소스 검색

modify lidar status in UI

HAPO-9# 3 년 전
부모
커밋
ecacdbb480
2개의 변경된 파일7개의 추가작업 그리고 6개의 파일을 삭제
  1. 6 5
      src/fusion/lidar_radar_fusion_cnn/lidar_radar_fusion_cnn.pro
  2. 1 1
      src/ui/ui_ads_hmi/ADCIntelligentVehicle.cpp

+ 6 - 5
src/fusion/lidar_radar_fusion_cnn/lidar_radar_fusion_cnn.pro

@@ -59,12 +59,13 @@ SOURCES += \
 INCLUDEPATH += /usr/include/eigen3
 INCLUDEPATH += $$PWD/../../include/msgtype
 
-LIBS += -L/usr/local/lib -lprotobuf
-
-INCLUDEPATH += $$PWD/../../../include/
-
-LIBS += -L$$PWD/../../../bin -lxmlparam -lmodulecomm -livlog -livfault
+!include(../../../include/common.pri ) {
+    error( "Couldn't find the common.pri file!" )
+}
 
+!include(../../../include/ivprotobuf.pri ) {
+    error( "Couldn't find the ivprotobuf.pri file!" )
+}
 
 INCLUDEPATH += /usr/include/opencv4/
 LIBS += /usr/lib/aarch64-linux-gnu/libopencv*.so

+ 1 - 1
src/ui/ui_ads_hmi/ADCIntelligentVehicle.cpp

@@ -1564,7 +1564,7 @@ void ADCIntelligentVehicle::UpdateFusion(const char * strdata,const unsigned int
     mfusionarray.CopyFrom(xfusionarray);
     mbfusionUpdate = true;
     mMutexFusion.unlock();
-
+    ServiceCarStatus.mLidarS = 10;
 }