Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.
added checks for this and the one in VSettings

added checks for this and the one in VSettings

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.