Merge branch 'release/v3.0.0'

platformio · Jan 29, 2021 · c711383 · c711383
2 parents c266d51 + 7e0dcf0
commit c711383
Show file tree

Hide file tree

Showing 37 changed files with 823 additions and 135 deletions.
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-16.04, windows-latest, macos-latest]
-        python-version: [2.7, 3.7]
+        python-version: [3.7]
         example:
           - "examples/arduino-blink"
           - "examples/arduino-briki-internal-libs"
@@ -22,6 +22,7 @@ jobs:
           - "examples/espidf-hello-world"
           - "examples/espidf-http-request"
           - "examples/espidf-peripherals-uart"
+          - "examples/espidf-peripherals-usb"
           - "examples/espidf-storage-sdcard"
           - "examples/espidf-ulp-adc"
           - "examples/espidf-ulp-pulse"

diff --git a/boards/esp32-s2-kaluga-1.json b/boards/esp32-s2-kaluga-1.json
@@ -0,0 +1,36 @@
+{
+  "build": {
+    "arduino":{
+      "ldscript": "esp32s2_out.ld"
+    },
+    "core": "esp32",
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "dio",
+    "mcu": "esp32s2",
+    "variant": "esp32s2"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "default_tool": "ftdi",
+    "onboard_tools": [
+      "ftdi"
+    ],
+    "openocd_target": "esp32s2.cfg"
+  },
+  "frameworks": [
+    "espidf"
+  ],
+  "name": "Espressif ESP32-S2-Kaluga-1 Kit",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/hw-reference/esp32s2/user-guide-esp32-s2-kaluga-1-kit.html",
+  "vendor": "Espressif"
+}
diff --git a/boards/esp32-s2-saola-1.json b/boards/esp32-s2-saola-1.json
@@ -0,0 +1,32 @@
+{
+  "build": {
+    "arduino":{
+      "ldscript": "esp32s2_out.ld"
+    },
+    "core": "esp32",
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "dio",
+    "mcu": "esp32s2",
+    "variant": "esp32s2"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32s2.cfg"
+  },
+  "frameworks": [
+    "espidf"
+  ],
+  "name": "Espressif ESP32-S2-Saola-1",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/hw-reference/esp32s2/user-guide-saola-1-v1.2.html",
+  "vendor": "Espressif"
+}
diff --git a/boards/esp32cam.json b/boards/esp32cam.json
@@ -1,15 +1,15 @@
 {
   "build": {
     "arduino":{
-      "ldscript": "esp32_out.ld"
+      "ldscript": "esp32_out.ld",
+      "partitions": "huge_app.csv"
     },
     "core": "esp32",
     "extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue",
     "f_cpu": "240000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
     "mcu": "esp32",
-    "partitions": "huge_app.csv",
     "variant": "esp32"
   },
   "connectivity": [

diff --git a/boards/featheresp32-s2.json b/boards/featheresp32-s2.json
@@ -0,0 +1,32 @@
+{
+  "build": {
+    "arduino":{
+      "ldscript": "esp32s2_out.ld"
+    },
+    "core": "esp32",
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "dio",
+    "mcu": "esp32s2",
+    "variant": "esp32s2"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32s2.cfg"
+  },
+  "frameworks": [
+    "espidf"
+  ],
+  "name": "Adafruit ESP32-S2 Feather Development Board",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://www.adafruit.com/product/4769",
+  "vendor": "Adafruit"
+}
diff --git a/boards/heltec_wifi_lora_32_V2.json b/boards/heltec_wifi_lora_32_V2.json
@@ -1,15 +1,15 @@
 {
   "build": {
     "arduino":{
-      "ldscript": "esp32_out.ld"
+      "ldscript": "esp32_out.ld",
+      "partitions": "default_8MB.csv"
     },
     "core": "esp32",
     "extra_flags": "-DARDUINO_HELTEC_WIFI_LORA_32_V2",
     "f_cpu": "240000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
     "mcu": "esp32",
-    "partitions": "default_8MB.csv",
     "variant": "heltec_wifi_lora_32_V2"
   },
   "connectivity": [

diff --git a/boards/heltec_wireless_stick.json b/boards/heltec_wireless_stick.json
@@ -1,15 +1,15 @@
 {
   "build": {
     "arduino":{
-      "ldscript": "esp32_out.ld"
+      "ldscript": "esp32_out.ld",
+      "partitions": "default_8MB.csv"
     },
     "core": "esp32",
     "extra_flags": "-DARDUINO_HELTEC_WIRELESS_STICK",
     "f_cpu": "240000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
     "mcu": "esp32",
-    "partitions": "default_8MB.csv",
     "variant": "heltec_wireless_stick"
   },
   "connectivity": [

diff --git a/boards/m5stack-fire.json b/boards/m5stack-fire.json
@@ -1,15 +1,15 @@
 {
   "build": {
     "arduino":{
-      "ldscript": "esp32_out.ld"
+      "ldscript": "esp32_out.ld",
+      "partitions": "default_16MB.csv"
     },
     "core": "esp32",
     "extra_flags": "-DARDUINO_M5STACK_FIRE",
     "f_cpu": "240000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
     "mcu": "esp32",
-    "partitions": "default_16MB.csv",
     "variant": "m5stack_fire"
   },
   "connectivity": [

diff --git a/boards/nina_w10.json b/boards/nina_w10.json
@@ -1,15 +1,15 @@
 {
   "build": {
     "arduino":{
-      "ldscript": "esp32_out.ld"
+      "ldscript": "esp32_out.ld",
+      "partitions": "minimal.csv"
     },
     "core": "esp32",
     "extra_flags": "-DARDUINO_UBLOX_NINA_W10",
     "f_cpu": "240000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
     "mcu": "esp32",
-    "partitions": "minimal.csv",
     "variant": "nina_w10"
   },
   "connectivity": [

diff --git a/boards/nscreen-32.json b/boards/nscreen-32.json
@@ -0,0 +1,40 @@
+{
+  "build": {
+    "arduino":{
+      "ldscript": "esp32_out.ld"
+    },
+    "core": "esp32",
+    "extra_flags": "-DARDUINO_ESP32_DEV",
+    "f_cpu": "240000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "dio",
+    "hwids": [
+      [
+        "0x0403",
+        "0x6010"
+      ]
+    ],
+    "mcu": "esp32",
+    "variant": "esp32"
+  },
+  "connectivity": [
+    "wifi",
+    "bluetooth",
+    "ethernet",
+    "can"
+  ],
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "YeaCreate NSCREEN-32",
+  "upload": {
+    "flash_size": "16MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 16777216,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://yeacreate.com",
+  "vendor": "YeaCreate"
+}
diff --git a/boards/odroid_esp32.json b/boards/odroid_esp32.json
@@ -4,7 +4,7 @@
       "ldscript": "esp32_out.ld"
     },
     "core": "esp32",
-    "extra_flags": "-DARDUINO_ODROID_ESP32",
+    "extra_flags": "-DARDUINO_ODROID_ESP32 -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue",
     "f_cpu": "240000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",

diff --git a/boards/oroca_edubot.json b/boards/oroca_edubot.json
@@ -1,15 +1,15 @@
 {
   "build": {
     "arduino":{
-      "ldscript": "esp32_out.ld"
+      "ldscript": "esp32_out.ld",
+      "partitions": "huge_app.csv"
     },
     "core": "esp32",
     "extra_flags": "-DARDUINO_OROCA_EDUBOT",
     "f_cpu": "240000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
     "mcu": "esp32",
-    "partitions": "huge_app.csv",
     "variant": "oroca_edubot"
   },
   "connectivity": [

diff --git a/boards/ttgo-t-watch.json b/boards/ttgo-t-watch.json
@@ -1,15 +1,15 @@
 {
   "build": {
     "arduino":{
-      "ldscript": "esp32_out.ld"
+      "ldscript": "esp32_out.ld",
+      "partitions": "default_16MB.csv"
     },
     "core": "esp32",
     "extra_flags": "-DARDUINO_T-Watch -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue",
     "f_cpu": "240000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
     "mcu": "esp32",
-    "partitions": "default_16MB.csv", 
     "variant": "twatch"
   },
   "connectivity": [

diff --git a/builder/frameworks/_embed_files.py b/builder/frameworks/_embed_files.py
@@ -104,9 +104,9 @@ def embed_files(files, files_type):
 
 def transform_to_asm(target, source, env):
     files = [join("$BUILD_DIR", s.name + ".S") for s in source]
-    env.AppendUnique(PIOBUILDFILES=files)
     return files, source
 
+
 env.Append(
     BUILDERS=dict(
         TxtToBin=Builder(
@@ -155,7 +155,7 @@ def transform_to_asm(target, source, env):
                 "Generating assembly for $TARGET",
             ),
             emitter=transform_to_asm,
-            single_source=True
+            single_source=True,
         ),
     )
 )