Merge pull request #47 from bitcraze/fix-paths-controllers

fixed paths issues webots controller
bitcraze · Aug 28, 2023 · 9fc77d2 · 9fc77d2
2 parents 9459c60 + 01fc4b9
commit 9fc77d2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/simulator_files/webots/controllers/crazyflie_controller_c/Makefile b/simulator_files/webots/controllers/crazyflie_controller_c/Makefile
@@ -35,7 +35,7 @@
 ###
 ### ---- C Sources ----
 ### if your program uses several C source files:
-C_SOURCES = crazyflie_controller.c ../../../controllers/c_based/pid_controller.c
+C_SOURCES = crazyflie_controller.c ../../../../controllers_shared/c_based/pid_controller.c
 ###
 ### ---- C++ Sources ----
 ### if your program uses several C++ source files:

diff --git a/simulator_files/webots/controllers/crazyflie_controller_c/crazyflie_controller.c b/simulator_files/webots/controllers/crazyflie_controller_c/crazyflie_controller.c
@@ -41,7 +41,8 @@
 
 // Add external controller
 // #include "pid_controller.h"
-#include "../../../../shared_controllers/c_based/pid_controller.h"
+#include "../../../../controllers_shared/c_based/pid_controller.h"
+
 
 #define FLYING_ALTITUDE 1.0
 

diff --git a/simulator_files/webots/controllers/crazyflie_controller_py/crazyflie_controller_py.py b/simulator_files/webots/controllers/crazyflie_controller_py/crazyflie_controller_py.py
@@ -26,7 +26,7 @@
 from math import cos, sin
 
 import sys
-sys.path.append('../../../../shared_controllers/python_based')
+sys.path.append('../../../../controllers_shared/python_based')
 from pid_controller import pid_velocity_fixed_height_controller
 
 FLYING_ATTITUDE = 1

diff --git a/...files/webots/controllers/crazyflie_controller_py_socket/crazyflie_controller_py_socket.py b/...files/webots/controllers/crazyflie_controller_py_socket/crazyflie_controller_py_socket.py
@@ -29,7 +29,7 @@
 from time import sleep
 
 import sys
-sys.path.append('../../../controllers/python_based')
+sys.path.append('../../../../controllers_shared/python_based')
 from pid_controller import pid_velocity_fixed_height_controller
 
 FLYING_ATTITUDE = 1

diff --git a/...ontrollers/crazyflie_controller_py_wallfollowing/crazyflie_controller_py_wallfollowing.py b/...ontrollers/crazyflie_controller_py_wallfollowing/crazyflie_controller_py_wallfollowing.py
@@ -26,10 +26,10 @@
 from math import cos, sin
 
 import sys
-sys.path.append('../../../../shared_controllers/python_based')
+sys.path.append('../../../../controllers_shared/python_based')
 from pid_controller import pid_velocity_fixed_height_controller
 
-sys.path.append('../../../../../python/crazyflie-lib-python/examples/multiranger/wall_following')
+sys.path.append('../../../../../../python/crazyflie-lib-python/examples/multiranger/wall_following')
 from wall_following import WallFollowing
 
 FLYING_ATTITUDE = 1