From 009689a9d3e8d781bb2441c49f58cef3745412b0 Mon Sep 17 00:00:00 2001
From: Gus Grubba <gus@auterion.com>
Date: Wed, 10 Jul 2019 12:46:31 -0400
Subject: [PATCH 1/3] Better describe the behavior when resetting parameters.
---
src/QmlControls/ParameterEditor.qml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/QmlControls/ParameterEditor.qml b/src/QmlControls/ParameterEditor.qml
index dfeffa6..6e2de86 100644
--- a/src/QmlControls/ParameterEditor.qml
+++ b/src/QmlControls/ParameterEditor.qml
@@ -337,7 +337,7 @@ Item {
QGCLabel {
width: parent.width
wrapMode: Text.WordWrap
- text: qsTr("Select Reset to reset all parameters to the vehicle's configuration defaults.")
+ text: qsTr("Select Reset to reset all parameters to the vehicle's configuration defaults.\n\nNote that this will also completely reset UAVCAN nodes.")
}
}
}
From 4b8684916e9334ee40400e002b9b352ea73397e2 Mon Sep 17 00:00:00 2001
From: Gus Grubba <gus@auterion.com>
Date: Tue, 16 Jul 2019 08:30:25 -0400
Subject: [PATCH 2/3] Flip offending command
---
src/QmlControls/ParameterEditor.qml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/QmlControls/ParameterEditor.qml b/src/QmlControls/ParameterEditor.qml
index 6e2de86..4848196 100644
--- a/src/QmlControls/ParameterEditor.qml
+++ b/src/QmlControls/ParameterEditor.qml
@@ -322,7 +322,7 @@ Item {
QGCLabel {
width: parent.width
wrapMode: Text.WordWrap
- text: qsTr("Select Reset to reset all parameters to their defaults.")
+ text: qsTr("Select Reset to reset all parameters to their defaults.\n\nNote that this will also completely reset UAVCAN nodes.")
}
}
}
@@ -337,7 +337,7 @@ Item {
QGCLabel {
width: parent.width
wrapMode: Text.WordWrap
- text: qsTr("Select Reset to reset all parameters to the vehicle's configuration defaults.\n\nNote that this will also completely reset UAVCAN nodes.")
+ text: qsTr("Select Reset to reset all parameters to the vehicle's configuration defaults.")
}
}
}
From 86d0cdc1d06d5929b9747fd9b2d1b96a7e6e0933 Mon Sep 17 00:00:00 2001
From: Gus Grubba <gus@auterion.com>
Date: Thu, 18 Jul 2019 16:59:55 -0400
Subject: [PATCH 3/3] Updating the message
---
src/QmlControls/ParameterEditor.qml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/QmlControls/ParameterEditor.qml b/src/QmlControls/ParameterEditor.qml
index 4848196..c9f7d61 100644
--- a/src/QmlControls/ParameterEditor.qml
+++ b/src/QmlControls/ParameterEditor.qml
@@ -322,7 +322,7 @@ Item {
QGCLabel {
width: parent.width
wrapMode: Text.WordWrap
- text: qsTr("Select Reset to reset all parameters to their defaults.\n\nNote that this will also completely reset UAVCAN nodes.")
+ text: qsTr("Select Reset to reset all parameters to their defaults.\n\nNote that this will also completely reset everything, including UAVCAN nodes.")
}
}
}