fixing minor issues for PR

Author: oliad1

modules/camera/camera_arducamir.py

@@ -7,11 +7,12 @@
 import cv2
 
 import ArducamEvkSDK
-from ArducamEvkSDK import Camera, Frame, Param
 import arducam_rgbir_remosaic
 
 from . import base_camera
 
+CAMERA_CONFIG_DIR = "./config/camera_config.cfg"
+
 
 class ArducamOutput(enum.Enum):
     """
@@ -34,13 +35,12 @@ def create(
         cls, width: int, height: int, config: None
     ) -> "tuple[True, CameraArducamIR] | tuple[False, None]":
 
-        camera = Camera()
+        camera = ArducamEvkSDK.Camera()
 
-        param = Param()
-        param.config_file_name = "./config/camera_config.cfg"
+        param = ArducamEvkSDK.Param()
+        param.config_file_name = CAMERA_CONFIG_DIR
 
         if not camera.open(param):
-            print("Error trying to open Arducam camera")
             return False, None
 
         return True, CameraArducamIR(cls.__create_key, camera)
@@ -66,7 +66,7 @@ def __del__(self) -> None:
         self.__camera.stop()
         self.__camera.close()
 
-    def run(self) -> tuple[True, Frame] | tuple[False, None]:
+    def run(self) -> tuple[True, ArducamEvkSDK.Frame] | tuple[False, None]:
         """
         Takes a picture with ArducamIR camera.
 
@@ -78,7 +78,7 @@ def run(self) -> tuple[True, Frame] | tuple[False, None]:
 
         return True, image_data
 
-    def demosaic(self, image: Frame, output: ArducamOutput) -> np.ndarray | None:
+    def demosaic(self, image: ArducamEvkSDK.Frame, output: ArducamOutput) -> np.ndarray | None:
         """
         Converts Bayer Pattern & IR data to OpenCV Matrix
         """
@@ -98,7 +98,7 @@ def demosaic(self, image: Frame, output: ArducamOutput) -> np.ndarray | None:
             return ir_resize
         raise ValueError(f"Error. Invalid output type: {output}")
 
-    def format(self, image: Frame) -> np.ndarray:
+    def format(self, image: ArducamEvkSDK.Frame) -> np.ndarray:
         """
         Formats byte buffer sensor input into 8-bit arrays
         """

modules/camera/camera_factory.py

@@ -37,8 +37,6 @@ def create_camera(
         case CameraOption.PICAM2:
             return camera_picamera2.CameraPiCamera2.create(width, height, config)
         case CameraOption.ARDUCAMIR:
-            if config is not None:  # ArducamIR does not have configurable settings
-                return False, None
             return camera_arducamir.CameraArducamIR.create(width, height, config)
 
     return False, None

tests/integration/test_camera_arducamir.py

@@ -31,7 +31,7 @@ def main() -> int:
             continue
 
         if image.seq % 50 == 0:  # Avoiding too many prints, 50 is an arbitrary number
-            print(f"Timestamp: [{0:s}]", time.ctime(float(image.timestamp / 10**3)))
+            print("Timestamp: [{0:s}]", time.ctime(float(image.timestamp / 10**3)))
             print("Bit Depth: {0:2d}", image.format.bit_depth)
             print("Format Code: {0:2d}", image.format.format_code)
             print("Height: {0:3d}", image.format.height)