jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Changed clock on lisa-m hid example to 72MHz and removed disconnect pin control as the stm32f105 has built in pullups.

Browse Source
This commit is contained in:
Piotr Esden-Tempski 2011-10-05 13:55:17 -07:00
parent 9e4522ad21
commit f9a28a3d5e
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/stm32/lisa-m/usb_hid/usbhid.c
View File

@ -22,6 +22,7 @@
#include <libopencm3/stm32/rcc.h> #include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/systick.h> #include <libopencm3/stm32/systick.h>
#include <libopencm3/stm32/otg_fs.h>
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/hid.h> #include <libopencm3/usb/hid.h>
@ -240,7 +241,7 @@ static void hid_set_config(u16 wValue)
int main(void) int main(void)
{ {
int usb_connect_blink = 0; int usb_connect_blink = 0;
rcc_clock_setup_in_hsi_out_48mhz(); rcc_clock_setup_in_hse_12mhz_out_72mhz();
rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN); rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
@ -250,11 +251,6 @@ int main(void)
gpio_set_mode(GPIOA, GPIO_MODE_INPUT, gpio_set_mode(GPIOA, GPIO_MODE_INPUT,
GPIO_CNF_INPUT_FLOAT, GPIO8); GPIO_CNF_INPUT_FLOAT, GPIO8);
/* disconnect USB_DISC, as output */
gpio_set(GPIOC, GPIO15);
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO15);
/* green LED off, as output */ /* green LED off, as output */
gpio_set(GPIOC, GPIO2); gpio_set(GPIOC, GPIO2);
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ, gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
@ -272,9 +268,7 @@ int main(void)
/* green LED on, connect USB */ /* green LED on, connect USB */
gpio_clear(GPIOC, GPIO2); gpio_clear(GPIOC, GPIO2);
gpio_set_mode(GPIOC, GPIO_MODE_INPUT, //OTG_FS_GCCFG &= ~OTG_FS_GCCFG_VBUSBSEN;
GPIO_CNF_INPUT_FLOAT, GPIO15);
//gpio_clear(GPIOC, GPIO15);
while (1) while (1)
usbd_poll(); usbd_poll();