From b299d6222a7747bb0eb5cd638bcfbe18f2304b6b Mon Sep 17 00:00:00 2001
From: Julien Lecoeur <julien.lecoeur@gmail.com>
Date: Tue, 15 May 2018 16:10:20 +0200
Subject: [PATCH] Astyle: allow version 3.1

---
 Tools/astyle/check_code_style_all.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Tools/astyle/check_code_style_all.sh b/Tools/astyle/check_code_style_all.sh
index df93e932ab..debf058678 100755
--- a/Tools/astyle/check_code_style_all.sh
+++ b/Tools/astyle/check_code_style_all.sh
@@ -5,6 +5,7 @@ set -eu
 ASTYLE_VER_REQUIRED_1="Artistic Style Version 2.06"
 ASTYLE_VER_REQUIRED_2="Artistic Style Version 3.0"
 ASTYLE_VER_REQUIRED_3="Artistic Style Version 3.0.1"
+ASTYLE_VER_REQUIRED_4="Artistic Style Version 3.1"
 
 astyle_ver() {
 	echo "PX4 requires at least ${ASTYLE_VER_REQUIRED_1}"
@@ -23,10 +24,11 @@ else
 
 	if [ "$ASTYLE_VER" != "$ASTYLE_VER_REQUIRED_1" -a \
 	     "$ASTYLE_VER" != "$ASTYLE_VER_REQUIRED_2" -a \
-	     "$ASTYLE_VER" != "$ASTYLE_VER_REQUIRED_3" ];
+	     "$ASTYLE_VER" != "$ASTYLE_VER_REQUIRED_3" -a \
+	     "$ASTYLE_VER" != "$ASTYLE_VER_REQUIRED_4" ];
 	then
 	    echo "Error: you're using ${ASTYLE_VER}"
-	    echo "but should be using ${ASTYLE_VER_REQUIRED_1}, ${ASTYLE_VER_REQUIRED_2}, or ${ASTYLE_VER_REQUIRED_3} instead"
+	    echo "but should be using ${ASTYLE_VER_REQUIRED_1}, ${ASTYLE_VER_REQUIRED_2}, ${ASTYLE_VER_REQUIRED_3}, or ${ASTYLE_VER_REQUIRED_4} instead"
 	    exit 1
 	fi
 fi