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

Merge pull request #2138 from ohagendorf/progen_correction 

[target.json - progen] changing a wrong config
pull/2139/head
Bogdan Marinescu 2016-07-11 12:54:22 +03:00 committed by GitHub
parent 8188684cab 4b94e726c4
commit 2d41d9b013
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hal/targets.json
View File

@ -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
},

1
requirements.txt
View File

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

2
setup.py
View File

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