Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r3eb7c2e62c727be195cd937d49957db9d4ba83b4 -r2fff37fa585181917705645494549b5fd4a4d522
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 3eb7c2e62c727be195cd937d49957db9d4ba83b4)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 2fff37fa585181917705645494549b5fd4a4d522)
@@ -567,13 +567,12 @@
             else
             {
                 signalCANXmitsCompleted();
-                // TODO - shouldn't get here, but let's see if we do
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, (U32)mBox )
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_CAN_TX_FAULT, (U32)mBox )
             }
         }
         else
-        {   // TODO - shouldn't get here - just testing - set first data to new s/w fault enum later
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, (U32)buffer, (U32)dataSize )
+        {
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CAN_MESSAGE_SIZE, (U32)dataSize )
         }
     }
 
@@ -839,9 +838,7 @@
     if ( TRUE == didTimeout( timeOfLastHDCheckIn, HD_COMM_TIMEOUT_IN_MS ) )
     {
         hdIsCommunicating = FALSE;
-#ifndef DEBUG_ENABLED
-        activateAlarmNoData( ALARM_ID_HD_COMM_TIMEOUT );  // TODO - add this alarm if we're in middle of a treatment? or if in a mode that comm loss would impact badly?
-#endif
+        activateAlarmNoData( ALARM_ID_HD_COMM_TIMEOUT );
     }
 }
 
@@ -1040,10 +1037,6 @@
             handleStartStopTrimmerHeaterCmd( message );
             break;
 
-        case MSG_ID_DG_TESTER_LOGIN_REQUEST:
-            handleTesterLogInRequest( message );
-            break;
-
         case MSG_ID_DG_START_STOP_FLUSH:
             handleStartStopDGFlush( message );
             break;
@@ -1052,6 +1045,19 @@
             handleStartStopDGHeatDisinfect( message );
             break;
 
+        case MSG_ID_DG_START_STOP_CHEM_DISINFECT:
+            handleStartStopDGChemicalDisinfect( message );
+            break;
+
+        case MSG_ID_UI_DG_SET_RTC_REQUEST:
+            handleUIClockSyncRequest( message );
+            break;
+
+        // NOTE: This case must be last
+        case MSG_ID_DG_TESTER_LOGIN_REQUEST:
+            handleTesterLogInRequest( message );
+            break;
+
         default:
             // unrecognized message ID received - ok, ignore - may be a test message handled below
             break;
@@ -1154,6 +1160,14 @@
                 handleTestDGAccelBroadcastIntervalOverrideRequest( message );
                 break;
 
+            case MSG_ID_DG_MONITORED_VOLTAGES_SEND_INTERVAL_OVERRIDE:
+                handleTestMonitoredVoltagesSendIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_DG_MONITORED_VOLTAGES_OVERRIDE:
+                handleTestMonitoredVoltageOverrideRequest( message );
+                break;
+
             case MSG_ID_DRAIN_PUMP_SET_DELTA_PRESSURE_OVERRIDE:
                 handleSetDrainPumpDeltaPressureOverrideRequest( message );
                 break;
@@ -1188,6 +1202,7 @@
 
             case MSG_ID_DG_FANS_DATA_PUBLISH_INTERVAL_OVERRIDE:
                 handleTestFansDataPublishIntervalOverride( message );
+                break;
 
             case MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE:
                 handleTestROPumpDutyCycleOverride( message );
@@ -1257,6 +1272,10 @@
                 handleSetFluidLeakStateDetectorOverrideRequest( message );
                 break;
 
+            case MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE:
+                handleFilterFlushTimePeriodOverride(message);
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;