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

Updated libopencm3 to current master. Made all examples compile again.

Browse Source 
Be specifically careful with the usb examples. There is likely some
breakage to be expected, not sure I updated all the drivers to the
correct types for the respective chips.
This commit is contained in:
Piotr Esden-Tempski
2015-12-15 00:56:25 +01:00
parent f0009c64dc
commit 976720c355
48 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/stm32/f1/other/usb_cdcacm/cdcacm.c
View File

@@ -244,7 +244,7 @@ int main(void)
gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15);
usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_register_set_config_callback(usbd_dev, cdcacm_set_config);
gpio_set(GPIOA, GPIO15);

2
examples/stm32/f1/other/usb_hid/usbhid.c
View File

@@ -285,7 +285,7 @@ int main(void)
AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON;
gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15);
usbd_dev = usbd_init(&stm32f103_usb_driver, &dev_descr, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_dev = usbd_init(&stm32f107_usb_driver, &dev_descr, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_register_set_config_callback(usbd_dev, hid_set_config);
gpio_set(GPIOA, GPIO15);

2
examples/stm32/f1/stm32-h103/rtc/rtc.c
View File

@@ -103,7 +103,7 @@ int main(void)
* Otherwise enable it with the LSE as clock source and 0x7fff as
* prescale value.
*/
rtc_auto_awake(LSE, 0x7fff);
rtc_auto_awake(RCC_LSE, 0x7fff);
/* Setup the RTC interrupt. */
nvic_setup();

2
examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c
View File

@@ -246,7 +246,7 @@ int main(void)
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO11);
usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_register_set_config_callback(usbd_dev, cdcacm_set_config);
for (i = 0; i < 0x800000; i++)

2
examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c
View File

@@ -267,7 +267,7 @@ int main(void)
GPIO_CNF_OUTPUT_PUSHPULL, GPIO11);
gpio_set(GPIOC, GPIO11);
usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 4, usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 4, usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_register_set_config_callback(usbd_dev, usbdfu_set_config);
gpio_clear(GPIOC, GPIO11);

2
examples/stm32/f1/stm32-h103/usb_hid/usbhid.c
View File

@@ -286,7 +286,7 @@ int main(void)
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO11);
usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_register_set_config_callback(usbd_dev, hid_set_config);
for (i = 0; i < 0x80000; i++)

2
examples/stm32/f1/stm32-h103/usb_iap/usbiap.c
View File

@@ -268,7 +268,7 @@ int main(void)
AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON;
gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15);
usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 4, usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 4, usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_register_set_config_callback(usbd_dev, usbdfu_set_config);
gpio_set(GPIOA, GPIO15);

2
examples/stm32/f1/stm32-maple/usb_cdcacm/cdcacm.c
View File

@@ -257,7 +257,7 @@ int main(void)
gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO5);
usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_register_set_config_callback(usbd_dev, cdcacm_set_config);
for (i = 0; i < 0x800000; i++)

2
examples/stm32/f1/stm32vl-discovery/rtc/rtc.c
View File

@@ -108,7 +108,7 @@ int main(void)
* Otherwise enable it with the LSE as clock source and 0x7fff as
* prescale value.
*/
rtc_auto_awake(LSE, 0x7fff);
rtc_auto_awake(RCC_LSE, 0x7fff);
/* The above mode will not reset the RTC when you press the RST button.
* It will also continue to count while the MCU is held in reset. If

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

@@ -251,7 +251,7 @@ int main(void)
AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON;
usbd_dev = usbd_init(&stm32f103_usb_driver,
usbd_dev = usbd_init(&stm32f107_usb_driver,
&dev,
&config,
usb_strings,

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

@@ -134,7 +134,7 @@ static void my_usart_print_int(uint32_t usart, int16_t value)
static void clock_setup(void)
{
rcc_clock_setup_hsi(&hsi_8mhz[CLOCK_64MHZ]);
rcc_clock_setup_hsi(&rcc_hsi_8mhz[RCC_CLOCK_64MHZ]);
}

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

@@ -29,7 +29,7 @@ uint16_t exti_line_state;
/* Set STM32 to 64 MHz. */
static void clock_setup(void)
{
rcc_clock_setup_hsi(&hsi_8mhz[CLOCK_64MHZ]);
rcc_clock_setup_hsi(&rcc_hsi_8mhz[RCC_CLOCK_64MHZ]);
}
static void gpio_setup(void)

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

