Clone
 

quang nguyen <qnguyen@diality.com> in hdfirmware

DEN-9906: Added rinse flag to drain commands

    • -3
    • +4
    /firmware/App/Controllers/DGInterface.c
    • -2
    • +3
    /firmware/App/Controllers/DGInterface.h
    • -5
    • +10
    /firmware/App/Modes/ModePostTreat.c
DEN-9906: Drain reservoir first during post-treatment

    • -23
    • +50
    /firmware/App/Modes/ModePostTreat.c
Merge branch 'DEN-9906-hd_dev-flow-measurement-changes' into develop

    • -9
    • +75
    /firmware/App/Controllers/BloodFlow.c
    • -3
    • +5
    /firmware/App/Controllers/DialInFlow.c
    • -1
    • +1
    /firmware/App/Controllers/DialOutFlow.c
Merge branch 'DEN-7802-dg_dev-dialysate-generation' into develop

    • -8
    • +8
    /firmware/App/Controllers/DGInterface.c
Merge branch 'DEN-7802-dg_dev-dialysate-generation' into staging

DEN-7802: Added check for processor clock speed against FPGA clock speed

DEN-7802: Removed dialysate temp check for treatment end sub-mode

DEN-7802: Renamed re-circ mode to gene mode

    • -8
    • +8
    /firmware/App/Controllers/DGInterface.c
    • -1
    • +1
    /firmware/App/Modes/ConsumableSelfTest.c
Merge branch 'DEN-7802-dg_dev-dialysate-generation' into develop

Merge branch 'DEN-9906-hd_dev-flow-measurement-changes' into develop

DEN-7802: Fixed temperature alarm trigger

    • -9
    • +11
    /firmware/App/Controllers/Temperatures.c
DEN-7802: Fixed alarm condition clear for DG comm timeout

DEN-7802: Fixed battery pack error codes

Merge branch 'DEN-7802-dg_dev-dialysate-generation' into develop

    • -2
    • +2
    /firmware/App/Controllers/DGInterface.c
DEN-7802: Removed test success status on integrity test

    • -4
    • +2
    /firmware/App/Controllers/DGInterface.c
Merge branch 'DEN-8886-hd_dg_dev-self-tests-2-of-2' into develop

    • -2
    • +2
    /firmware/App/Controllers/DialInFlow.c
    • -1
    • +1
    /firmware/App/Controllers/DialOutFlow.c
DEN-7802: Disabled battery charge monitor when battery comm disabled

Disable alarm audio

Merge branch 'DEN-8886-hd_dg_dev-self-tests-2-of-2' into develop

Disabled ack error, voltage monitor, and ui POST test

Merge branch 'DEN-8886-hd_dg_dev-self-tests-2-of-2' into develop

    • -1
    • +1
    /firmware/App/Controllers/DialOutFlow.c
Merge branch 'DEN-8886-hd_dg_dev-self-tests-2-of-2' into develop

    • -50
    • +43
    /firmware/App/Controllers/BloodFlow.c
    • -38
    • +30
    /firmware/App/Controllers/DialInFlow.c
    • -37
    • +14
    /firmware/App/Controllers/DialOutFlow.c
    • -19
    • +53
    /firmware/App/Modes/ModeInitPOST.c
    • -8
    • +156
    /firmware/App/Modes/ModeTreatment.c
    • -4
    • +64
    /firmware/App/Services/SystemComm.c
    • -12
    • +34
    /firmware/App/Services/WatchdogMgmt.c
Merge branch 'DEN-8679-hd_dev-treatment-log' into develop

    • -3
    • +2
    /firmware/App/Controllers/DGInterface.c
    • -4
    • +21
    /firmware/App/Modes/ModeTreatment.c
    • -16
    • +2
    /firmware/App/Modes/ModeTreatmentParams.c
Merge branch 'DEN-8679-hd_dev-treatment-log' into staging

DEN-8679: DEN-9695: Fixed typo in checking minimum rinseback rate

DEN-8679: DEN-9697: Added clear condition to bubble detected alarm during rinseback

DEN-7802: DEN-8815: DEN-8817: Fixed water sample and self-test timeout

    • -5
    • +59
    /firmware/App/Controllers/DGInterface.c
    • -0
    • +2
    /firmware/App/Controllers/DGInterface.h
DEN-8679: Addressed code review

    • -1
    • +1
    /firmware/App/Controllers/DGInterface.c
DEN-8679: Removed unused define

Merge branch 'staging' into DEN-8679-hd_dev-treatment-log

    • -8
    • +139
    /firmware/App/Controllers/DGInterface.c
    • -0
    • +16
    /firmware/App/Controllers/DGInterface.h
    • -2
    • +86
    /firmware/App/Controllers/SyringePump.c
    • -18
    • +32
    /firmware/App/Modes/ModeInitPOST.c
    • -79
    • +363
    /firmware/App/Modes/ModeStandby.c
    • -3
    • +45
    /firmware/App/Services/SystemComm.c