leahi-application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'feature/LDT-1021-device-settings-sw-wifi' into staging

Merge branch 'LDT-627-Main-Treatment-Screen-SW-Messaging-Broadcast' into staging

LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

Update lock popup timeout from 3 sec to 750 ms

LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

Update qml components, fix drop shadow, add homescreen background

    • -4
    • +12
    /sources/gui/qml/pages/MainHome.qml
LDT-627: Main Treatment Screen - SW - Messaging Broadcast - 05: DEV - Feature Implementation

Adjust Message ID's per Dialin message changes (0x52-0x54)

Main Treatment Screen - SW - Components & Screens - 03: SDD - Design Diagram

Code cleanup adn remove hard coded values for main treatment screen

    • -7
    • +5
    /sources/gui/qml/components/Circle.qml
    • -10
    • +10
    /sources/gui/qml/components/ContentArea.qml
    • -24
    • +28
    /sources/gui/qml/components/LabelValue.qml
    • -8
    • +9
    /sources/gui/qml/components/ProgressBarEx.qml
    • -5
    • +7
    /sources/gui/qml/components/RangeMarker.qml
    • -31
    • +30
    /sources/gui/qml/components/TimeText.qml
    • -0
    • +2
    /sources/gui/qml/globals/Variables.qml
Bamboo Commit: Updated MAlarmMapping.cpp

    • -6
    • +27
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'LDT-627-Main-Treatment-Screen-SW-Messaging-Broadcast' into staging

Main Treatment Screen - SW - Components & Screens - 03: SDD - Design Diagram

Fix UF progress bar to match design

    • -0
    • +49
    /sources/gui/qml/components/Fader.qml
    • -4
    • +4
    /sources/gui/qml/components/ProgressBarEx.qml
    • -49
    • +0
    /sources/gui/qml/compounds/Fader.qml
Main Treatment Screen - SW - Components & Screens - 03: SDD - Design Diagram

graphviz SDD completed. Adding to project

    • -0
    • +863
    /SDDs/Main_Treatment/FinalDiagram.dot
    • -0
    • +55
    /SDDs/Main_Treatment/TreatmentParameters-BloodFlow.dot
    • -0
    • +45
    /SDDs/Main_Treatment/TreatmentParameters-DialysateCond.dot
    • -0
    • +56
    /SDDs/Main_Treatment/TreatmentParameters-DialysateFlow.dot
    • -0
    • +55
    /SDDs/Main_Treatment/TreatmentParameters-DialysateTemp.dot
    • -0
    • +52
    /SDDs/Main_Treatment/TreatmentParameters.dot
    • -0
    • +197
    /SDDs/Main_Treatment/TreatmentPressures.dot
    • -0
    • +71
    /SDDs/Main_Treatment/TreatmentSaline.dot
    • -0
    • +62
    /SDDs/Main_Treatment/TreatmentTime.dot
    • -0
    • +70
    /SDDs/Main_Treatment/TreatmentVitals.dot
    • binary
    /SDDs/Main_Treatment/images/ArterialLowerMarker.png
  1. … 129 more files in changeset.
LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

Update qml imports

    • -1
    • +1
    /sources/gui/qml/components/ProgressBarEx.qml
LDT-1026: Device Settings - SW - 01 - Wifi - R&I - 05: DEV

update per review comment - remove trimmed() loop

LDT-1026: Device Settings - SW - 01 - Wifi - R&I - 05: DEV

fix build error

LDT-1026: Device Settings - SW - 01 - Wifi - R&I - 05: DEV

Updates to address CR comments

LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

Update component on vitals section

LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

Update alignedmen ton components and add animations and drop shadow effects to match design

    • -1
    • +1
    /sources/gui/qml/components/Circle.qml
    • -1
    • +2
    /sources/gui/qml/dialogs/AutoHideInfo.qml
    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
LDT-627: Main Treatment Screen - SW - Messaging Broadcast - 05: DEV - Feature Implementation

change UF max to 0.8

LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

