Bladeren bron

change controller_ge3, fix serialize error. change driver_can_kvaser, fix memory error. need update.

yuchuli 3 jaren geleden
bovenliggende
commit
8e909ecc4d
2 gewijzigde bestanden met toevoegingen van 3 en 2 verwijderingen
  1. 1 1
      src/controller/controller_ge3/main.cpp
  2. 2 1
      src/driver/driver_can_kvaser/canctrl.cpp

+ 1 - 1
src/controller/controller_ge3/main.cpp

@@ -245,7 +245,7 @@ void ExecSend()
     char * strser = new char[ndatasize];
     std::shared_ptr<char> pstrser;
     pstrser.reset(strser);
-    if(xmsg.SerializePartialToArray(strser,ndatasize))
+    if(xmsg.SerializeToArray(strser,ndatasize))
     {
         iv::modulecomm::ModuleSendMsg(gpacansend,strser,ndatasize);
     }

+ 2 - 1
src/driver/driver_can_kvaser/canctrl.cpp

@@ -258,7 +258,7 @@ void canctrl::sharecanmsg(void *xpa, basecan_msg * pxmsg,int ncount,int nch)
 
     int nsize = xmsg.ByteSize();
     char * strdata = new char[xmsg.ByteSize()];
-    if(xmsg.SerializePartialToArray(strdata,nsize))
+    if(xmsg.SerializeToArray(strdata,nsize))
     {
         iv::modulecomm::ModuleSendMsg(xpa,strdata,nsize);
     }
@@ -267,4 +267,5 @@ void canctrl::sharecanmsg(void *xpa, basecan_msg * pxmsg,int ncount,int nch)
         givlog->error("sharecanmsg serialize err");
         gfault->SetFaultState(1, 0, "sharecanmsg serialize err");
     }
+    delete strdata;
 }