hdfirmware

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

    • -46
    • +51
    /firmware/App/Controllers/DGInterface.c
    • -2
    • +3
    /firmware/App/Controllers/DGInterface.h
    • -37
    • +32
    /firmware/App/Services/SystemComm.c
    • -141
    • +149
    /firmware/App/Services/SystemCommMessages.c
DEN-13598: Addressed code review comments.

    • -3
    • +4
    /firmware/App/Controllers/DGInterface.c
    • -2
    • +1
    /firmware/App/Controllers/Temperatures.c
DEN-13598: Addressed code review comment.

DEN-13598: Addressed code review comment.

DEN-13598: Addressed code review comment.

    • -2
    • +4
    /firmware/App/Controllers/DGInterface.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

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

    • -2
    • +2
    /firmware/App/Controllers/DGInterface.c
    • -1
    • +1
    /firmware/App/Controllers/DialInFlow.c
    • -2
    • +2
    /firmware/App/Controllers/DialOutFlow.c
    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
    • -1
    • +1
    /firmware/App/Controllers/SyringePump.h
    • -1
    • +1
    /firmware/App/Controllers/Temperatures.c
    • -2
    • +2
    /firmware/App/Controllers/Temperatures.h
  1. … 27 more files in changeset.
DEN-13834 merged staging

    • -2
    • +15
    /firmware/App/Controllers/DGInterface.c
    • -12
    • +141
    /firmware/App/Modes/SelfTests.c
DEN-13598: Code review updates

DEN-13460 addressed the code review comments

    • -0
    • +1
    /firmware/App/Controllers/SyringePump.c
DEN-13598: Add code for FPGA clock speed checking

DEN-13598: Removed test code.

DEN-13598: Add persistence alarm using Windowscount for FPGA clock-spedd check

Merge branch 'DEN-13598-dg_hd_dev-sprint-77-fw-dong' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-13598-dg_hd_dev-sprint-77-fw-dong

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

DEN-13598 updated the code

    • -283
    • +289
    /firmware/App/Controllers/DGInterface.c
DEN-13598: Added #include to TaskGeneral.c.

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

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

Merge branch 'DEN-13712-dg_hd_dev-darren-sprint-77' into staging

DEN-13460 added PiSquare VectorCAST

    • -0
    • +2
    /firmware/App/Drivers/SafetyShutdown.c
DEN-13598 updated the code

    • -6
    • +0
    /firmware/App/Controllers/DGInterface.c
    • -29
    • +0
    /firmware/App/Controllers/DGInterface.h
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

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

    • -2
    • +2
    /firmware/App/Controllers/DGInterface.c
    • -2
    • +2
    /firmware/App/Controllers/DGInterface.h
Merge branch 'DEN-13427-sw_dev-sprint-75_mg' into staging

DEN-13427: post merge changes for staging

DEN-13598 Update code for new SRS with alarms.

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

    • -103
    • +135
    /firmware/App/Services/SystemCommMessages.c
DEN-13427: Addressed code review comments

DEN-13598 Update code for new SRS with alarms.

    • -81
    • +10
    /firmware/App/Controllers/DGInterface.c
    • -1
    • +0
    /firmware/App/Controllers/DGInterface.h