|
@@ -348,6 +348,7 @@ void *coffeeThread(void *threadid) {
|
|
|
|
|
|
case SigRotCCW:
|
|
case SigRotCCW:
|
|
case SigRotCW:
|
|
case SigRotCW:
|
|
|
|
+ case SigInt1Psh:
|
|
//Enter the menu
|
|
//Enter the menu
|
|
/* This should be not necessary!
|
|
/* This should be not necessary!
|
|
* if (page != PAGE_DEMO)
|
|
* if (page != PAGE_DEMO)
|
|
@@ -420,6 +421,7 @@ void *coffeeThread(void *threadid) {
|
|
|
|
|
|
case SigRotCCW:
|
|
case SigRotCCW:
|
|
case SigRotCW:
|
|
case SigRotCW:
|
|
|
|
+ case SigInt1Psh:
|
|
enterMenu();
|
|
enterMenu();
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
@@ -468,6 +470,7 @@ void *coffeeThread(void *threadid) {
|
|
|
|
|
|
case SigRotCCW:
|
|
case SigRotCCW:
|
|
case SigRotCW:
|
|
case SigRotCW:
|
|
|
|
+ case SigInt1Psh:
|
|
//Enter the menu
|
|
//Enter the menu
|
|
enterMenu();
|
|
enterMenu();
|
|
break;
|
|
break;
|
|
@@ -513,6 +516,7 @@ void *coffeeThread(void *threadid) {
|
|
|
|
|
|
case SigRotCCW:
|
|
case SigRotCCW:
|
|
case SigRotCW:
|
|
case SigRotCW:
|
|
|
|
+ case SigInt1Psh:
|
|
//Enter the menu
|
|
//Enter the menu
|
|
enterMenu();
|
|
enterMenu();
|
|
break;
|
|
break;
|
|
@@ -875,6 +879,7 @@ void coffeeBrew(void) {
|
|
brewTime = 0;
|
|
brewTime = 0;
|
|
brewTimer.start();
|
|
brewTimer.start();
|
|
while (halGetFlow() < AMOUNT_PREINFUSION && brewTime < TIME_PREINFUSION) {
|
|
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);
|
|
coffeeNap(0, 50000000);
|
|
if (getSigValue(MODE_STATE) == SigInt0Psh){
|
|
if (getSigValue(MODE_STATE) == SigInt0Psh){
|
|
stopBrewing();
|
|
stopBrewing();
|