Update protobufs

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
+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,
@@ -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"
}
@@ -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>
);
};
@@ -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>
);
@@ -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 {
+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."