feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Merge branch 'release/v1.2.0' into develop

Browse Source
This commit is contained in:
Ivan Kravets
2015-03-20 22:30:06 +02:00
parent a8a9451c73 cef16ab1c0
commit b04e17ade2
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY.rst
View File

@ -1,7 +1,7 @@
Release History Release History
=============== ===============
1.2.0 (2015-03-??) 1.2.0 (2015-03-20)
------------------ ------------------
* Added full support of `mbed <http://docs.platformio.org/en/latest/frameworks/mbed.html>`__ * Added full support of `mbed <http://docs.platformio.org/en/latest/frameworks/mbed.html>`__

2
platformio/__init__.py
View File

@ -1,7 +1,7 @@
# Copyright (C) Ivan Kravets <me@ikravets.com> # Copyright (C) Ivan Kravets <me@ikravets.com>
# See LICENSE for details. # See LICENSE for details.
VERSION = (1, 2, "0.dev2") VERSION = (1, 2, 0)
__version__ = ".".join([str(s) for s in VERSION]) __version__ = ".".join([str(s) for s in VERSION])
__title__ = "platformio" __title__ = "platformio"

1
platformio/telemetry.py
View File

@ -89,6 +89,7 @@ class MeasurementProtocol(TelemetryBase):
self['cd1'] = get_systype() self['cd1'] = get_systype()
self['cd2'] = "Python/%s %s" % (platform.python_version(), self['cd2'] = "Python/%s %s" % (platform.python_version(),
platform.platform()) platform.platform())
self['cd4'] = 1 if app.get_setting("enable_prompts") else 0
def _prefill_screen_name(self): def _prefill_screen_name(self):
args = [str(s).lower() for s in sys_argv[1:]] args = [str(s).lower() for s in sys_argv[1:]]