Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into develop

Merge branch 'bugfix/DENBUG-325-Machine-Fails-to-Zip-Files-When-Asleep-Preventing-Upload-to-Cloud' into develop

  1. … 4 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 6 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 6 more files in changeset.
Merged DEN-17295

DENBUG-323: Discrepancy between patient ID allowed characters on Cloud portal and Device

- Updated the patient ID's regular expression to not pass a patient ID that is greater than 20 character or contains [ . - _ ]

DENBUG-323: Discrepancy between patient ID allowed characters on Cloud portal and Device

- Updated the patient ID's regular expression to not pass a patient ID that is greater than 20 character or contains [ . - _ ]

Merged DEN-17295

  1. … 1 more file in changeset.
DENBUG-318: Rejection Ratio Setting Feature Implementation in Manufacturing Configuration For Treatment

- Updated the code to add max RO rejection ratio and min inlet water conductivity alarm limit to the HD institutional record and display it on the UI

  1. … 5 more files in changeset.
DENBUG-318: Rejection Ratio Setting Feature Implementation in Manufacturing Configuration For Treatment

- Updated the code to add max RO rejection ratio and min inlet water conductivity alarm limit to the HD institutional record and display it on the UI

  1. … 5 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 15 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 15 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 15 more files in changeset.
DENBUG-298: User unable to deliver saline bolus during alarm conditions where the blood pump is recirculating

- Added code to clear the saline bolus reject reason upon changing the treatment states.

DENBUG-298: User unable to deliver saline bolus during alarm conditions where the blood pump is recirculating

- Updated the code to clear the saline bolus related reject reasons upon changing the saline bolus states.

DENBUG-298: User unable to deliver saline bolus during alarm conditions where the blood pump is recirculating

- Updated the TreatmentSaline.qml file to clear the reject reasons associated with saline bolus once the treatment state has changed.

Merged DEN-17260

DENBUG-298: User unable to deliver saline bolus during alarm conditions where the blood pump is recirculating

- Reduced the font size of fluid value font from 32 to 28.

Merge branch 'DEN-17260-ui-dn-release-21' into develop

  1. … 12 more files in changeset.
DEN-17260: UI-DN-Release-21

- DENBUG-298: Removed the Maximum Saline Bolus State

- DENBUG-298: Added Deliver Saline Bolus in treatment stop.

  1. … 2 more files in changeset.
StagingMerge - DEN-17260-ui-dn-release-21 (13 commits squashed)

DEN-17260: UI-DN-Release-21

- DEN-17261: Corrected the treatment logs doxygen and data type for potassium and calcium.

DEN-17260: UI-DN-Release-21

- DENBUG-298: Removed the Maximum Saline Bolus State

- DENBUG-298: Added Deliver Saline Bolus in treatment stop.

DENBUG-298: User unable to deliver saline bolus during alarm conditions where the blood pump is recirculating

- Reduced the font size of fluid value font from 32 to 28.

DEN-17269: Change_version_format_from_dot_to_dash

- Changed the format of the version from dot to dash before compatibility value.

DENBUG-302: When treatment time is updated mid-treatment, update UF rate to keep the volume prescription the same

- Modified message 0xBA to send up to 4 float payloads to the UI

- Changed MDuetConfirmHD to receive and process the new payloads

- Changed VConfirm to update the confirm messages that have {} in them and replace them with actual values

DENBUG-298: User unable to deliver saline bolus during alarm conditions where the blood pump is recirculating

- Updated the TreatmentSaline.qml file to clear the reject reasons associated with saline bolus once the treatment state has changed.

DENBUG-302: When treatment time is updated mid-treatment, update UF rate to keep the volume prescription the same

- Updated the VConfirm to trigger the confirm messages even if the ID has not changed.

DENBUG-298: User unable to deliver saline bolus during alarm conditions where the blood pump is recirculating

- Updated the code to clear the saline bolus related reject reasons upon changing the saline bolus states.

DENBUG-298: User unable to deliver saline bolus during alarm conditions where the blood pump is recirculating

- Added code to clear the saline bolus reject reason upon changing the treatment states.

DENBUG-302: When treatment time is updated mid-treatment, update UF rate to keep the volume prescription the same

- Updated the code to round up the UF rate that is displayed on the UF rate change screen.

DENBUG-302: When treatment time is updated mid-treatment, update UF rate to keep the volume prescription the same

- Updated the current UF rate in the VTreatmentUltrafiltration to be rounded up.

- Removed commented code.

DENBUG-302: When treatment time is updated mid-treatment, update UF rate to keep the volume prescription the same

- Made UF Rate related values in VTreatmentAdjustmentUltrafiltrationEdit to be rounded up prior to displaying on the UI.

DENBUG-302: When treatment time is updated mid-treatment, update UF rate to keep the volume prescription the same

- Addressed the code review comments

  1. … 15 more files in changeset.
LEAH-1976: implement-a-simple-video-screen

To provide support for animation, the following modules are created [LEAH-1974]

AnimationScreen.qml

ImageAnimator.qml

ImageNameLoader.qml

PlaybackController.qml

    • -0
    • +158
    ./qml/components/AnimationScreen.qml
    • -0
    • +221
    ./qml/components/ImageAnimator.qml
    • -0
    • +131
    ./qml/components/ImageNameLoader.qml
    • -0
    • +200
    ./qml/components/PlaybackController.qml
  1. … 1 more file in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    ./qml/components/SliderCreateTreatment.qml
  1. … 4 more files in changeset.
Merge branch 'DEN-17157-update_denali_application_for_dry_demo' into staging

    • -2
    • +3
    ./qml/components/SliderCreateTreatment.qml
  1. … 3 more files in changeset.
DEN-17157: Update_Denali_Application_for_Dry_Demo

- Addressed the code review comments.

DEN-17157: Update_Denali_Application_for_Dry_Demo

- Addressed the code review comments.

    • -2
    • +2
    ./qml/components/SliderCreateTreatment.qml
  1. … 3 more files in changeset.
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/

    • -0
    • +211
    ./qml/components/VideoScreen.qml
    • -4
    • +17
    ./qml/dialogs/DiagnosticsDialog.qml
  1. … 3 more files in changeset.
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 the Copyright section and replaced tabs with 4 spaces

  1. … 605 more files in changeset.