smartpi 0.1.14__py3-none-any.whl → 0.1.16__py3-none-any.whl

smartpi/__init__.py

@@ -1,4 +1,4 @@
 __all__ = ["base_driver"]
 
-__version__ = "0.1.14"
+__version__ = "0.1.16"
 

smartpi/base_driver.py

@@ -116,6 +116,10 @@ def write_data(command_h: int, command_l: int, send_data: bytes= None) -> Option
             send_packet = [0x86, 0xAB, 0x00, 0x09, command_h, command_l, 0x01, pro_check, 0xCF]
         send_bytes = bytes(send_packet)
         
+#        for x in send_bytes:
+#            print(f"{x:02X}", end=' ')
+#        print("\n")
+        
         ser.write(send_bytes)
                  
         
@@ -135,12 +139,26 @@ def process_received_data():
         global buffer
         # 读取所有可用数据
         data = ser.read(ser.in_waiting or 1)
+        
+#        if data:
+#            buffer.extend(data)
+#            
+#            # 检查缓冲区中是否有0xCF
+#            if 0xCF in buffer:
+#                # 找到0xCF的位置
+#                cf_index = buffer.index(0xCF)
+#                # 提取从开始到0xCF的完整帧（包括0xCF）
+#                frame = buffer[:cf_index + 1]
+#                # 从缓冲区中移除已处理的数据
+#                buffer = buffer[cf_index + 1:]
+#                return bytes(frame)          
+        
         if data:
             buffer.extend(data)
         while len(buffer)>=2:
-    #            for x in buffer:
-    #                print(f"{x:02X}", end=' ')
-    #            print("\n")
+#            for x in buffer:
+#                print(f"{x:02X}", end=' ')
+#            print("\n")
             # 1. 查找帧头
             start_idx = buffer.find(HEADER)
             if start_idx == -1:
@@ -425,13 +443,13 @@ def read_battery() -> Optional[bytes]:
 
 """读取外设连接情况"""
 def read_peripheral() -> Optional[bytes]: 
-    serial_lock.acquire()  #获取线程锁
+#    serial_lock.acquire()  #获取线程锁
     write_data(READ_PERIPH_H, READ_PERIPH_L)
     start_time = time.time()
     while True:
         response =process_received_data()
         if response:
-            serial_lock.release()  #释放线程锁
+#            serial_lock.release()  #释放线程锁
             display_data = response[6:-3]
 #            for x in display_data:
 #                print(f"{x:02X}", end=' ')
@@ -441,7 +459,7 @@ def read_peripheral() -> Optional[bytes]:
             if time.time() - start_time > 3:
                 print("读取超时")
                 buffer.clear() 
-                serial_lock.release()  #释放线程锁
+#                serial_lock.release()  #释放线程锁
                 return None
 
 """单次操作外设"""         
@@ -485,9 +503,9 @@ def mode_change(send_data: str) -> Optional[bytes]:
         if response:
             serial_lock.release()  #释放线程锁
             display_data = response[6:-3]
-            for x in display_data:
-                print(f"{x:02X}", end=' ')
-            print("\n")
+#            for x in display_data:
+#                print(f"{x:02X}", end=' ')
+#            print("\n")
             return display_data
         else:
             if time.time() - start_time > 3:
@@ -506,9 +524,9 @@ def mode_change(send_data: str) -> Optional[bytes]:
         if response:
             serial_lock.release()  #释放线程锁
             display_data = response[6:-3]
-            for x in display_data:
-                print(f"{x:02X}", end=' ')
-            print("\n")
+#            for x in display_data:
+#                print(f"{x:02X}", end=' ')
+#            print("\n")
             return display_data
         else:
             if time.time() - start_time > 3:
@@ -516,6 +534,27 @@ def mode_change(send_data: str) -> Optional[bytes]:
                 buffer.clear()
                 serial_lock.release()  #释放线程锁 
                 return None
+                
+def shut_down(self):
+    serial_lock.acquire()  #获取线程锁
+    base_driver.write_data(0XFF, 0XFE)
+    serial_lock.release()  #释放线程锁
+    time.sleep(0.5)
+    
+def shut_down_state(self) -> bool:
+    serial_lock.acquire()  #获取线程锁
+    response =base_driver.process_received_data()
+    if response:
+        receive_data = response[4:-3]
+        if receive_data[0]==0XFF and receive_data[1]==0XFE:
+            serial_lock.release()  #释放线程锁
+            return True
+        else:
+            serial_lock.release()  #释放线程锁
+            return False
+    else:
+        serial_lock.release()  #释放线程锁
+        return False
 
 """H2-RCU初始化"""
 def smartpi_init():

smartpi/flash.py

