smartpi 0.1.16__py3-none-any.whl → 0.1.18__py3-none-any.whl

smartpi/__init__.py

@@ -1,4 +1,4 @@
 __all__ = ["base_driver"]
 
-__version__ = "0.1.16"
+__version__ = "0.1.18"
 

smartpi/base_driver.py

@@ -1,5 +1,5 @@
 # coding=utf-8
-import serial,time,struct,threading
+import serial,time,struct,threading,fcntl
 from typing import List, Optional
 from collections import deque
 from . import servo,motor,cw2015,gui
@@ -201,6 +201,7 @@ def process_received_data():
 ##############################################################################读取设备信息
 """读取设备型号"""
 def read_device_model() -> Optional[bytes]:
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     serial_lock.acquire()  #获取线程锁
     write_data(READ_MODEL_H, READ_MODEL_L)
     start_time = time.time()
@@ -208,6 +209,7 @@ def read_device_model() -> Optional[bytes]:
         response =process_received_data()
         if response:
             serial_lock.release()  #释放线程锁
+            fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
             display_data = response[6:-3].decode(errors="ignore")
 #            print(f"设备型号: {display_data}")
             return display_data
@@ -216,10 +218,12 @@ def read_device_model() -> Optional[bytes]:
                 print("读取超时")
                 buffer.clear() 
                 serial_lock.release()  #释放线程锁
+                fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
                 return None
 
 """读取版本号"""
 def read_version() -> Optional[bytes]:
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     serial_lock.acquire()  #获取线程锁
     write_data(READ_VERSION_H, READ_VERSION_L)
     start_time = time.time()
@@ -227,6 +231,7 @@ def read_version() -> Optional[bytes]:
         response =process_received_data()
         if response:
             serial_lock.release()  #释放线程锁
+            fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
             display_data = response[6:-3].decode(errors="ignore")
 #            print(f"版本号: {display_data}")
             return display_data
@@ -235,10 +240,12 @@ def read_version() -> Optional[bytes]:
                 print("读取超时")
                 buffer.clear() 
                 serial_lock.release()  #释放线程锁
+                fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
                 return None
 
 """读取工厂信息"""
 def read_factory_data() -> Optional[bytes]:
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     serial_lock.acquire()  #获取线程锁
     write_data(READ_FACTORY_H, READ_FACTORY_L)
     start_time = time.time()
@@ -246,6 +253,7 @@ def read_factory_data() -> Optional[bytes]:
         response =process_received_data()
         if response:
             serial_lock.release()  #释放线程锁
+            fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
             display_data = response[6:-3].decode(errors="ignore")
 #            print(f"厂家信息: {display_data}")
             return display_data
@@ -254,10 +262,12 @@ def read_factory_data() -> Optional[bytes]:
                 print("读取超时")
                 buffer.clear() 
                 serial_lock.release()  #释放线程锁
+                fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
                 return None
 
 """读取硬件ID"""
 def read_hardware_ID() -> Optional[bytes]:
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     serial_lock.acquire()  #获取线程锁
     write_data(READ_HW_ID_H, READ_HW_ID_L)
     start_time = time.time()
@@ -265,6 +275,7 @@ def read_hardware_ID() -> Optional[bytes]:
         response =process_received_data()
         if response:
             serial_lock.release()  #释放线程锁
+            fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
             display_data = response[6:-3].decode(errors="ignore")
 #            print(f"硬件ID: {display_data}")
             return display_data
@@ -273,10 +284,12 @@ def read_hardware_ID() -> Optional[bytes]:
                 print("读取超时")
                 buffer.clear() 
                 serial_lock.release()  #释放线程锁
+                fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
                 return None
         
 """读取设备名称"""
 def read_device_name() -> Optional[bytes]:
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     serial_lock.acquire()  #获取线程锁        
     write_data(READ_NAME_H, READ_NAME_L)
     start_time = time.time()
@@ -284,6 +297,7 @@ def read_device_name() -> Optional[bytes]:
         response =process_received_data()
         if response:
             serial_lock.release()  #释放线程锁
+            fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
             display_data = response[6:-3].decode(errors="ignore")
 #            print(f"设备名称: {display_data}")
             return display_data
@@ -292,10 +306,12 @@ def read_device_name() -> Optional[bytes]:
                 print("读取超时")
                 buffer.clear() 
                 serial_lock.release()  #释放线程锁
+                fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
                 return None
         
 """设置设备名称"""
 def write_device_name(send_data: str) -> Optional[bytes]:
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     serial_lock.acquire()  #获取线程锁
     data_bytes = send_data.encode('utf-8')
     write_data(WRITE_NAME_H, WRITE_NAME_L, data_bytes)
@@ -304,6 +320,7 @@ def write_device_name(send_data: str) -> Optional[bytes]:
         response =process_received_data()
         if response:
             serial_lock.release()  #释放线程锁
+            fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
             display_data = response[6:-3].decode(errors="ignore")
 #            print(f"设置状态: {display_data}")
             return 0
@@ -312,10 +329,12 @@ def write_device_name(send_data: str) -> Optional[bytes]:
                 print("读取超时")
                 buffer.clear() 
                 serial_lock.release()  #释放线程锁
+                fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
                 return None
         
 """读取连接方式"""
-def read_connected() -> Optional[bytes]: 
+def read_connected() -> Optional[bytes]:
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程 
     serial_lock.acquire()  #获取线程锁
     write_data(READ_CONNECT_H, READ_CONNECT_L)
     start_time = time.time()
@@ -323,6 +342,7 @@ def read_connected() -> Optional[bytes]:
         response =process_received_data()
         if response:
             serial_lock.release()  #释放线程锁
+            fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
             display_data = response[6:-3].decode(errors="ignore")
 #            print(f"连接方式: {display_data}")
             return display_data
@@ -330,7 +350,8 @@ def read_connected() -> Optional[bytes]:
             if time.time() - start_time > 3:
                 print("读取超时")
                 buffer.clear()
-                serial_lock.release()  #释放线程锁 
+                serial_lock.release()  #释放线程锁
+                fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
                 return None
     
 """读取电池电量百分比"""        
@@ -442,14 +463,16 @@ def read_battery() -> Optional[bytes]:
 ###############################################################################读取传感器信息
 
 """读取外设连接情况"""
-def read_peripheral() -> Optional[bytes]: 
-#    serial_lock.acquire()  #获取线程锁
+def read_peripheral() -> Optional[bytes]:
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程 
+    serial_lock.acquire()  #获取线程锁
     write_data(READ_PERIPH_H, READ_PERIPH_L)
     start_time = time.time()
     while True:
         response =process_received_data()
         if response:
-#            serial_lock.release()  #释放线程锁
+            serial_lock.release()  #释放线程锁
+            fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
             display_data = response[6:-3]
 #            for x in display_data:
 #                print(f"{x:02X}", end=' ')
@@ -459,11 +482,13 @@ def read_peripheral() -> Optional[bytes]:
             if time.time() - start_time > 3:
                 print("读取超时")
                 buffer.clear() 
-#                serial_lock.release()  #释放线程锁
+                serial_lock.release()  #释放线程锁
+                fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
                 return None
 
 """单次操作外设"""         
-def single_operate_sensor(op_struct: bytes) -> Optional[bytes]:     
+def single_operate_sensor(op_struct: bytes) -> Optional[bytes]: 
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程    
     serial_lock.acquire()  #获取线程锁
     write_data(SINGLE_OP_H, SINGLE_OP_L, op_struct)
     start_time = time.time()
@@ -471,6 +496,7 @@ def single_operate_sensor(op_struct: bytes) -> Optional[bytes]:
         response =process_received_data()
         if response:
             serial_lock.release()  #释放线程锁
+            fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
             display_data = response[6:-3]
 #            for x in display_data:
 #                print(f"{x:02X}", end=' ')
@@ -481,6 +507,7 @@ def single_operate_sensor(op_struct: bytes) -> Optional[bytes]:
                 print("读取超时")
                 buffer.clear() 
                 serial_lock.release()  #释放线程锁
+                fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
                 return None  
 
 #P端口初始化释放     
@@ -494,7 +521,8 @@ def P_port_init(port:bytes) -> Optional[bytes]:
         return None
               
 """从机模式转换"""         
-def mode_change(send_data: str) -> Optional[bytes]: 
+def mode_change(send_data: str) -> Optional[bytes]:
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程 
     serial_lock.acquire()  #获取线程锁    
     write_data(MODE_CHANGE_H, MODE_CHANGE_L, send_data)
     start_time = time.time()
@@ -502,6 +530,7 @@ def mode_change(send_data: str) -> Optional[bytes]:
         response =process_received_data()
         if response:
             serial_lock.release()  #释放线程锁
+            fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
             display_data = response[6:-3]
 #            for x in display_data:
 #                print(f"{x:02X}", end=' ')
@@ -512,10 +541,12 @@ def mode_change(send_data: str) -> Optional[bytes]:
                 print("读取超时")
                 buffer.clear() 
                 serial_lock.release()  #释放线程锁
+                fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
                 return None
         
 """智能模式发送周期"""         
-def mode_change(send_data: str) -> Optional[bytes]:  
+def mode_change(send_data: str) -> Optional[bytes]:
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程  
     serial_lock.acquire()  #获取线程锁     
     write_data(SEND_CYCLE_H, SEND_CYCLE_L, send_data)
     start_time = time.time()
@@ -523,6 +554,7 @@ def mode_change(send_data: str) -> Optional[bytes]:
         response =process_received_data()
         if response:
             serial_lock.release()  #释放线程锁
+            fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
             display_data = response[6:-3]
 #            for x in display_data:
 #                print(f"{x:02X}", end=' ')
