Index: AlarmDefs.h =================================================================== diff -u -rf7c27cc9775b8e20654d8b44ce6b35a67d6fc139 -r236637e98959c6869e8cecc22a24d81dff78a18e --- AlarmDefs.h (.../AlarmDefs.h) (revision f7c27cc9775b8e20654d8b44ce6b35a67d6fc139) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 236637e98959c6869e8cecc22a24d81dff78a18e) @@ -316,8 +316,8 @@ ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE = 278, ///< HD active reservoir weight out of range. ALARM_ID_DG_DIALYSATE_DRAIN_TIME_OUT = 279, ///< DG dialysate drain time out ALARM_ID_DG_DRAIN_PUMP_DIRECTION_INVALID = 280, ///< DG drain pump direction invalid - ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME = 281, ///< Acid concentration bottle low volume alarm - ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME = 282, ///< Bicarbonate concentration bottle low volume alarm + ALARM_ID_AVAILABLE_40 = 281, ///< Alarm available + ALARM_ID_AVAILABLE_41 = 282, ///< Alarm available ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE = 283, ///< DG load cells weight out of range ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE = 284, ///< DG load cells primary/back up drift out of range ALARM_ID_HD_RO_PERMEATE_SAMPLE = 285, ///< HD processor is in RO permeate sample mode @@ -770,8 +770,8 @@ { ALARM_PRIORITY_MEDIUM, 421, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_DIALYSATE_DRAIN_TIME_OUT }, { 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_INVALID }, - { ALARM_PRIORITY_MEDIUM, 412, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME }, - { ALARM_PRIORITY_MEDIUM, 413, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME }, + { ALARM_PRIORITY_LOW, 999, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_40 }, + { ALARM_PRIORITY_LOW, 999, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_41 }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE }, { ALARM_PRIORITY_LOW, 845, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_RO_PERMEATE_SAMPLE }, @@ -1052,8 +1052,6 @@ { 402, ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP }, { 410, ALARM_ID_DG_ACID_CONDUCTIVITY_OUT_OF_RANGE }, { 411, ALARM_ID_DG_BICARB_CONDUCTIVITY_OUT_OF_RANGE }, - { 412, ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME }, - { 413, ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME }, { 420, ALARM_ID_DG_FILL_CONDUCTIVITY_OUT_OF_RANGE }, { 421, ALARM_ID_HD_ACTIVE_RESERVOIR_RECIRCULATION_OUT_OF_RANGE }, { 421, ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE }, @@ -1143,6 +1141,8 @@ { 999, ALARM_ID_AVAILABLE_30 }, { 999, ALARM_ID_AVAILABLE_31 }, { 999, ALARM_ID_AVAILABLE_32 }, + { 999, ALARM_ID_AVAILABLE_40 }, + { 999, ALARM_ID_AVAILABLE_41 }, { 999, ALARM_ID_NO_ALARM }, }; @@ -1261,7 +1261,7 @@ { 94 , ALARM_ID_DG_PRESSURE_OUT_OF_RANGE , "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: Pressure Sensor Range | DG pressure sensor out of range | If either of the pressure sensors is < 0 psia or > 200 psia for DG pressure sensors. | "}, { 95 , ALARM_ID_DG_WATCHDOG_EXPIRED , "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: WD Error | DG watchdog expired | If the watchdog signal is low while not in POST. | "}, { 96 , ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE , "DG | Incoming Water Temperature High | Incoming water temperature is high.\n- Treatment is currently paused.\n- Check the incoming water supply.\n- When the temperature is within target range\nResume/OK button will be available.\n- Press Resume/OK to continue treatment. | Dial. Gen: Inlet Water Temp High | DG inlet water temperature out of range | If the inlet water temperature is > 37 C. | "}, - { 97 , ALARM_ID_DG_FILL_CONDUCTIVITY_OUT_OF_RANGE , "DG | Conductivity Out of Range | Treatment is currently paused.\n- Confirm that acid and bicarbonate concentrates\nare securely connected.\n- If empty, replace. \n- Treatment will need to be resumed when conductivity\nis within target range. | Dial. Gen: Dialysate Cond. | DG fill conductivity out of range | If the average acid or bicard conductivity is > 5% of the normal acid and bicarb conductivity values. | "}, + { 97 , ALARM_ID_DG_FILL_CONDUCTIVITY_OUT_OF_RANGE , "DG | Conductivity Out of Range | Treatment is currently paused.\n- Confirm that acid and bicarbonate concentrates are securely\nconnected.\n- If bubbles are observed in either of the concentrate lines\nreplace it with a new concentrate container.\n- Treatment will need to be resumed when conductivity\nis within target range. | Dial. Gen: Dialysate Cond. | DG fill conductivity out of range | If the average acid or bicard conductivity is > 5% of the normal acid and bicarb conductivity values. | "}, { 98 , ALARM_ID_HD_BATTERY_COMM_FAULT , "HD | Service Required: Hemodialysis Device | A non- critical problem was detected with the hemodialysis\n device.\n- Call service to report the issue and schedule a repair. | HD Alarm (Low): Battery Com | HD battery or battery charger communication fault | If battery I2C communication fault persistence count > 5. | "}, { 99 , ALARM_ID_HD_SYRINGE_PUMP_STALL , "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: Syringe Pump Stall | HD syringe pump stall alarm | If syringe pump measured rate < stall speed threshold (0.05) and the ramp up has been restarted 3 times after stall has been detected. | "}, { 100 , ALARM_ID_DG_COND_SENSORS_INVALID_TEMP_COMP_CAL_RECORD , "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: Conductivity Cal | DG conductivity sensors temperatrue compensation invalid calibration record | If the calibration data that was received from NVDataMgmt is NOT legitimate | "}, @@ -1445,8 +1445,8 @@ { 278 , ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE , "HD | Dialysate Reservoir Error | A problem has been detected with dialysate generation. \n- Treatment is paused and will need to be resumed when \ndialysate is ready for use. | Dial. Gen: Reservoir Overfill | HD active reservoir weight out of range. | If the active reservoir weight is > 1900.0 g. | "}, { 279 , ALARM_ID_DG_DIALYSATE_DRAIN_TIME_OUT , "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: Reservoir Drain | DG dialysate drain time out | If the DG dialysate drain exceeded 120 seconds. | "}, { 280 , ALARM_ID_DG_DRAIN_PUMP_DIRECTION_INVALID , "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: DRP Direction Fault | DG drain pump invalid direction | If the drain pump's direction is not 1 when draining. | "}, - { 281 , ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME , "DG | Acid Concentrate Low | The acid concentrate is low.\n- Replace acid concentrate container. | Dial. Gen: Acid Conc. Low | DG Acid concentration bottle low volume alarm | If the acid concentration bottle volume <= 500 mL. | "}, - { 282 , ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME , "DG | Bicarb Concentrate Low | Bicarbonate concentrate is low.\n- Replace the bicarbonate concentrate container. | Dial. Gen: Bicarb Conc. Low | DG Bicarbonate concentration bottle low volume alarm | If the bicarbonate concentration bottle volume <= 500 mL. | "}, + { 281 , ALARM_ID_AVAILABLE_40 , " | | | | | | "}, + { 282 , ALARM_ID_AVAILABLE_41 , " | | | | | | "}, { 283 , ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE , "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: LC Range | DG load cells weight out of range | If the weight of the DG load cells > 4500.0 g or < 0.0 g. | "}, { 284 , ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE , "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: Redundant LC Check | DG load cells primary/back up drift out of range | If redundant load cells deviate by more than 60g after tare for 5 seconds. | "}, { 285 , ALARM_ID_HD_RO_PERMEATE_SAMPLE , "HD | RO Permeate Sample in Progress | RO Permeate Sample is 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: RO Permeate Sample In Progress | DG RO permeate sample started | If DG RO permeate sample successfully started from UI. | "}, Index: Compatible.h =================================================================== diff -u -rf7c27cc9775b8e20654d8b44ce6b35a67d6fc139 -r236637e98959c6869e8cecc22a24d81dff78a18e --- Compatible.h (.../Compatible.h) (revision f7c27cc9775b8e20654d8b44ce6b35a67d6fc139) +++ Compatible.h (.../Compatible.h) (revision 236637e98959c6869e8cecc22a24d81dff78a18e) @@ -25,7 +25,7 @@ * @{ */ -#define SW_COMPATIBILITY_REV 17 ///< Compatibility revision for all system software stacks (HD and DG and UI). +#define SW_COMPATIBILITY_REV 18 ///< 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: DGDefs.h =================================================================== diff -u -raec79b5976528cca7e9041b778be367e4758e7a3 -r236637e98959c6869e8cecc22a24d81dff78a18e --- DGDefs.h (.../DGDefs.h) (revision aec79b5976528cca7e9041b778be367e4758e7a3) +++ DGDefs.h (.../DGDefs.h) (revision 236637e98959c6869e8cecc22a24d81dff78a18e) @@ -676,6 +676,9 @@ DG_EVENT_ACID_CHECK_RESULT, ///< DG acid check result DG_EVENT_COND1_VS_COND2_DIFF_RESULT, ///< DG CD1 (acid) vs. CD2 (bicarb) different result DG_EVENT_PASSIVE_COOL_HEAT_DISINFECT_STATUS, ///< DG passive cool heat disinfect status + DG_EVENT_MIN_RO_REJECTION_RATIO_PCT_FROM_HD_INSTIT_RECORD, ///< DG min RO rejection ratio in percent from HD institutional record + DG_EVENT_MIN_INLET_WATER_COND_ALARM_FROM_HD_INSTIT_RECORD, ///< DG min inlet water conductivity alarm limit from HD institutional record + DG_EVENT_CALC_RO_REJECTION_RATIO, ///< DG calculated RO rejection ratio 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: MsgDefs.h =================================================================== diff -u -rf7c27cc9775b8e20654d8b44ce6b35a67d6fc139 -r236637e98959c6869e8cecc22a24d81dff78a18e --- MsgDefs.h (.../MsgDefs.h) (revision f7c27cc9775b8e20654d8b44ce6b35a67d6fc139) +++ MsgDefs.h (.../MsgDefs.h) (revision 236637e98959c6869e8cecc22a24d81dff78a18e) @@ -238,6 +238,8 @@ 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 + MSG_ID_DG_INSTIT_VALUES_FROM_HD_INSTIT_RECORD_REQUEST = 0xD1, ///< DG institutional values from HD institutional record request + MSG_ID_DG_INSTIT_VALUES_FROM_HD_INSTIT_RECORD_RESPONSE = 0xD2, ///< DG institutional values from HD institutional record to DG response #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing @@ -488,9 +490,9 @@ MSG_ID_DG_SET_SW_CONFIG_RECORD = 0xA04B, ///< DG set software configuration record MSG_ID_DG_SEND_SW_CONFIG_RECORD = 0xA04C, ///< DG send software configuration record MSG_ID_DG_FANS_DUTY_CYCLE_OVERRIDE = 0xA04D, ///< DG fans duty cycle override request - MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE = 0xA04E, ///< DG used acid volume override in mL + MSG_ID_DG_MODE_FILL_ENABLE_CHEMS_TEST = 0xA04E, ///< DG mode fill enable chemicals test MSG_ID_DG_SET_FANS_RPM_ALARM_START_TIME_OFFSET = 0xA04F, ///< DG set fans RPM alarm start time offset - MSG_ID_DG_USED_BICARB_VOLUME_ML_OVERRIDE = 0xA050, ///< DG used bicarb volume override in mL + MSG_ID_MSG_AVAILABLE_43 = 0xA050, ///< Message ID available MSG_ID_FILL_MODE_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA051, ///< DG used fill publish interval override request MSG_ID_DG_GEN_IDLE_PUBLISH_INTERVAL_OVERRIDE = 0xA052, ///< DG gen idle sub-states publish interval override request MSG_ID_DG_GET_USAGE_INFO_RECORD = 0xA053, ///< DG get usage information record