smartpi 0.1.11__py3-none-any.whl → 0.1.13__py3-none-any.whl

smartpi/__init__.py

@@ -1,4 +1,4 @@
 __all__ = ["base_driver"]
 
-__version__ = "0.1.11"
+__version__ = "0.1.13"
 

smartpi/base_driver.py

@@ -331,7 +331,7 @@ def update_request() -> Optional[bytes]:
             if time.time() - start_time > 3:
                 print("读取超时")
                 buffer.clear() 
-                return -1
+                return None
 
 """查询最大通讯长度"""
 def read_max_com_len() -> Optional[bytes]:
@@ -347,7 +347,7 @@ def read_max_com_len() -> Optional[bytes]:
             if time.time() - start_time > 3:
                 print("读取超时")
                 buffer.clear() 
-                return -1
+                return None
 
 """下载文件的信息"""
 #def download_massage() -> Optional[bytes]:
@@ -363,7 +363,7 @@ def read_max_com_len() -> Optional[bytes]:
 #            if time.time() - start_time > 3:
 #                print("读取超时")
 #                buffer.clear() 
-#                return -1
+#                return None
 #
 #"""查询设备状态"""
 #def read_device_status() -> Optional[bytes]:
@@ -379,7 +379,7 @@ def read_max_com_len() -> Optional[bytes]:
 #            if time.time() - start_time > 3:
 #                print("读取超时")
 #                buffer.clear() 
-#                return -1
+#                return None
 #        
 #"""发送页校验码"""
 #def write_page_check() -> Optional[bytes]:
@@ -395,7 +395,7 @@ def read_max_com_len() -> Optional[bytes]:
 #            if time.time() - start_time > 3:
 #                print("读取超时")
 #                buffer.clear() 
-#                return -1          
+#                return None          
 #        
 #"""发送页数据"""
 #def write_page_check() -> Optional[bytes]:
@@ -411,7 +411,7 @@ def read_max_com_len() -> Optional[bytes]:
 #            if time.time() - start_time > 3:
 #                print("读取超时")
 #                buffer.clear() 
-#                return -1
+#                return None
      
 ###############################################################################读取传感器信息
 

smartpi/gui.py

@@ -1,28 +1,97 @@
 import socket
 import json
 import sys
+import threading
+import queue
+import atexit
 
 # 连接对象（模块级单例）
 _connection = None
+# 命令队列
+_command_queue = queue.Queue(maxsize=1000)
+# 后台发送线程
+_sender_thread = None
+# 线程停止标志
+_stop_event = threading.Event()
 
 def init(host="127.0.0.1", port=65167):
     """初始化GUI连接"""
-    global _connection
+    global _connection, _sender_thread, _stop_event
     if _connection is None:
-        _connection = socket.create_connection((host, port))
+        try:
+            _connection = socket.create_connection((host, port))
+            _connection.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
+        except ConnectionRefusedError:
+            print(f"无法连接到GUI服务器 {host}:{port}", file=sys.stderr)
+            return
+        
+        # 启动后台发送线程
+        _stop_event.clear()
+        _sender_thread = threading.Thread(target=_send_worker, daemon=True)
+        _sender_thread.start()
         _send({"type": "clear"})
 
-def _send(cmd):
-    """发送命令到服务器"""
-    if _connection is None and "pytest" not in sys.modules:  # 允许测试环境不初始化
-        raise ConnectionError("GUI not initialized. Call gui.init() first.")
+def _send_worker():
+    """后台发送线程的工作函数"""
+    while not _stop_event.is_set():
+        try:
+            # 从队列中获取命令，最多等待0.01秒
+            cmd = _command_queue.get(timeout=0.01)
+            
+            if _connection:
+                data = json.dumps(cmd) + "\n"
+                _connection.sendall(data.encode())
+            
+            # 标记任务完成
+            _command_queue.task_done()
+        except queue.Empty:
+            continue
+        except (BrokenPipeError, ConnectionResetError):
+            # 连接断开，尝试重新连接
+            _reconnect()
+        except Exception as e:
+            print(f"发送错误: {e}", file=sys.stderr)
+            time.sleep(0.1)
+
+def _reconnect():
+    """尝试重新连接服务器"""
+    global _connection
     if _connection:
-        _connection.sendall((json.dumps(cmd) + "\n").encode())
+        try:
+            _connection.close()
+        except:
+            pass
+        _connection = None
+    
+    # 尝试重新连接
+    try:
+        _connection = socket.create_connection(("127.0.0.1", 65167))
+        _connection.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
+        _send({"type": "clear"})
+    except Exception as e:
+        print(f"重新连接失败: {e}", file=sys.stderr)
+
+def _send(cmd):
+    """发送命令到服务器（线程安全）"""
+    # 如果没有连接，直接返回
+    if _connection is None and "pytest" not in sys.modules:
+        return
+    
+    # 将命令放入队列由后台线程发送
+    try:
+        _command_queue.put(cmd, block=False)
+    except queue.Full:
+        # 队列满时丢弃最旧的一条命令
+        try:
+            _command_queue.get_nowait()
+        except queue.Empty:
+            pass
+        _command_queue.put(cmd, block=False)
 
 def show_text(x, y, text, color="black", size=16):
     _send({"type": "text", "x": x, "y": y, "text": text, "color": color, "size": size})
 
