application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into 2020_EOY_DEMO

DEN-5754: Implementation

- Fixed the message id of the ID_ConfirmTreatmentReq from 58 to 59

- Enabled the priming button for now since there is no FW implementation.

Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into 2020_EOY_DEMO

    • -0
    • +13
    /sources/canbus/MessageDispatcher.cpp
    • -4
    • +2
    /sources/canbus/MessageInterpreter.cpp
DEN-4964: Added HD Blood/DialIn signal strengths to Manager page.

    • -24
    • +18
    /sources/gui/qml/pages/ManagerHome.qml
    • -2
    • +5
    /sources/model/hd/data/MTreatmentFlowsData.h
    • -1
    • +1
    /sources/view/vtreatmentdialysateflow.h
DEN-5833: Implementation

- Moved version and sd-card icon to to not to cover others.

DEN-5754: Implementation

- Removed the unused flag of ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT

    • -1
    • +0
    /sources/model/hd/alarm/MAlarmStatusData.cpp
DEN-5516, 5514 - BLE Interface updates

- When reconnecting to the last paired device on startup, ensure we repeatedly try to connect to it by updating the BLE connection type

- Docstring additions

- Keeping some code in case it is needed for future use with other BLE devices

DEN-5754: Implementation

- Removed the semi-colon at the end of the imports.

DEN-5833: Implementation

- The message 63 has been tested

    • -1
    • +15
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5833: Implementation

- Added the message 63 (req/rsp)

    • -13
    • +13
    /sources/canbus/MessageDispatcher.cpp
    • -13
    • +20
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +41
    /sources/model/hd/alarm/MAlarmClearedCondition.cpp
    • -0
    • +79
    /sources/model/hd/alarm/MAlarmClearedCondition.h
    • -4
    • +4
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5833: Implementation

- moved version and SD-Card icon to top which were covering the alarm bar.

- added list icon on the notification bar

- implemented the basics of the alarm list dialog.

- tweaked the Notification default coloring

-

    • binary
    /resources/images/AlarmBell.png
    • binary
    /resources/images/AlarmBellSilent.png
    • binary
    /resources/images/doted-list.png
    • binary
    /resources/images/list.png
    • -0
    • +100
    /sources/gui/qml/dialogs/AlarmListDialog.qml
    • -1
    • +2
    /sources/gui/qml/globals/Variables.qml
DEN-5833: Implementation

- fix a naming bug.

DEN-5833: Implementation

- Fixed the bug of silence logic which was reverse

- Fixed the bug that length of the silence message payload was incorrectly set to 4 instead of 1.

- changed the name of the MAlarmSilenceReq member variable to silence instead of state which now implies it is silent (1) or not (0).

    • -2
    • +2
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5833: Implementation

- made the mute button click optional and currently enabled.

- made minimize on silent on the Notification Dialog optional and is disabled currently.

- made separate slots for each user actions instead of one for all with 4 parameter cause I think it's easier and more convenient to use this way.

- increased the Notification Bar height a little bit more.

    • -2
    • +2
    /sources/gui/qml/globals/Variables.qml
    • -12
    • +45
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5833: Implementation

- Implementation of the message 64: 'Alarm User Action'

- Cleaned up the VAlarmStatus class.

    • -1
    • +4
    /sources/gui/qml/components/ImageLogoD.qml
    • -38
    • +35
    /sources/view/hd/alarm/VAlarmStatus.cpp
    • -20
    • +17
    /sources/view/hd/alarm/VAlarmStatus.h
DEN-5833: Implementation

- Added User Action message response model.

    • -0
    • +12
    /sources/canbus/MessageDispatcher.cpp
    • -0
    • +1
    /sources/canbus/MessageInterpreter.cpp
DEN-4964: Added DG Versions to Manager page.

    • -11
    • +19
    /sources/gui/qml/pages/ManagerHome.qml
