Merge branch 'develop' into feature/stage

ivankravets · ivankravets · commit 4f59cef45709 · 2017-11-30T16:10:12.000+02:00
* develop: Added esp8266-nonos-sdk framework (platformio#55) Depend on tool-mkspiffs for "buildfs" target # Conflicts: # builder/main.py
diff --git a/boards/d1.json b/boards/d1.json
@@ -14,7 +14,8 @@
   ],
   "frameworks": [
     "arduino",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "WEMOS D1 (Retired)",
   "upload": {
diff --git a/boards/d1_mini.json b/boards/d1_mini.json
@@ -14,7 +14,8 @@
   ],
   "frameworks": [
     "arduino",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "WEMOS D1 mini",
   "upload": {
diff --git a/boards/esp01.json b/boards/esp01.json
@@ -15,7 +15,8 @@
   "frameworks": [
     "arduino",
     "simba",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "Espressif Generic ESP8266 ESP-01 512k",
   "upload": {
diff --git a/boards/esp01_1m.json b/boards/esp01_1m.json
@@ -15,7 +15,8 @@
   "frameworks": [
     "arduino",
     "simba",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "Espressif Generic ESP8266 ESP-01 1M",
   "upload": {
diff --git a/boards/esp07.json b/boards/esp07.json
@@ -14,7 +14,8 @@
   ],
   "frameworks": [
     "arduino",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "Espressif Generic ESP8266 ESP-07",
   "upload": {
diff --git a/boards/esp12e.json b/boards/esp12e.json
@@ -15,7 +15,8 @@
   "frameworks": [
     "arduino",
     "simba",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "Espressif ESP8266 ESP-12E",
   "upload": {
diff --git a/boards/esp210.json b/boards/esp210.json
@@ -14,7 +14,8 @@
   ],
   "frameworks": [
     "arduino",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "SweetPea ESP-210",
   "upload": {
diff --git a/boards/esp8285.json b/boards/esp8285.json
@@ -14,7 +14,8 @@
   ],
   "frameworks": [
     "arduino",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "Generic ESP8285 Module",
   "upload": {
diff --git a/boards/esp_wroom_02.json b/boards/esp_wroom_02.json
@@ -15,7 +15,8 @@
   "frameworks": [
     "arduino",
     "simba",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "ESP-WROOM-02",
   "upload": {
diff --git a/boards/espduino.json b/boards/espduino.json
@@ -14,7 +14,8 @@
   ],
   "frameworks": [
     "arduino",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "ESPDuino (ESP-13 Module)",
   "upload": {
diff --git a/boards/espectro.json b/boards/espectro.json
@@ -14,7 +14,8 @@
   ],
   "frameworks": [
     "arduino",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "ESPectro Core",
   "upload": {
diff --git a/boards/espino.json b/boards/espino.json
@@ -14,7 +14,8 @@
   ],
   "frameworks": [
     "arduino",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "ESPino",
   "upload": {
diff --git a/boards/espinotee.json b/boards/espinotee.json
@@ -14,7 +14,8 @@
   ],
   "frameworks": [
     "arduino",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "ThaiEasyElec ESPino",
   "upload": {
diff --git a/boards/espresso_lite_v1.json b/boards/espresso_lite_v1.json
@@ -14,7 +14,8 @@
   ],
   "frameworks": [
     "arduino",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "ESPresso Lite 1.0",
   "upload": {
diff --git a/boards/espresso_lite_v2.json b/boards/espresso_lite_v2.json
@@ -14,7 +14,8 @@
   ],
   "frameworks": [
     "arduino",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "ESPresso Lite 2.0",
   "upload": {
diff --git a/boards/huzzah.json b/boards/huzzah.json
@@ -15,7 +15,8 @@
   "frameworks": [
     "arduino",
     "simba",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "Adafruit HUZZAH ESP8266",
   "upload": {
diff --git a/boards/modwifi.json b/boards/modwifi.json
@@ -14,7 +14,8 @@
   ],
   "frameworks": [
     "arduino",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "Olimex MOD-WIFI-ESP8266(-DEV)",
   "upload": {
diff --git a/boards/nodemcu.json b/boards/nodemcu.json
@@ -21,7 +21,8 @@
   "frameworks": [
     "arduino",
     "simba",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "NodeMCU 0.9 (ESP-12 Module)",
   "upload": {
diff --git a/boards/nodemcuv2.json b/boards/nodemcuv2.json
@@ -21,7 +21,8 @@
   "frameworks": [
     "arduino",
     "simba",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "NodeMCU 1.0 (ESP-12E Module)",
   "upload": {
diff --git a/boards/phoenix_v1.json b/boards/phoenix_v1.json
@@ -14,7 +14,8 @@
   ],
   "frameworks": [
     "arduino",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "Phoenix 1.0",
   "upload": {
diff --git a/boards/phoenix_v2.json b/boards/phoenix_v2.json
@@ -14,7 +14,8 @@
   ],
   "frameworks": [
     "arduino",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "Phoenix 2.0",
   "upload": {
diff --git a/boards/sparkfunBlynk.json b/boards/sparkfunBlynk.json
@@ -14,7 +14,8 @@
   ],
   "frameworks": [
     "arduino",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "SparkFun Blynk Board",
   "upload": {
diff --git a/boards/thing.json b/boards/thing.json
@@ -14,7 +14,8 @@
   ],
   "frameworks": [
     "arduino",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "SparkFun ESP8266 Thing",
   "upload": {
diff --git a/boards/thingdev.json b/boards/thingdev.json
@@ -14,7 +14,8 @@
   ],
   "frameworks": [
     "arduino",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "SparkFun ESP8266 Thing Dev",
   "upload": {
diff --git a/boards/wifinfo.json b/boards/wifinfo.json
@@ -14,7 +14,8 @@
   ],
   "frameworks": [
     "arduino",
-    "esp8266-rtos-sdk"
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
   ],
   "name": "WifInfo",
   "upload": {
diff --git a/builder/frameworks/esp8266-nonos-sdk.py b/builder/frameworks/esp8266-nonos-sdk.py
@@ -0,0 +1,76 @@
+# Copyright 2014-present PlatformIO <contact@platformio.org>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""
+ESP8266 NONOS SDK
+
+ESP8266 SDK C/C++ only
+
+https://github.com/espressif/ESP8266_NONOS_SDK
+"""
+
+from os.path import isdir, join
+
+from SCons.Script import DefaultEnvironment
+
+env = DefaultEnvironment()
+platform = env.PioPlatform()
+
+FRAMEWORK_DIR = platform.get_package_dir("framework-esp8266-nonos-sdk")
+assert isdir(FRAMEWORK_DIR)
+
+env.Prepend(
+    CPPPATH=[
+        join(FRAMEWORK_DIR, "include"),
+        join(FRAMEWORK_DIR, "extra_include"),
+        join(FRAMEWORK_DIR, "driver_lib", "include"),
+        join(FRAMEWORK_DIR, "include", "espressif"),
+        join(FRAMEWORK_DIR, "include", "lwip"),
+        join(FRAMEWORK_DIR, "include", "lwip", "ipv4"),
+        join(FRAMEWORK_DIR, "include", "lwip", "ipv6"),
+        join(FRAMEWORK_DIR, "include", "nopoll"),
+        join(FRAMEWORK_DIR, "include", "ssl"),
+        join(FRAMEWORK_DIR, "include", "json"),
+        join(FRAMEWORK_DIR, "include", "openssl"),
+    ],
+
+    LIBPATH=[
+        join(FRAMEWORK_DIR, "lib")
+    ],
+
+    LIBS=[
+        "airkiss", "at", "c", "crypto", "driver", "espnow", "gcc", "json", "lwip",
+        "main", "mbedtls", "mesh", "net80211", "phy", "pp", "pwm", "smartconfig",
+        "ssl", "upgrade", "wpa", "wpa2", "wps"
+    ]
+)
+
+env.Replace(
+    LDSCRIPT_PATH=[join(FRAMEWORK_DIR, "ld", "eagle.app.v6.ld")],
+)
+
+#
+# Target: Build Driver Library
+#
+
+libs = []
+
+envsafe = env.Clone()
+
+libs.append(envsafe.BuildLibrary(
+    join(FRAMEWORK_DIR, "lib", "driver"),
+    join(FRAMEWORK_DIR, "driver_lib")
+))
+
+env.Prepend(LIBS=libs)
diff --git a/builder/main.py b/builder/main.py
@@ -269,7 +269,23 @@ def __fetch_spiffs_size(target, source, env):
         env.Replace(
             UPLOAD_ADDRESS="0x20000",
         )
-    else:  # Configure Native SDK
+
+    # Configure NONOS SDK
+    elif env.subst("$PIOFRAMEWORK") == "esp8266-nonos-sdk":
+        env.Append(
+            CPPPATH=[
+                join("$SDK_ESP8266_DIR", "include"), "$PROJECTSRC_DIR"
+            ],
+            CCFLAGS=[
+                "-fno-builtin-printf",
+            ]
+        )
+        env.Replace(
+            UPLOAD_ADDRESS="0x10000",
+        )
+
+    # Configure Native SDK
+    else:
         env.Append(
             CPPPATH=[
                 join("$SDK_ESP8266_DIR", "include"), "$PROJECTSRC_DIR"
diff --git a/examples/esp8266-nonos-sdk-blink/lib/readme.txt b/examples/esp8266-nonos-sdk-blink/lib/readme.txt
@@ -0,0 +1,36 @@
+
+This directory is intended for the project specific (private) libraries.
+PlatformIO will compile them to static libraries and link to executable file.
+
+The source code of each library should be placed in separate directory, like
+"lib/private_lib/[here are source files]".
+
+For example, see how can be organized `Foo` and `Bar` libraries:
+
+|--lib
+|  |--Bar
+|  |  |--docs
+|  |  |--examples
+|  |  |--src
+|  |     |- Bar.c
+|  |     |- Bar.h
+|  |--Foo
+|  |  |- Foo.c
+|  |  |- Foo.h
+|  |- readme.txt --> THIS FILE
+|- platformio.ini
+|--src
+   |- main.c
+
+Then in `src/main.c` you should use:
+
+#include <Foo.h>
+#include <Bar.h>
+
+// rest H/C/CPP code
+
+PlatformIO will find your libraries automatically, configure preprocessor's
+include paths and build them.
+
+More information about PlatformIO Library Dependency Finder
+- http://docs.platformio.org/page/librarymanager/ldf.html
diff --git a/examples/esp8266-nonos-sdk-blink/platformio.ini b/examples/esp8266-nonos-sdk-blink/platformio.ini
diff --git a/examples/esp8266-nonos-sdk-blink/src/user_config.h b/examples/esp8266-nonos-sdk-blink/src/user_config.h
diff --git a/examples/esp8266-nonos-sdk-blink/src/user_main.c b/examples/esp8266-nonos-sdk-blink/src/user_main.c
diff --git a/platform.json b/platform.json
