Browse Source

update

master
zhaohe 1 year ago
parent
commit
453c09f80b
  1. 1
      components/step_motor_ctrl_module/step_motor_ctrl_module.hpp
  2. 16
      components/zcancmder/zcan_protocol_parser.cpp
  3. 4
      components/zcancmder/zcan_protocol_parser.hpp

1
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); void initialize(int moduleid, TMC51X0* stepM, ZGPIO iotable[], int nio, config_t* cfg);
static void create_default_cfg(config_t& cfg); static void create_default_cfg(config_t& cfg);
config_t* get_cfg() { return &m_cfg; }
/*********************************************************************************************************************** /***********************************************************************************************************************
* ZIModule * * ZIModule *

16
components/zcancmder/zcan_protocol_parser.cpp

@ -117,10 +117,10 @@ void ZCanProtocolParser::initialize(IZCanReceiver* cancmder) {
REGFN(a8000_idcard_reader_read_raw); 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_stop_scan);
REGFN(plate_code_scaner_read_result); 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_read_code);
REGFN(plate_code_scaner_adc_readraw); REGFN(plate_code_scaner_adc_readraw);
REGFN(plate_code_scaner_open_laser); REGFN(plate_code_scaner_open_laser);
@ -741,19 +741,19 @@ int32_t ZCanProtocolParser::a8000_idcard_reader_read_raw(cmdcontxt_t* cxt) {
#undef MODULE_CLASS #undef MODULE_CLASS
#define MODULE_CLASS ZI_PlateCodeScanerModule #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_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(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_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_adc_readraw(int32_t* val) = 0;
// virtual int32_t plate_code_scaner_open_laser() = 0; // virtual int32_t plate_code_scaner_open_laser() = 0;
// virtual int32_t plate_code_scaner_close_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); 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) { 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; 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); CHECK_AND_GET_MODULE(0);
int32_t* ack = (int32_t*)cxt->ackbuf; int32_t* ack = (int32_t*)cxt->ackbuf;
cxt->acklen = 4; 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) { int32_t ZCanProtocolParser::plate_code_scaner_read_code(cmdcontxt_t* cxt) {

4
components/zcancmder/zcan_protocol_parser.hpp

@ -156,10 +156,10 @@ class ZCanProtocolParser : public IZCanReceiverListener {
CMDFN(a8000_idcard_reader_read_raw); 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_stop_scan);
CMDFN(plate_code_scaner_read_result); 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_read_code);
CMDFN(plate_code_scaner_adc_readraw); CMDFN(plate_code_scaner_adc_readraw);
CMDFN(plate_code_scaner_open_laser); CMDFN(plate_code_scaner_open_laser);

Loading…
Cancel
Save