update: lbsLoc不应该先等3秒才启动. 优化libs库的部分api注释

script/libs/ads1115.lua

@@ -16,7 +16,7 @@ sys.taskInit(function()
     ads1115.init(i2cid)--初始化,传入i2c_id
     while 1 do
         local ads1115_data = ads1115.get_val()
-        log.info("ads1115_get_val", ads1115_data)
+        log.info("ads1115", ads1115_data)
         sys.wait(1000)
     end
 end)
@@ -120,7 +120,7 @@ local ADS1115_CONF_LCMD	            =   0x83  	-- 128sps 传统比较器 输出
 --[[
 ADS1115初始化
 @api ads1115.init(i2c_id)
-@number i2c_id i2c_id
+@number 所在的i2c总线id
 @return bool   成功返回true
 @usage
 ads1115.init(0)
@@ -128,23 +128,26 @@ ads1115.init(0)
 function ads1115.init(i2c_id)
     i2cid = i2c_id
     -- i2cslaveaddr = ADS1115_ADDRESS_AD0_LOW
-    log.info("ADS1115 init_ok")
+    log.info("ADS1115", "init_ok")
     return true
 end
 
 --[[
 获取ADS1115数据
 @api ads1115.get_val()
-@return number 光照强度数据
+@return number 光照强度数据,若读取失败会返回nil
 @usage
 local ads1115_data = ads1115.get_val()
-log.info("ads1115_get_val", ads1115_data)
+log.info("ads1115", ads1115_data)
 ]]
 function ads1115.get_val()
     i2c.send(i2cid, ADS1115_ADDRESS_AD0_LOW,{ADS1115_CONF_REG,ADS1115_CONF_HCMD,ADS1115_CONF_LCMD})
     sys.wait(5)
     i2c.send(i2cid, ADS1115_ADDRESS_AD0_LOW, ADS1115_DATA_REG)
     local _,val_data_raw = pack.unpack(i2c.recv(i2cid, ADS1115_ADDRESS_AD0_LOW, 2), ">h")
+    if not val_data_raw then
+        return
+    end
     if val_data_raw>=0x8000 then
         return ((0xffff-val_data_raw)/32767.0)*4.096
     else

script/libs/adxl34x.lua

@@ -105,7 +105,7 @@ end
 --[[
 adxl34x 初始化
 @api adxl34x.init(i2c_id)
-@number i2c_id i2c_id
+@number 所在的i2c总线id
 @return bool   成功返回true
 @usage
 adxl34x.init(0)
@@ -140,7 +140,7 @@ function adxl34x.get_data()
     _,accel.y = pack.unpack(i2c.recv(i2cid, ADXL34X_ADDRESS_ADR, 2),">h")
     i2c.send(i2cid, ADXL34X_ADDRESS_ADR,ADXL34X_DATAZ0)
     _,accel.z = pack.unpack(i2c.recv(i2cid, ADXL34X_ADDRESS_ADR, 2),">h")
-    return accel or 0
+    return accel
 end
 
 return adxl34x

script/libs/aht10.lua

@@ -38,7 +38,7 @@ local AHT10_STATE                 =   0x71 --状态字.
 --[[
 aht10初始化
 @api aht10.init(i2c_id)
-@number i2c_id i2c_id
+@number 所在的i2c总线id
 @return bool   成功返回true
 @usage
 aht10.init(0)

script/libs/bh1750.lua

@@ -69,7 +69,7 @@ end
 --[[
 bh1750初始化
 @api bh1750.init(i2c_id)
-@number i2c_id i2c_id
+@number 所在的i2c总线id
 @return bool   成功返回true
 @usage
 bh1750.init(0)

script/libs/ds3231.lua

@@ -81,7 +81,7 @@ end
 --[[
 ds3231初始化
 @api ds3231.init(i2c_id)
-@number i2c_id i2c_id
+@number 所在的i2c总线id
 @return bool   成功返回true
 @usage
 ds3231.init(0)

script/libs/ina226.lua

@@ -11,9 +11,8 @@
 local ina226 = require "ina226"
 
 local i2cid = 0
-i2c_speed = i2c.FAST
 sys.taskInit(function()
-    i2c.setup(i2cid,i2c_speed)
+    i2c.setup(i2cid, i2c.FAST)
     ina226.init(i2cid)
     while 1 do
         local ina226_data = ina226.get_data()
@@ -66,19 +65,28 @@ end
 
 --[[
 ina226初始化
-@api ina226.init(ina226_i2c)
-@number ina226_i2c i2c_id
+@api ina226.init(ina226_i2c, conf, cal)
+@number 挂载ina226的i2c总线id
+@table 配置数据, 默认值 {0x47,0x27}, 即0100 0111 0010 0111
+@table 校准数据, 默认值 {0x0A,0x00}, 即5.12 / (0.1 * 0.02)
 @return bool   成功返回true
 @usage
+-- 使用默认值进行初始化
 ina226.init(0)
 ]]
-function ina226.init(ina226_i2c)
+function ina226.init(ina226_i2c, conf, cal)
     i2cid = ina226_i2c
+    if not conf then
+        conf = {0x47,0x27}
+    end
+    if not cal then
+        cal =  {0x0A,0x00}
+    end
     if chip_check() then
         ina226_send(INA226_CONFIG_REG,0x80,0x00)
         sys.wait(20)
-        ina226_send(INA226_CONFIG_REG,0x47,0x27)-- 0100 0111 0010 0111
-        ina226_send(INA226_CALIBRA_REG,0x0A,0x00)--5.12 / (0.1 * 0.02)
+        ina226_send(INA226_CONFIG_REG, table.unpack(conf))-- 0100 0111 0010 0111
+        ina226_send(INA226_CALIBRA_REG, table.unpack(cal))--5.12 / (0.1 * 0.02)
         return true
     end
 end
@@ -94,19 +102,19 @@ log.info("ina226_data", "shunt_voltage",ina226_data.shunt_voltage,"bus_voltage",
 function ina226.get_data()
     local ina226_data = {}
     local shunt = ina226_recv_short(INA226_SHUNT_VOL_REG)
-    print("shunt",shunt)
+    -- print("shunt",shunt)
     if shunt == 0 then ina226_data.shunt_voltage = 0 else ina226_data.shunt_voltage = shunt*0.0025 end
 
     local bus = ina226_recv_short(INA226_BUS_VOL_REG)
-    print("bus",bus)
+    -- print("bus",bus)
     if bus == 0 then ina226_data.bus_voltage = 0 else ina226_data.bus_voltage = bus*1.25 end
 
     local power = ina226_recv_short(INA226_POWER_REG)
-    print("power",power)
+    -- print("power",power)
     if power == 0 then ina226_data.power = 0 else ina226_data.power = power*0.5 end
 
     local current = ina226_recv_short(INA226_CURRENT_REG)
-    print("current",current)
+    -- print("current",current)
     if current == 0 then ina226_data.current = 0 else ina226_data.current = current*0.02 end
     return ina226_data
 end

script/libs/l3g4200d.lua

@@ -94,7 +94,7 @@ end
 --[[
 l3g4200d 初始化
 @api l3g4200d.init(i2c_id)
-@number i2c_id i2c_id
+@number 所在的i2c总线id
 @return bool   成功返回true
 @usage
 l3g4200d.init(0)

script/libs/lbsLoc.lua

@@ -95,7 +95,7 @@ end
 
 
 local function netCB(msg)
-	log.info("未处理消息", msg[1], msg[2], msg[3], msg[4])
+	--log.info("未处理消息", msg[1], msg[2], msg[3], msg[4])
 end
 
 
@@ -129,10 +129,10 @@ local function enCellInfo(s)
 end
 
 local function enWifiInfo(tWifi)
-    local ret,cnt,k,v = "",0
+    local ret,cnt = "", 0
     if tWifi then
         for k,v in pairs(tWifi) do
-            log.info("lbsLoc.enWifiInfo",k,v)
+            -- log.info("lbsLoc.enWifiInfo",k,v)
             ret = ret..pack.pack("Ab",(k:gsub(":","")):fromHex(),(v<0) and (v+255) or v)
             cnt = cnt+1
         end
@@ -156,17 +156,17 @@ end
 
 
 local function taskClient(cbFnc, reqAddr, timeout, productKey, host, port,reqTime, reqWifi)
-    while mobile.status() == 0 do
+    if mobile.status() == 0 then
         if not sys.waitUntil("IP_READY", timeout) then return cbFnc(1) end
+        sys.wait(500)
     end
     local retryCnt  = 0
-    sys.wait(3000)
     local reqStr = pack.pack("bAbAAAAA", productKey:len(), productKey,
                              (reqAddr and 2 or 0) + (reqTime and 4 or 0) + 8 +(reqWifi and 16 or 0) + 32, "",
                              numToBcdNum(mobile.imei()), enMuid(),
                              enCellInfo(mobile.getCellInfo()),
                              enWifiInfo(reqWifi))
-    log.info("reqStr", reqStr:toHex())
+    log.debug("reqStr", reqStr:toHex())
     local rx_buff = zbuff.create(17)
     -- sys.wait(5000)
     while true do
@@ -179,7 +179,7 @@ local function taskClient(cbFnc, reqAddr, timeout, productKey, host, port,reqTim
         result = libnet.connect(d1Name, 5000, netc, host, port)
         if result then
             while true do
-                log.info(" lbsloc socket_service connect true")
+                -- log.info(" lbsloc socket_service connect true")
                 result = libnet.tx(d1Name, 0, netc, reqStr) ---发送数据
                 if result then
                     result, param = libnet.wait(d1Name, 15000 + retryCnt * 5, netc)
@@ -191,7 +191,7 @@ local function taskClient(cbFnc, reqAddr, timeout, productKey, host, port,reqTim
                         break
                     end
                     succ, param, _, _ = socket.rx(netc, rx_buff) -- 接收数据
-                    log.info("是否接收和数据长度", succ, param)
+                    -- log.info("是否接收和数据长度", succ, param)
                     if param ~= 0 then -- 如果接收成功
                         socket.close(netc) -- 关闭连接
                         socket.release(netc)

script/libs/lm75.lua

@@ -41,7 +41,7 @@ local LM75_THYST               =   0x02 --滞后寄存器
 --[[
 lm75_data 初始化
 @api lm75_data.init(i2c_id)
-@number i2c_id i2c_id
+@number 所在的i2c总线id
 @return bool   成功返回true
 @usage
 lm75_data.init(0)

script/libs/mlx90614.lua

@@ -36,7 +36,7 @@ local MLX90614_TOBJ2                =   0x08
 --[[
 mlx90614 初始化
 @api mlx90614.init(i2c_id)
-@number i2c_id i2c_id
+@number 所在的i2c总线id
 @return bool   成功返回true
 @usage
 mlx90614.init(0)

script/libs/mpu6xxx.lua

@@ -127,7 +127,7 @@ end
 --[[
 mpu6xxx初始化
 @api mpu6xxx.init(i2c_id)
-@number i2c_id i2c_id
+@number 所在的i2c总线id
 @return bool   成功返回true
 @usage
 mpu6xxx.init(0)

script/libs/pcf8574.lua

@@ -65,7 +65,7 @@ end
 --[[
 pcf8574初始化
 @api pcf8574.init(i2c_id)
-@number i2c_id i2c_id
+@number 所在的i2c总线id
 @return bool   成功返回true
 @usage
 pcf8574.init(0)

script/libs/qmc5883l.lua

@@ -81,7 +81,7 @@ end
 --[[
 qmc5883l 初始化
 @api qmc5883l.init(i2c_id)
-@number i2c_id i2c_id
+@number 所在的i2c总线id
 @return bool   成功返回true
 @usage
 qmc5883l.init(0)

script/libs/rc522.lua

@@ -630,7 +630,7 @@ function rc522.init(spi_id,cs,rst)
     rc522_rst(1)
     rc522.reset()
     rc522_config_isotype()
-    print("rc522.version",rc522.version())
+    log.debug("rc522.version",rc522.version())
     return true
 end
 

script/libs/si24r1.lua

@@ -298,7 +298,7 @@ si24r1 接收
 @api si24r1.rxpacket()
 @return number len,buff 长度 数据
 @usage
-local i,data = si24r1.rxpacket( );		--接收字节
+local i,data = si24r1.rxpacket()		--接收字节
 print("rxbuf",i,data)
 ]]
 function si24r1.rxpacket()

script/libs/tcs3472.lua

@@ -251,7 +251,7 @@ end
 --[[
 tcs3472初始化
 @api tcs3472.init(i2c_id)
-@number i2c_id i2c_id
+@number 所在的i2c总线id
 @return bool   成功返回true
 @usage
 tcs3472.init(0)

script/libs/tsl2561.lua

@@ -96,7 +96,7 @@ end
 --[[
 tsl2561 初始化
 @api tsl2561.init(i2c_id)
-@number i2c_id i2c_id
+@number 所在的i2c总线id
 @return bool   成功返回true
 @usage
 tsl2561.init(0)