move code to src

jan-krueger · Feb 23, 2022 · 1738fd1 · 1738fd1
1 parent 1a67dbb
commit 1738fd1
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "scripts/DJITelloPy"]
-	path = scripts/DJITelloPy
+	path = src/DJITelloPy
 	url = git@github.com:jan-krueger/DJITelloPy.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,7 @@ find_package(catkin REQUIRED COMPONENTS
 ## Uncomment this if the package has a setup.py. This macro ensures
 ## modules and global scripts declared therein get installed
 ## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
-# catkin_python_setup()
+catkin_python_setup()
 
 ################################################
 ## Declare ROS messages, services and actions ##

diff --git a/setup.py b/setup.py
@@ -0,0 +1,10 @@
+from setuptools import setup
+from catkin_pkg.python_setup import generate_distutils_setup
+
+d = generate_distutils_setup(
+    scripts=['src/tello_pilot_node.py'],
+    packages=['tello_pilot'],
+    package_dir={'': 'src'}
+)
+
+setup(**d)
diff --git a/scripts/DJITelloPy → src/DJITelloPy b/scripts/DJITelloPy → src/DJITelloPy
diff --git a/scripts/TelloParameterParser.py → src/TelloParameterParser.py b/scripts/TelloParameterParser.py → src/TelloParameterParser.py
diff --git a/scripts/tello_pilot_node.py → src/tello_pilot_node.py b/scripts/tello_pilot_node.py → src/tello_pilot_node.py
@@ -13,7 +13,7 @@
 
 import cv2 as cv
 import numpy as np
-from RospyLogger import RospyLogger
+from tello_pilot.src.utils.RospyLogger import RospyLogger
 from TelloParameterParser import TelloParameterParser
 
 from cv_bridge import CvBridge

diff --git a/scripts/test_node.py → src/test_node.py b/scripts/test_node.py → src/test_node.py
diff --git a/scripts/RospyLogger.py → src/utils/RospyLogger.py b/scripts/RospyLogger.py → src/utils/RospyLogger.py