recode

api/api.hpp

@@ -1,6 +1,7 @@
 #pragma once
+#include "apibasic/basic.hpp"
 //
-#include "errorcode.hpp"
+
 //
 #include "zi_module.hpp"
 //
@@ -8,24 +9,8 @@
 //
 #include "zi_xymotor.hpp"
 //
-#include "packet_interface.hpp"
-//
-#include "i_zcanreceiver.hpp"
-
-
-//
-#include "protocol_constant.hpp"
-//
-#include "reg_index.hpp"
-//
-#include "zi_code_scaner.hpp"
-//
 #include "zi_event_bus.hpp"
 //
 #include "zi_a8000_optical_module.hpp"
 //
-#include "zi_board_module.hpp"
-
-//
-#include "zi_pipette_ctrl_module.hpp"
-#include "reg_index_table.hpp"
+#include "zi_pipette_ctrl_module.hpp"

api/apibasic/basic.hpp

@@ -0,0 +1,14 @@
+#pragma once
+
+#include "cmdid.hpp"
+//
+#include "errorcode.hpp"
+//
+#include "packet_interface.hpp"
+//
+#include "module_type_index.hpp"
+//
+#include "protocol_constant.hpp"
+//
+#include "reg_index.hpp"
+//

cmdid.hpp → api/apibasic/cmdid.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include "api/api.hpp"
+
+#define CMDID(cmdid, cmdSubId) ((cmdid << 8) + cmdSubId)
 
 namespace iflytop {
 namespace zcr {

api/packet_interface.hpp → api/apibasic/packet_interface.hpp

@@ -24,7 +24,6 @@ typedef enum {
 }  // namespace zcr
 }  // namespace iflytop
 
-#define CMDID(cmdid, cmdSubId) ((cmdid << 8) + cmdSubId)
 #define CMD_SUB_ID(cmdid)      (cmdid & 0xff)
 #define MODULE_CMDID(cmdid)    (cmdid >> 8)
 

api/reg_index.hpp → api/apibasic/reg_index.hpp

@@ -155,7 +155,7 @@ typedef enum {
   kreg_laster_scaner_laster_intensity            = REG_INDEX(43, 0, 14),
 
   /***********************************************************************************************************************
-   *                                                       NEW_API                                                       *
+   *                                                       XYROBOT                                                       *
    ***********************************************************************************************************************/
 
   kreg_xyrobot_default_velocity     = REG_INDEX(100, 0, 0),

api/zi_a8000_optical_module.hpp

@@ -3,7 +3,8 @@
 
 #include <functional>
 
-#include "errorcode.hpp"
+#include "apibasic/basic.hpp"
+
 
 namespace iflytop {
 using namespace std;

api/zi_adc_capture.hpp

@@ -1,15 +0,0 @@
-#pragma once
-#include <stdint.h>
-
-#include <functional>
-
-#include "errorcode.hpp"
-
-namespace iflytop {
-using namespace std;
-class ZICodeScaner {
- public:
-    
-
-};
-}  // namespace iflytop

api/zi_board_module.hpp

@@ -1,22 +0,0 @@
-#pragma once
-#include <stdint.h>
-
-#include <functional>
-
-#include "errorcode.hpp"
-
-namespace iflytop {
-using namespace std;
-class ZIBoardModule {
- public:
-  typedef enum {
-    kf_optical = 0,
-    kt_optical = 1,
-  } optical_type_t;
-
- public:
-  virtual ~ZIBoardModule(){};
-
-  virtual int32_t board_reset() = 0;
-};
-}  // namespace iflytop

api/zi_code_scaner.hpp

@@ -1,18 +0,0 @@
-#pragma once
-#include <stdint.h>
-
-#include <functional>
-
-#include "errorcode.hpp"
-
-namespace iflytop {
-using namespace std;
-#if 0
-class ZICodeScaner {
- public:
-  virtual int32_t code_scaner_start_scan() { return err::koperation_not_support; }
-  virtual int32_t code_scaner_stop_scan() { return err::koperation_not_support; }
-  virtual int32_t code_scaner_read_scaner_result(int32_t startadd, uint8_t *data, int32_t *len) { return err::koperation_not_support; }
-};
-#endif
-}  // namespace iflytop

api/zi_event_bus.hpp

@@ -2,8 +2,11 @@
 #include <stdint.h>
 
 #include <functional>
+#include "apibasic/basic.hpp"
+
+
+
 
-#include "errorcode.hpp"
 
 namespace iflytop {
 using namespace std;

api/zi_module.hpp

@@ -3,8 +3,8 @@
 
 #include <functional>
 
-#include "errorcode.hpp"
-#include "module_type_index.hpp"
+#include "apibasic/basic.hpp"
+
 
 namespace iflytop {
 using namespace std;

api/zi_motor.hpp

@@ -3,7 +3,9 @@
 
 #include <functional>
 
-#include "errorcode.hpp"
+#include "apibasic/basic.hpp"
+
+
 
 namespace iflytop {
 using namespace std;

api/zi_pipette_ctrl_module.hpp

@@ -2,8 +2,9 @@
 #include <stdint.h>
 
 #include <functional>
+#include "apibasic/basic.hpp"
+
 
-#include "errorcode.hpp"
 
 namespace iflytop {
 using namespace std;

api/zi_xymotor.hpp

@@ -2,8 +2,9 @@
 #include <stdint.h>
 
 #include <functional>
+#include "apibasic/basic.hpp"
+
 
-#include "errorcode.hpp"
 
 namespace iflytop {
 using namespace std;

api/i_zcanreceiver.hpp → i_zcanreceiver.hpp

@@ -3,8 +3,7 @@
 //
 
 #pragma once
-#include "errorcode.hpp"
-#include "packet_interface.hpp"
+#include "api/api.hpp"
 namespace iflytop {
 using namespace zcr;
 

protocol.hpp

@@ -0,0 +1,8 @@
+#pragma once
+#include "api/api.hpp"
+//
+#include "i_zcanreceiver.hpp"
+//
+#include "reg_index_table.hpp"
+//
+#include "protocol_event_bus_sender.hpp"

protocol_event_bus_sender.cpp

@@ -1,7 +1,7 @@
 #include "protocol_event_bus_sender.hpp"
 
 #include "api/api.hpp"
-#include "cmdid.hpp"
+#include "i_zcanreceiver.hpp"
 namespace iflytop {
 using namespace std;
 

protocol_event_bus_sender.hpp

@@ -1,5 +1,6 @@
 #pragma once
 #include "api/api.hpp"
+#include "i_zcanreceiver.hpp"
 namespace iflytop {
 using namespace std;
 
@@ -11,4 +12,4 @@ class ProtocolEventBusSender : public ZIEventBusSender {
 
   virtual void push_reg_state_change_event(int32_t moduleid, int32_t regindex, int32_t oldval, int32_t toval) override;
 };
-}  // namespace iflytop
+}  // namespace iflytop

api/reg_index_table.cpp → reg_index_table.cpp

@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "reg_index.hpp"
+#include "api/api.hpp"
 using namespace iflytop;
 
 static reg_index_table_iterm_t iterms[] = {};