diff --git a/.vscode/settings.json b/.vscode/settings.json index 7219c6c..02d71d4 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -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/**", @@ -60,4 +63,4 @@ "sys.h": "c" }, "C_Cpp.errorSquiggles": "disabled" -} +} \ No newline at end of file diff --git a/MDK-ARM/controller-v2/controller-v2.4 b/MDK-ARM/controller-v2/controller-v2.4 index 4c0c117..cb3d077 100644 Binary files a/MDK-ARM/controller-v2/controller-v2.4 and b/MDK-ARM/controller-v2/controller-v2.4 differ diff --git a/User/application/inc/mode_pwmp_hd.h b/User/application/inc/mode_pwmp_hd.h index e32ce23..fa51f48 100644 --- a/User/application/inc/mode_pwmp_hd.h +++ b/User/application/inc/mode_pwmp_hd.h @@ -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); diff --git a/User/application/inc/params.h b/User/application/inc/params.h index fdb8c6c..ca0f250 100644 --- a/User/application/inc/params.h +++ b/User/application/inc/params.h @@ -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控制阀位),自动模式 diff --git a/User/application/src/mode.c b/User/application/src/mode.c index 6a141df..bb39de2 100644 --- a/User/application/src/mode.c +++ b/User/application/src/mode.c @@ -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 { diff --git a/User/application/src/mode_pwmp_hd.c b/User/application/src/mode_pwmp_hd.c index 58827ea..0dc709f 100644 --- a/User/application/src/mode_pwmp_hd.c +++ b/User/application/src/mode_pwmp_hd.c @@ -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); diff --git a/User/application/src/params.c b/User/application/src/params.c index 551f3e2..134bfcf 100644 --- a/User/application/src/params.c +++ b/User/application/src/params.c @@ -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; // 定位器控制输出模式 diff --git a/User/entity.h b/User/entity.h index baa0ca2..6694d5a 100644 --- a/User/entity.h +++ b/User/entity.h @@ -333,6 +333,8 @@ typedef struct uint16_t SpecControlOutputMode; // 整定结果 1:成功 0:失败 uint16_t TunedFlagResult; + // 定位器型号 + uint16_t positioner_model; } uDeviceTypedef; /// 实时参数