dgfirmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-13801: Updated testopmode doc string to reflect updated inputs/outputs.

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

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

Merge branch 'DEN-13427-sw_dev-sprint-75_mg' into staging

additional post merge changes for compilation

code review

DEN-13427: changes need in order for staging to build successfully post merge.

    • -13
    • +1
    /firmware/App/Controllers/Heaters.c
code review

Merge branch 'staging' into DEN-13427-sw_dev-sprint-75_mg

DEN-13427: Addressed code review comments.

DEN-13427: DIAL-201. Updated temp sensors broadcast message to include thd RTD.

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/UVReactors.c
    • -2
    • +2
    /firmware/App/Modes/ModeHeatDisinfect.c
Merge branch 'DEN-12974-miscellaneous-flush-issues_bb' into staging

# Conflicts:

# firmware/App/Controllers/DialysateFlow.c

# firmware/App/Controllers/ROPump.c

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

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

    • -2
    • +2
    /firmware/App/Controllers/DialysateFlow.c
DEN-12931 Temporary fix.

    • -1
    • +1
    /firmware/App/Controllers/DialysateFlow.c
Merge branch 'staging' into DEN-12974-miscellaneous-flush-issues_bb

# Conflicts:

# firmware/App/Controllers/TemperatureSensors.c

    • -19
    • +12
    /firmware/App/Controllers/DialysateFlow.c
    • -16
    • +5
    /firmware/App/Controllers/DrainPump.c
    • -119
    • +87
    /firmware/App/Controllers/Heaters.c
    • -29
    • +33
    /firmware/App/Controllers/ROPump.c
    • -15
    • +8
    /firmware/App/Modes/ModeHeatDisinfect.c
DEN-12974 Changes per code review. MIN_RO_FLOWRATE_LPM now 0.0F

DEN-12974 Minor correction.

    • -2
    • +2
    /firmware/App/Modes/ModeHeatDisinfect.c
DEN-12974 Changes per code review. Remove Chemical and Heat Disinfect code. Add separate RO_FLO_MIN_LPM for heaters and uv.

    • -2
    • +3
    /firmware/App/Controllers/UVReactors.c
    • -41
    • +35
    /firmware/App/Modes/ModeChemicalDisinfect.c
    • -42
    • +36
    /firmware/App/Modes/ModeHeatDisinfect.c
DEN-12974 Updates per code review.

DEN-12974 DEN-13558 Update to fill status functions to support V&V

merge conflicts

DEN-13427: DEN-13534: refactored load cell override to override the average small filtered weight instead of the raw values.

    • -28
    • +31
    /firmware/App/Controllers/LoadCell.c
Merge branch 'staging' into DEN-13427-sw_dev-sprint-75_mg

    • -20
    • +49
    /firmware/App/Controllers/LoadCell.c
    • -22
    • +73
    /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
  1. … 22 more files in changeset.
DEN-12931 addressed the VectorCAST compilation problems

DEN-12931 addressed the code review comments