Browse Source

update

master
zhaohe 2 years ago
parent
commit
dc03341cd3
  1. 8
      components/zcancmder/zcanreceiver_master.cpp

8
components/zcancmder/zcanreceiver_master.cpp

@ -126,7 +126,7 @@ int32_t ZCanCommnaderMaster::sendCmd(int32_t cmdid, int32_t submoduleid, int32_t
cmdheader->cmdmoduleid = MODULE_CMDID(cmdid);
cmdheader->subcmdid = SUBCMDID(cmdid);
cmdheader->submoduleid = submoduleid;
ZLOGI(TAG, "sendCmd %d %d %d %d", cmdheader->packetindex, cmdheader->cmdmoduleid, cmdheader->subcmdid, cmdheader->submoduleid);
// ZLOGI(TAG, "sendCmd %d %d %d %d", cmdheader->packetindex, cmdheader->cmdmoduleid, cmdheader->subcmdid, cmdheader->submoduleid);
int32_t *sendparam = (int32_t *)cmdheader->data;
for (size_t i = 0; i < npara; i++) {
sendparam[i] = param[i];
@ -140,14 +140,14 @@ int32_t ZCanCommnaderMaster::sendCmd(int32_t cmdid, int32_t submoduleid, int32_t
bool rxdataIsReady = false;
int32_t errocode = 0;
regListener(cmdheader->packetindex, [this, &rxdataIsReady, &ack, &nack, &errocode](CanPacketRxBuffer *report) {
ZLOGI(TAG, "....................................");
// ZLOGI(TAG, "....................................");
if (report->get_cmdheader()->packetType == kptv2_error_ack) {
auto *error_ack = report->get_data_as<int32_t>();
errocode = *error_ack;
ZLOGI(TAG, "error_ack %d %s", *error_ack, err::error2str(*error_ack));
// ZLOGI(TAG, "error_ack %d %s", *error_ack, err::error2str(*error_ack));
} else {
ZLOGI(TAG, "%d %d", report->get_datalen(), nack);
// ZLOGI(TAG, "%d %d", report->get_datalen(), nack);
int32_t *rxbuf = report->get_data_as<int32_t>();
if (ack != nullptr && nack != 0) {
for (size_t i = 0; i < nack; i++) {

Loading…
Cancel
Save