Diff: main.cpp

Revision:

75:763f3f0a311c

Parent:

74:05f2188cfc0b

Child:

76:5896b298b8bd

--- a/main.cpp	Wed Jun 22 11:16:00 2016 +0000
+++ b/main.cpp	Wed Jun 22 11:18:20 2016 +0000
@@ -20,7 +20,6 @@
     return MAIN();    
 }
 
-MOCK(salinity_mock, 3.0f);
 
 int realMain() {
     
@@ -39,12 +38,11 @@
     ProximityController proximity(false, 0);
     controllers.push_back((void*)&proximity);
     
-    //SalinityController salt(false, 0);
-    MockSensorController salt(false,0,salinity_mock);
+    SalinityController salt(false, 0);
     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!");
@@ -55,7 +53,6 @@
     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);
@@ -103,15 +100,13 @@
         }
         
         // If the alarm controller detected a dangerous situation then update lcd and possibly exit
-        /*if(temp_alarm.isError() || salt_alarm.isError() || prox_alarm.isError()) {
+        if(temp_alarm.isError() || salt_alarm.isError() || prox_alarm.isError()) {
             
-            /*if(temp_alarm.isError())
+            if(temp_alarm.isError())
                 LCDController::showError(temp_alarm.getErrorMessage().c_str());  
             else if(salt_alarm.isError())
                 LCDController::showError(salt_alarm.getErrorMessage().c_str());  
-            else*/
-            
-            if(prox_alarm.isError()) {
+            else
                 LCDController::showError(prox_alarm.getErrorMessage().c_str()); 
             
             #ifdef HALT_ON_ALARM