hdfirmware

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

    • -47
    • +53
    /firmware/App/Controllers/BloodFlow.c
    • -194
    • +56
    /firmware/App/Controllers/DGInterface.c
    • -9
    • +16
    /firmware/App/Controllers/DGInterface.h
    • -47
    • +54
    /firmware/App/Controllers/DialInFlow.c
    • -91
    • +157
    /firmware/App/Controllers/DialOutFlow.c
DEN-11114 addressed the code review comments

    • -282
    • +1
    /firmware/App/Controllers/DGInterface.c
    • -8
    • +1
    /firmware/App/Controllers/DGInterface.h
    • -0
    • +1
    /firmware/App/Modes/ConsumableSelfTest.c
DEN-10247: UI Acknow timeouts on HD side, due to the delay of almost 2 seconds.

- Added another timeout of 5000 ms ( same value as UI_COMM_TIMEOUT_IN_MS ) only for the INIT state in which UI has a delayed response.

DEN-11114 updated the reservoirs code

    • -38
    • +60
    /firmware/App/Services/Reservoirs.c
Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2

    • -1
    • +1
    /firmware/App/Controllers/DialInFlow.c
DEN-11114: Prevent pump set command from restarting pump control if rate/mode are not changed.

    • -47
    • +53
    /firmware/App/Controllers/BloodFlow.c
    • -43
    • +49
    /firmware/App/Controllers/DialInFlow.c
    • -46
    • +50
    /firmware/App/Controllers/DialOutFlow.c
DEN-11114 tested the modified the reservoir management code

    • -1
    • +1
    /firmware/App/Controllers/DialInFlow.c
    • -27
    • +73
    /firmware/App/Services/Reservoirs.c
DEN-11098: Addressed code review feedback.

DEN-11098 Added compiler switch RUN_BLOOD_CIRCUIT_PRIME_AGAIN

DEN-11114 continued working on the reservoir management

    • -1
    • +1
    /firmware/App/Controllers/DialInFlow.c
    • -10
    • +3
    /firmware/App/Services/Reservoirs.c
DEN-11089 Added cases in switch statement to handle prime pause for new saline dialyzer state

Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2

DEN-11114 continued working on the resevoir management

    • -7
    • +49
    /firmware/App/Controllers/DGInterface.c
    • -2
    • +15
    /firmware/App/Controllers/DGInterface.h
    • -1
    • +1
    /firmware/App/Modes/ConsumableSelfTest.c
    • -0
    • +3
    /firmware/App/Modes/ModeTreatmentParams.c
    • -42
    • +119
    /firmware/App/Services/Reservoirs.c
DEN-11114: perform periodic clock check only if release build so debugging will not cause alarm.

DEN-11089 Removed signalDialOutPumpHardStop since it has not been started

DEN-11114: Removed obsolete UF PI controller. Cleaned up UF control code changes.

    • -19
    • +15
    /firmware/App/Controllers/DialOutFlow.c
    • -1
    • +0
    /firmware/App/Services/PIControllers.c
    • -2
    • +1
    /firmware/App/Services/PIControllers.h
DEN-11089 the VDO pump is stopped before transition from dialyzer state to wet selftests state

DEN-11089 Correction - dialyzer dialysate bypass priming path uses R1 instead of R2 and dialyzer dialysate priming path uses R2 instead of R1

Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2

DEN-11114: Added comment.

    • -1
    • +1
    /firmware/App/Controllers/DialOutFlow.c
Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2

    • -1
    • +16
    /firmware/App/Modes/ModeTreatment.c
DEN-11114 initial commit of the reservoirs module. Continued with implementing the reservoir management

    • -19
    • +120
    /firmware/App/Controllers/DGInterface.c
    • -3
    • +4
    /firmware/App/Controllers/DGInterface.h
    • -0
    • +407
    /firmware/App/Services/Reservoirs.c
    • -0
    • +38
    /firmware/App/Services/Reservoirs.h
DEN-11114: Updated UF control to included estimated UF flow as input.

    • -4
    • +5
    /firmware/App/Controllers/DialInFlow.c
    • -40
    • +106
    /firmware/App/Controllers/DialOutFlow.c
    • -0
    • +1
    /firmware/App/Controllers/DialOutFlow.h
    • -1
    • +16
    /firmware/App/Modes/ModeTreatment.c
DEN-11089 Incorporated peer review comments

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' into develop

    • -1
    • +1
    /firmware/App/Controllers/DialInFlow.c
    • -1
    • +1
    /firmware/App/Controllers/DialOutFlow.c
DEN-11114: Restored previous motor controller speed feedback conversion to RPM - it was right before.

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

Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' into develop

    • -6
    • +8
    /firmware/App/Controllers/DialInFlow.c
    • -4
    • +4
    /firmware/App/Controllers/DialOutFlow.c
DEN-11114: Fixed conversion issue for pump speed ADC voltage levels.

    • -6
    • +8
    /firmware/App/Controllers/DialInFlow.c
    • -4
    • +4
    /firmware/App/Controllers/DialOutFlow.c