Merge branch 'release/v1.0.0'

platformio · May 30, 2018 · d293d3e · d293d3e
2 parents 5db9a56 + aa064b8
commit d293d3e
Show file tree

Hide file tree

Showing 61 changed files with 2,003 additions and 458 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,7 @@ env:
   - PLATFORMIO_PROJECT_DIR=examples/arduino-wifiscan
   - PLATFORMIO_PROJECT_DIR=examples/espidf-ble-adv
   - PLATFORMIO_PROJECT_DIR=examples/espidf-coap-server
+  - PLATFORMIO_PROJECT_DIR=examples/espidf-exceptions
   - PLATFORMIO_PROJECT_DIR=examples/espidf-hello-world
   - PLATFORMIO_PROJECT_DIR=examples/espidf-http-request
   - PLATFORMIO_PROJECT_DIR=examples/espidf-peripherals-uart

diff --git a/appveyor.yml b/appveyor.yml
@@ -6,6 +6,7 @@ environment:
     - PLATFORMIO_PROJECT_DIR: "examples/arduino-wifiscan"
     - PLATFORMIO_PROJECT_DIR: "examples/espidf-ble-adv"
     - PLATFORMIO_PROJECT_DIR: "examples/espidf-coap-server"
+    - PLATFORMIO_PROJECT_DIR: "examples/espidf-exceptions"
     - PLATFORMIO_PROJECT_DIR: "examples/espidf-hello-world"
     - PLATFORMIO_PROJECT_DIR: "examples/espidf-http-request"
     - PLATFORMIO_PROJECT_DIR: "examples/espidf-peripherals-uart"

diff --git a/boards/esp-wrover-kit.json b/boards/esp-wrover-kit.json
@@ -3,14 +3,14 @@
     "core": "esp32",
     "extra_flags": "-DARDUINO_ESP32_DEV",
     "f_cpu": "240000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "dio",
     "hwids": [
       [
         "0x0403",
         "0x6010"
       ]
     ],
-    "f_flash": "40000000L",
-    "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
     "mcu": "esp32",
     "variant": "esp32"
@@ -21,6 +21,11 @@
     "ethernet",
     "can"
   ],
+  "debug": {
+    "openocd_board": "esp32-wrover.cfg",
+    "onboard_tools": ["ft2232h"],
+    "default_tools": ["ft2232h"]
+  },
   "frameworks": [
     "arduino",
     "espidf"
@@ -32,7 +37,14 @@
     "maximum_size": 1310720,
     "require_upload_port": true,
     "speed": 115200,
-    "wait_for_upload_port": true
+    "protocol": "esptool",
+    "protocols": [
+      "esptool",
+      "ft2232h",
+      "olimex-arm-usb-tiny-h",
+      "olimex-arm-usb-ocd-h",
+      "minimodule"
+    ]
   },
   "url": "https://espressif.com/en/products/hardware/esp-wrover-kit/overview",
   "vendor": "Espressif"

diff --git a/boards/esp32-evb.json b/boards/esp32-evb.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DARDUINO_ESP32-EVB",
+    "extra_flags": "-DARDUINO_ESP32_EVB",
     "f_cpu": "240000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
@@ -15,6 +15,9 @@
     "ethernet",
     "can"
   ],
+  "debug": {
+    "openocd_board": "esp-wroom-32.cfg"
+  },
   "frameworks":  [
     "arduino",
     "espidf"
@@ -26,7 +29,13 @@
     "maximum_size": 1310720,
     "require_upload_port": true,
     "speed": 115200,
-    "wait_for_upload_port": true
+    "protocol": "esptool",
+    "protocols": [
+      "esptool",
+      "olimex-arm-usb-tiny-h",
+      "olimex-arm-usb-ocd-h",
+      "minimodule"
+    ]
   },
   "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
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DARDUINO_ESP32-GATEWAY",
+    "extra_flags": "-DARDUINO_ESP32_GATEWAY",
     "f_cpu": "240000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
@@ -15,6 +15,9 @@
     "ethernet",
     "can"
   ],
+  "debug": {
+    "openocd_board": "esp-wroom-32.cfg"
+  },
   "frameworks":  [
     "arduino",
     "espidf"
@@ -26,7 +29,13 @@
     "maximum_size": 1310720,
     "require_upload_port": true,
     "speed": 115200,
-    "wait_for_upload_port": true
+    "protocol": "esptool",
+    "protocols": [
+      "esptool",
+      "olimex-arm-usb-tiny-h",
+      "olimex-arm-usb-ocd-h",
+      "minimodule"
+    ]
   },
   "url": "https://www.olimex.com/Products/IoT/ESP32-GATEWAY/open-source-hardware",
   "vendor": "OLIMEX"

