Skip to content

Commit 538e160

Browse files
authored
Merge pull request #3869 from radhika-raghavendran/master
NCS36510: Default range changed from 0 to 950mV - ADC
2 parents 88fb819 + 9d06732 commit 538e160

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

targets/TARGET_ONSEMI/TARGET_NCS36510/PinNames.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ extern "C" {
3737
#endif
3838

3939
typedef enum {
40+
NC = (int)0xFFFFFFFF,
4041
GPIO0 = 0,
4142
GPIO1,
4243
GPIO2,
@@ -59,6 +60,8 @@ typedef enum {
5960
A1,
6061
A2,
6162
A3,
63+
A4 = NC,
64+
A5 = NC,
6265
UART1_TX = GPIO0,
6366
UART1_RX = GPIO1,
6467
UART2_TX = GPIO8,
@@ -146,8 +149,7 @@ typedef enum {
146149
D12 = GPIO16,
147150
D13 = GPIO14,
148151
D14 = GPIO3,
149-
D15 = GPIO2,
150-
NC = (int)0xFFFFFFFF
152+
D15 = GPIO2
151153
} PinName;
152154

153155
typedef enum {

targets/TARGET_ONSEMI/TARGET_NCS36510/analogin_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ void analogin_init(analogin_t *obj, PinName pin)
8888
/* Single sample, absolute conversion, scale = 1 */
8989
obj->adcReg->CONTROL.WORD = ((0 << ADC_CONTROL_MODE_BIT_POS) |
9090
(1 << ADC_CONTROL_MEASTYPE_BIT_POS) |
91-
(1 << ADC_CONTROL_INPUTSCALE_BIT_POS) |
91+
(6 << ADC_CONTROL_INPUTSCALE_BIT_POS) |
9292
(((uint8_t)adc_pin) << ADC_CONTROL_MEAS_CH_BIT_POS));
9393

9494
/* Prescaler enabled; set to 7 */

0 commit comments

Comments
 (0)