EMTime/libopencm3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

examples: Even more coding-style fixes.

Browse Source
This commit is contained in:
Uwe Hermann
2011-11-13 17:07:21 +01:00
parent c3fea659d1
commit bb8741a79b
31 changed files with 157 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,8 +33,8 @@ void gpio_setup(void)
// GPIOC_CRH = (GPIO_CNF_OUTPUT_PUSHPULL << (((12 - 8) * 4) + 2));
// GPIOC_CRH |= (GPIO_MODE_OUTPUT_2_MHZ << ((12 - 8) * 4));
/* Using API functions: */
MMIO32(RCC_BASE+0x30) |= (1<<2);
gpio_mode_setup(GPIOC, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, GPIO3|GPIO4);
MMIO32(RCC_BASE + 0x30) |= (1 << 2);
gpio_mode_setup(GPIOC, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, GPIO3 | GPIO4);
}
int main(void)

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

@@ -18,32 +18,32 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdio.h>
#include <errno.h>
#include <libopencm3/stm32/spi.h>
#include <libopencm3/stm32/usart.h>
#include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/f2/gpio.h>
#include <libopencm3/stm32/f2/rcc.h>
#include <stdio.h>
#include <errno.h>
void clock_setup(void)
{
RCC_APB1ENR |= RCC_APB1ENR_SPI2EN;
RCC_APB2ENR |= RCC_APB2ENR_USART1EN;
RCC_AHB1ENR |= RCC_AHB1ENR_IOPCEN | RCC_AHB1ENR_IOPAEN | RCC_AHB1ENR_IOPBEN;
RCC_APB1ENR |= RCC_APB1ENR_SPI2EN;
RCC_APB2ENR |= RCC_APB2ENR_USART1EN;
RCC_AHB1ENR |=
RCC_AHB1ENR_IOPCEN | RCC_AHB1ENR_IOPAEN | RCC_AHB1ENR_IOPBEN;
}
void spi_setup(void)
{
gpio_mode_setup(GPIOB, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO13 | GPIO14 | GPIO15);
gpio_mode_setup(GPIOB, GPIO_MODE_AF, GPIO_PUPD_NONE,
GPIO13 | GPIO14 | GPIO15);
gpio_set_af(GPIOB, GPIO_AF5, GPIO13 | GPIO14 | GPIO15);
/* Setup SPI parameters. */
spi_init_master(SPI2, SPI_CR1_BAUDRATE_FPCLK_DIV_256, SPI_CR1_CPOL, \
SPI_CR1_CPHA, SPI_CR1_DFF_8BIT, SPI_CR1_MSBFIRST);
spi_enable_ss_output(SPI2); /* Required, see 25.3.1 section about NSS */
spi_init_master(SPI2, SPI_CR1_BAUDRATE_FPCLK_DIV_256, SPI_CR1_CPOL,
SPI_CR1_CPHA, SPI_CR1_DFF_8BIT, SPI_CR1_MSBFIRST);
spi_enable_ss_output(SPI2); /* Required, see NSS, 25.3.1 section. */
/* Finally enable the SPI. */
spi_enable(SPI2);
@@ -52,7 +52,7 @@ void spi_setup(void)
void usart_setup(void)
{
gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO9);
gpio_set_af(GPIOA, GPIO_AF7, GPIO9|GPIO10);
gpio_set_af(GPIOA, GPIO_AF7, GPIO9 | GPIO10);
/* Setup UART parameters. */
usart_set_baudrate(USART1, 9600, 16000000);
@@ -70,44 +70,43 @@ void gpio_setup(void)
{
gpio_set(GPIOC, GPIO3);
/* Setup GPIO3 (in GPIO port C) for led use. */
gpio_mode_setup(GPIOC, GPIO_MODE_OUTPUT,
GPIO_MODE_OUTPUT, GPIO3);
/* Setup GPIO3 (in GPIO port C) for LED use. */
gpio_mode_setup(GPIOC, GPIO_MODE_OUTPUT, GPIO_MODE_OUTPUT, GPIO3);
}
int _write (int file, char *ptr, int len)
int _write(int file, char *ptr, int len)
{
int i;
int i;
if (file == 1) {
for (i = 0; i < len; i++){
for (i = 0; i < len; i++)
usart_send_blocking(USART1, ptr[i]);
}
return i;
}
errno = EIO;
return -1;
errno = EIO;
return -1;
}
int main(void)
{
int counter = 0;
volatile u16 dummy;
volatile u16 dummy;
clock_setup();
gpio_setup();
usart_setup();
spi_setup();
spi_setup();
while (1)
{
while (1) {
counter++;
printf("Hello, world! %i\r\n", counter);
dummy = spi_read(SPI2); /* Stops RX buff overflow, but probably not needed */
spi_send(SPI2,(u8)counter);
gpio_toggle(GPIOC, GPIO3);
printf("Hello, world! %i\r\n", counter);
/* Stops RX buffer overflow, but probably not needed. */
dummy = spi_read(SPI2);
spi_send(SPI2, (u8) counter);
gpio_toggle(GPIOC, GPIO3);
}
while(1);
while (1);
return 0;
}

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

@@ -34,17 +34,16 @@ void clock_setup(void)
//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_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)
{
gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO9);
gpio_set_af(GPIOA, GPIO_AF7, GPIO9|GPIO10);
gpio_set_af(GPIOA, GPIO_AF7, GPIO9 | GPIO10);
/* Setup UART parameters. */
usart_set_baudrate(USART1, 9600, 16000000);
@@ -62,25 +61,22 @@ 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);
/* Setup GPIO6 and 7 (in GPIO port A) for LED use. */
gpio_mode_setup(GPIOC, GPIO_MODE_OUTPUT, GPIO_MODE_OUTPUT, GPIO3);
}
int _write (int file, char *ptr, int len)
int _write(int file, char *ptr, int len)
{
int i;
int i;
if (file == 1) {
for (i = 0; i < len; i++){
for (i = 0; i < len; i++)
usart_send_blocking(USART1, ptr[i]);
}
return i;
}
errno = EIO;
return -1;
errno = EIO;
return -1;
}
int main(void)
@@ -99,10 +95,11 @@ int main(void)
*/
while (1) {
gpio_toggle(GPIOC, GPIO3);
printf("Hello World! %i %f %f\r\n", counter, fcounter, dcounter);
printf("Hello World! %i %f %f\r\n", counter, fcounter,
dcounter);
counter++;
fcounter+=0.01;
dcounter+=0.01;
fcounter += 0.01;
dcounter += 0.01;
}
return 0;