From c06fa3a3354d47e08c933cf648237096852fa81f Mon Sep 17 00:00:00 2001 From: Radhika Raghavendran Date: Thu, 9 Mar 2017 11:46:42 +0530 Subject: [PATCH 1/3] A4 and A5 definitions added --- targets/TARGET_ONSEMI/TARGET_NCS36510/PinNames.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/targets/TARGET_ONSEMI/TARGET_NCS36510/PinNames.h b/targets/TARGET_ONSEMI/TARGET_NCS36510/PinNames.h index 41b0f6b4f8c..e97e6b50dbe 100644 --- a/targets/TARGET_ONSEMI/TARGET_NCS36510/PinNames.h +++ b/targets/TARGET_ONSEMI/TARGET_NCS36510/PinNames.h @@ -37,6 +37,7 @@ extern "C" { #endif typedef enum { + NC = (int)0xFFFFFFFF, GPIO0 = 0, GPIO1, GPIO2, @@ -59,6 +60,8 @@ typedef enum { A1, A2, A3, + A4 = NC, + A5 = NC, UART1_TX = GPIO0, UART1_RX = GPIO1, UART2_TX = GPIO8, @@ -146,8 +149,7 @@ typedef enum { D12 = GPIO16, D13 = GPIO14, D14 = GPIO3, - D15 = GPIO2, - NC = (int)0xFFFFFFFF + D15 = GPIO2 } PinName; typedef enum { From e640f5f1e579e1e0f9891dd060a6e326809f4fc9 Mon Sep 17 00:00:00 2001 From: Radhika Raghavendran Date: Fri, 10 Mar 2017 13:45:32 +0530 Subject: [PATCH 2/3] Re-do change for changing ADC range from 0 to 3.3V --- targets/TARGET_ONSEMI/TARGET_NCS36510/analogin_api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/TARGET_ONSEMI/TARGET_NCS36510/analogin_api.c b/targets/TARGET_ONSEMI/TARGET_NCS36510/analogin_api.c index 5a01b365b6a..29ab895021c 100644 --- a/targets/TARGET_ONSEMI/TARGET_NCS36510/analogin_api.c +++ b/targets/TARGET_ONSEMI/TARGET_NCS36510/analogin_api.c @@ -88,7 +88,7 @@ void analogin_init(analogin_t *obj, PinName pin) /* Single sample, absolute conversion, scale = 1 */ obj->adcReg->CONTROL.WORD = ((0 << ADC_CONTROL_MODE_BIT_POS) | (1 << ADC_CONTROL_MEASTYPE_BIT_POS) | - (1 << ADC_CONTROL_INPUTSCALE_BIT_POS) | + (6 << ADC_CONTROL_INPUTSCALE_BIT_POS) | (((uint8_t)adc_pin) << ADC_CONTROL_MEAS_CH_BIT_POS)); /* Prescaler enabled; set to 7 */ From 9d06732aae64d26de963f9d39a601956796fe5b5 Mon Sep 17 00:00:00 2001 From: Radhika Raghavendran Date: Fri, 10 Mar 2017 16:22:30 +0530 Subject: [PATCH 3/3] Changed tab to spaces --- targets/TARGET_ONSEMI/TARGET_NCS36510/PinNames.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/targets/TARGET_ONSEMI/TARGET_NCS36510/PinNames.h b/targets/TARGET_ONSEMI/TARGET_NCS36510/PinNames.h index e97e6b50dbe..61305788c75 100644 --- a/targets/TARGET_ONSEMI/TARGET_NCS36510/PinNames.h +++ b/targets/TARGET_ONSEMI/TARGET_NCS36510/PinNames.h @@ -60,8 +60,8 @@ typedef enum { A1, A2, A3, - A4 = NC, - A5 = NC, + A4 = NC, + A5 = NC, UART1_TX = GPIO0, UART1_RX = GPIO1, UART2_TX = GPIO8,