ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

16-bit timer with sw overflow is used instead of the 32-bit timer.

pull/159/head
tkuyucu 2013-12-19 10:41:16 +01:00
parent 3c2258956b
commit 76d25ffb25
3 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/PeripheralNames.h
View File

@ -39,9 +39,7 @@ typedef enum {
typedef enum {
PWM_1 = 0,
PWM_2,
PWM_3,
PWM_4
PWM_2
} PWMName;
typedef enum {

30
libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/pwmout_api.c
View File

@ -18,6 +18,7 @@
#include "pinmap.h"
#include "error.h"
#define NO_PWMS 2
static const PinMap PinMap_PWM[] = {
{p0, PWM_1, 1},
@ -54,19 +55,19 @@ static const PinMap PinMap_PWM[] = {
{NC, NC, 0}
};
static NRF_TIMER_Type *Timers[2] = {
NRF_TIMER2, NRF_TIMER1
static NRF_TIMER_Type *Timers[1] = {
NRF_TIMER2
};
uint8_t PWM_taken[4] = {0,0,0,0};
uint16_t PERIOD[4] = {2500,2500,2500,2500};//20ms
uint16_t PULSE_WIDTH[4] ={1,1,1,1};//set to 1 instead of 0
uint16_t ACTUAL_PULSE[4] = {0,0,0,0};
uint8_t PWM_taken[NO_PWMS] = {0,0};
uint16_t PERIOD[NO_PWMS] = {2500,2500};//20ms
uint16_t PULSE_WIDTH[NO_PWMS] ={1,1};//set to 1 instead of 0
uint16_t ACTUAL_PULSE[NO_PWMS] = {0,0};
/** @brief Function for handling timer 1 peripheral interrupts.
*/
void TIMER1_IRQHandler(void)
/*void TIMER1_IRQHandler(void)
{
static uint16_t CCVal1=2501;//PERIOD[2] + 1;
static uint16_t CCVal2=2501;//PERIOD[3] + 1;
@ -89,7 +90,7 @@ void TIMER1_IRQHandler(void)
CCVal2 = NRF_TIMER1->CC[3] + PULSE_WIDTH[3];
}
}
}*/
/** @brief Function for handling timer 2 peripheral interrupts.
*/
@ -144,12 +145,12 @@ void timer_init(uint8_t pwmChoice)
timer->INTENSET |= (TIMER_INTENSET_COMPARE1_Enabled << TIMER_INTENSET_COMPARE1_Pos);
}
if(pwmChoice<2){
//if(pwmChoice<2){
NVIC_EnableIRQ(TIMER2_IRQn);
}
else{
NVIC_EnableIRQ(TIMER1_IRQn);
}
//}
// else{
// NVIC_EnableIRQ(TIMER1_IRQn);
// }
//__enable_irq();
timer->TASKS_START = 0x01;
@ -194,6 +195,7 @@ void gpiote_init(PinName pin,uint8_t channel_number)
*/
static void ppi_init(uint8_t pwm)
{
//using ppi channels 0-3 (0-7 are available)
uint8_t channel_number = 2*pwm;
NRF_TIMER_Type *timer = Timers[pwm/2];
@ -240,7 +242,7 @@ void pwmout_init(pwmout_t* obj, PinName pin) {
if (pwm == (PWMName)NC)
error("PwmOut pin mapping failed");
if(PWM_taken[(uint8_t)pwm]){
for(uint8_t i=1;!pwmOutSuccess && i<4;i++){
for(uint8_t i=1;!pwmOutSuccess && i<NO_PWMS;i++){
if(!PWM_taken[i]){
pwm = (PWMName)i;
PWM_taken[i]=1;

28
libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_nRF51822/us_ticker.c
View File

@ -18,10 +18,23 @@
#include "cmsis.h"
#include "PeripheralNames.h"
#define US_TICKER_TIMER NRF_TIMER0
#define US_TICKER_TIMER_IRQn TIMER0_IRQn
#define US_TICKER_TIMER NRF_TIMER1
#define US_TICKER_TIMER_IRQn TIMER1_IRQn
int us_ticker_inited = 0;
uint16_t overflow=0;
void TIMER1_IRQHandler(void)
{
if ((US_TICKER_TIMER->EVENTS_COMPARE[1] != 0) &&
((US_TICKER_TIMER->INTENSET & TIMER_INTENSET_COMPARE1_Msk) != 0))
{
US_TICKER_TIMER->EVENTS_COMPARE[1] = 0;
overflow++;
US_TICKER_TIMER->CC[1] =0;//US_TICKER_TIMER->CC[1]+ 1;
}
}
void us_ticker_init(void)
{
@ -38,8 +51,9 @@ void us_ticker_init(void)
US_TICKER_TIMER->MODE = TIMER_MODE_MODE_Timer;
US_TICKER_TIMER->PRESCALER = 4;
US_TICKER_TIMER->BITMODE = TIMER_BITMODE_BITMODE_32Bit;
US_TICKER_TIMER->BITMODE = TIMER_BITMODE_BITMODE_16Bit;
US_TICKER_TIMER->CC[1] = 0;
US_TICKER_TIMER->INTENSET = TIMER_INTENSET_COMPARE1_Set << TIMER_INTENSET_COMPARE1_Pos;
//NVIC_SetVector(US_TICKER_TIMER_IRQn, (uint32_t)us_ticker_irq_handler);
NVIC_EnableIRQ(US_TICKER_TIMER_IRQn);
@ -53,8 +67,8 @@ uint32_t us_ticker_read()
us_ticker_init();
}
US_TICKER_TIMER->TASKS_CAPTURE[3] = 1;
return US_TICKER_TIMER->CC[3];// / 16;
US_TICKER_TIMER->TASKS_CAPTURE[2] = 1;
return ((uint32_t) US_TICKER_TIMER->CC[2] + ((uint32_t)overflow<<16));
}
void us_ticker_set_interrupt(unsigned int timestamp)
@ -64,7 +78,7 @@ void us_ticker_set_interrupt(unsigned int timestamp)
us_ticker_init();
}
US_TICKER_TIMER->INTENSET = TIMER_INTENSET_COMPARE0_Set << TIMER_INTENSET_COMPARE0_Pos;
US_TICKER_TIMER->INTENSET |= TIMER_INTENSET_COMPARE0_Set << TIMER_INTENSET_COMPARE0_Pos;
US_TICKER_TIMER->TASKS_CAPTURE[0] = 1;
US_TICKER_TIMER->CC[0] += timestamp;// * 16;
}