smartpi 0.1.21__py3-none-any.whl → 0.1.23__py3-none-any.whl

smartpi/__init__.py

@@ -1,4 +1,4 @@
 __all__ = ["base_driver"]
 
-__version__ = "0.1.21"
+__version__ = "0.1.23"
 

smartpi/base_driver.py

@@ -487,7 +487,7 @@ def read_peripheral() -> Optional[bytes]:
                 return None
 
 """单次操作外设"""         
-def single_operate_sensor(op_struct: bytes) -> Optional[bytes]:     
+def single_operate_sensor(op_struct: bytes, block_time: float) -> Optional[bytes]:     
     serial_lock.acquire()  #获取线程锁
     fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程            
     write_data(SINGLE_OP_H, SINGLE_OP_L, op_struct)
@@ -503,7 +503,7 @@ def single_operate_sensor(op_struct: bytes) -> Optional[bytes]:
 #            print("\n")
             return display_data
         else:
-            if time.time() - start_time > 2:  
+            if time.time() - start_time > 2+block_time:  
                 print("读取超时")
                 buffer.clear() 
                 serial_lock.release()  #释放线程锁
@@ -514,7 +514,7 @@ def single_operate_sensor(op_struct: bytes) -> Optional[bytes]:
 def P_port_init(port:bytes) -> Optional[bytes]:
     servo_str=[0xA0, 0x0F, 0x00, 0xBE]
     servo_str[0]=0XA0+port
-    response = single_operate_sensor(servo_str)
+    response = single_operate_sensor(servo_str,0)
     if response:
         return 0
     else:
@@ -641,7 +641,6 @@ def smartpi_init():
     motor.reset_motor_encoder(5)
     motor.reset_motor_encoder(6)
     time.sleep(0.1)
-    gui.init()
     serial_lock.release()     
     time.sleep(0.1)   
             

smartpi/color_sensor.py

@@ -8,7 +8,7 @@ def get_value(port:bytes) -> Optional[bytes]:
     color_str=[0xA0, 0x04, 0x00, 0xBE]
     color_str[0]=0XA0+port
     color_str[2]=1
-    response = base_driver.single_operate_sensor(color_str)        
+    response = base_driver.single_operate_sensor(color_str,0)        
     if response == None:
         return None
     else:

smartpi/gui.py

@@ -1,61 +1,87 @@
 import socket
 import json
-import sys
+import time
 
-# 连接对象（模块级单例）
-_connection = None
+class _gui_client:
+    def __init__(self, host="127.0.0.1", port=65167):
+        self.sock = socket.create_connection((host, port))
+        self.clear()
 
-def init(host="127.0.0.1", port=65167):
-    """初始化GUI连接"""
-    global _connection
-    if _connection is None:
-        _connection = socket.create_connection((host, port))
-        _send({"type": "clear"})
+    def _send(self, cmd):
+        self.sock.sendall((json.dumps(cmd) + "\n").encode())
+        time.sleep(0.1)
 
-def _send(cmd):
-    """发送命令到服务器"""
-    if _connection is None and "pytest" not in sys.modules:  # 允许测试环境不初始化
-        raise ConnectionError("GUI not initialized. Call gui.init() first.")
-    if _connection:
-        _connection.sendall((json.dumps(cmd) + "\n").encode())
+    def show_text(self, x, y, text, color="black", size=16):
+        self._send({"type": "text", "x": x, "y": y, "text": text, "color": color, "size": size})
 
