sources

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated MAlarmMapping.cpp

    • -10
    • +10
    ./model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-12121-sw_dev-sprint-65' into staging

  1. … 1 more file in changeset.
Merge branch 'DEN-12182-ui_dev-sprint-65' into staging

  1. … 1 more file in changeset.
DEN-12262: INT: Code reviews wrap up & support

- Addressed all the code review comments in another branch in here to facilitate the code review process and make the code ready while the actual code owner were busy supporting system for demo.

- Added another condition to the Alarm top/right countdown to hide the timer when FW is not even in the Treatment mode by the HDOpMode.

    • -78
    • +88
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -0
    • +6
    ./model/dg/data/MDGAccelerometerData.cpp
    • -0
    • +6
    ./model/dg/data/MDGAccelerometerData.h
    • -0
    • +6
    ./model/hd/data/MHDAccelerometerData.cpp
    • -0
    • +6
    ./model/hd/data/MHDAccelerometerData.h
    • -16
    • +16
    ./model/hd/data/MHDBloodLeakData.h
  1. … 18 more files in changeset.
DEN-12262: INT: Code reviews wrap up & support

- Addressed all the code review comments in another branch in here to facilitate the code review process and make the code ready while the actual code owner were busy supporting system for demo.

- Added another condition to the Alarm top/right countdown to hide the timer when FW is not even in the Treatment mode by the HDOpMode.

    • -78
    • +88
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -0
    • +6
    ./model/dg/data/MDGAccelerometerData.cpp
    • -0
    • +6
    ./model/dg/data/MDGAccelerometerData.h
    • -0
    • +6
    ./model/hd/data/MHDAccelerometerData.cpp
    • -0
    • +6
    ./model/hd/data/MHDAccelerometerData.h
    • -16
    • +16
    ./model/hd/data/MHDBloodLeakData.h
  1. … 19 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

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

- merge conflict resolution.

  1. … 2 more files in changeset.
DEN-12262: INT: Log Dialin Messages

- Log Dialin messages as part of the unhandled messages.

    • -6
    • +6
    ./model/dg/data/MDGAccelerometerData.h
    • -6
    • +6
    ./model/dg/data/post/MDGPostFinalResultData.h
    • -6
    • +6
    ./model/dg/data/post/MDGPostSingleResultData.h
    • -6
    • +6
    ./model/hd/data/MHDAccelerometerData.h
    • -6
    • +6
    ./model/hd/data/post/MHDPostFinalResultData.h
    • -3
    • +3
    ./model/hd/data/post/MHDPostSingleResultData.h
  1. … 2 more files in changeset.
DEN-12262: INT: FW Support (Reset Diagnostic Data)

- Reorganized the Diagnostics screen a little more.

    • -3
    • +6
    ./gui/qml/components/DebugDataColumn.qml
    • -51
    • +57
    ./gui/qml/dialogs/DiagnosticsDialog.qml
  1. … 1 more file in changeset.
DEN-12262: INT: FW Support (Reset Diagnostic Data)

- Fixed HD version title.

    • -19
    • +19
    ./gui/qml/dialogs/DiagnosticsDialog.qml
DEN-12262: INT: FW Support (Reset Diagnostic Data)

- Fixed HD version title.

    • -19
    • +19
    ./gui/qml/dialogs/DiagnosticsDialog.qml
Merge branch 'DEN-12258-UI-BN-S66' into develop

  1. … 2 more files in changeset.
DEN-12262: INT: FW Support (Reset Diagnostic Data)

    • -1
    • +2
    ./gui/qml/components/DebugDataColumn.qml
    • -106
    • +120
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -11
    • +11
    ./model/hd/alarm/MAlarmMapping.cpp
    • -0
    • +101
    ./view/VGeneralEvent.cpp
    • -0
    • +84
    ./view/VGeneralEvent.h
  1. … 3 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

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

UI-DEN-12182: UI-DEN-12182-2

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

    • -1
    • +1
    ./gui/qml/dialogs/NotificationDialog.qml
DEN-10153: Treatment Log Comments Investigations

- Fixed the Treatment Review overlapped items.

  1. … 2 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -4
    • +6
    ./gui/qml/dialogs/DiagnosticsDialog.qml
Bamboo Commit: Updated MAlarmMapping.cpp

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

DEN-12121: Updates per code review

    • -1
    • +1
    ./gui/qml/dialogs/DiagnosticsDialog.qml
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

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.

  1. … 2 more files in changeset.
DEN-12180: Internal general support

- investigate on the Begin Prime back to Cartridge installation

- Added objectName for easier debug.

- added the stack change for the Cartridge Installation in case FW wants to navigate back from Begin Prime to the beginning of Cartridge Installation.

  1. … 1 more file in changeset.