dgfirmware

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

Updated the heaters internal temperature sensors

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.

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.

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.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.