Skip to content

Commit 8de944a

Browse files
ivankravetsivankravets
committed
Merge branch 'release/v1.6.0'
2 parents f3497cd + 5a5b55f commit 8de944a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+421
-392
lines changed

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
language: python
22
python:
33
- "2.7"
4+
- "3.5"
45

56
env:
67
- PLATFORMIO_PROJECT_DIR=examples/arduino-blink

‎boards/alksesp32.json

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,6 @@
2727
"maximum_ram_size": 327680,
2828
"maximum_size": 4194304,
2929
"protocol": "esptool",
30-
"protocols": [
31-
"esptool",
32-
"esp-prog",
33-
"jlink",
34-
"olimex-arm-usb-tiny-h",
35-
"olimex-arm-usb-ocd-h",
36-
"olimex-arm-usb-ocd",
37-
"olimex-jtag-tiny",
38-
"iot-bus-jtag",
39-
"tumpa",
40-
"minimodule"
41-
],
4230
"require_upload_port": true,
4331
"speed": 115200
4432
},

‎boards/bpi-bit.json

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"build": {
3+
"core": "esp32",
4+
"extra_flags": "-DARDUINO_BPI_BIT",
5+
"f_cpu": "160000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "dio",
8+
"ldscript": "esp32_out.ld",
9+
"mcu": "esp32",
10+
"variant": "bpi-bit"
11+
},
12+
"connectivity": [
13+
"wifi",
14+
"bluetooth",
15+
"ethernet",
16+
"can"
17+
],
18+
"frameworks": [
19+
"arduino",
20+
"espidf"
21+
],
22+
"name": "BPI-Bit",
23+
"upload": {
24+
"flash_size": "4MB",
25+
"maximum_ram_size": 327680,
26+
"maximum_size": 4194304,
27+
"protocol": "esptool",
28+
"require_upload_port": true,
29+
"speed": 921600
30+
},
31+
"url": "https://en.wikipedia.org/wiki/ESP32",
32+
"vendor": "BPI Tech"
33+
}

‎boards/d-duino-32.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"build": {
3+
"core": "esp32",
4+
"extra_flags": "-DARDUINO_D_DUINO_32",
5+
"f_cpu": "240000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "dio",
8+
"ldscript": "esp32_out.ld",
9+
"mcu": "esp32",
10+
"variant": "d-duino-32"
11+
},
12+
"connectivity": [
13+
"wifi",
14+
"bluetooth",
15+
"ethernet",
16+
"can"
17+
],
18+
"debug": {
19+
"openocd_board": "esp-wroom-32.cfg"
20+
},
21+
"frameworks": [
22+
"arduino",
23+
"espidf"
24+
],
25+
"name": "D-duino-32",
26+
"upload": {
27+
"flash_size": "4MB",
28+
"maximum_ram_size": 327680,
29+
"maximum_size": 4194304,
30+
"protocol": "esptool",
31+
"require_upload_port": true,
32+
"speed": 921600
33+
},
34+
"url": "https://www.tindie.com/products/lspoplove/dstike-d-duino-32-v3/",
35+
"vendor": "DSTIKE"
36+
}

‎boards/esp-wrover-kit.json

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"build": {
33
"core": "esp32",
4-
"extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue",
4+
"extra_flags": "-DARDUINO_ESP32_DEV",
55
"f_cpu": "240000000L",
66
"f_flash": "40000000L",
77
"flash_mode": "dio",
@@ -40,16 +40,7 @@
4040
"protocol": "esptool",
4141
"protocols": [
4242
"esptool",
43-
"ftdi",
44-
"esp-prog",
45-
"jlink",
46-
"olimex-arm-usb-tiny-h",
47-
"olimex-arm-usb-ocd-h",
48-
"olimex-arm-usb-ocd",
49-
"olimex-jtag-tiny",
50-
"iot-bus-jtag",
51-
"tumpa",
52-
"minimodule"
43+
"ftdi"
5344
],
5445
"require_upload_port": true,
5546
"speed": 921600

‎boards/esp32-evb.json

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,6 @@
2828
"maximum_ram_size": 327680,
2929
"maximum_size": 4194304,
3030
"protocol": "esptool",
31-
"protocols": [
32-
"esptool",
33-
"esp-prog",
34-
"jlink",
35-
"olimex-arm-usb-tiny-h",
36-
"olimex-arm-usb-ocd-h",
37-
"olimex-arm-usb-ocd",
38-
"olimex-jtag-tiny",
39-
"iot-bus-jtag",
40-
"tumpa",
41-
"minimodule"
42-
],
4331
"require_upload_port": true,
4432
"speed": 921600
4533
},

‎boards/esp32-gateway.json

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,6 @@
2828
"maximum_ram_size": 327680,
2929
"maximum_size": 4194304,
3030
"protocol": "esptool",
31-
"protocols": [
32-
"esptool",
33-
"esp-prog",
34-
"jlink",
35-
"olimex-arm-usb-tiny-h",
36-
"olimex-arm-usb-ocd-h",
37-
"olimex-arm-usb-ocd",
38-
"olimex-jtag-tiny",
39-
"iot-bus-jtag",
40-
"tumpa",
41-
"minimodule"
42-
],
4331
"require_upload_port": true,
4432
"speed": 921600
4533
},

‎boards/esp32-poe.json

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"build": {
3+
"core": "esp32",
4+
"extra_flags": "-DARDUINO_ESP32_POE",
5+
"f_cpu": "240000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "dio",
8+
"ldscript": "esp32_out.ld",
9+
"mcu": "esp32",
10+
"variant": "esp32-poe"
11+
},
12+
"connectivity": [
13+
"wifi",
14+
"bluetooth",
15+
"ethernet",
16+
"can"
17+
],
18+
"frameworks": [
19+
"arduino",
20+
"espidf"
21+
],
22+
"name": "me=OLIMEX ESP32-PoE",
23+
"upload": {
24+
"flash_size": "4MB",
25+
"maximum_ram_size": 327680,
26+
"maximum_size": 4194304,
27+
"protocol": "esptool",
28+
"require_upload_port": true,
29+
"speed": 921600
30+
},
31+
"url": "https://www.olimex.com/Products/IoT/ESP32/ESP32-POE/open-source-hardware",
32+
"vendor": "OLIMEX"
33+
}

‎boards/esp32-pro.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
"maximum_ram_size": 327680,
2626
"maximum_size": 4194304,
2727
"protocol": "esptool",
28-
"protocols": [
29-
"esptool"
30-
],
3128
"require_upload_port": true,
3229
"speed": 921600
3330
},

‎boards/esp320.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
"maximum_ram_size": 327680,
2626
"maximum_size": 4194304,
2727
"protocol": "esptool",
28-
"protocols": [
29-
"esptool"
30-
],
3128
"require_upload_port": true,
3229
"speed": 921600
3330
},

0 commit comments

Comments
 (0)