GitHub/candleLight_fw
1
0
Fork 0
mirror of https://github.com/candle-usb/candleLight_fw.git synced 2025-01-14 05:42:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

timer: run at 1 MHz for all clock speeds

Browse Source 
The TIM2 timer is expected to run at 1 MHz, but it's clocked by the
CPU clock. The current code expects the CPU runs with 48 MHz.

Introduce TIM2_CLOCK_SPEED and calculate a proper divider.
This commit is contained in:
Marc Kleine-Budde 2023-01-16 17:51:11 +01:00
parent cee17f3d0d
commit 4cd86590d6
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/config.h
View File

@ -53,6 +53,8 @@ THE SOFTWARE.
#define USBD_MANUFACTURER_STRING (uint8_t*) "bytewerk"
#define DFU_INTERFACE_STRING_FS (uint8_t*) "candleLight firmware upgrade interface"
#define TIM2_CLOCK_SPEED 48000000
#define CAN_INTERFACE CAN
#define CAN_CLOCK_SPEED 48000000
@ -74,6 +76,8 @@ THE SOFTWARE.
#define USBD_MANUFACTURER_STRING (uint8_t*) "makerbase"
#define DFU_INTERFACE_STRING_FS (uint8_t*) "CANable-MKS firmware upgrade interface"
#define TIM2_CLOCK_SPEED 48000000
#define CAN_INTERFACE CAN
#define CAN_CLOCK_SPEED 48000000
@ -94,6 +98,8 @@ THE SOFTWARE.
#define USBD_MANUFACTURER_STRING (uint8_t*) "ConvertDevice"
#define DFU_INTERFACE_STRING_FS (uint8_t*) "ConvertDevice xCAN firmware upgrade interface"
#define TIM2_CLOCK_SPEED 48000000
#define CAN_INTERFACE CAN
#define CAN_CLOCK_SPEED 48000000
@ -113,6 +119,9 @@ THE SOFTWARE.
#define USBD_PRODUCT_STRING_FS (uint8_t*) "ConvertDevice xCANFD"
#define USBD_MANUFACTURER_STRING (uint8_t*) "ConvertDevice"
#define DFU_INTERFACE_STRING_FS (uint8_t*) "ConvertDevice xCANFD firmware upgrade interface"
#define TIM2_CLOCK_SPEED 64000000
#define CAN_INTERFACE FDCAN1
#define CAN_CLOCK_SPEED 64000000
#define NUM_CAN_CHANNEL 1
@ -141,6 +150,8 @@ THE SOFTWARE.
#define USBD_MANUFACTURER_STRING (uint8_t*) "DSD TECH"
#define DFU_INTERFACE_STRING_FS (uint8_t*) "SH-C30A firmware upgrade interface"
#define TIM2_CLOCK_SPEED 48000000
#define CAN_INTERFACE CAN
#define CAN_CLOCK_SPEED 48000000
@ -161,6 +172,8 @@ THE SOFTWARE.
#define USBD_MANUFACTURER_STRING (uint8_t*) "FYSETC"
#define DFU_INTERFACE_STRING_FS (uint8_t*) "UCAN firmware upgrade interface"
#define TIM2_CLOCK_SPEED 48000000
#define CAN_INTERFACE CAN
#define CAN_CLOCK_SPEED 48000000
@ -181,6 +194,8 @@ THE SOFTWARE.
#define USBD_MANUFACTURER_STRING (uint8_t*) "cantact.io"
#define DFU_INTERFACE_STRING_FS (uint8_t*) "cantact firmware upgrade interface"
#define TIM2_CLOCK_SPEED 48000000
#define CAN_INTERFACE CAN
#define CAN_CLOCK_SPEED 48000000
@ -201,6 +216,8 @@ THE SOFTWARE.
#define USBD_MANUFACTURER_STRING (uint8_t*) "canable.io"
#define DFU_INTERFACE_STRING_FS (uint8_t*) "canable firmware upgrade interface"
#define TIM2_CLOCK_SPEED 48000000
#define CAN_INTERFACE CAN
#define CAN_CLOCK_SPEED 48000000
@ -221,6 +238,8 @@ THE SOFTWARE.
#define USBD_MANUFACTURER_STRING (uint8_t*) "Roboter Club Aachen"
#define DFU_INTERFACE_STRING_FS (uint8_t*) "usb2can firmware upgrade interface"
#define TIM2_CLOCK_SPEED 48000000
#define CAN_INTERFACE CAN
#define CAN_CLOCK_SPEED 48000000
@ -251,6 +270,8 @@ THE SOFTWARE.
#define USBD_MANUFACTURER_STRING (uint8_t*) "STMicroelectronics"
#define DFU_INTERFACE_STRING_FS (uint8_t*) "CANAlyze firmware upgrade interface"
#define TIM2_CLOCK_SPEED 48000000
#define CAN_INTERFACE CAN
#define CAN_CLOCK_SPEED 48000000
@ -271,6 +292,8 @@ THE SOFTWARE.
#define USBD_MANUFACTURER_STRING (uint8_t*) "chacaltech"
#define DFU_INTERFACE_STRING_FS (uint8_t*) "cannette firmware upgrade interface"
#define TIM2_CLOCK_SPEED 48000000
#define CAN_INTERFACE CAN
#define CAN_CLOCK_SPEED 48000000
@ -300,6 +323,9 @@ THE SOFTWARE.
#define USBD_PRODUCT_STRING_FS (uint8_t*) "budgetcan gs_usb"
#define USBD_MANUFACTURER_STRING (uint8_t*) "budgetcan"
#define DFU_INTERFACE_STRING_FS (uint8_t*) "budgetcan firmware upgrade interface"
#define TIM2_CLOCK_SPEED 64000000
#define CAN_INTERFACE FDCAN1
#define CAN_INTERFACE2 FDCAN2
#define CAN_CLOCK_SPEED 64000000
@ -334,6 +360,8 @@ THE SOFTWARE.
#define USBD_MANUFACTURER_STRING (uint8_t*) "misc"
#define DFU_INTERFACE_STRING_FS (uint8_t*) "STM32F4VE firmware upgrade interface"
#define TIM2_CLOCK_SPEED 96000000
#define CAN_INTERFACE CAN1
#define CAN_CLOCK_SPEED 42000000

5
src/timer.c
View File

@ -24,8 +24,9 @@ THE SOFTWARE.
*/
#include "timer.h"
#include "config.h"
#include "hal_include.h"
#include "timer.h"
void timer_init(void)
{
@ -38,7 +39,7 @@ void timer_init(void)
TIM2->CCMR1 = 0;
TIM2->CCMR2 = 0;
TIM2->CCER = 0;
TIM2->PSC = 48-1; // run @48MHz/480 = 1MHz = 1us
TIM2->PSC = (TIM2_CLOCK_SPEED / 1000000) - 1; // run @1MHz = 1us
TIM2->ARR = 0xFFFFFFFF;
TIM2->CR1 |= TIM_CR1_CEN;
TIM2->EGR = TIM_EGR_UG;