Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -ra1daba982e3117ce45437384e770b50cfda7b7a7 -r5eda37efda2d771de4f5cfb509adf05621a290c3
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision a1daba982e3117ce45437384e770b50cfda7b7a7)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 5eda37efda2d771de4f5cfb509adf05621a290c3)
@@ -283,7 +283,7 @@
 }
 
 /*********************************************************************//**
- * @brief signalBloodPumpHardStop
+ * @brief
  * The signalBloodPumpHardStop function stops the blood pump immediately.
  * @details
  * Inputs : none
Index: firmware/App/Controllers/BloodFlow.h
===================================================================
diff -u -rc84daa1f07003427fc5cdde8f5651434478f7313 -r5eda37efda2d771de4f5cfb509adf05621a290c3
--- firmware/App/Controllers/BloodFlow.h	(.../BloodFlow.h)	(revision c84daa1f07003427fc5cdde8f5651434478f7313)
+++ firmware/App/Controllers/BloodFlow.h	(.../BloodFlow.h)	(revision 5eda37efda2d771de4f5cfb509adf05621a290c3)
@@ -47,12 +47,12 @@
 
 SELF_TEST_STATUS_T execBloodFlowTest( void );
 
-DATA_GET_PROTOTYPE( S32, getTargetBloodFlowRate );
-DATA_GET_PROTOTYPE( F32, getMeasuredBloodFlowRate);
-DATA_GET_PROTOTYPE( F32, getMeasuredBloodPumpRotorSpeed );
-DATA_GET_PROTOTYPE( F32, getMeasuredBloodPumpSpeed );
-DATA_GET_PROTOTYPE( F32, getMeasuredBloodPumpMCSpeed );
-DATA_GET_PROTOTYPE( F32, getMeasuredBloodPumpMCCurrent );
+S32  getTargetBloodFlowRate( void );
+F32  getMeasuredBloodFlowRate( void );
+F32  getMeasuredBloodPumpRotorSpeed( void );
+F32  getMeasuredBloodPumpSpeed( void );
+F32  getMeasuredBloodPumpMCSpeed( void );
+F32  getMeasuredBloodPumpMCCurrent( void );
 
 BOOL setBloodFlowCalibration( F32 gain, F32 offset );
 void getBloodFlowCalibration( F32 *gain, F32 *offset );
Index: firmware/App/Controllers/Buttons.h
===================================================================
diff -u -r4459be59bdc2896b44bcf6cd42d2762190e23c16 -r5eda37efda2d771de4f5cfb509adf05621a290c3
--- firmware/App/Controllers/Buttons.h	(.../Buttons.h)	(revision 4459be59bdc2896b44bcf6cd42d2762190e23c16)
+++ firmware/App/Controllers/Buttons.h	(.../Buttons.h)	(revision 5eda37efda2d771de4f5cfb509adf05621a290c3)
@@ -30,7 +30,7 @@
 
 // ********** public definitions **********
 
-// Enumeration of hardware button states.
+/// Enumeration of hardware button states.
 typedef enum Button_States
 {
     BUTTON_STATE_RELEASED = 0,                  ///< Button is in the released state
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -r04f72c18f15a3d7ab960fccea7b99cf93fd9a409 -r5eda37efda2d771de4f5cfb509adf05621a290c3
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 04f72c18f15a3d7ab960fccea7b99cf93fd9a409)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 5eda37efda2d771de4f5cfb509adf05621a290c3)
@@ -404,7 +404,7 @@
 }
 
 /*********************************************************************//**
- * @brief execDialOutFlowMonitor
+ * @brief
  * The execDialOutFlowMonitor function executes the dialysate outlet pump
  * and load cell sensor monitor.  Checks are performed.  Data is published
  * at appropriate interval.
@@ -441,7 +441,7 @@
 }
 
 /*********************************************************************//**
- * @brief execDialOutFlowController
+ * @brief
  * The execDialOutFlowController function executes the dialysate outlet pump
  * ultrafiltration controller state machine.
  * @details
@@ -476,7 +476,7 @@
 }
 
 /*********************************************************************//**
- * @brief handleDialOutPumpOffState
+ * @brief
  * The handleDialOutPumpOffState function handles the dialOut pump off state
  * of the dialOut pump controller state machine.
  * @details
@@ -509,7 +509,7 @@
 }
 
 /*********************************************************************//**
- * @brief handleDialOutPumpRampingUpState
+ * @brief
  * The handleDialOutPumpRampingUpState function handles the ramp up state
  * of the dialOut pump controller state machine.
  * @details
@@ -553,7 +553,7 @@
 }
 
 /*********************************************************************//**
- * @brief handleDialOutPumpRampingDownState
+ * @brief
  * The handleDialOutPumpRampingDownState function handles the ramp down state
  * of the dialOut pump controller state machine.
  * @details
@@ -595,7 +595,7 @@
 }
 
 /*********************************************************************//**
- * @brief handleDialOutPumpControlToTargetState
+ * @brief
  * The handleDialOutPumpControlToTargetState function handles the "control to
  * target" state of the dialOut pump controller state machine.
  * @details
@@ -651,7 +651,7 @@
 }
 
 /*********************************************************************//**
- * @brief stopDialOutPump
+ * @brief
  * The stopDialOutPump function sets the dialout flow stop signal and PWM
  * duty cycle to 0.0.
  * @details
@@ -1006,7 +1006,7 @@
 {
     F32 result = 0.0;
 
-    if ( loadCellID <= NUM_OF_LOAD_CELLS - 1 )
+    if ( loadCellID < NUM_OF_LOAD_CELLS )
     {
         if ( OVERRIDE_KEY == loadCellWeightInGrams[ loadCellID ].override )
         {
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -ra1daba982e3117ce45437384e770b50cfda7b7a7 -r5eda37efda2d771de4f5cfb509adf05621a290c3
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision a1daba982e3117ce45437384e770b50cfda7b7a7)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 5eda37efda2d771de4f5cfb509adf05621a290c3)
@@ -196,8 +196,8 @@
     return postCompleted;
 }
 
-/*************************************************************************
- * @brief isPOSTPassed
+/*********************************************************************//**
+ * @brief
  * The isPOSTPassed function determines whether all HD POST have passed.
  * Call this function after POST is complete (call isPOSTCompleted function).
  * @details
@@ -210,8 +210,8 @@
     return postPassed;
 }
 
-/*************************************************************************
- * @brief handlePOSTStatus
+/*********************************************************************//**
+ * @brief
  * The handlePOSTStatus function handles a status result returned by a
  * POST function.
  * @details
Index: firmware/App/Modes/ModeStandby.h
===================================================================
diff -u -rc6f3b01d1b0a5e3fdf480a7ee205ca349e10d6d2 -r5eda37efda2d771de4f5cfb509adf05621a290c3
--- firmware/App/Modes/ModeStandby.h	(.../ModeStandby.h)	(revision c6f3b01d1b0a5e3fdf480a7ee205ca349e10d6d2)
+++ firmware/App/Modes/ModeStandby.h	(.../ModeStandby.h)	(revision 5eda37efda2d771de4f5cfb509adf05621a290c3)
@@ -29,7 +29,7 @@
  *  @{
  */
 
