Clone
 

michael garthwaite <mgarthwaite@diality.com> in hdfirmware

Merge branch 'DEN-16428-need-a-way-or-approach-to-validate-the-srshd-1426' into staging

Merge branch 'staging' into DEN-16428-need-a-way-or-approach-to-validate-the-srshd-1426

Merge branch 'staging' into DEN-16428-need-a-way-or-approach-to-validate-the-srshd-1426

    • -14
    • +16
    /firmware/App/Services/Reservoirs.c
DEN-16428: documentation updates

Merge branch 'DEN-16428-need-a-way-or-approach-to-validate-the-srshd-1426' into develop

    • -2
    • +2
    /firmware/App/Controllers/DGInterface.c
DEN-16428: message handling for recirulation pct override

Auto stash before merge of "DEN-16428-need-a-way-or-approach-to-validate-the-srshd-1426" and "staging"

    • -6
    • +57
    /firmware/App/Services/Reservoirs.c
Merge branch 'staging' into DEN-16428-need-a-way-or-approach-to-validate-the-srshd-1426

Merge branch 'DEN-14706-can-messge-not-acked-fix' into staging

Merge branch 'staging' into DEN-14706-can-messge-not-acked-fix

DEN-14706: removed check in pending ack list

DEN-14706: code review comments. Reworked logic

    • -11
    • +8
    /firmware/App/Services/SystemComm.c
DEN-14706: Fixed hd pending ack override

    • -8
    • +17
    /firmware/App/Services/SystemComm.c
Merge branch 'DIAL-276-dg-event-event-id-15-prints-duplicate-events-with-different-state-time' into staging

    • -26
    • +60
    /firmware/App/Controllers/PresOccl.c
DIAL-276: fixed warnings

Merge branch 'staging' into DIAL-276-dg-event-event-id-15-prints-duplicate-events-with-different-state-time

    • -12
    • +50
    /firmware/App/Controllers/PresOccl.c
DIAL-276: STT-2891: implemented short filtered pressure overrides

    • -26
    • +60
    /firmware/App/Controllers/PresOccl.c
DIAL-276: fixed op status event duplicating on op mode change only.

Merge branch 'DEN-16164-fw-pre-treatment-pressure-test-failures-vent-to-saline-bag' into staging

Merge branch 'DIAL-278-fan-pwm-override' into staging

Merge branch 'staging' into DIAL-278-fan-pwm-override

Merge branch 'staging' into DEN-16164-fw-pre-treatment-pressure-test-failures-vent-to-saline-bag

DEN-16203: code review comments

    • -1
    • +0
    /firmware/App/Controllers/DialOutFlow.c
Merge branch 'DIAL-278-fan-pwm-override' into develop

DIAL-278: changed Fan PWM timing to fit requirement of 40uS

DEN-16203: changed dopMeasuredRate to handle set flow rate in open loop state.

    • -3
    • +11
    /firmware/App/Controllers/DialOutFlow.c
Merge branch 'staging' into DEN-16164-fw-pre-treatment-pressure-test-failures-vent-to-saline-bag

Merge branch 'DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked' into staging

DEN-14706: code review comments.

DEN-14706: changed override condition for pending ack