Merge branch 'master' of 192.168.1.3:manufacturer_stm32/iflytop_stm32_os_sdk

components/zcancmder/zcanreceiver.cpp

@@ -196,7 +196,18 @@ int32_t ZCanCmder::sendAck(zcr_cmd_header_t *rx_cmd_header, int32_t *ackvar, int
   sendPacket(txbuff, sizeof(zcr_cmd_header_t) + sizeof(int32_t) * nack);
   return 0;
 }
-int32_t ZCanCmder::sendErrorAck(zcr_cmd_header_t *rx_cmd_header, int32_t errorcode) {}
+int32_t ZCanCmder::sendErrorAck(zcr_cmd_header_t *rx_cmd_header, int32_t errorcode) {
+  zlock_guard       l(m_lock);
+  zcr_cmd_header_t *txheader = (zcr_cmd_header_t *)txbuff;
+  memcpy(txheader, rx_cmd_header, sizeof(zcr_cmd_header_t));
+  txheader->packetType = kptv2_error_ack;
+
+  int32_t *txackcache = (int32_t *)txheader->data;
+  txackcache[0]       = errorcode;
+
+  sendPacket(txbuff, sizeof(zcr_cmd_header_t) + sizeof(int32_t));
+  return 0;
+}
 
 bool ZCanCmder::sendPacketSub(int npacket, int packetIndex, uint8_t *packet, size_t len, int overtimems) {
   zlock_guard l(m_lock);