Index: AlarmDefs.h =================================================================== diff -u -r5912d2cd18e412e3e8a48013954c9bea2e0b5362 -r2025da4435440ca8787c189516e4a0b062661980 --- AlarmDefs.h (.../AlarmDefs.h) (revision 5912d2cd18e412e3e8a48013954c9bea2e0b5362) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 2025da4435440ca8787c189516e4a0b062661980) @@ -141,7 +141,7 @@ ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID = 103, ///< HD invalid calibration CRC ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS = 104, ///< Air trap level sensors reporting illegal combination of air/fluid ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID = 105, ///< DG invalid calibration CRC - ALARM_ID_DG_DIALYSATE_FLOW_SENSOR_INVALID_CAL_RECORD = 106, ///< DG dialysate flow sensor invalid calibration record + ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD = 106, ///< DG dialysate flow sensor invalid calibration record ALARM_ID_DG_RESTARTED_FAULT = 107, ///< HD reports DG restarted fault ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR = 108, ///< HD syringe pump ADC error ALARM_ID_HD_SYRINGE_PUMP_VOLUME_ERROR = 109, ///< HD syringe pump volume check error @@ -569,7 +569,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_DIALYSATE_FLOW_SENSOR_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_RESTARTED_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_VOLUME_ERROR, 0, ALARM_ID_NO_ALARM }, @@ -819,7 +819,7 @@ { 1, ALARM_ID_DG_INVALID_SERVICE_RECORD_CRC }, { 1, ALARM_ID_DG_RTC_OR_TIMER_ACCURACY_FAILURE }, { 1, ALARM_ID_HD_RTC_OR_TIMER_ACCURACY_FAILURE }, - { 1, ALARM_ID_DG_DIALYSATE_FLOW_SENSOR_INVALID_CAL_RECORD }, + { 1, ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD }, { 1, ALARM_ID_DG_RO_FLOW_SENSOR_INVALID_CAL_RECORD }, { 1, ALARM_ID_HD_INVALID_USAGE_RECORD_CRC }, { 3, ALARM_ID_HD_INVALID_SYSTEM_RECORD_CRC }, Index: DGDefs.h =================================================================== diff -u -r0912fa3d431339074134e4c698cd3930333049dd -r2025da4435440ca8787c189516e4a0b062661980 --- DGDefs.h (.../DGDefs.h) (revision 0912fa3d431339074134e4c698cd3930333049dd) +++ DGDefs.h (.../DGDefs.h) (revision 2025da4435440ca8787c189516e4a0b062661980) @@ -63,15 +63,14 @@ DG_POST_STATE_TEMPERATURE_SENSORS, ///< Temperature Sensors POST state DG_POST_STATE_ACCELEROMETER, ///< Accelerometer POST state DG_POST_STATE_PRESSURES, ///< Pressure sensors POST state - DG_POST_STATE_RO_PUMP, ///< RO pump POST state DG_POST_STATE_DRAIN_PUMP, ///< Drain pump POST state DG_POST_STATE_CONCENTRATE_PUMPS, ///< Concentrate pumps POST state DG_POST_STATE_CONDUCTIVITY_SENSORS, ///< Conductivity sensors POST state DG_POST_STATE_RESERVOIRS, ///< Reservoirs POST state DG_POST_STATE_UV_REACTORS, ///< UV reactors POST state DG_POST_STATE_THERMISTORS, ///< Thermistors POST state DG_POST_STATE_FANS, ///< Fans POST state - DG_POST_STATE_DIALYSATE_FLOW_SENSOR, ///< Dialysate flow sensor POST state + DG_POST_STATE_FLOW_SENSORS, ///< Flow sensors POST state DG_POST_STATE_WATCHDOG, ///< Watchdog POST test state DG_POST_STATE_SAFETY_SHUTDOWN, ///< Safety shutdown POST test state DG_POST_STATE_LOAD_CELL, ///< Load cells POST state Index: MsgDefs.h =================================================================== diff -u -r5912d2cd18e412e3e8a48013954c9bea2e0b5362 -r2025da4435440ca8787c189516e4a0b062661980 --- MsgDefs.h (.../MsgDefs.h) (revision 5912d2cd18e412e3e8a48013954c9bea2e0b5362) +++ MsgDefs.h (.../MsgDefs.h) (revision 2025da4435440ca8787c189516e4a0b062661980) @@ -364,7 +364,7 @@ MSG_ID_PRESSURE_OVERRIDE = 0xA006, ///< Pressure sensor override request MSG_ID_PRESSURE_SEND_INTERVAL_OVERRIDE = 0xA007, ///< Pressure data broadcast interval override request MSG_ID_DG_HD_COMMUNICATION_STATUS_OVERRIDE = 0xA008, ///< DG HD Communication Status override - MSG_ID_RO_MEASURED_FLOW_OVERRIDE = 0xA009, ///< RO measured flow rate override request + MSG_ID____AVAILABLE_6 = 0xA009, ///< Unused - this message ID is available for use MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE = 0xA00A, ///< RO pump data broadcast interval override request MSG_ID_DRAIN_PUMP_SET_RPM = 0xA00B, ///< Drain pump set RPM override request MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE = 0xA00C, ///< Drain pump data broadcast interval override request @@ -402,7 +402,7 @@ MSG_ID_DG_THERMISTORS_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA02D, ///< DG thermistors data publish interval override MSG_ID_DG_THERMISTORS_VALUE_OVERRIDE = 0xA02E, ///< DG thermistors value override MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE = 0xA02F, ///< DG RO pump duty cycle override - MSG_ID_DG_RO_FLOW_RATE_OVERRIDE = 0xA030, ///< DG RO flow rate override + MSG_ID____AVAILABLE_5 = 0xA030, ///< Message available for use MSG_ID_DG_SET_RO_PUMP_TARGET_FLOW = 0xA031, ///< DG set RO pump target flow rate MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE = 0xA032, ///< DG RO pump target pressure override MSG_ID_DG_SET_CALIBRATION_RECORD = 0xA033, ///< DG set calibration record that is received from Dialin