Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'LDT-627-Main-Treatment-Screen-SW-Messaging-Broadcast' into develop

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

Address code review comments

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

- WIfi connection and disconnectiong functioning. Need to fix minor bugs in response message and rescan once completed

- Cherry pick of the commit from Nicholas Ramirez on e7c552d59935eb2a63f3dcee0a5161d19f5c7ac5

    • -3
    • +2
    ./gui/qml/pages/settings/SettingsBase.qml
    • -25
    • +6
    ./gui/qml/pages/settings/SettingsWiFi.qml
LDT-1026: Device Settings - SW - 01 - Wifi - R&I - 05: DEV - Feature Implementation

- Add logic in c++ for showing the connected WIfis data on QML

- Cherry pick of the commit from Nicholas Ramirez on 6f480a8d61165dd24cf8da7e9e637f89147303c3

    • -24
    • +18
    ./gui/qml/pages/settings/SettingsWiFi.qml
LDT-1024 Device Settings - SW - 01 - Wifi - R&I - 03: SDD - Design Diagram - plantuml

Update plantuml file

  1. … 1 more file in changeset.
LDT-1026: Device Settings - SW - 01 - Wifi - R&I - 05: DEV - Feature Implementation

- added headerbar UI fix

    • -2
    • +2
    ./gui/qml/pages/settings/SettingsBase.qml
LDT - 1026 added headerbar UI fix

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

- Add SDD for Main TX screen

- Slight adjustments to diagnostics QML for rotor hall state (H6)

    • -2
    • +2
    ./gui/qml/dialogs/DiagnosticsDialog.qml
  1. … 1 more file in changeset.
LDT-1030 Device Settings - SW - 01 - Wifi - R&I - 09: SDD - Functions Documentation

LDT-1030 Device Settings - SW - 01 - Wifi - R&I - 09: SDD - Functions Documentation

Merge branch 'Wifi_Settings_Page' into feature/LDT-1026-device-settings-wifi

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

- Adjust model structs to match FW naming if applicable

    • -26
    • +26
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -15
    • +15
    ./model/dd/data/MDDConductivityData.cpp
    • -15
    • +15
    ./model/dd/data/MDDConductivityData.h
    • -27
    • +27
    ./model/dd/data/MDDGenDialysateData.cpp
    • -21
    • +21
    ./model/td/data/MTDAirTrapData.cpp
    • -20
    • +20
    ./model/td/data/MTDAirTrapData.h
  1. … 5 more files in changeset.
LDT-1026: Device Settings - SW - 01 - Wifi - R&I - 05: DEV - Feature Implementation

- Fix status messages for wifi connect/ disconnect

    • -7
    • +1
    ./gui/qml/pages/settings/SettingsWiFi.qml
Fix status messages for wifi connect/ disconnect

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

- Move Views DD conductivity and Gen dialysate to DD folder

- Align text per CR comments

- Adjust settings information tab for TD and DD serial/Versions

    • -11
    • +11
    ./gui/qml/pages/settings/SettingsInformation.qml
    • -0
    • +29
    ./view/dd/data/VDDConductivityData.cpp
    • -0
    • +33
    ./view/dd/data/VDDGenDialysateData.cpp
    • -29
    • +0
    ./view/dg/data/VDDConductivityData.cpp
    • -33
    • +0
    ./view/dg/data/VDDGenDialysateData.cpp
  1. … 1 more file in changeset.
LDT-1026: Device Settings - SW - 01 - Wifi - R&I - 05: DEV - Feature Implementation

- code clean up

code clean up

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

- Added Recan wifi after wifi connect / disconnect for the rest of the UI to update accordingly

    • -0
    • +7
    ./gui/qml/pages/settings/SettingsWiFi.qml
Added Recan wifi after wifi connect / disconnect for the rest of the UI to update accordingigly

    • -0
    • +7
    ./gui/qml/pages/settings/SettingsWiFi.qml
LDT-1026: Device Settings - SW - 01 - Wifi - R&I - 05: DEV - Feature Implementation

- Update to clear SSID when wifi scan is starting

    • -1
    • +12
    ./gui/qml/pages/settings/SettingsWiFi.qml
Update to clear SSID when wifi scan is starting

    • -1
    • +12
    ./gui/qml/pages/settings/SettingsWiFi.qml
Recan wifi list after completing disconnect or connect scripts

    • -4
    • +2
    ./gui/qml/pages/settings/SettingsWiFi.qml
LDT-1026: Device Settings - SW - 01 - Wifi - R&I - 05: DEV - Feature Implementation

- Recan wifi list after completing disconnect or connect scripts

- Cherry pick of the commit from Nicholas Ramirez on 5c4bcd852bc3026166a409e3fae4a08dbbe98bd0

    • -4
    • +2
    ./gui/qml/pages/settings/SettingsWiFi.qml
WIfi connection and disconnectiong functioning. Need to fix minor bugs in response message and rescan once completed

    • -2
    • +0
    ./gui/qml/pages/settings/SettingsBase.qml
    • -25
    • +6
    ./gui/qml/pages/settings/SettingsWiFi.qml
LDT-627: Main Treatment Screen - SW - Messaging Broadcast - 05: DEV - Feature Implementation

- Move all Leahized files to TD/DD directory structure

- Remove Valves redundant file

- Small adjustment to gen dialysate name from conductivity to gendial

    • -0
    • +104
    ./model/dd/adjustment/settings/MAdjustDDVersionsResponse.h
    • -0
    • +58
    ./model/dd/data/MDDConductivityData.cpp
    • -0
    • +91
    ./model/dd/data/MDDConductivityData.h
    • -0
    • +69
    ./model/dd/data/MDDGenDialysateData.cpp
    • -0
    • +103
    ./model/dd/data/MDDGenDialysateData.h
    • -58
    • +0
    ./model/dg/data/MDDConductivityData.cpp
    • -91
    • +0
    ./model/dg/data/MDDConductivityData.h
    • -69
    • +0
    ./model/dg/data/MDDGenDialysateData.cpp
  1. … 123 more files in changeset.
Merge branch 'feature/LDT-450-TreatmentParametersCreateRx' into develop

revert gui globals

revert QML reload code

    • -2
    • +1
    ./gui/qml/components/NotificationBar.qml
  1. … 2 more files in changeset.
Add logic in c++ for showing the connected WIfis data on QML

    • -27
    • +25
    ./gui/qml/pages/settings/SettingsWiFi.qml
Revert and remove wifiinterface and vnetworkmodel files

    • -480
    • +0
    ./view/settings/VNetworkModel.cpp
  1. … 2 more files in changeset.