@@ -25,7 +25,7 @@
/* Set STM32 to 64 MHz. */
static void clock_setup(void)
{
rcc_clock_setup_hsi(&hsi_8mhz[CLOCK_64MHZ]);
rcc_clock_setup_hsi(&rcc_hsi_8mhz[RCC_CLOCK_64MHZ]);
/* Enable GPIOE clock. */
rcc_periph_clock_enable(RCC_GPIOE);

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

@@ -127,7 +127,7 @@ static void my_usart_print_int(uint32_t usart, int32_t value)
static void clock_setup(void)
{
rcc_clock_setup_hsi(&hsi_8mhz[CLOCK_64MHZ]);
rcc_clock_setup_hsi(&rcc_hsi_8mhz[RCC_CLOCK_64MHZ]);
}
#define I2C_ACC_ADDR 0x19

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

@@ -138,7 +138,7 @@ static void my_usart_print_int(uint32_t usart, int32_t value)
static void clock_setup(void)
{
rcc_clock_setup_hsi(&hsi_8mhz[CLOCK_64MHZ]);
rcc_clock_setup_hsi(&rcc_hsi_8mhz[RCC_CLOCK_64MHZ]);
}
#define GYR_RNW (1 << 7) /* Write when zero */

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

@@ -251,10 +251,10 @@ int main(void)
usbd_device *usbd_dev;
rcc_clock_setup_hsi(&hsi_8mhz[CLOCK_48MHZ]);
rcc_clock_setup_hsi(&rcc_hsi_8mhz[RCC_CLOCK_48MHZ]);
usb_setup();
usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings,
usbd_dev = usbd_init(&st_usbfs_v1_usb_driver, &dev, &config, usb_strings,
3, usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_register_set_config_callback(usbd_dev, cdcacm_set_config);

2
examples/stm32/f4/stm32f4-discovery/adc-dac-printf/adc-dac-printf.c
View File

@@ -36,7 +36,7 @@ int _write(int file, char *ptr, int len);
static void clock_setup(void)
{
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
/* Enable GPIOD clock for LED & USARTs. */
rcc_periph_clock_enable(RCC_GPIOD);
rcc_periph_clock_enable(RCC_GPIOA);

2
examples/stm32/f4/stm32f4-discovery/button/button.c
View File

@@ -27,7 +27,7 @@ uint16_t exti_line_state;
/* Set STM32 to 168 MHz. */
static void clock_setup(void)
{
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
}
static void gpio_setup(void)

2
examples/stm32/f4/stm32f4-discovery/dac-dma/dac-dma.c
View File

@@ -33,7 +33,7 @@ uint8_t waveform[256];
/*--------------------------------------------------------------------*/
static void clock_setup(void)
{
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
}
/*--------------------------------------------------------------------*/

2
examples/stm32/f4/stm32f4-discovery/fancyblink/fancyblink.c
View File

@@ -25,7 +25,7 @@
/* Set STM32 to 168 MHz. */
static void clock_setup(void)
{
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
/* Enable GPIOD clock. */
rcc_periph_clock_enable(RCC_GPIOD);

2
examples/stm32/f4/stm32f4-discovery/mandelbrot/mandel.c
View File

@@ -26,7 +26,7 @@
static void clock_setup(void)
{
/* Enable high-speed clock at 120MHz */
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_120MHZ]);
/* Enable GPIOD clock for LED & USARTs. */
rcc_periph_clock_enable(RCC_GPIOD);

2
examples/stm32/f4/stm32f4-discovery/random/random.c
View File

@@ -25,7 +25,7 @@
static void rcc_setup(void)
{
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_120MHZ]);
/* Enable GPIOD clock for onboard leds. */
rcc_periph_clock_enable(RCC_GPIOD);

2
examples/stm32/f4/stm32f4-discovery/tick_blink/tick_blink.c
View File

@@ -59,7 +59,7 @@ static void systick_setup(void)
/* Set STM32 to 168 MHz. */
static void clock_setup(void)
{
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
/* Enable GPIOD clock. */
rcc_periph_clock_enable(RCC_GPIOD);

2
examples/stm32/f4/stm32f4-discovery/timer/timer.c
View File

@@ -56,7 +56,7 @@ int debug = 0;
static void clock_setup(void)
{
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
}
static void gpio_setup(void)

2
examples/stm32/f4/stm32f4-discovery/usb_cdcacm/cdcacm.c
View File

@@ -226,7 +226,7 @@ int main(void)
{
usbd_device *usbd_dev;
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_120MHZ]);
rcc_periph_clock_enable(RCC_GPIOA);
rcc_periph_clock_enable(RCC_OTGFS);

2
examples/stm32/f4/stm32f4-discovery/usb_midi/usbmidi.c
View File

@@ -361,7 +361,7 @@ int main(void)
{
usbd_device *usbd_dev;
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_120MHZ]);
rcc_periph_clock_enable(RCC_GPIOA);
rcc_periph_clock_enable(RCC_OTGFS);

2
examples/stm32/f4/stm32f4-discovery/usb_msc/msc.c
View File

@@ -104,7 +104,7 @@ static uint8_t usbd_control_buffer[128];
int main(void)
{
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_120MHZ]);
rcc_periph_clock_enable(RCC_GPIOA);
rcc_periph_clock_enable(RCC_OTGFS);

