From ee869536190c5bbb8369833a6a0778f0cc2270f9 Mon Sep 17 00:00:00 2001 From: Valerii Koval Date: Mon, 24 Jul 2017 13:22:47 +0300 Subject: [PATCH 1/8] Remove deprecated stuff // platformio/platformio-examples#14 --- examples/espidf-hello-world/src/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/espidf-hello-world/src/main.c b/examples/espidf-hello-world/src/main.c index 0b37e55a3..0e872522f 100644 --- a/examples/espidf-hello-world/src/main.c +++ b/examples/espidf-hello-world/src/main.c @@ -21,12 +21,11 @@ void hello_task(void *pvParameter) } printf("Restarting now.\n"); fflush(stdout); - system_restart(); + esp_restart(); } void app_main() { nvs_flash_init(); - system_init(); xTaskCreate(&hello_task, "hello_task", 2048, NULL, 5, NULL); -} \ No newline at end of file +} From 85d3f1184962c2d77b1bb71ab9502049ff2836de Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 28 Jul 2017 00:44:33 +0300 Subject: [PATCH 2/8] Add "connectivity" information for boards --- boards/esp320.json | 8 +++++++- boards/esp32dev.json | 8 +++++++- boards/esp32doit-devkit-v1.json | 8 +++++++- boards/esp32thing.json | 8 +++++++- boards/esp32vn-iot-uno.json | 8 +++++++- boards/espea32.json | 10 ++++++++-- boards/featheresp32.json | 8 +++++++- boards/firebeetle32.json | 8 +++++++- boards/hornbill32dev.json | 8 +++++++- boards/hornbill32minima.json | 8 +++++++- boards/intorobot.json | 8 +++++++- boards/lolin32.json | 8 +++++++- boards/nano32.json | 8 +++++++- boards/node32s.json | 8 +++++++- boards/nodemcu-32s.json | 8 +++++++- boards/onehorse32dev.json | 8 +++++++- boards/quantum.json | 8 +++++++- boards/widora-air.json | 8 +++++++- 18 files changed, 127 insertions(+), 19 deletions(-) diff --git a/boards/esp320.json b/boards/esp320.json index 604469e88..32745b959 100644 --- a/boards/esp320.json +++ b/boards/esp320.json @@ -9,7 +9,13 @@ "mcu": "esp32", "variant": "esp320" }, - "frameworks": [ + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ "arduino", "espidf" ], diff --git a/boards/esp32dev.json b/boards/esp32dev.json index 37c3e0e60..392d2eb70 100644 --- a/boards/esp32dev.json +++ b/boards/esp32dev.json @@ -9,7 +9,13 @@ "mcu": "esp32", "variant": "esp32" }, - "frameworks": [ + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ "arduino", "espidf" ], diff --git a/boards/esp32doit-devkit-v1.json b/boards/esp32doit-devkit-v1.json index 1e1b733bc..356e785b2 100644 --- a/boards/esp32doit-devkit-v1.json +++ b/boards/esp32doit-devkit-v1.json @@ -9,7 +9,13 @@ "mcu": "esp32", "variant": "doitESP32devkitV1" }, - "frameworks": [ + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ "arduino", "espidf" ], diff --git a/boards/esp32thing.json b/boards/esp32thing.json index 0e250db3b..ad7dd783d 100644 --- a/boards/esp32thing.json +++ b/boards/esp32thing.json @@ -9,7 +9,13 @@ "mcu": "esp32", "variant": "esp32thing" }, - "frameworks": [ + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ "arduino", "espidf" ], diff --git a/boards/esp32vn-iot-uno.json b/boards/esp32vn-iot-uno.json index 0be663141..0c4fd0d63 100644 --- a/boards/esp32vn-iot-uno.json +++ b/boards/esp32vn-iot-uno.json @@ -9,7 +9,13 @@ "mcu": "esp32", "variant": "esp32vn-iot-uno" }, - "frameworks": [ + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ "arduino", "espidf" ], diff --git a/boards/espea32.json b/boards/espea32.json index 05bd35ded..e98b84525 100644 --- a/boards/espea32.json +++ b/boards/espea32.json @@ -9,13 +9,19 @@ "mcu": "esp32", "variant": "espea32" }, - "frameworks": [ + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ "arduino", "espidf" ], "name": "April Brother ESPea32", "upload": { - "flash_size": "4MB", + "flash_size": "4MB", "maximum_ram_size": 294912, "maximum_size": 1310720, "require_upload_port": true, diff --git a/boards/featheresp32.json b/boards/featheresp32.json index abeaca218..eec6a72ad 100644 --- a/boards/featheresp32.json +++ b/boards/featheresp32.json @@ -9,7 +9,13 @@ "mcu": "esp32", "variant": "feather_esp32" }, - "frameworks": [ + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ "arduino", "espidf" ], diff --git a/boards/firebeetle32.json b/boards/firebeetle32.json index 80a747368..63d5d65ef 100644 --- a/boards/firebeetle32.json +++ b/boards/firebeetle32.json @@ -9,7 +9,13 @@ "mcu": "esp32", "variant": "firebeetle32" }, - "frameworks": [ + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ "arduino", "espidf" ], diff --git a/boards/hornbill32dev.json b/boards/hornbill32dev.json index a84d3f672..a0a2b3f6d 100644 --- a/boards/hornbill32dev.json +++ b/boards/hornbill32dev.json @@ -9,7 +9,13 @@ "mcu": "esp32", "variant": "hornbill32dev" }, - "frameworks": [ + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ "arduino", "espidf" ], diff --git a/boards/hornbill32minima.json b/boards/hornbill32minima.json index 1927de2e8..2876956c2 100644 --- a/boards/hornbill32minima.json +++ b/boards/hornbill32minima.json @@ -9,7 +9,13 @@ "mcu": "esp32", "variant": "hornbill32minima" }, - "frameworks": [ + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ "arduino", "espidf" ], diff --git a/boards/intorobot.json b/boards/intorobot.json index 06c08e9be..bd966c68a 100644 --- a/boards/intorobot.json +++ b/boards/intorobot.json @@ -9,7 +9,13 @@ "mcu": "esp32", "variant": "intorobot-fig" }, - "frameworks": [ + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ "arduino", "espidf" ], diff --git a/boards/lolin32.json b/boards/lolin32.json index 272e1dbeb..28a4c5bd1 100644 --- a/boards/lolin32.json +++ b/boards/lolin32.json @@ -9,7 +9,13 @@ "mcu": "esp32", "variant": "lolin32" }, - "frameworks": [ + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ "arduino", "espidf" ], diff --git a/boards/nano32.json b/boards/nano32.json index b970179a9..df6b6e612 100644 --- a/boards/nano32.json +++ b/boards/nano32.json @@ -9,7 +9,13 @@ "mcu": "esp32", "variant": "nano32" }, - "frameworks": [ + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ "arduino", "espidf", "simba", diff --git a/boards/node32s.json b/boards/node32s.json index a7f351ff0..c6d86b8ab 100644 --- a/boards/node32s.json +++ b/boards/node32s.json @@ -9,7 +9,13 @@ "mcu": "esp32", "variant": "esp32" }, - "frameworks": [ + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ "arduino", "espidf" ], diff --git a/boards/nodemcu-32s.json b/boards/nodemcu-32s.json index 29c825738..2732f17c7 100644 --- a/boards/nodemcu-32s.json +++ b/boards/nodemcu-32s.json @@ -9,7 +9,13 @@ "mcu": "esp32", "variant": "nodemcu-32s" }, - "frameworks": [ + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ "arduino", "espidf" ], diff --git a/boards/onehorse32dev.json b/boards/onehorse32dev.json index dd6e143ae..5647b8710 100644 --- a/boards/onehorse32dev.json +++ b/boards/onehorse32dev.json @@ -9,7 +9,13 @@ "mcu": "esp32", "variant": "onehorse32dev" }, - "frameworks": [ + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ "arduino", "espidf" ], diff --git a/boards/quantum.json b/boards/quantum.json index cd0a04670..8eb0f5216 100644 --- a/boards/quantum.json +++ b/boards/quantum.json @@ -9,7 +9,13 @@ "mcu": "esp32", "variant": "quantum" }, - "frameworks": [ + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ "arduino", "espidf" ], diff --git a/boards/widora-air.json b/boards/widora-air.json index b323e7571..2b58c98ac 100644 --- a/boards/widora-air.json +++ b/boards/widora-air.json @@ -9,7 +9,13 @@ "mcu": "esp32", "variant": "widora-air" }, - "frameworks": [ + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ "arduino", "espidf" ], From 9e14a2f784df1fc8c512cee0e1be9edcbefaa88b Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 31 Jul 2017 19:42:40 +0300 Subject: [PATCH 3/8] Remove SourceForge Storage Mirror --- platform.json | 1 - 1 file changed, 1 deletion(-) diff --git a/platform.json b/platform.json index bcfb366a5..e9f0864b9 100644 --- a/platform.json +++ b/platform.json @@ -15,7 +15,6 @@ "version": "0.7.5", "packageRepositories": [ "https://dl.bintray.com/platformio/dl-packages/manifest.json", - "https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download", "http://dl.platformio.org/packages/manifest.json", "https://raw.githubusercontent.com/eerimoq/simba/master/make/platformio/manifest.json", "https://raw.githubusercontent.com/eerimoq/pumbaa/master/make/platformio/manifest.json" From 53468aa1e3f9154e181ea8c69f2c68f6d2548fe6 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 1 Aug 2017 01:26:46 +0300 Subject: [PATCH 4/8] Add new boards OLIMEX ESP32-EVB, OLIMEX ESP32-GATEWAY, ESPino32 --- boards/esp32-evb.json | 34 ++++++++++++++++++++++++++++++++++ boards/esp32-gateway.json | 34 ++++++++++++++++++++++++++++++++++ boards/espino32.json | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+) create mode 100644 boards/esp32-evb.json create mode 100644 boards/esp32-gateway.json create mode 100644 boards/espino32.json diff --git a/boards/esp32-evb.json b/boards/esp32-evb.json new file mode 100644 index 000000000..c93294b3b --- /dev/null +++ b/boards/esp32-evb.json @@ -0,0 +1,34 @@ +{ + "build": { + "core": "esp32", + "extra_flags": "-DESP32_DEV -DARDUINO_ESP32-EVB", + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "dio", + "ldscript": "esp32_out.ld", + "mcu": "esp32", + "variant": "esp32-evb" + }, + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ + "arduino", + "espidf" + ], + "name": "OLIMEX ESP32-EVB", + "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": "https://www.olimex.com/Products/IoT/ESP32-EVB/open-source-hardware", + "vendor": "OLIMEX" +} diff --git a/boards/esp32-gateway.json b/boards/esp32-gateway.json new file mode 100644 index 000000000..50a47e1bd --- /dev/null +++ b/boards/esp32-gateway.json @@ -0,0 +1,34 @@ +{ + "build": { + "core": "esp32", + "extra_flags": "-DESP32_DEV -DARDUINO_ESP32-GATEWAY", + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "dio", + "ldscript": "esp32_out.ld", + "mcu": "esp32", + "variant": "esp32-gateway" + }, + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ + "arduino", + "espidf" + ], + "name": "OLIMEX ESP32-GATEWAY", + "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": "https://www.olimex.com/Products/IoT/ESP32-GATEWAY/open-source-hardware", + "vendor": "OLIMEX" +} diff --git a/boards/espino32.json b/boards/espino32.json new file mode 100644 index 000000000..2abc952a6 --- /dev/null +++ b/boards/espino32.json @@ -0,0 +1,34 @@ +{ + "build": { + "core": "esp32", + "extra_flags": "-DESP32_DEV -DARDUINO_ESPino32", + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "dio", + "ldscript": "esp32_out.ld", + "mcu": "esp32", + "variant": "espino32" + }, + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ + "arduino", + "espidf" + ], + "name": "ESPino32", + "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://thaieasyelec.com/products/development-boards/espino-wifi-development-board-detail.html", + "vendor": "ThaiEasyElec" +} From 2e9269f337e81fdfe4d4b6ff81cde3d7d7b5a769 Mon Sep 17 00:00:00 2001 From: Valerii Koval Date: Thu, 3 Aug 2017 19:11:58 +0300 Subject: [PATCH 5/8] Add new board ESP-WROVER-KIT --- boards/esp-wrover-kit.json | 28 +++++++++++++++++++++++++++ examples/arduino-blink/platformio.ini | 5 +++++ 2 files changed, 33 insertions(+) create mode 100644 boards/esp-wrover-kit.json diff --git a/boards/esp-wrover-kit.json b/boards/esp-wrover-kit.json new file mode 100644 index 000000000..89fcbecea --- /dev/null +++ b/boards/esp-wrover-kit.json @@ -0,0 +1,28 @@ +{ + "build": { + "core": "esp32", + "extra_flags": "-DESP32_DEV -DARDUINO_ESP32_DEV", + "f_cpu": "240000000L", + "f_flash": "40000000L", + "flash_mode": "dio", + "ldscript": "esp32_out.ld", + "mcu": "esp32", + "variant": "esp32" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Espressif ESP-WROVER-KIT", + "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": "https://espressif.com/en/products/hardware/esp-wrover-kit/overview", + "vendor": "Espressif" +} diff --git a/examples/arduino-blink/platformio.ini b/examples/arduino-blink/platformio.ini index 379aaed04..3a1b7cebb 100644 --- a/examples/arduino-blink/platformio.ini +++ b/examples/arduino-blink/platformio.ini @@ -12,6 +12,11 @@ platform = espressif32 framework = arduino board = esp32dev +[env:esp-wrover-kit] +platform = espressif32 +framework = arduino +board = esp-wrover-kit + [env:quantum] platform = espressif32 framework = arduino From 24fa8ac1c908af1ba371a330c80cd8ffdfbf8c1a Mon Sep 17 00:00:00 2001 From: Valerii Koval Date: Thu, 3 Aug 2017 19:16:30 +0300 Subject: [PATCH 6/8] Add connectivity options for ESP-WROVER-KIT --- boards/esp-wrover-kit.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/boards/esp-wrover-kit.json b/boards/esp-wrover-kit.json index 89fcbecea..bcf1491ad 100644 --- a/boards/esp-wrover-kit.json +++ b/boards/esp-wrover-kit.json @@ -9,6 +9,12 @@ "mcu": "esp32", "variant": "esp32" }, + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], "frameworks": [ "arduino", "espidf" From 5c62334a2b2775c2ac4dcc48a310ef3142e18481 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 3 Aug 2017 20:47:36 +0300 Subject: [PATCH 7/8] Add Espressif ESP-WROVER-KIT PID/VID --- boards/esp-wrover-kit.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/boards/esp-wrover-kit.json b/boards/esp-wrover-kit.json index bcf1491ad..7ad3768a0 100644 --- a/boards/esp-wrover-kit.json +++ b/boards/esp-wrover-kit.json @@ -3,6 +3,12 @@ "core": "esp32", "extra_flags": "-DESP32_DEV -DARDUINO_ESP32_DEV", "f_cpu": "240000000L", + "hwids": [ + [ + "0x0403", + "0x6010" + ] + ], "f_flash": "40000000L", "flash_mode": "dio", "ldscript": "esp32_out.ld", From 4098e7d9a145cc3e9e66b08a17eaceefccd7c7f7 Mon Sep 17 00:00:00 2001 From: Valerii Koval Date: Mon, 7 Aug 2017 15:31:01 +0300 Subject: [PATCH 8/8] Bump version to 0.8.0 --- platform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.json b/platform.json index e9f0864b9..26759d153 100644 --- a/platform.json +++ b/platform.json @@ -12,7 +12,7 @@ "type": "git", "url": "https://github.com/platformio/platform-espressif32.git" }, - "version": "0.7.5", + "version": "0.8.0", "packageRepositories": [ "https://dl.bintray.com/platformio/dl-packages/manifest.json", "http://dl.platformio.org/packages/manifest.json",