From 0f9ad1c393d4db5be12a239c1ee204673d699c50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Thu, 8 Sep 2016 20:31:26 -0300 Subject: [PATCH] aerofc: Remove remaining code and macros of RGBLed --- src/drivers/boards/aerofc-v1/CMakeLists.txt | 1 - src/drivers/boards/aerofc-v1/board_config.h | 11 +- src/drivers/boards/asc-v1/asc_timer_config.c | 133 ------------------- 3 files changed, 1 insertion(+), 144 deletions(-) delete mode 100644 src/drivers/boards/asc-v1/asc_timer_config.c diff --git a/src/drivers/boards/aerofc-v1/CMakeLists.txt b/src/drivers/boards/aerofc-v1/CMakeLists.txt index 8f0842ce84..a257fa3ccc 100644 --- a/src/drivers/boards/aerofc-v1/CMakeLists.txt +++ b/src/drivers/boards/aerofc-v1/CMakeLists.txt @@ -37,7 +37,6 @@ px4_add_module( SRCS ../common/board_name.c aerofc_init.c - aerofc_timer_config.c aerofc_spi.c aerofc_usb.c aerofc_led.c diff --git a/src/drivers/boards/aerofc-v1/board_config.h b/src/drivers/boards/aerofc-v1/board_config.h index 297658256d..170e98abc0 100644 --- a/src/drivers/boards/aerofc-v1/board_config.h +++ b/src/drivers/boards/aerofc-v1/board_config.h @@ -143,17 +143,8 @@ * TIM3_CH4 PB1 nPWM_1 AUX1(Landing Gear) JP1-21,22 * */ -#define GPIO_TIM3_CH1OUT GPIO_TIM3_CH1OUT_1 -#define GPIO_TIM3_CH2OUT GPIO_TIM3_CH2OUT_1 -#define GPIO_TIM3_CH3OUT GPIO_TIM3_CH3OUT_1 -#define GPIO_TIM3_CH4OUT GPIO_TIM3_CH4OUT_1 #define DIRECT_PWM_OUTPUT_CHANNELS 0 - -#define BOARD_HAS_LED_PWM -#define LED_TIM3_CH1OUT GPIO_TIM3_CH1OUT -#define LED_TIM3_CH2OUT GPIO_TIM3_CH2OUT -#define LED_TIM3_CH3OUT GPIO_TIM3_CH3OUT - +#define BOARD_HAS_PWM DIRECT_PWM_OUTPUT_CHANNELS /* USB OTG FS * diff --git a/src/drivers/boards/asc-v1/asc_timer_config.c b/src/drivers/boards/asc-v1/asc_timer_config.c deleted file mode 100644 index 0d43e7931c..0000000000 --- a/src/drivers/boards/asc-v1/asc_timer_config.c +++ /dev/null @@ -1,133 +0,0 @@ -/**************************************************************************** - * - * Copyright (c) 2012-2016 PX4 Development Team. All rights reserved. - * Author: David Sidrane - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name PX4 nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/* - * @file tap-v1_timer_config.c - * - * Configuration data for the stm32 pwm_servo, input capture and pwm input driver. - * - * Note that these arrays must always be fully-sized. - */ - -#include - -#include -#include -#include - -#include -#include - -#include "board_config.h" - -__EXPORT const io_timers_t io_timers[MAX_IO_TIMERS] = { - { - .base = STM32_TIM3_BASE, - .clock_register = STM32_RCC_APB1ENR, - .clock_bit = RCC_APB1ENR_TIM3EN, - .clock_freq = STM32_APB1_TIM3_CLKIN, - .first_channel_index = 0, - .last_channel_index = 3, - .handler = io_timer_handler0, - .vectorno = STM32_IRQ_TIM3, - } -}; - -__EXPORT const timer_io_channels_t timer_io_channels[MAX_TIMER_IO_CHANNELS] = { - { - .gpio_out = GPIO_TIM3_CH1OUT, - .gpio_in = 0, - .timer_index = 0, - .timer_channel = 1, - .ccr_offset = STM32_GTIM_CCR1_OFFSET, - .masks = GTIM_SR_CC1IF | GTIM_SR_CC1OF - }, - { - .gpio_out = GPIO_TIM3_CH2OUT, - .gpio_in = 0, - .timer_index = 0, - .timer_channel = 2, - .ccr_offset = STM32_GTIM_CCR2_OFFSET, - .masks = GTIM_SR_CC2IF | GTIM_SR_CC2OF - }, - { - .gpio_out = GPIO_TIM3_CH3OUT, - .gpio_in = 0, - .timer_index = 0, - .timer_channel = 3, - .ccr_offset = STM32_GTIM_CCR3_OFFSET, - .masks = GTIM_SR_CC3IF | GTIM_SR_CC3OF - }, - { - .gpio_out = GPIO_TIM3_CH4OUT, - .gpio_in = 0, - .timer_index = 0, - .timer_channel = 4, - .ccr_offset = STM32_GTIM_CCR4_OFFSET, - .masks = GTIM_SR_CC4IF | GTIM_SR_CC4OF - } -}; - -__EXPORT const struct io_timers_t led_pwm_timers[1] = { - { - .base = STM32_TIM3_BASE, - .clock_register = STM32_RCC_APB1ENR, - .clock_bit = RCC_APB1ENR_TIM3EN, - .clock_freq = STM32_APB1_TIM3_CLKIN, - .vectorno = STM32_IRQ_TIM3, - .first_channel_index = 0, - .last_channel_index = 2, - } -}; - -__EXPORT const struct timer_io_channels_t led_pwm_channels[3] = { - { - .gpio_out = LED_TIM3_CH1OUT, - .gpio_in = 0, - .timer_index = 0, - .timer_channel = 1, - }, - { - .gpio_out = LED_TIM3_CH2OUT, - .gpio_in = 0, - .timer_index = 0, - .timer_channel = 2, - }, - { - .gpio_out = LED_TIM3_CH3OUT, - .gpio_in = 0, - .timer_index = 0, - .timer_channel = 3, - } -};