-// ********** private function prototypes **********
+// ********** public function prototypes **********
 
 void initStandbyMode( void );              // initialize this module
 void transitionToStandbyMode( void );      // prepares for transition to standby mode
Index: firmware/App/Modes/ModeTreatmentParams.c
===================================================================
diff -u -r45df07b39764c9dfea5f33925d30288196fee165 -r5eda37efda2d771de4f5cfb509adf05621a290c3
--- firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 45df07b39764c9dfea5f33925d30288196fee165)
+++ firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 5eda37efda2d771de4f5cfb509adf05621a290c3)
@@ -748,7 +748,7 @@
  *************************************************************************/
 
 
-/*************************************************************************
+/*********************************************************************//**
  * @brief
  * The testSetTreatmentParameterOverride function overrides the value of a
  * given treatment parameter.
Index: firmware/App/Modes/ModeTreatmentParams.h
===================================================================
diff -u -r45df07b39764c9dfea5f33925d30288196fee165 -r5eda37efda2d771de4f5cfb509adf05621a290c3
--- firmware/App/Modes/ModeTreatmentParams.h	(.../ModeTreatmentParams.h)	(revision 45df07b39764c9dfea5f33925d30288196fee165)
+++ firmware/App/Modes/ModeTreatmentParams.h	(.../ModeTreatmentParams.h)	(revision 5eda37efda2d771de4f5cfb509adf05621a290c3)
@@ -67,7 +67,7 @@
     F32 uFVolume_L;
 } ADJ_TREATMENT_PARAMS_T;
 
-// ********** private function prototypes **********
+// ********** public function prototypes **********
 
 void initTreatParamsMode( void );                                    // initialize this module
 void transitionToTreatParamsMode( void );                            // prepares for transition to treatment parameters mode
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -ra1daba982e3117ce45437384e770b50cfda7b7a7 -r5eda37efda2d771de4f5cfb509adf05621a290c3
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision a1daba982e3117ce45437384e770b50cfda7b7a7)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 5eda37efda2d771de4f5cfb509adf05621a290c3)
@@ -66,7 +66,7 @@
 static void broadcastOperationMode( void );
 
 /*********************************************************************//**
- * @brief execOperationModes
+ * @brief
  * The execOperationModes function initializes the Operation Modes module.
  * @details
  * Inputs : none
@@ -100,7 +100,7 @@
 }
 
 /*********************************************************************//**
- * @brief execOperationModes
+ * @brief
  * The execOperationModes function executes the Operation Modes state machine.
  * @details
  * Inputs : none
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r8dad6fab1c33602ad94908fd31b8b15153a9eb6e -r5eda37efda2d771de4f5cfb509adf05621a290c3
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 8dad6fab1c33602ad94908fd31b8b15153a9eb6e)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 5eda37efda2d771de4f5cfb509adf05621a290c3)
@@ -469,7 +469,7 @@
 {
     U32 result = 0;
 
-    if ( alarmID <= NUM_OF_ALARM_IDS-1 )
+    if ( alarmID < NUM_OF_ALARM_IDS )
     {
         if ( OVERRIDE_KEY == alarmStartedAt[ alarmID ].override )
         {
Index: firmware/App/Services/CommBuffers.c
===================================================================
diff -u -r8dad6fab1c33602ad94908fd31b8b15153a9eb6e -r5eda37efda2d771de4f5cfb509adf05621a290c3
--- firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 8dad6fab1c33602ad94908fd31b8b15153a9eb6e)
+++ firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 5eda37efda2d771de4f5cfb509adf05621a290c3)
@@ -265,7 +265,7 @@
  * longer than what is currently in the buffer.
  * @details
  * Inputs : commBuffers[], commBufferByteCount[], activeDoubleBuffer[]
- * Outputs : given array populated with requested # of bytes from the buffer.
+ * Outputs : given array populated with requested number of bytes from the buffer.
  * @param buffer which comm buffer to retrieve data from
  * @param data pointer to byte array to stuff data into
  * @param len number of bytes to retrieve into given data array.
Index: firmware/App/Services/CommBuffers.h
===================================================================
diff -u -r8dad6fab1c33602ad94908fd31b8b15153a9eb6e -r5eda37efda2d771de4f5cfb509adf05621a290c3
--- firmware/App/Services/CommBuffers.h	(.../CommBuffers.h)	(revision 8dad6fab1c33602ad94908fd31b8b15153a9eb6e)
+++ firmware/App/Services/CommBuffers.h	(.../CommBuffers.h)	(revision 5eda37efda2d771de4f5cfb509adf05621a290c3)
@@ -23,7 +23,7 @@
 /**
  *  @defgroup CommBuffers CommBuffers
  *  @brief The communication buffers module provides buffering services for
- *  incoming and outgoing CAN data.  A separate buffer is provided for each
+ *  incoming and outgoing CAN data. A separate buffer is provided for each
  *  CAN ID (channel) so that frame order is maintained for a given channel.
  *
  *  @addtogroup CommBuffers
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r4459be59bdc2896b44bcf6cd42d2762190e23c16 -r5eda37efda2d771de4f5cfb509adf05621a290c3
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 4459be59bdc2896b44bcf6cd42d2762190e23c16)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 5eda37efda2d771de4f5cfb509adf05621a290c3)
@@ -905,7 +905,7 @@
  * next DMA write command response from the FPGA.
  * @details
  * Inputs : none
- * Outputs : # of expected bytes for next FPGA write command response is set
+ * Outputs : number of expected bytes for next FPGA write command response is set
  * @param bytes2Receive number of bytes expected to be transmitted via DMA from the FPGA
  * @return none
  *************************************************************************/
