sources

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge Conflict fix

Merge branch 'master' into DEN-4691_InLineBloodPressureAdjustments

    • -5
    • +34
    ./gui/qml/pages/treatment/TreatmentBegin.qml
    • -85
    • +266
    ./gui/qml/pages/treatment/TreatmentCreate.qml
    • -8
    • +79
    ./gui/qml/pages/treatment/TreatmentPrime.qml
    • -17
    • +20
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 14 more files in changeset.
DEN-5636: Implementation [PressureRangeSlider improvement]

- kept an idea for later if required.

DEN-4860: BLE Settings Page Updates

- Saving my devices to disk

- Loading my devices on startup

- BLEScanner improvements

- Refactored VBluetoothDeviceInfo

    • -11
    • +41
    ./gui/qml/pages/SettingsBluetooth.qml
  1. … 1 more file in changeset.
DEN-5636: Implementation [PressureRangeSlider improvement]

- Updated the documentation

  1. … 1 more file in changeset.
DEN-4860: Confirmed data received after measurement completion.

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

    • -3
    • +14
    ./gui/qml/pages/SettingsBluetooth.qml
  1. … 1 more file in changeset.
DEN-5636: Implementation [PressureRangeSlider improvement]

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

DEN-4867: Refactored Pre-Treatment classes.

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

  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
    ./gui/qml/components/RangeSlider.qml
DEN-4698: Code Review 0

  1. … 1 more file in changeset.
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

    • -22
    • +87
    ./gui/qml/pages/SettingsBluetooth.qml
DEN-4860: Continue refactoring to align with coding standard

  1. … 1 more file in changeset.
DEN-4860: Update to align better with coding standard, fixed docstring issues.

- Updated message ID to align with message lists

  1. … 1 more file in changeset.
Merge master into DEN-4860_BLE

    • -0
    • +136
    ./gui/GuiGlobals.cpp
  1. … 4 more files in changeset.
DEN-4860: In progress update

    • -0
    • +461
    ./bluetooth/BLEScanner.cpp
    • -0
    • +118
    ./bluetooth/BLEScanner.h
    • -7
    • +22
    ./gui/qml/components/SettingsItem.qml
    • -0
    • +115
    ./gui/qml/pages/SettingsBluetooth.qml
    • -0
    • +102
    ./view/VBluetooth.cpp
    • -0
    • +60
    ./view/VBluetoothDeviceInfo.cpp
    • -0
    • +36
    ./view/VBluetoothDeviceInfo.h
  1. … 7 more files in changeset.
Merge master into DEN-4598-Confirm-Priming-Begin

    • -6
    • +7
    ./gui/qml/components/NotificationBar.qml
    • -25
    • +40
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 6 more files in changeset.
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.

    • -7
    • +24
    ./gui/qml/pages/treatment/TreatmentStart.qml
DEN-4698: Code Review 0

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

    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentConfirm.qml
    • -0
    • +1
    ./gui/qml/pages/treatment/TreatmentPrime.qml
DEN-4693: Update Design Documents

- Updated the messages MSG to hex for SDD.

    • -3
    • +3
    ./model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h
  1. … 1 more file in changeset.
DEN-4964: Added HD Versions implementation without *.qml needed changes.

DEN-4697: Static Code Analysis

  1. … 3 more files in changeset.
DEN-4964: Added HD Versions implementation without *.qml needed changes.

  1. … 1 more file in changeset.
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.

    • -0
    • +65
    ./model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp
  1. … 1 more file in changeset.
DEN-4964: Added HD Versions implementation without *.qml needed changes.

    • -0
    • +65
    ./model/hd/adjustment/MTreatmentAdjustHDVersionResponse.cpp
  1. … 1 more file in changeset.