Merge branch 'release/v1.0.0'

Author: ivankravets

README.md

@@ -16,5 +16,5 @@ Espressif Systems is a privately held fabless semiconductor company. They provid
 > platformio platform install espressif
 
 # install development version
-> platformio platform install https://github.com/platformio/platform-espressif/archive/develop.zip
+> platformio platform install https://github.com/platformio/platform-espressif.git
 ```

builder/frameworks/arduino.py

@@ -41,7 +41,7 @@
     CPPPATH=[
         join(FRAMEWORK_DIR, "tools", "sdk", "include"),
         join(FRAMEWORK_DIR, "tools", "sdk", "lwip", "include"),
-        join("$BUILD_DIR", "FrameworkArduino")
+        join(FRAMEWORK_DIR, "cores", env.BoardConfig().get("build.core"))
     ],
     LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib")],
     LIBS=[
@@ -57,11 +57,6 @@
     ]
 )
 
-env.VariantDirWrap(
-    join("$BUILD_DIR", "generic"),
-    join(FRAMEWORK_DIR, "variants", "generic")
-)
-
 #
 # Target: Build Core Library
 #
@@ -71,7 +66,8 @@
 if "build.variant" in env.BoardConfig():
     env.Append(
         CPPPATH=[
-            join("$BUILD_DIR", "FrameworkArduinoVariant")
+            join(FRAMEWORK_DIR, "variants",
+                 env.BoardConfig().get("build.variant"))
         ]
     )
     libs.append(env.BuildLibrary(

builder/main.py

@@ -21,8 +21,8 @@
 import re
 from os.path import join
 
-from SCons.Script import (COMMAND_LINE_TARGETS, AlwaysBuild, Builder, Default,
-                          DefaultEnvironment)
+from SCons.Script import (ARGUMENTS, COMMAND_LINE_TARGETS, AlwaysBuild,
+                          Builder, Default, DefaultEnvironment)
 
 
 def _get_flash_size(env):
@@ -151,7 +151,7 @@ def _get_board_f_flash(env):
     ASFLAGS=env.get("CCFLAGS", [])[:]
 )
 
-if not env.GetOption("silent"):
+if int(ARGUMENTS.get("PIOVERBOSE", 0)):
     env.Prepend(UPLOADERFLAGS=["-vv"])
 
 
@@ -189,14 +189,14 @@ def _fetch_spiffs_size(target, source, env):
 env.Append(
     BUILDERS=dict(
         DataToBin=Builder(
-            action=" ".join([
+            action=env.VerboseAction(" ".join([
                 '"$MKSPIFFSTOOL"',
                 "-c", "$SOURCES",
                 "-p", "${int(SPIFFS_PAGE, 16)}",
                 "-b", "${int(SPIFFS_BLOCK, 16)}",
                 "-s", "${int(SPIFFS_END, 16) - int(SPIFFS_START, 16)}",
                 "$TARGET"
-            ]),
+            ]), "Building SPIFFS image from '$SOURCES' directory to $TARGET"),
             emitter=_fetch_spiffs_size,
             source_factory=env.Dir,
             suffix=".bin"
@@ -223,7 +223,7 @@ def _fetch_spiffs_size(target, source, env):
 
         BUILDERS=dict(
             ElfToBin=Builder(
-                action=" ".join([
+                action=env.VerboseAction(" ".join([
                     '"$OBJCOPY"',
                     "-eo",
                     '"%s"' % join("$FRAMEWORK_ARDUINOESP8266_DIR",
@@ -241,7 +241,7 @@ def _fetch_spiffs_size(target, source, env):
                     "-bs", ".data",
                     "-bs", ".rodata",
                     "-bc", "-ec"
-                ]),
+                ]), "Building $TARGET"),
                 suffix=".bin"
             )
         )
@@ -270,7 +270,7 @@ def _fetch_spiffs_size(target, source, env):
 
         BUILDERS=dict(
             ElfToBin=Builder(
-                action=" ".join([
+                action=env.VerboseAction(" ".join([
                     '"$OBJCOPY"',
                     "-eo", "$SOURCES",
                     "-bo", "${TARGETS[0]}",
@@ -284,7 +284,7 @@ def _fetch_spiffs_size(target, source, env):
                     "-eo", "$SOURCES",
                     "-es", ".irom0.text", "${TARGETS[1]}",
                     "-ec", "-v"
-                ]),
+                ]), "Building $TARGET"),
                 suffix=".bin"
             )
         )
@@ -345,7 +345,9 @@ def _fetch_spiffs_size(target, source, env):
 # Target: Print binary size
 #
 
-target_size = env.Alias("size", target_elf, "$SIZEPRINTCMD")
+target_size = env.Alias(
+    "size", target_elf,
+    env.VerboseAction("$SIZEPRINTCMD", "Calculating size $SOURCE"))
 AlwaysBuild(target_size)
 
 #
@@ -354,17 +356,13 @@ def _fetch_spiffs_size(target, source, env):
 
 target_upload = env.Alias(
     ["upload", "uploadlazy", "uploadfs"], target_firm,
-    [env.AutodetectUploadPort, "$UPLOADCMD"])
+    [env.VerboseAction(env.AutodetectUploadPort, "Looking for upload port..."),
+     env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE")])
 env.AlwaysBuild(target_upload)
 
-#
-# Target: Unit Testing
-#
-
-AlwaysBuild(env.Alias("test", [target_firm, target_size]))
 
 #
-# Target: Define targets
+# Default targets
 #
 
 Default([target_firm, target_size])

platform.json

@@ -4,19 +4,16 @@
   "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",
-  "license": {
-    "type": "Apache-2.0",
-    "url": "http://opensource.org/licenses/apache2.0.php"
-  },
+  "license": "Apache-2.0",
   "engines": {
-    "platformio": "~3.0.0",
+    "platformio": "^3.0.0",
     "scons": ">=2.3.0,<2.6.0"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/platformio/platform-espressif.git"
   },
-  "version": "0.1.2",
+  "version": "1.0.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",