hermes/meshtastic-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #363 from danditomaso/add_empty_psk_size

Browse Source 
Added empty value to pre-shared key size. Feature parity with IOS app
This commit is contained in:
Tom Fifield
2025-01-07 13:58:20 +08:00
committed by GitHub
parent 94c6eea20b 63be65a487
commit ecd50148de
2 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/PageComponents/Channel.tsx
+25 -25
View File
@@ -91,7 +91,7 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => {
psk: pass, psk: pass,
positionEnabled: positionEnabled:
channel?.settings?.moduleSettings?.positionPrecision !== channel?.settings?.moduleSettings?.positionPrecision !==
undefined && undefined &&
channel?.settings?.moduleSettings?.positionPrecision > 0, channel?.settings?.moduleSettings?.positionPrecision > 0,
preciseLocation: preciseLocation:
channel?.settings?.moduleSettings?.positionPrecision === 32, channel?.settings?.moduleSettings?.positionPrecision === 32,
@@ -124,8 +124,8 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => {
{ {
type: "passwordGenerator", type: "passwordGenerator",
name: "settings.psk", name: "settings.psk",
label: "pre-Shared Key", label: "Pre-Shared Key",
description: "256, 128, or 8 bit PSKs allowed", description: "Supported PSK lengths: 256-bit, 128-bit, 8-bit, Empty (0-bit)",
validationText: validationText, validationText: validationText,
devicePSKBitCount: bitCount ?? 0, devicePSKBitCount: bitCount ?? 0,
inputChange: inputChangeEvent, inputChange: inputChangeEvent,
@@ -177,29 +177,29 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => {
enumValue: enumValue:
config.display?.units === 0 config.display?.units === 0
? { ? {
"Within 23 km": 10, "Within 23 km": 10,
"Within 12 km": 11, "Within 12 km": 11,
"Within 5.8 km": 12, "Within 5.8 km": 12,
"Within 2.9 km": 13, "Within 2.9 km": 13,
"Within 1.5 km": 14, "Within 1.5 km": 14,
"Within 700 m": 15, "Within 700 m": 15,
"Within 350 m": 16, "Within 350 m": 16,
"Within 200 m": 17, "Within 200 m": 17,
"Within 90 m": 18, "Within 90 m": 18,
"Within 50 m": 19, "Within 50 m": 19,
} }
: { : {
"Within 15 miles": 10, "Within 15 miles": 10,
"Within 7.3 miles": 11, "Within 7.3 miles": 11,
"Within 3.6 miles": 12, "Within 3.6 miles": 12,
"Within 1.8 miles": 13, "Within 1.8 miles": 13,
"Within 0.9 miles": 14, "Within 0.9 miles": 14,
"Within 0.5 miles": 15, "Within 0.5 miles": 15,
"Within 0.2 miles": 16, "Within 0.2 miles": 16,
"Within 600 feet": 17, "Within 600 feet": 17,
"Within 300 feet": 18, "Within 300 feet": 18,
"Within 150 feet": 19, "Within 150 feet": 19,
}, },
}, },
}, },
], ],
src/components/UI/Generator.tsx
+1
View File
@@ -40,6 +40,7 @@ const Generator = React.forwardRef<HTMLInputElement, GeneratorProps>(
{ text: "256 bit", value: "32", key: "bit256" }, { text: "256 bit", value: "32", key: "bit256" },
{ text: "128 bit", value: "16", key: "bit128" }, { text: "128 bit", value: "16", key: "bit128" },
{ text: "8 bit", value: "1", key: "bit8" }, { text: "8 bit", value: "1", key: "bit8" },
{ text: "Empty", value: "0", key: "empty" },
], ],
selectChange, selectChange,
inputChange, inputChange,