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

Merge branch 'DIAL-222-sys-request' into develop

DIAL-222: fixed heaters override reset.

DEN-14763 addressed the code review comments and added inlet water conditions to the heat disinfect active cool

    • -1
    • +1
    /firmware/App/Modes/ModeHeatDisinfect.c
    • -43
    • +210
    /firmware/App/Modes/ModeHeatDisinfectActiveCool.c
DEN-14646 Update per code review comments.

DEN-14646 Update per code review comments.

DEN-14763 work in progress continued working on the heat disinfect active cool mode

DEN-14646 Correct inclusion of watchdog alarm. Remove alarm for checking for comm errors detected by the FPGA.

Merge branch 'staging' into DEN-14646-fpga-alarm-properties-and-timing-3

# Conflicts:

# firmware/App/Controllers/TemperatureSensors.c

    • -48
    • +63
    /firmware/App/Controllers/Heaters.c
DEN-14646 - Remove code inserted for debugging. Enable FPGA clock speed check and watchdog check.

DEN-14646 Use typedefs in voltages.c to improve debugging. Correct counting FPGA timeouts twice if write values ACK not received. Correct handling of emstat response status values.

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

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

Merge branch 'DEN-14689-messaging-bugs' into develop

    • -11
    • +7
    /firmware/App/Controllers/DrainPump.c
    • -48
    • +63
    /firmware/App/Controllers/Heaters.c
    • -30
    • +45
    /firmware/App/Services/Reservoirs.c
    • -12
    • +2
    /firmware/App/Services/Reservoirs.h
    • -17
    • +17
    /firmware/App/Services/SystemComm.c
DEN-14689: sync msg_ids with msgdefs.h

    • -16
    • +20
    /firmware/App/Services/SystemComm.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/FlowSensors.c
Merged DEN-13154 into staging.

Merge branch 'staging' into DEN-14689-messaging-bugs

Merge branch 'staging' into DEN-14763-dg_hd_dev-hd_dg_dvt-update-part-10

    • -11
    • +7
    /firmware/App/Controllers/DrainPump.c
    • -4
    • +3
    /firmware/App/Modes/ModeHeatDisinfect.c
    • -30
    • +45
    /firmware/App/Services/Reservoirs.c
    • -12
    • +2
    /firmware/App/Services/Reservoirs.h
DEN-13154: Added raw flow rates to DG flow broadcast messages.

    • -4
    • +6
    /firmware/App/Controllers/FlowSensors.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

Merged DEN-14834

DEN-14834 updated the code to just send the heater command in Idle and Drain if the primary heater is not on. Addressed the code review comments

    • -10
    • +0
    /firmware/App/Services/Reservoirs.h
Merge branch 'staging' into DEN-14834-ro-flow-drops-to-zero-and-cp-measured-speed-1500-temporarily-during-pre-treatment

DEN-14834 updated that get target primary heater function to accomodate the changes from pre-treatment. Removed the range check from the drain pump measured RPM

    • -10
    • +6
    /firmware/App/Controllers/DrainPump.c
    • -15
    • +17
    /firmware/App/Controllers/Heaters.c
    • -29
    • +44
    /firmware/App/Services/Reservoirs.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

Merge branch 'DEN-14788-DIAL-222' into staging