Merge branch 'release/v1.2.0' into develop

This commit is contained in:
Ivan Kravets
2015-03-20 22:30:06 +02:00
3 changed files with 3 additions and 2 deletions

View File

@ -1,7 +1,7 @@
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>`__

View File

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

View File

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