Index: AlarmDefs.h =================================================================== diff -u -rdbc873e4e818974a1d732baa06141902407eb781 -re5a52695468f99e22b310e76267227549bdbc5cb --- AlarmDefs.h (.../AlarmDefs.h) (revision dbc873e4e818974a1d732baa06141902407eb781) +++ AlarmDefs.h (.../AlarmDefs.h) (revision e5a52695468f99e22b310e76267227549bdbc5cb) @@ -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 }, }; @@ -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: MsgDefs.h =================================================================== diff -u -r7ed2516a9a338cf838f1fbe1359e23c7da832d16 -re5a52695468f99e22b310e76267227549bdbc5cb --- MsgDefs.h (.../MsgDefs.h) (revision 7ed2516a9a338cf838f1fbe1359e23c7da832d16) +++ MsgDefs.h (.../MsgDefs.h) (revision e5a52695468f99e22b310e76267227549bdbc5cb) @@ -490,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_MSG_AVAILABLE_42 = 0xA04E, ///< Message ID available 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