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

DEN-13460 addressed the code review comments

    • -14
    • +22
    ./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

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
    ./Controllers/TemperatureSensors.c
DEN-13427: DIAL-201. Updated temp sensors broadcast message to include thd RTD.

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

DEN-13460: Fixed bug DEN-13777.

DEN-13460 updated the FPGA persistent alarm functions

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

DEN-13460 merged staging

    • -9
    • +10
    ./Controllers/ConductivitySensors.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

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

DEN-13460 updated the temperature sensors

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