Saltware / Mbed 2 deprecated Water Play

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   mbed DRV88255 TextLCD Ping mbed-rtos

Diff: main.cpp

Revision:
6:067e999b9c6e
Parent:
4:4011a1562a77
Child:
7:8b3aef52aa7b
Child:
8:24b057cbcb53
--- a/main.cpp	Wed Jun 08 13:37:18 2016 +0000
+++ b/main.cpp	Fri Jun 10 10:53:56 2016 +0000
@@ -1,6 +1,7 @@
 #include "SalinityController.h"
 #include "TemperatureController.h"
 #include "MotorController.h"
+#include "LCDController.h"
 
 #include "mbed.h"
 
@@ -11,24 +12,26 @@
     SalinityController salt;
     TemperatureController temperature;
     MotorController motor;
+    LCDController lcd;
     
 //    for(int i = 0; i < 20; i++)
 //    {
 //        motor.test();
 //        motor.test2();
 //    }
-    
+    lcd.splash();
     while(1) {        
-        printf("%d> ", count);
+       // printf("%d> ", count);
+        
+       // salt.displayPPT();
         
-        salt.displayPPT();
+        //temperature.displayTemperature();
         
-        temperature.displayTemperature();
+      //  temperature.controlHeater();
         
-        temperature.controlHeater();
-        
+        lcd.updateScreen(temperature.getTemperature(),salt.getVoltage());
         count++;
         
-        wait(0.1);
+        wait(0.5);
     }
 }
\ No newline at end of file