hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into DEN-14547-incorrect-dg-event

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/SyringePump.c
DEN-14561: Addressed code review comment.

DEN-14561: Have pre-tx res mgr switch to R2 after final fill before going to complete state.

DEN-14561: Addressed code review comments.

Fixed merge conflicts with local merge from staging.

    • -6
    • +15
    /firmware/App/Controllers/SyringePump.c
    • -42
    • +46
    /firmware/App/Modes/ModePreTreat.c
    • -17
    • +19
    /firmware/App/Modes/ModeTreatment.c
    • -104
    • +179
    /firmware/App/Modes/SelfTests.c
DEN-14561: Fix to pre-tx reservoir mgmt to keep modes from competing w/ res mgmt state machine for control of the active reservoir.

    • -16
    • +49
    /firmware/App/Modes/ModePreTreat.c
DEN-14537: code review comment

    • -1
    • +1
    /firmware/App/Modes/PreTreatmentRecirc.c
DEN-14561 Code review comment update.

DEN-14561 Code review comment update.

DEN-14547: Code review comments

    • -3
    • +3
    /firmware/App/Modes/PreTreatmentRecirc.c
DEN-14561: Set critical data values for UF and Tx duration settings when changed in mid-treatment.

DEN-14561: Increased final pre-tx res 1 fill volume to end up at 1500 mL before treatment. Fix bug that too many flush fills occurred. Reduced time for dialysate bypass prime state since DPi speed increased. Switch to res 2 before dialysate bypass prime state.

DEN-14547: Addressing code review

    • -1
    • +0
    /firmware/App/Modes/PreTreatmentRecirc.c
Merge branch 'staging' into DEN-14547-incorrect-dg-event

    • -7
    • +33
    /firmware/App/Modes/PreTreatmentRecirc.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/SyringePump.c
    • -2
    • +2
    /firmware/App/Controllers/SyringePump.h
    • -0
    • +16
    /firmware/App/Services/Reservoirs.c
DEN-14561 Updated for code review comments.

Merge branch 'staging' into DEN-14749-syringe-pump-plunger-remains-extended-during-pretreatment-causing-hd-software-fault

DEN-14749: Reset preload flag in standby mode instead of after retract/seek/prime operations. Increase alarm threshold for FMD vs. LC check in wet s.t. from 5% to 10%. Refactor alarm audio and 1 minute min tx time config flags. Removed test code in reservoir code.

    • -3
    • +12
    /firmware/App/Controllers/SyringePump.c
    • -0
    • +1
    /firmware/App/Controllers/SyringePump.h
    • -15
    • +14
    /firmware/App/Modes/ModeTreatment.c
    • -31
    • +7
    /firmware/App/Services/Reservoirs.c
DEN-1561 Fix integrated volume calculation for reservoir transfers.

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

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

DEN-14604 added code to not trigger the AC power loss if the safefy shutdown is enabled

Merge branch 'staging' into DEN-14604-dg_hd_dev-hd_dg_dvt-update-part-9

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
    • -1
    • +1
    /firmware/App/Controllers/DialInFlow.c
    • -1
    • +1
    /firmware/App/Controllers/DialOutFlow.c
    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
  1. … 32 more files in changeset.
DEN-14549: Fixed merge from staging merge conflicts.

    • -1
    • +13
    /firmware/App/Controllers/Buttons.c
    • -11
    • +50
    /firmware/App/Controllers/Valves.c
    • -2
    • +14
    /firmware/App/Drivers/SafetyShutdown.c
    • -2
    • +9
    /firmware/App/Modes/ConsumableSelfTest.c
    • -2
    • +15
    /firmware/App/Modes/ModePostTreat.c
    • -2
    • +8
    /firmware/App/Modes/ModeTreatmentParams.c
    • -2
    • +9
    /firmware/App/Modes/PreTreatmentRecirc.c
  1. … 3 more files in changeset.
DEN-14561 Comments

Answered comments from code review