|
|
@ -56,6 +56,7 @@ shared_ptr<ZCanReceiverCMD> ZCanReceiverHost::sendcmdblock(shared_ptr<ZCanReceiv |
|
|
|
logger->warn("sendcmdblock(index {},cmd {},subcmd {}) fail,timeout", cmd->packetindex, cmd->cmdid, cmd->subcmdid); |
|
|
|
return nullptr; |
|
|
|
} |
|
|
|
usleep(10*1000); |
|
|
|
return m_txContext.rx; |
|
|
|
} |
|
|
|
|
|
|
@ -125,8 +126,8 @@ void ZCanReceiverHost::processOnePacket(CanPacketRxBuffer *rxbuf, uint8_t *packe |
|
|
|
/**
|
|
|
|
* @brief 匹配下发的命令 |
|
|
|
*/ |
|
|
|
logger->debug("processOnePacket(index {}, packetType {} ,cmd {},subcmd {}),rx(index {})", header->packetindex, header->packetType, header->cmdid, |
|
|
|
header->subcmdid, rx->packetindex); |
|
|
|
// logger->info("processOnePacket(index {}, packetType {} ,cmd {},subcmd {}),rx(index {})", header->packetindex, header->packetType, header->cmdid,
|
|
|
|
// header->subcmdid, rx->packetindex);
|
|
|
|
if (header->packetType == kpt_ack || header->packetType == kpt_error_ack) { |
|
|
|
if (header->packetindex == m_txContext.txcmdcache->packetindex) { |
|
|
|
lock_guard<mutex> lock(m_txContextLock); |
|
|
|