hdfirmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-14007 merged staging and resolved the merge conflicts

    • -27
    • +139
    /firmware/App/Controllers/DialInFlow.c
    • -4
    • +6
    /firmware/App/Controllers/DialOutFlow.c
    • -18
    • +43
    /firmware/App/Modes/ModePostTreat.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'develop' of ssh://dvm-linux02:7999/hd/hdfirmware into develop

DEN-14007, DEN-14099 Merge & fix conflicts.

    • -6
    • +6
    /firmware/App/Controllers/DialInFlow.c
    • -6
    • +6
    /firmware/App/Controllers/DialOutFlow.c
    • -2
    • +50
    /firmware/App/Modes/ModePostTreat.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 'staging' into DEN-14433-sw-s86-mg-broadcast-fixes

    • -17
    • +41
    /firmware/App/Modes/ModeStandby.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'DIAL-219-request-for-dialin-command-to-return-alarm-button-broadcast-per-specific-alarm' into develop

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

Merge branch 'DEN-14344-sw-s85-mg-air-pump' into develop

DEN-14344: code review fixes.

DEN-14344: code review fixes.

Merge branch 'DEN-14099-bubbles-in-dialysate-out-line-from-dg-to-cartridge' into develop

DIAL-219: Fixed bug in broadcast user alarm button blockers.

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

Merge remote-tracking branch 'origin/develop' into develop

fixed double merge into develop.

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

Merge branch 'DEN-14344-sw-s85-mg-air-pump' into develop

DEN-14344: code review fixes.

    • -1
    • +16
    /firmware/App/Controllers/AirPump.c
DEN-14344: code review comments.

DEN-14344: code review comments

    • -16
    • +2
    /firmware/App/Controllers/AirTrap.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'DEN-14344-sw-s85-mg-air-pump' into develop

    • -13
    • +27
    /firmware/App/Controllers/DGInterface.c
    • -2
    • +3
    /firmware/App/Controllers/DGInterface.h
    • -8
    • +25
    /firmware/App/Controllers/DialInFlow.c
DEN-14344: compiler fixes

DEN-14344: fixed merge conflict missing lines.

Merge branch 'staging' into DEN-14344-sw-s85-mg-air-pump

    • -133
    • +118
    /firmware/App/Modes/SelfTests.c
    • -2
    • +10
    /firmware/App/Services/SystemComm.c
DEN-14099 Change PURGE_AIR_TIME_OUT_COUNT to 4min. Remove debug output.

DEN-14099 Bubble clear mods to state machine.