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

Fix usage of USB_VBUS

Browse Source 
USB_VBUS is not an alternate function, it is an additionnal function which is
always enabled.

If configured as an alternate function, it will draw current from VBUS.
This commit is contained in:
Nicolas Schodet
2015-06-23 11:43:21 +02:00
committed by Karl Palsson
parent ce364386d6
commit 5b30e3d98d
6 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -231,9 +231,8 @@ int main(void)
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);
rcc_periph_clock_enable(RCC_OTGFS); rcc_periph_clock_enable(RCC_OTGFS);
gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO11 | GPIO12);
GPIO9 | GPIO11 | GPIO12); gpio_set_af(GPIOA, GPIO_AF10, GPIO11 | GPIO12);
gpio_set_af(GPIOA, GPIO_AF10, GPIO9 | GPIO11 | GPIO12);
usbd_dev = usbd_init(&otgfs_usb_driver, &dev, &config, usbd_dev = usbd_init(&otgfs_usb_driver, &dev, &config,
usb_strings, 3, usb_strings, 3,

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

@@ -371,9 +371,8 @@ int main(void)
rcc_periph_clock_enable(RCC_OTGFS); rcc_periph_clock_enable(RCC_OTGFS);
/* USB pins */ /* USB pins */
gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO11 | GPIO12);
GPIO9 | GPIO11 | GPIO12); gpio_set_af(GPIOA, GPIO_AF10, GPIO11 | GPIO12);
gpio_set_af(GPIOA, GPIO_AF10, GPIO9 | GPIO11 | GPIO12);
desig_get_unique_id_as_string(usb_serial_number, sizeof(usb_serial_number)); desig_get_unique_id_as_string(usb_serial_number, sizeof(usb_serial_number));

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

@@ -109,9 +109,8 @@ int main(void)
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);
rcc_periph_clock_enable(RCC_OTGFS); rcc_periph_clock_enable(RCC_OTGFS);
gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO11 | GPIO12);
GPIO9 | GPIO11 | GPIO12); gpio_set_af(GPIOA, GPIO_AF10, GPIO11 | GPIO12);
gpio_set_af(GPIOA, GPIO_AF10, GPIO9 | GPIO11 | GPIO12);
msc_dev = usbd_init(&otgfs_usb_driver, &dev_descr, &config_descr, msc_dev = usbd_init(&otgfs_usb_driver, &dev_descr, &config_descr,
usb_strings, 3, usb_strings, 3,

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

@@ -232,9 +232,8 @@ int main(void)
rcc_periph_clock_enable(RCC_GPIOB); rcc_periph_clock_enable(RCC_GPIOB);
rcc_periph_clock_enable(RCC_OTGHS); rcc_periph_clock_enable(RCC_OTGHS);
gpio_mode_setup(GPIOB, GPIO_MODE_AF, GPIO_PUPD_NONE, gpio_mode_setup(GPIOB, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO14 | GPIO15);
GPIO13 | GPIO14 | GPIO15); gpio_set_af(GPIOB, GPIO_AF12, GPIO14 | GPIO15);
gpio_set_af(GPIOB, GPIO_AF12, GPIO13 | GPIO14 | GPIO15);
usbd_dev = usbd_init(&otghs_usb_driver, &dev, &config, usbd_dev = usbd_init(&otghs_usb_driver, &dev, &config,
usb_strings, 3, usb_strings, 3,

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

@@ -373,9 +373,8 @@ int main(void)
rcc_periph_clock_enable(RCC_OTGHS); rcc_periph_clock_enable(RCC_OTGHS);
/* USB pins */ /* USB pins */
gpio_mode_setup(GPIOB, GPIO_MODE_AF, GPIO_PUPD_NONE, gpio_mode_setup(GPIOB, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO14 | GPIO15);
GPIO13 | GPIO14 | GPIO15); gpio_set_af(GPIOB, GPIO_AF12, GPIO14 | GPIO15);
gpio_set_af(GPIOB, GPIO_AF12, GPIO13 | GPIO14 | GPIO15);
desig_get_unique_id_as_string(usb_serial_number, sizeof(usb_serial_number)); desig_get_unique_id_as_string(usb_serial_number, sizeof(usb_serial_number));

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

@@ -110,9 +110,8 @@ int main(void)
rcc_periph_clock_enable(RCC_GPIOB); rcc_periph_clock_enable(RCC_GPIOB);
rcc_periph_clock_enable(RCC_OTGHS); rcc_periph_clock_enable(RCC_OTGHS);
gpio_mode_setup(GPIOB, GPIO_MODE_AF, GPIO_PUPD_NONE, gpio_mode_setup(GPIOB, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO14 | GPIO15);
GPIO13 | GPIO14 | GPIO15); gpio_set_af(GPIOB, GPIO_AF12, GPIO14 | GPIO15);
gpio_set_af(GPIOB, GPIO_AF12, GPIO13 | GPIO14 | GPIO15);
msc_dev = usbd_init(&otghs_usb_driver, &dev_descr, &config_descr, msc_dev = usbd_init(&otghs_usb_driver, &dev_descr, &config_descr,
usb_strings, 3, usb_strings, 3,