From 453c09f80bc5f51b5285d9f8b12df86c973a3515 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Mon, 24 Jun 2024 19:56:43 +0800 Subject: [PATCH] update --- .../step_motor_ctrl_module/step_motor_ctrl_module.hpp | 1 + components/zcancmder/zcan_protocol_parser.cpp | 16 ++++++++-------- components/zcancmder/zcan_protocol_parser.hpp | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/components/step_motor_ctrl_module/step_motor_ctrl_module.hpp b/components/step_motor_ctrl_module/step_motor_ctrl_module.hpp index 1af3f7a..7de0ada 100644 --- a/components/step_motor_ctrl_module/step_motor_ctrl_module.hpp +++ b/components/step_motor_ctrl_module/step_motor_ctrl_module.hpp @@ -55,6 +55,7 @@ class StepMotorCtrlModule : public ZIModule, public ZIStepMotor { void initialize(int moduleid, TMC51X0* stepM, ZGPIO iotable[], int nio, config_t* cfg); static void create_default_cfg(config_t& cfg); + config_t* get_cfg() { return &m_cfg; } /*********************************************************************************************************************** * ZIModule * diff --git a/components/zcancmder/zcan_protocol_parser.cpp b/components/zcancmder/zcan_protocol_parser.cpp index cb8d25b..a91e7fd 100644 --- a/components/zcancmder/zcan_protocol_parser.cpp +++ b/components/zcancmder/zcan_protocol_parser.cpp @@ -117,10 +117,10 @@ void ZCanProtocolParser::initialize(IZCanReceiver* cancmder) { REGFN(a8000_idcard_reader_read_raw); - REGFN(plate_code_scaner_start_scan); + REGFN(plate_code_scaner_push_card_and_scan); REGFN(plate_code_scaner_stop_scan); REGFN(plate_code_scaner_read_result); - REGFN(plate_code_scaner_read_result_packet_num); + REGFN(plate_code_scaner_read_result_point_num); REGFN(plate_code_scaner_read_code); REGFN(plate_code_scaner_adc_readraw); REGFN(plate_code_scaner_open_laser); @@ -741,19 +741,19 @@ int32_t ZCanProtocolParser::a8000_idcard_reader_read_raw(cmdcontxt_t* cxt) { #undef MODULE_CLASS #define MODULE_CLASS ZI_PlateCodeScanerModule -// virtual int32_t plate_code_scaner_start_scan(int32_t startpos) = 0; +// virtual int32_t plate_code_scaner_push_card_and_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_result_point_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_adc_readraw(int32_t* val) = 0; // virtual int32_t plate_code_scaner_open_laser() = 0; // virtual int32_t plate_code_scaner_close_laser() = 0; -int32_t ZCanProtocolParser::plate_code_scaner_start_scan(cmdcontxt_t* cxt) { +int32_t ZCanProtocolParser::plate_code_scaner_push_card_and_scan(cmdcontxt_t* cxt) { CHECK_AND_GET_MODULE(1); - return module->plate_code_scaner_start_scan(cxt->params[0]); + return module->plate_code_scaner_push_card_and_scan(cxt->params[0]); } int32_t ZCanProtocolParser::plate_code_scaner_stop_scan(cmdcontxt_t* cxt) { @@ -771,11 +771,11 @@ int32_t ZCanProtocolParser::plate_code_scaner_read_result(cmdcontxt_t* cxt) { return suc; } -int32_t ZCanProtocolParser::plate_code_scaner_read_result_packet_num(cmdcontxt_t* cxt) { +int32_t ZCanProtocolParser::plate_code_scaner_read_result_point_num(cmdcontxt_t* cxt) { CHECK_AND_GET_MODULE(0); int32_t* ack = (int32_t*)cxt->ackbuf; cxt->acklen = 4; - return module->plate_code_scaner_read_result_packet_num(&ack[0]); + return module->plate_code_scaner_read_result_point_num(&ack[0]); } int32_t ZCanProtocolParser::plate_code_scaner_read_code(cmdcontxt_t* cxt) { diff --git a/components/zcancmder/zcan_protocol_parser.hpp b/components/zcancmder/zcan_protocol_parser.hpp index 7581851..09fd677 100644 --- a/components/zcancmder/zcan_protocol_parser.hpp +++ b/components/zcancmder/zcan_protocol_parser.hpp @@ -156,10 +156,10 @@ class ZCanProtocolParser : public IZCanReceiverListener { CMDFN(a8000_idcard_reader_read_raw); -CMDFN(plate_code_scaner_start_scan); +CMDFN(plate_code_scaner_push_card_and_scan); CMDFN(plate_code_scaner_stop_scan); CMDFN(plate_code_scaner_read_result); -CMDFN(plate_code_scaner_read_result_packet_num); +CMDFN(plate_code_scaner_read_result_point_num); CMDFN(plate_code_scaner_read_code); CMDFN(plate_code_scaner_adc_readraw); CMDFN(plate_code_scaner_open_laser);