helloyifa/bk7258_iR58
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
helloyifa 2025-06-23 18:47:54 +08:00
commit e9f3e0a9d8
4 changed files with 4752 additions and 5228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
bk_aidk/bk_avdk/bk_idk/middleware/boards/bk7258/vnd_cal/vnd_cal.c
View File

@ -1,7 +1,7 @@
#include "vnd_cal.h" #include "vnd_cal.h"
#include <driver/hal/hal_gpio_types.h> #include <driver/hal/hal_gpio_types.h>
#define DEFAULT_TXID_XTAL (0x3a) #define DEFAULT_TXID_XTAL (0x45)
#define TXPWR_ELEM_INUSED (0) #define TXPWR_ELEM_INUSED (0)
#define TXPWR_ELEM_UNUSED (1) #define TXPWR_ELEM_UNUSED (1)
@ -24,8 +24,7 @@
#define INIT_TXPWR_VALUE(gain, flag) {(((flag&FLAG_MASK)<<FLAG_POSI)|(gain&GAIN_MASK))} #define INIT_TXPWR_VALUE(gain, flag) {(((flag&FLAG_MASK)<<FLAG_POSI)|(gain&GAIN_MASK))}
const UINT32 g_default_xtal = DEFAULT_TXID_XTAL; const UINT32 g_default_xtal = DEFAULT_TXID_XTAL;
char *vnd_cal_version = "24-04-10 00:00:00"; char *vnd_cal_version = "2025-06-09 11:05:20";
/** /**
* pwr_gain<09:00> pregain in cfg_power_table.pregain * pwr_gain<09:00> pregain in cfg_power_table.pregain
* pwr_gain<13:10> pactrl in TRX_C<11:8>, F at present * pwr_gain<13:10> pactrl in TRX_C<11:8>, F at present
@ -270,76 +269,76 @@ const PWR_REGS cfg_tab_bt[TPC_PAMAP_TAB_BT_LEN] = {
/******************************** power table ********************************/ /******************************** power table ********************************/
const TXPWR_ST gtxpwr_tab_def_b[WLAN_2_4_G_CHANNEL_NUM] = { const TXPWR_ST gtxpwr_tab_def_b[WLAN_2_4_G_CHANNEL_NUM] = {
INIT_TXPWR_VALUE(21, TXPWR_ELEM_INUSED), // ch1 inused INIT_TXPWR_VALUE(16, TXPWR_ELEM_INUSED), // ch1 inused
INIT_TXPWR_VALUE(21, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(16, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(21, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(16, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(21, TXPWR_ELEM_UNUSED), // ch4 INIT_TXPWR_VALUE(16, TXPWR_ELEM_UNUSED), // ch4
INIT_TXPWR_VALUE(21, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(16, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(21, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(16, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(20, TXPWR_ELEM_UNUSED), // ch7 INIT_TXPWR_VALUE(16, TXPWR_ELEM_UNUSED), // ch7
INIT_TXPWR_VALUE(20, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(16, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(20, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(16, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(20, TXPWR_ELEM_UNUSED), // ch10 INIT_TXPWR_VALUE(16, TXPWR_ELEM_UNUSED), // ch10
INIT_TXPWR_VALUE(20, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(16, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(20, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(16, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(19, TXPWR_ELEM_INUSED), // ch13 inused INIT_TXPWR_VALUE(15, TXPWR_ELEM_INUSED), // ch13 inused
INIT_TXPWR_VALUE(19, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(15, TXPWR_ELEM_UNUSED),
}; };
const TXPWR_ST gtxpwr_tab_def_g[WLAN_2_4_G_CHANNEL_NUM] = { const TXPWR_ST gtxpwr_tab_def_g[WLAN_2_4_G_CHANNEL_NUM] = {
INIT_TXPWR_VALUE(48, TXPWR_ELEM_INUSED), // ch1 inused INIT_TXPWR_VALUE(43, TXPWR_ELEM_INUSED), // ch1 inused
INIT_TXPWR_VALUE(48, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(48, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(47, TXPWR_ELEM_UNUSED), // ch4
INIT_TXPWR_VALUE(47, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(47, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(46, TXPWR_ELEM_UNUSED), // ch7
INIT_TXPWR_VALUE(46, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(46, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(45, TXPWR_ELEM_UNUSED), // ch10
INIT_TXPWR_VALUE(44, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(44, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(43, TXPWR_ELEM_INUSED), // ch13 inused
INIT_TXPWR_VALUE(43, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(43, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(43, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(43, TXPWR_ELEM_UNUSED), // ch4
INIT_TXPWR_VALUE(43, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(43, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(42, TXPWR_ELEM_UNUSED), // ch7
INIT_TXPWR_VALUE(42, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(42, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(41, TXPWR_ELEM_UNUSED), // ch10
INIT_TXPWR_VALUE(41, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(41, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(40, TXPWR_ELEM_INUSED), // ch13 inused
INIT_TXPWR_VALUE(40, TXPWR_ELEM_UNUSED),
}; };
const TXPWR_ST gtxpwr_tab_def_n_40[WLAN_2_4_G_CHANNEL_NUM] = { const TXPWR_ST gtxpwr_tab_def_n_40[WLAN_2_4_G_CHANNEL_NUM] = {
INIT_TXPWR_VALUE(42, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(42, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(42, TXPWR_ELEM_UNUSED), // ch3
INIT_TXPWR_VALUE(41, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(41, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(41, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(40, TXPWR_ELEM_UNUSED), // ch7
INIT_TXPWR_VALUE(40, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(40, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(39, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(39, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(38, TXPWR_ELEM_UNUSED), // ch11 INIT_TXPWR_VALUE(39, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(39, TXPWR_ELEM_UNUSED), // ch3
INIT_TXPWR_VALUE(39, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(39, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(39, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(38, TXPWR_ELEM_UNUSED), // ch7
INIT_TXPWR_VALUE(38, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(38, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(38, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(37, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(37, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(37, TXPWR_ELEM_UNUSED), // ch11
INIT_TXPWR_VALUE(37, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(37, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(36, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(36, TXPWR_ELEM_UNUSED),
}; };
const TXPWR_ST gtxpwr_tab_def_ble[BLE_2_4_G_CHANNEL_NUM] = { const TXPWR_ST gtxpwr_tab_def_ble[BLE_2_4_G_CHANNEL_NUM] = {
INIT_TXPWR_VALUE(52, TXPWR_ELEM_UNUSED), // ch0 2402 inused INIT_TXPWR_VALUE(50, TXPWR_ELEM_UNUSED), // ch0 2402 inused
INIT_TXPWR_VALUE(52, TXPWR_ELEM_UNUSED), // ch1 2404 INIT_TXPWR_VALUE(50, TXPWR_ELEM_UNUSED), // ch1 2404
INIT_TXPWR_VALUE(52, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(50, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(52, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(50, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(52, TXPWR_ELEM_UNUSED), // ch4 2410 INIT_TXPWR_VALUE(50, TXPWR_ELEM_UNUSED), // ch4 2410
INIT_TXPWR_VALUE(52, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(52, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(52, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(52, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(52, TXPWR_ELEM_UNUSED), // ch9 2420
INIT_TXPWR_VALUE(51, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(51, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(51, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(51, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(51, TXPWR_ELEM_UNUSED), // ch14 2430
INIT_TXPWR_VALUE(50, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(50, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(50, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(50, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(50, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(50, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(50, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(50, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(50, TXPWR_ELEM_UNUSED), // ch9 2420
INIT_TXPWR_VALUE(49, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(49, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(49, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(49, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(49, TXPWR_ELEM_UNUSED), // ch14 2430
INIT_TXPWR_VALUE(49, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(49, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(49, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(49, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(49, TXPWR_ELEM_INUSED), // ch19 2440 inused INIT_TXPWR_VALUE(49, TXPWR_ELEM_INUSED), // ch19 2440 inused
INIT_TXPWR_VALUE(49, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(49, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(49, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(49, TXPWR_ELEM_UNUSED),
@ -356,11 +355,11 @@ const TXPWR_ST gtxpwr_tab_def_ble[BLE_2_4_G_CHANNEL_NUM] = {
INIT_TXPWR_VALUE(48, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(48, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(48, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(48, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(48, TXPWR_ELEM_UNUSED), // ch34 2470 INIT_TXPWR_VALUE(48, TXPWR_ELEM_UNUSED), // ch34 2470
INIT_TXPWR_VALUE(47, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(48, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(47, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(48, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(47, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(48, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(47, TXPWR_ELEM_UNUSED), INIT_TXPWR_VALUE(48, TXPWR_ELEM_UNUSED),
INIT_TXPWR_VALUE(46, TXPWR_ELEM_UNUSED), // ch39 2480 inused INIT_TXPWR_VALUE(47, TXPWR_ELEM_UNUSED), // ch39 2480 inused
}; };
/****************************** temperature table ****************************/ /****************************** temperature table ****************************/

9836
bk_aidk/bk_avdk/components/multimedia/include/prompt_tone.h
View File

File diff suppressed because it is too large Load Diff

9
bk_aidk/projects/beken_wss_paopao/main/app_event.c
View File

@ -88,7 +88,7 @@ void app_event_asr_evt_callback(media_app_evt_type_t event, uint32_t param)
currentWifiState = link_status.state; currentWifiState = link_status.state;
bk_printf("currentWifiState = %d\n", currentWifiState); bk_printf("currentWifiState = %d\n", currentWifiState);
if (currentWifiState == WIFI_LINKSTATE_STA_DISCONNECTED) if (currentWifiState == WIFI_LINKSTATE_STA_DISCONNECTED )
{ {
app_event_send_msg(APP_EVT_NETWORK_PROVISIONING_FAIL, 0); app_event_send_msg(APP_EVT_NETWORK_PROVISIONING_FAIL, 0);
@ -349,7 +349,7 @@ static void led_blink(uint32_t *warning_state, uint32_t indicates_state)
last_warning_state = *warning_state; last_warning_state = *warning_state;
} }
} }
extern int ispoweron;
static void app_event_thread(beken_thread_arg_t data) static void app_event_thread(beken_thread_arg_t data)
{ {
int ret = BK_OK; int ret = BK_OK;
@ -477,7 +477,10 @@ static void app_event_thread(beken_thread_arg_t data)
indicates_state |= (1 << INDICATES_WIFI_RECONNECT); indicates_state |= (1 << INDICATES_WIFI_RECONNECT);
indicates_state &= ~(1 << INDICATES_POWER_ON); indicates_state &= ~(1 << INDICATES_POWER_ON);
#if CONFIG_AUD_INTF_SUPPORT_PROMPT_TONE #if CONFIG_AUD_INTF_SUPPORT_PROMPT_TONE
bk_aud_intf_voc_play_prompt_tone(AUD_INTF_VOC_RECONNECT_NETWORK); if(ispoweron == 1){
bk_aud_intf_voc_play_prompt_tone(AUD_INTF_VOC_RECONNECT_NETWORK);
}
#endif #endif
break; break;

16
bk_aidk/projects/beken_wss_paopao/main/iot/iot_sleep_helper.c
View File

@ -329,19 +329,18 @@ void sleep_helper_set_level(sleep_model_level level){
void sleep_helper_open(){ void sleep_helper_open(){
LOGE("sleep_helper_open\n"); LOGE("sleep_helper_open\n");
bk_gpio_enable_output(44); bk_gpio_enable_output(44);
bk_gpio_enable_output(45); bk_gpio_enable_output(45);
gpio_dev_unmap(GPIO_50);
bk_gpio_enable_input(GPIO_50); // bk_gpio_enable_pull(GPIO_50);
//bk_gpio_enable_pull(GPIO_50);
//bk_gpio_pull_up(GPIO_50); //bk_gpio_pull_up(GPIO_50);
rtos_delay_milliseconds(1000); //rtos_delay_milliseconds(200);
uint8_t insert_value = bk_gpio_get_input(GPIO_50); uint8_t insert_value = bk_gpio_get_input(GPIO_50);
LOGE("sleep_helper insert_value %d \n",insert_value); LOGE("sleep_helper insert_valueccc %d \n",insert_value);
socket_insert = insert_value; socket_insert = insert_value;
if(socket_insert == 1){ if(socket_insert == 1){
LOGE("sleep_helper open fail!! battery charging... %d \n",insert_value); LOGE("sleep_helper open fail!! cable not insert %d \n",insert_value);
return ; return ;
} }
@ -487,6 +486,9 @@ void sleep_helper_init(){
gpio_dev_unmap(GPIO_44); gpio_dev_unmap(GPIO_44);
gpio_dev_unmap(GPIO_45); gpio_dev_unmap(GPIO_45);
gpio_dev_unmap(GPIO_50);
bk_gpio_enable_input(GPIO_50);
// gpio_dev_unmap(GPIO_50); // gpio_dev_unmap(GPIO_50);
// bk_gpio_enable_input(GPIO_50); // bk_gpio_enable_input(GPIO_50);
// bk_gpio_enable_pull(GPIO_50); // bk_gpio_enable_pull(GPIO_50);