Merge branch 'master' of https://gitee.com/openLuat/LuatOS

components/lcd/luat_lib_lcd.c

@@ -611,7 +611,7 @@ static int l_lcd_set_direction(lua_State* L) {
 }
 
 /*
-控制lcd reset pin拉高或者拉低
+控制lcd reset pin拉高或者拉低,2025/9/5启用
 @api lcd.reset(level)
 @int reset脚电平，1高电平，0低电平
 @usage

luat/demo/camera/spi_cam/main.lua

@@ -66,7 +66,7 @@ local result = uart.setup(uartid, -- 串口id
     1 -- 停止位
 )
 
-camera.on(0, "scanned", function(id, str)
+local function cb(id, str)
     if type(str) == 'string' then
         log.info("扫码结果", str)
     elseif str == false then
@@ -75,7 +75,8 @@ camera.on(0, "scanned", function(id, str)
         log.info("摄像头数据", str)
         sys.publish("capture done", true)
     end
-end)
+end
+
 
 local function press_key()
     log.info("boot press")
@@ -108,7 +109,7 @@ sys.taskInit(function()
     i2c.setup(i2cId, i2c.FAST)
     gpio.setup(5, 0) -- PD拉低
     camera_id = device_init()
-    
+	camera.on(camera_id, "scanned", cb)
     if DONE_WITH_CLOSE then
         camera.close(camera_id)
     else

module/Air8000/demo/ble/peripheral/ble_server_main.lua

@@ -45,7 +45,7 @@ local att_db = {
         ble.NOTIFY | ble.READ | ble.WRITE
     }, { -- Characteristic 2 (Write)
         string.fromHex(config.char_uuid2),
-        ble.WRITE
+        ble.WRITE | ble.WRITE_CMD -- ble.WRITE_CMD表示支持Write Without Response写入
     }, { -- Characteristic 3 (Read)
         string.fromHex(config.char_uuid3),
         ble.READ

module/Air8101/demo/ble/peripheral/ble_server_main.lua

@@ -45,7 +45,7 @@ local att_db = {
         ble.NOTIFY | ble.READ | ble.WRITE
     }, { -- Characteristic 2 (Write)
         string.fromHex(config.char_uuid2),
-        ble.WRITE
+        ble.WRITE | ble.WRITE_CMD -- ble.WRITE_CMD表示支持Write Without Response写入
     }, { -- Characteristic 3 (Read)
         string.fromHex(config.char_uuid3),
         ble.READ