+    def print(self, text):
+        self._send({"type": "print", "text": text})
+
+    def println(self, text):
+        self._send({"type": "println", "text": text})
+
+    def show_image(self, x, y, path, width, height):
+        self._send({"type": "image", "x": x, "y": y, "path": path, "width": width, "height": height})
+
+    def draw_line(self, x1, y1, x2, y2, color="black", width=1):
+        self._send({"type": "line", "x1": x1, "y1": y1, "x2": x2, "y2": y2, "color": color, "width": width})
+
+    def fill_rect(self, x, y, w, h, color="black"):
+        self._send({"type": "fill_rect", "x": x, "y": y, "w": w, "h": h, "color": color})
+        
+    def draw_rect(self, x, y, w, h, width, color="black"):
+        self._send({"type": "draw_rect", "x": x, "y": y, "w": w, "h": h, "width": width, "color": color})
+
+    def fill_circle(self, cx, cy, r, color="black"):
+        self._send({"type": "fill_circle", "cx": cx, "cy": cy, "r": r, "color": color})
+
+    def draw_circle(self, cx, cy, r, width, color="black"):
+        self._send({"type": "draw_circle", "cx": cx, "cy": cy, "r": r, "width": width, "color": color})
+    
+    def clear(self):
+        self._send({"type": "clear"})
+
+    def finish(self):
+        self.sock.close()
+
+# 创建全局实例
+_client_instance = _gui_client()
+
+# 将类方法提升为模块级别的函数
 def show_text(x, y, text, color="black", size=16):
-    _send({"type": "text", "x": x, "y": y, "text": text, "color": color, "size": size})
+    _client_instance.show_text(x, y, text, color, size)
 
-def print(text):  # 使用print作为函数名，因为调用时使用gui.print()
-    _send({"type": "print", "text": text})
+def print(text):
+    _client_instance.print(text)
 
 def println(text):
-    _send({"type": "println", "text": text})
+    _client_instance.println(text)
 
 def show_image(x, y, path, width, height):
-    _send({"type": "image", "x": x, "y": y, "path": path, "width": width, "height": height})
+    _client_instance.show_image(x, y, path, width, height)
 
 def draw_line(x1, y1, x2, y2, color="black", width=1):
-    _send({"type": "line", "x1": x1, "y1": y1, "x2": x2, "y2": y2, "color": color, "width": width})
+    _client_instance.draw_line(x1, y1, x2, y2, color, width)
 
 def fill_rect(x, y, w, h, color="black"):
-    _send({"type": "fill_rect", "x": x, "y": y, "w": w, "h": h, "color": color})
+    _client_instance.fill_rect(x, y, w, h, color)
     
 def draw_rect(x, y, w, h, width, color="black"):
-    _send({"type": "draw_rect", "x": x, "y": y, "w": w, "h": h, "width": width, "color": color})
+    _client_instance.draw_rect(x, y, w, h, width, color)
 
 def fill_circle(cx, cy, r, color="black"):
-    _send({"type": "fill_circle", "cx": cx, "cy": cy, "r": r, "color": color})
+    _client_instance.fill_circle(cx, cy, r, color)
 
 def draw_circle(cx, cy, r, width, color="black"):
-    _send({"type": "draw_circle", "cx": cx, "cy": cy, "r": r, "width": width, "color": color})
+    _client_instance.draw_circle(cx, cy, r, width, color)
 
 def clear():
-    _send({"type": "clear"})
-
-def close():
-    """关闭GUI连接"""
-    global _connection
-    if _connection:
-        _connection.close()
-        _connection = None
-
-# 注册程序退出时自动关闭连接
-import atexit
-atexit.register(close)
+    _client_instance.clear()
+
+def finish():
+    _client_instance.finish()
+
+# 可选：如果希望仍然可以使用类创建新实例
+def create_client(host="127.0.0.1", port=65167):
+    return _gui_client(host, port)
+    

smartpi/humidity.py

@@ -9,7 +9,7 @@ def get_value(port:bytes) -> Optional[bytes]:
     humi_str=[0XA0, 0X0C, 0X01, 0X71, 0X00, 0XBE]
     humi_str[0]=0XA0+port
     humi_str[4]=0X01 
-    response = base_driver.single_operate_sensor(humi_str)
+    response = base_driver.single_operate_sensor(humi_str,0)
     if response == None:
         return None
     else:

smartpi/led.py

@@ -9,7 +9,7 @@ def set_color(port:bytes,command:bytes) -> Optional[bytes]:
     color_lamp_str=[0xA0, 0x05, 0x00, 0xBE]
     color_lamp_str[0]=0XA0+port
     color_lamp_str[2]=command
