Index: AlarmDefs.h =================================================================== diff -u -r731b04a16562482fb7b24141a5bfd19bbc1f27b7 -r48582df36486e847be09c5ef147fee7b80683319 --- AlarmDefs.h (.../AlarmDefs.h) (revision 731b04a16562482fb7b24141a5bfd19bbc1f27b7) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 48582df36486e847be09c5ef147fee7b80683319) @@ -292,7 +292,7 @@ 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_DISINFECT_CHEM_FLUSH = 256, ///< HD processor is in Disinfect Chemical Flush mode - ALARM_ID_AVAILABLE_8 = 257, ///< Alarm ID available for use + ALARM_ID_HD_INVALID_INSTITUTIONAL_RECORD_CRC = 257, ///< HD invalid institutional record 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 @@ -745,7 +745,7 @@ { ALARM_PRIORITY_HIGH, 2, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_INVALID_SERVICE_RECORD_CRC }, { 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_HIGH, 2, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_HD_INVALID_INSTITUTIONAL_RECORD_CRC }, { 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 }, @@ -796,7 +796,7 @@ { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_DRAIN_PUMP_DIRECTION_FPGA_FAULT }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_INVALID_USAGE_RECORD_CRC }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_CPU_RAM_ERROR }, - { ALARM_PRIORITY_LOW, 999, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_50 }, + { ALARM_PRIORITY_LOW, 999, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_50 }, { ALARM_PRIORITY_HIGH, 100, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CPI_COND_SENSOR_INVALID_CHAR }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CPO_COND_SENSOR_INVALID_CHAR }, @@ -878,6 +878,7 @@ { 2, ALARM_ID_DG_INVALID_SERIAL_NUMBER }, { 2, ALARM_ID_DG_LOAD_CELLS_INVALID_CAL_RECORD }, { 2, ALARM_ID_DG_RTC_OR_TIMER_ACCURACY_FAILURE }, + { 2, ALARM_ID_HD_INVALID_INSTITUTIONAL_RECORD_CRC }, { 2, ALARM_ID_DG_TEMPERATURE_SENSORS_INVALID_CAL_RECORD }, { 2, ALARM_ID_DG_COND_SENSORS_INVALID_TEMP_COMP_CAL_RECORD }, { 2, ALARM_ID_DG_FILL_CONDUCTIVITIES_INVALID_CAL_RECORD }, @@ -1135,7 +1136,6 @@ { 999, ALARM_ID_HD_UI_POST_FAILURE_DISPLAY }, { 999, ALARM_ID_AVAILABLE_5 }, { 999, ALARM_ID_AVAILABLE_7 }, - { 999, ALARM_ID_AVAILABLE_8 }, { 999, ALARM_ID_AVAILABLE_10 }, { 999, ALARM_ID_AVAILABLE_13 }, { 999, ALARM_ID_AVAILABLE_15 }, @@ -1421,7 +1421,7 @@ { 254 , ALARM_ID_DG_INVALID_SERVICE_RECORD_CRC , "DG | 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. | DG POST: Serv Rec NVRAM CRC | 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 | 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 , " | | | | | | "}, + { 257 , ALARM_ID_HD_INVALID_INSTITUTIONAL_RECORD_CRC , "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: Institutional Rec NVRAM CRC | HD invalid institutional record | If the calculated CRC of the HD institutional record image does not match the expected CRC. | "}, { 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 failure. | "}, { 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 failure. | "}, Index: Compatible.h =================================================================== diff -u -ra6a5751bb18aadc4c9d8808ea4b691ae1812c4f1 -r48582df36486e847be09c5ef147fee7b80683319 --- Compatible.h (.../Compatible.h) (revision a6a5751bb18aadc4c9d8808ea4b691ae1812c4f1) +++ Compatible.h (.../Compatible.h) (revision 48582df36486e847be09c5ef147fee7b80683319) @@ -25,7 +25,7 @@ * @{ */ -#define SW_COMPATIBILITY_REV 10 ///< Compatibility revision for all system software stacks (HD and DG and UI). +#define SW_COMPATIBILITY_REV 11 ///< Compatibility revision for all system software stacks (HD and DG and UI). #define HD_FPGA_COMPATIBILITY_REV 1 ///< Compatibility revision for HD firmware with HD FPGA. #define DG_FPGA_COMPATIBILITY_REV 2 ///< Compatibility revision for DG firmware with DG FPGA. Index: HDDefs.h =================================================================== diff -u -r34f6ca900c3bafff4460d2838dd73672efc6c707 -r48582df36486e847be09c5ef147fee7b80683319 --- HDDefs.h (.../HDDefs.h) (revision 34f6ca900c3bafff4460d2838dd73672efc6c707) +++ HDDefs.h (.../HDDefs.h) (revision 48582df36486e847be09c5ef147fee7b80683319) @@ -719,13 +719,6 @@ HEPARIN_START_RESUME_EVENT, ///< Heparin start or resume event HEPARIN_STOP_PAUSE_EVENT, ///< Heparin stop or pause event SALINE_BOLUSES_CHANGE_EVENT, ///< Saline boluses change event - MID_TREATMENT_RINSE_BACK_EVENT, ///< Mid treatment rinse-back event - ALARM_AUDIO_VOLUME_CHANGED_EVENT, ///< Alarm audio volume changed event - FRONT_DOOR_SWITCH_CHANGED_EVENT, ///< Front door switch changed event - PUMP_TRACK_SWITCH_CHANGED_EVENT, ///< Pump track switch changed event - SYRINGE_DETECTION_SWITCH_CHANGED_EVENT, ///< Syringe detection switch changed event - OFF_BUTTON_PRESSED_EVENT, ///< Off button pressed event - STOP_BUTTON_PRESSED_EVENT, ///< Stop button pressed event NUM_OF_TX_EVENT_IDS ///< Total number of treatment events }; typedef enum Tx_Event_List TX_EVENT_ID_T; ///< Type for treatment event list enumeration @@ -769,6 +762,7 @@ HD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT, ///< HD blood leak self tests result. HD_EVENT_BLOOD_LEAK_NUM_OF_SET_POINT_CHECK_FAILURES, ///< HD blood leak number of set point check failures HD_EVENT_DRY_SELF_TEST_PRESSURE_DECAY_WAIT_PERIOD, ///< HD dry self test pressure decay waiting period. + HD_EVENT_INSTIT_RECORD_UPDATE, ///< HD new institutional record has been updated. NUM_OF_EVENT_IDS ///< Total number of HD events }; typedef enum HD_Event_List HD_EVENT_ID_T; ///< Type for HD event list enumeration Index: MsgDefs.h =================================================================== diff -u -r7d98871b56f7e897cbbc0082214a5346f8985f57 -r48582df36486e847be09c5ef147fee7b80683319 --- MsgDefs.h (.../MsgDefs.h) (revision 7d98871b56f7e897cbbc0082214a5346f8985f57) +++ MsgDefs.h (.../MsgDefs.h) (revision 48582df36486e847be09c5ef147fee7b80683319) @@ -235,6 +235,8 @@ MSG_ID_HD_SEND_RO_PERMEATE_SAMPLE_DISPENSE_REQUEST_TO_DG = 0xCB, ///< HD send RO permeate sample dispense request to DG MSG_ID_DG_SEND_RO_PERMEATE_SAMPLE_DISPENSE_READY_TO_HD = 0xCD, ///< DG send RO permeate sample dispense ready to HD MSG_ID_DG_DRAIN_MODE_DATA = 0xCE, ///< DG drain mode data broadcast message + MSG_ID_UI_INSTITUTIONAL_RECORD_REQUEST = 0xCF, ///< UI request institutional record request + MSG_ID_HD_INSTITUTIONAL_RECORD_RESPONSE = 0xD0, ///< HD institutional record response #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing @@ -399,6 +401,9 @@ MSG_ID_HD_CAN_RECEIVE_ACK_MESSAGE_OVERRIDE = 0x809B, ///< HD CAN message acknowledgment override request MSG_ID_HD_RECIRULATION_PCT_OVERRIDE = 0x809C, ///< HD recirulation percentage override request MSG_ID_HD_RAW_AIR_TRAP_LEVEL_SENSOR_OVERRIDE = 0x809D, ///< HD raw air trap level sensor override request + MSG_ID_HD_GET_INSTITUTIONAL_RECORD = 0x809E, ///< HD get institutional record + MSG_ID_HD_SET_INSTITUTIONAL_RECORD = 0x809F, ///< HD set institutional record + MSG_ID_HD_SEND_INSTITUTIONAL_RECORD = 0x80A0, ///< HD send institutional record MSG_ID_FIRST_DG_TESTER_MESSAGE = 0xA000, ///< First DG test message ID MSG_ID_DG_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DG_TESTER_MESSAGE, ///< DG tester log-in