Updated UI and fined tuned componenets to match design

    • -1
    • +1
    /sources/gui/qml/components/Circle.qml
    • -0
    • +2
    /sources/gui/qml/components/LabelValue.qml
    • -0
    • +2
    /sources/gui/qml/components/ProgressBar.qml
    • -0
    • +1
    /sources/gui/qml/components/RangeBar.qml
    • -2
    • +5
    /sources/gui/qml/components/RangeMarker.qml
    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
    • -10
    • +10
    /sources/gui/qml/pages/treatment/TreatmentHome.qml
LDT-627: Main Treatment Screen - SW - Messaging Broadcast - 05: DEV - Feature Implementation

- Remove H6-rotor hall state from switches in diagnostics

- adjust formatting for DD versions response, gen dialysate and td voltages

    • -3
    • +3
    /sources/model/dd/data/MDDGenDialysateData.h
    • -11
    • +11
    /sources/model/td/data/MTDVoltageData.h
LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

Finished timer component implementation

    • -0
    • +47
    /sources/gui/qml/components/Circle.qml
    • -0
    • +2
    /sources/gui/qml/components/TimeText.qml
    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

Components for treatment parameters sections complete

    • -1
    • +3
    /sources/gui/qml/components/LabelValue.qml
    • -0
    • +1
    /sources/gui/qml/globals/Variables.qml
LDT-1026: Device Settings - SW - 01 - Wifi - R&I - 05: DEV

Fixed error message to be consistant with the others

LDT-1026: Device Settings - SW - 01 - Wifi - R&I - 05: DEV

address review comments

LDT-627: Main Treatment Screen - SW - Messaging Broadcast - 05: DEV - Feature Implementation

- Fix bloodflow decimal comment

- Adjust diagnostics bloodflow, tx states messages/format. Fix diagnostics formatting throughout

- Fix DD messaging formatting

- Fix Gen Dialysate Data View payload and naming

- Fix TD messaging formatting

- Fix TD battery message payload formatting

    • -3
    • +3
    /sources/model/dd/data/MDDGenDialysateData.h
    • -2
    • +2
    /sources/model/td/data/MTDAirTrapData.h
    • -2
    • +2
    /sources/model/td/data/MTDBatteryData.cpp
    • -2
    • +2
    /sources/model/td/data/MTDBatteryData.h
    • -2
    • +2
    /sources/model/td/data/MTDEjectorData.h
    • -4
    • +4
    /sources/model/td/data/MTDSwitchesData.h
  1. … 14 more files in changeset.
LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

Ultra-filtration section completed and add initial components for treatment parameter section

    • -4
    • +33
    /sources/gui/qml/components/LabelValue.qml
    • -2
    • +4
    /sources/gui/qml/components/ProgressBar.qml
    • -1
    • +11
    /sources/gui/qml/components/ProgressBarEx.qml
    • -0
    • +1
    /sources/gui/qml/components/RangeMarker.qml
    • -1
    • +3
    /sources/gui/qml/globals/Variables.qml
    • -69
    • +52
    /sources/gui/qml/pages/treatment/TreatmentHome.qml
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

- Make Change for Diagnostic multiple screens

- Add DD Messages definition (messageglobals/messageinterpreter/guiglobals)

    • -3
    • +3
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +52
    /sources/gui/qml/dialogs/diagnostics/DiagnosticsBase.qml
    • -0
    • +246
    /sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
    • -0
    • +61
    /sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml
    • -0
    • +58
    /sources/gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml
    • -0
    • +245
    /sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

Update pressures section range bar to match design

    • -0
    • +1
    /sources/gui/qml/components/RangeBar.qml
    • -3
    • +5
    /sources/gui/qml/components/RangeMarker.qml
    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

fix qml error from missing imports

LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

Pressures section completed

    • -1
    • +2
    /sources/gui/qml/components/ProgressBar.qml
    • -0
    • +8
    /sources/gui/qml/components/ProgressRect.qml
LDT-958: Main Treatment Screen - SW - 01 - Auto Message Generation - Integration - R&I - 05: DEV - Feature Implementation

- Removed model and view files

- Tested the auto generated code and compiled the code

    • -41
    • +1
    /sources/bluetooth/BluetoothInterface.cpp
    • -7
    • +1
    /sources/bluetooth/BluetoothInterface.h
    • -608
    • +617
    /sources/canbus/MessageDispatcher.cpp
  1. … 47 more files in changeset.