application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'master' into DEN-4691_InLineBloodPressureAdjustments

    • -0
    • +95
    /sources/canbus/MessageDispatcher.cpp
    • -35
    • +39
    /sources/canbus/MessageInterpreter.cpp
    • -8
    • +10
    /sources/gui/qml/components/RangeRect.qml
    • -18
    • +24
    /sources/gui/qml/globals/Colors.qml
    • -71
    • +85
    /sources/gui/qml/globals/Variables.qml
    • -0
    • +17
    /sources/gui/qml/pages/SettingsHome.qml
  1. … 14 more files in changeset.
DEN-5636: Implementation [PressureRangeSlider improvement]

- kept an idea for later if required.

    • -2
    • +9
    /sources/gui/qml/components/RangeSlider.qml
DEN-4860: BLE Settings Page Updates

- Saving my devices to disk

- Loading my devices on startup

- BLEScanner improvements

- Refactored VBluetoothDeviceInfo

    • -37
    • +28
    /sources/bluetooth/BLEScanner.cpp
    • -1
    • +3
    /sources/gui/qml/globals/Variables.qml
    • -11
    • +41
    /sources/gui/qml/pages/SettingsBluetooth.qml
    • -6
    • +18
    /sources/view/VBluetoothDeviceInfo.cpp
DEN-5636: Implementation [PressureRangeSlider improvement]

- Updated the documentation

DEN-4860: Confirmed data received after measurement completion.

- In progress update for 1Hz check-in w/ BLE Cuff capability

    • -3
    • +14
    /sources/gui/qml/pages/SettingsBluetooth.qml
    • -20
    • +19
    /sources/view/VBluetoothDeviceInfo.cpp
    • -4
    • +11
    /sources/view/VBluetoothDeviceInfo.h
DEN-5636: Implementation [PressureRangeSlider improvement]

    • -41
    • +52
    /sources/gui/qml/components/RangeSlider.qml
DEN-5636: Implementation [PressureRangeSlider improvement]

    • -8
    • +8
    /sources/gui/qml/components/RangeSlider.qml
    • -21
    • +25
    /sources/gui/qml/globals/Variables.qml
DEN-4867: Refactored Pre-Treatment classes.

DEN-4860: Ensure error shows when bluetooth module is off

    • -10
    • +10
    /sources/canbus/MessageInterpreter.cpp
  1. … 21 more files in changeset.
DEN-5636: Implementation [PressureRangeSlider improvement]

- Added the improvement to have lower and upper band adjustment ranges for each min and max handlers.

- Added improvement to have the gapValue between min and max values.

- it still needs improvement to be more user friendly.

    • -4
    • +33
    /sources/gui/qml/components/RangeSlider.qml
DEN-4698: Code Review 0

    • -82
    • +82
    /sources/gui/qml/globals/Colors.qml
DEN-4860: Updated Bluetooth Settings Page Layout

- Added My Devices list view

- Upon selecting a device and successful connection, the device is moved from the devices list view to the my devices list view

    • -14
    • +17
    /sources/bluetooth/BLEScanner.cpp
    • -0
    • +2
    /sources/gui/qml/globals/Variables.qml
    • -22
    • +87
    /sources/gui/qml/pages/SettingsBluetooth.qml
DEN-4860: Continue refactoring to align with coding standard

    • -32
    • +28
    /sources/bluetooth/BLEScanner.cpp
    • -1
    • +1
    /sources/gui/qml/pages/SettingsBluetooth.qml
DEN-4860: Update to align better with coding standard, fixed docstring issues.

- Updated message ID to align with message lists

    • -2
    • +2
    /sources/gui/qml/pages/SettingsBluetooth.qml
Merge master into DEN-4860_BLE

    • -0
    • +98
    /sources/Threads.cpp
    • -0
    • +136
    /sources/gui/GuiGlobals.cpp
    • -77
    • +84
    /sources/gui/qml/globals/Variables.qml
    • -3
    • +16
    /sources/gui/qml/pages/SettingsHome.qml
    • -0
    • +140
    /sources/view/VView.h
DEN-4860: In progress update

    • -0
    • +461
    /sources/bluetooth/BLEScanner.cpp
    • -0
    • +118
    /sources/bluetooth/BLEScanner.h
    • -0
    • +6
    /sources/gui/qml/components/ScreenItem.qml
    • -7
    • +22
    /sources/gui/qml/components/SettingsItem.qml
    • -1
    • +4
    /sources/gui/qml/globals/Variables.qml
    • -0
    • +115
    /sources/gui/qml/pages/SettingsBluetooth.qml
  1. … 7 more files in changeset.
Merge master into DEN-4598-Confirm-Priming-Begin

    • -39
    • +10
    /sources/canbus/MessageInterpreter.cpp
    • -25
    • +40
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
DEN-4698: Code Review 0

- Found a bug during demo preparation:

The main treatment pressure section should only get updated if the request updated and should not be bound to the properties.

DEN-4698: Code Review 0

    • -1
    • +0
    /sources/canbus/MessageInterpreter.cpp
DEN-4698: Code Review 0

- Found a bug during preparation for the demo

when the ranges were adjusted by user then the ranges came back from FW were not updating the sliders handlers.

DEN-4609: Addressed code review comments

DEN-4693: Update Design Documents

- Updated the messages MSG to hex for SDD.

DEN-4964: Added HD Versions implementation without *.qml needed changes.

    • -1
    • +1
    /sources/canbus/messageinterpreter.cpp
DEN-4697: Static Code Analysis

DEN-4964: Added HD Versions implementation without *.qml needed changes.

    • -64
    • +0
    /sources/model/hd/data/MHDVersionData.cpp
DEN-4964: Added HD Versions implementation without *.qml needed changes.

DEN-4964: Added HD Versions implementation without *.qml needed changes.

DEN-4964: Added HD Versions implementation without *.qml needed changes.

DEN-4964: Added HD Versions implementation without *.qml needed changes.

    • -5
    • +5
    /sources/canbus/messageinterpreter.cpp
    • -31
    • +0
    /sources/view/hd/data/VHDVersionData.cpp
DEN-4964: Added HD Versions implementation without *.qml needed changes.

DEN-4964: Added HD Versions implementation without *.qml needed changes.

    • -0
    • +12
    /sources/canbus/messagedispatcher.cpp
    • -0
    • +7
    /sources/canbus/messageinterpreter.cpp
    • -0
    • +45
    /sources/model/hd/adjustment/MHDVersionResponse.cpp
  1. … 7 more files in changeset.