application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-6864: Implementation [Messaging] (1/2)

    • -0
    • +24
    /sources/canbus/MessageDispatcher.cpp
    • -0
    • +5
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +45
    /sources/model/hd/adjustment/MTreatmentAdjustRecirculateResponse.cpp
  1. … 14 more files in changeset.
- Added PostTreatmentComplete.qml screen - Added PostTreatmentRinsebackComplete.qml - Removed '_' from Dialisate state property name - fixed the Alarm enum name change on AlarmDefs

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmStatusData.cpp
DEN-4964: Added unit tests for DG/HD acceleration and versions.

DEN-4964: Added unit tests for DG/HD acceleration and versions.

DEN-4964: Added unit tests for DG/HD acceleration and versions.

DEN-4964: Added unit tests for DG/HD acceleration and versions.

Merge branch 'DEN-5777_UI_DEV_ConvertLogging_From_hrs_to_%' into staging

Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into staging

DEN-5759: Code Review 0

- Added a TODO for the DoubleSlider component to add a validation and active feature to be able to use it for PreTreatmentCreate.

DEN-6621: Code Review 0

DEN-6621: Code Review 0

    • -14
    • +14
    /sources/storage/FileHandler.cpp
DEN-5759: prTx: Code Review 0

Merge DEN-4860_BLE into master

    • -0
    • +3
    /sources/gui/qml/globals/Variables.qml
Merge master into DEN-6349_bp_hr_manual_entry

    • -32
    • +34
    /sources/canbus/MessageInterpreter.cpp
    • -3
    • +9
    /sources/view/hd/alarm/VAlarmStatus.cpp
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.

-

    • binary
    /resources/images/Accelerate.png
    • binary
    /resources/images/Decelerate.png
    • binary
    /resources/images/End.png
    • binary
    /resources/images/PauseDarkBlue.png
    • binary
    /resources/images/PauseLightBlue.png
    • -1
    • +1
    /sources/gui/qml/components/CheckListItem.qml
    • -5
    • +36
    /sources/gui/qml/components/StackItem.qml
    • -0
    • +3
    /sources/gui/qml/globals/Variables.qml
    • -301
    • +0
    /sources/gui/qml/pages/Diagnostics.qml
  1. … 9 more files in changeset.
DEN-6359: Addressed code review comments.

Merge branch 'DEN-5777_UI_DEV_ConvertLogging_From_hrs_to_%' into UI_DEV

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.

-

    • -5
    • +130
    /sources/storage/FileHandler.cpp
Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into UI_DEV

DEN-5758: Code Analysis

Merge branch 'master' into DEN-5736_UI_Heparin_Bolus

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.

    • -2
    • +2
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5757: Code Coverage

Merge branch 'master' into DEN-5751_Pre-TreatmentUltrafiltration

    • -3
    • +17
    /sources/canbus/MessageDispatcher.cpp
    • -42
    • +47
    /sources/canbus/MessageInterpreter.cpp
    • -12
    • +55
    /sources/gui/qml/globals/Colors.qml
    • -8
    • +9
    /sources/gui/qml/globals/Variables.qml
Server coverage issue fixed

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

Tested locally and it is working.

    • -1
    • +3
    /sources/view/hd/alarm/VAlarmStatus.cpp
Build failed on server because the fw common branch master was changed.

- commented out the removed enum from application.

    • -2
    • +2
    /sources/model/hd/alarm/MAlarmStatusData.cpp
Merge master into DEN-4860_BLE

    • -34
    • +36
    /sources/canbus/MessageInterpreter.cpp
    • -2
    • +6
    /sources/view/hd/alarm/VAlarmStatus.cpp
Merge branch 'DEN-5830_AlarmDesign'

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

    • -75
    • +57
    /sources/bluetooth/BLEScanner.cpp
    • -2
    • +2
    /sources/gui/qml/pages/SettingsBluetooth.qml
DEN-5753: Update Design Documents

- Fixed comments in some files of the Pre-Treatment Create.