forked from platformio/platformio-core
Merge branch 'develop' into feature/platformio-30
* develop: (21 commits) Use stable docs Version bump to 2.11.2 (issues #500, #533, #732, #731, #737, #733, #438, #722, #52, #725) Update project configuration template Use stable docs Implement firmware merging with base firmware for Nordic nRF51 development platform // Resolve #500 , Resolve #533 Fix firmware uploading to Atmel SAMD21-XPRO board using ARM mbed framework // Resolve #732 Add firmware merging process for nordicnrf51 // Issue #533, #500 Add OpenOCD as an alternative upload method for atmelsam platform // Issue #732 Sync flags parser with PlatformIO 3.0 branch // Resolve #738 Update ``udev`` rules for the new STM32F407DISCOVERY boards // Resolve #731 Add explanation about "Failed to find MSBuild toolsets directory" Add support for local "--echo" for Serial Port Monitor // Resolve #733 Update history Improve support for Microchip PIC32 development platform and ChipKIT boards // Resolve #438 Fix Project Generator for ESP8266 and ARM mbed based projects Switch to gcc-built LwIP library for espressif platform Push 2.11.2.dev2 Fix linking process for microchippic32 platfrom // Issue #438 Improve Project Generator for PlatformIO IDE (fixes incorrect linter errors)
This commit is contained in:
commit
64b8df6d81
25 files changed
+116
-112
No files matched your search
@@ -116,7 +116,7 @@ An unexpected error occurred. Further steps:
|
||||
`pip install -U platformio` command
|
||||
|
||||
* Try to find answer in FAQ Troubleshooting section
|
||||
http://docs.platformio.org/en/latest/faq.html
|
||||
http://docs.platformio.org/en/stable/faq.html
|
||||
|
||||
* Report this problem to the developers
|
||||
https://github.com/platformio/platformio/issues
|
||||
|
||||
+1
-1
@@ -50,7 +50,7 @@ DEFAULT_SETTINGS = {
|
||||
},
|
||||
"enable_telemetry": {
|
||||
"description": (
|
||||
"Telemetry service <http://docs.platformio.org/en/latest/"
|
||||
"Telemetry service <http://docs.platformio.org/en/stable/"
|
||||
"userguide/cmd_settings.html?#enable-telemetry> (Yes/No)"),
|
||||
"value": True
|
||||
},
|
||||
|
||||
@@ -145,17 +145,16 @@ def DumpIDEData(env):
|
||||
|
||||
def get_includes(env_):
|
||||
includes = []
|
||||
# includes from used frameworks and libs
|
||||
for item in env_.get("VARIANT_DIRS", []):
|
||||
if "$BUILDSRC_DIR" in item[0]:
|
||||
continue
|
||||
includes.append(env_.subst(item[1]))
|
||||
|
||||
# custom includes
|
||||
for item in env_.get("CPPPATH", []):
|
||||
if item.startswith("$BUILD_DIR"):
|
||||
continue
|
||||
includes.append(env_.subst(item))
|
||||
invardir = False
|
||||
for vardiritem in env_.get("VARIANT_DIRS", []):
|
||||
if item == vardiritem[0]:
|
||||
includes.append(env_.subst(vardiritem[1]))
|
||||
invardir = True
|
||||
break
|
||||
if not invardir:
|
||||
includes.append(env_.subst(item))
|
||||
|
||||
# installed libs
|
||||
for lb in env.GetLibBuilders():
|
||||
|
||||
@@ -190,7 +190,7 @@ include paths and build them.
|
||||
|
||||
See additional options for PlatformIO Library Dependency Finder `lib_*`:
|
||||
|
||||
http://docs.platformio.org/en/latest/projectconf.html#lib-install
|
||||
http://docs.platformio.org/en/stable/projectconf.html#lib-install
|
||||
|
||||
""")
|
||||
|
||||
@@ -201,7 +201,7 @@ def init_ci_conf(project_dir):
|
||||
with open(join(project_dir, ".travis.yml"), "w") as f:
|
||||
f.write("""# Continuous Integration (CI) is the practice, in software
|
||||
# engineering, of merging all developer working copies with a shared mainline
|
||||
# several times a day < http://docs.platformio.org/en/latest/ci/index.html >
|
||||
# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
|
||||
#
|
||||
# Documentation:
|
||||
#
|
||||
@@ -209,10 +209,10 @@ def init_ci_conf(project_dir):
|
||||
# < https://docs.travis-ci.com/user/integration/platformio/ >
|
||||
#
|
||||
# * PlatformIO integration with Travis CI
|
||||
# < http://docs.platformio.org/en/latest/ci/travis.html >
|
||||
# < http://docs.platformio.org/en/stable/ci/travis.html >
|
||||
#
|
||||
# * User Guide for `platformio ci` command
|
||||
# < http://docs.platformio.org/en/latest/userguide/cmd_ci.html >
|
||||
# < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
|
||||
#
|
||||
#
|
||||
# Please choice one of the following templates (proposed below) and uncomment
|
||||
|
||||
@@ -61,6 +61,8 @@ if int(PYSERIAL_VERSION[0]) == 3:
|
||||
help="Set initial RTS line state")
|
||||
@click.option("--dtr", default=None, type=click.Choice(["0", "1"]),
|
||||
help="Set initial DTR line state")
|
||||
@click.option("--echo", is_flag=True,
|
||||
help="Enable local echo, default=Off")
|
||||
@click.option("--encoding", default="UTF-8",
|
||||
help="Set the encoding for the serial port (e.g. hexlify, "
|
||||
"Latin1, UTF-8), default: UTF-8")
|
||||
|
||||
@@ -65,7 +65,7 @@ def cli():
|
||||
"PlatformIO has been successfully upgraded to %s" %
|
||||
actual_version, fg="green")
|
||||
click.echo("Release notes: ", nl=False)
|
||||
click.secho("http://docs.platformio.org/en/latest/history.html",
|
||||
click.secho("http://docs.platformio.org/en/stable/history.html",
|
||||
fg="cyan")
|
||||
except Exception as e: # pylint: disable=W0703
|
||||
if not r:
|
||||
|
||||
@@ -191,7 +191,7 @@ class UpgradeError(PlatformioException):
|
||||
|
||||
* Upgrade using `pip install -U platformio`
|
||||
* Try different installation/upgrading steps:
|
||||
http://docs.platformio.org/en/latest/installation.html
|
||||
http://docs.platformio.org/en/stable/installation.html
|
||||
"""
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# PlatformIO Project Configuration File
|
||||
#
|
||||
# Please check documentation with examples
|
||||
# http://docs.platformio.org/en/latest/projectconf.html
|
||||
#
|
||||
# Please make sure to read documentation with examples first
|
||||
# http://docs.platformio.org/en/stable/projectconf.html
|
||||
#
|
||||
+1
-1
@@ -228,7 +228,7 @@ def get_projectpioenvs_dir():
|
||||
with open(dontmod_path, "w") as fp:
|
||||
fp.write("""
|
||||
[InternetShortcut]
|
||||
URL=http://docs.platformio.org/en/latest/projectconf.html#envs-dir
|
||||
URL=http://docs.platformio.org/en/stable/projectconf.html#envs-dir
|
||||
""")
|
||||
return path
|
||||
|
||||
|
||||
Reference in new issue
Block a user