From 31dd102e184047921a476587ae08166a90856e37 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Sun, 30 Jul 2023 21:19:24 +0800
Subject: [PATCH] update

---
 sdk                                         |  2 +-
 usrc/flia_plate_box_pusher_ctl_service.cpp  |  0
 usrc/flia_plate_box_pusher_ctl_service.hpp  |  0
 usrc/main.cpp                               | 15 ++++++++-------
 usrc/main.hpp                               |  4 ++--
 usrc/one_dimensional_code_laser_scanner.cpp | 12 ++++++------
 usrc/one_dimensional_code_laser_scanner.hpp |  2 +-
 7 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 usrc/flia_plate_box_pusher_ctl_service.cpp
 create mode 100644 usrc/flia_plate_box_pusher_ctl_service.hpp

diff --git a/sdk b/sdk
index 74516c3..5d81668 160000
--- a/sdk
+++ b/sdk
@@ -1 +1 @@
-Subproject commit 74516c3308422c3a73853b6aa925d0d38a526eef
+Subproject commit 5d816689f151633f924c959945fd87ca7d26a259
diff --git a/usrc/flia_plate_box_pusher_ctl_service.cpp b/usrc/flia_plate_box_pusher_ctl_service.cpp
new file mode 100644
index 0000000..e69de29
diff --git a/usrc/flia_plate_box_pusher_ctl_service.hpp b/usrc/flia_plate_box_pusher_ctl_service.hpp
new file mode 100644
index 0000000..e69de29
diff --git a/usrc/main.cpp b/usrc/main.cpp
index 196bd0c..d26e014 100644
--- a/usrc/main.cpp
+++ b/usrc/main.cpp
@@ -7,7 +7,8 @@
 #include "project.hpp"
 //
 #include "one_dimensional_code_laser_scanner.hpp"
-#include "sdk/components/single_axis_motor_control_v2/single_axis_motor_control_v2.hpp"
+// #include "sdk/components/single_axis_motor_control_v2/single_axis_motor_control_v2.hpp"
+#include "sdk/components/single_axis_motor_control/single_axis_motor_control.hpp"
 #include "sdk/hal/zhal.hpp"
 #include "sdk\components\iflytop_can_slave_v1\iflytop_can_slave.hpp"
 #include "sdk\components\tmc\ic\ztmc4361A.hpp"
@@ -45,8 +46,8 @@ ZGPIO io_fybjl_sensor1;
 ZGPIO io_fybjl_sensor0;
 
 DeviceBaseControlService       m_deviceBaseControlService;
