Browse Source

update

master
zhaohe 1 year ago
parent
commit
85d2a97eb1
  1. 36
      components/zcancmder/zcan_protocol_parser.cpp
  2. 12
      components/zcancmder/zcan_protocol_parser.hpp

36
components/zcancmder/zcan_protocol_parser.cpp

@ -55,11 +55,13 @@ void ZCanProtocolParser::initialize(IZCanReceiver* cancmder) {
REGFN(mini_servo_rotate);
REGFN(mini_servo_rotate_with_torque);
REGFN(board_read_ext_inio);
REGFN(board_write_ext_outio);
REGFN(board_read_muti_inio);
REGFN(board_read_inio_index_in_stm32);
REGFN(board_read_outio_index_in_stm32);
REGFN(extboard_read_inio);
REGFN(extboard_write_outio);
REGFN(extboard_read_muti_inio);
REGFN(extboard_read_inio_index_in_stm32);
REGFN(extboard_read_outio_index_in_stm32);
REGFN(extboard_read_outio);
REGFN(code_scaner_start_scan);
REGFN(code_scaner_stop_scan);
@ -381,42 +383,42 @@ int32_t ZCanProtocolParser::mini_servo_rotate_with_torque(cmdcontxt_t* cxt) {
* ZIBoard *
***********************************************************************************************************************/
#define MODULE_CLASS ZIBoard
int32_t ZCanProtocolParser::board_read_ext_inio(cmdcontxt_t* cxt) {
int32_t ZCanProtocolParser::extboard_read_inio(cmdcontxt_t* cxt) {
CHECK_AND_GET_MODULE(1);
int32_t* ack = (int32_t*)cxt->ackbuf;
cxt->acklen = 4;
return module->board_read_ext_inio(cxt->params[0], ack);
return module->extboard_read_inio(cxt->params[0], ack);
}
int32_t ZCanProtocolParser::board_write_ext_outio(cmdcontxt_t* cxt) {
int32_t ZCanProtocolParser::extboard_write_outio(cmdcontxt_t* cxt) {
CHECK_AND_GET_MODULE(2);
return module->kboard_write_ext_outio(cxt->params[0], cxt->params[1]);
return module->kextboard_write_outio(cxt->params[0], cxt->params[1]);
}
int32_t ZCanProtocolParser::board_read_muti_inio(cmdcontxt_t* cxt) {
int32_t ZCanProtocolParser::extboard_read_muti_inio(cmdcontxt_t* cxt) {
CHECK_AND_GET_MODULE(0);
int32_t* ack = (int32_t*)cxt->ackbuf;
cxt->acklen = 4;
return module->board_read_muti_inio(ack);
return module->extboard_read_muti_inio(ack);
}
int32_t ZCanProtocolParser::board_read_inio_index_in_stm32(cmdcontxt_t* cxt) {
int32_t ZCanProtocolParser::extboard_read_inio_index_in_stm32(cmdcontxt_t* cxt) {
CHECK_AND_GET_MODULE(1);
int32_t* ack = (int32_t*)cxt->ackbuf;
cxt->acklen = 4;
return module->board_read_inio_index_in_stm32(cxt->params[0], ack);
return module->extboard_read_inio_index_in_stm32(cxt->params[0], ack);
}
int32_t ZCanProtocolParser::board_read_outio_index_in_stm32(cmdcontxt_t* cxt) {
int32_t ZCanProtocolParser::extboard_read_outio_index_in_stm32(cmdcontxt_t* cxt) {
CHECK_AND_GET_MODULE(1);
int32_t* ack = (int32_t*)cxt->ackbuf;
cxt->acklen = 4;
return module->board_read_outio_index_in_stm32(cxt->params[0], ack);
return module->extboard_read_outio_index_in_stm32(cxt->params[0], ack);
}
int32_t ZCanProtocolParser::board_read_outio(cmdcontxt_t* cxt) {
int32_t ZCanProtocolParser::extboard_read_outio(cmdcontxt_t* cxt) {
CHECK_AND_GET_MODULE(1);
int32_t* ack = (int32_t*)cxt->ackbuf;
cxt->acklen = 4;
return module->board_read_outio(cxt->params[0], ack);
return module->extboard_read_outio(cxt->params[0], ack);
}
#undef MODULE_CLASS

12
components/zcancmder/zcan_protocol_parser.hpp

@ -88,12 +88,12 @@ class ZCanProtocolParser : public IZCanReceiverListener {
static int32_t mini_servo_rotate(cmdcontxt_t* cxt);
static int32_t mini_servo_rotate_with_torque(cmdcontxt_t* cxt);
static int32_t board_read_ext_inio(cmdcontxt_t* cxt);
static int32_t board_write_ext_outio(cmdcontxt_t* cxt);
static int32_t board_read_muti_inio(cmdcontxt_t* cxt);
static int32_t board_read_inio_index_in_stm32(cmdcontxt_t* cxt);
static int32_t board_read_outio_index_in_stm32(cmdcontxt_t* cxt);
static int32_t board_read_outio(cmdcontxt_t* cxt);
static int32_t extboard_read_inio(cmdcontxt_t* cxt);
static int32_t extboard_write_outio(cmdcontxt_t* cxt);
static int32_t extboard_read_muti_inio(cmdcontxt_t* cxt);
static int32_t extboard_read_inio_index_in_stm32(cmdcontxt_t* cxt);
static int32_t extboard_read_outio_index_in_stm32(cmdcontxt_t* cxt);
static int32_t extboard_read_outio(cmdcontxt_t* cxt);
static int32_t code_scaner_start_scan(cmdcontxt_t* cxt);
static int32_t code_scaner_stop_scan(cmdcontxt_t* cxt);

Loading…
Cancel
Save