hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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-14589: Added battery comm status to publishing.

DEN-14589: removed TODO

DEN-14589: Battery overrides.

    • -13
    • +215
    /firmware/App/Drivers/Battery.c
    • -0
    • +12
    /firmware/App/Services/SystemComm.c
Merge branch 'staging' into DEN-14589-DIAL-211

    • -44
    • +23
    /firmware/App/Controllers/PresOccl.c
    • -6
    • +15
    /firmware/App/Controllers/SyringePump.c
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

Fixed merge conflicts.

    • -2
    • +2
    /firmware/App/Controllers/DGInterface.c
    • -2
    • +2
    /firmware/App/Controllers/DGInterface.h
    • -4
    • +13
    /firmware/App/Controllers/SyringePump.c
    • -2
    • +2
    /firmware/App/Modes/ConsumableSelfTest.c
    • -15
    • +15
    /firmware/App/Modes/ModePreTreat.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

DEN-14589: fixed syringe pump events.

    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
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.
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo