Index: AlarmDefs.h =================================================================== diff -u -raebe9aa2b6e24169026b4d5d9ea08d6718a7b5fc -rf1bf9b68e5b701c465e1adc3e00097a6ddc976c5 --- AlarmDefs.h (.../AlarmDefs.h) (revision aebe9aa2b6e24169026b4d5d9ea08d6718a7b5fc) +++ AlarmDefs.h (.../AlarmDefs.h) (revision f1bf9b68e5b701c465e1adc3e00097a6ddc976c5) @@ -124,8 +124,8 @@ ALARM_ID_AVAILABLE_93 = 93, ///< Available alarms ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE = 94, ///< DD balance chamber state1 fill initiated and pressure drop is not in range ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_OUT_OF_RANGE = 95, ///< DD balance chamber state2 fill initiated and pressure drop is not in range - ALARM_ID_DD_D74_COND_SENSOR_FPGA_FAULT = 96, ///< DD D74 bicarb conductivity sensor freshness/error timeout fault = 96, ///< Available alarms - ALARM_ID_AVAILABLE_97 = 97, ///< Available alarms + ALARM_ID_TD_TREATMENT_STOPPED_BY_USER = 96, ///< TD treatment paused by user + ALARM_ID_DD_D74_COND_SENSOR_FPGA_FAULT = 97, ///< DD D74 bicarb conductivity sensor freshness/error timeout fault ALARM_ID_AVAILABLE_98 = 98, ///< Available alarms ALARM_ID_AVAILABLE_99 = 99, ///< Available alarms // Added 30 TD-UI Alarms +1 TD only from 100 to 130 with some reserved IDs @@ -251,7 +251,9 @@ /**@}*/ -#if defined(__ALARM_MGMT_C__) || defined(__ALARM_MGMT_DD_C__) || defined(__ALARM_MGMT_TD_C__) || defined(__ALARM_MGMT_RO_C__) + +#if defined (__ALARM_MGMT_C__) || defined(__ALARM_MGMT_DD_C__) || defined(__ALARM_MGMT_TD_C__) || defined(__ALARM_MGMT_RO_C__) + /** * @addtogroup AlarmManagement * @{ @@ -287,7 +289,9 @@ ALARM_ID_T alarmID; ///< Alarm ID }; typedef struct AlarmsRankRecord ALARM_RANK_T; + #endif + #ifdef __ALARM_MGMT_C__ /// Table of alarms and their static properties. const ALARM_T ALARM_TABLE[] = @@ -391,11 +395,12 @@ { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_93 }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_OUT_OF_RANGE }, + { ALARM_PRIORITY_MEDIUM, 300, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TD_TREATMENT_STOPPED_BY_USER }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_D74_COND_SENSOR_FPGA_FAULT }, - { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_97 }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_98 }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_99 }, { ALARM_PRIORITY_HIGH, 0, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TD_COMM_TIMEOUT }, + // Priority Rank Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr ClrOnly TxLog ID { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_POST_FAILURE_OS_VERSION }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_POST_FAILURE_SHASUM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_POST_FAILURE_CANBUS }, @@ -421,6 +426,7 @@ { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_RESERVED_123 }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_RESERVED_124 }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_RESERVED_125 }, + // Priority Rank Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr ClrOnly TxLog ID { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_RESERVED_126 }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_RESERVED_127 }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_RESERVED_128 }, @@ -431,22 +437,22 @@ /// Table of alarms and their rank. const ALARM_RANK_T ALARM_RANK_TABLE[] = { - { 0, ALARM_ID_TD_COMM_TIMEOUT }, - { 1, ALARM_ID_UI_POST_FAILURE_OS_VERSION }, - { 1, ALARM_ID_UI_POST_FAILURE_SHASUM }, - { 1, ALARM_ID_UI_POST_FAILURE_CANBUS }, - { 1, ALARM_ID_UI_POST_FAILURE_DISPLAY }, - { 1, ALARM_ID_UI_POST_FAILURE_TOUCH }, - { 1, ALARM_ID_UI_POST_FAILURE_SDCARD }, - { 1, ALARM_ID_UI_POST_FAILURE_RTC }, - { 1, ALARM_ID_UI_POST_FAILURE_WIFI }, - { 1, ALARM_ID_UI_POST_FAILURE_BLUETOOTH }, - { 1, ALARM_ID_UI_POST_FAILURE_ETHERNET }, - { 1, ALARM_ID_UI_POST_FAILURE_SOUND }, - { 1, ALARM_ID_UI_POST_FAILURE_CLOUDSYNC }, - { 1, ALARM_ID_UI_POST_FAILURE_INVALID_YEAR }, - { 1, ALARM_ID_UI_POST_FAILURE_SETTINGS_BAD }, - { 1, ALARM_ID_UI_EVNT_FAILURE_SDCARD }, + { 0, ALARM_ID_TD_COMM_TIMEOUT }, + { 1, ALARM_ID_UI_POST_FAILURE_OS_VERSION }, + { 1, ALARM_ID_UI_POST_FAILURE_SHASUM }, + { 1, ALARM_ID_UI_POST_FAILURE_CANBUS }, + { 1, ALARM_ID_UI_POST_FAILURE_DISPLAY }, + { 1, ALARM_ID_UI_POST_FAILURE_TOUCH }, + { 1, ALARM_ID_UI_POST_FAILURE_SDCARD }, + { 1, ALARM_ID_UI_POST_FAILURE_RTC }, + { 1, ALARM_ID_UI_POST_FAILURE_WIFI }, + { 1, ALARM_ID_UI_POST_FAILURE_BLUETOOTH }, + { 1, ALARM_ID_UI_POST_FAILURE_ETHERNET }, + { 1, ALARM_ID_UI_POST_FAILURE_SOUND }, + { 1, ALARM_ID_UI_POST_FAILURE_CLOUDSYNC }, + { 1, ALARM_ID_UI_POST_FAILURE_INVALID_YEAR }, + { 1, ALARM_ID_UI_POST_FAILURE_SETTINGS_BAD }, + { 1, ALARM_ID_UI_EVNT_FAILURE_SDCARD }, { 1, ALARM_ID_TD_FPGA_POST_TEST_FAILED }, { 1, ALARM_ID_TD_WATCHDOG_POST_TEST_FAILED }, { 1, ALARM_ID_TD_UI_COMM_POST_FAILED }, @@ -532,6 +538,7 @@ { 202, ALARM_ID_TD_ARTERIAL_PRESSURE_LOW }, { 203, ALARM_ID_TD_ARTERIAL_PRESSURE_HIGH }, { 210, ALARM_ID_TD_CARTRIDGE_DOOR_OPENED }, + { 300, ALARM_ID_TD_TREATMENT_STOPPED_BY_USER }, { 430, ALARM_ID_DD_INLET_WATER_PRESSURE_IN_HIGH_RANGE }, { 431, ALARM_ID_DD_INLET_WATER_PRESSURE_IN_LOW_RANGE }, { 430, ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_HIGH_RANGE }, @@ -543,7 +550,6 @@ { 999, ALARM_ID_AVAILABLE_91 }, { 999, ALARM_ID_AVAILABLE_92 }, { 999, ALARM_ID_AVAILABLE_93 }, - { 999, ALARM_ID_AVAILABLE_97 }, { 999, ALARM_ID_AVAILABLE_98 }, { 999, ALARM_ID_AVAILABLE_99 }, { 999, ALARM_ID_UI_RESERVED_116 }, @@ -683,8 +689,8 @@ { 93 , ALARM_ID_AVAILABLE_93 , " | | | | | | "}, { 94 , ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Fault: BC Pressure not in range | DD balancing chamber state 1 fill initiated and pressure drop is not in range | If the fresh dialysate pressure (< 9 psig or > 13 psig) and spent dialysate pressure (< 9 psig or > 13 psig) not in range for balancing chamber state1 fill in progress. | "}, { 95 , ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_OUT_OF_RANGE , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Fault: BC Pressure not in range | DD balancing chamber state 2 fill initiated and pressure drop is not in range | If the fresh dialysate pressure (< 9 psig or > 13 psig) and spent dialysate pressure (< 9 psig or > 13 psig) not in range for balancing chamber state2 fill in progress. | "}, - { 96 , ALARM_ID_DD_D74_COND_SENSOR_FPGA_FAULT , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Conductivity Sensor Error | DD conductivity sensor (D74) located before balancing chamber reporting error or not being read successfully | Conductvity Sensor (D74) is reporting an error or FPGA is failing to read sensor. | "}, - { 97 , ALARM_ID_AVAILABLE_97 , " | | | | | | "}, + { 96 , ALARM_ID_TD_TREATMENT_STOPPED_BY_USER , "TD | Blood Pump Stopped: Treatment Paused | Treatment has been stopped by user.\n- Press Resume/OK to resume treatment. \n- If treatment is not resumed within five minutes,\ntreatment will be terminated without rinseback. | Blood Stopped: Treatment Pause | TD treatment stopped by user action - pressed stop button | If the user has pressed the stop button. | "}, + { 97 , ALARM_ID_DD_D74_COND_SENSOR_FPGA_FAULT , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Conductivity Sensor Error | DD conductivity sensor (D74) located before balancing chamber reporting error or not being read successfully | Conductvity Sensor (D74) is reporting an error or FPGA is failing to read sensor. | "}, { 98 , ALARM_ID_AVAILABLE_98 , " | | | | | | "}, { 99 , ALARM_ID_AVAILABLE_99 , " | | | | | | "}, // Num Alarm ID Device Display Title Instructions Alarm List Title Description Trigger Condition @@ -713,6 +719,7 @@ { 122 , ALARM_ID_UI_RESERVED_122 , "UI TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: UI- RESERVED | RESERVED | RESERVED | "}, { 123 , ALARM_ID_UI_RESERVED_123 , "UI TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: UI- RESERVED | RESERVED | RESERVED | "}, { 124 , ALARM_ID_UI_RESERVED_124 , "UI TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: UI- RESERVED | RESERVED | RESERVED | "}, + // Num Alarm ID Device Display Title Instructions Alarm List Title Description Trigger Condition { 125 , ALARM_ID_UI_RESERVED_125 , "UI TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: UI- RESERVED | RESERVED | RESERVED | "}, { 126 , ALARM_ID_UI_RESERVED_126 , "UI TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: UI- RESERVED | RESERVED | RESERVED | "}, { 127 , ALARM_ID_UI_RESERVED_127 , "UI TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: UI- RESERVED | RESERVED | RESERVED | "}, Index: MsgDefs.h =================================================================== diff -u -rda175684273b1709b2ea70334cb7af7c3698d558 -rf1bf9b68e5b701c465e1adc3e00097a6ddc976c5 --- MsgDefs.h (.../MsgDefs.h) (revision da175684273b1709b2ea70334cb7af7c3698d558) +++ MsgDefs.h (.../MsgDefs.h) (revision f1bf9b68e5b701c465e1adc3e00097a6ddc976c5) @@ -103,8 +103,11 @@ MSG_ID_UI_UF_PAUSE_RESUME_REQUEST = 0x47, ///< UI ultrafiltration pause/resume request MSG_ID_TD_UF_PAUSE_RESUME_RESPONSE = 0x48, ///< TD response to ultrafiltration pause/resume request MSG_ID_RO_GEN_PERMEATE_MODE_DATA = 0x49, ///< RO Gen Permeate data broadcast + MSG_ID_DD_PRE_GEN_DIALYSATE_STATE_DATA = 0x4A, ///< DD Pre-gen dialysate mode data + MSG_ID_DD_POST_GEN_DIALYSATE_STATE_DATA = 0x4B, ///< DD Post-gen dialysate mode data + MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA = 0x4C, ///< DD Pre Generate dialysate request data coming from TD. #ifdef __PUMPTEST__ - MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0x3B, ///< DD piston pump data + MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0, ///< DD piston pump data #endif // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID @@ -220,6 +223,11 @@ MSG_ID_DD_BICARB_DOSING_VOLUME_OVERRIDE_REQUEST = 0xA03A, ///< DD bicarb dosing volume override request MSG_ID_DD_GEND_EXEC_STATE_OVERRIDE_REQUEST = 0xA03B, ///< DD GenD execution state override request MSG_ID_DD_HEATERS_PWM_PERIOD_OVERIDE_REQUEST = 0xA03C, ///< DD heaters PWM period override request + MSG_ID_DD_PRE_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03D, ///< DD Pre generate dialysate mode data publish interval override request + MSG_ID_DD_POST_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03E, ///< DD Post generate dialysate mode data publish interval override request + MSG_ID_DD_START_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA03F, ///< DD start pre-gen dialysate mode override request + MSG_ID_DD_STOP_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA040, ///< DD stop pre-gen dialysate mode override request + MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA041, ///< DD stop gen dialysate mode override request #ifdef __PUMPTEST__ MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST = 0xAF00, ///< DD piston pump data publish interval override request MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xAF01, ///< DD piston pump start/stop override request