Index: AlarmDefs.h =================================================================== diff -u -r3e21e2633bccca3a4575fd26169b0855cfba0e2d -r8fc441b150d7a6aedf415c329ada5c29da99bf27 --- AlarmDefs.h (.../AlarmDefs.h) (revision 3e21e2633bccca3a4575fd26169b0855cfba0e2d) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 8fc441b150d7a6aedf415c329ada5c29da99bf27) @@ -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 > 3240 (3340 - 100). | "}, - { 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 > 3680 (3780 - 100). | "}, + { 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. | "}, { 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 -rc19c06d1b5f4aa16ea13837e7177cceb83a14aee -r8fc441b150d7a6aedf415c329ada5c29da99bf27 --- Compatible.h (.../Compatible.h) (revision c19c06d1b5f4aa16ea13837e7177cceb83a14aee) +++ Compatible.h (.../Compatible.h) (revision 8fc441b150d7a6aedf415c329ada5c29da99bf27) @@ -25,7 +25,7 @@ * @{ */ -#define SW_COMPATIBILITY_REV 14 ///< Compatibility revision for all system software stacks (HD and DG and UI). +#define SW_COMPATIBILITY_REV 15 ///< 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 -r7e4af9418fcd628667b23f4cf4921e9232ea8d9a -r8fc441b150d7a6aedf415c329ada5c29da99bf27 --- HDDefs.h (.../HDDefs.h) (revision 7e4af9418fcd628667b23f4cf4921e9232ea8d9a) +++ HDDefs.h (.../HDDefs.h) (revision 8fc441b150d7a6aedf415c329ada5c29da99bf27) @@ -396,12 +396,26 @@ * @{ */ +/// Blood leak zeroing states +enum Blood_Leak_Zeroing_States +{ + BLD_ZEROING_IDLE_STATE = 0, ///< Blood leak zeroing idle state. + BLD_ZEROING_FLUSH_RSRVR_2_DPI_STATE, ///< Blood leak zeroing flush reservoir to DPi state. + BLD_ZEROING_FLUSH_DPI_2_BLD_STATE, ///< Blood leak zeroing flush DPi to BLD state. + BLD_ZEROING_ZERO_STATE, ///< Blood leak zeroing zero state. + BLD_ZEROING_VERIFY_ZEROING_STATE, ///< Blood leak zeroing verify zeroing state. + BLD_ZEROING_COMPLETE_STATE, ///< Blood leak zeroing complete state. + NUM_OF_BLD_ZEROING_STATES ///< Number of blood leak zeroing states. +}; +typedef enum Blood_Leak_Zeroing_States BLOOD_LEAK_ZEROING_STATE_T; + /// Enumeration of dialysis sub-mode states. enum Dialysis_States { DIALYSIS_START_STATE = 0, ///< Start state of the dialysis sub-mode state machine DIALYSIS_UF_STATE, ///< Ultrafiltration state of the dialysis sub-mode state machine DIALYSIS_SALINE_BOLUS_STATE, ///< Saline bolus state of the dialysis sub-mode state machine + DIALYSIS_BLOOD_LEAK_ZEROING_STATE, ///< Blood leak zeroing state of the dialysis sub-mode state machine NUM_OF_DIALYSIS_STATES ///< Number of dialysis sub-mode states }; typedef enum Dialysis_States DIALYSIS_STATE_T; ///< Type for dialysis states enumeration @@ -764,6 +778,8 @@ 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. HD_EVENT_PARTIAL_OCCLUSION_BASELINE, ///< HD event partial occlusion baseline event + HD_EVENT_BLOOD_LEAK_ZEROING_REQUEST, ///< HD event blood leak zeroing request. + HD_EVENT_BLOOD_LEAK_ZEROING_REQUIRED, ///< HD event blood leak zeroing required. 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 -rc19c06d1b5f4aa16ea13837e7177cceb83a14aee -r8fc441b150d7a6aedf415c329ada5c29da99bf27 --- MsgDefs.h (.../MsgDefs.h) (revision c19c06d1b5f4aa16ea13837e7177cceb83a14aee) +++ MsgDefs.h (.../MsgDefs.h) (revision 8fc441b150d7a6aedf415c329ada5c29da99bf27) @@ -407,6 +407,9 @@ MSG_ID_HD_SEND_INSTITUTIONAL_RECORD = 0x80A0, ///< HD send institutional record MSG_ID_HD_PARTIAL_OCCLUSION_BLOOD_PUMP_OVERRIDE = 0x80A1, ///< HD Partial Blood pump occlusion pressure measured override request MSG_ID_HD_PARTIAL_OCCL_BLOOD_PUMP_BASELINE_OVERRIDE = 0x80A2, ///< HD Partial Blood pump occlusion baseline override request + MSG_ID_HD_BLOOD_LEAK_EMB_MODE_INFO_VALUES_OVERRIDE = 0x80A3, ///< HD blood leak embedded mode info values override + MSG_ID_HD_BLOOD_LEAK_INTENSITY_MVG_AVERAGE_OVERRIDE = 0x80A4, ///< HD blood leak intensity moving average override + MSG_ID_HD_BLOOD_LEAK_ZEROING_INTERVAL_IN_MINS_OVERRIDE = 0x80A5, ///< HD blood leak zeroing interval in minutes override 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