hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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
DEN-7802: Fixed alarm condition clear for DG comm timeout

DEN-9906: Added a couple trimmer heater off commands to ensure heater does not stay on when DPi pump is not running.

DEN-7802: Fixed battery pack error codes

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

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

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

Made a change for testing

DEN-8886: second local merge from staging. Fixed merge conflicts.

    • -0
    • +20
    /firmware/App/Services/SystemComm.c
DEN-8886: Fixed bug DEN-9827.

DEN-7802: Disabled battery charge monitor when battery comm disabled

DEN-8886: Addressed code review comments.

    • -2
    • +2
    /firmware/App/Controllers/DialInFlow.c
    • -1
    • +1
    /firmware/App/Controllers/DialOutFlow.c