Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge master into DEN-4860_BLE

  1. … 12 more files in changeset.
DEN-4867: Code Review 0 - Requested Modifications

- Removed startBLETimer and killBLETimer so we are not creating and deleting timers. Only one timer will be used

- Added toggleBLETimer

- Logging measurements when they are received instead of using qDebug

- Passing device addr and name to BLEScanner instead of just addr so only a QBluetoothDeviceInfo object is necessary, allowing removal of the macAddress QString

- Removed VBluetoothDeviceInfo static cast in VBluetooth::doSelectDevice

  1. … 4 more files in changeset.
DEN-6359: Addressed code review comments

DEN-6359: Addressed code review comments

DEN-4867: Addressed code review comments

  1. … 5 more files in changeset.
DEN-6359: Addressed code review comments

  1. … 5 more files in changeset.
DEN-4867: Preventing create treatment class from thinking a new treatment profile was saved when the bledevices.conf file is updated.

DEN-6359: Addressed code review comments

  1. … 9 more files in changeset.
DEN-5836: Code Coverage

- 99.979% (4826/4827)

  1. … 4 more files in changeset.
DEN-5836: Code Coverage

- commented as manually tested the AlarmClearedCondition.

  1. … 7 more files in changeset.
DEN-6353, DEN-6354: Added vitals manual entry page.

  1. … 6 more files in changeset.
DEN-4964: Addressed code review comments.

    • -0
    • +60
    ./hd/adjustment/VTreatmentAdjustmentVersions.cpp
  1. … 5 more files in changeset.
DEN-5836: Alarm:Code Coverage

- 99.110% (4790/4833)

  1. … 5 more files in changeset.
DEN-4964: Addressed code review comments.

    • -0
    • +78
    ./hd/adjustment/VTreatmentAdjustmentVersions.h
  1. … 3 more files in changeset.
DEN-5836: Alarm:Code Coverage

- updated the alarm message table

- fixed the -q parameter

  1. … 2 more files in changeset.
DEN-4866, DEN-4863, DEN-4862: Added class descriptions, fixed unit test, ran static code analysis

- Fixed tst_canbus issue likely introduced in f1e100d1368

  1. … 4 more files in changeset.
DEN-4863, DEN-4865: Code Coverage and Unit Tests

  1. … 7 more files in changeset.
DEN-4964: Addressed code review comments.

  1. … 5 more files in changeset.
DEN-4863, DEN-4865: Updated unit tests and code coverage for bluetooth

  1. … 3 more files in changeset.
DEN-4865, DEN-5642: Checking BLE connection before sending UF volume, fixed unit test errors and added object names to support squishqt tests

  1. … 12 more files in changeset.
DEN-5833: Implementation

- Added a UI "AlarmGenerator" class to handle the HD_COMM_TIMEOUT and later the BLE Cuff alarm (PRS 395).

  1. … 4 more files in changeset.
DEN-6022: The ultrafiltration inconsistency

- Had a conversation with Syseng(Nic) and Fweng(Sean) and decided to have the fix somehow more understandable but there is no actual fix and if that happens it would be the FW bug.

- The modification is that the main progress bar will always has VTreatmentUltratiltration.minimum as minimum (current;y always zero) and VTreatmentUltratiltration.maximum as maximum.

- The UI always expects to get the vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min (adjustable min and slider min) greater than vTreatmentUltrafiltration.ultrafiltration_RefUFVol (current uf volume delivered and current value on the progress bar) and so close to eachother.

- Removed the precision from VTreatmentUltrafiltration and moved into the Variables.

  1. … 7 more files in changeset.
Merge branch 'DEN-5830_AlarmDesign' into 2020_EOY_DEMO

  1. … 1 more file in changeset.
DEN-5833: Implementation

- Fixed the bug that alarm ID zero which is the clear the alarm indication wasn't updating the properties, so caused to alarm_ID changed notification signal not to raise and GUI wasn't getting updated.

Merge DEN-4860_BLE into 2020_EOY_DEMO

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

  1. … 23 more files in changeset.
DEN-5515, DEN-5516: Disabled verbose bluetooth debugging

  1. … 1 more file in changeset.
DEN-5515, DEN-5516: Setup in-treatment bp/hr measurement alerts

- Replaced some instances of qDebug with LOG_DEBUG

- Docstring fixes, cleanup

  1. … 3 more files in changeset.
DEN-4964: Added HD Blood/DialIn signal strengths to Manager page.

  1. … 5 more files in changeset.
DEN-5516, 5514 - BLE Interface updates

- When reconnecting to the last paired device on startup, ensure we repeatedly try to connect to it by updating the BLE connection type

- Docstring additions

- Keeping some code in case it is needed for future use with other BLE devices

  1. … 1 more file in changeset.