Merge pull request #1714 from makermelissa/main

Expand installer to more ESP32 Chips

Author: dhalbert

_data/bootloaders.json

@@ -7,21 +7,37 @@
             "version": "v3.16.0"
         },
         "esp32s2": {
-            "version": "0.35.0"
+            "version": "0.35.0",
+            "installer": true
         },
         "esp32s3": {
-            "version": "0.35.0"
+            "version": "0.35.0",
+            "installer": true
         },
         "analog": {},
         "broadcom": {},
         "cxd56": {},
-        "esp32": {},
-        "esp32c2": {},
-        "esp32c3": {},
-        "esp32c6": {},
-        "esp32c61": {},
-        "esp32h2": {},
-        "esp32p4": {},
+        "esp32": {
+            "installer": true
+        },
+        "esp32c2": {
+            "installer": true
+        },
+        "esp32c3": {
+            "installer": true
+        },
+        "esp32c6": {
+            "installer": true
+        },
+        "esp32c61": {
+            "installer": true
+        },
+        "esp32h2": {
+            "installer": true
+        },
+        "esp32p4": {
+            "installer": true
+        },
         "litex": {},
         "mimxrt10xx": {},
         "rp2040": {},

_includes/download/board.html

@@ -7,7 +7,8 @@
 {% assign stable = board[0].versions | where: "stable", true | sort: "version" %}
 {% assign unstable = board[0].versions | where: "stable", false | sort: "version" %}
 {% assign bootloaders = site.data.bootloaders.bootloaders %}
-{% assign bootloader_version = bootloaders[page.family].version %}
+{% assign bootloader_info = bootloaders[page.family] %}
+{% assign bootloader_version = bootloader_info.version %}
 {% assign bootloader_id = page.bootloader_id %}
 {% assign releases = stable | concat: unstable %}
 {% assign bootloader_instructions = page.bootloader_nonstandard_entry_instructions %}
@@ -150,7 +151,7 @@ <h3>CircuitPython {{ version.version }}</h3>
       {% for extension in reverse_extensions %}
         <a class="download-button {% if version.stable %}stable{% else %}unstable{% endif %} {{ extension }}" href="{{ download_url }}/en_US/adafruit-circuitpython-{{ board_id }}-en_US-{{ version.version }}.{{ extension }}">DOWNLOAD .{{ extension | upcase }} NOW <i class="fas fa-download" aria-hidden="true"></i></a>
       {% endfor %}
-      {% if page.family == 'esp32s2' or page.family == 'esp32c3' or page.family == 'esp32s3' or page.family == 'esp32' or page.family == 'esp32c6' %}
+      {% if bootloader_info and bootloader_info.installer and bootloader_info.installer == true %}
         <button is="cp-install-button" class="installer-button" boardid="{{ board_id }}"
         {% for extension in version.extensions %}
             {{ extension }}file="{{ download_url }}/en_US/adafruit-circuitpython-{{ board_id }}-en_US-{{ version.version }}.{{ extension }}"

_layouts/download.html

@@ -30,8 +30,9 @@ <h2>Contribute</h2>
   </div>
 </div>
 
-{% if page.family == 'esp32' or page.family == 'esp32s2' or page.family ==
-'esp32c3' or page.family == 'esp32s3' or page.family == 'esp32c6' %}
+{% assign bootloaders = site.data.bootloaders.bootloaders %}
+{% assign bootloader_info = bootloaders[page.family] %}
+{% if bootloader_info and bootloader_info.installer and bootloader_info.installer == true %}
 <script
   src="https://cdn.jsdelivr.net/gh/adafruit/web-firmware-installer-js@2/dist/cpinstaller.min.js"
   type="module"