diff --git a/edgeimpulse_ros/__pycache__/image_classification.cpython-38.pyc b/edgeimpulse_ros/__pycache__/image_classification.cpython-38.pyc index 59650d8..196ed8f 100644 Binary files a/edgeimpulse_ros/__pycache__/image_classification.cpython-38.pyc and b/edgeimpulse_ros/__pycache__/image_classification.cpython-38.pyc differ diff --git a/edgeimpulse_ros/image_classification.py b/edgeimpulse_ros/image_classification.py index 424103c..a03a932 100644 --- a/edgeimpulse_ros/image_classification.py +++ b/edgeimpulse_ros/image_classification.py @@ -101,7 +101,9 @@ def parameters_callback(self): def listener_callback(self, msg): if len(msg.data): current_frame = self.cv_bridge.imgmsg_to_cv2(msg) - current_frame = cv2.cvtColor(current_frame, cv2.COLOR_BGR2RGB) + img_encoding = msg.encoding + if img_encoding=="bgr8": + current_frame = cv2.cvtColor(current_frame, cv2.COLOR_BGR2RGB) if not self.occupied: self.img = current_frame self.timer_classify.reset() diff --git a/edgeimpulse_ros/submodules/__init__.py b/edgeimpulse_ros/submodules/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/edgeimpulse_ros/submodules/__pycache__/__init__.cpython-38.pyc b/edgeimpulse_ros/submodules/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..3c7190b Binary files /dev/null and b/edgeimpulse_ros/submodules/__pycache__/__init__.cpython-38.pyc differ diff --git a/package.xml b/package.xml index 79ae856..54aa6bc 100644 --- a/package.xml +++ b/package.xml @@ -2,7 +2,7 @@ edgeimpulse_ros - 0.0.1 + 0.0.3 ROS2 wrapper for Edge Impulse gbr1 Apache 2.0 diff --git a/setup.cfg b/setup.cfg index 096ae52..e5f07ff 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,4 +1,4 @@ [develop] -script-dir=$base/lib/edgeimpulse_ros +script_dir=$base/lib/edgeimpulse_ros [install] -install-scripts=$base/lib/edgeimpulse_ros +install_scripts=$base/lib/edgeimpulse_ros diff --git a/setup.py b/setup.py index 4d5aa3d..12b26bc 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ submodules = 'edgeimpulse_ros/submodules' setup( name=package_name, - version='0.0.2', + version='0.0.3', packages=[package_name, submodules], data_files=[ ('share/ament_index/resource_index/packages',