Index: AlarmMgmt.c
===================================================================
diff -u -r15a8d5ff98b2d88bd0f32a37b41f4eec0f7a7088 -r4997cacd5a1501b7da1c8a3ba71f9594ad23a603
--- AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 15a8d5ff98b2d88bd0f32a37b41f4eec0f7a7088)
+++ AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 4997cacd5a1501b7da1c8a3ba71f9594ad23a603)
@@ -83,13 +83,13 @@
     else
     {
 #ifdef _TD_
-       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm );
+       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm )
 #endif
 #ifdef _DD_
-       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm );
+       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm )
 #endif
 #ifdef _RO_
-       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm );
+       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm )
 #endif
     }
 
Index: Utilities.h
===================================================================
diff -u -r17607d3644f379c1b93ff271ed3cfefda80b0e6e -r4997cacd5a1501b7da1c8a3ba71f9594ad23a603
--- Utilities.h	(.../Utilities.h)	(revision 17607d3644f379c1b93ff271ed3cfefda80b0e6e)
+++ Utilities.h	(.../Utilities.h)	(revision 4997cacd5a1501b7da1c8a3ba71f9594ad23a603)
@@ -62,6 +62,12 @@
     TIME_WINDOWED_COUNT_FPGA_FRESH_DIALYSATE_PUMP_HALL_SENSOR_ERROR,///< FPGA fresh dialysate pump hall sensor failure
     TIME_WINDOWED_COUNT_FPGA_SPENT_DIALYSATE_PUMP_HALL_SENSOR_ERROR,///< FPGA spent dialysate pump hall sensor failure
 #endif
+#ifdef _RO_
+    TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR,     ///< FPGA Conductivity sensor error
+    TIME_WINDOWED_COUNT_FPGA_TEMPERATURE_SENSOR_ERROR,      ///< FPGA Temperature sensor error
+    TIME_WINDOWED_COUNT_FPGA_COMM_FAILURES,                 ///< FPGA communication failure (NAK, CRC, timeout)
+    TIME_WINDOWED_COUNT_FPGA_DRAIN_PUMP_HALL_SENSOR_ERROR,  ///< FPGA Drain pump hall sensor failure
+#endif
     NUM_OF_TIME_WINDOWED_COUNTS                             ///< Number of pressure sensors
 } TIME_WINDOWED_COUNT_T;
 
Index: WatchdogMgmt.c
===================================================================
diff -u -r15a8d5ff98b2d88bd0f32a37b41f4eec0f7a7088 -r4997cacd5a1501b7da1c8a3ba71f9594ad23a603
--- WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 15a8d5ff98b2d88bd0f32a37b41f4eec0f7a7088)
+++ WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 4997cacd5a1501b7da1c8a3ba71f9594ad23a603)
@@ -24,7 +24,8 @@
 #include "SafetyShutdown.h"
 #endif
 #ifdef _RO_
-#include "FpgaRo.h"
+#include "FpgaRO.h"
+#include "SafetyShutdown.h"
 #endif
 //#include "InternalADC.h"
 #include "Messaging.h"
@@ -124,6 +125,10 @@
 // TODO : clean up once we get the clarity
     PIN_SIGNAL_STATE_T safetyShutdownFeedbackSignal = PIN_SIGNAL_HIGH;
 #endif
+#ifdef _RO_
+// TODO : clean up once we get the clarity
+    PIN_SIGNAL_STATE_T safetyShutdownFeedbackSignal = PIN_SIGNAL_HIGH;
+#endif
     PIN_SIGNAL_STATE_T safetyShutdownSoftwareCmd    = ( TRUE == isSafetyShutdownActivated() ? PIN_SIGNAL_LOW : PIN_SIGNAL_HIGH );
 
     // Called by background task, so give bg task credit for checking in