Skip to content
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

Jump to bottom

Merge common files between LPC11XX and LPC11CXX #81

Merged
merged 5 commits into from
Sep 30, 2013
Merged

Merge common files between LPC11XX and LPC11CXX #81

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3fe31ad
Move objects.h to LPC11XX_11CXX common
omdathetkan Sep 28, 2013
e9f5c8d
Move README.md to LPC11XX_11CXX common
omdathetkan Sep 28, 2013
e196775
Move spi_pinmap.h to LPC11XX_11CXX common
omdathetkan Sep 28, 2013
4d0c864
Move adc_pinmap.h to LPC11XX_11CXX common
omdathetkan Sep 30, 2013
7ed6acb
Move pwmout_api.c/PeripheralNames.h to LPC11XX_11CXX common
omdathetkan Sep 30, 2013
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
Prev Previous commit
Next Next commit
Move adc_pinmap.h to LPC11XX_11CXX common 
Merge back into analog_api.c. P1_3/ADC0_4 (SWDIO) now disabled for both targets
  • Loading branch information
@omdathetkan
omdathetkan committed Sep 30, 2013
commit 4d0c864b16bf83cfca4f4c00e3c42ab3e03095a3
20 changes: 0 additions & 20 deletions libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/TARGET_LPC11CXX/adc_pinmap.h
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/TARGET_LPC11XX/adc_pinmap.h
View file
Open in desktop

This file was deleted.

12 changes: 11 additions & 1 deletion libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/analogin_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,17 @@
#include "pinmap.h"
#include "error.h"

#include "adc_pinmap.h"
static const PinMap PinMap_ADC[] = {
{P0_11, ADC0_0, 2},
{P1_0 , ADC0_1, 2},
{P1_1 , ADC0_2, 2},
{P1_2 , ADC0_3, 2},
// {P1_3 , ADC0_4, 2}, -- should be mapped to SWDIO only
{P1_4 , ADC0_5, 1},
{P1_10, ADC0_6, 1},
{P1_11, ADC0_7, 1},
{NC , NC , 0}
};

#define ANALOGIN_MEDIAN_FILTER 1

Expand Down