dgfirmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-5980 disabled a build switch

Merge branch 'DEN-7091-pre-treatment-mode' into staging

Merge branch 'staging' into DEN-7091-pre-treatment-mode

    • -0
    • +90
    /firmware/App/Controllers/LoadCell.c
    • -0
    • +40
    /firmware/App/Services/SystemComm.c
DEN-5963 tested and updated heat disinfect

    • -181
    • +181
    /firmware/App/Modes/ModeHeatDisinfect.c
    • -2
    • +2
    /firmware/App/Modes/ModeHeatDisinfect.h
DEN-8103: added getting calibration data to load cells driver

    • -14
    • +32
    /firmware/App/Controllers/LoadCell.c
DEN-7802: added getting calibration data to load cells driver

    • -15
    • +33
    /firmware/App/Controllers/LoadCell.c
DEN-5980 added getting calibration data to load cells driver

    • -61
    • +174
    /firmware/App/Controllers/LoadCell.c
DEN-7091: Fixed flush filter count down time

DEN-7802: Added temperature check when mixing

DEN-7091: initialize water quality check start time

DEN-5980 adddressed the code review comment

DEN-5980 addressed code review comments

DEN-5963 worked on heat disinfect mode

    • -88
    • +175
    /firmware/App/Modes/ModeHeatDisinfect.c
DEN-5980 merged staging and resolved the merge conflicts

    • -19
    • +17
    /firmware/App/Controllers/DrainPump.c
    • -0
    • +42
    /firmware/App/Controllers/Heaters.c
    • -40
    • +63
    /firmware/App/Services/AlarmMgmt.c
    • -0
    • +11
    /firmware/App/Services/SystemComm.c
    • -14
    • +20
    /firmware/App/Tasks/TaskPriority.c
Merge branch 'DEN-7091-pre-treatment-mode' into develop

DEN-7091: broadcast alarm condition clear when cleared with alarm.

DEN-5980 addressed code review comments

DEN-5980 addressed code review comments

DEN-5980 addressed code review comments

    • -32
    • +32
    /firmware/App/Controllers/Heaters.c
DEN-7091: Changed operation mode broadcast rate to 4 Hz and added time out for water quality check

DEN-5963 pulled the latest changes from Sprint37

    • -147
    • +63
    /firmware/App/Modes/ModeHeatDisinfect.c
DEN-5963 tested heat disinfect mode

    • -66
    • +184
    /firmware/App/Modes/ModeHeatDisinfect.c
Fixed merge conflicts.

DEN-7091: Addressed code review

Merge branch 'DEN-7091-pre-treatment-mode' into develop

DEN-7091: Fixed load cell small filter index

Merge branch 'DEN-7091-pre-treatment-mode' into develop

DEN-7091: Changed function call to actual valve settings

Merge branch 'DEN-7091-pre-treatment-mode' into develop

DEN-7091: fix to last.