-    response = base_driver.single_operate_sensor(color_lamp_str)
+    response = base_driver.single_operate_sensor(color_lamp_str,0)
     if response == None:
         return None
     else:

smartpi/light_sensor.py

@@ -8,7 +8,7 @@ def get_value(port:bytes) -> Optional[bytes]:
     light_str=[0xA0, 0x02, 0x00, 0xBE]
     light_str[0]=0XA0+port
     light_str[2]=0x01
-    response = base_driver.single_operate_sensor(light_str)       
+    response = base_driver.single_operate_sensor(light_str,0)       
     if response == None:
         return None
     else:
@@ -23,7 +23,7 @@ def set_threshold(port:bytes,threshold:int) -> Optional[bytes]:
     light_str[2]=0x04
     light_str[4]=threshold//256
     light_str[5]=threshold%256
-    response = base_driver.single_operate_sensor(light_str)       
+    response = base_driver.single_operate_sensor(light_str,0)       
     if response == None:
         return None
     else:
@@ -34,7 +34,7 @@ def get_threshold(port:bytes) -> Optional[bytes]:
     light_str=[0xA0, 0x02, 0x00, 0xBE]
     light_str[0]=0XA0+port
     light_str[2]=0x05
-    response = base_driver.single_operate_sensor(light_str)       
+    response = base_driver.single_operate_sensor(light_str,0)       
     if response == None:
         return None
     else:
@@ -47,7 +47,7 @@ def get_bool_data(port:bytes) -> Optional[bytes]:
     light_str=[0xA0, 0x02, 0x00, 0xBE]
     light_str[0]=0XA0+port
     light_str[2]=0x06
-    response = base_driver.single_operate_sensor(light_str)       
+    response = base_driver.single_operate_sensor(light_str,0)       
     if response == None:
         return None
     else:

smartpi/motor.py

@@ -1,14 +1,15 @@
 # coding=utf-8
 import time
+import struct
 from typing import List, Optional
 from smartpi import base_driver
 
-
+        
 #��������ȡ port:����M�˿ڣ�
 def get_motor_encoder(port:bytes) -> Optional[bytes]:
     motor_str=[0xA0, 0x01, 0x01, 0xBE]           
     motor_str[0]=0XA0+port       
-    response = base_driver.single_operate_sensor(motor_str)        
+    response = base_driver.single_operate_sensor(motor_str,0)        
     if response == None:
         return None
     else:
@@ -20,7 +21,7 @@ def get_motor_encoder(port:bytes) -> Optional[bytes]:
 def reset_motor_encoder(port:bytes) -> Optional[bytes]:
     motor_str=[0xA0, 0x01, 0x03, 0xBE]           
     motor_str[0]=0XA0+port       
-    response = base_driver.single_operate_sensor(motor_str)
+    response = base_driver.single_operate_sensor(motor_str,0)
     if response == None:
         return None
     else:
@@ -31,7 +32,7 @@ def set_motor_direction(port:bytes,direc:bytes) -> Optional[bytes]:
     motor_str=[0xA0, 0x01, 0x06, 0x71, 0x00, 0xBE]           
     motor_str[0]=0XA0+port
     motor_str[4]=direc
-    response = base_driver.single_operate_sensor(motor_str)
+    response = base_driver.single_operate_sensor(motor_str,0)
     if response == None:
         return None
     else:
@@ -52,7 +53,7 @@ def set_motor(port:bytes,speed:int) -> Optional[bytes]:
         
     motor_str[4]=m_par
         
-    response = base_driver.single_operate_sensor(motor_str)
+    response = base_driver.single_operate_sensor(motor_str,0)
     if response == None:
         return None
     else:
@@ -62,7 +63,7 @@ def set_motor(port:bytes,speed:int) -> Optional[bytes]:
 def set_motor_stop(port:bytes) -> Optional[bytes]:
     motor_str=[0xA0, 0x01, 0x0B, 0xBE]           
     motor_str[0]=0XA0+port
