diff --git a/boards/espectro32.json b/boards/espectro32.json new file mode 100644 index 0000000..4c5e549 --- /dev/null +++ b/boards/espectro32.json @@ -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" +} diff --git a/boards/heltec_wifi_kit_32.json b/boards/heltec_wifi_kit_32.json new file mode 100644 index 0000000..e0f22df --- /dev/null +++ b/boards/heltec_wifi_kit_32.json @@ -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" +} diff --git a/boards/heltec_wifi_lora_32.json b/boards/heltec_wifi_lora_32.json new file mode 100644 index 0000000..92399de --- /dev/null +++ b/boards/heltec_wifi_lora_32.json @@ -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" +} diff --git a/boards/m5stack-core-esp32.json b/boards/m5stack-core-esp32.json new file mode 100644 index 0000000..3d4e9bc --- /dev/null +++ b/boards/m5stack-core-esp32.json @@ -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" +} diff --git a/boards/mhetesp32devkit.json b/boards/mhetesp32devkit.json new file mode 100644 index 0000000..444227f --- /dev/null +++ b/boards/mhetesp32devkit.json @@ -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" +} diff --git a/boards/mhetesp32minikit.json b/boards/mhetesp32minikit.json new file mode 100644 index 0000000..be503cb --- /dev/null +++ b/boards/mhetesp32minikit.json @@ -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" +} diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py index 8c1a7db..8f535ff 100644 --- a/builder/frameworks/espidf.py +++ b/builder/frameworks/espidf.py @@ -337,7 +337,7 @@ linker_script = env.Command( 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) diff --git a/platform.json b/platform.json index d59449f..6be9874 100644 --- a/platform.json +++ b/platform.json @@ -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", @@ -45,7 +45,7 @@ "framework-arduinoespressif32": { "type": "framework", "optional": true, - "version": "~1.1.4" + "version": "~1.2.0" }, "framework-espidf": { "type": "framework",