leahi-application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-1026: Device Settings - SW - 01 - Wifi - R&I - 05: DEV - Feature Implementation

- Fix status messages for wifi connect/ disconnect

Fix status messages for wifi connect/ disconnect

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

    • -0
    • +29
    /sources/view/dd/data/VDDConductivityData.cpp
    • -0
    • +33
    /sources/view/dd/data/VDDGenDialysateData.cpp
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

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

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

- Update to clear SSID when wifi scan is starting

Update to clear SSID when wifi scan is starting

Merge branch 'feature/LDT-713-general-alarm-requirements-sw' into staging

Merge branch 'feature/LDT-713-general-alarm-requirements-sw' into develop

Recan wifi list after completing disconnect or connect scripts

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

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

    • -0
    • +71
    /sources/device/DeviceController.cpp
    • -1
    • +1
    /sources/gui/qml/components/StackItem.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
    • +58
    /sources/model/dd/data/MDDConductivityData.cpp
    • -0
    • +91
    /sources/model/dd/data/MDDConductivityData.h
    • -0
    • +69
    /sources/model/dd/data/MDDGenDialysateData.cpp
    • -0
    • +103
    /sources/model/dd/data/MDDGenDialysateData.h
    • -91
    • +0
    /sources/model/dg/data/MDDConductivityData.h
  1. … 123 more files in changeset.
Merge branch 'feature/LDT-450-TreatmentParametersCreateRx' into develop

revert gui globals

Merge remote-tracking branch 'origin/staging' into Wifi_Settings_Page

revert QML reload code

    • -1
    • +1
    /sources/gui/qml/components/MainMenu.qml
Add logic in c++ for showing the connected WIfis data on QML

    • -1
    • +58
    /sources/device/DeviceController.cpp
Revert and remove wifiinterface and vnetworkmodel files

    • -480
    • +0
    /sources/view/settings/VNetworkModel.cpp
    • -131
    • +0
    /sources/view/settings/VNetworkModel.h
    • -1009
    • +0
    /sources/wifi/WifiInterface.cpp
LDT-627: Main Treatment Screen - SW - Messaging Broadcast - 05: DEV - Feature Implementation - Adjust DD implementation for Conductivity and Gen dialysate mode data due to payload changes

    • -16
    • +7
    /sources/model/dg/data/MDDConductivityData.h
    • -18
    • +15
    /sources/model/dg/data/MDDGenDialysateData.h
    • -4
    • +1
    /sources/view/dg/data/VDDConductivityData.h
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'feature/LDT-450-TreatmentParametersCreateRx' into staging

Completed most of QML and c++ for wifi settings. Need to finish shell scripts

    • -1
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -0
    • +480
    /sources/view/settings/VNetworkModel.cpp
    • -0
    • +131
    /sources/view/settings/VNetworkModel.h
    • -0
    • +1009
    /sources/wifi/WifiInterface.cpp
    • -0
    • +162
    /sources/wifi/WifiInterface.h
LDT-718: General Alarm Requirements - SW - 05: DEV - Feature Implementation

Addressing code review comment(s):

- http://devapps.diality.us:8060/cru/LEAHI-APPLICATION-LDT-713-1#CFR-67864

LDT-718: General Alarm Requirements - SW - 05: DEV - Feature Implementation

Addressing code review comment(s):

- http://devapps.diality.us:8060/cru/LEAHI-APPLICATION-LDT-713-1#c22189

    • -2
    • +2
    /sources/model/hd/alarm/MAlarmCleared.h
fix back button location in settings screen

fixed name of resource file to link properly when reloading. removed explicit qml import dependency to the .qrc file and use the QML engine import path for the QML reloading

    • -1
    • +1
    /sources/gui/qml/components/MainMenu.qml
Implemented QML reload feature by pressing the F5 key when the run argument '-r' is set