Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-11980-sw_dev-sprint-64' into staging

    • -1
    • +1
    ./data/treatment/VTreatmentBloodFlow.cpp
    • -2
    • +2
    ./data/treatment/VTreatmentBloodFlow.h
    • -2
    • +1
    ./data/treatment/VTreatmentDialysateFlow.h
  1. … 3 more files in changeset.
Merge branch 'DEN-11980-sw_dev-sprint-64' into develop

    • -1
    • +1
    ./data/treatment/VTreatmentBloodFlow.cpp
    • -2
    • +2
    ./data/treatment/VTreatmentBloodFlow.h
    • -2
    • +1
    ./data/treatment/VTreatmentDialysateFlow.h
  1. … 2 more files in changeset.
DEN-11980: Updates and fixes per code review.

    • -1
    • +1
    ./data/treatment/VTreatmentBloodFlow.cpp
    • -1
    • +1
    ./data/treatment/VTreatmentDialysateFlow.h
  1. … 8 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -4
    • +4
    ./adjustment/common/VCommonAdjustmentVitals.cpp
    • -1
    • +1
    ./adjustment/disinfect/VDisinfectAdjustChemicalConfirm.cpp
    • -2
    • +2
    ./adjustment/disinfect/VDisinfectAdjustChemicalConfirm.h
    • -1
    • +1
    ./adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.cpp
    • -2
    • +2
    ./adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.h
    • -1
    • +1
    ./adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp
    • -3
    • +3
    ./adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h
    • -3
    • +3
    ./adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.cpp
    • -3
    • +3
    ./adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.h
    • -3
    • +3
    ./adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp
  1. … 570 more files in changeset.
DEN-11980: Split Flows Data Model to Blood Flow data and Inlet Data Models. Updated Views to reflect new message protocol for Blood Flow and Inlet Flow. Updated Diagnostic Dialog to reflect new message values.

    • -1
    • +1
    ./data/treatment/VTreatmentBloodFlow.cpp
    • -2
    • +2
    ./data/treatment/VTreatmentBloodFlow.h
    • -2
    • +1
    ./data/treatment/VTreatmentDialysateFlow.h
  1. … 10 more files in changeset.
DEN-11814: Heparin Minimum Dispensing Parameters Should Be 0.2

- Reverted back the Heparin min to 0.0 due to the slider's issue which disables the OFF feature, since the value 0.0 becomes an invalid.

- A minor update on the POST progress display to start when 0 to max of complete enum -1.

- An idea of fixing the slider touch issue. [Is DISABLED for now, for more test]

  1. … 13 more files in changeset.
DEN-9704: Missing acknowledgement confirmation message/alarm when leaving BP/HR blank

- A typo caused the BP/HR entry timer disabled.

    • -4
    • +4
    ./adjustment/common/VCommonAdjustmentVitals.cpp
  1. … 1 more file in changeset.
DEN-10422: Dialysate Flow Rate maximum rate selectable in Treatment does not meet PRS resolution

  1. … 1 more file in changeset.
DEN-9704: Missing acknowledgement confirmation message/alarm when leaving BP/HR blank

- Added a script to later be used for the log export on the device, but it now only works on the VM since the device doesn't have the zip tool.

- Added a mimic function to simulate the BCuff measurement received and assigned F11 to it and it will only be enabled if the macro DEBUG_BCUFF_MIMIC is defined.

- Added opened and closed signals to the EntryDialog.qml to make it do the auto focus on the firstInput object when opened.

- Added setFocus() function in the BPHREntry.qml

- Removed the enabled option from doReset of the VTreatmentVitals

- And created two separate enableDialog for vital entry, and enable update for the auto update the properties.

- Added a constructor with systolic, diastolic, heartRate parameter to set the data on creation to be used in the message mimic.

- Added systolic, diastolic, heartRate parameters to the doTrigger of the VCommonAdjustmentVitals to open the vitals entry dialog with default values.

    • -16
    • +21
    ./adjustment/common/VCommonAdjustmentVitals.cpp
  1. … 14 more files in changeset.
DEN-10614 [On Going Code Review] UI_DEV: Add Patient ID to Pre-Treatment Flow

- Pushed the code improvements

- Addressed the code review comments

  1. … 8 more files in changeset.
DEN-10205: BCuff [Missing Feature]: Try to reconnect to the previously paired

Bluetooth Code improvements:

- stopping the agent from scanning if user selects a device to connect.

- Rewording of the parred device not found

- Added "ZERO" check for the address

- Added real-time Bluetooth status on top of the main screen.

- Not The UI will always updated but the TreatmentLog still needs UI to be in a proper screen/state to log the Vitals measurements.

Other Requested modifications:

Chris.Y:

- Added back for the pre-treatment BP/HR screen to the Ultrafiltration screen.

Eliza.P:

- Added notification for the Heparin Dispensing:"Heparin Active"

- Changed the button text to "OFF" when the heparin is off.

- Changed the button text to "COMPLETE" when the heparin is complete.

- Shortened the notification text and removed the "Heparin ... " from the beginning.

- Won't show the off notification since the button text changed to imply that.

    • -6
    • +4
    ./adjustment/common/VCommonAdjustmentVitals.cpp
  1. … 10 more files in changeset.
Code Review: UI-DEN-10206: UI-DEN-10206-1

  1. … 4 more files in changeset.
