dgfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Resolved merge conflicts from DEN-16674

DEN-16674 updated the code from staging

    • -46
    • +14
    /firmware/App/Controllers/DrainPump.c
    • -4
    • +4
    /firmware/App/Controllers/UVReactors.c
DEN-16674 addressed the code reivew comment

DEN-16674 addressed the code review comments

DEN-16674 updated the code for mode fill calibration check command

DEN-16683 updated the conductivity sensor temperature compensation calibration enum names

DEN-16683 added code to get and apply the conductivity sensors' temperature compensation calibration record

DEN-16682 changed the speed of the acid concentrate pump. CD2 will be used for acid check in the Mode Fill

DEN-16681 addressed the code review comment

DEN-16681 changed the tolerances of acid and bicarb check in Mdoe Fill

DENBUG-213 added code to only check the drain pump's direction alarm if the feedback RPM is greater than 0

    • -46
    • +14
    /firmware/App/Controllers/DrainPump.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Merged DEN-16666

DEN-16666 added new events in Mode Fill

DEN-16674 updated the temperature sensors calibration record alarm

Merge branch 'staging' into DEN-16674-td2-calibration-feature

DEN-16674 made the UV reactors persistent alarm clearance period to 0 ms

    • -4
    • +4
    /firmware/App/Controllers/UVReactors.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

DEN-16587 Update to match other branch.

    • -18
    • +30
    /firmware/App/Modes/ModeGenIdle.c
    • -0
    • +24
    /firmware/App/Services/Reservoirs.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

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

DEN-16674 added an alarm to check the status of the temperature sensors calibration record in POST

DEN-16674 updated the temperature sensors calibration function

DEN-16674 added code to apply the calibration values to the inline temperature sensors

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
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Merge branch 'release/p1_staging' into DEN-16587-alarm-278-rsvr-overfill-triggered-during-treatment-reservoirs-filled-to-2000-ml-p1