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

Pwm timer interrupt priority set to 1. 

When timer interrupt priority is at 3, the pwm functionality can be
disturbed by an active ble connection.
pull/159/head
tkuyucu 2014-01-30 09:24:53 +01:00
parent 689a484d23
commit 05d6525285
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_nRF51822/TOOLCHAIN_ARM_STD/startup_nRF51822.s
View File

@ -91,15 +91,14 @@ NRF_POWER_RAMON_RAMxON_ONMODE_Msk EQU 0xF ; All RAM blocks on in onmod
Reset_Handler PROC
EXPORT Reset_Handler [WEAK]
IMPORT SystemInit
IMPORT EnableSoftDevice
IMPORT SystemInit
IMPORT __main
LDR R0, =NRF_POWER_RAMON_ADDRESS
LDR R2, [R0]
MOVS R1, #NRF_POWER_RAMON_RAMxON_ONMODE_Msk
ORRS R2, R2, R1
STR R2, [R0]
LDR R0, =SystemInit
LDR R0, =SystemInit
BLX R0
LDR R0, =__main
BX R0

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

@ -71,7 +71,7 @@ extern "C" {
void TIMER2_IRQHandler(void)
{
static uint16_t CCVal1=2501;
static uint16_t CCVal2=2501;
static uint16_t CCVal2=2501;
if ((NRF_TIMER2->EVENTS_COMPARE[1] != 0) &&
((NRF_TIMER2->INTENSET & TIMER_INTENSET_COMPARE1_Msk) != 0))
@ -120,7 +120,7 @@ void timer_init(uint8_t pwmChoice)
// Interrupt setup.
timer->INTENSET |= (TIMER_INTENSET_COMPARE1_Enabled << TIMER_INTENSET_COMPARE1_Pos);
}
NVIC_SetPriority(TIMER2_IRQn, 3);
NVIC_SetPriority(TIMER2_IRQn, 1);
NVIC_EnableIRQ(TIMER2_IRQn);
timer->TASKS_START = 0x01;
@ -175,7 +175,7 @@ static void ppi_init(uint8_t pwm)
NRF_PPI->CH[channel_number+1].EEP = (uint32_t)&timer->EVENTS_COMPARE[channel_number+1-(4*(channel_number/4))];
// Enable PPI channels.
NRF_PPI->CHEN |= (1 << channel_number)
| (1 << (channel_number+1));
| (1 << (channel_number+1));
}
void setModulation(pwmout_t* obj,uint8_t toggle,uint8_t high)
@ -249,13 +249,14 @@ void pwmout_free(pwmout_t* obj) {
}
void pwmout_write(pwmout_t* obj, float value) {
uint16_t oldPulseWidth;
if (value < 0.0f) {
value = 0.0;
} else if (value > 1.0f) {
value = 1.0;
}
uint16_t oldPulseWidth = ACTUAL_PULSE[obj->pwm];
oldPulseWidth = ACTUAL_PULSE[obj->pwm];
ACTUAL_PULSE[obj->pwm] = PULSE_WIDTH[obj->pwm] = value* PERIOD[obj->pwm];
if(PULSE_WIDTH[obj->pwm]==0){
PULSE_WIDTH[obj->pwm]=1;
@ -269,7 +270,6 @@ void pwmout_write(pwmout_t* obj, float value) {
{
setModulation(obj,1,oldPulseWidth== PERIOD[obj->pwm]);
}
}
float pwmout_read(pwmout_t* obj) {
@ -287,9 +287,9 @@ void pwmout_period_ms(pwmout_t* obj, int ms) {
// Set the PWM period, keeping the duty cycle the same.
void pwmout_period_us(pwmout_t* obj, int us) {
uint32_t periodInTicks = us/8;
if(periodInTicks>(1<<16 -1))
if(periodInTicks>((1<<16) -1))
{
PERIOD[obj->pwm] = 1<<16 -1;//262ms
PERIOD[obj->pwm] = (1<<16 )-1;//262ms
}
else if(periodInTicks<5){
PERIOD[obj->pwm] = 5;