hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-13801-sw_dev-sprint-79_mg' into develop

DEN-13801: updated dry self tests to reflect discussion.

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

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

    • -1
    • +1
    /firmware/App/Controllers/DGInterface.c
    • -7
    • +6
    /firmware/App/Controllers/SyringePump.c
DEN-13801: Changed dry self normal tolerance to 20mmHg instead of 10mmHg. Changed the condition to we can pass normal testing without fully waiting the timeout time.

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

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

Merge branch 'DEN-14101-sw-s82-mg-syringe-dac' into staging

Merge branch 'staging' into DEN-14101-sw-s82-mg-syringe-dac

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

Merge branch 'DEN-14150-hd-dialysate-flow-estimation' into develop

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

DEN-14150: Fixes to dialysate flow estimation functions.

    • -5
    • +6
    /firmware/App/Controllers/DialInFlow.c
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
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Fixed merge conflicts with DEN-13801.

    • -1
    • +2
    /firmware/App/Controllers/DGInterface.c
    • -39
    • +86
    /firmware/App/Modes/ModePreTreat.c
    • -54
    • +186
    /firmware/App/Modes/SelfTests.c
DEN-13801: Updates to reservoir mgmt during dry cartridge pressure leak test.

    • -1
    • +2
    /firmware/App/Controllers/DGInterface.c
Merge branch 'staging' into DEN-14166-dg_hd_dev-hd_dg_dvt-update-part-4

DEN-14166 updated the self tests

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

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

    • -2
    • +2
    /firmware/App/Modes/PreTreatmentRecirc.c
DEN-13903 merged staging

Merge branch 'staging' into DEN-13903-sprint-80_mg_air_trap_optimization

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

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

    • -2
    • +2
    /firmware/App/Controllers/SyringePump.c
DEN-12744 Start adding code to preload position for Heparin despenser before user installs.

    • -2
    • +109
    /firmware/App/Controllers/SyringePump.c
    • -0
    • +2
    /firmware/App/Controllers/SyringePump.h
DEN-13903: Addressing code review comments

DEN-14166 addressed a code review comment

DEN-13903: Reworked upper level persistence. Added todo for dialyizer timeout. code review changes.