update

api/apibasic/cmdid.cpp

@@ -41,6 +41,8 @@ static cmdinfo_t table[] = {
     CMD_ITERM(ka8000_optical_read_scanner_adc_val),
     CMD_ITERM(ka8000_optical_read_laster_adc_val),
     CMD_ITERM(ka8000_optical_scan_current_point_amp_adc_val),
+    CMD_ITERM(ka8000_optical_start_capture),
+    CMD_ITERM(ka8000_optical_read_raw),
 
     CMD_ITERM(kstep_motor_enable),
     CMD_ITERM(kstep_motor_read_pos),

api/apibasic/cmdid.hpp

@@ -38,6 +38,9 @@ typedef enum {
   kpipette_ctrl_put_tip     = CMDID(5, 2),  // para:{}, ack:{}
   kpipette_ctrl_move_to_ul  = CMDID(5, 3),  // para:{4}, ack:{}
 
+  /***********************************************************************************************************************
+   *                                                      光学模组                                                       *
+   ***********************************************************************************************************************/
   ka8000_optical_module_power_ctrl              = CMDID(6, 0),  // para:{4}, ack:{}
   ka8000_optical_open_laser                     = CMDID(6, 1),  // para:{4}, ack:{}
   ka8000_optical_close_laser                    = CMDID(6, 2),  // para:{4}, ack:{}
@@ -46,6 +49,8 @@ typedef enum {
   ka8000_optical_read_scanner_adc_val           = CMDID(6, 5),  // para:{4}, ack:{4}
   ka8000_optical_read_laster_adc_val            = CMDID(6, 6),  // para:{4}, ack:{4}
   ka8000_optical_scan_current_point_amp_adc_val = CMDID(6, 7),  // para:{4,4,4,4}, ack:{4,4}
+  ka8000_optical_start_capture                  = CMDID(6, 8),  // para:{n/a}
+  ka8000_optical_read_raw                       = CMDID(6, 9),  // para:{index,size}
 
   /***********************************************************************************************************************
    *                                                     STEP_MOTOR                                                      *

api/apibasic/reg_index.cpp

@@ -36,10 +36,9 @@ static reginfo_t table[] = {
     REG_ITERM(kreg_pipette_capactitance_val),
     REG_ITERM(kreg_pipette_tip_state),
     REG_ITERM(kreg_pipette_limit_ul),
-    REG_ITERM(kreg_self_reflecting_laser_sensor_transmitting_power),
-    REG_ITERM(kreg_self_reflecting_laser_sensor_receiving_tube_gain),
-    REG_ITERM(kreg_self_reflecting_laser_sensor_sample_interval_ms),
-    REG_ITERM(kreg_self_reflecting_laser_sensor_num_samples),
+    
+    REG_ITERM(kreg_boditech_optical_module_raw_sector_size),
+    REG_ITERM(kreg_boditech_optical_module_raw_sector_num),
     REG_ITERM(kreg_boditech_optical_scan_type),
     REG_ITERM(kreg_boditech_optical_scan_start_pos),
     REG_ITERM(kreg_boditech_optical_scan_direction),

api/apibasic/reg_index.hpp

@@ -44,14 +44,12 @@ typedef enum {
   kreg_pipette_tip_state        = REG_INDEX(40, 0, 2),   // 移动液枪tip状态
   kreg_pipette_limit_ul         = REG_INDEX(40, 50, 0),  // 移液枪ul限制
 
-  /*******************************************************************************
-   *                                smartADC                                     *
-   *******************************************************************************/
-  kreg_self_reflecting_laser_sensor_transmitting_power  = REG_INDEX(41, 0, 0),  // 发射功率
-  kreg_self_reflecting_laser_sensor_receiving_tube_gain = REG_INDEX(41, 0, 1),  // 接收管放大倍数
-  kreg_self_reflecting_laser_sensor_sample_interval_ms  = REG_INDEX(41, 0, 2),  // 采样率
-  kreg_self_reflecting_laser_sensor_num_samples         = REG_INDEX(41, 0, 3),  // 采样点数
+  /***********************************************************************************************************************
+   *                                                      光学模组                                                       *
+   ***********************************************************************************************************************/
 
+  kreg_boditech_optical_module_raw_sector_size = REG_INDEX(41, 0, 0),  // sector_size
+  kreg_boditech_optical_module_raw_sector_num  = REG_INDEX(41, 0, 1),  //
   // scan action
   kreg_boditech_optical_scan_type                   = REG_INDEX(42, 0, 0),  // 0 t光学，1 f光学
   kreg_boditech_optical_scan_start_pos              = REG_INDEX(42, 0, 1),

api/zi_a8000_optical_module.hpp

@@ -5,7 +5,6 @@
 
 #include "apibasic/basic.hpp"
 
-
 namespace iflytop {
 using namespace std;
 class ZIA8000OpticalModule {
@@ -18,6 +17,8 @@ class ZIA8000OpticalModule {
 
  public:
   virtual ~ZIA8000OpticalModule(){};
+  virtual int32_t a8000_optical_start_capture()                                      = 0;
+  virtual int32_t a8000_optical_read_raw(int32_t index, uint8_t* data, int32_t* len) = 0;
 
   /*******************************************************************************
    *                                    TEST                                     *
@@ -27,13 +28,13 @@ class ZIA8000OpticalModule {
    *   1. 下面方法属于单步测试采样的方法，用于调试。一般手动移动光学模组，然后利用下面方法进行测试
    *   2. 正式逻辑不使用下面逻辑
    */
-  virtual int32_t a8000_optical_module_power_ctrl(int32_t state) { return err::kcmd_not_support; }
-  virtual int32_t a8000_optical_open_laser(int32_t type) { return err::kcmd_not_support; }
-  virtual int32_t a8000_optical_close_laser(int32_t type) { return err::kcmd_not_support; }
-  virtual int32_t a8000_optical_set_laster_gain(int32_t type, int32_t gain) { return err::kcmd_not_support; }
-  virtual int32_t a8000_optical_set_scan_amp_gain(int32_t type, int32_t gain) { return err::kcmd_not_support; }
-  virtual int32_t a8000_optical_read_scanner_adc_val(int32_t type, int32_t* adcval) { return err::kcmd_not_support; }
-  virtual int32_t a8000_optical_read_laster_adc_val(int32_t type, int32_t* adcval) { return err::kcmd_not_support; }
+  virtual int32_t a8000_optical_module_power_ctrl(int32_t state)                    = 0;
+  virtual int32_t a8000_optical_open_laser(int32_t type)                            = 0;
+  virtual int32_t a8000_optical_close_laser(int32_t type)                           = 0;
+  virtual int32_t a8000_optical_set_laster_gain(int32_t type, int32_t gain)         = 0;
+  virtual int32_t a8000_optical_set_scan_amp_gain(int32_t type, int32_t gain)       = 0;
+  virtual int32_t a8000_optical_read_scanner_adc_val(int32_t type, int32_t* adcval) = 0;
+  virtual int32_t a8000_optical_read_laster_adc_val(int32_t type, int32_t* adcval)  = 0;
   /**
    * @brief 打开闪光灯读取当前这一点的采样信息
    *