Clone
 

darren cox <darren_m@cox.net> in dgfirmware

DEN-16587 Update to match other branch.

    • -18
    • +30
    /firmware/App/Modes/ModeGenIdle.c
    • -0
    • +24
    /firmware/App/Services/Reservoirs.c
Merge branch 'staging' into DEN-16587-alarm-278-rsvr-overfill-triggered-during-treatment-reservoirs-filled-to-2000-ml

DEN-16587 merge to develop.

DEN-16587 Added reservoir transfer flag, move invalid fill check to task exec function.

    • -19
    • +31
    /firmware/App/Modes/ModeGenIdle.c
    • -0
    • +24
    /firmware/App/Services/Reservoirs.c
Merge branch 'release/p1_staging' into DEN-16587-alarm-278-rsvr-overfill-triggered-during-treatment-reservoirs-filled-to-2000-ml-p1

Merge branch 'staging' into DEN-16587-alarm-278-rsvr-overfill-triggered-during-treatment-reservoirs-filled-to-2000-ml

Merge branch 'DEN-16587-alarm-278-rsvr-overfill-triggered-during-treatment-reservoirs-filled-to-2000-ml' into develop

DEN-16587 fix typo.

DEN-16587 Only check for unwanted fill in treatment mode. Pretreat mode does transfers that cause alarm 274.

Merge branch 'DEN-16587-alarm-278-rsvr-overfill-triggered-during-treatment-reservoirs-filled-to-2000-ml' into develop

DEN-16587 Only check for unwanted full in treatment mode. Pretreat has transfers from one reservoir to other.

Merge branch 'DEN-16587-alarm-278-rsvr-overfill-triggered-during-treatment-reservoirs-filled-to-2000-ml' into develop

DEN-16587 Update to match branch 1.

DEN-16587 Only call getInactiveReservoir() one time when checking for unwanted filling.

Merge branch 'DEN-16587-alarm-278-rsvr-overfill-triggered-during-treatment-reservoirs-filled-to-2000-ml' into develop

DEN-16587 Added check for change of inactive reservoir.

Merge branch 'DEN-16587-alarm-278-rsvr-overfill-triggered-during-treatment-reservoirs-filled-to-2000-ml' into develop

DEN-16587 code review comment update 2.

DEN-16587 code review comment update 1.

DEN-16587 Add alarm check in Gen Idle for inactive reservoir filling up.

DEN-16587 Add alarm check in Gen Idle for inactive reservoir filling up.

Merge branch 'DEN-15702-alarm-150-inlet-water-conductivity-high-does-not-disappear-on-standby-screen-when' into staging

Merge branch 'DEN-15702-alarm-150-inlet-water-conductivity-high-does-not-disappear-on-standby-screen-when' into develop

    • -14
    • +11
    /firmware/App/Modes/ModeStandby.c
DEN-15702 Code review update - remove spaces.

DEN-15702 Indent for code review comments.

    • -44
    • +44
    /firmware/App/Controllers/Pressures.c
DEN-15702 Check VPI Open for Inlet Conductivity, Pressure, temperature. If VPI Closed, clear alarms.

    • -8
    • +17
    /firmware/App/Controllers/Pressures.c
    • -14
    • +11
    /firmware/App/Modes/ModeStandby.c
DEN-14561 Decrease concentrate lines prime from 95 to 60 sec.

Merge DEN-14327 branch.

Merge branch 'DEN-14327-dg-cpld-returns-alarm-buzzer-state-as-true-after-hd-is-reconnected' into staging

DEN-14327 Clear Audio alarm when HD com reconnects in Fault mode.