firmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-14166 updated the heat disinfect temperature gradient out of range

Merged staging

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

# Conflicts:

# firmware/App/Controllers/DialysateFlow.c

# firmware/App/Controllers/Heaters.c

# firmware/App/Controllers/ROPump.c

# firmware/App/Controllers/UVReactors.c

# firmware/App/Modes/ModeHeatDisinfect.c

    • -186
    • +91
    ./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

DEN-13768 Remove EMC build from ROPump. Don not set cancellationMode when exiting DG_HEAT_DISINFECT_STATE_COOL_DOWN_RO_FILTER.

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

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

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

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

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

Merged DEN-14166

    • -3
    • +3
    ./App/Controllers/TemperatureSensors.c
DEN-14166 fixed the drain pump's direction check alarm

DEN-14166 fixed the drain pump's direction alarm check and updated the heat disinfect caps check

DEN-13768 Update branch

DEN-13768 Update branch

DEN-14166 added DVT FPGA thermistors, addressed the code review comment and added load cells sign extension

    • -3
    • +3
    ./App/Controllers/TemperatureSensors.c
DEN-13768 Update branch.

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

DEN-14166: Added 10 sec delay before FMP fill check.

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

Merged DEN-14166

    • -1
    • +1
    ./App/Controllers/ConductivitySensors.c
    • -2
    • +2
    ./App/Controllers/TemperatureSensors.c
    • -2
    • +37
    ./App/Services/SystemCommMessages.c
DEN-14166 added DG trimmer heater Dialin command

    • -1
    • +36
    ./App/Services/SystemCommMessages.c
Merge branch 'staging' into DEN-13903-s80-mg-dg-comm-buffer-opti

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/ConductivitySensors.c
    • -2
    • +2
    ./App/Controllers/TemperatureSensors.c
  1. … 25 more files in changeset.
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Merged DEN-13834

    • -162
    • +69
    ./App/Services/SystemCommMessages.c
    • -22
    • +4
    ./App/Services/SystemCommMessages.h
DEN-13834, DEN-14076 addressed the code review comments and implemented the command to set the primary and trimmer target temperature

    • -18
    • +51
    ./App/Services/SystemCommMessages.c
DEN-13834 addressed the code review comments and added the latest PiSquare VectorCAST changes

    • -161
    • +33
    ./App/Services/SystemCommMessages.c
    • -21
    • +0
    ./App/Services/SystemCommMessages.h