From: snickersun Date: Fri, 8 May 2026 02:25:32 +0000 (+0800) Subject: 更新新的编译系统。实现版本名称配置一体 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=8409c093c28ad7e32ed1a7c9ee3543555f7fe41d;p=mirrors%2FASR1603_G5.git 更新新的编译系统。实现版本名称配置一体 --- diff --git a/2.sdk/new.bat b/2.sdk/new.bat index e1adebb8..9fd22482 100644 --- a/2.sdk/new.bat +++ b/2.sdk/new.bat @@ -1,5 +1,5 @@ @echo off -call new_version.bat %1 +call new_version.bat %1 %2 cd project\%1\ diff --git a/2.sdk/new_clean.bat b/2.sdk/new_clean.bat index f2e19e6a..d182db1b 100644 --- a/2.sdk/new_clean.bat +++ b/2.sdk/new_clean.bat @@ -1,8 +1,115 @@ -@echo off -set PATH=D:\helios\bin;%PATH% -set "COMSPEC=%SystemRoot%\System32\cmd.exe" -cd Helios_SDK -helios clean -cd .. -new.bat %1 -:exit \ No newline at end of file +@echo off +setlocal EnableDelayedExpansion +cd /d "%~dp0" + +set "PATH=D:\helios\bin;%PATH%" +set "COMSPEC=%SystemRoot%\System32\cmd.exe" + +if "%~1"=="" ( + set "PRODUCT_NAME=k8" +) else ( + set "PRODUCT_NAME=%~1" +) + +set "CORE_BASE=project\7PIN_1_5\sdk\services\microPython\ports\quectel\core" +set "INI=%CORE_BASE%\products\product_!PRODUCT_NAME!.ini" + +if not exist "!INI!" ( + echo [错误] 找不到 product.ini: !INI! + exit /b 1 +) + +set "DEV_TYPE=" +set "SRV_TYPE=" +set "VERSION=" +for /f "usebackq tokens=1,* delims==" %%a in ("!INI!") do ( + if /i "%%~a"=="DEV_TYPE" set "DEV_TYPE=%%~b" + if /i "%%~a"=="SRV_TYPE" set "SRV_TYPE=%%~b" + if /i "%%~a"=="VERSION" set "VERSION=%%~b" +) + +if "!DEV_TYPE!"=="" ( + echo [错误] product.ini 中未定义 DEV_TYPE + exit /b 1 +) +if "!SRV_TYPE!"=="" ( + echo [错误] product.ini 中未定义 SRV_TYPE + exit /b 1 +) +if "!VERSION!"=="" ( + echo [错误] product.ini 中未定义 VERSION + exit /b 1 +) +set "VERSION=!VERSION:"=!" +for /f "delims=" %%s in ("!VERSION!") do set "VERSION=%%s" +set "VERSION=!VERSION: =!" + +set "SRC_CFG=!CORE_BASE!\products\configs\!DEV_TYPE!\default_config.py" +set "SRC_SRV=!CORE_BASE!\products\srv_configs\!SRV_TYPE!\default_srv.py" + +if not exist "!SRC_CFG!" ( + echo [错误] 找不到设备配置: !SRC_CFG! + exit /b 1 +) +if not exist "!SRC_SRV!" ( + echo [错误] 找不到服务器配置: !SRC_SRV! + exit /b 1 +) + +echo [信息] 覆盖 core\default_config.py ^<- products\configs\!DEV_TYPE! +copy /y "!SRC_CFG!" "!CORE_BASE!\default_config.py" >nul +if errorlevel 1 ( + echo [错误] copy default_config 失败 + exit /b 1 +) + +echo [信息] 覆盖 core\default_srv.py ^<- products\srv_configs\!SRV_TYPE! +copy /y "!SRC_SRV!" "!CORE_BASE!\default_srv.py" >nul +if errorlevel 1 ( + echo [错误] copy default_srv 失败 + exit /b 1 +) + +cd Helios_SDK +helios clean +if errorlevel 1 ( + echo [错误] helios clean 失败 + cd .. + exit /b 1 +) +cd .. + +call new.bat 7PIN_1_5 !PRODUCT_NAME! +if errorlevel 1 ( + echo [错误] 编译失败 ^(new.bat^) + exit /b 1 +) + +set "REL_DIR=Helios_SDK\opt\release\EG810MCN_GA_VOLTE" +if not exist "!REL_DIR!" ( + echo [错误] 编译产物目录不存在: !REL_DIR! + exit /b 1 +) + +set "D8=%date:~0,4%%date:~5,2%%date:~8,2%" +set "THMS=%time:~0,2%%time:~3,2%%time:~6,2%" +set "THMS=!THMS: =0!" +set "BUILD_TIME=!D8!_!THMS!" + +set "COMMIT=nogit" +for /f "delims=" %%h in ('git -C "%~dp0.." rev-parse --short HEAD 2^>nul') do set "COMMIT=%%h" +if "!COMMIT!"=="" set "COMMIT=nogit" + +set "NEWNAME=!PRODUCT_NAME!_!DEV_TYPE!_!SRV_TYPE!_!VERSION!_!BUILD_TIME!_!COMMIT!" + +if not exist "release" mkdir "release" + +echo [信息] 复制产物到 release\!NEWNAME! +xcopy /E /I /Y "!REL_DIR!" "release\!NEWNAME!\" >nul +if errorlevel 1 ( + echo [错误] xcopy 失败 + exit /b 1 +) + +echo [完成] release\!NEWNAME! +exit /b 0 diff --git a/2.sdk/new_version.bat b/2.sdk/new_version.bat index c4947b90..b9dbca13 100644 --- a/2.sdk/new_version.bat +++ b/2.sdk/new_version.bat @@ -1,2 +1,27 @@ -echo Version="V1.0" > project\%1%\sdk\services\microPython\ports\quectel\core\versions.py -echo Build_Time="%date:~0,4%-%date:~5,2%-%date:~8,2% %time:~0,8%" >> project\%1%\sdk\services\microPython\ports\quectel\core\versions.py \ No newline at end of file +@echo off +set "PROJ=%~1" +set "PRODUCT_NAME=%~2" +if "%PRODUCT_NAME%"=="" set "PRODUCT_NAME=k8" + +set "CORE_BASE=project\%PROJ%\sdk\services\microPython\ports\quectel\core" +set "INI=%CORE_BASE%\products\product_%PRODUCT_NAME%.ini" + +if not exist "%INI%" ( + echo [???] ?????product.ini: %INI% + exit /b 1 +) + +set "VERSION=" +for /f "usebackq tokens=1,* delims==" %%a in ("%INI%") do ( + if /i "%%~a"=="VERSION" set "VERSION=%%~b" +) +if "%VERSION%"=="" ( + echo [???] %INI% ?????? VERSION + exit /b 1 +) + +set "VERSION=%VERSION:\"=%" +set "VERSION=%VERSION: =%" + +echo Version="%VERSION%" > "%CORE_BASE%\versions.py" +echo Build_Time="%date:~0,4%-%date:~5,2%-%date:~8,2% %time:~0,8%" >> "%CORE_BASE%\versions.py" diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/7PIN/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/7PIN/default_config.py deleted file mode 100644 index 456c5689..00000000 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/7PIN/default_config.py +++ /dev/null @@ -1,54 +0,0 @@ -# 设备分支配置:7PIN -# 仅用于编译/打包阶段选择,不作为运行时加载入口。 - -DEV_TYPE = "7PIN" - -LED_GPIO = ("GPIO36", "GPIO44", "GPIO43") # (R, G, B) -UART_SUPPORTED = False -LANG = "zh" - -BT_POWER_MOTOR_ENABLED = False -PIN_BT_ON_GPIO = None -PIN_MOT_GPIO = None -AUDIO_QDAI_CFG = None - -EXTINT_AI_GPIO = "GPIO22" -PWK_KEY_GPIO = "GPIO26" - -BT_WAKEUP_4G_ENABLED = False -EXTINT_WAKEUP_CTA1_GPIO = None -PIN_WAKEUP_BT_GPIO = None - -# ---- 按键/防抖差异 ---- -KEY_RELEASE_DEBOUNCE_COUNT = 5 -AI_LONG_PRESS_POWER_OFF_ENABLED = False - -# ---- 开机提示/语音参数默认值 ---- -POWER_ON_TONE_ENABLED = True -POWER_ON_TONE_DEFAULT = "你好,我来了" -VAD_SILENCE_DEFAULT = 300 -VC_TTS_VOICE_TYPE_DEFAULT = None -VC_TTS_VOICE_KEY_DEFAULT = None - -# VC WebSocket 路径(ws://{AMP_SERVER}/{VC_WS_PATH}...) -VC_WS_PATH = "vc/agent" - -# 是否支持蓝牙 OTA -BT_OTA_ENABLED = False -UPLOAD_START_TONE_ENABLED = False -THINKING_LED_MODE = "flicker_blue_green" -VAD_ACTIVE_BLUE_LED = True -CMD_TOGGLE_MODE_TO_PTT_TTS = "已切换到单对话模式" -CMD_TOGGLE_MODE_TO_LONG_TTS = "已切换到长对话模式" -BT_VOICE_FEATURES_ENABLED = False -POWEROFF_CMD_CLOSE_ONLY = True -KWS_PTT_HINT = "请您按住圆形的按钮开始讲话,讲完松开即可 " -DIALOG_BOT_OPTION = None -DIALOG_PROVIDER_DEFAULT = None -KEYWORDS_FROM_VOICE_TYPE = False - -# ---- 按键音/提示音策略 ---- -KEY_PRESS_TONE_FILE = "U:/static/start.mp3" -KEY_PRESS_TONE_DELAY_MS = 0 -PTT_HINT = "请您按住圆形的按钮开始讲话,讲完松开即可 " - diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/7PIN/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/7PIN/default_config.py new file mode 100644 index 00000000..424c7b79 --- /dev/null +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/7PIN/default_config.py @@ -0,0 +1,128 @@ +# 设备侧默认配置(freeze 内置)。 +# +# 加载优先级(由 vc_config.py 执行): +# 1) usr/default_config.py(或 usr/defualt_config.py) +# 2) 本文件 default_config.py + +# 当前设备类型(编译期间确定;现场仅可用 usr/default_config.py 覆盖) +DEV_TYPE = "7PIN" + +# 当前设备配置(仅保留“设备差异项”,不要放运行态变量) +# led_gpio 使用 Pin 属性名(字符串),由 vc_config.py 转成 Pin.GPIOxx 常量。 +LED_GPIO = ("GPIO36", "GPIO44", "GPIO43") # (R, G, B) + +# LED 电平极性(是否“反向”点亮)。 +# - 默认 LED_ACTIVE_LOW=False:高电平点亮(write(1)=亮) +# - 若你的硬件是低电平点亮(write(0)=亮),将 LED_ACTIVE_LOW=True +# - 若仅某一路反相,用 LED_ACTIVE_LOW_RGB 单独配置(按 LED_GPIO 顺序 R/G/B) +LED_ACTIVE_LOW = False +LED_ACTIVE_LOW_RGB = None # 例如 (True, False, False) 表示仅红灯反相 +# LED_ACTIVE_LOW_RGB = (True, False, False) + +# 是否支持 UART 相关能力(例如 7PIN_1_5 才允许走串口) +UART_SUPPORTED = False + +# 语言/地区(如 zh/en),用于少量文案/逻辑差异 +LANG = "zh" + +# -------------------- +# 硬件差异项(由每个设备的 default_config 固定) +# -------------------- +LED_DEBUG = True +KEY_LED_DEBUG = True +HW_STATUS_DEBUG = True + +# 是否需要初始化蓝牙电源/马达/音频IIS配置等(原先仅 7PIN_1_5) +BT_POWER_MOTOR_ENABLED = False +PIN_BT_ON_GPIO = None # 例如 "GPIO31" +PIN_MOT_GPIO = None # 例如 "GPIO36" + +# audio.set_qdai_cfg(...) 参数;若为 None 则不调用 +AUDIO_QDAI_CFG = None # 例如 (1,0,0,2,0,1,1,1) + +# AI 按键中断与电源键中断引脚(ExtInt.GPIOxx) +EXTINT_AI_GPIO = "GPIO22" +PWK_KEY_GPIO = "GPIO26" + +# 蓝牙唤醒 4G/4G 唤醒蓝牙相关(原先仅 7PIN_1_5) +BT_WAKEUP_4G_ENABLED = False +EXTINT_WAKEUP_CTA1_GPIO = None # 例如 "GPIO22" +PIN_WAKEUP_BT_GPIO = None # 例如 "GPIO21" + +# -------------------- +# 按键/防抖差异 +# -------------------- + +# 释放防抖阈值(KeyAI/pwk):原代码部分设备用 3,其他用 5 +KEY_RELEASE_DEBOUNCE_COUNT = 5 + +# 是否允许 AI 键长按 8 秒触发关机逻辑(原 jswm/jswm_BOX) +AI_LONG_PRESS_POWER_OFF_ENABLED = False + +# -------------------- +# 开机提示/语音参数默认值(与具体产品绑定,编译期决定) +# -------------------- + +# 若为 None 或 POWER_ON_TONE_ENABLED=False,则不开机播报提示词 +POWER_ON_TONE_ENABLED = True +POWER_ON_TONE_DEFAULT = "你好,我来了" + +# VAD 静音阈值默认值(ms) +VAD_SILENCE_DEFAULT = 300 + +# 默认音色配置(与 ai_VC.py 中格式保持一致) +VC_TTS_VOICE_TYPE_DEFAULT = None # dict 或 None(None 表示沿用 ai_VC.py 内置兜底/存储值) +VC_TTS_VOICE_KEY_DEFAULT = None # 例如 "男"/"ç«¥" + +# VC WebSocket 路径(ws://{AMP_SERVER}/{VC_WS_PATH}...) +VC_WS_PATH = "vc/agent" + +# 是否支持蓝牙 OTA(原先仅 7PIN_1_5 会检查 bt_ota) +BT_OTA_ENABLED = False + +# 是否在“开始上传语音”时播放成功提示音(原逻辑:非 7PIN/7PIN_1_5/7PIN_coze 才播) +UPLOAD_START_TONE_ENABLED = False + +# LLM thinking 阶段 LED 策略:flicker_blue_green / open_red_green +THINKING_LED_MODE = "flicker_blue_green" + +# 收到 vad.active 时是否强制切回蓝灯 +VAD_ACTIVE_BLUE_LED = True + +# 本地指令:切换对话模式时的提示语(是什么语言就写什么) +CMD_TOGGLE_MODE_TO_PTT_TTS = "已切换到单对话模式" +CMD_TOGGLE_MODE_TO_LONG_TTS = "已切换到长对话模式" + +# 蓝牙/语音留言类本地指令是否启用(原先仅 7PIN_1_5) +BT_VOICE_FEATURES_ENABLED = False + +# “关机”语音指令是否仅关闭对话(不触发 Power_off)。原逻辑:7PIN/7PIN_coze/7PIN_1_5 只 Close +POWEROFF_CMD_CLOSE_ONLY = True + +# 关键词唤醒时在 PTT 模式下播报的提示语 +KWS_PTT_HINT = "请您按住圆形的按钮开始讲话,讲完松开即可 " + +# 对话智能体/工作流默认配置(编译期确定;可在 usr/default_config.py 覆盖) +# 结构示例: +# DIALOG_BOT_OPTION = {"bot_id":"...", "workflow_id":"...", "use_workflow":True} +DIALOG_BOT_OPTION = None + +# dialog_attributes.provider 覆盖(None 表示沿用存储配置 dialog_attributes_provider) +DIALOG_PROVIDER_DEFAULT = None + +# 是否从 VC_TTS_voice_type 的 key 列表生成 ASR 热词 +KEYWORDS_FROM_VOICE_TYPE = False + +# -------------------- +# 按键音/提示音策略(设备差异项) +# -------------------- + +# AI 键按下时:若设置了该文件路径,则在“无 VC 流播放中”时播放该提示音(例如 7PIN 用 start.mp3) +KEY_PRESS_TONE_FILE = None # 例如 "U:/static/start.mp3" + +# AI 键按下时:延迟播放按键音(ms),用于规避蓝牙连接瞬间不出声等问题(例如 7PIN_1_5 取 300) +KEY_PRESS_TONE_DELAY_MS = 0 + +# PTT 提示语(单对话模式,未长按时的提示;是什么语言就写什么) +PTT_HINT = "请您按住圆形的按钮开始讲话,讲完松开即可 " + diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/7PIN_1_5/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/7PIN_1_5/default_config.py similarity index 100% rename from 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/7PIN_1_5/default_config.py rename to 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/7PIN_1_5/default_config.py diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/7PIN_BK/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/7PIN_BK/default_config.py similarity index 100% rename from 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/7PIN_BK/default_config.py rename to 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/7PIN_BK/default_config.py diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/7PIN_BK_EU/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/7PIN_BK_EU/default_config.py similarity index 100% rename from 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/7PIN_BK_EU/default_config.py rename to 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/7PIN_BK_EU/default_config.py diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/7PIN_BK_coze/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/7PIN_BK_coze/default_config.py similarity index 100% rename from 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/7PIN_BK_coze/default_config.py rename to 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/7PIN_BK_coze/default_config.py diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/7PIN_coze/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/7PIN_coze/default_config.py similarity index 100% rename from 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/7PIN_coze/default_config.py rename to 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/7PIN_coze/default_config.py diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/G10/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/G10/default_config.py similarity index 100% rename from 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/G10/default_config.py rename to 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/G10/default_config.py diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/README.md b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/README.md similarity index 100% rename from 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/README.md rename to 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/README.md diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/csh/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/csh/default_config.py similarity index 100% rename from 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/csh/default_config.py rename to 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/csh/default_config.py diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/jswm/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/jswm/default_config.py similarity index 100% rename from 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/jswm/default_config.py rename to 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/jswm/default_config.py diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/jswm_BOX/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/jswm_BOX/default_config.py similarity index 100% rename from 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/jswm_BOX/default_config.py rename to 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/jswm_BOX/default_config.py diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/momo/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/momo/default_config.py similarity index 100% rename from 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/momo/default_config.py rename to 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/momo/default_config.py diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/sjgq/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/sjgq/default_config.py similarity index 100% rename from 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/sjgq/default_config.py rename to 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/sjgq/default_config.py diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/szbst/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/szbst/default_config.py similarity index 100% rename from 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/configs/szbst/default_config.py rename to 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/szbst/default_config.py diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/product_k8.ini b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/product_k8.ini new file mode 100644 index 00000000..8a7f0651 --- /dev/null +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/product_k8.ini @@ -0,0 +1,3 @@ +DEV_TYPE=7PIN +SRV_TYPE=beike_dev +VERSION=V1.1 diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/srv_configs/README.md b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/srv_configs/README.md similarity index 72% rename from 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/srv_configs/README.md rename to 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/srv_configs/README.md index 335adb7d..f0a06e01 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/srv_configs/README.md +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/srv_configs/README.md @@ -1,9 +1,9 @@ 本目录用于**服务器环境地址配置**,按 `SERVER_ENV` 分类管理。 示例: -- `beike.py`:北科测试 -- `kxc.py`:科学城 demo -- `beike_dev.py`:北科开发环境 +- `beike/default_srv.py`:北科测试 +- `kxc/default_srv.py.py`:科学城 demo +- `beike_dev/default_srv.py.py`:北科开发环境 每个环境文件需要导出以下常量: - `DMP_BASE` diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/srv_configs/beike/default_srv.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/srv_configs/beike/default_srv.py new file mode 100644 index 00000000..f784ef6b --- /dev/null +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/srv_configs/beike/default_srv.py @@ -0,0 +1,38 @@ + + +# 设备侧 Server 配置(freeze 内置)。 +# +# 注意: +# - `constants.py` 中固定不变的常量(事件名/枚举)继续保留在 constants.py。 +# - 本文件统一承载“协议/服务器相关的可配置项”,并支持 usr 覆盖。 + +# ---- 环境选择(服务器地址由 srv_configs/.py 承载)---- +# 服务器环境配置,切换只需修改 SERVER_ENV +# "beike" = 北科测试, "kxc" = 科学城demo +SERVER_ENV = "beike" + +# ---- 默认环境地址(即使没有 srv_configs/.py 也能工作)---- +# 这里默认给出 beike_dev 的地址;若要切换环境,建议: +# - 修改 SERVER_ENV +# - 同时提供对应的 srv_configs/.py(或 usr 覆盖) +# SERVER_ENV = beike(北科测试) + +DMP_BASE = "http://dmp.raisound.com/bz-api" +AMP_SERVER = "115.190.94.208:22080" +IOT_WS_URL = "ws://wsiot-nocdn.raisound.com/ws-hub/dev/v1" + +# ---- DMP/认证/时间同步等(默认使用 constants.DMP_BASE 拼接)---- +DMP_TIME_PATH = "/dev/time" +DMP_ACTIVE_PATH = "/dev/auth/active" +DMP_SIGN_IN_PATH = "/dev/auth/sign_in" +DMP_TOKEN_PATH = "/dev/auth/token" +DMP_ICCID_PATH = "/dev/iccid" +DMP_DEV_CONFIG_PATH_FMT = "/dev/config/{}" # deviceId + +# ---- OTA(现网有的走 DMP_BASE,有的走 qipai 域名;先集中成可配项)---- +OTA_TASK_URL_FMT = "https://dmp-api.qipai.com/qp-dmp-api/ota/task?deviceId={}&sourceVersion={}" +OTA_RESULT_PATH_FMT = "/ota/result?deviceId={}¤tVersion={}" + +# ---- AMP/健康检查等 ---- +AMP_HEALTH_URL_FMT = "http://{}/health?task_id={}" + diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/srv_configs/beike_dev/default_srv.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/srv_configs/beike_dev/default_srv.py new file mode 100644 index 00000000..5ae3122e --- /dev/null +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/srv_configs/beike_dev/default_srv.py @@ -0,0 +1,34 @@ +# 设备侧 Server 配置(freeze 内置)。 +# +# 注意: +# - `constants.py` 中固定不变的常量(事件名/枚举)继续保留在 constants.py。 +# - 本文件统一承载“协议/服务器相关的可配置项”,并支持 usr 覆盖。 + +# ---- 环境选择(服务器地址由 srv_configs/.py 承载)---- +# 服务器环境配置,切换只需修改 SERVER_ENV +# "beike" = 北科测试, "kxc" = 科学城demo +SERVER_ENV = "beike_dev" + +# ---- 默认环境地址(即使没有 srv_configs/.py 也能工作)---- +# 这里默认给出 beike_dev 的地址;若要切换环境,建议: +# - 修改 SERVER_ENV +# - 同时提供对应的 srv_configs/.py(或 usr 覆盖) +DMP_BASE = "http://dmp-dev.raisound.com/dmp-api" +AMP_SERVER = "118.145.158.207:22080" +IOT_WS_URL = "ws://dmp-dev.raisound.com/iot-api/ws-hub/dev/v1" + +# ---- DMP/认证/时间同步等(默认使用 constants.DMP_BASE 拼接)---- +DMP_TIME_PATH = "/dev/time" +DMP_ACTIVE_PATH = "/dev/auth/active" +DMP_SIGN_IN_PATH = "/dev/auth/sign_in" +DMP_TOKEN_PATH = "/dev/auth/token" +DMP_ICCID_PATH = "/dev/iccid" +DMP_DEV_CONFIG_PATH_FMT = "/dev/config/{}" # deviceId + +# ---- OTA(现网有的走 DMP_BASE,有的走 qipai 域名;先集中成可配项)---- +OTA_TASK_URL_FMT = "https://dmp-api.qipai.com/qp-dmp-api/ota/task?deviceId={}&sourceVersion={}" +OTA_RESULT_PATH_FMT = "/ota/result?deviceId={}¤tVersion={}" + +# ---- AMP/健康检查等 ---- +AMP_HEALTH_URL_FMT = "http://{}/health?task_id={}" + diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/srv_configs/dev_type_url_backup.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/srv_configs/dev_type_url_backup.py similarity index 100% rename from 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/srv_configs/dev_type_url_backup.py rename to 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/srv_configs/dev_type_url_backup.py diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/srv_configs/kxc/default_srv.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/srv_configs/kxc/default_srv.py new file mode 100644 index 00000000..6d952ab0 --- /dev/null +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/srv_configs/kxc/default_srv.py @@ -0,0 +1,37 @@ + + +# 设备侧 Server 配置(freeze 内置)。 +# +# 注意: +# - `constants.py` 中固定不变的常量(事件名/枚举)继续保留在 constants.py。 +# - 本文件统一承载“协议/服务器相关的可配置项”,并支持 usr 覆盖。 + +# ---- 环境选择(服务器地址由 srv_configs/.py 承载)---- +# 服务器环境配置,切换只需修改 SERVER_ENV +# "beike" = 北科测试, "kxc" = 科学城demo +SERVER_ENV = "kxc" + +# ---- 默认环境地址(即使没有 srv_configs/.py 也能工作)---- +# 这里默认给出 beike_dev 的地址;若要切换环境,建议: +# - 修改 SERVER_ENV +# - 同时提供对应的 srv_configs/.py(或 usr 覆盖) +# SERVER_ENV = kxc(科学城 demo) +DMP_BASE = "http://kxc.raisound.com/bz-api" +AMP_SERVER = "kxc.raisound.com/amp-api" +IOT_WS_URL = "ws://kxc.raisound.com/iot-api/ws-hub/dev/v1" + +# ---- DMP/认证/时间同步等(默认使用 constants.DMP_BASE 拼接)---- +DMP_TIME_PATH = "/dev/time" +DMP_ACTIVE_PATH = "/dev/auth/active" +DMP_SIGN_IN_PATH = "/dev/auth/sign_in" +DMP_TOKEN_PATH = "/dev/auth/token" +DMP_ICCID_PATH = "/dev/iccid" +DMP_DEV_CONFIG_PATH_FMT = "/dev/config/{}" # deviceId + +# ---- OTA(现网有的走 DMP_BASE,有的走 qipai 域名;先集中成可配项)---- +OTA_TASK_URL_FMT = "https://dmp-api.qipai.com/qp-dmp-api/ota/task?deviceId={}&sourceVersion={}" +OTA_RESULT_PATH_FMT = "/ota/result?deviceId={}¤tVersion={}" + +# ---- AMP/健康检查等 ---- +AMP_HEALTH_URL_FMT = "http://{}/health?task_id={}" + diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/srv_configs/beike.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/srv_configs/beike.py deleted file mode 100644 index 1852494b..00000000 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/srv_configs/beike.py +++ /dev/null @@ -1,6 +0,0 @@ -# SERVER_ENV = beike(北科测试) - -DMP_BASE = "http://dmp.raisound.com/bz-api" -AMP_SERVER = "115.190.94.208:22080" -IOT_WS_URL = "ws://wsiot-nocdn.raisound.com/ws-hub/dev/v1" - diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/srv_configs/beike_dev.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/srv_configs/beike_dev.py deleted file mode 100644 index a6a8d2fb..00000000 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/srv_configs/beike_dev.py +++ /dev/null @@ -1,6 +0,0 @@ -# SERVER_ENV = beike_dev(北科开发环境) - -DMP_BASE = "http://dmp-dev.raisound.com/dmp-api" -AMP_SERVER = "118.145.158.207:22080" -IOT_WS_URL = "ws://dmp-dev.raisound.com/iot-api/ws-hub/dev/v1" - diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/srv_configs/kxc.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/srv_configs/kxc.py deleted file mode 100644 index 5c21635f..00000000 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/srv_configs/kxc.py +++ /dev/null @@ -1,6 +0,0 @@ -# SERVER_ENV = kxc(科学城 demo) - -DMP_BASE = "http://kxc.raisound.com/bz-api" -AMP_SERVER = "kxc.raisound.com/amp-api" -IOT_WS_URL = "ws://kxc.raisound.com/iot-api/ws-hub/dev/v1" - diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/versions.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/versions.py index c01afe08..6389eda5 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/versions.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/versions.py @@ -1,2 +1,2 @@ -Version="V1.0" -Build_Time="2026-05-08 6:46:15" +Version="V1.1" +Build_Time="2026-05-08 10:22:58" diff --git a/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip b/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip index ddd75c7e..33a3a686 100644 Binary files a/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip and b/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip differ diff --git a/2.sdk/project/7PIN_1_5/usr/audio_ve.nvm b/2.sdk/project/7PIN_1_5/usr/audio_ve.nvm index cccf7975..a33dd45a 100644 Binary files a/2.sdk/project/7PIN_1_5/usr/audio_ve.nvm and b/2.sdk/project/7PIN_1_5/usr/audio_ve.nvm differ