Index: AlarmDefs.h =================================================================== diff -u -r4277e59a92a779d4b9794a7347b3adc9e13de187 -rd7edd2bf8e2f51d5afdf2499cc44d25cd35b81e5 --- AlarmDefs.h (.../AlarmDefs.h) (revision 4277e59a92a779d4b9794a7347b3adc9e13de187) +++ AlarmDefs.h (.../AlarmDefs.h) (revision d7edd2bf8e2f51d5afdf2499cc44d25cd35b81e5) @@ -279,13 +279,13 @@ ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT = 241, ///< DG reservoir drain time out ALARM_ID_DG_RESERVOIR_FILL_TIMEOUT = 242, ///< DG reservoir fill time out ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT = 243, ///< DG reservoir leak time out - ALARM_ID_DG_TEMP_SENSORS_DIFF_OUT_OF_RANGE = 244, ///< DG temperature sensors difference out of range + ALARM_ID_DG_CLEANING_MODE_TEMP_SENSORS_DIFF_OUT_OF_RANGE = 244, ///< DG cleaning mode temperature sensors difference out of range ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT = 245, ///< DG heat disinfect target temperature time out (could not reach to temperature) - ALARM_ID_AVAILABLE_3 = 246, ///< Alarm ID available for use + ALARM_ID_DG_CLEANING_MODE_COND_SENSORS_OUT_OF_RANGE = 246, ///< DG cleaning mode conductivity sensors out of range ALARM_ID_DG_HEAT_DISINFECT_ACTIVE_COOL_TIME_OUT = 247, ///< DG heat disinfect active cool time tour - ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT = 248, ///< DG chemical disinfect could not reach to target temperature - ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT = 249, ///< DG chemical disinfect inlet pressure and temperature sensors out of range - ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT = 250, ///< DG chemical disinfect inlet conductivity and temperature out of range + ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_OUT_OF_RANGE = 248, ///< DG chemical disinfect could not reach to target temperature out of range + ALARM_ID_DG_CHEM_DISINFECT_TARGET_COND_OUT_OF_RANGE = 249, ///< DG chemical disinfect target conductivity out of range + ALARM_ID_AVAILABLE_5 = 250, ///< Alarm ID available for use ALARM_ID_HD_INVALID_SYSTEM_RECORD_CRC = 251, ///< HD invalid system record ALARM_ID_HD_INVALID_SERVICE_RECORD_CRC = 252, ///< HD invalid service record ALARM_ID_DG_INVALID_SYSTEM_RECORD_CRC = 253, ///< DG invalid system record @@ -521,11 +521,11 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_COMM_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS, 0, ALARM_ID_NO_ALARM },//add DG version // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoBRcr NoDRcr ClrOnly TxLog ID Escalate In Escalate To - { ALARM_PRIORITY_HIGH, 3, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED, 0, ALARM_ID_NO_ALARM },//add DG version + { ALARM_PRIORITY_HIGH, 3, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED, 0, ALARM_ID_NO_ALARM },//add DG version { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UF_RATE_TOO_HIGH_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UF_VOLUME_ACCURACY_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_FPGA_COMM_TIMEOUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_VALVE_CONTROL_FAILURE, 0, ALARM_ID_NO_ALARM },//add DG version + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_VALVE_CONTROL_FAILURE, 0, ALARM_ID_NO_ALARM },//add DG version { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DIAL_IN_PUMP_MOTOR_SPEED_CHECK, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK, 0, ALARM_ID_NO_ALARM }, @@ -553,7 +553,7 @@ // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoBRcr NoDRcr ClrOnly TxLog ID Escalate In Escalate To { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_VOLTAGE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_VOLTAGE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_VOLTAGE_OUT_OF_RANGE, 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_ENCODER_DIRECTION_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_CONTROLLER_DIRECTION_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_FAULT, 0, ALARM_ID_NO_ALARM }, @@ -622,11 +622,11 @@ { ALARM_PRIORITY_HIGH, 20, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 21, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , ALARM_ID_OCCLUSION_BLOOD_PUMP, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_HIGH, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_HIGH, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , ALARM_ID_DG_RTC_OR_TIMER_ACCURACY_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_HIGH, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_HIGH, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_WATCHDOG_EXPIRED, 0, ALARM_ID_NO_ALARM }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoBRcr NoDRcr ClrOnly TxLog ID Escalate In Escalate To { ALARM_PRIORITY_MEDIUM, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, 0, ALARM_ID_NO_ALARM }, @@ -636,7 +636,7 @@ { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_LOW, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_NEW_RESERVOIRS_DATA_MESSAGE_NOT_RECEIVE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_NEW_DG_OPERATION_MODE_MESSAGE_NOT_RECEIVE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_PRIME_ACID_LINE_TIME_OUT, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_PRIME_ACID_LINE_TIME_OUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_1, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH, 0, ALARM_ID_NO_ALARM }, @@ -726,13 +726,13 @@ { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_RESERVOIR_FILL_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_TEMP_SENSORS_DIFF_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CLEANING_MODE_TEMP_SENSORS_DIFF_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_3, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CLEANING_MODE_COND_SENSORS_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_HEAT_DISINFECT_ACTIVE_COOL_TIME_OUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_TARGET_COND_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_5, 0, ALARM_ID_NO_ALARM }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoBRcr NoDRcr ClrOnly TxLog ID Escalate In Escalate To { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_INVALID_SYSTEM_RECORD_CRC, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_INVALID_SERVICE_RECORD_CRC, 0, ALARM_ID_NO_ALARM }, @@ -958,10 +958,10 @@ { 3, ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE }, { 3, ALARM_ID_HD_FPGA_CLOCK_SPEED_CHECK_FAILURE }, { 3, ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE }, - { 3, ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT }, + { 3, ALARM_ID_DG_CHEM_DISINFECT_TARGET_COND_OUT_OF_RANGE }, { 3, ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT }, - { 3, ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT }, - { 3, ALARM_ID_DG_TEMP_SENSORS_DIFF_OUT_OF_RANGE }, + { 3, ALARM_ID_AVAILABLE_5 }, + { 3, ALARM_ID_DG_CLEANING_MODE_TEMP_SENSORS_DIFF_OUT_OF_RANGE }, { 3, ALARM_ID_DG_RESERVOIR_FILL_TIMEOUT }, { 3, ALARM_ID_DG_INVALID_LOAD_CELL_VALUE }, { 3, ALARM_ID_DG_CHEM_DISINFECT_PRIME_ACID_LINE_TIME_OUT }, @@ -995,9 +995,9 @@ { 3, ALARM_ID_DG_CD1_CD2_SENSORS_FPGA_FAULT }, { 3, ALARM_ID_HD_RTC_CONFIG_ERROR }, { 3, ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT }, - { 3, ALARM_ID_AVAILABLE_3 }, + { 3, ALARM_ID_DG_CLEANING_MODE_COND_SENSORS_OUT_OF_RANGE }, { 3, ALARM_ID_DG_HEAT_DISINFECT_ACTIVE_COOL_TIME_OUT }, - { 3, ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT }, + { 3, ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_OUT_OF_RANGE }, { 3, ALARM_ID_DG_LOAD_CELLS_TARE_WEIGHT_OUT_OF_RANGE }, { 3, ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT }, { 3, ALARM_ID_HD_RTC_BATTERY_LOW }, @@ -1393,13 +1393,13 @@ { 241 , ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT , "DG | Cleaning Mode Error | Call service to schedule a repair. | DG reservoir drain time out | If the DG reservoir drain is not complete in 120 secs. | "}, { 242 , ALARM_ID_DG_RESERVOIR_FILL_TIMEOUT , "DG | Cleaning Mode Error | Call service to schedule a repair. | DG reservoir fill time out | If the DG reservoir fill is not complete in 120 secs. | "}, { 243 , ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT , "DG | Heat Disinfection Error | Call service to schedule a repair. | DG reservoir leak time out | If the reservoir level is drifted by 100 mL for more than 30 seconds. | "}, - { 244 , ALARM_ID_DG_TEMP_SENSORS_DIFF_OUT_OF_RANGE , "DG | Heat Disinfection Error | Call service to schedule a repair. | DG temperature sensors difference out of range | If any of the temperature sensors are out of the average of the sensors by more than 3 C. | "}, + { 244 , ALARM_ID_DG_CLEANING_MODE_TEMP_SENSORS_DIFF_OUT_OF_RANGE , "DG | Cleaning Mode Error | Call service to schedule a repair. | DG temperature sensors difference out of range | If any of the temperature sensors are out of the average of the sensors by more than 3 C. | "}, { 245 , ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT , "DG | Heat Disinfection Error | Call service to schedule a repair. | DG heat disinfect target temperature time out (could not reach to temperature) | If heating up to minimum temperature for heat disinfect failed after 4 hours. | "}, - { 246 , ALARM_ID_AVAILABLE_3 , "N/A | N/A | N/A | N/A | N/A | "}, + { 246 , ALARM_ID_DG_CLEANING_MODE_COND_SENSORS_OUT_OF_RANGE , "DG | Chemical Disinfection Error | Call service to schedule a repair. | DG chemical disinfect inlet conducitivty out of range | If CPo and CD2 conductivity values are above 100 uS/cm. | "}, { 247 , ALARM_ID_DG_HEAT_DISINFECT_ACTIVE_COOL_TIME_OUT , "DG | Heat Disinfection Active Cool Error | Call service to schedule a repair. | DG heat disinfect active cool time out | If THd > 44 C after 90 minutes of cooling. | "}, - { 248 , ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT , "DG | Chemical Disinfection Error | Call service to schedule a repair. | DG chemical disinfect could not reach to target temperature | If heating up to minimum temperature for chemical disinfect failed | "}, - { 249 , ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT , "DG | Chemical Disinfection Error | Call service to schedule a repair. | DG chemical disinfect inlet pressure and temperature sensors out of range | If the inlet pressure is less than the threshold of 30.0 PSI and TDi and TRo difference is greater than 3 C | "}, - { 250 , ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT , "DG | Chemical Disinfection Error | Call service to schedule a repair. | DG chemical disinfect inlet conductivity and temperature out of range | If couldn't get a good water sample after a couple of trials and the disinfect cycle failed | "}, + { 248 , ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_OUT_OF_RANGE , "DG | Chemical Disinfection Error | Call service to schedule a repair. | DG chemical disinfect out of target temperature | If TPo > 50 C after 1 second. | "}, + { 249 , ALARM_ID_DG_CHEM_DISINFECT_TARGET_COND_OUT_OF_RANGE , "DG | Chemical Disinfection Error | Call service to schedule a repair. | DG chemical disinfect out of target conductivity | If CD2 < 150 uS/cm or CD2 > 650 uS/cm after 10 seconds. | "}, + { 250 , ALARM_ID_AVAILABLE_5 , "N/A | N/A | N/A | N/A | N/A | "}, { 251 , ALARM_ID_HD_INVALID_SYSTEM_RECORD_CRC , "HD | Machine Error | Call service to schedule a repair. | HD invalid system record | If the calculated CRC of the HD system record image does not match the expected CRC. | "}, { 252 , ALARM_ID_HD_INVALID_SERVICE_RECORD_CRC , "HD | Machine Error | Call service to schedule a repair. | HD invalid service record | If the calculated CRC of the HD service record image does not match the expected CRC. | "}, { 253 , ALARM_ID_DG_INVALID_SYSTEM_RECORD_CRC , "DG | Machine Error | Call service to schedule a repair. | DG invalid system record | If the calculated CRC of the DG system record image does not match the expected CRC. | "}, Index: DGDefs.h =================================================================== diff -u -r048ff79b50b2c2955ea4e5f7cb6c5cff67e95809 -rd7edd2bf8e2f51d5afdf2499cc44d25cd35b81e5 --- DGDefs.h (.../DGDefs.h) (revision 048ff79b50b2c2955ea4e5f7cb6c5cff67e95809) +++ DGDefs.h (.../DGDefs.h) (revision d7edd2bf8e2f51d5afdf2499cc44d25cd35b81e5) @@ -425,18 +425,19 @@ /// Enumeration of chemical disinfect flush mode states. enum DG_Chem_Flush_States { - DG_CHEM_DISINFECT_FLUSH_STATE_START = 0, ///< Chemical disinfect, start state - DG_CHEM_DISINFECT_FLUSH_STATE_DRAIN_R1, ///< Chemical disinfect flush, drain R1 state - DG_CHEM_DISINFECT_FLUSH_STATE_DRAIN_R2, ///< Chemical disinfect flush, drain R2 state - DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_DRAIN, ///< Chemical disinfect flush, flush drain state - DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_DISINFECTANT_LINE, ///< Chemical disinfect flush, flush disinfectant line state - DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_UF, ///< Chemical disinfect flush, flush UF state - DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R2_TO_R1_DRAIN_R1, ///< Chemical disinfect flush, flush R2 to R1 drain R1 state - DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R1_TO_R2_DRAIN_R2, ///< Chemical disinfect flush, flush R1 to R2 drain R2 state - DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_BASIC_PATH, ///< Chemical disinfect flush, cancel basic path state - DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH, ///< Chemical disinfect flush, cancel water path state - DG_CHEM_DISINFECT_FLUSH_STATE_COMPLETE, ///< Chemical disinfect flush, complete state - NUM_OF_DG_CHEM_DISINFECT_FLUSH_STATES ///< Number of chemical disinfect flush mode states + DG_CHEM_DISINFECT_FLUSH_STATE_START = 0, ///< Chemical disinfect flush, start state + DG_CHEM_DISINFECT_FLUSH_STATE_DRAIN_R1, ///< Chemical disinfect flush, drain R1 state + DG_CHEM_DISINFECT_FLUSH_STATE_DRAIN_R2, ///< Chemical disinfect flush, drain R2 state + DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_DRAIN, ///< Chemical disinfect flush, flush drain state + DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_DISINFECTANT_LINE, ///< Chemical disinfect flush, flush disinfectant line state + DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_UF, ///< Chemical disinfect flush, flush UF state + DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R2_TO_R1_DRAIN_R1, ///< Chemical disinfect flush, flush R2 to R1 drain R1 state + DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R1_TO_R2_DRAIN_R2, ///< Chemical disinfect flush, flush R1 to R2 drain R2 state + DG_CHEM_DISINFECT_FLUSH_STATE_SAMPLE_FLUSH_R1_TO_R2_DRAIN_R2, ///< Chemical disinfect flush, sample flush R1 to R2 drain R2 state + DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_BASIC_PATH, ///< Chemical disinfect flush, cancel basic path state + DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH, ///< Chemical disinfect flush, cancel water path state + DG_CHEM_DISINFECT_FLUSH_STATE_COMPLETE, ///< Chemical disinfect flush, complete state + NUM_OF_DG_CHEM_DISINFECT_FLUSH_STATES ///< Number of chemical disinfect flush mode states }; typedef enum DG_Chem_Flush_States DG_CHEM_DISINFECT_FLUSH_STATE_T; ///< Type for DG chemical disinfect flush states enumeration Index: HDDefs.h =================================================================== diff -u -r048ff79b50b2c2955ea4e5f7cb6c5cff67e95809 -rd7edd2bf8e2f51d5afdf2499cc44d25cd35b81e5 --- HDDefs.h (.../HDDefs.h) (revision 048ff79b50b2c2955ea4e5f7cb6c5cff67e95809) +++ HDDefs.h (.../HDDefs.h) (revision d7edd2bf8e2f51d5afdf2499cc44d25cd35b81e5) @@ -53,10 +53,10 @@ { POST_STATE_START = 0, ///< Start initialize & POST mode state POST_STATE_FW_INTEGRITY, ///< Run firmware integrity test state - POST_STATE_WATCHDOG, ///< Run watchdog test state - POST_STATE_SAFETY_SHUTDOWN, ///< Run safety shutdown test state POST_STATE_RTC, ///< Run RTC test state POST_STATE_NVDATAMGMT, ///< Run NV Data Mgmt. test state + POST_STATE_WATCHDOG, ///< Run watchdog test state + POST_STATE_SAFETY_SHUTDOWN, ///< Run safety shutdown test state POST_STATE_BLOOD_FLOW, ///< Run blood flow test state POST_STATE_DIALYSATE_INLET_FLOW, ///< Run dialysate inlet flow test state POST_STATE_DIALYSATE_OUTLET_FLOW, ///< Run dialysate outlet flow test state Index: MsgDefs.h =================================================================== diff -u -rf96f7c7b7c048f0d49eb7ccf476fd69378a1fafe -rd7edd2bf8e2f51d5afdf2499cc44d25cd35b81e5 --- MsgDefs.h (.../MsgDefs.h) (revision f96f7c7b7c048f0d49eb7ccf476fd69378a1fafe) +++ MsgDefs.h (.../MsgDefs.h) (revision d7edd2bf8e2f51d5afdf2499cc44d25cd35b81e5) @@ -1,15 +1,15 @@ /************************************************************************** * -* Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved. +* Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * @file MsgDefs.h * * @author (last) Dara Navaei -* @date (last) 21-Dec-2022 +* @date (last) 03-Jan-2023 * * @author (original) Sean * @date (original) 27-Feb-2020 @@ -204,7 +204,7 @@ MSG_ID_DG_SET_SERVICE_TIME = 0xAC, ///< DG set service time MSG_ID_UI_INSTALLATION_CONFIRM_RESPONSE = 0xAD, ///< HD Confirm installation response MSG_ID_DG_FILL_MODE_DATA = 0xAE, ///< DG broadcast of fill mode data such as used acid & bicarb volume - MSG_ID_DG_BAD_FILL_SUB_STATE = 0xAF, ///< DG broadcast of idle mode bad fill sub-state + MSG_ID_DG_GEN_IDLE_DATA = 0xAF, ///< DG broadcast of Gen idle mode sub-state MSG_ID_UI_REQUEST_SERVICE_MODE = 0xB0, ///< UI request to HD to go to service mode MSG_ID_HD_RESPONSE_SERVICE_MODE_REQUEST = 0xB1, ///< HD response to UI request to go to service mode MSG_ID_HD_REQUEST_UI_FINAL_POST_RESULT = 0xB2, ///< HD request to UI for final POST result @@ -228,6 +228,7 @@ MSG_ID_HD_CHEM_DISINFECT_FLUSH_CONFIRM_RESPONSE = 0xC4, ///< HD response to confirmation of chemical disinfect flush start MSG_ID_DG_HEAT_DISINFECT_ACTIVE_COOL_DATA = 0xC5, ///< DG heat disinfect active cool data broadcast MSG_ID_DG_START_STOP_HEAT_DISINFECT_ACTIVE_COOL = 0xC6, ///< DG heat disinfect active cool start/stop command + MSG_ID_HD_AIR_PUMP_DATA = 0xC7, ///< HD air pump data publish #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing @@ -262,7 +263,7 @@ MSG_ID_PRESSURE_VENOUS_OVERRIDE = 0x8018, ///< Venous pressure measured override request MSG_ID_OCCLUSION_BLOOD_PUMP_OVERRIDE = 0x8019, ///< Blood pump occlusion pressure measured override request MSG_ID_BLOOD_ROTOR_COUNT_OVERRIDE = 0x801A, ///< Blood pump rotor count override request - MSG_ID____AVAILABLE_11 = 0x801B, ///< Message ID available + MSG_ID_HD_AIR_PUMP_SET_STATE = 0x801B, ///< HD set air pump state. MSG_ID_PRES_OCCL_SEND_INTERVAL_OVERRIDE = 0x801C, ///< Pressure and occlusion broadcast interval override request MSG_ID_SET_RTC_DATE_TIME = 0x801D, ///< RTC set date/time request MSG_ID_DIAL_OUT_FLOW_SEND_INTERVAL_OVERRIDE = 0x801E, ///< Dialysate outlet flow broadcast interval override request @@ -370,7 +371,7 @@ MSG_ID_HD_BLOOD_PUMP_SET_PWM = 0x8085, ///< HD set blood pump to specific PWM duty cycle request MSG_ID_HD_DIAL_IN_SET_PWM = 0x8086, ///< HD set dialysate inlet pump to specific PWM duty cycle request MSG_ID_HD_DIAL_OUT_SET_PWM = 0x8087, ///< HD set dialysate outlet pump to specific PWM duty cycle request - MSG_ID_DIALYSATE_INLET_PUMP_ROTOR_COUNT_OVERRIDE = 0x8088, ///< HD dialysate inlet pump rotor count override request + MSG_ID_HD_DIALYSATE_INLET_PUMP_ROTOR_COUNT_OVERRIDE = 0x8088, ///< HD dialysate inlet pump rotor count override request MSG_ID_HD_NV_RECORD_CRC_OVERRIDE = 0x8089, ///< HD non-volatile record CRC override MSG_ID_FIRST_DG_TESTER_MESSAGE = 0xA000, ///< First DG test message ID @@ -453,8 +454,8 @@ MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE = 0xA04E, ///< DG used acid volume override in mL MSG_ID_DG_SET_FANS_RPM_ALARM_START_TIME_OFFSET = 0xA04F, ///< DG set fans RPM alarm start time offset MSG_ID_DG_USED_BICARB_VOLUME_ML_OVERRIDE = 0xA050, ///< DG used bicarb volume override in mL - MSG_ID_FILL_MODE_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA051, ///< DG used fill publish interval override request - MSG_ID_BAD_FILL_STATES_PUBLISH_INTERVAL_OVERRIDE = 0xA052, ///< DG bad fill sub-states publish interval override request + MSG_ID_FILL_MODE_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA051, ///< DG used concentrate publish interval override request + MSG_ID_DG_GEN_IDLE_PUBLISH_INTERVAL_OVERRIDE = 0xA052, ///< DG gen idle sub-states publish interval override request MSG_ID_DG_GET_USAGE_INFO_RECORD = 0xA053, ///< DG get usage information record MSG_ID_DG_SET_USAGE_INFO_RECORD = 0xA054, ///< DG set usage information record MSG_ID_DG_SEND_USAGE_INFO_RECORD = 0xA055, ///< DG send usage information record