LEAHI-DIALIN-LDT-4002

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
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

Add type definition for can_interface.

Add type definition for can_interface.

Please update this section to reflect the latest structural changes merged to staging.

Please update this section to reflect the latest structural changes merged to staging.

Please update this section to reflect the latest structural changes merged to staging.

Please update this section to reflect the latest structural changes merged to staging.

Please move it before the DDValveStates to keep the order, so it will be easier to find it

Please move it before the DDValveStates to keep the order, so it will be easier to find it

Please move it to the "Names" section. Preferably between DDPressureSensorNames and DDTemperatureSensorNames.

Please move it to the "Names" section. Preferably between DDPressureSensorNames and DDTemperatureSensorNames.

That location is in used on the staging @ leahi-common. MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE = 0xB3, ///< FFU signal TD update is available.

That location is in used on the staging @ leahi-common.

MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE = 0xB3, ///< FFU signal TD update is available.

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

Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /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

    • -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
Remove extra blank line.

Remove extra blank line.

LEAHI-DIALIN-LDT-4002_HDF - FW Implementation - 3/4:
LEAHI-DIALIN-LDT-4002_HDF - FW Implementation - 3/4:
Merge branch 'DENBUG-335-air-trap-fill-design-improvement' into develop

DENBUG-335: Air Trap Fill Design Improvement

- Added treatment end blood flow rate to institutional record.

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp