X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=Src%2Fmain.c;h=1c016c3eaa25447bd95b23e5a925e0bd986c2710;hb=2d024d38ea3094cf50ef92e00589fb56a066ea9a;hp=22395ad86d356881ca7fa3e3b3ef1de5dc3ec1b4;hpb=965866e0a41d46c9aeb3d7a6ddbab2fa4106cccc;p=home-hw.git diff --git a/Src/main.c b/Src/main.c index 22395ad..1c016c3 100644 --- a/Src/main.c +++ b/Src/main.c @@ -37,8 +37,10 @@ ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ +#include "util.h" #include "main.h" #include "stm32f1xx_hal.h" +#include "usb.h" /* USER CODE BEGIN Includes */ @@ -50,7 +52,7 @@ PCD_HandleTypeDef hpcd_USB_FS; /* USER CODE BEGIN PV */ /* Private variables ---------------------------------------------------------*/ -USBD_HandleTypeDef USBD_Device; +struct usb usb; /* USER CODE END PV */ @@ -94,6 +96,7 @@ int main(void) SystemClock_Config(); /* USER CODE BEGIN SysInit */ + usb_init(&usb, &hpcd_USB_FS); /* USER CODE END SysInit */ @@ -103,17 +106,20 @@ int main(void) MX_I2C2_Init(); MX_USB_PCD_Init(); /* USER CODE BEGIN 2 */ + usb_start(&usb); /* USER CODE END 2 */ /* Infinite loop */ /* USER CODE BEGIN WHILE */ + int cnt = 0; while (1) { LL_GPIO_SetOutputPin(LED_GPIO_Port, LED_Pin); - LL_mDelay(1000); + LL_mDelay(500); LL_GPIO_ResetOutputPin(LED_GPIO_Port, LED_Pin); - LL_mDelay(1000); + LL_mDelay(500); + debug_printf("Counter = %d\n", cnt++); /* USER CODE END WHILE */ @@ -263,7 +269,6 @@ static void MX_I2C2_Init(void) /* USB init function */ static void MX_USB_PCD_Init(void) { - hpcd_USB_FS.Instance = USB; hpcd_USB_FS.Init.dev_endpoints = 8; hpcd_USB_FS.Init.speed = PCD_SPEED_FULL; @@ -275,7 +280,6 @@ static void MX_USB_PCD_Init(void) { _Error_Handler(__FILE__, __LINE__); } - } /** Configure pins as