Skip to content

Commit ae5b347

Browse files
author
root
committed
20250811 ver2:修复一些数据结构成员缺失
1 parent 7348368 commit ae5b347

File tree

2 files changed

+20
-10
lines changed

2 files changed

+20
-10
lines changed

components/PowerModule/inc/power_rounter.h

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,19 @@ typedef struct __GunData
4343

4444
typedef struct __GunNode
4545
{
46-
rt_list_t list;
47-
struct Gun_fops gun_node_fops;
46+
rt_list_t list; //枪终端节点列表
47+
rt_list_t assigned_pm_list; //枪终端节点关联的功率节点列表
48+
49+
struct Gun_fops gun_node_fops; //枪操作API函数集
4850
uint8_t id; // 枪节点ID
4951

50-
Gun_AttributeData gun_node_data;
52+
53+
Gun_AttributeData gun_node_data; //枪节点数据
54+
55+
5156
uint8_t is_connected;
57+
rt_uint16_t assigned_pm_count;
58+
rt_uint32_t required_power;
5259
}Class_GunNode;
5360

5461

components/PowerModule/src/power_rounter.c

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#include "power_rounter.h"
2+
3+
14
/**
25
* @brief 将功率模块分配给枪节点
36
*
@@ -206,7 +209,7 @@ Class_GunNode* create_gun_node(Class_RounterAgent *router, uint8_t id)
206209
rt_list_init(&gun->list);
207210

208211
// 初始化分配的功率模块列表
209-
rt_list_init(&gun->assigned_pm_list);
212+
rt_list_init(&gun->assigned_pm_list); //枪节点关联分配的功率节点
210213
gun->assigned_pm_count = 0;
211214

212215
// 设置ID和其他属性
@@ -216,10 +219,10 @@ Class_GunNode* create_gun_node(Class_RounterAgent *router, uint8_t id)
216219

217220
// 初始化函数指针(可选)
218221
gun->gun_node_fops.init_gun_node = init_gun_node;
219-
gun->gun_node_fops.control_pm = control_gun_node;
222+
gun->gun_node_fops.control_gun = control_gun_node;
220223

221224
// 添加到路由器的gun链表中
222-
rt_list_insert_after(&router->gun_list, &gun->list);
225+
rt_list_insert_after(&router->gun_list, &gun->list); //枪节点加入枪列表
223226

224227
// 增加计数器
225228
router->gun_count++;
@@ -326,10 +329,10 @@ Class_PmNode* create_pm_node(Class_RounterAgent *router, uint8_t id)
326329
pm->assigned_gun = RT_NULL;
327330

328331
// 初始化函数指针(可选)
329-
pm->pm_fops.init_pm_node = RT_NULL;
330-
pm->pm_fops.control_pm = RT_NULL;
331-
pm->pm_fops.read_pm_state_info = RT_NULL;
332-
pm->pm_fops.write_pm_state_info = RT_NULL;
332+
pm->pm_fops.init_pm_node = init_Pm_node;
333+
pm->pm_fops.control_pm = control_pm_node;
334+
pm->pm_fops.read_pm_state_info = read_pm_state_info;
335+
pm->pm_fops.write_pm_state_info = write_pm_state_info;
333336

334337
// 添加到路由器的pm链表中
335338
rt_list_insert_after(&router->pm_list, &pm->list);

0 commit comments

Comments
 (0)