Merge branch 'release/v1.0.2'

ivankravets · ivankravets · commit a67f5cb703cd · 2016-09-03T21:19:30.000+03:00
diff --git a/README.md b/README.md
@@ -1,20 +1,20 @@
-# Espressif: development platform for [PlatformIO](http://platformio.org)
-[![Build Status](https://travis-ci.org/platformio/platform-espressif.svg?branch=develop)](https://travis-ci.org/platformio/platform-espressif)
-[![Build status](https://ci.appveyor.com/api/projects/status/yosdb0a87s5rb7b5/branch/develop?svg=true)](https://ci.appveyor.com/project/ivankravets/platform-espressif/branch/develop)
+# Espressif 8266: development platform for [PlatformIO](http://platformio.org)
+[![Build Status](https://travis-ci.org/platformio/platform-espressif8266.svg?branch=develop)](https://travis-ci.org/platformio/platform-espressif8266)
+[![Build status](https://ci.appveyor.com/api/projects/status/aob49qatio84iygj/branch/develop?svg=true)](https://ci.appveyor.com/project/ivankravets/platform-espressif8266/branch/develop)
 
 Espressif Systems is a privately held fabless semiconductor company. They provide wireless communications and Wi-Fi chips which are widely used in mobile devices and the Internet of Things applications.
 
-* [Home](http://platformio.org/platforms/espressif) (home page in PlatformIO Platform Registry)
-* [Documentation](http://docs.platformio.org/en/latest/platforms/espressif.html) (advanced usage, packages, boards, frameworks, etc.)
+* [Home](http://platformio.org/platforms/espressif8266) (home page in PlatformIO Platform Registry)
+* [Documentation](http://docs.platformio.org/en/latest/platforms/espressif8266.html) (advanced usage, packages, boards, frameworks, etc.)
 
 # Usage
 
 1. [Install PlatformIO CLI](http://docs.platformio.org/en/latest/installation.html)
-2. Install Espressif development platform:
+2. Install Espressif 8266 development platform:
 ```bash
-# isntall the latest stable version
-> platformio platform install espressif
+# install the latest stable version
+> platformio platform install espressif8266
 
 # install development version
-> platformio platform install https://github.com/platformio/platform-espressif.git
+> platformio platform install https://github.com/platformio/platform-espressif8266.git
 ```
diff --git a/builder/frameworks/arduino.py b/builder/frameworks/arduino.py
@@ -29,8 +29,9 @@
 env = DefaultEnvironment()
 platform = env.PioPlatform()
 
-FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoespressif")
-FRAMEWORK_VERSION = platform.get_package_version("framework-arduinoespressif")
+FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoespressif8266")
+FRAMEWORK_VERSION = platform.get_package_version(
+    "framework-arduinoespressif8266")
 assert isdir(FRAMEWORK_DIR)
 
 env.Prepend(
diff --git a/builder/main.py b/builder/main.py
@@ -111,7 +111,7 @@ def _get_board_f_flash(env):
     #
 
     FRAMEWORK_ARDUINOESP8266_DIR=platform.get_package_dir(
-        "framework-arduinoespressif"),
+        "framework-arduinoespressif8266"),
     SDK_ESP8266_DIR=platform.get_package_dir("sdk-esp8266"),
 
     #
diff --git a/examples/arduino-blink/README.rst b/examples/arduino-blink/README.rst
@@ -13,14 +13,14 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `development platform with examples <https://github.com/platformio/platform-espressif/archive/develop.zip>`_
+2. Download `development platform with examples <https://github.com/platformio/platform-espressif8266/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
 .. code-block:: bash
 
     # Change directory to example
-    > cd platform-espressif/examples/arduino-blink
+    > cd platform-espressif8266/examples/arduino-blink
 
     # Build project
     > platformio run
diff --git a/examples/arduino-blink/platformio.ini b/examples/arduino-blink/platformio.ini
@@ -8,51 +8,51 @@
 ; http://docs.platformio.org/en/stable/projectconf.html
 
 [env:d1]
-platform = espressif
+platform = espressif8266
 framework = arduino
 board = d1
 
 [env:d1_mini]
-platform = espressif
+platform = espressif8266
 framework = arduino
 board = d1_mini
 
 [env:espduino]
-platform = espressif
+platform = espressif8266
 framework = arduino
 board = espduino
 
 [env:espino]
-platform = espressif
+platform = espressif8266
 framework = arduino
 board = espino
 
 [env:espinotee]
-platform = espressif
+platform = espressif8266
 framework = arduino
 board = espinotee
 
 [env:espresso_lite_v1]
-platform = espressif
+platform = espressif8266
 framework = arduino
 board = espresso_lite_v1
 
 [env:espresso_lite_v2]
-platform = espressif
+platform = espressif8266
 framework = arduino
 board = espresso_lite_v2
 
 [env:esp01]
-platform = espressif
+platform = espressif8266
 framework = arduino
 board = esp01
 
 [env:nodemcuv2]
-platform = espressif
+platform = espressif8266
 framework = arduino
 board = nodemcuv2
 
 [env:thing]
-platform = espressif
+platform = espressif8266
 framework = arduino
 board = thing
diff --git a/examples/arduino-webserver/README.rst b/examples/arduino-webserver/README.rst
@@ -13,14 +13,14 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `development platform with examples <https://github.com/platformio/platform-espressif/archive/develop.zip>`_
+2. Download `development platform with examples <https://github.com/platformio/platform-espressif8266/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
 .. code-block:: bash
 
     # Change directory to example
-    > cd platform-espressif/examples/arduino-webserver
+    > cd platform-espressif8266/examples/arduino-webserver
 
     # Build project
     > platformio run
diff --git a/examples/arduino-webserver/platformio.ini b/examples/arduino-webserver/platformio.ini
@@ -8,21 +8,21 @@
 ; http://docs.platformio.org/en/stable/projectconf.html
 
 [env:esp01]
-platform = espressif
+platform = espressif8266
 framework = arduino
 board = esp01
 
 [env:nodemcuv2]
-platform = espressif
+platform = espressif8266
 framework = arduino
 board = nodemcuv2
 
 [env:huzzah]
-platform = espressif
+platform = espressif8266
 framework = arduino
 board = huzzah
 
 [env:thing]
-platform = espressif
+platform = espressif8266
 framework = arduino
 board = thing
diff --git a/examples/arduino-wifiscan/README.rst b/examples/arduino-wifiscan/README.rst
@@ -13,14 +13,14 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `development platform with examples <https://github.com/platformio/platform-espressif/archive/develop.zip>`_
+2. Download `development platform with examples <https://github.com/platformio/platform-espressif8266/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
 .. code-block:: bash
 
     # Change directory to example
-    > cd platform-espressif/examples/arduino-wifiscan
+    > cd platform-espressif8266/examples/arduino-wifiscan
 
     # Build project
     > platformio run
diff --git a/examples/arduino-wifiscan/platformio.ini b/examples/arduino-wifiscan/platformio.ini
@@ -8,21 +8,21 @@
 ; http://docs.platformio.org/en/stable/projectconf.html
 
 [env:esp01]
-platform = espressif
+platform = espressif8266
 framework = arduino
 board = esp01
 
 [env:nodemcuv2]
-platform = espressif
+platform = espressif8266
 framework = arduino
 board = nodemcuv2
 
 [env:huzzah]
-platform = espressif
+platform = espressif8266
 framework = arduino
 board = huzzah
 
 [env:thing]
-platform = espressif
+platform = espressif8266
 framework = arduino
 board = thing
diff --git a/examples/native-sdk/README.rst b/examples/native-sdk/README.rst
@@ -13,14 +13,14 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `development platform with examples <https://github.com/platformio/platform-espressif/archive/develop.zip>`_
+2. Download `development platform with examples <https://github.com/platformio/platform-espressif8266/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
 .. code-block:: bash
 
     # Change directory to example
-    > cd platform-espressif/examples/native-sdk
+    > cd platform-espressif8266/examples/native-sdk
 
     # Build project
     > platformio run
diff --git a/examples/native-sdk/platformio.ini b/examples/native-sdk/platformio.ini
@@ -8,6 +8,6 @@
 ; http://docs.platformio.org/en/stable/projectconf.html
 
 [env:esp01]
-platform = espressif
+platform = espressif8266
 board = esp01
 build_flags = -Wl,-T"eagle.app.v6.ld"
diff --git a/examples/simba-blink/README.rst b/examples/simba-blink/README.rst
@@ -13,14 +13,14 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `development platform with examples <https://github.com/platformio/platform-espressif/archive/develop.zip>`_
+2. Download `development platform with examples <https://github.com/platformio/platform-espressif8266/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
 .. code-block:: bash
 
     # Change directory to example
-    > cd platform-espressif/examples/simba-blink
+    > cd platform-espressif8266/examples/simba-blink
 
     # Process example project
     > platformio run
diff --git a/examples/simba-blink/platformio.ini b/examples/simba-blink/platformio.ini
@@ -8,6 +8,6 @@
 ; http://docs.platformio.org/en/stable/projectconf.html
 
 [env:esp12e]
-platform = espressif
+platform = espressif8266
 framework = simba
 board = esp12e
diff --git a/platform.json b/platform.json
@@ -1,19 +1,19 @@
 {
-  "name": "espressif",
-  "title": "Espressif",
+  "name": "espressif8266",
+  "title": "Espressif 8266",
   "description": "Espressif Systems is a privately held fabless semiconductor company. They provide wireless communications and Wi-Fi chips which are widely used in mobile devices and the Internet of Things applications.",
   "url": "https://espressif.com/",
-  "homepage": "http://platformio.org/platforms/espressif",
+  "homepage": "http://platformio.org/platforms/espressif8266",
   "license": "Apache-2.0",
   "engines": {
     "platformio": "^3.0.0",
     "scons": ">=2.3.0,<2.6.0"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/platformio/platform-espressif.git"
+    "url": "https://github.com/platformio/platform-espressif8266.git"
   },
-  "version": "1.0.1",
+  "version": "1.0.2",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
@@ -22,7 +22,7 @@
   ],
   "frameworks": {
     "arduino": {
-      "package": "framework-arduinoespressif",
+      "package": "framework-arduinoespressif8266",
       "script": "builder/frameworks/arduino.py"
     },
     "simba": {
@@ -35,7 +35,7 @@
       "type": "toolchain",
       "version": "~1.40802.0"
     },
-    "framework-arduinoespressif": {
+    "framework-arduinoespressif8266": {
       "type": "framework",
       "optional": true,
       "version": "~1.20300.0"
diff --git a/platform.py b/platform.py
@@ -15,7 +15,7 @@
 from platformio.managers.platform import PlatformBase
 
 
-class EspressifPlatform(PlatformBase):
+class Espressif8266Platform(PlatformBase):
 
     def configure_default_packages(self, variables, targets):
         if not variables.get("pioframework"):

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ def _get_board_f_flash(env):`
`111`	`111`	`#`
`112`	`112`
`113`	`113`	`FRAMEWORK_ARDUINOESP8266_DIR=platform.get_package_dir(`
`114`		`- "framework-arduinoespressif"),`
	`114`	`+ "framework-arduinoespressif8266"),`
`115`	`115`	`SDK_ESP8266_DIR=platform.get_package_dir("sdk-esp8266"),`
`116`	`116`
`117`	`117`	`#`