Skip to content
Snippets Groups Projects
Commit 8944ab7c authored by C-Glick's avatar C-Glick
Browse files

Added new student files to makefile,

need to fix compilation bugs
parent fe8af017
No related branches found
No related tags found
No related merge requests found
...@@ -178,6 +178,7 @@ PROJ_OBJ += attitude_pid_controller.o sensfusion6.o stabilizer.o ...@@ -178,6 +178,7 @@ PROJ_OBJ += attitude_pid_controller.o sensfusion6.o stabilizer.o
PROJ_OBJ += position_estimator_altitude.o position_controller_pid.o position_controller_indi.o PROJ_OBJ += position_estimator_altitude.o position_controller_pid.o position_controller_indi.o
PROJ_OBJ += estimator.o estimator_complementary.o PROJ_OBJ += estimator.o estimator_complementary.o
PROJ_OBJ += controller.o controller_pid.o controller_mellinger.o controller_indi.o PROJ_OBJ += controller.o controller_pid.o controller_mellinger.o controller_indi.o
PROJ_OBJ += student_attitude_controller.o student_pid.o
PROJ_OBJ += controller_student.o PROJ_OBJ += controller_student.o
PROJ_OBJ += power_distribution_$(POWER_DISTRIBUTION).o PROJ_OBJ += power_distribution_$(POWER_DISTRIBUTION).o
PROJ_OBJ += collision_avoidance.o health.o PROJ_OBJ += collision_avoidance.o health.o
......
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
* attitude_controller.h: PID-based attitude controller * attitude_controller.h: PID-based attitude controller
*/ */
#ifndef ATTITUDE_CONTROLLER_H_ #ifndef STUDENT_ATTITUDE_CONTROLLER_H_
#define ATTITUDE_CONTROLLER_H_ #define STUDENT_ATTITUDE_CONTROLLER_H_
#include <stdbool.h> #include <stdbool.h>
#include "commander.h" #include "commander.h"
...@@ -109,4 +109,4 @@ void attitudeControllerResetAllPID(void); ...@@ -109,4 +109,4 @@ void attitudeControllerResetAllPID(void);
void attitudeControllerGetActuatorOutput(int16_t* roll, int16_t* pitch, int16_t* yaw); void attitudeControllerGetActuatorOutput(int16_t* roll, int16_t* pitch, int16_t* yaw);
#endif /* ATTITUDE_CONTROLLER_H_ */ #endif /* STUDENT_ATTITUDE_CONTROLLER_H_ */
#ifndef PID_H_ #ifndef STUDENT_PID_H_
#define PID_H_ #define STUDENT_PID_H_
#include <stdbool.h> #include <stdbool.h>
#include "filter.h" #include "filter.h"
......
...@@ -63,9 +63,12 @@ PidObject pidPitch; ...@@ -63,9 +63,12 @@ PidObject pidPitch;
PidObject pidYaw; PidObject pidYaw;
//attitude controller outputs //attitude controller outputs
//No longer needed since attitudeControllerCorrectRatePID modifies values in place
/*
static int16_t rollOutput; static int16_t rollOutput;
static int16_t pitchOutput; static int16_t pitchOutput;
static int16_t yawOutput; static int16_t yawOutput;
*/
static bool isInit; static bool isInit;
...@@ -177,6 +180,7 @@ void attitudeControllerResetAllPID(void) ...@@ -177,6 +180,7 @@ void attitudeControllerResetAllPID(void)
pidReset(&pidYawRate); pidReset(&pidYawRate);
} }
//no longer needed since attitudeControllerCorrectRatePID modifies the values in place
/*void attitudeControllerGetActuatorOutput(int16_t* roll, int16_t* pitch, int16_t* yaw) /*void attitudeControllerGetActuatorOutput(int16_t* roll, int16_t* pitch, int16_t* yaw)
{ {
*roll = rollOutput; *roll = rollOutput;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment