diff options
| author | thirdpin <n_lazareva@mail.ru> | 2016-08-26 15:26:00 +0300 |
|---|---|---|
| committer | thirdpin <n_lazareva@mail.ru> | 2016-08-26 15:26:00 +0300 |
| commit | 1a05c586f00c2869525edaeb1d1a296261a1bd15 (patch) | |
| tree | 573d6fc5214223ec1c3e0ad85b5fa3dec76ead71 | |
| parent | 5f0b82f2f94fa196fe7222efcd97255db702712a (diff) | |
version 0.1
| -rw-r--r-- | emb/pastilda/clock.h | 29 | ||||
| -rw-r--r-- | emb/pastilda/main.cpp | 6 |
2 files changed, 32 insertions, 3 deletions
diff --git a/emb/pastilda/clock.h b/emb/pastilda/clock.h index 57ea91a..2f814d5 100644 --- a/emb/pastilda/clock.h +++ b/emb/pastilda/clock.h @@ -3,7 +3,10 @@ * hosted at http://github.com/thirdpin/pastilda * * Copyright (C) 2016 Third Pin LLC - * Written by Anastasiia Lazareva <a.lazareva@thirdpin.ru> + * + * Written by: + * Anastasiia Lazareva <a.lazareva@thirdpin.ru> + * Dmitrii Lisin <mrlisdim@ya.ru> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -35,9 +38,29 @@ static constexpr struct rcc_clock_scale rcc_hse_25mhz_to_hclk_120mhz = 30000000 /*APB1_FREQ*/, 60000000 /*APB2_FREQ*/ }; +static constexpr struct rcc_clock_scale rcc_hse_8mhz_to_hclk_120mhz = +{ + 4 /*PLLM*/, 120 /*PLLN*/, 2 /*PLLP*/, 5 /*PLLQ*/, + FLASH_ACR_ICE | FLASH_ACR_DCE | FLASH_ACR_LATENCY_3WS /*FLASH CONFIG*/, + RCC_CFGR_HPRE_DIV_NONE /*HPRE*/, + RCC_CFGR_PPRE_DIV_4 /*PPRE1*/, RCC_CFGR_PPRE_DIV_2 /*PPRE2*/, + 1 /*POWER SAVE*/, 120000000 /*AHB FREQ*/, + 30000000 /*APB1_FREQ*/, 60000000 /*APB2_FREQ*/ +}; + +static constexpr struct rcc_clock_scale rcc_hse_25mhz_to_hclk_168mhz = +{ + 25 /*PLLM*/, 336 /*PLLN*/, 2 /*PLLP*/, 7 /*PLLQ*/, + (FLASH_ACR_ICE | FLASH_ACR_DCE | FLASH_ACR_LATENCY_3WS) /*FLASH CONFIG*/, + RCC_CFGR_HPRE_DIV_NONE /*HPRE*/, + RCC_CFGR_PPRE_DIV_4 /*PPRE1*/, RCC_CFGR_PPRE_DIV_2 /*PPRE2*/, + 1 /*POWER SAVE*/, 168000000 /*AHB FREQ*/, + 42000000 /*APB1_FREQ*/, 84000000 /*APB2_FREQ*/ +}; + static void clock_setup() { - rcc_clock_setup_hse_3v3(&rcc_hse_25mhz_to_hclk_120mhz); + rcc_clock_setup_hse_3v3(&rcc_hse_25mhz_to_hclk_168mhz); rcc_periph_clock_enable(rcc_periph_clken::RCC_GPIOA); rcc_periph_clock_enable(rcc_periph_clken::RCC_GPIOB); @@ -46,6 +69,8 @@ static void clock_setup() rcc_periph_clock_enable(rcc_periph_clken::RCC_SPI1); rcc_periph_clock_enable(rcc_periph_clken::RCC_OTGFS); rcc_periph_clock_enable(rcc_periph_clken::RCC_OTGHS); + rcc_periph_clock_enable(rcc_periph_clken::RCC_CRYP); + rcc_periph_clock_enable(rcc_periph_clken::RCC_DMA2); } #endif diff --git a/emb/pastilda/main.cpp b/emb/pastilda/main.cpp index 27a191d..c841c5b 100644 --- a/emb/pastilda/main.cpp +++ b/emb/pastilda/main.cpp @@ -1,9 +1,13 @@ #include "app.h" -#include "stdio.h" +#include "clock.h" + using namespace Application; int main() { + clock_setup(); + systick_init(); + App *app = new App(); while(1) { app->process(); |