firmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Fixed merge conflicts from DEN-7117.

    • -21
    • +181
    ./App/Controllers/SyringePump.c
    • -3
    • +91
    ./App/Services/SystemCommMessages.c
    • -1
    • +10
    ./App/Services/SystemCommMessages.h
Addressed. Note: I did a git pull on my hdfirmware branch (I should not have done that). To get my code working, I had to remove.

Addressed.

Note: I did a git pull on my hdfirmware branch (I should not have done that). To get my code working, I had to remove.

DEN-7395: Integrated Dialysis.c with HD Blood Leak Detector driver

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

DEN-7395: Revert deleted code

This reverts commit bbd8081a9bd6fe63174f571bd60036145074e155.

DEN-7395: Addressed code review comments

Addressed. Had this as placeholder before looking at the schematics and EE HRS/HDD docs.

Addressed.

Had this as placeholder before looking at the schematics and EE HRS/HDD docs.

What happened here? Why are these deleted? Looks like a lot of content in this module has been removed. Need to restore.

What happened here? Why are these deleted? Looks like a lot of content in this module has been removed. Need to restore.

DEN-7395: Addressed code review comments

Addressed.

Addressed.

DEN-7395: Addressed code review comments

Addressed.

Addressed.

This has been uncommented.

This has been uncommented.

DEN-7395: Addressed code review comments

Addressed.

Addressed.

This line has been removed.

This line has been removed.

This line has been updated. Please look at below.

This line has been updated. Please look at below.

This function has been deleted.

This function has been deleted.

I added a build switch so the functions are un-commented.

I added a build switch so the functions are un-commented.

DEN-7117: continued integration of syringe pump driver.

DEN-7117: Decoupled seek and prime operations.

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

    • -33
    • +107
    ./App/Services/SystemCommMessages.c
    • -6
    • +18
    ./App/Services/SystemCommMessages.h
DEN-7347: Added treatment log parameters

DEN-7347: Added handler to ui disposable removal confirm message

    • -0
    • +19
    ./App/Services/SystemCommMessages.c
DEN-7347: Added check for heparin use

DEN-7117: Misc fixes to UI messaging. Misc syringe pump fixes.

    • -10
    • +116
    ./App/Controllers/SyringePump.c
    • -3
    • +91
    ./App/Services/SystemCommMessages.c
    • -2
    • +11
    ./App/Services/SystemCommMessages.h
DEN-7091: Integrate syringe pump driver

    • -0
    • +1707
    ./App/Controllers/SyringePump.c
    • -0
    • +28
    ./App/Services/SystemCommMessages.c
DEN-7091: Added dry and no cartridge self-test time progress

    • -2
    • +63
    ./App/Services/SystemCommMessages.c
DEN-7091: Added one second wait time in sub-mode complete state

Add TODO for all commented lines below.

Add TODO for all commented lines below.