Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-13141-miscellaneous_hd_issues_bb' into develop

# Conflicts:

# firmware/App/Controllers/DialOutFlow.c

# firmware/App/HDCommon.h

    • -100
    • +100
    ./Services/SystemCommMessages.c
DEN-12609: fixed code review comments. changed variable naming and fixed alarm log with proper time

Merge branch 'staging' into DEN-12609-sw_dev-sprint-69_mg

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

DEN-12609: code review changes.

Can you clarify what case you're thinking of?

Can you clarify what case you're thinking of?

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

Updated the blood flow wear B term

DEN-13598 updated the locations of the variables in DGInterface.c

DEN-13598 Added 5 alams in HD code.

Merge branch 'staging' into DEN-13141-miscellaneous_hd_issues_bb

# Conflicts:

# firmware/App/Services/SystemCommMessages.c

    • -108
    • +141
    ./Services/SystemCommMessages.c
DEN-13460 added a queue to process the blood leak emebedded mode commands

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

DEN-13460: Try syringe pump DAC set if failing self-test. Increase retries on failure to get ACK on CAN msg.

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

Merged DEN-13460

DEN-13460 updated the wet self test second displacement check

DEN-13141 Changes per code review

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

DEN-13712 Handle disinfect command from UI Setup properly (0x9A)

Bill, I was just asking why there was a blank line added before final } of last function. The doxygen end group stuff should stay. I will generally add my comments directly below the issue, not above.

Bill, I was just asking why there was a blank line added before final } of last function. The doxygen end group stuff should stay.
I will generally add my comments directly below the issue, not above.

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

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

DEN-13712 Added Alarms for UI to show Disinfect modes.

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

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

DEN-13460 updated the HD valves position check