Diff: main.cpp

Revision:

64:735009c4c8aa

Parent:

61:6b5c2ddcea0c

Child:

68:b769c0f23406

diff -r 59335eb8bdbc -r 735009c4c8aa main.cpp
--- a/main.cpp	Mon Jun 20 09:15:30 2016 +0000
+++ b/main.cpp	Mon Jun 20 10:22:10 2016 +0000
@@ -42,14 +42,20 @@
     // Add alarms to monitor sensor values
     SensorAlarmController temp_alarm = SensorAlarmController(false, 0, &temperature,
         TEMP_MIN_CRIT, TEMP_MIN_UNDESIRED, TEMP_MAX_CRIT, TEMP_MAX_UNDESIRED);
+    temp_alarm.setUndesiredErrorMsg("Temp undes!");
+    temp_alarm.setCriticalErrorMsg("Temp crit!");
     controllers.push_back((void *)&temp_alarm);
 
     SensorAlarmController salt_alarm = SensorAlarmController(false, 0, &salt,
         SALT_MIN_CRIT, SALT_MIN_UNDESIRED, SALT_MAX_CRIT, SALT_MAX_UNDESIRED);
+    salt_alarm.setUndesiredErrorMsg("Salt undes!");
+    salt_alarm.setCriticalErrorMsg("Salt crit!");
     controllers.push_back((void *)&salt_alarm);
     
     SensorAlarmController prox_alarm = SensorAlarmController(false, 0, &proximity,
         VOLUME_MIN_CRIT, VOLUME_MIN_UNDESIRED, VOLUME_MAX_CRIT, VOLUME_MAX_UNDESIRED);
+    prox_alarm.setUndesiredErrorMsg("Vol undes!");
+    prox_alarm.setCriticalErrorMsg("Vol crit!");
     controllers.push_back((void *)&prox_alarm);
     
     // PIDController last, as alarms should update first
@@ -92,11 +98,11 @@
         if(temp_alarm.isError() || salt_alarm.isError() || prox_alarm.isError()) {
             
             if(temp_alarm.isError())
-                LCDController::showError(temp_alarm.getErrorMessage());  
+                LCDController::showError(temp_alarm.getErrorMessage().c_str());  
             else if(salt_alarm.isError())
-                LCDController::showError(salt_alarm.getErrorMessage());  
+                LCDController::showError(salt_alarm.getErrorMessage().c_str());  
             else
-                LCDController::showError(prox_alarm.getErrorMessage()); 
+                LCDController::showError(prox_alarm.getErrorMessage().c_str()); 
             
             #ifdef HALT_ON_ALARM
             break;