application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-10163 5 min countdown timer is not useful and should be removed in Additional Rinseback screen

- Disabled the Rinsback Additional's timer

- Also found a bug in SafetyVolume Reading.

Updated Alarm Mappings

    • -5
    • +6
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-9637: Update Design Documents

- Added the ability to enable/disable the vitals measurement logs [it's still unknown that how to stop in case of the treatment ended by alarm or system fault.]

- Added the Battery Level of the selected device.

    • -0
    • +35
    /scripts/bluetooth_remove_paired.sh
    • -361
    • +552
    /sources/bluetooth/BluetoothInterface.cpp
    • -9
    • +8
    /sources/bluetooth/BluetoothInterface.h
    • -11
    • +12
    /sources/gui/qml/globals/Colors.qml
    • -4
    • +3
    /sources/model/settings/MBluetooth.cpp
  1. … 4 more files in changeset.
DEN-9653: Implementation - Settings [Screen]

    • -19
    • +57
    /sources/bluetooth/BluetoothInterface.cpp
    • -0
    • +7
    /sources/bluetooth/BluetoothInterface.h
    • -2
    • +18
    /sources/model/settings/MBluetooth.h
    • -7
    • +77
    /sources/view/settings/VBluetooth.cpp
    • -4
    • +47
    /sources/view/settings/VBluetooth.h
DEN-9655: Implementation - Settings [MVC]

DEN-9657: Implementation - Event Driven Reading

DEN-9658: Implementation - Treatment Log

    • -10
    • +24
    /sources/ApplicationController.cpp
    • -49
    • +38
    /sources/bluetooth/BluetoothInterface.cpp
    • -21
    • +8
    /sources/bluetooth/BluetoothInterface.h
    • -3
    • +6
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -0
    • +86
    /sources/model/ui/data/MUIBloodPressureData.cpp
    • -0
    • +107
    /sources/model/ui/data/MUIBloodPressureData.h
  1. … 4 more files in changeset.
DEN-9659: Implementation [POST]

- Created a separate file for the Bluetooth screen since it became bigger.

- Moved the WiFi and Bluetooth start in the Application controller and handled by POST events.

- Added a 5 second sleep for the Bluetooth Device to get ready in run.sh

- Added WiFi POST in run.sh

- Moved lambda functions for POST into slots.

- Added signals in the ApplicationPOST for passed items to be used in the ApplciationController to start WiFi and Bluetooth interfaces.

- Added isValid to the BluetoothInterface to make sure the Bluetooth Adapter is ready for the Interface to setup (Is set by ApplicationController with the information Provided by ApplicationPOST).

- Improved the Bluetooth interface implementation

- Added Rinseback safety volume parameter

- Modified the SAFE_CALL's methods to be public slots.

- Removed the SerialNumber listener from VBluetooth.

- Improved the VBluetooth code and added the connection to the BluetoothController.

    • -12
    • +50
    /sources/ApplicationController.cpp
    • -27
    • +122
    /sources/bluetooth/BluetoothInterface.cpp
    • -8
    • +24
    /sources/bluetooth/BluetoothInterface.h
  1. … 6 more files in changeset.
DEN-9655: Implementation - Settings [MVC]

- Adding the Characteristics and descriptor notifications/log

    • -0
    • +31
    /scripts/bluetooth_kill.sh
    • -0
    • +20
    /scripts/bluetooth_reset.sh
    • -0
    • +29
    /scripts/bluetooth_start.sh
    • -6
    • +65
    /sources/bluetooth/BluetoothInterface.cpp
    • -4
    • +4
    /sources/bluetooth/BluetoothInterface.h
    • -3
    • +8
    /sources/model/settings/MBluetooth.cpp
    • -4
    • +17
    /sources/model/settings/MBluetooth.h
    • -3
    • +18
    /sources/view/settings/VBluetooth.cpp
DEN-9655: Implementation - Settings [MVC]

- Removed the paring

- improved the scanEnabled (scanInProgress) logic

- improved the re-connection

    • -13
    • +20
    /sources/bluetooth/BluetoothInterface.cpp
    • -2
    • +3
    /sources/bluetooth/BluetoothInterface.h
    • -13
    • +9
    /sources/view/settings/VBluetooth.cpp
DEN-9655: Implementation - Settings [MVC]

- First successful BP measurement read.

    • -153
    • +361
    /sources/bluetooth/BluetoothInterface.cpp
    • -21
    • +52
    /sources/bluetooth/BluetoothInterface.h
    • -17
    • +32
    /sources/model/settings/MBluetooth.cpp
    • -53
    • +64
    /sources/model/settings/MBluetooth.h
DEN-9655: Implementation - Settings [MVC]

    • -102
    • +313
    /sources/bluetooth/BluetoothInterface.cpp
    • -26
    • +53
    /sources/bluetooth/BluetoothInterface.h
    • -1
    • +10
    /sources/model/settings/MBluetooth.h
    • -16
    • +37
    /sources/view/settings/VBluetooth.cpp
[ DEN-9653 , DEN9655 ] : Implementation - Settings [ Screen , MVC ]

    • -0
    • +384
    /sources/bluetooth/BluetoothInterface.cpp
    • -0
    • +105
    /sources/bluetooth/BluetoothInterface.h
    • -0
    • +2
    /sources/gui/qml/components/StackItem.qml
    • -6
    • +7
    /sources/model/hd/alarm/MAlarmTriggered.cpp
    • -0
    • +38
    /sources/model/settings/MBluetooth.cpp
    • -0
    • +92
    /sources/model/settings/MBluetooth.h
  1. … 3 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated ui_build_history.log with build number and build date

Merge branch 'DEN-9626UI_DEV_BluetoothCuffIntegration' into develop

Adding the Acknowledge initialize log

    • -0
    • +1
    /sources/canbus/MessageAcknowModel.cpp
DEN-9897: Recirculate confirm button click doesn't do anything.

- After rinseback completes during treatment, UI does not provide option to go back to treatment after RECONNECT

- It has been fixed to send message 84.1 for the confirm

    • binary
    /resources/images/Omron-bp7000.png
DEN-9691: UI Strings Do Not Fit Various Treatment Screens

- Used abbreviation for some long Treatment parameters name, provided by Clayton

Bamboo Commit: Updated ui_build_history.log with build number and build date

Merge branch 'DEN-9626UI_DEV_BluetoothCuffIntegration' into develop

DEN-9418: Code Review 0

- Cherry picked the code review updated from post branch

- Correcting the message IDs enum comments.

    • -18
    • +18
    /sources/canbus/MessageGlobals.h
DEN-9418: Code Review 0

- Cherry picked the code review updated from post branch

- Function comments.

- Removed unused BLE alarm from alarm generator.

DEN-9707: BP/HR empty measurement display does not match PRS

- alarm mapping update.

- post code review applied here.

    • -12
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-9418: Code Review 0

- DEN-9707: BP/HR empty measurement display does not match PRS

- Updated Alarms Mapping

    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-9418: Code Review 0

DEN-9418: Code Review 0

    • -14
    • +29
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -9
    • +17
    /sources/view/settings/VNetworkModel.cpp
    • -1
    • +2
    /sources/view/settings/VNetworkModel.h
DEN-9418: Code Review 0

    • -18
    • +18
    /sources/canbus/MessageGlobals.h
Merge remote-tracking branch 'origin/DEN-9626UI_DEV_BluetoothCuffIntegration' into DEN-9626UI_DEV_BluetoothCuffIntegration

DEN-9649: Updated the Copy/Setup/run scripts and checked the devices.

- Updated the Copy/Setup/run scripts and checked the devices to have the

- Bluetooth

- Instructions

- Service Password

- Treatment Parameters

- Put the Ethernet configuration at the end of the run.sh script and gave it 10s delay to then run (it won't stop application process and will run in parallel 10s after the application ran.)

- Fixed the RTC POST test

    • -0
    • +221
    /scripts/start.sh
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated ui_build_history.log with build number and build date