diff --git a/ArduCopter/APM_Config.h b/ArduCopter/APM_Config.h index 1838c3bd4f..f356b0ccc6 100644 --- a/ArduCopter/APM_Config.h +++ b/ArduCopter/APM_Config.h @@ -63,5 +63,5 @@ #define USERHOOK_VARIABLES "UserVariables.h" -// enable this for the new 'purple' hardware -// #define CONFIG_APM_HARDWARE APM_HARDWARE_PURPLE +// enable this for the new 'APM2' hardware +// #define CONFIG_APM_HARDWARE APM_HARDWARE_APM2 diff --git a/ArduCopter/ArduCopter.pde b/ArduCopter/ArduCopter.pde index e9075346f1..c498f3ac98 100644 --- a/ArduCopter/ArduCopter.pde +++ b/ArduCopter/ArduCopter.pde @@ -114,8 +114,8 @@ static void update_events(void); //////////////////////////////////////////////////////////////////////////////// // RC Hardware //////////////////////////////////////////////////////////////////////////////// -#if CONFIG_APM_HARDWARE == APM_HARDWARE_PURPLE - APM_RC_Purple APM_RC; +#if CONFIG_APM_HARDWARE == APM_HARDWARE_APM2 + APM_RC_APM2 APM_RC; #else APM_RC_APM1 APM_RC; #endif @@ -123,8 +123,8 @@ static void update_events(void); //////////////////////////////////////////////////////////////////////////////// // Dataflash //////////////////////////////////////////////////////////////////////////////// -#if CONFIG_APM_HARDWARE == APM_HARDWARE_PURPLE - DataFlash_Purple DataFlash; +#if CONFIG_APM_HARDWARE == APM_HARDWARE_APM2 + DataFlash_APM2 DataFlash; #else DataFlash_APM1 DataFlash; #endif diff --git a/ArduCopter/Makefile b/ArduCopter/Makefile index a1cf10a01a..712e288804 100644 --- a/ArduCopter/Makefile +++ b/ArduCopter/Makefile @@ -18,8 +18,8 @@ hilnocli: heli: make -f Makefile EXTRAFLAGS="-DFRAME_CONFIG=HELI_FRAME" -purple: - make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_PURPLE -DCLI_SLIDER_ENABLED=DISABLED" +apm2: + make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2 -DCLI_SLIDER_ENABLED=DISABLED" mavlink10: make -f Makefile EXTRAFLAGS="-DHIL_MODE=HIL_MODE_ATTITUDE -DMAVLINK10 -DCLI_ENABLED=DISABLED -DLOGGING_ENABLED=DISABLED" diff --git a/ArduCopter/config.h b/ArduCopter/config.h index 66172fba5d..60562b5080 100644 --- a/ArduCopter/config.h +++ b/ArduCopter/config.h @@ -43,10 +43,10 @@ #endif ////////////////////////////////////////////////////////////////////////////// -// PURPLE HARDWARE DEFAULTS +// APM2 HARDWARE DEFAULTS // -#if CONFIG_APM_HARDWARE == APM_HARDWARE_PURPLE +#if CONFIG_APM_HARDWARE == APM_HARDWARE_APM2 # define CONFIG_IMU_TYPE CONFIG_IMU_MPU6000 # define CONFIG_PUSHBUTTON DISABLED # define CONFIG_RELAY DISABLED @@ -108,7 +108,7 @@ # define SLIDE_SWITCH_PIN 40 # define PUSHBUTTON_PIN 41 # define USB_MUX_PIN -1 -#elif CONFIG_APM_HARDWARE == APM_HARDWARE_PURPLE +#elif CONFIG_APM_HARDWARE == APM_HARDWARE_APM2 # define A_LED_PIN 27 # define B_LED_PIN 26 # define C_LED_PIN 25 diff --git a/ArduCopter/defines.h b/ArduCopter/defines.h index 18bbf19ac1..63597b2a9c 100644 --- a/ArduCopter/defines.h +++ b/ArduCopter/defines.h @@ -354,6 +354,6 @@ enum gcs_severity { // APM Hardware selection #define APM_HARDWARE_APM1 1 -#define APM_HARDWARE_PURPLE 2 +#define APM_HARDWARE_APM2 2 #endif // _DEFINES_H diff --git a/ArduCopter/system.pde b/ArduCopter/system.pde index 08c1ed1bb0..2da7c7f319 100644 --- a/ArduCopter/system.pde +++ b/ArduCopter/system.pde @@ -56,7 +56,7 @@ static void run_cli(void) static void init_ardupilot() { #if USB_MUX_PIN > 0 - // on the purple board we have a mux thet switches UART0 between + // on the APM2 board we have a mux thet switches UART0 between // USB and the board header. If the right ArduPPM firmware is // installed we can detect if USB is connected using the // USB_MUX_PIN @@ -235,7 +235,7 @@ static void init_ardupilot() adc.Init(&timer_scheduler); // APM ADC library initialization #endif // CONFIG_ADC -#if CONFIG_APM_HARDWARE == APM_HARDWARE_PURPLE +#if CONFIG_APM_HARDWARE == APM_HARDWARE_APM2 barometer.Init(1, true); #else barometer.Init(1, false);