@@ -0,0 +1,130 @@
+import os
+import struct
+import fcntl
+
+# 配置文件路径 (当前目录下的flash.bin)
+FLASH_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "/home/Interface/flash/flash.bin")
+FLASH_FILE_2 = os.path.join(os.path.dirname(os.path.abspath(__file__)), "/home/Interface/flash/flash_2.bin")
+
+DATA_SIZE = 2  # 每个数据2字节
+TOTAL_SLOTS = 100  # 100个数据槽
+
+def _init_flash_file():
+    """初始化存储文件"""
+    if not os.path.exists(FLASH_FILE):
+        with open(FLASH_FILE, "wb") as f:
+            f.write(b'\x00' * DATA_SIZE * TOTAL_SLOTS)
+
+def write(address, data):
+    """
+    写入数据到指定地址
+    :param address: 地址编号 (1-100)
+    :param data: 要写入的整数数据 (2字节范围)
+    """
+    if not 1 <= address <= TOTAL_SLOTS:
+        raise ValueError(f"地址必须在1-{TOTAL_SLOTS}范围内")
+    
+    # 2字节数据范围: 0-65535 (0xFFFF)
+    if not 0 <= data <= 0xFFFF:
+        raise ValueError("数据必须在0-65535范围内")
+    
+    _init_flash_file()
+    
+    # 计算文件偏移量 (每个地址2字节)
+    offset = (address - 1) * DATA_SIZE
+    
+    with open(FLASH_FILE, "r+b") as f:
+        # 使用文件锁确保写入安全
+        fcntl.flock(f, fcntl.LOCK_EX)
+        f.seek(offset)
+        # 将整数打包为2字节小端格式
+        f.write(struct.pack('<H', data))
+        f.flush()
+        fcntl.flock(f, fcntl.LOCK_UN)
+
+def read(address):
+    """
+    从指定地址读取数据
+    :param address: 地址编号 (1-100)
+    :return: 读取到的整数数据
+    """
+    if not 1 <= address <= TOTAL_SLOTS:
+        raise ValueError(f"地址必须在1-{TOTAL_SLOTS}范围内")
+    
+    _init_flash_file()
+    
+    offset = (address - 1) * DATA_SIZE
+    
+    with open(FLASH_FILE, "rb") as f:
+        fcntl.flock(f, fcntl.LOCK_SH)  # 共享锁
+        f.seek(offset)
+        # 读取2字节并解包为整数
+        data_bytes = f.read(DATA_SIZE)
+        fcntl.flock(f, fcntl.LOCK_UN)
+        
+        if len(data_bytes) != DATA_SIZE:
+            return 0  # 返回默认值0
+            
+        return struct.unpack('<H', data_bytes)[0]
+
+# 可选扩展功能
+def erase_all():
+    """擦除所有数据(重置为0)"""
+    with open(FLASH_FILE, "wb") as f:
+        f.write(b'\x00' * DATA_SIZE * TOTAL_SLOTS)
+        
+            
+def _init_flash_file_2():
+    """初始化存储文件"""
+    if not os.path.exists(FLASH_FILE_2):
+        with open(FLASH_FILE_2, "wb") as f:
+            f.write(b'\x00' * DATA_SIZE * TOTAL_SLOTS)
+        
+def write_2(address, data):
+    if not 1 <= address <= TOTAL_SLOTS:
+        raise ValueError(f"地址必须在1-{TOTAL_SLOTS}范围内")
+    
+    # 2字节数据范围: 0-65535 (0xFFFF)
+    if not 0 <= data <= 0xFFFF:
+        raise ValueError("数据必须在0-65535范围内")
+    
+    _init_flash_file_2()
+    
+    # 计算文件偏移量 (每个地址2字节)
+    offset = (address - 1) * DATA_SIZE
+    
+    with open(FLASH_FILE_2, "r+b") as f:
+        # 使用文件锁确保写入安全
+        fcntl.flock(f, fcntl.LOCK_EX)
+        f.seek(offset)
+        # 将整数打包为2字节小端格式
+        f.write(struct.pack('<H', data))
+        f.flush()
+        fcntl.flock(f, fcntl.LOCK_UN)
+
+def read_2(address):
+    if not 1 <= address <= TOTAL_SLOTS:
+        raise ValueError(f"地址必须在1-{TOTAL_SLOTS}范围内")
+    
+    _init_flash_file_2()
+    
+    offset = (address - 1) * DATA_SIZE
+    
+    with open(FLASH_FILE_2, "rb") as f:
+        fcntl.flock(f, fcntl.LOCK_SH)  # 共享锁
+        f.seek(offset)
+        # 读取2字节并解包为整数
+        data_bytes = f.read(DATA_SIZE)
+        fcntl.flock(f, fcntl.LOCK_UN)
+        
+        if len(data_bytes) != DATA_SIZE:
+            return 0  # 返回默认值0
+            
+        return struct.unpack('<H', data_bytes)[0]
+
+# 可选扩展功能
+def erase_all_2():
+    """擦除所有数据(重置为0)"""
+    with open(FLASH_FILE_2, "wb") as f:
+        f.write(b'\x00' * DATA_SIZE * TOTAL_SLOTS)
+        

smartpi/light_sensor.py

@@ -3,11 +3,11 @@ import time
 from typing import List, Optional
 from smartpi import base_driver
 
