application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-11980-sw_dev-sprint-64' into staging

Merge branch 'DEN-11980-sw_dev-sprint-64' into develop

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

DEN-12106: Heparin Delivery Active Text Does Not Appear

    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Added Dialin to unhandled

- Added Dialin messages to be defined/logged by unhandled messages definitions.

- It needs the call with the option -d to enable the Dialin handling.

    • -3
    • +5
    /sources/canbus/MessageInterpreter.cpp
Updates per code review.

DEN-12121: skeleton model and file for blood leak sensor for DEN-12118.

    • -0
    • +37
    /sources/model/hd/data/MHDBloodLeakData.h
DEN-12183KBM: Usual Meetings/Support/Development

- Added the basics of the messaging with the new source and coding.

- Now it needs error handling class.

    • -19
    • +42
    /sources/cloudsync/CloudSyncController.h
DEN-11980: Updates and fixes per code review.

    • -0
    • +67
    /sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp
    • -0
    • +95
    /sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h
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. … 570 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'UI_BUG_S63' into develop

Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
UI-BUG-S63: UI-BUG-S63-2: Addressed the code review comments.

    • -6
    • +7
    /sources/gui/qml/components/Slider.qml
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-11980: Split Flows Data Model to Blood Flow data and Inlet Data Models. Updated Views to reflect new message protocol for Blood Flow and Inlet Flow. Updated Diagnostic Dialog to reflect new message values.

Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'UI_BUG_S63' into develop

    • -1
    • +1
    /sources/bluetooth/BluetoothInterface.cpp
    • -3
    • +3
    /sources/bluetooth/BluetoothInterface.h
Updated the DG POST index like the HD

    • -3
    • +3
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -1
    • +1
    /sources/view/dg/data/post/VDGPOSTData.h
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /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 'UI_BUG_S62' into UI_BUG_S63

UI-BUG-S62: UI-BUG-S62-1

Addressed code reviews.

    • binary
    /resources/images/Logo d-Qt-mod1.png
    • -1
    • +1
    /sources/bluetooth/BluetoothInterface.cpp
    • -3
    • +3
    /sources/bluetooth/BluetoothInterface.h
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'UI_BUG_S63' into develop

DEN-11814: Heparin Minimum Dispensing Parameters Should Be 0.2

- Reverted back the Heparin min to 0.0 due to the slider's issue which disables the OFF feature, since the value 0.0 becomes an invalid.

- A minor update on the POST progress display to start when 0 to max of complete enum -1.

- An idea of fixing the slider touch issue. [Is DISABLED for now, for more test]

    • -1
    • +1
    /sources/gui/qml/components/BackButton.qml
    • -2
    • +0
    /sources/gui/qml/components/Circle.qml
    • -1
    • +18
    /sources/gui/qml/components/Slider.qml
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -1
    • +5
    /sources/view/hd/data/post/VHDPOSTData.h
Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp