Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r6818dafc0839d6e8585f5e6f35013f539ad5a0ed -r7838caf7aff7f6a3d890d21c13a4a695782c97bd
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 6818dafc0839d6e8585f5e6f35013f539ad5a0ed)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 7838caf7aff7f6a3d890d21c13a4a695782c97bd)
@@ -554,13 +554,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 )
         }
     }
 
@@ -826,9 +825,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 );
     }
 }
 
@@ -989,6 +986,7 @@
 
         case MSG_ID_REQUEST_FW_VERSIONS:
             handleFWVersionCmd( message );
+            handleDGSerialNumberRequest();
             break;
 
         case MSG_ID_DG_SWITCH_RESERVOIR_CMD:
@@ -1039,6 +1037,10 @@
             handleDGPOSTResultRequest( message );
             break;
 
+        case MSG_ID_UI_REQUEST_SERVICE_INFO:
+            handleDGServiceScheduleRequest( message );
+            break;
+
         // NOTE: This case must be last
         case MSG_ID_DG_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
@@ -1158,6 +1160,14 @@
                 handleSetDrainPumpDeltaPressureOverrideRequest( message );
                 break;
 
+            case MSG_ID_DG_SWITCHES_STATUS_OVERRIDE:
+                handleSetSwitchesStatusOverrideRequest( message );
+                break;
+
+            case MSG_ID_DG_SWITCHES_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestSwitchesPublishIntervalOverrideRequest( message );
+                break;
+
             case MSG_ID_DG_SOFTWARE_RESET_REQUEST:
                 handleDGSoftwareResetRequest( message );
                 break;
@@ -1258,6 +1268,10 @@
                 handleSetFluidLeakStateDetectorOverrideRequest( message );
                 break;
 
+            case MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE:
+                handleFilterFlushTimePeriodOverride(message);
+                break;
+
             case MSG_ID_DG_OP_MODE_PUBLISH_INTERVAL_OVERRIDE:
                 handleSetDGOpModeBroadcastIntervalOverrideRequest( message );
                 break;