hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-14011-occulsion-alarm-when-reseating' into staging

Merge branch 'staging' into DEN-14011-occulsion-alarm-when-reseating

Merge branch 'DEN-14561-_release_-preprocessor-flag-specifies-code-that-conflicts-with-sw_config_-debug' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-14561-_release_-preprocessor-flag-specifies-code-that-conflicts-with-sw_config_-debug

DEN-14561

Code review updates

    • -9
    • +2
    /firmware/App/Controllers/SyringePump.c
DEN-14604 updated the valves

DEN-14549: Fix art/ven pressure alarm check logic - apply user set limits in dialysis state (if not saline bolus) or treatment stop state (if BP running). Require door/latch to be closed in patient connection state. Remove escalation for prime complete alarms. Handle prime complete alarms in pre-tx recirculate state. Update prime complete alarm properties.

    • -1
    • +26
    /firmware/App/Modes/PreTreatmentRecirc.c
DEN-14557 addressed a code review comment

DEN-14557 reversed the blood leak's pass/fail logic in the zero sequence

DEN-14557 added code to the HD valves to accept a transition command if the valve is currently is not close to target

DEN-14011

DEN-14561 Wait for dry self test before final fill. Use reservoir 2 for Prime dialysate bypass.

DEN-14011: implemented proper exit condition for dry self start state.

DEN-14011: created handleDrySelfTestStartState. code review comments.

DEN-14561 Update PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML per code review comment.

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/ConsumableSelfTest.c
    • -2
    • +2
    /firmware/App/Modes/ModeTreatmentParams.c
    • -2
    • +2
    /firmware/App/Modes/PreTreatmentRecirc.c
Merge branch 'DEN-14328-hd-event-issues' into staging

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

DEN-14011: added condition to check if BP is running while we do occlusion checks.

DEN-14011: dry self test transitions to DRY_SELF_TESTS_START_STATE on dry self retries instead of DRY_SELF_WAIT_FOR_DOOR_CLOSE_STATE.

DEN-14414: addressed code reviews.

HD-DEN-14561

Pretreatment repeated flush implementation update.

    • -45
    • +29
    /firmware/App/Modes/ModePreTreat.c
Merge branch 'DEN-14328-hd-event-issues' into develop

    • -0
    • +6
    /firmware/App/Modes/ConsumableSelfTest.c
    • -0
    • +13
    /firmware/App/Modes/ModePostTreat.c
    • -2
    • +14
    /firmware/App/Services/WatchdogMgmt.c
Merge branch 'staging' into DEN-14328-hd-event-issues

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/Drivers/SafetyShutdown.c
    • -2
    • +2
    /firmware/App/Drivers/SafetyShutdown.h
DEN-14414: Implemented sub state events.

    • -0
    • +6
    /firmware/App/Modes/ConsumableSelfTest.c
    • -0
    • +13
    /firmware/App/Modes/ModePostTreat.c
    • -0
    • +6
    /firmware/App/Modes/ModeTreatmentParams.c
    • -0
    • +6
    /firmware/App/Modes/PreTreatmentRecirc.c
DEN-14561 Change DPi fast flow only to Reservoir 2 fill.

DEN-14549: Rolled back change to include blood prime for normal inline pressure range checks. Leave as fixed max only range check in blood prime.

HD-DEN-14561

Extended changes that correct RELEASE flag logic

Provide multiple flush passes in pretreatment

And eliminate all flushes when priming is disabled

    • -48
    • +43
    /firmware/App/Modes/ModePreTreat.c