diff --git a/api/apibasic/cmdid.cpp b/api/apibasic/cmdid.cpp index cab2df2..415ad71 100644 --- a/api/apibasic/cmdid.cpp +++ b/api/apibasic/cmdid.cpp @@ -108,10 +108,10 @@ static cmdinfo_t table[] = { CMD_ITERM(ka8000_idcard_reader_read_raw), - CMD_ITERM(kplate_code_scaner_start_scan), + CMD_ITERM(kplate_code_scaner_push_card_and_scan), CMD_ITERM(kplate_code_scaner_stop_scan), CMD_ITERM(kplate_code_scaner_read_result), - CMD_ITERM(kplate_code_scaner_read_result_packet_num), + CMD_ITERM(kplate_code_scaner_read_result_point_num), CMD_ITERM(kplate_code_scaner_read_code), CMD_ITERM(kplate_code_scaner_adc_readraw), CMD_ITERM(kplate_code_scaner_open_laser), diff --git a/api/apibasic/cmdid.hpp b/api/apibasic/cmdid.hpp index d8ae831..adb9b48 100644 --- a/api/apibasic/cmdid.hpp +++ b/api/apibasic/cmdid.hpp @@ -153,14 +153,15 @@ typedef enum { * 板夹仓板夹扫码 * ***********************************************************************************************************************/ - kplate_code_scaner_start_scan = CMDID(0x73, 1), // int32_t startpos - kplate_code_scaner_stop_scan = CMDID(0x73, 2), // - kplate_code_scaner_read_result = CMDID(0x73, 3), // int32_t packetIndex, uint8_t* data, int32_t* len - kplate_code_scaner_read_result_packet_num = CMDID(0x73, 4), // int32_t* packetNum - kplate_code_scaner_read_code = CMDID(0x73, 5), // int32_t* code0, int32_t* code1 - kplate_code_scaner_adc_readraw = CMDID(0x73, 6), // int32_t* val - kplate_code_scaner_open_laser = CMDID(0x73, 7), // - kplate_code_scaner_close_laser = CMDID(0x73, 8), // + kplate_code_scaner_push_card_and_scan = CMDID(0x73, 1), // int32_t startpos + kplate_code_scaner_stop_scan = CMDID(0x73, 2), // + kplate_code_scaner_read_result = CMDID(0x73, 3), // int32_t packetIndex, uint8_t* data, int32_t* len + kplate_code_scaner_read_result_point_num = CMDID(0x73, 4), // int32_t* pointNum + kplate_code_scaner_read_code = CMDID(0x73, 5), // int32_t* rawcode, int32_t* legal, int32_t* item, int32_t* lot + + kplate_code_scaner_adc_readraw = CMDID(0x73, 6), // 硬件测试使用 int32_t* val + kplate_code_scaner_open_laser = CMDID(0x73, 7), // 硬件测试使用 + kplate_code_scaner_close_laser = CMDID(0x73, 8), // 硬件测试使用 } cmdid_t; diff --git a/api/apibasic/reg_index.cpp b/api/apibasic/reg_index.cpp index d3ae271..cf9ba5b 100644 --- a/api/apibasic/reg_index.cpp +++ b/api/apibasic/reg_index.cpp @@ -142,8 +142,14 @@ static reginfo_t table[] = { REG_ITERM(kreg_plate_code_scaner_laster_intensity), REG_ITERM(kreg_plate_code_scaner_scan_gain), - REG_ITERM(kreg_plate_code_scaner_scan_step_interval), - REG_ITERM(kreg_plate_code_scaner_scan_point_num), + REG_ITERM(kreg_plate_code_scaner_scan_velocity), + REG_ITERM(kreg_plate_code_scaner_scan_start_pos), + REG_ITERM(kreg_plate_code_scaner_final_stop_pos), + REG_ITERM(kreg_plate_code_scaner_code_judgment_threshold), + REG_ITERM(kreg_plate_code_scaner_item), + REG_ITERM(kreg_plate_code_scaner_lot), + REG_ITERM(kreg_plate_code_scaner_rawcode), + REG_ITERM(kreg_plate_code_scaner_legal_code), }; diff --git a/api/apibasic/reg_index.hpp b/api/apibasic/reg_index.hpp index f0aabc5..9445138 100644 --- a/api/apibasic/reg_index.hpp +++ b/api/apibasic/reg_index.hpp @@ -185,10 +185,16 @@ typedef enum { * BOARD * ***********************************************************************************************************************/ - kreg_plate_code_scaner_laster_intensity = REG_INDEX(103, 0, 1), - kreg_plate_code_scaner_scan_gain = REG_INDEX(103, 0, 2), - kreg_plate_code_scaner_scan_step_interval = REG_INDEX(103, 0, 3), - kreg_plate_code_scaner_scan_point_num = REG_INDEX(103, 0, 4), + kreg_plate_code_scaner_laster_intensity = REG_INDEX(103, 0, 1), + kreg_plate_code_scaner_scan_gain = REG_INDEX(103, 0, 2), + kreg_plate_code_scaner_scan_velocity = REG_INDEX(103, 0, 3), + kreg_plate_code_scaner_scan_start_pos = REG_INDEX(103, 0, 4), + kreg_plate_code_scaner_final_stop_pos = REG_INDEX(103, 0, 5), + kreg_plate_code_scaner_code_judgment_threshold = REG_INDEX(103, 0, 6), + kreg_plate_code_scaner_item = REG_INDEX(103, 0, 7), + kreg_plate_code_scaner_lot = REG_INDEX(103, 0, 8), + kreg_plate_code_scaner_rawcode = REG_INDEX(103, 0, 9), + kreg_plate_code_scaner_legal_code = REG_INDEX(103, 0, 10), } reg_index_t; diff --git a/api/zi_plate_code_scaner_module.hpp b/api/zi_plate_code_scaner_module.hpp index 0358b30..0d52f63 100644 --- a/api/zi_plate_code_scaner_module.hpp +++ b/api/zi_plate_code_scaner_module.hpp @@ -11,11 +11,11 @@ using namespace std; 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* code0, int32_t* code1) = 0; + virtual int32_t plate_code_scaner_push_card_and_scan(int32_t final_stop_pos) = 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_point_num(int32_t* packetNum) = 0; + virtual int32_t plate_code_scaner_read_code(int32_t* rawcode, int32_t* legal, int32_t* item, int32_t* lot) = 0; virtual int32_t plate_code_scaner_adc_readraw(int32_t* val) = 0; virtual int32_t plate_code_scaner_open_laser() = 0;