alienwalker пре 2 година
родитељ
комит
dfffc8c214
2 измењених фајлова са 114 додато и 2 уклоњено
  1. 102 0
      demo/bit64/main.lua
  2. 12 2
      luat/modules/luat_lib_mcu.c

+ 102 - 0
demo/bit64/main.lua

@@ -0,0 +1,102 @@
+
+-- LuaTools需要PROJECT和VERSION这两个信息
+PROJECT = "bit64_test"
+VERSION = "1.0.0"
+
+log.info("main", PROJECT, VERSION)
+
+-- 引入必要的库文件(lua编写), 内部库不需要require
+sys = require("sys")
+
+if wdt then
+    --添加硬狗防止程序卡死,在支持的设备上启用这个功能
+    wdt.init(9000)--初始化watchdog设置为9s
+    sys.timerLoopStart(wdt.feed, 3000)--3s喂一次狗
+end
+
+
+local data,b64,b32,a,b
+
+if bit64 then
+	log.style(1)
+	log.info("bit64 演示")
+	data = 12345678
+	b64 = bit64.to64(data)
+	b32 = bit64.to32(b64)
+	log.info("i32", b32, mcu.x32(b32))
+	data = -12345678
+	b64 = bit64.to64(data)
+	b32 = bit64.to32(b64)
+	log.info("i32", b32, mcu.x32(b32))
+	data = 12.34234
+	b64 = bit64.to64(data)
+	b32 = bit64.to32(b64)
+	log.info("f32", data, b32)
+	data = -12.34234
+	b64 = bit64.to64(data)
+	b32 = bit64.to32(b64)
+	log.info("f32", data, b32)
+
+
+	a = bit64.to64(87654321)
+	b = bit64.to64(12345678)
+	log.info("87654321+12345678=", bit64.show(bit64.plus(a,b)))
+	log.info("87654321-12345678=", bit64.show(bit64.minus(a,b)))
+	log.info("87654321*12345678=", bit64.show(bit64.multi(a,b)))
+	log.info("87654321/12345678=", bit64.show(bit64.pide(a,b)))
+
+	a = bit64.to64(87654321)
+	b = 1234567
+	log.info("87654321+1234567=", bit64.show(bit64.plus(a,b)))
+	log.info("87654321-1234567=", bit64.show(bit64.minus(a,b)))
+	log.info("87654321*1234567=", bit64.show(bit64.multi(a,b)))
+	log.info("87654321/1234567=", bit64.show(bit64.pide(a,b)))
+
+
+	a = bit64.to64(87654.326)
+	b = bit64.to64(12345)
+	log.info("87654.326+12345=", 87654.326 + 12345)
+	log.info("87654.326+12345=", bit64.show(bit64.plus(a,b)))
+	log.info("87654.326-12345=", bit64.show(bit64.minus(a,b)))
+	log.info("87654.326*12345=", bit64.show(bit64.multi(a,b)))
+	log.info("87654.326/12345=", bit64.show(bit64.pide(a,b)))
+
+	a = bit64.to64(87654.32)
+	b = bit64.to64(12345.67)
+	log.info("float", "87654.32+12345.67=", 87654.32 + 12345.67)
+	log.info("double","87654.32+12345.67=", bit64.show(bit64.plus(a,b)))
+	log.info("double to float","87654.32+12345.67=", bit64.to32(bit64.plus(a,b)))
+	log.info("87654.32-12345.67=", bit64.show(bit64.minus(a,b)))
+	log.info("87654.32*12345.67=", bit64.show(bit64.multi(a,b)))
+	log.info("87654.32/12345.67=", bit64.show(bit64.pide(a,b)))
+	log.info("double to int64", "87654.32/12345.67=", bit64.show(bit64.pide(a,b,nil,true)))
+
+	a = bit64.to64(0xc0000000)
+	b = 2
+	a = bit64.shift(a,8,true)
+	log.info("0xc0000000 << 8 =", bit64.show(a, 16))
+	log.info("0xc000000000+2=", bit64.show(bit64.plus(a,b), 16))
+	log.info("0xc000000000-2=", bit64.show(bit64.minus(a,b), 16))
+	log.info("0xc000000000*2=", bit64.show(bit64.multi(a,b), 16))
+	log.info("0xc000000000/2=", bit64.show(bit64.pide(a,b), 16))
+	log.style(0)
+end
+
+local function sys_run_time()
+	local tick64, per = mcu.tick64(true)
+	local per_cnt = per * 1000000
+	while true do
+		tick64, per = mcu.tick64(true)
+		log.info("work time","当前时间", bit64.to32(bit64.pide(tick64,per_cnt)))
+		sys.wait(1000)
+	end
+end
+
+if mcu.tick64() then
+	sys.taskInit(sys_run_time)
+end
+
+-- 用户代码已结束---------------------------------------------
+-- 结尾总是这一句
+sys.run()
+-- sys.run()之后后面不要加任何语句!!!!!

+ 12 - 2
luat/modules/luat_lib_mcu.c

@@ -134,9 +134,10 @@ static int l_mcu_x32(lua_State* L) {
 
 // #ifdef __LUATOS_TICK_64BIT__
 /*
-获取启动后的高精度tick
+获取启动后的高精度tick,如果支持bit64库,可以直接输出转换好的bit64结构
 @api mcu.tick64()
-@return string 当前tick值,8个字节的uint64
+@boolean 是否输出bit64结构,true是,其他都是false,留空也是false,用于兼容旧的demo
+@return string 当前tick值,8个字节的uint64,如果支持64bit库,同时要求输出64bit结构的话,会输出9字节的string
 @return int 1us有几个tick,0表示未知
 @usage
 local tick_str, tick_per = mcu.tick64()
@@ -146,7 +147,16 @@ static int l_mcu_hw_tick64(lua_State* L) {
 
     uint64_t tick = luat_mcu_tick64();
     uint32_t us_period = luat_mcu_us_period();
+#ifdef LUAT_USE_BIT64
+	if (lua_isboolean(L, 1) && lua_toboolean(L, 1))
+	{
+		uint8_t data[9] = {0};
+		memcpy(data, &tick, 8);
+		lua_pushlstring(L, data, 9);
+	}
+#else
     lua_pushlstring(L, (const char*)&tick, 8);
+#endif
     lua_pushinteger(L, us_period);
     return 2;
 }