dgfirmware

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

# Conflicts:

# firmware/App/Controllers/TemperatureSensors.c

    • -19
    • +12
    /firmware/App/Controllers/DialysateFlow.c
    • -16
    • +5
    /firmware/App/Controllers/DrainPump.c
    • -119
    • +87
    /firmware/App/Controllers/Heaters.c
    • -29
    • +33
    /firmware/App/Controllers/ROPump.c
    • -15
    • +8
    /firmware/App/Modes/ModeHeatDisinfect.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Merge branch 'intertek_branch' of ssh://dvm-linux02:7999/dg/dgfirmware into intertek_branch

Updated the heaters internal temperature sensors

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

Removed the raw load cells broadcast

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

Fixed load cells

Merge branch 'DEN-13460-dg_hd_dev-hd_dg_dvt-update-part-2' into develop

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

DEN-13460 removed the temporary load cells raw data

DEN-13460: Added DG RTC sync to HD RTC broadcast.

DEN-12974 Changes per code review. MIN_RO_FLOWRATE_LPM now 0.0F

DEN-12974 Minor correction.

    • -2
    • +2
    /firmware/App/Modes/ModeHeatDisinfect.c
DEN-12974 Changes per code review. Remove Chemical and Heat Disinfect code. Add separate RO_FLO_MIN_LPM for heaters and uv.

    • -2
    • +3
    /firmware/App/Controllers/UVReactors.c
    • -41
    • +35
    /firmware/App/Modes/ModeChemicalDisinfect.c
    • -42
    • +36
    /firmware/App/Modes/ModeHeatDisinfect.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Merge branch 'DEN-13460-dg_hd_dev-hd_dg_dvt-update-part-2' into develop

DEN-13460 updated the control temperature sensor of the trimmer heater from TDi to TRo

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

Merge branch 'DEN-13460-dg_hd_dev-hd_dg_dvt-update-part-2' into develop

DEN-13460 updated the concentrate pump speed feedback check

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

Chnaged the RO flow minimum limit

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

Merge branch 'intertek_branch' of ssh://dvm-linux02:7999/dg/dgfirmware into intertek_branch

Changed the minimum RO flow from 0.3 to 0.2 L/min

Merge branch 'DEN-13460-dg_hd_dev-hd_dg_dvt-update-part-2' into develop

DEN-13460 updated the definition of the RO pump

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

Changed the heat disinfect control

    • -3
    • +3
    /firmware/App/Modes/ModeHeatDisinfect.c