Index: AlarmDefs.h =================================================================== diff -u -r72c28e0d601b9769c454b96194fa0d3336cd69a6 -rd8255b02f94eb524a75a1f435d215883be2dcaec --- AlarmDefs.h (.../AlarmDefs.h) (revision 72c28e0d601b9769c454b96194fa0d3336cd69a6) +++ AlarmDefs.h (.../AlarmDefs.h) (revision d8255b02f94eb524a75a1f435d215883be2dcaec) @@ -82,7 +82,7 @@ ALARM_ID_HD_UI_COMM_TIMEOUT = 44, ///< HD UI communication timeout ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS = 45, ///< HD too many bad communications CRC ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_BY_UI = 46, ///< HD didn't get ACK on message to UI that required acknowledgment - ALARM_ID_AVAILABLE_16 = 47, ///< Available for use + ALARM_ID_DG_MAX_RO_PUMP_PWM_EXCEEDED = 47, ///< DG maximum RO Pump PWM exceeded ALARM_ID_HD_UF_VOLUME_ACCURACY_ERROR = 48, ///< HD ultrafiltration volume accuracy error during treatment ALARM_ID_HD_FPGA_COMM_TIMEOUT = 49, ///< HD FPGA communication down for too long ALARM_ID_DG_VALVE_CONTROL_FAILURE = 50, ///< DG FPGA not accepting commanded valve states @@ -293,7 +293,7 @@ ALARM_ID_HD_UI_COMPATIBILITY_ERROR = 255, ///< HD and UI software builds are not compatible ALARM_ID_HD_DISINFECT_CHEM_FLUSH = 256, ///< HD processor is in Disinfect Chemical Flush mode ALARM_ID_AVAILABLE_8 = 257, ///< Alarm ID available for use - ALARM_ID_AVAILABLE_9 = 258, ///< Alarm Id available + ALARM_ID_HD_UI_POST_FAILURE_OS_VERSION = 258, ///< HD UI POST OS version compatibility failure ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE = 259, ///< HD temperatures out of range ALARM_ID_HD_UI_POST_FAILURE_SHASUM = 260, ///< HD UI POST Application Integrity (Sha256Sum) failure ALARM_ID_HD_UI_POST_FAILURE_CANBUS = 261, ///< HD UI POST CANBus failure @@ -527,7 +527,7 @@ { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET BTSRB BTSET NoBRcr NoDRcr ClrOnly TxLog ID { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_BY_UI }, - { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_AVAILABLE_16 }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_DG_MAX_RO_PUMP_PWM_EXCEEDED }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_UF_VOLUME_ACCURACY_ERROR }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_FPGA_COMM_TIMEOUT }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_VALVE_CONTROL_FAILURE }, @@ -746,7 +746,7 @@ { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_UI_COMPATIBILITY_ERROR }, { ALARM_PRIORITY_LOW, 843, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_DISINFECT_CHEM_FLUSH }, { ALARM_PRIORITY_LOW, 999, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_8 }, - { ALARM_PRIORITY_LOW, 999, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_9 }, + { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_UI_POST_FAILURE_OS_VERSION }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_UI_POST_FAILURE_SHASUM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_UI_POST_FAILURE_CANBUS }, @@ -813,7 +813,7 @@ { ALARM_PRIORITY_LOW, 752, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, ALARM_ID_DG_CHEM_DISINFECT_FLUSH_SAMPLE_TIMEOUT }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_OUTLET_UV_REACTOR_NOT_HEALTHY }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_UI_POST_FAILURE_INVALID_YEAR }, - // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET BTSRB BTSET NoBRcr NoDRcr ClrOnly TxLog ID + // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET BTSRB BTSET NoBRcr NoDRcr ClrOnly TxLog ID { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_UI_POST_FAILURE_SETTINGS_BAD }, }; // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET BTSRB BTSET NoBRcr NoDRcr ClrOnly TxLog ID @@ -833,6 +833,7 @@ { 1, ALARM_ID_HD_ACCELEROMETERS_INVALID_CAL_RECORD }, { 1, ALARM_ID_HD_HEPARIN_FORCE_SENSOR_INVALID_CAL_RECORD }, { 1, ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED }, + { 1, ALARM_ID_HD_UI_POST_FAILURE_OS_VERSION }, { 1, ALARM_ID_HD_UI_POST_FAILURE_SHASUM }, { 1, ALARM_ID_HD_UI_POST_FAILURE_CANBUS }, { 1, ALARM_ID_HD_UI_POST_FAILURE_TOUCH }, @@ -1011,6 +1012,7 @@ { 110, ALARM_ID_DG_SOFTWARE_FAULT }, { 110, ALARM_ID_DG_RO_PUMP_PRESSURE_OUT_OF_RANGE }, { 110, ALARM_ID_TEST_ALARM_NO_DIAL_RECIRC_CLR_TOP_ONLY }, + { 110, ALARM_ID_DG_MAX_RO_PUMP_PWM_EXCEEDED }, { 111, ALARM_ID_HD_DG_COMM_TIMEOUT }, { 111, ALARM_ID_HD_NEW_RESERVOIRS_DATA_MESSAGE_NOT_RECEIVE }, { 111, ALARM_ID_HD_DG_NEW_OPERATION_MODE_MESSAGE_NOT_RECEIVE }, @@ -1139,7 +1141,6 @@ { 999, ALARM_ID_AVAILABLE_12 }, { 999, ALARM_ID_AVAILABLE_13 }, { 999, ALARM_ID_AVAILABLE_15 }, - { 999, ALARM_ID_AVAILABLE_16 }, { 999, ALARM_ID_AVAILABLE_30 }, { 999, ALARM_ID_AVAILABLE_31 }, { 999, ALARM_ID_AVAILABLE_32 }, @@ -1211,7 +1212,7 @@ { 44 , ALARM_ID_HD_UI_COMM_TIMEOUT , "HD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis 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. | HD Fault: UI Comm | User interface communication timeout | If the sub-system communication timeout has occurred. UI is 5 seconds. DG is 2 seconds. | "}, { 45 , ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS , "HD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis 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. | HD Fault: CAN CRC Com | Too many bad CRCs detected on received system messages | If too many bad messages CRCs are received within a set period of time | "}, { 46 , ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_BY_UI , "HD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis 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. | HD Fault: CAN ACK UI Com | System message that required acknowledgment was not acknowledged | If no retries left in the pending acknowlegement list. | "}, - { 47 , ALARM_ID_AVAILABLE_16 , " | | | | | | "}, + { 47 , ALARM_ID_DG_MAX_RO_PUMP_PWM_EXCEEDED , "DG | 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. | DG Fault: RO Pump High | DG RO pump out of upper range | If the RO pump > 95% PWM for 12 secs. | "}, { 48 , ALARM_ID_HD_UF_VOLUME_ACCURACY_ERROR , "HD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis 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. | HD Fault: UF Rate Tare Err | Ultrafiltration volume accuracy error during treatment | If the UF volume (refUFvolume - measureVolume) > 100.0 mL. | "}, { 49 , ALARM_ID_HD_FPGA_COMM_TIMEOUT , "HD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis 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. | HD Fault: FPGA Com | HD FPGA communication down for too long | If there are more than 3 comm errors in a 1 min period. | "}, { 50 , ALARM_ID_DG_VALVE_CONTROL_FAILURE , "DG | 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. | DG Fault: Valve Control | DG FPGA not accepting commanded valve states | If the read back FPGA valve states does not match the commanded valve states for a certain amount of time. | "}, @@ -1422,8 +1423,8 @@ { 255 , ALARM_ID_HD_UI_COMPATIBILITY_ERROR , "HD | 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. | HD POST: UI Compatibility | 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_DISINFECT_CHEM_FLUSH , "HD | Chemical Flush in Progress | Chemical flush in progress.\n- Please wait for the process to complete. \n- You will not be able to create a treatment until the process\nis finished.\n- To end this process, press STOP on the front of the device. | Cleaning: Chem Flush In Progress | DG flush started | If DG flush successfully started from the UI. | "}, { 257 , ALARM_ID_AVAILABLE_8 , " | | | | | | "}, - { 258 , ALARM_ID_AVAILABLE_9 , " | | | | | | "}, - { 259 , ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE , "HD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis 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. | HD Fault: Temp Sensors Error | HD temperatures out of range | If thermistor reports temperature > 80.0 C or < 0.0 C for a certain period of time. | "}, + { 258 , ALARM_ID_HD_UI_POST_FAILURE_OS_VERSION , "UI HD | 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. | HD POST: OS Version | UI POST OS Version compatibility failure | If the UI POST reports the OS Version compatibility faillure. | "}, + { 259 , ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE , "HD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis 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. | HD Fault: Temp Sensors Error | HD temperatures out of range | If thermistor reports temperature > 80.0 C or < 0.0 C for a certain period of time. | "}, { 260 , ALARM_ID_HD_UI_POST_FAILURE_SHASUM , "UI HD | 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. | HD POST: UI Image | UI POST Application Integrity (Sha256Sum) failure | If the UI POST reports a shasum faillure. | "}, { 261 , ALARM_ID_HD_UI_POST_FAILURE_CANBUS , "UI HD | 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. | HD POST: UI CAN Driver | UI POST CANBus failure | If the UI POST reports a can bus failure. | "}, { 262 , ALARM_ID_HD_UI_POST_FAILURE_DISPLAY , " | | | | UI POST Display failure | If the UI POST reports a display failure. | "}, Index: DGDefs.h =================================================================== diff -u -r1e70b3053ecdf4edb17360c9df6724104deebdf2 -rd8255b02f94eb524a75a1f435d215883be2dcaec --- DGDefs.h (.../DGDefs.h) (revision 1e70b3053ecdf4edb17360c9df6724104deebdf2) +++ DGDefs.h (.../DGDefs.h) (revision d8255b02f94eb524a75a1f435d215883be2dcaec) @@ -667,6 +667,7 @@ DG_EVENT_AVG_DIALYSATE_FILL_COND_VALUES, ///< DG average dialysate fill conductivity values DG_EVENT_RESERVOIR_FILL_VALUES, ///< DG reservoir fill values DG_EVENT_OPERATION_STATUS, ///< DG operation status event + DG_EVENT_INACTIVE_RESERVOIR_TEMP_REMOVE, // TODO remove NUM_OF_DG_EVENT_IDS ///< Total number of DG events }; typedef enum DG_Event_List DG_EVENT_ID_T; ///< Type for DG event list enumeration Index: HDDefs.h =================================================================== diff -u -r0551ba4ac8162f75e8ad03c479ef58ffabd68a69 -rd8255b02f94eb524a75a1f435d215883be2dcaec --- HDDefs.h (.../HDDefs.h) (revision 0551ba4ac8162f75e8ad03c479ef58ffabd68a69) +++ HDDefs.h (.../HDDefs.h) (revision d8255b02f94eb524a75a1f435d215883be2dcaec) @@ -818,6 +818,4 @@ NUM_OF_CONFIRMATION_REQUEST_STATUS ///< Number of confirmation status } CONFIRMATION_REQUEST_STATUS_T; -/**@}*/ - #endif