@@ -69,9 +69,9 @@ void initInputs(){
69
69
// TODO are there no "loose" pins left floating after this? per https://electronics.stackexchange.com/q/37696/151805
70
70
#ifdef INPUT_BUTTONS
71
71
pinMode (CTRL_SEL, INPUT_PULLUP);
72
- # if CTRL_ALT>0
72
+ if ( CTRL_ALT>0 ){ // preprocessor directives don't seem to work for this when e.g. "A7"
73
73
pinMode (CTRL_ALT, INPUT_PULLUP);
74
- # endif
74
+ }
75
75
#ifdef INPUT_UPDN_BUTTONS
76
76
pinMode (CTRL_UP, INPUT_PULLUP);
77
77
pinMode (CTRL_DN, INPUT_PULLUP);
@@ -198,15 +198,6 @@ void checkRot(){
198
198
} // end checkRot()
199
199
#endif
200
200
201
- bool checkForHeldButtonAtStartup (){
202
- // This is a bit outside the standard ctrlEvt functionality due to happening at startup
203
- bool ret = readBtn (CTRL_SEL);
204
- // prevent the held button from doing anything else, if applicable
205
- // TODO expand this so short and long hold can happen at startup
206
- inputCur = CTRL_SEL; inputStop ();
207
- return ret;
208
- }
209
-
210
201
void checkInputs (){
211
202
// TODO potential issue: if user only means to rotate or push encoder but does both?
212
203
#ifdef INPUT_IMU
@@ -216,9 +207,9 @@ void checkInputs(){
216
207
// We just need to only call checkBtn if one or the other is equipped
217
208
#if defined(INPUT_BUTTONS) || defined(INPUT_IMU)
218
209
checkBtn (CTRL_SEL);
219
- # if CTRL_ALT>0
210
+ if ( CTRL_ALT>0 ){ // preprocessor directives don't seem to work for this when e.g. "A7"
220
211
checkBtn (CTRL_ALT);
221
- # endif
212
+ }
222
213
#if defined(INPUT_UPDN_BUTTONS) || defined(INPUT_IMU)
223
214
checkBtn (CTRL_UP);
224
215
checkBtn (CTRL_DN);
0 commit comments