2
examples/stm32/f4/stm32f429i-discovery/adc-dac-printf/adc-dac-printf.c
View File

@@ -37,7 +37,7 @@ int _write(int file, char *ptr, int len);
static void clock_setup(void)
{
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
/* Enable GPIOD clock for LED & USARTs. */
rcc_periph_clock_enable(RCC_GPIOG);
rcc_periph_clock_enable(RCC_GPIOA);

2
examples/stm32/f4/stm32f429i-discovery/button/button.c
View File

@@ -27,7 +27,7 @@ uint16_t exti_line_state;
/* Set STM32 to 168 MHz. */
static void clock_setup(void)
{
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
}
static void gpio_setup(void)

2
examples/stm32/f4/stm32f429i-discovery/dac-dma/dac-dma.c
View File

@@ -34,7 +34,7 @@ uint8_t waveform[256];
/*--------------------------------------------------------------------*/
static void clock_setup(void)
{
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
}
/*--------------------------------------------------------------------*/

2
examples/stm32/f4/stm32f429i-discovery/fancyblink/fancyblink.c
View File

@@ -26,7 +26,7 @@
/* Set STM32 to 168 MHz. */
static void clock_setup(void)
{
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
/* Enable GPIOG clock. */
rcc_periph_clock_enable(RCC_GPIOG);

2
examples/stm32/f4/stm32f429i-discovery/lcd-dma/clock.c
View File

@@ -63,7 +63,7 @@ uint32_t mtime(void)
void clock_setup(void)
{
/* Base board frequency, set to 168Mhz */
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
/* clock rate / 168000 to get 1mS interrupt rate */
systick_set_reload(168000);

2
examples/stm32/f4/stm32f429i-discovery/lcd-serial/clock.c
View File

@@ -61,7 +61,7 @@ uint32_t mtime(void)
void clock_setup(void)
{
/* Base board frequency, set to 168Mhz */
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
/* clock rate / 168000 to get 1mS interrupt rate */
systick_set_reload(168000);

2
examples/stm32/f4/stm32f429i-discovery/mandelbrot-lcd/clock.c
View File

@@ -32,7 +32,7 @@
void clock_setup(void)
{
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
/* set up the SysTick function (1mS interrupts) */
systick_set_clocksource(STK_CSR_CLKSOURCE_AHB);

2
examples/stm32/f4/stm32f429i-discovery/mandelbrot/mandel.c
View File

@@ -27,7 +27,7 @@
static void clock_setup(void)
{
/* Enable high-speed clock at 120MHz */
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_120MHZ]);
/* Enable GPIOG clock for LED & USARTs. */
rcc_periph_clock_enable(RCC_GPIOG);

2
examples/stm32/f4/stm32f429i-discovery/random/random.c
View File

@@ -25,7 +25,7 @@
static void rcc_setup(void)
{
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_120MHZ]);
/* Enable GPIOG clock for onboard leds. */
rcc_periph_clock_enable(RCC_GPIOG);

2
examples/stm32/f4/stm32f429i-discovery/sdram/clock.c
View File

@@ -61,7 +61,7 @@ uint32_t mtime(void)
void clock_setup(void)
{
/* Base board frequency, set to 168Mhz */
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
/* clock rate / 168000 to get 1mS interrupt rate */
systick_set_reload(168000);

2
examples/stm32/f4/stm32f429i-discovery/spi/clock.c
View File

@@ -61,7 +61,7 @@ uint32_t mtime(void)
void clock_setup(void)
{
/* Base board frequency, set to 168Mhz */
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
/* clock rate / 168000 to get 1mS interrupt rate */
systick_set_reload(168000);

2
examples/stm32/f4/stm32f429i-discovery/tick_blink/tick_blink.c
View File

@@ -65,7 +65,7 @@ static void systick_setup(void)
/* Set STM32 system clock to 168 MHz. */
static void clock_setup(void)
{
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
/* Enable GPIOG clock. */
rcc_periph_clock_enable(RCC_GPIOG);

2
examples/stm32/f4/stm32f429i-discovery/usart_console/clock.c
View File

@@ -62,7 +62,7 @@ uint32_t mtime(void)
void clock_setup(void)
{
/* Base board frequency, set to 168Mhz */
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
/* clock rate / 168000 to get 1mS interrupt rate */
systick_set_reload(168000);

2
examples/stm32/f4/stm32f429i-discovery/usart_irq_console/clock.c
View File

@@ -61,7 +61,7 @@ uint32_t mtime(void)
void clock_setup(void)
{
/* Base board frequency, set to 168Mhz */
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
/* clock rate / 168000 to get 1mS interrupt rate */
systick_set_reload(168000);

2
examples/stm32/f4/stm32f429i-discovery/usb_cdcacm/cdcacm.c
View File

@@ -227,7 +227,7 @@ int main(void)
{
usbd_device *usbd_dev;
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_120MHZ]);
rcc_periph_clock_enable(RCC_GPIOB);
rcc_periph_clock_enable(RCC_OTGHS);

2
examples/stm32/f4/stm32f429i-discovery/usb_midi/usbmidi.c
View File

@@ -362,7 +362,7 @@ int main(void)
{
usbd_device *usbd_dev;
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_120MHZ]);
rcc_periph_clock_enable(RCC_GPIOA);
rcc_periph_clock_enable(RCC_GPIOB);

2
examples/stm32/f4/stm32f429i-discovery/usb_msc/msc.c
View File

@@ -105,7 +105,7 @@ static uint8_t usbd_control_buffer[128];
int main(void)
{
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_120MHZ]);
rcc_periph_clock_enable(RCC_GPIOB);
rcc_periph_clock_enable(RCC_OTGHS);

8
examples/stm32/l1/stm32l-discovery/button-irq-printf-lowpower/main.c
View File

@@ -148,8 +148,8 @@ static int setup_rtc(void)
RCC_CSR &= ~RCC_CSR_RTCRST;
/* We want to use the LSE fitted on the discovery board */
rcc_osc_on(LSE);
rcc_wait_for_osc_ready(LSE);
rcc_osc_on(RCC_LSE);
rcc_wait_for_osc_ready(RCC_LSE);
/* Select the LSE as rtc clock */
rcc_rtc_select_clock(RCC_CSR_RTCSEL_LSE);
@@ -260,11 +260,11 @@ static int process_state(volatile struct state_t *st)
static void reset_clocks(void)
{
/* 4MHz MSI raw range 2*/
clock_scale_t myclock_config = {
struct rcc_clock_scale myclock_config = {
.hpre = RCC_CFGR_HPRE_SYSCLK_NODIV,
.ppre1 = RCC_CFGR_PPRE1_HCLK_NODIV,
.ppre2 = RCC_CFGR_PPRE2_HCLK_NODIV,
.voltage_scale = RANGE2,
.voltage_scale = PWR_SCALE2,
.flash_config = FLASH_ACR_LATENCY_0WS,
.apb1_frequency = 4194000,
.apb2_frequency = 4194000,

2
examples/stm32/l1/stm32l-discovery/button-irq-printf/main.c
View File

@@ -35,7 +35,7 @@ int _write(int file, char *ptr, int len);
static void clock_setup(void)
{
rcc_clock_setup_pll(&clock_config[CLOCK_VRANGE1_HSI_PLL_24MHZ]);
rcc_clock_setup_pll(&rcc_clock_config[RCC_CLOCK_VRANGE1_HSI_PLL_24MHZ]);
/* Lots of things on all ports... */
rcc_periph_clock_enable(RCC_GPIOA);
rcc_periph_clock_enable(RCC_GPIOB);

14
examples/stm32/l1/stm32l-discovery/lcd-display/lcd-hello.c
View File

@@ -49,15 +49,15 @@ static void lcd_init(void)
rcc_periph_clock_enable(RCC_PWR);
rcc_periph_clock_enable(RCC_LCD);
pwr_disable_backup_domain_write_protect ();
rcc_osc_on (LSE);
rcc_wait_for_osc_ready (LSE);
rcc_rtc_select_clock (RCC_CSR_RTCSEL_LSE);
rcc_osc_on(RCC_LSE);
rcc_wait_for_osc_ready(RCC_LSE);
rcc_rtc_select_clock(RCC_CSR_RTCSEL_LSE);
RCC_CSR |= RCC_CSR_RTCEN; /* Enable RTC clock */
pwr_enable_backup_domain_write_protect ();
/* Map SEG[43:40] to SEG[31:28], use 4 LCD commons, use 3 voltage levels
when driving LCD display */
lcd_enable_segment_multiplexing ();
lcd_enable_segment_multiplexing();
lcd_set_duty (LCD_CR_DUTY_1_4);
lcd_set_bias (LCD_CR_BIAS_1_3);
@@ -66,9 +66,9 @@ static void lcd_init(void)
/* And increase contrast */
lcd_set_contrast (LCD_FCR_CC_5);
lcd_enable ();
do {} while (!lcd_is_enabled ());
do {} while (!lcd_is_step_up_ready ());
lcd_enable();
do {} while (!lcd_is_enabled());
do {} while (!lcd_is_step_up_ready());
}
static void clear_lcd_ram(void)

2
libopencm3

Submodule libopencm3 updated: 43e66927fc...17f159dec9