hdfirmware

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

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

    • -3
    • +4
    /firmware/App/Controllers/DGInterface.c
    • -2
    • +3
    /firmware/App/Controllers/DGInterface.h
    • -3
    • +2
    /firmware/App/Controllers/DialOutFlow.c
Merge branch 'DEN-9906-hd_dev-flow-measurement-changes' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-9906-hd_dev-flow-measurement-changes

DEN-9906: Fixed target rinseback volume published after rinseback stopped prematurely. Allow alarm response resume if in pause state of Tx End sub-mode.

    • -1
    • +0
    /firmware/App/Controllers/DialOutFlow.c
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: Fixed poor UF control start.

    • -2
    • +2
    /firmware/App/Controllers/DialOutFlow.c
DEN-9906: Fixed rinseback t/o countdown ref.

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

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

DEN-9906: DG Defs merge.

    • -8
    • +8
    /firmware/App/Controllers/DGInterface.c
    • -1
    • +1
    /firmware/App/Modes/ConsumableSelfTest.c
Merge branch 'DEN-9906-hd_dev-flow-measurement-changes' into develop

DEN-9906: Send new general event msg for HD start, all op mode changes. Fixed rinseback countdown timer issue DEN-10154.

DEN-9906: Drain reservoir first during post-treatment

    • -23
    • +50
    /firmware/App/Modes/ModePostTreat.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

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
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

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

DEN-9906: Prevent transition from rinseback to recirc if rinseback not completed. Max additional rinseback volume set to 300 mL.

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

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

DEN-9906: Delayed power on AC check to allow voltage monitor time to see 24V. Fix FPGA voltage ranges.

DEN-9906: Added tentative blood flow estimation logic for testing. Added HD power-off function. Power off HD if no AC power on startup. Added t/o to rinseback stop state. Fixed valve commands in post-treatment mode.

    • -9
    • +75
    /firmware/App/Controllers/BloodFlow.c
    • -0
    • +18
    /firmware/App/Controllers/Buttons.c
    • -3
    • +5
    /firmware/App/Controllers/DialInFlow.c
    • -1
    • +1
    /firmware/App/Controllers/DialOutFlow.c
    • -0
    • +12
    /firmware/App/Controllers/PresOccl.c
    • -2
    • +8
    /firmware/App/Controllers/SyringePump.c
DEN-7802: Renamed re-circ mode to gene mode

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

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-9906: Added filtering for inline pressure sensors.

    • -8
    • +124
    /firmware/App/Controllers/PresOccl.c
DEN-9906: Extended rotor reset t/o from 10 to 20 sec. Added turn off of trimmer heater in blood prime. Fixed merge issue w/ integrity POST test. Split treatment recirc t/o alarm into an alarm and a warning.

    • -1
    • +15
    /firmware/App/Modes/TreatmentRecirc.c