Skip to content

Commit a385e34

Browse files
committed
Update PinNames markers
1 parent 1901210 commit a385e34

File tree

5 files changed

+7
-20
lines changed

5 files changed

+7
-20
lines changed

.codecheckignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
^hal/storage_abstraction
2020
^hal/tests/TESTS/mbed_hal/trng/pithy
2121
^hal/tests/TESTS/mbed_hal/trng/pithy
22-
^hal/tests/TESTS/pin_names/test_files
22+
^hal/tests/pinvalidate
2323
^platform/cxxsupport
2424
^platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV
2525
^platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,6 @@ matrix:
340340
- >-
341341
git diff --name-only --diff-filter=d FETCH_HEAD..HEAD \
342342
| ( grep '.*[\\|\/]PinNames.h$' || true ) \
343-
| while read file; do python ./hal/tests/TESTS/pin_names/pinvalidate.py -vfp "${file}"; done
343+
| while read file; do python ./hal/tests/pinvalidate/pinvalidate.py -vfp "${file}"; done
344344
- git diff --exit-code --diff-filter=d --color
345345

hal/source/mbed_gpio.c

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ MBED_WEAK void gpio_get_capabilities(gpio_t *gpio, gpio_capabilities_t *cap)
7878
cap->pull_up = 1;
7979
}
8080

81-
#if defined (TARGET_FF_ARDUINO) || (TARGET_FF_ARDUINO_UNO)
82-
8381
typedef enum {
8482
DEFAULT_GPIO = 0,
8583
} DefaultGPIOPeripheralName;
@@ -88,6 +86,7 @@ MBED_WEAK const PinMap *gpio_pinmap()
8886
{
8987
// Targets should override this weak implementation to provide correct data.
9088
static const PinMap empty_gpio_pinmap[] = {
89+
#if defined (TARGET_FF_ARDUINO) || (TARGET_FF_ARDUINO_UNO)
9190
{ARDUINO_UNO_D0, DEFAULT_GPIO, 0},
9291
{ARDUINO_UNO_D1, DEFAULT_GPIO, 0},
9392
{ARDUINO_UNO_D2, DEFAULT_GPIO, 0},
@@ -110,20 +109,8 @@ MBED_WEAK const PinMap *gpio_pinmap()
110109
{ARDUINO_UNO_A3, DEFAULT_GPIO, 0},
111110
{ARDUINO_UNO_A4, DEFAULT_GPIO, 0},
112111
{ARDUINO_UNO_A5, DEFAULT_GPIO, 0},
113-
114-
{NC, NC, 0},
115-
};
116-
return empty_gpio_pinmap;
117-
}
118-
119-
#else
120-
121-
MBED_WEAK const PinMap *gpio_pinmap()
122-
{
123-
static const PinMap empty_gpio_pinmap[] = {
112+
#endif
124113
{NC, NC, 0},
125114
};
126115
return empty_gpio_pinmap;
127-
}
128-
129-
#endif
116+
}

targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/PinNames.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* limitations under the License.
1717
*/
1818

19-
/* MBED TARGET LIST: ARM_MUSCA_B1, ARM_MUSCA_B1_NS */
19+
/* MBED TARGET LIST: ARM_MUSCA_B1 */
2020

2121
#ifndef MBED_PINNAMES_H
2222
#define MBED_PINNAMES_H

targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/PinNames.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* limitations under the License.
1717
*/
1818

19-
/* MBED TARGET LIST: ARM_MUSCA_S1, ARM_MUSCA_S1_NS */
19+
/* MBED TARGET LIST: ARM_MUSCA_S1 */
2020

2121
#ifndef MBED_PINNAMES_H
2222
#define MBED_PINNAMES_H

0 commit comments

Comments
 (0)