浏览代码

fix errors

neozhaoliang 3 年之前
父节点
当前提交
bec4357f2c

+ 24 - 0
src/decition/build-decition_brain-unknown-Debug/.qmake.stash

@@ -0,0 +1,24 @@
+QMAKE_CXX.INCDIRS = \
+    /usr/include/c++/7 \
+    /usr/include/x86_64-linux-gnu/c++/7 \
+    /usr/include/c++/7/backward \
+    /usr/lib/gcc/x86_64-linux-gnu/7/include \
+    /usr/local/include \
+    /usr/lib/gcc/x86_64-linux-gnu/7/include-fixed \
+    /usr/include/x86_64-linux-gnu \
+    /usr/include
+QMAKE_CXX.LIBDIRS = \
+    /usr/lib/gcc/x86_64-linux-gnu/7 \
+    /usr/lib/x86_64-linux-gnu \
+    /usr/lib \
+    /lib/x86_64-linux-gnu \
+    /lib
+QMAKE_CXX.QT_COMPILER_STDCXX = 201402L
+QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7
+QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 5
+QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0
+QMAKE_CXX.COMPILER_MACROS = \
+    QT_COMPILER_STDCXX \
+    QMAKE_GCC_MAJOR_VERSION \
+    QMAKE_GCC_MINOR_VERSION \
+    QMAKE_GCC_PATCH_VERSION

二进制
src/decition/build-decition_brain-unknown-Debug/decition_brain


+ 2 - 2
src/decition/common/main.cpp

@@ -2,7 +2,7 @@
 
 #include "ivlog.h"
 
-#include "decition/brain.h"
+#include "decision/brain.h"
 
 #include "xmlparam.h"
 #include "ivversion.h"
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
     gstrmembrainstate = xp.GetParam("brainstate","brainstate");
     gstrmemchassis = xp.GetParam("chassismsgname","chassis");
 
-    iv::decition::BrainDecition brain;
+    iv::decision::BrainDecition brain;
     brain.inialize();
     brain.start();
     return a.exec();

+ 1 - 1
src/decition/common/perception/impl_gps.cpp

@@ -1,5 +1,5 @@
 #include <perception/sensor_gps.h>
-#include <decition/gnss_coordinate_convert.h>
+#include <decision/gnss_coordinate_convert.h>
 #include <control/can.h>
 #include <QDebug>
 #include <QNetworkDatagram>