projects
/
mardrone
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sync
[mardrone]
/
mardrone
/
ardrone_harmattan.qml
diff --git
a/mardrone/ardrone_harmattan.qml
b/mardrone/ardrone_harmattan.qml
index
35cf4d3
..
b7d162b
100644
(file)
--- a/
mardrone/ardrone_harmattan.qml
+++ b/
mardrone/ardrone_harmattan.qml
@@
-156,7
+156,7
@@
PageStackWindow {
anchors.left:parent.left
anchors.bottom:parent.bottom
anchors.margins:10
anchors.left:parent.left
anchors.bottom:parent.bottom
anchors.margins:10
- // joyBackground: ""
+ joyBackground: ""
onYvChanged:{drone.vVelocity=-1*yv/200.0;}
onXvChanged:{drone.yaw=xv/200.0;}
onPressedChanged: { drone.ctrlActive=pressed;}
onYvChanged:{drone.vVelocity=-1*yv/200.0;}
onXvChanged:{drone.yaw=xv/200.0;}
onPressedChanged: { drone.ctrlActive=pressed;}
@@
-166,7
+166,7
@@
PageStackWindow {
visible: !drone.confUseJoyStick
id:rj
visible: !drone.confUseJoyStick
id:rj
- // joyBackground: ""
+ joyBackground: ""
anchors.right:parent.right
anchors.bottom:parent.bottom
width:200;height:200;
anchors.right:parent.right
anchors.bottom:parent.bottom
width:200;height:200;