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

Merge pull request #3869 from radhika-raghavendran/master 

NCS36510: Default range changed from 0 to 950mV - ADC
pull/3939/head
Anna Bridge 2017-03-14 14:39:21 +00:00 committed by GitHub
parent 88fb819e25 9d06732aae
commit 538e1600b4
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
targets/TARGET_ONSEMI/TARGET_NCS36510/PinNames.h
View File

@ -37,6 +37,7 @@ extern "C" {
#endif #endif
typedef enum { typedef enum {
NC = (int)0xFFFFFFFF,
GPIO0 = 0, GPIO0 = 0,
GPIO1, GPIO1,
GPIO2, GPIO2,
@ -59,6 +60,8 @@ typedef enum {
A1, A1,
A2, A2,
A3, A3,
A4 = NC,
A5 = NC,
UART1_TX = GPIO0, UART1_TX = GPIO0,
UART1_RX = GPIO1, UART1_RX = GPIO1,
UART2_TX = GPIO8, UART2_TX = GPIO8,
@ -146,8 +149,7 @@ typedef enum {
D12 = GPIO16, D12 = GPIO16,
D13 = GPIO14, D13 = GPIO14,
D14 = GPIO3, D14 = GPIO3,
D15 = GPIO2, D15 = GPIO2
NC = (int)0xFFFFFFFF
} PinName; } PinName;
typedef enum { typedef enum {

2
targets/TARGET_ONSEMI/TARGET_NCS36510/analogin_api.c
View File

@ -88,7 +88,7 @@ void analogin_init(analogin_t *obj, PinName pin)
/* Single sample, absolute conversion, scale = 1 */ /* Single sample, absolute conversion, scale = 1 */
obj->adcReg->CONTROL.WORD = ((0 << ADC_CONTROL_MODE_BIT_POS) | obj->adcReg->CONTROL.WORD = ((0 << ADC_CONTROL_MODE_BIT_POS) |
(1 << ADC_CONTROL_MEASTYPE_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)); (((uint8_t)adc_pin) << ADC_CONTROL_MEAS_CH_BIT_POS));
/* Prescaler enabled; set to 7 */ /* Prescaler enabled; set to 7 */