Explorar el Código

lower button now enters the menu as well, added TODO

Sebastian hace 6 años
padre
commit
e2e036674d
Se han modificado 2 ficheros con 6 adiciones y 1 borrados
  1. 1 1
      CoffeeCode/buildno
  2. 5 0
      CoffeeCode/coffee.cpp

+ 1 - 1
CoffeeCode/buildno

@@ -1 +1 @@
-323
+324

+ 5 - 0
CoffeeCode/coffee.cpp

@@ -348,6 +348,7 @@ void *coffeeThread(void *threadid) {
 
 			case SigRotCCW:
 			case SigRotCW:
+			case SigInt1Psh:
 				//Enter the menu
 				/* This should be not necessary!
 				 * if (page != PAGE_DEMO)
@@ -420,6 +421,7 @@ void *coffeeThread(void *threadid) {
 
 			case SigRotCCW:
 			case SigRotCW:
+			case SigInt1Psh:
 				enterMenu();
 				break;
 			}
@@ -468,6 +470,7 @@ void *coffeeThread(void *threadid) {
 
 			case SigRotCCW:
 			case SigRotCW:
+			case SigInt1Psh:
 				//Enter the menu
 				enterMenu();
 				break;
@@ -513,6 +516,7 @@ void *coffeeThread(void *threadid) {
 
 			case SigRotCCW:
 			case SigRotCW:
+			case SigInt1Psh:
 				//Enter the menu
 				enterMenu();
 				break;
@@ -875,6 +879,7 @@ void coffeeBrew(void) {
 	brewTime = 0;
 	brewTimer.start();
 	while (halGetFlow() < AMOUNT_PREINFUSION && brewTime < TIME_PREINFUSION) {
+		//TODO don't use coffeeNap here since we don't want to resume to sleep after a signal got caught...
 		coffeeNap(0, 50000000);
 		if (getSigValue(MODE_STATE) == SigInt0Psh){
 			stopBrewing();