Rdzleo
c24a9bc162
阶段1: 将 dzbj 项目的 LVGL 8.3.11 LCD 显示集成到 AI小智 主项目， 开机显示 ScreenHome 界面，同时优化配网模式下的内存使用， 确保 WiFi+BLE+LVGL 三者共存运行。 ## 新增功能 ### dzbj 显示模块集成 - 新增 main/dzbj/ 目录，移植 LCD 驱动(ST77916 QSPI)、触摸驱动(CST816S)、 LVGL 初始化和 SquareLine Studio UI 界面 - I2C 总线共享：dzbj 触摸控制器复用主项目的 I2C_NUM_1 总线 - GPIO 冲突解决：LED(GPIO21)、Touch1(GPIO1)、Touch4(GPIO7) 改为 NC， 电池 ADC 从 GPIO6 改为 GPIO3 - 添加 LVGL、esp_lcd_st77916、esp_lcd_touch_cst816s 等组件依赖 - managed_components 纳入版本管理 ### 配网模式轻量化启动 - BoxAudioCodec: 新增 output_only 模式，仅创建 I2S TX 通道（省 ~13KB DMA） 跳过 ES7210 ADC 初始化（省 ~2-4KB） - AudioCodec: 新增 StartOutputOnly() 方法，仅启用扬声器输出 - Application: 配网模式跳过 Opus 编码器、输入重采样器、协议初始化、 天气位置检测等网络业务 - 板级构造函数: 配网模式跳过电池检测、IMU传感器、PowerSaveTimer ### WifiBoard 配网流程修复 - NeedsProvisioning() 静态方法: 读取 NVS force_ap 和 SSID 列表， 用于提前判断配网模式 - force_ap 竞态修复: 构造函数不再清零 force_ap，改在 StartNetwork() 清零， 确保 NeedsProvisioning() 能正确读到 force_ap=1 - Application 缓存 provisioning_mode_ 成员变量，避免重复读 NVS ### BLE 配网重启修复 - 配网成功后用 esp_timer 延迟重启替代 xTaskCreate， 避免内存紧张时任务创建失败导致设备不重启 - 注释掉 WiFi 连接成功后的 MAC 地址发送步骤 ### sdkconfig 内存优化 - BT_ALLOCATION_FROM_SPIRAM_FIRST=y (BLE 动态分配优先 PSRAM) - SPIRAM_MALLOC_RESERVE_INTERNAL=32768 - NVS_ALLOCATE_CACHE_IN_SPIRAM=y - WiFi 静态缓冲区数量优化 (RX=10, TX=8) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
109 lines
2.9 KiB
Python
109 lines
2.9 KiB
Python
#!/usr/bin/env python3
|
|
|
|
import sys
|
|
import os.path
|
|
from os import path
|
|
import os, fnmatch
|
|
import re
|
|
import subprocess
|
|
import com
|
|
|
|
def cmd(c, ask_on_err = True):
|
|
print("\n" + c)
|
|
r = os.system(c)
|
|
if r:
|
|
print("### Error: " + str(r))
|
|
if ask_on_err:
|
|
input("Press Enter to continue execution...")
|
|
|
|
def define_set(fn, name, value):
|
|
print("In " + fn + " set " + name + " to " + value)
|
|
|
|
new_content = ""
|
|
s = r'^ *# *define +' + str(name).rstrip() + ' +'
|
|
|
|
f = open(fn, "r")
|
|
for i in f.read().splitlines():
|
|
r = re.search(s, i)
|
|
if r:
|
|
d = i.split("define")
|
|
i = d[0] + "define " + name + " " + value
|
|
new_content += i + '\n'
|
|
|
|
f.close()
|
|
|
|
f = open(fn, "w")
|
|
f.write(new_content)
|
|
f.close()
|
|
|
|
def ver_format(ver):
|
|
s = "v" + str(ver[0]) + "." + str(ver[1]) + "." + str(ver[2])
|
|
if(ver[3] != ""): s = s + "-" + ver[3]
|
|
return s
|
|
|
|
def get_lvgl_version():
|
|
print("Get lvgl's version ")
|
|
|
|
ver = [0, 0, 0, ""]
|
|
|
|
f = open("./lvgl.h", "r")
|
|
|
|
lastNum = re.compile(r'(?:[^\d]*(\d+)[^\d]*)+')
|
|
for i in f.read().splitlines():
|
|
r = re.search(r'^#define LVGL_VERSION_MAJOR ', i)
|
|
if r:
|
|
m = lastNum.search(i)
|
|
if m: ver[0] = m.group(1)
|
|
|
|
r = re.search(r'^#define LVGL_VERSION_MINOR ', i)
|
|
if r:
|
|
m = lastNum.search(i)
|
|
if m: ver[1] = m.group(1)
|
|
|
|
r = re.search(r'^#define LVGL_VERSION_PATCH ', i)
|
|
if r:
|
|
m = lastNum.search(i)
|
|
if m: ver[2] = m.group(1)
|
|
|
|
f.close()
|
|
|
|
print("Version found: " + ver_format(ver))
|
|
|
|
return ver
|
|
|
|
def push(c):
|
|
cmd("git push " + c)
|
|
|
|
def update_version(ver):
|
|
ver_str = ver_format(ver)
|
|
ver_num = ver[0] + "." + ver[1] + "." + ver[2]
|
|
|
|
templ = fnmatch.filter(os.listdir('.'), '*_templ*.h')
|
|
|
|
if len(templ) > 0 and templ[0]:
|
|
print("Updating version in " + templ[0])
|
|
cmd("sed -i -r 's/v[0-9]+\.[0-9]+\.[0-9]+.*/"+ "v" + ver_num + "/' " + templ[0])
|
|
|
|
if os.path.exists("library.json"):
|
|
print("Updating version in library.json")
|
|
cmd("sed -i -r 's/[0-9]+\.[0-9]+\.[0-9]+/"+ ver_num +"/' library.json")
|
|
|
|
if path.exists("library.properties"):
|
|
print("Updating version in library.properties")
|
|
cmd("sed -i -r 's/version=[0-9]+\.[0-9]+\.[0-9]+/"+ "version=" + ver_num + "/' library.properties")
|
|
|
|
if path.exists("conf.py"):
|
|
cmd("sed -i -r 's/v[0-9]+\.[0-9]+\.[0-9]+.*/" + ver_str + "/' conf.py")
|
|
|
|
if path.exists("Kconfig"):
|
|
cmd("sed -i -r 's/v[0-9]+\.[0-9]+\.[0-9]+.*/" + ver_str + "/' Kconfig")
|
|
|
|
if path.exists("lvgl.h"):
|
|
define_set("./lvgl.h", "LVGL_VERSION_MAJOR", str(ver[0]))
|
|
define_set("./lvgl.h", "LVGL_VERSION_MINOR", str(ver[1]))
|
|
define_set("./lvgl.h", "LVGL_VERSION_PATCH", str(ver[2]))
|
|
define_set("./lvgl.h", "LVGL_VERSION_INFO", "\"" + ver[3] + "\"")
|
|
|
|
cmd("git commit -am 'Update versions to " + ver_str + "'")
|
|
|