Mario Simaremare
/
g3_waterplay
Salinity and temperature sensors are implemented in classes.
Diff: main.cpp
- Revision:
- 12:7a48b90b493e
- Parent:
- 11:dcaaf1bb21ce
- Child:
- 13:142a142a7ac5
--- a/main.cpp Wed Jun 22 00:16:33 2016 +0000 +++ b/main.cpp Wed Jun 22 12:34:37 2016 +0000 @@ -7,6 +7,7 @@ #include "SalinitySensor.h" #include "TemperatureSensor.h" #include "Thermostat.h" +#include "Procedure.h" #include "Waterplay.h" #include "TextLCD.h" #include "Printer.h" @@ -26,7 +27,7 @@ int keep_running = 1; Serial serial(USBTX, USBRX); Flasher led1(LED1); -Flasher alarm(p20); +Flasher alarm(p5); Printer printer(serial, lcd); SalinitySensor salinitySensor( @@ -64,11 +65,19 @@ led1, alarm ); + +DigitalIn button(p7); + +Procedure procedure( + printer, + button +); int main() { printer.display(); led1.flash(1); + //procedure.proceed(); //tank.initialize(); while(keep_running) {