-    response = base_driver.single_operate_sensor(motor_str)
+    response = base_driver.single_operate_sensor(motor_str,0)
     if response == None:
         return None
     else:
@@ -85,15 +86,15 @@ def set_motor_angle(port:bytes,speed:int,degree:int) -> Optional[bytes]:
     motor_str[4]=m_par
     motor_str[6]=degree//256
     motor_str[7]=degree%256
-    response = base_driver.single_operate_sensor(motor_str)
+    response = base_driver.single_operate_sensor(motor_str,0)
     if response == None:
         return None
     else:
         return 0
         
 #���ﶨʱת�� port:����M�˿ڣ�speed:-100~100��second:1~256
-def set_motor_second(port:bytes,speed:int,second:bytes) -> Optional[bytes]:
-    motor_str=[0xA0, 0x01, 0x08, 0x81, 0x00, 0x71, 0x00, 0xBE]           
+def set_motor_second(port:bytes,speed:int,second:float) -> Optional[bytes]:
+    motor_str=[0xA0, 0x01, 0x08, 0x81, 0x00, 0x82, 0x00, 0x00, 0x00, 0x00, 0xBE]           
     motor_str[0]=0XA0+port
     
     if speed>100:
@@ -105,9 +106,17 @@ def set_motor_second(port:bytes,speed:int,second:bytes) -> Optional[bytes]:
     elif speed<=0 and speed>=-100:
         m_par=256+speed
         
-    motor_str[4]=m_par
-    motor_str[6]=second
-    response = base_driver.single_operate_sensor(motor_str)
+    motor_str[4]=m_par    
+    
+    byte_data = struct.pack('f', second)
+    byte_array = list(byte_data)
+    
+    motor_str[6]=byte_array[0]
+    motor_str[7]=byte_array[1]
+    motor_str[8]=byte_array[2]
+    motor_str[9]=byte_array[3]
+    
+    response = base_driver.single_operate_sensor(motor_str,second)
     if response == None:
         return None
     else:
@@ -129,7 +138,7 @@ def set_motor_constspeed(port:bytes,speed:int) -> Optional[bytes]:
         
     motor_str[4]=m_par
     
-    response = base_driver.single_operate_sensor(motor_str)
+    response = base_driver.single_operate_sensor(motor_str,0)
     if response == None:
         return None
     else:
@@ -139,7 +148,7 @@ def set_motor_constspeed(port:bytes,speed:int) -> Optional[bytes]:
 def get_motor_speed(port:bytes) -> Optional[bytes]:
     motor_str=[0xA0, 0x01, 0x10, 0xBE]           
     motor_str[0]=0XA0+port       
-    response = base_driver.single_operate_sensor(motor_str)        
+    response = base_driver.single_operate_sensor(motor_str,0)        
     if response == None:
         return None
     else:

smartpi/move.py

@@ -20,7 +20,7 @@ def run_second(dir:bytes,speed:bytes,second:bytes) -> Optional[bytes]:
     move_str[6]=speed
     move_str[8]=second      
              
-    response = base_driver.single_operate_sensor(move_str)        
+    response = base_driver.single_operate_sensor(move_str,0)        
     if response == None:
         return None
     else:
@@ -43,7 +43,7 @@ def run_angle(dir:bytes,speed:bytes,angle:int) -> Optional[bytes]:
     move_str[8]=angle//256
     move_str[9]=angle%256      
              
-    response = base_driver.single_operate_sensor(move_str)        
+    response = base_driver.single_operate_sensor(move_str,0)        
     if response == None:
         return None
     else:
@@ -64,7 +64,7 @@ def run(dir:bytes,speed:bytes) -> Optional[bytes]:
         
     move_str[6]=speed      
              
-    response = base_driver.single_operate_sensor(move_str)        
+    response = base_driver.single_operate_sensor(move_str,0)        
     if response == None:
         return None
     else:
@@ -98,7 +98,7 @@ def run_speed_second(Lspeed:int,Rspeed:int,second:bytes) -> Optional[bytes]:
     
     move_str[8]=second
              
