1.3.x updates

src/components/layout/Sidebar/Settings/Channels.tsx

@@ -1,110 +0,0 @@
-import type React from 'react';
-import { useState } from 'react';
-
-import { useForm } from 'react-hook-form';
-
-import { Checkbox } from '@components/generic/form/Checkbox';
-import { Form } from '@components/generic/form/Form';
-import { Input } from '@components/generic/form/Input';
-import { Select } from '@components/generic/form/Select';
-import { connection } from '@core/connection';
-import { useAppSelector } from '@hooks/useAppSelector';
-import { Protobuf } from '@meshtastic/meshtasticjs';
-
-export const Channels = (): JSX.Element => {
-  const channels = useAppSelector((state) => state.meshtastic.radio.channels);
-  const adminChannel =
-    channels.find(
-      (channel) => channel.role === Protobuf.Channel_Role.PRIMARY,
-    ) ?? channels[0];
-  const [usePreset, setUsePreset] = useState(true);
-  const [loading, setLoading] = useState(false);
-  const [selectedChannel, setSelectedChannel] = useState<
-    Protobuf.Channel | undefined
-  >();
-
-  const { register, handleSubmit, reset, formState } = useForm<
-    DeepOmit<Protobuf.Channel, 'psk'>
-  >({
-    defaultValues: {
-      ...adminChannel,
-    },
-  });
-
-  const onSubmit = handleSubmit(async (data) => {
-    setLoading(true);
-
-    const channelData = Protobuf.Channel.create({
-      ...data,
-      settings: {
-        ...data.settings,
-        psk: adminChannel.settings?.psk,
-      },
-    });
-
-    await connection.setChannel(channelData, (): Promise<void> => {
-      reset({ ...data });
-      setLoading(false);
-      return Promise.resolve();
-    });
-  });
-
-  return (
-    <>
-      {adminChannel && (
-        <>
-          <Checkbox
-            checked={usePreset}
-            label="Use Presets"
-            onChange={(e): void => setUsePreset(e.target.checked)}
-          />
-          <Form loading={loading} dirty={!formState.isDirty} submit={onSubmit}>
-            {usePreset ? (
-              <Select
-                label="Preset"
-                optionsEnum={Protobuf.ChannelSettings_ModemConfig}
-                {...register('settings.modemConfig', {
-                  valueAsNumber: true,
-                })}
-              />
-            ) : (
-              <>
-                <Input
-                  label="Bandwidth"
-                  type="number"
-                  suffix="MHz"
-                  {...register('settings.bandwidth', {
-                    valueAsNumber: true,
-                  })}
-                />
-                <Input
-                  label="Spread Factor"
-                  type="number"
-                  suffix="CPS"
-                  min={7}
-                  max={12}
-                  {...register('settings.spreadFactor', {
-                    valueAsNumber: true,
-                  })}
-                />
-                <Input
-                  label="Coding Rate"
-                  type="number"
-                  {...register('settings.codingRate', {
-                    valueAsNumber: true,
-                  })}
-                />
-              </>
-            )}
-            <Input
-              label="Transmit Power"
-              type="number"
-              suffix="dBm"
-              {...register('settings.txPower', { valueAsNumber: true })}
-            />
-          </Form>
-        </>
-      )}
-    </>
-  );
-};

src/components/layout/Sidebar/Settings/Device.tsx

