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

Updated to the new locm3 changed to stdint types.

Browse Source
This commit is contained in:
Piotr Esden-Tempski
2013-06-12 19:43:10 -07:00
parent adddf9e418
commit cb73d4ba3d
71 changed files with 443 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/stm32/f1/lisa-m-2/adc_injec/adc_injec.c
View File

@@ -94,10 +94,10 @@ static void adc_setup(void)
while ((ADC_CR2(ADC1) & ADC_CR2_CAL) != 0); //added this check
}
static void my_usart_print_int(u32 usart, int value)
static void my_usart_print_int(uint32_t usart, int value)
{
s8 i;
u8 nr_digits = 0;
int8_t i;
uint8_t nr_digits = 0;
char buffer[25];
if (value < 0) {
@@ -119,8 +119,8 @@ static void my_usart_print_int(u32 usart, int value)
int main(void)
{
u8 channel_array[16];
u16 temperature = 0;
uint8_t channel_array[16];
uint16_t temperature = 0;
rcc_clock_setup_in_hse_12mhz_out_72mhz();
gpio_setup();

10
examples/stm32/f1/lisa-m-2/adc_injec_timtrig/adc_injec_timtrig.c
View File

@@ -120,10 +120,10 @@ static void adc_setup(void)
while ((ADC_CR2(ADC1) & ADC_CR2_CAL) != 0);
}
static void my_usart_print_int(u32 usart, int value)
static void my_usart_print_int(uint32_t usart, int value)
{
s8 i;
u8 nr_digits = 0;
int8_t i;
uint8_t nr_digits = 0;
char buffer[25];
if (value < 0) {
@@ -145,8 +145,8 @@ static void my_usart_print_int(u32 usart, int value)
int main(void)
{
u8 channel_array[16];
u16 temperature = 0;
uint8_t channel_array[16];
uint16_t temperature = 0;
rcc_clock_setup_in_hse_12mhz_out_72mhz();
gpio_setup();

10
examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/adc_injec_timtrig_irq.c
View File

@@ -27,7 +27,7 @@
#include <libopencm3/stm32/timer.h>
#include <libopencm3/cm3/nvic.h>
volatile u16 temperature = 0;
volatile uint16_t temperature = 0;
static void usart_setup(void)
{
@@ -132,10 +132,10 @@ static void adc_setup(void)
while ((ADC_CR2(ADC1) & ADC_CR2_CAL) != 0);
}
static void my_usart_print_int(u32 usart, int value)
static void my_usart_print_int(uint32_t usart, int value)
{
s8 i;
u8 nr_digits = 0;
int8_t i;
uint8_t nr_digits = 0;
char buffer[25];
if (value < 0) {
@@ -157,7 +157,7 @@ static void my_usart_print_int(u32 usart, int value)
int main(void)
{
u8 channel_array[16];
uint8_t channel_array[16];
rcc_clock_setup_in_hse_12mhz_out_72mhz();
gpio_setup();

16
examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/adc_injec_timtrig_irq_4ch.c
View File

@@ -27,11 +27,11 @@
#include <libopencm3/stm32/timer.h>
#include <libopencm3/cm3/nvic.h>
volatile u16 temperature = 0;
volatile u16 v_refint = 0;
volatile u16 lisam_adc1 = 0;
volatile u16 lisam_adc2 = 0;
u8 channel_array[4]; /* for injected sampling, 4 channels max, for regular, 16 max */
volatile uint16_t temperature = 0;
volatile uint16_t v_refint = 0;
volatile uint16_t lisam_adc1 = 0;
volatile uint16_t lisam_adc2 = 0;
uint8_t channel_array[4]; /* for injected sampling, 4 channels max, for regular, 16 max */
static void usart_setup(void)
{
@@ -149,10 +149,10 @@ static void adc_setup(void)
while ((ADC_CR2(ADC1) & ADC_CR2_CAL) != 0); //added this check
}
static void my_usart_print_int(u32 usart, int value)
static void my_usart_print_int(uint32_t usart, int value)
{
s8 i;
u8 nr_digits = 0;
int8_t i;
uint8_t nr_digits = 0;
char buffer[25];
if (value < 0) {

10
examples/stm32/f1/lisa-m-2/adc_regular/adc.c
View File

@@ -88,10 +88,10 @@ static void adc_setup(void)
adc_calibration(ADC1);
}
static void my_usart_print_int(u32 usart, int value)
static void my_usart_print_int(uint32_t usart, int value)
{
s8 i;
u8 nr_digits = 0;
int8_t i;
uint8_t nr_digits = 0;
char buffer[25];
if (value < 0) {
@@ -113,8 +113,8 @@ static void my_usart_print_int(u32 usart, int value)
int main(void)
{
u8 channel_array[16];
u16 temperature = 0;
uint8_t channel_array[16];
uint16_t temperature = 0;
rcc_clock_setup_in_hse_12mhz_out_72mhz();
gpio_setup();

32
examples/stm32/f1/lisa-m-2/can/can.c
View File

@@ -26,22 +26,22 @@
#include <libopencm3/stm32/can.h>
struct can_tx_msg {
u32 std_id;
u32 ext_id;
u8 ide;
u8 rtr;
u8 dlc;
u8 data[8];
uint32_t std_id;
uint32_t ext_id;
uint8_t ide;
uint8_t rtr;
uint8_t dlc;
uint8_t data[8];
};
struct can_rx_msg {
u32 std_id;
u32 ext_id;
u8 ide;
u8 rtr;
u8 dlc;
u8 data[8];
u8 fmi;
uint32_t std_id;
uint32_t ext_id;
uint8_t ide;
uint8_t rtr;
uint8_t dlc;
uint8_t data[8];
uint8_t fmi;
};
struct can_tx_msg can_tx_msg;
@@ -166,7 +166,7 @@ static void can_setup(void)
void sys_tick_handler(void)
{
static int temp32 = 0;
static u8 data[8] = {0, 1, 2, 0, 0, 0, 0, 0};
static uint8_t data[8] = {0, 1, 2, 0, 0, 0, 0, 0};
/* We call this handler every 1ms so every 100ms = 0.1s
* resulting in 100Hz message rate.
@@ -195,9 +195,9 @@ void sys_tick_handler(void)
void usb_lp_can_rx0_isr(void)
{
u32 id, fmi;
uint32_t id, fmi;
bool ext, rtr;
u8 length, data[8];
uint8_t length, data[8];
can_receive(CAN1, 0, false, &id, &ext, &rtr, &fmi, &length, data);

2
examples/stm32/f1/lisa-m-2/spi/spi.c
View File

@@ -132,7 +132,7 @@ static void gpio_setup(void)
int main(void)
{
int counter = 0;
u16 rx_value = 0x42;
uint16_t rx_value = 0x42;
clock_setup();
gpio_setup();

22
examples/stm32/f1/lisa-m-2/spi_dma/spi_dma.c
View File

@@ -142,9 +142,9 @@ static void dma_setup(void)
}
#if USE_16BIT_TRANSFERS
static int spi_dma_transceive(u16 *tx_buf, int tx_len, u16 *rx_buf, int rx_len)
static int spi_dma_transceive(uint16_t *tx_buf, int tx_len, uint16_t *rx_buf, int rx_len)
#else
static int spi_dma_transceive(u8 *tx_buf, int tx_len, u8 *rx_buf, int rx_len)
static int spi_dma_transceive(uint8_t *tx_buf, int tx_len, uint8_t *rx_buf, int rx_len)
#endif
{
/* Check for 0 length in both tx and rx */
@@ -162,7 +162,7 @@ static int spi_dma_transceive(u8 *tx_buf, int tx_len, u8 *rx_buf, int rx_len)
* busy any longer, i.e. the last activity was verified
* complete elsewhere in the program.
*/
volatile u8 temp_data __attribute__ ((unused));
volatile uint8_t temp_data __attribute__ ((unused));
while (SPI_SR(SPI1) & (SPI_SR_RXNE | SPI_SR_OVR)) {
temp_data = SPI_DR(SPI1);
}
@@ -178,8 +178,8 @@ static int spi_dma_transceive(u8 *tx_buf, int tx_len, u8 *rx_buf, int rx_len)
/* Set up rx dma, note it has higher priority to avoid overrun */
if (rx_len > 0) {
dma_set_peripheral_address(DMA1, DMA_CHANNEL2, (u32)&SPI1_DR);
dma_set_memory_address(DMA1, DMA_CHANNEL2, (u32)rx_buf);
dma_set_peripheral_address(DMA1, DMA_CHANNEL2, (uint32_t)&SPI1_DR);
dma_set_memory_address(DMA1, DMA_CHANNEL2, (uint32_t)rx_buf);
dma_set_number_of_data(DMA1, DMA_CHANNEL2, rx_len);
dma_set_read_from_peripheral(DMA1, DMA_CHANNEL2);
dma_enable_memory_increment_mode(DMA1, DMA_CHANNEL2);
@@ -195,8 +195,8 @@ static int spi_dma_transceive(u8 *tx_buf, int tx_len, u8 *rx_buf, int rx_len)
/* Set up tx dma */
if (tx_len > 0) {
dma_set_peripheral_address(DMA1, DMA_CHANNEL3, (u32)&SPI1_DR);
dma_set_memory_address(DMA1, DMA_CHANNEL3, (u32)tx_buf);
dma_set_peripheral_address(DMA1, DMA_CHANNEL3, (uint32_t)&SPI1_DR);
dma_set_memory_address(DMA1, DMA_CHANNEL3, (uint32_t)tx_buf);
dma_set_number_of_data(DMA1, DMA_CHANNEL3, tx_len);
dma_set_read_from_memory(DMA1, DMA_CHANNEL3);
dma_enable_memory_increment_mode(DMA1, DMA_CHANNEL3);
@@ -340,11 +340,11 @@ int main(void)
/* Transmit and Receive packets, set transmit to index and receive to known unused value to aid in debugging */
#if USE_16BIT_TRANSFERS
u16 tx_packet[16] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
u16 rx_packet[16] = {0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42};
uint16_t tx_packet[16] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
uint16_t rx_packet[16] = {0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42};
#else
u8 tx_packet[16] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
u8 rx_packet[16] = {0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42};
uint8_t tx_packet[16] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
uint8_t rx_packet[16] = {0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42};
#endif
transceive_status = DONE;

38
examples/stm32/f1/lisa-m-2/spi_dma_adv/spi_dma_adv.c
View File

@@ -52,9 +52,9 @@ volatile trans_status transceive_status;
int rx_buf_remainder = 0;
#if USE_16BIT_TRANSFERS
u16 dummy_tx_buf = 0xdd;
uint16_t dummy_tx_buf = 0xdd;
#else
u8 dummy_tx_buf = 0xdd;
uint8_t dummy_tx_buf = 0xdd;
#endif
int _write(int file, char *ptr, int len);
@@ -152,9 +152,9 @@ static void dma_setup(void)
}
#if USE_16BIT_TRANSFERS
static int spi_dma_transceive(u16 *tx_buf, int tx_len, u16 *rx_buf, int rx_len)
static int spi_dma_transceive(uint16_t *tx_buf, int tx_len, uint16_t *rx_buf, int rx_len)
#else
static int spi_dma_transceive(u8 *tx_buf, int tx_len, u8 *rx_buf, int rx_len)
static int spi_dma_transceive(uint8_t *tx_buf, int tx_len, uint8_t *rx_buf, int rx_len)
#endif
{
@@ -173,7 +173,7 @@ static int spi_dma_transceive(u8 *tx_buf, int tx_len, u8 *rx_buf, int rx_len)
* busy any longer, i.e. the last activity was verified
* complete elsewhere in the program.
*/
volatile u8 temp_data __attribute__ ((unused));
volatile uint8_t temp_data __attribute__ ((unused));
while (SPI_SR(SPI1) & (SPI_SR_RXNE | SPI_SR_OVR)) {
temp_data = SPI_DR(SPI1);
}
@@ -199,8 +199,8 @@ static int spi_dma_transceive(u8 *tx_buf, int tx_len, u8 *rx_buf, int rx_len)
/* Set up rx dma, note it has higher priority to avoid overrun */
if (rx_len > 0) {
dma_set_peripheral_address(DMA1, DMA_CHANNEL2, (u32)&SPI1_DR);
dma_set_memory_address(DMA1, DMA_CHANNEL2, (u32)rx_buf);
dma_set_peripheral_address(DMA1, DMA_CHANNEL2, (uint32_t)&SPI1_DR);
dma_set_memory_address(DMA1, DMA_CHANNEL2, (uint32_t)rx_buf);
dma_set_number_of_data(DMA1, DMA_CHANNEL2, rx_len);
dma_set_read_from_peripheral(DMA1, DMA_CHANNEL2);
dma_enable_memory_increment_mode(DMA1, DMA_CHANNEL2);
@@ -217,8 +217,8 @@ static int spi_dma_transceive(u8 *tx_buf, int tx_len, u8 *rx_buf, int rx_len)
/* Set up tx dma (must always run tx to get clock signal) */
if (tx_len > 0) {
/* Here we have a regular tx transfer */
dma_set_peripheral_address(DMA1, DMA_CHANNEL3, (u32)&SPI1_DR);
dma_set_memory_address(DMA1, DMA_CHANNEL3, (u32)tx_buf);
dma_set_peripheral_address(DMA1, DMA_CHANNEL3, (uint32_t)&SPI1_DR);
dma_set_memory_address(DMA1, DMA_CHANNEL3, (uint32_t)tx_buf);
dma_set_number_of_data(DMA1, DMA_CHANNEL3, tx_len);
dma_set_read_from_memory(DMA1, DMA_CHANNEL3);
dma_enable_memory_increment_mode(DMA1, DMA_CHANNEL3);
@@ -235,8 +235,8 @@ static int spi_dma_transceive(u8 *tx_buf, int tx_len, u8 *rx_buf, int rx_len)
* and set the length to the rx_len to get all rx data in, while
* not incrementing the memory pointer
*/
dma_set_peripheral_address(DMA1, DMA_CHANNEL3, (u32)&SPI1_DR);
dma_set_memory_address(DMA1, DMA_CHANNEL3, (u32)(&dummy_tx_buf)); // Change here
dma_set_peripheral_address(DMA1, DMA_CHANNEL3, (uint32_t)&SPI1_DR);
dma_set_memory_address(DMA1, DMA_CHANNEL3, (uint32_t)(&dummy_tx_buf)); // Change here
dma_set_number_of_data(DMA1, DMA_CHANNEL3, rx_len); // Change here
dma_set_read_from_memory(DMA1, DMA_CHANNEL3);
dma_disable_memory_increment_mode(DMA1, DMA_CHANNEL3); // Change here
@@ -313,8 +313,8 @@ void dma1_channel3_isr(void)
*/
if (rx_buf_remainder > 0) {
dma_channel_reset(DMA1, DMA_CHANNEL3);
dma_set_peripheral_address(DMA1, DMA_CHANNEL3, (u32)&SPI1_DR);
dma_set_memory_address(DMA1, DMA_CHANNEL3, (u32)(&dummy_tx_buf)); // Change here
dma_set_peripheral_address(DMA1, DMA_CHANNEL3, (uint32_t)&SPI1_DR);
dma_set_memory_address(DMA1, DMA_CHANNEL3, (uint32_t)(&dummy_tx_buf)); // Change here
dma_set_number_of_data(DMA1, DMA_CHANNEL3, rx_buf_remainder); // Change here
dma_set_read_from_memory(DMA1, DMA_CHANNEL3);
dma_disable_memory_increment_mode(DMA1, DMA_CHANNEL3); // Change here
@@ -401,11 +401,11 @@ int main(void)
/* Transmit and Receive packets, set transmit to index and receive to known unused value to aid in debugging */
#if USE_16BIT_TRANSFERS
u16 tx_packet[16] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
u16 rx_packet[16] = {0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42};
uint16_t tx_packet[16] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
uint16_t rx_packet[16] = {0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42};
#else
u8 tx_packet[16] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
u8 rx_packet[16] = {0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42};
uint8_t tx_packet[16] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
uint8_t rx_packet[16] = {0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42};
#endif
transceive_status = DONE;
@@ -494,9 +494,9 @@ int main(void)
/* Reset receive buffer for consistency */
for (i = 0; i < 16; i++) {
#if USE_16BIT_TRANSFERS
tx_packet[i] = (u16)i;
tx_packet[i] = (uint16_t)i;
#else
tx_packet[i] = (u8)i;
tx_packet[i] = (uint8_t)i;
#endif
rx_packet[i] = 0x42;
}

8
examples/stm32/f1/lisa-m-2/usart_dma/usart_dma.c
View File

@@ -76,8 +76,8 @@ static void dma_write(char *data, int size)
/* Reset DMA channel*/
dma_channel_reset(DMA1, DMA_CHANNEL7);
dma_set_peripheral_address(DMA1, DMA_CHANNEL7, (u32)&USART2_DR);
dma_set_memory_address(DMA1, DMA_CHANNEL7, (u32)data);
dma_set_peripheral_address(DMA1, DMA_CHANNEL7, (uint32_t)&USART2_DR);
dma_set_memory_address(DMA1, DMA_CHANNEL7, (uint32_t)data);
dma_set_number_of_data(DMA1, DMA_CHANNEL7, size);
dma_set_read_from_memory(DMA1, DMA_CHANNEL7);
dma_enable_memory_increment_mode(DMA1, DMA_CHANNEL7);
@@ -118,8 +118,8 @@ static void dma_read(char *data, int size)
/* Reset DMA channel*/
dma_channel_reset(DMA1, DMA_CHANNEL6);
dma_set_peripheral_address(DMA1, DMA_CHANNEL6, (u32)&USART2_DR);
dma_set_memory_address(DMA1, DMA_CHANNEL6, (u32)data);
dma_set_peripheral_address(DMA1, DMA_CHANNEL6, (uint32_t)&USART2_DR);
dma_set_memory_address(DMA1, DMA_CHANNEL6, (uint32_t)data);
dma_set_number_of_data(DMA1, DMA_CHANNEL6, size);
dma_set_read_from_peripheral(DMA1, DMA_CHANNEL6);
dma_enable_memory_increment_mode(DMA1, DMA_CHANNEL6);

2
examples/stm32/f1/lisa-m-2/usart_irq/usart_irq.c
View File

@@ -81,7 +81,7 @@ static void gpio_setup(void)
void usart2_isr(void)
{
static u8 data = 'A';
static uint8_t data = 'A';
/* Check if we were called because of RXNE. */
if (((USART_CR1(USART2) & USART_CR1_RXNEIE) != 0) &&

34
examples/stm32/f1/lisa-m-2/usart_irq_printf/usart_irq_printf.c
View File

@@ -32,13 +32,13 @@
* https://github.com/open-bldc/open-bldc/tree/master/source/libgovernor
*****************************************************************************/
typedef s32 ring_size_t;
typedef int32_t ring_size_t;
struct ring {
u8 *data;
uint8_t *data;
ring_size_t size;
u32 begin;
u32 end;
uint32_t begin;
uint32_t end;
};
#define RING_SIZE(RING) ((RING)->size - 1)
@@ -47,7 +47,7 @@ struct ring {
int _write(int file, char *ptr, int len);
static void ring_init(struct ring *ring, u8 *buf, ring_size_t size)
static void ring_init(struct ring *ring, uint8_t *buf, ring_size_t size)
{
ring->data = buf;
ring->size = size;
@@ -55,20 +55,20 @@ static void ring_init(struct ring *ring, u8 *buf, ring_size_t size)
ring->end = 0;
}
static s32 ring_write_ch(struct ring *ring, u8 ch)
static int32_t ring_write_ch(struct ring *ring, uint8_t ch)
{
if (((ring->end + 1) % ring->size) != ring->begin) {
ring->data[ring->end++] = ch;
ring->end %= ring->size;
return (u32)ch;
return (uint32_t)ch;
}
return -1;
}
static s32 ring_write(struct ring *ring, u8 *data, ring_size_t size)
static int32_t ring_write(struct ring *ring, uint8_t *data, ring_size_t size)
{
s32 i;
int32_t i;
for (i = 0; i < size; i++) {
if (ring_write_ch(ring, data[i]) < 0)
@@ -78,9 +78,9 @@ static s32 ring_write(struct ring *ring, u8 *data, ring_size_t size)
return i;
}
static s32 ring_read_ch(struct ring *ring, u8 *ch)
static int32_t ring_read_ch(struct ring *ring, uint8_t *ch)
{
s32 ret = -1;
int32_t ret = -1;
if (ring->begin != ring->end) {
ret = ring->data[ring->begin++];
@@ -93,9 +93,9 @@ static s32 ring_read_ch(struct ring *ring, u8 *ch)
}
/* Not used!
static s32 ring_read(struct ring *ring, u8 *data, ring_size_t size)
static int32_t ring_read(struct ring *ring, uint8_t *data, ring_size_t size)
{
s32 i;
int32_t i;
for (i = 0; i < size; i++) {
if (ring_read_ch(ring, data + i) < 0)
@@ -113,7 +113,7 @@ static s32 ring_read(struct ring *ring, u8 *data, ring_size_t size)
#define BUFFER_SIZE 1024
struct ring output_ring;
u8 output_ring_buffer[BUFFER_SIZE];
uint8_t output_ring_buffer[BUFFER_SIZE];
static void clock_setup(void)
{
@@ -188,7 +188,7 @@ void usart2_isr(void)
if (((USART_CR1(USART2) & USART_CR1_TXEIE) != 0) &&
((USART_SR(USART2) & USART_SR_TXE) != 0)) {
s32 data;
int32_t data;
data = ring_read_ch(&output_ring, NULL);
@@ -207,7 +207,7 @@ int _write(int file, char *ptr, int len)
int ret;
if (file == 1) {
ret = ring_write(&output_ring, (u8 *)ptr, len);
ret = ring_write(&output_ring, (uint8_t *)ptr, len);
if (ret < 0)
ret = -ret;
@@ -241,7 +241,7 @@ void sys_tick_handler(void)
static int counter = 0;
static float fcounter = 0.0;
static double dcounter = 0.0;
static u32 temp32 = 0;
static uint32_t temp32 = 0;
temp32++;