diff --git a/apps/common/ctlv b/apps/common/ctlv index 5fddd9a5b4e5ed65a00866c2d7eb7e9ef808cf94..0d2f563a79954a586aae64a645b4d9b544dd08b2 160000 --- a/apps/common/ctlv +++ b/apps/common/ctlv @@ -1 +1 @@ -Subproject commit 5fddd9a5b4e5ed65a00866c2d7eb7e9ef808cf94 +Subproject commit 0d2f563a79954a586aae64a645b4d9b544dd08b2 diff --git a/apps/spp_and_le/app_main.c b/apps/spp_and_le/app_main.c index eca461f8de94b9ded3d334e1fa18a05d1a4ddc27..8b9688b4cce900370ccfb9fba49f83848ed78e12 100644 --- a/apps/spp_and_le/app_main.c +++ b/apps/spp_and_le/app_main.c @@ -14,7 +14,11 @@ #include "app_charge.h" #include "app_power_manage.h" #include "asm/charge.h" -#include "app_quectel.h" +#include "serial.h" +#include "asm/gpio.h" +#include "thread.h" +#include "timer.h" + #if TCFG_KWS_VOICE_RECOGNITION_ENABLE #include "jl_kws/jl_kws_api.h" @@ -112,8 +116,39 @@ void check_power_on_key(void) } +static void start_feed_dog_thread_worker(void *pdata) { + // 初始化喂狗GPIO + gpio_set_pull_up(IO_PORTA_09, 1); + gpio_set_pull_down(IO_PORTA_09, 0); + gpio_set_direction(IO_PORTA_09, 0); + int rv; + while (1) + { + // printf("feed dog...\n"); + gpio_set_output_value(IO_PORTA_09, 0); + timer_msleep(50); // 0.5s + gpio_set_output_value(IO_PORTA_09, 1); + timer_msleep(100); // 1s + } +} + + + void app_main() { + uart_cfg_t uart_cfg = { + .baud_rate = 115200, + .word_length = UART_WORDLENGTH_8, + .stop_bits = 1, + .parity = UART_PARITY_NO, + .mode = UART_MODE_RX_TX, + .hardware_flowcontrol = UART_HWFC_None, + .rx_buffer_size = 1024 + }; + tlv_bool_t res; + res = serial_init(UART_PORT1, &uart_cfg); + printf(">>> uart init res: %d\n", res); + struct intent it; if (!UPDATE_SUPPORT_DEV_IS_NULL()) { @@ -123,7 +158,9 @@ void app_main() printf(">>>>>>>>>>>>>>>>>app_main...\n"); printf(">>> v220,2022-11-23 >>>\n"); - example_lte(NULL); + if(thread_init(start_feed_dog_thread_worker, NULL, 10, 1024) == 0) { + printf("start_feed_dog_thread_worker failed\n"); + } if (get_charge_online_flag()) { #if(TCFG_SYS_LVD_EN == 1) diff --git a/apps/spp_and_le/board/bd19/board_ac6328a_demo_cfg.h b/apps/spp_and_le/board/bd19/board_ac6328a_demo_cfg.h index 443c9c410af25887239c248ea6d4fbee2f2f62f7..95fab0a21cd460cebe4f883207d4616e323327a2 100644 --- a/apps/spp_and_le/board/bd19/board_ac6328a_demo_cfg.h +++ b/apps/spp_and_le/board/bd19/board_ac6328a_demo_cfg.h @@ -21,7 +21,7 @@ //*********************************************************************************// // UART配置 // //*********************************************************************************// -#define TCFG_UART0_ENABLE ENABLE_THIS_MOUDLE //串口打印模块使能 +#define TCFG_UART0_ENABLE DISABLE_THIS_MOUDLE //串口打印模块使能 #define TCFG_UART0_RX_PORT NO_CONFIG_PORT //串口接收脚配置（用于打印可以选择NO_CONFIG_PORT） #define TCFG_UART0_TX_PORT IO_PORT_DP //串口发送脚配置 #define TCFG_UART0_BAUDRATE 1000000 //串口波特率配置 diff --git a/apps/spp_and_le/board/bd19/board_config.h b/apps/spp_and_le/board/bd19/board_config.h index 9b3ddcc56a50950effb76c7894ceacab7ba12b0b..5bd1e24f5dd9fafd7e46a8462c17e2236bcf1ed0 100644 --- a/apps/spp_and_le/board/bd19/board_config.h +++ b/apps/spp_and_le/board/bd19/board_config.h @@ -5,10 +5,10 @@ * 板级配置选择 */ -#define CONFIG_BOARD_AC632N_DEMO +// #define CONFIG_BOARD_AC632N_DEMO // #define CONFIG_BOARD_AC6321A_DEMO // #define CONFIG_BOARD_AC6323A_DEMO -// #define CONFIG_BOARD_AC6328A_DEMO +#define CONFIG_BOARD_AC6328A_DEMO // #define CONFIG_BOARD_AC6328B_DONGLE // #define CONFIG_BOARD_AC6329B_DEMO // #define CONFIG_BOARD_AC6329C_DEMO diff --git a/apps/spp_and_le/board/br25/........cpubr25toolsdownload.bat b/apps/spp_and_le/board/br25/........cpubr25toolsdownload.bat new file mode 100644 index 0000000000000000000000000000000000000000..0b8a22111162761f82f28f78c5a23f316c152385 --- /dev/null +++ b/apps/spp_and_le/board/br25/........cpubr25toolsdownload.bat @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +rem @echo off + +@echo ***************************************************************** +@echo SDK BR25 +@echo ***************************************************************** +@echo %date% + +cd %~dp0 + + +set OBJDUMP=C:\JL\pi32\bin\llvm-objdump.exe +set OBJCOPY=C:\JL\pi32\bin\llvm-objcopy.exe +set ELFFILE=sdk.elf + +REM %OBJDUMP% -D -address-mask=0x1ffffff -print-dbg $1.elf > $1.lst +%OBJCOPY% -O binary -j .text %ELFFILE% text.bin +%OBJCOPY% -O binary -j .data %ELFFILE% data.bin +%OBJCOPY% -O binary -j .data_code %ELFFILE% data_code.bin + + +%OBJCOPY% -O binary -j .overlay_aec %ELFFILE% aeco.bin +%OBJCOPY% -O binary -j .overlay_wav %ELFFILE% wavo.bin +%OBJCOPY% -O binary -j .overlay_ape %ELFFILE% apeo.bin +%OBJCOPY% -O binary -j .overlay_flac %ELFFILE% flaco.bin +%OBJCOPY% -O binary -j .overlay_m4a %ELFFILE% m4ao.bin +%OBJCOPY% -O binary -j .overlay_amr %ELFFILE% amro.bin +%OBJCOPY% -O binary -j .overlay_dts %ELFFILE% dtso.bin +%OBJCOPY% -O binary -j .overlay_fm %ELFFILE% fmo.bin +%OBJCOPY% -O binary -j .overlay_mp3 %ELFFILE% mp3o.bin +%OBJCOPY% -O binary -j .overlay_wma %ELFFILE% wmao.bin + + +remove_tailing_zeros -i aeco.bin -o aec.bin -mark ff +remove_tailing_zeros -i wavo.bin -o wav.bin -mark ff +remove_tailing_zeros -i apeo.bin -o ape.bin -mark ff +remove_tailing_zeros -i flaco.bin -o flac.bin -mark ff +remove_tailing_zeros -i m4ao.bin -o m4a.bin -mark ff +remove_tailing_zeros -i amro.bin -o amr.bin -mark ff +remove_tailing_zeros -i dtso.bin -o dts.bin -mark ff +remove_tailing_zeros -i fmo.bin -o fm.bin -mark ff +remove_tailing_zeros -i mp3o.bin -o mp3.bin -mark ff +remove_tailing_zeros -i wmao.bin -o wma.bin -mark ff + +bankfiles= +for /L %%i in (0,1,20) do ( + %OBJCOPY% -O binary -j .overlay_bank%%i %INELF% bank%%i.bin + set bankfiles=!bankfiles! bank%%i.bin 0x0 +) + +echo %bank_files +%LZ4_PACKET% -dict text.bin -input common.bin 0 %bankfiles% -o bank.bin + +%OBJDUMP% -section-headers -address-mask=0x1ffffff %ELFFILE% +%OBJDUMP% -t %ELFFILE% > symbol_tbl.txt + +copy /b text.bin+data.bin+data_code.bin+aec.bin+wav.bin+ape.bin+flac.bin+m4a.bin+amr.bin+dts.bin+fm.bin+mp3.bin+wma.bin+bank.bin app.bin +call download/data_trans/download.bat diff --git a/apps/spp_and_le/examples/trans_data/ble_trans.c b/apps/spp_and_le/examples/trans_data/ble_trans.c index c24c12bc73d1fb6f8aca5758fde947f5e6c3b14c..ba0574316767018ceb20d956500ed1d1668ab841 100644 --- a/apps/spp_and_le/examples/trans_data/ble_trans.c +++ b/apps/spp_and_le/examples/trans_data/ble_trans.c @@ -32,6 +32,7 @@ #include "gatt_common/le_gatt_common.h" #include "ble_trans.h" #include "ble_trans_profile.h" +#include "serial.h" #if CONFIG_APP_SPP_LE @@ -572,6 +573,7 @@ static int trans_att_write_callback(hci_con_handle_t connection_handle, uint16_t log_info("\n-ae01_rx(%d):", buffer_size); put_buf(buffer, buffer_size); + serial_write(UART_PORT1, buffer, buffer_size); //收发测试，自动发送收到的数据;for test if (ble_comm_att_check_send(connection_handle, buffer_size) && diff --git a/cpu/bd19/tools/download.bat b/cpu/bd19/tools/download.bat new file mode 100644 index 0000000000000000000000000000000000000000..2844a2021cbeb337a2a14e4966e7482e56c1525c --- /dev/null +++ b/cpu/bd19/tools/download.bat @@ -0,0 +1,2736 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +rem @echo off + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@echo ********************************************************************* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@echo AC632N SDK + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@echo ********************************************************************* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@echo %date% + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +cd /d %~dp0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +set OBJDUMP=C:\JL\pi32\bin\llvm-objdump.exe + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +set OBJCOPY=C:\JL\pi32\bin\llvm-objcopy.exe + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +set INELF=sdk.elf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +set LZ4_PACKET=lz4_packet.exe + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +::@echo on + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +if exist sdk.elf ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +%OBJDUMP% -D -address-mask=0x1ffffff -print-dbg %INELF% > sdk.lst + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +%OBJCOPY% -O binary -j .text %INELF% text.bin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +%OBJCOPY% -O binary -j .data %INELF% data.bin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +%OBJCOPY% -O binary -j .data_code %INELF% data_code.bin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +%OBJCOPY% -O binary -j .overlay_aec %INELF% aec.bin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +%OBJCOPY% -O binary -j .overlay_aac %INELF% aac.bin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +%OBJCOPY% -O binary -j .overlay_aptx %INELF% aptx.bin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +%OBJCOPY% -O binary -j .common %INELF% common.bin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +bankfiles= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +for /L %%i in (0,1,20) do ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %OBJCOPY% -O binary -j .overlay_bank%%i %INELF% bank%%i.bin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + set bankfiles=!bankfiles! bank%%i.bin 0x0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +echo %bank_files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +%LZ4_PACKET% -dict text.bin -input common.bin 0 %bankfiles% -o bank.bin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +%OBJDUMP% -section-headers -address-mask=0x1ffffff %INELF% + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +%OBJSIZEDUMP% -lite -skip-zero -enable-dbg-info %INELF% > symbol_tbl.txt + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +copy /b text.bin+data.bin+data_code.bin+aec.bin+aac.bin+bank.bin+aptx.bin app.bin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +del bank*.bin common.bin text.bin data.bin bank.bin aac.bin aec.bin aptx.bin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +call download/data_trans/download.bat + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cpu/br25/tools/isd_config.ini b/cpu/br25/tools/isd_config.ini new file mode 100644 index 0000000000000000000000000000000000000000..53230cbd39c2276d0a29a3438333ff7a18826367 --- /dev/null +++ b/cpu/br25/tools/isd_config.ini @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + +[EXTRA_CFG_PARAM] +NEW_FLASH_FS = YES; + + + + + + +CHIP_NAME = AC636N; +PID = AC636N; +VID = 0.01; +ENTRY = 0x1e00120; + +RESERVED_OPT = 0; + +DOWNLOAD_MODEL = USB; +[CHIP_VERSION] +SUPPORTED_LIST = B, C, D, E, F, G; + +[SYS_CFG_PARAM] +SPI = 2_3_0_0; + + + + + + +UTTX = PA05; +UTBD = 1000000; + + +UTRX = PB05; + +RESET = PB01_08_0; + + + + + + +UPDATE_JUMP = 0; +EOFFSET = 0; +[RESERVED_CONFIG] +BTIF_ADR = AUTO; +BTIF_LEN = 0x1000; +BTIF_OPT = 1; +PRCT_ADR = 0; +PRCT_LEN = CODE_LEN; +PRCT_OPT = 2; + + + +VM_ADR = 0; +VM_LEN = 8K; +VM_OPT = 1; +[BURNER_CONFIG] +SIZE = 32; + +[TOOL_CONFIG] +1TO2_MIN_VER = 2.26.1; + +1TO8_MIN_VER = 3.1.8;