application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-5833: Implementation

- Added a MACRO for convenience of empty payload messages handling.

    • -1
    • +9
    /sources/canbus/MessageInterpreter.cpp
DEN-5833: Implementation

- Fixed the bug that alarm ID zero which is the clear the alarm indication wasn't updating the properties, so caused to alarm_ID changed notification signal not to raise and GUI wasn't getting updated.

    • -6
    • +6
    /sources/view/hd/alarm/VAlarmStatus.cpp
Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into demo_test

DEN-5754: Implementation

- Fixed a bug caused by a typo

DEN-5515, DEN-5516: Moved bluetooth setup before UI application start in run.sh, fixed start treatment messaging

Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into demo_test

    • -0
    • +13
    /sources/canbus/MessageDispatcher.cpp
    • -0
    • +3
    /sources/canbus/MessageInterpreter.cpp
Merge DEN-4860_BLE into 2020_EOY_DEMO

    • -7
    • +17
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +6
    /sources/gui/qml/globals/Variables.qml
  1. … 10 more files in changeset.
Merge master into DEN-4860_BLE

    • -0
    • +28
    /sources/canbus/MessageDispatcher.cpp
    • -1
    • +15
    /sources/canbus/MessageInterpreter.cpp
    • -11
    • +48
    /sources/gui/qml/globals/Variables.qml
    • -1
    • +0
    /sources/gui/qml/pages/SettingsHome.qml
  1. … 9 more files in changeset.
DEN-5515, DEN-5516: Disabled verbose bluetooth debugging

DEN-5515, DEN-5516: Added bluetooth setup to run.sh

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

DEN-5754: Implementation

- linked the pre-treatment ultrafiltration adjustment with the in-treatment ultrafiltration section and the adjustment flow.

- added the rejection reason text to the pTx uf adj screen.

    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
    • -10
    • +14
    /sources/gui/qml/pages/treatment/TreatmentBegin.qml
DEN-5515, DEN-5516: Setup in-treatment bp/hr measurement alerts

- Replaced some instances of qDebug with LOG_DEBUG

- Docstring fixes, cleanup

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