Merge branch 'master' of 192.168.1.3:manufacturer_stm32/iflytop_stm32_os_sdk

components/sensors/m3078/m3078_code_scaner.cpp

@@ -87,9 +87,8 @@ int32_t M3078CodeScanner::module_xxx_reg(int32_t param_id, bool read, int32_t& v
   return 0;
 }
 
-int32_t M3078CodeScanner::module_set_reg(int32_t param_id, int32_t param_value) { return module_xxx_reg(param_id, false, param_value); }
-int32_t M3078CodeScanner::module_get_reg(int32_t param_id, int32_t* param_value) { return module_xxx_reg(param_id, true, *param_value); }
 
+#if 0
 int32_t M3078CodeScanner::code_scaner_start_scan() {
   ZLOGI(TAG, "code_scaner_start_scan");
   return module_start();
@@ -107,6 +106,7 @@ int32_t M3078CodeScanner::code_scaner_read_scaner_result(int32_t startadd, uint8
   memcpy(data, codecache, codecachelen);
   return 0;
 }
+#endif
 int32_t M3078CodeScanner::read_status() {
   if (m_triggerGpio.getState() == 0) {
     return 0;

components/sensors/m3078/m3078_code_scaner.hpp

@@ -26,7 +26,7 @@
 namespace iflytop {
 using namespace std;
 
-class M3078CodeScanner : public ZIModule, public ZICodeScaner {
+class M3078CodeScanner : public ZIModule {
  public:
   typedef struct {
     UART_HandleTypeDef* uart;
@@ -85,17 +85,17 @@ class M3078CodeScanner : public ZIModule, public ZICodeScaner {
     *id = this->id;
     return 0;
   }
-
   virtual int32_t module_stop();
   virtual int32_t module_break();
   virtual int32_t module_start();
 
   virtual int32_t module_set_reg(int32_t param_id, int32_t param_value);
   virtual int32_t module_get_reg(int32_t param_id, int32_t* param_value);
-
+#if 0
   virtual int32_t code_scaner_start_scan();
   virtual int32_t code_scaner_stop_scan();
   virtual int32_t code_scaner_read_scaner_result(int32_t startadd, uint8_t* data, int32_t* len);
+#endif
 
  private:
   int32_t module_xxx_reg(int32_t param_id, bool read, int32_t& param_value);