Skip to content

Commit

Permalink
Merge branch 'release/v0.10.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
ivankravets committed Sep 5, 2017
2 parents ba1877f + 0deef1b commit 949098a
Show file tree
Hide file tree
Showing 8 changed files with 207 additions and 3 deletions.
34 changes: 34 additions & 0 deletions boards/espectro32.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"build": {
"core": "esp32",
"extra_flags": "-DESP32_DEV -DARDUINO_ESPECTRO32",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "qio",
"ldscript": "esp32_out.ld",
"mcu": "esp32",
"variant": "espectro32"
},
"connectivity": [
"wifi",
"bluetooth",
"ethernet",
"can"
],
"frameworks": [
"arduino",
"espidf"
],
"name": "ESPectro32",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 294912,
"maximum_size": 1310720,
"require_upload_port": true,
"resetmethod": "nodemcu",
"speed": 2000000,
"wait_for_upload_port": true
},
"url": "https://shop.makestro.com/product/espectro32",
"vendor": "DycodeX"
}
34 changes: 34 additions & 0 deletions boards/heltec_wifi_kit_32.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"build": {
"core": "esp32",
"extra_flags": "-DESP32_DEV -DARDUINO_Heltec_WIFI_Kit_32",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "dio",
"ldscript": "esp32_out.ld",
"mcu": "esp32",
"variant": "heltec_wifi_kit_32"
},
"connectivity": [
"wifi",
"bluetooth",
"ethernet",
"can"
],
"frameworks": [
"arduino",
"espidf"
],
"name": "Heltec WIFI Kit 32",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 294912,
"maximum_size": 1310720,
"require_upload_port": true,
"resetmethod": "nodemcu",
"speed": 115200,
"wait_for_upload_port": true
},
"url": "http://www.heltec.cn",
"vendor": "Heltec Automation"
}
34 changes: 34 additions & 0 deletions boards/heltec_wifi_lora_32.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"build": {
"core": "esp32",
"extra_flags": "-DESP32_DEV -DARDUINO_Heltec_WIFI_LoRa_32",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "dio",
"ldscript": "esp32_out.ld",
"mcu": "esp32",
"variant": "heltec_wifi_lora_32"
},
"connectivity": [
"wifi",
"bluetooth",
"ethernet",
"can"
],
"frameworks": [
"arduino",
"espidf"
],
"name": "Heltec WIFI LoRa 32",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 294912,
"maximum_size": 1310720,
"require_upload_port": true,
"resetmethod": "nodemcu",
"speed": 115200,
"wait_for_upload_port": true
},
"url": "http://www.heltec.cn",
"vendor": "Heltec Automation"
}
34 changes: 34 additions & 0 deletions boards/m5stack-core-esp32.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"build": {
"core": "esp32",
"extra_flags": "-DESP32_DEV -DARDUINO_M5Stack-Core-ESP32",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "dio",
"ldscript": "esp32_out.ld",
"mcu": "esp32",
"variant": "esp32"
},
"connectivity": [
"wifi",
"bluetooth",
"ethernet",
"can"
],
"frameworks": [
"arduino",
"espidf"
],
"name": "M5Stack-Core-ESP32",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 294912,
"maximum_size": 1310720,
"require_upload_port": true,
"resetmethod": "nodemcu",
"speed": 115200,
"wait_for_upload_port": true
},
"url": "http://www.m5stack.com",
"vendor": "M5Stack"
}
34 changes: 34 additions & 0 deletions boards/mhetesp32devkit.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"build": {
"core": "esp32",
"extra_flags": "-DESP32_DEV -DARDUINO_MH_ET_LIVE_ESP32DEVKIT",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "dio",
"ldscript": "esp32_out.ld",
"mcu": "esp32",
"variant": "mhetesp32devkit"
},
"connectivity": [
"wifi",
"bluetooth",
"ethernet",
"can"
],
"frameworks": [
"arduino",
"espidf"
],
"name": "MH ET LIVE ESP32DevKIT",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 294912,
"maximum_size": 1310720,
"require_upload_port": true,
"resetmethod": "nodemcu",
"speed": 115200,
"wait_for_upload_port": true
},
"url": "http://forum.mhetlive.com",
"vendor": "MH-ET Live"
}
34 changes: 34 additions & 0 deletions boards/mhetesp32minikit.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"build": {
"core": "esp32",
"extra_flags": "-DESP32_DEV -DARDUINO_MH_ET_LIVE_ESP32MINIKIT",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "dio",
"ldscript": "esp32_out.ld",
"mcu": "esp32",
"variant": "mhetesp32minikit"
},
"connectivity": [
"wifi",
"bluetooth",
"ethernet",
"can"
],
"frameworks": [
"arduino",
"espidf"
],
"name": "MH ET LIVE ESP32MiniKit",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 294912,
"maximum_size": 1310720,
"require_upload_port": true,
"resetmethod": "nodemcu",
"speed": 115200,
"wait_for_upload_port": true
},
"url": "http://forum.mhetlive.com",
"vendor": "MH-ET Live"
}
2 changes: 1 addition & 1 deletion builder/frameworks/espidf.py
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ def build_espidf_bootloader():
join("$BUILD_DIR", "esp32_out.ld"),
join(FRAMEWORK_DIR, "components", "esp32", "ld", "esp32.ld"),
env.VerboseAction(
"$CC -I$PROJECTSRC_DIR -C -P -x c -E $SOURCE -o $TARGET",
'$CC -I"$PROJECTSRC_DIR" -C -P -x c -E $SOURCE -o $TARGET',
"Generating LD script $TARGET"))

env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", linker_script)
Expand Down
4 changes: 2 additions & 2 deletions platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-espressif32.git"
},
"version": "0.9.1",
"version": "0.10.0",
"packageRepositories": [
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
"http://dl.platformio.org/packages/manifest.json",
Expand Down Expand Up @@ -45,7 +45,7 @@
"framework-arduinoespressif32": {
"type": "framework",
"optional": true,
"version": "~1.1.4"
"version": "~1.2.0"
},
"framework-espidf": {
"type": "framework",
Expand Down

0 comments on commit 949098a

Please sign in to comment.