rusefi
/
ChibiOS-Contrib
mirror of https://github.com/rusefi/ChibiOS-Contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

moved from HFCLK TIMER to RTC LFCLK

This commit is contained in:
Stephane D'Alu 2016-02-05 18:58:31 +01:00
parent 5af8452153
commit a3a0be11dc
5 changed files with 47 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/hal/boards/NRF51-DK/board.h
View File

@ -22,7 +22,7 @@
#define BOARD_NAME "nRF51 DK"
/* Board oscillators-related settings. */
#define XTAL_VALUE 16000000
#define NRF51_XTAL_VALUE 16000000
/* GPIO pins. */
#define BTN1 17

2
os/hal/boards/WVSHARE_BLE400/board.h
View File

@ -22,7 +22,7 @@
#define BOARD_NAME "WvShare BLE400"
/* Board oscillators-related settings. */
#define XTAL_VALUE 16000000
#define NRF51_XTAL_VALUE 16000000
/* GPIO pins. */
#define KEY1 16

29
os/hal/ports/NRF51/NRF51822/hal_lld.c
View File

@ -55,6 +55,35 @@
*/
void hal_lld_init(void)
{
/* High frequency clock initialisation
* (If NRF51_XTAL_VALUE is not defined assume its an RC oscillator)
*/
#if defined(NRF51_XTAL_VALUE)
#if NRF51_XTAL_VALUE == 16000000
NRF_CLOCK->XTALFREQ = 0xFF;
#elif NRF51_XTAL_VALUE == 32000000
NRF_CLOCK->XTALFREQ = 0x00;
#endif
#endif
NRF_CLOCK->TASKS_HFCLKSTOP = 1;
/* Low frequency clock initialisation
* If source not specified, use the internal RC (0) which is prefered
* over synthetized clock from the high frequency clock (2)
*/
#if defined(NRF51_LFCLK_SOURCE)
#if (NRF51_LFCLK_SOURCE >=0) && (NRF51_LFCLK_SOURCE <= 2)
NRF_CLOCK->LFCLKSRC = NRF51_LFCLK_SOURCE;
#else
#error "Possible value for NRF51_LFCLK_SOURCE are 0=RC, 1=XTAL, 2=Synth"
#endif
#else
NRF_CLOCK->LFCLKSRC = 0;
#endif
#if (OSAL_ST_MODE != OSAL_ST_MODE_NONE)
NRF_CLOCK->TASKS_LFCLKSTART = 1;
#endif
}
/**

4
os/hal/ports/NRF51/NRF51822/hal_lld.h
View File

@ -44,9 +44,11 @@
/*===========================================================================*/
/*===========================================================================*/
/* Derived constants and error checks. */
/* Driver constants and error checks. */
/*===========================================================================*/
#define NRF51_LFCLK_FREQUENCY 32768
/*===========================================================================*/
/* Driver data structures and types. */
/*===========================================================================*/

38
os/hal/ports/NRF51/NRF51822/st_lld.c
View File

@ -52,19 +52,17 @@
#if (OSAL_ST_MODE == OSAL_ST_MODE_PERIODIC) || defined(__DOXYGEN__)
/**
* @brief System Timer vector.
* @brief System Timer vector (RTC0)
* @details This interrupt is used for system tick in periodic mode.
*
* @isr
*/
OSAL_IRQ_HANDLER(Vector60) {
OSAL_IRQ_HANDLER(Vector6C) {
OSAL_IRQ_PROLOGUE();
/* Clear timer compare event */
if (NRF_TIMER0->EVENTS_COMPARE[0] != 0)
NRF_TIMER0->EVENTS_COMPARE[0] = 0;
NRF_RTC0->EVENTS_TICK = 0;
osalSysLockFromISR();
osalOsTimerHandlerI();
osalSysUnlockFromISR();
@ -83,29 +81,19 @@ OSAL_IRQ_HANDLER(Vector60) {
* @notapi
*/
void st_lld_init(void) {
#if (OSAL_ST_MODE == OSAL_ST_MODE_FREERUNNING)
#endif /* OSAL_ST_MODE == OSAL_ST_MODE_FREERUNNING */
#if OSAL_ST_MODE == OSAL_ST_MODE_PERIODIC
NRF_TIMER0->TASKS_CLEAR = 1;
/*
* Using 32-bit mode with prescaler 16 configures this
* timer with a 1MHz clock.
*/
NRF_TIMER0->BITMODE = 3;
NRF_TIMER0->PRESCALER = 4;
/*
* Configure timer 0 compare capture 0 to generate interrupt
* and clear timer value when event is generated.
*/
NRF_TIMER0->CC[0] = (1000000 / OSAL_ST_FREQUENCY) - 1;
NRF_TIMER0->SHORTS = 1;
NRF_TIMER0->INTENSET = 0x10000;
nvicEnableVector(TIMER0_IRQn, 8);
/* Using RTC with prescaler */
NRF_RTC0->TASKS_STOP = 1;
NRF_RTC0->PRESCALER = (NRF51_LFCLK_FREQUENCY / OSAL_ST_FREQUENCY) - 1;
NRF_RTC0->INTENSET = RTC_INTENSET_TICK_Msk;
/* Start timer */
NRF_TIMER0->TASKS_START = 1;
nvicEnableVector(RTC0_IRQn, 8);
NRF_RTC0->TASKS_START = 1;
#endif
}