From ba234754253f163d8227ef7fd667b3f9c95d272c Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 13 Jul 2016 11:49:52 +0300 Subject: [PATCH 01/28] Improved docs for integration with CLion IDE --- docs/ide/clion.rst | 67 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/docs/ide/clion.rst b/docs/ide/clion.rst index bbd6584a..aa0a8afa 100644 --- a/docs/ide/clion.rst +++ b/docs/ide/clion.rst @@ -43,12 +43,17 @@ command and generate project via :option:`platformio init --ide` command: Then: -1. Place source files (``*.c, *.cpp, *.h, *.ino, etc.``) to ``src`` directory +1. Place source files (``*.c, *.cpp, *.h, *.hpp``) to ``src`` directory 2. Import this project via ``Menu: File > Import Project`` and specify root directory where is located :ref:`projectconf` 3. Open source file from ``src`` directory 4. Build project (*DO NOT RUN*): ``Menu: Run > Build``. +.. warning:: + + See know issue: :ref:`ide_clion_knownissues_inopde_not_supported` and how + to resolve it. + There are 6 predefined targets for building (*NOT FOR RUNNING*, see marks on the screenshot below): @@ -68,6 +73,64 @@ the screenshot below): after generating process wont be reflected in IDE. To fix it please run ``PLATFORMIO_REBUILD_PROJECT_INDEX`` target. +Known issues +------------ + +.. _ide_clion_knownissues_inopde_not_supported: + +Arduino ``.ino`` files are not supported +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +CLion doesn't support Arduino files (``*.ino`` and ``.pde``) because they are +not valid C/C++ based source files: + +1. Missing includes such as ``#include `` +2. Function declarations are omitted. + +Convert Arduino file to C++ manually +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +For example, we have the next ``Demo.ino`` file: + +.. code-block:: cpp + + void function setup () { + someFunction(13); + } + + void function loop() { + delay(1000); + } + + void someFunction(int num) { + } + +Let's convert it to ``Demo.cpp``: + +1. Add ``#include `` at the top of the source file +2. Declare each custom function (excluding built-in, such as ``setup`` and ``loop``) + before it will be called. + +The final ``Demo.cpp``: + +.. code-block:: cpp + + #include + + void someFunction(int num); + + void function setup () { + someFunction(13); + } + + void function loop() { + delay(1000); + } + + void someFunction(int num) { + } + + Articles / Manuals ------------------ @@ -81,6 +144,6 @@ Examples -------- "Blink" Project -^^^^^^^^^^^^^^^ +~~~~~~~~~~~~~~~ Source code of `CLion "Blink" Project `_. From 4f57cc52d442eb284331bc066be07d00a60ea452 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 13 Jul 2016 11:56:20 +0300 Subject: [PATCH 02/28] Minor improvements for CLion docs --- docs/ide/clion.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/ide/clion.rst b/docs/ide/clion.rst index aa0a8afa..7a548ee8 100644 --- a/docs/ide/clion.rst +++ b/docs/ide/clion.rst @@ -81,7 +81,8 @@ Known issues Arduino ``.ino`` files are not supported ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -CLion doesn't support Arduino files (``*.ino`` and ``.pde``) because they are +CLion uses "CMake" tool for code completion and code linting. As result, it +doesn't support Arduino files (``*.ino`` and ``.pde``) because they are not valid C/C++ based source files: 1. Missing includes such as ``#include `` From 7ad8d08037fc1854177a5fdee42a4dbf57054346 Mon Sep 17 00:00:00 2001 From: Valeriy Koval Date: Mon, 18 Jul 2016 12:14:48 +0300 Subject: [PATCH 03/28] Add Pinoccio board // Issue #52 --- platformio/boards/misc.json | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/platformio/boards/misc.json b/platformio/boards/misc.json index 114e8022..0a9be48e 100644 --- a/platformio/boards/misc.json +++ b/platformio/boards/misc.json @@ -820,5 +820,27 @@ }, "url": "https://www.arduboy.com", "vendor": "Arduboy" + }, + + "pinoccio": { + "build": { + "core": "arduino", + "extra_flags": "-DARDUINO_ARCH_AVR -DARDUINO_PINOCCIO -D__PROG_TYPES_COMPAT__", + "f_cpu": "16000000L", + "mcu": "atmega256rfr2", + "variant": "pinoccio" + }, + "frameworks": ["arduino"], + "name": "Pinoccio Scout", + "platform": "atmelavr", + "upload": { + "maximum_ram_size": 32768, + "maximum_size": 253952, + "protocol": "wiring", + "require_upload_port" : true, + "speed": 115200 + }, + "url": "https://www.crowdsupply.com/pinoccio/mesh-sensor-network", + "vendor": "Pinoccio" } } From 79a4a943dc79cbfde4d576077c0525972c94de5a Mon Sep 17 00:00:00 2001 From: Valeriy Koval Date: Mon, 18 Jul 2016 14:52:25 +0300 Subject: [PATCH 04/28] Fix USB flags processing for teensy platform // Issue #722 --- platformio/builder/scripts/frameworks/arduino.py | 16 ++++++++++++++++ platformio/builder/scripts/teensy.py | 1 - 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/platformio/builder/scripts/frameworks/arduino.py b/platformio/builder/scripts/frameworks/arduino.py index 16164d8d..558852a8 100644 --- a/platformio/builder/scripts/frameworks/arduino.py +++ b/platformio/builder/scripts/frameworks/arduino.py @@ -198,6 +198,20 @@ if env.get("PLATFORM") == "teensy": "ARDUINO=10600", "TEENSYDUINO=%d" % ARDUINO_VERSION ] + + USB_FLAGS = ( + "USB_HID", + "USB_SERIAL_HID", + "USB_DISK", + "USB_DISK_SDFLASH", + "USB_MIDI", + "USB_RAWHID", + "USB_FLIGHTSIM", + "USB_DISABLED" + ) + + if not any(f in env.get("BUILD_FLAGS", []) for f in USB_FLAGS): + env.Append(CPPDEFINES=["USB_SERIAL"]) else: ARDUINO_USBDEFINES += ["ARDUINO=%d" % ARDUINO_VERSION] @@ -310,6 +324,8 @@ if BOARD_BUILDOPTS.get("core", None) == "teensy": with open(file_path, "w") as fp: fp.write(content) + env.Append(CPPPATH=[join("$PLATFORMFW_DIR", "cores")]) + # # Target: Build Core Library # diff --git a/platformio/builder/scripts/teensy.py b/platformio/builder/scripts/teensy.py index 43e293f3..c01c67e8 100644 --- a/platformio/builder/scripts/teensy.py +++ b/platformio/builder/scripts/teensy.py @@ -40,7 +40,6 @@ elif env.get("BOARD_OPTIONS", {}).get("build", {}).get("core") == "teensy3": env.Append( CPPDEFINES=[ - "USB_SERIAL", "LAYOUT_US_ENGLISH" ], From 7b8fb77250decbb2baf15c0a07cfe18a836e898c Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 18 Jul 2016 20:36:24 +0300 Subject: [PATCH 05/28] Fix broken LD Script for Element14 chipKIT Pi board // Resolve #725 Resolve #726 --- HISTORY.rst | 6 ++++++ platformio/boards/microchippic32.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/HISTORY.rst b/HISTORY.rst index 2663748b..bf969585 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -4,6 +4,12 @@ Release Notes PlatformIO 2.0 -------------- +2.11.2 (2016-??-??) +~~~~~~~~~~~~~~~~~~~ + +* Fixed broken LD Script for Element14 chipKIT Pi board + (`issue #725 `_) + 2.11.1 (2016-07-12) ~~~~~~~~~~~~~~~~~~~ diff --git a/platformio/boards/microchippic32.json b/platformio/boards/microchippic32.json index 7090d97c..0b569c03 100644 --- a/platformio/boards/microchippic32.json +++ b/platformio/boards/microchippic32.json @@ -119,7 +119,7 @@ "core": "pic32", "extra_flags": "-D_BOARD_CHIPKIT_PI_", "f_cpu": "40000000L", - "ldscript": "cchipKIT-application-32MX250F128.ld", + "ldscript": "chipKIT-application-32MX250F128.ld", "mcu": "32MX250F128B", "variant": "ChipKIT_Pi" }, From 60b3fef37afedf1f71af5545a19fc0d00c5b44ce Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 18 Jul 2016 20:39:04 +0300 Subject: [PATCH 06/28] Add support for Pinoccio Scout board // Resolve #52 --- HISTORY.rst | 2 ++ docs/frameworks/arduino.rst | 20 ++++++++++++++++++++ docs/platforms/atmelavr.rst | 20 ++++++++++++++++++++ docs/platforms/embedded_boards.rst | 20 ++++++++++++++++++++ 4 files changed, 62 insertions(+) diff --git a/HISTORY.rst b/HISTORY.rst index bf969585..30a316c9 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -7,6 +7,8 @@ PlatformIO 2.0 2.11.2 (2016-??-??) ~~~~~~~~~~~~~~~~~~~ +* Added support for Pinoccio Scout board + (`issue #52 `_) * Fixed broken LD Script for Element14 chipKIT Pi board (`issue #725 `_) diff --git a/docs/frameworks/arduino.rst b/docs/frameworks/arduino.rst index e0d9c67f..b16c12d6 100644 --- a/docs/frameworks/arduino.rst +++ b/docs/frameworks/arduino.rst @@ -1341,6 +1341,26 @@ PanStamp - 32 Kb - 4 Kb +Pinoccio +~~~~~~~~ + +.. list-table:: + :header-rows: 1 + + * - Type ``board`` + - Name + - Microcontroller + - Frequency + - Flash + - RAM + + * - ``pinoccio`` + - `Pinoccio Scout `_ + - ATMEGA256RFR2 + - 16 MHz + - 256 Kb + - 32 Kb + Punch Through ~~~~~~~~~~~~~ diff --git a/docs/platforms/atmelavr.rst b/docs/platforms/atmelavr.rst index f5ba50c1..52bcb584 100644 --- a/docs/platforms/atmelavr.rst +++ b/docs/platforms/atmelavr.rst @@ -842,6 +842,26 @@ PanStamp - 32 Kb - 2 Kb +Pinoccio +~~~~~~~~ + +.. list-table:: + :header-rows: 1 + + * - Type ``board`` + - Name + - Microcontroller + - Frequency + - Flash + - RAM + + * - ``pinoccio`` + - `Pinoccio Scout `_ + - ATMEGA256RFR2 + - 16 MHz + - 256 Kb + - 32 Kb + Punch Through ~~~~~~~~~~~~~ diff --git a/docs/platforms/embedded_boards.rst b/docs/platforms/embedded_boards.rst index f5a6a0d6..91df1475 100644 --- a/docs/platforms/embedded_boards.rst +++ b/docs/platforms/embedded_boards.rst @@ -1726,6 +1726,26 @@ PanStamp - 32 Kb - 4 Kb +Pinoccio +~~~~~~~~ + +.. list-table:: + :header-rows: 1 + + * - Type ``board`` + - Name + - Microcontroller + - Frequency + - Flash + - RAM + + * - ``pinoccio`` + - `Pinoccio Scout `_ + - ATMEGA256RFR2 + - 16 MHz + - 256 Kb + - 32 Kb + Punch Through ~~~~~~~~~~~~~ From d7fa2551662236a81df149e7a8e59395f876e586 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 18 Jul 2016 21:06:45 +0300 Subject: [PATCH 07/28] Implement Teensy 2.0 USB functionality (HID, SERIAL_HID, DISK, MIDI, etc.) // Resolve #722 --- HISTORY.rst | 3 +++ docs/platforms/teensy_extra.rst | 27 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/HISTORY.rst b/HISTORY.rst index 30a316c9..5ed2e5c9 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -9,6 +9,9 @@ PlatformIO 2.0 * Added support for Pinoccio Scout board (`issue #52 `_) +* Implemented `Teensy 2.0 USB functionality `__ + (HID, SERIAL_HID, DISK, MIDI, etc.) + (`issue #722 `_) * Fixed broken LD Script for Element14 chipKIT Pi board (`issue #725 `_) diff --git a/docs/platforms/teensy_extra.rst b/docs/platforms/teensy_extra.rst index cca6c119..f2027038 100644 --- a/docs/platforms/teensy_extra.rst +++ b/docs/platforms/teensy_extra.rst @@ -9,6 +9,33 @@ See the License for the specific language governing permissions and limitations under the License. +Teensy 2.0 and USB +------------------ + +If you want to implement USB functionality using Teensy 2.0, you need to +add special macros/define using :ref:`projectconf_build_flags`: + +* ``-D USB_HID`` +* ``-D USB_SERIAL_HID`` +* ``-D USB_DISK`` +* ``-D USB_DISK_SDFLASH`` +* ``-D USB_MIDI`` +* ``-D USB_RAWHID`` +* ``-D USB_FLIGHTSIM`` +* ``-D USB_DISABLED`` + +Example: + +.. code-block:: ini + + [env:teensy_hid_device] + platform = teensy + framework = arduino + board = teensy20 + build_flags = -D USB_RAWHID + +See `Teensy USB Examples `_. + Examples -------- From f16c05c42973b4aa462f2d53456a74b6a3603b6d Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 18 Jul 2016 22:20:04 +0300 Subject: [PATCH 08/28] Update docs for Teensy USB Features // Issue #722 --- HISTORY.rst | 4 ++-- docs/platforms/teensy_extra.rst | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 5ed2e5c9..bce24a3a 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -9,8 +9,8 @@ PlatformIO 2.0 * Added support for Pinoccio Scout board (`issue #52 `_) -* Implemented `Teensy 2.0 USB functionality `__ - (HID, SERIAL_HID, DISK, MIDI, etc.) +* Added support for `Teensy USB Features `__ + (HID, SERIAL_HID, DISK, DISK_SDFLASH, MIDI, etc.) (`issue #722 `_) * Fixed broken LD Script for Element14 chipKIT Pi board (`issue #725 `_) diff --git a/docs/platforms/teensy_extra.rst b/docs/platforms/teensy_extra.rst index f2027038..360ea86c 100644 --- a/docs/platforms/teensy_extra.rst +++ b/docs/platforms/teensy_extra.rst @@ -9,11 +9,11 @@ See the License for the specific language governing permissions and limitations under the License. -Teensy 2.0 and USB ------------------- +USB Features +------------ -If you want to implement USB functionality using Teensy 2.0, you need to -add special macros/define using :ref:`projectconf_build_flags`: +If you want to use Teensy USB Features, you need to add special +acros/define using :ref:`projectconf_build_flags`: * ``-D USB_HID`` * ``-D USB_SERIAL_HID`` From a1d9bc7ceeabdcdf35250fadac0c718bfe88d05e Mon Sep 17 00:00:00 2001 From: Valeriy Koval Date: Fri, 22 Jul 2016 16:43:02 +0300 Subject: [PATCH 09/28] Fix ElfToHex builder for microchippic32 --- platformio/builder/scripts/microchippic32.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/platformio/builder/scripts/microchippic32.py b/platformio/builder/scripts/microchippic32.py index 607baf25..0dd966f1 100644 --- a/platformio/builder/scripts/microchippic32.py +++ b/platformio/builder/scripts/microchippic32.py @@ -92,6 +92,7 @@ env.Replace( if int(env.get("BOARD_OPTIONS", {}).get( "upload", {}).get("maximum_ram_size", 0)) < 65535: env.Append( + ASFLAGS=["-G1024"], CCFLAGS=["-G1024"] ) @@ -115,15 +116,7 @@ env.Append( ), ElfToHex=Builder( - action=" ".join([ - "$OBJCOPY", - "-O", - "ihex", - "-R", - ".eeprom", - "$SOURCES", - "$TARGET"]), - suffix=".hex" + action=" ".join(["pic32-bin2hex", "-a", "$SOURCES"]), suffix=".hex" ) ) ) @@ -161,7 +154,7 @@ env.Append( if "uploadlazy" in COMMAND_LINE_TARGETS: target_firm = join("$BUILD_DIR", "firmware.hex") else: - target_firm = env.ElfToHex(join("$BUILD_DIR", "firmware"), target_elf) + target_firm = env.ElfToHex(target_elf) # # Target: Print binary size From 0b862735b293f2c7ea31bdae37fcb76b43e06f09 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 22 Jul 2016 17:23:49 +0300 Subject: [PATCH 10/28] Push 2.11.2.dev0 --- platformio/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio/__init__.py b/platformio/__init__.py index 2063af7b..b906213e 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -14,7 +14,7 @@ import sys -VERSION = (2, 11, 1) +VERSION = (2, 11, "2.dev0") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" From dfc594fc3927fc3d71d8b86ba477632a38a59191 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sat, 23 Jul 2016 23:11:50 +0300 Subject: [PATCH 11/28] Improve Project Generator for PlatformIO IDE (fixes incorrect linter errors) --- HISTORY.rst | 1 + platformio/__init__.py | 2 +- platformio/builder/tools/piomisc.py | 18 ++++++++---------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index bce24a3a..cb5f44b4 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -12,6 +12,7 @@ PlatformIO 2.0 * Added support for `Teensy USB Features `__ (HID, SERIAL_HID, DISK, DISK_SDFLASH, MIDI, etc.) (`issue #722 `_) +* Improved Project Generator for PlatformIO IDE (fixes incorrect linter errors) * Fixed broken LD Script for Element14 chipKIT Pi board (`issue #725 `_) diff --git a/platformio/__init__.py b/platformio/__init__.py index b906213e..57eaa2bd 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -14,7 +14,7 @@ import sys -VERSION = (2, 11, "2.dev0") +VERSION = (2, 11, "2.dev1") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" diff --git a/platformio/builder/tools/piomisc.py b/platformio/builder/tools/piomisc.py index 29ab41a2..0ca830f3 100644 --- a/platformio/builder/tools/piomisc.py +++ b/platformio/builder/tools/piomisc.py @@ -147,17 +147,15 @@ def DumpIDEData(env): def get_includes(env_): includes = [] - # includes from used framework 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(vardiritem[1]) + invardir = True + break + if not invardir: + includes.append(env_.subst(item)) # installed libs for d in env_.get("LIBSOURCE_DIRS", []): From 826b5180487fe1f425b7e05e09139068895dcd31 Mon Sep 17 00:00:00 2001 From: Valeriy Koval Date: Tue, 26 Jul 2016 20:11:50 +0300 Subject: [PATCH 12/28] Fix linking process for microchippic32 platfrom // Issue #438 --- platformio/builder/scripts/microchippic32.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/platformio/builder/scripts/microchippic32.py b/platformio/builder/scripts/microchippic32.py index 0dd966f1..da44457f 100644 --- a/platformio/builder/scripts/microchippic32.py +++ b/platformio/builder/scripts/microchippic32.py @@ -71,7 +71,19 @@ env.Replace( "-mprocessor=$BOARD_MCU", "-mno-peripheral-libs", "-nostartfiles", - "-Wl,--gc-sections" + "-Wl,--gc-sections", + join( + "$PLATFORMFW_DIR", + "cores", + "${BOARD_OPTIONS['build']['core']}", + "cpp-startup.S" + ), + join( + "$PLATFORMFW_DIR", + "cores", + "${BOARD_OPTIONS['build']['core']}", + "crti.S" + ) ], LIBS=["m"], From 262b12524b02f346f0348a87755f48c8cf7d9ba7 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 26 Jul 2016 20:45:00 +0300 Subject: [PATCH 13/28] Push 2.11.2.dev2 --- platformio/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio/__init__.py b/platformio/__init__.py index 57eaa2bd..4a617ace 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -14,7 +14,7 @@ import sys -VERSION = (2, 11, "2.dev1") +VERSION = (2, 11, "2.dev2") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" From 98f8c6b25afd65242c35edb9bea6c37e79974278 Mon Sep 17 00:00:00 2001 From: Valeriy Koval Date: Wed, 27 Jul 2016 14:59:00 +0300 Subject: [PATCH 14/28] Switch to gcc-built LwIP library for espressif platform --- platformio/builder/scripts/frameworks/arduino.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platformio/builder/scripts/frameworks/arduino.py b/platformio/builder/scripts/frameworks/arduino.py index 558852a8..17300c75 100644 --- a/platformio/builder/scripts/frameworks/arduino.py +++ b/platformio/builder/scripts/frameworks/arduino.py @@ -55,13 +55,14 @@ elif env.get("PLATFORM") == "timsp430": ) elif env.get("PLATFORM") == "espressif": env.Prepend( + CPPDEFINES=["LWIP_OPEN_SRC"], CPPPATH=[ join("$PLATFORMFW_DIR", "tools", "sdk", "include"), join("$PLATFORMFW_DIR", "tools", "sdk", "lwip", "include") ], LIBPATH=[join("$PLATFORMFW_DIR", "tools", "sdk", "lib")], LIBS=[ - "mesh", "wpa2", "smartconfig", "pp", "main", "wpa", "lwip", + "mesh", "wpa2", "smartconfig", "pp", "main", "wpa", "lwip_gcc", "net80211", "wps", "crypto", "phy", "hal", "axtls", "gcc", "m", "stdc++" ] From ef9e1a017081416524f216d9e6bc6fd00f061813 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 28 Jul 2016 18:44:29 +0300 Subject: [PATCH 15/28] Fix Project Generator for ESP8266 and ARM mbed based projects --- HISTORY.rst | 3 ++- platformio/builder/tools/piomisc.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index cb5f44b4..f76adc2e 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -12,7 +12,8 @@ PlatformIO 2.0 * Added support for `Teensy USB Features `__ (HID, SERIAL_HID, DISK, DISK_SDFLASH, MIDI, etc.) (`issue #722 `_) -* Improved Project Generator for PlatformIO IDE (fixes incorrect linter errors) +* Fixed Project Generator for ESP8266 and ARM mbed based projects + (resolves incorrect linter errors) * Fixed broken LD Script for Element14 chipKIT Pi board (`issue #725 `_) diff --git a/platformio/builder/tools/piomisc.py b/platformio/builder/tools/piomisc.py index 0ca830f3..b24fca21 100644 --- a/platformio/builder/tools/piomisc.py +++ b/platformio/builder/tools/piomisc.py @@ -151,7 +151,7 @@ def DumpIDEData(env): invardir = False for vardiritem in env_.get("VARIANT_DIRS", []): if item == vardiritem[0]: - includes.append(vardiritem[1]) + includes.append(env_.subst(vardiritem[1])) invardir = True break if not invardir: From c61ff611fbb7e418043f30a1f0eb1c5c153069ec Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 28 Jul 2016 18:47:20 +0300 Subject: [PATCH 16/28] Improve support for Microchip PIC32 development platform and ChipKIT boards // Resolve #438 --- HISTORY.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/HISTORY.rst b/HISTORY.rst index f76adc2e..63a57664 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -7,6 +7,8 @@ PlatformIO 2.0 2.11.2 (2016-??-??) ~~~~~~~~~~~~~~~~~~~ +* Improved support for `Microchip PIC32 `__ development platform and ChipKIT boards + (`issue #438 `_) * Added support for Pinoccio Scout board (`issue #52 `_) * Added support for `Teensy USB Features `__ From 5c53b93a49a419c3f2a52ddd1f49b11754621e23 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 28 Jul 2016 18:49:22 +0300 Subject: [PATCH 17/28] Update history --- HISTORY.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/HISTORY.rst b/HISTORY.rst index 63a57664..4ef916e6 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -14,6 +14,7 @@ PlatformIO 2.0 * Added support for `Teensy USB Features `__ (HID, SERIAL_HID, DISK, DISK_SDFLASH, MIDI, etc.) (`issue #722 `_) +* Switched to built-in GCC LwIP library for Espressif development platform * Fixed Project Generator for ESP8266 and ARM mbed based projects (resolves incorrect linter errors) * Fixed broken LD Script for Element14 chipKIT Pi board From e821a438fe0740b5362cdba1f93d5f03f3053113 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 28 Jul 2016 23:08:42 +0300 Subject: [PATCH 18/28] Add support for local "--echo" for Serial Port Monitor // Resolve #733 --- HISTORY.rst | 2 ++ docs/userguide/cmd_serialports.rst | 3 --- platformio/__init__.py | 2 +- platformio/commands/serialports.py | 2 ++ 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 4ef916e6..f7cb260c 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -15,6 +15,8 @@ PlatformIO 2.0 (HID, SERIAL_HID, DISK, DISK_SDFLASH, MIDI, etc.) (`issue #722 `_) * Switched to built-in GCC LwIP library for Espressif development platform +* Added support for local ``--echo`` for Serial Port Monitor + (`issue #733 `_) * Fixed Project Generator for ESP8266 and ARM mbed based projects (resolves incorrect linter errors) * Fixed broken LD Script for Element14 chipKIT Pi board diff --git a/docs/userguide/cmd_serialports.rst b/docs/userguide/cmd_serialports.rst index 0ba8f36a..963046b1 100644 --- a/docs/userguide/cmd_serialports.rst +++ b/docs/userguide/cmd_serialports.rst @@ -207,14 +207,11 @@ default ``20`` (DEC) Diagnostics: suppress non-error messages, default ``Off`` - .. option:: --echo Enable local echo, default ``Off`` -**REMOVED**: Is not available in Miniterm/PySerial 3.0 - .. option:: --cr diff --git a/platformio/__init__.py b/platformio/__init__.py index 4a617ace..949f6586 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -14,7 +14,7 @@ import sys -VERSION = (2, 11, "2.dev2") +VERSION = (2, 11, "2.dev3") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" diff --git a/platformio/commands/serialports.py b/platformio/commands/serialports.py index d17d98aa..19b69ddb 100644 --- a/platformio/commands/serialports.py +++ b/platformio/commands/serialports.py @@ -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") From e6d3f6bc3f65260c63179151714c5619bdc55cba Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sat, 30 Jul 2016 14:10:15 +0300 Subject: [PATCH 19/28] Add explanation about "Failed to find MSBuild toolsets directory" --- docs/ide/atom.rst | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/docs/ide/atom.rst b/docs/ide/atom.rst index f46d5a2c..f3dc6c44 100644 --- a/docs/ide/atom.rst +++ b/docs/ide/atom.rst @@ -71,9 +71,10 @@ on the "Customize" stage, otherwise ``python`` command will not be available. 2. Clang for Intelligent Code Autocompletion ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -PlatformIO IDE uses `clang `_ for the Intelligent Code Autocompletion. -To check that ``clang`` is available in your system, please open -Terminal and run ``clang --version``. If ``clang`` is not installed, then install it: +PlatformIO IDE uses `clang `_ for the Intelligent Code +Autocompletion. To check that ``clang`` is available in your system, please +open Terminal and run ``clang --version``. If ``clang`` is not installed, +then install it and restart Atom: - **Mac OS X**: `Install the latest Xcode `_ along with the latest Command Line Tools @@ -84,6 +85,12 @@ Terminal and run ``clang --version``. If ``clang`` is not installed, then instal .. image:: ../_static/clang-installer-add-path.png + .. warning:: + If you see ``Failed to find MSBuild toolsets directory`` error in + the installation console, please ignore it and press any key to close + this window. PlatformIO IDE uses only Clang completion engine that + should work after it without any problems. + - **Linux**: Using package managers: ``apt-get install clang`` or ``yum install clang``. - **Other Systems**: Download the latest `Clang for the other systems `_. From 4c10c859374c221c05025957da2cf4fbf4dc5e70 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sun, 31 Jul 2016 20:21:55 +0300 Subject: [PATCH 20/28] Update ``udev`` rules for the new STM32F407DISCOVERY boards // Resolve #731 --- HISTORY.rst | 2 ++ scripts/99-platformio-udev.rules | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/HISTORY.rst b/HISTORY.rst index f7cb260c..92091fe1 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -17,6 +17,8 @@ PlatformIO 2.0 * Switched to built-in GCC LwIP library for Espressif development platform * Added support for local ``--echo`` for Serial Port Monitor (`issue #733 `_) +* Updated ``udev`` rules for the new STM32F407DISCOVERY boards + (`issue #731 `_) * Fixed Project Generator for ESP8266 and ARM mbed based projects (resolves incorrect linter errors) * Fixed broken LD Script for Element14 chipKIT Pi board diff --git a/scripts/99-platformio-udev.rules b/scripts/99-platformio-udev.rules index 340e723b..ac52af74 100644 --- a/scripts/99-platformio-udev.rules +++ b/scripts/99-platformio-udev.rules @@ -60,7 +60,7 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="16d0", ATTRS{idProduct}=="0753", MODE:="066 KERNEL=="ttyACM*", ATTRS{idVendor}=="16d0", ATTRS{idProduct}=="0753", MODE:="0666", ENV{ID_MM_DEVICE_IGNORE}="1" # STM32 discovery boards, with onboard st/linkv2 -SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE:="0666" +SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374?", MODE:="0666" # USBtiny SUBSYSTEMS=="usb", ATTRS{idProduct}=="0c9f", ATTRS{idVendor}=="1781", MODE="0666" From df0373c4fab3e716214c869158f13d7d9198e355 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sun, 31 Jul 2016 20:49:59 +0300 Subject: [PATCH 21/28] Sync flags parser with PlatformIO 3.0 branch // Resolve #738 --- platformio/builder/tools/platformio.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py index c9758fa1..a10f7cf1 100644 --- a/platformio/builder/tools/platformio.py +++ b/platformio/builder/tools/platformio.py @@ -115,6 +115,8 @@ def BuildProgram(env): def ProcessFlags(env, flags): if not flags: return + if isinstance(flags, list): + flags = " ".join(flags) parsed_flags = env.ParseFlags(str(flags)) for flag in parsed_flags.pop("CPPDEFINES"): if not isinstance(flag, list): @@ -148,14 +150,16 @@ def ProcessFlags(env, flags): def ProcessUnFlags(env, flags): if not flags: return - parsed_flags = env.ParseFlags(flags) + if isinstance(flags, list): + flags = " ".join(flags) + parsed_flags = env.ParseFlags(str(flags)) all_flags = [] for items in parsed_flags.values(): all_flags.extend(items) all_flags = set(all_flags) for key in parsed_flags: - cur_flags = set(env.get(key, [])) + cur_flags = set(env.Flatten(env.get(key, []))) for item in cur_flags & all_flags: while item in env[key]: env[key].remove(item) From ca2adbac13b3e41e76585a73e7cb88de6f0c5f6b Mon Sep 17 00:00:00 2001 From: Valeriy Koval Date: Tue, 2 Aug 2016 14:07:12 +0300 Subject: [PATCH 22/28] Add OpenOCD as an alternative upload method for atmelsam platform // Issue #732 --- platformio/boards/arduino.json | 9 +++++- platformio/boards/atmelsam.json | 12 +++++++ platformio/builder/scripts/atmelsam.py | 45 ++++++++++++++------------ 3 files changed, 44 insertions(+), 22 deletions(-) diff --git a/platformio/boards/arduino.json b/platformio/boards/arduino.json index 45c2ffef..99ab8a54 100644 --- a/platformio/boards/arduino.json +++ b/platformio/boards/arduino.json @@ -881,6 +881,9 @@ "frameworks": ["arduino"], "name": "Arduino Zero (Programming Port)", "platform": "atmelsam", + "debug": { + "openocdcfg": "arduino_zero.cfg" + }, "upload": { "disable_flushing": true, "maximum_ram_size": 32768, @@ -888,7 +891,8 @@ "protocol": "openocd", "require_upload_port" : false, "use_1200bps_touch": false, - "wait_for_upload_port": false + "wait_for_upload_port": false, + "section_start": "0x2000" }, "url": "https://www.arduino.cc/en/Main/ArduinoBoardZero", "vendor": "Arduino" @@ -974,6 +978,9 @@ "frameworks": ["arduino"], "name": "Arduino M0 Pro (Programming Port)", "platform": "atmelsam", + "debug": { + "openocdcfg": "arduino_zero_org.cfg" + }, "upload": { "disable_flushing": true, "maximum_ram_size": 32768, diff --git a/platformio/boards/atmelsam.json b/platformio/boards/atmelsam.json index bb2561ee..fc956996 100644 --- a/platformio/boards/atmelsam.json +++ b/platformio/boards/atmelsam.json @@ -8,7 +8,11 @@ "frameworks": ["mbed"], "name": "Atmel ATSAMR21-XPRO", "platform": "atmelsam", + "debug": { + "openocdcfg": "atmel_samr21_xplained_pro.cfg" + }, "upload": { + "protocol": "openocd", "maximum_ram_size": 32768, "maximum_size": 262144 }, @@ -24,7 +28,11 @@ "frameworks": ["mbed"], "name": "Atmel SAML21-XPRO-B", "platform": "atmelsam", + "debug": { + "openocdcfg": "atmel_saml21_xplained_pro.cfg" + }, "upload": { + "protocol": "openocd", "maximum_ram_size": 32768, "maximum_size": 262144 }, @@ -40,7 +48,11 @@ "frameworks": ["mbed"], "name": "Atmel SAMD21-XPRO", "platform": "atmelsam", + "debug": { + "openocdcfg": "atmel_samd21_xplained_pro.cfg" + }, "upload": { + "protocol": "openocd", "maximum_ram_size": 32768, "maximum_size": 262144 }, diff --git a/platformio/builder/scripts/atmelsam.py b/platformio/builder/scripts/atmelsam.py index 26009472..d4b25a46 100644 --- a/platformio/builder/scripts/atmelsam.py +++ b/platformio/builder/scripts/atmelsam.py @@ -122,32 +122,35 @@ if upload_protocol == "openocd": UPLOADER=join("$PIOPACKAGES_DIR", "tool-openocd", "bin", "openocd"), UPLOADERFLAGS=[ "-d2", - "-s", join( - "$PIOPACKAGES_DIR", - "tool-openocd", - "share", - "openocd", - "scripts" - ), - - "-f", join( - "$PLATFORMFW_DIR", - "variants", - "${BOARD_OPTIONS['build']['variant']}", - "openocd_scripts", - "${BOARD_OPTIONS['build']['variant']}.cfg" - ), - - "-c", "\"telnet_port", "disabled;", - "program", "{{$SOURCES}}", - "verify", "reset", - "%s;" % user_code_section if user_code_section else "0x2000", - "shutdown\"" + "-f", join(BOARD_OPTIONS.get("debug", {}).get("openocdcfg", "")), + "-s", join("$PIOPACKAGES_DIR", "tool-openocd", + "share", "openocd", "scripts"), + "-s", join("$PIOPACKAGES_DIR", "tool-openocd", + "share", "openocd", "scripts", "board") ], UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS' ) + if "zero" in env.subst("$BOARD"): + env.Append( + UPLOADERFLAGS=[ + "-s", join("$PLATFORMFW_DIR", "variants", + "${BOARD_OPTIONS['build']['variant']}", + "openocd_scripts") + ] + ) + + env.Append( + UPLOADERFLAGS=[ + "-c", "\"telnet_port", "disabled;", + "program", "{{$SOURCES}}", + "verify", "reset", + "%s;" % user_code_section if user_code_section else "", + "shutdown\"" + ] + ) + elif upload_protocol == "sam-ba": board_type = env.subst("$BOARD") From a588e88fec179ca7d090d245c78d70851c0d3898 Mon Sep 17 00:00:00 2001 From: Valeriy Koval Date: Tue, 2 Aug 2016 17:32:48 +0300 Subject: [PATCH 23/28] Add firmware merging process for nordicnrf51 // Issue #533, #500 --- platformio/builder/scripts/frameworks/mbed.py | 36 +++++++++++++++++++ platformio/builder/scripts/nordicnrf51.py | 29 +++++++++++++-- platformio/platforms/base.py | 3 ++ platformio/platforms/nordicnrf51.py | 4 +++ 4 files changed, 70 insertions(+), 2 deletions(-) diff --git a/platformio/builder/scripts/frameworks/mbed.py b/platformio/builder/scripts/frameworks/mbed.py index 16503122..76aca7fa 100644 --- a/platformio/builder/scripts/frameworks/mbed.py +++ b/platformio/builder/scripts/frameworks/mbed.py @@ -28,6 +28,7 @@ http://mbed.org/ from __future__ import print_function +import json import re import sys import xml.etree.ElementTree as ElementTree @@ -251,6 +252,37 @@ eixdata = parse_eix_file( build_flags = get_build_flags(eixdata) variant_dir = join("$PLATFORMFW_DIR", "variant", variant) + +def _find_soft_device_hex(): + + if not isfile(join(env.subst("$PLATFORMFW_DIR"), "targets.json")): + return None + + with open(join(env.subst("$PLATFORMFW_DIR"), "targets.json")) as fp: + data = json.load(fp) + + def _find_hex(target_name): + assert isinstance(data, dict) + if target_name not in data: + return None + target = data[target_name] + if "EXPECTED_SOFTDEVICES_WITH_OFFSETS" not in target: + try: + return _find_hex(target.get("inherits", [])[0]) + except IndexError: + return None + else: + return target['EXPECTED_SOFTDEVICES_WITH_OFFSETS'][0]['name'] + + softdevice_name = _find_hex(variant) + if softdevice_name: + for root, _, files in walk(env.subst(variant_dir)): + if softdevice_name in files: + return join(root, softdevice_name) + + env.Exit("Error: Cannot find SoftDevice binary file for your board!") + + env.Replace( _mbed_whole_archive_hook=_mbed_whole_archive_hook, _LIBFLAGS="${_mbed_whole_archive_hook(%s)}" % env.get("_LIBFLAGS")[2:-1], @@ -263,6 +295,10 @@ env.Replace( join(variant_dir, eixdata.get("LDSCRIPT_PATH")[0])) ) + +if env.get("PLATFORM") == "nordicnrf51": + env.Append(SOFTDEVICEHEX=_find_soft_device_hex()) + # restore external build flags env.ProcessFlags( env.get("BOARD_OPTIONS", {}).get("build", {}).get("extra_flags")) diff --git a/platformio/builder/scripts/nordicnrf51.py b/platformio/builder/scripts/nordicnrf51.py index 99f96614..ae4626c1 100644 --- a/platformio/builder/scripts/nordicnrf51.py +++ b/platformio/builder/scripts/nordicnrf51.py @@ -18,7 +18,7 @@ from os.path import join -from SCons.Script import (COMMAND_LINE_TARGETS, AlwaysBuild, Default, +from SCons.Script import (COMMAND_LINE_TARGETS, AlwaysBuild, Builder, Default, DefaultEnvironment, SConscript) env = DefaultEnvironment() @@ -35,6 +35,25 @@ if env.subst("$BOARD") == "rfduino": UPLOADERFLAGS=["-q", '"$UPLOAD_PORT"'], UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS $SOURCES' ) +else: + env.Append( + BUILDERS=dict( + MergeHex=Builder( + action=" ".join([ + join("$PIOPACKAGES_DIR", "tool-sreccat", "srec_cat"), + "$SOFTDEVICEHEX", + "-intel", + "$SOURCES", + "-intel", + "-o", + "$TARGET", + "-intel", + "--line-length=44" + ]), + suffix=".hex" + ) + ) + ) # # Target: Build executable and linkable firmware @@ -49,7 +68,13 @@ target_elf = env.BuildProgram() if "uploadlazy" in COMMAND_LINE_TARGETS: target_firm = join("$BUILD_DIR", "firmware.hex") else: - target_firm = env.ElfToHex(join("$BUILD_DIR", "firmware"), target_elf) + if env.subst("$BOARD") == "rfduino": + target_firm = env.ElfToHex(join("$BUILD_DIR", "firmware"), target_elf) + else: + target_firm = env.MergeHex( + join("$BUILD_DIR", "firmware"), + env.ElfToHex(join("$BUILD_DIR", "userfirmware"), target_elf) + ) # # Target: Print binary size diff --git a/platformio/platforms/base.py b/platformio/platforms/base.py index 5566f37b..ba97cbe6 100644 --- a/platformio/platforms/base.py +++ b/platformio/platforms/base.py @@ -181,6 +181,9 @@ PLATFORM_PACKAGES = { ], "tool-arduino101load": [ ("Genuino101 uploader", "https://github.com/01org/intel-arduino-tools") + ], + "tool-sreccat": [ + ("Merging tool", "https://github.com/marcows/SRecord") ] } diff --git a/platformio/platforms/nordicnrf51.py b/platformio/platforms/nordicnrf51.py index b68e240b..32a0d054 100644 --- a/platformio/platforms/nordicnrf51.py +++ b/platformio/platforms/nordicnrf51.py @@ -43,6 +43,10 @@ class Nordicnrf51Platform(BasePlatform): "alias": "framework" }, + "tool-sreccat": { + "default": True + }, + "tool-rfdloader": { } } From 855c28d95689c1d4cc84579a114b784810853390 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 2 Aug 2016 21:02:39 +0300 Subject: [PATCH 24/28] Fix firmware uploading to Atmel SAMD21-XPRO board using ARM mbed framework // Resolve #732 --- HISTORY.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/HISTORY.rst b/HISTORY.rst index 92091fe1..fef30cf6 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -23,6 +23,8 @@ PlatformIO 2.0 (resolves incorrect linter errors) * Fixed broken LD Script for Element14 chipKIT Pi board (`issue #725 `_) +* Fixed firmware uploading to Atmel SAMD21-XPRO board using ARM mbed framework + (`issue #732 `_) 2.11.1 (2016-07-12) ~~~~~~~~~~~~~~~~~~~ From 9d1128af51b7706c7c43d06850d3363864270885 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 2 Aug 2016 21:06:50 +0300 Subject: [PATCH 25/28] Implement firmware merging with base firmware for Nordic nRF51 development platform // Resolve #500 , Resolve #533 --- HISTORY.rst | 3 +++ docs/platforms/creating_platform.rst | 3 +++ docs/platforms/nordicnrf51.rst | 3 +++ 3 files changed, 9 insertions(+) diff --git a/HISTORY.rst b/HISTORY.rst index fef30cf6..69caccf1 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -19,6 +19,9 @@ PlatformIO 2.0 (`issue #733 `_) * Updated ``udev`` rules for the new STM32F407DISCOVERY boards (`issue #731 `_) +* Implemented firmware merging with base firmware for Nordic nRF51 development platform + (`issue #500 `_, + `issue #533 `_) * Fixed Project Generator for ESP8266 and ARM mbed based projects (resolves incorrect linter errors) * Fixed broken LD Script for Element14 chipKIT Pi board diff --git a/docs/platforms/creating_platform.rst b/docs/platforms/creating_platform.rst index 913fb40d..09e11695 100644 --- a/docs/platforms/creating_platform.rst +++ b/docs/platforms/creating_platform.rst @@ -143,6 +143,9 @@ Packages * - ``tool-scons`` - `SCons software construction tool `_ + * - ``tool-sreccat`` + - `Merging tool `_ + * - ``tool-stlink`` - `ST-Link `_ diff --git a/docs/platforms/nordicnrf51.rst b/docs/platforms/nordicnrf51.rst index 4c4d65fe..fff500b3 100644 --- a/docs/platforms/nordicnrf51.rst +++ b/docs/platforms/nordicnrf51.rst @@ -37,6 +37,9 @@ Packages * - ``toolchain-gccarmnoneeabi`` - `gcc-arm-embedded `_, `GDB `_ + * - ``tool-sreccat`` + - `Merging tool `_ + * - ``framework-arduinonordicnrf51`` - `Arduino Wiring-based Framework (RFduino Core) `_ From 4f2c207bb32ebfb146e98d356f0ebb2b254553c7 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 2 Aug 2016 21:13:58 +0300 Subject: [PATCH 26/28] Use stable docs --- docs/ide/atom.rst | 30 +++++++++++++++--------------- docs/ide/clion.rst | 2 +- docs/ide/codeblocks.rst | 10 +++++----- docs/ide/eclipse.rst | 2 +- docs/ide/emacs.rst | 2 +- docs/ide/netbeans.rst | 2 +- docs/ide/qtcreator.rst | 16 ++++++++-------- docs/ide/sublimetext.rst | 2 +- docs/ide/visualstudio.rst | 6 +++--- docs/quickstart.rst | 2 +- platformio/__main__.py | 2 +- platformio/app.py | 2 +- platformio/commands/init.py | 8 ++++---- platformio/commands/lib.py | 2 +- platformio/commands/upgrade.py | 2 +- platformio/exception.py | 2 +- platformio/maintenance.py | 2 +- platformio/projectconftpl.ini | 2 +- platformio/util.py | 2 +- 19 files changed, 49 insertions(+), 49 deletions(-) diff --git a/docs/ide/atom.rst b/docs/ide/atom.rst index f3dc6c44..09c6692c 100644 --- a/docs/ide/atom.rst +++ b/docs/ide/atom.rst @@ -37,7 +37,7 @@ can customize to do anything but also use productively without ever touching a config file. .. image:: ../_static/ide-atom-platformio.png - :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio.png + :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio.png .. contents:: @@ -144,30 +144,30 @@ Setting Up the Project the corresponding icon in the PlatformIO toolbar as shown in the image below: .. image:: ../_static/ide-atom-platformio-quick-start-1.png - :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-1.png + :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-1.png 2. In the "New Project Menu" choose desired boards (more than one board is allowed) and select a project directory. Then press "Initialize" button: .. image:: ../_static/ide-atom-platformio-quick-start-2.png - :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-2.png + :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-2.png 3. If everything is fine, you should see the success message and project tree in the left panel: .. image:: ../_static/ide-atom-platformio-quick-start-3.png - :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-3.png + :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-3.png 4. Now, let's create the first project source file: right-click on the folder ``src`` and choose ``New File``: .. image:: ../_static/ide-atom-platformio-quick-start-4.png - :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-4.png + :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-4.png Enter filename ``main.cpp``: .. image:: ../_static/ide-atom-platformio-quick-start-5.png - :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-5.png + :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-5.png Copy the next source code to the just created file ``main.cpp``: @@ -209,13 +209,13 @@ upload firmware, run other targets) using: - :ref:`ide_atom_building_targets` and hotkeys .. image:: ../_static/ide-atom-platformio-quick-start-6.png - :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-6.png + :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-6.png 5. Run ``Build`` and you should see green "success" result in the building panel: .. image:: ../_static/ide-atom-platformio-quick-start-7.png - :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-7.png + :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-7.png To upload firmware to the board run ``Upload``. @@ -224,39 +224,39 @@ To upload firmware to the board run ``Upload``. or call targets list from the status bar (bottom, left corner): .. image:: ../_static/ide-atom-platformio-quick-start-8.png - :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-8.png + :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-8.png And select desired target: .. image:: ../_static/ide-atom-platformio-quick-start-9.png - :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-9.png + :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-9.png 7. To run built-in terminal interface choose ``Menu: PlatformIO > Terminal`` or press the corresponding icon in the PlatformIO toolbar: .. image:: ../_static/ide-atom-platformio-quick-start-10.png - :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-10.png + :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-10.png It provides you fast access to all set of powerful PlatformIO CLI commands: .. image:: ../_static/ide-atom-platformio-quick-start-11.png - :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-11.png + :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-11.png 8. To run built-in "Serial Monitor" choose ``Menu: PlatformIO > Serial Monitor`` or press the corresponding icon in the PlatformIO toolbar: .. image:: ../_static/ide-atom-platformio-quick-start-12.png - :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-12.png + :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-12.png It has several settings to adjust your connection: .. image:: ../_static/ide-atom-platformio-quick-start-13.png - :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-13.png + :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-13.png And allows you to communicate with your board in an easy way: .. image:: ../_static/ide-atom-platformio-quick-start-14.png - :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-14.png + :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-14.png User Guide diff --git a/docs/ide/clion.rst b/docs/ide/clion.rst index 7a548ee8..387dad92 100644 --- a/docs/ide/clion.rst +++ b/docs/ide/clion.rst @@ -24,7 +24,7 @@ Refer to the `CLion Documentation `_. .. image:: ../_static/ide-platformio-codeblocks.png - :target: http://docs.platformio.org/en/latest/_images/ide-platformio-codeblocks.png + :target: http://docs.platformio.org/en/stable/_images/ide-platformio-codeblocks.png .. contents:: diff --git a/docs/ide/eclipse.rst b/docs/ide/eclipse.rst index 2ef869f8..6f889b6b 100644 --- a/docs/ide/eclipse.rst +++ b/docs/ide/eclipse.rst @@ -28,7 +28,7 @@ Refer to the `CDT Documentation `_ page for more detailed information. .. image:: ../_static/ide-platformio-eclipse.png - :target: http://docs.platformio.org/en/latest/_static/ide-platformio-eclipse.png + :target: http://docs.platformio.org/en/stable/_static/ide-platformio-eclipse.png .. contents:: diff --git a/docs/ide/emacs.rst b/docs/ide/emacs.rst index 4a153c86..ef402dfb 100644 --- a/docs/ide/emacs.rst +++ b/docs/ide/emacs.rst @@ -23,7 +23,7 @@ Refer to the `Emacs Documentation ` page for more detailed information. .. image:: ../_static/ide-platformio-emacs.png - :target: http://docs.platformio.org/en/latest/_static/ide-platformio-emacs.png + :target: http://docs.platformio.org/en/stable/_static/ide-platformio-emacs.png .. contents:: diff --git a/docs/ide/netbeans.rst b/docs/ide/netbeans.rst index 6cba0b76..432ddb26 100644 --- a/docs/ide/netbeans.rst +++ b/docs/ide/netbeans.rst @@ -26,7 +26,7 @@ Just make sure you download the C/C++ version (or if you already use NetBeans, install the C/C++ development plugins). .. image:: ../_static/ide-platformio-netbeans.png - :target: http://docs.platformio.org/en/latest/_images/ide-platformio-netbeans.png + :target: http://docs.platformio.org/en/stable/_images/ide-platformio-netbeans.png .. contents:: diff --git a/docs/ide/qtcreator.rst b/docs/ide/qtcreator.rst index 79baddc6..83d3c259 100644 --- a/docs/ide/qtcreator.rst +++ b/docs/ide/qtcreator.rst @@ -20,7 +20,7 @@ Refer to the `Qt-creator Manual `_ page for more detailed information. .. image:: ../_static/ide-platformio-qtcreator-7.png - :target: http://docs.platformio.org/en/latest/_static/ide-platformio-qtcreator-7.png + :target: http://docs.platformio.org/en/stable/_static/ide-platformio-qtcreator-7.png .. contents:: @@ -83,7 +83,7 @@ Then: 8. Build project: ``Menu: Build > Build All``. .. image:: ../_static/ide-platformio-qtcreator-3.png - :target: http://docs.platformio.org/en/latest/_static/ide-platformio-qtcreator-3.png + :target: http://docs.platformio.org/en/stable/_static/ide-platformio-qtcreator-3.png .. warning:: The libraries which are added, installed or used in the project @@ -99,7 +99,7 @@ Setup New Project First of all, let's create new project from Qt Creator Start Page: ``New Project`` or using ``Menu: File > New File or Project``, then select project with ``Empty Qt Project`` type (``Other Project > Empty Qt Project``), fill ``Name``, ``Create in``. .. image:: ../_static/ide-platformio-qtcreator-1.png - :target: http://docs.platformio.org/en/latest/_static/ide-platformio-qtcreator-1.png + :target: http://docs.platformio.org/en/stable/_static/ide-platformio-qtcreator-1.png On the next steps select any available kit and click Finish button. @@ -108,7 +108,7 @@ On the next steps select any available kit and click Finish button. Secondly, we need to delete default build and clean steps and configure project with PlatformIO Build System (click on Projects label on left menu or ``Ctrl+5`` shortcut): .. image:: ../_static/ide-platformio-qtcreator-3.png - :target: http://docs.platformio.org/en/latest/_static/ide-platformio-qtcreator-3.png + :target: http://docs.platformio.org/en/stable/_static/ide-platformio-qtcreator-3.png Thirdly, change project file by adding path to directories with header files. Please edit project file to match the following contents: @@ -125,7 +125,7 @@ Thirdly, change project file by adding path to directories with header files. Pl INCLUDEPATH += "$${HOMEDIR}/.platformio/packages/toolchain-atmelavr/avr/include" .. image:: ../_static/ide-platformio-qtcreator-4.png - :target: http://docs.platformio.org/en/latest/_static/ide-platformio-qtcreator-4.png + :target: http://docs.platformio.org/en/stable/_static/ide-platformio-qtcreator-4.png First program in Qt Creator ~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -136,7 +136,7 @@ Simple "Blink" project will consist from two files: Let's create new text file named ``main.c`` using ``Menu: New File or Project > General > Text File``: .. image:: ../_static/ide-platformio-qtcreator-5.png - :target: http://docs.platformio.org/en/latest/_static/ide-platformio-qtcreator-5.png + :target: http://docs.platformio.org/en/stable/_static/ide-platformio-qtcreator-5.png Copy the source code which is described below to file ``main.c``. @@ -161,7 +161,7 @@ Copy the source code which is described below to file ``main.c``. 3. Locate the project configuration file named ``platformio.ini`` at the root of the project directory and open it. .. image:: ../_static/ide-platformio-qtcreator-6.png - :target: http://docs.platformio.org/en/latest/_static/ide-platformio-qtcreator-6.png + :target: http://docs.platformio.org/en/stable/_static/ide-platformio-qtcreator-6.png Edit the content to match the code described below. @@ -171,7 +171,7 @@ Edit the content to match the code described below. # Project Configuration File # # A detailed documentation with the EXAMPLES is located here: - # http://docs.platformio.org/en/latest/projectconf.html + # http://docs.platformio.org/en/stable/projectconf.html # # A sign `#` at the beginning of the line indicates a comment diff --git a/docs/ide/sublimetext.rst b/docs/ide/sublimetext.rst index 42d64bf4..78ae3292 100644 --- a/docs/ide/sublimetext.rst +++ b/docs/ide/sublimetext.rst @@ -170,7 +170,7 @@ Copy the source code which is described below to it. # Project Configuration File # # A detailed documentation with the EXAMPLES is located here: - # http://docs.platformio.org/en/latest/projectconf.html + # http://docs.platformio.org/en/stable/projectconf.html # # A sign `#` at the beginning of the line indicates a comment diff --git a/docs/ide/visualstudio.rst b/docs/ide/visualstudio.rst index 8d70dfbe..8bb5f1bf 100644 --- a/docs/ide/visualstudio.rst +++ b/docs/ide/visualstudio.rst @@ -20,7 +20,7 @@ Refer to the `Visual Studio Documentation `_ .. image:: ../_static/ide-vs-platformio-newproject-9.png - :target: http://docs.platformio.org/en/latest/_static/ide-vs-platformio-newproject-9.png + :target: http://docs.platformio.org/en/stable/_static/ide-vs-platformio-newproject-9.png diff --git a/docs/quickstart.rst b/docs/quickstart.rst index 3b2d0c24..239586e0 100644 --- a/docs/quickstart.rst +++ b/docs/quickstart.rst @@ -150,7 +150,7 @@ The result of just generated ``platformio.ini``: # Project Configuration File # # A detailed documentation with the EXAMPLES is located here: - # http://docs.platformio.org/en/latest/projectconf.html + # http://docs.platformio.org/en/stable/projectconf.html # # A sign `#` at the beginning of the line indicates a comment diff --git a/platformio/__main__.py b/platformio/__main__.py index c553e8f6..d6ade4d6 100644 --- a/platformio/__main__.py +++ b/platformio/__main__.py @@ -122,7 +122,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 diff --git a/platformio/app.py b/platformio/app.py index f7fcce2a..20f2f55e 100644 --- a/platformio/app.py +++ b/platformio/app.py @@ -46,7 +46,7 @@ DEFAULT_SETTINGS = { }, "enable_telemetry": { "description": ( - "Telemetry service (Yes/No)"), "value": True }, diff --git a/platformio/commands/init.py b/platformio/commands/init.py index 550e839c..6a9e964c 100644 --- a/platformio/commands/init.py +++ b/platformio/commands/init.py @@ -186,7 +186,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 """) @@ -197,7 +197,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: # @@ -205,10 +205,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 diff --git a/platformio/commands/lib.py b/platformio/commands/lib.py index bbf8bb09..b48b23dc 100644 --- a/platformio/commands/lib.py +++ b/platformio/commands/lib.py @@ -90,7 +90,7 @@ def lib_search(query, json_output, page, **filters): click.echo("For more examples and advanced search syntax, " "please use documentation:") click.secho("http://docs.platformio.org" - "/en/latest/userguide/lib/cmd_search.html\n", fg="cyan") + "/en/stable/userguide/lib/cmd_search.html\n", fg="cyan") return click.secho("Found %d libraries:\n" % result['total'], diff --git a/platformio/commands/upgrade.py b/platformio/commands/upgrade.py index 44e3b8ea..24676bf1 100644 --- a/platformio/commands/upgrade.py +++ b/platformio/commands/upgrade.py @@ -70,7 +70,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: diff --git a/platformio/exception.py b/platformio/exception.py index 78059eb2..07fa0248 100644 --- a/platformio/exception.py +++ b/platformio/exception.py @@ -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 """ diff --git a/platformio/maintenance.py b/platformio/maintenance.py index d2e944eb..4832793d 100644 --- a/platformio/maintenance.py +++ b/platformio/maintenance.py @@ -217,7 +217,7 @@ def check_platformio_upgrade(): click.secho("pip install -U platformio", fg="cyan", nl=False) click.secho("` command.", fg="yellow") click.secho("Changes: ", fg="yellow", nl=False) - click.secho("http://docs.platformio.org/en/latest/history.html", + click.secho("http://docs.platformio.org/en/stable/history.html", fg="cyan") click.echo("*" * terminal_width) click.echo("") diff --git a/platformio/projectconftpl.ini b/platformio/projectconftpl.ini index da48cf88..fd754591 100644 --- a/platformio/projectconftpl.ini +++ b/platformio/projectconftpl.ini @@ -2,7 +2,7 @@ # Project Configuration File # # A detailed documentation with the EXAMPLES is located here: -# http://docs.platformio.org/en/latest/projectconf.html +# http://docs.platformio.org/en/stable/projectconf.html # # A sign `#` at the beginning of the line indicates a comment diff --git a/platformio/util.py b/platformio/util.py index 727c9957..f5e96b20 100644 --- a/platformio/util.py +++ b/platformio/util.py @@ -224,7 +224,7 @@ def get_pioenvs_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 From 0b0064afd02a193afed0f32c324e990bc5365cab Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 2 Aug 2016 21:21:08 +0300 Subject: [PATCH 27/28] Update project configuration template --- docs/ide/qtcreator.rst | 7 ++----- docs/ide/sublimetext.rst | 7 ++----- docs/ide/visualstudio.rst | 7 ++----- docs/quickstart.rst | 16 ++-------------- platformio/projectconftpl.ini | 18 +++--------------- 5 files changed, 11 insertions(+), 44 deletions(-) diff --git a/docs/ide/qtcreator.rst b/docs/ide/qtcreator.rst index 83d3c259..a84c8875 100644 --- a/docs/ide/qtcreator.rst +++ b/docs/ide/qtcreator.rst @@ -168,15 +168,12 @@ Edit the content to match the code described below. .. code-block:: none # - # Project Configuration File + # PlatformIO Project Configuration File # - # A detailed documentation with the EXAMPLES is located here: + # Please make sure to read documentation with examples first # http://docs.platformio.org/en/stable/projectconf.html # - # A sign `#` at the beginning of the line indicates a comment - # Comment lines are ignored. - [env:arduino_uno] platform = atmelavr framework = arduino diff --git a/docs/ide/sublimetext.rst b/docs/ide/sublimetext.rst index 78ae3292..feaa5f3a 100644 --- a/docs/ide/sublimetext.rst +++ b/docs/ide/sublimetext.rst @@ -167,15 +167,12 @@ Copy the source code which is described below to it. .. code-block:: none # - # Project Configuration File + # PlatformIO Project Configuration File # - # A detailed documentation with the EXAMPLES is located here: + # Please make sure to read documentation with examples first # http://docs.platformio.org/en/stable/projectconf.html # - # A sign `#` at the beginning of the line indicates a comment - # Comment lines are ignored. - [env:arduino_uno] platform = atmelavr framework = arduino diff --git a/docs/ide/visualstudio.rst b/docs/ide/visualstudio.rst index 8bb5f1bf..e7008e92 100644 --- a/docs/ide/visualstudio.rst +++ b/docs/ide/visualstudio.rst @@ -127,15 +127,12 @@ Copy the source code which is described below to it. .. code-block:: none # - # Project Configuration File + # PlatformIO Project Configuration File # - # A detailed documentation with the EXAMPLES is located here: + # Please make sure to read documentation with examples first # http://docs.platformio.org/en/stable/projectconf.html # - # A sign `#` at the beginning of the line indicates a comment - # Comment lines are ignored. - [env:arduino_uno] platform = atmelavr framework = arduino diff --git a/docs/quickstart.rst b/docs/quickstart.rst index 239586e0..57146752 100644 --- a/docs/quickstart.rst +++ b/docs/quickstart.rst @@ -147,24 +147,12 @@ The result of just generated ``platformio.ini``: .. code-block:: ini # - # Project Configuration File + # PlatformIO Project Configuration File # - # A detailed documentation with the EXAMPLES is located here: + # Please make sure to read documentation with examples first # http://docs.platformio.org/en/stable/projectconf.html # - # A sign `#` at the beginning of the line indicates a comment - # Comment lines are ignored. - - # Simple and base environment - # [env:mybaseenv] - # platform = %INSTALLED_PLATFORM_NAME_HERE% - # framework = - # board = - # - # Automatic targets - enable auto-uploading - # targets = upload - [env:uno] platform = atmelavr framework = arduino diff --git a/platformio/projectconftpl.ini b/platformio/projectconftpl.ini index fd754591..0e9de3f9 100644 --- a/platformio/projectconftpl.ini +++ b/platformio/projectconftpl.ini @@ -1,18 +1,6 @@ # -# Project Configuration File +# PlatformIO Project Configuration File # -# A detailed documentation with the EXAMPLES is located here: +# Please make sure to read documentation with examples first # http://docs.platformio.org/en/stable/projectconf.html -# - -# A sign `#` at the beginning of the line indicates a comment -# Comment lines are ignored. - -# Simple and base environment -# [env:mybaseenv] -# platform = %INSTALLED_PLATFORM_NAME_HERE% -# framework = -# board = -# -# Automatic targets - enable auto-uploading -# targets = upload +# \ No newline at end of file From f15bb1d5456aebf9fdbeb7c34ce6b3866f4d6a0e Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 2 Aug 2016 21:25:28 +0300 Subject: [PATCH 28/28] Version bump to 2.11.2 (issues #500, #533, #732, #731, #737, #733, #438, #722, #52, #725) --- HISTORY.rst | 2 +- platformio/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 69caccf1..2cf5ea27 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -4,7 +4,7 @@ Release Notes PlatformIO 2.0 -------------- -2.11.2 (2016-??-??) +2.11.2 (2016-08-02) ~~~~~~~~~~~~~~~~~~~ * Improved support for `Microchip PIC32 `__ development platform and ChipKIT boards diff --git a/platformio/__init__.py b/platformio/__init__.py index 949f6586..1282de0a 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -14,7 +14,7 @@ import sys -VERSION = (2, 11, "2.dev3") +VERSION = (2, 11, 2) __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio"