diff options
| author | Trygve Laugstøl <trygvis@inamo.no> | 2017-04-29 23:10:32 +0200 |
|---|---|---|
| committer | Trygve Laugstøl <trygvis@inamo.no> | 2017-04-29 23:10:32 +0200 |
| commit | 89d464c7f38b902e332f082f99df075dee080978 (patch) | |
| tree | 603750026d3fa12b2db7fa19abb8cdc079c5d3be /stm32cubemx/Inc | |
| parent | 4c159924abc0ad027166fe8853d062ed0a46481e (diff) | |
| download | radio-controller-89d464c7f38b902e332f082f99df075dee080978.tar.gz radio-controller-89d464c7f38b902e332f082f99df075dee080978.tar.bz2 radio-controller-89d464c7f38b902e332f082f99df075dee080978.tar.xz radio-controller-89d464c7f38b902e332f082f99df075dee080978.zip | |
o Setting up for TIM1/Channel 1 as input capture. Enabling IWDG.
Diffstat (limited to 'stm32cubemx/Inc')
| -rw-r--r-- | stm32cubemx/Inc/main.h | 11 | ||||
| -rw-r--r-- | stm32cubemx/Inc/stm32f1xx_hal_conf.h | 4 | ||||
| -rw-r--r-- | stm32cubemx/Inc/stm32f1xx_it.h | 1 |
3 files changed, 14 insertions, 2 deletions
diff --git a/stm32cubemx/Inc/main.h b/stm32cubemx/Inc/main.h index 6b905ce..6e20349 100644 --- a/stm32cubemx/Inc/main.h +++ b/stm32cubemx/Inc/main.h @@ -40,9 +40,20 @@ /* USER CODE END Includes */ /* Private define ------------------------------------------------------------*/ +#define RX_TIMER_PRESCALER 72000000 / 2000 /* USER CODE BEGIN Private defines */ +#ifdef __cplusplus +extern "C" { +#endif +void main_pre_init(); +void main_post_init(); +void main_loop(); + +#ifdef __cplusplus +} +#endif /* USER CODE END Private defines */ /** diff --git a/stm32cubemx/Inc/stm32f1xx_hal_conf.h b/stm32cubemx/Inc/stm32f1xx_hal_conf.h index a652ace..463c8ba 100644 --- a/stm32cubemx/Inc/stm32f1xx_hal_conf.h +++ b/stm32cubemx/Inc/stm32f1xx_hal_conf.h @@ -57,7 +57,7 @@ /*#define HAL_CORTEX_MODULE_ENABLED */ /*#define HAL_CRC_MODULE_ENABLED */ /*#define HAL_DAC_MODULE_ENABLED */ -/*#define HAL_DMA_MODULE_ENABLED */ +#define HAL_DMA_MODULE_ENABLED /*#define HAL_ETH_MODULE_ENABLED */ /*#define HAL_FLASH_MODULE_ENABLED */ #define HAL_GPIO_MODULE_ENABLED @@ -142,7 +142,7 @@ * @brief Uncomment the line below to expanse the "assert_param" macro in the * HAL drivers code */ -/* #define USE_FULL_ASSERT 1 */ + #define USE_FULL_ASSERT 1 /* ################## Ethernet peripheral configuration ##################### */ diff --git a/stm32cubemx/Inc/stm32f1xx_it.h b/stm32cubemx/Inc/stm32f1xx_it.h index b04b2cf..73ada16 100644 --- a/stm32cubemx/Inc/stm32f1xx_it.h +++ b/stm32cubemx/Inc/stm32f1xx_it.h @@ -54,6 +54,7 @@ void SVC_Handler(void); void DebugMon_Handler(void); void PendSV_Handler(void); void SysTick_Handler(void); +void DMA1_Channel2_IRQHandler(void); void TIM1_TRG_COM_IRQHandler(void); #ifdef __cplusplus |