Quellcode durchsuchen

fix: 修改demo_adxl345和lib_adxl34x中的错误

PKM-Bai vor 1 Jahr
Ursprung
Commit
ae24d1570a
2 geänderte Dateien mit 6 neuen und 5 gelöschten Zeilen
  1. 1 1
      demo/adxl345/main.lua
  2. 5 4
      script/libs/adxl34x.lua

+ 1 - 1
demo/adxl345/main.lua

@@ -34,7 +34,7 @@ sys.taskInit(function()
     adxl34x.set_irqf(i2cid, string.char(0x00), string.char(0xff), string.char(0x10))     -- activity映射到到INT1,并开启对应中断功能
     adxl34x.set_irqf(i2cid, string.char(0x00), string.char(0xff), string.char(0x10))     -- activity映射到到INT1,并开启对应中断功能
 
 
     while 1 do
     while 1 do
-        adxl34x.get_int_source()    -- 不加这个不会触发中断
+        adxl34x.get_int_source(i2cid)    -- 不加这个不会触发中断
         
         
         local adxl34x_data = adxl34x.get_data()
         local adxl34x_data = adxl34x.get_data()
         log.info("adxl34x_data", "adxl34x_data.x"..(adxl34x_data.x),"adxl34x_data.y"..(adxl34x_data.y),"adxl34x_data.z"..(adxl34x_data.z))
         log.info("adxl34x_data", "adxl34x_data.x"..(adxl34x_data.x),"adxl34x_data.y"..(adxl34x_data.y),"adxl34x_data.z"..(adxl34x_data.z))

+ 5 - 4
script/libs/adxl34x.lua

@@ -146,11 +146,12 @@ end
 --[[
 --[[
 获取 adxl34x 中断源
 获取 adxl34x 中断源
 @api adxl34x.get_int_source()
 @api adxl34x.get_int_source()
+@number 所在的i2c总线id
 @usage
 @usage
-adxl34x.get_int_source()
+adxl34x.get_int_source(i2cid)
 ]]
 ]]
-function adxl34x.get_int_source()
-    i2c.readReg(0, ADXL34X_ADDRESS_ADR, ADXL34X_INT_SOURCE, 2)
+function adxl34x.get_int_source(i2cid)
+    i2c.readReg(i2cid, ADXL34X_ADDRESS_ADR, ADXL34X_INT_SOURCE, 2)
 end
 end
 
 
 --[[
 --[[
@@ -182,7 +183,7 @@ adxl34x.set_irqf(i2cid, string.char(0x10), string.char(0xff), string.char(0x10))
 ]]
 ]]
 function adxl34x.set_irqf(i2cid, irqf_map, irqf_act_ctl, irqf_enable)
 function adxl34x.set_irqf(i2cid, irqf_map, irqf_act_ctl, irqf_enable)
     i2c.writeReg(i2cid, ADXL34X_ADDRESS_ADR, ADXL34X_INT_ENABLE, string.char(0x00))     -- 关闭所有中断
     i2c.writeReg(i2cid, ADXL34X_ADDRESS_ADR, ADXL34X_INT_ENABLE, string.char(0x00))     -- 关闭所有中断
-    i2c.writeReg(i2cid, ADXL34X_ADDRESS_ADR, ADXL34X_INT_MAP, irqf_data)
+    i2c.writeReg(i2cid, ADXL34X_ADDRESS_ADR, ADXL34X_INT_MAP, irqf_map)
     i2c.writeReg(i2cid, ADXL34X_ADDRESS_ADR, ADXL34X_ACT_INACT_CTL, irqf_act_ctl)
     i2c.writeReg(i2cid, ADXL34X_ADDRESS_ADR, ADXL34X_ACT_INACT_CTL, irqf_act_ctl)
     i2c.writeReg(i2cid, ADXL34X_ADDRESS_ADR, ADXL34X_INT_ENABLE, irqf_enable)           -- 开启中断
     i2c.writeReg(i2cid, ADXL34X_ADDRESS_ADR, ADXL34X_INT_ENABLE, irqf_enable)           -- 开启中断
 end
 end