-def print(text):  # 使用print作为函数名，因为调用时使用gui.print()
+def print(text):
     _send({"type": "print", "text": text})
 
 def println(text):
@@ -51,11 +120,18 @@ def clear():
 
 def close():
     """关闭GUI连接"""
-    global _connection
+    global _connection, _sender_thread, _stop_event
+    # 设置停止事件
+    _stop_event.set()
+    if _sender_thread:
+        # 等待发送线程退出
+        _sender_thread.join(timeout=0.5)
     if _connection:
-        _connection.close()
+        try:
+            _connection.close()
+        except:
+            pass
         _connection = None
 
 # 注册程序退出时自动关闭连接
-import atexit
 atexit.register(close)

smartpi/servo.py

@@ -95,7 +95,7 @@ def set_speed(port:bytes,speed:int) -> Optional[bytes]:
     if response == None:
         return None
     else:
-        return 0     
+        return 0      
         
 #���ֶ������ת�� port:����P�˿ڣ�code:����(0~65535)��speed:�ٶ�(-100~100)��
 def set_code_speed(port:bytes,code:int,speed:int) -> Optional[bytes]:
@@ -119,7 +119,7 @@ def set_code_speed(port:bytes,code:int,speed:int) -> Optional[bytes]:
     if response == None:
         return None
     else:
-        return 0 
+        return 0  
 
 #���ֶ������ֵ���� port:����P�˿ڣ�
 def reset_encode(port:bytes) -> Optional[bytes]:

{smartpi-0.1.11.dist-info → smartpi-0.1.13.dist-info}/METADATA

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

{smartpi-0.1.11.dist-info → smartpi-0.1.13.dist-info}/RECORD

@@ -1,18 +1,18 @@
-smartpi/__init__.py,sha256=CD_hKLtgmxyccH-ALP0bESCFPd6DvzMJQDqN9sKrtwg,55
-smartpi/base_driver.py,sha256=RVZQX1wbSVToJ_fsvxeVcc-v31LnND3YUPCybyUZa3s,18021
+smartpi/__init__.py,sha256=hSlULYmtHrtLpplBFTQagFL4pXXCSoMgkNVFfklgtzc,55
+smartpi/base_driver.py,sha256=FmnwZFqKE2HVUsDoqxXigdX1YlElcY07YkLnlvKY_x8,18033
 smartpi/color_sensor.py,sha256=sTqD3jApjmc6qHMrDyEy2UjaRt8vhJZNR88vzgUiLKs,496
 smartpi/cw2015.py,sha256=1lAF-pi_ye_ya1AZQS1sjbgsDf7MThO5IAskKsNGBzA,5695
-smartpi/gui.py,sha256=E98_soyWbEf_dwYhXZgMSXrgY5QuYoDTuFCPK63flIQ,2102
+smartpi/gui.py,sha256=M0VXAxk9VmW8VXSbbcRfOtZUVigWIDn0pEEYZHMTeI0,4416
 smartpi/humidity.py,sha256=xtALQ_IlcwR2RCYvopCSmeNajB45kQU_ckk6FZ0rqko,497
 smartpi/led.py,sha256=n3_k1jGcQptfGXhezDLaYzH6UptgluP4Ze6qP_Y4WmU,536
 smartpi/light_sensor.py,sha256=kWmoXklYS1QG0eDz4Qn9FF4WueR3GARb3OwQSkXqUNA,569
 smartpi/motor.py,sha256=uvuAwt2j5LjdLaMfNisXqaGh1ro3fZDvHU8IXd2fn9Q,4527
 smartpi/move.py,sha256=3qzrJCGA-qbsLXBpklY2DErtw0jlzMELzozjhEvRzKs,6028
-smartpi/servo.py,sha256=0KfWM1PEBL2u15-lZnzav_qTWErf0ldeuX265c6oUPM,4623
+smartpi/servo.py,sha256=B6X3yCoEz82qqpUIE5MSO0Eg9YZJ5zDzJEcRpioZpUo,4625
 smartpi/temperature.py,sha256=px2YeqgG63nPkyhJA1wDg3dwYx_oOCYuhMjtsVm_YO0,460
 smartpi/touch_sensor.py,sha256=F6IIQGewNRhC9U1RbHpVzuGYqb8H41lpeQ1Ejwsc_T8,438
 smartpi/ultrasonic.py,sha256=0meczFKXFLUt92kLxipeEc37vb5duvJjPs4kgtlpO8M,622
-smartpi-0.1.11.dist-info/METADATA,sha256=Vthva8Lex9bj8dr-QULiRbD0GuitBBR_0hRnCLlFRZQ,311
-smartpi-0.1.11.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-smartpi-0.1.11.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
-smartpi-0.1.11.dist-info/RECORD,,
+smartpi-0.1.13.dist-info/METADATA,sha256=fyS1LxSRoLa2FGN9JpZ7QYayqJ6zx57Nyt_mTBP6JI0,311
+smartpi-0.1.13.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+smartpi-0.1.13.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
+smartpi-0.1.13.dist-info/RECORD,,