diff --git a/HISTORY.rst b/HISTORY.rst index 18e141c3..64cd9797 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -4,6 +4,14 @@ Release History 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 `_) + 2.6.1 (2015-12-18) ~~~~~~~~~~~~~~~~~~ diff --git a/docs/_static/ide-platformio-clion.png b/docs/_static/ide-platformio-clion.png index 96049b35..ee67894b 100644 Binary files a/docs/_static/ide-platformio-clion.png and b/docs/_static/ide-platformio-clion.png differ diff --git a/docs/faq.rst b/docs/faq.rst index dc3663a7..5a5adf5a 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -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 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 `_ and all major :ref:`Development Platforms `. @@ -103,8 +103,8 @@ Troubleshooting Installation ~~~~~~~~~~~~ -PlatformIO and ``SCons`` aren't installed properly -'''''''''''''''''''''''''''''''''''''''''''''''''' +``SCons`` is not installed in your system +''''''''''''''''''''''''''''''''''''''''' PlatformIO depends on awesome and irreplaceable software construction tool named `SCons `_. PlatformIO Code Builder uses it to build diff --git a/docs/frameworks/arduino.rst b/docs/frameworks/arduino.rst index 7835d441..7bfac12f 100644 --- a/docs/frameworks/arduino.rst +++ b/docs/frameworks/arduino.rst @@ -77,6 +77,13 @@ Adafruit - 8 Kb - 0.5 Kb + * - ``huzzah`` + - `Adafruit HUZZAH ESP8266 `_ + - ESP8266 + - 80 MHz + - 1024 Kb + - 80 Kb + * - ``protrinket3`` - `Adafruit Pro Trinket 3V/12MHz (USB) `_ - ATMEGA328P @@ -437,6 +444,26 @@ Digistump - 512 Kb - 28 Kb +ESPino +~~~~~~ + +.. list-table:: + :header-rows: 1 + + * - Type ``board`` + - Name + - Microcontroller + - Frequency + - Flash + - RAM + + * - ``espino`` + - `ESPino `_ + - ESP8266 + - 80 MHz + - 1024 Kb + - 80 Kb + Engduino ~~~~~~~~ @@ -484,20 +511,6 @@ Espressif - Flash - RAM - * - ``d1`` - - `WeMos D1 `_ - - ESP8266 - - 80 MHz - - 1024 Kb - - 80 Kb - - * - ``d1_mini`` - - `WeMos D1 mini `_ - - ESP8266 - - 80 MHz - - 1024 Kb - - 80 Kb - * - ``esp01`` - `Espressif Generic ESP8266 ESP-01 `_ - ESP8266 @@ -512,48 +525,6 @@ Espressif - 1024 Kb - 80 Kb - * - ``esp210`` - - `SweetPea ESP-210 `_ - - ESP8266 - - 80 MHz - - 1024 Kb - - 80 Kb - - * - ``espino`` - - `ESPino `_ - - ESP8266 - - 80 MHz - - 1024 Kb - - 80 Kb - - * - ``huzzah`` - - `Adafruit HUZZAH ESP8266 `_ - - ESP8266 - - 80 MHz - - 1024 Kb - - 80 Kb - - * - ``modwifi`` - - `Olimex MOD-WIFI-ESP8266(-DEV) `_ - - ESP8266 - - 80 MHz - - 1024 Kb - - 80 Kb - - * - ``nodemcu`` - - `NodeMCU 0.9 & 1.0 `_ - - ESP8266 - - 80 MHz - - 1024 Kb - - 80 Kb - - * - ``thing`` - - `SparkFun ESP8266 Thing `_ - - ESP8266 - - 80 MHz - - 512 Kb - - 80 Kb - LightUp ~~~~~~~ @@ -677,6 +648,46 @@ Microduino - 64 Kb - 4 Kb +NodeMCU +~~~~~~~ + +.. list-table:: + :header-rows: 1 + + * - Type ``board`` + - Name + - Microcontroller + - Frequency + - Flash + - RAM + + * - ``nodemcu`` + - `NodeMCU 0.9 & 1.0 `_ + - 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) `_ + - ESP8266 + - 80 MHz + - 1024 Kb + - 80 Kb + PanStamp ~~~~~~~~ @@ -942,6 +953,13 @@ SparkFun - 32 Kb - 2 Kb + * - ``thing`` + - `SparkFun ESP8266 Thing `_ + - ESP8266 + - 80 MHz + - 512 Kb + - 80 Kb + * - ``uview`` - `SparkFun MicroView `_ - ATMEGA328P @@ -949,6 +967,26 @@ SparkFun - 32 Kb - 2 Kb +SweetPea +~~~~~~~~ + +.. list-table:: + :header-rows: 1 + + * - Type ``board`` + - Name + - Microcontroller + - Frequency + - Flash + - RAM + + * - ``esp210`` + - `SweetPea ESP-210 `_ + - ESP8266 + - 80 MHz + - 1024 Kb + - 80 Kb + Teensy ~~~~~~ @@ -1024,6 +1062,33 @@ TinyCircuits - 32 Kb - 2 Kb +WeMos +~~~~~ + +.. list-table:: + :header-rows: 1 + + * - Type ``board`` + - Name + - Microcontroller + - Frequency + - Flash + - RAM + + * - ``d1`` + - `WeMos D1 `_ + - ESP8266 + - 80 MHz + - 1024 Kb + - 80 Kb + + * - ``d1_mini`` + - `WeMos D1 mini `_ + - ESP8266 + - 80 MHz + - 1024 Kb + - 80 Kb + Wicked Device ~~~~~~~~~~~~~ diff --git a/docs/ide/clion.rst b/docs/ide/clion.rst index 84f8720f..6e1726d4 100644 --- a/docs/ide/clion.rst +++ b/docs/ide/clion.rst @@ -49,9 +49,10 @@ Then: 1. Import this project via ``Menu: File > Import Project`` and specify root directory where is located :ref:`projectconf` 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_UPLOAD`` - build and upload (if no errors) diff --git a/docs/platforms/espressif.rst b/docs/platforms/espressif.rst index f03a4970..deaa30c6 100644 --- a/docs/platforms/espressif.rst +++ b/docs/platforms/espressif.rst @@ -72,9 +72,156 @@ Boards * For more detailed ``board`` information please scroll tables below by horizontal. +Adafruit +~~~~~~~~ + +.. list-table:: + :header-rows: 1 + + * - Type ``board`` + - Name + - Microcontroller + - Frequency + - Flash + - RAM + + * - ``huzzah`` + - `Adafruit HUZZAH ESP8266 `_ + - ESP8266 + - 80 MHz + - 1024 Kb + - 80 Kb + +ESPino +~~~~~~ + +.. list-table:: + :header-rows: 1 + + * - Type ``board`` + - Name + - Microcontroller + - Frequency + - Flash + - RAM + + * - ``espino`` + - `ESPino `_ + - ESP8266 + - 80 MHz + - 1024 Kb + - 80 Kb + Espressif ~~~~~~~~~ +.. list-table:: + :header-rows: 1 + + * - Type ``board`` + - Name + - Microcontroller + - Frequency + - Flash + - RAM + + * - ``esp01`` + - `Espressif Generic ESP8266 ESP-01 `_ + - ESP8266 + - 80 MHz + - 512 Kb + - 80 Kb + + * - ``esp12e`` + - `Espressif ESP8266 ESP-12E `_ + - 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 `_ + - 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) `_ + - ESP8266 + - 80 MHz + - 1024 Kb + - 80 Kb + +SparkFun +~~~~~~~~ + +.. list-table:: + :header-rows: 1 + + * - Type ``board`` + - Name + - Microcontroller + - Frequency + - Flash + - RAM + + * - ``thing`` + - `SparkFun ESP8266 Thing `_ + - ESP8266 + - 80 MHz + - 512 Kb + - 80 Kb + +SweetPea +~~~~~~~~ + +.. list-table:: + :header-rows: 1 + + * - Type ``board`` + - Name + - Microcontroller + - Frequency + - Flash + - RAM + + * - ``esp210`` + - `SweetPea ESP-210 `_ + - ESP8266 + - 80 MHz + - 1024 Kb + - 80 Kb + +WeMos +~~~~~ + .. list-table:: :header-rows: 1 @@ -99,60 +246,4 @@ Espressif - 1024 Kb - 80 Kb - * - ``esp01`` - - `Espressif Generic ESP8266 ESP-01 `_ - - ESP8266 - - 80 MHz - - 512 Kb - - 80 Kb - - * - ``esp12e`` - - `Espressif ESP8266 ESP-12E `_ - - ESP8266 - - 80 MHz - - 1024 Kb - - 80 Kb - - * - ``esp210`` - - `SweetPea ESP-210 `_ - - ESP8266 - - 80 MHz - - 1024 Kb - - 80 Kb - - * - ``espino`` - - `ESPino `_ - - ESP8266 - - 80 MHz - - 1024 Kb - - 80 Kb - - * - ``huzzah`` - - `Adafruit HUZZAH ESP8266 `_ - - ESP8266 - - 80 MHz - - 1024 Kb - - 80 Kb - - * - ``modwifi`` - - `Olimex MOD-WIFI-ESP8266(-DEV) `_ - - ESP8266 - - 80 MHz - - 1024 Kb - - 80 Kb - - * - ``nodemcu`` - - `NodeMCU 0.9 & 1.0 `_ - - ESP8266 - - 80 MHz - - 1024 Kb - - 80 Kb - - * - ``thing`` - - `SparkFun ESP8266 Thing `_ - - ESP8266 - - 80 MHz - - 512 Kb - - 80 Kb - .. include:: espressif_extra.rst diff --git a/platformio/__init__.py b/platformio/__init__.py index dfffbd25..235dd071 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -VERSION = (2, 6, 1) +VERSION = (2, 6, 2) __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" diff --git a/platformio/boards/espressif.json b/platformio/boards/espressif.json index b11e7c34..53cffe70 100644 --- a/platformio/boards/espressif.json +++ b/platformio/boards/espressif.json @@ -65,7 +65,7 @@ "speed": 115200 }, "url": "http://www.nodemcu.com/", - "vendor": "Espressif" + "vendor": "NodeMCU" }, "huzzah": { @@ -88,7 +88,7 @@ "speed": 115200 }, "url": "https://www.adafruit.com/products/2471", - "vendor": "Espressif" + "vendor": "Adafruit" }, "modwifi": { @@ -111,7 +111,7 @@ "speed": 115200 }, "url": "https://www.olimex.com/Products/IoT/MOD-WIFI-ESP8266-DEV/open-source-hardware", - "vendor": "Espressif" + "vendor": "Olimex" }, "thing": { @@ -134,7 +134,7 @@ "speed": 921600 }, "url": "https://www.sparkfun.com/products/13231", - "vendor": "Espressif" + "vendor": "SparkFun" }, "esp210": { @@ -157,7 +157,7 @@ "speed": 115200 }, "url": "http://wiki.sweetpeas.se/index.php?title=ESP-210", - "vendor": "Espressif" + "vendor": "SweetPea" }, "d1": { @@ -180,7 +180,7 @@ "speed": 460800 }, "url": "http://www.wemos.cc/wiki/doku.php?id=en:d1", - "vendor": "Espressif" + "vendor": "WeMos" }, "d1_mini": { @@ -203,7 +203,7 @@ "speed": 460800 }, "url": "http://www.wemos.cc/wiki/doku.php?id=en:d1_mini", - "vendor": "Espressif" + "vendor": "WeMos" }, "espino": { @@ -226,6 +226,6 @@ "speed": 115200 }, "url": "http://www.espino.io", - "vendor": "Espressif" + "vendor": "ESPino" } } diff --git a/platformio/exception.py b/platformio/exception.py index ee7f565d..bd1ec52a 100644 --- a/platformio/exception.py +++ b/platformio/exception.py @@ -193,9 +193,10 @@ class CIBuildEnvsEmpty(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: "\ - "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): diff --git a/platformio/pkgmanager.py b/platformio/pkgmanager.py index 65054c67..1678e9a2 100644 --- a/platformio/pkgmanager.py +++ b/platformio/pkgmanager.py @@ -101,6 +101,7 @@ class PackageManager(object): try: dlpath = self.download(info['url'], pkg_dir, info['sha1']) except (requests.exceptions.ConnectionError, + requests.exceptions.ChunkedEncodingError, exception.FDUnrecognizedStatusCode, StopIteration): if info['url'].startswith("http://sourceforge.net"): dlpath = self.download( diff --git a/setup.py b/setup.py index c7968fd5..810d5b0b 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,9 @@ install_requires = [ if system() == "Windows": 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") setup(