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

update to current library

Browse Source 
Minor api changes required.
This commit is contained in:
Karl Palsson
2018-03-03 21:42:52 +00:00
parent bcf608fa54
commit 85be1e5e7b
13 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/stm32/f0/stm32f0-discovery/adc/adc.c
View File

@@ -70,7 +70,7 @@ static void usart_setup(void)
/* Setup UART parameters. */ /* Setup UART parameters. */
usart_set_baudrate(USART1, 38400); usart_set_baudrate(USART1, 38400);
usart_set_databits(USART1, 8); usart_set_databits(USART1, 8);
usart_set_stopbits(USART1, USART_CR2_STOP_1_0BIT); usart_set_stopbits(USART1, USART_CR2_STOPBITS_1);
usart_set_mode(USART1, USART_MODE_TX); usart_set_mode(USART1, USART_MODE_TX);
usart_set_parity(USART1, USART_PARITY_NONE); usart_set_parity(USART1, USART_PARITY_NONE);
usart_set_flow_control(USART1, USART_FLOWCONTROL_NONE); usart_set_flow_control(USART1, USART_FLOWCONTROL_NONE);

2
examples/stm32/f0/stm32f0-discovery/usart/usart.c
View File

@@ -38,7 +38,7 @@ static void usart_setup(void)
usart_set_baudrate(USART1, 38400); usart_set_baudrate(USART1, 38400);
usart_set_databits(USART1, 8); usart_set_databits(USART1, 8);
usart_set_parity(USART1, USART_PARITY_NONE); usart_set_parity(USART1, USART_PARITY_NONE);
usart_set_stopbits(USART1, USART_CR2_STOP_1_0BIT); usart_set_stopbits(USART1, USART_CR2_STOPBITS_1);
usart_set_mode(USART1, USART_MODE_TX); usart_set_mode(USART1, USART_MODE_TX);
usart_set_flow_control(USART1, USART_FLOWCONTROL_NONE); usart_set_flow_control(USART1, USART_FLOWCONTROL_NONE);

2
examples/stm32/f0/stm32f0-discovery/usart_stdio/usart_stdio.c
View File

@@ -58,7 +58,7 @@ static FILE *usart_setup(uint32_t dev)
usart_set_baudrate(dev, 38400); usart_set_baudrate(dev, 38400);
usart_set_databits(dev, 8); usart_set_databits(dev, 8);
usart_set_parity(dev, USART_PARITY_NONE); usart_set_parity(dev, USART_PARITY_NONE);
usart_set_stopbits(dev, USART_CR2_STOP_1_0BIT); usart_set_stopbits(dev, USART_CR2_STOPBITS_1);
usart_set_mode(dev, USART_MODE_TX_RX); usart_set_mode(dev, USART_MODE_TX_RX);
usart_set_flow_control(dev, USART_FLOWCONTROL_NONE); usart_set_flow_control(dev, USART_FLOWCONTROL_NONE);

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

