dgfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Fixed merge conflicts from staging.

    • -39
    • +48
    /firmware/App/Controllers/LoadCell.c
    • -1
    • +17
    /firmware/App/Services/SystemComm.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
    /firmware/App/Controllers/DialysateFlow.c
    • -0
    • +16
    /firmware/App/Controllers/FlowSensors.c
    • -0
    • +16
    /firmware/App/Controllers/FlowSensors.h
  1. … 38 more files in changeset.
DEN-13598: Code review updates

DEN-13460 merged staging and resolved merge conflicts

    • -38
    • +45
    /firmware/App/Controllers/LoadCell.c
    • -2
    • +30
    /firmware/App/Modes/OperationModes.c
    • -2
    • +30
    /firmware/App/Services/Reservoirs.c
    • -2
    • +14
    /firmware/App/Services/SystemComm.c
DEN-13460 addressed the code review comments

DEN-13598: Removed test code and comments.

DEN-13598: Removed test code and comments.

DEN-13598: Removed test code and comments.

DEN-13598: Changed DG FPGA timer accuracy check to be time windowed count type alarm.

DEN-13598: Add code for RAM error and FPGA clcok speed.

DEN-13598: Add code for RAM error and FPGA clcok speed.

    • -14
    • +0
    /firmware/App/Controllers/Heaters.h
    • -10
    • +0
    /firmware/App/Controllers/LoadCell.h
DEN-13598 updated the code

    • -15
    • +0
    /firmware/App/Controllers/Heaters.h
    • -11
    • +0
    /firmware/App/Controllers/LoadCell.h
DEN-13598: Updates to FPGA clock speed check.

DEN-13460 added PiSquare VectorCAST

    • -12
    • +0
    /firmware/App/Controllers/Heaters.c
DEN-13598 updated the code

DEN-13598 updated the code with the RAM alarms

    • -12
    • +0
    /firmware/App/Controllers/Heaters.c
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-13427-sw_dev-sprint-75_mg' into staging

additional post merge changes for compilation

code review

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

    • -13
    • +1
    /firmware/App/Controllers/Heaters.c
code review

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

DEN-13427: Addressed code review comments.

DEN-13598 Updated code for RAM error checking.

DEN-13460 updated the heates voltages

DEN-13460 addressed the code review comments

    • -1
    • +1
    /firmware/App/Controllers/DialysateFlow.c
Merge branch 'DEN-13460-dg_hd_dev-hd_dg_dvt-update-part-2' of ssh://dvm-linux02:7999/dg/dgfirmware into DEN-13460-dg_hd_dev-hd_dg_dvt-update-part-2