hdfirmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-15993-during-treatment-alarms-167-and-door-and-latch-open-offer-resume-option-that' into develop

DEN-16166: added blood leak self test event.

DENBUG-59: Addressed code review comments.

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

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

Merge branch 'DENBUG-59-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow' into develop

DENBUG-59: reverted vectorcast fixes.

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

Fixed merge conflicts.

    • -1
    • +1
    /firmware/App/Controllers/DGInterface.c
Fixed merge conflicts.

    • -17
    • +17
    /firmware/App/Controllers/DGInterface.c
    • -0
    • +1
    /firmware/App/Controllers/DGInterface.h
    • -1
    • +0
    /firmware/App/Controllers/SyringePump.c
    • -2
    • +2
    /firmware/App/Controllers/Temperatures.c
    • -19
    • +26
    /firmware/App/Services/AlarmMgmt.c
DENBUG-59: distinguish between alarms originating from outside.

    • -2
    • +2
    /firmware/App/Controllers/DGInterface.c
DENBUG-59: Added new alarm properties to block alarm trigger in rinseback or post-tx states.

    • -19
    • +26
    /firmware/App/Services/AlarmMgmt.c
DENBUG-59: Addressed some unit test issues.

    • -1
    • +0
    /firmware/App/Controllers/SyringePump.c
    • -2
    • +2
    /firmware/App/Controllers/Temperatures.c
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-16102-vtchd-554-actuator-state-not-match-wrong-transition-to-stopped-state' into staging

Merge branch 'staging' into DEN-16102-vtchd-554-actuator-state-not-match-wrong-transition-to-stopped-state

DENBUG-59: Addressed some compiler warnings.

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

DEN-15993 Make same logic change for cartridge level (AlarmID 85)

Merge branch 'staging' into DEN-16102-vtchd-554-actuator-state-not-match-wrong-transition-to-stopped-state

DEN-16102: code review comments

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

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

Merged DEN-15741 to staging.

Merged staging to DEN-15741.

    • -40
    • +28
    /firmware/App/Modes/ModeTreatment.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

DEN-16102: fixed operation status event to be called after current mode is updating

Merge branch 'DEN-15993-during-treatment-alarms-167-and-door-and-latch-open-offer-resume-option-that' into develop

# Conflicts:

# firmware/App/HDCommon.h

DEN-15993 Correct resume handling for front door