application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-12258-UI-BN-S66' into develop

- merge conflict resolution.

    • -21
    • +46
    /sources/canbus/MessageInterpreter.cpp
DEN-12262: INT: Log Dialin Messages

- Log Dialin messages as part of the unhandled messages.

    • -21
    • +46
    /sources/canbus/MessageInterpreter.cpp
    • -4
    • +4
    /sources/model/hd/data/MHDSyringePumpData.h
Merge branch 'DEN-12258-UI-BN-S66' into develop

DEN-12262: INT: FW Support (Reset Diagnostic Data)

- Reorganized the Diagnostics screen a little more.

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-12258-UI-BN-S66' into develop

DEN-12262: INT: FW Support (Reset Diagnostic Data)

- Fixed HD version title.

DEN-12262: INT: FW Support (Reset Diagnostic Data)

- Fixed HD version title.

Merge branch 'DEN-12258-UI-BN-S66' into develop

DEN-12262: INT: FW Support (Reset Diagnostic Data)

    • -11
    • +11
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -0
    • +101
    /sources/view/VGeneralEvent.cpp
    • -0
    • +84
    /sources/view/VGeneralEvent.h
    • -1
    • +1
    /sources/view/hd/alarm/VAlarmStatus.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-12182-ui_dev-sprint-65' into develop

    • -1
    • +2
    /sources/canbus/MessageInterpreter.cpp
UI-DEN-12182: UI-DEN-12182-2

- During code review of my code, cleaned up the code.

    • -1
    • +2
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +0
    /sources/cloudsync/CloudSyncController.h
Merge branch 'DEN-12182-ui_dev-sprint-65' into develop

DEN-10153: Treatment Log Comments Investigations

- Fixed the Treatment Review overlapped items.

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

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

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-12121-sw_dev-sprint-65' into develop

DEN-12121: Adjustments to Dianogistic Dialog to fit new FW versions better. Moved Pressures to have a bit more room for 5 digit values.

Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-12121-sw_dev-sprint-65' into develop

DEN-12121: Updates per code review

    • -3
    • +3
    /sources/model/dg/data/MDGConductivityData.h
    • -3
    • +3
    /sources/model/hd/data/MHDAirBubbleData.h
    • -3
    • +3
    /sources/model/hd/data/MHDAirTrapData.h
    • -3
    • +3
    /sources/model/hd/data/MHDBloodLeakData.h
Merge branch 'DEN-12182-ui_dev-sprint-65' into develop

DEN-10153: Treatment Log Comments Investigations

- Added the missing prescribed UF Volume, Rate to the log and review.

Merge branch 'DEN-12182-ui_dev-sprint-65' into develop

DEN-12204 Code Analysis

- Broke the build and fixed.

Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-12182-ui_dev-sprint-65' into develop

DEN-12204 Code Analysis

- cppcheck is confusing Message struct in different scopes and giving an error in CloudSync file about the struct in MessageGlobals, but the error has been fixed to avoid build fail.

Merge branch 'DEN-12182-ui_dev-sprint-65' into develop

Merge branch 'DEN-12121-sw_dev-sprint-65' into develop