Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.
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

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

Merge branch 'feature/LDT-450-TreatmentParametersCreateRx' into staging

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

    • -29
    • +25
    ./gui/qml/pages/settings/SettingsWiFi.qml
    • -0
    • +480
    ./view/settings/VNetworkModel.cpp
    • -0
    • +131
    ./view/settings/VNetworkModel.h
    • -0
    • +1009
    ./wifi/WifiInterface.cpp
    • -0
    • +162
    ./wifi/WifiInterface.h
  1. … 3 more files in changeset.
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

fix back button location in settings screen

    • -2
    • +3
    ./gui/qml/pages/settings/SettingsBase.qml
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
    • +2
    ./gui/qml/components/NotificationBar.qml
  1. … 1 more file in changeset.
Implemented QML reload feature by pressing the F5 key when the run argument '-r' is set

  1. … 2 more files in changeset.
LDT-455 Treatment Parameters (Create Rx) - SW - 05: DEV - Feature Implementation

- Fixed the issue with the validation message length.

- Fixed the forgotten requirement for the Heparin Stop time less than the Treatment Duration.

- Fixed the issue with the CreateRx branch build issue on the version enums/ddSerial being different than the rest.

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

- Fix diagnostic font size and weight

- Adjust affected treatment QML files per Tx message implementation

- Add Air trap additional payload

    • -0
    • +1
    ./gui/qml/components/DebugDataColumn.qml
    • -5
    • +9
    ./gui/qml/dialogs/DiagnosticsDialog.qml
LDT-718: General Alarm Requirements - SW - 05: DEV - Feature Implementation

- Updated the Alarm Messages for the Leahi Project.

- Used the init configuration location for the name/secured as well, since we don't have the secured partition yet.

- Added the rejection id next to the title for now for testing.

  1. … 6 more files in changeset.
Main Treatment Screen - SW - Messaging Broadcast - 05: DEV - Feature Implementation

- Implement TX messages: blood flow, conductivity, saline, UF, tx time, tx set point data, gen Dialysate, pressure

- remove blood pump duplicate and replace with blood flow

    • -11
    • +11
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -0
    • +67
    ./model/dg/data/MDDConductivityData.cpp
    • -0
    • +100
    ./model/dg/data/MDDConductivityData.h
    • -0
    • +72
    ./model/dg/data/MDDGenDialysateData.cpp
    • -0
    • +106
    ./model/dg/data/MDDGenDialysateData.h
    • -82
    • +0
    ./model/dg/data/MDGConductivityData.cpp
    • -115
    • +0
    ./model/dg/data/MDGConductivityData.h
    • -70
    • +0
    ./model/hd/data/MTDBloodPumpData.cpp
  1. … 34 more files in changeset.