firmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-13427-sw_dev-sprint-75_mg' into develop

    • -0
    • +25
    ./App/Services/SystemCommMessages.c
DEN-13427: Added support for Dialin request to go to service mode.

    • -0
    • +25
    ./App/Services/SystemCommMessages.c
DEN-12931 updated the conductivity sensors driver

    • -20
    • +196
    ./App/Controllers/ConductivitySensors.c
DEN-12931 updated the drviers with DVT changes

    • -76
    • +92
    ./App/Controllers/ConcentratePumps.c
    • -53
    • +120
    ./App/Controllers/ConductivitySensors.c
    • -166
    • +111
    ./App/Controllers/TemperatureSensors.c
  1. … 3 more files in changeset.
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Fixed temperatureSensors driver with the newest faults

    • -4
    • +4
    ./App/Controllers/TemperatureSensors.c
DEN-12974, DEN-13078 correct setting of VPo when entering handleFlushModeDrainR2State.

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

DEN-12847 Code review comments update.

DEN-12847 Code review comments update.

DEN-12974 Code review updates

    • -1
    • +1
    ./App/Controllers/ConductivitySensors.c
DEN-12931 updated the drivers for the DVT changes

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

DEN-12974, DEN-13078 Set VPo to VALVE_STATE_NOFILL_C_TO_NO in DrainR2State.

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/Controllers/ConductivitySensors.c

# firmware/App/Controllers/ROPump.c

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

Merged DEN-12931

    • -5
    • +5
    ./App/Controllers/ConductivitySensors.c
    • -0
    • +3
    ./App/Controllers/TemperatureSensors.c
DEN-12931 updated the heaters driver and DVT

    • -4
    • +4
    ./App/Controllers/ConductivitySensors.c
    • -0
    • +3
    ./App/Controllers/TemperatureSensors.c
DEN-12974, DEN-13078 correct setting of VPo when entering Drain_R1 and Drain_R2

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

    • -1
    • +1
    ./App/Controllers/ConductivitySensors.c
Remove test debug code. printf has major impact on unit timing and is not usable.

    • -10
    • +0
    ./App/Controllers/ConductivitySensors.c
DEN-13065 Debug printf for conductivity testing.

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

Merge correction

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

Correct merge issue.

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

Remove some debug statements.

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