update: 清理部分重复demo

demo/crypto/Air101/main.lua

@@ -1,46 +0,0 @@
-
--- LuaTools需要PROJECT和VERSION这两个信息
-PROJECT = "cryptodemo"
-VERSION = "1.0.0"
-
-log.info("main", PROJECT, VERSION)
-
--- sys库是标配
-_G.sys = require("sys")
-
---添加硬狗防止程序卡死
-wdt.init(15000)--初始化watchdog设置为15s
-sys.timerLoopStart(wdt.feed, 10000)--10s喂一次狗
-
-sys.timerLoopStart(function()
-    --sys.wait(3000) -- 开机后展示crypto功能
-
-    -- MD5,输出结果已经hex编码
-    log.info("md5", crypto.md5("abc"))
-    log.info("hmac_md5", crypto.hmac_md5("abc", "1234567890"))
-
-    -- SHA1,输出结果已经hex编码
-    log.info("sha1", crypto.sha1("abc"))
-    log.info("hmac_sha1", crypto.hmac_sha1("abc", "1234567890"))
-
-    -- SHA256,输出结果已经hex编码
-    log.info("sha256", crypto.sha256("abc"))
-    log.info("hmac_sha256", crypto.hmac_sha256("abc", "1234567890"))
-
-    -- SHA512,输出结果已经hex编码
-    log.info("sha512", crypto.sha512("abc"))
-    log.info("hmac_sha512", crypto.hmac_sha512("abc", "1234567890"))
-
-
-end, 2000)
-
-sys.taskInit(function()
-    while 1 do
-        sys.wait(500)
-    end
-end)
-
--- 用户代码已结束---------------------------------------------
--- 结尾总是这一句
-sys.run()
--- sys.run()之后后面不要加任何语句!!!!!

demo/crypto/Air302/main.lua

@@ -1,56 +0,0 @@
-
--- LuaTools需要PROJECT和VERSION这两个信息
-PROJECT = "cryptodemo"
-VERSION = "1.0.0"
-
--- sys库是标配
-_G.sys = require("sys")
-
--- 日志TAG, 非必须
-local NETLED = gpio.setup(19, 0)
-
-sys.taskInit(function()
-    while 1 do
-        if socket.isReady() then
-            NETLED(1)
-            sys.wait(100)
-            NETLED(0)
-            sys.wait(1900)
-        else
-            NETLED(1)
-            sys.wait(500)
-            NETLED(0)
-            sys.wait(500)
-        end
-    end
-end)
-
-sys.timerLoopStart(function()
-    --sys.wait(3000) -- 开机后展示crypto功能
-
-    -- MD5,输出结果已经hex编码
-    log.info("md5", crypto.md5("abc"))
-    log.info("hmac_md5", crypto.hmac_md5("abc", "1234567890"))
-
-    -- SHA1,输出结果已经hex编码
-    log.info("sha1", crypto.sha1("abc"))
-    log.info("hmac_sha1", crypto.hmac_sha1("abc", "1234567890"))
-
-    -- AES加密, 未经Hex编码. AES-128-ECB 算法,待加密字符串如果超过32字节会报错,待查. by wendal 20200812
-    local data_encrypt = crypto.cipher_encrypt("AES-128-ECB", "PKCS7", "12345678901234 > " .. nbiot.imei(), "1234567890123456")
-    local data2_encrypt = crypto.cipher_encrypt("AES-128-CBC", "PKCS7", "12345678901234 > ".. nbiot.imei(), "1234567890123456", "1234567890666666")
-    log.info("AES", data_encrypt:toHex())
-    log.info("AES", data2_encrypt:toHex())
-
-    -- AES解密, 未经Hex编码
-    local data_decrypt = crypto.cipher_decrypt("AES-128-ECB", "PKCS7", data_encrypt, "1234567890123456")
-    local data2_decrypt = crypto.cipher_decrypt("AES-128-CBC", "PKCS7", data2_encrypt, "1234567890123456", "1234567890666666")
-    log.info("AES", data_decrypt)
-    log.info("AES", data2_decrypt)
-    log.info("mem", rtos.meminfo("sys"))
-end, 2000)
-
--- 用户代码已结束---------------------------------------------
--- 结尾总是这一句
-sys.run()
--- sys.run()之后后面不要加任何语句!!!!!

