v1214 | 更新移液枪 归零逻辑

sdk/components/api/zi_module.hpp

@@ -1,10 +1,10 @@
 #pragma once
 #include <stdint.h>
-#include "version.h"
 
 #include <functional>
 
 #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:

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 {

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 {

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;

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 {

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 {

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;

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);

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 */

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;

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 {

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;

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,

usrc/version.c

@@ -0,0 +1,7 @@
+#include "version.h"
+
+int32_t APP_VERSION = 1214;
+
+int32_t get_app_version(){
+    return APP_VERSION;
+}

usrc/version.h

@@ -1,2 +1,4 @@
 #pragma once
-#define APP_VERSION           1214
+#include <stdint.h>
+
+int32_t get_app_version();