Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions packages/core/src/meshDevice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -931,10 +931,6 @@ export class MeshDevice {
from: meshPacket.from,
to: meshPacket.to,
channel: meshPacket.channel,
hops: Math.min(meshPacket.hopStart - meshPacket.hopLimit, 0),
rxRssi: meshPacket.rxRssi,
rxSnr: meshPacket.rxSnr,
viaMqtt: meshPacket.viaMqtt,
};

this.log.trace(
Expand Down
4 changes: 0 additions & 4 deletions packages/core/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@ export interface PacketMetadata<T> {
from: number;
to: number;
channel: ChannelNumber;
hops: number;
rxRssi: number;
rxSnr: number;
viaMqtt: boolean;
data: T;
}

Expand Down
12 changes: 0 additions & 12 deletions packages/core/src/utils/transform/decodePacket.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,6 @@ export const decodePacket = (device: MeshDevice) =>
type: "direct",
channel: Types.ChannelNumber.Primary,
data: decodedMessage.payloadVariant.value.position,
hops: 0,
rxRssi: 0,
rxSnr: 0,
viaMqtt: false,
});
}

Expand All @@ -103,10 +99,6 @@ export const decodePacket = (device: MeshDevice) =>
type: "direct",
channel: Types.ChannelNumber.Primary,
data: decodedMessage.payloadVariant.value.user,
hops: 0,
rxRssi: 0,
rxSnr: 0,
viaMqtt: false,
});
}
break;
Expand Down Expand Up @@ -246,10 +238,6 @@ export const decodePacket = (device: MeshDevice) =>
type: "direct",
channel: Types.ChannelNumber.Primary,
data: decodedMessage.payloadVariant.value,
hops: 0,
rxRssi: 0,
rxSnr: 0,
viaMqtt: false,
});
break;
}
Expand Down
5 changes: 1 addition & 4 deletions packages/web/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,7 @@ fix: correct caching issue in storage service
## 💡 Tips for Contributors
- Keep PRs **small, focused, and atomic**.
- Discuss larger changes with the team on [Discord](https://discord.gg/meshtastic) before starting work.
- If unsure, open a draft PR for early feedback.
- Maintain cross-platform visual consistency: when implementing new UI components, it's important to maintain a consistent
look and layout across platforms. Before introducing a new visual pattern, please reference the existing interfaces in other
client apps to ensure alignment.
- If unsure, open a draft PR for early feedback.

---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,21 +216,6 @@ export const MessageItem = ({ message }: MessageItemProps) => {
<span className="font-medium text-sm text-slate-900 dark:text-slate-100 truncate mr-1">
{displayName}
</span>
{message.viaMqtt && (
<TooltipProvider delayDuration={300}>
<Tooltip>
<TooltipTrigger asChild>
<span className="text-lg text-slate-800 dark:text-slate-200 -mt-6 h-1">
☁️
</span>
</TooltipTrigger>
<TooltipContent className="bg-slate-800 dark:bg-slate-600 text-white px-4 py-1 rounded text-xs">
MQTT
<TooltipArrow className="fill-slate-800 dark:fill-slate-600" />
</TooltipContent>
</Tooltip>
</TooltipProvider>
)}
{messageDate && (
<time
dateTime={messageDate.toISOString()}
Expand Down Expand Up @@ -260,16 +245,6 @@ export const MessageItem = ({ message }: MessageItemProps) => {
{message.message}
</div>
)}
{(message.hops && (
<div className="text-xs text-slate-500 dark:text-slate-200 whitespace-pre-wrap break-words">
{t("hops.text", { value: message.hops })}
</div>
)) ||
(message.rxSnr && message.rxRssi && (
<div className="text-xs text-slate-500 dark:text-slate-200 whitespace-pre-wrap break-words">
SNR: {message.rxSnr}, RSSI: {message.rxRssi}
</div>
))}
</div>
</div>
{/* Actions Menu Placeholder */}
Expand Down
12 changes: 0 additions & 12 deletions packages/web/src/core/dto/PacketToMessageDTO.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ class PacketToMessageDTO {
state: MessageState;
message: string;
type: MessageType;
hops: number;
rxRssi: number;
rxSnr: number;
viaMqtt: boolean;

constructor(data: Types.PacketMetadata<string>, nodeNum: number) {
this.channel = data.channel;
Expand All @@ -40,10 +36,6 @@ class PacketToMessageDTO {
);
}
this.date = dateTimestamp;
this.hops = data.hops;
this.rxRssi = data.rxRssi;
this.rxSnr = data.rxSnr;
this.viaMqtt = data.viaMqtt;
}

toMessage(): Message {
Expand All @@ -56,10 +48,6 @@ class PacketToMessageDTO {
state: this.state,
message: this.message,
type: this.type,
hops: this.hops,
rxRssi: this.rxRssi,
rxSnr: this.rxSnr,
viaMqtt: this.viaMqtt,
};
}
}
Expand Down
24 changes: 0 additions & 24 deletions packages/web/src/core/stores/messageStore/messageStore.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ const directMessageToOther1: Message = {
messageId: 101,
state: MessageState.Waiting,
message: "Hello other 1 from me",
rxSnr: 1,
rxRssi: 2,
viaMqtt: false,
hops: 3,
};

const directMessageFromOther1: Message = {
Expand All @@ -68,10 +64,6 @@ const directMessageFromOther1: Message = {
messageId: 102,
state: MessageState.Waiting,
message: "Hello me from other 1",
rxSnr: 1,
rxRssi: 2,
viaMqtt: false,
hops: 3,
};

const directMessageToOther2: Message = {
Expand All @@ -83,10 +75,6 @@ const directMessageToOther2: Message = {
messageId: 103,
state: MessageState.Waiting,
message: "Hello other 2 from me",
rxSnr: 1,
rxRssi: 2,
viaMqtt: false,
hops: 3,
};

const broadcastMessage1: Message = {
Expand All @@ -98,10 +86,6 @@ const broadcastMessage1: Message = {
messageId: 201,
state: MessageState.Waiting,
message: "Broadcast message 1",
rxSnr: 1,
rxRssi: 2,
viaMqtt: false,
hops: 3,
};

const broadcastMessage2: Message = {
Expand All @@ -113,10 +97,6 @@ const broadcastMessage2: Message = {
messageId: 202,
state: MessageState.Waiting,
message: "Broadcast message 2",
rxSnr: 1,
rxRssi: 2,
viaMqtt: false,
hops: 3,
};

describe("MessageStore persistence & rehydrate", () => {
Expand Down Expand Up @@ -784,10 +764,6 @@ describe("MessageStore persistence & rehydrate", () => {
messageId: i,
state: MessageState.Waiting,
message: `m${i}`,
rxSnr: 1,
rxRssi: 2,
viaMqtt: false,
hops: 3,
});
}

Expand Down
4 changes: 0 additions & 4 deletions packages/web/src/core/stores/messageStore/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ interface MessageBase {
messageId: number;
state: MessageState;
message: string;
rxSnr: number;
rxRssi: number;
viaMqtt: boolean;
hops: number;
}

interface GenericMessage<T extends MessageType> extends MessageBase {
Expand Down
Loading