firmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

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
DEN-12974 DEN 13558 Prototype new timer design for drain pump and reservoir status

DEN-12974 DEN 13558 Prototype new timer design for drain pump and reservoir status

DEN-12974 DEN-13556 Correct logic per SRSDG 333.

DEN12974 DEN-13558 Do not reset stateTimer in FlushR2AndDrainR1. Same issue will be in ModeChemicalDisinfect.

    • -35
    • +41
    ./App/Modes/ModeChemicalDisinfect.c
DEN-12974 DEN-13560 Do not reset stateTimer in FlushR1AndR2.

DEN-13047 haveDrainParmsBeenInit now any array with one entry for each reservoir. DEN-13534 rsrvrFillStableTimeCounter now an array with one entry for each reservoir. May be causing intermittent functionality (test_dg_flush_R1_to_R2_state_R2_filled_before_R1). DEN-12974, DEN-13425 Restore logic around resetting state timer for getRsrvrFillStatus.

    • -28
    • +29
    ./App/Modes/ModeChemicalDisinfect.c
DEN-12974, DEN-13549 Correct reservoir volume logic to match requirements. Changed ">" to ">=" in several modes when checking for R1 being filled before R2

DEN-12974 DEN-13242 Allow RO target flow rate to be set to 0 to support V&V testing.

DEN-12931 updated the dialysate flow sensor and made switching to service mode legal from solo mode

DEN-12931 updated the drivers with doxygen comments

    • -39
    • +42
    ./App/Controllers/ConcentratePumps.c
    • -58
    • +72
    ./App/Controllers/TemperatureSensors.c
DEN-12931: Added module header separator banners.

DEN-12931 updated the temperature sensors driver

    • -1
    • +7
    ./App/Controllers/TemperatureSensors.c
DEN-12974, DEN-13425 Remove logic around resetting state timer for getRsrvrFillStatus.

DEN-12974

DEN-12974, DEN-13425 Unable to set default arguement.

DEN-12974, DEN-13425 Correct bool to BOOL

DEN-12974, DEN-13425 Do not reset state timer in FlushR2DrainR1

DEN-12931 updated the dialysate flow sensor K factor

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