diff --git a/qgcresources.qrc b/qgcresources.qrc
index 4e2602e2cf0d7aa8e6778e3a7761c3b31d3b7609..4abea6ec73f8af85a1942d12a4ae42a10abfa42b 100644
--- a/qgcresources.qrc
+++ b/qgcresources.qrc
@@ -139,6 +139,7 @@
src/ui/toolbar/Images/Gears.svg
src/ui/toolbar/Images/Analyze.svg
src/ui/toolbar/Images/Gps.svg
+ src/ui/toolbar/Images/RTK.svg
src/ui/toolbar/Images/Hamburger.svg
src/ui/toolbar/Images/Megaphone.svg
src/ui/toolbar/Images/PaperPlane.svg
diff --git a/src/QmlControls/QGroundControlQmlGlobal.cc b/src/QmlControls/QGroundControlQmlGlobal.cc
index 3fea67ba479c03ac52585823661a0731e309ace6..b4875992b1bbec8f7b60f19afab7db022c3e07d1 100644
--- a/src/QmlControls/QGroundControlQmlGlobal.cc
+++ b/src/QmlControls/QGroundControlQmlGlobal.cc
@@ -252,7 +252,7 @@ void QGroundControlQmlGlobal::_onGPSDisconnect()
void QGroundControlQmlGlobal::_GPSSurveyInStatus(float duration, float accuracyMM, bool valid, bool active)
{
_gpsRtkFactGroup.currentDuration()->setRawValue(duration);
- _gpsRtkFactGroup.currentAccuracy()->setRawValue(accuracyMM);
+ _gpsRtkFactGroup.currentAccuracy()->setRawValue(accuracyMM/1000.0);
_gpsRtkFactGroup.valid()->setRawValue(valid);
_gpsRtkFactGroup.active()->setRawValue(active);
}
diff --git a/src/Vehicle/GPSRTKFact.json b/src/Vehicle/GPSRTKFact.json
index 306781373dc8a74789a64e9932943cedfd50df3b..12b26709ad1870cde0ebc54f95300cd07fc71e69 100644
--- a/src/Vehicle/GPSRTKFact.json
+++ b/src/Vehicle/GPSRTKFact.json
@@ -8,8 +8,8 @@
"name": "currentAccuracy",
"shortDescription": "Current Accuracy",
"type": "double",
- "decimalPlaces": 0,
- "units": "mm"
+ "decimalPlaces": 1,
+ "units": "m"
},
{
"name": "currentDuration",
diff --git a/src/ui/toolbar/GPSRTKIndicator.qml b/src/ui/toolbar/GPSRTKIndicator.qml
index 5f8dfc765f0d7454e9d7da1ca0d9cb3b2421c9a7..faf5f827cb78a4cf31943046b995ca1ee6f2b35c 100644
--- a/src/ui/toolbar/GPSRTKIndicator.qml
+++ b/src/ui/toolbar/GPSRTKIndicator.qml
@@ -71,7 +71,7 @@ Item {
text: QGroundControl.gpsRtk.valid.value ? qsTr("Accuracy:") : qsTr("Current Accuracy:")
}
QGCLabel {
- text: (QGroundControl.gpsRtk.currentAccuracy.value/1000).toFixed(1) + ' m'
+ text: QGroundControl.gpsRtk.currentAccuracy.valueString + " " + QGroundControl.appSettingsDistanceUnitsString
}
QGCLabel { text: qsTr("Satellites:") }
QGCLabel { text: QGroundControl.gpsRtk.numSatellites.value }
@@ -91,7 +91,7 @@ Item {
width: height
anchors.top: parent.top
anchors.bottom: parent.bottom
- source: "/qmlimages/Gps.svg"
+ source: "/qmlimages/RTK.svg"
fillMode: Image.PreserveAspectFit
sourceSize.height: height
opacity: 1
@@ -109,12 +109,6 @@ Item {
color: qgcPal.buttonText
text: QGroundControl.gpsRtk.numSatellites.value
}
-
- QGCLabel {
- id: numSatValue
- color: qgcPal.buttonText
- text: qsTr("RTK")
- }
}
MouseArea {
diff --git a/src/ui/toolbar/Images/RTK.svg b/src/ui/toolbar/Images/RTK.svg
new file mode 100644
index 0000000000000000000000000000000000000000..7cd88967ff92352a0c0f20eee72fa0a6948508b4
--- /dev/null
+++ b/src/ui/toolbar/Images/RTK.svg
@@ -0,0 +1,80 @@
+
+
+