firmware

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

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

    • -8
    • +19
    ./App/Controllers/ConductivitySensors.c
    • -29
    • +28
    ./App/Modes/ModeChemicalDisinfect.c
Revert "DEN-13047 Implement unique haveDrainParamsBeenInit for both reservoirs."

This reverts commit 81872acd6f2ce222c6b9a9b93f65b7cd3665f28f.

    • -29
    • +28
    ./App/Modes/ModeChemicalDisinfect.c
Testing of printf

    • -9
    • +19
    ./App/Controllers/ConductivitySensors.c
Merge branch 'staging' into DEN-12931-dg_hd_dev-hd_dg_dvt-update

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
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Merged DEN-12931

    • -0
    • +25
    ./App/Controllers/ConcentratePumps.c
    • -2
    • +0
    ./App/Controllers/ConductivitySensors.c
    • -6
    • +10
    ./App/Controllers/TemperatureSensors.c
    • -2
    • +34
    ./App/Services/SystemCommMessages.c
DEN-12845 addressed code review comments and merges staging

    • -1
    • +0
    ./App/Controllers/ConductivitySensors.c
Merge branch 'staging' into DEN-12845-sw_dev_sprint_s71_steve

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