Small platformio.ini changes

This commit is contained in:
2020-05-24 13:19:26 +02:00
parent 2ee7d5b531
commit ac2a0dfa58
2 changed files with 8 additions and 8 deletions

View File

@@ -132,10 +132,10 @@ build_flags =
; -DPINS_3WIRESW_IN1=16
; -DPINS_3WIRESW_IN2=27
-DFEATURE_DPAD
-DPINS_DPAD_IN1=22
-DPINS_DPAD_IN2=23
-DPINS_DPAD_IN3=27
-DPINS_DPAD_IN4=32
-DPINS_DPAD_UP=32
-DPINS_DPAD_DOWN=22
-DPINS_DPAD_CONFIRM=23
-DPINS_DPAD_BACK=27
; -DFEATURE_ROTARY
; -DPINS_ROTARY_CLK=16
; -DPINS_ROTARY_DT=27
@@ -148,7 +148,7 @@ build_flags =
[env:testbench]
[env:testbench_usb]
platform = ${common_env_data.platform}
board = ${common_env_data.board}
framework = ${common_env_data.framework}
@@ -194,7 +194,7 @@ build_flags =
[env:mickdermack]
[env:mickdermack_usb]
platform = ${common_env_data.platform}
board = ${common_env_data.board}
framework = ${common_env_data.framework}

View File

@@ -39,7 +39,7 @@ DPadState DPadHelper<IN1, IN2, IN3, IN4>::read()
}
#ifdef FEATURE_DPAD
DPadHelper<PINS_DPAD_IN1, PINS_DPAD_IN2, PINS_DPAD_IN3, PINS_DPAD_IN4> dpad;
DPadHelper<DPINS_DPAD_UP, DPINS_DPAD_DOWN, DPINS_DPAD_LEFT, DPINS_DPAD_RIGHT> dpad;
DPadState lastState;
void updateDpad()
@@ -47,10 +47,10 @@ void updateDpad()
const auto state = dpad.read();
enum {
ButtonUp = 3,
ButtonDown = 0,
ButtonConfirm = 1,
ButtonBack = 2
ButtonUp = 3,
};
if (!std::get<ButtonUp>(lastState) && std::get<ButtonUp>(state))