Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tk joystick status #11566

Closed
wants to merge 3 commits into from
Closed

Tk joystick status #11566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
150b108
Add joystick status on control pannel
dimazdoks May 27, 2024
be714ea
trying to add buttong to enable/disable joystick
dimazdoks May 27, 2024
6126224
Revert submodules
May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,7 @@ Qt*-linux*.tar.*
# vitepress - user guide
node_modules/
docs/.vitepress/cache/
docs/.vitepress/dist/
docs/.vitepress/dist/

# all zip builds
*.zip
2 changes: 1 addition & 1 deletion libs/OpenSSL/android_openssl
Open in desktop
Submodule android_openssl updated 1015 files
2 changes: 1 addition & 1 deletion libs/eigen
Open in desktop
Submodule eigen updated from 0fd6b4 to 5a9f66
2 changes: 1 addition & 1 deletion libs/libevents/libevents
Open in desktop
Submodule libevents updated 18 files
+71 −2 README.md
+33 −5 libs/cpp/CMakeLists.txt
+4 −0 libs/cpp/Config.cmake.in
+11 −0 libs/cpp/common/CMakeLists.txt
+24 −0 libs/cpp/common/event_type.h
+0 −0 libs/cpp/empty.cpp
+28 −16 libs/cpp/generated/events_generated.h
+0 −30 libs/cpp/include/libevents_definitions.h
+42 −15 libs/cpp/parse/CMakeLists.txt
+1 −2 libs/cpp/parse/health_and_arming_checks.h
+1 −1 libs/cpp/parse/parser.cpp
+3 −4 libs/cpp/parse/parser.h
+8 −10 libs/cpp/protocol/CMakeLists.txt
+0 −184 libs/cpp/protocol/receive.cpp
+180 −13 libs/cpp/protocol/receive.h
+8 −8 libs/cpp/templates/events_generated.h.jinja
+10 −8 libs/cpp/tests/CMakeLists.txt
+16 −14 libs/cpp/tests/parser.cpp
2 changes: 1 addition & 1 deletion libs/mavlink/include/mavlink/v2.0
Open in desktop
Submodule v2.0 updated 463 files
2 changes: 1 addition & 1 deletion libs/qmdnsengine
Open in desktop
Submodule qmdnsengine updated 1 files
+6 −6 src/src/browser.cpp
2 changes: 1 addition & 1 deletion libs/shapelib
Open in desktop
Submodule shapelib updated 139 files
2 changes: 1 addition & 1 deletion src/FirmwarePlugin/APM/ArduPilot-Parameter-Repository
Open in desktop
Submodule ArduPilot-Parameter-Repository updated from 772370 to 314760
1 change: 1 addition & 0 deletions src/FirmwarePlugin/FirmwarePlugin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ const QVariantList& FirmwarePlugin::toolIndicators(const Vehicle*)
_toolIndicatorList = QVariantList({
QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/MessageIndicator.qml")),
QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/GPSIndicator.qml")),
QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/JoystickIndicator.qml")),
QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/TelemetryRSSIIndicator.qml")),
QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/RCRSSIIndicator.qml")),
QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/BatteryIndicator.qml")),
Expand Down
2 changes: 1 addition & 1 deletion src/GPS/Drivers
Open in desktop
Submodule Drivers updated from c873a6 to 0b79ec
3 changes: 3 additions & 0 deletions src/Vehicle/Vehicle.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* COPYING.md in the root of the source code directory.
*
****************************************************************************/
#include <iostream>

#include <QTime>
#include <QDateTime>
Expand Down Expand Up @@ -2158,6 +2159,8 @@ bool Vehicle::joystickEnabled() const

void Vehicle::setJoystickEnabled(bool enabled)
{
std::cout << "WTF" << enabled << std::endl;

if (enabled){
qCDebug(JoystickLog) << "Vehicle " << this->id() << " Joystick Enabled";
}
Expand Down
22 changes: 21 additions & 1 deletion src/ui/toolbar/JoystickIndicator.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ Item {
width: joystickRow.width * 1.1
anchors.top: parent.top
anchors.bottom: parent.bottom
visible: globals.activeVehicle ? globals.activeVehicle.sub : false
// visible: globals.activeVehicle ? globals.activeVehicle.sub : false
// visible: globals.activeVehicle ? globals.activeVehicle.rover : false

property bool showIndicator: true
property bool _joystickEnabled: globals.activeVehicle ? globals.activeVehicle.joystickEnabled : false


Component {
Expand Down Expand Up @@ -66,6 +70,22 @@ Item {
text: globals.activeVehicle && globals.activeVehicle.joystickEnabled ? qsTr("Yes") : qsTr("No")
color: globals.activeVehicle && globals.activeVehicle.joystickEnabled ? qgcPal.buttonText : "red"
}

QGCButton {
Layout.leftMargin: width / 2
Layout.alignment: Qt.AlignHCenter
enabled: true
text: _joystickEnabled ? qsTr("Disable") : qsTr("Enable")
onClicked: {
if (_joystickEnabled) {
globals.activeVehicle.setJoystickEnabled(false)
} else {
globals.activeVehicle.setJoystickEnabled(true)
}
// close popup
mainWindow.hideIndicatorPopup()
}
}
}
}
}
Expand Down
Loading