diff --git a/User_Code/bsp/dmaMalloc/bsp_dmaMalloc.c b/User_Code/bsp/dmaMalloc/bsp_dmaMalloc.c index 6036ede..a869b2c 100644 --- a/User_Code/bsp/dmaMalloc/bsp_dmaMalloc.c +++ b/User_Code/bsp/dmaMalloc/bsp_dmaMalloc.c @@ -2,4 +2,4 @@ // Created by tuxmonkey on 2025/10/28. // -#include "bsp_dmaMalloc.h" \ No newline at end of file +#include "bsp_dmaMalloc.h" diff --git a/User_Code/module/periph/power_meters/xiditech/xidipwmeter.c b/User_Code/module/periph/power_meters/xiditech/xidipwmeter.c index 53ca7d6..541e185 100644 --- a/User_Code/module/periph/power_meters/xiditech/xidipwmeter.c +++ b/User_Code/module/periph/power_meters/xiditech/xidipwmeter.c @@ -5,6 +5,8 @@ #include #include +#include "daemon.h" + static PowerMeterInstance *power_meter_instance = NULL; /** @@ -84,7 +86,7 @@ PowerMeterInstance *PowerMeterInit(FDCAN_HandleTypeDef *can_handle) } memset(power_meter_instance, 0, sizeof(PowerMeterInstance)); - // 配置FDCAN初始化参数 - 完全适配您的FDCAN驱动 + // 配置功率计初始化参数 FDCAN_Init_Config_s can_config = { .can_handle = can_handle, .rx_id = 0x213, // 功率计反馈标识符 @@ -93,7 +95,7 @@ PowerMeterInstance *PowerMeterInit(FDCAN_HandleTypeDef *can_handle) .id = power_meter_instance, // 将实例指针作为ID传递 }; - // 注册FDCAN实例 - 使用FDCANRegister函数 + // 注册FDCAN实例 power_meter_instance->can_instance = CANRegister(&can_config); if (power_meter_instance->can_instance == NULL) { @@ -102,13 +104,13 @@ PowerMeterInstance *PowerMeterInit(FDCAN_HandleTypeDef *can_handle) return NULL; } - // 注册守护进程 - // Daemon_Init_Config_s daemon_config = { - // .callback = PowerMeterLostCallback, - // .owner_id = power_meter_instance, - // .reload_count = 5, // 50ms未收到数据则认为丢失 (1000Hz发送,5个周期) - // }; - // power_meter_instance->daemon = DaemonRegister(&daemon_config); + //注册守护进程 + Daemon_Init_Config_s daemon_config = { + .callback = PowerMeterLostCallback, + .owner_id = power_meter_instance, + .reload_count = 5, // 50ms未收到数据则认为丢失 (1000Hz发送,5个周期) + }; + power_meter_instance->daemon = DaemonRegister(&daemon_config); return power_meter_instance; } diff --git a/User_Code/module/periph/power_meters/xiditech/xidipwmeter.h b/User_Code/module/periph/power_meters/xiditech/xidipwmeter.h index b0bfaeb..93f7ee0 100644 --- a/User_Code/module/periph/power_meters/xiditech/xidipwmeter.h +++ b/User_Code/module/periph/power_meters/xiditech/xidipwmeter.h @@ -5,9 +5,10 @@ #ifndef TRONONEH7_SCAFFOLD_XIDIPWMETER_H #define TRONONEH7_SCAFFOLD_XIDIPWMETER_H -#include "general_def.h" #include "bsp_dwt.h" #include "bsp_fdcan.h" +#include "daemon.h" +#include "general_def.h" /* 功率计测量数据结构 */ typedef struct @@ -25,7 +26,7 @@ typedef struct { FDCANInstance *can_instance; // FDCAN实例指针 PowerMeter_Measure_s measure; // 测量数据 - // DaemonInstance *daemon; // 守护进程 + Daemon_Instance *daemon; // 守护进程 uint32_t feed_cnt; // 喂狗计数器 } PowerMeterInstance;