mirror
/
meshastic.web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix device lastInterraction timestamp

pull/66/head
Sacha Weatherstone 4 years ago
parent
ba7257ebf2
commit
367912e27e
No known key found for this signature in database GPG Key ID: 7AB2D7E206124B31
1 changed files with 22 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 39
      src/core/stores/deviceStore.ts

39
src/core/stores/deviceStore.ts
View File

@ -227,11 +227,11 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
data: Protobuf.NodeInfo.create({ data: Protobuf.NodeInfo.create({
num: metrics.packet.from, num: metrics.packet.from,
snr: metrics.packet.rxSnr, snr: metrics.packet.rxSnr,
lastHeard: new Date().getSeconds(), lastHeard: Date.now()
}), }),
metadata: undefined, metadata: undefined,
deviceMetrics: [], deviceMetrics: [],
environmentMetrics: [], environmentMetrics: []
}; };
device.nodes.push(node); device.nodes.push(node);
@ -264,7 +264,7 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
timestamp: timestamp:
metrics.packet.rxTime === 0 metrics.packet.rxTime === 0
? new Date() ? new Date()
: new Date(metrics.packet.rxTime * 1000), : new Date(metrics.packet.rxTime * 1000)
}); });
break; break;
case "environmentMetrics": case "environmentMetrics":
@ -273,7 +273,7 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
timestamp: timestamp:
metrics.packet.rxTime === 0 metrics.packet.rxTime === 0
? new Date() ? new Date()
: new Date(metrics.packet.rxTime * 1000), : new Date(metrics.packet.rxTime * 1000)
}); });
break; break;
} }
@ -338,17 +338,22 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
); );
if (node) { if (node) {
node.data = nodeInfo.data; node.data = nodeInfo.data;
// if (action.payload.packet.rxTime) { node.data.lastHeard =
// node.data.lastHeard = new Date( nodeInfo.packet.rxTime !== 0
// action.payload.packet.rxTime * 1000, ? nodeInfo.packet.rxTime * 1000
// ).getTime(); : Date.now();
// }
} else { } else {
device.nodes.push({ device.nodes.push({
data: Protobuf.NodeInfo.create(nodeInfo.data), data: Protobuf.NodeInfo.create({
...nodeInfo.data,
lastHeard:
nodeInfo.packet.rxTime !== 0
? nodeInfo.packet.rxTime * 1000
: Date.now()
}),
metadata: undefined, metadata: undefined,
deviceMetrics: [], deviceMetrics: [],
environmentMetrics: [], environmentMetrics: []
}); });
} }
} }
@ -395,11 +400,11 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
data: Protobuf.NodeInfo.create({ data: Protobuf.NodeInfo.create({
num: user.packet.from, num: user.packet.from,
snr: user.packet.rxSnr, snr: user.packet.rxSnr,
user: user.data, user: user.data
}), }),
metadata: undefined, metadata: undefined,
deviceMetrics: [], deviceMetrics: [],
environmentMetrics: [], environmentMetrics: []
}); });
} }
} }
@ -425,11 +430,11 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
device.nodes.push({ device.nodes.push({
data: Protobuf.NodeInfo.create({ data: Protobuf.NodeInfo.create({
num: position.packet.from, num: position.packet.from,
position: position.data, position: position.data
}), }),
metadata: undefined, metadata: undefined,
deviceMetrics: [], deviceMetrics: [],
environmentMetrics: [], environmentMetrics: []
}); });
} }
} }
@ -518,7 +523,7 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
} }
}) })
); );
}, }
}); });
}) })
); );
@ -540,7 +545,7 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
getDevices: () => Array.from(get().devices.values()), getDevices: () => Array.from(get().devices.values()),
getDevice: (id) => get().devices.get(id), getDevice: (id) => get().devices.get(id)
})); }));
export const DeviceContext = createContext<Device | undefined>(undefined); export const DeviceContext = createContext<Device | undefined>(undefined);

Write Preview
Loading…
Cancel
Save