Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge master into DEN-6349_bp_hr_manual_entry

  1. … 11 more files in changeset.
6636: ptTx_Rinseback: Implementation

- Added the PostTreatmentRinseback.qml

- Added the PostTreatmentRecirculate.qml

- Improved the StackItem.qml

- Added Rinseback/Recirculate Navigation

- Removed Diagnostics screen since it's not one screen anymore and is too old.

-

  1. … 22 more files in changeset.
DEN-6619: Implementation

- Added a signal named didSDCardSpaceTooLow in the DriveWatcher which will be triggered when the free storage space available on the SD-CARD is less than 10%. (No action on UI happens currently)

- Added a flag in DriveWatcher to stop emitting the Logger while it is cleaning the Logs [[ IMPORTANT : is is handled by signal/slots for thread synchronization and safety ]].

- Added a function to find the total size of the file in a path.

- Added find function to find files with a list of filter in a path.

- Added an overloaded version of find to help find the files in a path which are exceeding the storage limit from the oldest files.

- Added error check in the read overloaded which works with Json.

- Re-implemented the FileHandler::removeLogs to clean up the logs by % instead of date.

- Removed unused global log paths from StorageGlobal.

-

  1. … 15 more files in changeset.
DEN-6612 UI_DVT: Pre-Treatment Ultrafiltration

- This story wasn't part of the current sprint S37 but while I worked on it to be able to push it to master ASAP, so put the story as the commit comment.

  1. … 6 more files in changeset.
Server coverage issue fixed

- This line was not covered on server although it was covered on local.

Tested locally and it is working.

Build failed on server because the fw common branch master was changed.

- commented out the removed enum from application.

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