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

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

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

DEN-13786 DEN-13573 Correct MIN_INLET_TEMPERATURE_C value and minor logic bug. DEN-13786 DEN-13582 Delta temperature calculation requires fabs.

DEN-13460 addressed the code review comments

DEN-13460 updated the heaters driver. Moved the heaters data broadcast structure to the fwcommon so the HD can use it too. Updated the temperature sensors FPGA persistent alarm

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

Merge branch 'DEN-13427-sw_dev-sprint-75_mg' into develop

    • -0
    • +1
    ./App/Controllers/TemperatureSensors.c
    • -0
    • +1
    ./App/Controllers/TemperatureSensors.h
DEN-13427: DIAL-201. Updated temp sensors broadcast message to include thd RTD.

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

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

# Conflicts:

# firmware/App/Controllers/DialysateFlow.c

    • -1
    • +6
    ./App/Controllers/TemperatureSensors.c
DEN-13786 DEN-13770 The persistent alarm interface was changed resulting in the immediate turning off of the UVReactors. Changed to correct function call. DEN-13786 DEN-13558 Correct getRsrvrDrainStatus and getRsrvrFillStatus per modes to Flush mode

DEN-13460: make boolean explicit, update function header.

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

Commented out alarm 196

    • -1
    • +1
    ./App/Controllers/TemperatureSensors.c
DEN-13460: Fixed bug DEN-13777.

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

Merged DEN-13460

    • -2
    • +2
    ./App/Controllers/ConductivitySensors.c
    • -96
    • +23
    ./App/Controllers/TemperatureSensors.c
DEN-13460 updated the FPGA persistent alarm functions

    • -96
    • +23
    ./App/Controllers/TemperatureSensors.c
DEN-13460 updated the trimmer heater's duty cycle cap control

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

    • -9
    • +10
    ./App/Controllers/ConductivitySensors.c
    • -34
    • +35
    ./App/Modes/ModeChemicalDisinfect.c
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