@@ -153,7 +153,7 @@ static void can_setup(void)
} }
/* CAN filter 0 init. */ /* CAN filter 0 init. */
can_filter_id_mask_32bit_init(CAN1, can_filter_id_mask_32bit_init(
0, /* Filter ID */ 0, /* Filter ID */
0, /* CAN ID */ 0, /* CAN ID */
0, /* CAN ID mask */ 0, /* CAN ID mask */

2
examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c
View File

@@ -166,7 +166,7 @@ static const char *usb_strings[] = {
/* Buffer to be used for control requests. */ /* Buffer to be used for control requests. */
uint8_t usbd_control_buffer[128]; uint8_t usbd_control_buffer[128];
static int cdcacm_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, uint8_t **buf, static enum usbd_request_return_codes cdcacm_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, uint8_t **buf,
uint16_t *len, void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req)) uint16_t *len, void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req))
{ {
(void)complete; (void)complete;

6
examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c
View File

@@ -24,7 +24,7 @@
#include <libopencm3/stm32/rcc.h> #include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/spi.h> #include <libopencm3/stm32/spi.h>
#include <libopencm3/stm32/otg_fs.h> #include <libopencm3/usb/dwc/otg_fs.h>
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/hid.h> #include <libopencm3/usb/hid.h>
#include "adxl345.h" #include "adxl345.h"
@@ -205,7 +205,7 @@ static const char *usb_strings[] = {
/* Buffer used for control requests. */ /* Buffer used for control requests. */
uint8_t usbd_control_buffer[128]; uint8_t usbd_control_buffer[128];
static int hid_control_request(usbd_device *dev, struct usb_setup_data *req, uint8_t **buf, uint16_t *len, static enum usbd_request_return_codes hid_control_request(usbd_device *dev, struct usb_setup_data *req, uint8_t **buf, uint16_t *len,
void (**complete)(usbd_device *dev, struct usb_setup_data *req)) void (**complete)(usbd_device *dev, struct usb_setup_data *req))
{ {
(void)complete; (void)complete;
@@ -236,7 +236,7 @@ static void dfu_detach_complete(usbd_device *dev, struct usb_setup_data *req)
scb_reset_core(); scb_reset_core();
} }
static int dfu_control_request(usbd_device *dev, struct usb_setup_data *req, uint8_t **buf, uint16_t *len, static enum usbd_request_return_codes dfu_control_request(usbd_device *dev, struct usb_setup_data *req, uint8_t **buf, uint16_t *len,
void (**complete)(usbd_device *dev, struct usb_setup_data *req)) void (**complete)(usbd_device *dev, struct usb_setup_data *req))
{ {
(void)buf; (void)buf;

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

@@ -153,7 +153,7 @@ static void can_setup(void)
} }
/* CAN filter 0 init. */ /* CAN filter 0 init. */
can_filter_id_mask_32bit_init(CAN1, can_filter_id_mask_32bit_init(
0, /* Filter ID */ 0, /* Filter ID */
0, /* CAN ID */ 0, /* CAN ID */
0, /* CAN ID mask */ 0, /* CAN ID mask */

2
examples/stm32/f1/obldc-strip/can/can.c
View File

@@ -139,7 +139,7 @@ static void can_setup(void)
} }
/* CAN filter 0 init. */ /* CAN filter 0 init. */
can_filter_id_mask_32bit_init(CAN1, can_filter_id_mask_32bit_init(
0, /* Filter ID */ 0, /* Filter ID */
0, /* CAN ID */ 0, /* CAN ID */
0, /* CAN ID mask */ 0, /* CAN ID mask */

2
examples/stm32/f1/obldc/can/can.c
View File

@@ -138,7 +138,7 @@ static void can_setup(void)
} }
/* CAN filter 0 init. */ /* CAN filter 0 init. */
can_filter_id_mask_32bit_init(CAN1, can_filter_id_mask_32bit_init(
0, /* Filter ID */ 0, /* Filter ID */
0, /* CAN ID */ 0, /* CAN ID */
0, /* CAN ID mask */ 0, /* CAN ID mask */

2
examples/stm32/f1/waveshare-open103r/usbserial/usbserial.c
View File

@@ -175,7 +175,7 @@ static const char *usb_strings[] = {
/* Buffer to be used for control requests. */ /* Buffer to be used for control requests. */
uint8_t usbd_control_buffer[128]; uint8_t usbd_control_buffer[128];
static int cdcacm_control_request(usbd_device *usbd_dev, static enum usbd_request_return_codes cdcacm_control_request(usbd_device *usbd_dev,
struct usb_setup_data *req, struct usb_setup_data *req,
uint8_t **buf, uint8_t **buf,
uint16_t *len, uint16_t *len,

4
examples/stm32/f3/stm32f3-discovery/i2c/i2c.c
View File

@@ -45,6 +45,8 @@
#define LD8 GPIOE, GPIO14 #define LD8 GPIOE, GPIO14
#define LD6 GPIOE, GPIO15 #define LD6 GPIOE, GPIO15
int _write(int file, char *ptr, int len);
static void i2c_setup(void) static void i2c_setup(void)
{ {
rcc_periph_clock_enable(RCC_I2C1); rcc_periph_clock_enable(RCC_I2C1);
@@ -58,7 +60,7 @@ static void i2c_setup(void)
i2c_peripheral_disable(I2C1); i2c_peripheral_disable(I2C1);
//configure ANFOFF DNF[3:0] in CR1 //configure ANFOFF DNF[3:0] in CR1
i2c_enable_analog_filter(I2C1); i2c_enable_analog_filter(I2C1);
i2c_set_digital_filter(I2C1, I2C_CR1_DNF_DISABLED); i2c_set_digital_filter(I2C1, 0);
/* HSI is at 8Mhz */ /* HSI is at 8Mhz */
i2c_set_speed(I2C1, i2c_speed_sm_100k, 8); i2c_set_speed(I2C1, i2c_speed_sm_100k, 8);
//configure No-Stretch CR1 (only relevant in slave mode) //configure No-Stretch CR1 (only relevant in slave mode)

2
examples/stm32/f3/stm32f3-discovery/usb_cdcacm/cdcacm.c
View File

@@ -166,7 +166,7 @@ static const char *usb_strings[] = {
/* Buffer to be used for control requests. */ /* Buffer to be used for control requests. */
uint8_t usbd_control_buffer[128]; uint8_t usbd_control_buffer[128];
static int cdcacm_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, uint8_t **buf, static enum usbd_request_return_codes cdcacm_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, uint8_t **buf,
uint16_t *len, void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req)) uint16_t *len, void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req))
{ {
(void)complete; (void)complete;

2
libopencm3

Submodule libopencm3 updated: e3c78b8825...8feb711ca0