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

Adjusted code for l1 to the new api introduced by karlp in pr #84

Browse Source
This commit is contained in:
Piotr Esden-Tempski 2013-02-18 14:12:48 -08:00
parent 3c110fec8e
commit b13e55da8c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/stm32/l1/stm32l-discovery/button-irq-printf-lowpower/main.c
View File

@ -259,7 +259,7 @@ void reset_clocks(void)
.ppre1 = RCC_CFGR_PPRE1_HCLK_NODIV, .ppre1 = RCC_CFGR_PPRE1_HCLK_NODIV,
.ppre2 = RCC_CFGR_PPRE2_HCLK_NODIV, .ppre2 = RCC_CFGR_PPRE2_HCLK_NODIV,
.voltage_scale = RANGE2, .voltage_scale = RANGE2,
.flash_config = FLASH_LATENCY_0WS, .flash_config = FLASH_ACR_LATENCY_0WS,
.apb1_frequency = 4194000, .apb1_frequency = 4194000,
.apb2_frequency = 4194000, .apb2_frequency = 4194000,
.msi_range = RCC_ICSCR_MSIRANGE_4MHZ, .msi_range = RCC_ICSCR_MSIRANGE_4MHZ,
@ -297,4 +297,4 @@ int main(void)
} }
return 0; return 0;
} }

6
lib/stm32/l1/rcc.c
View File

@ -69,7 +69,7 @@ const clock_scale_t clock_config[CLOCK_CONFIG_END] =
.ppre1 = RCC_CFGR_PPRE1_HCLK_NODIV, .ppre1 = RCC_CFGR_PPRE1_HCLK_NODIV,
.ppre2 = RCC_CFGR_PPRE2_HCLK_NODIV, .ppre2 = RCC_CFGR_PPRE2_HCLK_NODIV,
.voltage_scale = RANGE1, .voltage_scale = RANGE1,
.flash_config = FLASH_LATENCY_0WS, .flash_config = FLASH_ACR_LATENCY_0WS,
.apb1_frequency = 4000000, .apb1_frequency = 4000000,
.apb2_frequency = 4000000, .apb2_frequency = 4000000,
}, },
@ -78,7 +78,7 @@ const clock_scale_t clock_config[CLOCK_CONFIG_END] =
.ppre1 = RCC_CFGR_PPRE1_HCLK_NODIV, .ppre1 = RCC_CFGR_PPRE1_HCLK_NODIV,
.ppre2 = RCC_CFGR_PPRE2_HCLK_NODIV, .ppre2 = RCC_CFGR_PPRE2_HCLK_NODIV,
.voltage_scale = RANGE1, .voltage_scale = RANGE1,
.flash_config = FLASH_LATENCY_0WS, .flash_config = FLASH_ACR_LATENCY_0WS,
.apb1_frequency = 4194000, .apb1_frequency = 4194000,
.apb2_frequency = 4194000, .apb2_frequency = 4194000,
.msi_range = RCC_ICSCR_MSIRANGE_4MHZ, .msi_range = RCC_ICSCR_MSIRANGE_4MHZ,
@ -88,7 +88,7 @@ const clock_scale_t clock_config[CLOCK_CONFIG_END] =
.ppre1 = RCC_CFGR_PPRE1_HCLK_NODIV, .ppre1 = RCC_CFGR_PPRE1_HCLK_NODIV,
.ppre2 = RCC_CFGR_PPRE2_HCLK_NODIV, .ppre2 = RCC_CFGR_PPRE2_HCLK_NODIV,
.voltage_scale = RANGE1, .voltage_scale = RANGE1,
.flash_config = FLASH_LATENCY_0WS, .flash_config = FLASH_ACR_LATENCY_0WS,
.apb1_frequency = 2097000, .apb1_frequency = 2097000,
.apb2_frequency = 2097000, .apb2_frequency = 2097000,
.msi_range = RCC_ICSCR_MSIRANGE_2MHZ, .msi_range = RCC_ICSCR_MSIRANGE_2MHZ,