hdfirmware

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

    • -22
    • +29
    /firmware/App/Controllers/DGInterface.c
    • -2
    • +2
    /firmware/App/Controllers/DGInterface.h
    • -2
    • +2
    /firmware/App/Controllers/DialInFlow.c
DEN-13154: Addressed code review comments.

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

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Merge branch 'DEN-14689-final-post-test-sending-many-times' into staging

DEN-13154: Use raw FMD measured flow for alarm 312. Added capture of raw dialysate flow to facilitate this.

    • -10
    • +33
    /firmware/App/Controllers/DGInterface.c
    • -12
    • +3
    /firmware/App/Controllers/DGInterface.h
    • -6
    • +5
    /firmware/App/Controllers/DialInFlow.c
Merge branch 'staging' into DEN-14689-final-post-test-sending-many-times

DEN-13154: Add syringe pump stall check to preload and seek states.

    • -0
    • +8
    /firmware/App/Controllers/SyringePump.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -2
    • +2
    /firmware/App/Controllers/DGInterface.h
Merge branch 'staging' into DEN-14834-ro-flow-drops-to-zero-and-cp-measured-speed-1500-temporarily-during-pre-treatment

DEN-14834 updated the code to control the primary heater

    • -10
    • +0
    /firmware/App/Controllers/DGInterface.h
    • -16
    • +23
    /firmware/App/Modes/ModePreTreat.c
DEN-13154: Further fix to DEN-14814 re: do not require syringe removal to re-do preload operation.

    • -11
    • +2
    /firmware/App/Controllers/SyringePump.c
DEN-14834 changed one of the pre-treatment target fills from 600 to 750mL Changed the reservoir's upper limit in treatment from 1950 to 1900mL

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

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Merge branch 'DEN-14160-hd-blood-leak-override-not-working' into staging

DEN-13154: Removed dry self-test timeout alarm. Fixed bug DEN-14884.

    • -1
    • +1
    /firmware/App/Controllers/DialInFlow.c
DEN-13154: Removed obsolete pressure data from broadcast. Tightened no cartridge pressure range for PBA and PBo.

DEN-14834 added code to calculate the heating parameters in pre-treatment and send it to DG in the pre-treatment reservoir management

DEN-14689: DEN-14634: fixed HD_POST_FINAL_TEST_RESULT being sent to be sent 1 time instead of 40 times over 2s.

DEN-13154: Update to handling of insufficient Heparin alarm per DEN-14814 and DEN-14287.

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

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    /firmware/App/Controllers/DGInterface.c
    • -1
    • +1
    /firmware/App/Controllers/DialInFlow.c
    • -1
    • +1
    /firmware/App/Modes/ModeTreatmentParams.c
Merge branch 'staging' into DEN-14273-gui-invalid-treatment-parameters-are-not-highlighted-red

DEN-13154: Fixed compiler warning.

DEN-13154: Ensure alarm system has control of alarm lamp in fault mode in case fault occurred before lamp test completed. Do not request DG active alarms on startup if DG is not communicating.

DEN-13154: Fix handling of cartridge installed dry s.t. per DEN-14770.

DEN-13154: Added prescribed flow rates to blood and dialysate flow broadcast messages per DEN-13152.

    • -0
    • +9
    /firmware/App/Controllers/DialInFlow.c
    • -0
    • +1
    /firmware/App/Controllers/DialInFlow.h
    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
DEN-13154: Updated empty syringe detection logic to address this bug.

    • -13
    • +4
    /firmware/App/Controllers/SyringePump.c