Skip to content

Commit 8eb521f

Browse files
ivankravetsivankravets
committed
Merge branch 'develop' into feature/stage
* develop: Bump version to 1.1.0 Fix SPIFFS uploading via OTA Update Arduino Core to the latest upstream version New board "ODROID-GO" Set default upload speed to 921600 Fix maximum allowed data size for ESP32 Update board flash size Update ESP-IDF to 3.0.1 // Resolve #97 Update default debug initial commands Update esptool to 2.4.1 Set monitor speed to 115200 by default Add new Olimex debug tools: ARM-USB-OCD and ARM-USB-TINY Minor changes Fix broken variant for ESP32vn IoT Uno // Issue #81 Restore formatting Test project with space Bump version to 1.0.2 # Conflicts: # platform.json
2 parents 1c1ee17 + 2fa7335 commit 8eb521f

40 files changed

+370
-246
lines changed

‎boards/esp-wrover-kit.json

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,13 @@
2222
"can"
2323
],
2424
"debug": {
25-
"openocd_board": "esp32-wrover.cfg",
26-
"onboard_tools": ["ft2232h"],
27-
"default_tools": ["ft2232h"]
25+
"default_tools": [
26+
"ft2232h"
27+
],
28+
"onboard_tools": [
29+
"ft2232h"
30+
],
31+
"openocd_board": "esp32-wrover.cfg"
2832
},
2933
"frameworks": [
3034
"arduino",
@@ -33,18 +37,20 @@
3337
"name": "Espressif ESP-WROVER-KIT",
3438
"upload": {
3539
"flash_size": "4MB",
36-
"maximum_ram_size": 4194304,
37-
"maximum_size": 1310720,
38-
"require_upload_port": true,
39-
"speed": 115200,
40+
"maximum_ram_size": 327680,
41+
"maximum_size": 4194304,
4042
"protocol": "esptool",
4143
"protocols": [
4244
"esptool",
4345
"ft2232h",
4446
"olimex-arm-usb-tiny-h",
4547
"olimex-arm-usb-ocd-h",
48+
"olimex-arm-usb-ocd",
49+
"olimex-jtag-tiny",
4650
"minimodule"
47-
]
51+
],
52+
"require_upload_port": true,
53+
"speed": 921600
4854
},
4955
"url": "https://espressif.com/en/products/hardware/esp-wrover-kit/overview",
5056
"vendor": "Espressif"

‎boards/esp32-evb.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,26 @@
1818
"debug": {
1919
"openocd_board": "esp-wroom-32.cfg"
2020
},
21-
"frameworks": [
21+
"frameworks": [
2222
"arduino",
2323
"espidf"
2424
],
2525
"name": "OLIMEX ESP32-EVB",
2626
"upload": {
2727
"flash_size": "4MB",
28-
"maximum_ram_size": 294912,
29-
"maximum_size": 1310720,
30-
"require_upload_port": true,
31-
"speed": 115200,
28+
"maximum_ram_size": 327680,
29+
"maximum_size": 4194304,
3230
"protocol": "esptool",
3331
"protocols": [
3432
"esptool",
3533
"olimex-arm-usb-tiny-h",
3634
"olimex-arm-usb-ocd-h",
35+
"olimex-arm-usb-ocd",
36+
"olimex-jtag-tiny",
3737
"minimodule"
38-
]
38+
],
39+
"require_upload_port": true,
40+
"speed": 921600
3941
},
4042
"url": "https://www.olimex.com/Products/IoT/ESP32-EVB/open-source-hardware",
4143
"vendor": "OLIMEX"

‎boards/esp32-gateway.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,26 @@
1818
"debug": {
1919
"openocd_board": "esp-wroom-32.cfg"
2020
},
21-
"frameworks": [
21+
"frameworks": [
2222
"arduino",
2323
"espidf"
2424
],
2525
"name": "OLIMEX ESP32-GATEWAY",
2626
"upload": {
2727
"flash_size": "4MB",
28-
"maximum_ram_size": 294912,
29-
"maximum_size": 1310720,
30-
"require_upload_port": true,
31-
"speed": 115200,
28+
"maximum_ram_size": 327680,
29+
"maximum_size": 4194304,
3230
"protocol": "esptool",
3331
"protocols": [
3432
"esptool",
3533
"olimex-arm-usb-tiny-h",
3634
"olimex-arm-usb-ocd-h",
35+
"olimex-arm-usb-ocd",
36+
"olimex-jtag-tiny",
3737
"minimodule"
38-
]
38+
],
39+
"require_upload_port": true,
40+
"speed": 921600
3941
},
4042
"url": "https://www.olimex.com/Products/IoT/ESP32-GATEWAY/open-source-hardware",
4143
"vendor": "OLIMEX"

