From e445da8862bb20b0ca252148b2d5013f369221e4 Mon Sep 17 00:00:00 2001 From: ahu_gq Date: Wed, 23 Apr 2025 22:08:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B3=A2=E7=89=B9=E7=8E=87?= =?UTF-8?q?=EF=BC=8C=E9=98=B2=E6=AD=A2=E6=B3=A2=E7=89=B9=E7=8E=87=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=9A=84wifi=E6=97=A0=E6=B3=95=E5=AF=B9=E8=AF=9D?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3soc=E6=8E=89=E7=94=B5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/stm32fxxx_app/app/eeprom_manager.c | 8 +++---- app/stm32fxxx_app/prj/BCU_APP.uvprojx | 29 +++++++------------------- library/drv_peripheral/drv_qfc41d.c | 4 +++- 3 files changed, 15 insertions(+), 26 deletions(-) diff --git a/app/stm32fxxx_app/app/eeprom_manager.c b/app/stm32fxxx_app/app/eeprom_manager.c index d1fb601..051f5e6 100644 --- a/app/stm32fxxx_app/app/eeprom_manager.c +++ b/app/stm32fxxx_app/app/eeprom_manager.c @@ -875,10 +875,10 @@ static const EepromDataFormat data_format[kEEDataIdx_End] = STATIC_UNCHECK_MAX_MIN, 0x0000, 0x0000, 0xFFFF, //预留10 //eeeprom //soc - STATIC_CHECK, 0, 0, 1, //电池循环次数更新标志 - STATIC_CHECK, 0, 0x0000, 0xFFFF, //电池循环次数 - STATIC_CHECK, 5000, 0, 10000, //SOC - STATIC_CHECK, 5000, 0, 10000, //SOE + DAYNMIC_CHECK, 0, 0, 1, //电池循环次数更新标志 + DAYNMIC_CHECK, 0, 0x0000, 0xFFFF, //电池循环次数 + DAYNMIC_CHECK, 5000, 0, 10000, //SOC + DAYNMIC_CHECK, 5000, 0, 10000, //SOE DAYNMIC_UNCHECK_MAX_MIN, 0x0000, 0x0000, 0xFFFF, //日充放电累计时间 DAYNMIC_UNCHECK_MAX_MIN, 0x0000, 0x0000, 0xFFFF, diff --git a/app/stm32fxxx_app/prj/BCU_APP.uvprojx b/app/stm32fxxx_app/prj/BCU_APP.uvprojx index fb592cf..e994ce7 100644 --- a/app/stm32fxxx_app/prj/BCU_APP.uvprojx +++ b/app/stm32fxxx_app/prj/BCU_APP.uvprojx @@ -10,14 +10,14 @@ stm32f407 0x4 ARM-ADS - 5060960::V5.06 update 7 (build 960)::.\ARMCC - 5060960::V5.06 update 7 (build 960)::.\ARMCC + 5060750::V5.06 update 6 (build 750)::ARMCC + 5060750::V5.06 update 6 (build 750)::ARMCC 0 STM32F407ZGTx STMicroelectronics - Keil.STM32F4xx_DFP.2.16.0 + Keil.STM32F4xx_DFP.2.14.0 http://www.keil.com/pack/ IRAM(0x20000000,0x00020000) IRAM2(0x10000000,0x00010000) IROM(0x08000000,0x00100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE @@ -186,8 +186,6 @@ 0 2 0 - 0 - 0 1 0 8 @@ -354,7 +352,7 @@ 0 0 0 - 4 + 0 @@ -473,7 +471,7 @@ 2 2 2 - 0 + 2 @@ -882,7 +880,7 @@ 2 2 2 - 0 + 2 @@ -1068,7 +1066,7 @@ STM32F407VGTx STMicroelectronics - Keil.STM32F4xx_DFP.2.16.0 + Keil.STM32F4xx_DFP.2.14.0 http://www.keil.com/pack/ IRAM(0x20000000,0x00020000) IRAM2(0x10000000,0x00010000) IROM(0x08000000,0x00100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE @@ -1237,8 +1235,6 @@ 0 2 0 - 0 - 0 1 0 8 @@ -1405,7 +1401,7 @@ 0 0 0 - 4 + 0 @@ -1985,13 +1981,4 @@ - - - - BCU_APP - 1 - - - - diff --git a/library/drv_peripheral/drv_qfc41d.c b/library/drv_peripheral/drv_qfc41d.c index 8f92bae..24c2b88 100644 --- a/library/drv_peripheral/drv_qfc41d.c +++ b/library/drv_peripheral/drv_qfc41d.c @@ -87,11 +87,13 @@ int drv_at_send_cmd(const char *cmd, const char *response, uint32_t timeout) static uint8_t drv_wifi_init() { // 1. ÉèÖÃÄ£×é²¨ÌØÂÊ + /* if (!drv_at_send_cmd(QFC41D_SET_BATE, "OK", WIFI_TIMEOUT)) { KIT_PRINTF("WiFi Module not responding!\r\n"); return 1 ; } + */ // 2. ²âÊÔ AT Ö¸Áî if (!drv_at_send_cmd("AT", "OK", WIFI_TIMEOUT)) @@ -187,7 +189,7 @@ static uint8_t drv_ble_init() uint8_t drv_qfc41d_init(void) { //³õʼ»¯´®¿Ú - drv_uart_init((UartDev)qfc41dItem.dev, 115200, 0 | UART_CFG_STOP_BIT_1, kGpioType_WIRELESSUart_Tx, kGpioType_WIRELESSUart_Rx); + drv_uart_init((UartDev)qfc41dItem.dev, 9600, 0 | UART_CFG_STOP_BIT_1, kGpioType_WIRELESSUart_Tx, kGpioType_WIRELESSUart_Rx); USART2->CR1 = USART_CR1_TE | USART_CR1_RE | USART_CR1_RXNEIE | USART_CR1_UE; //ÉèÖýÓÊջص÷º¯Êý