aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorPiotr Esden-Tempski2011-10-05 13:55:17 -0700
committerPiotr Esden-Tempski2011-10-05 13:55:17 -0700
commitf9a28a3d5e7438842f64c123ffff2488bdccff4d (patch)
tree887f900467fdc241ac0515ab1a6223cc252b216f /examples
parent9e4522ad21d9489b912e39e5ecac7143e997b8fd (diff)
Changed clock on lisa-m hid example to 72MHz and removed disconnect pin control as the stm32f105 has built in pullups.
Diffstat (limited to 'examples')
-rw-r--r--examples/stm32/lisa-m/usb_hid/usbhid.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/examples/stm32/lisa-m/usb_hid/usbhid.c b/examples/stm32/lisa-m/usb_hid/usbhid.c
index 414f346..f42454b 100644
--- a/examples/stm32/lisa-m/usb_hid/usbhid.c
+++ b/examples/stm32/lisa-m/usb_hid/usbhid.c
@@ -22,6 +22,7 @@
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/systick.h>
+#include <libopencm3/stm32/otg_fs.h>
#include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/hid.h>
@@ -240,7 +241,7 @@ static void hid_set_config(u16 wValue)
int main(void)
{
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);
@@ -250,11 +251,6 @@ int main(void)
gpio_set_mode(GPIOA, GPIO_MODE_INPUT,
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 */
gpio_set(GPIOC, GPIO2);
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
@@ -272,9 +268,7 @@ int main(void)
/* green LED on, connect USB */
gpio_clear(GPIOC, GPIO2);
- gpio_set_mode(GPIOC, GPIO_MODE_INPUT,
- GPIO_CNF_INPUT_FLOAT, GPIO15);
- //gpio_clear(GPIOC, GPIO15);
+ //OTG_FS_GCCFG &= ~OTG_FS_GCCFG_VBUSBSEN;
while (1)
usbd_poll();