Making an ESP32-based quadcopter from scratch
Python arduinoautopilotcontrol-theorydroneesp32flight-controlflight-controllermavlinkquadcopterquadcopter-firmwareuav
Make MAVLink control scale a parameter
Oleg Kalachev7effd9204305
diff --git a/flix/mavlink.ino b/flix/mavlink.inoindex 68edc4b..bcaeacd 100644--- a/flix/mavlink.ino+++ b/flix/mavlink.ino@@ -13,6 +13,8 @@#define MAVLINK_CONTROL_SCALE 0.7f#define MAVLINK_CONTROL_YAW_DEAD_ZONE 0.1f+float mavlinkControlScale = 0.7;+extern double controlsTime;extern int rollChannel, pitchChannel, throttleChannel, yawChannel, armedChannel, modeChannel;@@ -92,9 +94,9 @@ void handleMavlink(const void *_msg) {mavlink_manual_control_t manualControl;mavlink_msg_manual_control_decode(msg, &manualControl);controls[throttleChannel] = manualControl.z / 1000.0f;- controls[pitchChannel] = manualControl.x / 1000.0f * MAVLINK_CONTROL_SCALE;- controls[rollChannel] = manualControl.y / 1000.0f * MAVLINK_CONTROL_SCALE;- controls[yawChannel] = manualControl.r / 1000.0f * MAVLINK_CONTROL_SCALE;+ controls[pitchChannel] = manualControl.x / 1000.0f * mavlinkControlScale;+ controls[rollChannel] = manualControl.y / 1000.0f * mavlinkControlScale;+ controls[yawChannel] = manualControl.r / 1000.0f * mavlinkControlScale;controls[modeChannel] = 1; // STAB modecontrols[armedChannel] = 1; // armedcontrolsTime = t;diff --git a/flix/parameters.ino b/flix/parameters.inoindex ee8526d..62f2d7b 100644--- a/flix/parameters.ino+++ b/flix/parameters.ino@@ -7,6 +7,7 @@extern float channelNeutral[16];extern float channelMax[16];+extern float mavlinkControlScale;Preferences storage;@@ -66,7 +67,9 @@ Parameter parameters[] = {{"RC_MAX_4", &channelMax[4]},{"RC_MAX_5", &channelMax[5]},{"RC_MAX_6", &channelMax[6]},- {"RC_MAX_7", &channelMax[7]}+ {"RC_MAX_7", &channelMax[7]},+ // MAVLink+ {"MAV_CTRL_SCALE", &mavlinkControlScale},};void setupParameters() {