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

Update protobufs

Browse Source
This commit is contained in:
Sacha Weatherstone
2022-09-09 21:02:16 +10:00
parent 47b34a8f27
commit 4e45990ef5
15 changed files with 123 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/Dialog/PeersDialog.tsx
+1 -1
View File
@@ -94,7 +94,7 @@ export const PeersDialog = ({
onClick={() => {
void connection?.sendPacket(
Protobuf.AdminMessage.toBinary({
variant: {
payloadVariant: {
oneofKind: "getConfigRequest",
getConfigRequest:
Protobuf.AdminMessage_ConfigType.LORA_CONFIG,
src/components/PageComponents/Config/Bluetooth.tsx
+2 -2
View File
@@ -50,7 +50,7 @@ export const Bluetooth = (): JSX.Element => {
const pairingMode = useWatch({
control,
name: "mode",
defaultValue: Protobuf.Config_BluetoothConfig_PairingMode.RandomPin,
defaultValue: Protobuf.Config_BluetoothConfig_PairingMode.RANDOM_PIN,
});
return (
@@ -82,7 +82,7 @@ export const Bluetooth = (): JSX.Element => {
<TextInputField
display={
pairingMode !== Protobuf.Config_BluetoothConfig_PairingMode.FixedPin
pairingMode !== Protobuf.Config_BluetoothConfig_PairingMode.FIXED_PIN
? "none"
: "block"
}
src/components/PageComponents/Config/Device.tsx
+1 -14
View File
@@ -1,13 +1,7 @@
import type React from "react";
import { useEffect, useState } from "react";
import {
FormField,
SelectField,
Switch,
TextInputField,
toaster,
} from "evergreen-ui";
import { FormField, SelectField, Switch, toaster } from "evergreen-ui";
import { Controller, useForm } from "react-hook-form";
import { DeviceValidation } from "@app/validation/config/device.js";
@@ -105,13 +99,6 @@ export const Device = (): JSX.Element => {
)}
/>
</FormField>
<TextInputField
label="NTP Server"
description="This is a description."
isInvalid={!!errors.ntpServer?.message}
validationMessage={errors.ntpServer?.message}
{...register("ntpServer")}
/>
</Form>
);
};
src/components/PageComponents/Config/WiFi.tsx → src/components/PageComponents/Config/Network.tsx
+29 -22
View File
@@ -11,13 +11,13 @@ import {
import { Controller, useForm, useWatch } from "react-hook-form";
import { renderOptions } from "@app/core/utils/selectEnumOptions.js";
import { WiFiValidation } from "@app/validation/config/wifi.js";
import { NetworkValidation } from "@app/validation/config/network.js";
import { Form } from "@components/form/Form";
import { useDevice } from "@core/providers/useDevice.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs";
export const WiFi = (): JSX.Element => {
export const Network = (): JSX.Element => {
const { config, connection } = useDevice();
const [loading, setLoading] = useState(false);
const {
@@ -26,32 +26,32 @@ export const WiFi = (): JSX.Element => {
formState: { errors, isDirty },
control,
reset,
} = useForm<WiFiValidation>({
defaultValues: config.wifi,
resolver: classValidatorResolver(WiFiValidation),
} = useForm<NetworkValidation>({
defaultValues: config.network,
resolver: classValidatorResolver(NetworkValidation),
});
const wifiEnabled = useWatch({
control,
name: "enabled",
name: "wifiEnabled",
defaultValue: false,
});
useEffect(() => {
reset(config.wifi);
}, [reset, config.wifi]);
reset(config.network);
}, [reset, config.network]);
const onSubmit = handleSubmit((data) => {
setLoading(true);
void connection?.setConfig(
{
payloadVariant: {
oneofKind: "wifi",
wifi: data,
oneofKind: "network",
network: data,
},
},
async () => {
toaster.success("Successfully updated WiFi config");
toaster.success("Successfully updated Network config");
reset({ ...data });
setLoading(false);
await Promise.resolve();
@@ -63,11 +63,11 @@ export const WiFi = (): JSX.Element => {
<FormField
label="WiFi Enabled"
description="Description"
isInvalid={!!errors.enabled?.message}
validationMessage={errors.enabled?.message}
isInvalid={!!errors.wifiEnabled?.message}
validationMessage={errors.wifiEnabled?.message}
>
<Controller
name="enabled"
name="wifiEnabled"
control={control}
render={({ field: { value, ...field } }) => (
<Switch height={24} marginLeft="auto" checked={value} {...field} />
@@ -77,24 +77,31 @@ export const WiFi = (): JSX.Element => {
<SelectField
label="WiFi Mode"
description="This is a description."
{...register("mode", { valueAsNumber: true })}
{...register("wifiMode", { valueAsNumber: true })}
>
{renderOptions(Protobuf.Config_WiFiConfig_WiFiMode)}
{renderOptions(Protobuf.Config_NetworkConfig_WiFiMode)}
</SelectField>
<TextInputField
label="SSID"
description="This is a description."
isInvalid={!!errors.ssid?.message}
validationMessage={errors.ssid?.message}
{...register("ssid")}
isInvalid={!!errors.wifiSsid?.message}
validationMessage={errors.wifiSsid?.message}
{...register("wifiSsid")}
/>
<TextInputField
label="PSK"
type="password"
description="This is a description."
isInvalid={!!errors.psk?.message}
validationMessage={errors.psk?.message}
{...register("psk")}
isInvalid={!!errors.wifiPsk?.message}
validationMessage={errors.wifiPsk?.message}
{...register("wifiPsk")}
/>
<TextInputField
label="NTP Server"
description="This is a description."
isInvalid={!!errors.ntpServer?.message}
validationMessage={errors.ntpServer?.message}
{...register("ntpServer")}
/>
</Form>
);
src/components/PageComponents/Config/Position.tsx
+1 -1
View File
@@ -144,7 +144,7 @@ export const Position = (): JSX.Element => {
.filter(
(value) =>
parseInt(value[0]) !==
Protobuf.Config_PositionConfig_PositionFlags.POS_UNDEFINED
Protobuf.Config_PositionConfig_PositionFlags.UNSET
)
.map((value) => {
return {
src/components/PageComponents/Config/Power.tsx
+1 -12
View File
@@ -1,15 +1,13 @@
import type React from "react";
import { useEffect, useState } from "react";
import { FormField, SelectField, Switch, TextInputField } from "evergreen-ui";
import { FormField, Switch, TextInputField } from "evergreen-ui";
import { Controller, useForm } from "react-hook-form";
import { PowerValidation } from "@app/validation/config/power.js";
import { Form } from "@components/form/Form";
import { useDevice } from "@core/providers/useDevice.js";
import { renderOptions } from "@core/utils/selectEnumOptions.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs";
export const Power = (): JSX.Element => {
const { config, connection } = useDevice();
@@ -47,15 +45,6 @@ export const Power = (): JSX.Element => {
});
return (
<Form loading={loading} dirty={isDirty} onSubmit={onSubmit}>
<SelectField
label="Charge current"
description="This is a description."
isInvalid={!!errors.chargeCurrent?.message}
validationMessage={errors.chargeCurrent?.message}
{...register("chargeCurrent", { valueAsNumber: true })}
>
{renderOptions(Protobuf.Config_PowerConfig_ChargeCurrent)}
</SelectField>
<TextInputField
label="Shutdown on battery delay"
description="This is a description."
src/core/stores/deviceStore.ts
+3 -3
View File
@@ -140,8 +140,8 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
case "power":
device.config.power = config.payloadVariant.power;
break;
case "wifi":
device.config.wifi = config.payloadVariant.wifi;
case "network":
device.config.network = config.payloadVariant.network;
break;
case "display":
device.config.display = config.payloadVariant.display;
@@ -150,7 +150,7 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
device.config.lora = config.payloadVariant.lora;
device.regionUnset =
config.payloadVariant.lora.region ===
Protobuf.Config_LoRaConfig_RegionCode.Unset;
Protobuf.Config_LoRaConfig_RegionCode.UNSET;
break;
}
}
src/pages/Config/DeviceConfig.tsx
+3 -3
View File
@@ -3,6 +3,7 @@ import { useState } from "react";
import { Pane, Tab, Tablist } from "evergreen-ui";
import { Network } from "@app/components/PageComponents/Config/Network.js";
import { Bluetooth } from "@components/PageComponents/Config/Bluetooth.js";
import { Device } from "@components/PageComponents/Config/Device.js";
import { Display } from "@components/PageComponents/Config/Display.js";
@@ -10,7 +11,6 @@ import { LoRa } from "@components/PageComponents/Config/LoRa.js";
import { Position } from "@components/PageComponents/Config/Position.js";
import { Power } from "@components/PageComponents/Config/Power.js";
import { User } from "@components/PageComponents/Config/User.js";
import { WiFi } from "@components/PageComponents/Config/WiFi.js";
import { useDevice } from "@core/providers/useDevice.js";
export const DeviceConfig = (): JSX.Element => {
@@ -35,8 +35,8 @@ export const DeviceConfig = (): JSX.Element => {
element: Power,
},
{
label: "WiFi",
element: WiFi,
label: "Network",
element: Network,
disabled: !hardware.hasWifi,
},
{
src/validation/config/device.ts
+1 -4
View File
@@ -1,4 +1,4 @@
import { IsBoolean, IsEnum, Length } from "class-validator";
import { IsBoolean, IsEnum } from "class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs";
@@ -14,7 +14,4 @@ export class DeviceValidation implements Protobuf.Config_DeviceConfig {
@IsBoolean()
debugLogEnabled: boolean;
@Length(2, 30)
ntpServer: string;
}
src/validation/config/lora.ts
+1 -1
View File
@@ -15,7 +15,7 @@ export class LoRaValidation implements Protobuf.Config_LoRaConfig {
bandwidth: number;
@IsInt()
@Min(7)
// @Min(7)
@Max(12)
spreadFactor: number;
src/validation/config/network.ts
+20
View File
@@ -0,0 +1,20 @@
import { IsBoolean, IsEnum, Length } from "class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs";
export class NetworkValidation implements Protobuf.Config_NetworkConfig {
@IsBoolean()
wifiEnabled: boolean;
@IsEnum(Protobuf.Config_NetworkConfig_WiFiMode)
wifiMode: Protobuf.Config_NetworkConfig_WiFiMode;
@Length(1, 33)
wifiSsid: string;
@Length(8, 64)
wifiPsk: string;
@Length(2, 30)
ntpServer: string;
}
src/validation/config/power.ts
+2 -5
View File
@@ -1,11 +1,8 @@
import { IsBoolean, IsEnum, IsInt, Max, Min } from "class-validator";
import { IsBoolean, IsInt, Max, Min } from "class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs";
import type { Protobuf } from "@meshtastic/meshtasticjs";
export class PowerValidation implements Protobuf.Config_PowerConfig {
@IsEnum(Protobuf.Config_PowerConfig_ChargeCurrent)
chargeCurrent: Protobuf.Config_PowerConfig_ChargeCurrent;
@IsBoolean()
isPowerSaving: boolean;
src/validation/config/wifi.ts
-17
View File
@@ -1,17 +0,0 @@
import { IsBoolean, IsEnum, Length } from "class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs";
export class WiFiValidation implements Protobuf.Config_WiFiConfig {
@IsBoolean()
enabled: boolean;
@IsEnum(Protobuf.Config_WiFiConfig_WiFiMode)
mode: Protobuf.Config_WiFiConfig_WiFiMode;
@Length(1, 33)
ssid: string;
@Length(8, 64)
psk: string;
}