LEAHI-TD-FIRMWARE-LDT-3505

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

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
I thought this was a TEST_CONFIG thing. We aren't doing s/w config status, so maybe we should convert it to a TEST_CONFIG.

I thought this was a TEST_CONFIG thing. We aren't doing s/w config status, so maybe we should convert it to a TEST_CONFIG.

Let's hard code for time being with a TODO comment. I don't want alarm to be a problem.

Let's hard code for time being with a TODO comment. I don't want alarm to be a problem.

Use OVERRIDE_RESET for .override instead of 0.

Use OVERRIDE_RESET for .override instead of 0.

align indentation, same for line 338 as well.

align indentation, same for line 338 as well.

Yes. Otherwise, we will have to hard code the calibration record for the time being.

Yes.
Otherwise, we will have to hard code the calibration record for the time being.

The function getSoftwareConfigStatus() is also part of NVM module. Moreover, we are planning to remove this function when NVM will be implemented. So, we will have to perform a cleanup and remove a...

The function getSoftwareConfigStatus() is also part of NVM module.
Moreover, we are planning to remove this function when NVM will be implemented.
So, we will have to perform a cleanup and remove all similar calls that have been currently commented out in other files as well like AirTrap.c, BloodFlow.c, etc.

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