diff --git a/.eslintrc.cjs b/.eslintrc.cjs
deleted file mode 100644
index fb23ee1b..00000000
--- a/.eslintrc.cjs
+++ /dev/null
@@ -1,7 +0,0 @@
-module.exports = {
- extends: "@meshtastic/eslint-config",
- parserOptions: {
- tsconfigRootDir: __dirname,
- project: ["./tsconfig.json"]
- }
-};
diff --git a/eslint.config.js b/eslint.config.js
new file mode 100644
index 00000000..9e0933b7
--- /dev/null
+++ b/eslint.config.js
@@ -0,0 +1,12 @@
+import react from "eslint-plugin-react";
+
+export default [
+ "eslint:all",
+ {
+ files: ["src/**/*.{ts,tsx}"],
+ rules: {
+ semi: "error",
+ "prefer-const": "error"
+ }
+ }
+];
diff --git a/index.html b/index.html
index 34057353..d5323e2c 100644
--- a/index.html
+++ b/index.html
@@ -3,6 +3,8 @@
+
+
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
new file mode 100644
index 00000000..a75fd498
Binary files /dev/null and b/public/apple-touch-icon.png differ
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 00000000..2a1cdfc1
Binary files /dev/null and b/public/favicon.ico differ
diff --git a/src/core/subscriptions.ts b/src/core/subscriptions.ts
index d49f58ac..16fa478e 100644
--- a/src/core/subscriptions.ts
+++ b/src/core/subscriptions.ts
@@ -12,11 +12,11 @@ export const subscribeAll = (
// onLogEvent
// onMeshHeartbeat
- connection.onDeviceMetadataPacket.subscribe((metadataPacket) => {
+ connection.events.onDeviceMetadataPacket.subscribe((metadataPacket) => {
device.addDeviceMetadataMessage(metadataPacket);
});
- connection.onRoutingPacket.subscribe((routingPacket) => {
+ connection.events.onRoutingPacket.subscribe((routingPacket) => {
switch (routingPacket.data.variant.oneofKind) {
case "errorReason":
if (
@@ -46,11 +46,11 @@ export const subscribeAll = (
}
});
- connection.onTelemetryPacket.subscribe((telemetryPacket) => {
+ connection.events.onTelemetryPacket.subscribe((telemetryPacket) => {
device.setMetrics(telemetryPacket);
});
- connection.onDeviceStatus.subscribe((status) => {
+ connection.events.onDeviceStatus.subscribe((status) => {
device.setStatus(status);
if (status === Types.DeviceStatusEnum.DEVICE_CONFIGURED) {
@@ -60,7 +60,7 @@ export const subscribeAll = (
}
});
- connection.onWaypointPacket.subscribe((waypoint) => {
+ connection.events.onWaypointPacket.subscribe((waypoint) => {
const { data, ...rest } = waypoint;
device.addWaypoint(data);
device.addWaypointMessage({
@@ -70,48 +70,48 @@ export const subscribeAll = (
});
});
- connection.onMyNodeInfo.subscribe((nodeInfo) => {
+ connection.events.onMyNodeInfo.subscribe((nodeInfo) => {
device.setHardware(nodeInfo);
myNodeNum = nodeInfo.myNodeNum;
});
- connection.onUserPacket.subscribe((user) => {
+ connection.events.onUserPacket.subscribe((user) => {
device.addUser(user);
});
- connection.onPositionPacket.subscribe((position) => {
+ connection.events.onPositionPacket.subscribe((position) => {
device.addPosition(position);
});
- connection.onNodeInfoPacket.subscribe((nodeInfo) => {
+ connection.events.onNodeInfoPacket.subscribe((nodeInfo) => {
toast(`New Node Discovered: ${nodeInfo.data.user?.shortName ?? "UNK"}`, {
icon: "🔎"
});
device.addNodeInfo(nodeInfo);
});
- connection.onChannelPacket.subscribe((channel) => {
+ connection.events.onChannelPacket.subscribe((channel) => {
device.addChannel({
config: channel.data,
lastInterraction: new Date(),
messages: []
});
});
- connection.onConfigPacket.subscribe((config) => {
+ connection.events.onConfigPacket.subscribe((config) => {
device.setConfig(config.data);
});
- connection.onModuleConfigPacket.subscribe((moduleConfig) => {
+ connection.events.onModuleConfigPacket.subscribe((moduleConfig) => {
device.setModuleConfig(moduleConfig.data);
});
- connection.onMessagePacket.subscribe((messagePacket) => {
+ connection.events.onMessagePacket.subscribe((messagePacket) => {
device.addMessage({
...messagePacket,
ack: messagePacket.packet.from !== myNodeNum
});
});
- connection.onPendingSettingsChange.subscribe((state) => {
+ connection.events.onPendingSettingsChange.subscribe((state) => {
device.setPendingSettingsChanges(state);
});
};
diff --git a/src/index.css b/src/index.css
index 16679ce6..b02acc95 100644
--- a/src/index.css
+++ b/src/index.css
@@ -84,4 +84,4 @@
[data-accent="pink"][data-theme="dark"] {
--accent: #e454c4;
-}
\ No newline at end of file
+}
diff --git a/src/pages/Info.tsx b/src/pages/Info.tsx
index 9cb3fc66..da879a50 100644
--- a/src/pages/Info.tsx
+++ b/src/pages/Info.tsx
@@ -16,7 +16,7 @@ export const InfoPage = (): JSX.Element => {
const [serialLogs, setSerialLogs] = useState("");
- connection?.onDeviceDebugLog.subscribe((packet) => {
+ connection?.events.onDeviceDebugLog.subscribe((packet) => {
setSerialLogs(serialLogs + new TextDecoder().decode(packet));
});
diff --git a/src/pages/Logs.tsx b/src/pages/Logs.tsx
index dd53be11..ae775d55 100644
--- a/src/pages/Logs.tsx
+++ b/src/pages/Logs.tsx
@@ -10,7 +10,7 @@ export const LogsPage = (): JSX.Element => {
const [logs, setLogs] = useState([]);
useEffect(() => {
- connection?.onLogEvent.subscribe((log) => {
+ connection?.events.onLogEvent.subscribe((log) => {
setLogs([...logs, log]);
});
}, [connection, setLogs, logs]);
diff --git a/tailwind.config.cjs b/tailwind.config.cjs
index 3d8af6b6..9739998d 100644
--- a/tailwind.config.cjs
+++ b/tailwind.config.cjs
@@ -24,7 +24,7 @@ module.exports = {
button: "var(--button)",
textPrimary: "var(--textPrimary)",
textSecondary: "var(--textSecondary)",
- link: "var(--link)",
+ link: "var(--link)"
},
brightness: {
hover: "var(--brighnessHover)",