Skip to content

Add crsf-bind button #12068

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

Merged
merged 4 commits into from
Nov 16, 2024
Merged

Add crsf-bind button #12068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
477b69a
add crsf-bind button
benjinne Nov 5, 2024
cb28fc0
update mavlink
benjinne Nov 15, 2024
2a8bcdf
bind RC use enums
benjinne Nov 15, 2024
57d9ef1
Point mavlink cmake to latest repo
benjinne Nov 15, 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
2 changes: 1 addition & 1 deletion libs/mavlink/include/mavlink/v2.0
Open in desktop
Submodule v2.0 updated 70 files
+22 −22 ASLUAV/ASLUAV.h
+1 −1 ASLUAV/mavlink.h
+1 −1 ASLUAV/version.h
+4 −4 AVSSUAS/AVSSUAS.h
+1 −1 AVSSUAS/mavlink.h
+1 −1 AVSSUAS/version.h
+4 −4 all/all.h
+1 −1 all/mavlink.h
+1 −1 all/version.h
+22 −22 ardupilotmega/ardupilotmega.h
+1 −1 ardupilotmega/mavlink.h
+1 −1 ardupilotmega/version.h
+49 −29 common/common.h
+1 −1 common/mavlink.h
+5 −5 common/mavlink_msg_battery_info.h
+41 −13 common/mavlink_msg_camera_capture_status.h
+41 −13 common/mavlink_msg_camera_fov_status.h
+6 −6 common/mavlink_msg_camera_information.h
+41 −13 common/mavlink_msg_camera_settings.h
+484 −0 common/mavlink_msg_camera_thermal_range.h
+41 −13 common/mavlink_msg_camera_tracking_geo_status.h
+41 −13 common/mavlink_msg_camera_tracking_image_status.h
+700 −0 common/mavlink_msg_smart_battery_info.h
+41 −13 common/mavlink_msg_video_stream_information.h
+41 −13 common/mavlink_msg_video_stream_status.h
+179 −28 common/testsuite.h
+1 −1 common/version.h
+1 −1 csAirLink/csAirLink.h
+1 −1 csAirLink/mavlink.h
+1 −1 csAirLink/version.h
+4 −4 cubepilot/cubepilot.h
+1 −1 cubepilot/mavlink.h
+1 −1 cubepilot/version.h
+64 −23 development/development.h
+1 −1 development/mavlink.h
+288 −0 development/mavlink_msg_control_status.h
+61 −0 development/testsuite.h
+1 −1 development/version.h
+1 −1 icarous/icarous.h
+1 −1 icarous/mavlink.h
+1 −1 icarous/version.h
+22 −22 matrixpilot/matrixpilot.h
+1 −1 matrixpilot/mavlink.h
+1 −1 matrixpilot/version.h
+112 −26 message_definitions/common.xml
+52 −0 message_definitions/development.xml
+1 −1 minimal/mavlink.h
+1 −1 minimal/minimal.h
+1 −1 minimal/version.h
+1 −1 paparazzi/mavlink.h
+4 −4 paparazzi/paparazzi.h
+1 −1 paparazzi/version.h
+1 −1 python_array_test/mavlink.h
+4 −4 python_array_test/python_array_test.h
+1 −1 python_array_test/version.h
+1 −1 standard/mavlink.h
+1 −1 standard/standard.h
+1 −1 standard/version.h
+1 −1 storm32/mavlink.h
+22 −22 storm32/storm32.h
+1 −1 storm32/version.h
+1 −1 test/mavlink.h
+1 −1 test/test.h
+1 −1 test/version.h
+1 −1 uAvionix/mavlink.h
+4 −4 uAvionix/uAvionix.h
+1 −1 uAvionix/version.h
+1 −1 ualberta/mavlink.h
+4 −4 ualberta/ualberta.h
+1 −1 ualberta/version.h
8 changes: 8 additions & 0 deletions src/AutoPilotPlugins/Common/RadioComponent.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,14 @@ SetupPage {
onClicked: spektrumBindDialogComponent.createObject(mainWindow).open()
}

QGCButton {
text: qsTr("CRSF Bind")
onClicked: mainWindow.showMessageDialog(qsTr("CRSF Bind"),
qsTr("Click Ok to place your CRSF receiver in the bind mode."),
Dialog.Ok | Dialog.Cancel,
function() { controller.crsfBindMode() })
}

QGCButton {
text: qsTr("Copy Trims")
onClicked: mainWindow.showMessageDialog(qsTr("Copy Trims"),
Expand Down
7 changes: 6 additions & 1 deletion src/AutoPilotPlugins/Common/RadioComponentController.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,12 @@ void RadioComponentController::_setInternalCalibrationValuesFromParameters(void)

void RadioComponentController::spektrumBindMode(int mode)
{
_vehicle->pairRX(0, mode);
_vehicle->pairRX(RC_TYPE_SPEKTRUM, mode);
}

void RadioComponentController::crsfBindMode()
{
_vehicle->pairRX(RC_TYPE_CRSF, 0);
}

/// @brief Validates the current settings against the calibration rules resetting values as necessary.
Expand Down
1 change: 1 addition & 0 deletions src/AutoPilotPlugins/Common/RadioComponentController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ class RadioComponentController : public FactPanelController
Q_ENUM(BindModes)

Q_INVOKABLE void spektrumBindMode(int mode);
Q_INVOKABLE void crsfBindMode(void);
Q_INVOKABLE void cancelButtonClicked(void);
Q_INVOKABLE void skipButtonClicked(void);
Q_INVOKABLE void nextButtonClicked(void);
Expand Down
2 changes: 1 addition & 1 deletion src/MAVLink/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ target_include_directories(MAVLink PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
include(FetchContent)
FetchContent_Declare(mavlink
GIT_REPOSITORY https://github.com/mavlink/c_library_v2.git
GIT_TAG 052b8579f8aeb941f34cc9896af22cf1f38939b9
GIT_TAG 4db2f67156d996eae90ef437a73353468d850407
)
FetchContent_MakeAvailable(mavlink)

Expand Down
Loading