Modify HAPO agx1 build script & Disable IVSysMan record qDebug() msg

autodeploy.sh

@@ -1,5 +1,5 @@
 PRO_DIR=`pwd`
-CONFIG_IVSysMan="IVSysMan_midcar.xml"
+CONFIG_IVSysMan="IVSysMan_HAPO_1.xml"
 
 check_result=`whereis patchelf | awk '{print $2}'`
 if [ ! $check_result ];then
@@ -8,17 +8,34 @@ if [ ! $check_result ];then
 fi
 
 app_name=(
+######driver######
 driver_lidar_rs16
-#driver_lidar_vlp16
 driver_gps_hcp2
 driver_can_nvidia_agx
-#driver_can_kvaser
-#driver_can_vci
 driver_map_trace
-driver_radio_p900
+driver_map_xodrload
+driver_rpc_server
+driver_cloud_grpc_client
+driver_grpc_server
+driver_rpc_server
+driver_group_grpc_client
+
+######detection#####
+detection_lidar_PointPillars_MultiHead
 detection_radar_delphi_esr
-detection_lidar_grid
-#view_pointcloud
+detection_chassis
+
+######fusion#####
+lidar_radar_fusion_cnn
+
+######controller######
+controller_hapo
+
+######decition######
+decition_brain_sf
+
+######tools########
+view_pointcloud
 view_gps
 view_rawcan
 view_radar
@@ -26,17 +43,10 @@ IVSysMan
 ivmapmake
 view_ivlog
 tool_querymsg
-detection_chassis
-ui_ads_hmi
-decition_brain
-decition_brain_sf
-#decition_brain_ge3
-controller_midcar
-driver_map_xodrload
 tool_xodrobj
 ivlog_record
 adciv_record
-adciv_replay
+ui_ads_hmi
 )
 
 for x in ${app_name[@]}
@@ -59,6 +69,8 @@ lib_name=(
 	libivlog.so
 	libplatformif.so
 	libivexit.so
+	libivchart.so
+	libivbacktrace.so
 )
 
 for x in ${lib_name[@]}
@@ -71,11 +83,6 @@ do
 	fi
 done
 
