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

Updated with code style guidelines

pull/2852/head
Marcos Gomes 2016-09-12 17:30:18 +01:00 committed by Anna Bridge
parent 5d4dda9ecb
commit 6b44a61534
5 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/TARGET_LPC4330/PeripheralNames.h
View File

@ -46,7 +46,7 @@ typedef enum {
ADC1_5, ADC1_5,
ADC1_6, ADC1_6,
ADC1_7, ADC1_7,
ADC_pin0_0, // inlcude adc only pin channels ADC_pin0_0,
ADC_pin0_1, ADC_pin0_1,
ADC_pin0_2, ADC_pin0_2,
ADC_pin0_3, ADC_pin0_3,

1
hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/TARGET_LPC4330/PinNames.h
View File

@ -666,6 +666,7 @@ typedef enum {
// (*) if DAC0 is configured, ADC4 is not available // (*) if DAC0 is configured, ADC4 is not available
// (**) ADC5 requires JP2 mod // (**) ADC5 requires JP2 mod
// Analog Only Pins
adc0_0 = MBED_PIN(NO_PORT, 0, NO_GPIO, 0), adc0_0 = MBED_PIN(NO_PORT, 0, NO_GPIO, 0),
adc0_1 = MBED_PIN(NO_PORT, 1, NO_GPIO, 0), adc0_1 = MBED_PIN(NO_PORT, 1, NO_GPIO, 0),
adc0_2 = MBED_PIN(NO_PORT, 2, NO_GPIO, 0), adc0_2 = MBED_PIN(NO_PORT, 2, NO_GPIO, 0),

18
hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/TARGET_LPC4337/PeripheralNames.h
View File

@ -45,7 +45,23 @@ typedef enum {
ADC1_4, ADC1_4,
ADC1_5, ADC1_5,
ADC1_6, ADC1_6,
ADC1_7 ADC1_7,
ADC_pin0_0,
ADC_pin0_1,
ADC_pin0_2,
ADC_pin0_3,
ADC_pin0_4,
ADC_pin0_5,
ADC_pin0_6,
ADC_pin0_7,
ADC_pin1_0,
ADC_pin1_1,
ADC_pin1_2,
ADC_pin1_3,
ADC_pin1_4,
ADC_pin1_5,
ADC_pin1_6,
ADC_pin1_7
} ADCName; } ADCName;
typedef enum { typedef enum {

1
hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/TARGET_LPC4337/PinNames.h
View File

@ -506,7 +506,6 @@ typedef enum {
LED4 = LED_RED, LED4 = LED_RED,
// Analog Only pins // Analog Only pins
adc0_0 = MBED_PIN(NO_PORT, 0, NO_GPIO, 0), adc0_0 = MBED_PIN(NO_PORT, 0, NO_GPIO, 0),
adc0_1 = MBED_PIN(NO_PORT, 1, NO_GPIO, 0), adc0_1 = MBED_PIN(NO_PORT, 1, NO_GPIO, 0),
adc0_2 = MBED_PIN(NO_PORT, 2, NO_GPIO, 0), adc0_2 = MBED_PIN(NO_PORT, 2, NO_GPIO, 0),

25
hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogin_api.c
View File

@ -70,32 +70,27 @@ void analogin_init(analogin_t *obj, PinName pin) {
MBED_ASSERT(obj->adc != (LPC_ADC_T *)NC); MBED_ASSERT(obj->adc != (LPC_ADC_T *)NC);
// Set ADC number // Set ADC number
if(name < ADC1_0) if(name < ADC1_0) {
{
obj->num = 0; obj->num = 0;
} else if(name < ADC_pin0_0 && name > ADC0_6) } else if(name < ADC_pin0_0 && name > ADC0_6) {
{
obj->num = 1; obj->num = 1;
} else if(name < ADC_pin1_1 && name > ADC1_7) } else if(name < ADC_pin1_1 && name > ADC1_7) {
{
obj->num = 0; obj->num = 0;
} else if(name > ADC_pin0_7) } else if(name > ADC_pin0_7) {
{
obj->num = 1; obj->num = 1;
} }
// Set ADC register, number and channel //ADC register and channel
obj->ch = name % (ADC0_7 + 1); obj->ch = name % (ADC0_7 + 1);
obj->adc = (LPC_ADC_T *) (obj->num > 0) ? LPC_ADC1 : LPC_ADC0; obj->adc = (LPC_ADC_T *) (obj->num > 0) ? LPC_ADC1 : LPC_ADC0;
// Reset pin function to GPIO if it is a GPIO pin. for adc only pins it is not necessary // Reset pin function to GPIO if it is a GPIO pin. for adc only pins it is not necessary
if(name < ADC_pin0_0) if(name < ADC_pin0_0) {
{ gpio_set(pin);
gpio_set(pin); // Select ADC on analog function select register in SCU
// Select ADC on analog function select register in SCU LPC_SCU->ENAIO[obj->num] |= (1 << obj->ch);
LPC_SCU->ENAIO[obj->num] |= (1 << obj->ch);
} else { } else {
LPC_SCU->ENAIO[obj->num] &= ~(1 << obj->ch); LPC_SCU->ENAIO[obj->num] &= ~(1 << obj->ch);
} }
// Calculate minimum clock divider // Calculate minimum clock divider