ArduCopter & ArduPlane: Added support for apm2beta build via APM2_BETA_HARDWARE define

* This enables the BMA085 driver for compatibility with beta boards.
* The CLI_SLIDER_ENABLED=DISABLED line does not need to be in the makefile.
  config.h takes care of this default.

ArduCopter/Makefile

@@ -19,7 +19,10 @@ heli:
 	make -f Makefile EXTRAFLAGS="-DFRAME_CONFIG=HELI_FRAME"
 
 apm2:
-	make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2 -DCLI_SLIDER_ENABLED=DISABLED"
+	make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2"
+
+apm2beta:
+	make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2 -DAPM2_BETA_HARDWARE"
 
 mavlink10:
 	make -f Makefile EXTRAFLAGS="-DMAVLINK10"

ArduCopter/config.h

@@ -52,7 +52,11 @@
 # define CONFIG_RELAY      DISABLED
 # define MAG_ORIENTATION   AP_COMPASS_APM2_SHIELD
 # define CONFIG_SONAR_SOURCE SONAR_SOURCE_ANALOG_PIN
+# ifdef APM2_BETA_HARDWARE
+#  define CONFIG_BARO     AP_BARO_BMP085
+# else // APM2 Production Hardware (default)
 #  define CONFIG_BARO     AP_BARO_MS5611
+# endif
 #endif
 
 

ArduPlane/Makefile

@@ -21,6 +21,9 @@ heli:
 apm2:
 	make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2"
 
+apm2beta:
+	make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2 -DAPM2_BETA_HARDWARE"
+
 mavlink10:
 	make -f Makefile EXTRAFLAGS="-DMAVLINK10"
 

ArduPlane/config.h

@@ -60,9 +60,14 @@
 # define CONFIG_RELAY      DISABLED
 # define MAG_ORIENTATION   AP_COMPASS_APM2_SHIELD
 # define CONFIG_SONAR_SOURCE SONAR_SOURCE_ANALOG_PIN
+# ifdef APM2_BETA_HARDWARE
+#  define CONFIG_BARO     AP_BARO_BMP085
+# else // APM2 Production Hardware (default)
 #  define CONFIG_BARO     AP_BARO_MS5611
+# endif
 #endif
 
+//////////////////////////////////////////////////////////////////////////////
 // LED and IO Pins
 //
 #if CONFIG_APM_HARDWARE == APM_HARDWARE_APM1