firmware

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-243-integrated-volume-is-not-working' into develop

DIAL-243: Fixed header.

DIAL-243: fixed integrated volume data type from u32 to f32

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

    • -0
    • +1
    ./App/Controllers/ConductivitySensors.c
    • -0
    • +1
    ./App/Controllers/TemperatureSensors.c
    • -43
    • +210
    ./App/Modes/ModeHeatDisinfectActiveCool.c
DEN-14646 Update per code review comments.

DEN-14646 Update per code review comments.

    • -18
    • +5
    ./App/Controllers/ConductivitySensors.c
    • -2
    • +2
    ./App/Controllers/TemperatureSensors.c
DEN-14763 work in progress continued working on the heat disinfect active cool mode

    • -91
    • +87
    ./App/Modes/ModeHeatDisinfectActiveCool.c
    • -0
    • +1
    ./App/Modes/ModeHeatDisinfectActiveCool.h
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

    • -1
    • +5
    ./App/Controllers/TemperatureSensors.c
DEN-14646 - Remove code inserted for debugging. Enable FPGA clock speed check and watchdog check.

    • -17
    • +1
    ./App/Controllers/ConductivitySensors.c
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.

    • -14
    • +49
    ./App/Controllers/ConductivitySensors.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

DEN-14689: sync msg_ids with msgdefs.h

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

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

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

    • -2
    • +2
    ./App/Modes/ModeChemicalDisinfectFlush.c
DEN-13154: Added raw flow rates to DG flow broadcast messages.

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

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

    • -1
    • +1
    ./App/Controllers/TemperatureSensors.c
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

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

    • -14
    • +17
    ./App/Controllers/TemperatureSensors.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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