From c3267a3b537fa4edf27d738abe7ba95ec1e9507b Mon Sep 17 00:00:00 2001 From: Mike Smith Date: Sat, 23 Jul 2011 13:48:40 -0700 Subject: [PATCH] Remove PIOS_DELAY_TIMER definitions from configuration files, as there is no longer a delay timer to configure. --- flight/PiOS/Boards/STM32103CB_AHRS.h | 6 ------ flight/PiOS/Boards/STM32103CB_CC_Rev1.h | 6 ------ flight/PiOS/Boards/STM32103CB_PIPXTREME_Rev1.h | 8 -------- flight/PiOS/Boards/STM3210E_INS.h | 6 ------ flight/PiOS/Boards/STM3210E_OP.h | 6 ------ 5 files changed, 32 deletions(-) diff --git a/flight/PiOS/Boards/STM32103CB_AHRS.h b/flight/PiOS/Boards/STM32103CB_AHRS.h index 611d285fc..bd03a2f49 100644 --- a/flight/PiOS/Boards/STM32103CB_AHRS.h +++ b/flight/PiOS/Boards/STM32103CB_AHRS.h @@ -79,12 +79,6 @@ TIM8 | | | | #define PIOS_LED_PINS { PIOS_LED_LED1_GPIO_PIN } #define PIOS_LED_CLKS { PIOS_LED_LED1_GPIO_CLK } -//------------------------- -// Delay Timer -//------------------------- -#define PIOS_DELAY_TIMER TIM2 -#define PIOS_DELAY_TIMER_RCC_FUNC RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM2, ENABLE) - //------------------------- // System Settings //------------------------- diff --git a/flight/PiOS/Boards/STM32103CB_CC_Rev1.h b/flight/PiOS/Boards/STM32103CB_CC_Rev1.h index 38a29868c..42334ffdc 100644 --- a/flight/PiOS/Boards/STM32103CB_CC_Rev1.h +++ b/flight/PiOS/Boards/STM32103CB_CC_Rev1.h @@ -91,12 +91,6 @@ TIM4 | RC In 1 | Servo 3 | Servo 2 | Servo 1 #define PIOS_LED_PINS { PIOS_LED_LED1_GPIO_PIN } #define PIOS_LED_CLKS { PIOS_LED_LED1_GPIO_CLK } -//------------------------- -// Delay Timer -//------------------------- -#define PIOS_DELAY_TIMER TIM3 -#define PIOS_DELAY_TIMER_RCC_FUNC RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM3, ENABLE) - //------------------------- // System Settings //------------------------- diff --git a/flight/PiOS/Boards/STM32103CB_PIPXTREME_Rev1.h b/flight/PiOS/Boards/STM32103CB_PIPXTREME_Rev1.h index a8eead4bd..b31733fc5 100644 --- a/flight/PiOS/Boards/STM32103CB_PIPXTREME_Rev1.h +++ b/flight/PiOS/Boards/STM32103CB_PIPXTREME_Rev1.h @@ -117,14 +117,6 @@ TIM4 | STOPWATCH | #define TX_LED_OFF PIOS_LED_Off(LED4) #define TX_LED_TOGGLE PIOS_LED_Toggle(LED4) -// ***************************************************************** -// Delay Timer - -//#define PIOS_DELAY_TIMER TIM2 -//#define PIOS_DELAY_TIMER_RCC_FUNC RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM2, ENABLE) -#define PIOS_DELAY_TIMER TIM1 -#define PIOS_DELAY_TIMER_RCC_FUNC RCC_APB2PeriphClockCmd(RCC_APB2Periph_TIM1, ENABLE) - // ***************************************************************** // Timer interrupt diff --git a/flight/PiOS/Boards/STM3210E_INS.h b/flight/PiOS/Boards/STM3210E_INS.h index 505db9bb6..bb9b15b1a 100644 --- a/flight/PiOS/Boards/STM3210E_INS.h +++ b/flight/PiOS/Boards/STM3210E_INS.h @@ -144,12 +144,6 @@ extern uint32_t pios_com_aux_id; #define PIOS_COM_DEBUG PIOS_COM_AUX #endif -//------------------------- -// Delay Timer -//------------------------- -#define PIOS_DELAY_TIMER TIM2 -#define PIOS_DELAY_TIMER_RCC_FUNC RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM2, ENABLE) - //------------------------- // System Settings //------------------------- diff --git a/flight/PiOS/Boards/STM3210E_OP.h b/flight/PiOS/Boards/STM3210E_OP.h index c25e6ccfa..f93781de9 100644 --- a/flight/PiOS/Boards/STM3210E_OP.h +++ b/flight/PiOS/Boards/STM3210E_OP.h @@ -174,12 +174,6 @@ extern uint32_t pios_com_sbus_id; #define PIOS_COM_SBUS (pios_com_sbus_id) #endif -//------------------------- -// Delay Timer -//------------------------- -#define PIOS_DELAY_TIMER TIM2 -#define PIOS_DELAY_TIMER_RCC_FUNC RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM2, ENABLE) - //------------------------- // System Settings //-------------------------