@@ -944,7 +944,7 @@
  * read command to the FPGA.
  * @details
  * Inputs : none
- * Outputs : # of bytes for next FPGA read command is set
+ * Outputs : number of bytes for next FPGA read command is set
  * @param bytes2Transmit number of bytes to be transmitted via DMA to the FPGA
  * @return none
  *************************************************************************/
@@ -983,7 +983,7 @@
  * next DMA read command response from the FPGA.
  * @details
  * Inputs : none
- * Outputs : # of expected bytes for next FPGA read command response is set
+ * Outputs : number of expected bytes for next FPGA read command response is set
  * @param bytes2Receive number of expected bytes to be transmitted via DMA from the FPGA
  * @return none
  *************************************************************************/
@@ -1312,42 +1312,129 @@
     *err = fpgaSensorReadings.accelFaultRegister;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The enableValvesPIDControl function enables PID on valves per given bit
+ * mask.
+ * @details
+ * Inputs : none
+ * Outputs : fpgaActuatorSetPoints
+ * @param enableBits bit mask indicating which valves to enable
+ * @return none
+ *************************************************************************/
 void enableValvesPIDControl( U16 enableBits )
 {
-    fpgaActuatorSetPoints.fpgaPIDControl = 0x55;
+    fpgaActuatorSetPoints.fpgaPIDControl = 0x55;  // TODO - this looks hard coded - ignoring param - fix this
 }
 
