dgfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-7802: Fixed water sample stop

Merge branch 'develop' of ssh://dvm-linux02:7999/dg/dgfirmware into develop

Merged DEN-8030

DEN-8030 changed the drain modes drain pump RPM

DEN-8030 worked on chemical disinfect and V3 changes

    • -25
    • +104
    /firmware/App/Controllers/LoadCell.c
    • -33
    • +68
    /firmware/App/Modes/ModeChemicalDisinfect.c
DEN-8103: Added firmware image integrity check for POST

    • -0
    • +95
    /firmware/App/Services/Integrity.c
    • -0
    • +40
    /firmware/App/Services/Integrity.h
Merge branch 'DEN-7605-hd_dg_dev-self-tests' into develop

DEN-7605: Check FPGA reported comm errors in release version only.

DEN-8103: Fixed build error

DEN-8103: Added details to software fault alarm

Merged all DEN-8030-chemical-disinfect

DEN-8030 made changes in the modes to be able to run on V3

    • -3
    • +90
    /firmware/App/Modes/ModeChemicalDisinfect.c
Merge branch 'DEN-7605-hd_dg_dev-self-tests' into develop

DEN-7605: Added FPGA compatibility check to FPGA POST. Added skeleton for f/w stack compatibility POST test.

DEN-7802: Added boolean to comparison and disable alarms

    • -0
    • +5
    /firmware/App/Controllers/UVReactors.c
DEN-8030 continued working on chemical disinfect and added V3 DG valves configuration

    • -21
    • +54
    /firmware/App/Controllers/Valves.c
    • -47
    • +512
    /firmware/App/Modes/ModeChemicalDisinfect.c
    • -11
    • +124
    /firmware/App/Modes/ModeHeatDisinfect.c
DEN-8103: Cleaned up TODO and added alarms

    • -42
    • +14
    /firmware/App/Controllers/Heaters.c
    • -8
    • +15
    /firmware/App/Drivers/InternalADC.c
    • -65
    • +1
    /firmware/App/Services/Interrupts.c
Fixed merge conflicts.

    • -14
    • +63
    /firmware/App/Controllers/LoadCell.c
DEN-7605: Added load cell velocityto load cell monitor.

    • -4
    • +33
    /firmware/App/Controllers/LoadCell.c
DEN-7605: Added FPGA reported comm error to FPGA comm check. Added check of load cell ADC errors.

    • -9
    • +29
    /firmware/App/Controllers/LoadCell.c
DEN-7802: Added fpga fault check for concentrate pumps

DEN-8030 worked on chemical disinfect mode

    • -26
    • +34
    /firmware/App/Controllers/UVReactors.c
    • -5
    • +14
    /firmware/App/Controllers/UVReactors.h
    • -15
    • +1166
    /firmware/App/Modes/ModeChemicalDisinfect.c
    • -0
    • +14
    /firmware/App/Modes/ModeChemicalDisinfect.h
    • -17
    • +43
    /firmware/App/Modes/ModeHeatDisinfect.c
DEN-8103: Removed debug print and override type"

    • -3
    • +3
    /firmware/App/Controllers/UVReactors.c
    • -3
    • +3
    /firmware/App/Modes/ModeHeatDisinfect.c
    • -91
    • +13
    /firmware/App/Services/AlarmMgmt.c
DEN-8103: Added request to mode fault when alarm has fault property

DEN-7605: Added s/w faults for voltage monitor.

    • -28
    • +4
    /firmware/App/Controllers/Voltages.c
DEN-7605: Added transfer functions for monitored voltages.

    • -11
    • +17
    /firmware/App/Controllers/Voltages.c
    • -24
    • +24
    /firmware/App/Drivers/InternalADC.c
Fixed merge conflicts.

DEN-7605: Added function to get previous op mode.

    • -0
    • +14
    /firmware/App/Modes/OperationModes.c
DEN-7802: Removed alarm data type and unused variable

DEN-7802: Addressed code reviews

    • -0
    • +13
    /firmware/App/Controllers/Heaters.c