-    response = base_driver.single_operate_sensor(move_str)        
+    response = base_driver.single_operate_sensor(move_str,0)        
     if response == None:
         return None
     else:
@@ -130,7 +130,7 @@ def run_speed(Lspeed:int,Rspeed:int) -> Optional[bytes]:
         
     move_str[4]=m_par
              
-    response = base_driver.single_operate_sensor(move_str)        
+    response = base_driver.single_operate_sensor(move_str,0)        
     if response == None:
         return None
     else:
@@ -143,7 +143,7 @@ def run_power(Lpower:bytes,Rpower:bytes) -> Optional[bytes]:
     move_str[4]=Rpower       
     move_str[6]=Lpower
              
-    response = base_driver.single_operate_sensor(move_str)        
+    response = base_driver.single_operate_sensor(move_str,0)        
     if response == None:
         return None
     else:
@@ -160,7 +160,7 @@ def set_maxpower(M1:bytes,M2:bytes,M3:bytes,M4:bytes,M5:bytes,M6:bytes) -> Optio
     move_str[12]=M5       
     move_str[14]=M6
              
-    response = base_driver.single_operate_sensor(move_str)        
+    response = base_driver.single_operate_sensor(move_str,0)        
     if response == None:
         return None
     else:
@@ -170,7 +170,7 @@ def set_maxpower(M1:bytes,M2:bytes,M3:bytes,M4:bytes,M5:bytes,M6:bytes) -> Optio
 def stop() -> Optional[bytes]:
     move_str=[0xA0, 0x01, 0x0A, 0xBE]   
              
-    response = base_driver.single_operate_sensor(move_str)        
+    response = base_driver.single_operate_sensor(move_str,0)        
     if response == None:
         return None
     else:
@@ -192,7 +192,7 @@ def set_move_init(Lmotor:bytes,Rmotor:bytes,state:bytes) -> Optional[bytes]:
     move_str[6]=Rmotor
     move_str[8]=Lmotor          
 
-    response = base_driver.single_operate_sensor(move_str)        
+    response = base_driver.single_operate_sensor(move_str,0)        
     if response == None:
         return None
     else:

smartpi/servo.py

@@ -9,7 +9,7 @@ def steer_angle(port:bytes,angle:bytes) -> Optional[bytes]:
     servo_str=[0xA0, 0x0E, 0x01, 0x71, 0x00, 0xBE]
     servo_str[0]=0XA0+port
     servo_str[4]=angle
-    response = base_driver.single_operate_sensor(servo_str)
+    response = base_driver.single_operate_sensor(servo_str,0)
     if response == None:
         return None
     else:
@@ -22,7 +22,7 @@ def steer_angle_delay(port:bytes,angle:bytes,second:bytes) -> Optional[bytes]:
     servo_str[4]=angle//256
     servo_str[5]=angle%256
     servo_str[7]=second
-    response = base_driver.single_operate_sensor(servo_str)
+    response = base_driver.single_operate_sensor(servo_str,0)
     if response == None:
         return None
     else:
@@ -33,7 +33,7 @@ def set_dir(port:bytes,dir:bytes) -> Optional[bytes]:
     servo_str=[0xA0, 0x24, 0x01, 0x71, 0x00, 0xBE]
     servo_str[0]=0XA0+port
     servo_str[4]=dir
-    response = base_driver.single_operate_sensor(servo_str)
+    response = base_driver.single_operate_sensor(servo_str,0)
     if response == None:
         return None
     else:
@@ -46,7 +46,7 @@ def set_angle_speed(port:bytes,angle:bytes,speed:bytes) -> Optional[bytes]:
     servo_str[4]=angle//256
     servo_str[5]=angle%256
     servo_str[7]=speed
-    response = base_driver.single_operate_sensor(servo_str)
+    response = base_driver.single_operate_sensor(servo_str,0)
     if response == None:
         return None
     else:
