application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-17157: Update_Denali_Application_for_Dry_Demo

- Addressed the code review comments.

LEAH-1976: implement-a-simple-video-screen

Added Video Screen with button-controller with transition animation

Temporary:

The screen can be accessed by clicking on the "SD" icon

The test video is stored in "/home/denali/videos/

    • binary
    /resources/images/Backward.png
    • binary
    /resources/images/Forward.png
    • -0
    • +211
    /sources/gui/qml/components/VideoScreen.qml
Merged DEN-17157

DEN-17157: Update_Denali_Application_for_Dry_Demo

- Added code in PreTreatmentUltrafiltration.qml to clear the screen all the time.

- Removed the defaultValue in the PreTreatmentUltrafiltration.qml .

DEN-17157: Update_Denali_Application_for_Dry_Demo

- Updated the treatment vitals qml file to accept vitals in drydemo

Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'release/p1b/staging' into release/p1b/master

Bamboo Commit: Updated MAlarmMapping.cpp

    • -15
    • +21
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 605 more files in changeset.
Merge branch 'release/stagingmerge-DEN-17206-UI-BN-Release20' into release/p1b/staging

DENBUG-287 ( DEN-16823 ) : Tx Log Export Success Message via USB is Hidden Behind REQUEST_REJECT_REASON_DRAIN_NOT_COMPLETE Msg

- DEN-16823: Tx Log Export Success Message via USB is Hidden Behind REQUEST_REJECT_REASON_DRAIN_NOT_COMPLETE Msg

- Cherry Picked from Dara's commit

DEN-17161: Incorrect Calcium Value recorded in TX logs

- Cherry picked from Dara's commit 8fa28af55b1a183b75fb6ddd800192e88ac8d258.

DENBUG-294: UI: Log export between different devices on the same USB drive has conflict of names.

DENBUG-294: UI: Log export between different devices on the same USB drive has conflict of names.

- Added functionality to properly backup the BootPOST log which is the log before getting the HDSerial.

- It will get backed up if it is in the current day and system just has changed to the new log file due to receiving of the serial.

- When trying to back up the normal logs (logs with serial), will try for its BootPOST log, if exists will get backed up.

DENBUG-294: UI: Log export between different devices on the same USB drive has conflict of names.

- renamed the BootPOST log before backing up so won't remain Serial-less on the device.

DENBUG-294: UI: Log export between different devices on the same USB drive has conflict of names.

- now using the old "denali" added log format for update/manufacturing

- and delete them with the lockdown.sh script.

DENBUG-294: UI: Log export between different devices on the same USB drive has conflict of names.

- after the reboot the newly created BootPOST could not get renamed because of the same file already exists, therefore application is now append the new one to the oldone with serial and deletes the new one.

- since the BootPOST log files are small in size like 5~10K this should affect the performance of the system.

    • -1302
    • +1324
    /sources/device/DeviceController.cpp
    • -0
    • +1
    /sources/gui/qml/pages/TreatmentFlowBase.qml
Develop Merge

- Made the Wifi and Bluetooth icons as larger to match the SD icon in drydemo

    • -1
    • +1
    /sources/gui/qml/BluetoothStatusIndicator.qml
    • -1
    • +1
    /sources/gui/qml/WifiStatusIndicator.qml
Merged DEN-17157

DEN-17157: Update_Denali_Application_for_Dry_Demo

- Made the SD circle that is used in drydemo bigger

Merge branch 'DEN-17206-UI-BN-Release20' into staging

Merge branch 'DEN-17206-UI-BN-Release20' into develop

DENBUG-294: UI: Log export between different devices on the same USB drive has conflict of names.

- after the reboot the newly created BootPOST could not get renamed because of the same file already exists, therefore application is now append the new one to the oldone with serial and deletes the new one.

- since the BootPOST log files are small in size like 5~10K this should affect the performance of the system.

Merge branch 'DEN-17206-UI-BN-Release20' into develop

DENBUG-294: UI: Log export between different devices on the same USB drive has conflict of names.

- now using the old "denali" added log format for update/manufacturing

- and delete them with the lockdown.sh script.

Merge branch 'DEN-17206-UI-BN-Release20' into develop

DENBUG-294: UI: Log export between different devices on the same USB drive has conflict of names.

- renamed the BootPOST log before backing up so won't remain Serial-less on the device.

    • -10
    • +11
    /sources/device/DeviceController.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -15
    • +21
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 605 more files in changeset.
Merge branch 'DEN-17206-UI-BN-Release20' into develop

DENBUG-294: UI: Log export between different devices on the same USB drive has conflict of names.

- Added functionality to properly backup the BootPOST log which is the log before getting the HDSerial.

- It will get backed up if it is in the current day and system just has changed to the new log file due to receiving of the serial.

- When trying to back up the normal logs (logs with serial), will try for its BootPOST log, if exists will get backed up.

    • -1302
    • +1323
    /sources/device/DeviceController.cpp
Merge branch 'DEN-17206-UI-BN-Release20' into develop

DENBUG-294: UI: Log export between different devices on the same USB drive has conflict of names.