-#����ȡ port:����P�˿ڣ�  �������أ��Ҷ�����; ��ȡ����-1  
+#����ֵ��ȡ port:����P�˿ڣ�  �������أ���ֵ����; ��ȡ����-1  
 def get_value(port:bytes) -> Optional[bytes]:
     light_str=[0xA0, 0x02, 0x00, 0xBE]
     light_str[0]=0XA0+port
-    light_str[2]=1
+    light_str[2]=0x01
     response = base_driver.single_operate_sensor(light_str)       
     if response == None:
         return None
@@ -15,4 +15,41 @@ def get_value(port:bytes) -> Optional[bytes]:
         light_data=response[4:-1]
         light_num=int.from_bytes(light_data, byteorder='big', signed=True)
         return light_num
+        
+#�����ֵ���� port:����P�˿ڣ� threshold�����õ���ֵ0~4000
+def set_threshold(port:bytes,threshold:int) -> Optional[bytes]:
+    light_str=[0xA0, 0x02, 0x00, 0x81, 0x00, 0x00, 0xBE]
+    light_str[0]=0XA0+port
+    light_str[2]=0x04
+    light_str[4]=threshold//256
+    light_str[5]=threshold%256
+    response = base_driver.single_operate_sensor(light_str)       
+    if response == None:
+        return None
+    else:
+        return 0
+        
+#�����ֵ��ȡ port:����P�˿ڣ�  
+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)       
+    if response == None:
+        return None
+    else:
+        light_data=response[4:-1]
+        light_num=int.from_bytes(light_data, byteorder='big', signed=True)
+        return light_num
+        
+#����ȡ��ǰֵ���趨��ֵ�ȽϺ��boolֵ port:����P�˿ڣ�  
+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)       
+    if response == None:
+        return None
+    else:
+        return response[4]
         

smartpi/trace.py

@@ -0,0 +1,31 @@
+# coding=utf-8
+import time
+from typing import List, Optional
+from smartpi import base_driver
+
+#循迹卡单通道光值读取 port:连接P端口；正常返回：通道光值数据; 读取错误：None  
+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)       
+    if response == None:
+        return None
+    else:
+        trace_data=response[4:-1]
+        trace_num=int.from_bytes(trace_data, byteorder='big', signed=True)
+        return response[4]
+        
+#循迹卡设置全部颜色 port:连接P端口；正常返回：通道光值数据; 读取错误：None  
+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)       
+    if response == None:
+        return None
+    else:
+        return response[4]
+
+        
+        

{smartpi-0.1.14.dist-info → smartpi-0.1.16.dist-info}/METADATA

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

{smartpi-0.1.14.dist-info → smartpi-0.1.16.dist-info}/RECORD

@@ -1,18 +1,20 @@
-smartpi/__init__.py,sha256=7gd_8YTZSFswemDB4ymWsDfhMpyAMzJ0BMImjrWF6vc,55
-smartpi/base_driver.py,sha256=ChZAacB5ACUoA6R1bB4MYQH4Mkl0umrlZ3UFaTfoz-Q,19571
+smartpi/__init__.py,sha256=-IsfhJ0_REei-Mi4dvCdVrV0tMnAsoRJ4o1wGOWSOls,55
+smartpi/base_driver.py,sha256=rUMy7pmTVmE59iwCeKY_TIDeZ2JvYNwFHIEe45GBgR0,20906
 smartpi/color_sensor.py,sha256=sTqD3jApjmc6qHMrDyEy2UjaRt8vhJZNR88vzgUiLKs,496
 smartpi/cw2015.py,sha256=1lAF-pi_ye_ya1AZQS1sjbgsDf7MThO5IAskKsNGBzA,5695
+smartpi/flash.py,sha256=Luz0TjinQSkx31uVknqfSWkiAiVrqIE2Iba7lk3AOzM,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=kWmoXklYS1QG0eDz4Qn9FF4WueR3GARb3OwQSkXqUNA,569
+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=B6X3yCoEz82qqpUIE5MSO0Eg9YZJ5zDzJEcRpioZpUo,4625
 smartpi/temperature.py,sha256=px2YeqgG63nPkyhJA1wDg3dwYx_oOCYuhMjtsVm_YO0,460
 smartpi/touch_sensor.py,sha256=F6IIQGewNRhC9U1RbHpVzuGYqb8H41lpeQ1Ejwsc_T8,438
+smartpi/trace.py,sha256=2sqMZhaT1x2pR7qO-U5w4XHyFssx3swRka88mJlcxPw,1095
 smartpi/ultrasonic.py,sha256=0meczFKXFLUt92kLxipeEc37vb5duvJjPs4kgtlpO8M,622
-smartpi-0.1.14.dist-info/METADATA,sha256=X3ikK51XRpqcegUbzHDAtzSIy3L4Z_A7pc7rOuM6SAI,311
-smartpi-0.1.14.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-smartpi-0.1.14.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
-smartpi-0.1.14.dist-info/RECORD,,
+smartpi-0.1.16.dist-info/METADATA,sha256=oAj0zNAj6MBGhGgjM4VyXT_W-B9QZe5ialmBNRh3gcU,311
+smartpi-0.1.16.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+smartpi-0.1.16.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
+smartpi-0.1.16.dist-info/RECORD,,