rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-11 19:24:10 +01:00
Code Issues Releases Activity

Using real prototype board now. Move telemetry to GPS port for easy-ness right

Browse Source 
now.
This commit is contained in:
James Cotton 2011-11-17 01:58:51 -06:00
parent 1c7c85635d
commit 8477c2229b
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flight/PiOS/Boards/STM32F4xx_Revolution.h
View File

@ -77,12 +77,12 @@ TIM8 | | | |
//------------------------ //------------------------
// PIOS_LED // PIOS_LED
//------------------------ //------------------------
#define PIOS_LED_LED1_GPIO_PORT GPIOA #define PIOS_LED_LED1_GPIO_PORT GPIOE
#define PIOS_LED_LED1_GPIO_PIN GPIO_Pin_3 #define PIOS_LED_LED1_GPIO_PIN GPIO_Pin_2
#define PIOS_LED_LED1_GPIO_CLK RCC_APB2Periph_GPIOA #define PIOS_LED_LED1_GPIO_CLK RCC_APB2Periph_GPIOE
#define PIOS_LED_LED2_GPIO_PORT GPIOA #define PIOS_LED_LED2_GPIO_PORT GPIOE
#define PIOS_LED_LED2_GPIO_PIN GPIO_Pin_2 #define PIOS_LED_LED2_GPIO_PIN GPIO_Pin_3
#define PIOS_LED_LED2_GPIO_CLK RCC_APB2Periph_GPIOA #define PIOS_LED_LED2_GPIO_CLK RCC_APB2Periph_GPIOE
#define PIOS_LED_NUM 2 #define PIOS_LED_NUM 2
#define PIOS_LED_PORTS { PIOS_LED_LED1_GPIO_PORT, PIOS_LED_LED2_GPIO_PORT } #define PIOS_LED_PORTS { PIOS_LED_LED1_GPIO_PORT, PIOS_LED_LED2_GPIO_PORT }
#define PIOS_LED_PINS { PIOS_LED_LED1_GPIO_PIN, PIOS_LED_LED2_GPIO_PIN } #define PIOS_LED_PINS { PIOS_LED_LED1_GPIO_PIN, PIOS_LED_LED2_GPIO_PIN }

3
flight/Revolution/Makefile
View File

@ -49,7 +49,8 @@ endif
FLASH_TOOL = OPENOCD FLASH_TOOL = OPENOCD
# List of modules to include # List of modules to include
MODULES = Actuator Telemetry ManualControl Stabilization Attitude/revolution MODULES = Actuator Telemetry ManualControl Stabilization
# Attitude/revolution
PYMODULES = PYMODULES =
#FlightPlan #FlightPlan

17
flight/Revolution/System/pios_board.c
View File

@ -398,8 +398,9 @@ static uint8_t pios_com_gps_rx_buffer[PIOS_COM_GPS_RX_BUF_LEN];
* Telemetry on main USART * Telemetry on main USART
*/ */
static const struct pios_usart_cfg pios_usart_telem_main_cfg = { static const struct pios_usart_cfg pios_usart_telem_main_cfg = {
.regs = UART4, .regs = USART6,
.remap = GPIO_AF_UART4, .regs = USART1,
.remap = GPIO_AF_USART1,
.init = { .init = {
.USART_BaudRate = 57600, .USART_BaudRate = 57600,
.USART_WordLength = USART_WordLength_8b, .USART_WordLength = USART_WordLength_8b,
@ -411,16 +412,16 @@ static const struct pios_usart_cfg pios_usart_telem_main_cfg = {
}, },
.irq = { .irq = {
.init = { .init = {
.NVIC_IRQChannel = UART4_IRQn, .NVIC_IRQChannel = USART1_IRQn,
.NVIC_IRQChannelPreemptionPriority = PIOS_IRQ_PRIO_HIGH, .NVIC_IRQChannelPreemptionPriority = PIOS_IRQ_PRIO_MID,
.NVIC_IRQChannelSubPriority = 0, .NVIC_IRQChannelSubPriority = 0,
.NVIC_IRQChannelCmd = ENABLE, .NVIC_IRQChannelCmd = ENABLE,
}, },
}, },
.rx = { .rx = {
.gpio = GPIOC, .gpio = GPIOA,
.init = { .init = {
.GPIO_Pin = GPIO_Pin_11, .GPIO_Pin = GPIO_Pin_10,
.GPIO_Speed = GPIO_Speed_2MHz, .GPIO_Speed = GPIO_Speed_2MHz,
.GPIO_Mode = GPIO_Mode_AF, .GPIO_Mode = GPIO_Mode_AF,
.GPIO_OType = GPIO_OType_PP, .GPIO_OType = GPIO_OType_PP,
@ -428,9 +429,9 @@ static const struct pios_usart_cfg pios_usart_telem_main_cfg = {
}, },
}, },
.tx = { .tx = {
.gpio = GPIOC, .gpio = GPIOA,
.init = { .init = {
.GPIO_Pin = GPIO_Pin_10, .GPIO_Pin = GPIO_Pin_9,
.GPIO_Speed = GPIO_Speed_2MHz, .GPIO_Speed = GPIO_Speed_2MHz,
.GPIO_Mode = GPIO_Mode_AF, .GPIO_Mode = GPIO_Mode_AF,
.GPIO_OType = GPIO_OType_PP, .GPIO_OType = GPIO_OType_PP,