Ver Fonte

Modify HAPO agx2 build script

lijinliang há 3 anos atrás
pai
commit
34c5c22e05

+ 5 - 5
sh/HAPO/agx2/IVSysMan.xml

@@ -1,14 +1,14 @@
 <xml>	
 	<module app="driver_can_nvidia_agx" dir="/home/nvidia/app" args=" " autostart="true"  group="Driver"/>
 	<module app="driver_rpc_client" dir="/home/nvidia/app" args=" " autostart="true"  group="Driver"/>	
-	<module app="driver_rpc_server" dir="/home/nvidia/app" args=" " autostart="true"  group="Driver"/>	
-	<module app="detection_radar_delphi_srr" dir="/home/nvidia/app" args=" " autostart="true"  group="Detection"/>
+	<module app="driver_rpc_server" dir="/home/nvidia/app" args=" " autostart="true1"  group="Driver"/>	
+	<module app="detection_radar_delphi_srr" dir="/home/nvidia/app" args=" " autostart="true1"  group="Detection"/>
 	<module app="detection_mobileye" dir="/home/nvidia/app" args=" " autostart="true"  group="Detection"/>
-	<module app="detection_ultra_forvision" dir="/home/nvidia/app" args=" " autostart="true"  group="Detection"/>
-	<module app="fusion_radar_merge" dir="/home/nvidia/app" args=" " autostart="true"  group="Fusion"/>
+	<module app="detection_ultra_forvision" dir="/home/nvidia/app" args=" " autostart="true1"  group="Detection"/>
+	<module app="fusion_radar_merge" dir="/home/nvidia/app" args=" " autostart="true1"  group="Fusion"/>
 	<module app="view_ivlog" dir="/home/nvidia/app" args=" " autostart="false"  group="Tool"/>
 	<module app="view_radar" dir="/home/nvidia/app" args=" " autostart="false"  group="Tool"/>
 	<module app="view_gps" dir="/home/nvidia/app" args=" " autostart="false"  group="Tool"/>
-	<module app="adciv_record" dir="/home/nvidia/app" args=" " autostart="true"  group="Tool"/>
+	<module app="adciv_record" dir="/home/nvidia/app" args=" " autostart="true1"  group="Tool"/>
 	<module app="ivlog_record" dir="/home/nvidia/app" args=" " autostart="true1"  group="Tool"/>
 </xml>

+ 17 - 5
sh/HAPO/agx2/autodeploy.sh

@@ -13,7 +13,7 @@ driver_can_nvidia_agx
 driver_rpc_client
 
 ######detection#####
-detection_radar_delphi_srr
+#detection_radar_delphi_srr
 detection_mobileye
 
 ######tools########
@@ -44,6 +44,7 @@ lib_name=(
 	libivlog.so
 	libplatformif.so
 	libivexit.so
+	libivchart.so
 )
 
 for x in ${lib_name[@]}
@@ -56,13 +57,24 @@ 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
+#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!  ***"

+ 23 - 44
sh/HAPO/agx2/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
@@ -75,6 +43,7 @@ cd ../../../
 
 cd src/common/modulecomm/
 $qtmake modulecomm.pro
+check_result $?
 make $MAKEOPT
 check_result $?
 make clean
@@ -153,6 +122,16 @@ 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_midcar
 )
@@ -212,7 +191,7 @@ do
 done
 
 detect_app_name=(
-	detection_radar_delphi_srr
+#	detection_radar_delphi_srr
 	detection_mobileye
 )
 

+ 0 - 20
sh/HAPO/agx2/driver_rpc_client.yaml

@@ -1,27 +1,7 @@
 server : 192.168.1.102:63001
 message:
-  - corner_radar_left
-  - corner_radar_right
   - mobileye
-  - ultra
-  - canrecv1
-corner_radar_left:
-  msgname: corner_radar_left
-  buffersize: 100000
-  buffercount: 3
-corner_radar_right:
-  msgname: corner_radar_right
-  buffersize: 100000
-  buffercount: 3
 mobileye:
   msgname: mobileye
   buffersize: 100000
   buffercount: 3
-ultra:
-  msgname: ultra
-  buffersize: 100000
-  buffercount: 3
-canrecv1:
-  msgname: canrecv1
-  buffersize: 100000
-  buffercount: 3