Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r909b961d8b51c01e1582ae0e63f8d540d99057a2 -r3555f182983cb3852f1e414017d11aeb537d3274
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 909b961d8b51c01e1582ae0e63f8d540d99057a2)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 3555f182983cb3852f1e414017d11aeb537d3274)
@@ -825,7 +825,7 @@
     if ( TRUE == didTimeout( timeOfLastHDCheckIn, HD_COMM_TIMEOUT_IN_MS ) )
     {
         hdIsCommunicating = FALSE;
-        activateAlarmNoData( ALARM_ID_HD_COMM_TIMEOUT );
+        //activateAlarmNoData( ALARM_ID_HD_COMM_TIMEOUT );
     }
 }
 
@@ -950,7 +950,7 @@
                 U16 msgID;
 
                 memcpy( &msgID, &pendingAckList[ i ].msg[ sizeof( U08 ) + sizeof( U16) ], sizeof( U16 ) );
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CAN_MESSAGE_NOT_ACKED, (U32)msgID );
+                //SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CAN_MESSAGE_NOT_ACKED, (U32)msgID ); TODO uncomment this unit 2 raises this alarm no HD
                 pendingAckList[ i ].used = FALSE;  // take pending message off of list
             }
         }
@@ -1125,23 +1125,23 @@
                 break;
 
             case MSG_ID_TEMPERATURE_SENSORS_VALUE_OVERRIDE:
-                handleTestTemperatureSensorsOverrideRequest ( message );
+                handleTestTemperatureSensorsOverrideRequest( message );
                 break;
 
             case MSG_ID_TEMPERATURE_SENSORS_PUBLISH_INTERVAL_OVERRIDE:
-                handleTestTemperatureSensorsDataPublishOverrideRequest ( message );
+                handleTestTemperatureSensorsDataPublishOverrideRequest( message );
                 break;
 
             case MSG_ID_HEATERS_PUBLISH_INTERVAL_ORVERRIDE:
-                handleTestHeatersDataPublishOverrideRequest ( message );
+                handleTestHeatersDataPublishOverrideRequest( message );
                 break;
 
             case MSG_ID_CONDUCTIVITY_OVERRIDE:
-                handleTestSetConductivityOverrideRequest ( message );
+                handleTestSetConductivityOverrideRequest( message );
                 break;
 
             case MSG_ID_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE:
-                handleTestSetConductivityDataPublishIntervalOverrideRequest ( message );
+                handleTestSetConductivityDataPublishIntervalOverrideRequest( message );
                 break;
 
             case MSG_ID_DG_ACCEL_OVERRIDE:
@@ -1164,7 +1164,7 @@
                 handleTestMonitoredVoltageOverrideRequest( message );
                 break;
 
-            case MSG_ID_DRAIN_PUMP_SET_DELTA_PRESSURE_OVERRIDE:
+            case MSG_ID_DRAIN_PUMP_TARGET_OUTLET_PRESSURE:
                 handleSetDrainPumpDeltaPressureOverrideRequest( message );
                 break;
 
@@ -1213,7 +1213,7 @@
                 break;
 
             case MSG_ID_DG_RO_FLOW_RATE_OVERRIDE:
-                handleTestMeasuredROFlowRateOverride( message );
+                handleTestROMeasuredFlowOverrideRequest( message );
                 break;
 
             case MSG_ID_DG_SET_RO_PUMP_TARGET_FLOW: