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

smartpi/__init__.py

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

smartpi/base_driver.py

@@ -201,8 +201,8 @@ def process_received_data():
 ##############################################################################读取设备信息
 """读取设备型号"""
 def read_device_model() -> Optional[bytes]:
-    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     serial_lock.acquire()  #获取线程锁
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     write_data(READ_MODEL_H, READ_MODEL_L)
     start_time = time.time()
     while True:
@@ -223,8 +223,8 @@ def read_device_model() -> Optional[bytes]:
 
 """读取版本号"""
 def read_version() -> Optional[bytes]:
-    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     serial_lock.acquire()  #获取线程锁
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     write_data(READ_VERSION_H, READ_VERSION_L)
     start_time = time.time()
     while True:
@@ -245,8 +245,8 @@ def read_version() -> Optional[bytes]:
 
 """读取工厂信息"""
 def read_factory_data() -> Optional[bytes]:
-    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     serial_lock.acquire()  #获取线程锁
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     write_data(READ_FACTORY_H, READ_FACTORY_L)
     start_time = time.time()
     while True:
@@ -267,8 +267,8 @@ def read_factory_data() -> Optional[bytes]:
 
 """读取硬件ID"""
 def read_hardware_ID() -> Optional[bytes]:
-    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     serial_lock.acquire()  #获取线程锁
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     write_data(READ_HW_ID_H, READ_HW_ID_L)
     start_time = time.time()
     while True:
@@ -289,8 +289,8 @@ def read_hardware_ID() -> Optional[bytes]:
         
 """读取设备名称"""
 def read_device_name() -> Optional[bytes]:
-    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
-    serial_lock.acquire()  #获取线程锁        
+    serial_lock.acquire()  #获取线程锁
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程       
     write_data(READ_NAME_H, READ_NAME_L)
     start_time = time.time()
     while True:
@@ -311,8 +311,8 @@ def read_device_name() -> Optional[bytes]:
         
 """设置设备名称"""
 def write_device_name(send_data: str) -> Optional[bytes]:
-    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     serial_lock.acquire()  #获取线程锁
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     data_bytes = send_data.encode('utf-8')
     write_data(WRITE_NAME_H, WRITE_NAME_L, data_bytes)
     start_time = time.time()
@@ -334,8 +334,8 @@ def write_device_name(send_data: str) -> Optional[bytes]:
         
 """读取连接方式"""
 def read_connected() -> Optional[bytes]:
-    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程 
     serial_lock.acquire()  #获取线程锁
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     write_data(READ_CONNECT_H, READ_CONNECT_L)
     start_time = time.time()
     while True:
@@ -464,8 +464,8 @@ def read_battery() -> Optional[bytes]:
 
 """读取外设连接情况"""
 def read_peripheral() -> Optional[bytes]:
-    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程 
     serial_lock.acquire()  #获取线程锁
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     write_data(READ_PERIPH_H, READ_PERIPH_L)
     start_time = time.time()
     while True:
@@ -487,9 +487,9 @@ def read_peripheral() -> Optional[bytes]:
                 return None
 
 """单次操作外设"""         
-def single_operate_sensor(op_struct: bytes) -> Optional[bytes]: 
-    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程    
+def single_operate_sensor(op_struct: bytes) -> Optional[bytes]:     
     serial_lock.acquire()  #获取线程锁
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程            
     write_data(SINGLE_OP_H, SINGLE_OP_L, op_struct)
     start_time = time.time()
     while True:
@@ -522,8 +522,8 @@ def P_port_init(port:bytes) -> Optional[bytes]:
               
 """从机模式转换"""         
 def mode_change(send_data: str) -> Optional[bytes]:
-    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程 
-    serial_lock.acquire()  #获取线程锁    
+    serial_lock.acquire()  #获取线程锁
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程    
     write_data(MODE_CHANGE_H, MODE_CHANGE_L, send_data)
     start_time = time.time()
     while True:
@@ -546,8 +546,8 @@ 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()  #获取线程锁     
+    serial_lock.acquire()  #获取线程锁
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程    
     write_data(SEND_CYCLE_H, SEND_CYCLE_L, send_data)
     start_time = time.time()
     while True:
@@ -569,16 +569,16 @@ def mode_change(send_data: str) -> Optional[bytes]:
                 return None
                 
 def shut_down():
-    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     serial_lock.acquire()  #获取线程锁
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     write_data(0XFF, 0XFE)
     serial_lock.release()  #释放线程锁
     fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
     time.sleep(0.5)
     
 def shut_down_state() -> bool:
-    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     serial_lock.acquire()  #获取线程锁
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     response =process_received_data()
     if response:
         receive_data = response[4:-3]
@@ -599,10 +599,13 @@ def shut_down_state() -> bool:
 def smartpi_init():
     
     if is_lock_locked(serial_lock):
-        serial_lock.release()
+        serial_lock.release()  #释放线程锁
     
-    serial_lock.acquire()
+    fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
+    serial_lock.acquire()  #获取线程锁
+    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     uart3_init()
+    fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
     P_port_init(1)
     P_port_init(2)
     P_port_init(3)
@@ -635,6 +638,6 @@ def smartpi_init():
     motor.reset_motor_encoder(6)
     time.sleep(0.1)
     gui.init()
-    serial_lock.release()      
+    serial_lock.release()     
     time.sleep(0.1)   
             

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

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

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

@@ -1,5 +1,5 @@
-smartpi/__init__.py,sha256=yJNr8Bjm6Zi2geMqxDuEXaioVKTS4NGMUm5hfEW0TLQ,55
-smartpi/base_driver.py,sha256=3acmLtIcCW9sgPlPN7C10TGPIO_tCISC_QWLzNTM2X4,23846
+smartpi/__init__.py,sha256=XC4FyX6UBONemsJEdIZzMvIkF4pscJ5XGVvK8jgVCdA,55
+smartpi/base_driver.py,sha256=DV-jh7j4X7ak9zFSqgwjHrj1X18SDqUjCqewLovxDVU,24096
 smartpi/color_sensor.py,sha256=sTqD3jApjmc6qHMrDyEy2UjaRt8vhJZNR88vzgUiLKs,496
 smartpi/cw2015.py,sha256=1lAF-pi_ye_ya1AZQS1sjbgsDf7MThO5IAskKsNGBzA,5695
 smartpi/flash.py,sha256=Luz0TjinQSkx31uVknqfSWkiAiVrqIE2Iba7lk3AOzM,4132
@@ -14,7 +14,7 @@ smartpi/temperature.py,sha256=px2YeqgG63nPkyhJA1wDg3dwYx_oOCYuhMjtsVm_YO0,460
 smartpi/touch_sensor.py,sha256=F6IIQGewNRhC9U1RbHpVzuGYqb8H41lpeQ1Ejwsc_T8,438
 smartpi/trace.py,sha256=dtZQAkUUIsq578hycwrfR9GJUsIUCbHCF4ZvJv9GLrs,984
 smartpi/ultrasonic.py,sha256=0meczFKXFLUt92kLxipeEc37vb5duvJjPs4kgtlpO8M,622
-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,,
+smartpi-0.1.19.dist-info/METADATA,sha256=kViF6wYE4k68vEkBr0T8XPnoZGIN3gmP0d7sAulJItg,311
+smartpi-0.1.19.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+smartpi-0.1.19.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
+smartpi-0.1.19.dist-info/RECORD,,