hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-15183-in-treatment-rinseback-workflow-changes' into develop

DEN-15183: Prevent alarm user options while AC power is out.

DEN-14980-unable-to-resume-after-hd-unit-plugged-back-in-pre-treatment-after-priming

Moved block to choke point in activateAlarm2Data. Bock all alarms, rather than sub-rank 10 and above.

    • -61
    • +69
    /firmware/App/Services/AlarmMgmt.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merged staging

DEN-15183: Fixed DEN-15198 by not starting air trap control until treatment starts (patient connected).

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

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

DEN-14325 addressed the code review comments

DEN-15183: Addressed code review comments. Fixed DEN-15194.

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

Merge branch 'DEN-15183-in-treatment-rinseback-workflow-changes' into develop

    • -14
    • +0
    /firmware/App/Controllers/PresOccl.c
DEN-15183: Implemented updates to treatment recirculation workflow to include states for instructing user to disconnect and reconnected patient. Updated scalar for alarm audio current high gain signal. Updated alarm audio POST.

    • -4
    • +103
    /firmware/App/Modes/TreatmentRecirc.c
    • -29
    • +48
    /firmware/App/Services/AlarmMgmt.c
DEN-14980-unable-to-resume-after-hd-unit-plugged-back-in-pre-treatment-after-priming

Adjusted Alarm limit

DEN-15189 Add activateSafetyShutdown to alarm ALARM_ID_HD_VALVE_POSITION_OUT_OF_RANGE (62) if position C

DEN-15024 Change syringe pump off error count to max time windowed count.

    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
DEN-15183: indicate treatment over in treatment times broadcast if alarm preventing alarm resumption.

DEN-15183: Removed pressure limit alarm exemption for pump ramping. Address sequence issue with invert dialyzer logic DEN-15195.

    • -14
    • +0
    /firmware/App/Controllers/PresOccl.c
DEN-15104 Minor correction

DEN-14980-unable-to-resume-after-hd-unit-plugged-back-in-pre-treatment-after-priming

Adding an alarm blocking state to prevent cascade of errors during power fail.

    • -53
    • +75
    /firmware/App/Services/AlarmMgmt.c
DEN-15183: Addressed DEN-15191 by zeroing treatment time remaining in treatment times broadcast msg if an alarm has blocked resumption of treatment.

DEN-14183: Addressed DEN-15190 by allowing rinseback option regardless of whether alarm condition is cleared.

DEN-15024 Fix order of saving last syringe position and syringe detection.

    • -3
    • +6
    /firmware/App/Controllers/SyringePump.c
Merge branch 'staging' into DEN-15104-hd-fpga-communications

    • -91
    • +116
    /firmware/App/Services/FPGA.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'DEN-14325-fw-blood-leak-alarm-triggers-when-cartridge-lever-is-unlocked' into develop

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

Merged DEN-15183 to develop.

    • -2
    • +2
    /firmware/App/Controllers/DGInterface.c
DEN-15183: Fix for DEN-14312 (DPi running when alarm in rinseback should stop DPi).

DEN-14325 added conditions to not check for blood leak alarm, air trap illegal level alarm, and the bubble detection alarm and self test request if the pump track is open