Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r6cd114c4deffb81e85c6cd3ebaf550fe4661efda -r3f2b9de757500da37e0ed8881e4e906d94f3076c
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 6cd114c4deffb81e85c6cd3ebaf550fe4661efda)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 3f2b9de757500da37e0ed8881e4e906d94f3076c)
@@ -409,8 +409,8 @@
     }
     else
     {
-        // Should not get here - not an active message box
-        // TODO - s/w fault?
+        // Should not get here - not an active message box
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX, srcCANBox )
     }
 }
 
@@ -943,8 +943,10 @@
 
         if ( TRUE == didTimeout( timeOfLastDGCheckIn, DG_COMM_TIMEOUT_IN_MS ) )
         {
+#ifndef RUN_WITHOUT_DG
             activateAlarmNoData( ALARM_ID_DG_COMM_TIMEOUT );
             dgIsCommunicating = FALSE;
+#endif
         }
     }
 }
@@ -1017,8 +1019,6 @@
         }
     }
 
-    // TODO - if no open slot found, s/w fault
-
     return result;
 }
 
@@ -1080,8 +1080,8 @@
             {
                 U16 msgID;
 
-                memcpy( &msgID, (U08*)&pendingAckList[ i ].msg[ sizeof( U08 ) + sizeof( U16) ], sizeof( U16 ) );
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CAN_MESSAGE_NOT_ACKED, (U32)msgID );
+                memcpy( &msgID, (U08*)&pendingAckList[ i ].msg[ sizeof( U08 ) + sizeof( U16) ], sizeof( U16 ) );
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CAN_MESSAGE_NOT_ACKED, (U32)msgID );
                 pendingAckList[ i ].used = FALSE;  // Take pending message off of list
             }
         }
@@ -1156,7 +1156,8 @@
             break;
 
         case MSG_ID_REQUEST_FW_VERSIONS:
-            handleFWVersionRequest( message );
+            handleFWVersionRequest( message );
+            handleHDSerialNumberRequest();
             break;
 
         case MSG_ID_DG_TEMPERATURE_DATA:
@@ -1207,6 +1208,10 @@
             handleHeparinCommandRequest( message );
             break;
 
+        case MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD:
+            handleAlarmAudioVolumeSetCmd( message );
+            break;
+
         case MSG_ID_UI_SET_UF_VOLUME_PARAMETER:
             handleUFVolumeSetRequest( message );
             break;
@@ -1267,40 +1272,61 @@
             handleUITreatmentLogDataRequest( message );
             break;
 
+        case MSG_ID_UI_DISINFECT_REQUEST:
+            handleUIDisinfectRequest( message );
+            break;
+
         case MSG_ID_DG_COMMAND_RESPONSE:
             handleDGCmdResp( message );
             break;
 
-        case MSG_ID_TESTER_LOGIN_REQUEST:
-            handleTesterLogInRequest( message );
+        case MSG_ID_DG_FLUSH_DATA:
+            handleFlushUIStateReadingFromDG( message );
             break;
 
-        case MSG_ID_HD_SET_CALIBRATION_RECORD:
-            handleSetHDCalibrationRecord( message );
+        case MSG_ID_DG_HEAT_DISINFECT_DATA:
+            handleHeatDisinfectUIStateReadingFromDG( message );
             break;
 
-        case MSG_ID_HD_GET_CALIBRATION_RECORD:
-            handleGetHDCalibrationRecord( message );
+        case MSG_ID_DG_CHEM_DISINFECT_DATA:
+            handleChemDisinfectUIStateReadingFromDG( message );
             break;
 
-        case MSG_ID_HD_SET_SYSTEM_RECORD:
-            handleSetHDSystemRecord( message );
+        case MSG_ID_UI_HD_SET_RTC_REQUEST:
+            handleUIClockSyncRequest( message );
             break;
 
-        case MSG_ID_HD_GET_SYSTEM_RECORD:
-            handleGetHDSystemRecord( message );
+        case MSG_ID_DG_POST_FINAL_TEST_RESULT:
+            handleDGPOSTFinalResult( message );
             break;
 
-        case MSG_ID_HD_GET_SERVICE_RECORD:
-            handleGetHDServiceRecord( message );
+        case MSG_ID_UI_POST_FINAL_TEST_RESULT:
+            handleUIPOSTFinalResult( message );
             break;
 
