Skip to content

NCS36510: Default range changed from 0 to 950mV - ADC #3869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 14, 2017
Merged

NCS36510: Default range changed from 0 to 950mV - ADC #3869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c06fa3a
A4 and A5 definitions added
radhika-raghavendran Mar 9, 2017
e640f5f
Re-do change for changing ADC range from 0 to 3.3V
radhika-raghavendran Mar 10, 2017
9d06732
Changed tab to spaces
radhika-raghavendran Mar 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions targets/TARGET_ONSEMI/TARGET_NCS36510/PinNames.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ extern "C" {
#endif

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

typedef enum {
Expand Down
2 changes: 1 addition & 1 deletion targets/TARGET_ONSEMI/TARGET_NCS36510/analogin_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down