diff --git a/api/apibasic/cmdid.cpp b/api/apibasic/cmdid.cpp index 62f6990..cab2df2 100644 --- a/api/apibasic/cmdid.cpp +++ b/api/apibasic/cmdid.cpp @@ -48,7 +48,6 @@ static cmdinfo_t table[] = { CMD_ITERM(kpipette_aspirate_llf), CMD_ITERM(kpipette_distribut_llf), CMD_ITERM(kpipette_shake_up_llf), - CMD_ITERM(ka8000_optical_module_power_ctrl), CMD_ITERM(ka8000_optical_open_laser), @@ -108,6 +107,15 @@ static cmdinfo_t table[] = { CMD_ITERM(ktemp_controler_enable_log), CMD_ITERM(ka8000_idcard_reader_read_raw), + + CMD_ITERM(kplate_code_scaner_start_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_code), + CMD_ITERM(kplate_code_scaner_adc_readraw), + CMD_ITERM(kplate_code_scaner_open_laser), + CMD_ITERM(kplate_code_scaner_close_laser), }; const char* cmdid2str(int32_t code) { diff --git a/api/apibasic/cmdid.hpp b/api/apibasic/cmdid.hpp index 34ac91f..d8ae831 100644 --- a/api/apibasic/cmdid.hpp +++ b/api/apibasic/cmdid.hpp @@ -153,10 +153,14 @@ typedef enum { * 板夹仓板夹扫码 * ***********************************************************************************************************************/ - kplate_clamp_case_start_scan = CMDID(0x73, 1), // para:{}, ack:{} - kplate_clamp_case_stop_scan = CMDID(0x73, 2), // para:{}, ack:{} - kplate_clamp_case_readcode = CMDID(0x73, 3), // para:{}, ack:{} - + 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), // } cmdid_t; diff --git a/api/apibasic/reg_index.cpp b/api/apibasic/reg_index.cpp index 50093a2..d3ae271 100644 --- a/api/apibasic/reg_index.cpp +++ b/api/apibasic/reg_index.cpp @@ -140,9 +140,8 @@ static reginfo_t table[] = { 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_laster_intensity), 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), diff --git a/api/apibasic/reg_index.hpp b/api/apibasic/reg_index.hpp index f3162c1..f0aabc5 100644 --- a/api/apibasic/reg_index.hpp +++ b/api/apibasic/reg_index.hpp @@ -185,11 +185,10 @@ typedef enum { * BOARD * ***********************************************************************************************************************/ - kreg_plate_code_scaner_laster_gain = REG_INDEX(103, 0, 1), + 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_start_scan_pos = REG_INDEX(103, 0, 3), - kreg_plate_code_scaner_scan_step_interval = REG_INDEX(103, 0, 4), - kreg_plate_code_scaner_scan_point_num = REG_INDEX(103, 0, 5), + kreg_plate_code_scaner_scan_step_interval = REG_INDEX(103, 0, 3), + kreg_plate_code_scaner_scan_point_num = REG_INDEX(103, 0, 4), } reg_index_t; diff --git a/api/zi_plate_code_scaner_module.hpp b/api/zi_plate_code_scaner_module.hpp index ef3e6d8..0358b30 100644 --- a/api/zi_plate_code_scaner_module.hpp +++ b/api/zi_plate_code_scaner_module.hpp @@ -15,7 +15,7 @@ class ZI_PlateCodeScanerModule { 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; + virtual int32_t plate_code_scaner_read_code(int32_t* code0, int32_t* code1) = 0; virtual int32_t plate_code_scaner_adc_readraw(int32_t* val) = 0; virtual int32_t plate_code_scaner_open_laser() = 0;