smartpi 0.1.27__py3-none-any.whl → 0.1.29__py3-none-any.whl

smartpi/__init__.py

@@ -1,4 +1,6 @@
-__all__ = ["base_driver"]
+from ._gui import gui
 
-__version__ = "0.1.27"
+__all__ = ["base_driver","gui","ultrasonic","touch_sensor","temperature","humidity","light_sensor","color_sensor","motor","servo","led","flash"]
+
+__version__ = "0.1.29"
 

smartpi/{gui.py → _gui.py}

@@ -2,7 +2,7 @@ import socket
 import json
 import time
 
-class _gui_client:
+class gui_client:
     def __init__(self, host="127.0.0.1", port=65167):
         self.sock = socket.create_connection((host, port))
         self.clear()
@@ -44,44 +44,6 @@ class _gui_client:
     def finish(self):
         self.sock.close()
 
-# 创建全局实例
-_client_instance = _gui_client()
+# 外部调用
+gui = gui_client()
 
-# 将类方法提升为模块级别的函数
-def show_text(x, y, text, color="black", size=16):
-    _client_instance.show_text(x, y, text, color, size)
-
-def print(text):
-    _client_instance.print(text)
-
-def println(text):
-    _client_instance.println(text)
-
-def show_image(x, y, path, width, height):
-    _client_instance.show_image(x, y, path, width, height)
-
-def draw_line(x1, y1, x2, y2, color="black", width=1):
-    _client_instance.draw_line(x1, y1, x2, y2, color, width)
-
-def fill_rect(x, y, w, h, color="black"):
-    _client_instance.fill_rect(x, y, w, h, color)
-    
-def draw_rect(x, y, w, h, width, color="black"):
-    _client_instance.draw_rect(x, y, w, h, width, color)
-
-def fill_circle(cx, cy, r, color="black"):
-    _client_instance.fill_circle(cx, cy, r, color)
-
-def draw_circle(cx, cy, r, width, color="black"):
-    _client_instance.draw_circle(cx, cy, r, width, color)
-
-def clear():
-    _client_instance.clear()
-
-def finish():
-    _client_instance.finish()
-
-# 可选：如果希望仍然可以使用类创建新实例
-def create_client(host="127.0.0.1", port=65167):
-    return _gui_client(host, port)
-    

smartpi/base_driver.py

@@ -2,7 +2,7 @@
 import serial,time,struct,threading,fcntl
 from typing import List, Optional
 from collections import deque
-from . import servo,motor,cw2015,gui
+from . import servo,motor,cw2015
 
 # 创建全局线程锁
 serial_lock = threading.RLock()
@@ -575,28 +575,8 @@ def shut_down():
     serial_lock.release()  #释放线程锁
     fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
     time.sleep(0.5)
-    
-def shut_down_state() -> bool:
-    serial_lock.acquire()  #获取线程锁
-    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
-    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:
-            buffer.clear()
-            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
         
-def exit_program() -> bool:
+def power_button_detec() -> bytes:
     serial_lock.acquire()  #获取线程锁
     fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
     response =process_received_data()
@@ -605,16 +585,20 @@ def exit_program() -> bool:
         if receive_data[0]==0XFF and receive_data[1]==0XFD:
             serial_lock.release()  #释放线程锁
             fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
-            return True
+            return 1
+        elif receive_data[0]==0XFF and receive_data[1]==0XFE:
+            serial_lock.release()  #释放线程锁
+            fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
+            return 2
         else:
             buffer.clear()
             serial_lock.release()  #释放线程锁
             fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
-            return False
+            return 0
     else:
         serial_lock.release()  #释放线程锁
         fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
-        return False
+        return 0
         
 def buf_clear():
     buffer.clear()

{smartpi-0.1.27.dist-info → smartpi-0.1.29.dist-info}/METADATA

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

{smartpi-0.1.27.dist-info → smartpi-0.1.29.dist-info}/RECORD

@@ -1,9 +1,9 @@
-smartpi/__init__.py,sha256=BzLHJz_p4B14Wqd4Ns_Zpte5C5k34J6GRQlwjT6Qx0E,55
-smartpi/base_driver.py,sha256=2mlWUIsgFHg_IUltMN8KDcAdKadTHMd9n_aB4YQiro0,25006
+smartpi/__init__.py,sha256=DD3m7tPhima564oB5wb8kPTu1puPptby_1t8IlPB5d0,199
+smartpi/_gui.py,sha256=QObbzAx3m9m7E6A0uQ0Ek_Ofb3stSl7ef96FdVpMVn4,1779
+smartpi/base_driver.py,sha256=hJ5_Rph1BT-riYiW1pgw685WAgEMjpqDF264BLSP6hk,24392
 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
@@ -14,7 +14,7 @@ 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.27.dist-info/METADATA,sha256=sdrqXFW-34__a1ICBrHYjMJAqjbzDad0DiYM0aY0FpE,311
-smartpi-0.1.27.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-smartpi-0.1.27.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
-smartpi-0.1.27.dist-info/RECORD,,
+smartpi-0.1.29.dist-info/METADATA,sha256=EX2b2m3MfzrJHoX2hRGSQJhlBYMWpFuRcwPttrctwhA,311
+smartpi-0.1.29.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+smartpi-0.1.29.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
+smartpi-0.1.29.dist-info/RECORD,,