@@ -11,26 +11,34 @@ import { useAppSelector } from '@hooks/useAppSelector';
 import { Protobuf } from '@meshtastic/meshtasticjs';
 
 export const Device = (): JSX.Element => {
-  const preferences = useAppSelector(
-    (state) => state.meshtastic.radio.preferences,
+  const deviceConfig = useAppSelector(
+    (state) => state.meshtastic.radio.config.device,
   );
   const [loading, setLoading] = useState(false);
   const { register, handleSubmit, formState, reset } =
-    useForm<Protobuf.RadioConfig_UserPreferences>({
-      defaultValues: preferences,
+    useForm<Protobuf.Config_DeviceConfig>({
+      defaultValues: deviceConfig,
     });
 
   useEffect(() => {
-    reset(preferences);
-  }, [reset, preferences]);
+    reset(deviceConfig);
+  }, [reset, deviceConfig]);
 
   const onSubmit = handleSubmit((data) => {
     setLoading(true);
-    void connection.setPreferences(data, async () => {
-      reset({ ...data });
-      setLoading(false);
-      await Promise.resolve();
-    });
+    void connection.setConfig(
+      {
+        payloadVariant: {
+          oneofKind: 'device',
+          device: data,
+        },
+      },
+      async () => {
+        reset({ ...data });
+        setLoading(false);
+        await Promise.resolve();
+      },
+    );
   });
   return (
     <Form loading={loading} dirty={!formState.isDirty} submit={onSubmit}>
@@ -39,10 +47,14 @@ export const Device = (): JSX.Element => {
         {...register('serialDisabled')}
       />
       <Checkbox label="Factory Reset Device" {...register('factoryReset')} />
-      <Checkbox label="Debug Log Enabled" {...register('debugLogEnabled')} />
+      <Checkbox label="Enabled Debug Log" {...register('debugLogEnabled')} />
+      <Checkbox
+        label="Disable Serial COnsole"
+        {...register('serialDisabled')}
+      />
       <Select
         label="Role"
-        optionsEnum={Protobuf.Role}
+        optionsEnum={Protobuf.Config_DeviceConfig_Role}
         {...register('role', { valueAsNumber: true })}
       />
     </Form>

src/components/layout/Sidebar/Settings/Display.tsx

@@ -11,26 +11,34 @@ import { useAppSelector } from '@hooks/useAppSelector';
 import { Protobuf } from '@meshtastic/meshtasticjs';
 
 export const Display = (): JSX.Element => {
-  const preferences = useAppSelector(
-    (state) => state.meshtastic.radio.preferences,
+  const displayConfig = useAppSelector(
+    (state) => state.meshtastic.radio.config.display,
   );
   const [loading, setLoading] = useState(false);
   const { register, handleSubmit, formState, reset } =
-    useForm<Protobuf.RadioConfig_UserPreferences>({
-      defaultValues: preferences,
+    useForm<Protobuf.Config_DisplayConfig>({
+      defaultValues: displayConfig,
     });
 
   useEffect(() => {
-    reset(preferences);
-  }, [reset, preferences]);
+    reset(displayConfig);
+  }, [reset, displayConfig]);
 
   const onSubmit = handleSubmit((data) => {
     setLoading(true);
-    void connection.setPreferences(data, async () => {
-      reset({ ...data });
-      setLoading(false);
-      await Promise.resolve();
-    });
+    void connection.setConfig(
+      {
+        payloadVariant: {
+          oneofKind: 'display',
+          display: data,
+        },
+      },
+      async () => {
+        reset({ ...data });
+        setLoading(false);
+        await Promise.resolve();
+      },
+    );
   });
   return (
     <Form loading={loading} dirty={!formState.isDirty} submit={onSubmit}>
@@ -48,7 +56,7 @@ export const Display = (): JSX.Element => {
       />
       <Select
         label="GPS Display Units"
-        optionsEnum={Protobuf.GpsCoordinateFormat}
+        optionsEnum={Protobuf.Config_DisplayConfig_GpsCoordinateFormat}
         {...register('gpsFormat', { valueAsNumber: true })}
       />
     </Form>

src/components/layout/Sidebar/Settings/Index.tsx

@@ -22,10 +22,9 @@ import {
 import { CollapsibleSection } from '@components/generic/Sidebar/CollapsibleSection';
 import { ExternalSection } from '@components/generic/Sidebar/ExternalSection';
 import { SidebarOverlay } from '@components/generic/Sidebar/SidebarOverlay';
-import { Channels } from '@components/layout/Sidebar/Settings/Channels';
 import { ChannelsGroup } from '@components/layout/Sidebar/Settings/channels/ChannelsGroup';
 import { Display } from '@components/layout/Sidebar/Settings/Display';
-import { GPS } from '@components/layout/Sidebar/Settings/GPS';
+import { Position } from '@app/components/layout/Sidebar/Settings/Position';
 import { Interface } from '@components/layout/Sidebar/Settings/Interface';
 import { LoRa } from '@components/layout/Sidebar/Settings/LoRa';
 import { CannedMessage } from '@components/layout/Sidebar/Settings/modules/CannedMessage';
@@ -48,14 +47,9 @@ export interface SettingsProps {
 export const Settings = ({ open, setOpen }: SettingsProps): JSX.Element => {
   const [modulesOpen, setModulesOpen] = useState(false);
   const [channelsOpen, setChannelsOpen] = useState(false);
-  const {
-    rangeTestModuleEnabled,
-    extNotificationModuleEnabled,
-    serialModuleEnabled,
-    storeForwardModuleEnabled,
-    mqttDisabled,
-    cannedMessageModuleEnabled,
-  } = useAppSelector((state) => state.meshtastic.radio.preferences);
+  const moduleConfig = useAppSelector(
+    (state) => state.meshtastic.radio.moduleConfig,
+  );
 
   const hasGps = true;
   const hasWifi = true;
@@ -76,8 +70,8 @@ export const Settings = ({ open, setOpen }: SettingsProps): JSX.Element => {
         <CollapsibleSection icon={<FiSmartphone />} title="Device">
           <WiFi />
         </CollapsibleSection>
-        <CollapsibleSection icon={<FiMapPin />} title="GPS">
-          <GPS />
+        <CollapsibleSection icon={<FiMapPin />} title="Position">
+          <Position />
         </CollapsibleSection>
         <CollapsibleSection icon={<FiPower />} title="Power">
           <Power />
@@ -91,9 +85,6 @@ export const Settings = ({ open, setOpen }: SettingsProps): JSX.Element => {
         <CollapsibleSection icon={<FiRss />} title="LoRa">
           <LoRa />
         </CollapsibleSection>
-        <CollapsibleSection icon={<FiLayers />} title="Primary Channel">
-          <Channels />
-        </CollapsibleSection>
         <ExternalSection
           onClick={(): void => {
             setChannelsOpen(true);
@@ -125,35 +116,35 @@ export const Settings = ({ open, setOpen }: SettingsProps): JSX.Element => {
         <CollapsibleSection
           icon={<FiWifi />}
           title="MQTT"
-          status={!mqttDisabled}
+          status={!moduleConfig.mqtt.disabled}
         >
           <MQTT />
         </CollapsibleSection>
         <CollapsibleSection
           icon={<FiAlignLeft />}
           title="Serial"
-          status={serialModuleEnabled}
+          status={moduleConfig.serial.enabled}
         >
           <SerialSettingsPanel />
         </CollapsibleSection>
         <CollapsibleSection
           icon={<FiBell />}
           title="External Notifications"
-          status={extNotificationModuleEnabled}
+          status={moduleConfig.extNotification.enabled}
         >
           <ExternalNotificationsSettingsPlanel />
         </CollapsibleSection>
         <CollapsibleSection
           icon={<FiFastForward />}
           title="Store & Forward"
-          status={storeForwardModuleEnabled}
+          status={moduleConfig.storeForward.enabled}
         >
           <StoreForwardSettingsPanel />
         </CollapsibleSection>
         <CollapsibleSection
           icon={<FiRss />}
           title="Range Test"
-          status={rangeTestModuleEnabled}
+          status={moduleConfig.rangeTest.enabled}
         >
           <RangeTestSettingsPanel />
         </CollapsibleSection>
@@ -167,7 +158,7 @@ export const Settings = ({ open, setOpen }: SettingsProps): JSX.Element => {
         <CollapsibleSection
           icon={<FiMessageSquare />}
           title="Canned Message"
-          status={cannedMessageModuleEnabled}
+          status={moduleConfig.cannedMessage.enabled}
         >
           <CannedMessage />
         </CollapsibleSection>

src/components/layout/Sidebar/Settings/LoRa.tsx

@@ -12,52 +12,130 @@ import { useAppSelector } from '@hooks/useAppSelector';
 import { Protobuf } from '@meshtastic/meshtasticjs';
 
 export const LoRa = (): JSX.Element => {
-  const preferences = useAppSelector(
-    (state) => state.meshtastic.radio.preferences,
+  const myNodeNum = useAppSelector(
+    (state) => state.meshtastic.radio.hardware.myNodeNum,
+  );
+  const loraConfig = useAppSelector(
+    (state) => state.meshtastic.radio.config.lora,
   );
   const [loading, setLoading] = useState(false);
+  const [usePreset, setUsePreset] = useState(true);
+  // const { register, handleSubmit, formState, reset } =
+  //   useForm<Protobuf.RadioConfig_UserPreferences>({
+  //     defaultValues: preferences,
+  //   });
   const { register, handleSubmit, formState, reset } =
-    useForm<Protobuf.RadioConfig_UserPreferences>({
-      defaultValues: preferences,
+    useForm<Protobuf.Config_LoRaConfig>({
+      defaultValues: loraConfig,
     });
 
   useEffect(() => {
-    reset(preferences);
-  }, [reset, preferences]);
+    reset(loraConfig);
+  }, [reset, loraConfig]);
 
   const onSubmit = handleSubmit((data) => {
     setLoading(true);
-    void connection.setPreferences(data, async () => {
-      reset({ ...data });
-      setLoading(false);
-      await Promise.resolve();
+
+    const packet = Protobuf.AdminMessage.create({
+      variant: {
+        oneofKind: 'setConfig',
+        setConfig: {
+          payloadVariant: {
+            oneofKind: 'lora',
+            lora: data,
+          },
+        },
+      },
     });
+
+    void connection.sendPacket(
+      Protobuf.AdminMessage.toBinary(packet),
+      Protobuf.PortNum.ADMIN_APP,
+      myNodeNum,
+      true,
+      0,
+      true,
+      false,
+      async (num) => {
+        return await Promise.resolve();
+      },
+    );
+    // void connection.setPreferences(data, async () => {
+    //   reset({ ...data });
+    //   setLoading(false);
+    //   await Promise.resolve();
+    // });
   });
   return (
-    <Form loading={loading} dirty={!formState.isDirty} submit={onSubmit}>
-      <Input
-        label="Hop Count"
-        type="number"
-        suffix="Hops"
-        {...register('hopLimit', { valueAsNumber: true })}
+    <>
+      <Checkbox
+        checked={usePreset}
+        label="Use Presets"
+        onChange={(e): void => setUsePreset(e.target.checked)}
       />
-      <Checkbox label="Transmit Disabled" {...register('isLoraTxDisabled')} />
-      <Select
-        label="Operating Role"
-        optionsEnum={Protobuf.Role}
-        {...register('role')}
-      />
-      <Input
-        label="Frequency Offset"
-        type="number"
-        suffix="Hz"
-        {...register('frequencyOffset', { valueAsNumber: true })}
-      />
-      <Select
-        label="Region"
-        optionsEnum={Protobuf.RegionCode}
-        {...register('region', { valueAsNumber: true })}
-      />
-    </Form>
+      <Form loading={loading} dirty={!formState.isDirty} submit={onSubmit}>
+        {usePreset ? (
+          <Select
+            label="Preset"
+            optionsEnum={Protobuf.Config_LoRaConfig_ModemPreset}
+            {...register('modemPreset', {
+              valueAsNumber: true,
+            })}
+          />
+        ) : (
+          <>
+            <Input
+              label="Bandwidth"
+              type="number"
+              suffix="MHz"
+              {...register('bandwidth', {
+                valueAsNumber: true,
+              })}
+            />
+            <Input
+              label="Spread Factor"
+              type="number"
+              suffix="CPS"
+              min={7}
+              max={12}
+              {...register('spreadFactor', {
+                valueAsNumber: true,
+              })}
+            />
+            <Input
+              label="Coding Rate"
+              type="number"
+              {...register('codingRate', {
+                valueAsNumber: true,
+              })}
+            />
+          </>
+        )}
+        <Input
+          label="Transmit Power"
+          type="number"
+          suffix="dBm"
+          {...register('txPower', { valueAsNumber: true })}
+        />
+        <Input
+          label="Hop Count"
+          type="number"
+          suffix="Hops"
+          {...register('hopLimit', { valueAsNumber: true })}
+        />
+        <Checkbox label="Transmit Disabled" {...register('txDisabled')} />
+        <Input
+          label="Frequency Offset"
+          type="number"
+          suffix="Hz"
+          {...register('frequencyOffset', { valueAsNumber: true })}
+        />
+        <Select
+          label="Region"
+          optionsEnum={Protobuf.Config_LoRaConfig_RegionCode}
+          {...register('region', { valueAsNumber: true })}
+        />
+      </Form>
+    </>
   );
 };

src/components/layout/Sidebar/Settings/Position.tsx

@@ -13,35 +13,44 @@ import { bitwiseDecode, bitwiseEncode } from '@core/utils/bitwise';
 import { useAppSelector } from '@hooks/useAppSelector';
 import { Protobuf } from '@meshtastic/meshtasticjs';
 
-export const GPS = (): JSX.Element => {
-  const preferences = useAppSelector(
-    (state) => state.meshtastic.radio.preferences,
+export const Position = (): JSX.Element => {
+  const positionConfig = useAppSelector(
+    (state) => state.meshtastic.radio.config.position,
   );
   const [loading, setLoading] = useState(false);
   const { register, handleSubmit, formState, reset, control } =
-    useForm<Protobuf.RadioConfig_UserPreferences>({
-      defaultValues: {
-        ...preferences,
-        positionBroadcastSecs:
-          preferences.positionBroadcastSecs === 0
-            ? preferences.role === Protobuf.Role.Router
-              ? 43200
-              : 900
-            : preferences.positionBroadcastSecs,
-      },
+    useForm<Protobuf.Config_PositionConfig>({
+      defaultValues: positionConfig,
+      // defaultValues: {
+      //   ...preferences,
+      //   positionBroadcastSecs:
+      //     preferences.positionBroadcastSecs === 0
+      //       ? preferences.role === Protobuf.Role.Router
+      //         ? 43200
+      //         : 900
+      //       : preferences.positionBroadcastSecs,
+      // },
     });
 
   useEffect(() => {
-    reset(preferences);
-  }, [reset, preferences]);
+    reset(positionConfig);
+  }, [reset, positionConfig]);
 
   const onSubmit = handleSubmit((data) => {
     setLoading(true);
-    void connection.setPreferences(data, async () => {
-      reset({ ...data });
-      setLoading(false);
-      await Promise.resolve();
-    });
+    void connection.setConfig(
+      {
+        payloadVariant: {
+          oneofKind: 'position',
+          position: data,
+        },
+      },
+      async () => {
+        reset({ ...data });
+        setLoading(false);
+        await Promise.resolve();
+      },
+    );
   });
 
   return (
@@ -90,12 +99,15 @@ export const GPS = (): JSX.Element => {
             <div className="w-full">
               {label && <Label label={label} error={error?.message} />}
               <MultiSelect
-                options={Object.entries(Protobuf.PositionFlags)
+                options={Object.entries(
+                  Protobuf.Config_PositionConfig_PositionFlags,
+                )
                   .filter((value) => typeof value[1] !== 'number')
                   .filter(
                     (value) =>
                       parseInt(value[0]) !==
-                      Protobuf.PositionFlags.POS_UNDEFINED,
+                      Protobuf.Config_PositionConfig_PositionFlags
+                        .POS_UNDEFINED,
                   )
                   .map((value) => {
                     return {
@@ -103,14 +115,17 @@ export const GPS = (): JSX.Element => {
                       label: value[1].toString().replace('POS_', ''),
                     };
                   })}
-                value={bitwiseDecode(value, Protobuf.PositionFlags).map(
-                  (flag) => {
-                    return {
-                      value: flag,
-                      label: Protobuf.PositionFlags[flag].replace('POS_', ''),
-                    };
-                  },
-                )}
+                value={bitwiseDecode(
+                  value,
+                  Protobuf.Config_PositionConfig_PositionFlags,
+                ).map((flag) => {
+                  return {
+                    value: flag,
+                    label: Protobuf.Config_PositionConfig_PositionFlags[
+                      flag
+                    ].replace('POS_', ''),
+                  };
+                })}
                 onChange={(e: { value: number; label: string }[]): void =>
                   onChange(bitwiseEncode(e.map((v) => v.value)))
                 }

src/components/layout/Sidebar/Settings/Power.tsx

@@ -12,45 +12,59 @@ import { useAppSelector } from '@hooks/useAppSelector';
 import { Protobuf } from '@meshtastic/meshtasticjs';
 
 export const Power = (): JSX.Element => {
-  const preferences = useAppSelector(
-    (state) => state.meshtastic.radio.preferences,
+  const powerConfig = useAppSelector(
+    (state) => state.meshtastic.radio.config.power,
+  );
+  const deviceConfig = useAppSelector(
+    (state) => state.meshtastic.radio.config.device,
   );
   const [loading, setLoading] = useState(false);
   const { register, handleSubmit, formState, reset } =
-    useForm<Protobuf.RadioConfig_UserPreferences>({
-      defaultValues: {
-        ...preferences,
-        isLowPower:
-          preferences.role === Protobuf.Role.Router
-            ? true
-            : preferences.isLowPower,
-      },
+    useForm<Protobuf.Config_PowerConfig>({
+      defaultValues: powerConfig,
+      // defaultValues: {
+      //   ...preferences,
+      //   isLowPower:
+      //     preferences.role === Protobuf.Role.Router
+      //       ? true
+      //       : preferences.isLowPower,
+      // },
     });
 
   useEffect(() => {
-    reset(preferences);
-  }, [reset, preferences]);
+    reset(powerConfig);
+  }, [reset, powerConfig]);
 
   const onSubmit = handleSubmit((data) => {
     setLoading(true);
-    void connection.setPreferences(data, async () => {
-      reset({ ...data });
-      setLoading(false);
-      await Promise.resolve();
-    });
+    void connection.setConfig(
+      {
+        payloadVariant: {
+          oneofKind: 'power',
+          power: data,
+        },
+      },
+      async () => {
+        reset({ ...data });
+        setLoading(false);
+        await Promise.resolve();
+      },
+    );
   });
   return (
     <Form loading={loading} dirty={!formState.isDirty} submit={onSubmit}>
       <Select
         label="Charge current"
-        optionsEnum={Protobuf.ChargeCurrent}
+        optionsEnum={Protobuf.Config_PowerConfig_ChargeCurrent}
         {...register('chargeCurrent', { valueAsNumber: true })}
       />
       <Checkbox
         label="Powered by low power source (solar)"
-        disabled={preferences.role === Protobuf.Role.Router}
+        disabled={
+          deviceConfig.role === Protobuf.Config_DeviceConfig_Role.Router
+        }
         validationMessage={
-          preferences.role === Protobuf.Role.Router
+          deviceConfig.role === Protobuf.Config_DeviceConfig_Role.Router
             ? 'Enabled by default in router mode'
             : ''
         }
@@ -81,12 +95,6 @@ export const Power = (): JSX.Element => {
         type="number"
         {...register('phoneTimeoutSecs', { valueAsNumber: true })}
       />
-      <Input
-        label="Phone SDS Timeout"
-        suffix="Seconds"
-        type="number"
-        {...register('phoneSdsTimeoutSec', { valueAsNumber: true })}
-      />
       <Input
         label="Mesh SDS Timeout"
         suffix="Seconds"

src/components/layout/Sidebar/Settings/User.tsx

@@ -24,7 +24,6 @@ export const User = (): JSX.Element => {
     longName: string;
     shortName: string;
     isLicensed: boolean;
-    team: Protobuf.Team;
     antAzimuth: number;
     antGainDbi: number;
     txPowerDbm: number;
@@ -33,7 +32,6 @@ export const User = (): JSX.Element => {
       longName: node?.data.user?.longName,
       shortName: node?.data.user?.shortName,
       isLicensed: node?.data.user?.isLicensed,
-      team: node?.data.user?.team,
       antAzimuth: node?.data.user?.antAzimuth,
       antGainDbi: node?.data.user?.antGainDbi,
       txPowerDbm: node?.data.user?.txPowerDbm,
@@ -45,7 +43,6 @@ export const User = (): JSX.Element => {
       longName: node?.data.user?.longName,
       shortName: node?.data.user?.shortName,
       isLicensed: node?.data.user?.isLicensed,
-      team: node?.data.user?.team,
     });
   }, [reset, node]);
 
@@ -86,11 +83,6 @@ export const User = (): JSX.Element => {
         disabled
       />
       <Checkbox label="Licenced Operator?" {...register('isLicensed')} />
-      <Select
-        label="Team (DEPRECATED)"
-        optionsEnum={Protobuf.Team}
-        {...register('team', { valueAsNumber: true })}
-      />
       <Input
         label="Transmit Power"
         suffix="dBm"

src/components/layout/Sidebar/Settings/WiFi.tsx

@@ -11,47 +11,51 @@ import { useAppSelector } from '@hooks/useAppSelector';
 import type { Protobuf } from '@meshtastic/meshtasticjs';
 
 export const WiFi = (): JSX.Element => {
-  const preferences = useAppSelector(
-    (state) => state.meshtastic.radio.preferences,
+  const wifiConfig = useAppSelector(
+    (state) => state.meshtastic.radio.config.wifi,
   );
   const [loading, setLoading] = useState(false);
   const { register, handleSubmit, formState, reset, control } =
-    useForm<Protobuf.RadioConfig_UserPreferences>({
-      defaultValues: preferences,
+    useForm<Protobuf.Config_WiFiConfig>({
+      defaultValues: wifiConfig,
     });
 
   const WifiApMode = useWatch({
     control,
-    name: 'wifiApMode',
+    name: 'apMode',
     defaultValue: false,
   });
 
   useEffect(() => {
-    reset(preferences);
-  }, [reset, preferences]);
+    reset(wifiConfig);
+  }, [reset, wifiConfig]);
 
   const onSubmit = handleSubmit((data) => {
     setLoading(true);
-    void connection.setPreferences(data, async () => {
-      reset({ ...data });
-      setLoading(false);
-      await Promise.resolve();
-    });
+    void connection.setConfig(
+      {
+        payloadVariant: {
+          oneofKind: 'wifi',
+          wifi: data,
+        },
+      },
+      async () => {
+        reset({ ...data });
+        setLoading(false);
+        await Promise.resolve();
+      },
+    );
   });
   return (
     <Form loading={loading} dirty={!formState.isDirty} submit={onSubmit}>
-      <Checkbox label="Enable WiFi AP" {...register('wifiApMode')} />
-      <Input
-        label="WiFi SSID"
-        disabled={WifiApMode}
-        {...register('wifiSsid')}
-      />
+      <Checkbox label="Enable WiFi AP" {...register('apMode')} />
+      <Input label="WiFi SSID" disabled={WifiApMode} {...register('ssid')} />
       <Input
         type="password"
         autoComplete="off"
         label="WiFi PSK"
         disabled={WifiApMode}
-        {...register('wifiPassword')}
+        {...register('psk')}
       />
     </Form>
   );

src/components/layout/Sidebar/Settings/modules/CannedMessage.tsx

@@ -12,13 +12,13 @@ import { useAppSelector } from '@hooks/useAppSelector';
 import { Protobuf } from '@meshtastic/meshtasticjs';
 
 export const CannedMessage = (): JSX.Element => {
-  const preferences = useAppSelector(
-    (state) => state.meshtastic.radio.preferences,
+  const cannedMessageConfig = useAppSelector(
+    (state) => state.meshtastic.radio.moduleConfig.cannedMessage,
   );
   const [loading, setLoading] = useState(false);
   const { register, handleSubmit, formState, reset, control } =
-    useForm<Protobuf.RadioConfig_UserPreferences>({
-      defaultValues: preferences,
+    useForm<Protobuf.ModuleConfig_CannedMessageConfig>({
+      defaultValues: cannedMessageConfig,
     });
 
   const moduleEnabled = useWatch({
@@ -28,23 +28,28 @@ export const CannedMessage = (): JSX.Element => {
   });
 
   useEffect(() => {
-    reset(preferences);
-  }, [reset, preferences]);
+    reset(cannedMessageConfig);
+  }, [reset, cannedMessageConfig]);
 
   const onSubmit = handleSubmit((data) => {
     setLoading(true);
-    void connection.setPreferences(data, async () => {
-      reset({ ...data });
-      setLoading(false);
-      await Promise.resolve();
-    });
+    void connection.setModuleConfig(
+      {
+        payloadVariant: {
+          oneofKind: 'cannedMessage',
+          cannedMessage: data,
+        },
+      },
+      async () => {
+        reset({ ...data });
+        setLoading(false);
+        await Promise.resolve();
+      },
+    );
   });
   return (
     <Form loading={loading} dirty={!formState.isDirty} submit={onSubmit}>
-      <Checkbox
-        label="Module Enabled"
-        {...register('cannedMessageModuleEnabled')}
-      />
+      <Checkbox label="Module Enabled" {...register('enabled')} />
       <Checkbox
         label="Rotary Encoder #1 Enabled"
         {...register('rotary1Enabled')}
@@ -70,31 +75,28 @@ export const CannedMessage = (): JSX.Element => {
       <Select
         label="Clockwise event"
         disabled={moduleEnabled}
-        optionsEnum={Protobuf.InputEventChar}
+        optionsEnum={Protobuf.ModuleConfig_CannedMessageConfig_InputEventChar}
         {...register('inputbrokerEventCw', { valueAsNumber: true })}
       />
       <Select
         label="Counter Clockwise event"
         disabled={moduleEnabled}
-        optionsEnum={Protobuf.InputEventChar}
+        optionsEnum={Protobuf.ModuleConfig_CannedMessageConfig_InputEventChar}
         {...register('inputbrokerEventCcw', { valueAsNumber: true })}
       />
       <Select
         label="Press event"
         disabled={moduleEnabled}
-        optionsEnum={Protobuf.InputEventChar}
+        optionsEnum={Protobuf.ModuleConfig_CannedMessageConfig_InputEventChar}
         {...register('inputbrokerEventPress', { valueAsNumber: true })}
       />
       <Checkbox label="Up Down enabled" {...register('updown1Enabled')} />
       <Input
         label="Allow Input Source"
         disabled={moduleEnabled}
-        {...register('cannedMessageModuleAllowInputSource')}
-      />
-      <Checkbox
-        label="Send Bell"
-        {...register('cannedMessageModuleSendBell')}
+        {...register('allowInputSource')}
       />
+      <Checkbox label="Send Bell" {...register('sendBell')} />
     </Form>
   );
 };

src/components/layout/Sidebar/Settings/modules/ExternalNotifications.tsx

@@ -13,46 +13,51 @@ import type { Protobuf } from '@meshtastic/meshtasticjs';
 export const ExternalNotificationsSettingsPlanel = (): JSX.Element => {
   const [loading, setLoading] = useState(false);
 
-  const preferences = useAppSelector(
-    (state) => state.meshtastic.radio.preferences,
+  const extNotificationConfig = useAppSelector(
+    (state) => state.meshtastic.radio.moduleConfig.extNotification,
   );
 
   const { register, handleSubmit, formState, reset, control } =
-    useForm<Protobuf.RadioConfig_UserPreferences>({
-      defaultValues: preferences,
+    useForm<Protobuf.ModuleConfig_ExternalNotificationConfig>({
+      defaultValues: extNotificationConfig,
     });
 
   useEffect(() => {
-    reset(preferences);
-  }, [reset, preferences]);
+    reset(extNotificationConfig);
+  }, [reset, extNotificationConfig]);
 
   const onSubmit = handleSubmit(async (data) => {
     setLoading(true);
-    await connection.setPreferences(data, async (): Promise<void> => {
-      reset({ ...data });
-      setLoading(false);
-      await Promise.resolve();
-    });
+    await connection.setModuleConfig(
+      {
+        payloadVariant: {
+          oneofKind: 'externalNotification',
+          externalNotification: data,
+        },
+      },
+      async (): Promise<void> => {
+        reset({ ...data });
+        setLoading(false);
+        await Promise.resolve();
+      },
+    );
   });
 
   const moduleEnabled = useWatch({
     control,
-    name: 'extNotificationModuleEnabled',
+    name: 'enabled',
     defaultValue: false,
   });
 
   return (
     <Form loading={loading} dirty={!formState.isDirty} submit={onSubmit}>
-      <Checkbox
-        label="Module Enabled"
-        {...register('extNotificationModuleEnabled')}
-      />
+      <Checkbox label="Module Enabled" {...register('enabled')} />
       <Input
         type="number"
         label="Output MS"
         suffix="ms"
         disabled={!moduleEnabled}
-        {...register('extNotificationModuleOutputMs', {
+        {...register('outputMs', {
           valueAsNumber: true,
         })}
       />
@@ -60,24 +65,24 @@ export const ExternalNotificationsSettingsPlanel = (): JSX.Element => {
         type="number"
         label="Output"
         disabled={!moduleEnabled}
-        {...register('extNotificationModuleOutput', {
+        {...register('output', {
           valueAsNumber: true,
         })}
       />
       <Checkbox
         label="Active"
         disabled={!moduleEnabled}
-        {...register('extNotificationModuleActive')}
+        {...register('active')}
       />
       <Checkbox
         label="Message"
         disabled={!moduleEnabled}
-        {...register('extNotificationModuleAlertMessage')}
+        {...register('alertMessage')}
       />
       <Checkbox
         label="Bell"
         disabled={!moduleEnabled}
-        {...register('extNotificationModuleAlertBell')}
+        {...register('alertBell')}
       />
     </Form>
   );

src/components/layout/Sidebar/Settings/modules/MQTT.tsx

@@ -11,57 +11,65 @@ import { useAppSelector } from '@hooks/useAppSelector';
 import type { Protobuf } from '@meshtastic/meshtasticjs';
 
 export const MQTT = (): JSX.Element => {
-  const preferences = useAppSelector(
-    (state) => state.meshtastic.radio.preferences,
+  const mqttConfig = useAppSelector(
+    (state) => state.meshtastic.radio.moduleConfig.mqtt,
   );
   const [loading, setLoading] = useState(false);
   const { register, handleSubmit, formState, reset, control } =
-    useForm<Protobuf.RadioConfig_UserPreferences>({
-      defaultValues: preferences,
+    useForm<Protobuf.ModuleConfig_MQTTConfig>({
+      defaultValues: mqttConfig,
     });
 
   const moduleEnabled = useWatch({
     control,
-    name: 'mqttDisabled',
+    name: 'disabled',
     defaultValue: false,
   });
 
   useEffect(() => {
-    reset(preferences);
-  }, [reset, preferences]);
+    reset(mqttConfig);
+  }, [reset, mqttConfig]);
 
   const onSubmit = handleSubmit((data) => {
     setLoading(true);
-    void connection.setPreferences(data, async () => {
-      reset({ ...data });
-      setLoading(false);
-      await Promise.resolve();
-    });
+    void connection.setModuleConfig(
+      {
+        payloadVariant: {
+          oneofKind: 'mqtt',
+          mqtt: data,
+        },
+      },
+      async () => {
+        reset({ ...data });
+        setLoading(false);
+        await Promise.resolve();
+      },
+    );
   });
   return (
     <Form loading={loading} dirty={!formState.isDirty} submit={onSubmit}>
-      <Checkbox label="Module Disabled" {...register('mqttDisabled')} />
+      <Checkbox label="Module Disabled" {...register('disabled')} />
       <Input
         label="MQTT Server Address"
         disabled={moduleEnabled}
-        {...register('mqttServer')}
+        {...register('address')}
       />
       <Input
         label="MQTT Username"
         disabled={moduleEnabled}
-        {...register('mqttUsername')}
+        {...register('username')}
       />
       <Input
         label="MQTT Password"
         type="password"
         autoComplete="off"
         disabled={moduleEnabled}
-        {...register('mqttPassword')}
+        {...register('password')}
       />
       <Checkbox
         label="Encryption Enabled"
         disabled={moduleEnabled}
-        {...register('mqttEncryptionEnabled')}
+        {...register('encryptionEnabled')}
       />
     </Form>
   );

src/components/layout/Sidebar/Settings/modules/RangeTest.tsx

@@ -13,53 +13,58 @@ import type { Protobuf } from '@meshtastic/meshtasticjs';
 export const RangeTestSettingsPanel = (): JSX.Element => {
   const [loading, setLoading] = useState(false);
 
-  const preferences = useAppSelector(
-    (state) => state.meshtastic.radio.preferences,
+  const rangeTestConfig = useAppSelector(
+    (state) => state.meshtastic.radio.moduleConfig.rangeTest,
   );
 
   const { register, handleSubmit, formState, reset, control } =
-    useForm<Protobuf.RadioConfig_UserPreferences>({
-      defaultValues: preferences,
+    useForm<Protobuf.ModuleConfig_RangeTestConfig>({
+      defaultValues: rangeTestConfig,
     });
 
   useEffect(() => {
-    reset(preferences);
-  }, [reset, preferences]);
+    reset(rangeTestConfig);
+  }, [reset, rangeTestConfig]);
 
   const onSubmit = handleSubmit(async (data) => {
     setLoading(true);
-    await connection.setPreferences(data, async (): Promise<void> => {
-      reset({ ...data });
-      setLoading(false);
-      await Promise.resolve();
-    });
+    await connection.setModuleConfig(
+      {
+        payloadVariant: {
+          oneofKind: 'rangeTest',
+          rangeTest: data,
+        },
+      },
+      async (): Promise<void> => {
+        reset({ ...data });
+        setLoading(false);
+        await Promise.resolve();
+      },
+    );
   });
 
   const moduleEnabled = useWatch({
     control,
-    name: 'rangeTestModuleEnabled',
+    name: 'enabled',
     defaultValue: false,
   });
 
   return (
     <Form loading={loading} dirty={!formState.isDirty} submit={onSubmit}>
-      <Checkbox
-        label="Module Enabled"
-        {...register('rangeTestModuleEnabled')}
-      />
+      <Checkbox label="Module Enabled" {...register('enabled')} />
       <Input
         type="number"
         label="Message Interval"
         disabled={!moduleEnabled}
         suffix="Seconds"
-        {...register('rangeTestModuleSender', {
+        {...register('sender', {
           valueAsNumber: true,
         })}
       />
       <Checkbox
         label="Save CSV to storage"
         disabled={!moduleEnabled}
-        {...register('rangeTestModuleSave')}
+        {...register('save')}
       />
     </Form>
   );

src/components/layout/Sidebar/Settings/modules/Serial.tsx

@@ -13,48 +13,52 @@ import type { Protobuf } from '@meshtastic/meshtasticjs';
 export const SerialSettingsPanel = (): JSX.Element => {
   const [loading, setLoading] = useState(false);
 
-  const preferences = useAppSelector(
-    (state) => state.meshtastic.radio.preferences,
+  const serialConfig = useAppSelector(
+    (state) => state.meshtastic.radio.moduleConfig.serial,
   );
 
   const { register, handleSubmit, formState, reset, control } =
-    useForm<Protobuf.RadioConfig_UserPreferences>({
-      defaultValues: preferences,
+    useForm<Protobuf.ModuleConfig_SerialConfig>({
+      defaultValues: serialConfig,
     });
 
   useEffect(() => {
-    reset(preferences);
-  }, [reset, preferences]);
+    reset(serialConfig);
+  }, [reset, serialConfig]);
 
   const onSubmit = handleSubmit(async (data) => {
     setLoading(true);
-    await connection.setPreferences(data, async (): Promise<void> => {
-      reset({ ...data });
-      setLoading(false);
-      await Promise.resolve();
-    });
+    await connection.setModuleConfig(
+      {
+        payloadVariant: {
+          oneofKind: 'serial',
+          serial: data,
+        },
+      },
+      async (): Promise<void> => {
+        reset({ ...data });
+        setLoading(false);
+        await Promise.resolve();
+      },
+    );
   });
 
   const moduleEnabled = useWatch({
     control,
-    name: 'serialModuleEnabled',
+    name: 'enabled',
     defaultValue: false,
   });
 
   return (
     <Form loading={loading} dirty={!formState.isDirty} submit={onSubmit}>
-      <Checkbox label="Module Enabled" {...register('serialModuleEnabled')} />
-      <Checkbox
-        label="Echo"
-        disabled={!moduleEnabled}
-        {...register('serialModuleEcho')}
-      />
+      <Checkbox label="Module Enabled" {...register('enabled')} />
+      <Checkbox label="Echo" disabled={!moduleEnabled} {...register('echo')} />
 
       <Input
         type="number"
         label="RX"
         disabled={!moduleEnabled}
-        {...register('serialModuleRxd', {
+        {...register('rxd', {
           valueAsNumber: true,
         })}
       />
@@ -62,7 +66,7 @@ export const SerialSettingsPanel = (): JSX.Element => {
         type="number"
         label="TX Pin"
         disabled={!moduleEnabled}
-        {...register('serialModuleTxd', {
+        {...register('txd', {
           valueAsNumber: true,
         })}
       />
@@ -70,7 +74,7 @@ export const SerialSettingsPanel = (): JSX.Element => {
         type="number"
         label="Baud Rate"
         disabled={!moduleEnabled}
-        {...register('serialModuleBaud', {
+        {...register('baud', {
           valueAsNumber: true,
         })}
       />
@@ -78,7 +82,7 @@ export const SerialSettingsPanel = (): JSX.Element => {
         type="number"
         label="Timeout"
         disabled={!moduleEnabled}
-        {...register('serialModuleTimeout', {
+        {...register('timeout', {
           valueAsNumber: true,
         })}
       />
@@ -86,7 +90,7 @@ export const SerialSettingsPanel = (): JSX.Element => {
         type="number"
         label="Mode"
         disabled={!moduleEnabled}
-        {...register('serialModuleMode', {
+        {...register('mode', {
           valueAsNumber: true,
         })}
       />

src/components/layout/Sidebar/Settings/modules/StoreForward.tsx

@@ -13,51 +13,56 @@ import type { Protobuf } from '@meshtastic/meshtasticjs';
 export const StoreForwardSettingsPanel = (): JSX.Element => {
   const [loading, setLoading] = useState(false);
 
-  const preferences = useAppSelector(
-    (state) => state.meshtastic.radio.preferences,
+  const storeForwardConfig = useAppSelector(
+    (state) => state.meshtastic.radio.moduleConfig.storeForward,
   );
 
   const { register, handleSubmit, formState, reset, control } =
-    useForm<Protobuf.RadioConfig_UserPreferences>({
-      defaultValues: preferences,
+    useForm<Protobuf.ModuleConfig_StoreForwardConfig>({
+      defaultValues: storeForwardConfig,
     });
 
   useEffect(() => {
-    reset(preferences);
-  }, [reset, preferences]);
+    reset(storeForwardConfig);
+  }, [reset, storeForwardConfig]);
 
   const onSubmit = handleSubmit(async (data) => {
     setLoading(true);
-    await connection.setPreferences(data, async (): Promise<void> => {
-      reset({ ...data });
-      setLoading(false);
-      await Promise.resolve();
-    });
+    await connection.setModuleConfig(
+      {
+        payloadVariant: {
+          oneofKind: 'storeForward',
+          storeForward: data,
+        },
+      },
+      async (): Promise<void> => {
+        reset({ ...data });
+        setLoading(false);
+        await Promise.resolve();
+      },
+    );
   });
 
   const moduleEnabled = useWatch({
     control,
-    name: 'storeForwardModuleEnabled',
+    name: 'enabled',
     defaultValue: false,
   });
 
   return (
     <Form loading={loading} dirty={!formState.isDirty} submit={onSubmit}>
-      <Checkbox
-        label="Module Enabled"
-        {...register('storeForwardModuleEnabled')}
-      />
+      <Checkbox label="Module Enabled" {...register('enabled')} />
       <Checkbox
         label="Heartbeat Enabled"
         disabled={!moduleEnabled}
-        {...register('storeForwardModuleHeartbeat')}
+        {...register('heartbeat')}
       />
       <Input
         type="number"
         label="Number of records"
         suffix="Records"
         disabled={!moduleEnabled}
-        {...register('storeForwardModuleRecords', {
+        {...register('records', {
           valueAsNumber: true,
         })}
       />
@@ -65,7 +70,7 @@ export const StoreForwardSettingsPanel = (): JSX.Element => {
         type="number"
         label="History return max"
         disabled={!moduleEnabled}
-        {...register('storeForwardModuleHistoryReturnMax', {
+        {...register('historyReturnMax', {
           valueAsNumber: true,
         })}
       />
@@ -73,7 +78,7 @@ export const StoreForwardSettingsPanel = (): JSX.Element => {
         type="number"
         label="History return window"
         disabled={!moduleEnabled}
-        {...register('storeForwardModuleHistoryReturnWindow', {
+        {...register('historyReturnWindow', {
           valueAsNumber: true,
         })}
       />

src/components/layout/Sidebar/Settings/modules/Telemetry.tsx

@@ -12,41 +12,49 @@ import { useAppSelector } from '@hooks/useAppSelector';
 import { Protobuf } from '@meshtastic/meshtasticjs';
 
 export const Telemetry = (): JSX.Element => {
-  const preferences = useAppSelector(
-    (state) => state.meshtastic.radio.preferences,
+  const telemetryConfig = useAppSelector(
+    (state) => state.meshtastic.radio.moduleConfig.telemetry,
   );
   const [loading, setLoading] = useState(false);
   const { register, handleSubmit, formState, reset, control } =
-    useForm<Protobuf.RadioConfig_UserPreferences>({
-      defaultValues: preferences,
+    useForm<Protobuf.ModuleConfig_TelemetryConfig>({
+      defaultValues: telemetryConfig,
     });
 
   useEffect(() => {
-    reset(preferences);
-  }, [reset, preferences]);
+    reset(telemetryConfig);
+  }, [reset, telemetryConfig]);
 
   const onSubmit = handleSubmit((data) => {
     setLoading(true);
-    void connection.setPreferences(data, async () => {
-      reset({ ...data });
-      setLoading(false);
-      await Promise.resolve();
-    });
+    void connection.setModuleConfig(
+      {
+        payloadVariant: {
+          oneofKind: 'telemetry',
+          telemetry: data,
+        },
+      },
+      async () => {
+        reset({ ...data });
+        setLoading(false);
+        await Promise.resolve();
+      },
+    );
   });
   return (
     <Form loading={loading} dirty={!formState.isDirty} submit={onSubmit}>
       <Checkbox
         label="Measurement Enabled"
-        {...register('telemetryModuleEnvironmentMeasurementEnabled')}
+        {...register('environmentMeasurementEnabled')}
       />
       <Checkbox
         label="Displayed on Screen"
-        {...register('telemetryModuleEnvironmentScreenEnabled')}
+        {...register('environmentScreenEnabled')}
       />
       <Input
         label="Read Error Count Threshold"
         type="number"
-        {...register('telemetryModuleEnvironmentReadErrorCountThreshold', {
+        {...register('environmentReadErrorCountThreshold', {
           valueAsNumber: true,
         })}
       />
@@ -54,7 +62,7 @@ export const Telemetry = (): JSX.Element => {
         label="Update Interval"
         suffix="Seconds"
         type="number"
-        {...register('telemetryModuleEnvironmentUpdateInterval', {
+        {...register('environmentUpdateInterval', {
           valueAsNumber: true,
         })}
       />
@@ -62,25 +70,25 @@ export const Telemetry = (): JSX.Element => {
         label="Recovery Interval"
         suffix="Seconds"
         type="number"
-        {...register('telemetryModuleEnvironmentRecoveryInterval', {
+        {...register('environmentRecoveryInterval', {
           valueAsNumber: true,
         })}
       />
       <Checkbox
         label="Display Farenheit"
-        {...register('telemetryModuleEnvironmentDisplayFahrenheit')}
+        {...register('environmentDisplayFahrenheit')}
       />
       <Select
         label="Sensor Type"
-        optionsEnum={Protobuf.RadioConfig_UserPreferences_TelemetrySensorType}
-        {...register('telemetryModuleEnvironmentSensorType', {
+        optionsEnum={Protobuf.TelemetrySensorType}
+        {...register('environmentSensorType', {
           valueAsNumber: true,
         })}
       />
       <Input
         label="Sensor Pin"
         type="number"
-        {...register('telemetryModuleEnvironmentSensorPin', {
+        {...register('environmentSensorPin', {
           valueAsNumber: true,
         })}
       />

src/components/menu/BottomNav.tsx

@@ -134,13 +134,13 @@ export const BottomNav = (): JSX.Element => {
       <BottomNavItem tooltip="MQTT Status">
         {primaryChannelSettings?.uplinkEnabled &&
         primaryChannelSettings?.downlinkEnabled &&
-        !meshtasticState.radio.preferences.mqttDisabled ? (
+        !meshtasticState.radio.moduleConfig.mqtt.disabled ? (
           <RiArrowUpDownLine className="h-4" />
         ) : primaryChannelSettings?.uplinkEnabled &&
-          !meshtasticState.radio.preferences.mqttDisabled ? (
+          !meshtasticState.radio.moduleConfig.mqtt.disabled ? (
           <RiArrowUpLine className="h-4" />
         ) : primaryChannelSettings?.downlinkEnabled &&
-          !meshtasticState.radio.preferences.mqttDisabled ? (
+          !meshtasticState.radio.moduleConfig.mqtt.disabled ? (
           <RiArrowDownLine className="h-4" />
         ) : (
           <FiX className="h-4" />