diff --git a/bk_aidk/projects/beken_wss_paopao/config/bk7258/config b/bk_aidk/projects/beken_wss_paopao/config/bk7258/config index f053a354..196116f3 100755 --- a/bk_aidk/projects/beken_wss_paopao/config/bk7258/config +++ b/bk_aidk/projects/beken_wss_paopao/config/bk7258/config @@ -29,7 +29,7 @@ CONFIG_STA_USE_STATIC_IP=n CONFIG_AUD_INTF_SUPPORT_G722=n CONFIG_AUD_INTF_SUPPORT_OPUS=y CONFIG_AUD_INTF_SUPPORT_OPUS_PROMPT_TONE_RESAMPLE=y -CONFIG_AEC_VERSION_V2=y +CONFIG_AEC_VERSION_V3=y CONFIG_AEC_ECHO_COLLECT_MODE_HARDWARE=y CONFIG_AUD_INTF_SUPPORT_AI_DIALOG_FREE=y CONFIG_AUD_INTF_SUPPORT_MULTIPLE_SPK_SOURCE_TYPE=y diff --git a/bk_aidk/projects/beken_wss_paopao/config/bk7258_cp1/config b/bk_aidk/projects/beken_wss_paopao/config/bk7258_cp1/config index f26f0412..4ef1574f 100755 --- a/bk_aidk/projects/beken_wss_paopao/config/bk7258_cp1/config +++ b/bk_aidk/projects/beken_wss_paopao/config/bk7258_cp1/config @@ -40,7 +40,7 @@ CONFIG_AUD_INTF_SUPPORT_AI_DIALOG_FREE=y CONFIG_AUD_INTF_SUPPORT_MULTIPLE_SPK_SOURCE_TYPE=y CONFIG_AUD_INTF_SUPPORT_PROMPT_TONE=y CONFIG_AI_ASR_MODE_CPU2=y -CONFIG_AEC_VERSION_V2=y +CONFIG_AEC_VERSION_V3=y CONFIG_AEC_ECHO_COLLECT_MODE_HARDWARE=y #CONFIG_PROMPT_TONE_SOURCE_VFS=y CONFIG_PROMPT_TONE_SOURCE_ARRAY=y diff --git a/bk_aidk/projects/beken_wss_paopao/main/app_event.c b/bk_aidk/projects/beken_wss_paopao/main/app_event.c index 9be1ecf7..c1382291 100755 --- a/bk_aidk/projects/beken_wss_paopao/main/app_event.c +++ b/bk_aidk/projects/beken_wss_paopao/main/app_event.c @@ -588,6 +588,7 @@ static void app_event_thread(beken_thread_arg_t data) case APP_EVT_OTA_SUCCESS: LOGE("APP_EVT_OTA_SUCCESS\n"); s_active_tickets &= ~(1 << COUNTDOWN_TICKET_OTA); + ws2812_set_all_led_brightness(100); break; case APP_EVT_OTA_FAIL: @@ -604,7 +605,7 @@ static void app_event_thread(beken_thread_arg_t data) } // led blink by states - led_blink(&warning_state, indicates_state); + //led_blink(&warning_state, indicates_state); } } diff --git a/bk_aidk/projects/beken_wss_paopao/main/app_main.c b/bk_aidk/projects/beken_wss_paopao/main/app_main.c index 2db2f180..152e3b6a 100755 --- a/bk_aidk/projects/beken_wss_paopao/main/app_main.c +++ b/bk_aidk/projects/beken_wss_paopao/main/app_main.c @@ -666,10 +666,7 @@ static void handle_system_event(key_event_t event) // bk_enter_deepsleep(); // } - volume = 10; - bk_aud_intf_set_spk_gain(0x29); // 0x30 - - bk_config_write("volume", (void *)&volume, 4); + //poka ws2812_init(); thing_init(); diff --git a/bk_aidk/projects/beken_wss_paopao/main/application.c b/bk_aidk/projects/beken_wss_paopao/main/application.c index 461ab151..1645cf12 100755 --- a/bk_aidk/projects/beken_wss_paopao/main/application.c +++ b/bk_aidk/projects/beken_wss_paopao/main/application.c @@ -259,7 +259,7 @@ void app_mcp_init(){ // OTA { PropertyList* props = property_list_create(); - mcp_server_add_tool_with_params(mcp_server, "self.ota.update_device", "更新拍拍灯乐小牛软件,执行该指令需要和用户二次确认才允许下发这个指令", props, ota_update_device_callback); + mcp_server_add_tool_with_params(mcp_server, "self.ota.update_device", "更新拍拍灯乐小牛软件,执行该指令需要和用户二次确认才允许下发这个指令,并提示大约等待3分钟后手动重启设备", props, ota_update_device_callback); } } diff --git a/bk_aidk/projects/beken_wss_paopao/main/application.h b/bk_aidk/projects/beken_wss_paopao/main/application.h index ad59a4e7..7495f308 100755 --- a/bk_aidk/projects/beken_wss_paopao/main/application.h +++ b/bk_aidk/projects/beken_wss_paopao/main/application.h @@ -81,7 +81,7 @@ typedef enum ListeningMode { * 解决调用BLE设置灯光常亮时异常问题 */ -#define APPLICATION_VERSION "1.1.8" +#define APPLICATION_VERSION "1.1.9" #define APPLICATION_DEFULT_OTA_URL "https://xiaozhi.xa-poka.com/xiaozhi/ota/" #define APPLICATION_CONFIG_KEY_AI_URL "ai_url" /** diff --git a/bk_aidk/projects/beken_wss_paopao/main/audio_para.c b/bk_aidk/projects/beken_wss_paopao/main/audio_para.c index 84b1d03e..0ee24af5 100755 --- a/bk_aidk/projects/beken_wss_paopao/main/audio_para.c +++ b/bk_aidk/projects/beken_wss_paopao/main/audio_para.c @@ -82,17 +82,17 @@ .aec_enable = 1, \ .init_flags = 0x1f, \ .ec_filter = 0x7, \ - .ec_depth = 0xa, \ + .ec_depth = 0x2, \ .mic_delay = 16, \ .drc_gain = 0, \ - .voice_vol = 0xd, \ + .voice_vol = 0xe, \ .ref_scale = 0, \ .ns_level = 0x5, \ .ns_para = 0x2, \ .ns_filter = 0x7, \ .ai_ns_enable = 1, \ - .vad_enable = 1, \ - .vad_start_threshold = 480, \ + .vad_enable = 0, \ + .vad_start_threshold = 300, \ .vad_stop_threshold = 960, \ .vad_silence_threshold = 320, \ .vad_eng_threshold =2000, \ @@ -126,10 +126,10 @@ #define CUST_SYS_CONFIG_VOICE() \ { \ .mic0_digital_gain=0x30, \ - .mic0_analog_gain=0x8, \ + .mic0_analog_gain=0x10, \ .mic1_analog_gain=0x0, \ - .speaker_chan0_digital_gain = 0x1E, \ - .speaker_chan0_analog_gain = 0xF, \ + .speaker_chan0_digital_gain = 0x20, \ + .speaker_chan0_analog_gain = 0xA, \ .main_mic_select = 0, \ .dual_mic_enable = 0, \ .dmic_enable = 0, \ diff --git a/bk_aidk/projects/beken_wss_paopao/main/beken_sdk/beken_rtc.c b/bk_aidk/projects/beken_wss_paopao/main/beken_sdk/beken_rtc.c index f0995740..d666c4ae 100755 --- a/bk_aidk/projects/beken_wss_paopao/main/beken_sdk/beken_rtc.c +++ b/bk_aidk/projects/beken_wss_paopao/main/beken_sdk/beken_rtc.c @@ -842,7 +842,7 @@ int rtc_websocket_send_text(transport web_socket, void *str, enum MsgType msgtyp cJSON_AddStringToObject(startlistent, "type", "listen"); cJSON_AddStringToObject(startlistent, "state", "start"); - cJSON_AddStringToObject(startlistent, "mode", "auto") ; + cJSON_AddStringToObject(startlistent, "mode", "auto") ;//auto manual char *jsonString = cJSON_PrintUnformatted(startlistent); websocket_client_send_text(web_socket, jsonString, strlen(jsonString), 10*1000); cJSON_Delete(startlistent); diff --git a/bk_aidk/projects/beken_wss_paopao/main/boarding_service/wifi_boarding_utils.c b/bk_aidk/projects/beken_wss_paopao/main/boarding_service/wifi_boarding_utils.c index 1efd24d4..c5dd4762 100755 --- a/bk_aidk/projects/beken_wss_paopao/main/boarding_service/wifi_boarding_utils.c +++ b/bk_aidk/projects/beken_wss_paopao/main/boarding_service/wifi_boarding_utils.c @@ -195,6 +195,14 @@ int ble_notify_boarding_state(boarding_state state){ if(m_state == state){ return 0; } + //在没有配置wifi情况下,不发送状态AP_NOFOUND PASSWORD_ERROR + if(state== BOARDING_STATE_AP_NOFOUND && m_state != BOARDING_STATE_SETWIFI){ + return 0; + } + if(state== BOARDING_STATE_PASSWORD_ERROR && m_state != BOARDING_STATE_SETWIFI){ + return 0; + } + m_state = state; uint8_t str_respone [32] = {0}; memset(str_respone,0,sizeof(str_respone)); diff --git a/bk_aidk/projects/beken_wss_paopao/main/iot/iot_speaker.c b/bk_aidk/projects/beken_wss_paopao/main/iot/iot_speaker.c index 7ee75c15..869232ee 100755 --- a/bk_aidk/projects/beken_wss_paopao/main/iot/iot_speaker.c +++ b/bk_aidk/projects/beken_wss_paopao/main/iot/iot_speaker.c @@ -33,7 +33,7 @@ #if (CONFIG_SYS_CPU0) -static uint32_t volume = 7; // volume level, not gain. +static uint32_t volume = 9; // volume level, not gain. //static uint32_t g_volume_gain[SPK_VOLUME_LEVEL] = {0, 0x05, 0x18, 0x10, 0x13, 0x15, 0x18, 0x21, 0x22, 0x25, 0x30}; static uint32_t g_volume_gain[SPK_VOLUME_LEVEL] = {0, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x30}; void speaker_volume_init(void) @@ -53,6 +53,11 @@ void speaker_volume_init(void) }else{ volume = volume_size; } + + //volume = 10; + bk_aud_intf_set_spk_gain(g_volume_gain[volume]); // 0x30 + BK_LOGE(TAG, "g_volume_gain: %02X \n", g_volume_gain[volume]); + //bk_config_write("volume", (void *)&volume, 4); /* SPK_GAIN_MAX * [(exp(i/(SPK_VOLUME_LEVEL-1)-1)/(exp(1)-1)] */ //uint32_t step[SPK_VOLUME_LEVEL] = {0, 6, 12, 20, 28, 37, 47, 58, 71, 84, 100}; diff --git a/bk_aidk/projects/beken_wss_paopao/main/mcp/mcp_server.c b/bk_aidk/projects/beken_wss_paopao/main/mcp/mcp_server.c index 8bf767f5..ca5b3448 100755 --- a/bk_aidk/projects/beken_wss_paopao/main/mcp/mcp_server.c +++ b/bk_aidk/projects/beken_wss_paopao/main/mcp/mcp_server.c @@ -785,7 +785,7 @@ void mcp_server_parse_message_json(McpServer* server, const cJSON* json) { if (tool_json) { cJSON_AddItemToArray(tools_array, tool_json); } - LOGE("tool(%d) %s\n",i,tool_json_str); + //LOGE("tool(%d) %s\n",i,tool_json_str); free(tool_json_str); } } diff --git a/bk_aidk/projects/beken_wss_paopao/main/smart_config/bk_genie_smart_config.c b/bk_aidk/projects/beken_wss_paopao/main/smart_config/bk_genie_smart_config.c index a17df5f9..32d95ab1 100755 --- a/bk_aidk/projects/beken_wss_paopao/main/smart_config/bk_genie_smart_config.c +++ b/bk_aidk/projects/beken_wss_paopao/main/smart_config/bk_genie_smart_config.c @@ -622,8 +622,13 @@ int demo_save_network_auto_restart_info(netif_if_t type, void *val) //} #if (CONFIG_EASY_FLASH && CONFIG_EASY_FLASH_V4) - bk_set_env_enhance("d_network_id", (const void *)&info_tmp, sizeof(BK_FAST_CONNECT_D)); - #endif + EfErrCode code = bk_set_env_enhance("d_network_id", (const void *)&info_tmp, sizeof(BK_FAST_CONNECT_D)); + bk_save_env(); + if(code != EF_NO_ERR) + { + BK_LOGE(TAG, "bk_set_env_enhance failed\n"); + } + #endif return 0; } diff --git a/bk_aidk/projects/beken_wss_paopao/main/websocket_rtc_demo.c b/bk_aidk/projects/beken_wss_paopao/main/websocket_rtc_demo.c index a06e3853..cc007a23 100755 --- a/bk_aidk/projects/beken_wss_paopao/main/websocket_rtc_demo.c +++ b/bk_aidk/projects/beken_wss_paopao/main/websocket_rtc_demo.c @@ -591,6 +591,7 @@ void rtc_websocket_msg_handle(char *json_text, unsigned int size) if(state != NULL && text != NULL){ LOGE("TTS << (%s) %s\n",state->valuestring,text->valuestring); } + /* if(text == NULL) return; if (strcmp(state->valuestring, "start") == 0) { if (app_get_device_state() == kDeviceStateIdle || app_get_device_state() == kDeviceStateListening) { @@ -611,7 +612,7 @@ void rtc_websocket_msg_handle(char *json_text, unsigned int size) if (app_get_device_state() == kDeviceStateSpeaking) { app_set_device_state(kDeviceStateListening); } - } + }*/ } #if APPLICATION_IOT_PROTOCOL_MCP @@ -860,7 +861,7 @@ void rtc_websocket_event_handler(void *event_handler_arg, char *event_base, int3 #elif CONFIG_USE_OPUS_CODEC binary_data_status = 0; // 状态置为0,表示正在接收数据 last_binary_data_ms = bk_aon_rtc_get_ms(); // 记录当前毫秒数 - poka_audio_receive_data_opus(__get_beken_rtc(), (uint8_t *)data->data_ptr, data->data_len); + //poka_audio_receive_data_opus(__get_beken_rtc(), (uint8_t *)data->data_ptr, data->data_len); // rtc_websocket_audio_receive_data_opus(__get_beken_rtc(), (uint8_t *)data->data_ptr, data->data_len); #else #endif