firmware

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

    • -224
    • +245
    ./App/Controllers/TemperatureSensors.c
    • -2
    • +1
    ./App/Controllers/TemperatureSensors.h
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
    • -1
    • +1
    ./App/Controllers/ConductivitySensors.h
  1. … 38 more files in changeset.
DEN-13598: Code review updates

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

    • -4
    • +0
    ./App/Controllers/TemperatureSensors.c
    • -3
    • +0
    ./App/Controllers/TemperatureSensors.h
DEN-13598: Add code for RAM error and FPGA clcok speed.

    • -0
    • +4
    ./App/Controllers/TemperatureSensors.c
    • -0
    • +3
    ./App/Controllers/TemperatureSensors.h
DEN-13598: Add code for RAM error and FPGA clcok speed.

    • -7
    • +0
    ./App/Controllers/TemperatureSensors.c
    • -29
    • +0
    ./App/Controllers/TemperatureSensors.h
DEN-13598 updated the code

    • -6
    • +0
    ./App/Controllers/TemperatureSensors.c
    • -30
    • +0
    ./App/Controllers/TemperatureSensors.h
DEN-13598: Updates to FPGA clock speed check.

DEN-13460 added PiSquare VectorCAST

DEN-13598 updated the code

DEN-13598 updated the code with the RAM alarms

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-13598 Updated code for RAM error checking.

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