Updates for telemetry rework

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

@@ -47,12 +47,6 @@ export const LoRa = (): JSX.Element => {
         optionsEnum={Protobuf.Role}
         {...register('role')}
       />
-      <Input
-        label="Send Owner Interval"
-        type="number"
-        suffix="Seconds"
-        {...register('sendOwnerInterval', { valueAsNumber: true })}
-      />
       <Input
         label="Frequency Offset"
         type="number"

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

@@ -18,7 +18,7 @@ export const User = (): JSX.Element => {
     (state) => state.meshtastic.radio.hardware,
   ).myNodeNum;
   const node = useAppSelector((state) => state.meshtastic.nodes).find(
-    (node) => node.num === myNodeNum,
+    (node) => node.data.num === myNodeNum,
   );
   const { register, handleSubmit, formState, reset } = useForm<{
     longName: string;
@@ -30,51 +30,47 @@ export const User = (): JSX.Element => {
     txPowerDbm: number;
   }>({
     defaultValues: {
-      longName: node?.user?.longName,
-      shortName: node?.user?.shortName,
-      isLicensed: node?.user?.isLicensed,
-      team: node?.user?.team,
-      antAzimuth: node?.user?.antAzimuth,
-      antGainDbi: node?.user?.antGainDbi,
-      txPowerDbm: node?.user?.txPowerDbm,
+      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,
     },
   });
 
   useEffect(() => {
     reset({
-      longName: node?.user?.longName,
-      shortName: node?.user?.shortName,
-      isLicensed: node?.user?.isLicensed,
-      team: node?.user?.team,
+      longName: node?.data.user?.longName,
+      shortName: node?.data.user?.shortName,
+      isLicensed: node?.data.user?.isLicensed,
+      team: node?.data.user?.team,
     });
   }, [reset, node]);
 
   const onSubmit = handleSubmit((data) => {
     setLoading(true);
 
-    if (node?.user) {
-      void connection.setOwner({ ...node.user, ...data }, async () => {
+    if (node?.data.user) {
+      void connection.setOwner({ ...node.data.user, ...data }, async () => {
         reset({ ...data });
         setLoading(false);
         await Promise.resolve();
       });
-      // TODO: can be removed once getUser is implemented
-      // dispatch(
-      //   addUser({ ...node.user, ...{ data: { ...node.user.data, ...data } } }),
-      // );
     }
   });
 
   return (
     <Form loading={loading} dirty={!formState.isDirty} submit={onSubmit}>
-      <Input label="Device ID" value={node?.user?.id} disabled />
+      <Input label="Device ID" value={node?.data.user?.id} disabled />
       <Input label="Device Name" {...register('longName')} />
       <Input label="Short Name" maxLength={3} {...register('shortName')} />
       <Input
         label="Mac Address"
         defaultValue={
           base16
-            .stringify(node?.user?.macaddr ?? [])
+            .stringify(node?.data.user?.macaddr ?? [])
             .match(/.{1,2}/g)
             ?.join(':') ?? ''
         }
@@ -84,7 +80,7 @@ export const User = (): JSX.Element => {
         label="Hardware (DEPRECATED)"
         value={
           Protobuf.HardwareModel[
-            node?.user?.hwModel ?? Protobuf.HardwareModel.UNSET
+            node?.data.user?.hwModel ?? Protobuf.HardwareModel.UNSET
           ]
         }
         disabled

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

@@ -50,41 +50,42 @@ export const CannedMessage = (): JSX.Element => {
         {...register('rotary1Enabled')}
       />
       <Input
-        label="Encoder #1 Pin A"
+        label="Encoder Pin A"
         type="number"
         disabled={moduleEnabled}
-        {...register('rotary1PinA', { valueAsNumber: true })}
+        {...register('inputbrokerPinA', { valueAsNumber: true })}
       />
       <Input
-        label="Encoder #1 Pin B"
+        label="Encoder Pin B"
         type="number"
         disabled={moduleEnabled}
-        {...register('rotary1PinB', { valueAsNumber: true })}
+        {...register('inputbrokerPinB', { valueAsNumber: true })}
       />
       <Input
-        label="Endoer #1 Pin Press"
+        label="Endoer Pin Press"
         type="number"
         disabled={moduleEnabled}
-        {...register('rotary1PinPress', { valueAsNumber: true })}
+        {...register('inputbrokerPinPress', { valueAsNumber: true })}
       />
       <Select
         label="Clockwise event"
         disabled={moduleEnabled}
         optionsEnum={Protobuf.InputEventChar}
-        {...register('rotary1EventCw', { valueAsNumber: true })}
+        {...register('inputbrokerEventCw', { valueAsNumber: true })}
       />
       <Select
         label="Counter Clockwise event"
         disabled={moduleEnabled}
         optionsEnum={Protobuf.InputEventChar}
-        {...register('rotary1EventCcw', { valueAsNumber: true })}
+        {...register('inputbrokerEventCcw', { valueAsNumber: true })}
       />
       <Select
         label="Press event"
         disabled={moduleEnabled}
         optionsEnum={Protobuf.InputEventChar}
-        {...register('rotary1EventPress', { valueAsNumber: true })}
+        {...register('inputbrokerEventPress', { valueAsNumber: true })}
       />
+      <Checkbox label="Up Down enabled" {...register('updown1Enabled')} />
       <Input
         label="Allow Input Source"
         disabled={moduleEnabled}

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

@@ -37,16 +37,16 @@ export const Telemetry = (): JSX.Element => {
     <Form loading={loading} dirty={!formState.isDirty} submit={onSubmit}>
       <Checkbox
         label="Measurement Enabled"
-        {...register('telemetryModuleMeasurementEnabled')}
+        {...register('telemetryModuleEnvironmentMeasurementEnabled')}
       />
       <Checkbox
         label="Displayed on Screen"
-        {...register('telemetryModuleScreenEnabled')}
+        {...register('telemetryModuleEnvironmentScreenEnabled')}
       />
       <Input
         label="Read Error Count Threshold"
         type="number"
-        {...register('telemetryModuleReadErrorCountThreshold', {
+        {...register('telemetryModuleEnvironmentReadErrorCountThreshold', {
           valueAsNumber: true,
         })}
       />
@@ -54,7 +54,7 @@ export const Telemetry = (): JSX.Element => {
         label="Update Interval"
         suffix="Seconds"
         type="number"
-        {...register('telemetryModuleUpdateInterval', {
+        {...register('telemetryModuleEnvironmentUpdateInterval', {
           valueAsNumber: true,
         })}
       />
@@ -62,23 +62,27 @@ export const Telemetry = (): JSX.Element => {
         label="Recovery Interval"
         suffix="Seconds"
         type="number"
-        {...register('telemetryModuleRecoveryInterval', {
+        {...register('telemetryModuleEnvironmentRecoveryInterval', {
           valueAsNumber: true,
         })}
       />
       <Checkbox
         label="Display Farenheit"
-        {...register('telemetryModuleDisplayFahrenheit')}
+        {...register('telemetryModuleEnvironmentDisplayFahrenheit')}
       />
       <Select
         label="Sensor Type"
         optionsEnum={Protobuf.RadioConfig_UserPreferences_TelemetrySensorType}
-        {...register('telemetryModuleSensorType', { valueAsNumber: true })}
+        {...register('telemetryModuleEnvironmentSensorType', {
+          valueAsNumber: true,
+        })}
       />
       <Input
         label="Sensor Pin"
         type="number"
-        {...register('telemetryModuleSensorPin', { valueAsNumber: true })}
+        {...register('telemetryModuleEnvironmentSensorPin', {
+          valueAsNumber: true,
+        })}
       />
     </Form>
   );