# =============================================================================
KEY_RELEASE_DEBOUNCE_COUNT = 5
+AI_KEY_LONG_PRESS_MS = 800 # PTT 长按开录阈值(ms);定时器 100ms tick
AI_LONG_PRESS_POWER_OFF_ENABLED = False # AI 键长按 8s 关机
SOS_ENABLED = False # AI 长按 3s SOS、板载 SOS 入口
VAD_ENERGY_THRESHOLD = 10000
# imsl auth_vad:DMP 区域 0=海外 dmp-global.raisound.com 1=国内正式服务器 dmp.raisound.com 2=国内测试服务器 dmp-dev.raisound.com 3=测试服2 dmp-intl.raisound.com(与 imsl_vad.h AuthInfo.server_addr 一致)
VAD_DMP_SERVER_ADDR = 1
+# 开机有网时运行 transport HTTP 测试(VAD.transport_test → test_func)
+VAD_TRANSPORT_TEST_ON_BOOT = False
# 长对话:单轮最长录音(ms)、asr.completed 后续说 merge 窗(ms);0=不限制
# 说明:MAX_TURN_MS 解决"场景②一直说话太久"——强制提交截断输入;
# =============================================================================
KEY_RELEASE_DEBOUNCE_COUNT = 5
+AI_KEY_LONG_PRESS_MS = 800 # PTT 长按开录阈值(ms);定时器 100ms tick
AI_LONG_PRESS_POWER_OFF_ENABLED = False # AI 键长按 8s 关机
SOS_ENABLED = False # AI 长按 3s SOS、板载 SOS 入口
VAD_ENERGY_THRESHOLD = 10000
# imsl auth_vad:DMP 区域 0=海外 dmp-global.raisound.com 1=国内正式服务器 dmp.raisound.com 2=国内测试服务器 dmp-dev.raisound.com 3=测试服2 dmp-intl.raisound.com(与 imsl_vad.h AuthInfo.server_addr 一致)
VAD_DMP_SERVER_ADDR = 1
+# 开机有网时运行 transport HTTP 测试(VAD.transport_test → test_func)
+VAD_TRANSPORT_TEST_ON_BOOT = False
# 长对话:单轮最长录音(ms)、asr.completed 后续说 merge 窗(ms);0=不限制
# 说明:MAX_TURN_MS 解决"场景②一直说话太久"——强制提交截断输入;
/* 符号由 libimslnn.a(utils.c.o) 提供,此处仅赋值回调 */
extern imsl_nn_printf_func imsl_nn_printf;
+/* transport HTTP 联调测试,见 transport_imp_asr_mcu.c */
+extern int test_func(void);
static int vad_imsl_printf(const char *format, ...)
{
* 故需允许 1 个参数(否则报 "takes 0 positional arguments but 1 were given")。 */
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_vad_free_obj, 0, 1, mp_vad_free);
+/* transport_test():调用 transport_imp_asr_mcu.c 的 test_func,验证 lwip HTTP 通路 */
+STATIC mp_obj_t mp_vad_transport_test(void)
+{
+ int ret;
+
+ MP_THREAD_GIL_EXIT();
+ ret = test_func();
+ MP_THREAD_GIL_ENTER();
+ return mp_obj_new_int(ret);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_vad_transport_test_obj, mp_vad_transport_test);
+
STATIC const mp_rom_map_elem_t VAD_locals_dict_table[] = {
{ MP_ROM_QSTR(MP_QSTR_process), MP_ROM_PTR(&mp_vad_process_obj) },
{ MP_ROM_QSTR(MP_QSTR_detect), MP_ROM_PTR(&mp_vad_detect_obj) },
{ MP_ROM_QSTR(MP_QSTR_MODE_FAIL), MP_ROM_INT(0) },
{ MP_ROM_QSTR(MP_QSTR_MODE_TRIAL), MP_ROM_INT(1) },
{ MP_ROM_QSTR(MP_QSTR_MODE_LICENSED), MP_ROM_INT(2) },
+ { MP_ROM_QSTR(MP_QSTR_transport_test), MP_ROM_PTR(&mp_vad_transport_test_obj) },
};
STATIC MP_DEFINE_CONST_DICT(VAD_module_globals, VAD_module_globals_table);
* @file transport_imp_asr_mcu.c
* @brief IMSL libimslnn.a 网络传输适配(ASR MCU + lwip)
*/
+#include <stdio.h>
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
#define TRANSPORT_ERROR_NOT_CONNECTED -4
#define TRANSPORT_ERROR_DISCONNECTED -5
+extern int dmp_log_level; //开下DMP的详细log 10086
+
typedef struct {
int (*init)(void);
int (*connect)(const char *host, uint16_t port);
static int imp_init(void)
{
+ // 开 DMP 详细 LOG
+ // dmp_log_level = 10086;
return TRANSPORT_OK;
}
static int imp_disconnect(void)
{
if (sock >= 0) {
- TR_LOG("disconnect sock=%d", sock);
+ TR_LOG("disconnect sock=%d\n", sock);
lwip_close(sock);
sock = -1;
}
sock = lwip_socket(AF_INET, SOCK_STREAM, 0);
if (sock < 0) {
- TR_LOG("socket create fail errno=%d", errno);
+ TR_LOG("socket create fail errno=%d\n", errno);
return TRANSPORT_ERROR_CONNECT;
}
if (inet_pton(AF_INET, clean_host, &server_addr.sin_addr) <= 0) {
struct hostent *he = gethostbyname(clean_host);
if (!he) {
- TR_LOG("connect fail dns host=%s", clean_host);
+ TR_LOG("connect fail dns host=%s\n", clean_host);
lwip_close(sock);
sock = -1;
return TRANSPORT_ERROR_CONNECT;
}
if (lwip_connect(sock, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0) {
- TR_LOG("connect fail tcp host=%s port=%d errno=%d", clean_host, resolved_port, errno);
+ TR_LOG("connect fail tcp host=%s port=%d errno=%d\n", clean_host, resolved_port, errno);
lwip_close(sock);
sock = -1;
return TRANSPORT_ERROR_CONNECT;
}
is_connected_flag = 1;
- TR_LOG("connect ok host=%s ip=%s port=%d sock=%d",
+ TR_LOG("connect ok host=%s ip=%s port=%d sock=%d\n",
clean_host, inet_ntoa(server_addr.sin_addr), resolved_port, sock);
return TRANSPORT_OK;
}
{
int n = lwip_send(sock, data, len, 0);
if (n < 0) {
- TR_LOG("send fail errno=%d len=%u", errno, (unsigned)len);
+ TR_LOG("send fail errno=%d len=%u\n", errno, (unsigned)len);
+ }else{
+ TR_LOG("send ok len=%u\n data=%s\n", (unsigned)n, data);
}
return n;
}
static int imp_recv(uint8_t *buffer, uint16_t max_len)
{
+ if (buffer == NULL) {
+ TR_LOG("buffer is NULL\n");
+ return -1;
+ }
+ if (max_len == 0) {
+ TR_LOG("max_len is 0\n");
+ return -1;
+ }
int n = lwip_recv(sock, buffer, max_len, 0);
if (n < 0) {
- TR_LOG("recv fail errno=%d max=%u", errno, (unsigned)max_len);
+ TR_LOG("recv fail errno=%d max=%u\n", errno, (unsigned)max_len);
} else if (n == 0) {
- TR_LOG("recv peer closed");
+ TR_LOG("recv peer closed\n");
+ } else {
+ TR_LOG("recv ok len=%u\nbuffer=%s\n", (unsigned)n, buffer);
}
return n;
}
.delay = imp_delay,
};
+int test_func()
+{
+ int ret = 0;
+ uint8_t buffer[2048] = {0};
+ int recv_len = 0;
+ int total_recv_len = 0;
+
+ // 初始化传输层
+ ret = (imp_transport.init)();
+ if (ret != TRANSPORT_OK) {
+ printf("Transport initialization failed\n");
+ return -1;
+ }
+
+ // 连接服务器
+ ret = (imp_transport.connect)("dmp-dev.raisound.com", 80);
+ if (ret != TRANSPORT_OK) {
+ printf("Connection failed\n");
+ return -1;
+ }
+
+ // 构造正确的HTTP请求
+ const char* request =
+ "GET /bz-mp-api/sv/lib/time HTTP/1.1\r\n"
+ "Host: dmp-dev.raisound.com\r\n"
+ "Accept: */*\r\n"
+ "Connection: close\r\n"
+ "\r\n";
+
+ // 发送HTTP请求
+ int req_len = (int)strlen(request);
+ int send_len = (imp_transport.send)((const uint8_t*)request, (uint16_t)req_len);
+ if (send_len < 0) {
+ printf("Send failed\n");
+ (imp_transport.disconnect)();
+ return -1;
+ } else if (send_len != req_len) {
+ printf("Partial send: %d of %d bytes\n", send_len, req_len);
+ (imp_transport.disconnect)();
+ return -1;
+ }
+
+ printf("Request sent successfully\n");
+
+ // 接收响应(循环接收直到没有更多数据)
+
+ recv_len = (imp_transport.recv)(buffer + total_recv_len, sizeof(buffer) - total_recv_len - 1);
+
+
+ // 打印接收到的响应
+ if (recv_len > 0) {
+ buffer[total_recv_len+recv_len] = '\0'; // 确保字符串以NULL结尾
+ printf("Response:\n%s\n", buffer);
+ }
+ else
+ {
+ printf("RECV FAIL!!!!!!!!!!!!!\n");
+ }
+
+ // 断开连接
+ (imp_transport.disconnect)();
+
+ return 0;
+}
#endif /* CONFIG_VAD */
import ucryptolib
import urandom as random
import request
-from vc_utils import cfg_attr, net_csq_rssi, net_csq_invalid
+from vc_utils import cfg_attr, cfg_bool, net_csq_rssi, net_csq_invalid
class device_res_author(Abstract):
# self.post_iccidd_token_timer = osTimer()
# self.post_iccidd_token/_timer.start(10000, 0, self.post_iccidd_token_timer_cb)
self.connect_web_flag = 0
+ self._transport_test_done = False
#EventMesh.publish_async("dev_NTP",thread_size = 8192)
# count = 0
except Exception as e:
usys.print_exception(e)
def get_sim_Status(self):
- return sim.getStatus()
+ return sim.getStatus()
+
+ def try_transport_test(self):
+ """开机有网时跑一次 transport HTTP 测试(仅一次)。"""
+ if self._transport_test_done:
+ return
+ if not cfg_bool("VAD_TRANSPORT_TEST_ON_BOOT", False):
+ return
+ self._transport_test_done = True
+ try:
+ import VAD
+ ret = VAD.transport_test()
+ print("[TR] transport_test ret={}".format(ret))
+ except ImportError:
+ print("[TR] transport_test skip: no VAD module")
+ except Exception as e:
+ usys.print_exception(e)
+
def HMAC(self,k, m):
KEY_BLOCK = k + (b'\0' * (self.SHA1_BLOCK_SIZE - len(k)))
if net_csq_invalid(signal) or self.get_sim_Status() != 1:#网络不正常
print("dev_active 无 SIM卡!!!!!!!!\r\n")
return
+ self.try_transport_test()
print("dev_active 1\r\n")
# 签名内容: = deviceId+pid+timeStamp
dev_pass = ""
if net_csq_invalid(signal) or self.get_sim_Status() != 1:#网络不正常
print("dev_sign_in 无 SIM卡!!!!!!!!\r\n")
return
+ self.try_transport_test()
print("dev_sign_in 1")
token = ""
try:
try:
self.KeyAI_status = self._key_ai_read_level()
self.KeyAI_timer_count +=1
- if self.KeyAI_timer_count >= 10*1 : #长按1s
-
+ _lp_ms = cfg_int("AI_KEY_LONG_PRESS_MS", 800)
+ if _lp_ms < 300:
+ _lp_ms = 300
+ _lp_ticks = (_lp_ms + 99) // 100
+ if self.KeyAI_timer_count >= _lp_ticks:
if self.KeyAI_long_press == 0:
self.KeyAI_long_press = 1
#EventMesh.publish("AI_key_long_press")
vc.AI_key_long_press_flag = 1
vc._ptt_idle_latch = 0
vc._ptt_short_press_stop = 0
- vc._vc_enqueue_btn(vc.ptt_begin, priority=1)
+ # 已在 btn 线程,直接开录,避免二次入队排队(打断 TTS 时常见 ~500ms+ 延迟)
+ vc.ptt_begin()
return True
except Exception:
pass
return False
+ def _vc_ptt_deferred_play_end_cleanup(self):
+ """PTT 打断:cancel/开录后再收尾下行 PCM;已开录时勿 stopAll 掐 start 音。"""
+ if not self._vc_is_ptt_mode():
+ return
+ try:
+ if getattr(self, "VC_record_state_flag", 0) != 0:
+ if getattr(self, "play_pcm", None) is not None:
+ try:
+ self.play_pcm.stream_stop()
+ self.play_pcm.close()
+ except Exception:
+ pass
+ self.play_pcm = None
+ self.VC_Play_flag = 0
+ return
+ except Exception:
+ pass
+ try:
+ self._ptt_hard_mute_local_playback()
+ except Exception:
+ pass
+ try:
+ if getattr(self, "VC_Play_flag", 0) == 1 or getattr(self, "play_pcm", None) is not None:
+ self.VC_Play_End()
+ except Exception:
+ pass
+
+ def _vc_ptt_fast_stop_downlink(self):
+ """PTT 打断:仅丢队列/标志,不调用 VC_Play_End。"""
+ try:
+ self._drop_tts_audio = 1
+ self.is_ruppt_tts = 1
+ except Exception:
+ pass
+ try:
+ if getattr(self, "AI_audio_queue", None) is not None:
+ if self.AI_audio_queue.empty() != True:
+ self.AI_audio_queue.clear()
+ except Exception:
+ pass
+
def _vc_begin_ptt_cancel_wait(self, reason="ptt_interrupt"):
+ try:
+ self._vc_ptt_abort_play_end_wait()
+ self._vc_ptt_fast_stop_downlink()
+ except Exception:
+ pass
try:
self._ptt_await_server = 0
self._ptt_pending_arm = 1
self._ptt_pending_arm = 0
print("[VC][serial] ptt_arm after {}".format(via))
self._ptt_arm_uplink()
+ try:
+ self._vc_enqueue_btn(self._vc_ptt_deferred_play_end_cleanup)
+ except Exception:
+ pass
except Exception:
pass
def _vc_tick_cancel_deadline(self):
self._vc_on_ptt_cancel_settled(via="timeout")
except Exception:
pass
+ def _vc_ptt_abort_play_end_wait(self):
+ """PTT 打断:勿等 play_end_tick 自然收尾,立刻清 await_played。"""
+ if not self._vc_is_ptt_mode():
+ return
+ try:
+ self.fsm.await_played = False
+ self._need_audio_played_ack = 0
+ self._tts_pending = 0
+ self._tts_pending_ms = 0
+ self._tts_completed_wall_ms = 0
+ try:
+ self.fsm.last_tts_completed_ms = 0
+ except Exception:
+ pass
+ except Exception:
+ pass
+
def _ptt_arm_uplink(self, t0=0):
"""btn 线程:cancel 已结束或无需 cancel 时,发 audio.create 并开麦。"""
try:
self.Close_flag = 0
except Exception:
pass
+ self._vc_ptt_abort_play_end_wait()
t0 = 0
try:
if need_cancel:
self._ptt_enter_interrupt_arm(bump_gen=True)
+ self._vc_ptt_fast_stop_downlink()
else:
self._ptt_prepare_idle_round()
)
except Exception:
in_session = False
- try:
- self._ptt_hard_mute_local_playback()
- except Exception:
- pass
- if in_session:
- try:
- if getattr(self, "VC_Play_flag", 0) == 1 or getattr(self, "play_pcm", None) is not None:
- self.VC_Play_End()
- except Exception:
- pass
- try:
- self._ptt_hard_mute_local_playback()
- except Exception:
- pass
- else:
- try:
- self.VC_init()
- except Exception:
- pass
- try:
- if getattr(self, "VC_Play_flag", 0) == 1 or getattr(self, "play_pcm", None) is not None:
- self.VC_Play_End()
- except Exception:
- pass
+ if not need_cancel:
try:
self._ptt_hard_mute_local_playback()
except Exception:
pass
+ if in_session:
+ try:
+ if getattr(self, "VC_Play_flag", 0) == 1 or getattr(self, "play_pcm", None) is not None:
+ self.VC_Play_End()
+ except Exception:
+ pass
+ try:
+ self._ptt_hard_mute_local_playback()
+ except Exception:
+ pass
+ else:
+ try:
+ self.VC_init()
+ except Exception:
+ pass
+ try:
+ if getattr(self, "VC_Play_flag", 0) == 1 or getattr(self, "play_pcm", None) is not None:
+ self.VC_Play_End()
+ except Exception:
+ pass
+ try:
+ self._ptt_hard_mute_local_playback()
+ except Exception:
+ pass
# 若上一轮录音尚未结束,先强制停掉,避免 record_thread 复用出错
try:
return
except Exception:
return
- try:
- self.Close_flag = 1
- except Exception:
- pass
+ # 切到 PTT:提示音播完保持 WS(play_tts_cb 已预建链),勿 Close 造成 sess=0 冷启动
+ _to_ptt = getattr(self, "VC_mode", 0) == 1
+ if not _to_ptt:
+ try:
+ self.Close_flag = 1
+ except Exception:
+ pass
try:
self._vc_ms_play_gen = gen
self._vc_ms_phase = 2
tts_str = getattr(self, "_vc_ms_pending_tts_str", "") or ""
if not tts_str:
tts_str = "已切换到单对话模式" if getattr(self, "VC_mode", 0) == 1 else "已切换到长对话模式"
- print("[VC][ms] play_tts gen={} mode={}".format(gen, getattr(self, "VC_mode", -1)))
- EventMesh.publish("play_tts", [tts_str, 1])
+ print("[VC][ms] play_tts gen={} mode={} close_after={}".format(
+ gen, getattr(self, "VC_mode", -1), 0 if _to_ptt else 1))
+ EventMesh.publish("play_tts", [tts_str, 0 if _to_ptt else 1])
def pwk_key_double_press(self,event,msg):#pwk双击
print("come 双击")
return
except Exception:
pass
- self._vc_stop_downlink_for_interrupt("canceled")
+ if self._vc_is_ptt_mode():
+ try:
+ self._drop_tts_audio = 1
+ if getattr(self, "AI_audio_queue", None) is not None:
+ if self.AI_audio_queue.empty() != True:
+ self.AI_audio_queue.clear()
+ except Exception:
+ pass
+ else:
+ self._vc_stop_downlink_for_interrupt("canceled")
if ev == "tts.completed" and self._vc_ignore_late_tts_completed_event():
print("[ORCH] ignore late tts.completed (interrupt/recording)")
return
# 死循环接收数据
self.AI_client_VC_recv_lock = 0
- count+=1
- if self._vc_tts_pipeline_busy() and (self.tts_in_data_len - self.tts_out_data_len > 64*1024 or count>5):
+ # 不因 TTS 积压延迟 cli.recv(),否则 canceled/tts.started 等控制帧堵在 socket。
+ count += 1
+ if count >= 32:
count = 0
utime.sleep_ms(1)
- if not self._vc_tts_pipeline_busy():
- utime.sleep_ms(1)
recv_data = cli.recv()
if self.AI_client_VC_recv_lock == 2:
print("AI_client_VC_recv 该退出了")
# 服务端会在 LLM 生成期间狂发 delta,若每条都 ujson.loads+dispatch,
# recv 线程会被拖住 2~3s,导致其后的 tts.started 晚到、播放迟迟不开始。
# 这里在解析前用子串快速识别并跳过(idle 计时已在解析前刷新,安全)。
- if self.is_VAD != 0 and ('"llm.delta"' in recv_data):
+ if '"llm.delta"' in recv_data:
# VC_LLM_DELTA_LOG=1 调试:累积回复文本,llm.completed 整段打印
if cfg_bool("VC_LLM_DELTA_LOG", False):
self._vc_accum_llm_delta(recv_data)
return
mode_switch_tail = True
self.Close_flag = 0
+ # 切到 PTT 后提示音播完:会话已在 play_tts_cb 预建链,勿再 Close
+ if mode_switch_tail and getattr(self, "VC_mode", -1) == 1:
+ print("[VC][ms] play_end -> keep session (PTT mode switch)")
+ try:
+ self._vc_ms_phase = 3
+ block_ms = 500
+ try:
+ block_ms = self._vc_ms_key_block_ms()
+ except Exception:
+ pass
+ self._vc_ms_key_block_until_ms = utime.ticks_add(utime.ticks_ms(), block_ms)
+ except Exception:
+ pass
+ return
print("[VC] play_end -> Close (Close_flag)")
try:
if mode_switch_tail:
return False
if getattr(self, "_tts_first_write_ms", 0):
return False
- if since_done < 600:
+ _zero_min = 150 if getattr(self, "VC_mode", -1) == 1 else 600
+ if since_done < _zero_min:
return False
is_pcm_empty_z = (self.play_pcm is None) or (
self.play_pcm is not None and self.play_pcm.stream_is_empty() == 1