ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added "supported_form_factors" list attr to targets which defines TARGET_FF_* symbols for the supported form factors. 

Unified some tests for targets that support Arduino form factor to use Arduino style pin names.
pull/252/head
Mihail Stoyanov 2014-04-04 12:24:21 +01:00
parent d456671126
commit bf9689a9b8
5 changed files with 78 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/tests/mbed/digitalin_digitalout/main.cpp
View File

@ -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);

10
libraries/tests/mbed/digitalinout/main.cpp
View File

@ -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);

4
libraries/tests/mbed/pwm/main.cpp
View File

@ -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);

101
workspace_tools/targets.py
View File

@ -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
@ -169,6 +175,8 @@ class K64F(Target):
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
@ -304,6 +314,8 @@ class NUCLEO_F103RB(Target):
self.supported_toolchains = ["ARM", "uARM"]
self.supported_form_factors = ["ARDUINO", "MORPHO"]
class NUCLEO_L152RE(Target):
ONLINE_TOOLCHAIN = "uARM"
@ -318,6 +330,8 @@ class NUCLEO_L152RE(Target):
self.supported_toolchains = ["ARM", "uARM"]
self.supported_form_factors = ["ARDUINO", "MORPHO"]
class NUCLEO_F401RE(Target):
ONLINE_TOOLCHAIN = "uARM"
@ -332,6 +346,8 @@ class NUCLEO_F401RE(Target):
self.supported_toolchains = ["ARM", "uARM", "GCC_ARM"]
self.supported_form_factors = ["ARDUINO", "MORPHO"]
class NUCLEO_F030R8(Target):
ONLINE_TOOLCHAIN = "uARM"
@ -346,18 +362,7 @@ class NUCLEO_F030R8(Target):
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):
@ -373,31 +378,8 @@ class NUCLEO_F302R8(Target):
self.supported_toolchains = ["ARM", "uARM"]
class DISCO_F051R8(Target):
ONLINE_TOOLCHAIN = "uARM"
OUTPUT_NAMING = "8.3"
self.supported_form_factors = ["ARDUINO", "MORPHO"]
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):
@ -470,6 +452,8 @@ class UBLOX_C027(Target):
self.supported_toolchains = ["ARM", "uARM", "GCC_ARM", "GCC_CS", "GCC_CR", "IAR"]
self.supported_form_factors = ["ARDUINO"]
class NRF51822(Target):
EXPECTED_SOFTDEVICE = 's110_nrf51822_6.0.0_softdevice.hex'
@ -525,6 +509,51 @@ class LPC1549(Target):
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 = [
LPC2368(),

9
workspace_tools/toolchains/__init__.py
View File

@ -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):