From c9ae4f848bf0c8eb4ae22bee472333e6ddb4c9af Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Sun, 14 Jul 2024 16:42:03 +0800
Subject: [PATCH] V510,fix code scaner some bug

---
 .../plate_code_scaner_module.cpp                    | 21 +++++++++++++++------
 .../plate_code_scaner_module.hpp                    |  2 ++
 .../subboard90_optical_module.cpp                   |  2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/usrc/subboards/subboard20_plate_clamp_case/plate_code_scaner_module.cpp b/usrc/subboards/subboard20_plate_clamp_case/plate_code_scaner_module.cpp
index c13977d..777a440 100644
--- a/usrc/subboards/subboard20_plate_clamp_case/plate_code_scaner_module.cpp
+++ b/usrc/subboards/subboard20_plate_clamp_case/plate_code_scaner_module.cpp
@@ -94,10 +94,10 @@ void PlateCodeScanerModule::initialize(int32_t moduleid, hardware_config_t* hard
   adc_capture_buf = (int16_t*)calloc(2, MAX_POINT);
   ZASSERT(adc_capture_buf);
 
-  m_t_laster_enable_io.setState(true);
-  m_amp_negative_5v_gpio.setState(true);
-  m_t_amp_sw_io.setState(true);
-  m_f_amp_sw_io.setState(true);
+  m_t_laster_enable_io.setState(false);
+  m_amp_negative_5v_gpio.setState(false);
+  m_t_amp_sw_io.setState(false);
+  m_f_amp_sw_io.setState(false);
 
   // while (true) {
   //   int32_t adcv;
@@ -119,7 +119,7 @@ void PlateCodeScanerModule::initialize(int32_t moduleid, hardware_config_t* hard
 }
 #define PROCESS_REG_CFG(cfg) PROCESS_REG(kreg_plate_code_scaner_##cfg, /*          */ REG_GET(m_reg.cfg), REG_SET(m_reg.cfg))
 
-int32_t PlateCodeScanerModule::module_xxx_reg(int32_t param_id, bool read, int32_t& val) {
+int32_t PlateCodeScanerModule::pri_module_xxx_reg(int32_t param_id, bool read, int32_t& val) {
   switch (param_id) {
     PROCESS_REG_CFG(laster_intensity);
     PROCESS_REG_CFG(scan_gain);
@@ -134,6 +134,15 @@ int32_t PlateCodeScanerModule::module_xxx_reg(int32_t param_id, bool read, int32
       return err::kmodule_not_find_reg;
       break;
   }
+  return 0;
+}
+
+int32_t PlateCodeScanerModule::module_xxx_reg(int32_t param_id, bool read, int32_t& val) {
+  int32_t ret = pri_module_xxx_reg(param_id, read, val);
+  if (ret != 0) {
+    return ret;
+  }
+
   if (!read) module_active_cfg();
   return 0;
 };
@@ -368,7 +377,7 @@ void PlateCodeScanerModule::scaner_set_gain(float gain) {
 }
 void PlateCodeScanerModule::laser_set_intensity(float intensity) {
   int32_t potentiometer_val = 0;
-  potentiometer_val         = intensity / 100.0 * 255.0;
+  potentiometer_val         = intensity / 100.0 * 150.0;
   ZLOGI(TAG, "laser_set_intensity: %.2f(potentiometer_val: %d)", intensity, potentiometer_val);
   m_t_optical_amp_mcp41_ohm.setPotentiometerValue_0(potentiometer_val);
 }
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 8a4b7c9..72890c7 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
@@ -133,6 +133,8 @@ class PlateCodeScanerModule : public ZIModule, public ZI_PlateCodeScanerModule {
   void dumppoint();
   void parsepoint();
 
+  virtual int32_t pri_module_xxx_reg(int32_t param_id, bool read, int32_t& val);
+
  private:
   int32_t before_run();
   int32_t after_run();
diff --git a/usrc/subboards/subboard90_optical_module/subboard90_optical_module.cpp b/usrc/subboards/subboard90_optical_module/subboard90_optical_module.cpp
index eb75b4a..82edfe4 100644
--- a/usrc/subboards/subboard90_optical_module/subboard90_optical_module.cpp
+++ b/usrc/subboards/subboard90_optical_module/subboard90_optical_module.cpp
@@ -2,7 +2,7 @@
 extern "C" {
 #include "subboard90_optical_module_board.h"
 }
-#include "optical_module.hpp"
+
 #include "optical_module_v2.hpp"
 //
 #include "pri_board.h"