From 279b7054fe46618b4084fba61bcef40763f7b269 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Thu, 29 Feb 2024 15:42:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20zcanhost=EF=BC=8C=E6=AF=8F?=
 =?UTF-8?q?=E6=AC=A1=E5=8F=91=E9=80=81=E6=8C=87=E4=BB=A4=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E8=87=B3=E5=B0=91=E5=BB=B6=E6=97=B610ms=20=E6=89=8D=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91=E4=B8=8B=E4=B8=80=E6=9D=A1=E6=8C=87=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/iflytop/components/zcanreceiver/zcanhost.cpp         | 5 +++--
 src/iflytop/components/zcanreceiver/zcanreceiverhost.cpp | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/iflytop/components/zcanreceiver/zcanhost.cpp b/src/iflytop/components/zcanreceiver/zcanhost.cpp
index d3553dc..9536412 100644
--- a/src/iflytop/components/zcanreceiver/zcanhost.cpp
+++ b/src/iflytop/components/zcanreceiver/zcanhost.cpp
@@ -392,16 +392,17 @@ int32_t ZCanHost::huacheng_pressure_sensor_read_c1005(int sensorid, huacheng_pre
 
   auto rx = m_zcanReceiverHost->sendcmdblock(cmd, 100);
   if (!rx) {
+    logger->error("huacheng_pressure_sensor_read_c1005 {} no ack", sensorid);
     return err::zecode(err::knoack);
   }
 
   if (rx->packetType == kpt_error_ack) {
-    logger->error("huacheng_pressure_sensor_read_c1005 error ack");
+    logger->error("huacheng_pressure_sensor_read_c1005 {} error ack", sensorid);
     return err::zecode(err::kfail);
   }
 
   if (rx->len != 10) {
-    logger->warn("huacheng_pressure_sensor_read_c1005 rx len error:{}", rx->len);
+    logger->warn("huacheng_pressure_sensor_read_c1005 {} rx len error:{}", sensorid, rx->len);
     return err::zecode(err::kfail);
   }
 
diff --git a/src/iflytop/components/zcanreceiver/zcanreceiverhost.cpp b/src/iflytop/components/zcanreceiver/zcanreceiverhost.cpp
index 987ce45..677b907 100644
--- a/src/iflytop/components/zcanreceiver/zcanreceiverhost.cpp
+++ b/src/iflytop/components/zcanreceiver/zcanreceiverhost.cpp
@@ -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);