Removed the mock camera entirely as the image path can be passed dire…

…ctly in via the device id

Added capture_0024.png to all captures as the capture device always reads one image ahead
Added mailmap for old email addresses

.mailmap

@@ -0,0 +1,2 @@
+The Mariday <martinsa0182@gmail.com> Samuel <martinsa0182@gmail.com>
+The Mariday <martinsa0182@gmail.com> sam <martinsa0182@gmail.com>

lib/camera.py

@@ -37,7 +37,6 @@ def __init__(self, device_id):
 
         if not self.device.isOpened():
             logging.error(f"Failed to connect to camera {device_id}")
-            quit()
 
         self.set_resolution(self.get_width(), self.get_height())  # Don't ask
 
@@ -77,8 +76,6 @@ def set_resolution(self, width, height):
                 f"Failed to set camera {self.device_id} resolution to {width} x {height}",
             )
 
-        self.device.read()  # do not remove! do not ask why, just accept it
-
         logging.debug(f"Camera resolution set to {new_width} x {new_height}")
 
     def set_autofocus(self, mode, focus=0):

test/test_capture_sequence.py

@@ -2,7 +2,6 @@
 
 from lib.reconstructor import Reconstructor
 from lib.led_map_2d import LEDMap2D
-from mock_camera import MockCamera
 
 
 def test_capture_sequence():
@@ -12,16 +11,11 @@ def test_capture_sequence():
 
     for view_index in range(9):
 
-        mock_camera = MockCamera(device_id=view_index)
-
         reconstructor = Reconstructor(
-            device=view_index,
+            device=f"test/MariMapper-Test-Data/9_point_box/cam_{view_index}/capture_%04d.png",
             dark_exposure=-10,
             threshold=128,
             led_backend=None,
-            width=mock_camera.get_width(),
-            height=mock_camera.get_height(),
-            camera=mock_camera,
         )
 
         led_map_2d = LEDMap2D()

test/test_led_identifier.py

@@ -1,5 +1,5 @@
 from lib.led_identifier import LedFinder
-from mock_camera import MockCamera
+from lib.camera import Camera
 
 
 def close(x, y):
@@ -13,7 +13,7 @@ def test_init():
 def test_basic_image_loading():
     led_finder = LedFinder()
 
-    mock_camera = MockCamera()
+    mock_camera = Camera("test/MariMapper-Test-Data/9_point_box/cam_0/capture_0000.png")
 
     detection = led_finder.find_led(mock_camera.read())
     assert close(detection.u, 0.4029418361244019)
@@ -23,9 +23,10 @@ def test_basic_image_loading():
 def test_none_found():
     led_finder = LedFinder()
 
-    mock_camera = MockCamera()
+    mock_camera = Camera("test/MariMapper-Test-Data/9_point_box/cam_0/capture_%04d.png")
 
-    for frame_id in [7, 15, 23]:  # None of these should be visible from any views
-        frame = mock_camera.read_frame(frame_id)
-        led_results = led_finder.find_led(frame)
-        assert led_results is None
+    for frame_id in range(24):
+        frame = mock_camera.read()
+        if frame_id in [7, 15, 23]:
+            led_results = led_finder.find_led(frame)
+            assert led_results is None