jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Cleaned up the jobygps examples.

Browse Source
This commit is contained in:
Fergus Noble 2012-01-25 23:11:46 -08:00 committed by Uwe Hermann
parent ac29b654a9
commit d071a9ffde
3 changed files with 21 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
examples/stm32/f2/jobygps/miniblink/miniblink.c
View File

@ -2,6 +2,7 @@
* This file is part of the libopencm3 project. * This file is part of the libopencm3 project.
* *
* Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de> * Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
* Copyright (C) 2011 Fergus Noble <fergusnoble@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -17,23 +18,17 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
//#include <libopencm3/stm32/rcc.h> #include <libopencm3/stm32/f2/rcc.h>
#include <libopencm3/stm32/f2/gpio.h> #include <libopencm3/stm32/f2/gpio.h>
void gpio_setup(void) void gpio_setup(void)
{ {
/* Enable GPIOC clock. */ /* Enable GPIOC clock. */
/* Manually: */
// RCC_APB2ENR |= RCC_APB2ENR_IOPCEN;
/* Using API functions: */ /* Using API functions: */
//rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN); rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPCEN);
/* Set GPIO12 (in GPIO port C) to 'output push-pull'. */ /* Set GPIO3 and GPIO4 (in GPIO port C) to 'output push-pull'. */
/* Manually: */
// GPIOC_CRH = (GPIO_CNF_OUTPUT_PUSHPULL << (((12 - 8) * 4) + 2));
// GPIOC_CRH |= (GPIO_MODE_OUTPUT_2_MHZ << ((12 - 8) * 4));
/* Using API functions: */ /* Using API functions: */
MMIO32(RCC_BASE + 0x30) |= (1 << 2);
gpio_mode_setup(GPIOC, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, GPIO3 | GPIO4); gpio_mode_setup(GPIOC, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, GPIO3 | GPIO4);
} }
@ -43,32 +38,15 @@ int main(void)
gpio_setup(); gpio_setup();
/* Blink the LED (PC12) on the board. */ gpio_set(GPIOC, GPIO3);
while (1) { gpio_clear(GPIOC, GPIO4);
/* Manually: */
// GPIOC_BSRR = GPIO12; /* LED off */
// for (i = 0; i < 800000; i++) /* Wait a bit. */
// __asm__("nop");
// GPIOC_BRR = GPIO12; /* LED on */
// for (i = 0; i < 800000; i++) /* Wait a bit. */
// __asm__("nop");
/* Using API functions gpio_set()/gpio_clear(): */
// gpio_set(GPIOC, GPIO12); /* LED off */
// for (i = 0; i < 800000; i++) /* Wait a bit. */
// __asm__("nop");
// gpio_clear(GPIOC, GPIO12); /* LED on */
// for (i = 0; i < 800000; i++) /* Wait a bit. */
// __asm__("nop");
/* Blink the LEDs (PC3, PC4) on the board. */
while (1)
{
/* Using API function gpio_toggle(): */ /* Using API function gpio_toggle(): */
//gpio_toggle(GPIOC, GPIO3); /* LED on/off */ gpio_toggle(GPIOC, GPIO3);
gpio_set(GPIOC, GPIO3); gpio_toggle(GPIOC, GPIO4);
gpio_clear(GPIOC, GPIO4);
for (i = 0; i < 800000; i++) /* Wait a bit. */
__asm__("nop");
gpio_clear(GPIOC, GPIO3);
gpio_set(GPIOC, GPIO4);
for (i = 0; i < 800000; i++) /* Wait a bit. */ for (i = 0; i < 800000; i++) /* Wait a bit. */
__asm__("nop"); __asm__("nop");
} }

13
examples/stm32/f2/jobygps/spi_test/spi_test.c
View File

@ -28,13 +28,12 @@
void clock_setup(void) void clock_setup(void)
{ {
/* Enable clocks on all the peripherals we are going to use. */
#warning "This code has to call some kind of rcc clock setup function!!!" rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_SPI2EN);
rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_USART1EN);
RCC_APB1ENR |= RCC_APB1ENR_SPI2EN; rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPCEN | \
RCC_APB2ENR |= RCC_APB2ENR_USART1EN; RCC_AHB1ENR_IOPAEN | \
RCC_AHB1ENR |= RCC_AHB1ENR_IOPBEN);
RCC_AHB1ENR_IOPCEN | RCC_AHB1ENR_IOPAEN | RCC_AHB1ENR_IOPBEN;
} }
void spi_setup(void) void spi_setup(void)

20
examples/stm32/f2/jobygps/usart_printf/usart_printf.c
View File

@ -28,19 +28,9 @@
void clock_setup(void) void clock_setup(void)
{ {
/* Enable clocks on all the peripherals we are going to use. */
#warning "This code has to call some kind of rcc clock setup function!!!" rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_USART1EN);
rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPCEN | RCC_AHB1ENR_IOPAEN);
//rcc_clock_setup_in_hse_8mhz_out_72mhz();
/* Enable GPIOA clock (for LED GPIOs). */
//rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
/* Enable clocks for GPIO port A (for GPIO_USART1_TX) and USART1. */
// rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN |
// RCC_APB2ENR_AFIOEN | RCC_APB2ENR_USART1EN);
RCC_APB2ENR |= RCC_APB2ENR_USART1EN;
RCC_AHB1ENR |= RCC_AHB1ENR_IOPCEN | RCC_AHB1ENR_IOPAEN;
} }
void usart_setup(void) void usart_setup(void)
@ -62,10 +52,8 @@ void usart_setup(void)
void gpio_setup(void) void gpio_setup(void)
{ {
gpio_set(GPIOC, GPIO3);
/* Setup GPIO6 and 7 (in GPIO port A) for LED use. */
gpio_mode_setup(GPIOC, GPIO_MODE_OUTPUT, GPIO_MODE_OUTPUT, GPIO3); gpio_mode_setup(GPIOC, GPIO_MODE_OUTPUT, GPIO_MODE_OUTPUT, GPIO3);
gpio_set(GPIOC, GPIO3);
} }
int _write(int file, char *ptr, int len) int _write(int file, char *ptr, int len)