Skip to content

Commit e789b9f

Browse files
ivankravetsivankravets
committed
Merge branch 'release/v0.11.0'
2 parents 949098a + 8ff4af6 commit e789b9f

36 files changed

+229
-97
lines changed

‎boards/esp-wrover-kit.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"build": {
33
"core": "esp32",
4-
"extra_flags": "-DESP32_DEV -DARDUINO_ESP32_DEV",
4+
"extra_flags": "-DARDUINO_ESP32_DEV",
55
"f_cpu": "240000000L",
66
"hwids": [
77
[
@@ -31,7 +31,6 @@
3131
"maximum_ram_size": 294912,
3232
"maximum_size": 1310720,
3333
"require_upload_port": true,
34-
"resetmethod": "nodemcu",
3534
"speed": 115200,
3635
"wait_for_upload_port": true
3736
},

‎boards/esp32-evb.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"build": {
33
"core": "esp32",
4-
"extra_flags": "-DESP32_DEV -DARDUINO_ESP32-EVB",
4+
"extra_flags": "-DARDUINO_ESP32-EVB",
55
"f_cpu": "240000000L",
6-
"f_flash": "80000000L",
6+
"f_flash": "40000000L",
77
"flash_mode": "dio",
88
"ldscript": "esp32_out.ld",
99
"mcu": "esp32",
@@ -25,7 +25,6 @@
2525
"maximum_ram_size": 294912,
2626
"maximum_size": 1310720,
2727
"require_upload_port": true,
28-
"resetmethod": "nodemcu",
2928
"speed": 115200,
3029
"wait_for_upload_port": true
3130
},

‎boards/esp32-gateway.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"build": {
33
"core": "esp32",
4-
"extra_flags": "-DESP32_DEV -DARDUINO_ESP32-GATEWAY",
4+
"extra_flags": "-DARDUINO_ESP32-GATEWAY",
55
"f_cpu": "240000000L",
6-
"f_flash": "80000000L",
6+
"f_flash": "40000000L",
77
"flash_mode": "dio",
88
"ldscript": "esp32_out.ld",
99
"mcu": "esp32",
@@ -25,7 +25,6 @@
2525
"maximum_ram_size": 294912,
2626
"maximum_size": 1310720,
2727
"require_upload_port": true,
28-
"resetmethod": "nodemcu",
2928
"speed": 115200,
3029
"wait_for_upload_port": true
3130
},

‎boards/esp320.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"build": {
33
"core": "esp32",
4-
"extra_flags": "-DESP32_DEV -DARDUINO_ESP320",
4+
"extra_flags": "-DARDUINO_ESP320",
55
"f_cpu": "240000000L",
6-
"f_flash": "80000000L",
6+
"f_flash": "40000000L",
77
"flash_mode": "qio",
88
"ldscript": "esp32_out.ld",
99
"mcu": "esp32",
@@ -25,7 +25,6 @@
2525
"maximum_ram_size": 294912,
2626
"maximum_size": 1310720,
2727
"require_upload_port": true,
28-
"resetmethod": "nodemcu",
2928
"speed": 115200,
3029
"wait_for_upload_port": true
3130
},

‎boards/esp32dev.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"build": {
33
"core": "esp32",
4-
"extra_flags": "-DESP32_DEV -DARDUINO_ESP32_DEV",
4+
"extra_flags": "-DARDUINO_ESP32_DEV",
55
"f_cpu": "240000000L",
6-
"f_flash": "80000000L",
6+
"f_flash": "40000000L",
77
"flash_mode": "dio",
88
"ldscript": "esp32_out.ld",
99
"mcu": "esp32",
@@ -25,7 +25,6 @@
2525
"maximum_ram_size": 294912,
2626
"maximum_size": 1310720,
2727
"require_upload_port": true,
28-
"resetmethod": "nodemcu",
2928
"speed": 115200,
3029
"wait_for_upload_port": true
3130
},

‎boards/esp32doit-devkit-v1.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"build": {
33
"core": "esp32",
4-
"extra_flags": "-DESP32_DEV -DARDUINO_ESP32_DEV",
4+
"extra_flags": "-DARDUINO_ESP32_DEV",
55
"f_cpu": "240000000L",
6-
"f_flash": "80000000L",
6+
"f_flash": "40000000L",
77
"flash_mode": "dio",
88
"ldscript": "esp32_out.ld",
99
"mcu": "esp32",
@@ -25,7 +25,6 @@
2525
"maximum_ram_size": 294912,
2626
"maximum_size": 1310720,
2727
"require_upload_port": true,
28-
"resetmethod": "nodemcu",
2928
"speed": 115200,
3029
"wait_for_upload_port": true
3130
},

‎boards/esp32thing.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"build": {
33
"core": "esp32",
4-
"extra_flags": "-DESP32_DEV -DARDUINO_ESP32_THING",
4+
"extra_flags": "-DARDUINO_ESP32_THING",
55
"f_cpu": "240000000L",
6-
"f_flash": "80000000L",
6+
"f_flash": "40000000L",
77
"flash_mode": "dio",
88
"ldscript": "esp32_out.ld",
99
"mcu": "esp32",
@@ -25,7 +25,6 @@
2525
"maximum_ram_size": 294912,
2626
"maximum_size": 1310720,
2727
"require_upload_port": true,
28-
"resetmethod": "nodemcu",
2928
"speed": 115200,
3029
"wait_for_upload_port": true
3130
},

‎boards/esp32vn-iot-uno.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"build": {
33
"core": "esp32",
4-
"extra_flags": "-DESP32_DEV -DARDUINO_esp32vn-iot-uno",
4+
"extra_flags": "-DARDUINO_esp32vn-iot-uno",
55
"f_cpu": "240000000L",
6-
"f_flash": "80000000L",
6+
"f_flash": "40000000L",
77
"flash_mode": "dio",
88
"ldscript": "esp32_out.ld",
99
"mcu": "esp32",
@@ -25,7 +25,6 @@
2525
"maximum_ram_size": 294912,
2626
"maximum_size": 1044464,
2727
"require_upload_port": true,
28-
"resetmethod": "nodemcu",
2928
"speed": 115200,
3029
"wait_for_upload_port": true
3130
},

‎boards/espea32.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"build": {
33
"core": "esp32",
4-
"extra_flags": "-DESP32_DEV -DARDUINO_ESPea32",
4+
"extra_flags": "-DARDUINO_ESPea32",
55
"f_cpu": "240000000L",
6-
"f_flash": "80000000L",
6+
"f_flash": "40000000L",
77
"flash_mode": "dio",
88
"ldscript": "esp32_out.ld",
99
"mcu": "esp32",
@@ -25,7 +25,6 @@
2525
"maximum_ram_size": 294912,
2626
"maximum_size": 1310720,
2727
"require_upload_port": true,
28-
"resetmethod": "nodemcu",
2928
"speed": 115200,
3029
"wait_for_upload_port": true
3130
},

‎boards/espectro32.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"build": {
33
"core": "esp32",
4-
"extra_flags": "-DESP32_DEV -DARDUINO_ESPECTRO32",
4+
"extra_flags": "-DARDUINO_ESPECTRO32",
55
"f_cpu": "240000000L",
6-
"f_flash": "80000000L",
7-
"flash_mode": "qio",
6+
"f_flash": "40000000L",
7+
"flash_mode": "dio",
88
"ldscript": "esp32_out.ld",
99
"mcu": "esp32",
1010
"variant": "espectro32"
@@ -25,7 +25,6 @@
2525
"maximum_ram_size": 294912,
2626
"maximum_size": 1310720,
2727
"require_upload_port": true,
28-
"resetmethod": "nodemcu",
2928
"speed": 2000000,
3029
"wait_for_upload_port": true
3130
},

0 commit comments

Comments
 (0)