@@ -60,7 +60,7 @@ def set_angle_ms(port:bytes,angle:bytes,ms:int) -> Optional[bytes]:
     servo_str[5]=angle%256
     servo_str[7]=ms//256
     servo_str[8]=ms%256
-    response = base_driver.single_operate_sensor(servo_str)
+    response = base_driver.single_operate_sensor(servo_str,0)
     if response == None:
         return None
     else:
@@ -70,7 +70,7 @@ def set_angle_ms(port:bytes,angle:bytes,ms:int) -> Optional[bytes]:
 def set_init(port:bytes) -> Optional[bytes]:
     servo_str=[0xA0, 0x12, 0x01, 0xBE]
     servo_str[0]=0XA0+port
-    response = base_driver.single_operate_sensor(servo_str)
+    response = base_driver.single_operate_sensor(servo_str,0)
     if response == None:
         return None
     else:
@@ -80,7 +80,7 @@ def set_init(port:bytes) -> Optional[bytes]:
 def get_angle(port:bytes) -> Optional[bytes]:
     servo_str=[0xA0, 0x13, 0x01, 0xBE]
     servo_str[0]=0XA0+port
-    response = base_driver.single_operate_sensor(servo_str)       
+    response = base_driver.single_operate_sensor(servo_str,0)       
     if response == None:
         return None
     else:
@@ -102,7 +102,7 @@ def set_speed(port:bytes,speed:int) -> Optional[bytes]:
         m_par=256+speed
         
     servo_str[4]=m_par
-    response = base_driver.single_operate_sensor(servo_str)
+    response = base_driver.single_operate_sensor(servo_str,0)
     if response == None:
         return None
     else:
@@ -126,7 +126,7 @@ def set_code_speed(port:bytes,code:int,speed:int) -> Optional[bytes]:
         m_par=256+speed      
     servo_str[7]=m_par
 
-    response = base_driver.single_operate_sensor(servo_str)
+    response = base_driver.single_operate_sensor(servo_str,0)
     if response == None:
         return None
     else:
@@ -136,7 +136,7 @@ def set_code_speed(port:bytes,code:int,speed:int) -> Optional[bytes]:
 def reset_encode(port:bytes) -> Optional[bytes]:
     servo_str=[0xA0, 0x16, 0x01, 0xBE]
     servo_str[0]=0XA0+port
-    response = base_driver.single_operate_sensor(servo_str)
+    response = base_driver.single_operate_sensor(servo_str,0)
     if response == None:
         return None
     else:
@@ -146,7 +146,7 @@ def reset_encode(port:bytes) -> Optional[bytes]:
 def get_encoder(port:bytes) -> Optional[bytes]:
     servo_str=[0xA0, 0x17, 0x01, 0xBE]
     servo_str[0]=0XA0+port
-    response = base_driver.single_operate_sensor(servo_str)        
+    response = base_driver.single_operate_sensor(servo_str,0)        
     if response == None:
         return None
     else:

smartpi/temperature.py

@@ -9,7 +9,7 @@ def get_value(port:bytes) -> Optional[bytes]:
     temp_str=[0XA0, 0X0C, 0X01, 0X71, 0X00, 0XBE]
     temp_str[0]=0XA0+port
     temp_str[4]=0 
-    response = base_driver.single_operate_sensor(temp_str)
+    response = base_driver.single_operate_sensor(temp_str,0)
     if response == None:
         return None
     else:

smartpi/touch_sensor.py

@@ -7,7 +7,7 @@ from smartpi import base_driver
 def get_value(port:bytes) -> Optional[bytes]:
     read_sw_str=[0xA0, 0x03, 0x01, 0xBE]
     read_sw_str[0]=0XA0+port   
-    response = base_driver.single_operate_sensor(read_sw_str)
+    response = base_driver.single_operate_sensor(read_sw_str,0)
     if response == None:
         return None
     else:

smartpi/trace.py

@@ -27,7 +27,7 @@ def get_chn_data(port:bytes, chn:bytes) -> Optional[bytes]:
     trace_str=[0xA0, 0x18, 0x01, 0x71, 0x00, 0xBE]
     trace_str[0]=0XA0+port
     trace_str[4]=chn
