dgfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merged DEN-9054 and resolved merge conflicts

    • -18
    • +21
    /firmware/App/Controllers/LoadCell.c
    • -111
    • +191
    /firmware/App/Controllers/Pressures.c
    • -38
    • +112
    /firmware/App/Controllers/ROPump.c
    • -15
    • +27
    /firmware/App/Modes/ModeHeatDisinfect.c
    • -25
    • +77
    /firmware/App/Modes/ModeRecirculate.c
    • -2
    • +54
    /firmware/App/Services/Reservoirs.c
DEN-9054 updated some of the drivers with calibration code

    • -18
    • +21
    /firmware/App/Controllers/LoadCell.c
    • -111
    • +191
    /firmware/App/Controllers/Pressures.c
    • -38
    • +112
    /firmware/App/Controllers/ROPump.c
    • -16
    • +1
    /firmware/App/Modes/ModeChemicalDisinfect.h
    • -15
    • +27
    /firmware/App/Modes/ModeHeatDisinfect.c
    • -27
    • +77
    /firmware/App/Modes/ModeRecirculate.c
    • -9
    • +57
    /firmware/App/Services/Reservoirs.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Fixed merge conflicts.

    • -121
    • +267
    /firmware/App/Modes/ModeHeatDisinfect.c
    • -5
    • +20
    /firmware/App/Modes/ModeRecirculate.c
    • -64
    • +4
    /firmware/App/Services/Interrupts.c
    • -15
    • +11
    /firmware/App/Services/Reservoirs.c
    • -21
    • +1
    /firmware/App/Services/SystemComm.c
  1. … 3 more files in changeset.
DEN-8886: Changed master clock to 208 MHz to improve CAN timing.

    • -14
    • +0
    /firmware/App/Modes/ModeChemicalDisinfect.h
DEN-7802: Handled clear immedidate flag in alarm management

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

DEN-7802: Refactor conductivity checks

    • -2
    • +0
    /firmware/App/Controllers/UVReactors.c
Merge branch 'staging' into DEN-7802-dg_dev-dialysate-generation

    • -215
    • +87
    /firmware/App/Controllers/Heaters.c
    • -34
    • +74
    /firmware/App/Controllers/ROPump.c
    • -36
    • +41
    /firmware/App/Controllers/UVReactors.c
    • -24
    • +139
    /firmware/App/Modes/ModeStandby.c
    • -270
    • +302
    /firmware/App/Services/Reservoirs.c
    • -17
    • +18
    /firmware/App/Services/Reservoirs.h
Merge branch 'DEN-8103-dg-hd_dev-alarm-design' into staging

DEN-8886: Removed obsolete debug code.

    • -128
    • +4
    /firmware/App/Services/Interrupts.c
    • -21
    • +0
    /firmware/App/Services/SystemComm.c
DEN-8103: Fixed valve state when switch reservoir

DEN-8103: Fixed build errors

    • -12
    • +30
    /firmware/App/Controllers/Heaters.c
    • -14
    • +0
    /firmware/App/Modes/ModeChemicalDisinfect.h
Merge branch 'staging' into DEN-8103-dg-hd_dev-alarm-design

    • -201
    • +79
    /firmware/App/Controllers/Heaters.c
    • -23
    • +49
    /firmware/App/Controllers/LoadCell.c
    • -30
    • +38
    /firmware/App/Controllers/UVReactors.c
    • -176
    • +309
    /firmware/App/Modes/ModeHeatDisinfect.c
    • -4
    • +18
    /firmware/App/Modes/ModeRecirculate.c
    • -26
    • +24
    /firmware/App/Modes/ModeStandby.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Enable NV POST and fix NVData buffer length

Removed Skip Recirc build switch.

DEN-8886: Fixed merge conflicts from staging.

    • -3
    • +10
    /firmware/App/Modes/ModeRecirculate.c
    • -21
    • +13
    /firmware/App/Services/Reservoirs.c
DEN-8886: Close both reservoir drain valves at start of re-circ mode.

DEN-8103: Added missing header and removed redundant function declaration

DEN-8030 updated the documentation

    • -2
    • +1
    /firmware/App/Modes/ModeHeatDisinfect.c
DEN-8030 adderessed a code review comment

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

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

HalCOGen fixes. Merge fixes.

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

Reset corrupted HalCOGen source files.

DEN-8030 addressed code review comments

    • -12
    • +12
    /firmware/App/Modes/ModeHeatDisinfect.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Merge branch 'DEN-8103-dg-hd_dev-alarm-design' into develop

    • -49
    • +21
    /firmware/App/Controllers/Heaters.c
    • -13
    • +13
    /firmware/App/Controllers/LoadCell.c
    • -3
    • +3
    /firmware/App/Controllers/UVReactors.c
    • -3
    • +3
    /firmware/App/Modes/ModeHeatDisinfect.c
    • -0
    • +133
    /firmware/App/Services/AlarmMgmtSWFaults.h
  1. … 4 more files in changeset.