DEN-5516, DEN-5514: Ensure connection to BP-Cuff is re-established after power cycle

    • -39
    • +84
    /sources/bluetooth/BLEScanner.cpp
    • -0
    • +16
    /sources/view/VBluetoothDeviceInfo.cpp
DEN-4964: Added DG Versions to Manager page.

    • -2
    • +19
    /sources/gui/qml/pages/ManagerHome.qml
    • -0
    • +61
    /sources/view/dg/adjustment/VTreatmentAdjustmentDGVersions.h
DEN-5833: Implementation

- Fixed a bouncing bug of the message when sent for the first time with silenced flag on to show the alarm not maximized.

    • -5
    • +11
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5833: Implementation

- Added 3 Alarm buttons

- created Mute Button

- created Up and Down Button (minimize/maximize)

- used FW alarm status flag enum (Alarm_State_Flag_Bit_Positions) instead of the UI version and removed UI one.

Code cleaned up

- modified and cleaned up Notification Dialog and Bar.

- modified Time Text component to be able to show sections with one zero only.

- cleaned up main.qml

    • binary
    /resources/images/audio.png
    • binary
    /resources/images/chevron-down.png
    • binary
    /resources/images/chevron-up.png
    • binary
    /resources/images/mute.png
    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +0
    /sources/gui/qml/components/ModalDialog.qml
    • -0
    • +60
    /sources/gui/qml/components/MuteButton.qml
    • -3
    • +8
    /sources/gui/qml/components/TimeText.qml
    • -0
    • +37
    /sources/gui/qml/components/UpDownButton.qml
    • -12
    • +55
    /sources/gui/qml/globals/Colors.qml
  1. … 7 more files in changeset.
DEN-5754: Implementation

- Added the new MVC for initial UF Volume adjustment messages (79/80).

    • -0
    • +13
    /sources/canbus/MessageDispatcher.cpp
    • -0
    • +2
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +49
    /sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.cpp
    • -0
    • +86
    /sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.h
  1. … 4 more files in changeset.
DEN-5754: Implementation

- reviewed the pre-treatment screens and modified

- added the double range slider for Arterial and Venous

- modified the treatmentBegin(ultrafiltration)

- so many other tweaks.

    • -4
    • +41
    /sources/gui/qml/components/RangeSlider.qml
    • -2
    • +2
    /sources/gui/qml/components/Slider.qml
    • -1
    • +1
    /sources/gui/qml/components/TickMarks.qml
    • -60
    • +77
    /sources/gui/qml/pages/treatment/TreatmentBegin.qml
  1. … 4 more files in changeset.
DEN-4964: Added HDVersions FPGA items to Manager Screen.

    • -1
    • +6
    /sources/gui/qml/pages/ManagerHome.qml
DEN-5754: Implementation

- reformat and commented out the message id debug log.

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
DEN-5514: Checking omron bp service is not null before querying for data, confirmed data populates on treatment monitor page now automatically after a measurement.

Merge branch 'DEN-5830_AlarmDesign' into DEN-5751_Pre-TreatmentUltrafiltration

DEN-5833: Implementation

- Updated the old Alarm model structure to used the notify in the Message Interpreter.

- Updated the Alarm Trigger,Clear,Status to inherit from MAbstract to be able to the above.

- Added a macro to make the request messages handling easier.

    • -172
    • +32
    /sources/canbus/MessageInterpreter.cpp
    • -8
    • +5
    /sources/model/hd/alarm/MAlarmCleared.cpp
    • -12
    • +14
    /sources/model/hd/alarm/MAlarmCleared.h
    • -88
    • +79
    /sources/model/hd/alarm/MAlarmStatusData.cpp
    • -24
    • +31
    /sources/model/hd/alarm/MAlarmStatusData.h
    • -8
    • +5
    /sources/model/hd/alarm/MAlarmTriggered.cpp
    • -12
    • +15
    /sources/model/hd/alarm/MAlarmTriggered.h
Merge branch 'DEN-5736_UI_Heparin_Bolus'

DEN-5744: Code Review 0

- A typo to change the #3 to #4