Skip to content

Q
qgroundcontrol
Commit 3e2699ee authored by Lorenz Meier's avatar Lorenz Meier
Browse files
Options

PX4: Fix sensor config for mag

parent d7d4c331
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 24 deletions
src/AutoPilotPlugins/PX4/SensorsComponent.qml
View file @ 3e2699ee
...@@ -427,13 +427,13 @@ QGCView { ...@@ -427,13 +427,13 @@ QGCView {
calInProgressText: controller.orientationCalDownSideRotate ? qsTr("Rotate") : qsTr("Hold Still") calInProgressText: controller.orientationCalDownSideRotate ? qsTr("Rotate") : qsTr("Hold Still")
imageSource: controller.orientationCalDownSideRotate ? "qrc:///qmlimages/VehicleDownRotate.png" : "qrc:///qmlimages/VehicleDown.png" imageSource: controller.orientationCalDownSideRotate ? "qrc:///qmlimages/VehicleDownRotate.png" : "qrc:///qmlimages/VehicleDown.png"
} }
// VehicleRotationCal { VehicleRotationCal {
// visible: controller.orientationCalUpsideDownSideVisible visible: controller.orientationCalUpsideDownSideVisible
// calValid: controller.orientationCalUpsideDownSideDone calValid: controller.orientationCalUpsideDownSideDone
// calInProgress: controller.orientationCalUpsideDownSideInProgress calInProgress: controller.orientationCalUpsideDownSideInProgress
// calInProgressText: controller.orientationCalUpsideDownSideRotate ? qsTr("Rotate") : qsTr("Hold Still") calInProgressText: controller.orientationCalUpsideDownSideRotate ? qsTr("Rotate") : qsTr("Hold Still")
// imageSource: controller.orientationCalUpsideDownSideRotate ? "qrc:///qmlimages/VehicleUpsideDownRotate.png" : "qrc:///qmlimages/VehicleUpsideDown.png" imageSource: controller.orientationCalUpsideDownSideRotate ? "qrc:///qmlimages/VehicleUpsideDownRotate.png" : "qrc:///qmlimages/VehicleUpsideDown.png"
// } }
VehicleRotationCal { VehicleRotationCal {
visible: controller.orientationCalNoseDownSideVisible visible: controller.orientationCalNoseDownSideVisible
calValid: controller.orientationCalNoseDownSideDone calValid: controller.orientationCalNoseDownSideDone
...@@ -441,13 +441,13 @@ QGCView { ...@@ -441,13 +441,13 @@ QGCView {
calInProgressText: controller.orientationCalNoseDownSideRotate ? qsTr("Rotate") : qsTr("Hold Still") calInProgressText: controller.orientationCalNoseDownSideRotate ? qsTr("Rotate") : qsTr("Hold Still")
imageSource: controller.orientationCalNoseDownSideRotate ? "qrc:///qmlimages/VehicleNoseDownRotate.png" : "qrc:///qmlimages/VehicleNoseDown.png" imageSource: controller.orientationCalNoseDownSideRotate ? "qrc:///qmlimages/VehicleNoseDownRotate.png" : "qrc:///qmlimages/VehicleNoseDown.png"
} }
// VehicleRotationCal { VehicleRotationCal {
// visible: controller.orientationCalTailDownSideVisible visible: controller.orientationCalTailDownSideVisible
// calValid: controller.orientationCalTailDownSideDone calValid: controller.orientationCalTailDownSideDone
// calInProgress: controller.orientationCalTailDownSideInProgress calInProgress: controller.orientationCalTailDownSideInProgress
// calInProgressText: controller.orientationCalTailDownSideRotate ? qsTr("Rotate") : qsTr("Hold Still") calInProgressText: controller.orientationCalTailDownSideRotate ? qsTr("Rotate") : qsTr("Hold Still")
// imageSource: controller.orientationCalTailDownSideRotate ? "qrc:///qmlimages/VehicleTailDownRotate.png" : "qrc:///qmlimages/VehicleTailDown.png" imageSource: controller.orientationCalTailDownSideRotate ? "qrc:///qmlimages/VehicleTailDownRotate.png" : "qrc:///qmlimages/VehicleTailDown.png"
// } }
VehicleRotationCal { VehicleRotationCal {
visible: controller.orientationCalLeftSideVisible visible: controller.orientationCalLeftSideVisible
calValid: controller.orientationCalLeftSideDone calValid: controller.orientationCalLeftSideDone
...@@ -455,13 +455,13 @@ QGCView { ...@@ -455,13 +455,13 @@ QGCView {
calInProgressText: controller.orientationCalLeftSideRotate ? qsTr("Rotate") : qsTr("Hold Still") calInProgressText: controller.orientationCalLeftSideRotate ? qsTr("Rotate") : qsTr("Hold Still")
imageSource: controller.orientationCalLeftSideRotate ? "qrc:///qmlimages/VehicleLeftRotate.png" : "qrc:///qmlimages/VehicleLeft.png" imageSource: controller.orientationCalLeftSideRotate ? "qrc:///qmlimages/VehicleLeftRotate.png" : "qrc:///qmlimages/VehicleLeft.png"
} }
// VehicleRotationCal { VehicleRotationCal {
// visible: controller.orientationCalRightSideVisible visible: controller.orientationCalRightSideVisible
// calValid: controller.orientationCalRightSideDone calValid: controller.orientationCalRightSideDone
// calInProgress: controller.orientationCalRightSideInProgress calInProgress: controller.orientationCalRightSideInProgress
// calInProgressText: controller.orientationCalRightSideRotate ? qsTr("Rotate") : qsTr("Hold Still") calInProgressText: controller.orientationCalRightSideRotate ? qsTr("Rotate") : qsTr("Hold Still")
// imageSource: controller.orientationCalRightSideRotate ? "qrc:///qmlimages/VehicleRightRotate.png" : "qrc:///qmlimages/VehicleRight.png" imageSource: controller.orientationCalRightSideRotate ? "qrc:///qmlimages/VehicleRightRotate.png" : "qrc:///qmlimages/VehicleRight.png"
// } }
} }
} }
......
src/AutoPilotPlugins/PX4/SensorsComponentController.cc
View file @ 3e2699ee
...@@ -314,10 +314,10 @@ void SensorsComponentController::_handleUASTextMessage(int uasId, int compId, in ...@@ -314,10 +314,10 @@ void SensorsComponentController::_handleUASTextMessage(int uasId, int compId, in
} else if (text == "mag") { } else if (text == "mag") {
_magCalInProgress = true; _magCalInProgress = true;
_orientationCalDownSideVisible = true; _orientationCalDownSideVisible = true;
_orientationCalUpsideDownSideVisible = true; _orientationCalUpsideDownSideVisible = false;
_orientationCalLeftSideVisible = true; _orientationCalLeftSideVisible = true;
_orientationCalRightSideVisible = true; _orientationCalRightSideVisible = false;
_orientationCalTailDownSideVisible = true; _orientationCalTailDownSideVisible = false;
_orientationCalNoseDownSideVisible = true; _orientationCalNoseDownSideVisible = true;
} else if (text == "gyro") { } else if (text == "gyro") {
_gyroCalInProgress = true; _gyroCalInProgress = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment