hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-5980 resolved merge conflicts and addressed the code review comments

    • -3
    • +3
    /firmware/App/Controllers/DialInFlow.c
Merge branch 'DEN-7117-hd_dev-hd-heparin-delivery' into develop

DEN-7117: minor fix to treatment restart when Heparin is paused.

DEN-7347: Send UI treatment log data

Merge branch 'DEN-7117-hd_dev-hd-heparin-delivery' into develop

DEN-7117: Added more syringe pump integration.

    • -3
    • +0
    /firmware/App/Controllers/SyringePump.c
Merge branch 'DEN-7091-pre-treatment-mode' into develop

    • -0
    • +13
    /firmware/App/Controllers/DGInterface.c
    • -0
    • +1
    /firmware/App/Controllers/DGInterface.h
    • -77
    • +54
    /firmware/App/Modes/ModePreTreat.c
    • -85
    • +157
    /firmware/App/Modes/SelfTests.c
DEN-7091: Skip self-tests for syringe pump

DEN-7347: Removed blank line

    • -1
    • +0
    /firmware/App/Controllers/DialInFlow.h
DEN-7117: Fixes per lab testing observations.

    • -16
    • +15
    /firmware/App/Controllers/SyringePump.c
DEN-7091: Added wait for DG to switch reservoir

    • -0
    • +13
    /firmware/App/Controllers/DGInterface.c
    • -0
    • +1
    /firmware/App/Controllers/DGInterface.h
    • -77
    • +51
    /firmware/App/Modes/ModePreTreat.c
Fixed merge conflicts from DEN-7117.

DEN-7117: Fixed measured rate calculation. Added Heparin state to treatment states broadcast message.

    • -2
    • +3
    /firmware/App/Controllers/SyringePump.c
DEN-7091: Fixed resume signal handle

    • -79
    • +139
    /firmware/App/Modes/SelfTests.c
    • -6
    • +12
    /firmware/App/Services/SystemComm.c
DEN-7117: Fixes per lab testing.

    • -2
    • +6
    /firmware/App/Controllers/SyringePump.c
    • -0
    • +1
    /firmware/App/Controllers/SyringePump.h
DEN-7395: Addressed code review comments

Merge branch 'DEN-7091-pre-treatment-mode' into develop

DEN-7091: Syringe pump driver integration

    • -22
    • +182
    /firmware/App/Controllers/SyringePump.c
    • -3
    • +12
    /firmware/App/Controllers/SyringePump.h
DEN-7395: Addressed code review comments

Fixed merge conflicts from DEN-7117.

    • -21
    • +181
    /firmware/App/Controllers/SyringePump.c
    • -1
    • +13
    /firmware/App/Modes/ModeTreatmentParams.c
DEN-7395: Integrated Dialysis.c with HD Blood Leak Detector driver

DEN-7117: allow seek w/o starting at home position.

    • -3
    • +8
    /firmware/App/Controllers/SyringePump.c
DEN-7395: Revert deleted code

This reverts commit bbd8081a9bd6fe63174f571bd60036145074e155.

DEN-7395: Addressed code review comments

DEN-7395: Addressed code review comments

DEN-7395: Addressed code review comments

DEN-7395: Addressed code review comments

DEN-7117: continued integration of syringe pump driver.

    • -0
    • +25
    /firmware/App/Controllers/SyringePump.c
    • -0
    • +2
    /firmware/App/Controllers/SyringePump.h
DEN-7117: Decoupled seek and prime operations.

    • -11
    • +35
    /firmware/App/Controllers/SyringePump.c
    • -3
    • +5
    /firmware/App/Controllers/SyringePump.h
    • -1
    • +1
    /firmware/App/Modes/ModeTreatmentParams.c
Merge branch 'DEN-7091-pre-treatment-mode' into develop

    • -9
    • +20
    /firmware/App/Controllers/BloodFlow.c
    • -10
    • +21
    /firmware/App/Controllers/DialInFlow.c
    • -12
    • +8
    /firmware/App/Controllers/PresOccl.c
    • -26
    • +59
    /firmware/App/Modes/ModePreTreat.c
    • -1
    • +4
    /firmware/App/Modes/ModeTreatmentParams.c