From 4105f57352112fac1164727ad6fdc3d55a7f08a7 Mon Sep 17 00:00:00 2001 From: Thomas Farstrike Date: Tue, 13 May 2025 18:07:15 +0200 Subject: [PATCH] camtest: adapt to new api --- .../apps/com.example.camtest/assets/camtest.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/internal_filesystem/apps/com.example.camtest/assets/camtest.py b/internal_filesystem/apps/com.example.camtest/assets/camtest.py index 941de852..4b0f1f37 100644 --- a/internal_filesystem/apps/com.example.camtest/assets/camtest.py +++ b/internal_filesystem/apps/com.example.camtest/assets/camtest.py @@ -95,7 +95,7 @@ def qr_button_click(e): def try_capture(): global current_cam_buffer, image_dsc, image, use_webcam if use_webcam: - new_cam_buffer = webcam.capture_grayscale() + new_cam_buffer = cam.capture_grayscale() elif cam.frame_available(): new_cam_buffer = cam.capture() # Returns memoryview if len(new_cam_buffer): @@ -193,12 +193,23 @@ def init_cam(): return None +import webcam + +class Webcam: + def __init__(self): + # webcam.init() returns (obj, capture_grayscale, deinit) + self.obj, self._capture_grayscale, self._deinit = webcam.init() + def capture_grayscale(self): + return self._capture_grayscale(self.obj) + def deinit(self): + return self._deinit(self.obj) + + cam = init_cam() if not cam: print("init cam failed, retrying with webcam...") try: - import webcam - current_cam_buffer = webcam.capture_grayscale() + cam = Webcam() use_webcam = True except Exception as e: print(f"camtest.py: webcam exception: {e}")