Skip to content

Commit

Permalink
Merge branch 'release/v1.8.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
ivankravets committed Apr 19, 2019
2 parents 04e28ac + dfcbeb5 commit edc118b
Show file tree
Hide file tree
Showing 21 changed files with 1,026 additions and 215 deletions.
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ environment:

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

test_script:
Expand Down
34 changes: 34 additions & 0 deletions boards/esp32cam.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"build": {
"core": "esp32",
"extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue",
"f_cpu": "240000000L",
"f_flash": "40000000L",
"flash_mode": "dio",
"ldscript": "esp32_out.ld",
"partitions": "huge_app.csv",
"mcu": "esp32",
"variant": "esp32"
},
"connectivity": [
"wifi",
"bluetooth",
"ethernet",
"can"
],
"frameworks": [
"arduino",
"espidf"
],
"name": "AI Thinker ESP32-CAM",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 327680,
"maximum_size": 4194304,
"protocol": "esptool",
"require_upload_port": true,
"speed": 460800
},
"url": "https://wiki.ai-thinker.com/esp32-cam",
"vendor": "AI Thinker"
}
36 changes: 36 additions & 0 deletions boards/frogboard.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"build": {
"core": "esp32",
"extra_flags": "-DARDUINO_FROG_ESP32",
"f_cpu": "240000000L",
"f_flash": "40000000L",
"flash_mode": "dio",
"ldscript": "esp32_out.ld",
"mcu": "esp32",
"variant": "frog32"
},
"connectivity": [
"wifi",
"bluetooth",
"ethernet",
"can"
],
"debug": {
"openocd_board": "esp-wroom-32.cfg"
},
"frameworks": [
"arduino",
"espidf"
],
"name": "Frog Board ESP32",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 327680,
"maximum_size": 4194304,
"protocol": "esptool",
"require_upload_port": true,
"speed": 921600
},
"url": "https://www.tindie.com/products/fred_IOT/esp32s-esp-wroom32-frogopins-development-board/",
"vendor": "Fred"
}
6 changes: 3 additions & 3 deletions boards/heltec_wifi_kit_32.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"build": {
"core": "esp32",
"extra_flags": "-DARDUINO_Heltec_WIFI_Kit_32",
"extra_flags": "-DARDUINO_HELTEC_WIFI_KIT_32",
"f_cpu": "240000000L",
"f_flash": "40000000L",
"flash_mode": "dio",
Expand All @@ -19,7 +19,7 @@
"arduino",
"espidf"
],
"name": "Heltec WIFI Kit 32",
"name": "Heltec WiFi Kit 32",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 327680,
Expand All @@ -28,6 +28,6 @@
"require_upload_port": true,
"speed": 921600
},
"url": "http://www.heltec.cn",
"url": "http://www.heltec.cn/project/wifi-kit-32/?lang=en",
"vendor": "Heltec Automation"
}
4 changes: 2 additions & 2 deletions boards/heltec_wifi_lora_32.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"build": {
"core": "esp32",
"extra_flags": "-DARDUINO_Heltec_WIFI_LoRa_32",
"extra_flags": "-DARDUINO_HELTEC_WIFI_LORA_32",
"f_cpu": "240000000L",
"f_flash": "40000000L",
"flash_mode": "dio",
Expand All @@ -22,7 +22,7 @@
"arduino",
"espidf"
],
"name": "Heltec WIFI LoRa 32",
"name": "Heltec WiFi LoRa 32",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 327680,
Expand Down
37 changes: 37 additions & 0 deletions boards/heltec_wifi_lora_32_V2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"build": {
"core": "esp32",
"extra_flags": "-DARDUINO_HELTEC_WIFI_LORA_32_V2",
"f_cpu": "240000000L",
"f_flash": "40000000L",
"flash_mode": "dio",
"ldscript": "esp32_out.ld",
"partitions": "default_8MB.csv",
"mcu": "esp32",
"variant": "heltec_wifi_lora_32_V2"
},
"connectivity": [
"wifi",
"bluetooth",
"ethernet",
"can"
],
"debug": {
"openocd_board": "esp-wroom-32.cfg"
},
"frameworks": [
"arduino",
"espidf"
],
"name": "Heltec WiFi LoRa 32 (V2)",
"upload": {
"flash_size": "8MB",
"maximum_ram_size": 327680,
"maximum_size": 8388608,
"protocol": "esptool",
"require_upload_port": true,
"speed": 921600
},
"url": "http://www.heltec.cn/project/wifi-lora-32/?lang=en",
"vendor": "Heltec Automation"
}
37 changes: 37 additions & 0 deletions boards/heltec_wireless_stick.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"build": {
"core": "esp32",
"extra_flags": "-DARDUINO_HELTEC_WIRELESS_STICK",
"f_cpu": "240000000L",
"f_flash": "40000000L",
"flash_mode": "dio",
"ldscript": "esp32_out.ld",
"partitions": "default_8MB.csv",
"mcu": "esp32",
"variant": "heltec_wireless_stick"
},
"connectivity": [
"wifi",
"bluetooth",
"ethernet",
"can"
],
"debug": {
"openocd_board": "esp-wroom-32.cfg"
},
"frameworks": [
"arduino",
"espidf"
],
"name": "Heltec Wireless Stick",
"upload": {
"flash_size": "8MB",
"maximum_ram_size": 327680,
"maximum_size": 8388608,
"protocol": "esptool",
"require_upload_port": true,
"speed": 921600
},
"url": "http://www.heltec.cn/project/wireless-stick/?lang=en",
"vendor": "Heltec Automation"
}
33 changes: 33 additions & 0 deletions boards/m5stick-c.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"build": {
"core": "esp32",
"extra_flags": "-DARDUINO_M5Stick_C",
"f_cpu": "240000000L",
"f_flash": "40000000L",
"flash_mode": "dio",
"ldscript": "esp32_out.ld",
"mcu": "esp32",
"variant": "m5stick_c"
},
"connectivity": [
"wifi",
"bluetooth",
"ethernet",
"can"
],
"frameworks": [
"arduino",
"espidf"
],
"name": "M5Stick-C",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 327680,
"maximum_size": 4194304,
"protocol": "esptool",
"require_upload_port": true,
"speed": 1500000
},
"url": "http://www.m5stack.com",
"vendor": "M5Stack"
}
1 change: 1 addition & 0 deletions boards/oroca_edubot.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"f_flash": "40000000L",
"flash_mode": "dio",
"ldscript": "esp32_out.ld",
"partitions": "huge_app.csv",
"mcu": "esp32",
"variant": "oroca_edubot"
},
Expand Down
36 changes: 36 additions & 0 deletions boards/sparkfun_lora_gateway_1-channel.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"build": {
"core": "esp32",
"extra_flags": "-DARDUINO_ESP32_DEV",
"f_cpu": "240000000L",
"f_flash": "40000000L",
"flash_mode": "dio",
"ldscript": "esp32_out.ld",
"mcu": "esp32",
"variant": "sparkfun_lora_gateway_1-channel"
},
"connectivity": [
"wifi",
"bluetooth",
"ethernet",
"can"
],
"debug": {
"openocd_board": "esp-wroom-32.cfg"
},
"frameworks": [
"arduino",
"espidf"
],
"name": "SparkFun LoRa Gateway 1-Channel",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 327680,
"maximum_size": 4194304,
"protocol": "esptool",
"require_upload_port": true,
"speed": 921600
},
"url": "https://www.sparkfun.com/products/15006",
"vendor": "SparkFun"
}
Loading

0 comments on commit edc118b

Please sign in to comment.