From 7332b6d1b35a5012b668657407101da39e58c4a9 Mon Sep 17 00:00:00 2001 From: Mashintime Date: Sat, 29 Jul 2023 09:49:09 -0400 Subject: [PATCH 01/16] Download logging tweaks --- gui/main.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gui/main.js b/gui/main.js index f289e4e6..b23f1986 100644 --- a/gui/main.js +++ b/gui/main.js @@ -1055,13 +1055,14 @@ function downloadJsonUrlToFile(url, callsignPath) { https .get(url, (res) => { - console.log("statusCode:", res.statusCode); - console.log("headers:", res.headers); + //console.log("statusCode:", res.statusCode); + //console.log("headers:", res.headers); res.on("data", (d) => { - console.log(d); + //console.log(d); let json = JSON.parse(d); fs.writeFileSync(callsignPath, JSON.stringify(json, null, 2)); + sysInfo.info("Download " + url +" return statuscode: " + res.statusCode); }); }) .on("error", (e) => { @@ -1069,6 +1070,7 @@ function downloadJsonUrlToFile(url, callsignPath) { }); } function downloadCallsignReverseLookupData() { + sysInfo.info("Downloading callsigns.json"); var callsignPath = path.join(configFolder, "callsigns.json"); downloadJsonUrlToFile( "https://api.freedata.app/callsign_lookup.php", From d6ae766cf407c069362d04054ed334a8e2e55ec3 Mon Sep 17 00:00:00 2001 From: Mashintime Date: Sat, 29 Jul 2023 09:52:04 -0400 Subject: [PATCH 02/16] Move updatechat to dcomcontentloaded event --- gui/preload-chat.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gui/preload-chat.js b/gui/preload-chat.js index ab33f6a4..e2486242 100644 --- a/gui/preload-chat.js +++ b/gui/preload-chat.js @@ -145,10 +145,11 @@ var chatFilter = [ //{ type: "response" }, ]; -updateAllChat(false); + // WINDOW LISTENER window.addEventListener("DOMContentLoaded", () => { + updateAllChat(false); // theme selector changeGuiDesign(config.theme); From 144f03f997313ba59beb94ab50b3a7c5f6902f78 Mon Sep 17 00:00:00 2001 From: Mashintime Date: Sat, 29 Jul 2023 09:53:14 -0400 Subject: [PATCH 03/16] Include bc in chat filter --- gui/preload-chat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/preload-chat.js b/gui/preload-chat.js index e2486242..85989ed4 100644 --- a/gui/preload-chat.js +++ b/gui/preload-chat.js @@ -219,7 +219,7 @@ window.addEventListener("DOMContentLoaded", () => { chatFilter.length = 0; if (document.getElementById("chkMessage").checked == true) { chatFilter = [{ type: "newchat" }]; - chatFilter.push({ type: "received" }, { type: "transmit" }); + chatFilter.push({ type: "received" }, { type: "transmit" }, { type: "broadcast_received" },{ type: "broadcast_transmit" }); } if (document.getElementById("chkPing").checked == true) chatFilter.push({ type: "ping" }); From 129a6bd612ef1377794f157ec82e4e804f016ca8 Mon Sep 17 00:00:00 2001 From: Mashintime Date: Sat, 29 Jul 2023 09:57:42 -0400 Subject: [PATCH 04/16] Fix messages stuck in transmitting and at 100% --- gui/preload-chat.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gui/preload-chat.js b/gui/preload-chat.js index 85989ed4..cd44267f 100644 --- a/gui/preload-chat.js +++ b/gui/preload-chat.js @@ -1072,6 +1072,19 @@ update_chat = function (obj) { obj.status = "failed"; } } + // check if transmitting and @ 100% + if (obj.status == "transmitting" && obj.type == "transmit" && obj.percent == 100) { + console.log( + "Resetting message to transmitted since in transmit state and at 100%:", + ); + console.log(obj); + db.upsert(obj._id, function (doc) { + doc.status = "transmitted"; + return doc; + }); + obj.status = "transmitted"; + } + if (typeof obj.new == "undefined") { obj.new = 0; } From 7d61873bf27f8974c8a607f7a15dbeea79df88ab Mon Sep 17 00:00:00 2001 From: Mashintime Date: Sun, 30 Jul 2023 00:38:49 -0400 Subject: [PATCH 05/16] Update check to only trigger if message is older than 6 hours --- gui/preload-chat.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gui/preload-chat.js b/gui/preload-chat.js index cd44267f..f65c7b10 100644 --- a/gui/preload-chat.js +++ b/gui/preload-chat.js @@ -1072,9 +1072,12 @@ update_chat = function (obj) { obj.status = "failed"; } } - // check if transmitting and @ 100% + // check if in transmitting status and @ 100% if (obj.status == "transmitting" && obj.type == "transmit" && obj.percent == 100) { - console.log( + var TimeDifference = new Date().getTime() / 1000 - obj.timestamp; + if (TimeDifference > 21600) { + //Six hours + console.log( "Resetting message to transmitted since in transmit state and at 100%:", ); console.log(obj); @@ -1084,7 +1087,7 @@ update_chat = function (obj) { }); obj.status = "transmitted"; } - +} if (typeof obj.new == "undefined") { obj.new = 0; } From d293d424dcbee961bc1ccab0d9d558e03007eec2 Mon Sep 17 00:00:00 2001 From: Mashintime Date: Sun, 30 Jul 2023 00:40:02 -0400 Subject: [PATCH 06/16] No uuid on opening messages. --- gui/preload-chat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/preload-chat.js b/gui/preload-chat.js index f65c7b10..a04ea3a8 100644 --- a/gui/preload-chat.js +++ b/gui/preload-chat.js @@ -683,7 +683,7 @@ ipcRenderer.on("action-update-transmission-status", (event, arg) => { var data = arg["data"][0]; document.getElementById("txtConnectedWithChat").textContent = data.dxcallsign; - + if (data.status == "opening") return; if (typeof data.uuid === undefined) return; //console.log(data.status); From 321e241dddd2ac1c1418f451d0a4942a2c702cf4 Mon Sep 17 00:00:00 2001 From: Mashintime Date: Sun, 30 Jul 2023 10:46:02 -0400 Subject: [PATCH 07/16] Less logging --- gui/preload-chat.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gui/preload-chat.js b/gui/preload-chat.js index a04ea3a8..9ab81281 100644 --- a/gui/preload-chat.js +++ b/gui/preload-chat.js @@ -2272,7 +2272,8 @@ async function updateAllChat(clear) { function getSetUserSharedFolder(selected_callsign) { // TODO: This is a dirty hotfix for avoiding, this function is canceld too fast. - console.log("get set user information:" + selected_callsign); + //Should be fixed + //console.log("get set user information:" + selected_callsign); if ( selected_callsign == "" || @@ -2408,7 +2409,7 @@ function getSetUserSharedFolder(selected_callsign) { function getSetUserInformation(selected_callsign) { //Get user information - console.log("get set user information:" + selected_callsign); + //console.log("get set user information:" + selected_callsign); if ( selected_callsign == "" || From 5f3050c3dbf68a7bdc642613a82949055bceac74 Mon Sep 17 00:00:00 2001 From: Mashintime Date: Sun, 30 Jul 2023 12:19:49 -0400 Subject: [PATCH 08/16] Make release versions of codec2 --- .github/workflows/build_multiplatform.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 55aaaa3a..7ebdda13 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -51,7 +51,7 @@ jobs: mkdir build mkdir tempfiles cd build - cmake ../ + cmake -DCMAKE_BUILD_TYPE=Release ../ make mv src/${{ matrix.libcodec2_name }} ../tempfiles/libcodec2_${{ matrix.os }}_${{ matrix.platform.name }}.${{ matrix.libcodec2_filetype }} @@ -84,7 +84,7 @@ jobs: echo 'set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)' >> toolchain-ubuntu-mingw32.cmake echo 'set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)' >> toolchain-ubuntu-mingw32.cmake echo 'set(CMAKE_SHARED_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static")' >> toolchain-ubuntu-mingw32.cmake - cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-ubuntu-mingw32.cmake .. + cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=toolchain-ubuntu-mingw32.cmake .. make mv src/libcodec2.${{ matrix.platform.file }} ../tempfiles/libcodec2_${{ matrix.platform.name }}_${{ matrix.architecture }}.${{ matrix.platform.file }} From 4b016e0303c2e4bd6c0f426255aebffa97db045d Mon Sep 17 00:00:00 2001 From: Mashintime Date: Sun, 30 Jul 2023 12:27:01 -0400 Subject: [PATCH 09/16] Update build for codec1.2 --- .github/workflows/build_multiplatform.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 7ebdda13..e8d5e035 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -14,28 +14,28 @@ jobs: include: - os: ubuntu-20.04 - libcodec2_name: libcodec2.so.1.1 + libcodec2_name: libcodec2.so.1.2 libcodec2_os_name: libcodec2_ubuntu-2004 libcodec2_filetype: so generator: Unix Makefiles shell: bash - os: ubuntu-22.04 - libcodec2_name: libcodec2.so.1.1 + libcodec2_name: libcodec2.so.1.2 libcodec2_os_name: libcodec2_ubuntu-2204 libcodec2_filetype: so generator: Unix Makefiles shell: bash - os: macos-11 - libcodec2_name: libcodec2.1.1.dylib + libcodec2_name: libcodec2.1.2.dylib libcodec2_os_name: libcodec2_macos-11 libcodec2_filetype: dylib generator: Unix Makefiles shell: bash - os: macos-12 - libcodec2_name: libcodec2.1.1.dylib + libcodec2_name: libcodec2.1.2.dylib libcodec2_os_name: libcodec2_macos-12 libcodec2_filetype: dylib generator: Unix Makefiles From 484dc5fa59cc50482b0eba044b8e53eb1fe89da8 Mon Sep 17 00:00:00 2001 From: Mashintime Date: Sun, 30 Jul 2023 12:33:46 -0400 Subject: [PATCH 10/16] Fix another 1.1 reference --- .github/workflows/build_multiplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index e8d5e035..56bd0394 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -174,7 +174,7 @@ jobs: cd build cmake ../ make - mv ./src/libcodec2.so.1.1 /artifacts/${artifact_name} + mv ./src/libcodec2.so.1.2 /artifacts/${artifact_name} - name: Show recursive PWD/artifacts # Items placed in /artifacts in the container will be in From 8b5a0d9c02d2c2be69b64cc9851224925262ac81 Mon Sep 17 00:00:00 2001 From: Mashintime Date: Sun, 30 Jul 2023 12:39:38 -0400 Subject: [PATCH 11/16] Fix branch checkout name --- .github/workflows/build_multiplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 56bd0394..8c6305cd 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -169,7 +169,7 @@ jobs: git clone https://github.com/drowe67/codec2.git cd codec2 - git checkout master + git checkout main mkdir build cd build cmake ../ From 18f4f699f4e30bd2bbbba6be347453c954edbab8 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Fri, 4 Aug 2023 09:25:46 +0200 Subject: [PATCH 12/16] updated python to 3.11 --- .github/workflows/build_multiplatform.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 8c6305cd..41ccdbf6 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -222,10 +222,10 @@ jobs: with: repository: DJ2LS/FreeDATA - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.11" - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v3 From 4b1c19a1f65c613d3ef8ba604876811f13114fa1 Mon Sep 17 00:00:00 2001 From: Mashintime Date: Sun, 6 Aug 2023 13:47:52 -0400 Subject: [PATCH 13/16] Update gui package requirements --- gui/package.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/gui/package.json b/gui/package.json index 1862b114..e7e4cd5f 100644 --- a/gui/package.json +++ b/gui/package.json @@ -8,7 +8,7 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "engines": { - "node": ">=16.0.0", + "node": ">=18.17.0", "npm": ">=9.0.0" }, "repository": { @@ -28,20 +28,20 @@ }, "homepage": "https://freedata.app", "dependencies": { - "@electron/asar": "^3.2.3", + "@electron/asar": "^3.2.4", "@electron/osx-sign": "^1.0.4", - "@popperjs/core": "^2.11.6", + "@popperjs/core": "^2.11.8", "blob-util": "^2.0.2", - "bootstrap": "^5.3.0", + "bootstrap": "^5.3.1", "bootstrap-icons": "^1.10.5", - "bootswatch": "^5.2.3", - "browser-image-compression": "^2.0.0", - "chart.js": "^4.2.1", - "chartjs-plugin-annotation": "^2.1.2", + "bootswatch": "^5.3.1", + "browser-image-compression": "^2.0.2", + "chart.js": "^4.3.3", + "chartjs-plugin-annotation": "^3.0.1", "electron-log": "^4.4.8", - "electron-updater": "^5.3.0", - "emoji-picker-element": "^1.15.1", - "emoji-picker-element-data": "^1.3.0", + "electron-updater": "^6.1.1", + "emoji-picker-element": "^1.18.3", + "emoji-picker-element-data": "^1.4.0", "express-pouchdb": "^4.2.0", "mime": "^3.0.0", "pouchdb": "^8.0.1", @@ -55,9 +55,9 @@ "uuid": "^9.0.0" }, "devDependencies": { - "@electron/notarize": "^1.2.3", - "electron": "^23.0.0", - "electron-builder": "^23.6.0", + "@electron/notarize": "^2.1.0", + "electron": "^25.4.0", + "electron-builder": "^24.6.3", "electron-builder-notarize": "^1.5.1" }, "build": { From 9ef9f1b556a33add52d9040eb8991bce93bade88 Mon Sep 17 00:00:00 2001 From: Mashintime Date: Sun, 6 Aug 2023 13:48:42 -0400 Subject: [PATCH 14/16] Reset speed level to current value if chan is busy. --- tnc/data_handler.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tnc/data_handler.py b/tnc/data_handler.py index fba1a137..868b9dab 100644 --- a/tnc/data_handler.py +++ b/tnc/data_handler.py @@ -991,6 +991,7 @@ class DATA: return True def arq_calculate_speed_level(self, snr): + current_speed_level = self.speed_level self.frame_received_counter += 1 # try increasing speed level only if we had two successful decodes if self.frame_received_counter >= 2: @@ -1011,7 +1012,7 @@ class DATA: # calculate if speed level fits to busy condition if not self.check_if_mode_fits_to_busy_slot(): - self.speed_level = 0 + self.speed_level = current_speed_level ARQ.arq_speed_level = self.speed_level From 25148be7512671652cc452f7a95f6b7348fb85a0 Mon Sep 17 00:00:00 2001 From: Mashintime Date: Sun, 6 Aug 2023 16:47:11 -0400 Subject: [PATCH 15/16] Try forcing a specifc version of node --- .github/workflows/build_multiplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 41ccdbf6..eda246cd 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -230,7 +230,7 @@ jobs: - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 18.17 - name: Create tnc/dist working-directory: tnc From 70c56487f42cadf19ed1fce6b1d58fdef6efcef7 Mon Sep 17 00:00:00 2001 From: Mashintime Date: Mon, 7 Aug 2023 10:53:12 -0400 Subject: [PATCH 16/16] Try fixing mac build --- .github/workflows/build_multiplatform.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index eda246cd..80636b02 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -363,10 +363,11 @@ jobs: find . -type d -o -name ".git" -delete - name: Build/release Electron app - uses: samuelmeuli/action-electron-builder@v1 + uses: coparse-inc/action-electron-builder@v1.0.0 env: APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} + APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} with: package_root: "./gui/" github_token: ${{ secrets.github_token }}