smartpi 0.1.42__py3-none-any.whl → 0.1.43__py3-none-any.whl

smartpi/__init__.py

@@ -4,5 +4,5 @@ from .base_driver import P1, P2, P3, P4, P5, P6, M1, M2, M3, M4, M5, M6
 __all__ = ["base_driver","gui","ultrasonic","touch_sensor","temperature","humidity","light_sensor","color_sensor","motor","servo","led","flash",
            "P1", "P2", "P3", "P4", "P5", "P6", "M1", "M2", "M3", "M4", "M5", "M6"]
 
-__version__ = "0.1.42"
+__version__ = "0.1.43"
 

smartpi/base_driver.py

@@ -109,7 +109,7 @@ def uart3_init() -> Optional[serial.Serial]:
 def calculate_pro_check(command_h: int, command_l: int, data: List[bytes] = None) -> int:    
     if data:
         len_data = len(data)
-        base_sum = 0x86 + 0xAB + 0x00 + 0x09 + len_data + command_h + command_l + 0x01 + 0xCF
+        base_sum = 0x86 + 0xAB + (len_data+9)//256 + 0x09 + len_data + command_h + command_l + 0x01 + 0xCF
         base_sum += sum(data)
     else:
         base_sum = 0x86 + 0xAB + 0x00 + 0x09 + command_h + command_l + 0x01 + 0xCF
