|
@@ -17,6 +17,8 @@
|
|
|
*/
|
|
*/
|
|
|
/* USER CODE END Header */
|
|
/* USER CODE END Header */
|
|
|
/* Includes ------------------------------------------------------------------*/
|
|
/* Includes ------------------------------------------------------------------*/
|
|
|
|
|
+#include <stdarg.h>
|
|
|
|
|
+#include <stdio.h>
|
|
|
#include "main.h"
|
|
#include "main.h"
|
|
|
#include "rtc.h"
|
|
#include "rtc.h"
|
|
|
#include "gpio.h"
|
|
#include "gpio.h"
|
|
@@ -112,15 +114,14 @@ int main(void)
|
|
|
W25qxx_WriteByte((recvSize >> 16) & 0xFF, EXT_FLASH_FW_SIZE_ADDR + 2); // 字节2
|
|
W25qxx_WriteByte((recvSize >> 16) & 0xFF, EXT_FLASH_FW_SIZE_ADDR + 2); // 字节2
|
|
|
W25qxx_WriteByte((recvSize >> 24) & 0xFF, EXT_FLASH_FW_SIZE_ADDR + 3); // 字节3
|
|
W25qxx_WriteByte((recvSize >> 24) & 0xFF, EXT_FLASH_FW_SIZE_ADDR + 3); // 字节3
|
|
|
|
|
|
|
|
-
|
|
|
|
|
- LL_USART_TransmitData8(COM_DBG, (recvSize >> 0) & 0xFF); //调试口发
|
|
|
|
|
|
|
+ /*LL_USART_TransmitData8(COM_DBG, (recvSize >> 0) & 0xFF); //调试口发
|
|
|
while (!LL_USART_IsActiveFlag_TC(COM_DBG));
|
|
while (!LL_USART_IsActiveFlag_TC(COM_DBG));
|
|
|
LL_USART_TransmitData8(COM_DBG, (recvSize >> 8) & 0xFF); //调试口发
|
|
LL_USART_TransmitData8(COM_DBG, (recvSize >> 8) & 0xFF); //调试口发
|
|
|
while (!LL_USART_IsActiveFlag_TC(COM_DBG));
|
|
while (!LL_USART_IsActiveFlag_TC(COM_DBG));
|
|
|
LL_USART_TransmitData8(COM_DBG, (recvSize >> 16) & 0xFF); //调试口发
|
|
LL_USART_TransmitData8(COM_DBG, (recvSize >> 16) & 0xFF); //调试口发
|
|
|
while (!LL_USART_IsActiveFlag_TC(COM_DBG));
|
|
while (!LL_USART_IsActiveFlag_TC(COM_DBG));
|
|
|
LL_USART_TransmitData8(COM_DBG, (recvSize >> 24) & 0xFF); //调试口发
|
|
LL_USART_TransmitData8(COM_DBG, (recvSize >> 24) & 0xFF); //调试口发
|
|
|
- while (!LL_USART_IsActiveFlag_TC(COM_DBG));
|
|
|
|
|
|
|
+ while (!LL_USART_IsActiveFlag_TC(COM_DBG));*/
|
|
|
//复位
|
|
//复位
|
|
|
HAL_NVIC_SystemReset();
|
|
HAL_NVIC_SystemReset();
|
|
|
}
|
|
}
|
|
@@ -141,8 +142,8 @@ int main(void)
|
|
|
{
|
|
{
|
|
|
/* USER CODE END WHILE */
|
|
/* USER CODE END WHILE */
|
|
|
#if dbg_ymodem==1
|
|
#if dbg_ymodem==1
|
|
|
- LL_USART_TransmitData8(COM_DBG, ret); //调试口发
|
|
|
|
|
- while (!LL_USART_IsActiveFlag_TC(COM_DBG));
|
|
|
|
|
|
|
+ /*LL_USART_TransmitData8(COM_DBG, ret); //调试口发
|
|
|
|
|
+ while (!LL_USART_IsActiveFlag_TC(COM_DBG));*/
|
|
|
HAL_Delay(1000);
|
|
HAL_Delay(1000);
|
|
|
#endif
|
|
#endif
|
|
|
/* USER CODE BEGIN 3 */
|
|
/* USER CODE BEGIN 3 */
|
|
@@ -233,3 +234,39 @@ void assert_failed(uint8_t *file, uint32_t line)
|
|
|
/* USER CODE END 6 */
|
|
/* USER CODE END 6 */
|
|
|
}
|
|
}
|
|
|
#endif /* USE_FULL_ASSERT */
|
|
#endif /* USE_FULL_ASSERT */
|
|
|
|
|
+
|
|
|
|
|
+void dbg_log(const char *fmt, ...)
|
|
|
|
|
+{
|
|
|
|
|
+#ifdef __DBG_LOG__
|
|
|
|
|
+
|
|
|
|
|
+ char buf[64];
|
|
|
|
|
+
|
|
|
|
|
+ va_list args;
|
|
|
|
|
+ va_start(args, fmt);
|
|
|
|
|
+ vsnprintf(buf, sizeof(buf), fmt, args);
|
|
|
|
|
+ va_end(args);
|
|
|
|
|
+
|
|
|
|
|
+ // ⭐1:等待UART完全空闲(防STOP唤醒残留)
|
|
|
|
|
+ while (!LL_USART_IsActiveFlag_TC(COM_DBG));
|
|
|
|
|
+
|
|
|
|
|
+ for (char *p = buf; *p; p++)
|
|
|
|
|
+ {
|
|
|
|
|
+ while (!LL_USART_IsActiveFlag_TXE(COM_DBG));
|
|
|
|
|
+ LL_USART_TransmitData8(COM_DBG, *p);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // ⭐2:整帧发送完成(防止0x43 E1这种错位)
|
|
|
|
|
+ while (!LL_USART_IsActiveFlag_TC(COM_DBG));
|
|
|
|
|
+
|
|
|
|
|
+ // 发送换行
|
|
|
|
|
+ while (!LL_USART_IsActiveFlag_TXE(COM_DBG));
|
|
|
|
|
+ LL_USART_TransmitData8(COM_DBG, '\r');
|
|
|
|
|
+
|
|
|
|
|
+ while (!LL_USART_IsActiveFlag_TXE(COM_DBG));
|
|
|
|
|
+ LL_USART_TransmitData8(COM_DBG, '\n');
|
|
|
|
|
+
|
|
|
|
|
+ // ⭐3:再等一次收尾
|
|
|
|
|
+ while (!LL_USART_IsActiveFlag_TC(COM_DBG));
|
|
|
|
|
+
|
|
|
|
|
+#endif
|
|
|
|
|
+}
|