hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.

DEN-14344: Misc formatting fixes.

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

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

    • -1
    • +1
    /firmware/App/Controllers/DGInterface.c
    • -1
    • +1
    /firmware/App/Controllers/DGInterface.h
    • -2
    • +2
    /firmware/App/Controllers/DialInFlow.c
    • -2
    • +2
    /firmware/App/Controllers/DialOutFlow.c
    • -2
    • +2
    /firmware/App/Drivers/SafetyShutdown.c
  1. … 6 more files in changeset.
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

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

    • -7
    • +70
    /firmware/App/Controllers/AirTrap.c
    • -2
    • +36
    /firmware/App/Controllers/PresOccl.c
DEN-14344: fixes for adjusted venous limits when air pump is on

    • -20
    • +21
    /firmware/App/Controllers/PresOccl.c
Merge branch 'DEN-14307-dg_hd_dev-hd_dg_dvt-update-part-6' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-14307-dg_hd_dev-hd_dg_dvt-update-part-6

DEN-14307: partial fix to DEN-14086.

    • -5
    • +22
    /firmware/App/Controllers/DialInFlow.c
DEN-14307 addressed a code review comment

DEN-14307 addressed the code review comments

Merge branch 'DEN-14307-dg_hd_dev-hd_dg_dvt-update-part-6' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-14307-dg_hd_dev-hd_dg_dvt-update-part-6

DEN-14307: Removed obsolete build switches.

    • -13
    • +8
    /firmware/App/Drivers/SafetyShutdown.c
DEN-14307 addressed code review comments

DEN-14344: complier fixes and warnings

DEN-14344: created air pump monitor function for alarm id 316. Created a timer for venous pressure to handle adjusted treatment values for a time while the air pump is operating. Allow HD to start filling after consumable testing in pretreatment instead of waiting after dry self tests. formatted ifndef release code blocks to look neater.

    • -6
    • +13
    /firmware/App/Controllers/AirPump.c
    • -31
    • +16
    /firmware/App/Controllers/AirTrap.c
    • -1
    • +27
    /firmware/App/Controllers/PresOccl.c
DEN-14007 Code Review comments update 2.

DEN-14007 Code Review comments update 1.

    • -3
    • +3
    /firmware/App/Controllers/DialInFlow.c
    • -3
    • +3
    /firmware/App/Controllers/DialOutFlow.c
    • -18
    • +21
    /firmware/App/Modes/ModePostTreat.c