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

Remove GPIO pin-maps used for FPGA testing #12436

Merged
merged 7 commits into from
Mar 4, 2020
Merged

Remove GPIO pin-maps used for FPGA testing #12436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f6acb51
Update find_ports() FPGA testing utility function to loop through the…
mprse Feb 11, 2020
d36f2aa
KW24D, KW41Z: Remove GPIO pin-maps (use restricted GPIO pins if needed)
mprse Feb 11, 2020
6cd012d
tests-mbed_hal-pinmap: Remove testing GPIO pinmaps (GPIO pinmaps are …
mprse Feb 11, 2020
2a9e32e
tests-mbed_hal_fpga_ci_test_shield-uart: fix include order
mprse Feb 11, 2020
2b52c58
K64F: remove PTD3 pin from I2C SDA pinmap - fails FPGA test
mprse Feb 14, 2020
e18a800
NRF52840 I2C driver: Initialise I2C pins before transmission
mprse Feb 17, 2020
32311b7
i2c_api.c: fix style
mprse Feb 17, 2020
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: 0 additions & 6 deletions TESTS/mbed_hal/pinmap/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@

using namespace utest::v1;

#include "gpio_api.h"
#include "gpio_irq_api.h"
#include "analogin_api.h"
#include "analogout_api.h"
#include "can_api.h"
Expand All @@ -41,10 +39,6 @@ typedef struct {
} pinmap_info_t;

const pinmap_info_t pinmap_functions[] = {
PINMAP_TEST_ENTRY(gpio_pinmap),
#if DEVICE_INTERRUPTIN
PINMAP_TEST_ENTRY(gpio_irq_pinmap),
#endif
#if DEVICE_ANALOGIN
PINMAP_TEST_ENTRY(analogin_pinmap),
#endif
Expand Down
3 changes: 2 additions & 1 deletion TESTS/mbed_hal_fpga_ci_test_shield/uart/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,15 @@
#include "greentea-client/test_env.h"
#include "platform/mbed_critical.h"
#include <stdlib.h>
#include "hal/serial_api.h"
#include "UARTTester.h"
#include "pinmap.h"
#include "test_utils.h"
#include "serial_api.h"
#include "us_ticker_api.h"
#include "uart_fpga_test.h"
#include "hal/static_pinmap.h"


using namespace utest::v1;

#define PUTC_REPS 16
Expand Down
22 changes: 13 additions & 9 deletions components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/test_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,26 +111,30 @@ void find_ports(std::list<PortType> &matched_ports, std::list<PortType> &not_mat
const char *pin_type = PortType::PinMap::pin_type_names[i];

// Loop through each pin of a given type
for (; map->pin != NC; map++) {
for (uint32_t j = 0; j < FormFactorType::pins()->count; j++) {
PortType port;
// Set pin being tested
port.pins[i] = map->pin;
port.peripheral = map->peripheral;
// Only form factor pins can be tested
if (!pinmap_list_has_pin(FormFactorType::pins(), port.pins[i])) {

if (FormFactorType::pins()->pins[j] == NC) {
utest_printf("Skipping (NC pin) %s pin %s (%i)\r\n", pin_type,
FormFactorType::pin_to_string(port.pins[i]), port.pins[i]);
continue;
}

// Set pin being tested
port.pins[i] = FormFactorType::pins()->pins[j];
port.peripheral = pinmap_find_peripheral(port.pins[i], map);

// Don't test restricted pins
if (pinmap_list_has_pin(FormFactorType::restricted_pins(), port.pins[i])) {
utest_printf("Skipping %s pin %s (%i)\r\n", pin_type,
utest_printf("Skipping (restricted pin) %s pin %s (%i)\r\n", pin_type,
FormFactorType::pin_to_string(port.pins[i]), port.pins[i]);
continue;
}

if (!strcmp(PortType::PinMap::name, GPIO_IRQ_NAME) || !strcmp(PortType::PinMap::name, GPIO_NAME)) {
// Don't test restricted gpio pins
if (pinmap_list_has_pin(pinmap_gpio_restricted_pins(), port.pins[i])) {
utest_printf("Skipping %s pin %s (%i)\r\n", pin_type,
utest_printf("Skipping (restricted gpio pin) %s pin %s (%i)\r\n", pin_type,
FormFactorType::pin_to_string(port.pins[i]), port.pins[i]);
continue;
}
Expand All @@ -139,7 +143,7 @@ void find_ports(std::list<PortType> &matched_ports, std::list<PortType> &not_mat
#if DEVICE_SERIAL
if (!strcmp(PortType::PinMap::name, UART_NAME) || !strcmp(PortType::PinMap::name, UARTNOFC_NAME)) {
if (pinmap_list_has_peripheral(pinmap_uart_restricted_peripherals(), port.peripheral)) {
utest_printf("Skipping %s peripheral %i with pin %s (%i)\r\n", pin_type,
utest_printf("Skipping (restricted uart peripheral) %s peripheral %i with pin %s (%i)\r\n", pin_type,
port.peripheral, FormFactorType::pin_to_string(port.pins[i]), port.pins[i]);
continue;
}
Expand Down
67 changes: 13 additions & 54 deletions targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW24D/TARGET_FRDM/PeripheralPins.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,47 +16,6 @@

#include "PeripheralPins.h"

/************GPIO***************/
const PinMap PinMap_GPIO[] = {
{PTA0, GPIO_X, 1},
{PTA1, GPIO_X, 1},
{PTA2, GPIO_X, 1},
{PTA3, GPIO_X, 1},
{PTA4, GPIO_X, 1},
{PTA18, GPIO_X, 1},
{PTA19, GPIO_X, 1},

{PTC4, GPIO_X, 1},
{PTC5, GPIO_X, 1},
{PTC6, GPIO_X, 1},
{PTC7, GPIO_X, 1},

{PTD1, GPIO_X, 1},
{PTD2, GPIO_X, 1},
{PTD3, GPIO_X, 1},
{PTD4, GPIO_X, 1},
{PTD5, GPIO_X, 1},
{PTD6, GPIO_X, 1},
{PTD7, GPIO_X, 1},

{PTE0, GPIO_X, 1},
{PTE1, GPIO_X, 1},
{PTE2, GPIO_X, 1},
{PTE3, GPIO_X, 1},
{PTE4, GPIO_X, 1},
{PTE16, GPIO_X, 1},
{PTE17, GPIO_X, 1},
{PTE18, GPIO_X, 1},
{PTE19, GPIO_X, 1},

{NC , NC , 0}
};

const PinMap *gpio_pinmap()
{
return PinMap_GPIO;
}

/************RTC***************/
const PinMap PinMap_RTC[] = {
{NC, OSC32KCLK, 0},
Expand All @@ -75,22 +34,22 @@ const PinMap PinMap_ADC[] = {
{PTE17, ADC0_SE5a, 0},
{PTE18, ADC0_SE6a, 0},
{PTE19, ADC0_SE7a, 0},
{NC , NC , 0}
{NC, NC, 0}
};

/************I2C***************/
const PinMap PinMap_I2C_SDA[] = {
{PTD3, I2C_0, 4},
{PTE0, I2C_1, 6},
{PTE18, I2C_0, 4},
{NC , NC , 0}
{NC, NC, 0}
};

const PinMap PinMap_I2C_SCL[] = {
{PTD2, I2C_0, 4},
{PTE1, I2C_1, 6},
{PTE19, I2C_0, 4},
{NC , NC , 0}
{NC, NC, 0}
};

/************UART***************/
Expand All @@ -101,7 +60,7 @@ const PinMap PinMap_UART_TX[] = {
{PTE0, UART_1, 3},
{PTD3, UART_2, 3},
{PTE16, UART_2, 3},
{NC , NC , 0}
{NC, NC, 0}
};

const PinMap PinMap_UART_RX[] = {
Expand All @@ -111,7 +70,7 @@ const PinMap PinMap_UART_RX[] = {
{PTD2, UART_2, 3},
{PTE17, UART_2, 3},

{NC , NC , 0}
{NC, NC, 0}
};

const PinMap PinMap_UART_CTS[] = {
Expand All @@ -120,15 +79,15 @@ const PinMap PinMap_UART_CTS[] = {
{PTE2, UART_1, 3},
{PTE18, UART_2, 3},
{PTA0, UART_0, 2},
{NC , NC , 0}
{NC, NC, 0}
};

const PinMap PinMap_UART_RTS[] = {
{PTD4, UART_0, 3},
{PTE3 , UART_1, 3},
{PTE3, UART_1, 3},
{PTE19, UART_2, 3},
{PTA3, UART_0, 2},
{NC , NC , 0}
{NC, NC, 0}
};

/************SPI***************/
Expand All @@ -138,7 +97,7 @@ const PinMap PinMap_SPI_SCLK[] = {
{PTD1, SPI_0, 2},
{PTE2, SPI_1, 2},
{PTE17, SPI_0, 2},
{NC , NC , 0}
{NC, NC, 0}
};

const PinMap PinMap_SPI_MOSI[] = {
Expand All @@ -148,7 +107,7 @@ const PinMap PinMap_SPI_MOSI[] = {
{PTE1, SPI_1, 2},
{PTE3, SPI_1, 7},
{PTE18, SPI_0, 2},
{NC , NC , 0}
{NC, NC, 0}
};

const PinMap PinMap_SPI_MISO[] = {
Expand All @@ -158,15 +117,15 @@ const PinMap PinMap_SPI_MISO[] = {
{PTE1, SPI_1, 7},
{PTE3, SPI_1, 2},
{PTE19, SPI_0, 2},
{NC , NC , 0}
{NC, NC, 0}
};

const PinMap PinMap_SPI_SSEL[] = {
{PTB10, SPI_1, 2},
{PTC4, SPI_0, 2},
{PTE4, SPI_1, 2},
{PTE16, SPI_0, 2},
{NC , NC , 0}
{NC, NC, 0}
};

/************PWM***************/
Expand All @@ -181,5 +140,5 @@ const PinMap PinMap_PWM[] = {
{PTA2, PWM_7, 3},
{PTA3, PWM_0, 3},
{PTA4, PWM_1, 3},
{NC , NC , 0}
{NC, NC, 0}
};
63 changes: 12 additions & 51 deletions targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW41Z/TARGET_FRDM/PeripheralPins.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,45 +16,6 @@

#include "PeripheralPins.h"

/************GPIO***************/
const PinMap PinMap_GPIO[] = {
{PTA0, GPIO_X, 1},
{PTA1, GPIO_X, 1},
{PTA2, GPIO_X, 1},
{PTA16, GPIO_X, 1},
{PTA17, GPIO_X, 1},
{PTA18, GPIO_X, 1},
{PTA19, GPIO_X, 1},

{PTB0, GPIO_X, 1},
{PTB1, GPIO_X, 1},
{PTB2, GPIO_X, 1},
{PTB3, GPIO_X, 1},
{PTB16, GPIO_X, 1},
{PTB17, GPIO_X, 1},
{PTB18, GPIO_X, 1},

// {PTC0, GPIO_X, 1}, // PTC0 is not available on the 48-pin Laminate QFN package.
{PTC1, GPIO_X, 1},
{PTC2, GPIO_X, 1},
{PTC3, GPIO_X, 1},
{PTC4, GPIO_X, 1},
{PTC5, GPIO_X, 1},
{PTC6, GPIO_X, 1},
{PTC7, GPIO_X, 1},
{PTC16, GPIO_X, 1},
{PTC17, GPIO_X, 1},
{PTC18, GPIO_X, 1},
{PTC19, GPIO_X, 1},

{NC , NC , 0}
};

const PinMap *gpio_pinmap()
{
return PinMap_GPIO;
}

/************RTC***************/
const PinMap PinMap_RTC[] = {
{NC, OSC32KCLK, 0},
Expand All @@ -67,7 +28,7 @@ const PinMap PinMap_ADC[] = {
{PTB2, ADC0_SE3, 0},
{PTB18, ADC0_SE4, 0},
{PTA19, ADC0_SE5, 0},
{NC , NC , 0}
{NC, NC, 0}
};

/************DAC***************/
Expand All @@ -85,7 +46,7 @@ const PinMap PinMap_I2C_SDA[] = {
{PTC7, I2C_1, 3},
{PTC16, I2C_0, 3},
{PTC18, I2C_1, 3},
{NC , NC , 0}
{NC, NC, 0}
};

const PinMap PinMap_I2C_SCL[] = {
Expand All @@ -96,61 +57,61 @@ const PinMap PinMap_I2C_SCL[] = {
{PTC6, I2C_1, 3},
{PTC17, I2C_1, 3},
{PTC19, I2C_0, 3},
{NC , NC , 0}
{NC, NC, 0}
};

/************UART***************/
const PinMap PinMap_UART_TX[] = {
{PTC3, LPUART_0, 4},
{PTC7, LPUART_0, 4},
{PTC18, LPUART_0, 4},
{NC , NC , 0}
{NC, NC, 0}
};

const PinMap PinMap_UART_RX[] = {
{PTC2, LPUART_0, 4},
{PTC6, LPUART_0, 4},
{PTC17, LPUART_0, 4},
{NC , NC , 0}
{NC, NC, 0}
};

const PinMap PinMap_UART_CTS[] = {
{PTC4, LPUART_0, 4},
{PTC19, LPUART_0, 4},
{NC , NC , 0}
{NC, NC, 0}
};

const PinMap PinMap_UART_RTS[] = {
{PTC1, LPUART_0, 4},
{PTC5, LPUART_0, 4},
{PTC16, LPUART_0, 4},
{NC , NC , 0}
{NC, NC, 0}
};

/************SPI***************/
const PinMap PinMap_SPI_SCLK[] = {
{PTA18, SPI_1, 2},
{PTC16, SPI_0, 2},
{NC , NC , 0}
{NC, NC, 0}
};

const PinMap PinMap_SPI_MOSI[] = {
{PTA16, SPI_1, 2},
{PTC17, SPI_0, 2},
{NC , NC , 0}
{NC, NC, 0}
};

const PinMap PinMap_SPI_MISO[] = {
{PTA17, SPI_1, 2},
{PTC18, SPI_0, 2},
{NC , NC , 0}
{NC, NC, 0}
};

const PinMap PinMap_SPI_SSEL[] = {
{PTA1, SPI_1, 2},
{PTA19, SPI_1, 2},
{PTC19, SPI_0, 2},
{NC , NC , 0}
{NC, NC, 0}
};

/************PWM***************/
Expand All @@ -171,5 +132,5 @@ const PinMap PinMap_PWM[] = {
{PTB3, PWM_6, 5},
{PTC4, PWM_5, 5},
{PTC5, PWM_6, 5},
{NC , NC , 0}
{NC, NC, 0}
};
2 changes: 1 addition & 1 deletion ...s/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_FRDM/PeripheralPinMaps.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ MSTD_CONSTEXPR_OBJ_11 PinMap PinMap_I2C_SDA[] = {
{PTB3, I2C_0, 2},
{PTC11, I2C_1, 2},
{PTA13, I2C_2, 5},
{PTD3, I2C_0, 7},
// {PTD3, I2C_0, 7}, // Fails FPGA testing
{PTE0, I2C_1, 6},
{NC, NC, 0}
};
Expand Down
Loading