Merge branch 'main' into realsense_fix

airo-ugent · Jan 25, 2024 · f10e847 · f10e847
2 parents 2ad1b9d + 9e4e880
commit f10e847
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,8 @@ This project uses a [CalVer](https://calver.org/) versioning scheme with monthly
 ### Fixed
 - Fixed bug in `get_colored_point_cloud()` that removed some points see issue #25.
 - Fixed bug requiring unplug-and-plug of USB cable for Realsense: see issue #109.
+- Removed camera imports in `airo_camera_toolkit.cameras`: see issue #110.
+- Added `__init__.py` to `realsense` and `utils` in `airo_camera_toolkit.cameras`, fixing installs with pip and issue #113.
 
 ### Removed
 - `ColoredPointCloudType`

diff --git a/airo-camera-toolkit/airo_camera_toolkit/cameras/__init__.py b/airo-camera-toolkit/airo_camera_toolkit/cameras/__init__.py
@@ -1,2 +0,0 @@
-from airo_camera_toolkit.cameras.realsense.realsense import Realsense  # noqa: F401
-from airo_camera_toolkit.cameras.zed.zed2i import Zed2i  # noqa: F401

diff --git a/airo-camera-toolkit/airo_camera_toolkit/cameras/realsense/__init__.py b/airo-camera-toolkit/airo_camera_toolkit/cameras/realsense/__init__.py
diff --git a/airo-camera-toolkit/airo_camera_toolkit/utils/__init__.py b/airo-camera-toolkit/airo_camera_toolkit/utils/__init__.py
Original file line number	Diff line number	Diff line change
		@@ -1,2 +0,0 @@
		from airo_camera_toolkit.cameras.realsense.realsense import Realsense # noqa: F401
		from airo_camera_toolkit.cameras.zed.zed2i import Zed2i # noqa: F401