Diff: main.cpp

Revision:

68:b769c0f23406

Parent:

64:735009c4c8aa

Child:

71:38bb6bf09933

--- a/main.cpp	Mon Jun 20 10:57:32 2016 +0000
+++ b/main.cpp	Mon Jun 20 12:48:42 2016 +0000
@@ -40,7 +40,7 @@
     controllers.push_back((void *)&salt);    
     
     // Add alarms to monitor sensor values
-    SensorAlarmController temp_alarm = SensorAlarmController(false, 0, &temperature,
+    /*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!");
@@ -57,7 +57,7 @@
     prox_alarm.setUndesiredErrorMsg("Vol undes!");
     prox_alarm.setCriticalErrorMsg("Vol crit!");
     controllers.push_back((void *)&prox_alarm);
-    
+    */
     // PIDController last, as alarms should update first
     PIDController pidc(false, 0, &temperature,&salt,&proximity);
     controllers.push_back((void *)&pidc);
@@ -95,7 +95,7 @@
         
         // 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()) {
+        /*if(temp_alarm.isError() || salt_alarm.isError() || prox_alarm.isError()) {
             
             if(temp_alarm.isError())
                 LCDController::showError(temp_alarm.getErrorMessage().c_str());  
@@ -107,7 +107,7 @@
             #ifdef HALT_ON_ALARM
             break;
             #endif
-        }
+        }*/
 
 
         //Show temperature, salinity and volume of the water tank on the PC if connected through serial