Prechádzať zdrojové kódy

change apollo hcp2, test data ok . function need test outside .

yuchuli 2 týždňov pred
rodič
commit
fe2ebb456f

+ 4 - 1
src/apollo/apollolib/hcp2/hcp2.cpp

@@ -193,6 +193,7 @@ void hcp2::threadrecv()
         len = read(fd, strbuf, 999);
         if(len > 0)
         {
+ //           std::cout<<" recve data. len: "<<len<<std::endl;
             strbuf[len] = 0;
             mstrgpsdata = mstrgpsdata + strbuf;
             SerialGPSDecode();
@@ -222,10 +223,12 @@ void hcp2::SerialGPSDecode()
 void hcp2::SerialGPSDecodeSen(std::string strsen)
 {
     std::vector<std::string> strlistrmc;
-    strlistrmc = splitByCommaManual(strsen,'\n');
+    strlistrmc = splitByCommaManual(strsen,',');
 
    if(strlistrmc.size() < 23)return;
    if(strlistrmc.at(0) != "$GPCHC")return;
+   
+   
 
    if(!checknmeasen(strsen.data(),strsen.length()))
    {

+ 7 - 7
src/apollo/code/apollodriver_hcp2/apollodriver_hcp2.pro

@@ -20,13 +20,13 @@ DEFINES += QT_DEPRECATED_WARNINGS
 
 SOURCES += \
         main.cpp \
-        /apollo_workspace/modules/common_msgs/localization_msgs/localization.pb.cc  \
-        /apollo_workspace/modules/common_msgs/localization_msgs/localization_status.pb.cc  \
-        /apollo_workspace/modules/common_msgs/localization_msgs/pose.pb.cc  \
-        /apollo_workspace/modules/common_msgs/basic_msgs/header.pb.cc  \
-        /apollo_workspace/modules/common_msgs/basic_msgs/pnc_point.pb.cc  \ 
-        /apollo_workspace/modules/common_msgs/basic_msgs/geometry.pb.cc  \
-        /apollo_workspace/modules/common_msgs/basic_msgs/error_code.pb.cc
+        /apollo_workspace/bazel-bin/external/apollo_src/modules/common_msgs/localization_msgs/localization.pb.cc  \
+        /apollo_workspace/bazel-bin/external/apollo_src/modules/common_msgs/localization_msgs/localization_status.pb.cc  \
+        /apollo_workspace/bazel-bin/external/apollo_src/modules/common_msgs/localization_msgs/pose.pb.cc  \
+        /apollo_workspace/bazel-bin/external/apollo_src/modules/common_msgs/basic_msgs/header.pb.cc  \
+        /apollo_workspace/bazel-bin/external/apollo_src/modules/common_msgs/basic_msgs/pnc_point.pb.cc  \ 
+        /apollo_workspace/bazel-bin/external/apollo_src/modules/common_msgs/basic_msgs/geometry.pb.cc  \
+        /apollo_workspace/bazel-bin/external/apollo_src/modules/common_msgs/basic_msgs/error_code.pb.cc
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin

+ 2 - 1
src/apollo/code/apollodriver_hcp2/main.cpp

@@ -85,6 +85,7 @@ void PublishLocalization(const double x,const double y,const double z,const doub
 
 void hcp2callback(iv::rawgps xrawgps)
 {
+//    std::cout<<"call callback. "<<std::endl;
     double flon = xrawgps.mfLon;
     double flat = xrawgps.mfLat;
     
@@ -106,7 +107,7 @@ int main(int argc, char *argv[])
 
     localization_writer_ = pilot_node->CreateWriter<apollo::localization::LocalizationEstimate>("/apollo/localization/adcpose");
 
-    std::string strgpsport =  "/dev/ttyUSB0";
+    std::string strgpsport =  "/dev/ttyTHS1";
     hcp2fun funcall = std::bind(&hcp2callback,std::placeholders::_1);
     hcp2 xhcp2(strgpsport,funcall);