Merge branch 'main' into ls-mesh

.github/workflows/build_multiplatform.yml

@@ -228,7 +228,7 @@ jobs:
           python-version: "3.11"
 
       - name: Install Node.js, NPM and Yarn
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18.17
 
@@ -388,6 +388,7 @@ jobs:
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/v')
         with:
+          draft: true
           files: ./modem/dist/modem/${{ matrix.zip_name }}.zip
           #files: ./modem/dist/${{ matrix.zip_name }}.zip
 

gui/electron-builder.json5

@@ -32,16 +32,17 @@
     "target": [
       {
         "target": "default",
-        "arch": ["arm64", "x64"]
+        "arch": ["universal"]
       }
     ],
-    "notarize": "false",
+      "notarize": "false",
       "icon": "build/icon.png",
       "hardenedRuntime": true,
       "entitlements": "build/entitlements.plist",
       "entitlementsInherit": "build/entitlements.plist",
       "gatekeeperAssess": false,
-      "artifactName": "${productName}-Mac-${version}-Installer.${ext}"
+      "mergeASARs": true,
+      "artifactName": "${productName}-Mac-${version}.${ext}"
   },
   "win": {
     "icon": "build/icon.png",
@@ -51,7 +52,7 @@
         "arch": ["arm64", "x64"]
       }
     ],
-    "artifactName": "${productName}-Windows-${version}-Setup.${ext}"
+    "artifactName": "${productName}-Windows-${version}.${ext}"
   },
   "nsis": {
     "oneClick": false,

gui/package.json

@@ -2,10 +2,10 @@
   "name": "FreeDATA",
   "description": "FreeDATA",
   "private": true,
-  "version": "0.11.0-alpha.6",
+  "version": "0.11.0-alpha.8",
   "main": "dist-electron/main/index.js",
   "scripts": {
-    "start": "git pull && npm i && vite",
+    "start": "vite",
     "dev": "vite",
     "check": "vue-tsc --noEmit",
     "build": "vue-tsc --noEmit && vite build && electron-builder -p never",

gui/src/js/chatHandler.ts

@@ -644,7 +644,7 @@ function deleteFromDatabaseByCallsign(callsign) {
             .then(function (doc) {
               db.remove(doc)
                 .then(function () {
-                  updateAllChat(false);
+                  //updateAllChat(false);
                   return true;
                 })
                 .catch(function (err) {

gui/src/js/sock.js

@@ -46,7 +46,7 @@ function connectModem() {
 
 client.on("connect", function () {
   console.log("Modem connection established");
-
+  stateStore.modem_running_state = "running";
   stateStore.busy_state = "-";
   stateStore.arq_state = "-";
   stateStore.frequency = "-";
@@ -63,7 +63,9 @@ client.on("error", function (err) {
     console.log("Modem connection error");
     console.log(err);
     modemShowConnectStateError = 0;
+    stateStore.modem_running_state = "stopped";
   }
+
   setTimeout(connectModem, 500);
   client.destroy();
   stateStore.busy_state = "-";
@@ -93,6 +95,7 @@ client.on("end", function (data) {
   stateStore.dbfs_level = 0;
   stateStore.updateTncState(client.readyState);
   client.destroy();
+  stateStore.modem_running_state = "stopped";
 
   setTimeout(connectModem, 500);
 });

modem/sock.py

@@ -1128,12 +1128,12 @@ class ThreadedTCPRequestHandler(socketserver.StreamRequestHandler):
 
     def daemon_stop_modem(self, received_json):
         try:
+            log.warning("[SCK] Stopping Modem")
+            Daemon.modemstarted = False
             Daemon.modemprocess.kill()
             # unregister process from atexit to avoid process zombies
             atexit.unregister(Daemon.modemprocess.kill)
 
-            log.warning("[SCK] Stopping Modem")
-            Daemon.modemstarted = False
             command_response("stop_modem", True)
         except Exception as err:
             command_response("stop_modem", False)

modem/static.py

@@ -134,7 +134,7 @@ class TCIParam:
 
 @dataclass 
 class Modem:
-    version = "0.11.0-alpha.6"
+    version = "0.11.0-alpha.8"
     host: str = "0.0.0.0"
     port: int = 3000
     SOCKET_TIMEOUT: int = 1  # seconds

tools/create_python_env.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [ ! -d "tnc" ]; then
+if [ ! -d "modem" ]; then
     echo "Error: Run this script from the main FreeDATA directory."
     exit 1
 fi