hdfirmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merged DEN-14906 into staging.

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
Merge branch 'staging' into DEN-14999-alarm-table-updates

    • -10
    • +15
    /firmware/App/Modes/ModePreTreat.c
DEN-14999: Fixed issue with repeated trimmer heater commands being sent to DG.

    • -2
    • +24
    /firmware/App/Controllers/DGInterface.c
    • -0
    • +1
    /firmware/App/Controllers/DGInterface.h
DEN-14906: Disabled re-prime feature.

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

Merge branch 'DEN-14906-dialyzer-de-prime' into develop

    • -10
    • +22
    /firmware/App/Controllers/PresOccl.c
DEN-14906: re-enabled re-prime.

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

DEN-14999: Dont trigger alarm 312 unless in treatment mode or pre-treatment mode after priming complete.

    • -3
    • +14
    /firmware/App/Controllers/DialInFlow.c
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

Merge DEN-14457-reservoir-drains-before-treatment-with-pre-treatment-build-flags-off

Cherry picked merge, due to staging/develop conflicts

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

DEN-14999: Set UI as communicating on any msg received from UI (not just check-in) to address DEN-14928.

DEN-14999: Fixed alarm mgmt issue where top alarm may not be set if LOW priority alarm triggered. Ensure HD pump on flag is set to FALSE when pump controller is in off state.

    • -0
    • +4
    /firmware/App/Controllers/DialInFlow.c
    • -0
    • +1
    /firmware/App/Controllers/DialOutFlow.c
HD-DEN-14457_Reservoir Drains Before Treatment With Pre Treatment Build Flags Off

Integrated current changes in other branches to address apparent conflicts.

DEN-14999: Split alarm 46 (no ACK) into 2 alarms. 46 is for msg to UI w/ no ACK. 18 is for msg to DG w/ no ACK.

DEN-14860 Fill time calculation maximum calculation 10% extra margin. Move Depletion time calculation to work in all reservoir states.

    • -34
    • +24
    /firmware/App/Services/Reservoirs.c
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

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

Merge branch 'DEN-14906-dialyzer-de-prime' into develop

    • -1
    • +1
    /firmware/App/Controllers/DialInFlow.c
    • -21
    • +47
    /firmware/App/Controllers/PresOccl.c
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