From ca76f6d0ec70dda10a6a8b5c2017f7c28ff1dcbe Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 13 Nov 2011 19:47:35 +1100 Subject: [PATCH] purple: add the remaining hw defines for purple hardware --- ArduPlane/config.h | 16 ++++++++++++---- ArduPlane/system.pde | 7 ++++++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ArduPlane/config.h b/ArduPlane/config.h index aad3bbfdf7..8524e0557f 100644 --- a/ArduPlane/config.h +++ b/ArduPlane/config.h @@ -48,10 +48,18 @@ #ifndef CONFIG_APM_HARDWARE # define CONFIG_APM_HARDWARE APM_HARDWARE_APM1 -#else -# if CONFIG_APM_HARDWARE == APM_HARDWARE_PURPLE -# define CONFIG_IMU_TYPE CONFIG_IMU_MPU6000 -# endif +#endif + +////////////////////////////////////////////////////////////////////////////// +// PURPLE HARDWARE DEFAULTS +// + +#if CONFIG_APM_HARDWARE == APM_HARDWARE_PURPLE +# define CONFIG_IMU_TYPE CONFIG_IMU_MPU6000 +# define CONFIG_PUSHBUTTON DISABLED +# define CONFIG_RELAY DISABLED +# define MAG_ORIENTATION ROTATION_NONE +# define CONFIG_SONAR_SOURCE SONAR_SOURCE_ANALOG_PIN #endif ////////////////////////////////////////////////////////////////////////////// diff --git a/ArduPlane/system.pde b/ArduPlane/system.pde index 41dcd06edb..19370bc74e 100644 --- a/ArduPlane/system.pde +++ b/ArduPlane/system.pde @@ -197,10 +197,15 @@ static void init_ardupilot() pinMode(C_LED_PIN, OUTPUT); // GPS status LED pinMode(A_LED_PIN, OUTPUT); // GPS status LED pinMode(B_LED_PIN, OUTPUT); // GPS status LED +#if SLIDE_SWITCH_PIN > 0 pinMode(SLIDE_SWITCH_PIN, INPUT); // To enter interactive mode +#endif +#if CONFIG_PUSHBUTTON == ENABLED pinMode(PUSHBUTTON_PIN, INPUT); // unused +#endif +#if CONFIG_RELAY == ENABLED DDRL |= B00000100; // Set Port L, pin 2 to output for the relay - +#endif // If the switch is in 'menu' mode, run the main menu. // // Since we can't be sure that the setup or test mode won't leave