leahi-application

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
    • +2
    /sources/gui/qml/components/Circle.qml
    • -1
    • +0
    /sources/gui/qml/components/IconButton.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

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +2
    /sources/gui/qml/globals/Variables.qml
  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-1207 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 03: SDD - Design Diagram - plantuml

Updated SDD diagram and removed obsolete components

    • -102
    • +81
    /SDDs/Main_Treatment/FinalDiagram.dot
    • -846
    • +0
    /SDDs/Main_Treatment/finalDiagram.dot
    • binary
    /SDDs/Main_Treatment/images/IsolatedUfButton.png
LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

address cr comments

    • -2
    • +5
    /sources/gui/qml/components/RangeBar.qml
    • -1
    • +0
    /sources/view/hd/data/VTreatmentRanges.cpp
LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

remove states

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

    • -8
    • +9
    /sources/view/hd/data/VTreatmentRanges.cpp
    • -2
    • +2
    /sources/view/hd/data/VTreatmentRanges.h
LDT-1207 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 03: SDD - Design Diagram - plantuml

add final SDD diagram

    • -0
    • +846
    /SDDs/Main_Treatment/finalDiagram.dot
Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 03: SDD - Design Diagram

Updated SDD diagram

    • -1
    • +1
    /SDDs/Main_Treatment/TreatmentSaline.dot
    • -2
    • +2
    /SDDs/Main_Treatment/TreatmentTime.dot
    • binary
    /SDDs/Main_Treatment/images/UfProgressBar.png
    • binary
    /SDDs/Main_Treatment/images/UfProgressMarker.png
  1. … 4 more files in changeset.
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
    • +1
    /sources/gui/qml/components/ModalDialog.qml
    • -1
    • +2
    /sources/gui/qml/globals/Variables.qml
Merge branch 'feature/LDT-853-main-treatment-screen' into staging

    • -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. … 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

    • -6
    • +27
    /sources/model/hd/alarm/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

    • -3
    • +3
    /sources/model/dd/data/MDDGenDialysateData.h
    • -11
    • +11
    /sources/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

    • -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-1026: Device Settings - SW - 01 - Wifi - R&I - 05: DEV

Addressing code review commends

    • -18
    • +18
    /sources/device/DeviceController.cpp
LDT-627: Main Treatment Screen - SW - Messaging Broadcast - 05: DEV - Feature Implementation

- Add Treatment States to Diagnostics Screen

- Add Treatment state message (0x3C)

  1. … 11 more files in changeset.