Index: PIControllers.c
===================================================================
diff -u -rcaf43526e79b7e324f32524d5dc1eee0b40805ab -r9023ef607793bf8f9e0491da6b84b7da6f8e77de
--- PIControllers.c	(.../PIControllers.c)	(revision caf43526e79b7e324f32524d5dc1eee0b40805ab)
+++ PIControllers.c	(.../PIControllers.c)	(revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de)
@@ -68,16 +68,14 @@
     { 0.0, 0.0, 0.90, 0.10, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 100.0, CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 },  // PI_CONTROLLER_ID_BLOOD_FLOW
 #endif
 #ifdef _DD_
-    { 0.0, 0.0, 2650, 350, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,  4.0,  CONTROLLER_BIDIRECTIONAL, FALSE, 0.0 },   // PI_CONTROLLER_ID_D12_PUMP
-    { 0.0, 0.0, 2650, 350, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,  4.0,  CONTROLLER_BIDIRECTIONAL, FALSE, 0.0 },   // PI_CONTROLLER_ID_D48_PUMP
-    { 0.0, 0.0, 1.0,  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,  15.0, CONTROLLER_BIDIRECTIONAL, TRUE, 0.0 },   // PI_CONTROLLER_ID_D5_HEAT
-    { 0.0, 0.0, 1.0,  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,  5.0,  CONTROLLER_BIDIRECTIONAL, FALSE, 0.0 },   // PI_CONTROLLER_ID_D45_HEAT
-#endif
-#ifdef _RO_
+    { 0.0, 0.0, 2650, 350, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 4.0,  CONTROLLER_BIDIRECTIONAL, FALSE, 0.0 },   // PI_CONTROLLER_ID_D12_PUMP
+    { 0.0, 0.0, 2650, 350, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 4.0,  CONTROLLER_BIDIRECTIONAL, FALSE, 0.0 },   // PI_CONTROLLER_ID_D48_PUMP
+    { 0.0, 0.0, 1.0,  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 15.0, CONTROLLER_BIDIRECTIONAL, TRUE, 0.0 },    // PI_CONTROLLER_ID_D5_HEAT
+    { 0.0, 0.0, 1.0,  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 5.0,  CONTROLLER_BIDIRECTIONAL, FALSE, 0.0 },   // PI_CONTROLLER_ID_D45_HEAT
     { 0.0, 0.0, 1.0,  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 50.0,  CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 },  // PI_CONTROLLER_ID_RO_PUMP
-    { 0.0, 0.0, 1.0,  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.1,  CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 },  // PI_CONTROLLER_ID_RO_PUMP_MAX_PRES
-    { 0.0, 0.0, 1.0,  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.5,  CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 },  // PI_CONTROLLER_ID_BOOST_PUMP_FLOW
-    { 0.0, 0.0, 1.0,  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.1,  CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 },  // PI_CONTROLLER_ID_BOOST_PUMP_PRES
+    { 0.0, 0.0, 1.0,  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.1,  CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 },   // PI_CONTROLLER_ID_RO_PUMP_MAX_PRES
+    { 0.0, 0.0, 1.0,  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.5,  CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 },   // PI_CONTROLLER_ID_BOOST_PUMP_FLOW
+    { 0.0, 0.0, 1.0,  0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.1,  CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 },   // PI_CONTROLLER_ID_BOOST_PUMP_PRES
 #endif
 };
 
@@ -128,9 +126,6 @@
 #ifdef _DD_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
 #endif
-#ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
-#endif
     }
 }
 
@@ -167,9 +162,6 @@
 #ifdef _DD_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
 #endif
-#ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
-#endif
     }
 }
 
@@ -267,9 +259,6 @@
 #ifdef _DD_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
 #endif
-#ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
-#endif
     }
 
     return result;
@@ -339,9 +328,6 @@
 #ifdef _DD_
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_SIGNAL, (U32)signalID )
 #endif
-#ifdef _RO_
-                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_SIGNAL, (U32)signalID )
-#endif
                 break;
         } // End of switch
     }
@@ -350,9 +336,6 @@
 #ifdef _DD_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
 #endif
-#ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
-#endif
     }
 
     return output;
@@ -387,9 +370,6 @@
 #ifdef _DD_
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_STEP_LIMIT, (U32)stepLimit )
 #endif
-#ifdef _RO_
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_STEP_LIMIT, (U32)stepLimit )
-#endif
         }
 
     }
@@ -399,10 +379,6 @@
         // Invalid controller given
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
 #endif
-#ifdef _RO_
-        // Invalid controller given
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, (U32)controllerID )
-#endif
     }
 }