diff --git a/boards/esp320.json b/boards/esp320.json
@@ -26,7 +26,10 @@
     "maximum_size": 1310720,
     "require_upload_port": true,
     "speed": 115200,
-    "wait_for_upload_port": true
+    "protocol": "esptool",
+    "protocols": [
+      "esptool"
+    ]
   },
   "url": "http://www.sweetpeas.se/controller-modules/10-esp210.html",
   "vendor": "Electronic SweetPeas"

diff --git a/boards/esp32dev.json b/boards/esp32dev.json
@@ -15,6 +15,9 @@
     "ethernet",
     "can"
   ],
+  "debug": {
+    "openocd_board": "esp-wroom-32.cfg"
+  },
   "frameworks":  [
     "arduino",
     "espidf"
@@ -26,7 +29,13 @@
     "maximum_size": 1310720,
     "require_upload_port": true,
     "speed": 115200,
-    "wait_for_upload_port": true
+    "protocol": "esptool",
+    "protocols": [
+      "esptool",
+      "olimex-arm-usb-tiny-h",
+      "olimex-arm-usb-ocd-h",
+      "minimodule"
+    ]
   },
   "url": "https://en.wikipedia.org/wiki/ESP32",
   "vendor": "Espressif"

diff --git a/boards/esp32doit-devkit-v1.json b/boards/esp32doit-devkit-v1.json
@@ -15,6 +15,9 @@
     "ethernet",
     "can"
   ],
+  "debug": {
+    "openocd_board": "esp-wroom-32.cfg"
+  },
   "frameworks":  [
     "arduino",
     "espidf"
@@ -26,7 +29,13 @@
     "maximum_size": 1310720,
     "require_upload_port": true,
     "speed": 115200,
-    "wait_for_upload_port": true
+    "protocol": "esptool",
+    "protocols": [
+      "esptool",
+      "olimex-arm-usb-tiny-h",
+      "olimex-arm-usb-ocd-h",
+      "minimodule"
+    ]
   },
   "url": "http://www.doit.am/",
   "vendor": "DOIT"

diff --git a/boards/esp32thing.json b/boards/esp32thing.json
@@ -15,6 +15,9 @@
     "ethernet",
     "can"
   ],
+  "debug": {
+    "openocd_board": "esp-wroom-32.cfg"
+  },
   "frameworks":  [
     "arduino",
     "espidf"
@@ -26,7 +29,13 @@
     "maximum_size": 1310720,
     "require_upload_port": true,
     "speed": 115200,
-    "wait_for_upload_port": true
+    "protocol": "esptool",
+    "protocols": [
+      "esptool",
+      "olimex-arm-usb-tiny-h",
+      "olimex-arm-usb-ocd-h",
+      "minimodule"
+    ]
   },
   "url": "https://www.sparkfun.com/products/13907",
   "vendor": "SparkFun Electronics"

diff --git a/boards/esp32vn-iot-uno.json b/boards/esp32vn-iot-uno.json
@@ -1,20 +1,23 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DARDUINO_esp32vn-iot-uno",
+    "extra_flags": "-DARDUINO_esp32vn_iot_uno",
     "f_cpu": "240000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
     "mcu": "esp32",
-    "variant": "esp32vn-iot-uno"
+    "variant": "esp32vn_iot_uno"
   },
   "connectivity": [
     "wifi",
     "bluetooth",
     "ethernet",
     "can"
   ],
+  "debug": {
+    "openocd_board": "esp-wroom-32.cfg"
+  },
   "frameworks":  [
     "arduino",
     "espidf"
@@ -26,7 +29,13 @@
     "maximum_size": 1310720,
     "require_upload_port": true,
     "speed": 115200,
-    "wait_for_upload_port": true
+    "protocol": "esptool",
+    "protocols": [
+      "esptool",
+      "olimex-arm-usb-tiny-h",
+      "olimex-arm-usb-ocd-h",
+      "minimodule"
+    ]
   },
   "url": "https://esp32.vn/",
   "vendor": "ESP32vn"

diff --git a/boards/espea32.json b/boards/espea32.json
@@ -26,7 +26,10 @@
     "maximum_size": 1310720,
     "require_upload_port": true,
     "speed": 115200,
