LEAHI-DIALIN-LDT-4612

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
Put this into a dataclass folder under common, so we start structuring it.

Put this into a dataclass folder under common, so we start structuring it.

Not in use, don't need to add

Not in use, don't need to add

2 empty lines please

2 empty lines please

2 lines between functions please

2 lines between functions please

remove empty line

remove empty line

remove 3rd empty line

remove 3rd empty line

Rename to CanChannels

Rename to CanChannels

Rename to CanChannels

Rename to CanChannels

Rename to CanChannels

Rename to CanChannels

Rename to CanChannels

Rename to CanChannels

Rename to CanChannels

Rename to CanChannels

Rename to CanChannels

Rename to CanChannels

Rename to CanChannels

Rename to CanChannels

Fix it, it's CanChannels, not DenaliChannels

Fix it, it's CanChannels, not DenaliChannels

Merged release/DENBUG-335-air-trap-fill-design-improvement-P1B-Staging

LEAHI-DIALIN-LDT-4612_Dialysate Composition (Dry Bicarbonate) - FW Iteration - 4/1:
LEAHI-DIALIN-LDT-4612_Dialysate Composition (Dry Bicarbonate) - FW Iteration - 4/1:
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
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

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

Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp