Mercurial > mbsePi-apps / file comparison
comparison: brewco/brewco.c
brewco/brewco.c
- changeset 475
- bec993331061
- parent 474
- fe1c3e3e90dc
- child 476
- 8f159cd4f5fc
equal
deleted
inserted
replaced
| 474:fe1c3e3e90dc | 475:bec993331061 |
|---|---|
| 350 | 350 |
| 351 case STEP_WATERCHECK: if (brew->brewstep != last_step) { | 351 case STEP_WATERCHECK: if (brew->brewstep != last_step) { |
| 352 prompt(111, NULL); /* "AUTO --> Mash In " */ | 352 prompt(111, NULL); /* "AUTO --> Mash In " */ |
| 353 prompt(209, NULL); /* " Water Added? " */ | 353 prompt(209, NULL); /* " Water Added? " */ |
| 354 prompt(300, NULL); | 354 prompt(300, NULL); |
| 355 prompt(410, NULL); /* " Continue: Yes No " */ | 355 prompt(407, NULL); /* "--- --- No Yes " */ |
| 356 last_step = brew->brewstep; | 356 last_step = brew->brewstep; |
| 357 } | 357 } |
| 358 slcdDummy(slcdHandle); | 358 slcdDummy(slcdHandle); |
| 359 key = keycheck(); | 359 key = keycheck(); |
| 360 if (key == KEY_RETURN) { | 360 if (key == KEY_ENTER) { |
| 361 brew->brewstep = STEP_PUMPPRIME; | 361 brew->brewstep = STEP_PUMPPRIME; |
| 362 syslog(LOG_NOTICE, "AUTO: confirmed water added"); | 362 syslog(LOG_NOTICE, "AUTO: confirmed water added"); |
| 363 } | 363 } |
| 364 if (key == KEY_ENTER) { | 364 if (key == KEY_RETURN) { |
| 365 syslog(LOG_NOTICE, "AUTO: aborted water added"); | 365 syslog(LOG_NOTICE, "AUTO: aborted water added"); |
| 366 brew->brewstep = STEP_CLEANUP; | 366 brew->brewstep = STEP_CLEANUP; |
| 367 } | 367 } |
| 368 break; | 368 break; |
| 369 | 369 |
| 370 case STEP_PUMPPRIME: if (brew->brewstep != last_step) { | 370 case STEP_PUMPPRIME: if (brew->brewstep != last_step) { |
| 371 prompt(111, NULL); /* "AUTO --> Mash In " */ | 371 prompt(100, NULL); /* " " */ |
| 372 prompt(210, NULL); /* " Pump Prime " */ | 372 prompt(210, NULL); /* " Pump Prime " */ |
| 373 prompt(300, NULL); /* " " */ | 373 prompt(300, NULL); /* " " */ |
| 374 prompt(400, NULL); /* " " */ | 374 prompt(400, NULL); /* " " */ |
| 375 hlt_status(0); | |
| 376 mlt_status(0); | |
| 375 last_step = brew->brewstep; | 377 last_step = brew->brewstep; |
| 378 } | |
| 379 for (i = 1; i < 6; i++) { | |
| 380 if (set_MLT_pump(unit, 1)) | |
| 381 syslog(LOG_NOTICE, "AUTO: pump prime %d turn %s MLT pump", i, mlt_pump_state ? "on":"off"); | |
| 382 usleep(750000 + (i * 250000)); /* 250 + i * 250 mSec */ | |
| 383 if (set_MLT_pump(unit, 0)) | |
| 384 syslog(LOG_NOTICE, "AUTO: pump prime %d turn %s MLT pump", i, mlt_pump_state ? "on":"off"); | |
| 385 usleep(350000); /* 350 mSec */ | |
| 376 } | 386 } |
| 377 brew->brewstep = STEP_WAITSTART; | 387 brew->brewstep = STEP_WAITSTART; |
| 378 break; | 388 break; |
| 379 | 389 |
| 380 case STEP_WAITSTART: if (startdelay == 0) { | 390 case STEP_WAITSTART: if (startdelay == 0) { |
| 404 brew->brewstep = STEP_PREMASH; | 414 brew->brewstep = STEP_PREMASH; |
| 405 } | 415 } |
| 406 break; | 416 break; |
| 407 | 417 |
| 408 case STEP_PREMASH: if (brew->brewstep != last_step) { | 418 case STEP_PREMASH: if (brew->brewstep != last_step) { |
| 409 prompt(111 + brew->mashstep, NULL); /* "AUTO --> [mashname] " */ | 419 prompt(111, NULL); /* "AUTO --> Mash-in " */ |
| 410 prompt(300, NULL); /* " " */ | 420 prompt(300, NULL); /* " " */ |
| 411 prompt(418, NULL); /* "--- --- Pause --- " */ | 421 prompt(418, NULL); /* "--- --- Pause --- " */ |
| 412 tempstatus(); | 422 tempstatus(); |
| 413 hlt_status(1); | 423 hlt_status(1); |
| 414 mlt_status(1); | 424 mlt_status(1); |
| 415 pump_status(unit->pump_premash); | 425 pump_status(unit->pump_premash); |
| 416 last_step = brew->brewstep; | 426 last_step = brew->brewstep; |
| 467 | 477 |
| 468 case MASH_PROMPT: if (last_fase != mash_fase) { | 478 case MASH_PROMPT: if (last_fase != mash_fase) { |
| 469 prompt(111 + brew->mashstep, NULL); /* "AUTO --> [mashname] " */ | 479 prompt(111 + brew->mashstep, NULL); /* "AUTO --> [mashname] " */ |
| 470 prompt(219, NULL); /* " Mash added? " */ | 480 prompt(219, NULL); /* " Mash added? " */ |
| 471 prompt(300, NULL); | 481 prompt(300, NULL); |
| 472 prompt(410, NULL); /* " Continue: Yes No " */ | 482 prompt(407, NULL); /* "--- --- No Yes " */ |
| 473 last_fase = mash_fase; | 483 last_fase = mash_fase; |
| 474 } | 484 } |
| 475 slcdDummy(slcdHandle); | 485 slcdDummy(slcdHandle); |
| 476 key = keycheck(); | 486 key = keycheck(); |
| 477 if (key == KEY_RETURN) { | 487 if (key == KEY_ENTER) { |
| 478 mash_fase = MASH_HEATING; | 488 mash_fase = MASH_HEATING; |
| 479 syslog(LOG_NOTICE, "AUTO: confirmed mash added"); | 489 syslog(LOG_NOTICE, "AUTO: confirmed mash added"); |
| 480 } | 490 } |
| 481 if (key == KEY_ENTER) { | 491 if (key == KEY_RETURN) { |
| 482 syslog(LOG_NOTICE, "AUTO: aborted mash added"); | 492 syslog(LOG_NOTICE, "AUTO: aborted mash added"); |
| 483 brew->brewstep = STEP_CLEANUP; | 493 brew->brewstep = STEP_CLEANUP; |
| 484 brew->mashstep = 0; | 494 brew->mashstep = 0; |
| 485 } | 495 } |
| 486 break; | 496 break; |
| 1398 tempstatus(); | 1408 tempstatus(); |
| 1399 key = keycheck(); | 1409 key = keycheck(); |
| 1400 if (key == KEY_ENTER) { | 1410 if (key == KEY_ENTER) { |
| 1401 setup(); | 1411 setup(); |
| 1402 prompt(101, NULL); /* " Brewco x.x.x " */ | 1412 prompt(101, NULL); /* " Brewco x.x.x " */ |
| 1413 prompt(200, NULL); | |
| 1414 prompt(300, NULL); | |
| 1415 hlt_status(0); | |
| 1416 mlt_status(0); | |
| 1417 pump_status(0); | |
| 1403 prompt(401, NULL); /* "--- MAN AUTO SETUP" */ | 1418 prompt(401, NULL); /* "--- MAN AUTO SETUP" */ |
| 1404 } else if (key == KEY_RETURN && ! brew) { | 1419 } else if (key == KEY_RETURN && ! brew) { |
| 1405 int i, isOk = TRUE; | 1420 int i, isOk = TRUE; |
| 1406 char message[41]; | 1421 char message[41]; |
| 1407 | 1422 |
