aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ArduCopter: rename purple to APM2

Browse Source
This commit is contained in:
Andrew Tridgell 2011-11-26 10:11:25 +11:00 committed by Pat Hickey
parent a9dfc68bc0
commit 1d66b075b0
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduCopter/APM_Config.h
View File

@ -63,5 +63,5 @@
#define USERHOOK_VARIABLES "UserVariables.h" #define USERHOOK_VARIABLES "UserVariables.h"
// enable this for the new 'purple' hardware // enable this for the new 'APM2' hardware
// #define CONFIG_APM_HARDWARE APM_HARDWARE_PURPLE // #define CONFIG_APM_HARDWARE APM_HARDWARE_APM2

8
ArduCopter/ArduCopter.pde
View File

@ -114,8 +114,8 @@ static void update_events(void);
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// RC Hardware // RC Hardware
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#if CONFIG_APM_HARDWARE == APM_HARDWARE_PURPLE #if CONFIG_APM_HARDWARE == APM_HARDWARE_APM2
APM_RC_Purple APM_RC; APM_RC_APM2 APM_RC;
#else #else
APM_RC_APM1 APM_RC; APM_RC_APM1 APM_RC;
#endif #endif
@ -123,8 +123,8 @@ static void update_events(void);
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Dataflash // Dataflash
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#if CONFIG_APM_HARDWARE == APM_HARDWARE_PURPLE #if CONFIG_APM_HARDWARE == APM_HARDWARE_APM2
DataFlash_Purple DataFlash; DataFlash_APM2 DataFlash;
#else #else
DataFlash_APM1 DataFlash; DataFlash_APM1 DataFlash;
#endif #endif

4
ArduCopter/Makefile
View File

@ -18,8 +18,8 @@ hilnocli:
heli: heli:
make -f Makefile EXTRAFLAGS="-DFRAME_CONFIG=HELI_FRAME" make -f Makefile EXTRAFLAGS="-DFRAME_CONFIG=HELI_FRAME"
purple: apm2:
make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_PURPLE -DCLI_SLIDER_ENABLED=DISABLED" make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2 -DCLI_SLIDER_ENABLED=DISABLED"
mavlink10: mavlink10:
make -f Makefile EXTRAFLAGS="-DHIL_MODE=HIL_MODE_ATTITUDE -DMAVLINK10 -DCLI_ENABLED=DISABLED -DLOGGING_ENABLED=DISABLED" make -f Makefile EXTRAFLAGS="-DHIL_MODE=HIL_MODE_ATTITUDE -DMAVLINK10 -DCLI_ENABLED=DISABLED -DLOGGING_ENABLED=DISABLED"

6
ArduCopter/config.h
View File

@ -43,10 +43,10 @@
#endif #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_IMU_TYPE CONFIG_IMU_MPU6000
# define CONFIG_PUSHBUTTON DISABLED # define CONFIG_PUSHBUTTON DISABLED
# define CONFIG_RELAY DISABLED # define CONFIG_RELAY DISABLED
@ -108,7 +108,7 @@
# define SLIDE_SWITCH_PIN 40 # define SLIDE_SWITCH_PIN 40
# define PUSHBUTTON_PIN 41 # define PUSHBUTTON_PIN 41
# define USB_MUX_PIN -1 # 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 A_LED_PIN 27
# define B_LED_PIN 26 # define B_LED_PIN 26
# define C_LED_PIN 25 # define C_LED_PIN 25

2
ArduCopter/defines.h
View File

@ -354,6 +354,6 @@ enum gcs_severity {
// APM Hardware selection // APM Hardware selection
#define APM_HARDWARE_APM1 1 #define APM_HARDWARE_APM1 1
#define APM_HARDWARE_PURPLE 2 #define APM_HARDWARE_APM2 2
#endif // _DEFINES_H #endif // _DEFINES_H

4
ArduCopter/system.pde
View File

@ -56,7 +56,7 @@ static void run_cli(void)
static void init_ardupilot() static void init_ardupilot()
{ {
#if USB_MUX_PIN > 0 #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 // USB and the board header. If the right ArduPPM firmware is
// installed we can detect if USB is connected using the // installed we can detect if USB is connected using the
// USB_MUX_PIN // USB_MUX_PIN
@ -235,7 +235,7 @@ static void init_ardupilot()
adc.Init(&timer_scheduler); // APM ADC library initialization adc.Init(&timer_scheduler); // APM ADC library initialization
#endif // CONFIG_ADC #endif // CONFIG_ADC
#if CONFIG_APM_HARDWARE == APM_HARDWARE_PURPLE #if CONFIG_APM_HARDWARE == APM_HARDWARE_APM2
barometer.Init(1, true); barometer.Init(1, true);
#else #else
barometer.Init(1, false); barometer.Init(1, false);