+
diff --git a/src/core/connection.ts b/src/core/connection.ts
index d8a76fff..33ae39d7 100644
--- a/src/core/connection.ts
+++ b/src/core/connection.ts
@@ -4,6 +4,10 @@ import {
ISerialConnection,
} from '@meshtastic/meshtasticjs';
-export const connection = new IHTTPConnection();
-export const bleConnection = new IBLEConnection();
-export const serialConnection = new ISerialConnection();
+type connectionType = IBLEConnection | IHTTPConnection | ISerialConnection;
+
+export let connection: connectionType = new IHTTPConnection();
+
+export const setConnection = (conn: connectionType): void => {
+ connection = conn;
+};
diff --git a/src/core/slices/meshtasticSlice.ts b/src/core/slices/meshtasticSlice.ts
index d549ecc9..b66c772d 100644
--- a/src/core/slices/meshtasticSlice.ts
+++ b/src/core/slices/meshtasticSlice.ts
@@ -10,6 +10,11 @@ export interface MessageWithAck {
isSender: boolean;
received: Date;
}
+enum connType {
+ HTTP,
+ BLE,
+ SERIAL,
+}
interface MeshtasticState {
deviceStatus: Types.DeviceStatusEnum;
@@ -24,6 +29,7 @@ interface MeshtasticState {
messages: MessageWithAck[];
hostOverrideEnabled: boolean;
hostOverride: string;
+ connectionType: connType;
}
const initialState: MeshtasticState = {
@@ -40,6 +46,7 @@ const initialState: MeshtasticState = {
hostOverrideEnabled:
localStorage.getItem('hostOverrideEnabled') === 'true' ?? false,
hostOverride: localStorage.getItem('hostOverride') ?? '',
+ connectionType: parseInt(localStorage.getItem('connectionType') ?? '0'),
};
export const meshtasticSlice = createSlice({
@@ -58,8 +65,21 @@ export const meshtasticSlice = createSlice({
setMyNodeInfo: (state, action: PayloadAction
) => {
state.myNodeInfo = action.payload;
},
- setUser: (state, action: PayloadAction) => {
- state.user = action.payload;
+ setUser: (
+ state,
+ action: PayloadAction<{
+ nodeNum: number;
+ user: Protobuf.User;
+ }>,
+ ) => {
+ if (action.payload.nodeNum === state.myNodeInfo.myNodeNum) {
+ state.user = action.payload.user;
+ } else {
+ const num = state.nodes.findIndex(
+ (node) => node.num === action.payload.nodeNum,
+ );
+ state.nodes[num].user = action.payload.user;
+ }
},
addPositionPacket: (state, action: PayloadAction) => {
state.positionPackets.push(action.payload);
@@ -75,7 +95,6 @@ export const meshtasticSlice = createSlice({
state.nodes.push(action.payload);
}
},
-
addChannel: (state, action: PayloadAction) => {
if (
state.channels.findIndex(
@@ -121,6 +140,13 @@ export const meshtasticSlice = createSlice({
connection.disconnect();
}
},
+ setConnectionType: (state, action: PayloadAction) => {
+ state.connectionType = action.payload;
+ localStorage.setItem('connectionType', String(action.payload));
+ if (state.connectionType !== action.payload) {
+ connection.disconnect();
+ }
+ },
},
});
diff --git a/src/pages/Plugins/Files.tsx b/src/pages/Plugins/Files.tsx
index d6834248..2a52804d 100644
--- a/src/pages/Plugins/Files.tsx
+++ b/src/pages/Plugins/Files.tsx
@@ -118,14 +118,14 @@ export const Files = ({ navOpen, setNavOpen }: RangeTestProps): JSX.Element => {