smartpi 0.1.15__py3-none-any.whl → 0.1.17__py3-none-any.whl

smartpi/__init__.py

@@ -1,4 +1,4 @@
 __all__ = ["base_driver"]
 
-__version__ = "0.1.15"
+__version__ = "0.1.17"
 

smartpi/base_driver.py

@@ -443,13 +443,13 @@ def read_battery() -> Optional[bytes]:
 
 """读取外设连接情况"""
 def read_peripheral() -> Optional[bytes]: 
-    serial_lock.acquire()  #获取线程锁
+#    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()  #释放线程锁
             display_data = response[6:-3]
 #            for x in display_data:
 #                print(f"{x:02X}", end=' ')
@@ -459,7 +459,7 @@ def read_peripheral() -> Optional[bytes]:
             if time.time() - start_time > 3:
                 print("读取超时")
                 buffer.clear() 
-                serial_lock.release()  #释放线程锁
+#                serial_lock.release()  #释放线程锁
                 return None
 
 """单次操作外设"""         
@@ -534,6 +534,27 @@ def mode_change(send_data: str) -> Optional[bytes]:
                 buffer.clear()
                 serial_lock.release()  #释放线程锁 
                 return None
+                
+def shut_down():
+    serial_lock.acquire()  #获取线程锁
+    write_data(0XFF, 0XFE)
+    serial_lock.release()  #释放线程锁
+    time.sleep(0.5)
+    
+def shut_down_state() -> bool:
+    serial_lock.acquire()  #获取线程锁
+    response =process_received_data()
+    if response:
+        receive_data = response[4:-3]
+        if receive_data[0]==0XFF and receive_data[1]==0XFE:
+            serial_lock.release()  #释放线程锁
+            return True
+        else:
+            serial_lock.release()  #释放线程锁
+            return False
+    else:
+        serial_lock.release()  #释放线程锁
+        return False
 
 """H2-RCU初始化"""
 def smartpi_init():

smartpi/trace.py

@@ -7,14 +7,14 @@ from smartpi import base_driver
 def get_analog(port:bytes, chn:bytes) -> Optional[bytes]:
     trace_str=[0xA0, 0x21, 0x01, 0x71, 0x00, 0xBE]
     trace_str[0]=0XA0+port
-    trace_str[4]=0x20+chn
+    trace_str[4]=20+chn
     response = base_driver.single_operate_sensor(trace_str)       
     if response == None:
         return None
     else:
         trace_data=response[4:-1]
         trace_num=int.from_bytes(trace_data, byteorder='big', signed=True)
-        return trace_num
+        return response[4]
         
 #循迹卡设置全部颜色 port:连接P端口；正常返回：通道光值数据; 读取错误：None  
 def set_color(port:bytes, color:bytes) -> Optional[bytes]:

{smartpi-0.1.15.dist-info → smartpi-0.1.17.dist-info}/METADATA

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

{smartpi-0.1.15.dist-info → smartpi-0.1.17.dist-info}/RECORD

@@ -1,5 +1,5 @@
-smartpi/__init__.py,sha256=dSznPiZfuuDogA_EVuESFxs3sJut0lzCo-ys_AJaccE,55
-smartpi/base_driver.py,sha256=3_dsEM1Sbx43HVICOFZmByHGAjIRbba902GEWsThDSU,20202
+smartpi/__init__.py,sha256=QvBc8l0qX84e0M5-X8BCEcxwyPCioMaK72G9o0Bpc00,55
+smartpi/base_driver.py,sha256=itd5Qe5MMiTBUeOLoIjrZO3dvCXS-Mgaz8soKqzveAk,20874
 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=pa85IKqNzqAPGtRAoGGYwYmTh3RXOtuKnLrv9_z9qmM,1095
+smartpi/trace.py,sha256=2sqMZhaT1x2pR7qO-U5w4XHyFssx3swRka88mJlcxPw,1095
 smartpi/ultrasonic.py,sha256=0meczFKXFLUt92kLxipeEc37vb5duvJjPs4kgtlpO8M,622
-smartpi-0.1.15.dist-info/METADATA,sha256=OVWU7rX_t-hjb8WDnOQKBCfmW7Sh17APIuXUs7A9cnM,311
-smartpi-0.1.15.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-smartpi-0.1.15.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
-smartpi-0.1.15.dist-info/RECORD,,
+smartpi-0.1.17.dist-info/METADATA,sha256=87afL8yQ8pS-mVIR6YVbQPsqAfQXddk48WJQvSNNu5A,311
+smartpi-0.1.17.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+smartpi-0.1.17.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
+smartpi-0.1.17.dist-info/RECORD,,