firmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-14101: Fixed warnings on implicit declaration.

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

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

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

Merge branch 'DEN-14175-dg_hd_dev-hd_dg_dvt-update-part-5' into develop

    • -15
    • +28
    ./App/Controllers/ConductivitySensors.c
DEN-14175 added alarms to check the conductivity sensor's bad received hex characters

    • -15
    • +28
    ./App/Controllers/ConductivitySensors.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Merge branch 'DEN-14101-sw-s82-mg-DIAL-179-DIAL-184' into develop

    • -1
    • +1
    ./App/Controllers/TemperatureSensors.c
    • -1
    • +65
    ./App/Services/SystemCommMessages.c
DEN-14101: DIAL-184: Fixed publish interval to not overlap with the publish counter.

DEN-14101: DIAL-184: Fixed gen idle/bad fill publish override handler to actually work.

    • -0
    • +31
    ./App/Services/SystemCommMessages.c
DEN-14101: DIAL-184: Fixed return type for drain pump current handler

DEN-14101: DIAL-184: reworked bad fill broadcast to now be genidle broadcast containing bad fill states and signal.

DEN-14101: DEN-179: comm handling for Dial-179

    • -0
    • +33
    ./App/Services/SystemCommMessages.c
DEN-14101: DIAL-179: Set and Reset for Drain pump current.

DEN-13786 Correct VPo

DEN-13786 Correct heater PWM and proper position of VPo for Drain_R2

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

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-13786 Code review changes

DEN-13786 Code review changes

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