瀏覽代碼

change CAFD.

pilot 2 年之前
父節點
當前提交
3d2af135f8
共有 2 個文件被更改,包括 5 次插入3 次删除
  1. 3 2
      src/detection/detection_chassis/decodechassis.cpp
  2. 2 1
      src/driver/driver_can_nvidia_agx/nvcan.cpp

+ 3 - 2
src/detection/detection_chassis/decodechassis.cpp

@@ -471,10 +471,11 @@ int ProcShenLanCANFDChassis(void *pa, iv::can::canmsg *pmsg)
     for(i=0;i<pmsg->rawmsg_size();i++)
     {
 
-        const iv::can::canraw * praw = &(pmsg->rawmsg(i));
+        iv::can::canraw * praw =  pmsg->mutable_rawmsg(i);//&(pmsg->rawmsg(i));
+ //       qDebug("id: % 0x2x",praw->id());
 //        unsigned char data[8];
 //        memcpy(data,praw->data().data(),8);
-        if(praw->id() == 0x1CC)
+        if(praw->id() == 0x1C2)
         {
             unsigned char byte[64];
             double vehspeed;

+ 2 - 1
src/driver/driver_can_nvidia_agx/nvcan.cpp

@@ -205,7 +205,8 @@ void nvcan::run()
                 if((frame.can_id&0x40000000)!= 0)msg.isRemote = true;
                 else msg.isRemote = false;
                 msg.nLen = frame.len;
-                if((frame.len<64)&&(frame.len>0))memcpy(msg.data,frame.data,frame.len);
+//                if(msg.id == 0x1c2)qDebug("id = %08x",msg.id);
+                if((frame.len<=64)&&(frame.len>0))memcpy(msg.data,frame.data,frame.len);
                 if(mMsgRecvBuf[i].size()<BUF_SIZE)
                 {
                     mMsgRecvBuf[i].push_back(msg);