update to latest psn lib

This commit is contained in:
2023-09-14 22:49:07 -05:00
parent f7ae192b74
commit 01af232a06
4 changed files with 29 additions and 49 deletions
+7 -26
View File
@@ -9,7 +9,7 @@
"version": "1.0.1",
"license": "CC BY-SA 4.0",
"dependencies": {
"@jwetzell/posistagenet": "^0.2.0",
"@jwetzell/posistagenet": "^0.4.0",
"atem-connection": "^3.3.0",
"bonjour": "^3.5.0",
"electron-updater": "^6.1.1",
@@ -309,12 +309,9 @@
}
},
"node_modules/@jwetzell/posistagenet": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/@jwetzell/posistagenet/-/posistagenet-0.2.0.tgz",
"integrity": "sha512-XeBSC4WHL9OiCmbiS3BYQbhpZh6dd4NpFk6rgqHb3l+B3WxUUNRtshQ3Av7VtwbzGRSWS5Ba6mwDzF1AeWizWQ==",
"dependencies": {
"binary-parser": "^2.2.1"
}
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/@jwetzell/posistagenet/-/posistagenet-0.4.0.tgz",
"integrity": "sha512-Z4FLQrXGLLzRtGiT2bSw6z/TbpgSarwJQ5u6OzxtGQb7VGNpVx6BYNoXVfTqRvz8Kej7JFAyf6sqTR2psRz43A=="
},
"node_modules/@malept/cross-spawn-promise": {
"version": "1.1.1",
@@ -1138,14 +1135,6 @@
}
]
},
"node_modules/binary-parser": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/binary-parser/-/binary-parser-2.2.1.tgz",
"integrity": "sha512-5ATpz/uPDgq5GgEDxTB4ouXCde7q2lqAQlSdBRQVl/AJnxmQmhIfyxJx+0MGu//D5rHQifkfGbWWlaysG0o9NA==",
"engines": {
"node": ">=12"
}
},
"node_modules/bitdepth": {
"version": "7.0.2",
"resolved": "https://registry.npmjs.org/bitdepth/-/bitdepth-7.0.2.tgz",
@@ -5366,12 +5355,9 @@
}
},
"@jwetzell/posistagenet": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/@jwetzell/posistagenet/-/posistagenet-0.2.0.tgz",
"integrity": "sha512-XeBSC4WHL9OiCmbiS3BYQbhpZh6dd4NpFk6rgqHb3l+B3WxUUNRtshQ3Av7VtwbzGRSWS5Ba6mwDzF1AeWizWQ==",
"requires": {
"binary-parser": "^2.2.1"
}
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/@jwetzell/posistagenet/-/posistagenet-0.4.0.tgz",
"integrity": "sha512-Z4FLQrXGLLzRtGiT2bSw6z/TbpgSarwJQ5u6OzxtGQb7VGNpVx6BYNoXVfTqRvz8Kej7JFAyf6sqTR2psRz43A=="
},
"@malept/cross-spawn-promise": {
"version": "1.1.1",
@@ -5968,11 +5954,6 @@
"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
"dev": true
},
"binary-parser": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/binary-parser/-/binary-parser-2.2.1.tgz",
"integrity": "sha512-5ATpz/uPDgq5GgEDxTB4ouXCde7q2lqAQlSdBRQVl/AJnxmQmhIfyxJx+0MGu//D5rHQifkfGbWWlaysG0o9NA=="
},
"bitdepth": {
"version": "7.0.2",
"resolved": "https://registry.npmjs.org/bitdepth/-/bitdepth-7.0.2.tgz",
+1 -1
View File
@@ -30,7 +30,7 @@
"prettier": "^3.0.2"
},
"dependencies": {
"@jwetzell/posistagenet": "^0.2.0",
"@jwetzell/posistagenet": "^0.4.0",
"atem-connection": "^3.3.0",
"bonjour": "^3.5.0",
"electron-updater": "^6.1.1",
+2 -2
View File
@@ -46,8 +46,8 @@ exports.data = function data(_device, buf, info) {
Object.keys(device.decoders).forEach((address) => {
if (!device.data[address]) {
device.data[address] = {
data: device.decoders[address].data,
info: device.decoders[address].info,
trackers: device.decoders[address].trackers,
system_name: device.decoders[address].system_name,
};
}
});
+19 -20
View File
@@ -6,8 +6,8 @@
<% Object.keys(data).forEach((address) => {
const instanceData = data[address]
%>
<h2>Server: <%= instanceData.info.system_name ? instanceData.info.system_name : ''%> (<%= address %>)</h2>
<h3>Tracker Count: <%= Object.keys(instanceData.data.trackers).length %></h3>
<h2>Server: <%= instanceData.system_name ? instanceData.system_name : ''%> (<%= address %>)</h2>
<h3>Tracker Count: <%= Object.keys(instanceData.trackers).length %></h3>
<table>
<tr>
@@ -48,40 +48,39 @@
<th>tracker_timestamp</th>
</tr>
<% Object.entries(instanceData.info.trackers).forEach(([trackerId,trackerInfo]) => {
const trackerData = instanceData.data.trackers[trackerId]
<% Object.entries(instanceData.trackers).forEach(([trackerId,trackerData]) => {
%>
<tr>
<td><%= trackerId %></td>
<td><%= trackerInfo.name %></td>
<td><%= trackerData.tracker_name.tracker_name %></td>
<!-- pos -->
<td><%= trackerData.pos?.x?.toFixed(2) %></td>
<td><%= trackerData.pos?.y?.toFixed(2) %></td>
<td><%= trackerData.pos?.z?.toFixed(2) %></td>
<td><%= trackerData.pos?.pos_x?.toFixed(2) %></td>
<td><%= trackerData.pos?.pos_y?.toFixed(2) %></td>
<td><%= trackerData.pos?.pos_z?.toFixed(2) %></td>
<!-- speed -->
<td><%= trackerData.speed?.x?.toFixed(2) %></td>
<td><%= trackerData.speed?.y?.toFixed(2) %></td>
<td><%= trackerData.speed?.z?.toFixed(2) %></td>
<td><%= trackerData.speed?.speed_x?.toFixed(2) %></td>
<td><%= trackerData.speed?.speed_y?.toFixed(2) %></td>
<td><%= trackerData.speed?.speed_z?.toFixed(2) %></td>
<!-- ori -->
<td><%= trackerData.ori?.x?.toFixed(2) %></td>
<td><%= trackerData.ori?.y?.toFixed(2) %></td>
<td><%= trackerData.ori?.z?.toFixed(2) %></td>
<td><%= trackerData.ori?.ori_x?.toFixed(2) %></td>
<td><%= trackerData.ori?.ori_y?.toFixed(2) %></td>
<td><%= trackerData.ori?.ori_z?.toFixed(2) %></td>
<td><%= trackerData.status?.validity?.toFixed(2) %></td>
<!-- accel -->
<td><%= trackerData.accel?.x?.toFixed(2) %></td>
<td><%= trackerData.accel?.y?.toFixed(2) %></td>
<td><%= trackerData.accel?.z?.toFixed(2) %></td>
<td><%= trackerData.accel?.accel_x?.toFixed(2) %></td>
<td><%= trackerData.accel?.accel_y?.toFixed(2) %></td>
<td><%= trackerData.accel?.accel_z?.toFixed(2) %></td>
<!-- trgtpos -->
<td><%= trackerData.trgtpos?.x?.toFixed(2) %></td>
<td><%= trackerData.trgtpos?.y?.toFixed(2) %></td>
<td><%= trackerData.trgtpos?.z?.toFixed(2) %></td>
<td><%= trackerData.trgtpos?.trgtpos_x?.toFixed(2) %></td>
<td><%= trackerData.trgtpos?.trgtpos_y?.toFixed(2) %></td>
<td><%= trackerData.trgtpos?.trgtpos_z?.toFixed(2) %></td>
<!-- pos -->
<td><%= trackerData.timestamp?.tracker_timestamp %></td>