Improved ButtonPress

This commit is contained in:
2022-09-04 09:05:48 +02:00
parent 67c93a2b13
commit 76962684a4
2 changed files with 12 additions and 18 deletions

View File

@@ -66,10 +66,10 @@
#define Calibration_TimeToMiddle 3000 #define Calibration_TimeToMiddle 3000
#define Calibration_messureTime 5 #define Calibration_messureTime 5
#define Calibration_messureCount 10 #define Calibration_messureCount 10
// Langer druck Zeit
#define Button_LongPressTime 1000
// Kurzer druck Zeit // Kurzer druck Zeit
#define Button_ShortPressTime 300 #define Button_ShortPressTime 300
// Code fertig Zeit
#define Button_FinishedTime 1000
// Beep Geschwindigkeit // Beep Geschwindigkeit
#define buzzSpeed 1 #define buzzSpeed 1

View File

@@ -224,36 +224,30 @@ void joystickButtonPress() {
int Code[] = {}; //0 = short, 1 = long int Code[] = {}; //0 = short, 1 = long
int CodeLenght = 0; int CodeLenght = 0;
bool Finished = false; bool Finished = false;
bool abort = false;
while(!Finished && !abort){ while(!Finished){
int buttonTime = 0; int buttonTime = 0;
while(digitalRead(joystick_button_Pin) == LOW) { while(digitalRead(joystick_button_Pin) == LOW) {
buttonTime+= 10; buttonTime+= 1;
delay(10); delay(1);
} }
if(buttonTime < Button_ShortPressTime) { if(buttonTime < Button_ShortPressTime) {
Code[CodeLenght] = 0; Code[CodeLenght] = 0;
Serial.println("short press"); Serial.println("short press");
} } else {
else if(buttonTime < Button_LongPressTime){
Code[CodeLenght] = 1; Code[CodeLenght] = 1;
Serial.println("long press"); Serial.println("long press");
} }
else{
abort = true;
Serial.println("Code aborted!");
}
CodeLenght++; CodeLenght++;
buttonTime = 0; buttonTime = 0;
while(digitalRead(joystick_button_Pin) == HIGH && !Finished && !abort){ while(digitalRead(joystick_button_Pin) == HIGH && !Finished){
buttonTime+= 10; buttonTime+= 1;
delay(10); delay(1);
if(buttonTime >= Button_LongPressTime){ if(buttonTime >= Button_FinishedTime){
Finished = true; Finished = true;
Serial.println("Code fineshed!"); Serial.println("Code fineshed!");
} }