Merge branch 'release/v0.11.0'

platformio · Nov 27, 2017 · e789b9f · e789b9f
2 parents 949098a + 8ff4af6
commit e789b9f
Show file tree

Hide file tree

Showing 36 changed files with 229 additions and 97 deletions.
diff --git a/boards/esp-wrover-kit.json b/boards/esp-wrover-kit.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DESP32_DEV -DARDUINO_ESP32_DEV",
+    "extra_flags": "-DARDUINO_ESP32_DEV",
     "f_cpu": "240000000L",
     "hwids": [
       [
@@ -31,7 +31,6 @@
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
     "require_upload_port": true,
-    "resetmethod": "nodemcu",
     "speed": 115200,
     "wait_for_upload_port": true
   },

diff --git a/boards/esp32-evb.json b/boards/esp32-evb.json
@@ -1,9 +1,9 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DESP32_DEV -DARDUINO_ESP32-EVB",
+    "extra_flags": "-DARDUINO_ESP32-EVB",
     "f_cpu": "240000000L",
-    "f_flash": "80000000L",
+    "f_flash": "40000000L",
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
     "mcu": "esp32",
@@ -25,7 +25,6 @@
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
     "require_upload_port": true,
-    "resetmethod": "nodemcu",
     "speed": 115200,
     "wait_for_upload_port": true
   },

diff --git a/boards/esp32-gateway.json b/boards/esp32-gateway.json
@@ -1,9 +1,9 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DESP32_DEV -DARDUINO_ESP32-GATEWAY",
+    "extra_flags": "-DARDUINO_ESP32-GATEWAY",
     "f_cpu": "240000000L",
-    "f_flash": "80000000L",
+    "f_flash": "40000000L",
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
     "mcu": "esp32",
@@ -25,7 +25,6 @@
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
     "require_upload_port": true,
-    "resetmethod": "nodemcu",
     "speed": 115200,
     "wait_for_upload_port": true
   },

diff --git a/boards/esp320.json b/boards/esp320.json
@@ -1,9 +1,9 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DESP32_DEV -DARDUINO_ESP320",
+    "extra_flags": "-DARDUINO_ESP320",
     "f_cpu": "240000000L",
-    "f_flash": "80000000L",
+    "f_flash": "40000000L",
     "flash_mode": "qio",
     "ldscript": "esp32_out.ld",
     "mcu": "esp32",
@@ -25,7 +25,6 @@
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
     "require_upload_port": true,
-    "resetmethod": "nodemcu",
     "speed": 115200,
     "wait_for_upload_port": true
   },

diff --git a/boards/esp32dev.json b/boards/esp32dev.json
@@ -1,9 +1,9 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DESP32_DEV -DARDUINO_ESP32_DEV",
+    "extra_flags": "-DARDUINO_ESP32_DEV",
     "f_cpu": "240000000L",
-    "f_flash": "80000000L",
+    "f_flash": "40000000L",
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
     "mcu": "esp32",
@@ -25,7 +25,6 @@
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
     "require_upload_port": true,
-    "resetmethod": "nodemcu",
     "speed": 115200,
     "wait_for_upload_port": true
   },

diff --git a/boards/esp32doit-devkit-v1.json b/boards/esp32doit-devkit-v1.json
@@ -1,9 +1,9 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DESP32_DEV -DARDUINO_ESP32_DEV",
+    "extra_flags": "-DARDUINO_ESP32_DEV",
     "f_cpu": "240000000L",
-    "f_flash": "80000000L",
+    "f_flash": "40000000L",
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
     "mcu": "esp32",
@@ -25,7 +25,6 @@
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
     "require_upload_port": true,
-    "resetmethod": "nodemcu",
     "speed": 115200,
     "wait_for_upload_port": true
   },

diff --git a/boards/esp32thing.json b/boards/esp32thing.json
@@ -1,9 +1,9 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DESP32_DEV -DARDUINO_ESP32_THING",
+    "extra_flags": "-DARDUINO_ESP32_THING",
     "f_cpu": "240000000L",
