Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated MAlarmMapping.cpp

    • -2
    • +102
    ./model/hd/alarm/MAlarmMapping.cpp
LDT-4964 Service - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

address CR commetns

    • -1
    • +0
    ./gui/qml/dialogs/CalibrationDialog.qml
    • -1
    • +0
    ./view/settings/VCalibrationSettings.h
Merge remote-tracking branch 'origin/staging' into feature/LDT-4919-SW-Integration-Rinseback

LDT-4984 SW Misc & Enhc - SW - 01 - SW Integration - Pre-Tx - R&I - 05: DEV - Feature Implementation

address cr comments

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

fix model column names

    • -1
    • +1
    ./gui/qml/pages/settings/SettingsStack.qml
    • -7
    • +8
    ./view/settings/VCalibrationSettings.cpp
LDT-4984 SW Misc & Enhc - SW - 01 - SW Integration - Pre-Tx - R&I - 05: DEV - Feature Implementation

fix pre tx common

LDT-4924 SW Misc & Enhc - SW - 01 - SW Integration - Rinseback - R&I - 05: DEV - Feature Implementation

updated per dry demo

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

added conductivity

    • -5
    • +10
    ./gui/qml/dialogs/CalibrationDialog.qml
    • -0
    • +12
    ./view/settings/VCalibrationSettings.cpp
    • -1
    • +2
    ./view/settings/VCalibrationSettings.h
LDT-4964 Service - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

add remianing models

    • -4
    • +18
    ./gui/qml/dialogs/CalibrationDialog.qml
    • -52
    • +86
    ./view/settings/VCalibrationSettings.cpp
    • -3
    • +2
    ./view/settings/VCalibrationSettings.h
LDT-4964 Service - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

Front end for calibration is completed and working

    • -0
    • +215
    ./gui/qml/dialogs/CalibrationDialog.qml
    • -68
    • +112
    ./view/settings/VCalibrationSettings.cpp
    • -68
    • +19
    ./view/settings/VCalibrationSettings.h
  1. … 1 more file in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -0
    • +138
    ./gui/qml/pages/settings/SettingsCalibrationSettings.qml
    • -0
    • +9
    ./gui/qml/pages/settings/SettingsStack.qml
    • -0
    • +85
    ./view/settings/VCalibrationSettings.cpp
    • -0
    • +120
    ./view/settings/VCalibrationSettings.h
  1. … 2 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

LDT-4924 SW Misc & Enhc - SW - 01 - SW Integration - Rinseback - R&I - 05: DEV - Feature Implementation

cr comments

LDT-4924 SW Misc & Enhc - SW - 01 - SW Integration - Rinseback - R&I - 05: DEV - Feature Implementation

    • -0
    • +3
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 3 more files in changeset.
LDT-4984 SW Misc & Enhc - SW - 01 - SW Integration - Pre-Tx - R&I - 05: DEV - Feature Implementation

added patienbt conneciton confirmation message

LDT-4984 SW Misc & Enhc - SW - 01 - SW Integration - Pre-Tx - R&I - 05: DEV - Feature Implementation

add message ID

Merge branch 'feature/LDT-4852-Remove-Old-Messaging-Logic' into staging

    • -0
    • +1
    ./gui/qml/pages/settings/SettingsStack.qml
LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

update to set variable on completed script

LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

fix placement of property in device view

LDT-4857 SW Misc & Enhc - SW - 01 - Remove Old Messaging Logic [PowerOff].sh - R&I - 05: DEV - Feature Implementation

PUSH REVERT

    • -0
    • +1
    ./gui/qml/pages/settings/SettingsStack.qml
LDT-4857 SW Misc & Enhc - SW - 01 - Remove Old Messaging Logic [PowerOff].sh - R&I - 05: DEV - Feature Implementation

revert changes in message dispather

LDT-4857 SW Misc & Enhc - SW - 01 - Remove Old Messaging Logic [PowerOff].sh - R&I - 05: DEV - Feature Implementation

push revert

LDT-4857 SW Misc & Enhc - SW - 01 - Remove Old Messaging Logic [PowerOff].sh - R&I - 05: DEV - Feature Implementation

revert

Merge remote-tracking branch 'origin/staging' into feature/LDT-4852-Remove-Old-Messaging-Logic

    • -15
    • +15
    ./gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
    • -60
    • +44
    ./gui/qml/dialogs/diagnostics/DiagnosticsFP.qml
    • -12
    • +12
    ./gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
LDT-4857 SW Misc & Enhc - SW - 01 - Remove Old Messaging Logic [PowerOff].sh - R&I - 05: DEV - Feature Implementation

revert changes that broke checkin

    • -1
    • +1
    ./gui/qml/pages/settings/SettingsStack.qml
Merge remote-tracking branch 'origin/staging' into feature/LDT-4810-device-settings-enhancement

    • -10
    • +5
    ./gui/qml/pages/settings/SettingsStack.qml
Merge branch 'feature/LDT-4787-enhancement-power-off' into staging

LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

address cr comments

    • -2
    • +2
    ./gui/qml/pages/settings/SettingsWiFi.qml
LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

address cr comments

    • -0
    • +50
    ./gui/qml/dialogs/ConfirmPasswordDialog.qml
    • -2
    • +2
    ./gui/qml/pages/settings/SettingsExportLogs.qml
    • -41
    • +14
    ./gui/qml/pages/settings/SettingsWiFi.qml
  1. … 1 more file in changeset.