Merge branch 'release/v2.6.3'

platformio · Feb 3, 2021 · d0da799 · d0da799
2 parents 41bdd3e + 4d1f003
commit d0da799
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 21 deletions.
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-16.04, windows-latest, macos-latest]
-        python-version: [2.7, 3.7]
+        python-version: [3.7]
         example:
           - "examples/arduino-asyncudp"
           - "examples/arduino-blink"

diff --git a/boards/esp07.json b/boards/esp07.json
@@ -1,15 +1,15 @@
 {
   "build": {
     "arduino": {
-      "ldscript": "eagle.flash.4m1m.ld"
+      "ldscript": "eagle.flash.1m256.ld"
     },
     "core": "esp8266",
     "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP07",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "qio",
     "mcu": "esp8266",
-    "variant": "nodemcu"
+    "variant": "generic"
   },
   "connectivity": [
     "wifi"
@@ -19,12 +19,12 @@
     "esp8266-rtos-sdk",
     "esp8266-nonos-sdk"
   ],
-  "name": "Espressif Generic ESP8266 ESP-07",
+  "name": "Espressif Generic ESP8266 ESP-07 1MB",
   "upload": {
     "maximum_ram_size": 81920,
-    "maximum_size": 4194304,
+    "maximum_size": 1048576,
     "require_upload_port": true,
-    "resetmethod": "nodemcu",
+    "resetmethod": "ck",
     "speed": 115200
   },
   "url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family#esp-07",

diff --git a/boards/esp07s.json b/boards/esp07s.json
@@ -0,0 +1,32 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "eagle.flash.4m1m.ld"
+    },
+    "core": "esp8266",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP07",
+    "f_cpu": "80000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "qio",
+    "mcu": "esp8266",
+    "variant": "nodemcu"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "frameworks": [
+    "arduino",
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
+  ],
+  "name": "Espressif Generic ESP8266 ESP-07S",
+  "upload": {
+    "maximum_ram_size": 81920,
+    "maximum_size": 4194304,
+    "require_upload_port": true,
+    "resetmethod": "nodemcu",
+    "speed": 115200
+  },
+  "url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family#esp-07",
+  "vendor": "Espressif"
+}
diff --git a/platform.json b/platform.json
@@ -5,26 +5,19 @@
   "homepage": "https://espressif.com/",
   "license": "Apache-2.0",
   "keywords": [
-      "dev-platform",
-      "Wi-Fi",
-      "Xtensa",
-      "106Micro"
+    "dev-platform",
+    "Wi-Fi",
+    "Xtensa",
+    "106Micro"
   ],
   "engines": {
-    "platformio": "<5"
+    "platformio": "^5"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/platformio/platform-espressif8266.git"
   },
-  "version": "2.6.2",
-  "packageRepositories": [
-    "https://dl.bintray.com/platformio/dl-packages/manifest.json",
-    "http://dl.platformio.org/packages/manifest.json",
-    "https://raw.githubusercontent.com/eerimoq/simba/master/make/platformio/manifest.json",
-    "https://raw.githubusercontent.com/yanbe/framework-esp8266-rtos-sdk/master/manifest.json",
-    "https://raw.githubusercontent.com/sanderv32/framework-esp8266-nonos-sdk/master/manifest.json"
-  ],
+  "version": "2.6.3",
   "frameworks": {
     "arduino": {
       "package": "framework-arduinoespressif8266",
@@ -52,44 +45,54 @@
   "packages": {
     "toolchain-xtensa": {
       "type": "toolchain",
-      "version": "~2.40802.191122"
+      "owner": "platformio",
+      "version": "~2.40802.0",
+      "optionalVersions": ["~1.40802.0"]
     },
     "framework-arduinoespressif8266": {
       "type": "framework",
       "optional": true,
+      "owner": "platformio",
       "version": "~3.20704.0"
     },
     "framework-esp8266-rtos-sdk": {
       "type": "framework",
       "optional": true,
+      "owner": "platformio",
       "version": ">=1.5.0-beta"
     },
     "framework-esp8266-nonos-sdk": {
       "type": "framework",
       "optional": true,
+      "owner": "platformio",
       "version": ">=2.1.0"
     },
     "framework-simba": {
       "type": "framework",
       "optional": true,
+      "owner": "platformio",
       "version": ">=7.0.0"
     },
     "tool-esptool": {
       "type": "uploader",
+      "owner": "platformio",
       "version": "<2"
     },
     "tool-esptoolpy": {
       "type": "uploader",
-      "version": "~1.20800.0"
+      "owner": "platformio",
+      "version": "~1.30000.0"
     },
     "tool-mkspiffs": {
       "type": "uploader",
       "optional": true,
+      "owner": "platformio",
       "version": "~1.200.0"
     },
     "tool-mklittlefs": {
       "type": "uploader",
       "optional": true,
+      "owner": "platformio",
       "version": "~1.203.0"
     }
   }