Download and use artifacts from artifactory

.github/workflows/web.yml

@@ -32,12 +32,15 @@ jobs:
             cd dist
             mkdir firmware
             cd firmware
+            curl -L -o index.json https://artifactory.expresslrs.org/ExpressLRS/index.json
             for i in 3.0.0 3.0.1 3.1.0 3.1.1 3.1.2 3.2.0 3.2.1 3.3.0 ; do
-              curl -L -o firmware.zip "http://vps.pkendall.cloudns.org/firmware-$i.zip"
+              HASH=`grep \"$i\" index.json | sed 's/.* "//' | sed 's/".*//'`
+              curl -L -o firmware.zip "https://artifactory.expresslrs.org/ExpressLRS/$HASH/firmware.zip"
               unzip firmware.zip
               rm firmware.zip
               mv firmware $i
             done
+            rm -f index.json
       - name: Setup Pages
         if: ${{ github.ref == 'refs/heads/master' }}
         uses: actions/configure-pages@v1

src/js/configure.js

@@ -191,9 +191,9 @@ export class Configure {
       const folder = `firmware/${version}`
       const hardwareLayoutFile = await this.#fetch_file(`${folder}/hardware/${deviceType}/${config.layout_file}`, 0)
       if (config.platform === 'esp32') {
-        list.push(this.#fetch_file(`${folder}/bootloader_dio_40m.bin`, 0x1000))
-        list.push(this.#fetch_file(`${folder}/partitions.bin`, 0x8000))
-        list.push(this.#fetch_file(`${folder}/boot_app0.bin`, 0xE000))
+        list.push(this.#fetch_file(firmwareUrl.replace('firmware.bin', 'bootloader.bin'), 0x1000))
+        list.push(this.#fetch_file(firmwareUrl.replace('firmware.bin', 'partitions.bin'), 0x8000))
+        list.push(this.#fetch_file(firmwareUrl.replace('firmware.bin', 'boot_app0.bin'), 0xE000))
         list.push(this.#fetch_file(firmwareUrl, 0x10000, (bin) => Configure.#configureESP(bin, config, options)))
       } else if (config.platform === 'esp8285') {
         list.push(this.#fetch_file(firmwareUrl, 0x0, (bin) => Configure.#configureESP(bin, config, options)))