Skip to content

Commit edc118b

Browse files
ivankravetsivankravets
committed
Merge branch 'release/v1.8.0'
2 parents 04e28ac + dfcbeb5 commit edc118b

File tree

21 files changed

+1026
-215
lines changed

21 files changed

+1026
-215
lines changed

‎appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ environment:
1717

1818
install:
1919
- cmd: git submodule update --init --recursive
20-
- cmd: SET PATH=%PATH%;C:\Python27\Scripts
21-
- cmd: pip install -U https://github.com/platformio/platformio/archive/develop.zip
20+
- cmd: SET PATH=%PATH%;C:\Python36\Scripts
21+
- cmd: pip3 install -U https://github.com/platformio/platformio/archive/develop.zip
2222
- cmd: platformio platform install file://.
2323

2424
test_script:

‎boards/esp32cam.json

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"build": {
3+
"core": "esp32",
4+
"extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue",
5+
"f_cpu": "240000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "dio",
8+
"ldscript": "esp32_out.ld",
9+
"partitions": "huge_app.csv",
10+
"mcu": "esp32",
11+
"variant": "esp32"
12+
},
13+
"connectivity": [
14+
"wifi",
15+
"bluetooth",
16+
"ethernet",
17+
"can"
18+
],
19+
"frameworks": [
20+
"arduino",
21+
"espidf"
22+
],
23+
"name": "AI Thinker ESP32-CAM",
24+
"upload": {
25+
"flash_size": "4MB",
26+
"maximum_ram_size": 327680,
27+
"maximum_size": 4194304,
28+
"protocol": "esptool",
29+
"require_upload_port": true,
30+
"speed": 460800
31+
},
32+
"url": "https://wiki.ai-thinker.com/esp32-cam",
33+
"vendor": "AI Thinker"
34+
}

‎boards/frogboard.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_FROG_ESP32",
5+
"f_cpu": "240000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "dio",
8+
"ldscript": "esp32_out.ld",
9+
"mcu": "esp32",
10+
"variant": "frog32"
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": "Frog Board ESP32",
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/fred_IOT/esp32s-esp-wroom32-frogopins-development-board/",
35+
"vendor": "Fred"
36+
}

‎boards/heltec_wifi_kit_32.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"build": {
33
"core": "esp32",
4-
"extra_flags": "-DARDUINO_Heltec_WIFI_Kit_32",
4+
"extra_flags": "-DARDUINO_HELTEC_WIFI_KIT_32",
55
"f_cpu": "240000000L",
66
"f_flash": "40000000L",
77
"flash_mode": "dio",
@@ -19,7 +19,7 @@
1919
"arduino",
2020
"espidf"
2121
],
22-
"name": "Heltec WIFI Kit 32",
22+
"name": "Heltec WiFi Kit 32",
2323
"upload": {
2424
"flash_size": "4MB",
2525
"maximum_ram_size": 327680,
@@ -28,6 +28,6 @@
2828
"require_upload_port": true,
2929
"speed": 921600
3030
},
31-
"url": "http://www.heltec.cn",
31+
"url": "http://www.heltec.cn/project/wifi-kit-32/?lang=en",
3232
"vendor": "Heltec Automation"
3333
}

