Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

Fix initial boolean setting for running the opacity animation for the ProgressCircle.qml

    • -2
    • +3
    ./gui/qml/components/ProgressCircle.qml
LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

add in treatment time "treatment complete" text to timer and address CR comments

    • -0
    • +52
    ./model/td/data/treatment/MTreatmentParametersSetPointData.cpp
    • -0
    • +86
    ./model/td/data/treatment/MTreatmentParametersSetPointData.h
  1. … 7 more files in changeset.
LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

fix upper and lower bound range bugs for pressures component

LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

fix lower bound bug where progress would go out of scope

LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

added fixed decimal to UF progress bar value

LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

address cr comments

LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

remove states

    • -1
    • +0
    ./gui/qml/pages/treatment/TreatmentStack.qml
LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

address pr comments

LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

address CR comments

Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

add missing colors

Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

add integration code

    • -0
    • +3
    ./gui/qml/pages/treatment/TreatmentStack.qml
Merge branch 'feature/LDT-853-main-treatment-screen' into staging

    • -0
    • +40
    ./gui/qml/components/ArrowButton.qml
    • -0
    • +22
    ./gui/qml/components/ContentArea.qml
    • -0
    • +39
    ./gui/qml/components/IconButton.qml
    • -0
    • +76
    ./gui/qml/components/LabelValue.qml
    • -3
    • +3
    ./gui/qml/components/ProgressBarEx.qml
    • -3
    • +8
    ./gui/qml/components/ProgressCircle.qml
    • -5
    • +13
    ./gui/qml/components/RangeMarker.qml
    • -30
    • +31
    ./gui/qml/components/TimeText.qml
  1. … 166 more files in changeset.
Merge branch 'feature/LDT-1021-device-settings-sw-wifi' into staging

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

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

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

Bamboo Commit: Updated MAlarmMapping.cpp

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

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-627: Main Treatment Screen - SW - Messaging Broadcast - 05: DEV - Feature Implementation

change UF max to 0.8

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

    • -2
    • +0
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -11
    • +11
    ./model/td/data/MTDVoltageData.h
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

    • -31
    • +41
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -3
    • +3
    ./model/dd/data/MDDGenDialysateData.cpp
  1. … 14 more files in changeset.
LDT-1026: Device Settings - SW - 01 - Wifi - R&I - 05: DEV

Addressing code review commends

    • -3
    • +4
    ./gui/qml/pages/settings/SettingsWiFi.qml
LDT-627: Main Treatment Screen - SW - Messaging Broadcast - 05: DEV - Feature Implementation

- Add Treatment States to Diagnostics Screen

- Add Treatment state message (0x3C)

    • -0
    • +23
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -4
    • +4
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 11 more files in changeset.
LDT-1026: Device Settings - SW - 01 - Wifi - R&I - 05: DEV

remove debug print statement

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

Addressing code review comments

    • -0
    • +1
    ./gui/qml/pages/settings/SettingsBase.qml
    • -34
    • +10
    ./gui/qml/pages/settings/SettingsWiFi.qml
LDT-1026: Device Settings - SW - 01 - Wifi - R&I - 05: DEV

Address code review comments