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

Merge branch 'release/v2.6.2'

Browse Source
This commit is contained in:
Ivan Kravets
2015-12-21 17:42:01 +02:00
parent 41c2164755 618d32b872
commit 7a95a201b5
11 changed files with 298 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
HISTORY.rst
View File

@ -4,6 +4,14 @@ Release History
PlatformIO 2.0 PlatformIO 2.0
-------------- --------------
2.6.2 (2015-12-21)
~~~~~~~~~~~~~~~~~~
* Removed ``SCons`` from requirements list. PlatformIO will try to install it
automatically, otherwise users need to install it manually
* Fixed ``ChunkedEncodingError`` when SF connection is broken
(`issue #356 <https://github.com/platformio/platformio/issues/356>`_)
2.6.1 (2015-12-18) 2.6.1 (2015-12-18)
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~

BIN
docs/_static/ide-platformio-clion.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 292 KiB

After

Width:  |  Height:  |  Size: 297 KiB

6
docs/faq.rst
View File

@ -41,7 +41,7 @@ console application, it can be used in combination with one's favorite
Alright, so PlatformIO can run on different operating systems. But more Alright, so PlatformIO can run on different operating systems. But more
importantly, from development perspective at least, is a list of supported importantly, from development perspective at least, is a list of supported
boards and MCUs. To keep things short: PlatformIO supports over 150+ boards and MCUs. To keep things short: PlatformIO supports approximately 200
`Embedded Boards <http://platformio.org/#!/boards>`_ and all major `Embedded Boards <http://platformio.org/#!/boards>`_ and all major
:ref:`Development Platforms <platforms>`. :ref:`Development Platforms <platforms>`.
@ -103,8 +103,8 @@ Troubleshooting
Installation Installation
~~~~~~~~~~~~ ~~~~~~~~~~~~
PlatformIO and ``SCons`` aren't installed properly ``SCons`` is not installed in your system
'''''''''''''''''''''''''''''''''''''''''''''''''' '''''''''''''''''''''''''''''''''''''''''
PlatformIO depends on awesome and irreplaceable software construction tool PlatformIO depends on awesome and irreplaceable software construction tool
named `SCons <http://www.scons.org>`_. PlatformIO Code Builder uses it to build named `SCons <http://www.scons.org>`_. PlatformIO Code Builder uses it to build

177
docs/frameworks/arduino.rst
View File

@ -77,6 +77,13 @@ Adafruit
- 8 Kb - 8 Kb
- 0.5 Kb - 0.5 Kb
* - ``huzzah``
- `Adafruit HUZZAH ESP8266 <https://www.adafruit.com/products/2471>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
* - ``protrinket3`` * - ``protrinket3``
- `Adafruit Pro Trinket 3V/12MHz (USB) <http://www.adafruit.com/products/2010>`_ - `Adafruit Pro Trinket 3V/12MHz (USB) <http://www.adafruit.com/products/2010>`_
- ATMEGA328P - ATMEGA328P
@ -437,6 +444,26 @@ Digistump
- 512 Kb - 512 Kb
- 28 Kb - 28 Kb
ESPino
~~~~~~
.. list-table::
:header-rows: 1
* - Type ``board``
- Name
- Microcontroller
- Frequency
- Flash
- RAM
* - ``espino``
- `ESPino <http://www.espino.io>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
Engduino Engduino
~~~~~~~~ ~~~~~~~~
@ -484,20 +511,6 @@ Espressif
- Flash - Flash
- RAM - RAM
* - ``d1``
- `WeMos D1 <http://www.wemos.cc/wiki/doku.php?id=en:d1>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
* - ``d1_mini``
- `WeMos D1 mini <http://www.wemos.cc/wiki/doku.php?id=en:d1_mini>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
* - ``esp01`` * - ``esp01``
- `Espressif Generic ESP8266 ESP-01 <https://nurdspace.nl/ESP8266>`_ - `Espressif Generic ESP8266 ESP-01 <https://nurdspace.nl/ESP8266>`_
- ESP8266 - ESP8266
@ -512,48 +525,6 @@ Espressif
- 1024 Kb - 1024 Kb
- 80 Kb - 80 Kb
* - ``esp210``
- `SweetPea ESP-210 <http://wiki.sweetpeas.se/index.php?title=ESP-210>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
* - ``espino``
- `ESPino <http://www.espino.io>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
* - ``huzzah``
- `Adafruit HUZZAH ESP8266 <https://www.adafruit.com/products/2471>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
* - ``modwifi``
- `Olimex MOD-WIFI-ESP8266(-DEV) <https://www.olimex.com/Products/IoT/MOD-WIFI-ESP8266-DEV/open-source-hardware>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
* - ``nodemcu``
- `NodeMCU 0.9 & 1.0 <http://www.nodemcu.com/>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
* - ``thing``
- `SparkFun ESP8266 Thing <https://www.sparkfun.com/products/13231>`_
- ESP8266
- 80 MHz
- 512 Kb
- 80 Kb
LightUp LightUp
~~~~~~~ ~~~~~~~
@ -677,6 +648,46 @@ Microduino
- 64 Kb - 64 Kb
- 4 Kb - 4 Kb
NodeMCU
~~~~~~~
.. list-table::
:header-rows: 1
* - Type ``board``
- Name
- Microcontroller
- Frequency
- Flash
- RAM
* - ``nodemcu``
- `NodeMCU 0.9 & 1.0 <http://www.nodemcu.com/>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
Olimex
~~~~~~
.. list-table::
:header-rows: 1
* - Type ``board``
- Name
- Microcontroller
- Frequency
- Flash
- RAM
* - ``modwifi``
- `Olimex MOD-WIFI-ESP8266(-DEV) <https://www.olimex.com/Products/IoT/MOD-WIFI-ESP8266-DEV/open-source-hardware>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
PanStamp PanStamp
~~~~~~~~ ~~~~~~~~
@ -942,6 +953,13 @@ SparkFun
- 32 Kb - 32 Kb
- 2 Kb - 2 Kb
* - ``thing``
- `SparkFun ESP8266 Thing <https://www.sparkfun.com/products/13231>`_
- ESP8266
- 80 MHz
- 512 Kb
- 80 Kb
* - ``uview`` * - ``uview``
- `SparkFun MicroView <https://www.sparkfun.com/products/12923>`_ - `SparkFun MicroView <https://www.sparkfun.com/products/12923>`_
- ATMEGA328P - ATMEGA328P
@ -949,6 +967,26 @@ SparkFun
- 32 Kb - 32 Kb
- 2 Kb - 2 Kb
SweetPea
~~~~~~~~
.. list-table::
:header-rows: 1
* - Type ``board``
- Name
- Microcontroller
- Frequency
- Flash
- RAM
* - ``esp210``
- `SweetPea ESP-210 <http://wiki.sweetpeas.se/index.php?title=ESP-210>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
Teensy Teensy
~~~~~~ ~~~~~~
@ -1024,6 +1062,33 @@ TinyCircuits
- 32 Kb - 32 Kb
- 2 Kb - 2 Kb
WeMos
~~~~~
.. list-table::
:header-rows: 1
* - Type ``board``
- Name
- Microcontroller
- Frequency
- Flash
- RAM
* - ``d1``
- `WeMos D1 <http://www.wemos.cc/wiki/doku.php?id=en:d1>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
* - ``d1_mini``
- `WeMos D1 mini <http://www.wemos.cc/wiki/doku.php?id=en:d1_mini>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
Wicked Device Wicked Device
~~~~~~~~~~~~~ ~~~~~~~~~~~~~

5
docs/ide/clion.rst
View File

@ -49,9 +49,10 @@ Then:
1. Import this project via ``Menu: File > Import Project`` 1. Import this project via ``Menu: File > Import Project``
and specify root directory where is located :ref:`projectconf` and specify root directory where is located :ref:`projectconf`
2. Open source file from ``src`` directory (``*.c, *.cpp, *.ino, etc.``) 2. Open source file from ``src`` directory (``*.c, *.cpp, *.ino, etc.``)
3. Build project: ``Menu: Run > Build``. 3. Build project (*DO NOT RUN*): ``Menu: Run > Build``.
There are 3 predefined targets for building: There are 3 predefined targets for building (*NOT FOR RUNNING*, see marks on
the screenshot below):
* ``PLATFORMIO_BUILD`` - build project without auto-uploading * ``PLATFORMIO_BUILD`` - build project without auto-uploading
* ``PLATFORMIO_UPLOAD`` - build and upload (if no errors) * ``PLATFORMIO_UPLOAD`` - build and upload (if no errors)

203
docs/platforms/espressif.rst
View File

@ -72,9 +72,156 @@ Boards
* For more detailed ``board`` information please scroll tables below by * For more detailed ``board`` information please scroll tables below by
horizontal. horizontal.
Adafruit
~~~~~~~~
.. list-table::
:header-rows: 1
* - Type ``board``
- Name
- Microcontroller
- Frequency
- Flash
- RAM
* - ``huzzah``
- `Adafruit HUZZAH ESP8266 <https://www.adafruit.com/products/2471>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
ESPino
~~~~~~
.. list-table::
:header-rows: 1
* - Type ``board``
- Name
- Microcontroller
- Frequency
- Flash
- RAM
* - ``espino``
- `ESPino <http://www.espino.io>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
Espressif Espressif
~~~~~~~~~ ~~~~~~~~~
.. list-table::
:header-rows: 1
* - Type ``board``
- Name
- Microcontroller
- Frequency
- Flash
- RAM
* - ``esp01``
- `Espressif Generic ESP8266 ESP-01 <https://nurdspace.nl/ESP8266>`_
- ESP8266
- 80 MHz
- 512 Kb
- 80 Kb
* - ``esp12e``
- `Espressif ESP8266 ESP-12E <https://nurdspace.nl/ESP8266>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
NodeMCU
~~~~~~~
.. list-table::
:header-rows: 1
* - Type ``board``
- Name
- Microcontroller
- Frequency
- Flash
- RAM
* - ``nodemcu``
- `NodeMCU 0.9 & 1.0 <http://www.nodemcu.com/>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
Olimex
~~~~~~
.. list-table::
:header-rows: 1
* - Type ``board``
- Name
- Microcontroller
- Frequency
- Flash
- RAM
* - ``modwifi``
- `Olimex MOD-WIFI-ESP8266(-DEV) <https://www.olimex.com/Products/IoT/MOD-WIFI-ESP8266-DEV/open-source-hardware>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
SparkFun
~~~~~~~~
.. list-table::
:header-rows: 1
* - Type ``board``
- Name
- Microcontroller
- Frequency
- Flash
- RAM
* - ``thing``
- `SparkFun ESP8266 Thing <https://www.sparkfun.com/products/13231>`_
- ESP8266
- 80 MHz
- 512 Kb
- 80 Kb
SweetPea
~~~~~~~~
.. list-table::
:header-rows: 1
* - Type ``board``
- Name
- Microcontroller
- Frequency
- Flash
- RAM
* - ``esp210``
- `SweetPea ESP-210 <http://wiki.sweetpeas.se/index.php?title=ESP-210>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
WeMos
~~~~~
.. list-table:: .. list-table::
:header-rows: 1 :header-rows: 1
@ -99,60 +246,4 @@ Espressif
- 1024 Kb - 1024 Kb
- 80 Kb - 80 Kb
* - ``esp01``
- `Espressif Generic ESP8266 ESP-01 <https://nurdspace.nl/ESP8266>`_
- ESP8266
- 80 MHz
- 512 Kb
- 80 Kb
* - ``esp12e``
- `Espressif ESP8266 ESP-12E <https://nurdspace.nl/ESP8266>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
* - ``esp210``
- `SweetPea ESP-210 <http://wiki.sweetpeas.se/index.php?title=ESP-210>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
* - ``espino``
- `ESPino <http://www.espino.io>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
* - ``huzzah``
- `Adafruit HUZZAH ESP8266 <https://www.adafruit.com/products/2471>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
* - ``modwifi``
- `Olimex MOD-WIFI-ESP8266(-DEV) <https://www.olimex.com/Products/IoT/MOD-WIFI-ESP8266-DEV/open-source-hardware>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
* - ``nodemcu``
- `NodeMCU 0.9 & 1.0 <http://www.nodemcu.com/>`_
- ESP8266
- 80 MHz
- 1024 Kb
- 80 Kb
* - ``thing``
- `SparkFun ESP8266 Thing <https://www.sparkfun.com/products/13231>`_
- ESP8266
- 80 MHz
- 512 Kb
- 80 Kb
.. include:: espressif_extra.rst .. include:: espressif_extra.rst

2
platformio/__init__.py
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
VERSION = (2, 6, 1) VERSION = (2, 6, 2)
__version__ = ".".join([str(s) for s in VERSION]) __version__ = ".".join([str(s) for s in VERSION])
__title__ = "platformio" __title__ = "platformio"

16
platformio/boards/espressif.json
View File

@ -65,7 +65,7 @@
"speed": 115200 "speed": 115200
}, },
"url": "http://www.nodemcu.com/", "url": "http://www.nodemcu.com/",
"vendor": "Espressif" "vendor": "NodeMCU"
}, },
"huzzah": { "huzzah": {
@ -88,7 +88,7 @@
"speed": 115200 "speed": 115200
}, },
"url": "https://www.adafruit.com/products/2471", "url": "https://www.adafruit.com/products/2471",
"vendor": "Espressif" "vendor": "Adafruit"
}, },
"modwifi": { "modwifi": {
@ -111,7 +111,7 @@
"speed": 115200 "speed": 115200
}, },
"url": "https://www.olimex.com/Products/IoT/MOD-WIFI-ESP8266-DEV/open-source-hardware", "url": "https://www.olimex.com/Products/IoT/MOD-WIFI-ESP8266-DEV/open-source-hardware",
"vendor": "Espressif" "vendor": "Olimex"
}, },
"thing": { "thing": {
@ -134,7 +134,7 @@
"speed": 921600 "speed": 921600
}, },
"url": "https://www.sparkfun.com/products/13231", "url": "https://www.sparkfun.com/products/13231",
"vendor": "Espressif" "vendor": "SparkFun"
}, },
"esp210": { "esp210": {
@ -157,7 +157,7 @@
"speed": 115200 "speed": 115200
}, },
"url": "http://wiki.sweetpeas.se/index.php?title=ESP-210", "url": "http://wiki.sweetpeas.se/index.php?title=ESP-210",
"vendor": "Espressif" "vendor": "SweetPea"
}, },
"d1": { "d1": {
@ -180,7 +180,7 @@
"speed": 460800 "speed": 460800
}, },
"url": "http://www.wemos.cc/wiki/doku.php?id=en:d1", "url": "http://www.wemos.cc/wiki/doku.php?id=en:d1",
"vendor": "Espressif" "vendor": "WeMos"
}, },
"d1_mini": { "d1_mini": {
@ -203,7 +203,7 @@
"speed": 460800 "speed": 460800
}, },
"url": "http://www.wemos.cc/wiki/doku.php?id=en:d1_mini", "url": "http://www.wemos.cc/wiki/doku.php?id=en:d1_mini",
"vendor": "Espressif" "vendor": "WeMos"
}, },
"espino": { "espino": {
@ -226,6 +226,6 @@
"speed": 115200 "speed": 115200
}, },
"url": "http://www.espino.io", "url": "http://www.espino.io",
"vendor": "Espressif" "vendor": "ESPino"
} }
} }

5
platformio/exception.py
View File

@ -193,9 +193,10 @@ class CIBuildEnvsEmpty(PlatformioException):
class SConsNotInstalledError(PlatformioException): class SConsNotInstalledError(PlatformioException):
MESSAGE = "The PlatformIO and `scons` aren't installed properly. "\ MESSAGE = "SCons is not installed in your system. "\
"More details in FAQ/Troubleshooting section: "\ "More details in FAQ/Troubleshooting section: "\
"http://docs.platformio.org/en/latest/faq.html" "http://docs.platformio.org/en/latest/faq.html"\
"#scons-is-not-installed-in-your-system"
class UpgradeError(PlatformioException): class UpgradeError(PlatformioException):

1
platformio/pkgmanager.py
View File

@ -101,6 +101,7 @@ class PackageManager(object):
try: try:
dlpath = self.download(info['url'], pkg_dir, info['sha1']) dlpath = self.download(info['url'], pkg_dir, info['sha1'])
except (requests.exceptions.ConnectionError, except (requests.exceptions.ConnectionError,
requests.exceptions.ChunkedEncodingError,
exception.FDUnrecognizedStatusCode, StopIteration): exception.FDUnrecognizedStatusCode, StopIteration):
if info['url'].startswith("http://sourceforge.net"): if info['url'].startswith("http://sourceforge.net"):
dlpath = self.download( dlpath = self.download(

4
setup.py
View File

@ -30,7 +30,9 @@ install_requires = [
if system() == "Windows": if system() == "Windows":
install_requires.append("colorama") install_requires.append("colorama")
if (not util.test_scons() and not util.install_scons()) or util.scons_in_pip(): if not util.test_scons():
util.install_scons()
elif util.scons_in_pip():
install_requires.append("scons") install_requires.append("scons")
setup( setup(