From edaad76b66e47d945d7aa352d13de5ab8251317a Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Sun, 28 May 2017 09:05:53 +0200 Subject: o Naming pins. o Correct prescaler for 1us resolution. o Trying out a lock structure for locking between an ISR and a main loop. --- bsp/radio-controller-1/Src/main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'bsp/radio-controller-1/Src/main.c') diff --git a/bsp/radio-controller-1/Src/main.c b/bsp/radio-controller-1/Src/main.c index f57b555..4b49e82 100644 --- a/bsp/radio-controller-1/Src/main.c +++ b/bsp/radio-controller-1/Src/main.c @@ -47,6 +47,7 @@ /* USER CODE BEGIN Includes */ #include "radio-controller.h" +#include /* USER CODE END Includes */ /* Private variables ---------------------------------------------------------*/ @@ -182,7 +183,7 @@ static void MX_TIM1_Init(void) htim1.Instance = TIM1; htim1.Init.Prescaler = RX_TIMER_PRESCALER; htim1.Init.CounterMode = TIM_COUNTERMODE_UP; - htim1.Init.Period = 65535; + htim1.Init.Period = 0xffff; htim1.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1; htim1.Init.RepetitionCounter = 0; if (HAL_TIM_IC_Init(&htim1) != HAL_OK) @@ -271,10 +272,7 @@ static void MX_GPIO_Init(void) void Error_Handler(void) { /* USER CODE BEGIN Error_Handler */ - /* User can add his own implementation to report the HAL error return state */ - while(1) - { - } + halt(); /* USER CODE END Error_Handler */ } -- cgit v1.2.3