Skip to content

Commit e6b4047

Browse files
committed
Merge branch 'release/v1.10.0'
2 parents d92f95a + 3851278 commit e6b4047

File tree

116 files changed

+14877
-302
lines changed

Some content is hidden

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

116 files changed

+14877
-302
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ python:
66
env:
77
- PLATFORMIO_PROJECT_DIR=examples/arduino-blink
88
- PLATFORMIO_PROJECT_DIR=examples/arduino-wifiscan
9+
- PLATFORMIO_PROJECT_DIR=examples/espidf-arduino-blink
10+
- PLATFORMIO_PROJECT_DIR=examples/espidf-arduino-wifiscan
911
- PLATFORMIO_PROJECT_DIR=examples/espidf-aws-iot
1012
- PLATFORMIO_PROJECT_DIR=examples/espidf-ble-adv
1113
- PLATFORMIO_PROJECT_DIR=examples/espidf-coap-server

appveyor.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ environment:
44
matrix:
55
- PLATFORMIO_PROJECT_DIR: "examples/arduino-blink"
66
- PLATFORMIO_PROJECT_DIR: "examples/arduino-wifiscan"
7+
- PLATFORMIO_PROJECT_DIR: "examples/espidf-arduino-blink"
8+
- PLATFORMIO_PROJECT_DIR: "examples/espidf-arduino-wifiscan"
79
- PLATFORMIO_PROJECT_DIR: "examples/espidf-aws-iot"
810
- PLATFORMIO_PROJECT_DIR: "examples/espidf-ble-adv"
911
- PLATFORMIO_PROJECT_DIR: "examples/espidf-coap-server"

boards/alksesp32.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"maximum_ram_size": 327680,
2828
"maximum_size": 4194304,
2929
"require_upload_port": true,
30-
"speed": 921600
30+
"speed": 460800
3131
},
3232
"url": "https://github.com/RoboticsBrno/ArduinoLearningKitStarter.git",
3333
"vendor": "RoboticsBrno"

boards/bpi-bit.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"maximum_ram_size": 327680,
2626
"maximum_size": 4194304,
2727
"require_upload_port": true,
28-
"speed": 921600
28+
"speed": 460800
2929
},
3030
"url": "https://en.wikipedia.org/wiki/ESP32",
3131
"vendor": "BPI Tech"

boards/d-duino-32.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"maximum_ram_size": 327680,
2929
"maximum_size": 4194304,
3030
"require_upload_port": true,
31-
"speed": 921600
31+
"speed": 460800
3232
},
3333
"url": "https://www.tindie.com/products/lspoplove/dstike-d-duino-32-v3/",
3434
"vendor": "DSTIKE"

boards/esp-wrover-kit.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"ftdi"
4444
],
4545
"require_upload_port": true,
46-
"speed": 921600
46+
"speed": 460800
4747
},
4848
"url": "https://espressif.com/en/products/hardware/esp-wrover-kit/overview",
4949
"vendor": "Espressif"

boards/esp32-devkitlipo.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"build": {
3+
"core": "esp32",
4+
"extra_flags": "-DARDUINO_ESP32_DEVKIT_LIPO",
5+
"f_cpu": "240000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "qio",
8+
"ldscript": "esp32_out.ld",
9+
"mcu": "esp32",
10+
"variant": "esp32-devkit-lipo"
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": "OLIMEX ESP32-DevKit-LiPo",
26+
"upload": {
27+
"flash_size": "4MB",
28+
"maximum_ram_size": 327680,
29+
"maximum_size": 4194304,
30+
"require_upload_port": true,
31+
"speed": 460800
32+
},
33+
"url": "https://www.olimex.com/Products/IoT/ESP32/ESP32-DevKit-LiPo/open-source-hardware",
34+
"vendor": "OLIMEX"
35+
}

boards/esp32-evb.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"maximum_ram_size": 327680,
2929
"maximum_size": 4194304,
3030
"require_upload_port": true,
31-
"speed": 921600
31+
"speed": 460800
3232
},
3333
"url": "https://www.olimex.com/Products/IoT/ESP32-EVB/open-source-hardware",
3434
"vendor": "OLIMEX"

boards/esp32-gateway.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"maximum_ram_size": 327680,
2929
"maximum_size": 4194304,
3030
"require_upload_port": true,
31-
"speed": 921600
31+
"speed": 460800
3232
},
3333
"url": "https://www.olimex.com/Products/IoT/ESP32-GATEWAY/open-source-hardware",
3434
"vendor": "OLIMEX"

boards/esp32-poe-iso.json

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

0 commit comments

Comments
 (0)