-    response = base_driver.single_operate_sensor(trace_str)       
+    response = base_driver.single_operate_sensor(trace_str,0)       
     if response == None:
         return None
     else:
@@ -44,7 +44,7 @@ def set_chn_color(port:bytes, color1:bytes, color2:bytes, color3:bytes, color4:b
     trace_str[12]=color5
     trace_str[14]=color6
     trace_str[16]=color7
-    response = base_driver.single_operate_sensor(trace_str)       
+    response = base_driver.single_operate_sensor(trace_str,0)       
     if response == None:
         return None
     else:
@@ -55,7 +55,7 @@ def set_color(port:bytes, color:bytes) -> Optional[bytes]:
     trace_str=[0xA0, 0x20, 0x01, 0x71, 0x00, 0xBE]
     trace_str[0]=0XA0+port
     trace_str[4]=color
-    response = base_driver.single_operate_sensor(trace_str)       
+    response = base_driver.single_operate_sensor(trace_str,0)       
     if response == None:
         return None
     else:
@@ -66,7 +66,7 @@ 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]=20+chn
-    response = base_driver.single_operate_sensor(trace_str)       
+    response = base_driver.single_operate_sensor(trace_str,0)       
     if response == None:
         return None
     else:
@@ -78,7 +78,7 @@ def get_line_state(port:bytes, state:bytes) -> Optional[bytes]:
     trace_str=[0xA0, 0x22, 0x01, 0x71, 0x00, 0xBE]
     trace_str[0]=0XA0+port
     trace_str[4]=state
-    response = base_driver.single_operate_sensor(trace_str)       
+    response = base_driver.single_operate_sensor(trace_str,0)       
     if response == None:
         return None
     else:

smartpi/ultrasonic.py

@@ -8,7 +8,7 @@ def get_value(port:bytes) -> Optional[bytes]:
     ultrasonic_str=[0xA0, 0x06, 0x00, 0xBE]
     ultrasonic_str[0]=0XA0+port
     ultrasonic_str[2]=1 
-    response = base_driver.single_operate_sensor(ultrasonic_str)
+    response = base_driver.single_operate_sensor(ultrasonic_str,0)
         
     if response == None:
         return None

{smartpi-0.1.21.dist-info → smartpi-0.1.23.dist-info}/METADATA

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

smartpi-0.1.23.dist-info/RECORD

@@ -0,0 +1,20 @@
+smartpi/__init__.py,sha256=vHEaSuG4o0m17zvDoMBhn-lttaKYGct1k73F5y1orhk,55
+smartpi/base_driver.py,sha256=jP8cuQ0LRfjMuVQ2I6tY7fxp3JsjcUH8fdWKooIogME,24188
+smartpi/color_sensor.py,sha256=YXJjknYjp7teTZsHYZRAWgi73CH0MhBp1go9y0Inxyo,498
+smartpi/cw2015.py,sha256=1lAF-pi_ye_ya1AZQS1sjbgsDf7MThO5IAskKsNGBzA,5695
+smartpi/flash.py,sha256=-pUqg6FSVoBiLFKqrG9B4dFqn8lICnQsSPJr_MtZLIU,4132
+smartpi/gui.py,sha256=HaupXWg5cWw_n86ge8IxARrvL3gpcDCNRwATK9irwH8,2960
+smartpi/humidity.py,sha256=nZwiBtMWKNipVM83ymajZACPHxkC2vUJjDMmCOPN9lw,499
+smartpi/led.py,sha256=flvN7EJfP6VDTSiC93w1uR8pRxcZD9w2vLXA1GbJTo8,538
+smartpi/light_sensor.py,sha256=MayyVikWcXQfjeZrtYRnwYgHBDzu2g-mfJLpdd29EG8,1852
+smartpi/motor.py,sha256=CS-a1AxKeLFQNxsBpfThWE7lI3ZC27OZthXPfgk8vro,4792
+smartpi/move.py,sha256=mYw5li1qQe97845cqclMksuaKOL9n_0E0n9652EIMcI,6046
+smartpi/servo.py,sha256=SN4Md57MNDBBlu2vCrzby04IDQiLNqdwgvS4dCh0q8E,5057
+smartpi/temperature.py,sha256=VT79CYA41q1d_4AM-Y0eIMeIw7AtCkSXjWVws6Yx5yE,462
+smartpi/touch_sensor.py,sha256=P57RRQlqY0KexpMi-ydqwF5albOKCBOGb0Rb6zeVTqk,440
+smartpi/trace.py,sha256=tut7BMbq87ShaR5eNuv7PZtAEz9DS5_BDf0_muIZ-tQ,4577
+smartpi/ultrasonic.py,sha256=kmVpUfvE1oHoqgv92ZU6Fi-sO6DSwm10ssKsImNeOkY,624
+smartpi-0.1.23.dist-info/METADATA,sha256=VFDRXlgYEsVNBbHmPcqcwQnuu5VUeoFE0G1VtTfe3Vw,311
+smartpi-0.1.23.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+smartpi-0.1.23.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
+smartpi-0.1.23.dist-info/RECORD,,

