CameraManager: support rotated cameras

ThomasFarstrike · ThomasFarstrike · commit 9ef1cc8e7b24 · 2026-02-11T21:08:00.000+01:00
diff --git a/internal_filesystem/lib/mpos/board/linux.py b/internal_filesystem/lib/mpos/board/linux.py
@@ -14,12 +14,12 @@
 TFT_VER_RES=240
 
 # Fri3d Camp 2024 Badge:
-#TFT_HOR_RES=296
-#TFT_VER_RES=240
+TFT_HOR_RES=296
+TFT_VER_RES=240
 
 # Makerfabs / Matouch
-TFT_HOR_RES=240
-TFT_VER_RES=320
+#TFT_HOR_RES=240
+#TFT_VER_RES=320
 
 # Bigger screen
 #TFT_HOR_RES=640
diff --git a/internal_filesystem/lib/mpos/board/waveshare_esp32_s3_touch_lcd_2.py b/internal_filesystem/lib/mpos/board/waveshare_esp32_s3_touch_lcd_2.py
@@ -197,7 +197,8 @@ def apply_cam_settings(cam_obj, prefs):
     init=init_cam,
     deinit=deinit_cam,
     capture=capture_cam,
-    apply_settings=apply_cam_settings
+    apply_settings=apply_cam_settings,
+    rotation_degrees=-90 # camera is rotated 90 degrees counterclockwise so -90 degrees clockwise
 ))
 
 print("waveshare_esp32_s3_touch_lcd_2.py finished")
diff --git a/internal_filesystem/lib/mpos/camera_manager.py b/internal_filesystem/lib/mpos/camera_manager.py
@@ -37,14 +37,15 @@ class Camera:
     Represents a camera device with its characteristics.
     """
 
-    def __init__(self, lens_facing, name=None, vendor=None, version=None, init=None, deinit=None, capture=None, apply_settings=None):
+    def __init__(self, lens_facing, name=None, vendor=None, version=None, init=None, deinit=None, capture=None, apply_settings=None, rotation_degrees=0):
         """Initialize camera metadata.
 
         Args:
             lens_facing: Camera orientation (LENS_FACING_BACK, LENS_FACING_FRONT, etc.)
             name: Human-readable camera name (e.g., "OV5640", "Front Camera")
             vendor: Camera vendor/manufacturer (e.g., "OmniVision")
             version: Driver version (default 1)
+            rotation_degrees: how many degrees the camera is rotated clockwise
         """
         self.lens_facing = lens_facing
         self.name = name or "Camera"
@@ -54,6 +55,7 @@ def __init__(self, lens_facing, name=None, vendor=None, version=None, init=None,
         self.deinit_function = deinit
         self.capture_function = capture
         self.apply_settings_function = apply_settings
+        self.rotation_degrees = rotation_degrees
 
     def __repr__(self):
         facing_names = {
@@ -80,6 +82,10 @@ def apply_settings(self, cam_obj, prefs):
         if self.apply_settings_function:
             return self.apply_settings_function(cam_obj, prefs)
 
+    def get_rotation_degrees(self):
+        return self.rotation_degrees
+
+
 class CameraManager:
     """
     Centralized camera device management service.
diff --git a/internal_filesystem/lib/mpos/ui/camera_activity.py b/internal_filesystem/lib/mpos/ui/camera_activity.py
@@ -153,10 +153,12 @@ def resize_buttons(self):
 
     def start_cam(self):
         # Init camera:
-        self.cam = CameraManager.get_cameras()[0].init(self.width, self.height, self.colormode)
+        firstcam = CameraManager.get_cameras()[0]
+        self.cam = firstcam.init(self.width, self.height, self.colormode)
         if self.cam:
+            self.image.set_rotation(-10 * firstcam.get_rotation_degrees()) # counter the rotation so * -1 and convert to tens-of-a-degree for LVGL
             # Apply saved camera settings, only for internal camera for now:
-            CameraManager.get_cameras()[0].apply_settings(self.cam, self.scanqr_prefs if self.scanqr_mode else self.prefs) # needs to be done AFTER the camera is initialized
+            firstcam.apply_settings(self.cam, self.scanqr_prefs if self.scanqr_mode else self.prefs) # needs to be done AFTER the camera is initialized
             # Start refreshing:
             print("Camera app initialized, continuing...")
             self.update_preview_image()
