hdfirmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-14906: fixed merge conflicts from staging.

    • -1
    • +10
    /firmware/App/Controllers/BloodFlow.c
    • -7
    • +15
    /firmware/App/Controllers/DialInFlow.c
    • -2
    • +2
    /firmware/App/Modes/ModeTreatmentParams.c
    • -3
    • +35
    /firmware/App/Services/Reservoirs.c
    • -182
    • +322
    /firmware/App/Services/SystemCommMessages.c
DEN-14906: Disabled re-prime feature.

DEN-14906: re-enabled re-prime.

DEN-14906: Fixed arterial high pressure check while in adjunct treatment states.

DEN-14906: Fixed isues that arose when disabling re-prime feature.

DEN-14906: Addressed code review comment.

    • -8
    • +20
    /firmware/App/Controllers/PresOccl.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-14457-reservoir-drains-before-treatment-with-pre-treatment-build-flags-off' into staging

HD-DEN-14457_Reservoir Drains Before Treatment With Pre Treatment Build Flags Off

Integrated current changes in other branches to address apparent conflicts.

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

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

Merged DEN-14557

DEN-14906: Increased HD pump max current persistence from 2 to 5 seconds. Added 1 minute delay following start/resume of dialysis where venous pressure limits are set to max selectable to allow pumps to stabilize.

    • -1
    • +1
    /firmware/App/Controllers/DialInFlow.c
    • -1
    • +1
    /firmware/App/Controllers/DialOutFlow.c
    • -21
    • +47
    /firmware/App/Controllers/PresOccl.c
    • -2
    • +2
    /firmware/App/Modes/ModeTreatmentParams.c
Auto stash before merge of "DEN-14457-reservoir-drains-before-treatment-with-pre-treatment-build-flags-off" and "staging"

Merge branch 'staging' into DEN-14457-reservoir-drains-before-treatment-with-pre-treatment-build-flags-off

    • -14
    • +49
    /firmware/App/Modes/ModePreTreat.c
DEN-14557 updated the code set the valves status to position unknown if the tranistion to a position timedout.

DEN-14906: Fix response to Dialin requiring ACK when it should not.

DEN-14906: restored 30 min interval for dialyzer re-prime.

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-14788-DIAL-242-air-bubble-sensor' into staging

DEN-14788: code review comments.

DEN-14906: Increased pump speed during dialyzer re-prime and reduce time in re-prime state in attempt to address over-current alarm.

Merge branch 'staging' into DEN-14788-DIAL-242-air-bubble-sensor

DEN-14788: fixed UI check-in.

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/DGInterface.c
    • -2
    • +2
    /firmware/App/Controllers/DGInterface.h
HD-DEN-14457_Reservoir Drains Before Treatment With Pre Treatment Build Flags Off

Updated signalAllowDGFlushFills(),

signalAllowDGFillRes[12]() to be sure that the signal to continue occurs even when both thr air pump and dry tests are disabled.

Merge branch 'staging' into DEN-14763-dg_hd_dev-hd_dg_dvt-update-part-10