Clone
 

darren cox <darren_m@cox.net> in hdfirmware

Merge branch 'staging' into DEN-15953-dialysate-temp-alarm-triggered-after-dialysate-recirculation-stopped-2

Merge branch 'release/p1_staging' into DEN-15953-dialysate-temp-alarm-triggered-after-dialysate-recirculation-stopped

Merge branch 'DEN-15953-dialysate-temp-alarm-triggered-after-dialysate-recirculation-stopped-2' into develop

    • -3
    • +7
    /firmware/App/Controllers/DGInterface.c
DEN-15953 No dialysate temperature check when DPi is off / flow set to zero.

    • -3
    • +7
    /firmware/App/Controllers/DGInterface.c
DEN-15953 Remove old sw config switch.

    • -5
    • +0
    /firmware/App/Controllers/DGInterface.c
DEN-15953 No dialysate temperature check when DPi is off / flow set to zero.

    • -0
    • +9
    /firmware/App/Controllers/DGInterface.c
DENBUG-84 Fix merge issue with staging.

    • -1
    • +0
    /firmware/App/Controllers/SyringePump.c
Merge branch 'staging' into DENBUG-84-heparin-bolus-does-not-resume-after-treatment-pause

    • -3
    • +4
    /firmware/App/Controllers/SyringePump.c
DENBUG-84 Fix merge issue.

    • -1
    • +0
    /firmware/App/Controllers/SyringePump.c
Merge branch 'DENBUG-84-heparin-bolus-does-not-resume-after-treatment-pause' into develop

    • -0
    • +2
    /firmware/App/Controllers/SyringePump.c
DENBUG-84 Only clear syringePumpSetRate in stopSyringePump() if it is actually running.

    • -1
    • +2
    /firmware/App/Controllers/SyringePump.c
Merge branch 'DENBUG-85-treatment-log-missing-event-for-heparin-paused-by-user-request-during-treatment' into staging

    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
Merge branch 'DENBUG-85-treatment-log-missing-event-for-heparin-paused-by-user-request-during-treatment' into develop

    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
Merge branch 'DENBUG-84-heparin-bolus-does-not-resume-after-treatment-pause' into develop

    • -2
    • +8
    /firmware/App/Controllers/SyringePump.c
Merge branch 'DEN-16456-dpo-does-not-home-in-startup-or-end-treatment' into staging

    • -4
    • +5
    /firmware/App/Controllers/DialOutFlow.c
DENBUG-84 Code review comment: remove startHeparinBolus() in Treat restart.

Merge branch 'DEN-16456-dpo-does-not-home-in-startup-or-end-treatment' into develop

    • -2
    • +3
    /firmware/App/Controllers/DialOutFlow.c
DEN-16456 Fix DPO homing speed.

    • -2
    • +3
    /firmware/App/Controllers/DialOutFlow.c
DENBUG-84 call startHeparinBolus on resume Wet self tests and Treatment. Check for bolus not complete before starting.

    • -2
    • +8
    /firmware/App/Controllers/SyringePump.c
DENBUG-85 Remove call to stopDialysis in Treat Mode Stop. Stopping motors is based on Alarm flags.

Merge branch 'DEN-16456-dpo-does-not-home-in-startup-or-end-treatment' into develop

    • -3
    • +3
    /firmware/App/Controllers/DialOutFlow.c
DENBUG-85 Send syringePumpSetRate in event data before resetting value.

    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
DEN-16456 Use basic PWM calculation for Homing DPO.

    • -3
    • +3
    /firmware/App/Controllers/DialOutFlow.c
Merge branch 'DEN-16397-after-treatment-duration-is-changed-dpo-speeds-up-and-alarm-127-venous-pressure-low' into develop

    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
DEN-16397 Force pressure stabilize on treatment duration change.

Merge branch 'DEN-16385-treatment-log-event-ids-for-heparin-pause-are-not-notated-correctly' into staging

    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
Merge branch 'DEN-16385-treatment-log-event-ids-for-heparin-pause-are-not-notated-correctly' into develop

    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
DEN-16385 Fix pause message when requested by user. Move HeparinDeliveryState set to after calling StopSyringePump() which needs it for pause message to be sent.

    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
Merge branch 'DEN-16385-treatment-log-event-ids-for-heparin-pause-are-not-notated-correctly' into staging

    • -4
    • +8
    /firmware/App/Controllers/SyringePump.c
Merge branch 'DEN-16385-treatment-log-event-ids-for-heparin-pause-are-not-notated-correctly' into develop

    • -4
    • +8
    /firmware/App/Controllers/SyringePump.c