From 7d792b27630067962534d51aa68aba5d7d756d82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B1=86=E8=B1=86?= <1491766334@qq.com> Date: Tue, 4 Mar 2025 15:48:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0usb=E6=91=84=E5=83=8F?= =?UTF-8?q?=E5=A4=B4=E7=AB=AF=E5=8F=A3=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/camera/luat_lib_camera.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/components/camera/luat_lib_camera.c b/components/camera/luat_lib_camera.c index 89361690..80525952 100644 --- a/components/camera/luat_lib_camera.c +++ b/components/camera/luat_lib_camera.c @@ -161,6 +161,14 @@ static int l_camera_init(lua_State *L){ conf.id = luaL_checkinteger(L, -1); } lua_pop(L, 1); + + lua_pushliteral(L, "usb_port"); + lua_gettable(L, 1); + if (lua_isinteger(L, -1)) { + conf.usb_port = luaL_checkinteger(L, -1); + } + lua_pop(L, 1); + lua_pushliteral(L, "init_cmd"); lua_gettable(L, 1); if (lua_istable(L, -1)) { From 99b2769d77a3a113a8fc1539544866f0997d343a Mon Sep 17 00:00:00 2001 From: doudou <1491766334@qq.com> Date: Tue, 4 Mar 2025 15:52:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?update:usb=20camera=20demo=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/camera/usb_cam/main.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/demo/camera/usb_cam/main.lua b/demo/camera/usb_cam/main.lua index a2d3da33..43e236e8 100644 --- a/demo/camera/usb_cam/main.lua +++ b/demo/camera/usb_cam/main.lua @@ -15,7 +15,8 @@ local camera_id = camera.USB local usb_camera_table = { id = camera_id, sensor_width = 1280, - sensor_height = 720 + sensor_height = 720, + usb_port = 1 } camera.on(camera_id, "scanned", function(id, str) From df35e1490777c00b129e87848031834814c2e914 Mon Sep 17 00:00:00 2001 From: Wendal Chen Date: Tue, 4 Mar 2025 17:29:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E6=91=84=E5=83=8F=E5=A4=B4=E5=BA=93?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E5=A4=B1=E8=B4=A5,=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E4=B9=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/camera/luat_camera.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/camera/luat_camera.h b/components/camera/luat_camera.h index 81dd7501..032b8009 100644 --- a/components/camera/luat_camera.h +++ b/components/camera/luat_camera.h @@ -44,6 +44,7 @@ typedef struct luat_camera_conf uint8_t color_bit; uint8_t id_reg; uint8_t id_value; + uint8_t usb_port; size_t init_cmd_size; uint8_t *init_cmd; #ifdef __LUATOS__ @@ -66,6 +67,7 @@ typedef struct uint8_t is_msb; //0 or 1; uint8_t is_two_line_rx; //0 or 1; uint8_t seq_type; //0 or 1 + uint8_t usb_port; uint8_t plat_param[4]; #ifdef __LUATOS__ luat_lcd_conf_t* lcd_conf;