-    "f_flash": "80000000L",
+    "f_flash": "40000000L",
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
     "mcu": "esp32",
@@ -25,7 +25,6 @@
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
     "require_upload_port": true,
-    "resetmethod": "nodemcu",
     "speed": 115200,
     "wait_for_upload_port": true
   },

diff --git a/boards/esp32vn-iot-uno.json b/boards/esp32vn-iot-uno.json
@@ -1,9 +1,9 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DESP32_DEV -DARDUINO_esp32vn-iot-uno",
+    "extra_flags": "-DARDUINO_esp32vn-iot-uno",
     "f_cpu": "240000000L",
-    "f_flash": "80000000L",
+    "f_flash": "40000000L",
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
     "mcu": "esp32",
@@ -25,7 +25,6 @@
     "maximum_ram_size": 294912,
     "maximum_size": 1044464,
     "require_upload_port": true,
-    "resetmethod": "nodemcu",
     "speed": 115200,
     "wait_for_upload_port": true
   },

diff --git a/boards/espea32.json b/boards/espea32.json
@@ -1,9 +1,9 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DESP32_DEV -DARDUINO_ESPea32",
+    "extra_flags": "-DARDUINO_ESPea32",
     "f_cpu": "240000000L",
-    "f_flash": "80000000L",
+    "f_flash": "40000000L",
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
     "mcu": "esp32",
@@ -25,7 +25,6 @@
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
     "require_upload_port": true,
-    "resetmethod": "nodemcu",
     "speed": 115200,
     "wait_for_upload_port": true
   },

diff --git a/boards/espectro32.json b/boards/espectro32.json
@@ -1,10 +1,10 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DESP32_DEV -DARDUINO_ESPECTRO32",
+    "extra_flags": "-DARDUINO_ESPECTRO32",
     "f_cpu": "240000000L",
-    "f_flash": "80000000L",
-    "flash_mode": "qio",
+    "f_flash": "40000000L",
+    "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
     "mcu": "esp32",
     "variant": "espectro32"
@@ -25,7 +25,6 @@
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
     "require_upload_port": true,
-    "resetmethod": "nodemcu",
     "speed": 2000000,
     "wait_for_upload_port": true
   },

diff --git a/boards/espino32.json b/boards/espino32.json
@@ -1,9 +1,9 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DESP32_DEV -DARDUINO_ESPino32",
+    "extra_flags": "-DARDUINO_ESPino32",
     "f_cpu": "240000000L",
-    "f_flash": "80000000L",
+    "f_flash": "40000000L",
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
     "mcu": "esp32",
@@ -25,7 +25,6 @@
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
     "require_upload_port": true,
-    "resetmethod": "nodemcu",
     "speed": 115200,
     "wait_for_upload_port": true
   },

diff --git a/boards/featheresp32.json b/boards/featheresp32.json
@@ -1,9 +1,9 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DESP32_DEV -DARDUINO_FEATHER_ESP32",
+    "extra_flags": "-DARDUINO_FEATHER_ESP32",
     "f_cpu": "240000000L",
-    "f_flash": "80000000L",
+    "f_flash": "40000000L",
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
     "mcu": "esp32",
@@ -25,7 +25,6 @@
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
     "require_upload_port": true,
-    "resetmethod": "nodemcu",
     "speed": 115200,
     "wait_for_upload_port": true
   },

diff --git a/boards/firebeetle32.json b/boards/firebeetle32.json
@@ -1,9 +1,9 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DESP32_DEV -DARDUINO_ESP32_DEV",
+    "extra_flags": "-DARDUINO_ESP32_DEV",
     "f_cpu": "240000000L",
-    "f_flash": "80000000L",
+    "f_flash": "40000000L",
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
     "mcu": "esp32",
@@ -25,7 +25,6 @@
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
     "require_upload_port": true,
