Merge branch 'release/v0.3.0'

ivankravets · ivankravets · commit bf0df404c469 · 2016-12-10T17:42:56.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ env:
   - PLATFORMIO_PROJECT_DIR=examples/arduino-blink
   - PLATFORMIO_PROJECT_DIR=examples/arduino-wifiscan
   - PLATFORMIO_PROJECT_DIR=examples/espidf-http-request
+  - PLATFORMIO_PROJECT_DIR=examples/simba-blink
 
 install:
   - pip install -U https://github.com/platformio/platformio/archive/develop.zip
diff --git a/boards/esp320.json b/boards/esp320.json
@@ -2,7 +2,7 @@
   "build": {
     "core": "esp32",
     "extra_flags": "-DESP32_DEV -DARDUINO_ESP320",
-    "f_cpu": "160000000L",
+    "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "qio",
     "ldscript": "esp32_out.ld",
diff --git a/boards/esp32dev.json b/boards/esp32dev.json
@@ -2,7 +2,7 @@
   "build": {
     "core": "esp32",
     "extra_flags": "-DESP32_DEV -DARDUINO_ESP32_DEV",
-    "f_cpu": "160000000L",
+    "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
diff --git a/boards/esp32thing.json b/boards/esp32thing.json
@@ -2,7 +2,7 @@
   "build": {
     "core": "esp32",
     "extra_flags": "-DESP32_DEV -DARDUINO_ESP32_DEV",
-    "f_cpu": "160000000L",
+    "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
diff --git a/boards/espea32.json b/boards/espea32.json
@@ -2,7 +2,7 @@
   "build": {
     "core": "esp32",
     "extra_flags": "-DESP32_DEV -DARDUINO_ESPea32",
-    "f_cpu": "160000000L",
+    "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
diff --git a/boards/lolin32.json b/boards/lolin32.json
@@ -2,7 +2,7 @@
   "build": {
     "core": "esp32",
     "extra_flags": "-DESP32_DEV -DARDUINO_LoLin32",
-    "f_cpu": "160000000L",
+    "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
diff --git a/boards/nano32.json b/boards/nano32.json
@@ -2,7 +2,7 @@
   "build": {
     "core": "esp32",
     "extra_flags": "-DESP32_DEV -DARDUINO_NANO32",
-    "f_cpu": "160000000L",
+    "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
@@ -11,7 +11,8 @@
   },
   "frameworks": [
     "arduino",
-    "espidf"
+    "espidf",
+    "simba"
   ],
   "name": "MakerAsia Nano32",
   "upload": {
diff --git a/boards/node32s.json b/boards/node32s.json
@@ -0,0 +1,27 @@
+{
+  "build": {
+    "core": "esp32",
+    "extra_flags": "-DESP32_DEV -DARDUINO_Node32s",
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "dio",
+    "ldscript": "esp32_out.ld",
+    "mcu": "esp32",
+    "variant": "esp32"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Node32s",
+  "upload": {
+    "maximum_ram_size": 114688,
+    "maximum_size": 1044464,
+    "require_upload_port": true,
+    "resetmethod": "nodemcu",
+    "speed": 115200,
+    "wait_for_upload_port": true
+  },
+  "url": "http://www.ayarafun.com",
+  "vendor": "Aiyarafun"
+}
diff --git a/boards/quantum.json b/boards/quantum.json
@@ -2,7 +2,7 @@
   "build": {
     "core": "esp32",
     "extra_flags": "-DESP32_DEV -DARDUINO_QUANTUM",
-    "f_cpu": "160000000L",
+    "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "qio",
     "ldscript": "esp32_out.ld",
diff --git a/builder/frameworks/arduino.py b/builder/frameworks/arduino.py
@@ -43,6 +43,7 @@
         join(FRAMEWORK_DIR, "tools", "sdk", "include", "bt"),
         join(FRAMEWORK_DIR, "tools", "sdk", "include", "driver"),
         join(FRAMEWORK_DIR, "tools", "sdk", "include", "esp32"),
+        join(FRAMEWORK_DIR, "tools", "sdk", "include", "ethernet"),
         join(FRAMEWORK_DIR, "tools", "sdk", "include", "freertos"),
         join(FRAMEWORK_DIR, "tools", "sdk", "include", "log"),
         join(FRAMEWORK_DIR, "tools", "sdk", "include", "lwip"),
@@ -62,10 +63,12 @@
         join(FRAMEWORK_DIR, "tools", "sdk", "ld"),
     ],
     LIBS=[
-        "hal", "core", "net80211", "phy", "rtc", "pp", "wpa",
-        "smartconfig", "btdm_app", "bt", "driver", "esp32", "crypto", "expat",
-        "freertos", "json", "log", "lwip", "mbedtls", "nghttp", "nvs_flash",
-        "spi_flash", "tcpip_adapter", "newlib", "vfs", "gcc", "m", "c"
+        "app_update", "bt", "btdm_app", "c", "coexist", "core", "driver",
+        "esp32", "ethernet", "expat", "freertos", "g", "hal", "json", "log",
+        "lwip", "m", "mbedtls", "net80211", "newlib", "nghttp", "nvs_flash",
+        "openssl", "phy", "pp", "rtc", "smartconfig", "spi_flash",
+        "tcpip_adapter", "ulp", "vfs", "wpa", "wpa2", "wpa_supplicant", "wps",
+        "xtensa-debug-module"
     ]
 )
 
diff --git a/builder/frameworks/simba.py b/builder/frameworks/simba.py
@@ -0,0 +1,58 @@
+# 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.
+
+"""Simba
+
+Simba is an RTOS and build framework. It aims to make embedded
+programming easy and portable.
+
+http://simba-os.readthedocs.org
+
+"""
+
+from os.path import join, sep
+
+from SCons.Script import DefaultEnvironment, SConscript
+
+from platformio.builder.tools import platformio as platformio_tool
+
+#
+# Backward compatibility with PlatformIO 2.0
+#
+platformio_tool.SRC_DEFAULT_FILTER = " ".join([
+    "+<*>", "-<.git%s>" % sep, "-<svn%s>" % sep,
+    "-<example%s>" % sep, "-<examples%s>" % sep,
+    "-<test%s>" % sep, "-<tests%s>" % sep
+])
+
+
+def LookupSources(env, variant_dir, src_dir, duplicate=True, src_filter=None):
+    return env.CollectBuildFiles(variant_dir, src_dir, src_filter, duplicate)
+
+
+def VariantDirWrap(env, variant_dir, src_dir, duplicate=False):
+    env.VariantDir(variant_dir, src_dir, duplicate)
+
+
+env = DefaultEnvironment()
+
+env.AddMethod(LookupSources)
+env.AddMethod(VariantDirWrap)
+
+env.Replace(
+    PLATFORMFW_DIR=env.PioPlatform().get_package_dir("framework-simba")
+)
+
+SConscript(
+    [env.subst(join("$PLATFORMFW_DIR", "make", "platformio.sconscript"))])
diff --git a/builder/main.py b/builder/main.py
@@ -87,6 +87,7 @@ def _get_board_f_flash(env):
     FRAMEWORK_ARDUINOESP32_DIR=platform.get_package_dir(
         "framework-arduinoespressif32"),
     ESPIDF_DIR=platform.get_package_dir("framework-espidf"),
+    FRAMEWORK_SIMBA_DIR=platform.get_package_dir("framework-simba"),
 
     #
     # Upload
@@ -128,6 +129,16 @@ def _get_board_f_flash(env):
             "0x10000"
         ]
     )
+if env.subst("$PIOFRAMEWORK") == "simba":
+    env.Append(
+        UPLOADERFLAGS=[
+            "0x1000", join("$FRAMEWORK_SIMBA_DIR", "3pp", "esp32",
+                           "bin", "bootloader.bin"),
+            "0x4000", join("$FRAMEWORK_SIMBA_DIR", "3pp", "esp32",
+                           "bin", "partitions_singleapp.bin"),
+            "0x10000"
+        ]
+    )
 
 
 env.Append(
diff --git a/examples/simba-blink/.gitignore b/examples/simba-blink/.gitignore
@@ -0,0 +1,3 @@
+.pioenvs
+.clang_complete
+.gcc-flags.json
diff --git a/examples/simba-blink/.travis.yml b/examples/simba-blink/.travis.yml
@@ -0,0 +1,65 @@
+# Continuous Integration (CI) is the practice, in software
+# engineering, of merging all developer working copies with a shared mainline
+# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
+#
+# Documentation:
+#
+# * Travis CI Embedded Builds with PlatformIO
+#   < https://docs.travis-ci.com/user/integration/platformio/ >
+#
+# * PlatformIO integration with Travis CI
+#   < http://docs.platformio.org/en/stable/ci/travis.html >
+#
+# * User Guide for `platformio ci` command
+#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
+#
+#
+# Please choice one of the following templates (proposed below) and uncomment
+# it (remove "# " before each line) or use own configuration according to the
+# Travis CI documentation (see above).
+#
+
+
+#
+# Template #1: General project. Test it using existing `platformio.ini`.
+#
+
+# language: python
+# python:
+#     - "2.7"
+#
+# sudo: false
+# cache:
+#     directories:
+#         - "~/.platformio"
+#
+# install:
+#     - pip install -U platformio
+#
+# script:
+#     - platformio run
+
+
+#
+# Template #2: The project is intended to by used as a library with examples
+#
+
+# language: python
+# python:
+#     - "2.7"
+#
+# sudo: false
+# cache:
+#     directories:
+#         - "~/.platformio"
+#
+# env:
+#     - PLATFORMIO_CI_SRC=path/to/test/file.c
+#     - PLATFORMIO_CI_SRC=examples/file.ino
+#     - PLATFORMIO_CI_SRC=path/to/test/directory
+#
+# install:
+#     - pip install -U platformio
+#
+# script:
+#     - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N
diff --git a/examples/simba-blink/README.rst b/examples/simba-blink/README.rst
@@ -0,0 +1,29 @@
+..  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.
+
+How to build PlatformIO based project
+=====================================
+
+1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
+2. Download `development platform with examples <https://github.com/platformio/platform-espressif32/archive/develop.zip>`_
+3. Extract ZIP archive
+4. Run these commands:
+
+.. code-block:: bash
+
+    # Change directory to example
+    > cd platform-espressif32/examples/simba-blink
+
+    # Process example project
+    > platformio run
+
+    # Upload firmware
+    > platformio run --target upload
diff --git a/examples/simba-blink/lib/readme.txt b/examples/simba-blink/lib/readme.txt
@@ -0,0 +1,38 @@
+
+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 organised `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.
+
+See additional options for PlatformIO Library Dependency Finder `lib_*`:
+
+http://docs.platformio.org/en/stable/projectconf.html#lib-install
+
diff --git a/examples/simba-blink/platformio.ini b/examples/simba-blink/platformio.ini
@@ -0,0 +1,13 @@
+; PlatformIO Project Configuration File
+;
+;   Build options: build flags, source filter, extra scripting
+;   Upload options: custom port, speed and extra flags
+;   Library options: dependencies, extra library storages
+;
+; Please visit documentation for the other options and examples
+; http://docs.platformio.org/en/stable/projectconf.html
+
+[env:nano32]
+platform = espressif32
+framework = simba
+board = nano32
diff --git a/examples/simba-blink/src/main.c b/examples/simba-blink/src/main.c
diff --git a/platform.json b/platform.json
