From f31a251dd7c826e3125212681c4381cf4e86f0b7 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Mon, 24 Jun 2024 10:17:16 +0800 Subject: [PATCH] update --- api/apibasic/errorcode.cpp | 1 + api/apibasic/errorcode.hpp | 1 + api/apibasic/reg_index.cpp | 7 +++++++ api/zi_plate_code_scaner_module.hpp | 1 + 4 files changed, 10 insertions(+) diff --git a/api/apibasic/errorcode.cpp b/api/apibasic/errorcode.cpp index 4985e80..418d680 100644 --- a/api/apibasic/errorcode.cpp +++ b/api/apibasic/errorcode.cpp @@ -57,6 +57,7 @@ static ecode_table_item_t table[] = { ERR_ITERM(kpipette_error_uninited), ERR_ITERM(kpipette_error_not_lld_prepare), ERR_ITERM(kpipette_error_tipisload_when_lld_prepare), + ERR_ITERM(kpipette_error_pump_load_val_is_not_empty), ERR_ITERM(kstep_motor_not_found_zero_point), ERR_ITERM(kstep_motor_not_go_zero), ERR_ITERM(kstep_motor_over_temperature), diff --git a/api/apibasic/errorcode.hpp b/api/apibasic/errorcode.hpp index 271acca..ae6ee72 100644 --- a/api/apibasic/errorcode.hpp +++ b/api/apibasic/errorcode.hpp @@ -68,6 +68,7 @@ typedef enum { 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 + kpipette_error_pump_load_val_is_not_empty = ERROR_CODE(500, 3), // 为执行lld_prepare /*********************************************************************************************************************** * 步进电机错误码 * diff --git a/api/apibasic/reg_index.cpp b/api/apibasic/reg_index.cpp index 062c35a..50093a2 100644 --- a/api/apibasic/reg_index.cpp +++ b/api/apibasic/reg_index.cpp @@ -139,6 +139,13 @@ static reginfo_t table[] = { REG_ITERM(kreg_id_card_reader_raw_sector_size), REG_ITERM(kreg_id_card_reader_raw_sector_num), REG_ITERM(kreg_id_card_reader_is_online), + + REG_ITERM(kreg_plate_code_scaner_laster_gain), + REG_ITERM(kreg_plate_code_scaner_scan_gain), + REG_ITERM(kreg_plate_code_scaner_start_scan_pos), + REG_ITERM(kreg_plate_code_scaner_scan_step_interval), + REG_ITERM(kreg_plate_code_scaner_scan_point_num), + }; reginfo_t *get_reginfo_by_index(int32_t index) { diff --git a/api/zi_plate_code_scaner_module.hpp b/api/zi_plate_code_scaner_module.hpp index b4ef191..ef3e6d8 100644 --- a/api/zi_plate_code_scaner_module.hpp +++ b/api/zi_plate_code_scaner_module.hpp @@ -12,6 +12,7 @@ class ZI_PlateCodeScanerModule { public: virtual ~ZI_PlateCodeScanerModule(){}; virtual int32_t plate_code_scaner_start_scan(int32_t startpos) = 0; + virtual int32_t plate_code_scaner_stop_scan() = 0; virtual int32_t plate_code_scaner_read_result(int32_t packetIndex, uint8_t* data, int32_t* len) = 0; virtual int32_t plate_code_scaner_read_result_packet_num(int32_t* packetNum) = 0; virtual int32_t plate_code_scaner_read_code(int32_t* code) = 0;