This commit is contained in:
Sacha Weatherstone
2025-03-01 14:14:21 +08:00
parent 5a62b67e79
commit 977b5647f6
28 changed files with 368 additions and 366 deletions
+6 -9
View File
@@ -73,7 +73,8 @@ export const ImportDialog = ({
connection?.setChannel( connection?.setChannel(
create(Protobuf.Channel.ChannelSchema, { create(Protobuf.Channel.ChannelSchema, {
index, index,
role: index === 0 role:
index === 0
? Protobuf.Channel.Channel_Role.PRIMARY ? Protobuf.Channel.Channel_Role.PRIMARY
: Protobuf.Channel.Channel_Role.SECONDARY, : Protobuf.Channel.Channel_Role.SECONDARY,
settings: ch, settings: ch,
@@ -122,25 +123,21 @@ export const ImportDialog = ({
checked={channelSet?.loraConfig?.usePreset ?? true} checked={channelSet?.loraConfig?.usePreset ?? true}
/> />
</div> </div>
{ {/* <Select
/* <Select
label="Modem Preset" label="Modem Preset"
disabled disabled
value={channelSet?.loraConfig?.modemPreset} value={channelSet?.loraConfig?.modemPreset}
> >
{renderOptions(Protobuf.Config_LoRaConfig_ModemPreset)} {renderOptions(Protobuf.Config_LoRaConfig_ModemPreset)}
</Select> */ </Select> */}
}
</div> </div>
{ {/* <Select
/* <Select
label="Region" label="Region"
disabled disabled
value={channelSet?.loraConfig?.region} value={channelSet?.loraConfig?.region}
> >
{renderOptions(Protobuf.Config_LoRaConfig_RegionCode)} {renderOptions(Protobuf.Config_LoRaConfig_RegionCode)}
</Select> */ </Select> */}
}
<span className="text-md block font-medium text-text-primary"> <span className="text-md block font-medium text-text-primary">
Channels: Channels:
@@ -24,9 +24,11 @@ export const LocationResponseDialog = ({
const { nodes } = useDevice(); const { nodes } = useDevice();
const from = nodes.get(location?.from ?? 0); const from = nodes.get(location?.from ?? 0);
const longName = from?.user?.longName ?? const longName =
from?.user?.longName ??
(from ? `!${numberToHexUnpadded(from?.num)}` : "Unknown"); (from ? `!${numberToHexUnpadded(from?.num)}` : "Unknown");
const shortName = from?.user?.shortName ?? const shortName =
from?.user?.shortName ??
(from ? `${numberToHexUnpadded(from?.num).substring(0, 4)}` : "UNK"); (from ? `${numberToHexUnpadded(from?.num).substring(0, 4)}` : "UNK");
return ( return (
+40 -65
View File
@@ -32,8 +32,7 @@ export const NodeDetailsDialog = ({
const { nodeNumDetails } = useAppStore(); const { nodeNumDetails } = useAppStore();
const device: Protobuf.Mesh.NodeInfo = nodes.get(nodeNumDetails); const device: Protobuf.Mesh.NodeInfo = nodes.get(nodeNumDetails);
return device return device ? (
? (
<Dialog open={open} onOpenChange={onOpenChange}> <Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent> <DialogContent>
<DialogHeader> <DialogHeader>
@@ -46,8 +45,9 @@ export const NodeDetailsDialog = ({
<div className="w-full"> <div className="w-full">
<DeviceImage <DeviceImage
className="w-32 h-32 mx-auto rounded-lg border-4 border-slate-200 dark:border-slate-800" className="w-32 h-32 mx-auto rounded-lg border-4 border-slate-200 dark:border-slate-800"
deviceType={Protobuf.Mesh deviceType={
.HardwareModel[device.user?.hwModel ?? 0]} Protobuf.Mesh.HardwareModel[device.user?.hwModel ?? 0]
}
/> />
<div className="bg-slate-100 dark:bg-slate-800 p-3 rounded-lg mt-3"> <div className="bg-slate-100 dark:bg-slate-800 p-3 rounded-lg mt-3">
<p className="text-lg font-semibold text-slate-900 dark:text-slate-50"> <p className="text-lg font-semibold text-slate-900 dark:text-slate-50">
@@ -60,36 +60,36 @@ export const NodeDetailsDialog = ({
<p>Node Number: {device.num}</p> <p>Node Number: {device.num}</p>
<p>Node HEX: !{numberToHexUnpadded(device.num)}</p> <p>Node HEX: !{numberToHexUnpadded(device.num)}</p>
<p> <p>
Role: {Protobuf.Config.Config_DeviceConfig_Role[ Role:{" "}
{
Protobuf.Config.Config_DeviceConfig_Role[
device.user?.role ?? 0 device.user?.role ?? 0
]} ]
}
</p> </p>
<p> <p>
Last Heard: {device.lastHeard === 0 Last Heard:{" "}
? ( {device.lastHeard === 0 ? (
"Never" "Never"
) ) : (
: <TimeAgo timestamp={device.lastHeard * 1000} />} <TimeAgo timestamp={device.lastHeard * 1000} />
)}
</p> </p>
</div> </div>
{device.position {device.position ? (
? (
<div className="mt-5 bg-slate-100 dark:bg-slate-800 p-3 rounded-lg mt-3"> <div className="mt-5 bg-slate-100 dark:bg-slate-800 p-3 rounded-lg mt-3">
<p className="text-lg font-semibold text-slate-900 dark:text-slate-50"> <p className="text-lg font-semibold text-slate-900 dark:text-slate-50">
Position: Position:
</p> </p>
{device.position.latitudeI && device.position.longitudeI {device.position.latitudeI && device.position.longitudeI ? (
? (
<p> <p>
Coordinates:{" "} Coordinates:{" "}
<a <a
className="text-blue-500 dark:text-blue-400" className="text-blue-500 dark:text-blue-400"
href={`https://www.openstreetmap.org/?mlat=${ href={`https://www.openstreetmap.org/?mlat=${
device.position.latitudeI / 1e7 device.position.latitudeI / 1e7
}&mlon=${ }&mlon=${device.position.longitudeI / 1e7}&layers=N`}
device.position.longitudeI / 1e7
}&layers=N`}
target="_blank" target="_blank"
rel="noreferrer" rel="noreferrer"
> >
@@ -97,74 +97,51 @@ export const NodeDetailsDialog = ({
{device.position.longitudeI / 1e7} {device.position.longitudeI / 1e7}
</a> </a>
</p> </p>
) ) : null}
: null} {device.position.altitude ? (
{device.position.altitude <p>Altitude: {device.position.altitude}m</p>
? <p>Altitude: {device.position.altitude}m</p> ) : null}
: null}
</div> </div>
) ) : null}
: null}
{device.deviceMetrics {device.deviceMetrics ? (
? (
<div className="mt-5 bg-slate-100 dark:bg-slate-800 p-3 rounded-lg mt-3"> <div className="mt-5 bg-slate-100 dark:bg-slate-800 p-3 rounded-lg mt-3">
<p className="text-lg font-semibold text-slate-900 dark:text-slate-50"> <p className="text-lg font-semibold text-slate-900 dark:text-slate-50">
Device Metrics: Device Metrics:
</p> </p>
{device.deviceMetrics.airUtilTx {device.deviceMetrics.airUtilTx ? (
? (
<p> <p>
Air TX utilization:{" "} Air TX utilization:{" "}
{device.deviceMetrics.airUtilTx.toFixed(2)}% {device.deviceMetrics.airUtilTx.toFixed(2)}%
</p> </p>
) ) : null}
: null} {device.deviceMetrics.channelUtilization ? (
{device.deviceMetrics.channelUtilization
? (
<p> <p>
Channel utilization:{" "} Channel utilization:{" "}
{device.deviceMetrics.channelUtilization.toFixed(2)}% {device.deviceMetrics.channelUtilization.toFixed(2)}%
</p> </p>
) ) : null}
: null} {device.deviceMetrics.batteryLevel ? (
{device.deviceMetrics.batteryLevel
? (
<p> <p>
Battery level:{" "} Battery level:{" "}
{device.deviceMetrics.batteryLevel.toFixed(2)}% {device.deviceMetrics.batteryLevel.toFixed(2)}%
</p> </p>
) ) : null}
: null} {device.deviceMetrics.voltage ? (
{device.deviceMetrics.voltage <p>Voltage: {device.deviceMetrics.voltage.toFixed(2)}V</p>
? ( ) : null}
<p> {device.deviceMetrics.uptimeSeconds ? (
Voltage: {device.deviceMetrics.voltage.toFixed(2)}V
</p>
)
: null}
{device.deviceMetrics.uptimeSeconds
? (
<p> <p>
Uptime:{" "} Uptime:{" "}
<Uptime <Uptime seconds={device.deviceMetrics.uptimeSeconds} />
seconds={device.deviceMetrics.uptimeSeconds}
/>
</p> </p>
) ) : null}
: null}
</div> </div>
) ) : null}
: null}
{device {device ? (
? (
<div className="mt-5 w-full max-w-[464px] bg-slate-100 dark:bg-slate-800 p-3 rounded-lg mt-3"> <div className="mt-5 w-full max-w-[464px] bg-slate-100 dark:bg-slate-800 p-3 rounded-lg mt-3">
<Accordion <Accordion className="AccordionRoot" type="single" collapsible>
className="AccordionRoot"
type="single"
collapsible
>
<AccordionItem className="AccordionItem" value="item-1"> <AccordionItem className="AccordionItem" value="item-1">
<AccordionTrigger> <AccordionTrigger>
<p className="text-lg font-semibold text-slate-900 dark:text-slate-50"> <p className="text-lg font-semibold text-slate-900 dark:text-slate-50">
@@ -179,12 +156,10 @@ export const NodeDetailsDialog = ({
</AccordionItem> </AccordionItem>
</Accordion> </Accordion>
</div> </div>
) ) : null}
: null}
</div> </div>
</DialogFooter> </DialogFooter>
</DialogContent> </DialogContent>
</Dialog> </Dialog>
) ) : null;
: null;
}; };
+6 -4
View File
@@ -31,9 +31,11 @@ export const NodeOptionsDialog = ({
setChatType, setChatType,
setActiveChat, setActiveChat,
} = useAppStore(); } = useAppStore();
const longName = node?.user?.longName ?? const longName =
node?.user?.longName ??
(node ? `!${numberToHexUnpadded(node?.num)}` : "Unknown"); (node ? `!${numberToHexUnpadded(node?.num)}` : "Unknown");
const shortName = node?.user?.shortName ?? const shortName =
node?.user?.shortName ??
(node ? `${numberToHexUnpadded(node?.num).substring(0, 4)}` : "UNK"); (node ? `${numberToHexUnpadded(node?.num).substring(0, 4)}` : "UNK");
function handleDirectMessage() { function handleDirectMessage() {
@@ -51,7 +53,7 @@ export const NodeOptionsDialog = ({
connection?.requestPosition(node.num).then(() => connection?.requestPosition(node.num).then(() =>
toast({ toast({
title: "Position request sent.", title: "Position request sent.",
}) }),
); );
onOpenChange(); onOpenChange();
} }
@@ -64,7 +66,7 @@ export const NodeOptionsDialog = ({
connection?.traceRoute(node.num).then(() => connection?.traceRoute(node.num).then(() =>
toast({ toast({
title: "Traceroute sent.", title: "Traceroute sent.",
}) }),
); );
onOpenChange(); onOpenChange();
} }
+1 -3
View File
@@ -86,9 +86,7 @@ export const QRDialog = ({
onCheckedChange={() => { onCheckedChange={() => {
if (selectedChannels.includes(channel.index)) { if (selectedChannels.includes(channel.index)) {
setSelectedChannels( setSelectedChannels(
selectedChannels.filter((c) => selectedChannels.filter((c) => c !== channel.index),
c !== channel.index
),
); );
} else { } else {
setSelectedChannels([ setSelectedChannels([
@@ -28,9 +28,11 @@ export const TracerouteResponseDialog = ({
const snrTowards = traceroute?.data.snrTowards ?? []; const snrTowards = traceroute?.data.snrTowards ?? [];
const snrBack = traceroute?.data.snrBack ?? []; const snrBack = traceroute?.data.snrBack ?? [];
const from = nodes.get(traceroute?.from ?? 0); const from = nodes.get(traceroute?.from ?? 0);
const longName = from?.user?.longName ?? const longName =
from?.user?.longName ??
(from ? `!${numberToHexUnpadded(from?.num)}` : "Unknown"); (from ? `!${numberToHexUnpadded(from?.num)}` : "Unknown");
const shortName = from?.user?.shortName ?? const shortName =
from?.user?.shortName ??
(from ? `${numberToHexUnpadded(from?.num).substring(0, 4)}` : "UNK"); (from ? `${numberToHexUnpadded(from?.num).substring(0, 4)}` : "UNK");
const to = nodes.get(traceroute?.to ?? 0); const to = nodes.get(traceroute?.to ?? 0);
return ( return (
+6 -5
View File
@@ -24,9 +24,8 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => {
channel?.settings?.psk.length ?? 16, channel?.settings?.psk.length ?? 16,
); );
const [validationText, setValidationText] = useState<string>(); const [validationText, setValidationText] = useState<string>();
const [preSharedDialogOpen, setPreSharedDialogOpen] = useState<boolean>( const [preSharedDialogOpen, setPreSharedDialogOpen] =
false, useState<boolean>(false);
);
const onSubmit = (data: ChannelValidation) => { const onSubmit = (data: ChannelValidation) => {
const channel = create(Protobuf.Channel.ChannelSchema, { const channel = create(Protobuf.Channel.ChannelSchema, {
@@ -127,7 +126,8 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => {
description: description:
"Device telemetry is sent over PRIMARY. Only one PRIMARY allowed", "Device telemetry is sent over PRIMARY. Only one PRIMARY allowed",
properties: { properties: {
enumValue: channel.index === 0 enumValue:
channel.index === 0
? { PRIMARY: 1 } ? { PRIMARY: 1 }
: { DISABLED: 0, SECONDARY: 2 }, : { DISABLED: 0, SECONDARY: 2 },
}, },
@@ -192,7 +192,8 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => {
description: description:
"If not sharing precise location, position shared on channel will be accurate within this distance", "If not sharing precise location, position shared on channel will be accurate within this distance",
properties: { properties: {
enumValue: config.display?.units === 0 enumValue:
config.display?.units === 0
? { ? {
"Within 23 km": 10, "Within 23 km": 10,
"Within 12 km": 11, "Within 12 km": 11,
@@ -111,7 +111,8 @@ export const Bluetooth = () => {
disabledBy: [ disabledBy: [
{ {
fieldName: "mode", fieldName: "mode",
selector: Protobuf.Config.Config_BluetoothConfig_PairingMode selector:
Protobuf.Config.Config_BluetoothConfig_PairingMode
.FIXED_PIN, .FIXED_PIN,
invert: true, invert: true,
}, },
@@ -37,16 +37,14 @@ export const NodeDetail = ({ node }: NodeDetailProps) => {
<Avatar text={node.user?.shortName} /> <Avatar text={node.user?.shortName} />
<div> <div>
{node.user?.publicKey && node.user?.publicKey.length > 0 {node.user?.publicKey && node.user?.publicKey.length > 0 ? (
? (
<LockIcon <LockIcon
className="text-green-600" className="text-green-600"
size={12} size={12}
strokeWidth={3} strokeWidth={3}
aria-label="Public Key Enabled" aria-label="Public Key Enabled"
/> />
) ) : (
: (
<LockOpenIcon <LockOpenIcon
className="text-yellow-500" className="text-yellow-500"
size={12} size={12}
@@ -75,13 +73,15 @@ export const NodeDetail = ({ node }: NodeDetailProps) => {
node.deviceMetrics?.voltage?.toPrecision(3) ?? "Unknown" node.deviceMetrics?.voltage?.toPrecision(3) ?? "Unknown"
} volts`} } volts`}
> >
{node.deviceMetrics?.batteryLevel > 100 {node.deviceMetrics?.batteryLevel > 100 ? (
? <BatteryChargingIcon size={22} /> <BatteryChargingIcon size={22} />
: node.deviceMetrics?.batteryLevel > 80 ) : node.deviceMetrics?.batteryLevel > 80 ? (
? <BatteryFullIcon size={22} /> <BatteryFullIcon size={22} />
: node.deviceMetrics?.batteryLevel > 20 ) : node.deviceMetrics?.batteryLevel > 20 ? (
? <BatteryMediumIcon size={22} /> <BatteryMediumIcon size={22} />
: <BatteryLowIcon size={22} />} ) : (
<BatteryLowIcon size={22} />
)}
<Subtle aria-label="Battery"> <Subtle aria-label="Battery">
{node.deviceMetrics?.batteryLevel > 100 {node.deviceMetrics?.batteryLevel > 100
? "Charging" ? "Charging"
@@ -34,7 +34,8 @@ export const ChannelChat = ({
const scrollToBottom = useCallback(() => { const scrollToBottom = useCallback(() => {
const scrollContainer = scrollContainerRef.current; const scrollContainer = scrollContainerRef.current;
if (scrollContainer) { if (scrollContainer) {
const isNearBottom = scrollContainer.scrollHeight - const isNearBottom =
scrollContainer.scrollHeight -
scrollContainer.scrollTop - scrollContainer.scrollTop -
scrollContainer.clientHeight < scrollContainer.clientHeight <
100; 100;
@@ -71,8 +72,9 @@ export const ChannelChat = ({
key={message.id} key={message.id}
message={message} message={message}
sender={nodes.get(message.from)} sender={nodes.get(message.from)}
lastMsgSameUser={index > 0 && lastMsgSameUser={
messages[index - 1].from === message.from} index > 0 && messages[index - 1].from === message.from
}
/> />
); );
})} })}
@@ -51,7 +51,7 @@ export const MessageInput = ({
myNodeNum, myNodeNum,
id, id,
"ack", "ack",
) ),
) )
.catch((e: Types.PacketError) => .catch((e: Types.PacketError) =>
setMessageState( setMessageState(
@@ -61,7 +61,7 @@ export const MessageInput = ({
myNodeNum, myNodeNum,
e.id, e.id,
e.error, e.error,
) ),
); );
}, },
[channel, connection, myNodeNum, setMessageState, to], [channel, connection, myNodeNum, setMessageState, to],
@@ -38,8 +38,7 @@ export const TraceRoute = ({
))} ))}
{from?.user?.longName} {from?.user?.longName}
</span> </span>
{routeBack {routeBack ? (
? (
<span className="ml-4 border-l-2 border-l-background-primary pl-2 text-text-primary"> <span className="ml-4 border-l-2 border-l-background-primary pl-2 text-text-primary">
<p className="font-semibold">Route back:</p> <p className="font-semibold">Route back:</p>
<p>{from?.user?.longName}</p> <p>{from?.user?.longName}</p>
@@ -55,8 +54,7 @@ export const TraceRoute = ({
))} ))}
{to?.user?.longName} {to?.user?.longName}
</span> </span>
) ) : null}
: null}
</div> </div>
); );
}; };
+13 -7
View File
@@ -299,8 +299,8 @@ export const useDeviceStore = createStore<DeviceState>((set, get) => ({
if (!device) { if (!device) {
return; return;
} }
const workingModuleConfigIndex = device?.workingModuleConfig const workingModuleConfigIndex =
.findIndex( device?.workingModuleConfig.findIndex(
(wmc) => (wmc) =>
wmc.payloadVariant.case === wmc.payloadVariant.case ===
moduleConfig.payloadVariant.case, moduleConfig.payloadVariant.case,
@@ -445,7 +445,8 @@ export const useDeviceStore = createStore<DeviceState>((set, get) => ({
if (!device) { if (!device) {
return; return;
} }
const currentNode = device.nodes.get(user.from) ?? const currentNode =
device.nodes.get(user.from) ??
create(Protobuf.Mesh.NodeInfoSchema); create(Protobuf.Mesh.NodeInfoSchema);
currentNode.user = user.data; currentNode.user = user.data;
device.nodes.set(user.from, currentNode); device.nodes.set(user.from, currentNode);
@@ -459,7 +460,8 @@ export const useDeviceStore = createStore<DeviceState>((set, get) => ({
if (!device) { if (!device) {
return; return;
} }
const currentNode = device.nodes.get(position.from) ?? const currentNode =
device.nodes.get(position.from) ??
create(Protobuf.Mesh.NodeInfoSchema); create(Protobuf.Mesh.NodeInfoSchema);
currentNode.position = position.data; currentNode.position = position.data;
device.nodes.set(position.from, currentNode); device.nodes.set(position.from, currentNode);
@@ -484,7 +486,8 @@ export const useDeviceStore = createStore<DeviceState>((set, get) => ({
return; return;
} }
const messageGroup = device.messages[message.type]; const messageGroup = device.messages[message.type];
const messageIndex = message.type === "direct" const messageIndex =
message.type === "direct"
? message.from === device.hardware.myNodeNum ? message.from === device.hardware.myNodeNum
? message.to ? message.to
: message.from : message.from
@@ -561,8 +564,11 @@ export const useDeviceStore = createStore<DeviceState>((set, get) => ({
} }
const messageGroup = device.messages[type]; const messageGroup = device.messages[type];
const messageIndex = type === "direct" const messageIndex =
? from === device.hardware.myNodeNum ? to : from type === "direct"
? from === device.hardware.myNodeNum
? to
: from
: channelIndex; : channelIndex;
const messages = messageGroup.get(messageIndex); const messages = messageGroup.get(messageIndex);
+11 -6
View File
@@ -39,11 +39,13 @@ export const MessagesPage = () => {
{filteredChannels.map((channel) => ( {filteredChannels.map((channel) => (
<SidebarButton <SidebarButton
key={channel.index} key={channel.index}
label={channel.settings?.name.length label={
channel.settings?.name.length
? channel.settings?.name ? channel.settings?.name
: channel.index === 0 : channel.index === 0
? "Primary" ? "Primary"
: `Ch ${channel.index}`} : `Ch ${channel.index}`
}
active={activeChat === channel.index} active={activeChat === channel.index}
onClick={() => { onClick={() => {
setChatType("broadcast"); setChatType("broadcast");
@@ -67,8 +69,9 @@ export const MessagesPage = () => {
{filteredNodes.map((node) => ( {filteredNodes.map((node) => (
<SidebarButton <SidebarButton
key={node.num} key={node.num}
label={node.user?.longName ?? label={
`!${numberToHexUnpadded(node.num)}`} node.user?.longName ?? `!${numberToHexUnpadded(node.num)}`
}
active={activeChat === node.num} active={activeChat === node.num}
onClick={() => { onClick={() => {
setChatType("direct"); setChatType("direct");
@@ -94,7 +97,8 @@ export const MessagesPage = () => {
? (nodes.get(activeChat)?.user?.longName ?? nodeHex) ? (nodes.get(activeChat)?.user?.longName ?? nodeHex)
: "Loading..." : "Loading..."
}`} }`}
actions={chatType === "direct" actions={
chatType === "direct"
? [ ? [
{ {
icon: nodes.get(activeChat)?.user?.publicKey.length icon: nodes.get(activeChat)?.user?.publicKey.length
@@ -114,7 +118,8 @@ export const MessagesPage = () => {
}, },
}, },
] ]
: []} : []
}
> >
{allChannels.map( {allChannels.map(
(channel) => (channel) =>
+14 -14
View File
@@ -107,11 +107,9 @@ const NodesPage = (): JSX.Element => {
> >
{node.user?.shortName ?? {node.user?.shortName ??
(node.user?.macaddr (node.user?.macaddr
? `${ ? `${base16
base16
.stringify(node.user?.macaddr.subarray(4, 6) ?? []) .stringify(node.user?.macaddr.subarray(4, 6) ?? [])
.toLowerCase() .toLowerCase()}`
}`
: `${numberToHexUnpadded(node.num).slice(-4)}`)} : `${numberToHexUnpadded(node.num).slice(-4)}`)}
</h1>, </h1>,
@@ -122,11 +120,9 @@ const NodesPage = (): JSX.Element => {
> >
{node.user?.longName ?? {node.user?.longName ??
(node.user?.macaddr (node.user?.macaddr
? `Meshtastic ${ ? `Meshtastic ${base16
base16
.stringify(node.user?.macaddr.subarray(4, 6) ?? []) .stringify(node.user?.macaddr.subarray(4, 6) ?? [])
.toLowerCase() .toLowerCase()}`
}`
: `!${numberToHexUnpadded(node.num)}`)} : `!${numberToHexUnpadded(node.num)}`)}
</h1>, </h1>,
@@ -140,9 +136,11 @@ const NodesPage = (): JSX.Element => {
?.join(":") ?? "UNK"} ?.join(":") ?? "UNK"}
</Mono>, </Mono>,
<Fragment key="lastHeard"> <Fragment key="lastHeard">
{node.lastHeard === 0 {node.lastHeard === 0 ? (
? <p>Never</p> <p>Never</p>
: <TimeAgo timestamp={node.lastHeard * 1000} />} ) : (
<TimeAgo timestamp={node.lastHeard * 1000} />
)}
</Fragment>, </Fragment>,
<Mono key="snr"> <Mono key="snr">
{node.snr}db/ {node.snr}db/
@@ -150,9 +148,11 @@ const NodesPage = (): JSX.Element => {
{(node.snr + 10) * 5}raw {(node.snr + 10) * 5}raw
</Mono>, </Mono>,
<Mono key="pki"> <Mono key="pki">
{node.user?.publicKey && node.user?.publicKey.length > 0 {node.user?.publicKey && node.user?.publicKey.length > 0 ? (
? <LockIcon className="text-green-600" /> <LockIcon className="text-green-600" />
: <LockOpenIcon className="text-yellow-300 mx-auto" />} ) : (
<LockOpenIcon className="text-yellow-300 mx-auto" />
)}
</Mono>, </Mono>,
<Mono key="hops"> <Mono key="hops">
{node.lastHeard !== 0 {node.lastHeard !== 0
+4 -2
View File
@@ -10,7 +10,8 @@ import {
} from "class-validator"; } from "class-validator";
export class ChannelValidation export class ChannelValidation
implements Omit<Protobuf.Channel.Channel, keyof Message | "settings"> { implements Omit<Protobuf.Channel.Channel, keyof Message | "settings">
{
@IsNumber() @IsNumber()
index: number; index: number;
@@ -21,7 +22,8 @@ export class ChannelValidation
} }
export class Channel_SettingsValidation export class Channel_SettingsValidation
implements Omit<Protobuf.Channel.ChannelSettings, keyof Message | "psk"> { implements Omit<Protobuf.Channel.ChannelSettings, keyof Message | "psk">
{
@IsNumber() @IsNumber()
channelNum: number; channelNum: number;
+4 -2
View File
@@ -2,11 +2,13 @@ import type { Message } from "@bufbuild/protobuf";
import { Protobuf } from "@meshtastic/core"; import { Protobuf } from "@meshtastic/core";
import { IsBoolean, IsEnum, IsInt } from "class-validator"; import { IsBoolean, IsEnum, IsInt } from "class-validator";
export class BluetoothValidation implements export class BluetoothValidation
implements
Omit< Omit<
Protobuf.Config.Config_BluetoothConfig, Protobuf.Config.Config_BluetoothConfig,
keyof Message | "deviceLoggingEnabled" keyof Message | "deviceLoggingEnabled"
> { >
{
@IsBoolean() @IsBoolean()
enabled: boolean; enabled: boolean;
+4 -2
View File
@@ -4,11 +4,13 @@ import { IsArray, IsBoolean, IsEnum, IsInt } from "class-validator";
const DeprecatedPositionValidationFields = ["gpsEnabled", "gpsAttemptTime"]; const DeprecatedPositionValidationFields = ["gpsEnabled", "gpsAttemptTime"];
export class PositionValidation implements export class PositionValidation
implements
Omit< Omit<
Protobuf.Config.Config_PositionConfig, Protobuf.Config.Config_PositionConfig,
keyof Message | (typeof DeprecatedPositionValidationFields)[number] keyof Message | (typeof DeprecatedPositionValidationFields)[number]
> { >
{
@IsInt() @IsInt()
positionBroadcastSecs: number; positionBroadcastSecs: number;
+4 -2
View File
@@ -2,11 +2,13 @@ import type { Message } from "@bufbuild/protobuf";
import type { Protobuf } from "@meshtastic/core"; import type { Protobuf } from "@meshtastic/core";
import { IsBoolean, IsString } from "class-validator"; import { IsBoolean, IsString } from "class-validator";
export class SecurityValidation implements export class SecurityValidation
implements
Omit< Omit<
Protobuf.Config.Config_SecurityConfig, Protobuf.Config.Config_SecurityConfig,
keyof Message | "adminKey" | "privateKey" | "publicKey" keyof Message | "adminKey" | "privateKey" | "publicKey"
> { >
{
@IsBoolean() @IsBoolean()
adminChannelEnabled: boolean; adminChannelEnabled: boolean;
@@ -2,11 +2,13 @@ import type { Message } from "@bufbuild/protobuf";
import type { Protobuf } from "@meshtastic/core"; import type { Protobuf } from "@meshtastic/core";
import { IsBoolean, IsInt } from "class-validator"; import { IsBoolean, IsInt } from "class-validator";
export class AmbientLightingValidation implements export class AmbientLightingValidation
implements
Omit< Omit<
Protobuf.ModuleConfig.ModuleConfig_AmbientLightingConfig, Protobuf.ModuleConfig.ModuleConfig_AmbientLightingConfig,
keyof Message keyof Message
> { >
{
@IsBoolean() @IsBoolean()
ledState: boolean; ledState: boolean;
+5 -10
View File
@@ -4,10 +4,8 @@ import { IsBoolean, IsEnum, IsInt, Length } from "class-validator";
export class CannedMessageValidation export class CannedMessageValidation
implements implements
Omit< Omit<Protobuf.ModuleConfig.ModuleConfig_CannedMessageConfig, keyof Message>
Protobuf.ModuleConfig.ModuleConfig_CannedMessageConfig, {
keyof Message
> {
@IsBoolean() @IsBoolean()
rotary1Enabled: boolean; rotary1Enabled: boolean;
@@ -21,16 +19,13 @@ export class CannedMessageValidation
inputbrokerPinPress: number; inputbrokerPinPress: number;
@IsEnum(Protobuf.ModuleConfig.ModuleConfig_CannedMessageConfig_InputEventChar) @IsEnum(Protobuf.ModuleConfig.ModuleConfig_CannedMessageConfig_InputEventChar)
inputbrokerEventCw: inputbrokerEventCw: Protobuf.ModuleConfig.ModuleConfig_CannedMessageConfig_InputEventChar;
Protobuf.ModuleConfig.ModuleConfig_CannedMessageConfig_InputEventChar;
@IsEnum(Protobuf.ModuleConfig.ModuleConfig_CannedMessageConfig_InputEventChar) @IsEnum(Protobuf.ModuleConfig.ModuleConfig_CannedMessageConfig_InputEventChar)
inputbrokerEventCcw: inputbrokerEventCcw: Protobuf.ModuleConfig.ModuleConfig_CannedMessageConfig_InputEventChar;
Protobuf.ModuleConfig.ModuleConfig_CannedMessageConfig_InputEventChar;
@IsEnum(Protobuf.ModuleConfig.ModuleConfig_CannedMessageConfig_InputEventChar) @IsEnum(Protobuf.ModuleConfig.ModuleConfig_CannedMessageConfig_InputEventChar)
inputbrokerEventPress: inputbrokerEventPress: Protobuf.ModuleConfig.ModuleConfig_CannedMessageConfig_InputEventChar;
Protobuf.ModuleConfig.ModuleConfig_CannedMessageConfig_InputEventChar;
@IsBoolean() @IsBoolean()
updown1Enabled: boolean; updown1Enabled: boolean;
@@ -2,11 +2,13 @@ import type { Message } from "@bufbuild/protobuf";
import type { Protobuf } from "@meshtastic/core"; import type { Protobuf } from "@meshtastic/core";
import { IsBoolean, IsInt, Length } from "class-validator"; import { IsBoolean, IsInt, Length } from "class-validator";
export class DetectionSensorValidation implements export class DetectionSensorValidation
implements
Omit< Omit<
Protobuf.ModuleConfig.ModuleConfig_DetectionSensorConfig, Protobuf.ModuleConfig.ModuleConfig_DetectionSensorConfig,
keyof Message keyof Message
> { >
{
@IsBoolean() @IsBoolean()
enabled: boolean; enabled: boolean;
@@ -2,11 +2,13 @@ import type { Message } from "@bufbuild/protobuf";
import type { Protobuf } from "@meshtastic/core"; import type { Protobuf } from "@meshtastic/core";
import { IsBoolean, IsInt } from "class-validator"; import { IsBoolean, IsInt } from "class-validator";
export class ExternalNotificationValidation implements export class ExternalNotificationValidation
implements
Omit< Omit<
Protobuf.ModuleConfig.ModuleConfig_ExternalNotificationConfig, Protobuf.ModuleConfig.ModuleConfig_ExternalNotificationConfig,
keyof Message keyof Message
> { >
{
@IsBoolean() @IsBoolean()
enabled: boolean; enabled: boolean;
+2 -1
View File
@@ -4,7 +4,8 @@ import { IsBoolean, IsInt } from "class-validator";
export class NeighborInfoValidation export class NeighborInfoValidation
implements implements
Omit<Protobuf.ModuleConfig.ModuleConfig_NeighborInfoConfig, keyof Message> { Omit<Protobuf.ModuleConfig.ModuleConfig_NeighborInfoConfig, keyof Message>
{
@IsBoolean() @IsBoolean()
enabled: boolean; enabled: boolean;
+2 -1
View File
@@ -4,7 +4,8 @@ import { IsBoolean, IsInt } from "class-validator";
export class PaxcounterValidation export class PaxcounterValidation
implements implements
Omit<Protobuf.ModuleConfig.ModuleConfig_PaxcounterConfig, keyof Message> { Omit<Protobuf.ModuleConfig.ModuleConfig_PaxcounterConfig, keyof Message>
{
@IsBoolean() @IsBoolean()
enabled: boolean; enabled: boolean;
+2 -1
View File
@@ -4,7 +4,8 @@ import { IsBoolean, IsEnum, IsInt } from "class-validator";
export class SerialValidation export class SerialValidation
implements implements
Omit<Protobuf.ModuleConfig.ModuleConfig_SerialConfig, keyof Message> { Omit<Protobuf.ModuleConfig.ModuleConfig_SerialConfig, keyof Message>
{
@IsBoolean() @IsBoolean()
enabled: boolean; enabled: boolean;
+2 -1
View File
@@ -4,7 +4,8 @@ import { IsBoolean, IsInt } from "class-validator";
export class TelemetryValidation export class TelemetryValidation
implements implements
Omit<Protobuf.ModuleConfig.ModuleConfig_TelemetryConfig, keyof Message> { Omit<Protobuf.ModuleConfig.ModuleConfig_TelemetryConfig, keyof Message>
{
@IsInt() @IsInt()
deviceUpdateInterval: number; deviceUpdateInterval: number;