Bob Seque / mbed-dev

mbed library sources. Supersedes mbed-src.

Fork of mbed-dev by mbed official

Files at this revision

API Documentation at this revision

Revision 13:da2ea05f91cf, committed 2015-10-29

Comitter:
mbed_official
Date:
Thu Oct 29 12:00:09 2015 +0000
Parent:
12:7ebf5ad709a3
Child:
14:d797fbdad187
Commit message:
Synchronized with git revision 6bdf53a4e8cce7f608b34507fff0de50d586af01

Full URL: https://github.com/mbedmicro/mbed/commit/6bdf53a4e8cce7f608b34507fff0de50d586af01/

Fix in analogin - DK target does not provide the pins

Changed in this revision

api/mbed.h Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/analogin_api.c Show annotated file Show diff for this revision Revisions of this file 
--- a/api/mbed.h	Wed Oct 28 13:00:10 2015 +0000
+++ b/api/mbed.h	Thu Oct 29 12:00:09 2015 +0000
@@ -16,7 +16,7 @@
 #ifndef MBED_H
 #define MBED_H
 
-#define MBED_LIBRARY_VERSION 108
+#define MBED_LIBRARY_VERSION 109
 
 #include "platform.h"
 

--- a/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/analogin_api.c	Wed Oct 28 13:00:10 2015 +0000
+++ b/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/analogin_api.c	Thu Oct 29 12:00:09 2015 +0000
@@ -29,8 +29,10 @@
     {p4, ADC0_0, 32},
     {p5, ADC0_0, 64},
     {p6, ADC0_0, 128},
+#ifndef TARGET_NRF51_DONGLE
     {p26, ADC0_0, 1},
-    {p27, ADC0_0, 2}, 
+    {p27, ADC0_0, 2},
+#endif
     {NC, NC, 0}
 };