Index: firmware/App/Services/SystemCommDD.c
===================================================================
diff -u -r8b8fff67b95805272f37855346d600599aaec03d -rcd3af1ebb7396ba3b2bec1d779510d29c30014f4
--- firmware/App/Services/SystemCommDD.c	(.../SystemCommDD.c)	(revision 8b8fff67b95805272f37855346d600599aaec03d)
+++ firmware/App/Services/SystemCommDD.c	(.../SystemCommDD.c)	(revision cd3af1ebb7396ba3b2bec1d779510d29c30014f4)
@@ -233,584 +233,8 @@
  *************************************************************************/
 void processReceivedMessage( MESSAGE_T *message )
 {
-    U16 msgID = message->hdr.msgID;
-
-    // handle any messages from other sub-systems
-    switch ( msgID )
-    {
-        /*case MSG_ID_POWER_OFF_WARNING:
-            handlePowerOffWarning( message );
-            break;
-
-        case MSG_ID_ALARM_CLEARED:
-            handleAlarmClear( message );
-            break;
-
-        case MSG_ID_RTC_EPOCH_DATA:
-            handleRTCSyncFromHD( message );
-            break;
-
-        case MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS:
-            handleSetDialysateTemperatureCmd( message );
-            break;
-
-        case MSG_ID_FW_VERSIONS_REQUEST:
-            handleFWVersionCmd( message );
-            handleDGSerialNumberRequest();
-            break;
-
-        case MSG_ID_DG_SWITCH_RESERVOIR_CMD_REQUEST:
-            handleSwitchReservoirCmd( message );
-            break;
-
-        case MSG_ID_DG_CHANGE_VALVE_SETTING_CMD_REQUEST:
-            handleChangeValveSettingCmd( message );
-            break;
-
-        case MSG_ID_DG_FILL_CMD_REQUEST:
-            handleFillCmd( message );
-            break;
-
-        case MSG_ID_DG_DRAIN_CMD_REQUEST:
-            handleDrainCmd( message );
-            break;
-
-        case MSG_ID_HD_OP_MODE_DATA:
-            handleSetHDOperationMode( message );
-            break;
-
-        case MSG_ID_STARTING_STOPPING_TREATMENT_CMD_REQUEST:
-            handleStartStopTreatmentMsg( message );
-            break;
-
-        case MSG_ID_DG_SAMPLE_WATER_CMD_REQUEST:
-            handleSampleWaterCmd( message );
-            break;
-
-        case MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD_REQUEST:
-            handleHDStartStopTrimmerHeaterCmd( message );
-            break;
-
-        case MSG_ID_DG_PARK_CONCENTRATE_PUMPS_CMD_REQUEST:
-            handleParkConecentratePumpsCmd( message );
-            break;
-
-        case MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD:
-            handleDGStartStopTrimmerHeater( message );
-            break;
-
-        case MSG_ID_DG_START_STOP_FLUSH_CMD_REQUEST:
-            handleStartStopDGFlush( message );
-            break;
-
-        case MSG_ID_DG_START_STOP_HEAT_DISINFECT_CMD_REQUEST:
-            handleStartStopDGHeatDisinfect( message );
-            break;
-
-        case MSG_ID_DG_START_STOP_CHEM_DISINFECT:
-            handleStartStopDGChemicalDisinfect( message );
-            break;
-
-        case MSG_ID_DG_START_STOP_CHEM_DISINFECT_FLUSH:
-            handleStartStopDGChemicalDisinfectFlush( message );
-            break;
-
-        case MSG_ID_UI_DG_SET_RTC_REQUEST:
-            handleUIClockSyncRequest( message );
-            break;
-
-        case MSG_ID_HD_DG_POST_RESULT_REQUEST:
-            handleDGPOSTResultRequest( message );
-            break;
-
-        case MSG_ID_UI_SERVICE_INFO_REQUEST:
-            handleDGServiceScheduleRequestToUI( message );
-            break;
-
-        case MSG_ID_HD_DG_CONCENTRATE_MIXING_RATIOS_REQUEST:
-            handleDGSendConcentrateMixingRatios( message );
-            break;
-
-        case MSG_ID_HD_DG_SERVICE_MODE_REQUEST:
-            handleServiceModeRequest( message );
-            break;
-
-        case MSG_ID_HD_DG_USAGE_INFO_REQUEST:
-            handleHDRequestDGUsageInfo( message );
-            break;
-
-        case MSG_ID_DG_SET_SERVICE_TIME_REQUEST:
-            handleSetDGServiceTime( message );
-            break;
-
-        case MSG_ID_DG_START_STOP_HEAT_DISINFECT_ACTIVE_COOL:
-            handleStartStopDGHeatDisinfectActiveCool( message );
-            break;
-
-        case MSG_ID_HD_DG_ALARMS_REQUEST:
-            handleResendAllAlarmsCommand( message );
-            break;
-
-        case MSG_ID_UI_SET_DG_RO_MODE:
-            handleSetROOnlyMode( message );
-            break;
-
-        case MSG_ID_HD_SEND_CHEM_FLUSH_SAMPLE_PASS_FAIL_TO_DG:
-            handleReceiveChemFlushSampleResultsFromHD( message );
-            break;
-
-        case MSG_ID_DG_START_STOP_RO_PERMEATE_SAMPLE_MODE_CMD_REQUEST:
-            handleStartStopDGROPermeateSample( message );
-            break;
-
-        case MSG_ID_HD_SEND_RO_PERMEATE_SAMPLE_DISPENSE_REQUEST_TO_DG:
-            handleReceiveROPermeatSampleDispenseRequest( message );
-            break;
-
-        case MSG_ID_HD_REQUEST_SERVICE_RECORD_FROM_HD:
-            handleSendDGServiceRecordToHD( 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;
-    }
-
-    // handle any test messages if tester has logged in successfully
-    if ( ( msgID > MSG_ID_FIRST_DG_TESTER_MESSAGE ) && ( TRUE == isTestingActivated() ) )
-    {
-        switch ( msgID )
-        {
-            /*case MSG_ID_DG_ALARM_STATE_OVERRIDE:
-                handleTestAlarmStateOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_WATCHDOG_TASK_CHECKIN_OVERRIDE:
-                handleTestWatchdogCheckInStateOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_SET_RTC_DATE_TIME:
-                handleSetRTCTimestamp( message );
-                break;
-
-            case MSG_ID_START_STOP_PRIMARY_HEATER:
-                handleStartStopPrimaryHeater ( message );
-                break;
-
-            case MSG_ID_LOAD_CELL_OVERRIDE:
-                handleTestLoadCellOverrideRequest( message );
-                break;
-
-            case MSG_ID_LOAD_CELL_SEND_INTERVAL_OVERRIDE:
-                handleTestLoadCellDataBroadcastIntervalOverrideRequest( message );
-                break;
-
-            case MSG_ID_PRESSURE_OVERRIDE:
-                handleTestPressureSensorOverrideRequest( message );
-                break;
-
-            case MSG_ID_PRESSURE_SEND_INTERVAL_OVERRIDE:
-                handleTestPressureDataBroadcastIntervalOverrideRequest( message );
-                break;
-
-            case MSG_ID_MEASURED_FLOW_SENSORS_OVERRIDE:
-                handleTestMeasuredFlowOverrideRequest( message );
-                break;
-
-            case MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE:
-                handleTestROPumpDataBroadcastIntervalOverrideRequest( message );
-                break;
-
-            case MSG_ID_FLOW_DATA_PUBLISH_INTERVAL_OVERRIDE:
-                handleTestFlowSensorsDataBroadcastIntervalOverrideRequest( message );
-                break;
-
-            case MSG_ID_DRAIN_PUMP_SET_RPM:
-                handleTestSetDrainPumpRPM( message );
-                break;
-
-            case MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE:
-                handleTestDrainPumpDataBroadcastIntervalOverrideRequest( message );
-                break;
-
-            case MSG_ID_VALVE_STATE_OVERRIDE:
-                handleTestValveStateOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_VALVES_STATES_PUBLISH_INTERVAL_OVERRIDE:
-                handleTestValvesStatesPublishIntervalOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_SAFETY_SHUTDOWN_OVERRIDE:
-                handleTestDGSafetyShutdownOverrideRequest( message );
-                break;
-
-            case MSG_ID_TEMPERATURE_SENSORS_VALUE_OVERRIDE:
-                handleTestTemperatureSensorsOverrideRequest( message );
-                break;
-
-            case MSG_ID_TEMPERATURE_SENSORS_PUBLISH_INTERVAL_OVERRIDE:
-                handleTestTemperatureSensorsDataPublishOverrideRequest( message );
-                break;
-
-            case MSG_ID_HEATERS_PUBLISH_INTERVAL_ORVERRIDE:
-                handleTestHeatersDataPublishOverrideRequest( message );
-                break;
-
-            case MSG_ID_CONDUCTIVITY_OVERRIDE:
-                handleTestSetConductivityOverrideRequest( message );
-                break;
-
-            case MSG_ID_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE:
-                handleTestSetConductivityDataPublishIntervalOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_ACCEL_OVERRIDE:
-                handleTestDGAccelOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_ACCEL_MAX_OVERRIDE:
-                handleTestDGAccelMaxOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_ACCEL_SEND_INTERVAL_OVERRIDE:
-                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_TARGET_OUTLET_FLOW:
-                handleSetDrainPumpTargetOutletFlowLPM( 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;
-
-            case MSG_ID_DG_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE:
-                handleConcentratePumpMeasuredSpeedOverride( message );
-                break;
-
-            case MSG_ID_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE:
-                handleSetConcentratePumpTargetSpeed( message );
-                break;
-
-            case MSG_ID_CONCENTRATE_PUMP_STATE_CHANGE_REQUEST:
-                handleConcentratePumpStateChangeRequest( message );
-                break;
-
-            case MSG_ID_CONCENTRATE_PUMP_PUBLISH_INTERVAL_OVERRIDE:
-                handleConcentratePumpPublishIntervalOverride( message );
-                break;
-
-            case MSG_ID_DG_THERMISTORS_DATA_PUBLISH_INTERVAL_OVERRIDE:
-                handleTestThermistorsDataPublishIntervalOverride( message );
-                break;
-
-            case MSG_ID_DG_THERMISTORS_VALUE_OVERRIDE:
-                handleTestThermistorsValueOverride( message );
-                break;
-
-            case MSG_ID_DG_FANS_DATA_PUBLISH_INTERVAL_OVERRIDE:
-                handleTestFansDataPublishIntervalOverride( message );
-                break;
-
-            case MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE:
-                handleTestROPumpDutyCycleOverride( message );
-                break;
-
-            case MSG_ID_DG_VALVES_SENSED_STATE_OVERRIDE:
-                handleTestDGValvesSensedStateOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_SET_RO_PUMP_TARGET_FLOW:
-                handleTestROPumpTargetFlowOverride( message );
-                break;
-
-            case MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE:
-                handleROPumpTargetPressureOverride( message );
-                break;
-
-            case MSG_ID_DG_START_STOP_UV_REACTORS:
-                handleStartStopUVReactors( message );
-                break;
-
-            case MSG_ID_UV_REACTORS_DATA_PUBLISH_INTERVAL_OVERRIDE:
-                handleTestUVReactorsDataPublishIntervalOverride( message );
-                break;
-
-            case MSG_ID_DG_UV_REACTORS_HEALTH_OVERRIDE:
-                handleTestUVReactorsHealthOverride( message );
-                break;
-
-            case MSG_ID_DG_SET_CALIBRATION_RECORD:
-                handleSetDGCalibrationRecord( message );
-                break;
-
-            case MSG_ID_DG_GET_CALIBRATION_RECORD:
-                handleGetDGCalibrationRecord( message );
-                break;
-
-            case MSG_ID_DG_SET_SYSTEM_RECORD:
-                handleSetDGSystemRecord( message );
-                break;
-
-            case MSG_ID_DG_GET_SYSTEM_RECORD:
-                handleGetDGSystemRecord( message );
-                break;
-
-            case MSG_ID_DG_GET_SERVICE_RECORD:
-                handleGetDGServiceRecord( message );
-                break;
-
-            case MSG_ID_DG_SET_SERVICE_RECORD:
-                handleSetDGServiceRecord( message );
-                break;
-
-            case MSG_ID_DG_FLUID_LEAK_SEND_INTERVAL_OVERRIDE:
-                handleSetFluidLeakBroadcastIntervalOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_FLUID_LEAK_STATE_DETECTOR_OVERRIDE:
-                handleSetFluidLeakStateDetectorOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_OP_MODE_PUBLISH_INTERVAL_OVERRIDE:
-                handleSetDGOpModeBroadcastIntervalOverrideRequest( message );
-                break;
-
-            case MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE:
-                handleFilterFlushTimePeriodOverride( message );
-                break;
-
-            case MSG_ID_DG_FANS_RPM_OVERRIDE:
-                handleFansRPMOverride( message );
-                break;
-
-            case MSG_ID_DG_STOP_RTC_CLOCK:
-                handleStopDGRTCClock( message );
-                break;
-
-            case MSG_ID_DG_DRAIN_PUMP_MEASURED_RPM_OVERRIDE:
-                handleSetDrainPumpMeasuredRPMOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION:
-                handleTestBlockMessagesRequest( message );
-                break;
-
-            case MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD:
-                handleTestSuperClearAlarmsRequest( message );
-                break;
-
-            case MSG_ID_DG_ALARM_INFO_SEND_INTERVAL_OVERRIDE:
-                handleTestAlarmInfoSendIntervalOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_SET_FANS_RPM_ALARM_START_TIME_OFFSET:
-                handleTestFansRPMAlarmStartTimeOffsetRequest( message );
-                break;
-
-            case MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE:
-                handleTestUsedAcidVolumeMLOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_USED_BICARB_VOLUME_ML_OVERRIDE:
-                handleTestUsedBicarbVolumeMLOverrideRequest( message );
-                break;
-
-#ifndef _RELEASE_
-            case MSG_ID_DG_GET_SW_CONFIG_RECORD:
-                handleGetDGSoftwareConfigRecord( message );
-                break;
-
-            case MSG_ID_DG_SET_SW_CONFIG_RECORD:
-                handleSetDGSoftwareConfigRecord( message );
-                break;
-#endif
-
-            case MSG_ID_DG_FANS_DUTY_CYCLE_OVERRIDE:
-                handleSetFansDutyCycleOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_HD_COMMUNICATION_STATUS_OVERRIDE:
-                handleTestHDCommunicationStatusOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_SET_PRIMARY_AND_TRIMMER_HEATERS_TARGET_TEMP:
-                handleSetPrimaryAndTrimmerHeatersTargetTemperature( message );
-                break;
-
-            case MSG_ID_DG_GET_USAGE_INFO_RECORD:
-                handleGetDGUsageInfoRecord( message );
-                break;
-
-            case MSG_ID_DG_SET_USAGE_INFO_RECORD:
-                handleSetDGUsageInfoRecord( message );
-                break;
-
-            case MSG_ID_DG_SET_OP_MODE_REQUEST:
-                handleTestSetOpModeRequest( message );
-                break;
-
-            case MSG_ID_DG_RESERVOIR_TARE_REQUEST:
-                handleTestTareReservoirRequest( message );
-                break;
-
-            case MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE:
-                handleTestDrainPumpMeasuredCurrentOverride( message );
-                break;
-
-            case MSG_ID_DG_GEN_IDLE_PUBLISH_INTERVAL_OVERRIDE:
-                handleTestGenIdlePublishIntervalOverride( message );
-                break;
-
-            case MSG_ID_DG_DRAIN_PUMP_DIRECTION_OVERRIDE:
-                handleTestDGDrainPumpDirectionOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_CONC_PUMP_PARK_STATUS_OVERRIDE:
-                handleTestDGConcPumpParkStatusOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_CONC_PUMP_PARK_FAULT_STATUS_OVERRIDE:
-                handleTestDGConcPumpParkFaultStatusOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_CONC_PUMP_PARK_COMMAND:
-                handleTestDGConcPumpParkCommandRequest( message );
-                break;
-
-            case MSG_ID_DG_NV_RECORD_CRC_OVERRIDE:
-                handleTestDGNVRecordCRCOverride( message );
-                break;
-
-            case MSG_ID_DG_RO_FEEDBACK_VOLTAGE_OVERRIDE:
-                handleTestDGROPumpFeedbackVoltageOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_DIALYSATE_FILL_INTEGRATED_VOLUME_OVERRIDE:
-                handleTestDGFillIntegratedVolumeOverrideRequest( message );
-                break;
-
-            case MSG_ID_FILL_MODE_DATA_PUBLISH_INTERVAL_OVERRIDE:
-                handleTestDGFillModeBroadcastOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_HEATERS_DUTY_CYCLE_OVERRIDE:
-                handleTestDGHeatersDutyCycleOverrideRequest( message );
-                break;
-
-            case MSD_ID_DG_RTC_CTL_REG1_STATUS_OVERRIDE:
-                handleDGRTCControlReg1StatusOverrideRequest( message );
-                break;
-
-            case MSD_ID_DG_RTC_CTL_REG3_STATUS_OVERRIDE:
-                handleDGRTCControlReg3StatusOverrideRequest( message );
-                break;
-
-#ifndef _RELEASE_
-            case MSG_ID_DG_NELSON_DISINFECT_SUPPORT:
-                handleTestDGNelsonDisinfectSupport( message );
-                break;
-#endif
-
-            case MSG_ID_DG_SET_DIALYSATE_MIXING_RATIOS:
-                handleTestDGSetDialysateMixingRatios( message );
-                break;
-
-            case MSG_ID_DG_SET_TEST_CONFIGURATION:
-                handleTestDGSetTestConfig( message );
-                break;
-
-            case MSG_ID_DG_GET_TEST_CONFIGURATION:
-                handleTestDGGetTestConfig( message );
-                break;
-
-            case MSG_ID_DG_RESET_ALL_TEST_CONFIGURATIONS:
-                handleTestDGResetAllTestConfigs( message );
-                break;
-
-            case MSG_ID_DG_DIALIN_CHECK_IN:
-                handleTestDGDialinCheckIn( message );
-                break;
-
-            case MSG_ID_DG_GET_LOAD_CELLS_TARE_VALUES:
-                handleTestDGGetLoadCellsTareValues( message );
-                break;
-
-            case MSG_ID_DG_SET_LOAD_CELLS_TARE_VALUES:
-                handleTestDGSetLoadCellsTareValues( message );
-                break;
-
-            case MSG_ID_DG_SET_COND_SENSOR_CAL_TABLE:
-                handleTestDGSetConductivitySensorCalTable( message );
-                break;
-
-            case MSG_ID_DG_SIGNAL_RECOVER_FROM_FAULT_MODE:
-                handleTestDGSetRecoverFromFaultModeSignal( message );
-                break;
-
-            case MSG_ID_DG_DRAIN_MODE_BROADCAST_INTERVAL_OVERRIDE:
-                handleTestDGDrainModeBroadcastOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_DIALIN_RO_ONLY_MODE_STATUS_REQUEST:
-                handleDGROStatusRequest( message );
-                break;
-
-            case MSG_ID_DG_RAM_STATUS_OVERRIDE:
-                handleTestDGRAMStatusOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_RESERVOIR_BROADCAST_INTERVAL_OVERRIDE:
-                handleTestDGReservoirOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_CAN_RECEIVE_ACK_MESSAGE_OVERRIDE:
-                handleTestDGPendingACKOverrideRequest( message );
-                break;
-
-            case MSG_ID_DG_STATE_TIMER_82C_OVERRIDE:
-                handleTestDG82CStateTimerOverride( message );
-                break;
-
-            case MSG_ID_DG_STATE_TIMER_77C_OVERRIDE:
-                handleTestDG77CStateTimerOverride( message );
-                break;
-
-            case MSG_ID_DG_CHEM_DISINFECT_ACID_OVERRIDE:
-                handleTestChemDisinfectAcidOverride( message );
-                break;
-
-            case MSG_ID_DG_RUN_MODE_FILL_FOR_CAL_CHECK:
-                handleTestRunModeFillForCalibrationCheck( message );
-                break;*/
-
-            default:
-                // TODO - unrecognized message ID received - ignore
-                break;
-        }
-    }
+    // Handle any messages from other sub-systems
+    //handleIncomingMessage( message );
 }