diff --git a/TESTS/integration/COMMON/target_extended.json b/TESTS/integration/COMMON/target_extended.json index 79b7f31..78ef201 100644 --- a/TESTS/integration/COMMON/target_extended.json +++ b/TESTS/integration/COMMON/target_extended.json @@ -2,10 +2,10 @@ "target_overrides": { "NUCLEO_F412ZG": { "target.components_add" : ["SD", "WIFI_WIZFI310"], - "sd.SPI_MOSI" : "D11", - "sd.SPI_MISO" : "D12", - "sd.SPI_CLK" : "D13", - "sd.SPI_CS" : "D10", + "sd.SPI_MOSI" : "ARDUINO_UNO_SPI_MOSI", + "sd.SPI_MISO" : "ARDUINO_UNO_SPI_MISO", + "sd.SPI_CLK" : "ARDUINO_UNO_SPI_SCK", + "sd.SPI_CS" : "ARDUINO_UNO_SPI_CS", "target.network-default-interface-type" : "WIFI", "wizfi310.tx" : "PD_5", "wizfi310.rx" : "PD_6", @@ -47,15 +47,15 @@ "NUCLEO_L476RG": { "target.macros_remove" : ["MBED_TICKLESS"], "target.components_add" : ["SD", "WIFI_WIZFI310"], - "sd.SPI_MOSI" : "D11", - "sd.SPI_MISO" : "D12", - "sd.SPI_CLK" : "D13", - "sd.SPI_CS" : "D10", + "sd.SPI_MOSI" : "ARDUINO_UNO_SPI_MOSI", + "sd.SPI_MISO" : "ARDUINO_UNO_SPI_MIS0", + "sd.SPI_CLK" : "ARDUINO_UNO_SPI_SCK", + "sd.SPI_CS" : "ARDUINO_UNO_SPI_CS", "target.network-default-interface-type" : "WIFI", - "wizfi310.tx" : "D8", - "wizfi310.rx" : "D2", - "wizfi310.rts" : "D3", - "wizfi310.cts" : "D5", + "wizfi310.tx" : "ARDUINO_UNO_D8", + "wizfi310.rx" : "ARDUINO_UNO_D2", + "wizfi310.rts" : "ARDUINO_UNO_D3", + "wizfi310.cts" : "ARDUINO_UNO_D5", "wizfi310.rx-buffer-size" : 64, "wizfi310.stacksize" : 1536, "wizfi310.event-queue-size" : 256, @@ -65,13 +65,13 @@ "NUCLEO_L4R5ZI": { "target.macros_remove" : ["MBED_TICKLESS"], "target.components_add" : ["SD", "WIFI_WIZFI310"], - "sd.SPI_MOSI" : "D11", - "sd.SPI_MISO" : "D12", - "sd.SPI_CLK" : "D13", - "sd.SPI_CS" : "D10", + "sd.SPI_MOSI" : "ARDUINO_UNO_SPI_MOSI", + "sd.SPI_MISO" : "ARDUINO_UNO_SPI_MIS0", + "sd.SPI_CLK" : "ARDUINO_UNO_SPI_SCK", + "sd.SPI_CS" : "ARDUINO_UNO_SPI_CS", "target.network-default-interface-type" : "WIFI", - "wizfi310.tx" : "D1", - "wizfi310.rx" : "D0", + "wizfi310.tx" : "ARDUINO_UNO_UART_TX", + "wizfi310.rx" : "ARDUINO_UNO_UART_RX", "wizfi310.rts" : "PB_1", "wizfi310.cts" : "PB_13", "wizfi310.rx-buffer-size" : 512, @@ -82,13 +82,13 @@ "NUCLEO_L496ZG": { "target.macros_remove" : ["MBED_TICKLESS"], "target.components_add" : ["SD", "WIFI_WIZFI310"], - "sd.SPI_MOSI" : "D11", - "sd.SPI_MISO" : "D12", - "sd.SPI_CLK" : "D13", - "sd.SPI_CS" : "D10", + "sd.SPI_MOSI" : "ARDUINO_UNO_SPI_MOSI", + "sd.SPI_MISO" : "ARDUINO_UNO_SPI_MIS0", + "sd.SPI_CLK" : "ARDUINO_UNO_SPI_SCK", + "sd.SPI_CS" : "ARDUINO_UNO_SPI_CS", "target.network-default-interface-type" : "WIFI", - "wizfi310.tx" : "D1", - "wizfi310.rx" : "D0", + "wizfi310.tx" : "ARDUINO_UNO_UART_TX", + "wizfi310.rx" : "ARDUINO_UNO_UART_RX", "wizfi310.rts" : "PB_1", "wizfi310.cts" : "PB_13", "wizfi310.rx-buffer-size" : 512, @@ -121,10 +121,10 @@ "DISCO_F469NI": { "target.components_add" : ["WIFI_WIZFI310"], "target.network-default-interface-type" : "WIFI", - "wizfi310.tx" : "D1", - "wizfi310.rx" : "D0", - "wizfi310.rts" : "D4", - "wizfi310.cts" : "D2", + "wizfi310.tx" : "ARDUINO_UNO_UART_TX", + "wizfi310.rx" : "ARDUINO_UNO_UART_RX", + "wizfi310.rts" : "ARDUINO_UNO_D4", + "wizfi310.cts" : "ARDUINO_UNO_D2", "wizfi310.rx-buffer-size" : 512, "wizfi310.stacksize" : 1536, "wizfi310.event-queue-size" : 1024, diff --git a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/mbed_lib.json b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/mbed_lib.json index 4e0daaa..d1d920c 100644 --- a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/mbed_lib.json +++ b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/mbed_lib.json @@ -1,12 +1,12 @@ { "name": "bluenrg_ms", "config": { - "SPI_MOSI": "D11", - "SPI_MISO": "D12", - "SPI_nCS": "A1", - "SPI_RESET": "D7", - "SPI_IRQ": "A0", - "SPI_SCK": "D3", + "SPI_MOSI": "ARDUINO_UNO_SPI_MOSI", + "SPI_MISO": "ARDUINO_UNO_SPI_MISO", + "SPI_nCS": "ARDUINO_UNO_A1", + "SPI_RESET": "ARDUINO_UNO_D7", + "SPI_IRQ": "ARDUINO_UNO_A0", + "SPI_SCK": "ARDUINO_UNO_D3", "valid-public-bd-address": { "help": "Read the BD public address at startup", "value": false @@ -14,7 +14,7 @@ }, "target_overrides": { "K64F": { - "SPI_SCK": "D13" + "SPI_SCK": "ARDUINO_UNO_SPI_SCK" }, "DISCO_L475VG_IOT01A": { "SPI_MOSI": "PC_12", diff --git a/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/analogin/main.cpp b/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/analogin/main.cpp index 57b4459..b4a8acf 100644 --- a/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/analogin/main.cpp +++ b/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/analogin/main.cpp @@ -19,7 +19,7 @@ #error [NOT_SUPPORTED] Analog in not supported for this target #elif !COMPONENT_FPGA_CI_TEST_SHIELD #error [NOT_SUPPORTED] FPGA CI Test Shield is needed to run this test -#elif !defined(TARGET_FF_ARDUINO) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) +#elif !(defined(TARGET_FF_ARDUINO) || defined(TARGET_FF_ARDUINO_UNO)) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) #error [NOT_SUPPORTED] Test not supported for this form factor #else diff --git a/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/gpio/main.cpp b/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/gpio/main.cpp index aaec083..dce82fb 100644 --- a/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/gpio/main.cpp +++ b/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/gpio/main.cpp @@ -17,7 +17,7 @@ #if !COMPONENT_FPGA_CI_TEST_SHIELD #error [NOT_SUPPORTED] FPGA CI Test Shield is needed to run this test -#elif !defined(TARGET_FF_ARDUINO) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) +#elif !(defined(TARGET_FF_ARDUINO) || defined(TARGET_FF_ARDUINO_UNO)) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) #error [NOT_SUPPORTED] Test not supported for this form factor #else diff --git a/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/gpio_irq/main.cpp b/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/gpio_irq/main.cpp index 98b4935..08d9981 100644 --- a/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/gpio_irq/main.cpp +++ b/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/gpio_irq/main.cpp @@ -19,7 +19,7 @@ #error [NOT_SUPPORTED] test not supported #elif !COMPONENT_FPGA_CI_TEST_SHIELD #error [NOT_SUPPORTED] FPGA CI Test Shield is needed to run this test -#elif !defined(TARGET_FF_ARDUINO) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) +#elif !(defined(TARGET_FF_ARDUINO) || defined(TARGET_FF_ARDUINO_UNO)) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) #error [NOT_SUPPORTED] Test not supported for this form factor #else diff --git a/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/i2c/main.cpp b/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/i2c/main.cpp index 62030ec..e518e86 100644 --- a/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/i2c/main.cpp +++ b/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/i2c/main.cpp @@ -19,7 +19,7 @@ #error [NOT_SUPPORTED] I2C not supported for this target #elif !COMPONENT_FPGA_CI_TEST_SHIELD #error [NOT_SUPPORTED] FPGA CI Test Shield is needed to run this test -#elif !defined(TARGET_FF_ARDUINO) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) +#elif !(defined(TARGET_FF_ARDUINO) || defined(TARGET_FF_ARDUINO_UNO)) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) #error [NOT_SUPPORTED] Test not supported for this form factor #else diff --git a/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/pwm/main.cpp b/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/pwm/main.cpp index 7124fce..76421f9 100644 --- a/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/pwm/main.cpp +++ b/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/pwm/main.cpp @@ -19,7 +19,7 @@ #error [NOT_SUPPORTED] PWM not supported for this target #elif !COMPONENT_FPGA_CI_TEST_SHIELD #error [NOT_SUPPORTED] FPGA CI Test Shield is needed to run this test -#elif !defined(TARGET_FF_ARDUINO) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) +#elif !(defined(TARGET_FF_ARDUINO) || defined(TARGET_FF_ARDUINO_UNO)) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) #error [NOT_SUPPORTED] Test not supported for this form factor #else diff --git a/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/spi/main.cpp b/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/spi/main.cpp index f933b25..84b41cc 100644 --- a/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/spi/main.cpp +++ b/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/spi/main.cpp @@ -19,7 +19,7 @@ #error [NOT_SUPPORTED] SPI not supported for this target #elif !COMPONENT_FPGA_CI_TEST_SHIELD #error [NOT_SUPPORTED] FPGA CI Test Shield is needed to run this test -#elif !defined(TARGET_FF_ARDUINO) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) +#elif !(defined(TARGET_FF_ARDUINO) || defined(TARGET_FF_ARDUINO_UNO)) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) #error [NOT_SUPPORTED] Test not supported for this form factor #else diff --git a/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/uart/main.cpp b/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/uart/main.cpp index 4315cc8..3719f03 100644 --- a/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/uart/main.cpp +++ b/hal/tests/TESTS/mbed_hal_fpga_ci_test_shield/uart/main.cpp @@ -19,7 +19,7 @@ #error [NOT_SUPPORTED] SERIAL not supported for this target #elif !COMPONENT_FPGA_CI_TEST_SHIELD #error [NOT_SUPPORTED] FPGA CI Test Shield is needed to run this test -#elif !defined(TARGET_FF_ARDUINO) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) +#elif !(defined(TARGET_FF_ARDUINO) || defined(TARGET_FF_ARDUINO_UNO)) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) #error [NOT_SUPPORTED] Test not supported for this form factor #else diff --git a/hal/tests/TESTS/mbed_timing_fpga_ci_test_shield/watchdog/main.cpp b/hal/tests/TESTS/mbed_timing_fpga_ci_test_shield/watchdog/main.cpp index be8c9f2..9323428 100644 --- a/hal/tests/TESTS/mbed_timing_fpga_ci_test_shield/watchdog/main.cpp +++ b/hal/tests/TESTS/mbed_timing_fpga_ci_test_shield/watchdog/main.cpp @@ -18,7 +18,7 @@ #error [NOT_SUPPORTED] Watchdog not supported for this target #elif !COMPONENT_FPGA_CI_TEST_SHIELD #error [NOT_SUPPORTED] FPGA CI Test Shield is needed to run this test -#elif !defined(TARGET_FF_ARDUINO) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) +#elif !(defined(TARGET_FF_ARDUINO) || defined(TARGET_FF_ARDUINO_UNO)) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) #error [NOT_SUPPORTED] Test not supported for this form factor #else diff --git a/storage/blockdevice/COMPONENT_SD/mbed_lib.json b/storage/blockdevice/COMPONENT_SD/mbed_lib.json index 6779ad6..c8423d9 100644 --- a/storage/blockdevice/COMPONENT_SD/mbed_lib.json +++ b/storage/blockdevice/COMPONENT_SD/mbed_lib.json @@ -1,10 +1,10 @@ { "name": "sd", "config": { - "SPI_CS": "SPI_CS", - "SPI_MOSI": "SPI_MOSI", - "SPI_MISO": "SPI_MISO", - "SPI_CLK": "SPI_SCK", + "SPI_CS": "ARDUINO_UNO_SPI_CS", + "SPI_MOSI": "ARDUINO_UNO_SPI_MOSI", + "SPI_MISO": "ARDUINO_UNO_SPI_MISO", + "SPI_CLK": "ARDUINO_UNO_SPI_SCK", "FSFAT_SDCARD_INSTALLED": 1, "CMD_TIMEOUT": 10000, "CMD0_IDLE_STATE_RETRIES": 5, @@ -80,12 +80,6 @@ "SPI_CLK": "PD_15", "SPI_CS": "PD_12" }, - "NUMAKER_PFM_M487": { - "SPI_MOSI": "D11", - "SPI_MISO": "D12", - "SPI_CLK": "D13", - "SPI_CS": "D10" - }, "NUMAKER_PFM_NUC472": { "SPI_MOSI": "PF_0", "SPI_MISO": "PD_15", @@ -122,12 +116,6 @@ "SPI_CLK": "p7", "SPI_CS": "p8" }, - "CC3220SF_LAUNCHXL": { - "SPI_MOSI": "D11", - "SPI_MISO": "D12", - "SPI_CLK": "D13", - "SPI_CS": "D10" - }, "ARCH_MAX": { "SPI_MOSI": "PC_3", "SPI_MISO": "PC_2",