diff --git a/boards/esp-wrover-kit.json b/boards/esp-wrover-kit.json index 7ad3768a0..5e68c571d 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 c93294b3b..912047e1a 100644 --- 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 index 50a47e1bd..6740baaa0 100644 --- 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 index 32745b959..af9cf2741 100644 --- 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 index 392d2eb70..01c07b8d6 100644 --- 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 index 356e785b2..be93b860c 100644 --- 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 index ad7dd783d..f6f72c088 100644 --- 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 index 0c4fd0d63..bd18d3355 100644 --- 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 index e98b84525..caebc4d11 100644 --- 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 index 4c5e549be..a1d539ff5 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": "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 index 2abc952a6..d1feabcad 100644 --- 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 index eec6a72ad..bfaf64c79 100644 --- 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 index 63d5d65ef..46fe60c0a 100644 --- 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 index e0f22df36..e9d14e916 100644 --- 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 index 92399de2d..8853d39c2 100644 --- 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 index a0a2b3f6d..e4294d06c 100644 --- 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 index 2876956c2..b8c4ae7f4 100644 --- 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 index bd966c68a..bd0bebbed 100644 --- 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 index 28a4c5bd1..0bfa49db6 100644 --- 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 }, diff --git a/boards/m5stack-core-esp32.json b/boards/m5stack-core-esp32.json index 3d4e9bc1b..72d5112d7 100644 --- a/boards/m5stack-core-esp32.json +++ b/boards/m5stack-core-esp32.json @@ -1,9 +1,9 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_M5Stack-Core-ESP32", + "extra_flags": "-DARDUINO_M5Stack-Core-ESP32", "f_cpu": "240000000L", - "f_flash": "80000000L", + "f_flash": "40000000L", "flash_mode": "dio", "ldscript": "esp32_out.ld", "mcu": "esp32", @@ -19,13 +19,12 @@ "arduino", "espidf" ], - "name": "M5Stack-Core-ESP32", + "name": "M5Stack Core ESP32", "upload": { "flash_size": "4MB", "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 444227f99..659a00a5c 100644 --- a/boards/mhetesp32devkit.json +++ b/boards/mhetesp32devkit.json @@ -1,9 +1,9 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_MH_ET_LIVE_ESP32DEVKIT", + "extra_flags": "-DARDUINO_MH_ET_LIVE_ESP32DEVKIT", "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/mhetesp32minikit.json b/boards/mhetesp32minikit.json index be503cb17..d6b114ec0 100644 --- a/boards/mhetesp32minikit.json +++ b/boards/mhetesp32minikit.json @@ -1,9 +1,9 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_MH_ET_LIVE_ESP32MINIKIT", + "extra_flags": "-DARDUINO_MH_ET_LIVE_ESP32MINIKIT", "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/microduino-core-esp32.json b/boards/microduino-core-esp32.json new file mode 100644 index 000000000..010da233d --- /dev/null +++ b/boards/microduino-core-esp32.json @@ -0,0 +1,33 @@ +{ + "build": { + "core": "esp32", + "extra_flags": "-DARDUINO_CoreESP32", + "f_cpu": "240000000L", + "f_flash": "40000000L", + "flash_mode": "dio", + "ldscript": "esp32_out.ld", + "mcu": "esp32", + "variant": "Microduino-esp32" + }, + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Microduino Core ESP32", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 294912, + "maximum_size": 1310720, + "require_upload_port": true, + "speed": 2000000, + "wait_for_upload_port": true + }, + "url": "https://microduinoinc.com", + "vendor": "Microduino" +} diff --git a/boards/nano32.json b/boards/nano32.json index df6b6e612..4776a2b4d 100644 --- a/boards/nano32.json +++ b/boards/nano32.json @@ -1,9 +1,9 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_NANO32", + "extra_flags": "-DARDUINO_NANO32", "f_cpu": "240000000L", - "f_flash": "80000000L", + "f_flash": "40000000L", "flash_mode": "dio", "ldscript": "esp32_out.ld", "mcu": "esp32", @@ -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/nina_w10.json b/boards/nina_w10.json new file mode 100644 index 000000000..913228aa4 --- /dev/null +++ b/boards/nina_w10.json @@ -0,0 +1,34 @@ +{ + "build": { + "core": "esp32", + "extra_flags": "-DARDUINO_UBLOX_NINA_W10", + "f_cpu": "240000000L", + "f_flash": "40000000L", + "flash_mode": "dio", + "partitions": "minimal", + "ldscript": "esp32_out.ld", + "mcu": "esp32", + "variant": "nina_w10" + }, + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ + "arduino", + "espidf" + ], + "name": "u-blox NINA-W10 series", + "upload": { + "flash_size": "2MB", + "maximum_ram_size": 294912, + "maximum_size": 1310720, + "require_upload_port": true, + "speed": 115200, + "wait_for_upload_port": true + }, + "url": "https://www.u-blox.com/en/product/nina-w10-series", + "vendor": "u-blox" +} diff --git a/boards/node32s.json b/boards/node32s.json index c6d86b8ab..a83fd80cb 100644 --- a/boards/node32s.json +++ b/boards/node32s.json @@ -1,9 +1,9 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_Node32s", + "extra_flags": "-DARDUINO_Node32s", "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/nodemcu-32s.json b/boards/nodemcu-32s.json index 2732f17c7..49bd65cde 100644 --- a/boards/nodemcu-32s.json +++ b/boards/nodemcu-32s.json @@ -1,9 +1,9 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_NodeMCU-32S", + "extra_flags": "-DARDUINO_NodeMCU-32S", "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/onehorse32dev.json b/boards/onehorse32dev.json index 5647b8710..34b049dda 100644 --- a/boards/onehorse32dev.json +++ b/boards/onehorse32dev.json @@ -1,9 +1,9 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_ONEHORSE_ESP32_DEV", + "extra_flags": "-DARDUINO_ONEHORSE_ESP32_DEV", "f_cpu": "240000000L", - "f_flash": "80000000L", + "f_flash": "40000000L", "flash_mode": "dout", "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/pocket_32.json b/boards/pocket_32.json new file mode 100644 index 000000000..92db5137f --- /dev/null +++ b/boards/pocket_32.json @@ -0,0 +1,33 @@ +{ + "build": { + "core": "esp32", + "extra_flags": "-DARDUINO_Pocket32", + "f_cpu": "240000000L", + "f_flash": "40000000L", + "flash_mode": "dio", + "ldscript": "esp32_out.ld", + "mcu": "esp32", + "variant": "pocket_32" + }, + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Dongsen Tech Pocket 32", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 294912, + "maximum_size": 1310720, + "require_upload_port": true, + "speed": 115200, + "wait_for_upload_port": true + }, + "url": "http://dong-sen.com", + "vendor": "Dongsen Technology" +} diff --git a/boards/quantum.json b/boards/quantum.json index 8eb0f5216..3640da780 100644 --- a/boards/quantum.json +++ b/boards/quantum.json @@ -1,9 +1,9 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_QUANTUM", + "extra_flags": "-DARDUINO_QUANTUM", "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/wemosbat.json b/boards/wemosbat.json new file mode 100644 index 000000000..0214a7dad --- /dev/null +++ b/boards/wemosbat.json @@ -0,0 +1,33 @@ +{ + "build": { + "core": "esp32", + "extra_flags": "-DARDUINO_Pocket32", + "f_cpu": "240000000L", + "f_flash": "40000000L", + "flash_mode": "dio", + "ldscript": "esp32_out.ld", + "mcu": "esp32", + "variant": "pocket_32" + }, + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ + "arduino", + "espidf" + ], + "name": "WeMos WiFi & Bluetooth Battery", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 294912, + "maximum_size": 1310720, + "require_upload_port": true, + "speed": 115200, + "wait_for_upload_port": true + }, + "url": "https://www.wemos.cc", + "vendor": "WEMOS" +} diff --git a/boards/widora-air.json b/boards/widora-air.json index 2b58c98ac..9285c7116 100644 --- a/boards/widora-air.json +++ b/boards/widora-air.json @@ -1,9 +1,9 @@ { "build": { "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_WIDORA_AIR", + "extra_flags": "-DARDUINO_WIDORA_AIR", "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/builder/frameworks/espidf.py b/builder/frameworks/espidf.py index 8f535ff4a..4eb5bc982 100644 --- a/builder/frameworks/espidf.py +++ b/builder/frameworks/espidf.py @@ -46,6 +46,7 @@ def parse_mk(path): for line in fp.readlines(): line = line.strip() if not line or line.startswith("#"): + multi = False continue # remove inline comments if " # " in line: @@ -198,8 +199,6 @@ def build_espidf_bootloader(): join(FRAMEWORK_DIR, "components", "json", "port", "include"), join(FRAMEWORK_DIR, "components", "libsodium", "libsodium", "src", "libsodium", "include"), - join(FRAMEWORK_DIR, "components", "libsodium", "port_include", - "sodium"), join(FRAMEWORK_DIR, "components", "libsodium", "libsodium", "src", "libsodium", "include", "sodium"), join(FRAMEWORK_DIR, "components", "log", "include"), @@ -252,7 +251,7 @@ def build_espidf_bootloader(): FRAMEWORK_DIR, "components", "bt", "bluedroid")): for d in dirs: if (d == "include"): - env.Append(CPPPATH=[join(root, d)]) + env.Prepend(CPPPATH=[join(root, d)]) env.Prepend( @@ -395,12 +394,16 @@ def build_espidf_bootloader(): )) envsafe = env.Clone() -envsafe.Append( +envsafe.Prepend( CPPDEFINES=[ "CONFIGURED", "NATIVE_LITTLE_ENDIAN", "HAVE_WEAK_SYMBOLS", "__STDC_LIMIT_MACROS", "__STDC_CONSTANT_MACROS" ], - CCFLAGS=["-Wno-type-limits", "-Wno-unknown-pragmas"] + CCFLAGS=["-Wno-type-limits", "-Wno-unknown-pragmas"], + CPPPATH=[ + join(FRAMEWORK_DIR, "components", "libsodium", "port_include", + "sodium") + ] ) libs.append( diff --git a/builder/main.py b/builder/main.py index 2d32193c2..187ce01e4 100644 --- a/builder/main.py +++ b/builder/main.py @@ -93,9 +93,9 @@ def _get_board_f_flash(env): UPLOADERFLAGS=[ "--chip", "esp32", "--port", '"$UPLOAD_PORT"', + "--baud", "$UPLOAD_SPEED", "--before", "default_reset", "--after", "hard_reset", - "--baud", "$UPLOAD_SPEED", "write_flash", "-z", "--flash_mode", "$BOARD_FLASH_MODE", "--flash_freq", "${__get_board_f_flash(__env__)}", diff --git a/platform.json b/platform.json index 6be987450..be0e1865f 100644 --- a/platform.json +++ b/platform.json @@ -12,7 +12,7 @@ "type": "git", "url": "https://github.com/platformio/platform-espressif32.git" }, - "version": "0.10.0", + "version": "0.11.0", "packageRepositories": [ "https://dl.bintray.com/platformio/dl-packages/manifest.json", "http://dl.platformio.org/packages/manifest.json", @@ -40,17 +40,17 @@ "packages": { "toolchain-xtensa32": { "type": "toolchain", - "version": "~1.50200.0" + "version": "~1.50200.2" }, "framework-arduinoespressif32": { "type": "framework", "optional": true, - "version": "~1.2.0" + "version": "~1.3.0" }, "framework-espidf": { "type": "framework", "optional": true, - "version": "~2.210.0" + "version": "~2.211.0" }, "framework-simba": { "type": "framework", @@ -64,12 +64,12 @@ }, "tool-esptoolpy": { "type": "uploader", - "version": "~1.20000.0" + "version": "~1.20100.0" }, "tool-espotapy": { "type": "uploader", "optional": true, - "version": "~1.0.0" + "version": "~1.1.0" } } } diff --git a/platform.py b/platform.py new file mode 100644 index 000000000..25c631a92 --- /dev/null +++ b/platform.py @@ -0,0 +1,24 @@ +# Copyright 2014-present PlatformIO +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from platformio.managers.platform import PlatformBase + + +class Espressif32Platform(PlatformBase): + + def configure_default_packages(self, variables, targets): + if "arduino" in variables.get("pioframework"): + self.packages['toolchain-xtensa32']['version'] = "~2.50200.0" + return PlatformBase.configure_default_packages( + self, variables, targets)