edison/433_STM32
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决编译错误

Browse Source
This commit is contained in:
zhongxuanzhen
2026-05-08 16:14:00 +08:00
parent 878379f101
commit 6c56fe8a60
7 changed files with 32 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
Core/Src/debug_log.c
View File

@ -112,146 +112,6 @@ void DebugLog_EnableModule(const char *module, bool enable)
}
}
void DebugLog_Output(log_level_t level, const char *module, const char *fmt, ...)
{
if (level < g_current_level) {
return;
}
if (!is_module_enabled(module)) {
return;
}
char buffer[256];
int len = 0;
len += snprintf(buffer + len, sizeof(buffer) - len, "[%s][%s] ",
g_level_str[level], module ? module : "MAIN");
if (len < (int)sizeof(buffer) - 1) {
va_list args;
va_start(args, fmt);
len += vsnprintf(buffer + len, sizeof(buffer) - len, fmt, args);
va_end(args);
}
if (len > 0 && len < (int)sizeof(buffer)) {
buffer[len++] = '\r';
if (len < (int)sizeof(buffer)) {
/**
******************************************************************************
* @file debug_log.c
* @brief 增强型调试日志系统实现
* @author Application Layer
* @version 1.0
******************************************************************************
* @attention
* 本模块实现增强型调试日志系统
* 设计依据：多通信接口统一指令处理系统开发计划 第3.4节
*
* 日志格式：[LEVEL][MODULE] message
* 示例：[INFO][CMD] Command received: RL
******************************************************************************
*/
#include "debug_log.h"
#include "uart2_print.h"
#include <stdarg.h>
#include <string.h>
#include <stdio.h>
#include "multi_uart_router.h"
#define MAX_MODULES 16
#define MODULE_NAME_LEN 16
typedef struct {
char name[MODULE_NAME_LEN];
bool enabled;
} module_config_t;
static log_level_t g_current_level = LOG_LEVEL_DEBUG;
static module_config_t g_modules[MAX_MODULES];
static bool g_modules_initialized = false;
static const char *const g_level_str[] = {
[LOG_LEVEL_DEBUG] = "DEBUG",
[LOG_LEVEL_INFO] = "INFO ",
[LOG_LEVEL_WARN] = "WARN ",
[LOG_LEVEL_ERROR] = "ERROR",
};
static void init_modules(void)
{
if (g_modules_initialized) {
return;
}
for (int i = 0; i < MAX_MODULES; i++) {
g_modules[i].name[0] = '\0';
g_modules[i].enabled = false;
}
g_modules_initialized = true;
}
static bool is_module_enabled(const char *module)
{
if (module == NULL || module[0] == '\0') {
return true;
}
init_modules();
for (int i = 0; i < MAX_MODULES; i++) {
if (g_modules[i].name[0] != '\0' &&
strncmp(g_modules[i].name, module, MODULE_NAME_LEN - 1) == 0) {
return g_modules[i].enabled;
}
}
return true;
}
void DebugLog_Init(void)
{
g_current_level = LOG_LEVEL_DEBUG;
init_modules();
UART2_Print_String("[LOG] Debug log system initialized\r\n");
}
void DebugLog_SetLevel(log_level_t level)
{
g_current_level = level;
}
log_level_t DebugLog_GetLevel(void)
{
return g_current_level;
}
void DebugLog_EnableModule(const char *module, bool enable)
{
if (module == NULL || module[0] == '\0') {
return;
}
init_modules();
for (int i = 0; i < MAX_MODULES; i++) {
if (g_modules[i].name[0] == '\0') {
strncpy(g_modules[i].name, module, MODULE_NAME_LEN - 1);
g_modules[i].name[MODULE_NAME_LEN - 1] = '\0';
g_modules[i].enabled = enable;
return;
}
if (strncmp(g_modules[i].name, module, MODULE_NAME_LEN - 1) == 0) {
g_modules[i].enabled = enable;
return;
}
}
}
void DebugLog_Output(log_level_t level, const char *module, const char *fmt, ...)
{
if (level < g_current_level) {

1
Core/Src/main.c
View File

@ -396,6 +396,7 @@ int main(void)
/* USER CODE END WHILE */
}
}
/* USER CODE END 3 */
/**
* @brief System Clock Configuration

2
Core/Src/multi_uart_router.c
View File

@ -681,7 +681,7 @@ bool MultiUART_IsBusy(uint8_t port_id)
if (port_id >= PORT_COUNT) return false;
// 调试串口特殊处理
if (port_id == PORT_UART2) {
if (port_id == PORT_DEBUG) {
// UART2_Print 使用单独的标志位，这里简单兼容
return false;
}

6
Core/Src/uart2_print.c
View File

@ -462,7 +462,7 @@ int fputc(int ch, FILE *f)
{
(void)f;
UART2_Print_Send((uint8_t *)&ch, 1);
MultiUART_Send(PORT_UART3, (uint8_t *)&ch, 1); /* 增加：同时发给 UART3 */
MultiUART_Send(PORT_RS485, (uint8_t *)&ch, 1); /* 增加：同时发给 UART3 */
return ch;
}
#endif
@ -471,7 +471,7 @@ int fputc(int ch, FILE *f)
int __io_putchar(int ch)
{
UART2_Print_Send((uint8_t *)&ch, 1);
MultiUART_Send(PORT_UART3, (uint8_t *)&ch, 1); /* 增加：同时发给 UART3 */
MultiUART_Send(PORT_RS485, (uint8_t *)&ch, 1); /* 增加：同时发给 UART3 */
return ch;
}
@ -479,7 +479,7 @@ int _write(int file, char *ptr, int len)
{
(void)file;
UART2_Print_Send((uint8_t *)ptr, len);
MultiUART_Send(PORT_UART3, (uint8_t *)ptr, len); /* 增加：同时发给 UART3 */
MultiUART_Send(PORT_RS485, (uint8_t *)ptr, len); /* 增加：同时发给 UART3 */
return len;
}
#endif

4
Core/Src/uart3_passthrough.c
View File

@ -208,7 +208,7 @@ void Passthrough_Task(void)
}
uint8_t byte = node->data[node->offset++];
MultiUART_Send(PORT_UART1, &byte, 1);
MultiUART_Send(PORT_433, &byte, 1);
ctx->queue.pending_count--;
ctx->stats.total_bytes_sent++;
@ -232,7 +232,7 @@ void Passthrough_OnTxComplete(void)
*/
bool Passthrough_CanSend(void)
{
return (MultiUART_GetTxAvailable(PORT_UART1) > 0) &&
return (MultiUART_GetTxAvailable(PORT_433) > 0) &&
(g_passthrough_ctx.queue.pending_count > 0);
}