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

smartpi/__init__.py

@@ -2,5 +2,5 @@ from ._gui import gui
 
 __all__ = ["base_driver","gui","ultrasonic","touch_sensor","temperature","humidity","light_sensor","color_sensor","motor","servo","led","flash"]
 
-__version__ = "0.1.29"
+__version__ = "0.1.31"
 

smartpi/_gui.py

@@ -1,15 +1,32 @@
+
+
 import socket
 import json
 import time
 
 class gui_client:
-    def __init__(self, host="127.0.0.1", port=65167):
-        self.sock = socket.create_connection((host, port))
-        self.clear()
+    def __init__(self, host="127.0.0.1", port=65167, timeout=2.0):
+        self.sock = None
+        try:
+            self.sock = socket.create_connection((host, port), timeout=timeout)
+            self.clear()
+        except :
+            self.sock = None 
 
+    def is_connected(self):
+        result = False
+        if self.sock is not None:
+            result = True
+        return result
+    
     def _send(self, cmd):
-        self.sock.sendall((json.dumps(cmd) + "\n").encode())
-        time.sleep(0.1)
+        if self.sock is None:
+            return
+        try:
+            self.sock.sendall((json.dumps(cmd) + "\n").encode())
+            time.sleep(0.1)  
+        except :
+            self.sock = None
 
     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})

smartpi/base_driver.py

@@ -1,5 +1,5 @@
 # coding=utf-8
-import serial,time,struct,threading,fcntl
+import serial,time,struct,threading,fcntl,os
 from typing import List, Optional
 from collections import deque
 from . import servo,motor,cw2015
@@ -267,25 +267,10 @@ def read_factory_data() -> Optional[bytes]:
 
 """读取硬件ID"""
 def read_hardware_ID() -> Optional[bytes]:
-    serial_lock.acquire()  #获取线程锁
-    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  # 进程锁，阻塞其他进程
-    write_data(READ_HW_ID_H, READ_HW_ID_L)
-    start_time = time.time()
-    while True:
-        response =process_received_data()
-        if response:
-            serial_lock.release()  #释放线程锁
-            fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
-            display_data = response[6:-3].decode(errors="ignore")
-#            print(f"硬件ID: {display_data}")
-            return display_data
-        else:
-            if time.time() - start_time > 3:
-                print("读取超时")
-                buffer.clear() 
-                serial_lock.release()  #释放线程锁
-                fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
-                return None
+    result = os.popen("cat /proc/cpuinfo | grep Serial").read().strip()
+    if ":" in result:
+        return result.split(":")[1].strip()
+    return None
         
 """读取设备名称"""
 def read_device_name() -> Optional[bytes]:
@@ -361,104 +346,6 @@ def read_battery() -> Optional[bytes]:
         return sensor.get_soc(0)
     else:
         return None
