Clone
 

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

Merge remote-tracking branch 'origin/HD-DEN-16314-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low' into staging

Merge remote-tracking branch 'origin/HD-DEN-16314-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low' into develop

HD-DEN-16314-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low

Removed unused elements of Reservoir data.

    • -3
    • +0
    /firmware/App/Controllers/DGInterface.h
Merge remote-tracking branch 'origin/DEN-16314-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low' into develop

    • -3
    • +0
    /firmware/App/Controllers/DGInterface.h
DEN-16314-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low

Updated the DG_RESERVOIR_DATA_T structure on the HD side

    • -3
    • +0
    /firmware/App/Controllers/DGInterface.h
Merge remote-tracking branch 'origin/DEN-16278-hd-pretreatment-prime-start-state-does-not-allow-pause' into staging

Merge branch 'DEN-16278-hd-pretreatment-prime-start-state-does-not-allow-pause' into develop

DEN-16278-hd-pretreatment-prime-start-state-does-not-allow-pause

Added pause/stop property detection in start state.

Merge remote-tracking branch 'origin/DEN-15994-rinseback-5-minute-timer-does-not-count-down' into staging

Merge remote-tracking branch 'origin/DEN-15630-vtchd-598-transitions-not-found' into develop

    • -11
    • +9
    /firmware/App/Controllers/BloodLeak.c
    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
DEN-15630-vtchd-598-transitions-not-found

Added code in pre-treatment prime state to allow pause in start state.

Merge remote-tracking branch 'origin/DEN-15994-rinseback-5-minute-timer-does-not-count-down' into develop

DEN-15994-rinseback-5-minute-timer-does-not-count-down

Simplification.

DEN-15994-rinseback-5-minute-timer-does-not-count-down

Updated for CR comments.

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-15994-rinseback-5-minute-timer-does-not-count-down' into develop

DEN-15994-rinseback-5-minute-timer-does-not-count-down

Typo. Corrected display enable logic.

Merge remote-tracking branch 'origin/DEN-15994-rinseback-5-minute-timer-does-not-count-down' into develop

DEN-15994-rinseback-5-minute-timer-does-not-count-down

Moved fix to correct message.

Merge remote-tracking branch 'origin/DEN-15927-alarm-127-low-venous-pressure-triggers-post-treatment-1' into develop

DEN-15927-alarm-127-low-venous-pressure-triggers-post-treatment-1

Remove unnecessary define

Merge remote-tracking branch 'origin/develop' into develop

DEN-15927-alarm-127-low-venous-pressure-triggers-post-treatment-1

Removed unnecessary define.

Merge remote-tracking branch 'origin/DEN-15927-alarm-127-low-venous-pressure-triggers-post-treatment-1' into develop

DEN-15927-alarm-127-low-venous-pressure-triggers-post-treatment-1

Incorporated state change, rather than flow.

DEN-15927-alarm-127-low-venous-pressure-triggers-post-treatment-1

Added a minimum flow requirement to provide a small additional margin to stabilize venous pressure.

DEN-15994-rinseback-5-minute-timer-does-not-count-down

Address CR comments.

DEN-15741-dpi-does-not-stop-when-recirculation-is-paused-2

Typo.

DEN-15741-dpi-does-not-stop-when-recirculation-is-paused-2

Blood pump only stops for user stop.

Merge remote-tracking branch 'origin/DEN-15741-dpi-does-not-stop-when-recirculation-is-paused-2' into develop