Making an ESP32-based quadcopter from scratch
Python arduinoautopilotcontrol-theorydroneesp32flight-controlflight-controllermavlinkquadcopterquadcopter-firmwareuav
Rename RC_CHANNEL_AUX to RC_CHANNEL_ARMED
Oleg Kalacheved6d09061ba5
diff --git a/flix/cli.ino b/flix/cli.inoindex 3737eb9..b4c9a5e 100644--- a/flix/cli.ino+++ b/flix/cli.ino@@ -73,12 +73,12 @@ void doCommand(String& command, String& value) {Serial.printf("acc: %f %f %f\n", acc.x, acc.y, acc.z);printIMUCal();} else if (command == "rc") {- Serial.printf("Raw: throttle %d yaw %d pitch %d roll %d aux %d mode %d\n",+ Serial.printf("Raw: throttle %d yaw %d pitch %d roll %d armed %d mode %d\n",channels[RC_CHANNEL_THROTTLE], channels[RC_CHANNEL_YAW], channels[RC_CHANNEL_PITCH],- channels[RC_CHANNEL_ROLL], channels[RC_CHANNEL_AUX], channels[RC_CHANNEL_MODE]);- Serial.printf("Control: throttle %f yaw %f pitch %f roll %f aux %f mode %f\n",+ channels[RC_CHANNEL_ROLL], channels[RC_CHANNEL_ARMED], channels[RC_CHANNEL_MODE]);+ Serial.printf("Control: throttle %f yaw %f pitch %f roll %f armed %f mode %f\n",controls[RC_CHANNEL_THROTTLE], controls[RC_CHANNEL_YAW], controls[RC_CHANNEL_PITCH],- controls[RC_CHANNEL_ROLL], controls[RC_CHANNEL_AUX], controls[RC_CHANNEL_MODE]);+ controls[RC_CHANNEL_ROLL], controls[RC_CHANNEL_ARMED], controls[RC_CHANNEL_MODE]);Serial.printf("Mode: %s\n", getModeName());} else if (command == "mot") {Serial.printf("MOTOR front-right %f front-left %f rear-right %f rear-left %f\n",diff --git a/flix/control.ino b/flix/control.inoindex b120931..5bc327b 100644--- a/flix/control.ino+++ b/flix/control.ino@@ -77,7 +77,7 @@ void interpretRC() {mode = STAB;}- armed = controls[RC_CHANNEL_THROTTLE] >= 0.05 && controls[RC_CHANNEL_AUX] >= 0.5;+ armed = controls[RC_CHANNEL_THROTTLE] >= 0.05 && controls[RC_CHANNEL_ARMED] >= 0.5;thrustTarget = controls[RC_CHANNEL_THROTTLE];if (mode == ACRO) {diff --git a/flix/flix.ino b/flix/flix.inoindex d4e2531..e01da35 100644--- a/flix/flix.ino+++ b/flix/flix.ino@@ -15,7 +15,7 @@#define RC_CHANNEL_PITCH 1#define RC_CHANNEL_THROTTLE 2#define RC_CHANNEL_YAW 3-#define RC_CHANNEL_AUX 4+#define RC_CHANNEL_ARMED 4#define RC_CHANNEL_MODE 5#define MOTOR_REAR_LEFT 0diff --git a/flix/mavlink.ino b/flix/mavlink.inoindex ffb9797..816534e 100644--- a/flix/mavlink.ino+++ b/flix/mavlink.ino@@ -90,7 +90,7 @@ void handleMavlink(const void *_msg) {controls[RC_CHANNEL_ROLL] = manualControl.y / 1000.0f * MAVLINK_CONTROL_SCALE;controls[RC_CHANNEL_YAW] = manualControl.r / 1000.0f * MAVLINK_CONTROL_SCALE;controls[RC_CHANNEL_MODE] = 1; // STAB mode- controls[RC_CHANNEL_AUX] = 1; // armed+ controls[RC_CHANNEL_ARMED] = 1; // armed}}diff --git a/gazebo/joystick.h b/gazebo/joystick.hindex a5ade19..2e834a7 100644--- a/gazebo/joystick.h+++ b/gazebo/joystick.h@@ -15,7 +15,7 @@ const int channelMaxOverride[] = {27090, 27090, 27090, 27090, 0, 1};#define RC_CHANNEL_PITCH 1#define RC_CHANNEL_THROTTLE 2#define RC_CHANNEL_YAW 3-#define RC_CHANNEL_AUX 4+#define RC_CHANNEL_ARMED 4#define RC_CHANNEL_MODE 5SDL_Joystick *joystick;diff --git a/gazebo/simulator.cpp b/gazebo/simulator.cppindex 5c6aa99..9591960 100644--- a/gazebo/simulator.cpp+++ b/gazebo/simulator.cpp@@ -69,7 +69,7 @@ public:// read rcreadRC();controls[RC_CHANNEL_MODE] = 1; // 0 acro, 1 stab- controls[RC_CHANNEL_AUX] = 1; // armed+ controls[RC_CHANNEL_ARMED] = 1; // armedestimate();