diff --git a/libraries/tests/mbed/digitalin_digitalout/main.cpp b/libraries/tests/mbed/digitalin_digitalout/main.cpp index 7e54c29d11..fe9a4f627e 100644 --- a/libraries/tests/mbed/digitalin_digitalout/main.cpp +++ b/libraries/tests/mbed/digitalin_digitalout/main.cpp @@ -1,17 +1,9 @@ #include "test_env.h" -#if defined(TARGET_K64F) +#if defined(TARGET_FF_ARDUINO) DigitalOut out(D0); DigitalIn in(D7); -#elif defined(TARGET_KL25Z) -DigitalOut out(PTA5); -DigitalIn in(PTC6); - -#elif defined(TARGET_KL05Z) -DigitalOut out(PTB11); -DigitalIn in(PTB1); - #elif defined(TARGET_LPC1114) DigitalOut out(dp1); DigitalIn in(dp2); diff --git a/libraries/tests/mbed/digitalinout/main.cpp b/libraries/tests/mbed/digitalinout/main.cpp index 0b535f643b..30c5f5bd6b 100644 --- a/libraries/tests/mbed/digitalinout/main.cpp +++ b/libraries/tests/mbed/digitalinout/main.cpp @@ -1,17 +1,9 @@ #include "test_env.h" -#if defined(TARGET_K64F) +#if defined(TARGET_FF_ARDUINO) DigitalInOut d1(D0); DigitalInOut d2(D7); -#elif defined(TARGET_KL25Z) -DigitalInOut d1(PTA5); -DigitalInOut d2(PTC6); - -#elif defined(TARGET_KL05Z) -DigitalInOut d1(PTB11); -DigitalInOut d2(PTB1); - #elif defined(TARGET_LPC1114) DigitalInOut d1(dp1); DigitalInOut d2(dp2); diff --git a/libraries/tests/mbed/pwm/main.cpp b/libraries/tests/mbed/pwm/main.cpp index 6846c6d8ac..45b14c436d 100644 --- a/libraries/tests/mbed/pwm/main.cpp +++ b/libraries/tests/mbed/pwm/main.cpp @@ -17,8 +17,8 @@ CT32B0/MR2 p10 (P1_26) float value = 0.75; int main() { -#if defined(TARGET_K64F) || defined(TARGET_KL05Z) || defined(TARGET_KL25Z) || defined(TARGET_NUCLEO_F401RE) - PwmOut pwm(D9); +#if defined(TARGET_FF_ARDUINO) + PwmOut pwm(D5); pwm.period_ms(10); pwm.write(value); diff --git a/workspace_tools/targets.py b/workspace_tools/targets.py index c09ca6c715..18939380dc 100644 --- a/workspace_tools/targets.py +++ b/workspace_tools/targets.py @@ -115,6 +115,8 @@ class KL05Z(Target): self.supported_toolchains = ["ARM", "uARM", "GCC_ARM"] + self.supported_form_factors = ["ARDUINO"] + self.is_disk_virtual = True @@ -128,6 +130,8 @@ class KL25Z(Target): self.supported_toolchains = ["ARM", "GCC_CW_EWL", "GCC_CW_NEWLIB", "GCC_ARM"] + self.supported_form_factors = ["ARDUINO"] + self.is_disk_virtual = True @@ -141,6 +145,8 @@ class KL46Z(Target): self.supported_toolchains = ["GCC_ARM", "ARM"] + self.supported_form_factors = ["ARDUINO"] + self.is_disk_virtual = True @@ -168,6 +174,8 @@ class K64F(Target): self.macros = ["CPU_MK64FN1M0VMD12"] self.supported_toolchains = ["ARM"] + + self.supported_form_factors = ["ARDUINO"] self.is_disk_virtual = True @@ -184,6 +192,8 @@ class LPC812(Target): self.supported_toolchains = ["uARM"] + self.supported_form_factors = ["ARDUINO"] + self.is_disk_virtual = True @@ -303,6 +313,8 @@ class NUCLEO_F103RB(Target): self.extra_labels = ['STM', 'STM32F1', 'STM32F103RB'] self.supported_toolchains = ["ARM", "uARM"] + + self.supported_form_factors = ["ARDUINO", "MORPHO"] class NUCLEO_L152RE(Target): @@ -317,6 +329,8 @@ class NUCLEO_L152RE(Target): self.extra_labels = ['STM', 'STM32L1', 'STM32L152RE'] self.supported_toolchains = ["ARM", "uARM"] + + self.supported_form_factors = ["ARDUINO", "MORPHO"] class NUCLEO_F401RE(Target): @@ -331,6 +345,8 @@ class NUCLEO_F401RE(Target): self.extra_labels = ['STM', 'STM32F4', 'STM32F401RE'] self.supported_toolchains = ["ARM", "uARM", "GCC_ARM"] + + self.supported_form_factors = ["ARDUINO", "MORPHO"] class NUCLEO_F030R8(Target): @@ -345,19 +361,8 @@ class NUCLEO_F030R8(Target): self.extra_labels = ['STM', 'STM32F0', 'STM32F030R8'] self.supported_toolchains = ["ARM", "uARM"] - -class DISCO_F100RB(Target): - ONLINE_TOOLCHAIN = "uARM" - OUTPUT_NAMING = "8.3" - - def __init__(self): - Target.__init__(self) - self.core = "Cortex-M3" - - self.extra_labels = ['STM', 'STM32F1', 'STM32F100RB'] - - self.supported_toolchains = ["GCC_ARM"] + self.supported_form_factors = ["ARDUINO", "MORPHO"] class NUCLEO_F302R8(Target): @@ -372,32 +377,9 @@ class NUCLEO_F302R8(Target): self.extra_labels = ['STM', 'STM32F3', 'STM32F302R8'] self.supported_toolchains = ["ARM", "uARM"] + + self.supported_form_factors = ["ARDUINO", "MORPHO"] -class DISCO_F051R8(Target): - ONLINE_TOOLCHAIN = "uARM" - OUTPUT_NAMING = "8.3" - - def __init__(self): - Target.__init__(self) - - self.core = "Cortex-M0" - - self.extra_labels = ['STM', 'STM32F0', 'STM32F051','STM32F051R8'] - - self.supported_toolchains = ["GCC_ARM"] - -class DISCO_F407VG(Target): - ONLINE_TOOLCHAIN = "uARM" - OUTPUT_NAMING = "8.3" - - def __init__(self): - Target.__init__(self) - - self.core = "Cortex-M4F" - - self.extra_labels = ['STM', 'STM32F4', 'STM32F407','STM32F407VG'] - - self.supported_toolchains = ["GCC_ARM"] class LPC1347(Target): def __init__(self): @@ -469,6 +451,8 @@ class UBLOX_C027(Target): self.extra_labels = ['NXP', 'LPC176X'] self.supported_toolchains = ["ARM", "uARM", "GCC_ARM", "GCC_CS", "GCC_CR", "IAR"] + + self.supported_form_factors = ["ARDUINO"] class NRF51822(Target): @@ -524,6 +508,51 @@ class LPC1549(Target): self.extra_labels = ['NXP', 'LPC15XX'] self.supported_toolchains = ["uARM"] + + self.supported_form_factors = ["ARDUINO"] + + +class DISCO_F100RB(Target): + ONLINE_TOOLCHAIN = "uARM" + OUTPUT_NAMING = "8.3" + + def __init__(self): + Target.__init__(self) + + self.core = "Cortex-M3" + + self.extra_labels = ['STM', 'STM32F1', 'STM32F100RB'] + + self.supported_toolchains = ["GCC_ARM"] + + +class DISCO_F051R8(Target): + ONLINE_TOOLCHAIN = "uARM" + OUTPUT_NAMING = "8.3" + + def __init__(self): + Target.__init__(self) + + self.core = "Cortex-M0" + + self.extra_labels = ['STM', 'STM32F0', 'STM32F051','STM32F051R8'] + + self.supported_toolchains = ["GCC_ARM"] + + +class DISCO_F407VG(Target): + ONLINE_TOOLCHAIN = "uARM" + OUTPUT_NAMING = "8.3" + + def __init__(self): + Target.__init__(self) + + self.core = "Cortex-M4F" + + self.extra_labels = ['STM', 'STM32F4', 'STM32F407','STM32F407VG'] + + self.supported_toolchains = ["GCC_ARM"] + # Get a single instance for each target TARGETS = [ diff --git a/workspace_tools/toolchains/__init__.py b/workspace_tools/toolchains/__init__.py index 0e719c143e..58d6a9bdad 100644 --- a/workspace_tools/toolchains/__init__.py +++ b/workspace_tools/toolchains/__init__.py @@ -207,6 +207,8 @@ class mbedToolchain: labels = self.get_labels() self.symbols = ["TARGET_%s" % t for t in labels['TARGET']] self.symbols.extend(["TOOLCHAIN_%s" % t for t in labels['TOOLCHAIN']]) + + # Config support if self.has_config: self.symbols.append('HAVE_MBED_CONFIG_H') @@ -218,10 +220,15 @@ class mbedToolchain: self.symbols.extend(['MBED_BUILD_TIMESTAMP=%s' % self.timestamp, '__MBED__=1']) if MBED_ORG_USER: self.symbols.append('MBED_USERNAME=' + MBED_ORG_USER) - # add target's symbols + + # Add target's symbols for macro in self.target.macros: self.symbols.append(macro) + # Form factor variables + if hasattr(self.target, 'supported_form_factors'): + self.symbols.extend(["TARGET_FF_%s" % t for t in self.target.supported_form_factors]) + return self.symbols def get_labels(self):