@@ -532,28 +564,35 @@ def mode_change(send_data: str) -> Optional[bytes]:
             if time.time() - start_time > 3:
                 print("读取超时")
                 buffer.clear()
-                serial_lock.release()  #释放线程锁 
+                serial_lock.release()  #释放线程锁
+                fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁 
                 return None
                 
-def shut_down(self):
+def shut_down():
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     serial_lock.acquire()  #获取线程锁
-    base_driver.write_data(0XFF, 0XFE)
+    write_data(0XFF, 0XFE)
     serial_lock.release()  #释放线程锁
+    fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
     time.sleep(0.5)
     
-def shut_down_state(self) -> bool:
+def shut_down_state() -> bool:
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     serial_lock.acquire()  #获取线程锁
-    response =base_driver.process_received_data()
+    response =process_received_data()
     if response:
         receive_data = response[4:-3]
         if receive_data[0]==0XFF and receive_data[1]==0XFE:
             serial_lock.release()  #释放线程锁
+            fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
             return True
         else:
             serial_lock.release()  #释放线程锁
+            fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
             return False
     else:
         serial_lock.release()  #释放线程锁
+        fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
         return False
 
 """H2-RCU初始化"""

smartpi/trace.py

@@ -12,8 +12,6 @@ def get_analog(port:bytes, chn:bytes) -> Optional[bytes]:
     if response == None:
         return None
     else:
-        trace_data=response[4:-1]
-        trace_num=int.from_bytes(trace_data, byteorder='big', signed=True)
         return response[4]
         
 #循迹卡设置全部颜色 port:连接P端口；正常返回：通道光值数据; 读取错误：None  

{smartpi-0.1.16.dist-info → smartpi-0.1.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: smartpi
-Version: 0.1.16
+Version: 0.1.18
 Summary: A library use for H2-RCU
 Author: ZMROBO
 Classifier: Programming Language :: Python :: 3

{smartpi-0.1.16.dist-info → smartpi-0.1.18.dist-info}/RECORD

@@ -1,5 +1,5 @@
-smartpi/__init__.py,sha256=-IsfhJ0_REei-Mi4dvCdVrV0tMnAsoRJ4o1wGOWSOls,55
-smartpi/base_driver.py,sha256=rUMy7pmTVmE59iwCeKY_TIDeZ2JvYNwFHIEe45GBgR0,20906
+smartpi/__init__.py,sha256=yJNr8Bjm6Zi2geMqxDuEXaioVKTS4NGMUm5hfEW0TLQ,55
+smartpi/base_driver.py,sha256=3acmLtIcCW9sgPlPN7C10TGPIO_tCISC_QWLzNTM2X4,23846
 smartpi/color_sensor.py,sha256=sTqD3jApjmc6qHMrDyEy2UjaRt8vhJZNR88vzgUiLKs,496
 smartpi/cw2015.py,sha256=1lAF-pi_ye_ya1AZQS1sjbgsDf7MThO5IAskKsNGBzA,5695
 smartpi/flash.py,sha256=Luz0TjinQSkx31uVknqfSWkiAiVrqIE2Iba7lk3AOzM,4132
@@ -12,9 +12,9 @@ smartpi/move.py,sha256=3qzrJCGA-qbsLXBpklY2DErtw0jlzMELzozjhEvRzKs,6028
 smartpi/servo.py,sha256=B6X3yCoEz82qqpUIE5MSO0Eg9YZJ5zDzJEcRpioZpUo,4625
 smartpi/temperature.py,sha256=px2YeqgG63nPkyhJA1wDg3dwYx_oOCYuhMjtsVm_YO0,460
 smartpi/touch_sensor.py,sha256=F6IIQGewNRhC9U1RbHpVzuGYqb8H41lpeQ1Ejwsc_T8,438
-smartpi/trace.py,sha256=2sqMZhaT1x2pR7qO-U5w4XHyFssx3swRka88mJlcxPw,1095
+smartpi/trace.py,sha256=dtZQAkUUIsq578hycwrfR9GJUsIUCbHCF4ZvJv9GLrs,984
 smartpi/ultrasonic.py,sha256=0meczFKXFLUt92kLxipeEc37vb5duvJjPs4kgtlpO8M,622
-smartpi-0.1.16.dist-info/METADATA,sha256=oAj0zNAj6MBGhGgjM4VyXT_W-B9QZe5ialmBNRh3gcU,311
-smartpi-0.1.16.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-smartpi-0.1.16.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
-smartpi-0.1.16.dist-info/RECORD,,
+smartpi-0.1.18.dist-info/METADATA,sha256=ShLsBIEi6ruwSr-BoqJWYwrvHyrc8Mn0xinRrWmYgng,311
+smartpi-0.1.18.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+smartpi-0.1.18.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
+smartpi-0.1.18.dist-info/RECORD,,