rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-16 08:29:15 +01:00
Code Issues Releases Activity

Merge branch 'rel-15.05' into rel-nano-15.05

Browse Source
This commit is contained in:
abeck70 2015-05-20 08:37:44 +10:00
commit 2241070d04
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CREDITS.txt
View File

@ -20,9 +20,11 @@ Stefan Cenkov
Andrés Chavarría Krauser Andrés Chavarría Krauser
Cosimo Corrado Cosimo Corrado
James Cotton James Cotton
Kalyn Doerr
Steve Doll Steve Doll
James Duley James Duley
Piotr Esden-Tempski Piotr Esden-Tempski
Steve Evans
Peter Farnworth Peter Farnworth
Ed Faulkner Ed Faulkner
Andrew Finegan Andrew Finegan
@ -50,6 +52,7 @@ Stefan Karlsson
Ricky King Ricky King
Thorsten Klose Thorsten Klose
Karl Knutsson Karl Knutsson
Daniël Koek
Sami Korhonen Sami Korhonen
Hallvard Kristiansen Hallvard Kristiansen
Alan Krum Alan Krum

3
ground/openpilotgcs/share/openpilotgcs/pfd/default/Panels.qml
View File

@ -379,7 +379,6 @@ Item {
width: scaledBounds.width * sceneItem.width width: scaledBounds.width * sceneItem.width
height: scaledBounds.height * sceneItem.height height: scaledBounds.height * sceneItem.height
x: (scaledBounds.x * sceneItem.width) + (ManualControlCommand.Roll * rc_stick.width * 2.5)
y: (scaledBounds.y * sceneItem.height) + (ManualControlCommand.Pitch * rc_stick.width * 2.5) y: (scaledBounds.y * sceneItem.height) + (ManualControlCommand.Pitch * rc_stick.width * 2.5)
smooth: true smooth: true
@ -394,7 +393,7 @@ Item {
states: State { states: State {
name: "fading" name: "fading"
when: show_panels == true when: show_panels == true
PropertyChanges { target: rc_stick; x: Math.floor(scaledBounds.x * sceneItem.width) + offset_value; } PropertyChanges { target: rc_stick; x: Math.floor(scaledBounds.x * sceneItem.width) + (ManualControlCommand.Roll * rc_stick.width * 2.5) + offset_value; }
} }
transitions: Transition { transitions: Transition {