-#echo "creat IVSysMan.xml"
-#cp ./other/$CONFIG_IVSysMan ./deploy/app/IVSysMan.xml
-#cp ./other/ADS_decision.xml ./deploy/app/ADS_decision.xml
-#sed -i "s|xxxxxx|$PRO_DIR/deploy/app|g" ./deploy/app/IVSysMan.xml
-
 cp ./bin/*.so ./deploy/app/lib/
 
 qt_com=`arch`

autogen.sh

@@ -43,7 +43,6 @@ cd ../../../
 
 cd src/common/modulecomm/
 $qtmake modulecomm.pro
-check_result $?
 make $MAKEOPT
 check_result $?
 make clean
@@ -122,10 +121,18 @@ rm Makefile
 rm .qmake.stash
 cd ../../../
 
+cd src/common/ivchart/
+$qtmake ivchart.pro
+make $MAKEOPT
+check_result $?
+make clean
+cp libivchart.so ./../../../bin/
+rm Makefile
+rm .qmake.stash
+cd ../../../
+
 controller_app_name=(
-	controller_ge3
-	controller_vv7
-    controller_midcar
+    controller_hapo
 )
 
 for x in ${controller_app_name[@]}
@@ -143,7 +150,7 @@ do
 done
 
 decition_app_name=(
-	decition_brain
+	decition_brain_sf
 	#decition_brain_ge3
 	#decition_brain_qingyuan
 	#decition_brain_vv7
@@ -165,15 +172,15 @@ done
 
 driver_app_name=(
 	driver_lidar_rs16
-#	driver_lidar_vlp16
 	driver_gps_hcp2
-	#driver_gps_ins550d
 	driver_can_nvidia_agx
-#	driver_can_kvaser
-#	driver_can_vci
 	driver_map_trace
 	driver_map_xodrload
-    driver_radio_p900
+	driver_rpc_server
+	driver_cloud_grpc_client
+	driver_grpc_server
+	driver_rpc_server
+	driver_group_grpc_client
 )
 
 for x in ${driver_app_name[@]}
@@ -191,10 +198,9 @@ do
 done
 
 detect_app_name=(
-	#detection_radar_conti_sr308
+	detection_lidar_PointPillars_MultiHead
 	detection_radar_delphi_esr
 	detection_chassis
-	detection_lidar_grid
 )
 
 for x in ${detect_app_name[@]}
@@ -211,8 +217,27 @@ do
 	cd ../../../
 done
 
+
+fution_app_name=(
+	lidar_radar_fusion_cnn
+)
+
+for x in ${fution_app_name[@]}
+do
+	cd src/fusion/${x}/
+	$qtmake ${x}.pro
+	make $MAKEOPT
+	check_result $?
+	make clean
+	cp ${x} ./../../../bin/
+	rm Makefile
+	rm .qmake.stash
+	rm ${x}
+	cd ../../../
+done
+
 tool_app_name=(
-	#view_pointcloud
+	view_pointcloud
 	view_gps
 	view_rawcan
 	view_radar
@@ -256,3 +281,4 @@ do
 	rm ${x}
 	cd ../../../
 done
+

sh/HAPO/agx1/autodeploy.sh

@@ -8,30 +8,31 @@ if [ ! $check_result ];then
 fi
 
 app_name=(
-######controller##
-controller_midcar
-
-######decition####
-decition_brain
-
 ######driver######
 driver_lidar_rs16
-#driver_lidar_vlp16
-#driver_gps_hcp2
-#driver_radio_p900
+driver_gps_hcp2
 driver_can_nvidia_agx
-#driver_can_kvaser
-#driver_can_vci
 driver_map_trace
 driver_map_xodrload
 driver_rpc_server
 driver_cloud_grpc_client
+driver_grpc_server
+driver_rpc_server
+driver_group_grpc_client
 
 ######detection#####
-detection_lidar_cnn_segmentation
+detection_lidar_PointPillars_MultiHead
 detection_radar_delphi_esr
-detection_gps_hcp2
-detection_chassis
+etection_chassis
+
+######fusion#####
+lidar_radar_fusion_cnn
+
+######controller######
+controller_hapo
+
+######decition######
+decition_brain_sf
 
 ######tools########
 view_pointcloud
@@ -42,10 +43,10 @@ IVSysMan
 ivmapmake
 view_ivlog
 tool_querymsg
-ui_ads_hmi
 tool_xodrobj
 ivlog_record
 adciv_record
+ui_ads_hmi
 )
 
 for x in ${app_name[@]}
@@ -54,7 +55,6 @@ do
 	cp ./bin/${x} ./
 	./deploy.sh $x
 	if [ $? == 1 ];then
-		echo "build $x faile"
 		echo "build $x faile"
 		exit 1
 	fi
@@ -83,13 +83,19 @@ do
 	fi
 done
 
-echo "creat IVSysMan.xml"
-cp ./other/$CONFIG_IVSysMan ./deploy/app/IVSysMan.xml
-cp ./other/ADS_decision.xml ./deploy/app/ADS_decision.xml
-sed -i "s|xxxxxx|$PRO_DIR/deploy/app|g" ./deploy/app/IVSysMan.xml
-
 cp ./bin/*.so ./deploy/app/lib/
 
+qt_com=`arch`
+if [ $qt_com = "aarch64" ];then
+cp -r /usr/lib/aarch64-linux-gnu/nss/* ./deploy/app/lib/
+else
+cp -r /usr/lib/x86_64-linux-gnu/nss/* ./deploy/app/lib/
+fi
+
+cp ./sh/BaiDuMap.html ./deploy/app/
+cp ./sh/car.png ./deploy/app/
+cp ./sh/asphalt.jpg ./deploy/app/
+
 echo ""
 echo "***************"
 echo "***  done!  ***"

sh/HAPO/agx1/autogen.sh

@@ -1,19 +1,18 @@
+#qt_com=$(arch)
+qt_com=`arch`
+if [ $qt_com = "aarch64" ];then
+qtmake="/usr/lib/aarch64-linux-gnu/qt5/bin/qmake"
+else
+qtmake="/opt/Qt5.10.1/5.10.1/gcc_64/bin/qmake"
+fi
 
-#qtmake="/opt/Qt5.10.1/5.10.1/gcc_64/bin/qmake"
-#qtmake=/usr/bin/qmake
-#qtmake="/usr/lib/aarch64-linux-gnu/qt5/bin/qmake"
-if [ ! $qtmake ];then
-	echo -e "\e[33m qtmake not set, auto find it\e[0m"
-	qtmake=`find /opt -name "qmake" 2>/dev/null | grep 'gcc_64'`
+if [ $(uname -m) == "x86_64" ]; then
+    qtmake="/usr/lib/x86_64-linux-gnu/qt5/bin/qmake"
 fi
 
 if [ ! $qtmake ];then
-	echo -e "\e[33m qtmake not ,may be agx, auto find it\e[0m"
-	if [ -d '/usr/lib/aarch64-linux-gnu/qt5' ]; then
-    		qtmake='/usr/lib/aarch64-linux-gnu/qt5/bin/qmake'
-  	else
-    		echo "if NVIDIA,please sudo apt install qt"
-  	fi
+	echo -e "\e[33m qtmake not set, auto find it\e[0m"
+	qtmake=`find /opt -name "qmake" 2>/dev/null | grep 'gcc_64'`
 fi
 
 if [ ! $qtmake ];then
@@ -34,37 +33,6 @@ check_result()
 	fi
 }
 
-function checkOS_TYPE(){
-    if [[ ! -z "`uname | grep Darwin`" ]];then
-        OS_TYPE=osx
-		install_path=/Applications
-    elif [[ ! -z "`uname | grep Linux`" ]];then
-        OS_TYPE=linux
-		install_path=/usr/lib
-    else
-        echo "Unsupported operating systems!"
-        exit 1
-    fi
-    echo "The current operating system is"
-    echo $OS_TYPE
-}
-
-function checkos(){
-    if [[ -f /etc/redhat-release ]];then
-        OS=Centos
-    elif [[ ! -z "`cat /etc/issue | grep bian`" ]];then
-        OS=Debian
-    elif [[ ! -z "`cat /etc/issue | grep Ubuntu`" ]];then
-        OS=Ubuntu
-    else
-        echo "Unknow!!!"
-    fi
-	echo $OS
-}
-
-checkOS_TYPE
-checkos
-
 MAKEOPT=-j8
 
 mkdir bin
@@ -164,7 +132,7 @@ rm .qmake.stash
 cd ../../../
 
 controller_app_name=(
-    controller_midcar
+    controller_hapo
 )
 
 for x in ${controller_app_name[@]}
@@ -182,7 +150,7 @@ do
 done
 
 decition_app_name=(
-	decition_brain
+	decition_brain_sf
 	#decition_brain_ge3
 	#decition_brain_qingyuan
 	#decition_brain_vv7
@@ -210,6 +178,9 @@ driver_app_name=(
 	driver_map_xodrload
 	driver_rpc_server
 	driver_cloud_grpc_client
+	driver_grpc_server
+	driver_rpc_server
+	driver_group_grpc_client
 )
 
 for x in ${driver_app_name[@]}
@@ -227,9 +198,8 @@ do
 done
 
 detect_app_name=(
-	detection_lidar_cnn_segmentation
+	detection_lidar_PointPillars_MultiHead
 	detection_radar_delphi_esr
-	detection_gps_hcp2
 	detection_chassis
 )
 
@@ -247,6 +217,25 @@ do
 	cd ../../../
 done
 
+
+fution_app_name=(
+	lidar_radar_fusion_cnn
+)
+
+for x in ${fution_app_name[@]}
+do
+	cd src/fusion/${x}/
+	$qtmake ${x}.pro
+	make $MAKEOPT
+	check_result $?
+	make clean
+	cp ${x} ./../../../bin/
+	rm Makefile
+	rm .qmake.stash
+	rm ${x}
+	cd ../../../
+done
+
 tool_app_name=(
 	view_pointcloud
 	view_gps

src/tool/IVSysMan/progmon.cpp

@@ -298,6 +298,8 @@ void ProgMon::onReadStandardError()
     QProcess * proc = (QProcess *)sender();
     QByteArray ba = proc->readAllStandardError();
 
+    return;
+
     if(ba.size() == 0)return;
     LogError(proc,ba);