UI-DEN-10206: UI-DEN-10206-1: addressing the code reviews.

  1. … 10 more files in changeset.
UI-DEN-10206: UI-DEN-10206-1: addressing the code reviews.

  1. … 10 more files in changeset.
DEN-10607: Implementation [Screen]

- DEN-10608: Implementation [Navigation]

- DEN-10609: Implementation [Treatment Log]

  1. … 7 more files in changeset.
Improved the POST

- Updated the run.sh

- Enabled the Sha256 in the application

- Fixed the ShaSum issue in the run.sh

- Added a command line argument to disable the alarm-no-minimize

- Set the timezone to UTC int eh setup script.

- Setup the correct greeting on the home screen

  1. … 11 more files in changeset.
DEN-9968: GUI does not indicate the amount of time the device has been stopped in pre-treatment & treatment

- Added message ID_TreatmentStop = 0x4900, // 73 and its Model, View

- Added a timer on the Alarm Dialog which is visible in Treatment Stop and if the message above has a total value.

    • -0
    • +26
    ./data/treatment/VTreatmentStopData.cpp
    • -0
    • +44
    ./data/treatment/VTreatmentStopData.h
  1. … 13 more files in changeset.
DEN-10399: UI: Alarms block Shutdown screen

DEN-9271: Dialysate Temperature implemented resolution does not meet PRS

  1. … 5 more files in changeset.
Code Review Comments

- QApplication typo

- Added a UI version of the Log Macros.

    • -4
    • +4
    ./adjustment/common/VCommonAdjustmentVitals.cpp
  1. … 13 more files in changeset.
DEN-9637: Update Design Documents

- Added the ability to enable/disable the vitals measurement logs [it's still unknown that how to stop in case of the treatment ended by alarm or system fault.]

- Added the Battery Level of the selected device.

    • -1
    • +4
    ./adjustment/common/VCommonAdjustmentVitals.cpp
  1. … 17 more files in changeset.
DEN-9655: Implementation - Settings [MVC]

DEN-9657: Implementation - Event Driven Reading

DEN-9658: Implementation - Treatment Log

    • -26
    • +28
    ./adjustment/common/VCommonAdjustmentVitals.cpp
    • -20
    • +11
    ./adjustment/common/VCommonAdjustmentVitals.h
  1. … 17 more files in changeset.
DEN-9649: Implementation - Yocto configuration

- Addressed some frequent code review comments

- Fixed the UI POST AlarmTriggered message

- Added the deleteLater for the QQuickViewer pointer _viewer.

    • -1
    • +1
    ./adjustment/disinfect/VDisinfectAdjustChemicalConfirm.h
    • -1
    • +1
    ./adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.h
    • -1
    • +1
    ./adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h
    • -1
    • +1
    ./adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.h
    • -1
    • +1
    ./adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h
    • -1
    • +1
    ./adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.h
    • -1
    • +1
    ./adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.h
    • -1
    • +1
    ./adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.h
    • -1
    • +1
    ./adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h
    • -1
    • +1
    ./adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.h
  1. … 100 more files in changeset.
DEN-9416: Implementations

- Added a newly added parameter of the BloodPrime (Safety Vol).

- UI POST is done.

- Out of 10 tests

1 - CANBus

2 - Touch Screen

3 - SD-Card

4 - RTC

tests are done.

- The

5 - File System integrity

will be done as part of CyberSecurity.

- The

6 - Bluetooth

will be added when the feature itself added to the application.

- The

7 - WiFi

is in progress and having issue correctly detect it.

- Some tests are listed to be added later in case required, like

8 - Display

9 - Ethernet

10- Sound

test couldn't find a way to test it yet.

- On each unsuccessful test an alarm will be triggered.

- UI alarms are in range of [250 - 259]

  1. … 16 more files in changeset.
DEN-9416: Implementation

DEN-9299: Adding the Syringe Pump data on Diagnostic

    • -0
    • +34
    ./data/VHDSyringePumpData.cpp
    • -0
    • +52
    ./data/VHDSyringePumpData.h
  1. … 23 more files in changeset.
DEN-9416: Implementations

- Most of the FW implementation is done.

- After the Check-in message two more messages needs to be sent to the HD to complete the POST:

- Version for the compatibility test.

- UI_POST to wrap the POST on HD side.

    • -0
    • +59
    ./data/post/VHDPOSTData.cpp
    • -0
    • +61
    ./data/post/VHDPOSTData.h
  1. … 13 more files in changeset.
DEN-8937: Meetings & Support - General Support

- Updated the main Treatment Log message parameters.

  1. … 14 more files in changeset.
DEN-DEN-8937: Meetings & Support - General Support

- Modified the DG disinfect states message to use the new FW enum instead of the temporary UI one.

  1. … 8 more files in changeset.
DEN-8920 Implementation [Store Collected Data]

- Added MVC

- Added the TxLog and Log_Events and so...

- Added the timeout/interval

- ....

    • -0
    • +203
    ./adjustment/common/VCommonAdjustmentVitals.cpp
    • -0
    • +128
    ./adjustment/common/VCommonAdjustmentVitals.h
  1. … 13 more files in changeset.
DEN-8918: BtC: Implementation [Screens]

  1. … 13 more files in changeset.
DEN-8910: Meetings & Support - General Support

- Improved the Alarm design logic

- Fixed the issue with the AlarmActiveListDialig jumping back to the AlarmDialog.

  1. … 4 more files in changeset.