dgfirmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Fixed merge conflicts.

Fixed merge conflicts.

DEN-9906: Update drain command message handling.

    • -10
    • +11
    /firmware/App/Services/Reservoirs.h
DEN-9480 merged staging

    • -484
    • +38
    /firmware/App/Controllers/Heaters.c
    • -12
    • +2
    /firmware/App/Controllers/Heaters.h
    • -22
    • +2
    /firmware/App/Controllers/LoadCell.c
    • -22
    • +1
    /firmware/App/Controllers/Switches.c
    • -22
    • +1
    /firmware/App/Controllers/Thermistors.c
    • -124
    • +266
    /firmware/App/Modes/ModeFill.c
    • -0
    • +239
    /firmware/App/Modes/ModeGenIdle.c
    • -107
    • +10
    /firmware/App/Modes/ModeHeatDisinfect.c
  1. … 6 more files in changeset.
DEN-9906: Added rinse concentrate lines state in drain mode

DEN-9480 worked on the heaters control

    • -415
    • +527
    /firmware/App/Controllers/Heaters.c
    • -10
    • +2
    /firmware/App/Modes/ModeRecirculate.c
DEN-9906: Attempted fix for DEN-9693 and DEN-10140.

    • -21
    • +42
    /firmware/App/Controllers/Heaters.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

Merge branch 'DEN-7802-dg_dev-dialysate-generation' into staging

    • -11
    • +11
    /firmware/App/Modes/OperationModes.c
Merge branch 'DEN-7802-dg_dev-dialysate-generation' into develop

DEN-7802: Added 5 minutes wait time for HD comm timeout before transition back to standby

DEN-7802: Fixed out of range check error

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

Merge branch 'DEN-7802-dg_dev-dialysate-generation' into develop

    • -11
    • +11
    /firmware/App/Modes/OperationModes.c
DEN-7802: DEN-9693: Reset start heater flag if heater is already on

    • -15
    • +18
    /firmware/App/Controllers/Heaters.c
    • -44
    • +4
    /firmware/App/Services/Interrupts.c
DEN-7802: Turned off concentrate pumps when water is not ready

DEN-9480 worked on developing new heaters control

    • -141
    • +461
    /firmware/App/Controllers/Heaters.c
    • -10
    • +23
    /firmware/App/Controllers/Heaters.h
    • -9
    • +14
    /firmware/App/Modes/ModeRecirculate.c
DEN-7802: Renamed re-circ to generation idle

DEN-7802: Fixed pressure reading

DEN-7802: DEN-9139: Fixed reservoir tare

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

Merge branch 'DEN-8886-hd_dg_dev-self-tests-2-of-2' into develop

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

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

DEN-7802: Used test support get override value

    • -22
    • +1
    /firmware/App/Controllers/DrainPump.c
    • -22
    • +1
    /firmware/App/Controllers/FluidLeak.c
    • -21
    • +1
    /firmware/App/Controllers/Heaters.c
    • -21
    • +1
    /firmware/App/Controllers/LoadCell.c
    • -31
    • +3
    /firmware/App/Controllers/Pressures.c
    • -22
    • +1
    /firmware/App/Controllers/Switches.c
    • -22
    • +1
    /firmware/App/Controllers/Thermistors.c
    • -30
    • +2
    /firmware/App/Controllers/UVReactors.c
    • -28
    • +2
    /firmware/App/Controllers/Voltages.c
  1. … 3 more files in changeset.
DEN-7802: Addressed code review comments

    • -4
    • +4
    /firmware/App/Modes/ModeHeatDisinfect.c
DEN-7802: Removed concentrate pump voltage broadcast data

DEN-7802: Removed concentrate pumps voltage monitor and fixed pressure checks

    • -19
    • +17
    /firmware/App/Controllers/Voltages.h