Просмотр исходного кода

fixed Bug: Entering menu now from every state through the rotary encoder

Sebastian 6 лет назад
Родитель
Сommit
149460c397
2 измененных файлов с 8 добавлено и 4 удалено
  1. 1 1
      CoffeeCode/buildno
  2. 7 3
      CoffeeCode/coffee.cpp

+ 1 - 1
CoffeeCode/buildno

@@ -1 +1 @@
-290
+291

+ 7 - 3
CoffeeCode/coffee.cpp

@@ -418,7 +418,8 @@ void *coffeeThread(void *threadid) {
 				changeState(STATE_WAIT_OFF);
 				break;
 
-			case SigInt1Psh:
+			case SigRotCCW:
+			case SigRotCW:
 				enterMenu();
 				break;
 			}
@@ -465,7 +466,8 @@ void *coffeeThread(void *threadid) {
 				changeState(STATE_WAIT_OFF);
 				break;
 
-			case SigInt1Psh:
+			case SigRotCCW:
+			case SigRotCW:
 				//Enter the menu
 				enterMenu();
 				break;
@@ -509,7 +511,8 @@ void *coffeeThread(void *threadid) {
 				changeState(STATE_OFF);
 				break;
 
-			case SigInt1Psh:
+			case SigRotCCW:
+			case SigRotCW:
 				//Enter the menu
 				enterMenu();
 				break;
@@ -552,6 +555,7 @@ void *coffeeThread(void *threadid) {
 			 *
 			 */
 		case STATE_CLEANING: //this can only be executed once the machine is hot!
+			//TODO Show the progress of the cleaning process
 			if (!halProxSensorCovered()) {
 				//execute the cleaning procedure
 				coffeeClean();