dgfirmware

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

Merge branch 'DEN-12931-dg_hd_dev-hd_dg_dvt-update' of ssh://dvm-linux02:7999/dg/dgfirmware into DEN-12931-dg_hd_dev-hd_dg_dvt-update

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

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

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

DEN-12845 addressed the code review comments

Done.

Done.

Done.

Done.

Done.

Done.

Done.

Done.

Done.

Done.

DEN-12931 DVT updates and SRS changes

    • -14
    • +7
    /firmware/App/Modes/ModeHeatDisinfect.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

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.

    • -2
    • +2
    /firmware/App/Controllers/UVReactors.c
    • -28
    • +29
    /firmware/App/Modes/ModeChemicalDisinfect.c
    • -33
    • +34
    /firmware/App/Modes/ModeHeatDisinfect.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

    • -63
    • +18
    /firmware/App/Controllers/Heaters.c
    • -238
    • +247
    /firmware/App/Services/SystemCommMessages.c
DEN-12974 disbaled alarm 196.

DEN-12974 disabled the ADC check of the temeperature sensors