smartpi-0.1.21.dist-info/RECORD

@@ -1,20 +0,0 @@
-smartpi/__init__.py,sha256=QR4ouIPj9-lhXKMzcZUxB--K9gklRhYKZenfjmxWUOw,55
-smartpi/base_driver.py,sha256=n_KIkdfk2BLzaPZpOj-hH30QuyiGwHSMQuosxj2YnOU,24172
-smartpi/color_sensor.py,sha256=sTqD3jApjmc6qHMrDyEy2UjaRt8vhJZNR88vzgUiLKs,496
-smartpi/cw2015.py,sha256=1lAF-pi_ye_ya1AZQS1sjbgsDf7MThO5IAskKsNGBzA,5695
-smartpi/flash.py,sha256=-pUqg6FSVoBiLFKqrG9B4dFqn8lICnQsSPJr_MtZLIU,4132
-smartpi/gui.py,sha256=E98_soyWbEf_dwYhXZgMSXrgY5QuYoDTuFCPK63flIQ,2102
-smartpi/humidity.py,sha256=xtALQ_IlcwR2RCYvopCSmeNajB45kQU_ckk6FZ0rqko,497
-smartpi/led.py,sha256=n3_k1jGcQptfGXhezDLaYzH6UptgluP4Ze6qP_Y4WmU,536
-smartpi/light_sensor.py,sha256=glDa4O0wW0kamb-tI3qf509qM7zA8UUjVXbA9si3TXM,1844
-smartpi/motor.py,sha256=uvuAwt2j5LjdLaMfNisXqaGh1ro3fZDvHU8IXd2fn9Q,4527
-smartpi/move.py,sha256=3qzrJCGA-qbsLXBpklY2DErtw0jlzMELzozjhEvRzKs,6028
-smartpi/servo.py,sha256=p8BxfqXVQYP81Kl0J9P23AGoGTrnn8To98ipo6Z_Tkk,5035
-smartpi/temperature.py,sha256=px2YeqgG63nPkyhJA1wDg3dwYx_oOCYuhMjtsVm_YO0,460
-smartpi/touch_sensor.py,sha256=F6IIQGewNRhC9U1RbHpVzuGYqb8H41lpeQ1Ejwsc_T8,438
-smartpi/trace.py,sha256=ntk3UwVATOV_eViGQhFi3lyil9xFmzeZZ_MBvQTq3UQ,4567
-smartpi/ultrasonic.py,sha256=0meczFKXFLUt92kLxipeEc37vb5duvJjPs4kgtlpO8M,622
-smartpi-0.1.21.dist-info/METADATA,sha256=bZEx5P-yz1jfxEPLJS9W-DhGHNrjyfXHHiKLlkLqpHE,311
-smartpi-0.1.21.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-smartpi-0.1.21.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
-smartpi-0.1.21.dist-info/RECORD,,