firmware

Clone Tools
  • last updated a few seconds 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

    • -2
    • +2
    ./App/Controllers/TemperatureSensors.c
    • -2
    • +2
    ./App/Controllers/TemperatureSensors.h
additional post merge changes for compilation

code review

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

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.

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

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

    • -2
    • +2
    ./App/Controllers/ConductivitySensors.c
Merge branch 'DEN-12974-miscellaneous-flush-issues_bb' into staging

# Conflicts:

# firmware/App/Controllers/DialysateFlow.c

# firmware/App/Controllers/ROPump.c

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

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

DEN-12931 Temporary fix.

Merge branch 'staging' into DEN-12974-miscellaneous-flush-issues_bb

# Conflicts:

# firmware/App/Controllers/TemperatureSensors.c

    • -191
    • +264
    ./App/Controllers/ConductivitySensors.c
    • -19
    • +12
    ./App/Controllers/DialysateFlow.c
DEN-12974 Changes per code review. MIN_RO_FLOWRATE_LPM now 0.0F

DEN-12974 Minor correction.

DEN-12974 Changes per code review. Remove Chemical and Heat Disinfect code. Add separate RO_FLO_MIN_LPM for heaters and uv.

    • -41
    • +35
    ./App/Modes/ModeChemicalDisinfect.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.

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

    • -3
    • +32
    ./App/Services/SystemCommMessages.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
    ./App/Controllers/ConductivitySensors.c
    • -1
    • +1
    ./App/Controllers/ConductivitySensors.h
    • -1
    • +1
    ./App/Controllers/TemperatureSensors.c
    • -1
    • +1
    ./App/Controllers/TemperatureSensors.h
  1. … 22 more files in changeset.
DEN-12931 addressed the VectorCAST compilation problems

    • -3
    • +11
    ./App/Controllers/TemperatureSensors.c
DEN-12931 addressed the code review comments

    • -4
    • +4
    ./App/Controllers/TemperatureSensors.c
DEN-12931 addressed the code review comments

    • -5
    • +20
    ./App/Controllers/ConcentratePumps.c
    • -4
    • +4
    ./App/Controllers/ConductivitySensors.c
    • -0
    • +4
    ./App/Controllers/TemperatureSensors.c