leahi-application

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

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.

    • -4
    • +4
    /sources/canbus/MessageInterpreter.cpp
Merge remote-tracking branch 'origin/LDT-627-Main-Treatment-Screen-SW-Messaging-Broadcast' into LDT-627-Main-Treatment-Screen-SW-Messaging-Broadcast

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

    • -8
    • +11
    /sources/model/hd/data/MTDAirTrapData.cpp
    • -4
    • +7
    /sources/model/hd/data/MTDAirTrapData.h
    • -1
    • +2
    /sources/view/hd/data/VTDAirTrapData.cpp
    • -1
    • +2
    /sources/view/hd/data/VTDAirTrapData.h
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.

    • -28
    • +40
    /etc/reports/cppcheck/cppcheck.err
    • -253
    • +351
    /etc/reports/cppcheck/cppcheck.log
    • -2
    • +2
    /sources/gui/qml/components/MainMenu.qml
    • -7
    • +7
    /sources/model/hd/alarm/MAlarmActiveList.h
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmCleared.h
    • -1
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
  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

    • -2
    • +4
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +100
    /sources/model/dg/data/MDDConductivityData.h
    • -0
    • +106
    /sources/model/dg/data/MDDGenDialysateData.h
  1. … 34 more files in changeset.
Main Treatment Screen - SW - Messaging Broadcast - 05: DEV - Feature Implementation

- Add all main treatment messages: Blood flow, Ultrafiltration, Saline, DD Cond, Gen Dialysate, pressure

- Remove bloodpump model to use bloodflow instead

- Fix diagnostic bug for bloodflow to correct labeling order

-

    • -2
    • +4
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +67
    /sources/model/dg/data/MDDConductivityData.cpp
    • -0
    • +100
    /sources/model/dg/data/MDDConductivityData.h
    • -0
    • +72
    /sources/model/dg/data/MDDGenDialysateData.cpp
    • -0
    • +106
    /sources/model/dg/data/MDDGenDialysateData.h
  1. … 34 more files in changeset.
Merge branch 'feature/LDT-450-TreatmentParametersCreateRx' into staging

    • -18
    • +19
    /sources/canbus/MessageInterpreter.cpp
    • -36
    • +38
    /sources/view/VTreatmentCreate.cpp
    • -47
    • +47
    /sources/view/VTreatmentCreate.h
Merge branch 'LDT-261-MainTreatmentScreen-SW-Diagnostics-Screen' into staging

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

    • -18
    • +19
    /sources/canbus/MessageInterpreter.cpp
    • -36
    • +38
    /sources/view/VTreatmentCreate.cpp
    • -47
    • +47
    /sources/view/VTreatmentCreate.h
Merge branch 'LDT-261-MainTreatmentScreen-SW-Diagnostics-Screen' into develop

Merge branch 'staging' into develop

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

LDT-455 Treatment Parameters (Create Rx) - SW - 05: DEV - Feature Implementation

- updated the settings device registration to match the td,dd.

- updated the regex for the patient ID to match the extra characters accepted in the Whitney.

- fix the unmatched version messages enums with the changes on the diagnosticsScreen branch

    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
Merge branch 'feature/LDT-450-TreatmentParametersCreateRx' into develop

    • -18
    • +19
    /sources/canbus/MessageInterpreter.cpp
    • -36
    • +38
    /sources/view/VTreatmentCreate.cpp
    • -47
    • +47
    /sources/view/VTreatmentCreate.h
Merge remote-tracking branch 'origin/LDT-261-MainTreatmentScreen-SW-Diagnostics-Screen' into develop

LDT-455 Treatment Parameters (Create Rx) - SW - 05: DEV - Feature Implementation

- Updated the version message length

- Improved the unhandled messages function performance.

- Updated the Alarm Messages IDs

- Removed the orange Prescription profiel ID with number from the Treatment Confirm Screen table title .

- Added gradient to the MainMenu component.

- Set the main menu height (notificationHeight) higher to the 100.

- Figured that the keyboard may cover the AlarmBar so changged the Keyboard style to remove the bottom margin and made the extra black ribbon not visible when alarmbar is visible to uncover the alarmbar.

- Created a temporary StatusBar/HeaderBar to have a base to adjust other screens.

- Adjusted the Patient ID screen for the new screen size ena keyboard loaction.

- Updated the Virtual Keyboard style to adjust for the new screen size and the AlarmBar.

- Updated the TreatmentRanges for Leahi to read from the settings//configurations.

- Added separate date and time properties in the VDateTime to temporarily display on the StatusBar/HeaderBar.

    • -16
    • +17
    /sources/canbus/MessageInterpreter.cpp
    • -4
    • +4
    /sources/gui/qml/components/MainMenu.qml
    • -1
    • +1
    /sources/gui/qml/components/StepIndicator.qml
    • -2
    • +2
    /sources/gui/qml/globals/Variables.qml
    • -1
    • +2
    /sources/gui/qml/pages/TreatmentFlowBase.qml
  1. … 9 more files in changeset.
Main Treatment Screen - SW - Diagnostics Screen - 05: DEV - Feature Implementation

- Fix typos from HD/DG to TD/DD

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +1
    /sources/model/hd/data/MTDTemperatureData.h
    • -1
    • +1
    /sources/view/hd/data/VTDAirTrapData.cpp
Main Treatment Screen - SW - Diagnostics Screen - 05: DEV - Feature Implementation

- Fix typos of HD to TD

- Change BOOL to U32 in airtrap model

- Add comments to not implemented FW MSGs

- Add DD Versions and serial to diagnostics screen

    • -2
    • +2
    /sources/canbus/MessageInterpreter.cpp
  1. … 17 more files in changeset.
Main Treatment Screen - SW - Diagnostics Screen - 05: DEV - Feature Implementation

- bug fixes for versions, ejector, and valve modules

- update blood pump for td message list changes

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +3
    /sources/model/hd/data/MTDBloodPumpData.cpp
    • -4
    • +7
    /sources/model/hd/data/MTDBloodPumpData.h
  1. … 15 more files in changeset.
Main Treatment Screen - SW - Diagnostics Screen - 05: DEV - Feature Implementation

- Complet new models for TD air trap, voltage, BP, Valves, battery, switches, ejector, and temp

- Complete base diagnostics screen items

- rename and make adjustments for leahi TD versions from HD versions

    • -218
    • +225
    /etc/reports/cppcheck/cppcheck.log
    • -4
    • +11
    /sources/canbus/MessageInterpreter.cpp
  1. … 45 more files in changeset.