‎boards/esp320.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@
1515
"ethernet",
1616
"can"
1717
],
18-
"frameworks": [
18+
"frameworks": [
1919
"arduino",
2020
"espidf"
2121
],
2222
"name": "Electronic SweetPeas ESP320",
2323
"upload": {
2424
"flash_size": "4MB",
25-
"maximum_ram_size": 294912,
26-
"maximum_size": 1310720,
27-
"require_upload_port": true,
28-
"speed": 115200,
25+
"maximum_ram_size": 327680,
26+
"maximum_size": 4194304,
2927
"protocol": "esptool",
3028
"protocols": [
3129
"esptool"
32-
]
30+
],
31+
"require_upload_port": true,
32+
"speed": 921600
3333
},
3434
"url": "http://www.sweetpeas.se/controller-modules/10-esp210.html",
3535
"vendor": "Electronic SweetPeas"

‎boards/esp32dev.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,26 @@
1818
"debug": {
1919
"openocd_board": "esp-wroom-32.cfg"
2020
},
21-
"frameworks": [
21+
"frameworks": [
2222
"arduino",
2323
"espidf"
2424
],
2525
"name": "Espressif ESP32 Dev Module",
2626
"upload": {
2727
"flash_size": "4MB",
28-
"maximum_ram_size": 294912,
29-
"maximum_size": 1310720,
30-
"require_upload_port": true,
31-
"speed": 115200,
28+
"maximum_ram_size": 327680,
29+
"maximum_size": 4194304,
3230
"protocol": "esptool",
3331
"protocols": [
3432
"esptool",
3533
"olimex-arm-usb-tiny-h",
3634
"olimex-arm-usb-ocd-h",
35+
"olimex-arm-usb-ocd",
36+
"olimex-jtag-tiny",
3737
"minimodule"
38-
]
38+
],
39+
"require_upload_port": true,
40+
"speed": 921600
3941
},
4042
"url": "https://en.wikipedia.org/wiki/ESP32",
4143
"vendor": "Espressif"

‎boards/esp32doit-devkit-v1.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,26 @@
1818
"debug": {
1919
"openocd_board": "esp-wroom-32.cfg"
2020
},
21-
"frameworks": [
21+
"frameworks": [
2222
"arduino",
2323
"espidf"
2424
],
2525
"name": "DOIT ESP32 DEVKIT V1",
2626
"upload": {
2727
"flash_size": "4MB",
28-
"maximum_ram_size": 294912,
29-
"maximum_size": 1310720,
30-
"require_upload_port": true,
31-
"speed": 115200,
28+
"maximum_ram_size": 327680,
29+
"maximum_size": 4194304,
3230
"protocol": "esptool",
3331
"protocols": [
3432
"esptool",
3533
"olimex-arm-usb-tiny-h",
3634
"olimex-arm-usb-ocd-h",
35+
"olimex-arm-usb-ocd",
36+
"olimex-jtag-tiny",
3737
"minimodule"
38-
]
38+
],
39+
"require_upload_port": true,
40+
"speed": 921600
3941
},
4042
"url": "http://www.doit.am/",
4143
"vendor": "DOIT"

‎boards/esp32thing.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,26 @@
1818
"debug": {
1919
"openocd_board": "esp-wroom-32.cfg"
2020
},
21-
"frameworks": [
21+
"frameworks": [
2222
"arduino",
2323
"espidf"
2424
],
2525
"name": "SparkFun ESP32 Thing",
2626
"upload": {
2727
"flash_size": "4MB",
28-
"maximum_ram_size": 294912,
29-
"maximum_size": 1310720,
30-
"require_upload_port": true,
31-
"speed": 115200,
28+
"maximum_ram_size": 327680,
29+
"maximum_size": 4194304,
3230
"protocol": "esptool",
3331
"protocols": [
3432
"esptool",
3533
"olimex-arm-usb-tiny-h",
3634
"olimex-arm-usb-ocd-h",
35+
"olimex-arm-usb-ocd",
36+
"olimex-jtag-tiny",
3737
"minimodule"
38-
]
38+
],
39+
"require_upload_port": true,
40+
"speed": 921600
3941
},
4042
"url": "https://www.sparkfun.com/products/13907",
4143
"vendor": "SparkFun Electronics"