@@ -130,10 +130,10 @@ def write_data(command_h: int, command_l: int, send_data: bytes= None, lock: byt
             send_packet = [0x86, 0xAB, 0x00, 0x09, command_h, command_l, 0x01, pro_check, 0xCF]
         send_bytes = bytes(send_packet)
         
-        print("send:")
-        for x in send_bytes:
-            print(f"{x:02X}", end=' ')
-        print("\n")
+#        print("send:")
+#        for x in send_bytes:
+#            print(f"{x:02X}", end=' ')
+#        print("\n")
         buf_clear()
         serial_lock.acquire()  #获取线程锁
         fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  #进程锁，阻塞其他进程
@@ -153,10 +153,10 @@ def write_data(command_h: int, command_l: int, send_data: bytes= None, lock: byt
             send_packet = [0x86, 0xAB, 0x00, 0x09, command_h, command_l, 0x01, pro_check, 0xCF]
         send_bytes = bytes(send_packet)
         
-        print("send:")
-        for x in send_bytes:      
-            print(f"{x:02X}", end=' ')
-        print("\n")
+#        print("send:")
+#        for x in send_bytes:      
+#            print(f"{x:02X}", end=' ')
+#        print("\n")
         buf_clear()
         ser.write(send_bytes)
                  
@@ -197,6 +197,7 @@ def process_received_data():
 #            for x in buffer:
 #                print(f"{x:02X}", end=' ')
 #            print("\n")
+            
             # 1. 查找帧头
             start_idx = buffer.find(HEADER)
             if start_idx == -1:
@@ -230,6 +231,10 @@ def process_received_data():
         # 处理所有完整帧
         if len(frames_queue) > 0:
             frame = frames_queue.popleft()
+#            for x in frame:
+#                print(f"{x:02X}", end=' ')
+#            print("\n") 
+            
             if check_frame(frame):
                 return frame
             else:
@@ -549,262 +554,7 @@ def buf_clear():
         fcntl.ioctl(ser.fileno(), termios.TCIOFLUSH)
     except:
         pass
-        
-        
-def enter_bootloader_mode():
-    """进入Bootloader模式"""
-    serial_lock.acquire()  #获取线程锁
-    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  #进程锁，阻塞其他进程           
-    write_data(BOOT_UPDATE_H, BOOT_UPDATE_L, None, False)
-    start_time = time.time()
-    while True:
-        response =process_received_data()
-        if response:
-            serial_lock.release()  #释放线程锁
-            fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
-            buf_clear()
-            print("get:")
-            for x in response:
-                print(f"{x:02X}", end=' ')
-            print("\n")
-            return True
-        else:
-            if time.time() - start_time > 2:  
-                print("读取超时")
-                buf_clear()
-                serial_lock.release()  #释放线程锁
-                fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
-                return None  
-
-def send_update_request():
-    """发送更新请求"""
-    serial_lock.acquire()  #获取线程锁
-    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  #进程锁，阻塞其他进程           
-    write_data(UPDATE_REQUEST_H, UPDATE_REQUEST_L, None, False)
-    start_time = time.time()
-    while True:
-        response = process_received_data()
-        if response:
-            serial_lock.release()  #释放线程锁
-            fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
-            buf_clear()
-            print("get:")
-            for x in response:
-                print(f"{x:02X}", end=' ')
-            print("\n")
-            return True
-        else:
-            if time.time() - start_time > 2:  
-                print("更新请求超时")
-                buf_clear()
-                serial_lock.release()  #释放线程锁
-                fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
-                return None
-
-def send_file_size(file_size):
-    """发送文件大小"""
-    serial_lock.acquire()  #获取线程锁
-    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  #进程锁，阻塞其他进程
-    
-    try:
-        # 将文件大小转换为4字节小端序
-        size_data = struct.pack('<I', file_size)
-        write_data(MAX_COM_LEN_H, MAX_COM_LEN_L, size_data, False)
-        
-        start_time = time.time()
-        while True:
-            response = process_received_data()
-            if response:
-                serial_lock.release()  #释放线程锁
-                fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
-                buf_clear()
-                for x in response:
-                    print(f"{x:02X}", end=' ')
-                print("\n")
-                return True
-            else:
-                if time.time() - start_time > 2:  
-                    print("发送文件大小超时")
-                    buf_clear()
-                    serial_lock.release()  #释放线程锁
-                    fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
-                    return None
-    except Exception as e:
-        print(f"发送文件大小出错: {e}")
-        serial_lock.release()  #释放线程锁
-        fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
-        return None
-
-def send_file_data_chunk(chunk_data, chunk_num, total_chunks):
-    """发送文件数据块"""
-    serial_lock.acquire()  #获取线程锁
-    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)  #进程锁，阻塞其他进程
-    
-    try:
-        write_data(PAGE_SEND_H, PAGE_SEND_L, chunk_data, False)
-        
-        start_time = time.time()
-        while True:
-            response = process_received_data()
-            if response:
-                serial_lock.release()  #释放线程锁
-                fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
-                buf_clear()
-                # 显示进度
-                progress = (chunk_num + 1) * 100 // total_chunks
-                if progress % 10 == 0 or chunk_num == total_chunks - 1:
-                    print(f"传输进度: {progress}% ({chunk_num+1}/{total_chunks})")
-                return True
-            else:
-                if time.time() - start_time > 2:  
-                    print(f"第{chunk_num+1}块数据发送超时")
-                    buf_clear()
-                    serial_lock.release()  #释放线程锁
-                    fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
-                    return None
-    except Exception as e:
-        print(f"发送数据块出错: {e}")
-        serial_lock.release()  #释放线程锁
-        fcntl.flock(ser.fileno(), fcntl.LOCK_UN)  # 释放进程锁
-        return None
-
-def send_restart_command():
-    """发送重启命令"""
-    print("发送重启指令...")
-    serial_lock.acquire()
-    fcntl.flock(ser.fileno(), fcntl.LOCK_EX)
-    
-    try:
-        # 发送重启命令 (0xFF 0xFF)
-        write_data(0xFF, 0xFF, None, False)
-        
-        # 重启不需要等待响应，因为设备会立即重启
-        time.sleep(0.5)
-        print("重启指令已发送")
-        return True
-    except Exception as e:
-        print(f"发送重启指令出错: {e}")
-        return False
-    finally:
-        serial_lock.release()
-        fcntl.flock(ser.fileno(), fcntl.LOCK_UN)
-
-def transmit_file_to_usb(file_path, chunk_size=512):
-    """
-    传输文件到虚拟U盘的主函数
-    
-    Args:
-        file_path: 要传输的文件路径
-        chunk_size: 每个数据块的大小（默认512字节）
-    
-    Returns:
-        bool: 传输是否成功
-    """
-    print("=" * 50)
-    print("开始文件传输到虚拟U盘")
-    print("=" * 50)
-    
-    # 检查文件是否存在
-    if not os.path.exists(file_path):
-        print(f"错误: 文件不存在 - {file_path}")
-        return False
-    
-    # 获取文件大小
-    try:
-        file_size = os.path.getsize(file_path)
-        print(f"文件: {os.path.basename(file_path)}")
-        print(f"大小: {file_size} 字节")
-    except Exception as e:
-        print(f"获取文件大小出错: {e}")
-        return False
-    
-    # 确保串口已初始化
-    if not ser.is_open:
-        print("初始化串口...")
-        uart3_init()
-        if not ser.is_open:
-            print("串口初始化失败")
-            return False
-    
-    # 1. 进入Bootloader模式
-    enter_bootloader_mode()
-        
-    time.sleep(5)
-    
-    # 2. 发送更新请求
-    if not send_update_request():
-        print("更新请求失败，传输中止")
-        return False
-    
-#    # 3. 发送文件大小
-#    if not send_file_size(file_size):
-#        print("文件大小发送失败，传输中止")
-#        return False
-#    
-#    # 4. 读取并发送文件数据
-#    print("开始传输文件数据...")
-#    try:
-#        with open(file_path, 'rb') as f:
-#            total_chunks = (file_size + chunk_size - 1) // chunk_size
-#            
-#            for chunk_num in range(total_chunks):
-#                # 读取数据块
-#                chunk_data = f.read(chunk_size)
-#                if not chunk_data:
-#                    print(f"错误: 第{chunk_num+1}块数据读取失败")
-#                    return False
-#                
-#                # 如果数据块不足chunk_size，填充0（可选）
-#                if len(chunk_data) < chunk_size:
-#                    chunk_data += b'\x00' * (chunk_size - len(chunk_data))
-#                
-#                # 发送数据块
-#                if not send_file_data_chunk(chunk_data, chunk_num, total_chunks):
-#                    print(f"第{chunk_num+1}块数据发送失败，传输中止")
-#                    return False
-#        
-#        print("文件数据传输完成!")
-#        
-#    except Exception as e:
-#        print(f"读取或发送文件数据出错: {e}")
-#        return False
-#    
-#    # 5. 发送重启命令
-#    if not send_restart_command():
-#        print("重启指令发送失败")
-#        return False
-#    
-#    print("=" * 50)
-#    print("文件传输成功完成!")
-#    print("文件已保存到虚拟U盘")
-#    print("设备将自动重启...")
-#    print("=" * 50)
-    
-    # 等待设备重启
-    time.sleep(3)
-    return True
-    
-def example_file_transfer():
-    """文件传输使用示例"""
-    print("文件传输示例")
-    print("-" * 30)
-    
-    # 初始化串口
-    uart3_init()
-    
-    # 指定要传输的文件路径
-    # 请根据实际情况修改
-    file_path = "/home/zmrobo/UPDATE.DAT"
-    
-    # 执行文件传输
-    success = transmit_file_to_usb(file_path)
-    
-    if success:
-        print("文件传输成功！")
-        return 0
-    else:
-        print("文件传输失败！")
-        return 1
+           
     
 """H2-RCU初始化"""
 def smartpi_init():

{smartpi-0.1.42.dist-info → smartpi-0.1.43.dist-info}/METADATA

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

{smartpi-0.1.42.dist-info → smartpi-0.1.43.dist-info}/RECORD

@@ -1,10 +1,10 @@
-smartpi/__init__.py,sha256=7AdxZqsEjhv8Ht_bLXOoF3T3jGZ0TEnG-SVYdjs4NR0,356
+smartpi/__init__.py,sha256=YzlPmAHE6lnrGS7ChCmQYrfk9QZRPCNMlw46chQnWSY,356
 smartpi/_gui.py,sha256=ij-6HZAEIwdy_hvU7f0NkyQjx_-eephijlKbGUhf8Uo,2177
 smartpi/ai_asr.py,sha256=wxh_1Klh8vJottAt19jq3qpOmM_Cw4DHQEPKpsHGhmE,40063
 smartpi/ai_llm.py,sha256=-khBK2PMwbYUDvbaCTRCktE4dFloqfai4mHI-V8GEXM,36751
 smartpi/ai_tts.py,sha256=OjAJs3XOykiufXuEDiaD0coKsWjknPdhwRpRzGLDZKU,36061
 smartpi/ai_vad.py,sha256=9J1xxuKF8GvojkL_JuXv7_xE8bQAo5D49Xasi8piKK8,3630
-smartpi/base_driver.py,sha256=nGkGp7cAgeNo7BijHMJKHfdVZKIKuZNTx9GqLFPP5TI,31486
+smartpi/base_driver.py,sha256=BwqgcYbQ9Rg8KiBJV2xy--NMNsMIg_zL-nnsAilCHJk,22687
 smartpi/camera.py,sha256=AVpZsMpW-24CP3BOfarjmRawMJdTOZY7Crq7FeLOqb4,3292
 smartpi/color_sensor.py,sha256=ckIXD81YnqPo6nENAnipNp3gY12FJ235QKj0e8Cul9E,521
 smartpi/cw2015.py,sha256=1lAF-pi_ye_ya1AZQS1sjbgsDf7MThO5IAskKsNGBzA,5695
@@ -70,7 +70,7 @@ smartpi/text_gte_model/config/tokenizer_config.json,sha256=w5RiDifbeIYy6vyGX5v94
 smartpi/text_gte_model/config/vocab.txt,sha256=oi9hP3uz_8h8XoHNh6rgLnVdJbIEm75zKoSKM8HzsC8,84758
 smartpi/text_gte_model/gte/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpi/text_gte_model/gte/gte_model.onnx,sha256=XXYg6TUhzOx1SqAhp6ePDU0QgeK6DQEqHATMuQQJCNE,30468366
-smartpi-0.1.42.dist-info/METADATA,sha256=FxIXEB2WMTsKc8Fs8ukVfdnD3--vqy7fOEXFT5AQLq8,614
-smartpi-0.1.42.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-smartpi-0.1.42.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
-smartpi-0.1.42.dist-info/RECORD,,
+smartpi-0.1.43.dist-info/METADATA,sha256=Itx-zHFW2xLOdYkd5UgHu7EKImJObZdgVXD-yduwt7c,614
+smartpi-0.1.43.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+smartpi-0.1.43.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
+smartpi-0.1.43.dist-info/RECORD,,