HD-DENBUG-335

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

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merged release/p1b/staging and resolved the conflicts

    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merged release/DENBUG-335-air-trap-fill-design-improvement-P1B-Staging

DENBUG-335: Air Trap Fill Design Improvements: Updated the institutional record to receive and display the end treatment blood flow rate in mL/min

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
HD-DENBUG-335_Air Trap Fill Design Improvement P1B Staging
HD-DENBUG-335_Air Trap Fill Design Improvement P1B Staging
HD-DENBUG-335_Air Trap Fill Design Improvem
HD-DENBUG-335_Air Trap Fill Design Improvem
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -15
    • +21
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merged DENBUG-335

RESOLVED in CODE WALKTHROUGH

RESOLVED in CODE WALKTHROUGH

Done

Done

RESOLVED in CODE WALKTHROUGH

RESOLVED in CODE WALKTHROUGH

RESOLVED in CODE WALKTHROUGH

RESOLVED in CODE WALKTHROUGH

Merge branch 'staging' into DENBUG-335-air-trap-fill-design-improvement

The comment was left here to make sure the next developer does not ask the question that the blood pump was not set here. It is a note to remind the developer that the ramp is set below.

The comment was left here to make sure the next developer does not ask the question that the blood pump was not set here. It is a note to remind the developer that the ramp is set below.

Can we move the comment where required?

Can we move the comment where required?

Dara, work with Nick to get the right text for this new alarm.

Dara, work with Nick to get the right text for this new alarm.

We changed the order of ORs. But the parenthesis match otherwise, it would not compile.

We changed the order of ORs. But the parenthesis match otherwise, it would not compile.

Done

Done