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 cccf00e..545ca7d 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 @@ -8,7 +8,7 @@ namespace iflytop { class MiniServoCtrlModule : public ZIModule { - ENABLE_MODULE(StepMotorCtrlModule, kmini_servo_motor_module, PC_VERSION); + ENABLE_MODULE(StepMotorCtrlModule, kmini_servo_motor_module, APP_VERSION); public: typedef struct { diff --git a/sdk/components/pipette_module/pipette_ctrl_module_v2.hpp b/sdk/components/pipette_module/pipette_ctrl_module_v2.hpp index 53e8208..2ad682c 100644 --- a/sdk/components/pipette_module/pipette_ctrl_module_v2.hpp +++ b/sdk/components/pipette_module/pipette_ctrl_module_v2.hpp @@ -26,7 +26,7 @@ namespace iflytop { #define PIPETTEMODULE_SAMPLE_BUF_SIZE 300 class PipetteModuleV2 : public ZIModule { - ENABLE_MODULE(PipetteModuleV2, kpipette_ctrl_module, PC_VERSION); + ENABLE_MODULE(PipetteModuleV2, kpipette_ctrl_module, APP_VERSION); public: typedef enum { diff --git a/sdk/components/sensors/m3078/m3078_code_scaner.hpp b/sdk/components/sensors/m3078/m3078_code_scaner.hpp index 92bc134..51cb904 100644 --- a/sdk/components/sensors/m3078/m3078_code_scaner.hpp +++ b/sdk/components/sensors/m3078/m3078_code_scaner.hpp @@ -28,7 +28,7 @@ namespace iflytop { using namespace std; class M3078CodeScanner : public ZIModule { - ENABLE_MODULE(M3078CodeScanner, kcode_scaner, PC_VERSION); + ENABLE_MODULE(M3078CodeScanner, kcode_scaner, APP_VERSION); public: typedef struct { 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 54d73b1..ba681d5 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 @@ -8,7 +8,7 @@ namespace iflytop { class StepMotorCtrlModule : public ZIModule { - ENABLE_MODULE(StepMotorCtrlModule, ktmc_step_motor, PC_VERSION); + ENABLE_MODULE(StepMotorCtrlModule, ktmc_step_motor, APP_VERSION); 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 036aabf..3ceb189 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 @@ -34,7 +34,7 @@ namespace iflytop { */ class WaterCoolingTemperatureControlModule : public ZIModule { - ENABLE_MODULE(WaterCoolingTemperatureControlModule, kwater_cooling_temperature_ctrl_module, PC_VERSION); + ENABLE_MODULE(WaterCoolingTemperatureControlModule, kwater_cooling_temperature_ctrl_module, APP_VERSION); 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 9f93df1..5fe457f 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 @@ -10,7 +10,7 @@ namespace iflytop { class XYRobotCtrlModule : public ZIModule { - ENABLE_MODULE(XYRobotCtrlModule, khbot_module, PC_VERSION); + ENABLE_MODULE(XYRobotCtrlModule, khbot_module, APP_VERSION); public: typedef enum { khbot, kcorexy /*交叉 */ } robot_type_t; diff --git a/usrc/main.cpp b/usrc/main.cpp index 784643c..8d3766a 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", PC_VERSION); + ZEARLY_LOGI("SYS", "= version : %d", 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 8c251a3..8e133e4 100644 --- a/usrc/public_service/ext_board_impl.hpp +++ b/usrc/public_service/ext_board_impl.hpp @@ -14,7 +14,7 @@ namespace iflytop { class ExtBoardImpl : public ZIModule { - ENABLE_MODULE(ExtBoardImpl, kboard, PC_VERSION); + ENABLE_MODULE(ExtBoardImpl, kboard, APP_VERSION); protected: /* data */ diff --git a/usrc/subboards/subboard100_idcard_reader/eeprom_service.hpp b/usrc/subboards/subboard100_idcard_reader/eeprom_service.hpp index 6e92de7..942f4b8 100644 --- a/usrc/subboards/subboard100_idcard_reader/eeprom_service.hpp +++ b/usrc/subboards/subboard100_idcard_reader/eeprom_service.hpp @@ -22,7 +22,7 @@ using namespace std; */ class EEPROMService : public ZIModule { - ENABLE_MODULE(EEPROMService, ka8000_idcard_reader, PC_VERSION) + ENABLE_MODULE(EEPROMService, ka8000_idcard_reader, APP_VERSION) I2C_HandleTypeDef* m_i2c_handle; ZThread m_monitor_thread; bool m_is_online_flag = false; diff --git a/usrc/subboards/subboard20_plate_clamp_case/plate_code_scaner_module.hpp b/usrc/subboards/subboard20_plate_clamp_case/plate_code_scaner_module.hpp index c31e691..d11b05f 100644 --- a/usrc/subboards/subboard20_plate_clamp_case/plate_code_scaner_module.hpp +++ b/usrc/subboards/subboard20_plate_clamp_case/plate_code_scaner_module.hpp @@ -12,7 +12,7 @@ namespace iflytop { using namespace std; class PlateCodeScanerModule : public ZIModule { - ENABLE_MODULE(PlateCodeScanerModule, ka8000_plate_code_scaner, PC_VERSION); + ENABLE_MODULE(PlateCodeScanerModule, ka8000_plate_code_scaner, APP_VERSION); public: typedef struct { diff --git a/usrc/subboards/subboard30_shake_module/subboard30_shake_module.hpp b/usrc/subboards/subboard30_shake_module/subboard30_shake_module.hpp index bf0b979..4a392a5 100644 --- a/usrc/subboards/subboard30_shake_module/subboard30_shake_module.hpp +++ b/usrc/subboards/subboard30_shake_module/subboard30_shake_module.hpp @@ -12,7 +12,7 @@ namespace iflytop { class Subboard30ShakeModule : public ExtBoardImpl { - ENABLE_MODULE(Subboard30ShakeModule, kboard, PC_VERSION); + ENABLE_MODULE(Subboard30ShakeModule, kboard, APP_VERSION); public: static Subboard30ShakeModule *ins() { 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 d404f4d..48163d1 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 @@ -27,7 +27,7 @@ namespace iflytop { */ class ZcanFanCtrlModule : public ZIModule{ - ENABLE_MODULE(ZcanFanCtrlModule, kfan_ctrl_module, 1); + ENABLE_MODULE(ZcanFanCtrlModule, kfan_ctrl_module, APP_VERSION); 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 886eed8..23571f2 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; #define OPTICAL_MODULE_MAX_SCAN_POINT_NUM 2000 class OpticalModuleV2 : public ZIModule { - ENABLE_MODULE(OpticalModuleV2, ka8000_optical_module, PC_VERSION); + ENABLE_MODULE(OpticalModuleV2, ka8000_optical_module, APP_VERSION); typedef enum { kf_optical = 0, kt_optical = 1, diff --git a/usrc/version.h b/usrc/version.h index b1ab658..80f67f5 100644 --- a/usrc/version.h +++ b/usrc/version.h @@ -1,2 +1,2 @@ #pragma once -#define PC_VERSION 1021 +#define APP_VERSION 1021