hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into DEN-14175-dg_hd_dev-hd_dg_dvt-update-part-5

    • -4
    • +126
    /firmware/App/Controllers/SyringePump.c
DEN-14175 removed a blank line

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/SyringePump.c
    • -2
    • +2
    /firmware/App/Controllers/SyringePump.h
Merge branch 'DEN-14170-sw_dev_sprint_82_darren' into staging

    • -2
    • +124
    /firmware/App/Controllers/SyringePump.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'DEN-14170-sw_dev_sprint_82_darren' into develop

    • -2
    • +124
    /firmware/App/Controllers/SyringePump.c
DEN-14170 Code review comment update for if/else condition.

    • -14
    • +14
    /firmware/App/Controllers/SyringePump.c
DEN-14150: Update DialInFlow.c

    • -3
    • +0
    /firmware/App/Controllers/DialInFlow.c
DEN-14170 Remove check for Syringe in Preload request. Preload function does this test and sets alarm properly.

    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
DEN-14150: Update DialInFlow.c

    • -2
    • +2
    /firmware/App/Controllers/DialInFlow.c
DEN-14150: Update DialInFlow.c

    • -15
    • +18
    /firmware/App/Controllers/DialInFlow.c
DEN-14175 merged staging and resolved the conflicts

    • -3
    • +4
    /firmware/App/Controllers/DGInterface.c
    • -3
    • +14
    /firmware/App/Controllers/PresOccl.c
    • -48
    • +155
    /firmware/App/Modes/ModePreTreat.c
    • -76
    • +217
    /firmware/App/Modes/SelfTests.c
DEN-14150: Update DialInFlow.c

    • -1
    • +0
    /firmware/App/Controllers/DialInFlow.c
DEN-14175 addressed the code review comments

DEN-14150: Update DialInFlow.c

    • -2
    • +5
    /firmware/App/Controllers/DialInFlow.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'DEN-14150-hd-dialysate-flow-estimation' into develop

    • -4
    • +5
    /firmware/App/Controllers/DialInFlow.c
Merge branch 'develop' of ssh://dvm-linux02:7999/hd/hdfirmware into develop

    • -3
    • +5
    /firmware/App/Controllers/DGInterface.c
DEN-14150: Update DialInFlow.c

    • -1
    • +0
    /firmware/App/Controllers/DialInFlow.c
DEN-14170 Updated for code review comments.

    • -22
    • +24
    /firmware/App/Controllers/SyringePump.c
DEN-14150: Address code review comments

    • -4
    • +6
    /firmware/App/Controllers/DialInFlow.c
Merge DEN-14150

    • -8
    • +0
    /firmware/App/Controllers/DGInterface.c
    • -0
    • +1
    /firmware/App/Controllers/DialInFlow.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merged DEN-14175

    • -3
    • +5
    /firmware/App/Controllers/DGInterface.c
    • -1
    • +1
    /firmware/App/Controllers/DGInterface.h
    • -1
    • +4
    /firmware/App/Controllers/SyringePump.c
DEN-14175 replaced the V3 flag with FPGA hardware check and added the default the fixed valves PWM count in FPGA

DEN-14170 Fix TODO with new fault.

DEN-14175 addressed code review comments

    • -10
    • +0
    /firmware/App/Controllers/BloodLeak.c
Merge branch 'DEN-14175-dg_hd_dev-hd_dg_dvt-update-part-5' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-14175-dg_hd_dev-hd_dg_dvt-update-part-5

DEN-14175 updated the reservoir switch command to send the trimmer use the previous duty cycle or estimate the duty cycle

    • -3
    • +5
    /firmware/App/Controllers/DGInterface.c
    • -1
    • +1
    /firmware/App/Controllers/DGInterface.h
    • -1
    • +6
    /firmware/App/Modes/PreTreatmentRecirc.c