-SingleAxisMotorControlerV2     m_pyMotorControlService;  // 平移电机
-SingleAxisMotorControlerV2     m_tjMotorControlService;  // 推进电机
+SingleAxisMotorControler       m_pyMotorControlService;  // 平移电机
+SingleAxisMotorControler       m_tjMotorControlService;  // 推进电机
 OneDimensionalCodeLaserScanner m_oneDimensionalCodeLaserScanner;
 
 void input_sensors_init() {
@@ -161,15 +162,15 @@ void Main::run() {
     auto *cfg = IflytopCanProtocolStackProcesser::createDefaultConfig(DEVICE_ID, 128);
     m_protocolStack.initialize(cfg);
     m_protocolStack.setDumpPacketFlag(false);
-    m_protocolStack.registerListener(this);
-    m_protocolStack.activeReg(REG_GPIO_INPUT0, icps::kwr, 0);
+    // m_protocolStack.registerListener(this);
+    // m_protocolStack.activeReg(REG_GPIO_INPUT0, icps::kwr, 0);
   }
 
   {  //
     m_deviceBaseControlService.initialize(&m_protocolStack, DEVICE_ID);
     m_deviceBaseControlService.setListener([](int32_t engineer_mode) {
-      m_pyMotorControlService.setEngineerMode(engineer_mode);
-      m_tjMotorControlService.setEngineerMode(engineer_mode);
+      // m_pyMotorControlService.setEngineerMode(engineer_mode);
+      // m_tjMotorControlService.setEngineerMode(engineer_mode);
     });
   }
 
diff --git a/usrc/main.hpp b/usrc/main.hpp
index 87fd276..891cc4e 100644
--- a/usrc/main.hpp
+++ b/usrc/main.hpp
@@ -9,7 +9,7 @@
 
 namespace iflytop {
 using namespace std;
-class Main : public IflytopCanProtocolStackProcesserListener{
+class Main {
  private:
   /* data */
  public:
@@ -28,4 +28,4 @@ extern Main gmain;
 
 extern "C" {
 void umain(void) { iflytop::gmain.run(); }
-}
\ No newline at end of file
+}
diff --git a/usrc/one_dimensional_code_laser_scanner.cpp b/usrc/one_dimensional_code_laser_scanner.cpp
index d31890d..4aab146 100644
--- a/usrc/one_dimensional_code_laser_scanner.cpp
+++ b/usrc/one_dimensional_code_laser_scanner.cpp
@@ -17,15 +17,15 @@ void OneDimensionalCodeLaserScanner::initialize(IflytopCanProtocolStackProcesser
   m_protocolProcesser = protocolProcesser;
   m_regStartOff       = regStartOff;
 
-  m_protocolProcesser->activeReg(m_regStartOff + REG_CODE_SCANER_ACT_CTRL, icps::kw, 0);
-  m_protocolProcesser->activeReg(m_regStartOff + REG_CODE_SCANER_ACT_CLEAR_EXCEPTION, icps::kw, 0);
-  m_protocolProcesser->activeReg(m_regStartOff + REG_CODE_SCANER_STAT_STATUS, icps::kr, 0);
-  m_protocolProcesser->activeReg(m_regStartOff + REG_CODE_SCANER_STAT_EXCEPTION, icps::kr, 0);
-  m_protocolProcesser->activeReg(m_regStartOff + REG_CODE_SCANER_CODE, icps::kr, 0);
+  // m_protocolProcesser->activeReg(m_regStartOff + REG_CODE_SCANER_ACT_CTRL, icps::kw, 0);
+  // m_protocolProcesser->activeReg(m_regStartOff + REG_CODE_SCANER_ACT_CLEAR_EXCEPTION, icps::kw, 0);
+  // m_protocolProcesser->activeReg(m_regStartOff + REG_CODE_SCANER_STAT_STATUS, icps::kr, 0);
+  // m_protocolProcesser->activeReg(m_regStartOff + REG_CODE_SCANER_STAT_EXCEPTION, icps::kr, 0);
+  // m_protocolProcesser->activeReg(m_regStartOff + REG_CODE_SCANER_CODE, icps::kr, 0);
 
   m_triggerGpio.initAsInput(triggerPin, ZGPIO::kMode_nopull, ZGPIO::kIRQ_risingAndFallingIrq, false /*mirror*/);
   m_triggerGpio.regListener([this](ZGPIO* GPIO_Pin, ZGPIO::IrqTypeEvent_t irqevent) { onGpioIrq(GPIO_Pin, irqevent); });
-  m_protocolProcesser->registerListener(this);
+  // m_protocolProcesser->registerListener(this);
   m_readder = readder;
 }
 
diff --git a/usrc/one_dimensional_code_laser_scanner.hpp b/usrc/one_dimensional_code_laser_scanner.hpp
index 7dcb2ab..23feb77 100644
--- a/usrc/one_dimensional_code_laser_scanner.hpp
+++ b/usrc/one_dimensional_code_laser_scanner.hpp
@@ -17,7 +17,7 @@ using namespace std;
 
 #define POS_CACHE_SIZE 28
 
-class OneDimensionalCodeLaserScanner : public IflytopCanProtocolStackProcesserListener {
+class OneDimensionalCodeLaserScanner {
  public:
   typedef enum {
     kidle,