Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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-958: main-treatment-screen-sw-01-auto-message-generation-integration

- Removed the bluetooth and cloudsync modules

  1. … 15 more files in changeset.
LDT-958: Main Treatment Screen - SW - 01 - Auto Message Generation - Integration - R&I

- Modified the application to be able to compile with the auto generated code

- Initial commit of the auto generated code

    • -0
    • +570
    ./MModelAutoGen.h
    • -0
    • +25
    ./model_autogen/MAckMessageThatRequiresAck.cpp
    • -0
    • +64
    ./model_autogen/MAckMessageThatRequiresAck.h
    • -0
    • +32
    ./model_autogen/MAlarmCleared.cpp
    • -0
    • +67
    ./model_autogen/MAlarmCleared.h
    • -0
    • +32
    ./model_autogen/MAlarmConditionCleared.cpp
    • -0
    • +67
    ./model_autogen/MAlarmConditionCleared.h
    • -0
    • +41
    ./model_autogen/MAlarmStatusData.cpp
    • -0
    • +77
    ./model_autogen/MAlarmStatusData.h
    • -0
    • +53
    ./model_autogen/MAlarmTriggered.cpp
    • -0
    • +88
    ./model_autogen/MAlarmTriggered.h
    • -0
    • +32
    ./model_autogen/MDDAlarmInfoData.cpp
    • -0
    • +67
    ./model_autogen/MDDAlarmInfoData.h
    • -0
    • +53
    ./model_autogen/MDDBalChamberData.cpp
    • -0
    • +88
    ./model_autogen/MDDBalChamberData.h
  1. … 349 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-958: Main Treatment Screen - SW - 01 - Auto Message Generation - Integration - R&I - 05: DEV - Feature Implementation

- Removed model and view files

- Tested the auto generated code and compiled the code

  1. … 56 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-958: Main Treatment Screen - SW - 01 - Auto Message Generation - Integration - R&I - 05: DEV - Feature Implementation

- Removed the residual Denali files

- Removed the Leahi files that will be auto generated

    • -163
    • +0
    ./dg/adjustment/settings/MDuetRoWaterDG.h
  1. … 359 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.
Merge branch 'feature/LDT-1021-device-settings-sw-wifi' into develop

  1. … 1 more file 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.
WIfi connection and disconnectiong functioning. Need to fix minor bugs in response message and rescan once completed

  1. … 14 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.
Add logic in c++ for showing the connected WIfis data on QML

  1. … 13 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.
Bamboo Commit: Updated MAlarmMapping.cpp

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

  1. … 12 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.