Merge branch 'giga_display_callback' of https://github.com/kurte/ArduinoCore-zephyr into giga_display_callback

Author: KurtE

libraries/Camera/src/camera.cpp

@@ -70,8 +70,8 @@ bool Camera::begin(uint32_t width, uint32_t height, uint32_t pixformat, bool byt
     }
 
     // Get capabilities
-    struct video_caps caps = {0};
-    if (video_get_caps(this->vdev, VIDEO_EP_OUT, &caps)) {
+    struct video_caps caps;
+    if (video_get_caps(this->vdev, &caps)) {
         return false;
     }
 
@@ -96,7 +96,7 @@ bool Camera::begin(uint32_t width, uint32_t height, uint32_t pixformat, bool byt
         .pitch = width * 2,
     };
 
-	if (video_set_format(this->vdev, VIDEO_EP_OUT, &fmt)) {
+	if (video_set_format(this->vdev, &fmt)) {
         Serial.println("Failed to set video format");
 		return false;
 	}
@@ -110,11 +110,11 @@ bool Camera::begin(uint32_t width, uint32_t height, uint32_t pixformat, bool byt
             Serial.println("Failed to allocate video buffers");
 			return false;
 		}
-		video_enqueue(this->vdev, VIDEO_EP_OUT, this->vbuf[i]);
+		video_enqueue(this->vdev, this->vbuf[i]);
 	}
 
 	// Start video capture
-	if (video_stream_start(this->vdev)) {
+	if (video_stream_start(this->vdev, VIDEO_BUF_TYPE_OUTPUT)) {
         Serial.println("Failed to start capture");
 		return false;
 	}
@@ -127,7 +127,7 @@ bool Camera::grabFrame(FrameBuffer &fb, uint32_t timeout) {
         return false;
     }
 
-    if (video_dequeue(this->vdev, VIDEO_EP_OUT, &fb.vbuf, K_MSEC(timeout))) {
+    if (video_dequeue(this->vdev, &fb.vbuf, K_MSEC(timeout))) {
         return false;
     }
 
@@ -154,17 +154,19 @@ bool Camera::releaseFrame(FrameBuffer &fb) {
         return false;
     }
 
-    if (video_enqueue(this->vdev, VIDEO_EP_OUT, fb.vbuf)) {
+    if (video_enqueue(this->vdev, fb.vbuf)) {
         return false;
 	}
 
     return true;
 }
 
 bool Camera::setVerticalFlip(bool flip_enable) {
-    return video_set_ctrl(this->vdev, VIDEO_CID_VFLIP, (void *) flip_enable) == 0;
+  struct video_control ctrl = {.id = VIDEO_CID_VFLIP, .val = flip_enable};
+    return video_set_ctrl(this->vdev, &ctrl) == 0;
 }
 
 bool Camera::setHorizontalMirror(bool mirror_enable) {
-    return video_set_ctrl(this->vdev, VIDEO_CID_HFLIP, (void *) mirror_enable) == 0;
+    struct video_control ctrl = {.id = VIDEO_CID_HFLIP, .val = mirror_enable};
+    return video_set_ctrl(this->vdev, &ctrl) == 0;
 }

loader/fixups.c

@@ -220,4 +220,4 @@ int maybe_flash_bootloader(void)
 
 SYS_INIT(maybe_flash_bootloader, POST_KERNEL, CONFIG_FILE_SYSTEM_INIT_PRIORITY);
 
-#endif
+#endif

loader/llext_exports.c

@@ -129,6 +129,12 @@ FORCE_EXPORT_SYM(__stack_chk_fail);
 FORCE_EXPORT_SYM(video_buffer_aligned_alloc);
 FORCE_EXPORT_SYM(video_buffer_alloc);
 FORCE_EXPORT_SYM(video_buffer_release);
+FORCE_EXPORT_SYM(video_set_ctrl);
+#endif
+#if defined(CONFIG_BOARD_ARDUINO_GIGA_R1) && defined(CONFIG_VIDEO)
+//FORCE_EXPORT_SYM(getVideoTouchEvent);
+FORCE_EXPORT_SYM(registerGigaTouchCallback);
+
 #endif
 #if defined(CONFIG_BOARD_ARDUINO_GIGA_R1) && defined(CONFIG_VIDEO)
 //FORCE_EXPORT_SYM(getVideoTouchEvent);

variants/arduino_giga_r1_stm32h747xx_m7/arduino_giga_r1_stm32h747xx_m7.conf

@@ -45,4 +45,6 @@ CONFIG_VIDEO_BUFFER_SMH_ATTRIBUTE=2
 CONFIG_VIDEO_GC2145=y
 
 CONFIG_DISPLAY=y
-CONFIG_INPUT=y
+CONFIG_INPUT=y
+CONFIG_STM32_LTDC_FB_USE_SHARED_MULTI_HEAP=y
+CONFIG_STM32_LTDC_FB_SMH_ATTRIBUTE=2