-    "wait_for_upload_port": true
+    "protocol": "esptool",
+    "protocols": [
+      "esptool"
+    ]
   },
   "url": "https://blog.aprbrother.com/product/espea",
   "vendor": "April Brother"

diff --git a/boards/espectro32.json b/boards/espectro32.json
@@ -15,6 +15,9 @@
     "ethernet",
     "can"
   ],
+  "debug": {
+    "openocd_board": "esp-wroom-32.cfg"
+  },
   "frameworks":  [
     "arduino",
     "espidf"
@@ -26,7 +29,13 @@
     "maximum_size": 1310720,
     "require_upload_port": true,
     "speed": 2000000,
-    "wait_for_upload_port": true
+    "protocol": "esptool",
+    "protocols": [
+      "esptool",
+      "olimex-arm-usb-tiny-h",
+      "olimex-arm-usb-ocd-h",
+      "minimodule"
+    ]
   },
   "url": "https://shop.makestro.com/product/espectro32",
   "vendor": "DycodeX"

diff --git a/boards/espino32.json b/boards/espino32.json
@@ -15,6 +15,9 @@
     "ethernet",
     "can"
   ],
+  "debug": {
+    "openocd_board": "esp-wroom-32.cfg"
+  },
   "frameworks":  [
     "arduino",
     "espidf"
@@ -26,7 +29,13 @@
     "maximum_size": 1310720,
     "require_upload_port": true,
     "speed": 115200,
-    "wait_for_upload_port": true
+    "protocol": "esptool",
+    "protocols": [
+      "esptool",
+      "olimex-arm-usb-tiny-h",
+      "olimex-arm-usb-ocd-h",
+      "minimodule"
+    ]
   },
   "url": "http://thaieasyelec.com/products/development-boards/espino-wifi-development-board-detail.html",
   "vendor": "ThaiEasyElec"

diff --git a/boards/featheresp32.json b/boards/featheresp32.json
@@ -15,6 +15,9 @@
     "ethernet",
     "can"
   ],
+  "debug": {
+    "openocd_board": "esp-wroom-32.cfg"
+  },
   "frameworks":  [
     "arduino",
     "espidf"
@@ -26,7 +29,13 @@
     "maximum_size": 1310720,
     "require_upload_port": true,
     "speed": 115200,
-    "wait_for_upload_port": true
+    "protocol": "esptool",
+    "protocols": [
+      "esptool",
+      "olimex-arm-usb-tiny-h",
+      "olimex-arm-usb-ocd-h",
+      "minimodule"
+    ]
   },
   "url": "https://www.adafruit.com/product/3405",
   "vendor": "Adafruit"

diff --git a/boards/firebeetle32.json b/boards/firebeetle32.json
@@ -15,6 +15,9 @@
     "ethernet",
     "can"
   ],
+  "debug": {
+    "openocd_board": "esp-wroom-32.cfg"
+  },
   "frameworks":  [
     "arduino",
     "espidf"
@@ -26,7 +29,13 @@
     "maximum_size": 1310720,
     "require_upload_port": true,
     "speed": 115200,
-    "wait_for_upload_port": true
+    "protocol": "esptool",
+    "protocols": [
+      "esptool",
+      "olimex-arm-usb-tiny-h",
+      "olimex-arm-usb-ocd-h",
+      "minimodule"
+    ]
   },
   "url": "https://dfrobotblog.wordpress.com",
   "vendor": "DFRobot"

diff --git a/boards/heltec_wifi_kit_32.json b/boards/heltec_wifi_kit_32.json
@@ -26,7 +26,10 @@
     "maximum_size": 1310720,
     "require_upload_port": true,
     "speed": 115200,
-    "wait_for_upload_port": true
+    "protocol": "esptool",
+    "protocols": [
+      "esptool"
+    ]
   },
   "url": "http://www.heltec.cn",
   "vendor": "Heltec Automation"

diff --git a/boards/heltec_wifi_lora_32.json b/boards/heltec_wifi_lora_32.json
@@ -26,7 +26,10 @@
     "maximum_size": 1310720,
     "require_upload_port": true,
     "speed": 115200,
-    "wait_for_upload_port": true
+    "protocol": "esptool",
+    "protocols": [
+      "esptool"
+    ]
   },
   "url": "http://www.heltec.cn",
   "vendor": "Heltec Automation"