DEN:7860: Resolved merge conflicts
master
+ 204 more
- DEN-10155-treatment-end-paused-state-not-displaying-resume-option
- DEN-10602_UI_DEV_Add_PatientID_PreTreatment
- DEN-11928-dg-conductivity-update
- DEN-11980-sw_dev-sprint-64
- DEN-12121-sw_dev-sprint-65-michael-garthwaite
- DEN-12441-sw_dev_sprint_67_darren
- DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle
- DEN-13053-S81-JI
- DEN-13154-heparin-syringe-empty-position-incorrect
- DEN-13198-UI_BN_75
- DEN-13598-dg_hd_dev-sprint-77-fw-dong
- DEN-13786-hd_dg_dev-s78_bb
- DEN-13794-instructions-step-to-reconnect-to-patient-after-rinseback-missing-from-ui
- DEN-13801-sw_dev-sprint-79_mg
- DEN-13834-dg_hd_dev-hd_dg_dvt-update-part-3
- DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow
- DEN-13903-s80-mg-DIAL-204
- DEN-13903-sprint-80_mg_air_trap_optimization
- DEN-13946-certain-temperature-sensors-trigger-wrong-alarm
- DEN-13962-UI-BN-S82
- DEN-13965-UI-BN-S80
- DEN-13965-UI-BN-S81
- DEN-13966-UI-BN-S81
- DEN-14000-sw_dev_sprint_80_darren
- DEN-14001-hd-battery-driver-update
- DEN-14086-alarm-159-dialysate-inlet-pump-failed-flow-vs-motor-speed-check
- DEN-14101-sw-s82-mg-DIAL-179-DIAL-184
- DEN-14147-UI-BN-S82
- DEN-14150-hd-dialysate-flow-estimation
- DEN-14166-dg_hd_dev-hd_dg_dvt-update-part-4
- DEN-14170-sw_dev_sprint_82_darren
- DEN-14175-dg_hd_dev-hd_dg_dvt-update-part-5
- DEN-14197-sw-s83-mg-pi-optimizations
- DEN-14209-UI-BN-S82
- DEN-14252-r2-does-not-tare-during-no-cartridge-self-tests
- DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device
- DEN-14273-gui-invalid-treatment-parameters-are-not-highlighted-red
- DEN-14294-UI-BN-S84
- DEN-14307-dg_hd_dev-hd_dg_dvt-update-part-6
- DEN-14316-chemical-disinfect
- DEN-14325-fw-blood-leak-alarm-triggers-when-cartridge-lever-is-unlocked
- DEN-14328-hd-event-issues
- DEN-14344-sw-s85-mg-air-pump
- DEN-14497-dg_hd_dev-hd_dg_dvt-update-part-7
- DEN-14546-add-option-to-resume-treatment-without-heparin-for-empty-syringe-alarm-1
- DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-treatment
- DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix
- DEN-14559-dg_hd_dev-hd_dg_dvt-update-part-8
- DEN-14589-DIAL-211
- DEN-14604-dg_hd_dev-hd_dg_dvt-update-part-9
- DEN-14607-alarm-89-and-198-trigger-during-priming
- DEN-14609-UI-VD-S89
- DEN-14646-fpga-alarm-properties-and-timing-3
- DEN-14689-messaging-bugs
- DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error
- DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked
- DEN-14749-syringe-pump-plunger-remains-extended-during-pretreatment-causing-hd-software-fault
- DEN-14763-dg_hd_dev-hd_dg_dvt-update-part-10
- DEN-14781-alarm-117-dg-can-message-not-acked
- DEN-14815-cartridge-removal-screen-is-displayed-prematurely
- DEN-14830-incorrect-dialysate-temperature-alarm-triggered
- DEN-14888-unable-to-trigger-alarm-47-ultrafiltration-rate-is-too-high-error-during-treatment
- DEN-14892-add-bootloader-to-existing-dg-firmware
- DEN-14906-dialyzer-de-prime
- DEN-14934-rinseback-back-to-treatment-workflow-missing-patient-reconnection-instructions
- DEN-14947-UI-VD-S94-Misc
- DEN-14999-alarm-table-updates
- DEN-14999-alarm-table-updates-part-2
- DEN-15014-dg_hd_dev-hd_dg_dvt-update-part-11
- DEN-15023-variation-in-syringe-pump-position-between-dvt-units
- DEN-15095-fw-system-faults-during-treatment-then-returns-to-the-standby-screen-reopen-1
- DEN-15105-dialyzer-flip
- DEN-15164-inlet-water-temp-alarm-closes-vpi
- DEN-15166-fw-add-drain-pump-maxon-board-rpm-check-cbit
- DEN-15183-2-in-treatment-rinseback-workflow-changes
- DEN-15183-in-treatment-rinseback-workflow-changes
- DEN-15196-DIAL-251
- DEN-15199-fw_dn_sprint_95
- DEN-15199-fw_dn_sprint_95-part-2
- DEN-15204-inlet-water-temperature-alarm-triggers-during-rinseback
- DEN-15214-alarm-47-uf-rate-is-too-high-triggered-during-treatment-when-uf-0-clone-of
- DEN-15215-ui-multiple-alarm-dialog-texts-appear-cropped
- DEN-15267-request-create-dialin-command-to-enable-air-bubble-alarm-in-service-mode-air-bubble
- DEN-15274-hd_dg_test_configuration_setup
- DEN-15278-blood-stop-air-trap-alarm-declares-during-saline-bolus-treatment
- DEN-15314-usability-update-alarm-text-to-not-use-acronyms
- DEN-15317-usability-hd-door-open-alarm-during-post-treatment
- DEN-15359-usability-arterial-and-venous-pressure-alarm-limits
- DEN-15363-fw-handle-bld-sensor-communication-errors
- DEN-15367-hd_dg_test_configuration_setup
- DEN-15444-resume-button-is-not-available-on-blood-stop-cartridge-lever-open-alarm-in
- DEN-15455-fw-dvt-6-and-16-cap-switches-do-not-update-when-caps-close
- DEN-15455-pt2-fw-dvt-6-and-16-cap-switches-do-not-update-when-caps-close
- DEN-15455-pt3-fw-dvt-6-and-16-cap-switches-do-not-update-when-caps-close
- DEN-15634-bad-fill-states-and-signal-updating-inconsistently
- DEN-15660-test_configuration_treatment_recovery
- DEN-15719-blood-pump-stopped-alarms-211-212-124-125-not-relevant-for-alarms-that-force-tx-to
- DEN-15742-typo-in-title-of-alarm-238
- DEN-15763-dg-restarted-alarm-107-cannot-be-cleared
- DEN-15788-pbo-ramps-up-to-400-mmhg-during-dialysate-circuit-priming
- DEN-15792-hd-software-design-description
- DEN-15842-alarm-272-fan-fault-hd-alarm-does-not-declare-during-post-tx
- DEN-15864-typo-in-title-of-alarm-142
- DEN-15885-alarm-171-has-incorrect-continuation-options
- DEN-15885-alarm-171-has-incorrect-continuation-options-pt2
- DEN-15886-air-pump-pushes-air-into-the-heparin-syringe-during-dry-self-tests
- DEN-15918-UI-VD-S102_POST_ConfigFilesCheck
- DEN-15921-when-cap-is-open-dg-transition-to-cancel-basic-path-instead-of-cancel-water-path
- DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment
- DEN-15996-over-ride-commands-duplicates-the-id-msg_id_valves_states_publish_interval_override
- DEN-16088-text-truncated-in-alarm-window-alarm-153-alarm-212-and-alarm-237
- DEN-16092-alarm-48-has-no-end-treatment-option
- DEN-16093-alarm-97-conductivity-out-of-range-triggered-on-first-fill-of-treatment
- DEN-16166-event-message-for-pass-fail-bld-self-test
- DEN-16200-3-syringe-pump-stuck-in-priming-state
- DEN-16200-4-syringe-pump-stuck-in-priming-state
- DEN-16200-syringe-pump-stuck-in-priming-state
- DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state
- DEN-16288-UI-BN-S104
- DEN-16309-heat-disinfect-has-spikes-in-temperature-near-95c-which-will-cause-water-to-boil-at
- DEN-16325-alarm-137-hd-excessive-tilt-alarm-at-power-up
- DEN-16372-srsdg-907-not-met
- DEN-16382-alarm-207-dg-flow-meter-check-failure-triggers-after-alarm-282-bicarbonate-volume
- DEN-16395-fw-remove-tro-tdi-check-from-post-treatment-modes-and-during-water-flush-and-chem-flush
- DEN-16424-certain-alarms-not-logged-in-treatment-log
- DEN-16428-need-a-way-or-approach-to-validate-the-srshd-1426
- DEN-16457-typo-in-alarm-315-disinfection-water-pressure-low
- DEN-16475-please-add-average-tdi-tro-delta
- DEN-16490-UI-BN-S108
- DEN-16499-fw-message-list-testing-issues
- DEN-16499-fw-message-list-testing-issues-2
- DEN-16565-sw-updater-hd-dg-app-side-intake-from-sunrise
- DEN-16587-alarm-278-rsvr-overfill-triggered-during-treatment-reservoirs-filled-to-2000-ml
- DEN-16587-alarm-278-rsvr-overfill-triggered-during-treatment-reservoirs-filled-to-2000-ml-p1
- DEN-16666-log-passing-results-of-self-test-2
- DEN-16666-log-passing-results-of-self-test-to-ui-log
- DEN-16674-td2-calibration-feature
- DEN-16674-td2-calibration-feature-2
- DEN-16680-p1b-inlet-water-shutdown-during-heat-disinfect-staging
- DEN-16682-use-cd2-values-for-acid-check
- DEN-16682-use-cd2-values-for-acid-check-2
- DEN-16693-institutional-settings-implementation
- DEN-16693-institutional-settings-implementation-2
- DEN-16773-add-chemical-disinfect-enable-institutional-record-2
- DEN-16773-add-chemical-disinfect-enable-to-the-institutional-record
- DEN-16778-system-does-not-check-that-air
- DEN-16782-unable-to-clear-communication-error-alarm-65-during-power-loss
- DEN-16782-unable-to-clear-communication-error-alarm-65-during-power-loss-2
- DEN-16819-In-Treatment-Parameter-mode-no-rejection-seen-when-hep_rate-or-hep_bol-value-is-set-to-less-than-0-p1-staging
- DEN-16851-new-alarm-for-increased-occlus
- DEN-16862-add-a-command-to-reset-hd-during-UI-software-install
- DEN-16874-alarm-278-message-requires-update-p1-staging
- DEN-16874-alarm-278-message-requires-update-to-clarify-and-reword-message
- DEN-16923-alarms-table-ranking-Discrepancies-with-PRS-Tracing-in-AE
- DEN-17046-alarm-301-remove-dialysate-cap-staging
- DEN-17053-release-17-firmware-update-alarm-update-staging
- DEN-17053-release-17-firmware-update-release-p1-staging
- DEN-17053-release-17-firmware-update-release-p1b-staging
- DEN-17063-cartridge-testing-special-s-w-
- DEN-17093-blood-leak-zeroing-in-treatment
- DEN-17093-blood-leak-zeroing-in-treatment-p1b-staging
- DEN-17135-concentrate-pump-calibration-staging
- DEN-17208-blood-leak-alarm-126-129-triggered-when-VDI-and-VDO-are-in-position-C-staging
- DEN-17220-release_20_p1b_staging
- DEN-17299-release_22_p1b_staging
- DENBUG-133-missing-parameters-in-device-information-screen
- DENBUG-163-2-high-venous-pressure-alarm-13
- DENBUG-163-high-venous-pressure-alarm-13
- DENBUG-236-alarm-97-when-running-treatment-at-Qd-100-and-1K-acid
- DENBUG-256-alarms-table-ranking-Discrepancies-p1-staging
- DENBUG-298-user-unable-to-deliver-saline-P1B-STAGING
- DENBUG-298-user-unable-to-deliver-saline-bolus-during-alarm-conditions-where-the-blood-pump-is-recirculating
- DENBUG-318-rejection-ratio-setting-feature-implementation-in-manufacturing-configuration-for-treatment-staging
- DENBUG-328-venous-pressure-alarm-did-not-trigger-P1B-STAGING
- DENBUG-328-venous-pressure-alarm-did-not-trigger-alarm-fix-STAGING
- DENBUG-328-venous-pressure-alarm-did-not-trigger-when-pressure-dropped-to-0-mmHg-STAGING
- DENBUG-59-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow
- DENBUG-62-fw-alarm-130-when-changing-qd-pressure
- DENBUG-64-sys-dialyzer-blood-leak-alarm-triggered-during-treatment
- DENBUG-83-alarm-278-triggered-active-res-weight-out-of-range
- DENBUG-94-prs-872-prs-874-not-met-in-pre-treatment-treatment
- DIAL-252-request-create-dialin-command-to-enable-air-bubble-alarm-in-service-mode-air-bubble
- DIAL-269-pure-water-mode-not-able-to-turn-on-off
- DIAL-281-requesting-heat-disinfect-timer-overrides
- DIAL-283-no-moving-average-commands-conductivity
- STT-2824-vtchd-504-verify-alarm-is-set-point-not-set-after-3-trials
- cdc-demo-branch-218
- demo_branch
- develop
- hd_cdc_demo_branch_320
- intertek_branch
- intertek_branch_from_release_10
- leahi/staging
- nelson_heat_disinfect_transfer_change
- release/Oct-09
- release/Oct-17
- release/p1
- release/p1_develop
- release/p1_staging
- release/p1b/develop
- release/p1b/master
- release/p1b/staging
- staging
- swupdateHD
|
 |
