Index: AlarmDefs.h =================================================================== diff -u -r693e664e662fa31ae4e931f5a1b5f7d0be581c66 -rc95071efc070744afe5afcc6ac632307f7051c69 --- AlarmDefs.h (.../AlarmDefs.h) (revision 693e664e662fa31ae4e931f5a1b5f7d0be581c66) +++ AlarmDefs.h (.../AlarmDefs.h) (revision c95071efc070744afe5afcc6ac632307f7051c69) @@ -291,7 +291,7 @@ ALARM_ID_DG_INVALID_SYSTEM_RECORD_CRC = 253, ///< DG invalid system record ALARM_ID_DG_INVALID_SERVICE_RECORD_CRC = 254, ///< DG invalid service record ALARM_ID_HD_UI_COMPATIBILITY_ERROR = 255, ///< HD and UI software builds are not compatible - ALARM_ID_HD_DG_COMPATIBILITY_ERROR = 256, ///< HD and DG software builds are not compatible + ALARM_ID_AVAILABLE_2 = 256, ///< Alarm ID available for use ALARM_ID_DG_FPGA_POWER_OUT_TIMEOUT = 257, ///< DG FPGA power out timeout ALARM_ID_HD_FPGA_POWER_OUT_TIMEOUT = 258, ///< HD FPGA power out timeout ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE = 259, ///< HD temperatures out of range @@ -651,7 +651,7 @@ { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_CARTRIDGE_DOOR_OPENED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_HD_ACTIVE_RESERVOIR_DEPLETION_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_DIALYSATE_FLOW_RATE_OUT_OF_MAX_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_RTC_CONFIG_ERROR, 0, ALARM_ID_NO_ALARM }, @@ -707,7 +707,7 @@ { ALARM_PRIORITY_LOW, 900, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_EMPTY_SALINE_BAG, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_OCCLUSION_SENSOR_FPGA_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_ARTERIAL_SENSOR_FPGA_FAULT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_LOW, 903, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TREATMENT_STOPPED_BY_USER, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_MEDIUM, 803, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TREATMENT_STOPPED_BY_USER, 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_LOW, 904, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_END_OF_TREATMENT_WARNING, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 905, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_PRIME_COMPLETED_LOW_PRIORITY, ALM_ESC_90_MIN, ALARM_ID_PRIME_COMPLETED_MEDIUM }, @@ -741,7 +741,7 @@ { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_INVALID_SYSTEM_RECORD_CRC, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_INVALID_SERVICE_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_UI_COMPATIBILITY_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_DG_COMPATIBILITY_ERROR, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_2, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_FPGA_POWER_OUT_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_FPGA_POWER_OUT_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_TEMPERATURES_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, @@ -943,7 +943,7 @@ { 3, ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE }, { 3, ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE }, { 3, ALARM_ID_HD_UI_COMPATIBILITY_ERROR }, - { 3, ALARM_ID_HD_DG_COMPATIBILITY_ERROR }, + { 3, ALARM_ID_AVAILABLE_2 }, { 3, ALARM_ID_DG_FPGA_POWER_OUT_TIMEOUT }, { 3, ALARM_ID_HD_FPGA_POWER_OUT_TIMEOUT }, { 3, ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE }, @@ -1067,7 +1067,6 @@ { 799, ALARM_ID_PUMP_TRACK_LATCH_OPENED }, { 799, ALARM_ID_CARTRIDGE_DOOR_OPENED }, { 799, ALARM_ID_HD_ACTIVE_RESERVOIR_DEPLETION_TIME_OUT }, - { 799, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY }, { 799, ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION }, { 799, ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM }, { 799, ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_HIGH_SAFETY_RANGE }, @@ -1096,6 +1095,7 @@ { 800, ALARM_ID_BLOOD_SITTING_WARNING }, { 801, ALARM_ID_END_OF_TREATMENT_ALARM }, { 802, ALARM_ID_PRIME_COMPLETED_MEDIUM }, + { 803, ALARM_ID_TREATMENT_STOPPED_BY_USER }, { 899, ALARM_ID_SALINE_BOLUS_VOLUME_CHECK_FAILURE }, { 899, ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE }, { 899, ALARM_ID_END_TREATMENT_TIMEOUT_ALARM }, @@ -1105,7 +1105,6 @@ { 899, ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING }, { 899, ALARM_ID_HD_DISINFECT_CHEM_INSTRUCTION1 }, { 900, ALARM_ID_EMPTY_SALINE_BAG }, - { 903, ALARM_ID_TREATMENT_STOPPED_BY_USER }, { 904, ALARM_ID_END_OF_TREATMENT_WARNING }, { 905, ALARM_ID_PRIME_COMPLETED_LOW_PRIORITY }, { 909, ALARM_ID_PRIME_OUT_OF_TIME }, @@ -1122,6 +1121,7 @@ { 999, ALARM_ID_PRIME_SALINE_DIALYZER_TIME_OUT }, { 999, ALARM_ID_NO_CARTRIDGE_LOADED }, { 999, ALARM_ID_CARTRIDGE_REMOVAL_FAILURE }, + { 999, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY }, { 999, ALARM_ID_UI_POST_FAILURE_WIFI }, { 999, ALARM_ID_UI_POST_FAILURE_BLUETOOTH }, { 999, ALARM_ID_UI_POST_FAILURE_CLOUDSYNC }, @@ -1412,7 +1412,7 @@ { 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. | "}, { 254 , ALARM_ID_DG_INVALID_SERVICE_RECORD_CRC , "DG | Machine Error | Call service to schedule a repair. | DG invalid service record | If the calculated CRC of the DG service record image does not match the expected CRC. | "}, { 255 , ALARM_ID_HD_UI_COMPATIBILITY_ERROR , "HD | Machine Error | Call service to schedule a repair. | HD and UI software builds are not compatible | If the compatibility revision field of the UI is not equal to SW_COMPATIBILITY_REV. | "}, - { 256 , ALARM_ID_HD_DG_COMPATIBILITY_ERROR , "DG | Self-Test Error | Call service to schedule a repair. | HD and DG software builds are not compatible | This alarm is not used in the HD/DG code | "}, + { 256 , ALARM_ID_AVAILABLE_2 , "N/A | N/A | N/A | N/A | N/A | "}, { 257 , ALARM_ID_DG_FPGA_POWER_OUT_TIMEOUT , "DG | Machine Error | Call service to schedule a repair. | DG FPGA power out timeout | If the FPGA power gpio status pin has a logic '0' for more than 2 seconds. | "}, { 258 , ALARM_ID_HD_FPGA_POWER_OUT_TIMEOUT , "HD | Machine Error | Call service to schedule a repair. | HD FPGA power out timeout | If the FPGA power gpio status pin has a logic '0' for more than 2 seconds. | "}, { 259 , ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE , "HD | Temperature Sensors Error | Call service to schedule a repair. | HD temperatures out of range | If thermistor reports temperature > 80.0 C or < 0.0 C for a certain period of time. | "}, Index: HDDefs.h =================================================================== diff -u -r85b078d1b42131386fc50fed3aaa4061ae25c605 -rc95071efc070744afe5afcc6ac632307f7051c69 --- HDDefs.h (.../HDDefs.h) (revision 85b078d1b42131386fc50fed3aaa4061ae25c605) +++ HDDefs.h (.../HDDefs.h) (revision c95071efc070744afe5afcc6ac632307f7051c69) @@ -747,6 +747,8 @@ HD_EVENT_SERVICE_UPDATE, ///< HD new service record has been updated HD_EVENT_USAGE_INFO_UPDATE, ///< HD new usage information has been updated HD_EVENT_SW_CONFIG_UPDATE, ///< HD new software configuration has been updated + HD_EVENT_BUTTON, ///< HD button pressed/released + HD_EVENT_SAFETY_LINE, ///< HD safety line pulled/released HD_EVENT_RSRVR_1_LOAD_CELL_START_VALUES, ///< HD reservoir 1 load cells start values HD_EVENT_RSRVR_1_LOAD_CELL_END_VALUES, ///< HD reservoir 2 load cells end values HD_EVENT_RSRVR_2_LOAD_CELL_START_VALUES, ///< HD reservoir 2 load cells start values @@ -796,6 +798,4 @@ NUM_OF_CONFIRMATION_REQUEST_STATUS ///< Number of confirmation status } CONFIRMATION_REQUEST_STATUS_T; -/**@}*/ - #endif Index: MsgDefs.h =================================================================== diff -u -rd2e5e9dba92b9b0b0245e3cb8b5f33250f875c7d -rc95071efc070744afe5afcc6ac632307f7051c69 --- MsgDefs.h (.../MsgDefs.h) (revision d2e5e9dba92b9b0b0245e3cb8b5f33250f875c7d) +++ MsgDefs.h (.../MsgDefs.h) (revision c95071efc070744afe5afcc6ac632307f7051c69) @@ -456,7 +456,7 @@ 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 concentrate publish interval override request + MSG_ID_FILL_MODE_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA051, ///< DG used fill 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 @@ -539,6 +539,7 @@ REQUEST_REJECT_REASON_HD_SERVICE_IS_DUE = 48, ///< HD service is due REQUEST_REJECT_REASON_DG_CHEM_FLUSH_NOT_COMPLETED = 49, ///< DG chemical flush is not complete REQUEST_REJECT_REASON_DG_RO_FILTER_TEMPERATURE_OUT_OF_RANGE = 50, ///< DG RO filter temperature out of range + REQUEST_REJECT_REASON_DG_INCOMPATIBLE = 51, ///< DG firmware version is not compatible with HD firmware NUM_OF_REQUEST_REJECT_REASONS ///< Number of settings change reject codes }; typedef enum Request_Reject_Reasons REQUEST_REJECT_REASON_CODE_T; ///< Type for settings change rejection reason codes enumeration