firmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-13460 merged staging and resolved merge conflicts

    • -2
    • +3
    ./App/Controllers/TemperatureSensors.c
    • -2
    • +3
    ./App/Controllers/TemperatureSensors.h
    • -2
    • +121
    ./App/Services/SystemCommMessages.c
    • -2
    • +17
    ./App/Services/SystemCommMessages.h
DEN-13460 addressed the code review comments

    • -1
    • +0
    ./App/Controllers/ConductivitySensors.c
    • -14
    • +22
    ./App/Controllers/TemperatureSensors.c
DEN-13460 added PiSquare VectorCAST

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/TemperatureSensors.c
    • -2
    • +2
    ./App/Controllers/TemperatureSensors.h
additional post merge changes for compilation

code review

DEN-13427: changes need in order for staging to build successfully post merge.

code review

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

DEN-13427: Addressed code review comments.

DEN-13460 updated the heates voltages

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
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
DEN-13460: make boolean explicit, update function header.

DEN-13460: Fixed bug DEN-13777.

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

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-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.

DEN-13460 updated the heaters control

    • -4
    • +17
    ./App/Controllers/TemperatureSensors.c
DEN-13460 updated the temperature sensors

    • -14
    • +38
    ./App/Controllers/TemperatureSensors.c