From 1d836db862b0036247c15df19dd9716b30044d7f Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 18 Mar 2013 14:44:41 +1100
Subject: [PATCH] build: added all 7 copter frame types to binary build

---
 Tools/scripts/build_binaries.sh |  9 ++--
 mk/targets.mk                   | 92 ++++++++++++++++++++++++++++++++-
 2 files changed, 96 insertions(+), 5 deletions(-)

diff --git a/Tools/scripts/build_binaries.sh b/Tools/scripts/build_binaries.sh
index 4886029c30..44c3749f97 100755
--- a/Tools/scripts/build_binaries.sh
+++ b/Tools/scripts/build_binaries.sh
@@ -27,6 +27,7 @@ copyit() {
     /bin/cp "$file" "$dir"
     echo "$githash" > "$dir/git-version.txt"
     mkdir -p "$ldir"
+    echo "$githash" > "$ldir/git-version.txt"
     rsync "$file" "$ldir"
 }
 
@@ -42,11 +43,13 @@ popd
 
 echo "Building ArduCopter binaries"
 pushd ArduCopter
-for b in apm1 apm2 apm1-hil apm2-hil; do
+for b in apm1 apm2; do
+for f in quad tri hexa y6 octa octa-quad heli quad-hil heli-hil; do
     pwd
     make clean
-    make $b -j4
-    copyit $TMPDIR/ArduCopter.build/ArduCopter.hex $binaries/Copter/$hdate/$b
+    make "$b-$f" -j4
+    copyit $TMPDIR/ArduCopter.build/ArduCopter.hex "$binaries/Copter/$hdate/$b-$f"
+done
 done
 popd
 
diff --git a/mk/targets.mk b/mk/targets.mk
index 96020bef69..382f3f54d8 100644
--- a/mk/targets.mk
+++ b/mk/targets.mk
@@ -57,8 +57,96 @@ heli: all
 dmp: EXTRAFLAGS += "-DDMP_ENABLED=ENABLED"
 dmp: apm2
 
-apm2hexa: EXTRAFLAGS += "-DFRAME_CONFIG=HEXA_FRAME "
-apm2hexa: apm2
+
+apm1-quad: EXTRAFLAGS += "-DFRAME_CONFIG=QUAD_FRAME "
+apm1-quad: apm1
+
+apm1-quad-hil: EXTRAFLAGS += "-DFRAME_CONFIG=QUAD_FRAME "
+apm1-quad-hil: EXTRAFLAGS += "-DHIL_MODE=HIL_MODE_ATTITUDE "
+apm1-quad-hil: apm1
+
+apm1-tri: EXTRAFLAGS += "-DFRAME_CONFIG=TRI_FRAME "
+apm1-tri: apm1
+
+apm1-hexa: EXTRAFLAGS += "-DFRAME_CONFIG=HEXA_FRAME "
+apm1-hexa: apm1
+
+apm1-y6: EXTRAFLAGS += "-DFRAME_CONFIG=Y6_FRAME "
+apm1-y6: apm1
+
+apm1-octa: EXTRAFLAGS += "-DFRAME_CONFIG=OCTA_FRAME "
+apm1-octa: apm1
+
+apm1-octa-quad: EXTRAFLAGS += "-DFRAME_CONFIG=OCTA_QUAD_FRAME "
+apm1-octa-quad: apm1
+
+apm1-heli: EXTRAFLAGS += "-DFRAME_CONFIG=HELI_FRAME "
+apm1-heli: apm1
+
+apm1-heli-hil: EXTRAFLAGS += "-DFRAME_CONFIG=HELI_FRAME "
+apm1-heli-hil: EXTRAFLAGS += "-DHIL_MODE=HIL_MODE_ATTITUDE "
+apm1-heli-hil: apm1
+
+
+apm2-quad: EXTRAFLAGS += "-DFRAME_CONFIG=QUAD_FRAME "
+apm2-quad: apm2
+
+apm2-quad-hil: EXTRAFLAGS += "-DFRAME_CONFIG=QUAD_FRAME "
+apm2-quad-hil: EXTRAFLAGS += "-DHIL_MODE=HIL_MODE_ATTITUDE "
+apm2-quad-hil: apm2
+
+apm2-tri: EXTRAFLAGS += "-DFRAME_CONFIG=TRI_FRAME "
+apm2-tri: apm2
+
+apm2-hexa: EXTRAFLAGS += "-DFRAME_CONFIG=HEXA_FRAME "
+apm2-hexa: apm2
+
+apm2-y6: EXTRAFLAGS += "-DFRAME_CONFIG=Y6_FRAME "
+apm2-y6: apm2
+
+apm2-octa: EXTRAFLAGS += "-DFRAME_CONFIG=OCTA_FRAME "
+apm2-octa: apm2
+
+apm2-octa-quad: EXTRAFLAGS += "-DFRAME_CONFIG=OCTA_QUAD_FRAME "
+apm2-octa-quad: apm2
+
+apm2-heli: EXTRAFLAGS += "-DFRAME_CONFIG=HELI_FRAME "
+apm2-heli: apm2
+
+apm2-heli-hil: EXTRAFLAGS += "-DFRAME_CONFIG=HELI_FRAME "
+apm2-heli-hil: EXTRAFLAGS += "-DHIL_MODE=HIL_MODE_ATTITUDE "
+apm2-heli-hil: apm2
+
+
+px4-quad: EXTRAFLAGS += "-DFRAME_CONFIG=QUAD_FRAME "
+px4-quad: px4
+
+px4-quad-hil: EXTRAFLAGS += "-DFRAME_CONFIG=QUAD_FRAME "
+px4-quad-hil: EXTRAFLAGS += "-DHIL_MODE=HIL_MODE_ATTITUDE "
+px4-quad-hil: px4
+
+px4-tri: EXTRAFLAGS += "-DFRAME_CONFIG=TRI_FRAME "
+px4-tri: px4
+
+px4-hexa: EXTRAFLAGS += "-DFRAME_CONFIG=HEXA_FRAME "
+px4-hexa: px4
+
+px4-y6: EXTRAFLAGS += "-DFRAME_CONFIG=Y6_FRAME "
+px4-y6: px4
+
+px4-octa: EXTRAFLAGS += "-DFRAME_CONFIG=OCTA_FRAME "
+px4-octa: px4
+
+px4-octa-quad: EXTRAFLAGS += "-DFRAME_CONFIG=OCTA_QUAD_FRAME "
+px4-octa-quad: px4
+
+px4-heli: EXTRAFLAGS += "-DFRAME_CONFIG=HELI_FRAME "
+px4-heli: px4
+
+px4-heli-hil: EXTRAFLAGS += "-DFRAME_CONFIG=HELI_FRAME "
+px4-heli-hil: EXTRAFLAGS += "-DHIL_MODE=HIL_MODE_ATTITUDE "
+px4-heli-hil: px4
+
 
 apm2beta: EXTRAFLAGS += "-DAPM2_BETA_HARDWARE "
 apm2beta: apm2