Merge branch 'release/v3.0.0'

platformio · May 31, 2021 · 3c40378 · 3c40378
2 parents d0da799 + 02c28bc
commit 3c40378
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 24 deletions.
diff --git a/boards/agruminolemon.json b/boards/agruminolemon.json
@@ -0,0 +1,33 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "eagle.flash.4m1m.ld"
+    },
+    "core": "esp8266",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_AGRUMINO_LEMON_V4",
+    "f_cpu": "80000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "dio",
+    "mcu": "esp8266",
+    "variant": "agruminolemonv4"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "frameworks": [
+    "arduino",
+    "simba",
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
+  ],
+  "name": "Lifely Agrumino Lemon v4",
+  "upload": {
+    "maximum_ram_size": 81920,
+    "maximum_size": 4194304,
+    "require_upload_port": true,
+    "resetmethod": "nodemcu",
+    "speed": 115200
+  },
+  "url": "https://www.lifely.cc/lifely-3-0/",
+  "vendor": "Lifely"
+}
diff --git a/boards/gen4iod.json b/boards/gen4iod.json
@@ -4,7 +4,7 @@
       "ldscript": "eagle.flash.512k64.ld"
     },
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_GEN4_IOD",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_GEN4_IOD",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "qio",

diff --git a/boards/huzzah.json b/boards/huzzah.json
@@ -4,7 +4,7 @@
       "ldscript": "eagle.flash.4m1m.ld"
     },
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP12",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ADAFRUIT_HUZZAH",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "qio",

diff --git a/boards/inventone.json b/boards/inventone.json
@@ -4,7 +4,7 @@
       "ldscript": "eagle.flash.4m1m.ld"
     },
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_GENERIC",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_INVENT_ONE",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",

diff --git a/boards/nodemcuv2.json b/boards/nodemcuv2.json
@@ -4,7 +4,7 @@
       "ldscript": "eagle.flash.4m1m.ld"
     },
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_NODEMCU",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_NODEMCU_ESP12E",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",

diff --git a/boards/wifinfo.json b/boards/wifinfo.json
@@ -4,7 +4,7 @@
       "ldscript": "eagle.flash.1m256.ld"
     },
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_WIFINFO",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_WIFINFO",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "qio",

diff --git a/boards/xinabox_cw01.json b/boards/xinabox_cw01.json
@@ -4,7 +4,7 @@
       "ldscript": "eagle.flash.4m1m.ld"
     },
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_GENERIC",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_XINABOX_CW01",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "qio",

diff --git a/builder/main.py b/builder/main.py
@@ -246,8 +246,9 @@ def get_esptoolpy_reset_flags(resetmethod):
     else:
         target_firm = env.ElfToBin(
             join("$BUILD_DIR", "${PROGNAME}"), target_elf)
+        env.Depends(target_firm, "checkprogsize")
 
-env.AddPlatformTarget("buildfs", target_firm, None, "Build Filesystem Image")
+env.AddPlatformTarget("buildfs", target_firm, target_firm, "Build Filesystem Image")
 AlwaysBuild(env.Alias("nobuild", target_firm))
 target_buildprog = env.Alias("buildprog", target_firm, target_firm)
 

diff --git a/examples/arduino-asyncudp/.gitignore b/examples/arduino-asyncudp/.gitignore
@@ -1,2 +1 @@
-.pioenvs
-.piolibdeps
+.pio
diff --git a/examples/arduino-blink/.gitignore b/examples/arduino-blink/.gitignore
@@ -1,2 +1 @@
-.pioenvs
-.piolibdeps
+.pio
diff --git a/examples/arduino-webserver/.gitignore b/examples/arduino-webserver/.gitignore
@@ -1,2 +1 @@
-.pioenvs
-.piolibdeps
+.pio
diff --git a/examples/arduino-wifiscan/.gitignore b/examples/arduino-wifiscan/.gitignore
@@ -1,2 +1 @@
-.pioenvs
-.piolibdeps
+.pio
diff --git a/examples/esp8266-nonos-sdk-blink/.gitignore b/examples/esp8266-nonos-sdk-blink/.gitignore
@@ -1,2 +1 @@
-.pioenvs
-.piolibdeps
+.pio
diff --git a/examples/esp8266-rtos-sdk-blink/.gitignore b/examples/esp8266-rtos-sdk-blink/.gitignore
@@ -1,2 +1 @@
-.pioenvs
-.piolibdeps
+.pio
diff --git a/examples/simba-blink/.gitignore b/examples/simba-blink/.gitignore
@@ -1,2 +1 @@
-.pioenvs
-.piolibdeps
+.pio
diff --git a/platform.json b/platform.json
@@ -17,7 +17,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-espressif8266.git"
   },
-  "version": "2.6.3",
+  "version": "3.0.0",
   "frameworks": {
     "arduino": {
       "package": "framework-arduinoespressif8266",
@@ -46,14 +46,14 @@
     "toolchain-xtensa": {
       "type": "toolchain",
       "owner": "platformio",
-      "version": "~2.40802.0",
+      "version": "~2.100200.0",
       "optionalVersions": ["~1.40802.0"]
     },
     "framework-arduinoespressif8266": {
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~3.20704.0"
+      "version": "~3.30000.0"
     },
     "framework-esp8266-rtos-sdk": {
       "type": "framework",