‎boards/heltec_wifi_lora_32.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"build": {
33
"core": "esp32",
4-
"extra_flags": "-DARDUINO_Heltec_WIFI_LoRa_32",
4+
"extra_flags": "-DARDUINO_HELTEC_WIFI_LORA_32",
55
"f_cpu": "240000000L",
66
"f_flash": "40000000L",
77
"flash_mode": "dio",
@@ -22,7 +22,7 @@
2222
"arduino",
2323
"espidf"
2424
],
25-
"name": "Heltec WIFI LoRa 32",
25+
"name": "Heltec WiFi LoRa 32",
2626
"upload": {
2727
"flash_size": "4MB",
2828
"maximum_ram_size": 327680,

‎boards/heltec_wifi_lora_32_V2.json

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"build": {
3+
"core": "esp32",
4+
"extra_flags": "-DARDUINO_HELTEC_WIFI_LORA_32_V2",
5+
"f_cpu": "240000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "dio",
8+
"ldscript": "esp32_out.ld",
9+
"partitions": "default_8MB.csv",
10+
"mcu": "esp32",
11+
"variant": "heltec_wifi_lora_32_V2"
12+
},
13+
"connectivity": [
14+
"wifi",
15+
"bluetooth",
16+
"ethernet",
17+
"can"
18+
],
19+
"debug": {
20+
"openocd_board": "esp-wroom-32.cfg"
21+
},
22+
"frameworks": [
23+
"arduino",
24+
"espidf"
25+
],
26+
"name": "Heltec WiFi LoRa 32 (V2)",
27+
"upload": {
28+
"flash_size": "8MB",
29+
"maximum_ram_size": 327680,
30+
"maximum_size": 8388608,
31+
"protocol": "esptool",
32+
"require_upload_port": true,
33+
"speed": 921600
34+
},
35+
"url": "http://www.heltec.cn/project/wifi-lora-32/?lang=en",
36+
"vendor": "Heltec Automation"
37+
}

‎boards/heltec_wireless_stick.json

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"build": {
3+
"core": "esp32",
4+
"extra_flags": "-DARDUINO_HELTEC_WIRELESS_STICK",
5+
"f_cpu": "240000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "dio",
8+
"ldscript": "esp32_out.ld",
9+
"partitions": "default_8MB.csv",
10+
"mcu": "esp32",
11+
"variant": "heltec_wireless_stick"
12+
},
13+
"connectivity": [
14+
"wifi",
15+
"bluetooth",
16+
"ethernet",
17+
"can"
18+
],
19+
"debug": {
20+
"openocd_board": "esp-wroom-32.cfg"
21+
},
22+
"frameworks": [
23+
"arduino",
24+
"espidf"
25+
],
26+
"name": "Heltec Wireless Stick",
27+
"upload": {
28+
"flash_size": "8MB",
29+
"maximum_ram_size": 327680,
30+
"maximum_size": 8388608,
31+
"protocol": "esptool",
32+
"require_upload_port": true,
33+
"speed": 921600
34+
},
35+
"url": "http://www.heltec.cn/project/wireless-stick/?lang=en",
36+
"vendor": "Heltec Automation"
37+
}

‎boards/m5stick-c.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_M5Stick_C",
5+
"f_cpu": "240000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "dio",
8+
"ldscript": "esp32_out.ld",
9+
"mcu": "esp32",
10+
"variant": "m5stick_c"
11+
},
12+
"connectivity": [
13+
"wifi",
14+
"bluetooth",
15+
"ethernet",
16+
"can"
17+
],
18+
"frameworks": [
19+
"arduino",
20+
"espidf"
21+
],
22+
"name": "M5Stick-C",
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": 1500000
30+
},
31+
"url": "http://www.m5stack.com",
32+
"vendor": "M5Stack"
33+
}

‎boards/oroca_edubot.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"f_flash": "40000000L",
77
"flash_mode": "dio",
88
"ldscript": "esp32_out.ld",
9+
"partitions": "huge_app.csv",
910
"mcu": "esp32",
1011
"variant": "oroca_edubot"
1112
},

‎boards/sparkfun_lora_gateway_1-channel.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_ESP32_DEV",
5+
"f_cpu": "240000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "dio",
8+
"ldscript": "esp32_out.ld",
9+
"mcu": "esp32",
10+
"variant": "sparkfun_lora_gateway_1-channel"
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": "SparkFun LoRa Gateway 1-Channel",
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.sparkfun.com/products/15006",
35+
"vendor": "SparkFun"
36+
}

0 commit comments

Comments
 (0)