Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

- implement TD air pump and air bubbles message

- Adjust page indicators in diagnostics screen

- Add TD air pump and bubbles message to diagnostics screen

- fix DD diagnostics conductivity to have fixed float points

-Fix dd dialysate pump model comments

- Add Base of DD valves in doxygen comment TODO LATER

- Address imports for diagnostics QML files

- Generate png files for all SDD items

    • -0
    • +25
    ./td/data/VTDAirPumpData.cpp
    • -0
    • +43
    ./td/data/VTDAirPumpData.h
  1. … 25 more files in changeset.
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

- implement TD air pump and air bubbles message

- Adjust page indicators in diagnostics screen

- Add TD air pump and bubbles message to diagnostics screen

- fix DD diagnostics conductivity to have fixed float points

-Fix dd dialysate pump model comments

- Add Base of DD valves in doxygen comment TODO LATER

    • -0
    • +25
    ./td/data/VTDAirBubbleData.cpp
    • -0
    • +43
    ./td/data/VTDAirBubbleData.h
  1. … 4 more files in changeset.
LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

Address CR comments

  1. … 1 more file in changeset.
LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

Address CR comments

  1. … 4 more files in changeset.
LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

Update alarm dialog list with new (not imeplemened) scheme of how the alarms.conf file will be

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

-Implement DD blood Leak message

    • -0
    • +24
    ./dd/data/VDDBloodLeakData.cpp
    • -0
    • +42
    ./dd/data/VDDBloodLeakData.h
  1. … 9 more files in changeset.
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

- Move DG Valves to DD and rename to DD

- Implement the following DD messages:

Dialysate Pump, Concentrate pump

- Cleanup Saloine bolus enum in VTDTretamentSattesData.cpp

- Minor comment cleanup in MDDTemperatures

    • -0
    • +49
    ./dd/data/VDDConcentratePumpData.cpp
    • -0
    • +66
    ./dd/data/VDDConcentratePumpData.h
    • -0
    • +44
    ./dd/data/VDDDialysatePumpData.cpp
    • -0
    • +61
    ./dd/data/VDDDialysatePumpData.h
    • -0
    • +54
    ./dd/data/VDDValvesStatesData.cpp
    • -0
    • +71
    ./dd/data/VDDValvesStatesData.h
  1. … 18 more files in changeset.
LDT-1785: Update SW (UI)

- Fixed the issue with the heparin slider explained in the LDT-1753.

- Fixed the issue found in one of the merges that missed some qml import.

- Fixed the issue with the VTDTreatmentStates mismatch missing SalineMax Enum in common repo.

- Removed unused def, max, res properties of the heparin stop time from the VTreatmentRanges.

  1. … 3 more files in changeset.
***** TEMPORARILY Fixed the build issue on develop *****

Removes the 'SALINE_BOLUS_STATE_MAX_DELIVERED' state as it is no longer needed.

*****

This must be overwritten later by a feature branch or staging that has the fix

*****

LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

-Add SDD for diagnostics screen

- Fix typo in DD Gen dialysate to be 'SpentPressure' instead of 'SpendPressure'

- Move Leahi implementation of DG to now DD folder

- implement DD diagnostics including the following:

Heaters

Pressures

Temperatures

- The following DD message ID's have been updated:

Pressure

Temperature

Heaters

Blood Leak

Dialysate Pump

Concentrate Pump

Valves

    • -0
    • +41
    ./dd/data/VDDHeatersData.cpp
    • -0
    • +59
    ./dd/data/VDDHeatersData.h
    • -0
    • +26
    ./dd/data/VDDLevelData.cpp
    • -0
    • +44
    ./dd/data/VDDLevelData.h
    • -0
    • +38
    ./dd/data/VDDPressuresData.cpp
    • -0
    • +56
    ./dd/data/VDDPressuresData.h
    • -0
    • +39
    ./dd/data/VDDTemperaturesData.cpp
    • -0
    • +56
    ./dd/data/VDDTemperaturesData.h
  1. … 34 more files in changeset.
LDT-1738 (UI) Main Tx Screen - Ultrafiltration Details - R&I - 05: DEV - Feature Implementation

Fix copy/paste unicode error

LDT-1738 (UI) Main Tx Screen - Ultrafiltration Details - R&I - 05: DEV - Feature Implementation

Revert min/max changes

  1. … 10 more files in changeset.
LDT-1738 (UI) Main Tx Screen - Ultrafiltration Details - R&I - 05: DEV - Feature Implementation

Removed obsolete ‘minimum' and ‘maximum' properties in VTreatmentUltrafiltrationData.h and update proeprty binding using those

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

- Add DD level sensor message

- Add diagnostics QML patch

- Add DD diagnostics base implementation

    • -0
    • +26
    ./dg/data/VDDLevelData.cpp
    • -0
    • +44
    ./dg/data/VDDLevelData.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. … 13 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
    • +25
    ./valarmstatushelper.cpp
    • -0
    • +16
    ./valarmstatushelper.h
    • -0
    • +16
    ./view_autogen/VAckMessageThatRequiresAck.cpp
    • -0
    • +34
    ./view_autogen/VAckMessageThatRequiresAck.h
    • -0
    • +17
    ./view_autogen/VAlarmCleared.cpp
    • -0
    • +35
    ./view_autogen/VAlarmCleared.h
    • -0
    • +17
    ./view_autogen/VAlarmConditionCleared.cpp
    • -0
    • +35
    ./view_autogen/VAlarmConditionCleared.h
    • -0
    • +21
    ./view_autogen/VAlarmStatus.cpp
    • -0
    • +38
    ./view_autogen/VAlarmStatus.h
    • -0
    • +24
    ./view_autogen/VAlarmTriggered.cpp
    • -0
    • +42
    ./view_autogen/VAlarmTriggered.h
    • -0
    • +17
    ./view_autogen/VDDAlarmInfo.cpp
  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
    • +28
    ./td/data/treatment/VTreatmentParametersSetPointData.cpp
    • -0
    • +45
    ./td/data/treatment/VTreatmentParametersSetPointData.h
  1. … 17 more files in changeset.
LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

address cr comments

  1. … 3 more files in changeset.
LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

address pr comments

  1. … 2 more files in changeset.
LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

address CR comments

  1. … 4 more files in changeset.
Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

add integration code

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

change UF max to 0.8

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

    • -9
    • +9
    ./td/data/treatment/VTreatmentBloodFlow.h
  1. … 23 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

    • -81
    • +0
    ./settings/VAdjustmentAlarmVolume.cpp
    • -67
    • +0
    ./settings/VAdjustmentAlarmVolume.h
    • -112
    • +0
    ./settings/VAdjustmentVersions.cpp
    • -102
    • +0
    ./settings/VAdjustmentVersions.h
  1. … 47 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

    • -28
    • +0
    ./dg/data/VDGLoadCellReadingsData.cpp
    • -46
    • +0
    ./dg/data/VDGLoadCellReadingsData.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)

    • -0
    • +228
    ./td/data/treatment/VTDTreatmentStatesData.cpp
    • -0
    • +129
    ./td/data/treatment/VTDTreatmentStatesData.h
  1. … 20 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

  1. … 15 more files in changeset.
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
    ./dd/data/VDDConductivityData.cpp
    • -0
    • +33
    ./dd/data/VDDGenDialysateData.cpp
  1. … 3 more files in changeset.