diff --git a/apps/earphone/board/br28/board_jl701n_demo_cfg.h b/apps/earphone/board/br28/board_jl701n_demo_cfg.h index 81a8c2b..83461e0 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波特率:100k +#define TCFG_HW_I2C0_CLK 100000 //*********************************************************************************// // 硬件SPI 配置 // diff --git a/apps/earphone/remote_control/RFID/rfid_event.c b/apps/earphone/remote_control/RFID/rfid_event.c index 1e11dd0..48452ce 100644 --- a/apps/earphone/remote_control/RFID/rfid_event.c +++ b/apps/earphone/remote_control/RFID/rfid_event.c @@ -273,7 +273,7 @@ void rfid_task_fuc(void) first_init = 1; // rfid_hal_init(); - FM176XX_HardInit(); + // FM176XX_HardInit(); rfid_delay_ms(5); // 硬件初始化后增加一个短暂延时,确保芯片稳定 // 2. 复位 FM176XX 芯片 diff --git a/apps/earphone/remote_control/RFID/rfid_hal.c b/apps/earphone/remote_control/RFID/rfid_hal.c index b90f9c2..d225f39 100644 --- a/apps/earphone/remote_control/RFID/rfid_hal.c +++ b/apps/earphone/remote_control/RFID/rfid_hal.c @@ -77,7 +77,7 @@ unsigned char SetReg(unsigned char address, unsigned char reg_data){ * @return unsigned char */ unsigned char FM176XX_SoftReset(void){ - return (FM176_WRITE_ADDR,REG_COMMAND,0x1F); + return SetReg(REG_COMMAND, 0x1F); } #elif INTERFACE_TYPE == 1 //spi diff --git a/apps/earphone/xtell_Sensor/xtell_handler.c b/apps/earphone/xtell_Sensor/xtell_handler.c index bcb0a7f..15296c3 100644 --- a/apps/earphone/xtell_Sensor/xtell_handler.c +++ b/apps/earphone/xtell_Sensor/xtell_handler.c @@ -82,7 +82,7 @@ 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-22222"; +unsigned char xt_ble_new_name[9] = "CM-55555"; static u16 play_poweron_ok_timer_id = 0; // -- 初始化标志位 -- @@ -224,6 +224,7 @@ void le_user_app_event_handler(struct sys_event* event){ 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(); diff --git a/cpu/br28/tools/app.bin b/cpu/br28/tools/app.bin index 6e593eb..73c378f 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 859d325..6c7da96 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/jl_isd.bin b/cpu/br28/tools/download/earphone/jl_isd.bin index ecd810f..67ac779 100644 Binary files a/cpu/br28/tools/download/earphone/jl_isd.bin and b/cpu/br28/tools/download/earphone/jl_isd.bin differ diff --git a/cpu/br28/tools/sdk.elf.resolution.txt b/cpu/br28/tools/sdk.elf.resolution.txt index 577303e..4dec3e7 100644 --- a/cpu/br28/tools/sdk.elf.resolution.txt +++ b/cpu/br28/tools/sdk.elf.resolution.txt @@ -5927,7 +5927,6 @@ objs/apps/earphone/remote_control/RFID/rfid_event.c.o -r=objs/apps/earphone/remote_control/RFID/rfid_event.c.o,ReaderF_Initial,l -r=objs/apps/earphone/remote_control/RFID/rfid_event.c.o,ReaderF_Inventory,l -r=objs/apps/earphone/remote_control/RFID/rfid_event.c.o,rfid_task_fuc,pl --r=objs/apps/earphone/remote_control/RFID/rfid_event.c.o,FM176XX_HardInit,l -r=objs/apps/earphone/remote_control/RFID/rfid_event.c.o,rfid_delay_ms,l -r=objs/apps/earphone/remote_control/RFID/rfid_event.c.o,FM176XX_SoftReset,l -r=objs/apps/earphone/remote_control/RFID/rfid_event.c.o,GetReg,l