Janek Mann / mbed-src-openwear

mbed library sources modified for open wear

Dependents:   openwear-lifelogger-example

Fork of mbed-src by mbed official

Files at this revision

API Documentation at this revision

Revision 308:61b24bcb4679, committed 2014-09-04

Comitter:
janekm
Date:
Thu Sep 04 21:18:39 2014 +0000
Parent:
307:b1463675c899
Child:
309:1576dac518fb
Commit message:
?

Changed in this revision

targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/analogin_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/pwmout_api.c Show annotated file Show diff for this revision Revisions of this file 
--- a/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/analogin_api.c	Tue Sep 02 21:14:02 2014 +0000
+++ b/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/analogin_api.c	Thu Sep 04 21:18:39 2014 +0000
@@ -64,6 +64,7 @@
     NRF_ADC->TASKS_START = 1;
     while (((NRF_ADC->BUSY & ADC_BUSY_BUSY_Msk) >> ADC_BUSY_BUSY_Pos) == ADC_BUSY_BUSY_Busy) {
     }
+    NRF_ADC->TASKS_STOP = 1;
 
     return (uint16_t)NRF_ADC->RESULT; // 10 bit
 }

--- a/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/pwmout_api.c	Tue Sep 02 21:14:02 2014 +0000
+++ b/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/pwmout_api.c	Thu Sep 04 21:18:39 2014 +0000
@@ -49,6 +49,8 @@
     {p23,  PWM_1, 1},
     {p24,  PWM_1, 1},
     {p25,  PWM_1, 1},
+    {p26,  PWM_1, 1},
+    {p27,  PWM_1, 1},
     {p28,  PWM_1, 1},
     {p29,  PWM_1, 1},
     {p30,  PWM_1, 1},