|
@@ -789,8 +789,8 @@ void coffeeBrew(void) {
|
|
|
halRelaisOn(RELAIS_PUMP);
|
|
|
brewTime = 0;
|
|
|
brewTimer.start();
|
|
|
- while (halGetFlow() < AMOUNT_PREINFUSION) {
|
|
|
- coffeeNap(0,50000000);
|
|
|
+ while (halGetFlow() < AMOUNT_PREINFUSION && brewTime < TIME_PREINFUSION) {
|
|
|
+ coffeeNap(0, 50000000);
|
|
|
if (getSigValue(MODE_STATE) == SigInt0Psh){
|
|
|
stopBrewing();
|
|
|
return;
|
|
@@ -803,7 +803,7 @@ void coffeeBrew(void) {
|
|
|
*/
|
|
|
brewTimer.start();
|
|
|
while (brewTime < TIME_SOAK) {
|
|
|
- coffeeNap(1,100000000);
|
|
|
+ coffeeNap(1, 100000000);
|
|
|
if (getSigValue(MODE_STATE) == SigInt0Psh) {
|
|
|
stopBrewing();
|
|
|
return;
|
|
@@ -818,7 +818,7 @@ void coffeeBrew(void) {
|
|
|
halRelaisOn(RELAIS_PUMP);
|
|
|
brewTimer.start();
|
|
|
while (brewTime < TIME_INFUSION && halGetFlow() < AMOUNT_DBLESPRESSO) {
|
|
|
- coffeeNap(1,100000000);
|
|
|
+ coffeeNap(1, 100000000);
|
|
|
if (getSigValue(MODE_STATE) == SigInt0Psh){
|
|
|
stopBrewing();
|
|
|
break;
|