‎boards/esp32vn-iot-uno.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"flash_mode": "dio",
88
"ldscript": "esp32_out.ld",
99
"mcu": "esp32",
10-
"variant": "esp32vn_iot_uno"
10+
"variant": "esp32vn-iot-uno"
1111
},
1212
"connectivity": [
1313
"wifi",
@@ -18,24 +18,26 @@
1818
"debug": {
1919
"openocd_board": "esp-wroom-32.cfg"
2020
},
21-
"frameworks": [
21+
"frameworks": [
2222
"arduino",
2323
"espidf"
2424
],
2525
"name": "ESP32vn IoT Uno",
2626
"upload": {
2727
"flash_size": "4MB",
28-
"maximum_ram_size": 294912,
29-
"maximum_size": 1310720,
30-
"require_upload_port": true,
31-
"speed": 115200,
28+
"maximum_ram_size": 327680,
29+
"maximum_size": 4194304,
3230
"protocol": "esptool",
3331
"protocols": [
3432
"esptool",
3533
"olimex-arm-usb-tiny-h",
3634
"olimex-arm-usb-ocd-h",
35+
"olimex-arm-usb-ocd",
36+
"olimex-jtag-tiny",
3737
"minimodule"
38-
]
38+
],
39+
"require_upload_port": true,
40+
"speed": 921600
3941
},
4042
"url": "https://esp32.vn/",
4143
"vendor": "ESP32vn"

‎boards/espea32.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@
1515
"ethernet",
1616
"can"
1717
],
18-
"frameworks": [
18+
"frameworks": [
1919
"arduino",
2020
"espidf"
2121
],
2222
"name": "April Brother ESPea32",
2323
"upload": {
2424
"flash_size": "4MB",
25-
"maximum_ram_size": 294912,
26-
"maximum_size": 1310720,
27-
"require_upload_port": true,
28-
"speed": 115200,
25+
"maximum_ram_size": 327680,
26+
"maximum_size": 4194304,
2927
"protocol": "esptool",
3028
"protocols": [
3129
"esptool"
32-
]
30+
],
31+
"require_upload_port": true,
32+
"speed": 921600
3333
},
3434
"url": "https://blog.aprbrother.com/product/espea",
3535
"vendor": "April Brother"

‎boards/espectro32.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,26 @@
1818
"debug": {
1919
"openocd_board": "esp-wroom-32.cfg"
2020
},
21-
"frameworks": [
21+
"frameworks": [
2222
"arduino",
2323
"espidf"
2424
],
2525
"name": "ESPectro32",
2626
"upload": {
2727
"flash_size": "4MB",
28-
"maximum_ram_size": 294912,
29-
"maximum_size": 1310720,
30-
"require_upload_port": true,
31-
"speed": 2000000,
28+
"maximum_ram_size": 327680,
29+
"maximum_size": 4194304,
3230
"protocol": "esptool",
3331
"protocols": [
3432
"esptool",
3533
"olimex-arm-usb-tiny-h",
3634
"olimex-arm-usb-ocd-h",
35+
"olimex-arm-usb-ocd",
36+
"olimex-jtag-tiny",
3737
"minimodule"
38-
]
38+
],
39+
"require_upload_port": true,
40+
"speed": 2000000
3941
},
4042
"url": "https://shop.makestro.com/product/espectro32",
4143
"vendor": "DycodeX"

‎boards/espino32.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,26 @@
1818
"debug": {
1919
"openocd_board": "esp-wroom-32.cfg"
2020
},
21-
"frameworks": [
21+
"frameworks": [
2222
"arduino",
2323
"espidf"
2424
],
2525
"name": "ESPino32",
2626
"upload": {
2727
"flash_size": "4MB",
28-
"maximum_ram_size": 294912,
29-
"maximum_size": 1310720,
30-
"require_upload_port": true,
31-
"speed": 115200,
28+
"maximum_ram_size": 327680,
29+
"maximum_size": 4194304,
3230
"protocol": "esptool",
3331
"protocols": [
3432
"esptool",
3533
"olimex-arm-usb-tiny-h",
3634
"olimex-arm-usb-ocd-h",
35+
"olimex-arm-usb-ocd",
36+
"olimex-jtag-tiny",
3737
"minimodule"
38-
]
38+
],
39+
"require_upload_port": true,
40+
"speed": 921600
3941
},
4042
"url": "http://thaieasyelec.com/products/development-boards/espino-wifi-development-board-detail.html",
4143
"vendor": "ThaiEasyElec"

0 commit comments

Comments
 (0)