-        case MSG_ID_HD_SET_SERVICE_RECORD:
-            handleSetHDServiceRecord( message );
+        case MSG_ID_UI_ACTIVE_ALARMS_LIST_REQUEST:
+            handleUIActiveAlarmsListRequest( message );
             break;
 
+        case MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_REQUEST:
+            handleSetHDStandbyDisinfectSubmodeRequest( message );
+            break;
+
+        case MSG_ID_UI_REQUEST_SERVICE_INFO:
+            handleHDServiceScheduleRequest( message );
+            break;
+
+        case MSG_ID_REQUEST_HD_USAGE_INFO:
+            handleHDUsageInfoRequest( message );
+            break;
+
+        // NOTE: this always must be the last case
+        case MSG_ID_TESTER_LOGIN_REQUEST:
+            handleTesterLogInRequest( message );
+            break;
+
         default:
-            // Unrecognized message ID received - ignore
+            // Un-recognized or un-handled message ID received - ignore
             break;
     }
 
@@ -1551,6 +1577,30 @@
                 handleBloodLeakZeroRequest( message );
                 break;
 
+            case MSG_ID_HD_BUBBLES_DATA_SEND_INTERVAL_OVERRIDE:
+                handleSetBubblesDataBroadcastIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_BUBBLE_STATUS_OVERRIDE:
+                handleSetBubbleStatusOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_BUBBLE_SELF_TEST_REQUEST:
+                handleBubbleSelfTestRequest( message );
+                break;
+
+            case MSG_ID_HD_SWITCHES_STATUS_OVERRIDE:
+                handleSetSwitchesStatusOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_SWITCHES_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestSwitchesPublishIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_BATTERY_REMAINING_PERCENT_OVERRIDE:
+                handleBatteryRemainingPercentOverrideRequest( message );
+                break;
+
             case MSG_ID_HD_SET_OP_MODE_REQUEST:
                 handleTestSetOpModeRequest( message );
                 break;
@@ -1591,6 +1641,78 @@
                 handleTestSyringePumpMeasuredVolumeOverrideRequest( message );
                 break;
 
+            case MSG_ID_HD_VALVES_CURRENT_OVERRIDE:
+                handleTestValvesCurrentOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_MONITORED_VOLTAGES_SEND_INTERVAL_OVERRIDE:
+                handleTestMonitoredVoltagesSendIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_MONITORED_VOLTAGES_OVERRIDE:
+                handleTestMonitoredVoltageOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_ALARM_INFO_SEND_INTERVAL_OVERRIDE:
+                handleTestAlarmInfoSendIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_ALARM_AUDIO_VOLUME_LEVEL_OVERRIDE:
+                handleTestAlarmAudioVolumeOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_ALARM_AUDIO_CURRENT_HG_OVERRIDE:
+                handleTestAlarmAudioCurrentHgOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_ALARM_AUDIO_CURRENT_LG_OVERRIDE:
+                handleTestAlarmAudioCurrentLgOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_ALARM_BACKUP_AUDIO_CURRENT_OVERRIDE:
+                handleTestAlarmBackupAudioCurrentOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_SYRINGE_PUMP_STATUS_OVERRIDE:
+                handleTestSyringePumpStatusOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_SYRINGE_PUMP_ENCODER_STATUS_OVERRIDE:
+                handleTestSyringePumpEncoderStatusOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_SYRINGE_PUMP_ADC_DAC_STATUS_OVERRIDE:
+                handleTestSyringePumpADCandDACStatusOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE:
+                handleTestSyringePumpADCReadCtrOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_SET_CALIBRATION_RECORD:
+                handleSetHDCalibrationRecord( message );
+                break;
+
+            case MSG_ID_HD_GET_CALIBRATION_RECORD:
+                handleGetHDCalibrationRecord( message );
+                break;
+
+            case MSG_ID_HD_SET_SYSTEM_RECORD:
+                handleSetHDSystemRecord( message );
+                break;
+
+            case MSG_ID_HD_GET_SYSTEM_RECORD:
+                handleGetHDSystemRecord( message );
+                break;
+
+            case MSG_ID_HD_GET_SERVICE_RECORD:
+                handleGetHDServiceRecord( message );
+                break;
+
+            case MSG_ID_HD_SET_SERVICE_RECORD:
+                handleSetHDServiceRecord( message );
+                break;
+
             default:
                 // Unrecognized message ID received - ignore
                 break;