add:更新demo注释

demo/eink/Air101/main.lua

@@ -39,7 +39,8 @@ end
 
 sys.taskInit(function()
     eink.model(eink.MODEL_1in54_V2)
-    eink.setup(1, 0,pin.PB01,pin.PA01,pin.PA04,pin.PB04)
+    eink.setup(1, 0,17,1,4,20)
+    -- eink.setup(1, 0,pin.PB01,pin.PA01,pin.PA04,pin.PB04)-- v0006及以后版本可用pin方式
     eink.setWin(200, 200, 0)
     log.info("eink", "end setup")
     -- 稍微等一会,免得墨水屏没初始化完成

demo/gpio/main.lua

@@ -15,9 +15,15 @@ if wdt then
 end
 
 --下面的GPIO引脚编号，请根据实际需要进行更改！
+--[[-- v0006及以后版本可用pin方式
 local LEDA = gpio.setup(pin.PB08, 0, gpio.PULLUP) -- PB8输出模式
 local LEDB = gpio.setup(pin.PB09, 0, gpio.PULLUP) -- PB9输出模式
 local LEDC = gpio.setup(pin.PB10, 0, gpio.PULLUP) -- PB10输出模式
+]]
+
+local LEDA = gpio.setup(24, 0, gpio.PULLUP) -- PB8输出模式
+local LEDB = gpio.setup(25, 0, gpio.PULLUP) -- PB9输出模式
+local LEDC = gpio.setup(26, 0, gpio.PULLUP) -- PB10输出模式
 
 sys.taskInit(function()
     local count = 0

demo/lcd/Air101/main.lua

@@ -23,6 +23,24 @@ SPI0_MOSI              (PB5)
 wdt.init(15000)--初始化watchdog设置为15s
 sys.timerLoopStart(wdt.feed, 10000)--10s喂一次狗
 
+spi_lcd = spi.deviceSetup(0,20,0,0,8,2000000,spi.MSB,1,1)
+
+-- log.info("lcd.init",
+-- lcd.init("gc9a01",{port = "device",pin_dc = 17, pin_pwr = 16,pin_rst = 19,direction = 0,w = 240,h = 320,xoffset = 0,yoffset = 0},spi_lcd))
+-- log.info("lcd.init",
+-- lcd.init("st7789",{port = "device",pin_dc = 17, pin_pwr = 16,pin_rst = 19,direction = 0,w = 240,h = 240,xoffset = 0,yoffset = 0},spi_lcd))
+-- log.info("lcd.init",
+-- lcd.init("st7789",{port = "device",pin_dc = 17, pin_pwr = 16,pin_rst = 19,direction = 3,w = 240,h = 240,xoffset = 80,yoffset = 0},spi_lcd))
+-- log.info("lcd.init",
+-- lcd.init("st7789",{port = "device",pin_dc = 17, pin_pwr = 16,pin_rst = 19,direction = 3,w = 320,h = 240,xoffset = 0,yoffset = 0},spi_lcd))
+-- log.info("lcd.init",
+-- lcd.init("st7735",{port = "device",pin_dc = 17, pin_pwr = 7,pin_rst = 19,direction = 0,w = 128,h = 160,xoffset = 2,yoffset = 1},spi_lcd))
+-- log.info("lcd.init",
+-- lcd.init("st7735v",{port = "device",pin_dc = 17, pin_pwr = 16,pin_rst = 19,direction = 1,w = 160,h = 80,xoffset = 0,yoffset = 24},spi_lcd))
+log.info("lcd.init",
+lcd.init("st7735s",{port = "device",pin_dc = 17, pin_pwr = 7,pin_rst = 19,direction = 2,w = 160,h = 80,xoffset = 1,yoffset = 26},spi_lcd))
+
+--[[-- v0006及以后版本可用pin方式
 spi_lcd = spi.deviceSetup(0,pin.PB04,0,0,8,2000000,spi.MSB,1,1)
 
 -- log.info("lcd.init",
@@ -39,11 +57,13 @@ spi_lcd = spi.deviceSetup(0,pin.PB04,0,0,8,2000000,spi.MSB,1,1)
 -- lcd.init("st7735v",{port = "device",pin_dc = pin.PB01, pin_pwr = pin.PB00,pin_rst = pin.PB03,direction = 1,w = 160,h = 80,xoffset = 0,yoffset = 24},spi_lcd))
 log.info("lcd.init",
 lcd.init("st7735s",{port = "device",pin_dc = pin.PB01, pin_pwr = pin.PB00,pin_rst = pin.PB03,direction = 2,w = 160,h = 80,xoffset = 1,yoffset = 26},spi_lcd))
+]]
 
 log.info("lcd.drawLine", lcd.drawLine(20,20,150,20,0x001F))
 log.info("lcd.drawRectangle", lcd.drawRectangle(20,40,120,70,0xF800))
 log.info("lcd.drawCircle", lcd.drawCircle(50,50,20,0x0CE0))
 
+
 sys.taskInit(function()
     while 1 do
         sys.wait(500)

demo/lvgl/Air101/main.lua

@@ -25,9 +25,15 @@ sys.timerLoopStart(wdt.feed, 10000)--10s喂一次狗
 
 log.info("hello luatos")
 
-local spi_lcd = spi.deviceSetup(0,pin.PB04,0,0,8,2000000,spi.MSB,1,1)
+spi_lcd = spi.deviceSetup(0,20,0,0,8,2000000,spi.MSB,1,1)
+log.info("lcd.init",
+lcd.init("st7735s",{port = "device",pin_dc = 17, pin_pwr = 7,pin_rst = 19,direction = 2,w = 160,h = 80,xoffset = 1,yoffset = 26},spi_lcd))
+
+--[[-- v0006及以后版本可用pin方式
+spi_lcd = spi.deviceSetup(0,pin.PB04,0,0,8,2000000,spi.MSB,1,1)
 log.info("lcd.init",
 lcd.init("st7735s",{port = "device",pin_dc = pin.PB01, pin_pwr = pin.PB00,pin_rst = pin.PB03,direction = 2,w = 160,h = 80,xoffset = 1,yoffset = 26},spi_lcd))
+]]
 
 log.info("lvgl", lvgl.init())
 lvgl.disp_set_bg_color(nil, 0xFFFFFF)

demo/nimble/nimble_led/main.lua

@@ -20,6 +20,15 @@ end
 
 leds = {}
 if rtos.bsp() == "air101" then -- 与w800/805等价
+    leds["a"] = gpio.setup(24, 0, gpio.PULLUP) -- PB_08,输出模式
+    leds["b"] = gpio.setup(25, 0, gpio.PULLUP) -- PB_09,输出模式
+    leds["c"] = gpio.setup(26, 0, gpio.PULLUP) -- PB_10,输出模式
+elseif rtos.bsp() == "air103" then -- 与w806等价
+    leds["a"] = gpio.setup(40, 0, gpio.PULLUP) -- PB_24,输出模式
+    leds["b"] = gpio.setup(41, 0, gpio.PULLUP) -- PB_25,输出模式
+    leds["c"] = gpio.setup(42, 0, gpio.PULLUP) -- PB_26,输出模式
+
+--[[-- v0006及以后版本可用pin方式
     leds["a"] = gpio.setup(pin.PB08, 0, gpio.PULLUP) -- PB_08,输出模式
     leds["b"] = gpio.setup(pin.PB09, 0, gpio.PULLUP) -- PB_09,输出模式
     leds["c"] = gpio.setup(pin.PB10, 0, gpio.PULLUP) -- PB_10,输出模式
@@ -27,6 +36,7 @@ elseif rtos.bsp() == "air103" then -- 与w806等价
     leds["a"] = gpio.setup(pin.PB24, 0, gpio.PULLUP) -- PB_24,输出模式
     leds["b"] = gpio.setup(pin.PB25, 0, gpio.PULLUP) -- PB_25,输出模式
     leds["c"] = gpio.setup(pin.PB26, 0, gpio.PULLUP) -- PB_26,输出模式
+]]
 else
     log.info("gpio", "pls add gpio.setup for you board")
 end
@@ -41,7 +51,7 @@ end
 local bulingbuling = sys.timerLoopStart(led_bulingbuling, 1000)
 
 if lcd then
-    spi_lcd = spi.deviceSetup(0,pin.PB04,0,0,8,20*1000*1000,spi.MSB,1,1)
+    spi_lcd = spi.deviceSetup(0,20,0,0,8,20*1000*1000,spi.MSB,1,1)
     lcd.setColor(0x0000,0xFFFF)
     log.info("lcd.init",
     lcd.init("st7735s",{port = "device",pin_dc = 17, pin_pwr = 7,pin_rst = 19,direction = 2,w = 160,h = 80,xoffset = 1,yoffset = 26},spi_lcd))
@@ -53,12 +63,18 @@ else
     log.info("lcd", "lcd not found, display is off")
 end
 
+gpio.setup(0, function(val) print("PA0 R",val) if lcd then lcd.fill(0,40,160,80) if val == 0 then lcd.drawStr(50,60,"R down",0x07E0) end end end, gpio.PULLUP)
+gpio.setup(7, function(val) print("PA7 U",val) if lcd then lcd.fill(0,40,160,80) if  val == 0 then lcd.drawStr(50,60,"U down",0x07E0) end end end, gpio.PULLUP)
+gpio.setup(4, function(val) print("PA4 C",val) if lcd then lcd.fill(0,40,160,80) if  val == 0 then lcd.drawStr(50,60,"C down",0x07E0) end end end, gpio.PULLUP)
+gpio.setup(1, function(val) print("PA1 L",val) if lcd then lcd.fill(0,40,160,80) if  val == 0 then lcd.drawStr(50,60,"L down",0x07E0) end end end, gpio.PULLUP)
+gpio.setup(27, function(val) print("PB11 D",val) if lcd then lcd.fill(0,40,160,80) if  val == 0 then lcd.drawStr(50,60,"D down",0x07E0) end end end, gpio.PULLUP)
+--[[-- v0006及以后版本可用pin方式
 gpio.setup(pin.PA00, function(val) print("PA0 R",val) if lcd then lcd.fill(0,40,160,80) if val == 0 then lcd.drawStr(50,60,"R down",0x07E0) end end end, gpio.PULLUP)
 gpio.setup(pin.PA07, function(val) print("PA7 U",val) if lcd then lcd.fill(0,40,160,80) if  val == 0 then lcd.drawStr(50,60,"U down",0x07E0) end end end, gpio.PULLUP)
 gpio.setup(pin.PA04, function(val) print("PA4 C",val) if lcd then lcd.fill(0,40,160,80) if  val == 0 then lcd.drawStr(50,60,"C down",0x07E0) end end end, gpio.PULLUP)
 gpio.setup(pin.PA01, function(val) print("PA1 L",val) if lcd then lcd.fill(0,40,160,80) if  val == 0 then lcd.drawStr(50,60,"L down",0x07E0) end end end, gpio.PULLUP)
 gpio.setup(pin.PB11, function(val) print("PB11 D",val) if lcd then lcd.fill(0,40,160,80) if  val == 0 then lcd.drawStr(50,60,"D down",0x07E0) end end end, gpio.PULLUP)
-
+]]
 
 function decodeURI(s)
     s = string.gsub(s, '%%(%x%x)', function(h) return string.char(tonumber(h, 16)) end)

demo/video_play/Air101/main.lua

@@ -20,10 +20,15 @@ sys.taskInit(function()
     sdio.init(0)
     sdio.sd_mount(0,"/sd",0)
 
-    local spi_lcd = spi.deviceSetup(0,pin.PB04,0,0,8,2000000,spi.MSB,1,1)
+    spi_lcd = spi.deviceSetup(0,20,0,0,8,2000000,spi.MSB,1,1)
+    log.info("lcd.init",
+    lcd.init("st7735s",{port = "device",pin_dc = 17, pin_pwr = 7,pin_rst = 19,direction = 2,w = 160,h = 80,xoffset = 1,yoffset = 26},spi_lcd))
+    
+--[[-- v0006及以后版本可用pin方式
+    spi_lcd = spi.deviceSetup(0,pin.PB04,0,0,8,2000000,spi.MSB,1,1)
     log.info("lcd.init",
     lcd.init("st7735s",{port = "device",pin_dc = pin.PB01, pin_pwr = pin.PB00,pin_rst = pin.PB03,direction = 2,w = 160,h = 80,xoffset = 1,yoffset = 26},spi_lcd))
-
+]]
     -- 使用ffmpeg.exe将视频转成字节流文件video2.rgb放入TF卡
     local file_size = fs.fsize("/sd/video2.rgb")
     print("/sd/video2.rgb file_size",file_size)