Clone
 

james walter taylor <jtaylor@diality.com> in common

Merge remote-tracking branch 'origin/DEN-15996-over-ride-commands-duplicates-the-id-msg_id_valves_states_publish_interval_override' into staging

Merge remote-tracking branch 'origin/DEN-15996-over-ride-commands-duplicates-the-id-msg_id_valves_states_publish_interval_override' into develop

DEN-15996-over-ride-commands-duplicates-the-id-msg_id_valves_states_publish_interval_override

Separated duplicate message.

Merge remote-tracking branch 'origin/DEN-16088-text-truncated-in-alarm-window-alarm-153-alarm-212-and-alarm-237' into staging

Merge remote-tracking branch 'origin/DEN-16088-text-truncated-in-alarm-window-alarm-153-alarm-212-and-alarm-237' into develop

DEN-16088-text-truncated-in-alarm-window-alarm-153-alarm-212-and-alarm-237

Column alignment corrected (CR)

DEN-16088-text-truncated-in-alarm-window-alarm-153-alarm-212-and-alarm-237

Clean up comments

DEN-16088-text-truncated-in-alarm-window-alarm-153-alarm-212-and-alarm-237

Text updated.

Merge branch 'DEN-15719-blood-pump-stopped-alarms-211-212-124-125-not-relevant-for-alarms-that-force-tx-to' into staging

Merge remote-tracking branch 'origin/DEN-15719-blood-pump-stopped-alarms-211-212-124-125-not-relevant-for-alarms-that-force-tx-to' into develop

DEN-15719-blood-pump-stopped-alarms-211-212-124-125-not-relevant-for-alarms-that-force-tx-to

Retrigger blocked for 211,212,124,125

DEN-14546-add-option-to-resume-treatment-without-heparin-for-empty-syringe-alarm-1

Response to code review comments.

Merge branch 'DEN-15095-fw-system-faults-during-treatment-then-returns-to-the-standby-screen-reopen-1' into develop

Merge branch 'DEN-15095-fw-system-faults-during-treatment-then-returns-to-the-standby-screen-reopen-1' into staging

DEN-14546-add-option-to-resume-treatment-without-heparin-for-empty-syringe-alarm-1

Add resume to alarm table

HD-DEN-15095_FW System Faults During Treatment Then Returns TO The Standby Screen Reopen

Corectly ordered the table, updated the flags per Sean Nash

Merge remote-tracking branch 'origin/staging' into DEN-15095-fw-system-faults-during-treatment-then-returns-to-the-standby-screen-reopen-1

DEN-15095-fw-system-faults-during-treatment-then-returns-to-the-standby-screen-reopen-1

Updated venous bubble alarms to match SRSHD

Merge remote-tracking branch 'origin/DEN-10155-treatment-end-paused-state-not-displaying-resume-option' into staging

Merge remote-tracking branch 'origin/DEN-10155-treatment-end-paused-state-not-displaying-resume-option' into develop

DEN-10155-treatment-end-paused-state-not-displaying-resume-option

Updated END_OF_TREATMENT_WARNING to allow resume, and allow blood recirculation.