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:
44:7c932cc5991b
Parent:
43:0abb54448b75
Child:
46:7e4c1f2ab76c
--- a/main.cpp	Wed Jun 15 09:14:57 2016 +0000
+++ b/main.cpp	Wed Jun 15 10:37:50 2016 +0000
@@ -42,23 +42,23 @@
     /* THE SECOND ARG SPECIFIES THE DELAY AFTER EACH UPDATE, ONLY WHEN THREADED   */
     // -----------------------------------------------------------------------------
     
-    //TemperatureController temperature(false,0);
-    MockSensorController temperature(false,0,temp_mock);
+    TemperatureController temperature(false,0);
+    //MockSensorController temperature(false,0,temp_mock);
     controllers.push_back((void*)&temperature);
     
-    //ProximityController proximity(false,0);
-    MockSensorController proximity(false,0,prox_mock);
+    ProximityController proximity(false,0);
+    //MockSensorController proximity(false,0,prox_mock);
     controllers.push_back((void*)&proximity);
     
-    //SalinityController salt(false,0);
-    MockSensorController salt(false,0,salt_mock);
+    SalinityController salt(false,0);
+    //MockSensorController salt(false,0,salt_mock);
     controllers.push_back((void *)&salt);
     
     PIDController pidc(false,0,&temperature,&salt,&proximity);
     controllers.push_back((void *)&pidc);
     
     AlarmController alarm(false,0,&temperature,&salt,&proximity);
-    controllers.push_back((void *)&alarm);
+   // controllers.push_back((void *)&alarm);
     
     
     // -----------------------------------------------------------------------------