Merge pull request #65 from MK16kawai/dev

update modbus && qmi8658 doc
sipeed · Nov 6, 2024 · 2d2cf2a · 2d2cf2a
2 parents f86cf27 + 477bf40
commit 2d2cf2a
Show file tree

Hide file tree

Showing 5 changed files with 93 additions and 15 deletions.
diff --git a/docs/doc/en/modules/qmi8658.md b/docs/doc/en/modules/qmi8658.md
@@ -33,11 +33,11 @@ from maix import ext_dev, pinmap, err, time
 QMI8658_I2CBUS_NUM = 4
 
 imu = ext_dev.qmi8658.QMI8658(QMI8658_I2CBUS_NUM,
-                              mode=ext_dev.qmi8658.Mode.DUAL,
-                              acc_scale=ext_dev.qmi8658.AccScale.ACC_SCALE_2G,
-                              acc_odr=ext_dev.qmi8658.AccOdr.ACC_ODR_8000,
-                              gyro_scale=ext_dev.qmi8658.GyroScale.GYRO_SCALE_16DPS,
-                              gyro_odr=ext_dev.qmi8658.GyroOdr.GYRO_ODR_8000)
+                              mode=ext_dev.imu.Mode.DUAL,
+                              acc_scale=ext_dev.imu.AccScale.ACC_SCALE_2G,
+                              acc_odr=ext_dev.imu.AccOdr.ACC_ODR_8000,
+                              gyro_scale=ext_dev.imu.GyroScale.GYRO_SCALE_16DPS,
+                              gyro_odr=ext_dev.imu.GyroOdr.GYRO_ODR_8000)
 
 while True:
     data = imu.read()

diff --git a/docs/doc/zh/modules/qmi8658.md b/docs/doc/zh/modules/qmi8658.md
@@ -33,11 +33,11 @@ from maix import ext_dev, pinmap, err, time
 QMI8658_I2CBUS_NUM = 4
 
 imu = ext_dev.qmi8658.QMI8658(QMI8658_I2CBUS_NUM,
-                              mode=ext_dev.qmi8658.Mode.DUAL,
-                              acc_scale=ext_dev.qmi8658.AccScale.ACC_SCALE_2G,
-                              acc_odr=ext_dev.qmi8658.AccOdr.ACC_ODR_8000,
-                              gyro_scale=ext_dev.qmi8658.GyroScale.GYRO_SCALE_16DPS,
-                              gyro_odr=ext_dev.qmi8658.GyroOdr.GYRO_ODR_8000)
+                              mode=ext_dev.imu.Mode.DUAL,
+                              acc_scale=ext_dev.imu.AccScale.ACC_SCALE_2G,
+                              acc_odr=ext_dev.imu.AccOdr.ACC_ODR_8000,
+                              gyro_scale=ext_dev.imu.GyroScale.GYRO_SCALE_16DPS,
+                              gyro_odr=ext_dev.imu.GyroOdr.GYRO_ODR_8000)
 
 while True:
     data = imu.read()

diff --git a/examples/ext_dev/sensors/acc_gyro_qmi8658/qmi8658_rw_example.py b/examples/ext_dev/sensors/acc_gyro_qmi8658/qmi8658_rw_example.py
@@ -13,11 +13,11 @@
 QMI8658_I2CBUS_NUM = 4
 
 imu = ext_dev.qmi8658.QMI8658(QMI8658_I2CBUS_NUM,
-                              mode=ext_dev.qmi8658.Mode.DUAL,
-                              acc_scale=ext_dev.qmi8658.AccScale.ACC_SCALE_2G,
-                              acc_odr=ext_dev.qmi8658.AccOdr.ACC_ODR_8000,
-                              gyro_scale=ext_dev.qmi8658.GyroScale.GYRO_SCALE_16DPS,
-                              gyro_odr=ext_dev.qmi8658.GyroOdr.GYRO_ODR_8000)
+                              mode=ext_dev.imu.Mode.DUAL,
+                              acc_scale=ext_dev.imu.AccScale.ACC_SCALE_2G,
+                              acc_odr=ext_dev.imu.AccOdr.ACC_ODR_8000,
+                              gyro_scale=ext_dev.imu.GyroScale.GYRO_SCALE_16DPS,
+                              gyro_odr=ext_dev.imu.GyroOdr.GYRO_ODR_8000)
 
 while True:
     data = imu.read()

diff --git a/examples/protocol/comm_modbus_rtu.py b/examples/protocol/comm_modbus_rtu.py
@@ -0,0 +1,39 @@
+from maix.comm import modbus
+from maix import app, err
+
+slave = modbus.Slave(
+    modbus.Mode.RTU,    # mode
+    "/dev/ttyS0",       # serial device
+    0x00, 10,           # coils
+    0x00, 10,           # discrete input
+    0x00, 10,           # input registers
+    0x00, 10,           # holding registers
+    115200, 1,          # serial 115200-8N1, slave
+    0, False            # tcp port, debug OFF
+)
+
+
+old_ir = slave.input_registers()
+print("old ir: ", old_ir)
+data : list[int] = [0x22, 0x33, 0x44]
+slave.input_registers(data, 3)
+new_ir = slave.input_registers()
+print("new ir:", new_ir)
+
+while not app.need_exit():
+    if err.Err.ERR_NONE != slave.receive(2000): #timeout 2000ms
+        continue
+
+    rtype = slave.request_type()
+    if rtype == modbus.RequestType.READ_HOLDING_REGISTERS:
+        print("master read hr")
+        hr = slave.holding_registers()
+        print("now hr: ", hr)
+        hr = [x+1 for x in hr]
+        print("now we make hr+1: ", hr)
+        print("update hr")
+        slave.holding_registers(hr)
+
+    slave.reply()
+
+
diff --git a/examples/protocol/comm_modbus_tcp.py b/examples/protocol/comm_modbus_tcp.py
@@ -0,0 +1,39 @@
+from maix.comm import modbus
+from maix import app, err
+
+slave = modbus.Slave(
+    modbus.Mode.TCP,    # mode
+    "",                 # ip, keep empty
+    0x00, 10,           # coils
+    0x00, 10,           # discrete input
+    0x00, 10,           # input registers
+    0x00, 10,           # holding registers
+    0, 1,               # serial 115200-8N1, slave, ignore
+    5020, False            # tcp port, debug OFF
+)
+
+
+old_ir = slave.input_registers()
+print("old ir: ", old_ir)
+data : list[int] = [0x22, 0x33, 0x44]
+slave.input_registers(data, 3)
+new_ir = slave.input_registers()
+print("new ir:", new_ir)
+
+while not app.need_exit():
+    if err.Err.ERR_NONE != slave.receive(2000): #timeout 2000ms
+        continue
+
+    rtype = slave.request_type()
+    if rtype == modbus.RequestType.READ_HOLDING_REGISTERS:
+        print("master read hr")
+        hr = slave.holding_registers()
+        print("now hr: ", hr)
+        hr = [x+1 for x in hr]
+        print("now we make hr+1: ", hr)
+        print("update hr")
+        slave.holding_registers(hr)
+
+    slave.reply()
+
+