dgfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/DEN-12974-miscellaneous-flush-issues_bb' into develop

DEN-12549 Correct state of valves before entering DRAIN_R1 from FLUSH_R2AND_DRAIN_R1.

DEN-12882 Change MIN_RO_FLOWRATE_LPM to 0.3/LPM. RO Pump is unable to achieve 0.2/LPM rate. May change later as requirements are firmed up.

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Merge remote-tracking branch 'origin/DEN-12974-miscellaneous-flush-issues_bb' into develop

# Conflicts:

# firmware/App/DGCommon.h

    • -63
    • +18
    /firmware/App/Controllers/Heaters.c
    • -238
    • +247
    /firmware/App/Services/SystemCommMessages.c
DEN-12974 disbaled alarm 196.

DEN-12974 disabled the ADC check of the temeperature sensors

DEN-12549 changed UV reactor no flow timeout to 2 seconds.

    • -1
    • +1
    /firmware/App/Controllers/UVReactors.c
DEN-12974 - Miscellaneous Flush Issues DEN-12959 - Flush dialysate wait time changed to 60 seconds DEN-12960 - Flush concentrate straws tim changed to 3 minutes

DEN-12931 updated the trimmer heater control

    • -13
    • +18
    /firmware/App/Controllers/Heaters.c
    • -23
    • +24
    /firmware/App/Controllers/ROPump.c
    • -9
    • +65
    /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

    • -1
    • +1
    /firmware/App/Controllers/DialysateFlow.c
    • -2
    • +2
    /firmware/App/Controllers/DialysateFlow.h
  1. … 39 more files in changeset.
DEN-12224 removed an alarm

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

DEN-12224 addressed the code review comments

    • -3
    • +2
    /firmware/App/Controllers/DialysateFlow.c
    • -214
    • +217
    /firmware/App/Services/SystemCommMessages.c
Done.

Done.

Done.

Done.

Done.

Done.

Done.

Done.

Done.

Done.

The idea was to call these variables once it is time to do the control but it was abandoned.

The idea was to call these variables once it is time to do the control but it was abandoned.

Done.

Done.