aleks/flix
1
0
Fork 0
mirror of https://github.com/okalachev/flix.git synced 2025-07-27 17:49:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename RC_CHANNEL_AUX to RC_CHANNEL_ARMED

Browse Source
This commit is contained in:
Oleg Kalachev 2024-01-19 05:19:41 +03:00
parent 26a028ff66
commit ed6d09061b
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flix/cli.ino
View File

@ -73,12 +73,12 @@ void doCommand(String& command, String& value) {
Serial.printf("acc: %f %f %f\n", acc.x, acc.y, acc.z); Serial.printf("acc: %f %f %f\n", acc.x, acc.y, acc.z);
printIMUCal(); printIMUCal();
} else if (command == "rc") { } 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_THROTTLE], channels[RC_CHANNEL_YAW], channels[RC_CHANNEL_PITCH],
channels[RC_CHANNEL_ROLL], channels[RC_CHANNEL_AUX], channels[RC_CHANNEL_MODE]); channels[RC_CHANNEL_ROLL], channels[RC_CHANNEL_ARMED], channels[RC_CHANNEL_MODE]);
Serial.printf("Control: throttle %f yaw %f pitch %f roll %f aux %f mode %f\n", 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_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()); Serial.printf("Mode: %s\n", getModeName());
} else if (command == "mot") { } else if (command == "mot") {
Serial.printf("MOTOR front-right %f front-left %f rear-right %f rear-left %f\n", Serial.printf("MOTOR front-right %f front-left %f rear-right %f rear-left %f\n",

2
flix/control.ino
View File

@ -77,7 +77,7 @@ void interpretRC() {
mode = STAB; 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]; thrustTarget = controls[RC_CHANNEL_THROTTLE];
if (mode == ACRO) { if (mode == ACRO) {

2
flix/flix.ino
View File

@ -15,7 +15,7 @@
#define RC_CHANNEL_PITCH 1 #define RC_CHANNEL_PITCH 1
#define RC_CHANNEL_THROTTLE 2 #define RC_CHANNEL_THROTTLE 2
#define RC_CHANNEL_YAW 3 #define RC_CHANNEL_YAW 3
#define RC_CHANNEL_AUX 4 #define RC_CHANNEL_ARMED 4
#define RC_CHANNEL_MODE 5 #define RC_CHANNEL_MODE 5
#define MOTOR_REAR_LEFT 0 #define MOTOR_REAR_LEFT 0

2
flix/mavlink.ino
View File

@ -90,7 +90,7 @@ void handleMavlink(const void *_msg) {
controls[RC_CHANNEL_ROLL] = manualControl.y / 1000.0f * MAVLINK_CONTROL_SCALE; 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_YAW] = manualControl.r / 1000.0f * MAVLINK_CONTROL_SCALE;
controls[RC_CHANNEL_MODE] = 1; // STAB mode controls[RC_CHANNEL_MODE] = 1; // STAB mode
controls[RC_CHANNEL_AUX] = 1; // armed controls[RC_CHANNEL_ARMED] = 1; // armed
} }
} }

2
gazebo/joystick.h
View File

@ -15,7 +15,7 @@ const int channelMaxOverride[] = {27090, 27090, 27090, 27090, 0, 1};
#define RC_CHANNEL_PITCH 1 #define RC_CHANNEL_PITCH 1
#define RC_CHANNEL_THROTTLE 2 #define RC_CHANNEL_THROTTLE 2
#define RC_CHANNEL_YAW 3 #define RC_CHANNEL_YAW 3
#define RC_CHANNEL_AUX 4 #define RC_CHANNEL_ARMED 4
#define RC_CHANNEL_MODE 5 #define RC_CHANNEL_MODE 5
SDL_Joystick *joystick; SDL_Joystick *joystick;

2
gazebo/simulator.cpp
View File

@ -69,7 +69,7 @@ public:
// read rc // read rc
readRC(); readRC();
controls[RC_CHANNEL_MODE] = 1; // 0 acro, 1 stab controls[RC_CHANNEL_MODE] = 1; // 0 acro, 1 stab
controls[RC_CHANNEL_AUX] = 1; // armed controls[RC_CHANNEL_ARMED] = 1; // armed
estimate(); estimate();