Index: AlarmDefs.h =================================================================== diff -u -r50acbf24a2e073a5ae9c58cd8660973357ac5d0e -r29063fba3c4d1f663ec36c8b75f36c45305068be --- AlarmDefs.h (.../AlarmDefs.h) (revision 50acbf24a2e073a5ae9c58cd8660973357ac5d0e) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 29063fba3c4d1f663ec36c8b75f36c45305068be) @@ -201,6 +201,16 @@ ALARM_ID_DD_NVM_INVALID_INSTITUTIONAL_RECORD_CRC = 169, ///< DD invalid NVM institutional record ALARM_ID_DD_NVM_INVALID_USAGE_RECORD_CRC = 170, ///< DD invalid NVM Usage Info record ALARM_ID_DD_NVM_INVALID_SERIAL_NUMBER = 171, ///< DD invalid serial number + ALARM_ID_DD_NVM_INVALID_CAL_PRESSURE_SENSOR = 172, ///< DD invalid pressure sensor calibration record + ALARM_ID_DD_NVM_INVALID_CAL_TEMP_SENSOR = 173, ///< DD invalid temperature sensor calibration record + ALARM_ID_DD_NVM_INVALID_CAL_CONC_PUMP = 174, ///< DD invalid concentrate pump calibration record + ALARM_ID_DD_NVM_INVALID_CAL_D12_PUMP = 175, ///< DD invalid d12 dialysate pump calibration record + ALARM_ID_DD_NVM_INVALID_CAL_D48_PUMP = 176, ///< DD invalid d48 dialysate pump calibration record + ALARM_ID_DD_NVM_INVALID_CAL_ACID_CONCENTRATE = 177, ///< DD invalid acid concentrate calibration record + ALARM_ID_DD_NVM_INVALID_CAL_BICARB_CONCENTRATE = 178, ///< DD invalid bicarbonate concentrate calibration record + ALARM_ID_DD_NVM_INVALID_CAL_ACCEL_SENSOR = 179, ///< DD invalid accelerometer sensor calibration record + ALARM_ID_DD_NVM_INVALID_CAL_BLOOD_LEAK_SENSOR = 180, ///< DD invalid blood leak sensor calibration record + NUM_OF_ALARM_IDS ///< Number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -517,6 +527,15 @@ { ALARM_PRIORITY_HIGH, 2, ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_NVM_INVALID_INSTITUTIONAL_RECORD_CRC }, { ALARM_PRIORITY_HIGH, 2, ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_NVM_INVALID_USAGE_RECORD_CRC }, { ALARM_PRIORITY_HIGH, 2, ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_NVM_INVALID_SERIAL_NUMBER }, + { ALARM_PRIORITY_HIGH, 2, ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_NVM_INVALID_CAL_PRESSURE_SENSOR }, + { ALARM_PRIORITY_HIGH, 2, ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_NVM_INVALID_CAL_TEMP_SENSOR }, + { ALARM_PRIORITY_HIGH, 2, ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_NVM_INVALID_CAL_CONC_PUMP }, + { ALARM_PRIORITY_HIGH, 2, ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_NVM_INVALID_CAL_D12_PUMP }, + { ALARM_PRIORITY_HIGH, 2, ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_NVM_INVALID_CAL_D48_PUMP }, + { ALARM_PRIORITY_HIGH, 2, ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_NVM_INVALID_CAL_ACID_CONCENTRATE }, + { ALARM_PRIORITY_HIGH, 2, ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_NVM_INVALID_CAL_BICARB_CONCENTRATE }, + { ALARM_PRIORITY_HIGH, 2, ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_NVM_INVALID_CAL_ACCEL_SENSOR }, + { ALARM_PRIORITY_HIGH, 2, ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_NVM_INVALID_CAL_BLOOD_LEAK_SENSOR }, }; // Priority Rank Source Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr AutoRes ClrOnly TxLog ID /// Table of alarms and their rank. @@ -552,6 +571,15 @@ { 2, ALARM_ID_DD_NVM_INVALID_INSTITUTIONAL_RECORD_CRC }, { 2, ALARM_ID_DD_NVM_INVALID_USAGE_RECORD_CRC }, { 2, ALARM_ID_DD_NVM_INVALID_SERIAL_NUMBER }, + { 2, ALARM_ID_DD_NVM_INVALID_CAL_PRESSURE_SENSOR }, + { 2, ALARM_ID_DD_NVM_INVALID_CAL_TEMP_SENSOR }, + { 2, ALARM_ID_DD_NVM_INVALID_CAL_CONC_PUMP }, + { 2, ALARM_ID_DD_NVM_INVALID_CAL_D12_PUMP }, + { 2, ALARM_ID_DD_NVM_INVALID_CAL_D48_PUMP }, + { 2, ALARM_ID_DD_NVM_INVALID_CAL_ACID_CONCENTRATE }, + { 2, ALARM_ID_DD_NVM_INVALID_CAL_BICARB_CONCENTRATE }, + { 2, ALARM_ID_DD_NVM_INVALID_CAL_ACCEL_SENSOR }, + { 2, ALARM_ID_DD_NVM_INVALID_CAL_BLOOD_LEAK_SENSOR }, { 10, ALARM_ID_TD_SOFTWARE_FAULT }, { 10, ALARM_ID_TD_UI_COMM_TIMEOUT }, { 10, ALARM_ID_TD_COMM_TOO_MANY_BAD_CRCS }, @@ -891,9 +919,19 @@ { 166 , ALARM_ID_DD_NVM_INVALID_SYSTEM_RECORD_CRC , "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 POST: Sys Rec NVRAM CRC | DD invalid system record | If the calculated CRC of the DD system record image does not match the expected CRC. | "}, { 167 , ALARM_ID_DD_NVM_INVALID_SERVICE_RECORD_CRC , "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 POST: Serv Rec NVRAM CRC | DD invalid service record | If the calculated CRC of the DD service record image does not match the expected CRC. | "}, { 168 , ALARM_ID_DD_NVM_INVALID_CALIBRATION_RECORD_CRC , "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 POST: Cal NVRAM CRC | DD non-volatile calibration group invalid record CRC | If the DD NVM Calibration group calculated CRC does not matched the expected CRC. | "}, - { 168 , ALARM_ID_DD_NVM_INVALID_INSTITUTIONAL_RECORD_CRC , "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 POST: Instit NVRAM CRC | DD non-volatile institutional group invalid record CRC | If the DD NVM Institutional group calculated CRC does not matched the expected CRC. | "}, - { 169 , ALARM_ID_DD_NVM_INVALID_USAGE_RECORD_CRC , "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 POST: Usage Rec NVRAM CRC | DD non-volatile usage information group invalid record CRC | If the DD usage information record's CRC does not match the calculated CRC in POST. | "}, - { 170 , ALARM_ID_DD_NVM_INVALID_SERIAL_NUMBER , "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 POST: Serial Number Check | DD invalid serial number | If the DD serial number is empty and does not have any characters. | "}, + { 169 , ALARM_ID_DD_NVM_INVALID_INSTITUTIONAL_RECORD_CRC , "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 POST: Instit NVRAM CRC | DD non-volatile institutional group invalid record CRC | If the DD NVM Institutional group calculated CRC does not matched the expected CRC. | "}, + { 170 , ALARM_ID_DD_NVM_INVALID_USAGE_RECORD_CRC , "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 POST: Usage Rec NVRAM CRC | DD non-volatile usage information group invalid record CRC | If the DD usage information record's CRC does not match the calculated CRC in POST. | "}, + { 171 , ALARM_ID_DD_NVM_INVALID_SERIAL_NUMBER , "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 POST: Serial Number Check | DD invalid serial number | If the DD serial number is empty and does not have any characters. | "}, + { 172 , ALARM_ID_DD_NVM_INVALID_CAL_PRESSURE_SENSOR , "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 POST: Pressure Sensor CRC | DD invalid pressure sensor calibration record | If the calculated CRC of the DD pressure sensor calibration record image does not match the expected CRC.. | "}, + { 173 , ALARM_ID_DD_NVM_INVALID_CAL_TEMP_SENSOR , "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 POST: Temp Sensor CRC | DD invalid temperature sensor calibration record | If the calculated CRC of the DD temperature sensor calibration record image does not match the expected CRC. | "}, + { 174 , ALARM_ID_DD_NVM_INVALID_CAL_CONC_PUMP , "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 POST: Concentrate Pump CRC | DD invalid concentrate pump calibration record | If the calculated CRC of the DD concentrate pump calibration record image does not match the expected CRC. | "}, + { 175 , ALARM_ID_DD_NVM_INVALID_CAL_D12_PUMP , "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 POST: D12 Dialysate Pump CRC | DD invalid d12 dialysate pump calibration record | If the calculated CRC of the DD d12 dialysate pump calibration record image does not match the expected CRC. | "}, + { 176 , ALARM_ID_DD_NVM_INVALID_CAL_D48_PUMP , "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 POST: D48 Dialysate Pump CRC | DD invalid d48 dialysate pump calibration record | If the calculated CRC of the DD d48 dialysate pump calibration record image does not match the expected CRC. | "}, + { 177 , ALARM_ID_DD_NVM_INVALID_CAL_ACID_CONCENTRATE , "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 POST: Acid Concentrate CRC | DD invalid acid concentrate calibration record | If the calculated CRC of the DD acid concentrate calibration record image does not match the expected CRC. | "}, + { 178 , ALARM_ID_DD_NVM_INVALID_CAL_BICARB_CONCENTRATE , "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 POST: Bicarb Concentrate CRC | DD invalid bicarbonate concentrate calibration record | If the calculated CRC of the DD bicarbonate concentrate calibration record image does not match the expected CRC. | "}, + { 179 , ALARM_ID_DD_NVM_INVALID_CAL_ACCEL_SENSOR , "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 POST: Accel Sensor CRC | DD invalid accelerometer sensor calibration record | If the calculated CRC of the DD accelerometer sensor calibration record image does not match the expected CRC. | "}, + { 180 , ALARM_ID_DD_NVM_INVALID_CAL_BLOOD_LEAK_SENSOR , "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 POST: Blood Leak sensor CRC | DD invalid blood leak sensor calibration record | If the calculated CRC of the DD blood leak sensor calibration record image does not match the expected CRC. | "}, + }; #endif // manual alarms Index: MsgDefs.h =================================================================== diff -u -r3859d0bb360ec837dbc6e06b71aab8a36fd4961c -r29063fba3c4d1f663ec36c8b75f36c45305068be --- MsgDefs.h (.../MsgDefs.h) (revision 3859d0bb360ec837dbc6e06b71aab8a36fd4961c) +++ MsgDefs.h (.../MsgDefs.h) (revision 29063fba3c4d1f663ec36c8b75f36c45305068be) @@ -195,6 +195,34 @@ MSG_ID_UI_WATER_SAMPLE_RESULT_REQUEST = 0xA3, ///< UI water sample result request MSG_ID_UI_PRESSURE_LIMIT_WIDEN_REQUEST = 0xA4, ///< UI pressure limit widen request. MSG_ID_TD_PRESSURE_LIMIT_WIDEN_RESPONSE = 0xA5, ///< TD pressure limit widen response. + MSG_ID_UI_DD_NVM_GET_RECORD_REQUEST = 0xBA, ///< DD NVM Calibration send to UI + MSG_ID_DD_NVM_SYSTEM_RECORD_RESPONSE = 0xBB, ///< DD NVM System Record send to UI + MSG_ID_UI_DD_NVM_SET_SYSTEM_RECORD = 0xBC, ///< DD NVM System Record receive from UI + MSG_ID_DD_NVM_SERVICE_RECORD_RESPONSE = 0xBD, ///< DD NVM Service Record send to UI + MSG_ID_UI_DD_NVM_SET_SERVICE_RECORD = 0xBE, ///< DD NVM Service Record receive from UI + MSG_ID_DD_NVM_INSTITUTIONAL_RECORD_RESPONSE = 0xBF, ///< DD NVM Institutional Record send to UI + MSG_ID_UI_DD_NVM_SET_INSTITUTIONAL_RECORD = 0xC0, ///< DD NVM Institutional Record receive from UI + MSG_ID_DD_NVM_USAGE_INFO_RECORD_RESPONSE = 0xC1, ///< DD NVM Usage Info Record send to UI + MSG_ID_UI_DD_NVM_SET_USAGE_INFO_RECORD = 0xC2, ///< DD NVM Usage Info Record receive from UI + MSG_ID_DD_NVM_CAL_PRESSURE_SENSOR_RESPONSE = 0xC3, ///< DD NVM Pressure Sensor Calibration Record send to UI + MSG_ID_UI_DD_NVM_SET_CAL_PRESSURE_SENSOR = 0xC4, ///< DD NVM Pressure Sensor Calibration Record receive from UI + MSG_ID_DD_NVM_CAL_TEMP_SENSOR_RESPONSE = 0xC5, ///< DD NVM Temperature Sensor Calibration Record send to UI + MSG_ID_UI_DD_NVM_SET_CAL_TEMP_SENSOR = 0xC6, ///< DD NVM Temperature Sensor Calibration Record receive to UI + MSG_ID_DD_NVM_CAL_CONC_PUMP_RESPONSE = 0xC7, ///< DD NVM Concentrate Pump Calibration Record send to UI + MSG_ID_UI_DD_NVM_SET_CAL_CONC_PUMP = 0xC8, ///< DD NVM Concentrate Pump Calibration Record receive to UI + MSG_ID_DD_NVM_CAL_D12_PUMP_RESPONSE = 0xC9, ///< DD NVM D12 Dialysate Pump Calibration Record send to UI + MSG_ID_UI_DD_NVM_SET_CAL_D12_PUMP = 0xCA, ///< DD NVM D12 Dialysate Pump Calibration Record receive to UI + MSG_ID_DD_NVM_CAL_D48_PUMP_RESPONSE = 0xCB, ///< DD NVM D48 Dialysate Pump Calibration Record send to UI + MSG_ID_UI_DD_NVM_SET_CAL_D48_PUMP = 0xCC, ///< DD NVM D48 Dialysate Pump Calibration Record receive to UI + MSG_ID_DD_NVM_CAL_ACID_CONCENTRATE_RESPONSE = 0xCD, ///< DD NVM Acid Concentrate Calibration Record send to UI + MSG_ID_UI_DD_NVM_SET_CAL_ACID_CONCENTRATE = 0xCF, ///< DD NVM Acid Concentrate Calibration Record receive to UI + MSG_ID_DD_NVM_CAL_BICARB_CONCENTRATE_RESPONSE = 0xCF, ///< DD NVM Bicarbonate Concentrate Calibration Record send to UI + MSG_ID_UI_DD_NVM_SET_CAL_BICARB_CONCENTRATE = 0xD0, ///< DD NVM Bicarbonate Concentrate Calibration Record receive to UI + MSG_ID_DD_NVM_CAL_ACCEL_SENSOR_RESPONSE = 0xD1, ///< DD NVM Accelerometer Sensor Calibration Record send to UI + MSG_ID_UI_DD_NVM_SET_CAL_ACCEL_SENSOR = 0xD2, ///< DD NVM Accelerometer Sensor Calibration Record receive to UI + MSG_ID_DD_NVM_CAL_BLOOD_LEAK_SENSOR_RESPONSE = 0xD4, ///< DD NVM Blood Leak Sensor Calibration Record send to UI + MSG_ID_UI_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR = 0xD4, ///< DD NVM Blood Leak Sensor Calibration Record receive to UI + MSG_ID_DD_NVM_RECORD_CRC_OVERRIDE_REQUEST = 0xD5, ///< DD NVM Record CRC override request // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID @@ -364,19 +392,9 @@ MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST = 0xA059, ///< DD bicarb chamber fill request overrride request MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST = 0xA05A, ///< DD bicarb drain request overrride request MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST = 0xA05B, ///< DD bicarb cartridge select(small-0, large-1) overrride request - MSG_ID_DD_NVM_GET_RECORD = 0xA05C, ///< DD Non volatile Memory Calibration send to UI - MSG_ID_DD_NVM_SEND_SYSTEM_RECORD = 0xA05D, ///< DD Non volatile Memory System Record send to UI - MSG_ID_DD_NVM_SET_SYSTEM_RECORD = 0xA05E, ///< DD Non volatile Memory System Record receive from UI - MSG_ID_DD_NVM_SEND_SERVICE_RECORD = 0xA05F, ///< DD Non volatile Memory Service Record send to UI - MSG_ID_DD_NVM_SET_SERVICE_RECORD = 0xA060, ///< DD Non volatile Memory Service Record receive from UI - MSG_ID_DD_NVM_SEND_CALIBRATION_RECORD = 0xA061, ///< DD Non volatile Memory Calibration receive from UI - MSG_ID_DD_NVM_SET_CALIBRATION_RECORD = 0xA062, ///< DD Non volatile Memory Calibration receive from UI - MSG_ID_DD_NVM_SEND_INSTITUTIONAL_RECORD = 0xA063, ///< DD Non volatile Memory Institutional Record send to UI - MSG_ID_DD_NVM_SET_INSTITUTIONAL_RECORD = 0xA064, ///< DD Non volatile Memory Institutional Record receive from UI - MSG_ID_DD_NVM_SEND_USAGE_INFO_RECORD = 0xA065, ///< DD Non volatile Memory Usage Info Record send to UI - MSG_ID_DD_NVM_SET_USAGE_INFO_RECORD = 0xA066, ///< DD Non volatile Memory Usage Info Record receive from UI - MSG_ID_DD_NVM_RECORD_CRC_OVERRIDE_REQUEST = 0xA067, ///< DD Non volatile Memory Record CRC override request + + #ifdef __TEENSY_CONDUCTIVITY_DRIVER__ MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA100, ///< DD set conductivity model to conductivity sensors ( also applies to FP conductivity sensors ) MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xA101, ///< DD conductivity sensor resistance override request