From fa282aa3447f6830fd3b81d978c57f81b3d3dbe9 Mon Sep 17 00:00:00 2001 From: James Snyder Date: Sun, 3 May 2015 19:42:05 -0500 Subject: [PATCH] disable usb for nucleo-f411re, higher frequency cutoff for PLL_P selection --- src/platform/stm32f4/conf.lua | 2 +- src/platform/stm32f4/pll_config.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platform/stm32f4/conf.lua b/src/platform/stm32f4/conf.lua index e352d15c..bbe42fc6 100644 --- a/src/platform/stm32f4/conf.lua +++ b/src/platform/stm32f4/conf.lua @@ -8,7 +8,7 @@ addi( sf( 'src/platform/%s/FWLib/USB/STM32_USB_Device_Library/Core/inc', platfor addi( sf( 'src/platform/%s/FWLib/USB/VCP/inc', platform ) ) local fwlib_files = utils.get_files( "src/platform/" .. platform .. "/FWLib/library/src", ".*%.c$" ) -if comp.board ~= "stm32f4-nucleo" then +if comp.board ~= "stm32f4-nucleo" and comp.board ~= "nucleo-f411re" then fwlib_files = fwlib_files .. " " .. utils.get_files( "src/platform/" .. platform .. "/FWLib/USB/", "%.c$" ) end specific_files = "system_stm32f4xx.c startup_stm32f4xx.s stm32f4xx_it.c platform.c platform_int.c cpu.c stm32_pio.c enc.c" diff --git a/src/platform/stm32f4/pll_config.h b/src/platform/stm32f4/pll_config.h index 4750cb98..634f8d78 100644 --- a/src/platform/stm32f4/pll_config.h +++ b/src/platform/stm32f4/pll_config.h @@ -41,7 +41,7 @@ Restrictions: #error PLL_M out of range, unable to compute PLL parameters #endif -#if STM32F4_DESIRED_SYSCLK_FREQ_MHZ < 96 +#if STM32F4_DESIRED_SYSCLK_FREQ_MHZ <= 100 #define PLL_P 4 #else #define PLL_P 2