Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'feature/LDT-4767-enhancement-Isolated-UF' into develop

  1. … 3 more files in changeset.
Merge remote-tracking branch 'origin/staging' into feature/LDT-5246-bicarb-Low

  1. … 1 more file in changeset.
LDT-5235 HDF - SW - 01 - HDF - Messaging & Models - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

fix minor buigs

  1. … 2 more files in changeset.
LDT-5082 SW Misc & Enhc - SW - 01 - Miscellaneous - Feature Complete - R&I - 08: DEV - Dialin Implementation

addressed cr comments

    • -0
    • +38
    ./settings/VRoWaterMode.cpp
    • -0
    • +42
    ./settings/VRoWaterMode.h
  1. … 15 more files in changeset.
LDT-4964 Service - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

address CR commetns

  1. … 2 more files in changeset.
LDT-5109: SW Misc & Enhc - SW - 01 - Miscellaneous - Leahi Qt6 & UB24 & Squish9.2.2 - rebuild/test - R&I - 05: DEV - Feature Implementation

- Updated C++ files so they automatically compile for Qt5 vs Qt6 based on Qt kit used for building.

- Updated QML so that Qt5 is the default state of the files and Qt6 changes are marked and commented out.

  1. … 28 more files in changeset.
LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

added syringe to td diagnostics

    • -0
    • +33
    ./td/data/VTDSyringePumpData.cpp
    • -0
    • +51
    ./td/data/VTDSyringePumpData.h
  1. … 14 more files in changeset.
LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

added model and view classes

    • -0
    • +16
    ./td/data/treatment/VTreatmentDryBicartDisconnect.cpp
    • -0
    • +34
    ./td/data/treatment/VTreatmentDryBicartDisconnect.h
  1. … 14 more files in changeset.
LDT-5334 SW Misc & Enhc - SW - 01 - Pre-Tx - Usability Support - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

removed secondary id

  1. … 8 more files in changeset.
LDT-5334 SW Misc & Enhc - SW - 01 - Pre-Tx - Usability Support - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

add pre tx states model update

    • -0
    • +96
    ./td/data/pretreatment/VPreTreatmentStatesData.cpp
    • -0
    • +89
    ./td/data/pretreatment/VPreTreatmentStatesData.h
  1. … 10 more files in changeset.
Merge remote-tracking branch 'origin/staging' into feature/LDT-4919-SW-Integration-Rinseback

  1. … 1 more file in changeset.
LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

  1. … 3 more files in changeset.
LDT-5235 HDF - SW - 01 - HDF - Messaging & Models - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

HDF implementatio ncompeolte

    • -1
    • +1
    ./td/data/treatment/VTreatmentHDFData.cpp
    • -1
    • +1
    ./td/data/treatment/VTreatmentHDFData.h
  1. … 5 more files in changeset.
LDT-5235 HDF - SW - 01 - HDF - Messaging & Models - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

c++ models for 7 messages created

    • -0
    • +35
    ./td/adjustment/treatment/VTreatmentAdjustmentAutoSub.cpp
    • -0
    • +39
    ./td/adjustment/treatment/VTreatmentAdjustmentAutoSub.h
    • -0
    • +39
    ./td/adjustment/treatment/VTreatmentAdjustmentHDF.cpp
    • -0
    • +50
    ./td/adjustment/treatment/VTreatmentAdjustmentHDF.h
    • -0
    • +39
    ./td/adjustment/treatment/VTreatmentAdjustmentHDFState.h
    • -0
    • +20
    ./td/data/treatment/VTreatmentHDFData.cpp
    • -0
    • +38
    ./td/data/treatment/VTreatmentHDFData.h
  1. … 18 more files in changeset.
LDT-4772 NON-FEATURE: SW Misc & Enhc - SW - 01 - Isolated UF - R&I - 05: DEV - Feature Implementation

update borad cast

  1. … 4 more files in changeset.
LDT-4964 Service - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

fix model column names

  1. … 1 more file in changeset.
LDT-5079 SW Misc & Enhc - SW - 01 - Miscellaneous - Feature Complete - R&I - 05: DEV - Feature Implementation

fix pre tx common

LDT-4772 NON-FEATURE: SW Misc & Enhc - SW - 01 - Isolated UF - R&I - 05: DEV - Feature Implementation

add command messages

  1. … 16 more files in changeset.
LDT-4772 NON-FEATURE: SW Misc & Enhc - SW - 01 - Isolated UF - R&I - 05: DEV - Feature Implementation

updated allowed actions for iuso uf

  1. … 6 more files in changeset.
LDT-4984 SW Misc & Enhc - SW - 01 - SW Integration - Pre-Tx - R&I - 05: DEV - Feature Implementation

fix pre tx common

LDT-4964 Service - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

added conductivity

    • -0
    • +12
    ./settings/VCalibrationSettings.cpp
  1. … 2 more files in changeset.
LDT-4964 Service - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

add remianing models

    • -52
    • +86
    ./settings/VCalibrationSettings.cpp
  1. … 2 more files in changeset.
LDT-4964 Service - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

Front end for calibration is completed and working

    • -68
    • +112
    ./settings/VCalibrationSettings.cpp
    • -68
    • +19
    ./settings/VCalibrationSettings.h
  1. … 4 more files in changeset.
LDT-4964 Service - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

    • -0
    • +85
    ./settings/VCalibrationSettings.cpp
    • -0
    • +120
    ./settings/VCalibrationSettings.h
  1. … 6 more files in changeset.
LDT-5109: SW Misc & Enhc - SW - 01 - Miscellaneous - Leahi Qt6 & UB24 & Squish9.2.2 - rebuild/test - R&I - 05: DEV - Feature Implementation

- Updated for Qt 6.12 port.

  1. … 24 more files in changeset.
LDT-4984 SW Misc & Enhc - SW - 01 - SW Integration - Pre-Tx - R&I - 05: DEV - Feature Implementation

update initiate tx message to include modality

  1. … 6 more files in changeset.
LDT-4772 NON-FEATURE: SW Misc & Enhc - SW - 01 - Isolated UF - R&I - 05: DEV - Feature Implementation

add main tx iso uf items

  1. … 4 more files in changeset.
LDT-4924 SW Misc & Enhc - SW - 01 - SW Integration - Rinseback - R&I - 05: DEV - Feature Implementation

  1. … 10 more files in changeset.
LDT-4984 SW Misc & Enhc - SW - 01 - SW Integration - Pre-Tx - R&I - 05: DEV - Feature Implementation

add message ID

  1. … 4 more files in changeset.
LDT-5079 SW Misc & Enhc - SW - 01 - Miscellaneous - Feature Complete - R&I - 05: DEV - Feature Implementation

update files for ro watering

    • -0
    • +44
    ./settings/VAdjustRoWaterMode.cpp
    • -0
    • +44
    ./settings/VAdjustRoWaterMode.h
  1. … 16 more files in changeset.