From 2b4b96bd4d902e1748527d42670917852a39baa3 Mon Sep 17 00:00:00 2001 From: Sacha Weatherstone Date: Sat, 6 Jan 2024 11:02:32 +1000 Subject: [PATCH] fix build --- package.json | 1 + pnpm-lock.yaml | 15 ++++ src/components/tools/FrequencyCalculator.tsx | 72 +++++++++++--------- src/pages/tools/OEM.tsx | 8 +-- 4 files changed, 59 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index b5b9b28f..c606f3b7 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ }, "devDependencies": { "@biomejs/biome": "^1.4.1", + "@buf/meshtastic_protobufs.bufbuild_es": "1.6.0-20240104182715-af4a215beb91.1", "@docusaurus/module-type-aliases": "3.1.0", "@tailwindcss/typography": "^0.5.10", "@tsconfig/docusaurus": "^2.0.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fc522ee6..91ea04c1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -67,6 +67,9 @@ devDependencies: '@biomejs/biome': specifier: ^1.4.1 version: 1.4.1 + '@buf/meshtastic_protobufs.bufbuild_es': + specifier: 1.6.0-20240104182715-af4a215beb91.1 + version: 1.6.0-20240104182715-af4a215beb91.1(@bufbuild/protobuf@1.6.0) '@docusaurus/module-type-aliases': specifier: 3.1.0 version: 3.1.0(react-dom@18.2.0)(react@18.2.0) @@ -1620,6 +1623,18 @@ packages: resolution: {integrity: sha512-s3jaWicZd0pkP0jf5ysyHUI/RE7MHos6qlToFcGWXVp+ykHOy77OUMrfbgJ9it2C5bow7OIQwYYaHjk9XlBQ2A==} dev: false + /@buf/meshtastic_protobufs.bufbuild_es@1.6.0-20240104182715-af4a215beb91.1(@bufbuild/protobuf@1.6.0): + resolution: {tarball: https://buf.build/gen/npm/v1/@buf/meshtastic_protobufs.bufbuild_es/-/meshtastic_protobufs.bufbuild_es-1.6.0-20240104182715-af4a215beb91.1.tgz} + peerDependencies: + '@bufbuild/protobuf': ^1.6.0 + dependencies: + '@bufbuild/protobuf': 1.6.0 + dev: true + + /@bufbuild/protobuf@1.6.0: + resolution: {integrity: sha512-hp19vSFgNw3wBBcVBx5qo5pufCqjaJ0Cfk5H/pfjNOfNWU+4/w0QVOmfAOZNRrNWRrVuaJWxcN8P2vhOkkzbBQ==} + dev: true + /@colors/colors@1.5.0: resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==} engines: {node: '>=0.1.90'} diff --git a/src/components/tools/FrequencyCalculator.tsx b/src/components/tools/FrequencyCalculator.tsx index 04fc2444..f8048dbc 100644 --- a/src/components/tools/FrequencyCalculator.tsx +++ b/src/components/tools/FrequencyCalculator.tsx @@ -15,9 +15,12 @@ interface Modem { sf: number; } -const RegionData = new Map([ +const RegionData = new Map< + Protobuf.Config.Config_LoRaConfig_RegionCode, + Region +>([ [ - Protobuf.Config_LoRaConfig_RegionCode.US, + Protobuf.Config.Config_LoRaConfig_RegionCode.US, { freq_start: 902.0, freq_end: 928.0, @@ -27,7 +30,7 @@ const RegionData = new Map([ }, ], [ - Protobuf.Config_LoRaConfig_RegionCode.EU_433, + Protobuf.Config.Config_LoRaConfig_RegionCode.EU_433, { freq_start: 433.0, freq_end: 434.0, @@ -37,7 +40,7 @@ const RegionData = new Map([ }, ], [ - Protobuf.Config_LoRaConfig_RegionCode.EU_868, + Protobuf.Config.Config_LoRaConfig_RegionCode.EU_868, { freq_start: 869.4, freq_end: 869.65, @@ -47,7 +50,7 @@ const RegionData = new Map([ }, ], [ - Protobuf.Config_LoRaConfig_RegionCode.CN, + Protobuf.Config.Config_LoRaConfig_RegionCode.CN, { freq_start: 470.0, freq_end: 510.0, @@ -57,7 +60,7 @@ const RegionData = new Map([ }, ], [ - Protobuf.Config_LoRaConfig_RegionCode.JP, + Protobuf.Config.Config_LoRaConfig_RegionCode.JP, { freq_start: 920.8, freq_end: 927.8, @@ -67,7 +70,7 @@ const RegionData = new Map([ }, ], [ - Protobuf.Config_LoRaConfig_RegionCode.ANZ, + Protobuf.Config.Config_LoRaConfig_RegionCode.ANZ, { freq_start: 915.0, freq_end: 928.0, @@ -77,7 +80,7 @@ const RegionData = new Map([ }, ], [ - Protobuf.Config_LoRaConfig_RegionCode.RU, + Protobuf.Config.Config_LoRaConfig_RegionCode.RU, { freq_start: 868.7, freq_end: 869.2, @@ -87,7 +90,7 @@ const RegionData = new Map([ }, ], [ - Protobuf.Config_LoRaConfig_RegionCode.KR, + Protobuf.Config.Config_LoRaConfig_RegionCode.KR, { freq_start: 920.0, freq_end: 923.0, @@ -97,7 +100,7 @@ const RegionData = new Map([ }, ], [ - Protobuf.Config_LoRaConfig_RegionCode.TW, + Protobuf.Config.Config_LoRaConfig_RegionCode.TW, { freq_start: 920.0, freq_end: 925.0, @@ -107,7 +110,7 @@ const RegionData = new Map([ }, ], [ - Protobuf.Config_LoRaConfig_RegionCode.IN, + Protobuf.Config.Config_LoRaConfig_RegionCode.IN, { freq_start: 865.0, freq_end: 867.0, @@ -117,7 +120,7 @@ const RegionData = new Map([ }, ], [ - Protobuf.Config_LoRaConfig_RegionCode.NZ_865, + Protobuf.Config.Config_LoRaConfig_RegionCode.NZ_865, { freq_start: 864.0, freq_end: 868.0, @@ -127,7 +130,7 @@ const RegionData = new Map([ }, ], [ - Protobuf.Config_LoRaConfig_RegionCode.TH, + Protobuf.Config.Config_LoRaConfig_RegionCode.TH, { freq_start: 920.0, freq_end: 925.0, @@ -137,7 +140,7 @@ const RegionData = new Map([ }, ], [ - Protobuf.Config_LoRaConfig_RegionCode.UA_433, + Protobuf.Config.Config_LoRaConfig_RegionCode.UA_433, { freq_start: 433.0, freq_end: 434.7, @@ -147,7 +150,7 @@ const RegionData = new Map([ }, ], [ - Protobuf.Config_LoRaConfig_RegionCode.UA_868, + Protobuf.Config.Config_LoRaConfig_RegionCode.UA_868, { freq_start: 868.0, freq_end: 868.6, @@ -157,7 +160,7 @@ const RegionData = new Map([ }, ], [ - Protobuf.Config_LoRaConfig_RegionCode.LORA_24, + Protobuf.Config.Config_LoRaConfig_RegionCode.LORA_24, { freq_start: 2400.0, freq_end: 2483.5, @@ -167,7 +170,7 @@ const RegionData = new Map([ }, ], [ - Protobuf.Config_LoRaConfig_RegionCode.UNSET, + Protobuf.Config.Config_LoRaConfig_RegionCode.UNSET, { freq_start: 902.0, freq_end: 928.0, @@ -178,9 +181,12 @@ const RegionData = new Map([ ], ]); -const modemPresets = new Map([ +const modemPresets = new Map< + Protobuf.Config.Config_LoRaConfig_ModemPreset, + Modem +>([ [ - Protobuf.Config_LoRaConfig_ModemPreset.SHORT_FAST, + Protobuf.Config.Config_LoRaConfig_ModemPreset.SHORT_FAST, { bw: 250, cr: 8, @@ -188,7 +194,7 @@ const modemPresets = new Map([ }, ], [ - Protobuf.Config_LoRaConfig_ModemPreset.SHORT_SLOW, + Protobuf.Config.Config_LoRaConfig_ModemPreset.SHORT_SLOW, { bw: 250, cr: 8, @@ -196,7 +202,7 @@ const modemPresets = new Map([ }, ], [ - Protobuf.Config_LoRaConfig_ModemPreset.MEDIUM_FAST, + Protobuf.Config.Config_LoRaConfig_ModemPreset.MEDIUM_FAST, { bw: 250, cr: 8, @@ -204,7 +210,7 @@ const modemPresets = new Map([ }, ], [ - Protobuf.Config_LoRaConfig_ModemPreset.MEDIUM_SLOW, + Protobuf.Config.Config_LoRaConfig_ModemPreset.MEDIUM_SLOW, { bw: 250, cr: 8, @@ -212,7 +218,7 @@ const modemPresets = new Map([ }, ], [ - Protobuf.Config_LoRaConfig_ModemPreset.LONG_FAST, + Protobuf.Config.Config_LoRaConfig_ModemPreset.LONG_FAST, { bw: 250, cr: 8, @@ -220,7 +226,7 @@ const modemPresets = new Map([ }, ], [ - Protobuf.Config_LoRaConfig_ModemPreset.LONG_MODERATE, + Protobuf.Config.Config_LoRaConfig_ModemPreset.LONG_MODERATE, { bw: 125, cr: 8, @@ -228,7 +234,7 @@ const modemPresets = new Map([ }, ], [ - Protobuf.Config_LoRaConfig_ModemPreset.LONG_SLOW, + Protobuf.Config.Config_LoRaConfig_ModemPreset.LONG_SLOW, { bw: 125, cr: 8, @@ -236,7 +242,7 @@ const modemPresets = new Map([ }, ], [ - Protobuf.Config_LoRaConfig_ModemPreset.VERY_LONG_SLOW, + Protobuf.Config.Config_LoRaConfig_ModemPreset.VERY_LONG_SLOW, { bw: 62.5, cr: 8, @@ -247,12 +253,12 @@ const modemPresets = new Map([ export const FrequencyCalculator = (): JSX.Element => { const [modemPreset, setModemPreset] = - React.useState( - Protobuf.Config_LoRaConfig_ModemPreset.LONG_FAST, + React.useState( + Protobuf.Config.Config_LoRaConfig_ModemPreset.LONG_FAST, ); const [region, setRegion] = - React.useState( - Protobuf.Config_LoRaConfig_RegionCode.US, + React.useState( + Protobuf.Config.Config_LoRaConfig_RegionCode.US, ); const [channel, setChannel] = React.useState( Types.ChannelNumber.PRIMARY, @@ -294,13 +300,13 @@ export const FrequencyCalculator = (): JSX.Element => { setModemPreset( parseInt( e.target.value, - ) as Protobuf.Config_LoRaConfig_ModemPreset, + ) as Protobuf.Config.Config_LoRaConfig_ModemPreset, ) } > {Array.from(modemPresets.keys()).map((key) => ( ))} @@ -313,7 +319,7 @@ export const FrequencyCalculator = (): JSX.Element => { > {Array.from(RegionData.keys()).map((key) => ( ))} diff --git a/src/pages/tools/OEM.tsx b/src/pages/tools/OEM.tsx index a2eb679a..3f1d94f1 100644 --- a/src/pages/tools/OEM.tsx +++ b/src/pages/tools/OEM.tsx @@ -8,7 +8,7 @@ import Layout from "@theme/Layout"; const OEM = (): JSX.Element => { const [oemAesKey, setOemAesKey] = useState(new Uint8Array()); const [oemFont, setOemFont] = useState( - Protobuf.ScreenFonts.FONT_MEDIUM, + Protobuf.DeviceOnly.ScreenFonts.FONT_MEDIUM, ); const [oemIconBits, setOemIconBits] = useState(new Uint8Array()); const [oemIconHeight, setOemIconHeight] = useState(0); @@ -18,7 +18,7 @@ const OEM = (): JSX.Element => { useEffect(() => { setOemBytes( - new Protobuf.OEMStore({ + new Protobuf.DeviceOnly.OEMStore({ oemAesKey, oemFont, oemIconBits, @@ -29,8 +29,8 @@ const OEM = (): JSX.Element => { ); }, [oemAesKey, oemFont, oemIconBits, oemIconHeight, oemIconWidth, oemText]); - const enumOptions = Protobuf.ScreenFonts - ? Object.entries(Protobuf.ScreenFonts).filter( + const enumOptions = Protobuf.DeviceOnly.ScreenFonts + ? Object.entries(Protobuf.DeviceOnly.ScreenFonts).filter( (value) => typeof value[1] === "number", ) : [];