-        
-###############################################################################固件升级
-
-#"""下载更新请求"""
-#def update_request() -> Optional[bytes]:
-#    write_data(UPDATE_REQUEST_H, UPDATE_REQUEST_L)
-#    start_time = time.time()
-#    while True:
-#        response =process_received_data()
-#        if response:
-#            display_data = response[6:-3].decode(errors="ignore")
-#            print(f"从机响应: {display_data}")
-#            return display_data
-#        else:
-#            if time.time() - start_time > 3:
-#                print("读取超时")
-#                buffer.clear() 
-#                return None
-#
-#"""查询最大通讯长度"""
-#def read_max_com_len() -> Optional[bytes]:
-#    write_data(MAX_COM_LEN_H, MAX_COM_LEN_L)
-#    start_time = time.time()
-#    while True:
-#        response =process_received_data()
-#        if response:
-#            display_data = response[6:-3].decode(errors="ignore")
-#            print(f"从机响应: {display_data}")
-#            return display_data
-#        else:
-#            if time.time() - start_time > 3:
-#                print("读取超时")
-#                buffer.clear() 
-#                return None
-#
-#"""下载文件的信息"""
-#def download_massage() -> Optional[bytes]:
-#    write_data(DL_MESSAGE_H, DL_MESSAGE_L, file_data)#文件信息来源从哪获取？
-#    start_time = time.time()
-#    while True:
-#        response =process_received_data()
-#        if response:
-#            display_data = response[6:-3].decode(errors="ignore")
-#            print(f"从机响应: {display_data}")
-#            return display_data
-#        else:
-#            if time.time() - start_time > 3:
-#                print("读取超时")
-#                buffer.clear() 
-#                return None
-#
-#"""查询设备状态"""
-#def read_device_status() -> Optional[bytes]:
-#    write_data(READ_STATUS_H, READ_STATUS_L)
-#    start_time = time.time()
-#    while True:
-#        response =process_received_data()
-#        if response:
-#            display_data = response[6:-3].decode(errors="ignore")
-#            print(f"从机响应: {display_data}")
-#            return display_data
-#        else:
-#            if time.time() - start_time > 3:
-#                print("读取超时")
-#                buffer.clear() 
-#                return None
-#        
-#"""发送页校验码"""
-#def write_page_check() -> Optional[bytes]:
-#    write_data(PAGE_CHECK_H, PAGE_CHECK_L, page_check_data)
-#    start_time = time.time()
-#    while True:
-#        response =process_received_data()
-#        if response:
-#            display_data = response[6:-3].decode(errors="ignore")
-#            print(f"从机响应: {display_data}")
-#            return display_data
-#        else:
-#            if time.time() - start_time > 3:
-#                print("读取超时")
-#                buffer.clear() 
-#                return None          
-#        
-#"""发送页数据"""
-#def write_page_check() -> Optional[bytes]:
-#    write_data(PAGE_SEND_H, PAGE_SEND_L, page_send_data)
-#    start_time = time.time()
-#    while True:
-#        response =process_received_data()
-#        if response:
-#            display_data = response[6:-3].decode(errors="ignore")
-#            print(f"从机响应: {display_data}")
-#            return display_data
-#        else:
-#            if time.time() - start_time > 3:
-#                print("读取超时")
-#                buffer.clear() 
-#                return None
      
 ###############################################################################读取传感器信息
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: smartpi
-Version: 0.1.29
+Version: 0.1.31
 Summary: A library use for H2-RCU
 Author: ZMROBO
 Classifier: Programming Language :: Python :: 3
@@ -9,3 +9,9 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 
+灵芯派函数库
+SmartPi library
+
+V0.1.31
+1、更新了设备硬件ID读取函数；
+

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

@@ -1,6 +1,6 @@
-smartpi/__init__.py,sha256=DD3m7tPhima564oB5wb8kPTu1puPptby_1t8IlPB5d0,199
-smartpi/_gui.py,sha256=QObbzAx3m9m7E6A0uQ0Ek_Ofb3stSl7ef96FdVpMVn4,1779
-smartpi/base_driver.py,sha256=hJ5_Rph1BT-riYiW1pgw685WAgEMjpqDF264BLSP6hk,24392
+smartpi/__init__.py,sha256=Mx0R3q6LJmVf3XdhWEIDW7hj_vsJq0V5t3jS2XeErj8,199
+smartpi/_gui.py,sha256=ij-6HZAEIwdy_hvU7f0NkyQjx_-eephijlKbGUhf8Uo,2177
+smartpi/base_driver.py,sha256=P029DleVPCTYTWi0ckwTwdfBNzzRrb13mGFdxIWCSYQ,20131
 smartpi/color_sensor.py,sha256=YXJjknYjp7teTZsHYZRAWgi73CH0MhBp1go9y0Inxyo,498
 smartpi/cw2015.py,sha256=1lAF-pi_ye_ya1AZQS1sjbgsDf7MThO5IAskKsNGBzA,5695
 smartpi/flash.py,sha256=-pUqg6FSVoBiLFKqrG9B4dFqn8lICnQsSPJr_MtZLIU,4132
@@ -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.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,,
+smartpi-0.1.31.dist-info/METADATA,sha256=cWc5QT8cfatmdvFj6TYtDRYZf41lR7NlktAgu9Z-DM0,399
+smartpi-0.1.31.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+smartpi-0.1.31.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
+smartpi-0.1.31.dist-info/RECORD,,