From 31db9c92b43e387bc61550b4b060c47909edb45a Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sat, 19 Jul 2025 21:37:53 +0800 Subject: [PATCH] =?UTF-8?q?v1214=20|=20=E6=9B=B4=E6=96=B0=E7=A7=BB?= =?UTF-8?q?=E6=B6=B2=E6=9E=AA=20=E5=BD=92=E9=9B=B6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sdk/components/api/zi_module.hpp | 6 +++--- sdk/components/mini_servo_motor/mini_servo_motor_ctrl_module.hpp | 2 +- sdk/components/pipette_module/pipette_ctrl_module.hpp | 2 +- sdk/components/sensors/m3078/m3078_code_scaner.hpp | 2 +- sdk/components/step_motor_ctrl_module/step_motor_ctrl_module.hpp | 2 +- .../water_cooling_temperature_control_module.hpp | 2 +- sdk/components/xy_robot_ctrl_module/xy_robot_ctrl_module.hpp | 2 +- usrc/main.cpp | 2 +- usrc/public_service/ext_board_impl.hpp | 2 +- usrc/subboards/subboard100_idcard_reader/eeprom_service.hpp | 2 +- .../subboard20_plate_clamp_case/plate_code_scaner_module.hpp.bak | 2 +- .../subboard40_and_50_temperature_ctrl/zcan_fan_ctrl_module.hpp | 2 +- usrc/subboards/subboard90_optical_module/optical_module_v2.hpp | 2 +- usrc/version.c | 7 +++++++ usrc/version.h | 4 +++- 15 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 usrc/version.c diff --git a/sdk/components/api/zi_module.hpp b/sdk/components/api/zi_module.hpp index f749bcd..952c0de 100644 --- a/sdk/components/api/zi_module.hpp +++ b/sdk/components/api/zi_module.hpp @@ -1,10 +1,10 @@ #pragma once #include -#include "version.h" #include #include "a8000_protocol\protocol.hpp" +#include "version.h" namespace iflytop { using namespace std; @@ -67,9 +67,9 @@ class ZIModule { public: virtual ~ZIModule() {} - ZIModule(int32_t type, int32_t version) { + ZIModule(int32_t type) { module_type = type; - module_version = version; + module_version = get_app_version(); } public: diff --git a/sdk/components/mini_servo_motor/mini_servo_motor_ctrl_module.hpp b/sdk/components/mini_servo_motor/mini_servo_motor_ctrl_module.hpp index 6371029..321a58d 100644 --- a/sdk/components/mini_servo_motor/mini_servo_motor_ctrl_module.hpp +++ b/sdk/components/mini_servo_motor/mini_servo_motor_ctrl_module.hpp @@ -9,7 +9,7 @@ namespace iflytop { class MiniServoCtrlModule : public ZIModule { public: - MiniServoCtrlModule() : ZIModule(kmini_servo_motor_module, APP_VERSION) {} + MiniServoCtrlModule() : ZIModule(kmini_servo_motor_module) {} public: typedef struct { diff --git a/sdk/components/pipette_module/pipette_ctrl_module.hpp b/sdk/components/pipette_module/pipette_ctrl_module.hpp index e317963..b0c0db2 100644 --- a/sdk/components/pipette_module/pipette_ctrl_module.hpp +++ b/sdk/components/pipette_module/pipette_ctrl_module.hpp @@ -36,7 +36,7 @@ namespace iflytop { class PipetteModule : public ZIModule { public: - PipetteModule() : ZIModule(kpipette_ctrl_module, APP_VERSION) {} + PipetteModule() : ZIModule(kpipette_ctrl_module) {} public: typedef struct { diff --git a/sdk/components/sensors/m3078/m3078_code_scaner.hpp b/sdk/components/sensors/m3078/m3078_code_scaner.hpp index 29f4f11..d911a95 100644 --- a/sdk/components/sensors/m3078/m3078_code_scaner.hpp +++ b/sdk/components/sensors/m3078/m3078_code_scaner.hpp @@ -30,7 +30,7 @@ using namespace std; class M3078CodeScanner : public ZIModule { public: - M3078CodeScanner() : ZIModule(kcode_scaner, APP_VERSION) {} + M3078CodeScanner() : ZIModule(kcode_scaner) {} public: typedef struct { UART_HandleTypeDef* uart; diff --git a/sdk/components/step_motor_ctrl_module/step_motor_ctrl_module.hpp b/sdk/components/step_motor_ctrl_module/step_motor_ctrl_module.hpp index 8928a06..f04f669 100644 --- a/sdk/components/step_motor_ctrl_module/step_motor_ctrl_module.hpp +++ b/sdk/components/step_motor_ctrl_module/step_motor_ctrl_module.hpp @@ -9,7 +9,7 @@ namespace iflytop { class StepMotorCtrlModule : public ZIModule { public: - StepMotorCtrlModule() : ZIModule(ktmc_step_motor, APP_VERSION) {} + StepMotorCtrlModule() : ZIModule(ktmc_step_motor) {} public: typedef struct { diff --git a/sdk/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.hpp b/sdk/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.hpp index 9f6224b..ce0f6c2 100644 --- a/sdk/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.hpp +++ b/sdk/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.hpp @@ -35,7 +35,7 @@ namespace iflytop { class WaterCoolingTemperatureControlModule : public ZIModule { public: - WaterCoolingTemperatureControlModule() : ZIModule(kwater_cooling_temperature_ctrl_module, APP_VERSION) {} + WaterCoolingTemperatureControlModule() : ZIModule(kwater_cooling_temperature_ctrl_module) {} public: typedef struct { diff --git a/sdk/components/xy_robot_ctrl_module/xy_robot_ctrl_module.hpp b/sdk/components/xy_robot_ctrl_module/xy_robot_ctrl_module.hpp index a3c899c..93dd525 100644 --- a/sdk/components/xy_robot_ctrl_module/xy_robot_ctrl_module.hpp +++ b/sdk/components/xy_robot_ctrl_module/xy_robot_ctrl_module.hpp @@ -11,7 +11,7 @@ namespace iflytop { class XYRobotCtrlModule : public ZIModule { public: - XYRobotCtrlModule() : ZIModule(khbot_module, APP_VERSION) {} + XYRobotCtrlModule() : ZIModule(khbot_module) {} public: typedef enum { khbot, kcorexy /*交叉 */ } robot_type_t; diff --git a/usrc/main.cpp b/usrc/main.cpp index a062490..6c4f976 100644 --- a/usrc/main.cpp +++ b/usrc/main.cpp @@ -146,7 +146,7 @@ void umain() { ZEARLY_LOGI("SYS", "chip init ok"); ZEARLY_LOGI("SYS", "= manufacturer : %s", PC_MANUFACTURER); ZEARLY_LOGI("SYS", "= project name : %s", PC_PROJECT_NAME); - ZEARLY_LOGI("SYS", "= version : %d", APP_VERSION); + ZEARLY_LOGI("SYS", "= version : %d", get_app_version()); ZEARLY_LOGI("SYS", "= freq : %d", HAL_RCC_GetSysClockFreq()); ZEARLY_LOGI("SYS", "= build time : %s", __DATE__ " " __TIME__); ZEARLY_LOGI("SYS", "= device id : %d", deviceId); diff --git a/usrc/public_service/ext_board_impl.hpp b/usrc/public_service/ext_board_impl.hpp index 3186972..c531f23 100644 --- a/usrc/public_service/ext_board_impl.hpp +++ b/usrc/public_service/ext_board_impl.hpp @@ -15,7 +15,7 @@ namespace iflytop { class ExtBoardImpl : public ZIModule { public: - ExtBoardImpl() : ZIModule(kboard, APP_VERSION) {} + ExtBoardImpl() : ZIModule(kboard) {} protected: /* data */ diff --git a/usrc/subboards/subboard100_idcard_reader/eeprom_service.hpp b/usrc/subboards/subboard100_idcard_reader/eeprom_service.hpp index dda9a68..4e0b19f 100644 --- a/usrc/subboards/subboard100_idcard_reader/eeprom_service.hpp +++ b/usrc/subboards/subboard100_idcard_reader/eeprom_service.hpp @@ -23,7 +23,7 @@ using namespace std; class EEPROMService : public ZIModule { public: - EEPROMService() : ZIModule(ka8000_idcard_reader, APP_VERSION) {} + EEPROMService() : ZIModule(ka8000_idcard_reader) {} private: I2C_HandleTypeDef* m_i2c_handle; diff --git a/usrc/subboards/subboard20_plate_clamp_case/plate_code_scaner_module.hpp.bak b/usrc/subboards/subboard20_plate_clamp_case/plate_code_scaner_module.hpp.bak index 1709c00..77f4850 100644 --- a/usrc/subboards/subboard20_plate_clamp_case/plate_code_scaner_module.hpp.bak +++ b/usrc/subboards/subboard20_plate_clamp_case/plate_code_scaner_module.hpp.bak @@ -12,7 +12,7 @@ using namespace std; class PlateCodeScanerModule : public ZIModule { public: - PlateCodeScanerModule() : ZIModule(ka8000_plate_code_scaner, APP_VERSION) {} + PlateCodeScanerModule() : ZIModule(ka8000_plate_code_scaner) {} public: typedef struct { diff --git a/usrc/subboards/subboard40_and_50_temperature_ctrl/zcan_fan_ctrl_module.hpp b/usrc/subboards/subboard40_and_50_temperature_ctrl/zcan_fan_ctrl_module.hpp index e6b3273..6d189f2 100644 --- a/usrc/subboards/subboard40_and_50_temperature_ctrl/zcan_fan_ctrl_module.hpp +++ b/usrc/subboards/subboard40_and_50_temperature_ctrl/zcan_fan_ctrl_module.hpp @@ -28,7 +28,7 @@ namespace iflytop { class ZcanFanCtrlModule : public ZIModule { public: - ZcanFanCtrlModule() : ZIModule(kfan_ctrl_module, APP_VERSION) {} + ZcanFanCtrlModule() : ZIModule(kfan_ctrl_module) {} public: ZIPWMFanCtrlModule* m_fanmodule = nullptr; diff --git a/usrc/subboards/subboard90_optical_module/optical_module_v2.hpp b/usrc/subboards/subboard90_optical_module/optical_module_v2.hpp index e295c68..e085342 100644 --- a/usrc/subboards/subboard90_optical_module/optical_module_v2.hpp +++ b/usrc/subboards/subboard90_optical_module/optical_module_v2.hpp @@ -14,7 +14,7 @@ using namespace std; class OpticalModuleV2 : public ZIModule { public: - OpticalModuleV2() : ZIModule(ka8000_optical_module, APP_VERSION) {} + OpticalModuleV2() : ZIModule(ka8000_optical_module) {} typedef enum { knormal_run = 0, diff --git a/usrc/version.c b/usrc/version.c new file mode 100644 index 0000000..df85e9f --- /dev/null +++ b/usrc/version.c @@ -0,0 +1,7 @@ +#include "version.h" + +int32_t APP_VERSION = 1214; + +int32_t get_app_version(){ + return APP_VERSION; +} diff --git a/usrc/version.h b/usrc/version.h index 2187730..139d0b1 100644 --- a/usrc/version.h +++ b/usrc/version.h @@ -1,2 +1,4 @@ #pragma once -#define APP_VERSION 1214 +#include + +int32_t get_app_version(); \ No newline at end of file