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

Merge branch 'nordic_sdk_integration' of https://github.com/nvlsianpu/mbed-nordic into nordic_sdk_integration 

# Conflicts:
#	hal/targets.json
pull/2234/head
Andrzej Puzdrowski 2016-06-27 12:42:13 +02:00
parent a664be0347 441a665302
commit 5ba9392280
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hal/targets.json
View File

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

5
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)
{
MBED_ASSERT(obj->pwm != (PWMName)NC);
MBED_ASSERT(obj->pwm_name != (PWMName)NC);
MBED_ASSERT(obj->pwm_channel < PWM_CHANNELS_PER_INSTANCE);
pwm_t * pwm = (pwm_t *) obj->pwm_struct;
@ -160,7 +160,8 @@ void pwmout_write(pwmout_t *obj, float value)
if (value > 1.0f) {
value = 1.0f;
}
uint16_t ticks = (uint16_t)((float)app_pwm_cycle_ticks_get(pwm->instance) * value);
app_pwm_channel_duty_set(pwm->instance, obj->pwm_channel, (app_pwm_duty_t)(value * 100.0f) );
}
float pwmout_read(pwmout_t *obj)