diff --git a/flix/control.cpp b/flix/control.cpp index e5f9a0c..8c04f3a 100644 --- a/flix/control.cpp +++ b/flix/control.cpp @@ -4,6 +4,7 @@ // Flight control #include "config.h" +#include "flix.h" #include "vector.h" #include "quaternion.h" #include "pid.h" diff --git a/flix/motors.cpp b/flix/motors.cpp index 9512614..0f5f95f 100644 --- a/flix/motors.cpp +++ b/flix/motors.cpp @@ -9,17 +9,6 @@ #include "flix.h" #include "util.h" -#define MOTOR_0_PIN 12 // rear left -#define MOTOR_1_PIN 13 // rear right -#define MOTOR_2_PIN 14 // front right -#define MOTOR_3_PIN 15 // front left - -#define PWM_FREQUENCY 78000 -#define PWM_RESOLUTION 10 -#define PWM_STOP 0 -#define PWM_MIN 0 -#define PWM_MAX 1000000 / PWM_FREQUENCY - float motors[4]; // normalized motor thrusts in range [0..1] extern const int MOTOR_REAR_LEFT = 0;