Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'feature/LDT-1209-main-treatment-screen' into staging

  1. … 7 more files in changeset.
Merge branch 'LDT-907-Main-Treatment-Screen-SW-Diagnostics-Screen-DD' into staging

  1. … 10 more files in changeset.
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

- Address Diagnostic QML object names

- Remove all unimplemented DD instances, leaving only DDlevel message

- MModel alignment

  1. … 5 more files in changeset.
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

- Add DD level sensor message

- Add diagnostics QML patch

- Add DD diagnostics base implementation

    • -0
    • +47
    ./dg/data/MDDLevelData.cpp
    • -0
    • +84
    ./dg/data/MDDLevelData.h
  1. … 12 more files in changeset.
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

    • -0
    • +52
    ./td/data/treatment/MTreatmentParametersSetPointData.cpp
    • -0
    • +86
    ./td/data/treatment/MTreatmentParametersSetPointData.h
  1. … 17 more files in changeset.
Merge branch 'feature/LDT-1021-device-settings-sw-wifi' into staging

  1. … 1 more file in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

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

  1. … 1 more file in changeset.
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

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

Addressing code review commends

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

- Add Treatment States to Diagnostics Screen

- Add Treatment state message (0x3C)

    • -117
    • +0
    ./hd/data/treatment/MTreatmentStatesData.h
    • -0
    • +73
    ./td/data/treatment/MTreatmentStatesData.cpp
    • -0
    • +117
    ./td/data/treatment/MTreatmentStatesData.h
  1. … 22 more files in changeset.
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

  1. … 14 more files in changeset.
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

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

- Adjust model structs to match FW naming if applicable

    • -15
    • +15
    ./dd/data/MDDConductivityData.cpp
    • -27
    • +27
    ./dd/data/MDDGenDialysateData.cpp
  1. … 6 more files in changeset.
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
    • +77
    ./dd/adjustment/settings/MAdjustDDSerialNumberResponse.h
    • -0
    • +65
    ./dd/adjustment/settings/MAdjustDDVersionsResponse.cpp
    • -0
    • +104
    ./dd/adjustment/settings/MAdjustDDVersionsResponse.h
    • -0
    • +58
    ./dd/data/MDDConductivityData.cpp
    • -0
    • +91
    ./dd/data/MDDConductivityData.h
    • -0
    • +69
    ./dd/data/MDDGenDialysateData.cpp
    • -0
    • +103
    ./dd/data/MDDGenDialysateData.h
  1. … 123 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

  1. … 4 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#c22189

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

  1. … 11 more files in changeset.
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. … 12 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

  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

-

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

  1. … 13 more files in changeset.
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.

  1. … 22 more files in changeset.
Main Treatment Screen - SW - Diagnostics Screen - 05: DEV - Feature Implementation

- Fix typos from HD/DG to TD/DD

  1. … 4 more files in changeset.
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

    • -0
    • +77
    ./dg/adjustment/settings/MAdjustDDSerialNumberResponse.h
    • -0
    • +65
    ./dg/adjustment/settings/MAdjustDDVersionsResponse.cpp
    • -0
    • +104
    ./dg/adjustment/settings/MAdjustDDVersionsResponse.h
  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

    • -0
    • +77
    ./hd/adjustment/settings/MAdjustTDSerialNumberResponse.h
  1. … 21 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

    • -77
    • +0
    ./hd/adjustment/settings/MAdjustHDVersionsRequest.h
    • -0
    • +31
    ./hd/adjustment/settings/MAdjustTDVersionsRequest.cpp
    • -0
    • +77
    ./hd/adjustment/settings/MAdjustTDVersionsRequest.h
    • -0
    • +65
    ./hd/adjustment/settings/MAdjustTDVersionsResponse.cpp
    • -0
    • +104
    ./hd/adjustment/settings/MAdjustTDVersionsResponse.h
    • -0
    • +61
    ./hd/data/MTDAirTrapData.cpp
    • -0
    • +94
    ./hd/data/MTDAirTrapData.h
    • -0
    • +49
    ./hd/data/MTDBatteryData.cpp
    • -0
    • +82
    ./hd/data/MTDBatteryData.h
    • -0
    • +67
    ./hd/data/MTDBloodPumpData.cpp
  1. … 45 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

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

- Not entirely complete.

- The Components are not modified yet.

    • -5
    • +0
    ./dg/adjustment/settings/MDuetRoWaterDG.h
  1. … 43 more files in changeset.
LDT-280 Main Treatment Screen - SW - FW Initial integration - 05: DEV - Feature Implementation

- Adjusted the code with the recent changes in the TD-Defs.h that has removed some states.

    • -2
    • +2
    ./hd/data/treatment/MTreatmentStatesData.h
  1. … 8 more files in changeset.