From 256fe59bfa94c74048a27af152a76d4ffa649578 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Thu, 20 Jun 2024 17:39:24 +0800 Subject: [PATCH] update --- api/apibasic/errorcode.hpp | 1 + api/apibasic/reg_index.cpp | 8 ++++---- api/apibasic/reg_index.hpp | 30 +++++++++++++++--------------- api/zi_module.cpp | 4 ++-- api/zi_module.hpp | 2 +- 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/api/apibasic/errorcode.hpp b/api/apibasic/errorcode.hpp index 2da23c3..271acca 100644 --- a/api/apibasic/errorcode.hpp +++ b/api/apibasic/errorcode.hpp @@ -67,6 +67,7 @@ typedef enum { kpipette_error_TipLoadFail = ERROR_CODE(400, 21), kpipette_error_tipisload_when_lld_prepare = ERROR_CODE(500, 0), // 未卸载Tip就进行LLD准备 kpipette_error_uninited = ERROR_CODE(500, 1), // 泵机未初始化 + kpipette_error_not_lld_prepare = ERROR_CODE(500, 2), // 为执行lld_prepare /*********************************************************************************************************************** * 步进电机错误码 * diff --git a/api/apibasic/reg_index.cpp b/api/apibasic/reg_index.cpp index 0ea4e79..54551dc 100644 --- a/api/apibasic/reg_index.cpp +++ b/api/apibasic/reg_index.cpp @@ -51,7 +51,7 @@ static reginfo_t table[] = { REG_ITERM(kreg_pipette_pump_vmax), REG_ITERM(kreg_pipette_lld_velocity), REG_ITERM(kreg_pipette_data_sample_period), - +// 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), @@ -60,13 +60,13 @@ static reginfo_t table[] = { REG_ITERM(kreg_boditech_optical_scan_step_interval), REG_ITERM(kreg_boditech_optical_scan_pointnum), REG_ITERM(kreg_boditech_optical_channel_select_num), - REG_ITERM(kreg_boditech_optical_laster_gain), - REG_ITERM(kreg_boditech_optical_scan_gain), + REG_ITERM(kreg_boditech_optical_laster_gain_potentiometer_val), + REG_ITERM(kreg_boditech_optical_scan_gain_potentiometer), REG_ITERM(kreg_boditech_optical_trf_uvled_on_duration_us), REG_ITERM(kreg_boditech_optical_trf_uvled_off_duration_us), REG_ITERM(kreg_boditech_optical_trf_scan_delay_us), REG_ITERM(kreg_boditech_optical_trf_scan_duration_us), - REG_ITERM(kreg_boditech_optical_scan_gain_adjust_suggestion), + REG_ITERM(kreg_boditech_optical_scan_gain_potentiometer_adjust_suggestion), REG_ITERM(kreg_boditech_optical_adc_result_overflow), REG_ITERM(kreg_boditech_optical_laster_intensity), REG_ITERM(kreg_laster_scaner_scan_type), diff --git a/api/apibasic/reg_index.hpp b/api/apibasic/reg_index.hpp index 72b1784..b4cec02 100644 --- a/api/apibasic/reg_index.hpp +++ b/api/apibasic/reg_index.hpp @@ -69,21 +69,21 @@ typedef enum { 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), - kreg_boditech_optical_scan_direction = REG_INDEX(42, 0, 2), - kreg_boditech_optical_scan_step_interval = REG_INDEX(42, 0, 3), - kreg_boditech_optical_scan_pointnum = REG_INDEX(42, 0, 4), - kreg_boditech_optical_channel_select_num = REG_INDEX(42, 0, 5), - kreg_boditech_optical_laster_gain = REG_INDEX(42, 0, 6), - kreg_boditech_optical_scan_gain = REG_INDEX(42, 0, 7), - kreg_boditech_optical_trf_uvled_on_duration_us = REG_INDEX(42, 0, 8), - kreg_boditech_optical_trf_uvled_off_duration_us = REG_INDEX(42, 0, 9), - kreg_boditech_optical_trf_scan_delay_us = REG_INDEX(42, 0, 10), - kreg_boditech_optical_trf_scan_duration_us = REG_INDEX(42, 0, 11), - kreg_boditech_optical_scan_gain_adjust_suggestion = REG_INDEX(42, 0, 12), - kreg_boditech_optical_adc_result_overflow = REG_INDEX(42, 0, 13), - kreg_boditech_optical_laster_intensity = REG_INDEX(42, 0, 14), + 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), + kreg_boditech_optical_scan_direction = REG_INDEX(42, 0, 2), + kreg_boditech_optical_scan_step_interval = REG_INDEX(42, 0, 3), + kreg_boditech_optical_scan_pointnum = REG_INDEX(42, 0, 4), + kreg_boditech_optical_channel_select_num = REG_INDEX(42, 0, 5), + kreg_boditech_optical_laster_gain_potentiometer_val = REG_INDEX(42, 0, 6), + kreg_boditech_optical_scan_gain_potentiometer = REG_INDEX(42, 0, 7), + kreg_boditech_optical_trf_uvled_on_duration_us = REG_INDEX(42, 0, 8), + kreg_boditech_optical_trf_uvled_off_duration_us = REG_INDEX(42, 0, 9), + kreg_boditech_optical_trf_scan_delay_us = REG_INDEX(42, 0, 10), + kreg_boditech_optical_trf_scan_duration_us = REG_INDEX(42, 0, 11), + kreg_boditech_optical_scan_gain_potentiometer_adjust_suggestion = REG_INDEX(42, 0, 12), + kreg_boditech_optical_adc_result_overflow = REG_INDEX(42, 0, 13), + kreg_boditech_optical_laster_intensity = REG_INDEX(42, 0, 14), // kreg_laster_scaner_scan_type = REG_INDEX(43, 0, 0), // 0 t光学，1 f光学 diff --git a/api/zi_module.cpp b/api/zi_module.cpp index 4b0759e..01844fe 100644 --- a/api/zi_module.cpp +++ b/api/zi_module.cpp @@ -86,11 +86,11 @@ int32_t ZIModule::module_get_error(int32_t *iserror) { } int32_t ZIModule::module_clear_error() { creg.module_errorcode = 0; - creg.m_module_status = 0; + creg.module_status = 0; return 0; } int32_t ZIModule::module_get_status(int32_t *status) { - *status = creg.m_module_status; + *status = creg.module_status; return 0; } diff --git a/api/zi_module.hpp b/api/zi_module.hpp index f689cf8..8f29739 100644 --- a/api/zi_module.hpp +++ b/api/zi_module.hpp @@ -39,7 +39,7 @@ using namespace std; typedef struct { int32_t module_errorcode; - int32_t m_module_status; + int32_t module_status; } module_common_reg_t; class ZIModule {