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:
59:614f713fb48b
Parent:
57:8dc3192ff150
Child:
61:6b5c2ddcea0c
diff -r b5f0c0f305ff -r 614f713fb48b main.cpp
--- a/main.cpp	Sun Jun 19 22:39:16 2016 +0000
+++ b/main.cpp	Sun Jun 19 22:56:49 2016 +0000
@@ -90,7 +90,14 @@
         // If the alarm controller detected a dangerous situation then update lcd and possibly exit
         // TODO move LCD updating to alarm controller
         if(temp_alarm.isError() || salt_alarm.isError() || prox_alarm.isError()) {
-            //LCDController::error(alarm.get_error_message());    
+            
+            if(temp_alarm.isError())
+                LCDController::error(temp_alarm.getErrorMessage());  
+            else if(salt_alarm.isError())
+                LCDController::error(salt_alarm.getErrorMessage());  
+            else
+                LCDController::error(prox_alarm.getErrorMessage()); 
+            
             #ifdef HALT_ON_ALARM
             break;
             #endif