diff --git a/apps/earphone/board/br28/board_jl701n_demo_cfg.h b/apps/earphone/board/br28/board_jl701n_demo_cfg.h index 62d79ad..5ded81e 100644 --- a/apps/earphone/board/br28/board_jl701n_demo_cfg.h +++ b/apps/earphone/board/br28/board_jl701n_demo_cfg.h @@ -47,7 +47,7 @@ */ #define TCFG_HW_I2C0_PORTS 'B' -#define TCFG_HW_I2C0_CLK 1000000 //硬件IIC波特率:400k +#define TCFG_HW_I2C0_CLK 400000 //硬件IIC波特率:400k //*********************************************************************************// // 硬件SPI 配置 // diff --git a/apps/earphone/xtell_Sensor/send_data.c b/apps/earphone/xtell_Sensor/send_data.c index 4c23541..b9b9f40 100644 --- a/apps/earphone/xtell_Sensor/send_data.c +++ b/apps/earphone/xtell_Sensor/send_data.c @@ -129,7 +129,7 @@ void sensor_collect_task(void){ while(1){//4组地磁数据、16组六轴数据、1组气压计数据 interval++; - mmc5603nj_read_mag_data(&mmc5603nj_buffer); + mmc5603nj_read_mag_data(&mmc5603nj_buffer); //地磁的采样率为100Hz，每10ms读一次 for(int i = (interval-1)*4; i < interval*4; i++){ send_data.sensor_package[i].mmc5603nj_buffer[0] = (int32_t)(mmc5603nj_buffer.x * 1000.0f); send_data.sensor_package[i].mmc5603nj_buffer[1] = (int32_t)(mmc5603nj_buffer.y * 1000.0f); @@ -165,11 +165,11 @@ void sensor_collect_task(void){ SL_data_index += MPU_FIFO_LEN/4; - if(interval >= 4){ + if(interval >= 4){ //40ms interval = 0; SL_data_index = 0; #if BMP280 - bmp280_read_data(&temperature, &pressure);//每40ms读取一次 + bmp280_read_data(&temperature, &pressure);//每40ms读取一次，高精度的采样率为26.5Hz #else WF_GET_Temperature_Pressure(&temperature, &pressure); #endif @@ -178,7 +178,7 @@ void sensor_collect_task(void){ send_data.sensor_package[i].pressure = (int32_t)(pressure * 1000.0f); } - xlog("temperature: %.2f,pressure: %.2f\n",temperature,pressure); + // xlog("temperature: %.2f,pressure: %.2f\n",temperature,pressure); // xlog("fifo_num:%d\n",fifo_num); send_data.checkout_1 = 0xBE; @@ -454,7 +454,7 @@ void sensor_test_task(void){ while(1){ WF_GET_Temperature_Pressure(&temperature, &pressure); xlog("temperature: %.3f,pressure: %.3f\n",temperature,pressure); - os_time_dly(40); + os_time_dly(100); } } diff --git a/apps/earphone/xtell_Sensor/sensor/WF282A.c b/apps/earphone/xtell_Sensor/sensor/WF282A.c index f644827..4670479 100644 --- a/apps/earphone/xtell_Sensor/sensor/WF282A.c +++ b/apps/earphone/xtell_Sensor/sensor/WF282A.c @@ -150,7 +150,7 @@ uint8_t WF_Init() { xlog("Parsed Coefficients: c0=%d, c1=%d, c00=%ld, c10=%ld, c01=%d, c11=%d, c20=%d, c21=%d, c30=%d\n", c0, c1, c00, c10, c01, c11, c20, c21, c30); - #if 1 //连续测量 + #if 0 //连续测量 // 配置压力、温度和通用寄存器为连续测量模式 wf282a_write_reg(WF_PRS_CFG, (PM_RATE_32 << 4) | PM_PRC_1); //reg: 0x06 // 温度配置: 内部传感器 (TMP_INT_SENSOR), 32Hz测量速率 (TMP_RATE_32), 16x过采样 (TMP_PRC_16) -> 0x54 @@ -165,7 +165,7 @@ uint8_t WF_Init() { wf282a_write_reg(WF_PRS_CFG, (PM_RATE_1 << 4) | PM_PRC_128); //reg: 0x06，压力 wf282a_write_reg(WF_TMP_CFG, TMP_EXT_SENSOR | (TMP_RATE_1 << 4) | TMP_PRC_128); //reg: 0x07，温度 //过采样率大于8要对移位置配置1 - // wf282a_write_reg(WF_CFG_REG, 0x0C); //reg: 0x09 + wf282a_write_reg(WF_CFG_REG, 0x0C); //reg: 0x09 delay(40); // 稍长一点的延迟，确保传感器开始正常工作 #endif @@ -193,25 +193,34 @@ uint8_t WF_GetID() { //外部调用 void WF_GET_Temperature_Pressure(float* temperature, float* precessure){ - #if 0 //单词测量模式 + #if 0 //连续测量模式 + int32_t Traw = Get_Traw(); + xlog("DEBUG: Traw = %ld\n", Traw); + delay(5); + int32_t Praw = Get_Praw(); + xlog("DEBUG: Praw = %ld\n", Praw); + #else //单次测量 wf282a_write_reg(WF_MEAS_CFG, 0x02); //内部进行一次温度测量 - delay(200); + delay(500); int32_t Traw = Get_Traw(); + xlog("DEBUG: Traw = %ld\n", Traw); wf282a_write_reg(WF_MEAS_CFG, 0x01); //内部进行一次压力测量 - delay(200); - int32_t Praw = Get_Praw(); - #else - int32_t Traw = Get_Traw(); + delay(500); int32_t Praw = Get_Praw(); + xlog("DEBUG: Praw = %ld\n", Praw); + #endif - float Traw_sc = (float)Traw / KT; // 缩放原始温度值 - float Praw_sc = (float)Praw / KP; // 缩放原始压力值 + float Traw_sc = (float)Traw / KT; // 缩放原始温度值 + double Praw_sc = (double)Praw / KP; // 缩放原始压力值 + double precessure_tmp = 0; *temperature = (float)c0 * 0.5f + (float)c1 * Traw_sc; - *precessure = (float)c00 - + Praw_sc * ((float)c10 + Praw_sc * ((float)c20 + Praw_sc * (float)c30)) - + Traw_sc * (float)c01 - + Traw_sc * Praw_sc * ((float)c11 + Praw_sc * (float)c21); + precessure_tmp = (double)c00 + + Praw_sc * ((double)c10 + Praw_sc * ((double)c20 + Praw_sc * (double)c30)) + + Traw_sc * (double)c01 + + Traw_sc * Praw_sc * ((double)c11 + Praw_sc + (double)c21); + xlog("temperature:%.3f,precessure: %.3f\n",*temperature, precessure_tmp); + *precessure = (float)precessure_tmp; // 传出 } float WF_Altitude_Calculate() { float pressure_pa = WF_Pressure_Calculate(); diff --git a/apps/earphone/xtell_Sensor/sensor/WF282A.h b/apps/earphone/xtell_Sensor/sensor/WF282A.h index cb83cc5..05cdc88 100644 --- a/apps/earphone/xtell_Sensor/sensor/WF282A.h +++ b/apps/earphone/xtell_Sensor/sensor/WF282A.h @@ -14,8 +14,8 @@ Oversampling Rate Scale Factor (kP or kT) 64 times (High Precision) 1040384 128 times 2088960 */ -#define KT 524288.0f -#define KP 524288.0f +#define KT 1572864.0f +#define KP 1572864.0f #define WF_PULL_UP 0 //外部是否接的上拉 // I2C 从设备地址 diff --git a/apps/earphone/xtell_remote_control/ble_handler/ble_handler.c b/apps/earphone/xtell_remote_control/ble_handler/ble_handler.c deleted file mode 100644 index 9c6d139..0000000 --- a/apps/earphone/xtell_remote_control/ble_handler/ble_handler.c +++ /dev/null @@ -1,528 +0,0 @@ -#include "system/includes.h" -#include "media/includes.h" -#include "tone_player.h" -#include "earphone.h" - -#include "app_config.h" -#include "app_action.h" -#include "app_task.h" - -#include "btstack/avctp_user.h" -#include "btstack/btstack_task.h" -#include "btctrler/btctrler_task.h" -#include "btstack/frame_queque.h" -#include "user_cfg.h" -// #include "aec_user.h" -#include "classic/hci_lmp.h" -#include "bt_common.h" -#include "bt_ble.h" -#include "bt_tws.h" -#include "pbg_user.h" -#include "btstack/bluetooth.h" -#include "colorful_lights/colorful_lights.h" - -#include "app_chargestore.h" -#include "jl_kws/jl_kws_api.h" - -#include "asm/charge.h" -#include "app_charge.h" -#include "ui_manage.h" - -#include "app_chargestore.h" -#include "app_umidigi_chargestore.h" -#include "app_testbox.h" -#include "app_online_cfg.h" -#include "app_main.h" -#include "app_power_manage.h" -#include "gSensor/gSensor_manage.h" -#include "key_event_deal.h" -#include "classic/tws_api.h" -#include "asm/pwm_led.h" -#include "ir_sensor/ir_manage.h" -#include "in_ear_detect/in_ear_manage.h" -#include "vol_sync.h" -#include "bt_background.h" -#include "default_event_handler.h" -#include "debug.h" -#include "system/event.h" -#include "../nvs/nvs.h" -#if (JL_EARPHONE_APP_EN) -#include "rcsp_adv_bluetooth.h" -#endif -/////////////////////////////////////////////////////////////////////////////////////////////////// -//宏定义 -#define LOG_TAG_CONST EARPHONE -#define LOG_TAG "[EARPHONE]" -#define LOG_ERROR_ENABLE -#define LOG_DEBUG_ENABLE -#define xlog_ENABLE - - -#if(USE_DMA_UART_TEST) //使用dm串口测试时不能同时打开 -#define MY_SNIFF_EN 0 -#else -#define MY_SNIFF_EN 1 //默认打开 -#endif - -#define ENABLE_XLOG 1 -#ifdef xlog -#undef xlog -#endif -#if ENABLE_XLOG - #define xlog(format, ...) printf("[XT:%s] " format, __func__, ##__VA_ARGS__) -#else - #define xlog(format, ...) ((void)0) -#endif -// -/////////////////////////////////////////////////////////////////////////////////////////////////// - -/////////////////////////////////////////////////////////////////////////////////////////////////// -//变量 -extern u8 init_ok; -extern u8 sniff_out; -unsigned char xtell_bl_state=0; //存放经典蓝牙的连接状态，0断开，1是连接 -u8 bt_newname =0; -unsigned char xt_ble_new_name[9] = "CM-55555"; -static u16 play_poweron_ok_timer_id = 0; - -// -- 初始化标志位 -- -u8 SC7U22_init = 0x10; //六轴是否初始化 -u8 MMC5603nj_init = 0x20; //地磁是否初始化 -u8 barometer_init = 0x30; //气压计初始化 -// -- 线程id -- -u16 SC7U22_calibration_id; -u16 start_collect_fuc_id; -u16 BLE_send_fuc_id; -u16 rfid_fuc_id; -// -/////////////////////////////////////////////////////////////////////////////////////////////////// -extern int bt_hci_event_handler(struct bt_event *bt); -extern void SC7U22_static_calibration(void); -extern void create_process(u16* pid, const char* name, void *priv, void (*func)(void *priv), u32 msec); -extern void close_process(u16* pid,char* name); -extern void start_collect_fuc(void); -extern void BLE_send_fuc(void); -extern void xtell_ble_central_test_start(void); -/////////////////////////////////////////////////////////////////////////////////////////////////// -/* - * 模式状态机, 通过start_app()控制状态切换 - */ -/* extern int audio_mic_init(); */ - -static int state_machine(struct application *app, enum app_state state, struct intent *it){ - int error = 0; - static u8 tone_player_err = 0; - xlog("bt_state_machine=%d\n", state); - switch (state) { - case APP_STA_CREATE: - xlog("APP_STA_CREATE\n"); - /* set_adjust_conn_dac_check(0); */ - - break; - case APP_STA_START: - xlog("APP_STA_START\n"); - if (!it) { - xlog("APP_STA_START:it none\n"); - break; - } - switch (it->action) { - case ACTION_EARPHONE_MAIN: - xlog("ble init\n"); - /* - * handler 初始化 - */ - clk_set("sys", BT_NORMAL_HZ); - u32 sys_clk = clk_get("sys"); - bt_pll_para(TCFG_CLOCK_OSC_HZ, sys_clk, 0, 0); - /* bredr_set_dut_enble(1, 1); */ - bt_function_select_init(); - bredr_handle_register(); - EARPHONE_STATE_INIT(); - btstack_init(); - sys_auto_shut_down_enable(); - bt_sniff_feature_init(); - sys_auto_sniff_controle(MY_SNIFF_EN, NULL); - app_var.dev_volume = -1; - break; - case ACTION_A2DP_START: //蓝牙音频传输协议 - xlog("ACTION_A2DP_START\n"); - break; - case ACTION_BY_KEY_MODE: - xlog("ACTION_BY_KEY_MODE\n"); - break; - case ACTION_TONE_PLAY: - xlog("ACTION_TONE_PLAY\n"); - // STATUS *p_tone = get_tone_config(); - // tone_play_index(p_tone->bt_init_ok, 1); - break; - case ACTION_DO_NOTHING: - xlog("ACTION_DO_NOTHING\n"); - break; - } - break; - case APP_STA_PAUSE: - xlog("APP_STA_PAUSE\n"); - break; - case APP_STA_RESUME: - xlog("APP_STA_RESUME\n"); - //恢复前台运行 - sys_auto_shut_down_disable(); - sys_key_event_enable(); - break; - case APP_STA_STOP: - xlog("APP_STA_STOP\n"); - break; - case APP_STA_DESTROY: - xlog("APP_STA_DESTROY\n"); - r_printf("APP_STA_DESTROY\n"); - if (!app_var.goto_poweroff_flag) { - bt_app_exit(NULL); - } - break; - } - xlog("state machine error\n"); - return error; -} - -/////////////////////////////////////////////////////////////////////////////////////////////////// -//handle - - -void le_user_app_send_event(size_t command, unsigned char* data, size_t size) -{ - // 中断->事件 - static unsigned char buffer[512]; - if(data && size && size <= sizeof(buffer)) { - // 拷贝到缓存，避免转发事件的时候，地址发送改变。 - memcpy(buffer, data, size); - struct sys_event event; - event.type = SYS_APP_USER_EVENT; - event.u.app.command = command; - event.u.app.buffer = buffer; - event.u.app.size = size; - sys_event_notify(&event); - } -} - -void le_user_app_event_handler(struct sys_event* event){ - - switch (event->type) { - // 打印接收到的数据 - printf("BLE data\n"); - put_buf(event->u.app.buffer, event->u.app.size); - case SYS_APP_USER_EVENT: - if (event->u.app.buffer[0] == 0xBE && event->u.app.buffer[1] == 0xBB) { - if(event->u.app.buffer[2] == 0x01){ //后面的数据长度 1 - switch (event->u.app.buffer[3]){ - case 0x01: - nvs_test_factory_info(); - break; - case 0x02: - // factory_info_t read_info;; - // nvs_read_factory_info(&read_info); - extern void rfid_task_fuc(void); - create_process(&rfid_fuc_id,"rfid",NULL,rfid_task_fuc,2000); - break; - case 0xff: //测试 - int ret = hw_iic_init(0); - // int ret = soft_iic_init(0); - xlog("init iic result:%d\n", ret); //返回0成功 - extern void i2c_scanner_probe(void); - i2c_scanner_probe(); - - break; - default: - break; - } - }else if(event->u.app.buffer[2] == 0x02){ //后面数据长度为2 - switch (event->u.app.buffer[3]){ //数据包类型 - case 0x00: - break; - } - } - } - break; - - default: - xlog("%d\n",event->type); - break; - } - - -} - - -static void play_poweron_ok_timer(void *priv) -{ - app_var.wait_timer_do = 0; - - log_d("\n-------play_poweron_ok_timer-------\n", priv); - if (is_dac_power_off()) { -#if TCFG_USER_TWS_ENABLE - bt_tws_poweron(); -#else - bt_wait_connect_and_phone_connect_switch(0); -#endif - return; - } - - app_var.wait_timer_do = sys_timeout_add(priv, play_poweron_ok_timer, 100); -} - -static void play_bt_connect_dly(void *priv) -{ - app_var.wait_timer_do = 0; - - log_d("\n-------play_bt_connect_dly-------\n", priv); - - if (!app_var.goto_poweroff_flag) { - STATUS *p_tone = get_tone_config(); - tone_play_index(p_tone->bt_connect_ok, 1); - } -} - - - -static int bt_connction_status_event_handler(struct bt_event *bt) -{ - STATUS *p_tone = get_tone_config(); - u8 *phone_number = NULL; - - switch (bt->event) { - case BT_STATUS_INIT_OK: - /* - * 蓝牙初始化完成 - */ - xlog("BT_STATUS_INIT_OK\n"); - init_ok = 1; - __set_sbc_cap_bitpool(38); - -#if (TCFG_USER_BLE_ENABLE) - if (BT_MODE_IS(BT_BQB)) { - ble_bqb_test_thread_init(); - } else { -#if !TCFG_WIRELESS_MIC_ENABLE - bt_ble_init(); // lmx，初始化完，初始化ble，决定ble是作为主设备还是从设备 - // xtell_ble_central_test_start(); //xtell -#endif - } -#endif - bt_init_ok_search_index(); -#if TCFG_TEST_BOX_ENABLE - testbox_set_bt_init_ok(1); -#endif - -#if ((CONFIG_BT_MODE == BT_BQB)||(CONFIG_BT_MODE == BT_PER)) - bt_wait_phone_connect_control(1); -#else - if (is_dac_power_off()) { - bt_wait_connect_and_phone_connect_switch(0); - } else { - app_var.wait_timer_do = sys_timeout_add(NULL, play_poweron_ok_timer, 100); - } -#endif - - /*if (app_var.play_poweron_tone) { - tone_play_index(p_tone->power_on, 1); - }*/ - break; - - case BT_STATUS_SECOND_CONNECTED: - clear_current_poweron_memory_search_index(0); - case BT_STATUS_FIRST_CONNECTED: - xlog("BT_STATUS_CONNECTED\n"); - xtell_bl_state = 1; //蓝牙连接成功 置1 - if(strcmp(xt_ble_new_name,"CM-11111") != 0){ - //蓝牙连接成功 - bt_newname =1; - u8 temp[5]={0xBB,0xBE,0x02,0x04,0x00}; - temp[4] = xtell_bl_state; //经典蓝牙连接状态 - // send_data_to_ble_client(&temp,5); - } - earphone_change_pwr_mode(PWR_DCDC15, 3000); - sys_auto_shut_down_disable(); - - ui_update_status(STATUS_BT_CONN); //单台在此处设置连接状态,对耳的连接状态需要同步，在bt_tws.c中去设置 - - /* tone_play(TONE_CONN); */ - /*os_time_dly(40); // for test*/ - xlog("tone status:%d\n", tone_get_status()); - if (get_call_status() == BT_CALL_HANGUP) { - if (app_var.phone_dly_discon_time) { - sys_timeout_del(app_var.phone_dly_discon_time); - app_var.phone_dly_discon_time = 0; - } else { - app_var.wait_timer_do = sys_timeout_add(NULL, play_bt_connect_dly, 1600); - /* tone_play_index(p_tone->bt_connect_ok, 1); */ - } - } - - - /*int timeout = 5000 + rand32() % 10000; - sys_timeout_add(NULL, connect_phone_test, timeout);*/ - break; - case BT_STATUS_FIRST_DISCONNECT: - case BT_STATUS_SECOND_DISCONNECT: - xlog("BT_STATUS_DISCONNECT\n"); - xtell_bl_state = 0; //断开蓝牙 清0 - //蓝牙断开连接 - if(bt_newname){ //已经改成新蓝牙名字，断开才播报 - bt_newname=0; - u8 temp[5]={0xBB,0xBE,0x02,0x04,0x00}; - temp[4] = xtell_bl_state; //经典蓝牙连接状态 - // send_data_to_ble_client(&temp,5); - } - if (app_var.goto_poweroff_flag) { - /*关机不播断开提示音*/ - /*关机时不改UI*/ - break; - } - // bt_discon_dly_handle(NULL); - break; - - //phone status deal - case BT_STATUS_PHONE_INCOME: - break; - case BT_STATUS_PHONE_OUT: - - break; - case BT_STATUS_PHONE_ACTIVE: - break; - case BT_STATUS_PHONE_HANGUP: - break; - case BT_STATUS_PHONE_NUMBER: - break; - case BT_STATUS_INBAND_RINGTONE: //铃声 - break; - case BT_STATUS_CALL_VOL_CHANGE: - - break; - case BT_STATUS_SNIFF_STATE_UPDATE: - xlog(" BT_STATUS_SNIFF_STATE_UPDATE %d\n", bt->value); //0退出SNIFF - if (bt->value == 0) { - sniff_out = 1; - sys_auto_sniff_controle(MY_SNIFF_EN, bt->args); - } else { - sys_auto_sniff_controle(0, bt->args); - } - break; - - case BT_STATUS_LAST_CALL_TYPE_CHANGE: - break; - - case BT_STATUS_CONN_A2DP_CH: - case BT_STATUS_CONN_HFP_CH: - - if ((!is_1t2_connection()) && (get_current_poweron_memory_search_index(NULL))) { //回连下一个device - if (get_esco_coder_busy_flag()) { - clear_current_poweron_memory_search_index(0); - } else { - user_send_cmd_prepare(USER_CTRL_START_CONNECTION, 0, NULL); - } - } - break; - case BT_STATUS_PHONE_MANUFACTURER: - break; - case BT_STATUS_VOICE_RECOGNITION: - - break; - case BT_STATUS_AVRCP_INCOME_OPID: - xlog("BT_STATUS_AVRCP_INCOME_OPID:%d\n", bt->value); - break; - default: - xlog(" BT STATUS DEFAULT\n"); - break; - } - return 0; -} - - -static int event_handler(struct application *app, struct sys_event *event) -{ - - le_user_app_event_handler(event); - - if (SYS_EVENT_REMAP(event)) { - g_printf("****SYS_EVENT_REMAP**** \n"); - return 0; - } - - switch (event->type) { - case SYS_KEY_EVENT: - break; - case SYS_BT_EVENT: - /* - * 蓝牙事件处理 - */ - if ((u32)event->arg == SYS_BT_EVENT_TYPE_CON_STATUS) { - printf("in event_handler:bt_connction_status_event_handler"); - bt_connction_status_event_handler(&event->u.bt); - } else if ((u32)event->arg == SYS_BT_EVENT_TYPE_HCI_STATUS) { - bt_hci_event_handler(&event->u.bt); - } - break; - case SYS_DEVICE_EVENT: - /* - * 系统设备事件处理 - */ - if ((u32)event->arg == DEVICE_EVENT_FROM_CHARGE) { - - } else if ((u32)event->arg == DEVICE_EVENT_FROM_POWER) { - return app_power_event_handler(&event->u.dev); - } -#if (JL_EARPHONE_APP_EN) - else if ((u32)event->arg == DEVICE_EVENT_FROM_RCSP) { - xlog("DEVICE_EVENT_FROM_RCSP: %d", event->u.rcsp.event); - switch (event->u.rcsp.event) { - case MSG_JL_UPDATE_START: - xlog(">>> Xtell APP: MSG_JL_UPDATE_START\n"); - // You can add UI notifications here, like LED blinking or a tone. - break; - default: - break; - } - } -#endif -#if TCFG_UMIDIGI_BOX_ENABLE - else if ((u32)event->arg == DEVICE_EVENT_UMIDIGI_CHARGE_STORE) { - app_umidigi_chargestore_event_handler(&event->u.umidigi_chargestore); - } -#endif -#if TCFG_TEST_BOX_ENABLE - else if ((u32)event->arg == DEVICE_EVENT_TEST_BOX) { - app_testbox_event_handler(&event->u.testbox); - } -#endif - break; - - default: - return false; - } - - SYS_EVENT_HANDLER_SPECIFIC(event); -#ifdef CONFIG_BT_BACKGROUND_ENABLE - if (app) { - default_event_handler(event); - } -#endif - return false; - -} - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -static const struct application_operation app_handler_ops = { - .state_machine = state_machine, - .event_handler = event_handler, -}; - - -/* - * 注册earphone模式 - */ -REGISTER_APPLICATION(app_handler) = { - .name = "handler", - .action = ACTION_EARPHONE_MAIN, - .ops = &app_handler_ops, - .state = APP_STA_DESTROY, -}; diff --git a/cpu/br28/tools/app.bin b/cpu/br28/tools/app.bin index 800a9d7..919c915 100644 Binary files a/cpu/br28/tools/app.bin and b/cpu/br28/tools/app.bin differ diff --git a/cpu/br28/tools/data_code.bin b/cpu/br28/tools/data_code.bin index b2f4c26..690d10e 100644 Binary files a/cpu/br28/tools/data_code.bin and b/cpu/br28/tools/data_code.bin differ diff --git a/cpu/br28/tools/download/earphone/download.bat b/cpu/br28/tools/download/earphone/download.bat index d9517b2..fda6592 100644 --- a/cpu/br28/tools/download/earphone/download.bat +++ b/cpu/br28/tools/download/earphone/download.bat @@ -10,7 +10,7 @@ copy ..\..\ota.bin . copy ..\..\anc_coeff.bin . copy ..\..\anc_gains.bin . -..\..\isd_download.exe ..\..\isd_config.ini -tonorflash -dev br28 -boot 0x120000 -div8 -wait 300 -uboot ..\..\uboot.boot -app ..\..\app.bin -res ..\..\cfg_tool.bin tone.cfg p11_code.bin ..\..\eq_cfg_hw.bin -uboot_compress -format all +..\..\isd_download.exe ..\..\isd_config.ini -tonorflash -dev br28 -boot 0x120000 -div8 -wait 300 -uboot ..\..\uboot.boot -app ..\..\app.bin -res ..\..\cfg_tool.bin tone.cfg p11_code.bin ..\..\eq_cfg_hw.bin -uboot_compress -format all -key 646-AC690X-7603.key @REM..\..\isd_download.exe ..\..\isd_config.ini -tonorflash -dev br34 -boot 0x20000 -div8 -wait 300 -uboot ..\..\uboot.boot -app ..\..\app.bin ..\..\cfg_tool.bin -res tone.cfg kws_command.bin p11_code.bin -uboot_compress diff --git a/cpu/br28/tools/download/earphone/jl_isd.bin b/cpu/br28/tools/download/earphone/jl_isd.bin index 0bad19d..766b462 100644 Binary files a/cpu/br28/tools/download/earphone/jl_isd.bin and b/cpu/br28/tools/download/earphone/jl_isd.bin differ