+/*********************************************************************//**
+ * @brief
+ * The setDialyzerInletValvePosition function sets the target position for
+ * the dialyzer inlet valve.
+ * @details
+ * Inputs : none
+ * Outputs : fpgaActuatorSetPoints
+ * @param setPoint target position for the dialyzer inlet valve
+ * @return none
+ *************************************************************************/
 void setDialyzerInletValvePosition( S16 setPoint )
 {
     fpgaActuatorSetPoints.VDiSetPoint = setPoint;
 }
+
+/*********************************************************************//**
+ * @brief
+ * The getDialyzerInletValvePosition function gets the last read position
+ * for the dialyzer inlet valve.
+ * @details
+ * Inputs : fpgaSensorReadings
+ * Outputs : none
+ * @return last read position of the dialyzer inlet valve
+ *************************************************************************/
 S16 getDialyzerInletValvePosition( void )
 {
     return fpgaSensorReadings.VDiPosition;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The setDialyzerOutletValvePosition function sets the target position for
+ * the dialyzer outlet valve.
+ * @details
+ * Inputs : none
+ * Outputs : fpgaActuatorSetPoints
+ * @return none
+ *************************************************************************/
 void setDialyzerOutletValvePosition( S16 setPoint )
 {
     fpgaActuatorSetPoints.VDoSetPoint = setPoint;
 }
+
+/*********************************************************************//**
+ * @brief
+ * The getDialyzerOutletValvePosition function gets the last read position
+ * for the dialyzer outlet valve.
+ * @details
+ * Inputs : fpgaSensorReadings
+ * Outputs : none
+ * @return last read position of the dialyzer outlet valve
+ *************************************************************************/
 S16 getDialyzerOutletValvePosition( void )
 {
     return fpgaSensorReadings.VDoPosition;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The setVenousBloodValvePosition function sets the target position for
+ * the venous blood valve.
+ * @details
+ * Inputs : none
+ * Outputs : fpgaActuatorSetPoints
+ * @return none
+ *************************************************************************/
 void setVenousBloodValvePosition( S16 setPoint )
 {
     fpgaActuatorSetPoints.VBVSetPoint = setPoint;
 }
+
+/*********************************************************************//**
+ * @brief
+ * The getVenousBloodValvePoistion function gets the last read position
+ * for the venous blood valve.
+ * @details
+ * Inputs : fpgaSensorReadings
+ * Outputs : none
+ * @return last read position of the venous blood valve
+ *************************************************************************/
 S16 getVenousBloodValvePoistion( void )
 {
     return fpgaSensorReadings.VBVPosition;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The setArterialBloodValvePosition function sets the target position for
+ * the arterial blood valve.
+ * @details
+ * Inputs : none
+ * Outputs : fpgaActuatorSetPoints
+ * @return none
+ *************************************************************************/
 void setArterialBloodValvePosition( S16 setPoint )
 {
     fpgaActuatorSetPoints.VBASetPoint = setPoint;
 }
+
+/*********************************************************************//**
+ * @brief
+ * The getArterialBloodValvePoistion function gets the last read position
+ * for the arterial blood valve.
+ * @details
+ * Inputs : fpgaSensorReadings
+ * Outputs : none
+ * @return last read position of the arterial blood valve
+ *************************************************************************/
 S16 getArterialBloodValvePoistion( void )
 {
     return fpgaSensorReadings.VBAPosition;
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r8dad6fab1c33602ad94908fd31b8b15153a9eb6e -r5eda37efda2d771de4f5cfb509adf05621a290c3
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 8dad6fab1c33602ad94908fd31b8b15153a9eb6e)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 5eda37efda2d771de4f5cfb509adf05621a290c3)
@@ -639,7 +639,7 @@
  * @details
  * Inputs : Output CAN Comm Buffers
  * Outputs : CAN packet transmit initiated.
- * @return # of bytes transmitted
+ * @return number of bytes transmitted
  *************************************************************************/
 static U32 transmitNextCANPacket( void )
 {
@@ -689,7 +689,7 @@
  * @details
  * Inputs : Output UART Comm Buffer(s)
  * Outputs : UART DMA transmit initiated.
- * @return # of bytes transmitted
+ * @return number of bytes transmitted
  *************************************************************************/
 #ifdef DEBUG_ENABLED
 static U32 transmitNextUARTPacket( void )
@@ -816,7 +816,7 @@
  * @details
  * Inputs : none
  * Outputs : Any padding at front of buffer is consumed.
- * @param msg buffer : the comm buffer to process
+ * @param buffer the comm buffer to process
  * @return none
  *************************************************************************/
 static void consumeBufferPaddingBeforeSync( COMM_BUFFER_T buffer )
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r637f38d98b89720a903d63b62a73f303b48e15f1 -r5eda37efda2d771de4f5cfb509adf05621a290c3
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 637f38d98b89720a903d63b62a73f303b48e15f1)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5eda37efda2d771de4f5cfb509adf05621a290c3)
@@ -1721,7 +1721,7 @@
 
 
 #ifdef DEBUG_ENABLED
-    /*************************************************************************
+    /*********************************************************************//**
      * @brief
      * The sendDebugData function sends debug data out to the PC port.
      * @details
@@ -1741,7 +1741,7 @@
         return result;
     }
 
-    /*************************************************************************
+    /*********************************************************************//**
      * @brief
      * The sendDebugDataToUI function sends debug string to the UI for logging.
      * @details
@@ -1860,7 +1860,7 @@
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
 
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetOffButtonStateOverride( payload.state.u32 );
         }
@@ -1893,7 +1893,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetStopButtonStateOverride( payload.state.u32 );
         }
@@ -1926,7 +1926,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetCurrentLampPatternOverride( payload.state.u32 );
         }
@@ -1959,7 +1959,7 @@
     if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetWatchdogTaskCheckInOverride( payload.index, payload.state.u32 );
         }
@@ -1992,7 +1992,7 @@
     if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetAlarmStateOverride( payload.index, payload.state.u32 );
         }
@@ -2025,7 +2025,7 @@
     if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetAlarmStartOverride( payload.index, payload.state.u32 );
         }
@@ -2058,7 +2058,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetAlarmStatusPublishIntervalOverride( payload.state.u32 );
         }
@@ -2124,7 +2124,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetMeasuredBloodFlowRateOverride( payload.state.f32 );
         }
@@ -2157,7 +2157,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetMeasuredBloodPumpRotorSpeedOverride( payload.state.f32 );
         }
@@ -2190,7 +2190,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetMeasuredBloodPumpSpeedOverride( payload.state.f32 );
         }
@@ -2223,7 +2223,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetMeasuredBloodPumpMCSpeedOverride( payload.state.f32 );
         }
@@ -2256,7 +2256,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetMeasuredBloodPumpMCCurrentOverride( payload.state.f32 );
         }
@@ -2289,7 +2289,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetBloodFlowDataPublishIntervalOverride( payload.state.u32 );
         }
@@ -2322,7 +2322,7 @@
     if ( sizeof(OVERRIDE_PUMP_SET_PT_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(OVERRIDE_PUMP_SET_PT_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetTargetDialInFlowRateOverride( payload.setPt, payload.ctrlMode );
         }
@@ -2355,7 +2355,7 @@
     if ( sizeof(OVERRIDE_PUMP_SET_PT_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(OVERRIDE_PUMP_SET_PT_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetTargetDialOutFlowRateOverride( payload.setPt, payload.ctrlMode );
         }
@@ -2388,7 +2388,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetMeasuredDialInFlowRateOverride( payload.state.f32 );
         }
@@ -2421,7 +2421,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetMeasuredDialInPumpRotorSpeedOverride( payload.state.f32 );
         }
@@ -2454,7 +2454,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetMeasuredDialInPumpSpeedOverride( payload.state.f32 );
         }
@@ -2487,7 +2487,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetMeasuredDialInPumpMCSpeedOverride( payload.state.f32 );
         }
@@ -2520,7 +2520,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetMeasuredDialInPumpMCCurrentOverride( payload.state.f32 );
         }
@@ -2553,7 +2553,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetDialInFlowDataPublishIntervalOverride( payload.state.u32 );
         }
@@ -2586,7 +2586,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetArterialPressureOverride( payload.state.f32 );
         }
@@ -2619,7 +2619,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetVenousPressureOverride( payload.state.f32 );
         }
@@ -2652,7 +2652,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetBloodPumpOcclusionOverride( payload.state.f32 );
         }
@@ -2685,7 +2685,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetDialInPumpOcclusionOverride( payload.state.f32 );
         }
@@ -2718,7 +2718,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetDialOutPumpOcclusionOverride( payload.state.f32 );
         }
@@ -2751,7 +2751,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetPresOcclDataPublishIntervalOverride( payload.state.u32 );
         }
@@ -2815,7 +2815,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetDialOutPumpAndLoadCellDataPublishIntervalOverride( payload.state.u32 );
         }
@@ -2849,7 +2849,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetDialOutUFRefVolumeOverride( payload.state.f32 );
         }
@@ -2883,7 +2883,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetDialOutUFTotVolumeOverride( payload.state.f32 );
         }
@@ -2917,7 +2917,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetMeasuredDialOutPumpMCSpeedOverride( payload.state.f32 );
         }
@@ -2951,7 +2951,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetMeasuredDialOutPumpMCCurrentOverride( payload.state.f32 );
         }
@@ -2984,7 +2984,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetMeasuredDialOutPumpSpeedOverride( payload.state.f32 );
         }
@@ -3017,7 +3017,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetMeasuredDialOutPumpRotorSpeedOverride( payload.state.f32 );
         }
@@ -3050,7 +3050,7 @@
     if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetDialOutLoadCellWeightOverride( payload.index, payload.state.f32 );
         }
@@ -3083,7 +3083,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetSafetyShutdownOverride( payload.state.u32 );
         }
@@ -3116,7 +3116,7 @@
     if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetAccelAxisOverride( payload.index, payload.state.f32 );
         }
@@ -3149,7 +3149,7 @@
     if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetAccelMaxOverride( payload.index, payload.state.f32 );
         }
@@ -3182,7 +3182,7 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( 0 == payload.reset )
+        if ( FALSE == payload.reset )
         {
             result = testSetAccelDataPublishIntervalOverride( payload.state.u32 );
         }
Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r8dad6fab1c33602ad94908fd31b8b15153a9eb6e -r5eda37efda2d771de4f5cfb509adf05621a290c3
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 8dad6fab1c33602ad94908fd31b8b15153a9eb6e)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 5eda37efda2d771de4f5cfb509adf05621a290c3)
@@ -269,7 +269,7 @@
 {
     BOOL result = FALSE;
 
-    if ( task <= NUM_OF_TASKS-1 )
+    if ( task < NUM_OF_TASKS )
     {
         if ( OVERRIDE_KEY == watchdogTaskCheckedIn[ task ].override )
         {