firmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-13460 updated the RO pump duty cycle feedback

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

# Conflicts:

# firmware/App/Controllers/DialysateFlow.c

# firmware/App/Controllers/Heaters.c

    • -9
    • +10
    ./App/Controllers/ConductivitySensors.c
    • -34
    • +35
    ./App/Modes/ModeChemicalDisinfect.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
    ./App/Controllers/ConductivitySensors.c
Merge branch 'DEN-12974-miscellaneous-flush-issues_bb' into staging

# Conflicts:

# firmware/App/Controllers/DialysateFlow.c

# firmware/App/Controllers/ROPump.c

DEN-13786 DEN-13758 Change RSRVRS_TARGET_VOL_OUT_TIMEOUT_MS to 10 seconds per SRS. NOTE: Firmware had comment to set to 5 seconds. DEN-13786 DEN-13560 Change RSRVRS_500ML_FILL_UP_TIMEOUT_MS to 2 minutes per SRS DEN-13786 DEN-13770 Correct UVReactor to properly control on/off of UVReactors based upon RO flow rate. DEN-13786 DEN-13788 Correct temperature reporting for V3 configurations.

    • -1
    • +6
    ./App/Controllers/TemperatureSensors.c
DEN-13460 merged staging

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

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

DEN-12931 Temporary fix.

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

Merge remote-tracking branch 'origin/develop' into develop

Merge branch 'DEN-12974-miscellaneous-flush-issues_bb' into develop

# Conflicts:

# firmware/App/Controllers/DialysateFlow.c

# firmware/App/Controllers/Heaters.c

# firmware/App/Controllers/ROPump.h

    • -41
    • +35
    ./App/Modes/ModeChemicalDisinfect.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Merge branch 'DEN-13460-dg_hd_dev-hd_dg_dvt-update-part-2' into develop

    • -4
    • +17
    ./App/Controllers/TemperatureSensors.c
DEN-13460 updated the heaters control

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

Merge branch 'DEN-13460-dg_hd_dev-hd_dg_dvt-update-part-2' into develop

    • -14
    • +38
    ./App/Controllers/TemperatureSensors.c
DEN-13460 updated the temperature sensors

    • -14
    • +38
    ./App/Controllers/TemperatureSensors.c
Merge branch 'staging' into DEN-12974-miscellaneous-flush-issues_bb

# Conflicts:

# firmware/App/Controllers/TemperatureSensors.c

    • -191
    • +264
    ./App/Controllers/ConductivitySensors.c
    • -19
    • +12
    ./App/Controllers/DialysateFlow.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Updated the heaters internal temperature sensors

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

Removed the raw load cells broadcast

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

Fixed load cells

Merge branch 'DEN-13460-dg_hd_dev-hd_dg_dvt-update-part-2' into develop

    • -0
    • +24
    ./App/Services/SystemCommMessages.c
DEN-13460 removed the temporary load cells raw data

DEN-13460: Added DG RTC sync to HD RTC broadcast.

    • -0
    • +24
    ./App/Services/SystemCommMessages.c
DEN-12974 Changes per code review. MIN_RO_FLOWRATE_LPM now 0.0F