dgfirmware

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

Commented out alarm 196

DEN-13460: Fixed bug DEN-13777.

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

Merged DEN-13460

    • -11
    • +16
    /firmware/App/Controllers/Heaters.c
    • -46
    • +47
    /firmware/App/Controllers/ROPump.c
DEN-13460 updated the FPGA persistent alarm functions

    • -25
    • +24
    /firmware/App/Controllers/ROPump.c
DEN-13460 updated the trimmer heater's duty cycle cap control

    • -9
    • +14
    /firmware/App/Controllers/Heaters.c
    • -16
    • +18
    /firmware/App/Controllers/ROPump.c
    • -63
    • +68
    /firmware/App/Controllers/Voltages.c
DEN-13460 merged staging

    • -1
    • +1
    /firmware/App/Controllers/DialysateFlow.c
    • -34
    • +35
    /firmware/App/Modes/ModeChemicalDisinfect.c
    • -46
    • +50
    /firmware/App/Modes/ModeHeatDisinfect.c
DEN-13460 updated the RO pump duty cycle feedback

Merge branch 'staging' into DEN-13786-hd_dg_dev-s78_bb

# Conflicts:

# firmware/App/Controllers/DialysateFlow.c

# firmware/App/Controllers/Heaters.c

    • -2
    • +2
    /firmware/App/Controllers/DialysateFlow.c
    • -5
    • +6
    /firmware/App/Controllers/UVReactors.c
    • -34
    • +35
    /firmware/App/Modes/ModeChemicalDisinfect.c
    • -46
    • +50
    /firmware/App/Modes/ModeHeatDisinfect.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    /firmware/App/Controllers/DialysateFlow.c
    • -2
    • +2
    /firmware/App/Controllers/UVReactors.c
    • -2
    • +2
    /firmware/App/Modes/ModeHeatDisinfect.c
Merge branch 'DEN-12974-miscellaneous-flush-issues_bb' into staging

# Conflicts:

# firmware/App/Controllers/DialysateFlow.c

# firmware/App/Controllers/ROPump.c

    • -1
    • +1
    /firmware/App/Controllers/DialysateFlow.c
DEN-13786 DEN-13758 Change RSRVRS_TARGET_VOL_OUT_TIMEOUT_MS to 10 seconds per SRS. NOTE: Firmware had comment to set to 5 seconds. DEN-13786 DEN-13560 Change RSRVRS_500ML_FILL_UP_TIMEOUT_MS to 2 minutes per SRS DEN-13786 DEN-13770 Correct UVReactor to properly control on/off of UVReactors based upon RO flow rate. DEN-13786 DEN-13788 Correct temperature reporting for V3 configurations.

    • -3
    • +1
    /firmware/App/Controllers/UVReactors.c
    • -2
    • +2
    /firmware/App/Modes/ModeHeatDisinfect.c
DEN-13460 merged staging

    • -2
    • +2
    /firmware/App/Controllers/DialysateFlow.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -2
    • +2
    /firmware/App/Controllers/DialysateFlow.c
DEN-12931 Temporary fix.

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

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

    • -18
    • +20
    /firmware/App/Controllers/Heaters.c
Merge branch 'DEN-12974-miscellaneous-flush-issues_bb' into develop

# Conflicts:

# firmware/App/Controllers/DialysateFlow.c

# firmware/App/Controllers/Heaters.c

# firmware/App/Controllers/ROPump.h

    • -1
    • +1
    /firmware/App/Controllers/DialysateFlow.c
    • -41
    • +35
    /firmware/App/Modes/ModeChemicalDisinfect.c
    • -41
    • +35
    /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

    • -18
    • +20
    /firmware/App/Controllers/Heaters.c
DEN-13460 updated the heaters control

    • -18
    • +20
    /firmware/App/Controllers/Heaters.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 temperature sensors

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