From fb051c123eefd8d2b7f2a696e0365f104555f926 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sat, 25 Nov 2017 14:51:15 +0200 Subject: [PATCH] Cleanup configs --- boards/esp-wrover-kit.json | 3 +-- boards/esp32-evb.json | 3 +-- boards/esp32-gateway.json | 3 +-- boards/esp320.json | 3 +-- boards/esp32dev.json | 3 +-- boards/esp32doit-devkit-v1.json | 3 +-- boards/esp32thing.json | 3 +-- boards/esp32vn-iot-uno.json | 3 +-- boards/espea32.json | 3 +-- boards/espectro32.json | 5 ++--- boards/espino32.json | 3 +-- boards/featheresp32.json | 3 +-- boards/firebeetle32.json | 3 +-- boards/heltec_wifi_kit_32.json | 3 +-- boards/heltec_wifi_lora_32.json | 3 +-- boards/hornbill32dev.json | 3 +-- boards/hornbill32minima.json | 3 +-- boards/intorobot.json | 3 +-- boards/lolin32.json | 3 +-- boards/m5stack-core-esp32.json | 3 +-- boards/mhetesp32devkit.json | 3 +-- boards/mhetesp32minikit.json | 3 +-- boards/nano32.json | 3 +-- boards/node32s.json | 3 +-- boards/nodemcu-32s.json | 3 +-- boards/onehorse32dev.json | 3 +-- boards/quantum.json | 3 +-- boards/widora-air.json | 3 +-- 28 files changed, 29 insertions(+), 57 deletions(-) diff --git a/boards/esp-wrover-kit.json b/boards/esp-wrover-kit.json index 7ad3768..5e68c57 100644 --- 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 index 1a6b4d3..912047e 100644 --- a/boards/esp32-evb.json +++ b/boards/esp32-evb.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_ESP32-EVB", + "extra_flags": "-DARDUINO_ESP32-EVB", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", @@ -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 index 0c7276d..6740baa 100644 --- a/boards/esp32-gateway.json +++ b/boards/esp32-gateway.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_ESP32-GATEWAY", + "extra_flags": "-DARDUINO_ESP32-GATEWAY", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", @@ -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 index 352e52f..af9cf27 100644 --- a/boards/esp320.json +++ b/boards/esp320.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_ESP320", + "extra_flags": "-DARDUINO_ESP320", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "qio", @@ -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 index 4f626e2..01c07b8 100644 --- a/boards/esp32dev.json +++ b/boards/esp32dev.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_ESP32_DEV", + "extra_flags": "-DARDUINO_ESP32_DEV", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", @@ -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 index 70fce06..be93b86 100644 --- a/boards/esp32doit-devkit-v1.json +++ b/boards/esp32doit-devkit-v1.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_ESP32_DEV", + "extra_flags": "-DARDUINO_ESP32_DEV", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", @@ -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 index cef3fed..f6f72c0 100644 --- a/boards/esp32thing.json +++ b/boards/esp32thing.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_ESP32_THING", + "extra_flags": "-DARDUINO_ESP32_THING", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", @@ -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 index 0f281a7..bd18d33 100644 --- a/boards/esp32vn-iot-uno.json +++ b/boards/esp32vn-iot-uno.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_esp32vn-iot-uno", + "extra_flags": "-DARDUINO_esp32vn-iot-uno", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", @@ -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 index abfae29..caebc4d 100644 --- a/boards/espea32.json +++ b/boards/espea32.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_ESPea32", + "extra_flags": "-DARDUINO_ESPea32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", @@ -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 index 26bbc46..a1d539f 100644 --- 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": "40000000L", - "flash_mode": "qio", + "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 index 226111b..d1feabc 100644 --- a/boards/espino32.json +++ b/boards/espino32.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_ESPino32", + "extra_flags": "-DARDUINO_ESPino32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", @@ -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 index ef9366b..bfaf64c 100644 --- a/boards/featheresp32.json +++ b/boards/featheresp32.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_FEATHER_ESP32", + "extra_flags": "-DARDUINO_FEATHER_ESP32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", @@ -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 index e721b1c..46fe60c 100644 --- a/boards/firebeetle32.json +++ b/boards/firebeetle32.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_ESP32_DEV", + "extra_flags": "-DARDUINO_ESP32_DEV", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", @@ -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 index c226e36..e9d14e9 100644 --- a/boards/heltec_wifi_kit_32.json +++ b/boards/heltec_wifi_kit_32.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_Heltec_WIFI_Kit_32", + "extra_flags": "-DARDUINO_Heltec_WIFI_Kit_32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", @@ -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 index 289f600..8853d39 100644 --- a/boards/heltec_wifi_lora_32.json +++ b/boards/heltec_wifi_lora_32.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_Heltec_WIFI_LoRa_32", + "extra_flags": "-DARDUINO_Heltec_WIFI_LoRa_32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", @@ -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 index 6335b30..e4294d0 100644 --- a/boards/hornbill32dev.json +++ b/boards/hornbill32dev.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_HORNBILL_ESP32_DEV", + "extra_flags": "-DARDUINO_HORNBILL_ESP32_DEV", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", @@ -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 index a475a65..b8c4ae7 100644 --- a/boards/hornbill32minima.json +++ b/boards/hornbill32minima.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_HORNBILL_ESP32_MINIMA", + "extra_flags": "-DARDUINO_HORNBILL_ESP32_MINIMA", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", @@ -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 index be86c1e..bd0bebb 100644 --- a/boards/intorobot.json +++ b/boards/intorobot.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_INTOROBOT_ESP32_DEV", + "extra_flags": "-DARDUINO_INTOROBOT_ESP32_DEV", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", @@ -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 index 0372dc0..0bfa49d 100644 --- a/boards/lolin32.json +++ b/boards/lolin32.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_LOLIN32", + "extra_flags": "-DARDUINO_LOLIN32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", @@ -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/m5stack-core-esp32.json b/boards/m5stack-core-esp32.json index 7c8a515..72d5112 100644 --- a/boards/m5stack-core-esp32.json +++ b/boards/m5stack-core-esp32.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_M5Stack-Core-ESP32", + "extra_flags": "-DARDUINO_M5Stack-Core-ESP32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", @@ -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/mhetesp32devkit.json b/boards/mhetesp32devkit.json index 69f77fa..659a00a 100644 --- a/boards/mhetesp32devkit.json +++ b/boards/mhetesp32devkit.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_MH_ET_LIVE_ESP32DEVKIT", + "extra_flags": "-DARDUINO_MH_ET_LIVE_ESP32DEVKIT", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", @@ -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/mhetesp32minikit.json b/boards/mhetesp32minikit.json index 755b880..d6b114e 100644 --- a/boards/mhetesp32minikit.json +++ b/boards/mhetesp32minikit.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_MH_ET_LIVE_ESP32MINIKIT", + "extra_flags": "-DARDUINO_MH_ET_LIVE_ESP32MINIKIT", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", @@ -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/nano32.json b/boards/nano32.json index 0a948aa..4776a2b 100644 --- a/boards/nano32.json +++ b/boards/nano32.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_NANO32", + "extra_flags": "-DARDUINO_NANO32", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", @@ -27,7 +27,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/node32s.json b/boards/node32s.json index 313f15b..a83fd80 100644 --- a/boards/node32s.json +++ b/boards/node32s.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_Node32s", + "extra_flags": "-DARDUINO_Node32s", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", @@ -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/nodemcu-32s.json b/boards/nodemcu-32s.json index 4189049..49bd65c 100644 --- a/boards/nodemcu-32s.json +++ b/boards/nodemcu-32s.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_NodeMCU-32S", + "extra_flags": "-DARDUINO_NodeMCU-32S", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", @@ -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/onehorse32dev.json b/boards/onehorse32dev.json index cbc3ad5..34b049d 100644 --- a/boards/onehorse32dev.json +++ b/boards/onehorse32dev.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_ONEHORSE_ESP32_DEV", + "extra_flags": "-DARDUINO_ONEHORSE_ESP32_DEV", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dout", @@ -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/quantum.json b/boards/quantum.json index fb1280f..3640da7 100644 --- a/boards/quantum.json +++ b/boards/quantum.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_QUANTUM", + "extra_flags": "-DARDUINO_QUANTUM", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "qio", @@ -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/widora-air.json b/boards/widora-air.json index d678572..9285c71 100644 --- a/boards/widora-air.json +++ b/boards/widora-air.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_WIDORA_AIR", + "extra_flags": "-DARDUINO_WIDORA_AIR", "f_cpu": "240000000L", "f_flash": "40000000L", "flash_mode": "dio", @@ -25,7 +25,6 @@ "maximum_ram_size": 294912, "maximum_size": 1310720, "require_upload_port": true, - "resetmethod": "nodemcu", "speed": 115200, "wait_for_upload_port": true },