|
@@ -52,7 +52,7 @@ void displayPrintTime(int line) {
|
|
|
void displayPrintFlow(int line) {
|
|
|
float flow = halGetFlow();
|
|
|
lcdPosition(lcd, 0, line);
|
|
|
- lcdPrintf(lcd, "%s: %.0f", displayGetString(str_flow), flow);
|
|
|
+ lcdPrintf(lcd, "%s: %.0f ml ", displayGetString(str_flow), flow);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -219,11 +219,13 @@ void displayRefresh(void) {
|
|
|
break;
|
|
|
|
|
|
case STATE_BREW:
|
|
|
- if (elapsedCnt <= REFRESH_RATE) {
|
|
|
- displayPrintLn(0, "CoffeePi", true);
|
|
|
- displayPrintLn(1, displayGetString(str_brewing), true);
|
|
|
- } else
|
|
|
+ if (elapsedCnt <= 2*REFRESH_RATE) {
|
|
|
+ displayPrintLn(0, "CoffeePi", true);
|
|
|
+ displayPrintLn(1, displayGetString(str_brewing), true);
|
|
|
+ } else {
|
|
|
+ displayPrintLn(0, displayGetString(str_brewing), true);
|
|
|
displayPrintFlow(1);
|
|
|
+ }
|
|
|
break;
|
|
|
|
|
|
case STATE_BREWMANUAL:
|
|
@@ -270,6 +272,7 @@ void displayPushState(coffee_status_t state) {
|
|
|
if (state != coffeeState) {
|
|
|
coffeeState = state;
|
|
|
timerScaler--;
|
|
|
+ elapsedCnt = 0;
|
|
|
displayTimer.call();
|
|
|
}
|
|
|
}
|