dgfirmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-3421 merged with other branches

DEN-3922 Addressed code reviews and removed VC previous import errors

Use notifications for RTI interrupt handling like HD.

    • -7
    • +42
    /firmware/App/Services/Interrupts.c
Merge branch 'DEN-2490-firmware-lockup' into DEN-3421-dg-heat-disinfection

    • -5
    • +5
    /firmware/App/Services/PIControllers.c
    • -144
    • +187
    /firmware/App/Services/SystemComm.c
Resolved a merge conflict with master

    • -17
    • +18
    /firmware/App/Controllers/DrainPump.c
    • -15
    • +16
    /firmware/App/Controllers/DrainPump.h
    • -19
    • +22
    /firmware/App/Controllers/ROPump.c
    • -15
    • +16
    /firmware/App/Controllers/ROPump.h
    • -15
    • +16
    /firmware/App/Modes/ModeHeatDisinfect.c
    • -15
    • +16
    /firmware/App/Modes/ModeHeatDisinfect.h
    • -15
    • +16
    /firmware/App/Services/PIControllers.c
    • -15
    • +16
    /firmware/App/Services/PIControllers.h
    • -17
    • +16
    /firmware/App/Services/SystemComm.c
Fix module headers.

Handle CAN and UART error/warning notifications. Differentiated HD from DG s/w fault. Updated some older module/function headers to latest format.

  1. … 13 more files in changeset.
DEN-3922 Fixed doxygen errors and corrected spelling errors

DEN-3922 Fixed constant name and FPGA control address

DEN-3922 Added unit tests and integration test

    • -604
    • +2260
    /results/VectorCAST.log
DEN-3922 Check inlet water conductivity during Fill, Drain, and Recirculate Modes

Fixed bug where new debug event for full buffer would overflow a temporary buffer to hold the event text. Removed some obsolete comm buffer protection code. Removed obsolete CAN test build option.

    • -28
    • +23
    /firmware/App/Services/CommBuffers.c
Added CAN channel for DG to send to UI. Added task/interrup timing measurement test code. Added debug code for CAN/UART error interrupts and alarm trigger/clear events. Added new f/w debug messaging support. Added FPGA version info to versions message.

    • -20
    • +20
    /firmware/App/Services/Interrupts.c
DEN-3922 Refactor and add outlet conductivity sensor

DEN-3922 Add conductivity sensor module for inlet water

    • -0
    • +260
    /firmware/App/Controllers/ConductivitySensors.c
    • -0
    • +57
    /firmware/App/Controllers/ConductivitySensors.h
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

    • -15
    • +16
    /firmware/App/Controllers/DrainPump.c
    • -15
    • +16
    /firmware/App/Controllers/DrainPump.h
    • -15
    • +16
    /firmware/App/Controllers/Heaters.c
    • -15
    • +16
    /firmware/App/Controllers/Heaters.h
    • -15
    • +16
    /firmware/App/Controllers/LoadCell.c
    • -15
    • +16
    /firmware/App/Controllers/LoadCell.h
    • -15
    • +16
    /firmware/App/Controllers/Pressures.c
    • -15
    • +16
    /firmware/App/Controllers/Pressures.h
    • -15
    • +16
    /firmware/App/Controllers/ROPump.c
    • -15
    • +16
    /firmware/App/Controllers/ROPump.h
    • -15
    • +16
    /firmware/App/Controllers/Valves.c
    • -15
    • +16
    /firmware/App/Controllers/Valves.h
  1. … 60 more files in changeset.
Ran the test script after merge with DEN-2650

    • -2332
    • +1819
    /results/VectorCAST.log
DEN-2650 Fixed merge conflict with master

Fixed initial broadcast intervals for RO and Drain pumps.

Complete IT for Valves module.

    • -0
    • +74
    /results/Build_Status_Report.csv
UT and IT updates. Added IT for Reservoirs.c.

DEN-3421 modified RO pump and Drain pump and added a control loop to them.

    • -5
    • +24
    /firmware/App/Controllers/DrainPump.c
    • -2
    • +2
    /firmware/App/Modes/ModeHeatDisinfect.c
    • -0
    • +2
    /firmware/App/Services/PIControllers.c
    • -1
    • +2
    /firmware/App/Services/PIControllers.h
Fix reservoir mix-up in Drain/Fill modes. Added test code to turn fan on when starting re-circ mode to cool heater until fan module is written.

IT updates.

UT updates. Added UT for Reservoirs module. Minor fixes per UT.

Merge branch 'DEN-2650-dg-firmware-infrastructure' into DEN-3421-dg-heat-disinfection

DEN-3421 work in progress. Added a state to ramp up the RO pump for the targeted flow

    • -10
    • +138
    /firmware/App/Controllers/ROPump.c
    • -0
    • +15
    /firmware/App/Controllers/UVReactors.c
    • -5
    • +19
    /firmware/App/Controllers/UVReactors.h
    • -127
    • +116
    /firmware/App/Modes/ModeHeatDisinfect.c
    • -1
    • +4
    /firmware/App/Modes/ModeHeatDisinfect.h
    • -0
    • +1
    /firmware/App/Services/PIControllers.h
UT updates. Updated RO pump PI coefficients to make less aggressive based on lab testing.

Changed state of VRc from re-circ state to drain state in re-circulate mode per latest SA.