From e6115ada7594708e0fd29feeca8d5487d8a6f4ac Mon Sep 17 00:00:00 2001 From: Sonny Piers Date: Tue, 13 May 2025 17:01:53 +0000 Subject: [PATCH] Remove gps leftovers --- .../adafruithat/package.json | 1 - .../planktoscopehat/flows.json | 214 ------------------ .../planktoscopehat/package-lock.json | 25 -- .../planktoscopehat/package.json | 3 - 4 files changed, 243 deletions(-) diff --git a/software/node-red-dashboard/adafruithat/package.json b/software/node-red-dashboard/adafruithat/package.json index c0534d274..92ef4dab8 100644 --- a/software/node-red-dashboard/adafruithat/package.json +++ b/software/node-red-dashboard/adafruithat/package.json @@ -1,7 +1,6 @@ { "name": "planktoscope-node-red-dashboard", "description": "PlanktoScope graphical user interface", - "version": "2024.0.0", "dependencies": { "@flowfuse/node-red-dashboard": "^1.22.1", "@flowfuse/node-red-dashboard-2-ui-flowviewer": "^1.0.1", diff --git a/software/node-red-dashboard/planktoscopehat/flows.json b/software/node-red-dashboard/planktoscopehat/flows.json index 56f7062c3..604a62787 100644 --- a/software/node-red-dashboard/planktoscopehat/flows.json +++ b/software/node-red-dashboard/planktoscopehat/flows.json @@ -631,16 +631,6 @@ "collapse": false, "className": "" }, - { - "id": "fc5e4e6f.5b1c8", - "type": "ui_group", - "name": "GPS Status", - "tab": "737ec584.2eea2c", - "order": 6, - "disp": true, - "width": 10, - "collapse": false - }, { "id": "f3ca28ef.4df0a8", "type": "ui_group", @@ -793,16 +783,6 @@ "width": 10, "height": 1 }, - { - "id": "d65a6ccdeb9d35d6", - "type": "ui_spacer", - "z": "b771c342.49603", - "name": "spacer", - "group": "fc5e4e6f.5b1c8", - "order": 3, - "width": 1, - "height": 1 - }, { "id": "0035a03e1490cd8c", "type": "ui_group", @@ -1991,31 +1971,6 @@ "error" ] }, - { - "id": "18f44504.cac66b", - "type": "gpsd", - "z": "b771c342.49603", - "name": "", - "hostname": "localhost", - "port": "2947", - "tpv": true, - "sky": false, - "info": false, - "device": false, - "gst": false, - "att": false, - "x": 250, - "y": 1240, - "wires": [ - [ - "258b4562.9f778a", - "54e37580.fdc31c", - "cc21ca16.b92928", - "4a4de52c.cf2884", - "73c4a14a.9b93c8" - ] - ] - }, { "id": "726a7822.cd6298", "type": "ui_ui_control", @@ -2210,22 +2165,6 @@ [] ] }, - { - "id": "7116e906.9f50f", - "type": "ui_text", - "z": "b771c342.49603", - "group": "fc5e4e6f.5b1c8", - "order": 1, - "width": 10, - "height": 1, - "name": "GPS Status Display", - "label": "GPS Status:", - "format": "{{msg.payload}}", - "layout": "row-center", - "x": 740, - "y": 1080, - "wires": [] - }, { "id": "9c7f7fc9.c8d3a", "type": "ui_text_input", @@ -2750,141 +2689,6 @@ ] ] }, - { - "id": "4fb4e0ad.c417c", - "type": "ui_text", - "z": "b771c342.49603", - "group": "fc5e4e6f.5b1c8", - "order": 6, - "width": 5, - "height": 1, - "name": "Latitude", - "label": "Latitude", - "format": "{{msg.payload.lat.deg}}°{{msg.payload.lat.min}}'{{msg.payload.lat.sec}}{{msg.payload.lat.dir}}", - "layout": "col-center", - "x": 700, - "y": 1120, - "wires": [] - }, - { - "id": "8d2b5026.13e6e8", - "type": "ui_text", - "z": "b771c342.49603", - "group": "fc5e4e6f.5b1c8", - "order": 7, - "width": 5, - "height": 1, - "name": "Longitude", - "label": "Longitude", - "format": "{{msg.payload.lon.deg}}°{{msg.payload.lon.min}}'{{msg.payload.lon.sec}}{{msg.payload.lon.dir}}", - "layout": "col-center", - "x": 700, - "y": 1160, - "wires": [] - }, - { - "id": "258b4562.9f778a", - "type": "function", - "z": "b771c342.49603", - "name": "Convert DD to DMS", - "func": "function ConvertDDToDMS(D, lng){\n // from https://stackoverflow.com/a/5786281/2108279\n return {\n dir : D<0?lng?'W':'S':lng?'E':'N',\n deg : 0|(D<0?D=-D:D),\n min : 0|D%1*60,\n sec :(0|D*60%1*6000)/100\n };\n}\n\nmsg.payload = {\n \"lat\":ConvertDDToDMS(msg.payload.lat, false),\n \"lon\":ConvertDDToDMS(msg.payload.lon, true)\n};\nreturn msg;", - "outputs": 1, - "noerr": 0, - "initialize": "", - "finalize": "", - "x": 490, - "y": 1140, - "wires": [ - [ - "4fb4e0ad.c417c", - "8d2b5026.13e6e8" - ] - ] - }, - { - "id": "7c4ce5f3.62dd5c", - "type": "ui_text", - "z": "b771c342.49603", - "group": "fc5e4e6f.5b1c8", - "order": 4, - "width": 2, - "height": 1, - "name": "Speed", - "label": "Speed", - "format": "{{msg.payload}} kts", - "layout": "col-center", - "x": 690, - "y": 1200, - "wires": [] - }, - { - "id": "54e37580.fdc31c", - "type": "ui_text", - "z": "b771c342.49603", - "group": "fc5e4e6f.5b1c8", - "order": 5, - "width": 2, - "height": 1, - "name": "Direction", - "label": "Direction", - "format": "{{msg.payload.track}} °", - "layout": "col-center", - "x": 700, - "y": 1240, - "wires": [] - }, - { - "id": "cc21ca16.b92928", - "type": "function", - "z": "b771c342.49603", - "name": "GPS Mode", - "func": "switch (msg.payload.mode){\n case 1:msg.payload = \"No Fix\"; break\n case 2:msg.payload = \"2D Fix\"; break\n case 3:msg.payload = \"3D Fix\"; break\n default: msg.payload = \"No info\"\n}\nreturn msg;", - "outputs": 1, - "noerr": 0, - "initialize": "", - "finalize": "", - "x": 470, - "y": 1080, - "wires": [ - [ - "7116e906.9f50f" - ] - ] - }, - { - "id": "4a4de52c.cf2884", - "type": "function", - "z": "b771c342.49603", - "name": "Speed conversion", - "func": "msg.payload = (0|msg.payload.speed) * 1.9438\nreturn msg;", - "outputs": 1, - "noerr": 0, - "initialize": "", - "finalize": "", - "x": 490, - "y": 1200, - "wires": [ - [ - "7c4ce5f3.62dd5c" - ] - ] - }, - { - "id": "35ad311f.344c76", - "type": "ui_text", - "z": "b771c342.49603", - "group": "fc5e4e6f.5b1c8", - "order": 2, - "width": 5, - "height": 1, - "name": "Time", - "label": "Time", - "format": "{{msg.payload.time}}", - "layout": "col-center", - "x": 690, - "y": 1280, - "wires": [] - }, { "id": "e73fd87d.d24e4", "type": "function", @@ -2923,24 +2727,6 @@ ] ] }, - { - "id": "73c4a14a.9b93c8", - "type": "function", - "z": "b771c342.49603", - "name": "Convert time", - "func": "msg.payload.time = msg.payload.time.replace('T', ' ')\nreturn msg;", - "outputs": 1, - "noerr": 0, - "initialize": "", - "finalize": "", - "x": 470, - "y": 1280, - "wires": [ - [ - "35ad311f.344c76" - ] - ] - }, { "id": "58de1340.3cc354", "type": "ui_text_input", diff --git a/software/node-red-dashboard/planktoscopehat/package-lock.json b/software/node-red-dashboard/planktoscopehat/package-lock.json index fb08cab14..08e31ecbb 100644 --- a/software/node-red-dashboard/planktoscopehat/package-lock.json +++ b/software/node-red-dashboard/planktoscopehat/package-lock.json @@ -12,8 +12,6 @@ "@flowfuse/node-red-dashboard-2-ui-flowviewer": "^1.0.1", "node-red-contrib-cron-plus": "^2.1.0", "node-red-contrib-dir2files": "^0.3.0", - "node-red-contrib-gpsd": "^1.0.4", - "node-red-contrib-python3-function": "^0.0.4", "node-red-contrib-ui-multistate-switch": "^1.2.2", "node-red-dashboard": "^3.1.2", "node-red-node-ui-list": "^0.3.6" @@ -1662,14 +1660,6 @@ "node": ">= 0.6" } }, - "node_modules/node-gpsd": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/node-gpsd/-/node-gpsd-0.3.4.tgz", - "integrity": "sha512-sI9hPfHiaWDmhjE1oJZnhMo7UF2vQVGl3qk0K4HbN1L8BkS0I+rd6V687eHOj/6ervXiHrhwXzYYsWdXxGy0Qg==", - "engines": { - "node": ">=v0.8.0" - } - }, "node_modules/node-red-contrib-cron-plus": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/node-red-contrib-cron-plus/-/node-red-contrib-cron-plus-2.1.0.tgz", @@ -1696,21 +1686,6 @@ "path": "^0.12.7" } }, - "node_modules/node-red-contrib-gpsd": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/node-red-contrib-gpsd/-/node-red-contrib-gpsd-1.0.8.tgz", - "integrity": "sha512-KLZ2/bVqyt1LD3TbfyjCzN3piR0KGVLt3RlB9vIygyc2ML1J/AyvqYrGS3fWaWtIVK0k+f+NkK6BV/DXO2q/2Q==", - "license": "GPL-3.0+", - "dependencies": { - "node-gpsd": "^0.3.4" - } - }, - "node_modules/node-red-contrib-python3-function": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/node-red-contrib-python3-function/-/node-red-contrib-python3-function-0.0.4.tgz", - "integrity": "sha512-m7JOWdUQCrX2g7IoCPUlyu1jQt31egYCbGbFenw+nB/28VMtjs9tTYrPxpraPfxU89oQ7XeiiQzq4DWKD3MAKw==", - "license": "MIT" - }, "node_modules/node-red-contrib-ui-multistate-switch": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/node-red-contrib-ui-multistate-switch/-/node-red-contrib-ui-multistate-switch-1.2.3.tgz", diff --git a/software/node-red-dashboard/planktoscopehat/package.json b/software/node-red-dashboard/planktoscopehat/package.json index 32f657df9..10ef2935d 100644 --- a/software/node-red-dashboard/planktoscopehat/package.json +++ b/software/node-red-dashboard/planktoscopehat/package.json @@ -1,14 +1,11 @@ { "name": "planktoscope-node-red-dashboard", "description": "PlanktoScope graphical user interface", - "version": "2024.0.0", "dependencies": { "@flowfuse/node-red-dashboard": "^1.22.1", "@flowfuse/node-red-dashboard-2-ui-flowviewer": "^1.0.1", "node-red-contrib-cron-plus": "^2.1.0", "node-red-contrib-dir2files": "^0.3.0", - "node-red-contrib-gpsd": "^1.0.4", - "node-red-contrib-python3-function": "^0.0.4", "node-red-contrib-ui-multistate-switch": "^1.2.2", "node-red-dashboard": "^3.1.2", "node-red-node-ui-list": "^0.3.6"