From 714f9f4d4815c1121da56c8972d1c33ce34f3038 Mon Sep 17 00:00:00 2001
From: zbr <zbr3550@sina.com>
Date: Mon, 22 Nov 2021 17:22:37 +0800
Subject: [PATCH] =?UTF-8?q?zr-dev-4.0.16=20=E9=81=BF=E9=9A=9C=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=94=B9=E9=9D=99=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ArduCopter/version.h     | 2 +-
 ArduCopter/zr_flight.cpp | 2 +-
 modules/mavlink          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ArduCopter/version.h b/ArduCopter/version.h
index 889d5d16b9..3559385226 100644
--- a/ArduCopter/version.h
+++ b/ArduCopter/version.h
@@ -6,7 +6,7 @@
 
 #include "ap_version.h"
 
-#define THISFIRMWARE "ZRUAV v4.0.16-RC3"  //"ArduCopter V4.0.0"
+#define THISFIRMWARE "ZRUAV v4.0.16-RC4"  //"ArduCopter V4.0.0"
 
 // the following line is parsed by the autotest scripts
 #define FIRMWARE_VERSION 4,0,16,FIRMWARE_VERSION_TYPE_OFFICIAL
diff --git a/ArduCopter/zr_flight.cpp b/ArduCopter/zr_flight.cpp
index dba940d9eb..126040be02 100644
--- a/ArduCopter/zr_flight.cpp
+++ b/ArduCopter/zr_flight.cpp
@@ -169,7 +169,7 @@ void Copter::do_avoid_action(){
 
 uint8_t Copter::avoid_area_detect(float dist)
 {
-    Proxy_Area area = PROXY_OUTRANGE;;
+    static Proxy_Area area = PROXY_OUTRANGE;
     if(dist < avoid.get_zr_avd_min()){
         if(area != PROXY_TOO_CLOSE && area != PROXY_FIND_BARRIER){  // 前一个状态不是障碍物过近
             area = PROXY_OUTRANGE;
diff --git a/modules/mavlink b/modules/mavlink
index 5fc095d170..72b407db39 160000
--- a/modules/mavlink
+++ b/modules/mavlink
@@ -1 +1 @@
-Subproject commit 5fc095d17043557589ecc6a28d62fb234081fc87
+Subproject commit 72b407db3991ed74631fa59a5e826615f569819f