From 968a3d499b8a7def440e4886125c5b0ec23ecde7 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Fri, 5 Aug 2016 22:23:32 -0400
Subject: [PATCH] add make format (check_code_style_all.sh --fix)

---
 Makefile                      |  9 +++++++--
 Tools/check_code_style.sh     | 10 ++++++++--
 Tools/check_code_style_all.sh |  9 ++++++++-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 1f2909c0fd..94146b9a5a 100644
--- a/Makefile
+++ b/Makefile
@@ -233,8 +233,8 @@ run_sitl_ros: sitl_deprecation
 # Other targets
 # --------------------------------------------------------------------
 
-.PHONY: gazebo_build uavcan_firmware check check_format unittest tests qgc_firmware package_firmware clean submodulesclean distclean
-.NOTPARALLEL: gazebo_build uavcan_firmware check check_format unittest tests qgc_firmware package_firmware clean submodulesclean distclean
+.PHONY: gazebo_build uavcan_firmware check check_format format unittest tests qgc_firmware package_firmware clean submodulesclean distclean
+.NOTPARALLEL: gazebo_build uavcan_firmware check check_format format unittest tests qgc_firmware package_firmware clean submodulesclean distclean
 
 gazebo_build:
 	@mkdir -p build_gazebo
@@ -283,6 +283,11 @@ check_format:
 	@./Tools/fix_code_style.sh
 	@./Tools/check_code_style_all.sh
 
+format:
+	$(call colorecho,"Formatting with astyle")
+	@./Tools/fix_code_style.sh
+	@./Tools/check_code_style_all.sh --fix
+
 check_%:
 	@echo
 	$(call colorecho,"Building" $(subst check_,,$@))
diff --git a/Tools/check_code_style.sh b/Tools/check_code_style.sh
index 898f9d1c38..c37a862969 100755
--- a/Tools/check_code_style.sh
+++ b/Tools/check_code_style.sh
@@ -16,8 +16,14 @@ then
 		echo
 
 		rm -f $file.pretty
-		echo $file 'bad formatting, please run "./Tools/fix_code_style.sh' $file'"'
-		exit 1
+
+		if [[ $PX4_ASTYLE_FIX -eq 1 ]]
+		then
+			${DIR}/fix_code_style.sh $file
+		else
+			echo $file 'bad formatting, please run "./Tools/fix_code_style.sh' $file'"'
+			exit 1
+		fi
 	fi
 fi
 
diff --git a/Tools/check_code_style_all.sh b/Tools/check_code_style_all.sh
index 461ced6fea..eb0c2b7529 100755
--- a/Tools/check_code_style_all.sh
+++ b/Tools/check_code_style_all.sh
@@ -1,12 +1,19 @@
 #!/usr/bin/env bash
 set -eu
-failed=0
+
+if [[ "$@" == "--fix" ]]
+then
+    export PX4_ASTYLE_FIX=1
+fi
 
 DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
 find src/ \
+    -path src/lib/DriverFramework -prune -o \
+    -path src/lib/ecl -prune -o \
     -path src/lib/external_lgpl -prune -o \
     -path src/lib/mathlib -prune -o \
+    -path src/lib/matrix -prune -o \
     -path src/modules/attitude_estimator_ekf -prune -o \
     -path src/modules/commander -prune -o \
     -path src/modules/ekf2 -prune -o \