更正串口收发时，没转换16进制的问题

chenxuuu · Jun 25, 2019 · b2ef963 · b2ef963
1 parent d0846af
commit b2ef963
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/llcom/DefaultFiles/core_script/head.lua b/llcom/DefaultFiles/core_script/head.lua
@@ -54,12 +54,24 @@ end
 
 log = require("log")
 sys = require("sys")
-uartReceive = function (d) end
 
+--串口数据接收接口
+local uartCB = function (d)
+    if uartReceive then uartReceive(d:fromHex()) end
+end
+
+--重写串口数据发送接口
+local oldapiSendUartData = apiSendUartData
+apiSendUartData = function (s)
+    local str = s:toHex()
+    return oldapiSendUartData(str)
+end
+
+--协程外部触发
 tiggerCB = function (id,type,data)
     --log.debug("tigger",id,type,data:toHex())
     if type == "uartRev" then--串口消息
-        uartReceive(data)
+        uartCB(data)
     elseif type == "cmd" then
         local result, info = pcall(function ()
             load(data)()

diff --git a/llcom/Properties/AssemblyInfo.cs b/llcom/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.1")]
+[assembly: AssemblyFileVersion("1.0.0.1")]
 [assembly: NeutralResourcesLanguage("zh-CN")]