版本号调整

ArduCopter/version.h

@@ -6,14 +6,14 @@
 
 #include "ap_version.h"
 
-#define THISFIRMWARE "ZRUAV v4.0.17-RC8"  //"ArduCopter V4.0.0"
+#define THISFIRMWARE "ZRUAV v4.0.18"  //"ArduCopter V4.0.0"
 
 // the following line is parsed by the autotest scripts
-#define FIRMWARE_VERSION 4,0,17,FIRMWARE_VERSION_TYPE_OFFICIAL
+#define FIRMWARE_VERSION 4,0,18,FIRMWARE_VERSION_TYPE_OFFICIAL
 
 #define FW_MAJOR 4
 #define FW_MINOR 0
-#define FW_PATCH 17
+#define FW_PATCH 18
 #define FW_TYPE FIRMWARE_VERSION_TYPE_OFFICIAL
 /**
  * AVDv6: avoid.get_zr_mode() = 3时可以用Loiter模式测试自动避障

all.sh

@@ -6,31 +6,31 @@ starttime=`date +'%Y-%m-%d %H:%M:%S'`
 ./waf configure --board rs100 > build_log.txt
 # ./waf clean >> build_log.txt
 ./waf copter >> build_log.txt
-cp ./build/rs100/bin/arducopter.apj  /mnt/f/_01-work/100\=data/固件/编译/致睿rs100-v4.0.17-RC8.px4
+cp ./build/rs100/bin/arducopter.apj  /mnt/f/_01-work/100\=data/固件/编译/致睿rs100-v4.0.18.px4
 echo "finish build rs100 "
 ./waf configure --board rs100h >> build_log.txt
-# ./waf clean >> build_log.txt
+./waf clean >> build_log.txt
 ./waf copter >> build_log.txt
-cp ./build/rs100h/bin/arducopter.apj  /mnt/f/_01-work/100\=data/固件/编译/致睿rs100h-v4.0.17-RC8.px4
+cp ./build/rs100h/bin/arducopter.apj  /mnt/f/_01-work/100\=data/固件/编译/致睿rs100h-v4.0.18.px4
 echo "finish build rs100h "
 
 ./waf configure --board d100 >> build_log.txt
-# ./waf clean >> build_log.txt
+./waf clean >> build_log.txt
 ./waf copter >> build_log.txt
-cp ./build/d100/bin/arducopter.apj  /mnt/f/_01-work/100\=data/固件/编译/中海达d100-v4.0.17-RC8.px4
+cp ./build/d100/bin/arducopter.apj  /mnt/f/_01-work/100\=data/固件/编译/中海达d100-v4.0.18.px4
 echo "finish build d100 "
 
 ./waf configure --board d100h >> build_log.txt
-# ./waf clean >> build_log.txt
+./waf clean >> build_log.txt
 ./waf copter >> build_log.txt
-cp ./build/d100h/bin/arducopter.apj  /mnt/f/_01-work/100\=data/固件/编译/中海达d100h-v4.0.17-RC8.px4
+cp ./build/d100h/bin/arducopter.apj  /mnt/f/_01-work/100\=data/固件/编译/中海达d100h-v4.0.18.px4
 echo "finish build d100h "
 
-# ./waf configure --board zr-hexa >> build_log.txt
-# ./waf clean >> build_log.txt
-# ./waf copter >> build_log.txt
-# cp ./build/zr-hexa/bin/arducopter.apj  /mnt/f/_01-work/100\=data/固件/编译/六轴m66-v4.0.17-RC8.px4
-# echo "finish build zr-hexa "
+./waf configure --board zr-hexa >> build_log.txt
+./waf clean >> build_log.txt
+./waf copter >> build_log.txt
+cp ./build/zr-hexa/bin/arducopter.apj  /mnt/f/_01-work/100\=data/固件/编译/六轴m66-v4.0.18.px4
+echo "finish build zr-hexa "
 
 endtime=`date +'%Y-%m-%d %H:%M:%S'`
 date -R