firmware

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

    • -336
    • +264
    ./App/Controllers/DGInterface.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

DEN-13598: Removed test code.

Merge branch 'DEN-13903-s80-mg-DIAL-204' into develop

    • -2
    • +84
    ./App/Services/SystemCommMessages.c
DEN-13903: DIAL-204: Fixes. Linking. Removal of warnings.

DEN-13903: fixed alarm persistence to use correct define

DEN-13903: DIAL-204: Implemented set PWM for all 3 HD pumps.

    • -0
    • +82
    ./App/Services/SystemCommMessages.c
DEN-13903: Alarm is triggered when the air trap gets to the upper level in treatment for 2s persistence.

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

Merged DEN-13834

    • -15
    • +108
    ./App/Services/SystemCommMessages.c
    • -1
    • +13
    ./App/Services/SystemCommMessages.h
DEN-13903: DIAL-204: Init commit

DEN-13834 updated the code

    • -15
    • +108
    ./App/Services/SystemCommMessages.c
    • -1
    • +13
    ./App/Services/SystemCommMessages.h
DEN-13598: Add persistence alarm using Windowscount for FPGA clock-spedd check

DEN-13903: Changed Air Trap control to use the lower level sensor for opening and closing instead of the upper.

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

DEN-13598 updated the code

    • -283
    • +289
    ./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

    • -8
    • +10
    ./App/Services/SystemCommMessages.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge DEN-13712.

    • -8
    • +10
    ./App/Services/SystemCommMessages.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'DEN-13801-sw_dev-sprint-79_mg' into develop

DEN-13801: Further merge fixes.

DEN-13460: Removed alarm 220 (battery charge low). Added battery remaining capacity monitor - use for blocking treatment start if < 10 min. For now, comment out blocking treatment, as most battery reads appear to not be working.

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

Merge branch 'DEN-13801-sw_dev-sprint-79_mg' into develop

DEN-13801: fixes for merge conflict

DEN-13801: DEN-13426: wrapped a new minimum occlusion sensor count behind the V3 SWConfig.