diff --git a/CREDITS.txt b/CREDITS.txt index b5f7f316a..4bcec3caa 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -20,9 +20,11 @@ Stefan Cenkov Andrés Chavarría Krauser Cosimo Corrado James Cotton +Kalyn Doerr Steve Doll James Duley Piotr Esden-Tempski +Steve Evans Peter Farnworth Ed Faulkner Andrew Finegan @@ -50,6 +52,7 @@ Stefan Karlsson Ricky King Thorsten Klose Karl Knutsson +Daniël Koek Sami Korhonen Hallvard Kristiansen Alan Krum diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Panels.qml b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Panels.qml index b61fe6c8c..09b5f61bd 100644 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Panels.qml +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Panels.qml @@ -379,7 +379,6 @@ Item { width: scaledBounds.width * sceneItem.width 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) smooth: true @@ -394,7 +393,7 @@ Item { states: State { name: "fading" 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 {