wxsmart
/
controller-hd
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update C_Cpp_Runner includeSearch settings 

Update mode_pwmp_hd_init function signature
This commit is contained in:
许晟昊 2024-01-26 15:27:37 +08:00
parent 3b35db3b48
commit 16d886578a
8 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.vscode/settings.json vendored
View File

@ -38,7 +38,10 @@
"C_Cpp_Runner.compilerArgs": [],
"C_Cpp_Runner.linkerArgs": [],
"C_Cpp_Runner.includePaths": [],
"C_Cpp_Runner.includeSearch": ["*", "**/*"],
"C_Cpp_Runner.includeSearch": [
"*",
"**/*"
],
"C_Cpp_Runner.excludeSearch": [
"**/build",
"**/build/**",

BIN
MDK-ARM/controller-v2/controller-v2.4
View File

Binary file not shown.

2
User/application/inc/mode_pwmp_hd.h
View File

@ -252,7 +252,7 @@ typedef struct
} execute_rsp_hd_t;
/////////////////////////////////////////*控制算法END*////////////////////////////////////////
void mode_pwmp_hd_init(uint16_t valve_style, mode_pwmp_hd_params_u *params, void (*params_save_cb)(void));
void mode_pwmp_hd_init(uint16_t positioner_model, mode_pwmp_hd_params_u *params, void (*params_save_cb)(void));
void mode_pwmp_hd_dinit(void);
void mode_pwmp_hd_process(void);
void pwmp_hd_process_state_set(mode_pwmp_hd_process_state_e state);

8
User/application/inc/params.h
View File

@ -41,10 +41,10 @@ typedef enum
typedef enum
{
VALVE_GPS1000 = 1000,
VALVE_GPS3000 = 3000,
VALVE_GPS5000 = 5000,
} valve_style_e; ///< 阀门型号
POSITIONER_MODEL_GPS1000 = 1000,
POSITIONER_MODEL_GPS3000 = 3000, // 自制IP+放大器
POSITIONER_MODEL_GPS5000 = 5000,
} positioner_model_e; ///< 定位器型号
// 定位器工作模式
#define ON_LINE_MODE 0 ///< 在线模式（根据4~20ma控制阀位）,自动模式

2
User/application/src/mode.c
View File

@ -436,7 +436,7 @@ void mode_init(void)
else if (uDevice.SpecControlOutputMode == PDCTRL_PWMP_HD)
{
pdctrl_init(PDCTRL_PWMP_HD);
mode_pwmp_hd_init(uDevice.ValveStyle, &mode_params.mode_pwmp_hd_params, mode_params_save_cb);
mode_pwmp_hd_init(uDevice.positioner_model, &mode_params.mode_pwmp_hd_params, mode_params_save_cb);
}
else
{

2
User/application/src/mode_pwmp_hd.c
View File

@ -1269,7 +1269,7 @@ void mode_pwmp_hd_process(void)
//////////////////////////////*入口END*//////////////////////////////////////////////////////
/*程序初始化*/
void mode_pwmp_hd_init(uint16_t valve_style, mode_pwmp_hd_params_u *params, void (*params_save_cb)(void))
void mode_pwmp_hd_init(uint16_t positioner_model, mode_pwmp_hd_params_u *params, void (*params_save_cb)(void))
{
DBG_ASSERT(params != NULL __DBG_LINE); // 断言检查
DBG_ASSERT(params_save_cb != NULL __DBG_LINE);

4
User/application/src/params.c
View File

@ -129,8 +129,8 @@ void params_restart(void)
uDevice.DeviceAddr = 0;
// 定位器工作模式
uDevice.WorkMode = ON_LINE_MODE;
// 阀门型号
uDevice.ValveStyle = VALVE_GPS3000;
// 定位器型号
uDevice.positioner_model = POSITIONER_MODEL_GPS3000;
// 阀门类型
uDevice.eAirAction = ATO;
// 定位器控制输出模式

2
User/entity.h
View File

@ -333,6 +333,8 @@ typedef struct
uint16_t SpecControlOutputMode;
// 整定结果 1：成功 0：失败
uint16_t TunedFlagResult;
// 定位器型号
uint16_t positioner_model;
} uDeviceTypedef;
/// 实时参数