Index: PIControllers.c
===================================================================
diff -u -r4ed3097b9e36e0f5112b47b684b887c19e7d1dc4 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de
--- PIControllers.c	(.../PIControllers.c)	(revision 4ed3097b9e36e0f5112b47b684b887c19e7d1dc4)
+++ PIControllers.c	(.../PIControllers.c)	(revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de)
@@ -77,12 +77,6 @@
     { 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
-#ifdef _RO_
-    { 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
-#endif
 };
 
 /*********************************************************************//**
@@ -132,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
     }
 }
 
@@ -171,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
     }
 }
 
@@ -271,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;
@@ -343,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
     }
@@ -354,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;
@@ -391,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
         }
 
     }
@@ -403,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
     }
 }