Index: AlarmDefs.h =================================================================== diff -u -r67a554b5e091f0207e432023f0e51f8ae3e9312c -r2f77c01f9cd09e34365556838a8e26e05a54eea3 --- AlarmDefs.h (.../AlarmDefs.h) (revision 67a554b5e091f0207e432023f0e51f8ae3e9312c) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 2f77c01f9cd09e34365556838a8e26e05a54eea3) @@ -86,7 +86,7 @@ ALARM_ID_DD_CONCENTRATE_PUMP_FAULT = 55, ///< DD concentrate pump fault ALARM_ID_DD_TEMPERATURE_SENSOR_OUT_OF_RANGE = 56, ///< DD temperature sensor out of range ALARM_ID_DD_RTD_SENSORS_FPGA_FAULT = 57, ///< DD temperature sensors freshness timeout fault - ALARM_ID_DD_BARO_SENSOR_FPGA_FAULT = 58, ///< DD baro sensors freshness timeout fault + ALARM_ID_AVAILABLE_58 = 58, ///< DD Available alarms ALARM_ID_DD_BAROMETRIC_SENSOR_COEFFS_BAD_CRC = 59, ///< DD barometric sensor coefficients bad CRC ALARM_ID_DD_D12_PUMP_RPM_OUT_OF_RANGE = 60, ///< DD fresh dialysate pump RPM out of range ALARM_ID_DD_D12_PUMP_OFF_FAULT = 61, ///< DD fresh dialysate pump running when it is not commanded to run @@ -388,7 +388,7 @@ { ALARM_PRIORITY_HIGH, 110, ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_CONCENTRATE_PUMP_FAULT }, { ALARM_PRIORITY_HIGH, 110, ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_TEMPERATURE_SENSOR_OUT_OF_RANGE }, { ALARM_PRIORITY_HIGH, 110, ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_RTD_SENSORS_FPGA_FAULT }, - { ALARM_PRIORITY_HIGH, 110, ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_BARO_SENSOR_FPGA_FAULT }, + { ALARM_PRIORITY_LOW, 999, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_AVAILABLE_58 }, { ALARM_PRIORITY_HIGH, 110, ALM_SRC_DD, FALSE, TRUE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_BAROMETRIC_SENSOR_COEFFS_BAD_CRC }, { ALARM_PRIORITY_HIGH, 110, ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_D12_PUMP_RPM_OUT_OF_RANGE }, { ALARM_PRIORITY_HIGH, 110, ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_D12_PUMP_OFF_FAULT }, @@ -566,7 +566,6 @@ { 110, ALARM_ID_DD_CONCENTRATE_PUMP_FAULT }, { 110, ALARM_ID_DD_TEMPERATURE_SENSOR_OUT_OF_RANGE }, { 110, ALARM_ID_DD_RTD_SENSORS_FPGA_FAULT }, - { 110, ALARM_ID_DD_BARO_SENSOR_FPGA_FAULT }, { 110, ALARM_ID_DD_BAROMETRIC_SENSOR_COEFFS_BAD_CRC }, { 110, ALARM_ID_DD_D12_PUMP_RPM_OUT_OF_RANGE }, { 110, ALARM_ID_DD_D12_PUMP_OFF_FAULT }, @@ -642,6 +641,7 @@ { 999, ALARM_ID_AVAILABLE_30 }, { 999, ALARM_ID_AVAILABLE_31 }, { 999, ALARM_ID_AVAILABLE_32 }, + { 999, ALARM_ID_AVAILABLE_58 }, { 999, ALARM_ID_AVAILABLE_72 }, { 999, ALARM_ID_AVAILABLE_73 }, { 999, ALARM_ID_AVAILABLE_93 }, @@ -743,7 +743,7 @@ { 55 , ALARM_ID_DD_CONCENTRATE_PUMP_FAULT , "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: Pump Fault | DD concentrate pump fault | If the concentrate pumps fault is reported by the FPGA. | "}, { 56 , ALARM_ID_DD_TEMPERATURE_SENSOR_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: Temp Sensor Range | DD temperature sensor out of range | If the measured temperature < 0 C or > 80 C for the non-fluid inline sensors and > 120 C for the fluid sensors. | "}, { 57 , ALARM_ID_DD_RTD_SENSORS_FPGA_FAULT , "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: Temperature RTD Comm | DD temperature sensors not being read successfully | If the FPGA does not report fresh data for a certain period of time | "}, - { 58 , ALARM_ID_DD_BARO_SENSOR_FPGA_FAULT , "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: Baro temp Comm | DD barometric sensor not being read successfully | If the FPGA does not report fresh data for a certain period of time | "}, + { 58 , ALARM_ID_AVAILABLE_58 , " | | | | | | "}, { 59 , ALARM_ID_DD_BAROMETRIC_SENSOR_COEFFS_BAD_CRC , "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: Baro temp Cal CRC | DD barometric pressure sensor bad coefficients CRC | If the following happens: 1. The stored CRC in the sensor does not match the calculated CRC. 2. The CRC and coefficients have not been received from the sensor after 20 seconds from the power up. | "}, { 60 , ALARM_ID_DD_D12_PUMP_RPM_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: Fresh Dial Pump Speed Fault | DD fresh dialysate pump RPM out of range | If the fresh dialysate pump RPM > 300.0 of the target RPM. | "}, { 61 , ALARM_ID_DD_D12_PUMP_OFF_FAULT , "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: Fresh Dial Pump Speed Not Off | DD fresh dialysate pump off fault | If the pump is in off state and the RPM is greater than the minimum RPM of 300.0 RPM. | "}, Index: MsgDefs.h =================================================================== diff -u -r9b2efdc79d775d643e7d6765117df1efd690b502 -r2f77c01f9cd09e34365556838a8e26e05a54eea3 --- MsgDefs.h (.../MsgDefs.h) (revision 9b2efdc79d775d643e7d6765117df1efd690b502) +++ MsgDefs.h (.../MsgDefs.h) (revision 2f77c01f9cd09e34365556838a8e26e05a54eea3) @@ -221,8 +221,8 @@ MSG_ID_DD_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA018, ///< DD temperature sensor publish interval override request MSG_ID_DD_TEMPERATURE_SENSOR_MEASURED_TEMPERATURE_OVERRIDE_REQUEST = 0xA019, ///< DD temperature sensor measured temperature override request MSG_ID_DD_TEMPERATURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST = 0xA01A, ///< DD temperature sensor read counter override request - MSG_ID_DD_TEMPERATURE_SENSOR_BARO_READ_COUNTER_OVERRIDE_REQUEST = 0xA01B, ///< DD temperature sensor baro sensor read counter override request - MSG_ID_DD_TEMPERATURE_SENSOR_BARO_CRC_OVERRIDE_REQUEST = 0xA01C, ///< DD temperature sensor baro sensor coefficient CRC override request + MSG_ID_DD_AVAILABLE_2 = 0xA01B, ///< DD Msg ID not used - available for use. + MSG_ID_DD_AVAILABLE_3 = 0xA01C, ///< DD Msg ID not used - available for use. MSG_ID_DD_DIALYSATE_PUMPS_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA01D, ///< DD dialysate pumps data publish interval override request MSG_ID_DD_DIALYSATE_PUMPS_TARGET_SPEED_OVERRIDE_REQUEST = 0xA01E, ///< DD dialysate pumps target speed override request MSG_ID_DD_DIALYSATE_PUMPS_MEASURED_SPEED_OVERRIDE_REQUEST = 0xA01F, ///< DD dialysate pumps measured speed override request