diff --git a/package-lock.json b/package-lock.json
index 7530572..9e33ddb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
"name": "toolbox",
"version": "0.0.0",
"dependencies": {
- "@nabucasa/sl-web-tools": "^0.12.2",
+ "@nabucasa/sl-web-tools": "^0.13.0",
"improv-wifi-sdk": "^1.4.0"
},
"devDependencies": {
@@ -1289,9 +1289,9 @@
"license": "Apache-2.0"
},
"node_modules/@nabucasa/sl-web-tools": {
- "version": "0.12.2",
- "resolved": "https://registry.npmjs.org/@nabucasa/sl-web-tools/-/sl-web-tools-0.12.2.tgz",
- "integrity": "sha512-7pGY46fG9HJ/WKop7HqL4favx1YqmLsp89LejHKpjxOgFWvRPvEkplfGCtrom/Gtbqg1oenGkL6DiNIoKYC1aQ==",
+ "version": "0.13.0",
+ "resolved": "https://registry.npmjs.org/@nabucasa/sl-web-tools/-/sl-web-tools-0.13.0.tgz",
+ "integrity": "sha512-12G95ok3aWCBreu5rWXucP+Bwz8SMDP6goWVkIbQo3vCPwV9NBDJ1DWDZMN1crN2lhYZmWuVsgJ9pOWOTcj0Pg==",
"license": "MIT",
"dependencies": {
"@material/mwc-button": "^0.27.0",
@@ -1302,10 +1302,23 @@
"@material/mwc-linear-progress": "^0.27.0",
"@material/mwc-radio": "^0.27.0",
"@mdi/js": "^7.1.96",
+ "@noble/hashes": "^1.6.1",
"lit": "^2.0.2",
"pyodide": "^0.29.0"
}
},
+ "node_modules/@noble/hashes": {
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz",
+ "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==",
+ "license": "MIT",
+ "engines": {
+ "node": "^14.21.3 || >=16"
+ },
+ "funding": {
+ "url": "https://paulmillr.com/funding/"
+ }
+ },
"node_modules/@rollup/rollup-android-arm-eabi": {
"version": "4.52.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.52.2.tgz",
diff --git a/package.json b/package.json
index 60eee83..3f78814 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
"format:check": "npx prettier --check src/**/*"
},
"dependencies": {
- "@nabucasa/sl-web-tools": "^0.12.2",
+ "@nabucasa/sl-web-tools": "^0.13.0",
"improv-wifi-sdk": "^1.4.0"
},
"devDependencies": {
diff --git a/public/assets/firmwares/skyconnect_openthread_rcp_2.4.4.0_GitHub-7074a43e4_gsdk_4.4.4.gbl b/public/assets/firmwares/skyconnect_openthread_rcp_2.4.4.0_GitHub-7074a43e4_gsdk_4.4.4.gbl
deleted file mode 100644
index 2bb9f9a..0000000
Binary files a/public/assets/firmwares/skyconnect_openthread_rcp_2.4.4.0_GitHub-7074a43e4_gsdk_4.4.4.gbl and /dev/null differ
diff --git a/public/assets/firmwares/skyconnect_zigbee_ncp_7.4.4.3.gbl b/public/assets/firmwares/skyconnect_zigbee_ncp_7.4.4.3.gbl
deleted file mode 100644
index 180dc61..0000000
Binary files a/public/assets/firmwares/skyconnect_zigbee_ncp_7.4.4.3.gbl and /dev/null differ
diff --git a/public/assets/firmwares/zbt2_openthread_rcp_2.4.4.0_GitHub-7074a43e4_gsdk_4.4.4.gbl b/public/assets/firmwares/zbt2_openthread_rcp_2.4.4.0_GitHub-7074a43e4_gsdk_4.4.4.gbl
deleted file mode 100644
index f562396..0000000
Binary files a/public/assets/firmwares/zbt2_openthread_rcp_2.4.4.0_GitHub-7074a43e4_gsdk_4.4.4.gbl and /dev/null differ
diff --git a/public/assets/firmwares/zbt2_zigbee_ncp_7.4.4.6.gbl b/public/assets/firmwares/zbt2_zigbee_ncp_7.4.4.6.gbl
deleted file mode 100644
index ec6ab4a..0000000
Binary files a/public/assets/firmwares/zbt2_zigbee_ncp_7.4.4.6.gbl and /dev/null differ
diff --git a/public/assets/manifests/zbt1.json b/public/assets/manifests/zbt1.json
index 018146d..a1848ae 100644
--- a/public/assets/manifests/zbt1.json
+++ b/public/assets/manifests/zbt1.json
@@ -26,22 +26,7 @@
"pid": 60000,
"vid": 4292
}],
- "firmwares": [{
- "name": "Zigbee (EZSP)",
- "url": "/assets/firmwares/skyconnect_zigbee_ncp_7.4.4.3.gbl",
- "type": "ncp-uart-hw",
- "version": "7.4.4.3"
- }, {
- "name": "OpenThread (RCP)",
- "url": "/assets/firmwares/skyconnect_openthread_rcp_2.4.4.0_GitHub-7074a43e4_gsdk_4.4.4.gbl",
- "type": "ot-rcp",
- "version": "2.4.4.0"
- }, {
- "name": "Multiprotocol (deprecated)",
- "url": "https://raw.githubusercontent.com/NabuCasa/silabs-firmware/main/RCPMultiPAN/beta/NabuCasa_SkyConnect_RCP_v4.3.2_rcp-uart-hw-802154_460800.gbl",
- "type": "rcp-uart-802154",
- "version": "4.3.2"
- }],
+ "firmwares": [],
"bootloader_reset": [],
"allow_custom_firmware_upload": true
-}
\ No newline at end of file
+}
diff --git a/public/assets/manifests/zbt2.json b/public/assets/manifests/zbt2.json
index 07135be..df34248 100644
--- a/public/assets/manifests/zbt2.json
+++ b/public/assets/manifests/zbt2.json
@@ -17,17 +17,7 @@
"pid": 33562,
"vid": 12346
}],
- "firmwares": [{
- "name": "Zigbee (EZSP)",
- "url": "/assets/firmwares/zbt2_zigbee_ncp_7.4.4.6.gbl",
- "type": "ncp-uart-hw",
- "version": "7.4.4.6"
- }, {
- "name": "OpenThread (RCP)",
- "url": "/assets/firmwares/zbt2_openthread_rcp_2.4.4.0_GitHub-7074a43e4_gsdk_4.4.4.gbl",
- "type": "ot-rcp",
- "version": "2.4.4.0"
- }],
+ "firmwares": [],
"bootloader_reset": ["rts_dtr", "baudrate"],
"allow_custom_firmware_upload": true
-}
\ No newline at end of file
+}
diff --git a/src-11ty/home-assistant-connect-zbt-1/install.njk b/src-11ty/home-assistant-connect-zbt-1/install.njk
index ecd821f..b756c65 100644
--- a/src-11ty/home-assistant-connect-zbt-1/install.njk
+++ b/src-11ty/home-assistant-connect-zbt-1/install.njk
@@ -42,7 +42,12 @@ hero: |
-
+
Install firmware
@@ -57,4 +62,15 @@ hero: |
diff --git a/src-11ty/home-assistant-connect-zbt-2/install.njk b/src-11ty/home-assistant-connect-zbt-2/install.njk
index a937bf0..34cdba1 100644
--- a/src-11ty/home-assistant-connect-zbt-2/install.njk
+++ b/src-11ty/home-assistant-connect-zbt-2/install.njk
@@ -17,7 +17,12 @@ hero: |
-
+
Install firmware
@@ -32,4 +37,15 @@ hero: |
diff --git a/vite.config.ts b/vite.config.ts
index 8cc28d3..a3b7064 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -15,30 +15,12 @@ export default defineConfig({
plugins: [
{
name: 'py-raw-loader',
- transform(code, id) {
- if (id.endsWith('.py')) {
- return { code: `export default ${JSON.stringify(code)};`, map: null };
+ enforce: 'pre',
+ load(id) {
+ if (id.endsWith('.py') || id.endsWith('.txt')) {
+ const content = fs.readFileSync(id, 'utf-8');
+ return { code: `export default ${JSON.stringify(content)};`, map: null };
}
-
- if (id.endsWith('.txt')) {
- if (code.startsWith('export default "data:text/plain;base64,')) {
- const match = code.match(/data:text\/plain;base64,(.+?)"$/);
- if (match) {
- const base64Content = match[1];
- const decodedContent = Buffer.from(
- base64Content,
- 'base64'
- ).toString('utf-8');
- return {
- code: `export default ${JSON.stringify(decodedContent)};`,
- map: null,
- };
- }
- }
- return { code: `export default ${JSON.stringify(code)};`, map: null };
- }
-
- return null;
},
},
{
@@ -69,6 +51,7 @@ export default defineConfig({
],
optimizeDeps: {
+ include: ['@nabucasa/sl-web-tools'],
esbuildOptions: {
loader: {
'.py': 'text',