hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into DEN-6402-hd_dev-pre-treatment-self-tests

    • -12
    • +14
    /firmware/App/Controllers/DGInterface.c
    • -1
    • +1
    /firmware/App/Controllers/DGInterface.h
Merge branch 'DEN-6078-revisit-safety-functionality-of-pumps-valves' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-6078-revisit-safety-functionality-of-pumps-valves

DEN-6078 addressed some of the merge issues

    • -1
    • +1
    /firmware/App/Controllers/DGInterface.c
    • -19
    • +1
    /firmware/App/Controllers/DGInterface.h
    • -25
    • +7
    /firmware/App/Modes/ModeTreatment.c
    • -20
    • +0
    /firmware/App/Services/SystemComm.c
DEN-6078 merged staging and ran the script

    • -14
    • +19
    /results/Build_Status_Report.csv
    • -4563
    • +6120
    /results/VectorCAST.log
DEN-5887: Fixed merge conflicts from staging.

    • -47
    • +106
    /firmware/App/Controllers/DGInterface.c
    • -24
    • +17
    /firmware/App/Controllers/DGInterface.h
    • -77
    • +72
    /firmware/App/Controllers/DialOutFlow.c
    • -100
    • +78
    /firmware/App/Modes/Dialysis.c
    • -15
    • +207
    /firmware/App/Modes/ModePreTreat.c
    • -96
    • +144
    /firmware/App/Modes/ModeTreatment.c
    • -16
    • +16
    /firmware/App/Services/PIControllers.c
    • -181
    • +169
    /firmware/App/Services/SystemComm.c
    • -361
    • +468
    /firmware/App/Services/SystemCommMessages.c
    • -0
    • +173
    /results/Build_Status_Report.csv
DEN-6402: Fixed static analysis warning

DEN-5887: ran local test script.

    • -156
    • +5
    /results/Build_Status_Report.csv
    • -39331
    • +4815
    /results/VectorCAST.log
DEN-6078 merged staging and resolved merge conflicts

    • -15
    • +184
    /firmware/App/Modes/ModePreTreat.c
    • -37
    • +5
    /firmware/App/Modes/ModeTreatment.c
DEN-6078 commented the count to PWM conversion macros

DEN-6402: Switch self-test for flow meters

    • -2
    • +2
    /firmware/App/Controllers/DialInFlow.c
DEN-5887: No adjustment to DPo initial PWM at this time. Restored P and I control terms to original settings.

    • -3
    • +3
    /firmware/App/Controllers/DialOutFlow.c
DEN-6402: Set final and start reservoir volume at the same time

DEN-6402: Fixed DG commands

DEN-6402: Used enums from DG defs

    • -2
    • +2
    /firmware/App/Controllers/DGInterface.c
    • -27
    • +1
    /firmware/App/Controllers/DGInterface.h
DEN-6402: Added DG valve setting change command

    • -1
    • +23
    /firmware/App/Controllers/DGInterface.c
    • -3
    • +12
    /firmware/App/Controllers/DGInterface.h
    • -25
    • +203
    /firmware/App/Modes/SelfTests.c
DEN-6402: Stored command response for each possible command

    • -17
    • +41
    /firmware/App/Controllers/DGInterface.c
    • -2
    • +2
    /firmware/App/Controllers/DGInterface.h
DEN-6402: Added wet self-test for FMD and load cell

    • -47
    • +298
    /firmware/App/Modes/SelfTests.c
DEN-5887: Refactored load cell acceleration alarm. Tuned UF control.

    • -34
    • +0
    /firmware/App/Controllers/DGInterface.c
    • -3
    • +3
    /firmware/App/Controllers/DialOutFlow.c
    • -1
    • +1
    /firmware/App/Services/PIControllers.c
DEN-6402: Added alarm signal action handlers

    • -105
    • +63
    /firmware/App/Modes/ModePreTreat.c
    • -12
    • +87
    /firmware/App/Modes/PreTreatmentRecirc.c
    • -0
    • +2
    /firmware/App/Modes/PreTreatmentRecirc.h
DEN-6402: Moved pre-treatment recirc into a module

    • -0
    • +168
    /firmware/App/Modes/PreTreatmentRecirc.c
    • -0
    • +45
    /firmware/App/Modes/PreTreatmentRecirc.h
DEN-6402: Break down big functions

    • -70
    • +151
    /firmware/App/Modes/SelfTests.c
DEN-5887: Adjusted UF controller co-efficients.

    • -2
    • +2
    /firmware/App/Controllers/DialOutFlow.c
DEN-5887: Increase load cell change threshold for non-treatment modes so will not cause alarm when load cell is tared. Remove obsolete messaging.

    • -3
    • +4
    /firmware/App/Controllers/DGInterface.c
    • -22
    • +0
    /firmware/App/Modes/ModeTreatment.c
DEN-6402: Removed home setup state and refactor big functions

    • -3
    • +2
    /firmware/App/Controllers/DGInterface.c
    • -8
    • +24
    /firmware/App/Controllers/PresOccl.c
    • -61
    • +14
    /firmware/App/Modes/ModePreTreat.c
    • -68
    • +142
    /firmware/App/Modes/SelfTests.c
DEN-6402: Added build switch to skip self-tests

DEN-6402: Added build switch to skip self-tests and prime

DEN-6402: Wait for DG to be in Fill Mode

DEN-6402: Fixed memcpy error and blood flow rate

    • -1
    • +1
    /firmware/App/Controllers/DGInterface.c
DEN-6402: Added arterial and venous pressure dry self-test

DEN-6402: Removed user end treatment request

    • -22
    • +0
    /firmware/App/Modes/ModeTreatment.c