Fix issue with broken examples for NONOS SDK and RTOS SDK // Resolve platformio#62 Resolve platformio#133

Author: ivankravets

builder/frameworks/esp8266-nonos-sdk.py

@@ -99,15 +99,22 @@
         "airkiss", "at", "c", "crypto", "driver", "espnow", "gcc", "json", "lwip",
         "main", "mbedtls", "mesh", "net80211", "phy", "pp", "pwm", "smartconfig",
         "ssl", "upgrade", "wpa", "wpa2", "wps"
+    ],
+
+    FLASH_EXTRA_IMAGES=[
+        ("0x00000", join("$BUILD_DIR", "eagle.flash.bin")),
+        ("0x10000", join("$BUILD_DIR", "eagle.irom0text.bin")),
+        ("0x1fc000" if env.BoardConfig().get(
+            "upload.maximum_size", 0) < 4194304 else "0x3fc000",
+            join(FRAMEWORK_DIR, "bin", "esp_init_data_default.bin"))
     ]
 )
 
 # copy CCFLAGS to ASFLAGS (-x assembler-with-cpp mode)
 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")
 )
 
 #

builder/frameworks/esp8266-rtos-sdk.py

@@ -99,15 +99,22 @@
         "cirom", "crypto", "driver", "espconn", "espnow", "freertos", "gcc",
         "json", "hal", "lwip", "main", "mesh", "mirom", "net80211", "nopoll",
         "phy", "pp", "pwm", "smartconfig", "spiffs", "ssl", "wpa", "wps"
+    ],
+
+    FLASH_EXTRA_IMAGES=[
+        ("0x00000", join("$BUILD_DIR", "eagle.flash.bin")),
+        ("0x10000", join("$BUILD_DIR", "eagle.irom0text.bin")),
+        ("0x1fc000" if env.BoardConfig().get(
+            "upload.maximum_size", 0) < 4194304 else "0x3fc000",
+            join(FRAMEWORK_DIR, "bin", "esp_init_data_default.bin"))
     ]
 )
 
 # copy CCFLAGS to ASFLAGS (-x assembler-with-cpp mode)
 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"),
 )
 
 #

builder/main.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
     #
@@ -215,9 +207,10 @@ def _update_max_upload_size(env):
             ElfToBin=Builder(
                 action=env.VerboseAction(" ".join([
                     '"$OBJCOPY"',
-                    "-eo",
-                    '"%s"' % join("$FRAMEWORK_ARDUINOESP8266_DIR",
-                                  "bootloaders", "eboot", "eboot.elf"),
+                    "-eo", '"%s"' % join(
+                        platform.get_package_dir(
+                            "framework-arduinoespressif8266"),
+                        "bootloaders", "eboot", "eboot.elf"),
                     "-bo", "$TARGET",
                     "-bm", "$BOARD_FLASH_MODE",
                     "-bf", "${__get_board_f_flash(__env__)}",
@@ -366,14 +359,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)}"])

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

@@ -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-rtos-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

platform.json

@@ -76,10 +76,6 @@
       "type": "uploader",
       "optional": true,
       "version": "~1.200.0"
-    },
-    "sdk-esp8266": {
-      "optional": true,
-      "version": "~1.10502.0"
     }
   }
 }