Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
add changes from dry demo branch

    • -1
    • +4
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 1 more file in changeset.
update recirc to temporary break

    • -1
    • +4
    ./gui/qml/pages/treatment/TreatmentStack.qml
added more usability updates

reserved service mode ids

LDT-5163 SW Misc & Enhc - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

added all request for the records

    • -5
    • +44
    ./view/settings/VCalibrationSettings.cpp
LDT-5163 SW Misc & Enhc - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

all resposne models added to Vcalibration

    • -5
    • +340
    ./view/settings/VCalibrationSettings.cpp
    • -0
    • +36
    ./view/settings/VCalibrationSettings.h
LDT-5163 SW Misc & Enhc - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

added response model classes

    • -0
    • +47
    ./model/dd/adjustment/settings/MAdjustDDCalibrationAccelerometerSensorRecordResponse.cpp
    • -0
    • +80
    ./model/dd/adjustment/settings/MAdjustDDCalibrationAccelerometerSensorRecordResponse.h
    • -0
    • +41
    ./model/dd/adjustment/settings/MAdjustDDCalibrationBloodLeakSensorRecordResponse.cpp
    • -0
    • +74
    ./model/dd/adjustment/settings/MAdjustDDCalibrationBloodLeakSensorRecordResponse.h
    • -0
    • +77
    ./model/dd/adjustment/settings/MAdjustDDCalibrationConductivitySensorRecordResponse.cpp
    • -0
    • +110
    ./model/dd/adjustment/settings/MAdjustDDCalibrationConductivitySensorRecordResponse.h
    • -0
    • +48
    ./model/dd/adjustment/settings/MDDCalibrationAccelerometerSensorRecordResponse.cpp
    • -0
    • +80
    ./model/dd/adjustment/settings/MDDCalibrationAccelerometerSensorRecordResponse.h
    • -0
    • +42
    ./model/dd/adjustment/settings/MDDCalibrationBloodLeakSensorRecordResponse.cpp
    • -0
    • +78
    ./model/dd/adjustment/settings/MDDCalibrationConductivitySensorRecordResponse.cpp
    • -0
    • +110
    ./model/dd/adjustment/settings/MDDCalibrationConductivitySensorRecordResponse.h
  1. … 1 more file in changeset.
Resolved conflict with the remote

    • -0
    • +1
    ./gui/qml/dialogs/NotificationDialog.qml
  1. … 2 more files in changeset.
push dialog priority

    • -0
    • +1
    ./gui/qml/dialogs/NotificationDialog.qml
LDT-5163 SW Misc & Enhc - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

add fix to alarm dialog

    • -0
    • +1
    ./gui/qml/dialogs/NotificationDialog.qml
    • -0
    • +47
    ./model/dd/adjustment/settings/MAdjustDDCalibrationBicarbConcentratesRecordResponse.cpp
    • -0
    • +80
    ./model/dd/adjustment/settings/MAdjustDDCalibrationBicarbConcentratesRecordResponse.h
    • -0
    • +48
    ./model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.cpp
    • -0
    • +80
    ./model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.h
Merge branch 'feature/LDT-5331-pre-tx-usability-requests' into dry-demo-usability

Merge branch 'staging' into dry-demo-usability

  1. … 2 more files in changeset.
LDT-5163 SW Misc & Enhc - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

add acic conentrates response model

  1. … 1 more file in changeset.
Merge branch 'staging' into feature/LDT-5331-pre-tx-usability-requests

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

address cr comments

Headerbar popup update

    • -0
    • +5
    ./gui/qml/components/HeaderBarPopup.qml
Adding AlarmMapping for now for the develop.

    • -11
    • +11
    ./model/hd/alarm/MAlarmMapping.cpp
  1. … 2 more files in changeset.
LDT-5163 SW Misc & Enhc - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

    • -0
    • +47
    ./model/dd/adjustment/settings/MAdjustDDCalibrationAcidConcentratesRecordResponse.cpp
    • -0
    • +80
    ./model/dd/adjustment/settings/MAdjustDDCalibrationAcidConcentratesRecordResponse.h
    • -0
    • +47
    ./model/dd/adjustment/settings/MAdjustDDCalibrationConcentratePumpRecordResponse.cpp
    • -0
    • +80
    ./model/dd/adjustment/settings/MAdjustDDCalibrationConcentratePumpRecordResponse.h
    • -0
    • +41
    ./model/dd/adjustment/settings/MAdjustDDCalibrationD12DialysatePumpRecordResponse.cpp
    • -0
    • +74
    ./model/dd/adjustment/settings/MAdjustDDCalibrationD12DialysatePumpRecordResponse.h
    • -0
    • +44
    ./model/dd/adjustment/settings/MAdjustDDCalibrationD48DialysatePumpRecordResponse.cpp
    • -0
    • +77
    ./model/dd/adjustment/settings/MAdjustDDCalibrationD48DialysatePumpRecordResponse.h
    • -0
    • +48
    ./model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.cpp
    • -0
    • +80
    ./model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.h
    • -0
    • +48
    ./model/dd/adjustment/settings/MDDCalibrationConcentratePumpRecordResponse.cpp
    • -0
    • +42
    ./model/dd/adjustment/settings/MDDCalibrationD12DialysatePumpRecordResponse.cpp
  1. … 5 more files in changeset.
Merge branch 'feature/LDT-5414-prime' into staging

  1. … 1 more file in changeset.
Merge branch 'feature/LDT-5445-end-of-treatment' into staging

fix qml warning

Merge branch 'staging' into feature/LDT-5158-integration-calibration

    • -10
    • +10
    ./model/hd/alarm/MAlarmMapping.cpp
  1. … 1 more file in changeset.
LDT-5163 SW Misc & Enhc - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

    • -16
    • +15
    ./gui/qml/components/HeaderBar.qml
    • -0
    • +47
    ./model/dd/adjustment/settings/MAdjustDDCalibrationTemperatureRecordResponse.cpp
    • -0
    • +80
    ./model/dd/adjustment/settings/MAdjustDDCalibrationTemperatureRecordResponse.h
LDT-5163 SW Misc & Enhc - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

added all request models

    • -2
    • +23
    ./view/settings/VCalibrationSettings.cpp
    • -2
    • +20
    ./view/settings/VCalibrationSettings.h
add bug fixes and updated menu

LDT-5448 End of Treatment - SW - 01- Notification - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

add dry dem orequests

LDT-5163 SW Misc & Enhc - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

add dry demo fixes

LDT-5163 SW Misc & Enhc - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

push more messaging for calibration

LDT-5163 SW Misc & Enhc - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

    • -20
    • +20
    ./view/settings/VCalibrationSettings.cpp
    • -4
    • +0
    ./view/settings/VCalibrationSettings.h
LDT-5448 End of Treatment - SW - 01- Notification - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

    • -1
    • +6
    ./gui/qml/components/HeaderBarPopup.qml
    • -5
    • +12
    ./gui/qml/dialogs/EndTreatmentDialog.qml