From 8c2e29da2459de038abc9c097d52fb1bf785b5a2 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sat, 29 Oct 2016 19:31:23 +0300 Subject: [PATCH] Added packages, updated Arduino for ESP32 --- .travis.yml | 2 +- README.md | 2 +- boards/esp32.json | 27 --------------------- boards/esp32dev.json | 27 +++++++++++++++++++++ builder/main.py | 8 +++--- examples/arduino-blink/platformio.ini | 4 +-- examples/arduino-wifiscan/platformio.ini | 4 +-- examples/espidf-http-request/platformio.ini | 4 +-- platform.json | 6 ++--- 9 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 boards/esp32.json create mode 100644 boards/esp32dev.json diff --git a/.travis.yml b/.travis.yml index a39fb22..77fc687 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,6 @@ notifications: slack: rooms: - secure: zKv2HzE18J8f+mHUeoNylXSvh6IBlfaaf2H96cicwGB3p53jOXBXO/99N7MVe6UnkJludmVeTGim4timqZdCOLglUPxIo8lSFSp5+4dO+WCpZB7z9P+vw4oy+qV+5Kp1EhDQnOybg/7DdYiJiCVz1psDZH+oYRqnW/+lU6s48svItrUpy6s36OeZJsYP9jjoWnSyzAemvO3kurC3Gib475tJfKIMVd5l9Lmj3yuALonDj6z6DXHyM8lExxRbaAe22CvHzuTXs3N0S/d34Gdi7+f/+NOcKrdBgNbzMnchtwLgnX8uqGAp+3D96JmTNFxdBc1uY82WdDY/ij2X/f6GFzIWgXRI7medHxvWqUFdRC1Z6bK1t36QsPgot2A3nT4oJnlJ/NqpwsjnSN60emDmkbDUf0p1JzErhHHQTVrasTWOX7yXVteXXIIP1HYR1A+5VMjO+6r20J9AM+QYm/b+9Rmy6t2uMdmimiRTy2fQxH/eExWSmJqrzdvgWHPc8gPxj9Ib8mryVegFlkajswv/rh2L8I5FZwNTot0+qwYFyst+hNm0PBVBmcyLhSW4v2/sVBwq38ir4NyXtnps46S7VNKh7b8kdO2o4f8oRkv+PWSnnK6N6tej20CAZeBjTh2puIl2HVL47/rCQA7DZMiJP+iGet6HG6pWKktilvfhSLs= + secure: EkXAtWoUQtgtFeiOobnNZmaUgPw7evpo60Tam5jQiKbVK02bCbBODELTSFsGfIj05oAzNm4s1xBTRD3x9bsvPqvfThHwIHZ2M2BlrT06iINsfFXoXM5yCuBAIi8FF61UKmiZn+Pm+IK6OeUFmzXoP5BcpS2LRB0eSoCj0nsF5cj/H+oA6BnCn/5AXhbSQSiHxOPfq/0khQb5dalmf3B9NHq08MEiOLJR5J9zPglKMfE2HR8PS98irN0x1t9+aReMfUJSZrxfqwvWKz/Sb38/2H37A4GOXpsnRDagZXkfw/MSckSxRFtW8p/0LUBQqeaxdC5Z9qIuyDCAeHPm8d0AIArR7Ylz6BjlNVJVdCTAZaNTp7PUV4n1cN7gZPq8NhWnuGG3wdWiYlJEyHmmRjr9adDYTshCl3gf2GOjB5YJIjoNrixkoJwHM2gJLvwuOw7mgo0hLbqW84XSgV6KeSU12AYk9d2nz3AhWVsb4DiKrN+EqnhBVnCygAxYGlNxfZOPG0FIYai2DUsl6PXd3OBmxeNEWG+x7BivG+maaQEyC4SeFaNFIBR1L4F+C0fHW1VxiCvJCb6vB7fOk7fU5UDhpYnrRmSuyAVYR86aZ+3VnZjbjpGac6hfN7Qxg5WeC5Yd6eR2lrNag9lG5zASylZ1nsdlOZloPs8ilGe43mDpAkg= on_failure: always on_success: change diff --git a/README.md b/README.md index 9266572..a3c2211 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Espressif 32: development platform for [PlatformIO](http://platformio.org) [![Build Status](https://travis-ci.org/platformio/platform-espressif32.svg?branch=develop)](https://travis-ci.org/platformio/platform-espressif32) -[![Build status](https://ci.appveyor.com/api/projects/status/aob49qatio84iygj/branch/develop?svg=true)](https://ci.appveyor.com/project/ivankravets/platform-espressif32/branch/develop) +[![Build status](https://ci.appveyor.com/api/projects/status/nl087sumhneumse3/branch/develop?svg=true)](https://ci.appveyor.com/project/ivankravets/platform-espressif32/branch/develop) Espressif Systems is a privately held fabless semiconductor company. They provide wireless communications and Wi-Fi chips which are widely used in mobile devices and the Internet of Things applications. diff --git a/boards/esp32.json b/boards/esp32.json deleted file mode 100644 index 2f3d137..0000000 --- a/boards/esp32.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "build": { - "core": "esp32", - "extra_flags": "-DESP32_DEV -DARDUINO_ESP32_DEV", - "f_cpu": "160000000L", - "f_flash": "80000000L", - "flash_mode": "dio", - "ldscript": "esp32.out.ld", - "mcu": "esp32", - "variant": "esp32" - }, - "frameworks": [ - "arduino", - "espidf" - ], - "name": "Espressif ESP32 Dev Module", - "upload": { - "maximum_ram_size": 114688, - "maximum_size": 1044464, - "require_upload_port": true, - "resetmethod": "nodemcu", - "speed": 115200, - "wait_for_upload_port": true - }, - "url": "https://en.wikipedia.org/wiki/ESP32", - "vendor": "Espressif" -} diff --git a/boards/esp32dev.json b/boards/esp32dev.json new file mode 100644 index 0000000..8898a48 --- /dev/null +++ b/boards/esp32dev.json @@ -0,0 +1,27 @@ +{ + "build": { + "core": "esp32", + "extra_flags": "-DESP32_DEV -DARDUINO_ESP32_DEV", + "f_cpu": "160000000L", + "f_flash": "80000000L", + "flash_mode": "dio", + "ldscript": "esp32_out.ld", + "mcu": "esp32", + "variant": "esp32" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Espressif ESP32 Dev Module", + "upload": { + "maximum_ram_size": 114688, + "maximum_size": 1044464, + "require_upload_port": true, + "resetmethod": "nodemcu", + "speed": 115200, + "wait_for_upload_port": true + }, + "url": "https://en.wikipedia.org/wiki/ESP32", + "vendor": "Espressif" +} diff --git a/builder/main.py b/builder/main.py index 1edf30d..53813bb 100644 --- a/builder/main.py +++ b/builder/main.py @@ -12,8 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. - -import re from os.path import join from SCons.Script import (AlwaysBuild, Builder, Default, DefaultEnvironment) @@ -78,7 +76,8 @@ env.Replace( AS="xtensa-esp32-elf-as", CC="xtensa-esp32-elf-gcc", CXX="xtensa-esp32-elf-g++", - OBJCOPY=join(platform.get_package_dir("tool-esptool"), "esptool.py"), + OBJCOPY=join( + platform.get_package_dir("tool-esptoolpy") or "", "esptool.py"), RANLIB="xtensa-esp32-elf-ranlib", SIZETOOL="xtensa-esp32-elf-size", @@ -136,7 +135,8 @@ env.Replace( # Upload # - UPLOADER=join(platform.get_package_dir("tool-esptool"), "esptool.py"), + UPLOADER=join( + platform.get_package_dir("tool-esptoolpy") or "", "esptool.py"), UPLOADERFLAGS=[ "--chip", "esp32", diff --git a/examples/arduino-blink/platformio.ini b/examples/arduino-blink/platformio.ini index 830b591..42a8c81 100644 --- a/examples/arduino-blink/platformio.ini +++ b/examples/arduino-blink/platformio.ini @@ -7,7 +7,7 @@ ; Please visit documentation for the other options and examples ; http://docs.platformio.org/en/stable/projectconf.html -[env:esp32] +[env:esp32dev] platform = espressif32 framework = arduino -board = esp32 +board = esp32dev diff --git a/examples/arduino-wifiscan/platformio.ini b/examples/arduino-wifiscan/platformio.ini index 830b591..42a8c81 100644 --- a/examples/arduino-wifiscan/platformio.ini +++ b/examples/arduino-wifiscan/platformio.ini @@ -7,7 +7,7 @@ ; Please visit documentation for the other options and examples ; http://docs.platformio.org/en/stable/projectconf.html -[env:esp32] +[env:esp32dev] platform = espressif32 framework = arduino -board = esp32 +board = esp32dev diff --git a/examples/espidf-http-request/platformio.ini b/examples/espidf-http-request/platformio.ini index 55eafde..2f9f3b2 100644 --- a/examples/espidf-http-request/platformio.ini +++ b/examples/espidf-http-request/platformio.ini @@ -7,8 +7,8 @@ ; Please visit documentation for the other options and examples ; http://docs.platformio.org/en/stable/projectconf.html -[env:esp32] +[env:esp32dev] platform = espressif32 framework = espidf -board = esp32 +board = esp32dev build_flags = -DCONFIG_WIFI_SSID=\"ESP_AP\" -DCONFIG_WIFI_PASSWORD=\"MYPASS\" \ No newline at end of file diff --git a/platform.json b/platform.json index a3122ef..a0cdd6e 100644 --- a/platform.json +++ b/platform.json @@ -38,16 +38,16 @@ "framework-arduinoespressif32": { "type": "framework", "optional": true, - "version": "~0.0.0" + "version": "~1.0.0" }, "framework-espidf": { "type": "framework", "optional": true, "version": "~1.90.0" }, - "tool-esptool": { + "tool-esptoolpy": { "type": "uploader", - "version": "~1.409.0" + "version": "~1.0.0" } } }