Acceleration sensor control and basic vision framework

[mardrone] / mardrone / ardrone.qml

diff --git a/mardrone/ardrone.qml b/mardrone/ardrone.qml
index 2d8af42..183d743 100644 (file)
--- a/mardrone/ardrone.qml
+++ b/mardrone/ardrone.qml
@@ -37,6 +37,14 @@ Window {
             opacity:0.5
             width:640;height:480;
         }
+        Text {
+            y:100
+            visible:drone.confUseAccel
+            color: "#00FF00"
+            id: droneCtrlValues
+            font.pixelSize:20
+            text: "cmd:pitch=" + Math.round(drone.pitch) + " roll= " +  Math.round(drone.roll) + " yaw=" + Math.round(drone.yaw) + " vv= " +  Math.round(drone.vVelocity)
+        }
 
         Text {
             y:115
@@ -65,6 +73,7 @@ Window {
             }
         }
         Image {
+            visible: !drone.confUseAccel
             x:10;y:200
             width:280;height:280;
             source: "joybox.png"
@@ -88,8 +97,9 @@ Window {
                 id:rj
                 anchors.fill:parent
                 anchors.margins:50
-                onYvChanged:{drone.vVelocity=yv;}
+                onYvChanged:{drone.vVelocity=-1*yv;}
                 onXvChanged:{drone.yaw=xv;}
+                onPressedChanged: { drone.ctrlActive=pressed;}
             }
         }
         Row {