From 01af232a066150937b9520875b2fc7c89642c9d5 Mon Sep 17 00:00:00 2001 From: Joel Wetzell Date: Thu, 14 Sep 2023 22:49:07 -0500 Subject: [PATCH] update to latest psn lib --- package-lock.json | 33 ++++++-------------------- package.json | 2 +- plugins/posistagenet/main.js | 4 ++-- plugins/posistagenet/template.ejs | 39 +++++++++++++++---------------- 4 files changed, 29 insertions(+), 49 deletions(-) diff --git a/package-lock.json b/package-lock.json index 31c2065..9b0cbe4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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", diff --git a/package.json b/package.json index 693643e..b82acaa 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/plugins/posistagenet/main.js b/plugins/posistagenet/main.js index dc11cfc..2d82fcc 100644 --- a/plugins/posistagenet/main.js +++ b/plugins/posistagenet/main.js @@ -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, }; } }); diff --git a/plugins/posistagenet/template.ejs b/plugins/posistagenet/template.ejs index cf3cb29..48a9a8c 100644 --- a/plugins/posistagenet/template.ejs +++ b/plugins/posistagenet/template.ejs @@ -6,8 +6,8 @@ <% Object.keys(data).forEach((address) => { const instanceData = data[address] %> -

Server: <%= instanceData.info.system_name ? instanceData.info.system_name : ''%> (<%= address %>)

-

Tracker Count: <%= Object.keys(instanceData.data.trackers).length %>

+

Server: <%= instanceData.system_name ? instanceData.system_name : ''%> (<%= address %>)

+

Tracker Count: <%= Object.keys(instanceData.trackers).length %>

@@ -48,40 +48,39 @@ - <% Object.entries(instanceData.info.trackers).forEach(([trackerId,trackerInfo]) => { - const trackerData = instanceData.data.trackers[trackerId] + <% Object.entries(instanceData.trackers).forEach(([trackerId,trackerData]) => { %> - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + +
tracker_timestamp
<%= trackerId %><%= trackerInfo.name %><%= trackerData.tracker_name.tracker_name %> <%= trackerData.pos?.x?.toFixed(2) %><%= trackerData.pos?.y?.toFixed(2) %><%= trackerData.pos?.z?.toFixed(2) %><%= trackerData.pos?.pos_x?.toFixed(2) %><%= trackerData.pos?.pos_y?.toFixed(2) %><%= trackerData.pos?.pos_z?.toFixed(2) %> <%= trackerData.speed?.x?.toFixed(2) %><%= trackerData.speed?.y?.toFixed(2) %><%= trackerData.speed?.z?.toFixed(2) %><%= trackerData.speed?.speed_x?.toFixed(2) %><%= trackerData.speed?.speed_y?.toFixed(2) %><%= trackerData.speed?.speed_z?.toFixed(2) %> <%= trackerData.ori?.x?.toFixed(2) %><%= trackerData.ori?.y?.toFixed(2) %><%= trackerData.ori?.z?.toFixed(2) %><%= trackerData.ori?.ori_x?.toFixed(2) %><%= trackerData.ori?.ori_y?.toFixed(2) %><%= trackerData.ori?.ori_z?.toFixed(2) %> <%= trackerData.status?.validity?.toFixed(2) %> <%= trackerData.accel?.x?.toFixed(2) %><%= trackerData.accel?.y?.toFixed(2) %><%= trackerData.accel?.z?.toFixed(2) %><%= trackerData.accel?.accel_x?.toFixed(2) %><%= trackerData.accel?.accel_y?.toFixed(2) %><%= trackerData.accel?.accel_z?.toFixed(2) %> <%= trackerData.trgtpos?.x?.toFixed(2) %><%= trackerData.trgtpos?.y?.toFixed(2) %><%= trackerData.trgtpos?.z?.toFixed(2) %><%= trackerData.trgtpos?.trgtpos_x?.toFixed(2) %><%= trackerData.trgtpos?.trgtpos_y?.toFixed(2) %><%= trackerData.trgtpos?.trgtpos_z?.toFixed(2) %> <%= trackerData.timestamp?.tracker_timestamp %>