From 4bc6d77579b5a2953e39bc048c574b3c967a6db9 Mon Sep 17 00:00:00 2001 From: Dominic Clifton Date: Sat, 24 Aug 2013 18:08:46 +0100 Subject: [PATCH] OLIMEXINO - Disable usage of LEDs by default. --- src/board.h | 24 ++++++++++++++++++++++++ src/drv_system.c | 23 ++++++++++++++--------- 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/src/board.h b/src/board.h index aa513e1f42..199f6b425c 100755 --- a/src/board.h +++ b/src/board.h @@ -116,6 +116,8 @@ typedef struct baro_t #define GYRO #define ACC +#define LED0 +#define LED1 #define SENSORS_SET (SENSOR_ACC) @@ -124,11 +126,18 @@ typedef struct baro_t #ifdef OLIMEXINO // OLIMEXINO +#ifdef OLIMEXINO_UNCUT_LED2_E_JUMPER // LED2 is using one of the pwm pins (PWM2), so we must not use PWM2. @See pwmInit() #define LED0_GPIO GPIOA #define LED0_PIN GPIO_Pin_1 // D3, PA1/USART2_RTS/ADC1/TIM2_CH3 - "LED2" on silkscreen, Yellow +#define LED0 +#endif + +#ifdef OLIMEXINO_UNCUT_LED1_E_JUMPER #define LED1_GPIO GPIOA #define LED1_PIN GPIO_Pin_5 // D13, PA5/SPI1_SCK/ADC5 - "LED1" on silkscreen, Green +#define LED1 +#endif #define GYRO #define ACC @@ -137,6 +146,7 @@ typedef struct baro_t #else // Afroflight32 + #define LED0_GPIO GPIOB #define LED0_PIN GPIO_Pin_3 // PB3 (LED) #define LED1_GPIO GPIOB @@ -153,6 +163,8 @@ typedef struct baro_t #define LEDRING #define SONAR #define BUZZER +#define LED0 +#define LED1 #define SENSORS_SET (SENSOR_ACC | SENSOR_BARO | SENSOR_MAG) @@ -160,13 +172,25 @@ typedef struct baro_t #endif // Helpful macros +#ifdef LED0 #define LED0_TOGGLE digitalToggle(LED0_GPIO, LED0_PIN); #define LED0_OFF digitalHi(LED0_GPIO, LED0_PIN); #define LED0_ON digitalLo(LED0_GPIO, LED0_PIN); +#else +#define LED0_TOGGLE +#define LED0_OFF +#define LED0_ON +#endif +#ifdef LED1 #define LED1_TOGGLE digitalToggle(LED1_GPIO, LED1_PIN); #define LED1_OFF digitalHi(LED1_GPIO, LED1_PIN); #define LED1_ON digitalLo(LED1_GPIO, LED1_PIN); +#else +#define LED1_TOGGLE +#define LED1_OFF +#define LED1_ON +#endif #ifdef BEEP_GPIO #define BEEP_TOGGLE digitalToggle(BEEP_GPIO, BEEP_PIN); diff --git a/src/drv_system.c b/src/drv_system.c index db0fbc0896..be73da96d2 100755 --- a/src/drv_system.c +++ b/src/drv_system.c @@ -43,18 +43,23 @@ void systemInit(void) GPIO_TypeDef *gpio; gpio_config_t cfg; } gpio_setup[] = { - { - .gpio = LED0_GPIO, - .cfg = { LED0_PIN, Mode_Out_PP, Speed_2MHz } +#ifdef LED0 + { + .gpio = LED0_GPIO, + .cfg = { LED0_PIN, Mode_Out_PP, Speed_2MHz } }, - { - .gpio = LED1_GPIO, - .cfg = { LED1_PIN, Mode_Out_PP, Speed_2MHz } +#endif +#ifdef LED1 + + { + .gpio = LED1_GPIO, + .cfg = { LED1_PIN, Mode_Out_PP, Speed_2MHz } }, +#endif #ifdef BUZZER - { - .gpio = BEEP_GPIO, - .cfg = { BEEP_PIN, Mode_Out_OD, Speed_2MHz } + { + .gpio = BEEP_GPIO, + .cfg = { BEEP_PIN, Mode_Out_OD, Speed_2MHz } }, #endif };