hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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
Old transfer was 600mL, new is 300mL. Res 1 should end up with 1500 so added 300 to baseline, Res 2 was previously ending with 500. Do we want it to end R2 with 300?

Old transfer was 600mL, new is 300mL. Res 1 should end up with 1500 so added 300 to baseline, Res 2 was previously ending with 500. Do we want it to end R2 with 300?

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
Updated for only reservoir 2 fill state.

Updated for only reservoir 2 fill state.

DEN-14561 Change DPi fast flow only to Reservoir 2 fill.

There are two dialysate prime states. First goes through dialyzer and both DPs are running and we still want 300 rate. Second bypasses dialyzer and only DPi is running and we want 600 rate.

There are two dialysate prime states. First goes through dialyzer and both DPs are running and we still want 300 rate. Second bypasses dialyzer and only DPi is running and we want 600 rate.

This looks like we're skipping draining of reservoirs before doing any filling if priming disabled. I think we always want to drain both reservoirs first. Also, if we go to fill state like this, wi...

This looks like we're skipping draining of reservoirs before doing any filling if priming disabled. I think we always want to drain both reservoirs first.
Also, if we go to fill state like this, will it do a flush or a normal fill? I think it will do a flush fill since flushed flag is still FALSE.

Remove extra blank line.

Remove extra blank line.

We should initialize these with a loop iterating through each reservoir (in case a reservoir is added/removed at some point).

We should initialize these with a loop iterating through each reservoir (in case a reservoir is added/removed at some point).

This should probably be 600 since we'll only be transferring 300 to R1 in wet self-tests.

This should probably be 600 since we'll only be transferring 300 to R1 in wet self-tests.

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.

Alignment

Alignment

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
Merge branch 'staging' into DEN-14559-dg_hd_dev-hd_dg_dvt-update-part-8

DEN-14559 updated the code to be able to run POST requested by the Dialin user

    • -0
    • +12
    /firmware/App/Controllers/AlarmLamp.c
    • -0
    • +12
    /firmware/App/Controllers/Buttons.c
    • -0
    • +12
    /firmware/App/Drivers/SafetyShutdown.c
    • -0
    • +1
    /firmware/App/Drivers/SafetyShutdown.h
    • -0
    • +12
    /firmware/App/Services/WatchdogMgmt.c
DEN-14561 Update timing and volumesfor speeding up Pre-Treat part 1.

Fixed merge conflicts from staging.

Merge branch 'staging' into DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-treatment

    • -12
    • +12
    /firmware/App/Modes/ModeInitPOST.c
RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

DEN-14549: Added function to see if an alarm condition is detected. Added a function to determine whether A/C power loss condition is detected and used them where needed.

    • -2
    • +4
    /firmware/App/Controllers/DialInFlow.c
    • -1
    • +3
    /firmware/App/Controllers/DialOutFlow.c
DEN-14549: include venous check in including blood prime.

Yes, may need to be done when merging to Staging. Is this flag used independently anywhere? Or planned to be?

Yes, may need to be done when merging to Staging. Is this flag used independently anywhere? Or planned to be?

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

DEN-14549: Addressed code review comments.

    • -1
    • +11
    /firmware/App/Controllers/Voltages.c
I don't think I have this bug fix in my branch. Needs to be addressed in a more recent branch.

I don't think I have this bug fix in my branch. Needs to be addressed in a more recent branch.

Good catch. Updated Voltages.c to behave same as Battery.c (trigger the correction alarm depending on whether in a treatment mode).

Good catch. Updated Voltages.c to behave same as Battery.c (trigger the correction alarm depending on whether in a treatment mode).