demo/crypto/Air724/main.lua → demo/crypto/main.lua

@@ -3,30 +3,18 @@
 PROJECT = "cryptodemo"
 VERSION = "1.0.0"
 
+log.info("main", PROJECT, VERSION)
+
 -- sys库是标配
 _G.sys = require("sys")
 
--- 网络灯, 非必须
-local NETLED = gpio.setup(1, 0)
-
-sys.taskInit(function()
-    while 1 do
-        if socket.isReady() then
-            NETLED(1)
-            sys.wait(100)
-            NETLED(0)
-            sys.wait(1900)
-        else
-            NETLED(1)
-            sys.wait(500)
-            NETLED(0)
-            sys.wait(500)
-        end
-    end
-end)
+if wdt.init then
+    --添加硬狗防止程序卡死，在支持的设备上启用这个功能
+    wdt.init(15000)--初始化watchdog设置为15s
+    sys.timerLoopStart(wdt.feed, 10000)--10s喂一次狗
+end
 
 sys.timerLoopStart(function()
-    --sys.wait(3000) -- 开机后展示crypto功能
 
     -- MD5,输出结果已经hex编码
     log.info("md5", crypto.md5("abc"))
@@ -45,8 +33,8 @@ sys.timerLoopStart(function()
     log.info("hmac_sha512", crypto.hmac_sha512("abc", "1234567890"))
 
     -- AES加密, 未经Hex编码. AES-128-ECB 算法,待加密字符串如果超过32字节会报错,待查. by wendal 20200812
-    local data_encrypt = crypto.cipher_encrypt("AES-128-ECB", "PKCS7", "12345678901234 > " .. lte.imei(), "1234567890123456")
-    local data2_encrypt = crypto.cipher_encrypt("AES-128-CBC", "PKCS7", "12345678901234 > ".. lte.imei(), "1234567890123456", "1234567890666666")
+    local data_encrypt = crypto.cipher_encrypt("AES-128-ECB", "PKCS7", "12345678901234 > 123456", "1234567890123456")
+    local data2_encrypt = crypto.cipher_encrypt("AES-128-CBC", "PKCS7", "12345678901234 > 123456", "1234567890123456", "1234567890666666")
     log.info("AES", data_encrypt:toHex())
     log.info("AES", data2_encrypt:toHex())
 
@@ -55,10 +43,16 @@ sys.timerLoopStart(function()
     local data2_decrypt = crypto.cipher_decrypt("AES-128-CBC", "PKCS7", data2_encrypt, "1234567890123456", "1234567890666666")
     log.info("AES", data_decrypt)
     log.info("AES", data2_decrypt)
-    log.info("mem", "vm", rtos.meminfo())
-    log.info("mem", "sys", rtos.meminfo("sys"))
+    log.info("mem", rtos.meminfo("sys"))
+
 end, 2000)
 
+sys.taskInit(function()
+    while 1 do
+        sys.wait(500)
+    end
+end)
+
 -- 用户代码已结束---------------------------------------------
 -- 结尾总是这一句
 sys.run()

demo/dht12/Air640w/main.lua

@@ -1,49 +0,0 @@
--- LuaTools需要PROJECT和VERSION这两个信息
-PROJECT = "dht12demo"
-VERSION = "1.0.0"
-
--- 引入必要的库文件(lua编写), 内部库不需要require
-local sys = require "sys"
-
--- 初始化并打开I2C操作DHT12
-local function read_dht12(id)
-    --if i2c.setup(id, i2c.SLOW) ~= i2c.SLOW then
-    --    log.error("I2C.init is: ", "fail")
-    --    i2c.close(id)
-    --    return
-    --end
-    local addr = 0xB8
-    i2c.writeReg(id, addr, 0x00, 0x00)
-    sys.wait(400)
-    local data = i2c.recv(id, addr, 5)
-    --i2c.close(id)
-    log.info("DHT12", data:byte(1), data:byte(2), data:byte(3), data:byte(4), data:byte(5))
-    --log.info("DHT12 HEX data: ", data:toHex())
-    -- 分别是湿度整数,湿度小数,温度整数,温度湿度
-    --[[
-    local _, h_H, h_L, t_H, t_L = pack.unpack(data, 'b4')
-    log.info("DHT12 data: ", h_H, h_L, t_H, t_L)
-    -- 需要考虑温度低于0度的情况, t_L第0位是符号位
-    local t_L2 = tonumber(t_L)
-    if t_L2 > 127 then
-        return h_H .. ".".. h_L, "-" .. t_H .. "." .. tostring(t_L2 - 128)
-    else
-        return h_H .. ".".. h_L, t_H .. "." .. t_L
-    end
-    ]]
-end
-
-sys.timerLoopStart(function() print("READY") end, 3000)
-
-
-sys.taskInit(function()
-    while 1 do
-        print("DHT12", read_dht12(1))
-        sys.wait(3000)
-    end
-end)
-
--- 用户代码已结束---------------------------------------------
--- 结尾总是这一句
-sys.run()
--- sys.run()之后后面不要加任何语句!!!!!

demo/dht12/Air302/main.lua → demo/dht12/main.lua

@@ -21,7 +21,7 @@ _G.sys = require("sys")
 --         return
 --     end
 
-    
+
 --     log.info("DHT12 HEX data: ", data:toHex())
 --     -- 分别是湿度整数,湿度小数,温度整数,温度湿度
 --     local _, h_H, h_L, t_H, t_L,crc = pack.unpack(data, 'b5')
@@ -41,11 +41,11 @@ _G.sys = require("sys")
 -- end
 
 sys.taskInit(function()
-    local id = 0
+    local id = 0--i2c的id，请按需更改
     while 1 do
         sys.wait(5000) -- 5秒读取一次
         i2c.setup(id, i2c.SLOW)
-        --log.info("dht12", read_dht12(0)) -- 传统方式读取,请取消read_dht12方法的注释
+        --log.info("dht12", read_dht12(0)) -- 如果想用传统方式读取,请取消read_dht12方法的注释
         log.info("dht12", i2c.readDHT12(id))
         i2c.close(id)
     end

demo/hi/Air724/main.lua

@@ -1,18 +0,0 @@
-
-PROJECT = "hi"
-VERSION = "1.0.0"
-
-local sys = require "sys"
-
-sys.taskInit(function()
-    while 1 do
-        log.info("luatos", "hi", os.date())
-        sys.wait(1000)
-    end
-end)
-
-
--- 用户代码已结束---------------------------------------------
--- 结尾总是这一句
-sys.run()
--- sys.run()之后后面不要加任何语句!!!!!

demo/meminfo/Air724/main.lua → demo/meminfo/main.lua

@@ -4,15 +4,9 @@ VERSION = "1.0.0"
 
 local sys = require "sys"
 
-pmd.ldoset(3200, pmd.LDO_VLCD)
-
 sys.taskInit(function()
-    local netled = gpio.setup(1, 0)
     local count = 1
     while 1 do
-        netled(1)
-        sys.wait(1000)
-        netled(0)
         sys.wait(1000)
         log.info("luatos", "hi", count, os.date())
         log.info("luatos", rtos.meminfo())

demo/memtest/Air724/main.lua

@@ -1,36 +0,0 @@
-
---[[
-    内存连续性测试, 测试字符串最大长度
-]]
-
-PROJECT = "memtest"
-VERSION = "1.0.0"
-
-local sys = require "sys"
-
-pmd.ldoset(3000, pmd.LDO_VLCD)
-pmd.ldoset(3000, pmd.LDO_VCAM)
-pmd.ldoset(3300, pmd.LDO_VIBR)
-
-sys.taskInit(function()
-    sys.wait(10000) -- 延时10秒启动
-    --local netled = gpio.setup(1, 0)
-    local count = 1
-    local longstr = string.rep( "1024", 1024) -- 4kb
-    local curstr = longstr
-    while 1 do -- 大概500ms增加4kb的长度, 每秒增长8kb
-        --netled(1)
-        sys.wait(250)
-        --netled(0)
-        sys.wait(250)
-        --curstr = curstr .. longstr
-        log.info("luatos", "hi", count, #curstr)
-        count = count + 1
-    end
-end)
-
-
--- 用户代码已结束---------------------------------------------
--- 结尾总是这一句
-sys.run()
--- sys.run()之后后面不要加任何语句!!!!!