X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ssr%2FSrc%2Fmain.c;h=e056fdc6c5585013bdb99d98f666f99ef47cbcbd;hb=9802b6f5e5ea2a431f985dd597836c8b1df373fc;hp=9d6a7530d32ea7568c72bd8aca8d89c75d9f5988;hpb=9d04b18ba06d1f57fee5d04c1ee1c47261023183;p=home-hw.git diff --git a/ssr/Src/main.c b/ssr/Src/main.c index 9d6a753..e056fdc 100644 --- a/ssr/Src/main.c +++ b/ssr/Src/main.c @@ -52,11 +52,11 @@ /* Private variables ---------------------------------------------------------*/ PCD_HandleTypeDef hpcd_USB_FS; -volatile byte led_trigger; /* USER CODE BEGIN PV */ /* Private variables ---------------------------------------------------------*/ struct usb usb; +volatile byte led_trigger; /* USER CODE END PV */ @@ -170,6 +170,8 @@ int main(void) LL_TIM_EnableIT_UPDATE(TIM4); LL_TIM_GenerateEvent_UPDATE(TIM4); + ds_test(); + /* USER CODE END 2 */ /* Infinite loop */ @@ -337,7 +339,7 @@ static void MX_TIM3_Init(void) GPIO_InitStruct.Pin = THERMO_Pin; GPIO_InitStruct.Mode = LL_GPIO_MODE_ALTERNATE; GPIO_InitStruct.Speed = LL_GPIO_SPEED_FREQ_HIGH; - GPIO_InitStruct.OutputType = LL_GPIO_OUTPUT_PUSHPULL; + GPIO_InitStruct.OutputType = LL_GPIO_OUTPUT_OPENDRAIN; LL_GPIO_Init(THERMO_GPIO_Port, &GPIO_InitStruct); } @@ -443,8 +445,9 @@ static void MX_USB_PCD_Init(void) */ static void MX_DMA_Init(void) { + /* Init with LL driver */ /* DMA controller clock enable */ - __HAL_RCC_DMA1_CLK_ENABLE(); + LL_AHB1_GRP1_EnableClock(LL_AHB1_GRP1_PERIPH_DMA1); /* DMA interrupt init */ /* DMA1_Channel6_IRQn interrupt configuration */