dgfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/DEN-12974-miscellaneous-flush-issues_bb' into develop

# Conflicts:

# firmware/App/Controllers/ConductivitySensors.c

# firmware/App/Controllers/ROPump.c

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

Merged DEN-12931

    • -79
    • +29
    /firmware/App/Controllers/Heaters.c
    • -3
    • +12
    /firmware/App/Controllers/Switches.c
DEN-12931 updated the heaters driver and DVT

    • -1
    • +0
    /firmware/App/Controllers/DialysateFlow.c
    • -79
    • +29
    /firmware/App/Controllers/Heaters.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

Remove test debug code. printf has major impact on unit timing and is not usable.

DEN-13065 Debug printf for conductivity testing.

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

Merge remote-tracking branch 'origin/develop' into develop

Merge correction

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

Merge remote-tracking branch 'origin/develop' into develop

Correct merge issue.

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

Merge remote-tracking branch 'origin/develop' into develop

Remove some debug statements.

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

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

    • -29
    • +28
    /firmware/App/Modes/ModeChemicalDisinfect.c
    • -34
    • +33
    /firmware/App/Modes/ModeHeatDisinfect.c
Revert "DEN-13047 Implement unique haveDrainParamsBeenInit for both reservoirs."

This reverts commit 81872acd6f2ce222c6b9a9b93f65b7cd3665f28f.

    • -2
    • +2
    /firmware/App/Controllers/UVReactors.c
    • -29
    • +28
    /firmware/App/Modes/ModeChemicalDisinfect.c
    • -34
    • +33
    /firmware/App/Modes/ModeHeatDisinfect.c
Finish Feature-1

Testing of printf

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

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

Merged DEN-12931

    • -13
    • +18
    /firmware/App/Controllers/Heaters.c
    • -23
    • +24
    /firmware/App/Controllers/ROPump.c
    • -14
    • +7
    /firmware/App/Modes/ModeHeatDisinfect.c
DEN-12845 addressed code review comments and merges staging

Merge branch 'staging' into DEN-12845-sw_dev_sprint_s71_steve

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