-    "resetmethod": "nodemcu",
     "speed": 115200,
     "wait_for_upload_port": true
   },

diff --git a/boards/heltec_wifi_kit_32.json b/boards/heltec_wifi_kit_32.json
@@ -1,9 +1,9 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DESP32_DEV -DARDUINO_Heltec_WIFI_Kit_32",
+    "extra_flags": "-DARDUINO_Heltec_WIFI_Kit_32",
     "f_cpu": "240000000L",
-    "f_flash": "80000000L",
+    "f_flash": "40000000L",
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
     "mcu": "esp32",
@@ -25,7 +25,6 @@
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
     "require_upload_port": true,
-    "resetmethod": "nodemcu",
     "speed": 115200,
     "wait_for_upload_port": true
   },

diff --git a/boards/heltec_wifi_lora_32.json b/boards/heltec_wifi_lora_32.json
@@ -1,9 +1,9 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DESP32_DEV -DARDUINO_Heltec_WIFI_LoRa_32",
+    "extra_flags": "-DARDUINO_Heltec_WIFI_LoRa_32",
     "f_cpu": "240000000L",
-    "f_flash": "80000000L",
+    "f_flash": "40000000L",
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
     "mcu": "esp32",
@@ -25,7 +25,6 @@
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
     "require_upload_port": true,
-    "resetmethod": "nodemcu",
     "speed": 115200,
     "wait_for_upload_port": true
   },

diff --git a/boards/hornbill32dev.json b/boards/hornbill32dev.json
@@ -1,9 +1,9 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DESP32_DEV -DARDUINO_HORNBILL_ESP32_DEV",
+    "extra_flags": "-DARDUINO_HORNBILL_ESP32_DEV",
     "f_cpu": "240000000L",
-    "f_flash": "80000000L",
+    "f_flash": "40000000L",
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
     "mcu": "esp32",
@@ -25,7 +25,6 @@
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
     "require_upload_port": true,
-    "resetmethod": "nodemcu",
     "speed": 115200,
     "wait_for_upload_port": true
   },

diff --git a/boards/hornbill32minima.json b/boards/hornbill32minima.json
@@ -1,9 +1,9 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DESP32_DEV -DARDUINO_HORNBILL_ESP32_MINIMA",
+    "extra_flags": "-DARDUINO_HORNBILL_ESP32_MINIMA",
     "f_cpu": "240000000L",
-    "f_flash": "80000000L",
+    "f_flash": "40000000L",
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
     "mcu": "esp32",
@@ -25,7 +25,6 @@
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
     "require_upload_port": true,
-    "resetmethod": "nodemcu",
     "speed": 115200,
     "wait_for_upload_port": true
   },

diff --git a/boards/intorobot.json b/boards/intorobot.json
@@ -1,9 +1,9 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DESP32_DEV -DARDUINO_INTOROBOT_ESP32_DEV",
+    "extra_flags": "-DARDUINO_INTOROBOT_ESP32_DEV",
     "f_cpu": "240000000L",
-    "f_flash": "80000000L",
+    "f_flash": "40000000L",
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
     "mcu": "esp32",
@@ -25,7 +25,6 @@
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
     "require_upload_port": true,
-    "resetmethod": "nodemcu",
     "speed": 115200,
     "wait_for_upload_port": true
   },

diff --git a/boards/lolin32.json b/boards/lolin32.json
@@ -1,9 +1,9 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DESP32_DEV -DARDUINO_LOLIN32",
+    "extra_flags": "-DARDUINO_LOLIN32",
     "f_cpu": "240000000L",
-    "f_flash": "80000000L",
+    "f_flash": "40000000L",
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
     "mcu": "esp32",
@@ -25,7 +25,6 @@
     "maximum_ram_size": 294912,
     "maximum_size": 1310720,
     "require_upload_port": true,
-    "resetmethod": "nodemcu",
     "speed": 115200,
     "wait_for_upload_port": true
   },