diff --git a/quad/src/quad_app/PID.h b/quad/src/quad_app/PID.h index 9753f3ab6354a014b1f4ca1d7f8d2fe6d9726c44..faf5579f090e7bfe424725ce65a762e7fa9a8e9b 100644 --- a/quad/src/quad_app/PID.h +++ b/quad/src/quad_app/PID.h @@ -39,7 +39,7 @@ #define YPOS_KP 0.55 #define YPOS_KI 0.0075 #define YPOS_KD 0.0 -#define YPOS_ALPHA 0.88 +#define YPOS_ALPHA 0 //Pitch constants @@ -58,7 +58,7 @@ #define XPOS_KP 0.55 #define XPOS_KI 0.0075 #define XPOS_KD 0.0 -#define XPOS_ALPHA 0.88 +#define XPOS_ALPHA 0 //Throttle constants diff --git a/quad/src/quad_app/control_algorithm.c b/quad/src/quad_app/control_algorithm.c index 55d1e249c3332c721adaf55b3c55be2c0664cd14..ef23136fb9227e51f6a48b3b849a4a090977c5e8 100644 --- a/quad/src/quad_app/control_algorithm.c +++ b/quad/src/quad_app/control_algorithm.c @@ -214,10 +214,11 @@ int control_algorithm_init(parameter_t * ps) // Set velocity constants graph_set_param_val(graph, ps->x_vel_pid, PID_KP, XVEL_KP); graph_set_param_val(graph, ps->x_vel_pid, PID_KD, XVEL_KD); - graph_set_param_val(graph, ps->x_vel_pid, PID_ALPHA, XVEL_ALPHA); graph_set_param_val(graph, ps->y_vel_pid, PID_KP, YVEL_KP); graph_set_param_val(graph, ps->y_vel_pid, PID_KD, YVEL_KD); - graph_set_param_val(graph, ps->y_vel_pid, PID_ALPHA, YVEL_ALPHA); + // Differentiators + graph_set_param_val(graph, ps->x_vel, PID_ALPHA, XVEL_ALPHA); + graph_set_param_val(graph, ps->y_vel, PID_ALPHA, YVEL_ALPHA); // Set X/Y/Alt constants graph_set_param_val(graph, ps->x_pos_pid, PID_KP, XPOS_KP);