|
@@ -48,24 +48,24 @@ static THD_FUNCTION(BTNThread, arg) {
|
|
if (palReadLine(button_Lines[(button_num_t)i]) == BUTTON_PRESSED) {
|
|
if (palReadLine(button_Lines[(button_num_t)i]) == BUTTON_PRESSED) {
|
|
/* button pressed */
|
|
/* button pressed */
|
|
button_Time[i] ++;
|
|
button_Time[i] ++;
|
|
- if (button_Time[i] >= (BTN_TIME_HOLDED/BTN_SCAN_PERIOD)) {
|
|
|
|
|
|
+ if (button_Time[i] >= BTN_TIME_HOLDED) {
|
|
/* process long press */
|
|
/* process long press */
|
|
- button_Time[i] -= (BTN_TIME_REPEATED/BTN_SCAN_PERIOD);
|
|
|
|
|
|
+ button_Time[i] -= BTN_TIME_REPEATED;
|
|
button_States[i] = BTN_st_Holded;
|
|
button_States[i] = BTN_st_Holded;
|
|
btnh[i](BTN_st_Pressed); // autorepeat
|
|
btnh[i](BTN_st_Pressed); // autorepeat
|
|
}
|
|
}
|
|
|
|
|
|
} else if (button_Time[i] != 0) {
|
|
} else if (button_Time[i] != 0) {
|
|
/* button released */
|
|
/* button released */
|
|
- if (button_Time[i] >= (BTN_TIME_PRESSED/BTN_SCAN_PERIOD)) {
|
|
|
|
|
|
+ if (button_Time[i] >= BTN_TIME_PRESSED) {
|
|
/* process short press */
|
|
/* process short press */
|
|
button_States[i] = BTN_st_Pressed;
|
|
button_States[i] = BTN_st_Pressed;
|
|
btnh[i](BTN_st_Pressed);
|
|
btnh[i](BTN_st_Pressed);
|
|
}
|
|
}
|
|
button_Time[i] = 0;
|
|
button_Time[i] = 0;
|
|
button_States[i] = BTN_st_Released;
|
|
button_States[i] = BTN_st_Released;
|
|
- pause = (BTN_SCAN_PAUSE/BTN_SCAN_PERIOD);
|
|
|
|
- btnh[i](BTN_st_Pressed);
|
|
|
|
|
|
+ pause = BTN_SCAN_PAUSE;
|
|
|
|
+ //btnh[i](BTN_st_Released);
|
|
}
|
|
}
|
|
} /* end FOR */
|
|
} /* end FOR */
|
|
} /* end Pause check */
|
|
} /* end Pause check */
|