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

fix pwm hal implemenation for nRF51. 

PwmOut::pwm renamed to PwmOut::pwm_name
pull/2234/head
Andrzej Puzdrowski 2016-06-16 16:42:51 +01:00
parent 082fd409ce
commit 4fcffd40b1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hal/targets.json
View File

@ -1388,7 +1388,7 @@
"supported_form_factors": ["ARDUINO"], "supported_form_factors": ["ARDUINO"],
"inherits": ["MCU_NRF51_32K"], "inherits": ["MCU_NRF51_32K"],
"progen": {"target": "nrf51-dk"}, "progen": {"target": "nrf51-dk"},
"device_has": ["ERROR_PATTERN", "I2C", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "SERIAL", "RTC", "SERIAL_ASYNCH", "SLEEP"] "device_has": ["ERROR_PATTERN", "I2C", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "RTC", "SERIAL_ASYNCH", "SLEEP"]
}, },
"NRF51_DK_BOOT": { "NRF51_DK_BOOT": {
"supported_form_factors": ["ARDUINO"], "supported_form_factors": ["ARDUINO"],

2
hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/pwmout_api.c
View File

@ -138,7 +138,7 @@ void pwmout_init(pwmout_t *obj, PinName pin)
void pwmout_free(pwmout_t *obj) void pwmout_free(pwmout_t *obj)
{ {
MBED_ASSERT(obj->pwm != (PWMName)NC); MBED_ASSERT(obj->pwm_name != (PWMName)NC);
MBED_ASSERT(obj->pwm_channel < PWM_CHANNELS_PER_INSTANCE); MBED_ASSERT(obj->pwm_channel < PWM_CHANNELS_PER_INSTANCE);
pwm_t * pwm = (pwm_t *) obj->pwm_struct; pwm_t * pwm = (pwm_t *) obj->pwm_struct;