firmware

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

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

DEN-12931: Removed init persistence call for unused alarm.

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

DEN-12845 addressed the code review comments

DEN-12931 DVT updates and SRS changes

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

Correct Flash programming configuration to NOT erase the configuration information.

DEN-13047 Implement unique haveDrainParamsBeenInit for both reservoirs. DEN-12882 Unique minimum ro flow rate for uv reactors.

    • -28
    • +29
    ./App/Modes/ModeChemicalDisinfect.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

DEN-12549 Correct state of valves before entering DRAIN_R1 from FLUSH_R2AND_DRAIN_R1.

DEN-12882 Change MIN_RO_FLOWRATE_LPM to 0.3/LPM. RO Pump is unable to achieve 0.2/LPM rate. May change later as requirements are firmed up.

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/DGCommon.h

    • -3
    • +2
    ./App/Controllers/ConductivitySensors.c
    • -238
    • +247
    ./App/Services/SystemCommMessages.c