Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-30 11:37:06 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

[locm3] Updated code to be compatible with the changes in locm3.

Browse Source
This commit is contained in:
Piotr Esden-Tempski
2012-11-07 17:27:34 -08:00
parent f067b62141
commit c708ce0bc0
18 changed files with 12 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/arch/stm32/mcu_arch.c
+1 -1
View File
@@ -30,7 +30,7 @@
#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/f1/flash.h>
#include <libopencm3/stm32/f1/scb.h>
#include <libopencm3/cm3/scb.h>
void mcu_arch_init(void) {
#if LUFTBOOT
sw/airborne/arch/stm32/mcu_periph/adc_arch.c
+1 -3
View File
@@ -88,14 +88,12 @@
#include <libopencm3/stm32/f1/adc.h>
#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/timer.h>
#include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/f1/nvic.h>
#include <string.h>
#include "std.h"
#include "led.h"
#include BOARD_CONFIG
void adc1_2_isr(void);
volatile uint8_t adc_new_data_trigger;
/* Static functions */
sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
+2 -9
View File
@@ -2,8 +2,8 @@
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/f1/scb.h>
#include <libopencm3/stm32/nvic.h>
#include <libopencm3/cm3/scb.h>
#include <libopencm3/stm32/f1/nvic.h>
//#define I2C_DEBUG_LED
@@ -172,13 +172,6 @@ static inline void __enable_irq(void) { asm volatile ("cpsie i"); }
#define __I2C_REG_CRITICAL_ZONE_START __disable_irq();
#define __I2C_REG_CRITICAL_ZONE_STOP __enable_irq();
/* Interrupt service routine forward declarations. */
/* XXX: This should be somehow integrated into libopencm3. */
void i2c1_ev_isr(void);
void i2c1_er_isr(void);
void i2c2_ev_isr(void);
void i2c2_er_isr(void);
//////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////
sw/airborne/arch/stm32/mcu_periph/spi_arch.c
+1 -1
View File
@@ -25,7 +25,7 @@
* Handling of SPI hardware for STM32.
*/
#include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/f1/nvic.h>
#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/exti.h>
sw/airborne/arch/stm32/mcu_periph/sys_time_arch.c
+1 -1
View File
@@ -28,7 +28,7 @@
#include "mcu_periph/sys_time.h"
#include "libopencm3/stm32/systick.h"
#include "libopencm3/cm3/systick.h"
#ifdef SYS_TIME_LED
#include "led.h"
sw/airborne/arch/stm32/mcu_periph/sys_time_arch.h
+1 -1
View File
@@ -34,7 +34,7 @@
#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/systick.h>
#include <libopencm3/cm3/systick.h>
#include "std.h"
extern void sys_tick_handler(void);
sw/airborne/arch/stm32/mcu_periph/uart_arch.c
+1 -1
View File
@@ -23,7 +23,7 @@
#include "mcu_periph/uart.h"
#include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/f1/nvic.h>
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/usart.h>
#include <libopencm3/stm32/f1/gpio.h>
sw/airborne/arch/stm32/mcu_periph/uart_arch.h
-16
View File
@@ -37,20 +37,4 @@
#define B57600 57600
#define B115200 115200
#if defined USE_UART1 || OVERRIDE_UART1_IRQ_HANDLER
extern void usart1_isr(void);
#endif
#if defined USE_UART2 || OVERRIDE_UART2_IRQ_HANDLER
extern void usart2_isr(void);
#endif
#if defined USE_UART3 || OVERRIDE_UART3_IRQ_HANDLER
extern void usart3_isr(void);
#endif
#if defined USE_UART5 || OVERRIDE_UART5_IRQ_HANDLER
extern void uart5_isr(void);
#endif
#endif /* STM32_UART_ARCH_H */
sw/airborne/arch/stm32/peripherals/hmc5843_arch.c
-2
View File
@@ -28,8 +28,6 @@
#include <libopencm3/stm32/exti.h>
#include "mcu_periph/i2c.h"
void exti9_5_isr(void);
void hmc5843_arch_init( void ) {
/* configure external interrupt exti5 on PB5( mag int ) */
sw/airborne/arch/stm32/peripherals/max1168_arch.c
+1 -3
View File
@@ -23,9 +23,7 @@
#include "libopencm3/stm32/f1/rcc.h"
#include "libopencm3/stm32/f1/gpio.h"
#include "libopencm3/stm32/exti.h"
#include "libopencm3/stm32/nvic.h"
void exti2_isr(void);
#include "libopencm3/stm32/f1/nvic.h"
void max1168_arch_init( void ) {
sw/airborne/arch/stm32/subsystems/imu/imu_aspirin_arch.c
+1 -9
View File
@@ -5,18 +5,10 @@
#include <libopencm3/stm32/exti.h>
#include <libopencm3/stm32/spi.h>
#include <libopencm3/stm32/f1/dma.h>
#include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/f1/nvic.h>
#include "mcu_periph/i2c.h"
/* gyro int handler */
void exti15_10_isr(void);
/* mag int handler */
void exti9_5_isr(void);
/* accelerometer int handler */
void exti2_isr(void);
/* dma1 channel 4 int handler */
void dma1_channel4_isr(void);
/* accelerometer SPI selection */
#define Adxl345Unselect() GPIOB_BSRR = GPIO12
#define Adxl345Select() GPIOB_BRR = GPIO12
sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
+1 -6
View File
@@ -27,7 +27,7 @@
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/timer.h>
#include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/f1/nvic.h>
#include "mcu_periph/sys_time.h"
@@ -57,8 +57,6 @@ static uint32_t timer_rollover_cnt;
#define PPM_GPIO_PORT GPIOA
#define PPM_GPIO_PIN GPIO1
void tim2_isr(void);
#elif defined USE_TIM1_IRQ
#pragma message "Using PPM input on UART1_RX pin!"
@@ -75,9 +73,6 @@ void tim2_isr(void);
#define PPM_GPIO_PORT GPIOA
#define PPM_GPIO_PIN GPIO10
void tim1_up_isr(void);
void tim1_cc_isr(void);
#endif
void ppm_arch_init ( void ) {
sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
+1 -4
View File
@@ -24,16 +24,13 @@
#include <stdint.h>
#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/f1/nvic.h>
#include <libopencm3/stm32/timer.h>
#include <libopencm3/stm32/usart.h>
#include "subsystems/radio_control.h"
#include "subsystems/radio_control/spektrum_arch.h"
#include "mcu_periph/uart.h"
/* XXX: this should be declared in some libopencm3 header */
void tim6_isr(void);
#define SPEKTRUM_CHANNELS_PER_FRAME 7
#define MAX_SPEKTRUM_FRAMES 2
#define MAX_SPEKTRUM_CHANNELS 16
sw/airborne/lisa/test/lisa_test_adxl345.c
-2
View File
@@ -47,8 +47,6 @@ static inline void main_event_task( void );
static inline void main_init_hw(void);
void exti2_isr(void);
int main(void) {
main_init();
sw/airborne/lisa/test/lisa_test_adxl345_dma.c
-3
View File
@@ -42,9 +42,6 @@ static inline void main_event_task( void );
static inline void main_init_hw(void);
void exti2_isr(void);
void dma1_channel4_isr(void);
int main(void) {
main_init();
sw/airborne/lisa/test/lisa_test_hmc5843.c
-3
View File
@@ -60,9 +60,6 @@ static uint8_t mag_state = 0;
static volatile uint8_t mag_ready_for_read = FALSE;
static uint8_t reading_mag = FALSE;
extern void exti9_5_isr(void);
int main(void) {
main_init();
sw/airborne/lisa/test/lisa_test_itg3200.c
-3
View File
@@ -57,9 +57,6 @@ static uint8_t gyro_state = 0;
static volatile uint8_t gyro_ready_for_read = FALSE;
static uint8_t reading_gyro = FALSE;
void exti15_10_isr(void);
int main(void) {
main_init();
sw/airborne/subsystems/imu/imu_aspirin.h
-3
View File
@@ -192,9 +192,6 @@ static inline void accel_copy_spi(void)
VECT3_ASSIGN(imu.accel_unscaled, ax, ay, az);
}
// FIXME, remove stm32 specific stuff here
void i2c2_er_isr(void);
static inline void imu_aspirin_event(void (* _gyro_handler)(void), void (* _accel_handler)(void), void (* _mag_handler)(void))
{
if (imu_aspirin.status == AspirinStatusUninit) return;