application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-11380_KeborMed_CloudSyncDevelopment' into develop

DEN-11380 KeborMed [ CloudSync Development ]

Added the treatment log saved/ready message.

    • -0
    • +3
    /sources/cloudsync/CloudSyncController.h
    • -10
    • +18
    /sources/storage/TreatmentLog.cpp
Merge branch 'DEN-11380_KeborMed_CloudSyncDevelopment' into develop

DEN-11380 KeborMed [ CloudSync Development ]

- modified the messaging protocol to the below and reordered the crc position.

<timestamp>,<seq>,<CRC=0 for now, Don't care>,<message id>,<parameter length>[,<P1>,...<Pn>]

    • -3
    • +3
    /sources/cloudsync/CloudSyncController.h
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-10205_BCuff_MissingFeatures_Reconnect_Paired' into develop

    • -0
    • +36
    /sources/bluetooth/BluetoothInterface.cpp
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-10602_UI_DEV_Add_PatientID_PreTreatment' into develop

Added a step in the application build to run the alarmMapping automatically

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

    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
Finishing up the story for Firmware and adding remaining other tasks

DEN-10607: Implementation [Screen]

DEN-10609: Implementation [Treatment Log]

DEN-11320: KeborMed [ CloudSync Development ]

- Added the message handling for the Device status

- Adding Error handling

    • -5
    • +64
    /sources/cloudsync/CloudSyncController.h
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-10614 [On Going Code Review] UI_DEV: Add Patient ID to Pre-Treatment Flow

- Pushed the code improvements

- Addressed the code review comments

    • -35
    • +34
    /sources/gui/qml/components/GridSelection.qml
    • -12
    • +12
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -1
    • +1
    /sources/view/hd/alarm/VAlarmStatus.cpp
Updated the local user conf to add sha256sum to the build

DEN-10607: Screen

- Added the feature for the create treatment slider to be able to show OFF for zero values on label.

- Did a refactoring to clean up the SliderCreateTreatment.

Copied some useful modifications from other stashes

    • -3
    • +4
    /sources/bluetooth/BluetoothInterface.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

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

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

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

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-10205: BCuff [Missing Feature]: Try to reconnect to the previously paired

- Stop try to reconnect while still is trying the initial connect.

- Changed the BCuff wait state notification.

- Updated the Heparin section wording.

    • -3
    • +4
    /sources/bluetooth/BluetoothInterface.cpp
    • -0
    • +1
    /sources/bluetooth/BluetoothInterface.h
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.

    • -0
    • +6
    /sources/bluetooth/BluetoothInterface.cpp
DEN-10205: BCuff [Missing Feature]: Try to reconnect to the previously paired

    • -0
    • +39
    /scripts/bluetooth_paired_clear.sh
    • -0
    • +30
    /scripts/bluetooth_paired_query.sh
    • -35
    • +0
    /scripts/bluetooth_remove_paired.sh
    • -0
    • +29
    /sources/bluetooth/BluetoothInterface.cpp
    • -2
    • +5
    /sources/bluetooth/BluetoothInterface.h
    • -12
    • +45
    /sources/device/DeviceController.cpp
  1. … 5 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

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

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

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

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Commit latest changes of the update script to push on develop

Bamboo Commit: Updated MAlarmMapping.cpp

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

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

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp