Merge branch 'release/v2.0.4'

Author: ivankravets

.travis.yml

@@ -9,7 +9,6 @@ env:
   - PLATFORMIO_PROJECT_DIR=examples/arduino-webserver
   - PLATFORMIO_PROJECT_DIR=examples/arduino-wifiscan
   - PLATFORMIO_PROJECT_DIR=examples/esp8266-rtos-sdk-blink
-  - PLATFORMIO_PROJECT_DIR=examples/native-sdk
   - PLATFORMIO_PROJECT_DIR=examples/simba-blink
 
 install:

appveyor.yml

@@ -6,7 +6,6 @@ environment:
     - PLATFORMIO_PROJECT_DIR: "examples/arduino-webserver"
     - PLATFORMIO_PROJECT_DIR: "examples/arduino-wifiscan"
     - PLATFORMIO_PROJECT_DIR: "examples/esp8266-rtos-sdk-blink"
-    - PLATFORMIO_PROJECT_DIR: "examples/native-sdk"
     - PLATFORMIO_PROJECT_DIR: "examples/simba-blink"
 
 install:

builder/frameworks/_bare.py

@@ -106,10 +106,35 @@
 env.Append(ASFLAGS=env.get("CCFLAGS", [])[:])
 
 env.Replace(
-    LDSCRIPT_PATH=[join(FRAMEWORK_DIR, "ld", "eagle.app.v6.ld")],
-    UPLOAD_ADDRESS="0x10000"
+    LDSCRIPT_PATH=join(FRAMEWORK_DIR, "ld", "eagle.app.v6.ld")
 )
 
+board_flash_size = int(env.BoardConfig().get("upload.maximum_size", 0))
+if board_flash_size > 8388608:
+    init_data_flash_address = 0xffc000  # for 16 MB
+elif board_flash_size > 4194304:
+    init_data_flash_address = 0x7fc000  # for 8 MB
+elif board_flash_size > 2097152:
+    init_data_flash_address = 0x3fc000  # for 4 MB
+elif board_flash_size > 1048576:
+    init_data_flash_address = 0x1fc000  # for 2 MB
+elif board_flash_size > 524288:
+    init_data_flash_address = 0xfc000  # for 1 MB
+else:
+    init_data_flash_address = 0x7c000  # for 512 kB
+
+env.Append(
+    FLASH_EXTRA_IMAGES=[
+        ("0x00000", join("$BUILD_DIR", "eagle.flash.bin")),
+        ("0x10000", join("$BUILD_DIR", "eagle.irom0text.bin")),
+        (hex(init_data_flash_address),
+            join(FRAMEWORK_DIR, "bin", "esp_init_data_default.bin")),
+        (hex(init_data_flash_address + 0x2000),
+            join(FRAMEWORK_DIR, "bin", "blank.bin"))
+    ]
+)
+
+
 #
 # Target: Build Driver Library
 #

builder/frameworks/esp8266-nonos-sdk.py

@@ -106,8 +106,33 @@
 env.Append(ASFLAGS=env.get("CCFLAGS", [])[:])
 
 env.Replace(
-    LDSCRIPT_PATH=[join(FRAMEWORK_DIR, "ld", "eagle.app.v6.ld")],
-    UPLOAD_ADDRESS="0x20000"
+    LDSCRIPT_PATH=join(FRAMEWORK_DIR, "ld", "eagle.app.v6.ld"),
+)
+
+# Extra flash images
+board_flash_size = int(env.BoardConfig().get("upload.maximum_size", 0))
+if board_flash_size > 8388608:
+    init_data_flash_address = 0xffc000  # for 16 MB
+elif board_flash_size > 4194304:
+    init_data_flash_address = 0x7fc000  # for 8 MB
+elif board_flash_size > 2097152:
+    init_data_flash_address = 0x3fc000  # for 4 MB
+elif board_flash_size > 1048576:
+    init_data_flash_address = 0x1fc000  # for 2 MB
+elif board_flash_size > 524288:
+    init_data_flash_address = 0xfc000  # for 1 MB
+else:
+    init_data_flash_address = 0x7c000  # for 512 kB
+
+env.Append(
+    FLASH_EXTRA_IMAGES=[
+        ("0x00000", join("$BUILD_DIR", "eagle.flash.bin")),
+        ("0x20000", join("$BUILD_DIR", "eagle.irom0text.bin")),
+        (hex(init_data_flash_address),
+            join(FRAMEWORK_DIR, "bin", "esp_init_data_default.bin")),
+        (hex(init_data_flash_address + 0x2000),
+            join(FRAMEWORK_DIR, "bin", "blank.bin"))
+    ]
 )
 
 #

