smartpi 0.1.24__py3-none-any.whl → 0.1.26__py3-none-any.whl

smartpi/__init__.py

@@ -1,4 +1,4 @@
 __all__ = ["base_driver"]
 
-__version__ = "0.1.24"
+__version__ = "0.1.26"
 

smartpi/base_driver.py

@@ -595,6 +595,26 @@ def shut_down_state() -> bool:
         serial_lock.release()  #释放线程锁
         fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
         return False
+
+def exit_program() -> 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]==0XFD:
+            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 buf_clear():
     buffer.clear()

smartpi/gui.py

@@ -1,8 +1,4 @@
 #!/usr/bin/env python3
-"""
-可靠触摸屏GUI - 恢复可工作版本
-"""
-
 import tkinter as tk
 from tkinter import font as tkfont
 import os
@@ -100,8 +96,7 @@ def _read_touch_events():
                 break
         except Exception as e:
             print(f"触摸读取异常: {e}")
-            break
-    
+            break    
     # 关闭设备
     os.close(fd)
 
@@ -142,10 +137,8 @@ def init():
     touch_thread = threading.Thread(target=_read_touch_events, daemon=True)
     touch_thread.start()
     
-    # 等待GUI初始化完成
     time.sleep(0.2)
 
-
 # 公共接口函数
 def show_text(x, y, text, color="black", size=16):
     if _canvas and _fonts:
@@ -190,6 +183,18 @@ def get_touch_y():
 def get_touchscreen():
     return _touch_pressed
 
+#检测区域范围内是否按下  返回：1：按下；0：没按下  
+def get_xy_touch(x1,y1,x2,y2):
+    if get_touchscreen():
+        x = get_touch_x()
+        y = get_touch_y()
+        if x1 <= x <= x2 and y1 <= y <= y2:
+            return 1
+        else:
+            return 0
+    else:
+        return 0
+
 def should_exit():
     """检查是否应该退出程序"""
     return _exit_triggered
@@ -235,4 +240,16 @@ def check_exit_button(x, y):
         global _exit_triggered
         _exit_triggered = True
         return True
-    return False
+    return False
+    
+#判断有无按下退出按键  返回：1：按下；0：没按下
+def exit_button():
+    x = get_touch_x()
+    y = get_touch_y()
+    pressed = get_touchscreen()
+    draw_exit_button()
+    if pressed and check_exit_button(x,y):
+        return 1
+    else:
+        return 0
+    

{smartpi-0.1.24.dist-info → smartpi-0.1.26.dist-info}/METADATA

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

{smartpi-0.1.24.dist-info → smartpi-0.1.26.dist-info}/RECORD

@@ -1,9 +1,9 @@
-smartpi/__init__.py,sha256=mtkDm-FlobRiZdbqGbS77ZzAwe5A9DRGKwIoWdhN2U4,55
-smartpi/base_driver.py,sha256=jP8cuQ0LRfjMuVQ2I6tY7fxp3JsjcUH8fdWKooIogME,24188
+smartpi/__init__.py,sha256=QSExDrXsT6YYS4iMlWm6tRK2sV5uLqOeGXQOVD70emo,55
+smartpi/base_driver.py,sha256=kVpIRNObvhQUQDF7nXnoSvEDMhgfwYxAYQ8Ymv0cMek,24998
 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=nUFfU-jbDMOHIqZOyiy-7bwO0gMTJllscjnTLyoPYsk,7228
+smartpi/gui.py,sha256=UEi-ub1KFxIl5uYFhwZRJ2Jt-nFFgAnEhwczVzL4PnE,7755
 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.24.dist-info/METADATA,sha256=EQIoqPSL55ic97bXSlKHbMhQYTH37iI-k9tCJHCJPXc,311
-smartpi-0.1.24.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-smartpi-0.1.24.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
-smartpi-0.1.24.dist-info/RECORD,,
+smartpi-0.1.26.dist-info/METADATA,sha256=nQZgGpvSJ9IT-ozXTDLaVj62i8pUoeE1Ug-lznHudJM,311
+smartpi-0.1.26.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+smartpi-0.1.26.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
+smartpi-0.1.26.dist-info/RECORD,,