From 7388b446d4613ef63b2c16d2a37eb02b5075b987 Mon Sep 17 00:00:00 2001 From: ohagendorf Date: Sun, 10 Jul 2016 20:58:35 +0200 Subject: [PATCH 1/2] [target.json - progen] changing a wrong config ARCH_MAX has a STM32F407 mcu --- hal/targets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hal/targets.json b/hal/targets.json index 1c0ead7895..5b26f4b7e4 100644 --- a/hal/targets.json +++ b/hal/targets.json @@ -1013,7 +1013,7 @@ "extra_labels": ["STM", "STM32F4", "STM32F407", "STM32F407VG"], "macros": ["LSI_VALUE=32000"], "inherits": ["Target"], - "progen": {"target": "lpc1768"}, + "progen": {"target": "arch-max"}, "device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"], "release": true }, From 4b94e726c4d853b30a98a0b65e5c2be627c92461 Mon Sep 17 00:00:00 2001 From: Olaf Hagendorf Date: Mon, 11 Jul 2016 10:55:02 +0200 Subject: [PATCH 2/2] adding project_generator_definitions to setup.py and requirements.txt --- requirements.txt | 1 + setup.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9a28e6f308..53efae0aef 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,7 @@ PrettyTable>=0.7.2 Jinja2>=2.7.3 IntelHex>=1.3 project-generator>=0.9.3,<0.10.0 +project_generator_definitions>=0.2.26,<0.3.0 junit-xml pyYAML requests diff --git a/setup.py b/setup.py index 3ff7c30d6d..c27a2a8b0e 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ setup(name='mbed-tools', url='https://github.com/mbedmicro/mbed', packages=find_packages(), license=LICENSE, - install_requires=["PrettyTable>=0.7.2", "PySerial>=2.7", "IntelHex>=1.3", "colorama>=0.3.3", "Jinja2>=2.7.3", "project-generator>=0.9.3,<0.10.0", "junit-xml", "requests", "pyYAML"]) + install_requires=["PrettyTable>=0.7.2", "PySerial>=2.7", "IntelHex>=1.3", "colorama>=0.3.3", "Jinja2>=2.7.3", "project-generator>=0.9.3,<0.10.0", "project_generator_definitions>=0.2.26,<0.3.0", "junit-xml", "requests", "pyYAML"]) # Restore previous mbed_settings if needed if backup: