Skip to content

Commit d0847cd

Browse files
committed
more pylint fixing
1 parent 6cd0017 commit d0847cd

File tree

3 files changed

+15
-17
lines changed

3 files changed

+15
-17
lines changed

modules/camera/camera_arducamir.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,24 @@ class CameraArducamIR(base_camera.BaseCameraDevice):
3030
__create_key = object()
3131

3232
@classmethod
33-
def create(cls) -> "tuple[True, CameraArducamIR] | tuple[False, None]":
33+
def create(cls, width: int, height: int, config: None) -> "tuple[True, CameraArducamIR] | tuple[False, None]":
3434
# TODO: Do I need a create() function, if there are no invalid inputs?
3535

3636
camera = Camera()
3737

38-
return True, CameraArducamIR(cls.__create_key, camera)
38+
return True, CameraArducamIR(cls.__create_key, camera, width, height, config)
3939

40-
def __init__(self, class_private_create_key: object, camera: ArducamEvkSDK.Camera) -> None:
40+
def __init__(self, class_private_create_key: object, camera: ArducamEvkSDK.Camera, width: int, height: int, config:None) -> None:
4141
"""
4242
Private constructor, use create() method.
4343
"""
4444
assert class_private_create_key is CameraArducamIR.__create_key, "Use create() method."
4545

46+
# TODO: Nonsense for passing pylint
47+
self.width = width
48+
self.height = height
49+
self.config = config
50+
4651
param = Param()
4752
param.config_file_name = "config.cfg"
4853

modules/camera/camera_factory.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ def create_camera(
3939
case CameraOption.PICAM2:
4040
return camera_picamera2.CameraPiCamera2.create(width, height, config)
4141
case CameraOption.ARDUCAMIR:
42-
return camera_arducamir.CameraArducamIR.create()
42+
return camera_arducamir.CameraArducamIR.create(width, height, config)
4343

4444
return False, None

tests/integration/test_camera_arducamir.py

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
"""
22
Test ArducamIR camera physically and verifies configuration
33
"""
4-
5-
import pathlib
6-
7-
import cv2
84
import time
9-
import numpy as np
105

11-
import ArducamEvkSDK
12-
from ArducamEvkSDK import Frame
13-
import arducam_rgbir_remosaic
6+
import cv2
147

158
from modules.camera import camera_factory
169
from modules.camera import camera_arducamir
@@ -41,11 +34,11 @@ def main() -> int:
4134
continue
4235

4336
if image.seq % 50 == 0: # Avoiding too many prints, 50 is an arbitrary number
44-
print("Timestamp: [{0:s}]".format(time.ctime(float(image.timestamp / 10**3))))
45-
print("Bit Depth: {0:2d}".format(image.format.bit_depth))
46-
print("Format Code: {0:2d}".format(image.format.format_code))
47-
print("Height: {0:3d}".format(image.format.height))
48-
print("Width: {0:3d}\n".format(image.format.width))
37+
print(f"Timestamp: [{0:s}]",time.ctime(float(image.timestamp / 10**3)))
38+
print("Bit Depth: {0:2d}",image.format.bit_depth)
39+
print("Format Code: {0:2d}",image.format.format_code)
40+
print("Height: {0:3d}",image.format.height)
41+
print("Width: {0:3d}\n",image.format.width)
4942

5043
# Assertions for Arducam cfg config values
5144
assert image.format.bit_depth == 12

0 commit comments

Comments
 (0)