diff --git a/.github/workflows/build_nsis_bundle.yml b/.github/workflows/build_nsis_bundle.yml index 45e13bb5..70409896 100644 --- a/.github/workflows/build_nsis_bundle.yml +++ b/.github/workflows/build_nsis_bundle.yml @@ -60,7 +60,7 @@ jobs: path: ./FreeDATA-Installer.exe - name: Upload Installer to Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 if: startsWith(github.ref, 'refs/tags/v') with: draft: true diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml index 23d6e20b..9b122edd 100644 --- a/.github/workflows/build_server.yml +++ b/.github/workflows/build_server.yml @@ -48,7 +48,6 @@ jobs: brew install portaudio python -m pip install --upgrade pip pip3 install pyaudio - export PYTHONPATH=/Library/Frameworks/Python.framework/Versions/3.11/lib/:$PYTHONPATH - name: Install Python dependencies run: | @@ -114,7 +113,7 @@ jobs: path: ./modem/server.dist/${{ matrix.zip_name }}.zip - name: Release Modem - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 if: startsWith(github.ref, 'refs/tags/v') with: draft: true diff --git a/gui/package.json b/gui/package.json index 5b3986ad..1ac0e655 100644 --- a/gui/package.json +++ b/gui/package.json @@ -2,7 +2,7 @@ "name": "FreeDATA", "description": "FreeDATA Client application for connecting to FreeDATA server", "private": true, - "version": "0.14.2-alpha", + "version": "0.15.2-alpha", "main": "dist-electron/main/index.js", "scripts": { "start": "vite", @@ -40,12 +40,10 @@ "blob-util": "2.0.2", "bootstrap": "5.3.2", "bootstrap-icons": "1.11.3", - "bootswatch": "5.3.2", "browser-image-compression": "2.0.2", - "chart.js": "4.4.1", + "chart.js": "4.4.2", "chartjs-plugin-annotation": "3.0.1", - "electron-log": "5.1.1", - "electron-updater": "6.1.7", + "electron-log": "5.1.2", "emoji-picker-element": "1.21.0", "emoji-picker-element-data": "1.6.0", "file-saver": "2.0.5", @@ -57,16 +55,16 @@ "qth-locator": "2.1.0", "socket.io": "4.7.4", "uuid": "^9.0.1", - "vue": "3.4.15", + "vue": "3.4.21", "vue-chartjs": "5.3.0", - "vuemoji-picker": "0.2.0" + "vuemoji-picker": "0.2.1" }, "devDependencies": { "@types/nconf": "^0.10.6", "@typescript-eslint/eslint-plugin": "6.21.0", "@vitejs/plugin-vue": "5.0.4", - "electron": "28.2.2", - "electron-builder": "24.9.1", + "electron": "28.2.6", + "electron-builder": "24.13.3", "eslint": "8.56.0", "eslint-config-prettier": "9.1.0", "eslint-config-standard-with-typescript": "43.0.1", @@ -74,13 +72,13 @@ "eslint-plugin-n": "16.6.2", "eslint-plugin-prettier": "5.1.3", "eslint-plugin-promise": "6.1.1", - "eslint-plugin-vue": "9.20.1", + "eslint-plugin-vue": "9.22.0", "typescript": "5.3.3", "vite": "5.1.3", "vite-plugin-electron": "0.28.2", "vite-plugin-electron-renderer": "0.14.5", - "vitest": "1.2.2", - "vue": "3.4.15", + "vitest": "1.4.0", + "vue": "3.4.21", "vue-tsc": "1.8.27" } } diff --git a/gui/public/dj2ls.png b/gui/public/dj2ls.png deleted file mode 100644 index 8f34b0fa..00000000 Binary files a/gui/public/dj2ls.png and /dev/null differ diff --git a/gui/public/ei7ig.jpeg b/gui/public/ei7ig.jpeg deleted file mode 100644 index 30e341b4..00000000 Binary files a/gui/public/ei7ig.jpeg and /dev/null differ diff --git a/gui/public/kt4wo.png b/gui/public/kt4wo.png deleted file mode 100644 index a909507d..00000000 Binary files a/gui/public/kt4wo.png and /dev/null differ diff --git a/gui/public/person-fill.svg b/gui/public/person-fill.svg deleted file mode 100644 index 5e71aca1..00000000 --- a/gui/public/person-fill.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/gui/public/vk5dgr.jpeg b/gui/public/vk5dgr.jpeg deleted file mode 100644 index 94f78941..00000000 Binary files a/gui/public/vk5dgr.jpeg and /dev/null differ diff --git a/gui/src/assets/waterfall/spectrum.js b/gui/src/assets/waterfall/spectrum.js index fb93bd61..11aadd24 100644 --- a/gui/src/assets/waterfall/spectrum.js +++ b/gui/src/assets/waterfall/spectrum.js @@ -105,6 +105,8 @@ Spectrum.prototype.drawSpectrum = function () { var linePositionHigh = 178.4; //150 + bandwidth/20 var linePositionLow2 = 65; //150 - bandwith/20 var linePositionHigh2 = 235; //150 + bandwith/20 + var linePositionLow3 = 28.1; //150 - bandwith/20 + var linePositionHigh3 = 271.9; //150 + bandwith/20 this.ctx_wf.beginPath(); this.ctx_wf.moveTo(linePositionLow, 0); this.ctx_wf.lineTo(linePositionLow, height); @@ -114,6 +116,10 @@ Spectrum.prototype.drawSpectrum = function () { this.ctx_wf.lineTo(linePositionLow2, height); this.ctx_wf.moveTo(linePositionHigh2, 0); this.ctx_wf.lineTo(linePositionHigh2, height); + this.ctx_wf.moveTo(linePositionLow3, 0); + this.ctx_wf.lineTo(linePositionLow3, height); + this.ctx_wf.moveTo(linePositionHigh3, 0); + this.ctx_wf.lineTo(linePositionHigh3, height); this.ctx_wf.lineWidth = 1; this.ctx_wf.strokeStyle = "#C3C3C3"; this.ctx_wf.stroke(); @@ -454,7 +460,7 @@ export function Spectrum(id, options) { this.centerHz = options && options.centerHz ? options.centerHz : 1500; this.spanHz = options && options.spanHz ? options.spanHz : 0; this.wf_size = options && options.wf_size ? options.wf_size : 0; - this.wf_rows = options && options.wf_rows ? options.wf_rows : 1024; + this.wf_rows = options && options.wf_rows ? options.wf_rows : 512; this.spectrumPercent = options && options.spectrumPercent ? options.spectrumPercent : 0; this.spectrumPercentStep = diff --git a/gui/src/components/dynamic_components.vue b/gui/src/components/dynamic_components.vue index abd6a3af..e55a4a5c 100644 --- a/gui/src/components/dynamic_components.vue +++ b/gui/src/components/dynamic_components.vue @@ -32,8 +32,7 @@ import grid_freq from "./grid/grid_frequency.vue"; import grid_beacon from "./grid/grid_beacon.vue"; import grid_mycall_small from "./grid/grid_mycall small.vue"; import grid_scatter from "./grid/grid_scatter.vue"; -import { stateDispatcher } from "../js/eventHandler"; -import { Scatter } from "vue-chartjs"; +import grid_stats_chart from "./grid/grid_stats_chart.vue"; let count = ref(0); let grid = null; // DO NOT use ref(null) as proxies GS will break all logic when comparing structures... see https://github.com/gridstack/gridstack.js/issues/2115 @@ -63,7 +62,8 @@ class gridWidget { this.id = id; } } -//Array of grid widgets, do not change array order as it'll affect saved configs +//Array of grid widgets +//Order can be changed so sorted correctly, but do not change ID as it'll affect saved configs const gridWidgets = [ new gridWidget( grid_activities, @@ -247,8 +247,16 @@ new gridWidget( "Stats", 19, ), - - //New new widget ID should be 20 + new gridWidget( + grid_stats_chart, + { x: 0, y: 114, w: 6, h: 30 }, + "Speed/SNR graph", + false, + true, + "Stats", + 20, + ), + //Next new widget ID should be 21 ]; @@ -832,7 +840,7 @@ function quickfill() {
15m
- +
18.106 MHz
EU / US diff --git a/gui/src/components/grid/grid_active_broadcasts.vue b/gui/src/components/grid/grid_active_broadcasts.vue index e4a466c3..08f1a04e 100644 --- a/gui/src/components/grid/grid_active_broadcasts.vue +++ b/gui/src/components/grid/grid_active_broadcasts.vue @@ -21,6 +21,14 @@ function startStopBeacon() { } } var dxcallPing = ref(""); +window.addEventListener( + "stationSelected", + function (eventdata) { + let evt = eventdata; + dxcallPing.value = evt.detail; + }, + false, + );