builder/frameworks/esp8266-rtos-sdk.py

@@ -142,14 +142,6 @@ def _update_max_upload_size(env):
 
     ARFLAGS=["rc"],
 
-    #
-    # Packages
-    #
-
-    FRAMEWORK_ARDUINOESP8266_DIR=platform.get_package_dir(
-        "framework-arduinoespressif8266"),
-    SDK_ESP8266_DIR=platform.get_package_dir("sdk-esp8266"),
-
     #
     # Misc
     #
@@ -210,14 +202,21 @@ def _update_max_upload_size(env):
 #
 
 if env.subst("$PIOFRAMEWORK") in ("arduino", "simba"):
+    if "simba" in env.subst("$PIOFRAMEWORK"):
+        ebootelf_path = join(
+            platform.get_package_dir("framework-simba") or "", "3pp",
+            "esp8266Arduino", "2.3.0", "bootloaders", "eboot", "eboot.elf")
+    else:
+        ebootelf_path = join(
+            platform.get_package_dir("framework-arduinoespressif8266") or "",
+            "bootloaders", "eboot", "eboot.elf")
+
     env.Append(
         BUILDERS=dict(
             ElfToBin=Builder(
                 action=env.VerboseAction(" ".join([
                     '"$OBJCOPY"',
-                    "-eo",
-                    '"%s"' % join("$FRAMEWORK_ARDUINOESP8266_DIR",
-                                  "bootloaders", "eboot", "eboot.elf"),
+                    "-eo", '"%s"' % ebootelf_path,
                     "-bo", "$TARGET",
                     "-bm", "$BOARD_FLASH_MODE",
                     "-bf", "${__get_board_f_flash(__env__)}",
@@ -261,9 +260,6 @@ def _update_max_upload_size(env):
         )
     )
 
-if not env.get("PIOFRAMEWORK"):
-    env.SConscript("frameworks/_bare.py", exports="env")
-
 #
 # Target: Build executable and linkable firmware or SPIFFS image
 #
@@ -366,14 +362,9 @@ def _update_max_upload_size(env):
         UPLOADCMD='$UPLOADER $UPLOADERFLAGS -cf $SOURCE',
     )
     if env.subst("$PIOFRAMEWORK") not in ("arduino", "simba"):  # SDK
-        env.Append(
-            UPLOADERFLAGS=[
-                "-ca", "0x00000",
-                "-cf", "${SOURCES[0]}",
-                "-ca", "$UPLOAD_ADDRESS",
-                "-cf", "${SOURCES[1]}"
-            ]
-        )
+        for image in env.get("FLASH_EXTRA_IMAGES", []):
+            env.Append(
+                UPLOADERFLAGS=["-ca", image[0], "-cf", env.subst(image[1])])
         env.Replace(UPLOADCMD="$UPLOADER $UPLOADERFLAGS")
     elif "uploadfs" in COMMAND_LINE_TARGETS:
         env.Append(UPLOADERFLAGS=["-ca", "${hex(SPIFFS_START)}"])

builder/main.py

@@ -8,6 +8,12 @@
 ; Please visit documentation for the other options and examples
 ; http://docs.platformio.org/page/projectconf.html
 
+[env:nodemcuv2]
+platform = espressif8266
+board = nodemcuv2
+framework = esp8266-nonos-sdk
+monitor_speed = 74880
+
 [env:esp12e]
 platform = espressif8266
 board = esp12e

examples/esp8266-nonos-sdk-blink/platformio.ini

@@ -7,6 +7,12 @@
 ;
 ; Please visit documentation for the other options and examples
 ; http://docs.platformio.org/page/projectconf.html
+
+[env:nodemcuv2]
+platform = espressif8266
+framework = esp8266-rtos-sdk
+board = nodemcuv2
+
 [env:esp_wroom_02]
 platform = espressif8266
 framework = esp8266-rtos-sdk