Merge remote-tracking branch 'upstream/dev' into station_lookup

Author: HB9HIL

.github/workflows/electron.yml

@@ -10,23 +10,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-node@master
-      with:
-        node-version: 21
     - name: install dependencies
       run: npm install
-    - name: build and publish
+    - name: build and publish x64
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: npx electron-forge publish --platform linux --arch=x64
+    - name: build and publish armhf
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: npx electron-forge publish --platform linux --arch=armv7l
 
   build_on_mac:
     runs-on: macos-14
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-node@master
-      with:
-        node-version: 21
     - name: setup python
       uses: actions/setup-python@v5
       with:
@@ -47,9 +45,6 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-node@master
-      with:
-        node-version: 21
     - name: install dependencies
       run: npm install
     - name: build and publish

forge.config.js

@@ -32,7 +32,7 @@ module.exports = {
 		{
 			name: '@electron-forge/maker-deb',
 			config: { "bin":"wlgate" },
-			arch: ['x86']
+			arch: ['x86','armv7l']
 		},
 	],
 	plugins: [

index.html

@@ -162,13 +162,21 @@
 					</div>
 					<div class="row">
 						<div class="col">
-							<div class="mb-3">
+							<div class="mb-3 col-mb3">
 								<label for="wavelog_radioname">Radio Name</label>
 								<input type="text" class="form-control form-control-sm" name="wavelog_radioname"
 									id="wavelog_radioname" value="" />
 							</div>
 						</div>
-						<div class="col"></div>
+						<div class="col">
+							<div class="mb-2 col-mb-2"></div>
+						</div>
+						<div class="col">
+							<div class="mb-1 col-mb-1">
+								<label for="wavelog_pmode" class="text-center">Set MODE via FLRig</label>
+								<input type="checkbox" value="1" class="form-control form-control-sm" name="wavelog_pmode" id="wavelog_pmode" title="Try to set Mode automatically" value="" />
+							</div>
+						</div>
 					</div>
 					<div class="row">
 						<div class="col">
@@ -188,8 +196,7 @@
 						<div class="col">
 							<div class="mb-1 col-mb-1">
 								<label for="flrig_ena">FLRig Enabled</label>
-								<input type="checkbox" value="1" class="form-control form-control-sm" name="flrig_ena"
-									id="flrig_ena" value="" />
+								<input type="checkbox" value="1" class="form-control form-control-sm" name="flrig_ena" id="flrig_ena" value="" />
 							</div>
 						</div>
 					</div>

main.js

@@ -20,6 +20,7 @@ var defaultcfg = {
 	wavelog_key: "mykey",
 	wavelog_id: 0,
 	wavelog_radioname: 'WLGate',
+	wavelog_pmode: true,
 	flrig_host: '127.0.0.1',
 	flrig_port: '12345',
 	flrig_ena: false,
@@ -229,7 +230,7 @@ WServer.on('message',async function(msg,info){
 			xml.parseString(msg.toString(), function (err,dat) {
 				parsedXML=dat;
 			});
-			let qsodatum = new Date(Date.parse(parsedXML.contactinfo.timestamp[0]));
+			let qsodatum = new Date(Date.parse(parsedXML.contactinfo.timestamp[0]+"Z")); // Added Z to make it UTC
 			qsodat=fmt(qsodatum);
 			if (parsedXML.contactinfo.mode[0] == 'USB' || parsedXML.contactinfo.mode[0] == 'LSB') {	 // TCADIF lib is not capable of using USB/LSB
 				parsedXML.contactinfo.mode[0]='SSB';
@@ -257,7 +258,12 @@ WServer.on('message',async function(msg,info){
 				} ]};
 		} catch (e) {}
 	} else {
-		adobject=parseADIF(msg.toString());
+		try {
+			adobject=parseADIF(msg.toString());
+		} catch(e) {
+			tomsg('<div class="alert alert-danger" role="alert">Received broken ADIF</div>');
+			return;
+		}
 	}
 	var plainret='';
 	if (adobject.qsos.length>0) {
@@ -338,16 +344,18 @@ async function settrx(qrg) {
 	let url="http://"+defaultcfg.flrig_host+':'+defaultcfg.flrig_port+'/';
 	x=await httpPost(url,options,postData);
 
-	postData= '<?xml version="1.0"?>';
-	postData+='<methodCall><methodName>rig.set_modeA</methodName><params><param><value>' + to.mode + '</value></param></params></methodCall>';
-	var options = {
-		method: 'POST',
-		headers: {
-			'User-Agent': 'SW2WL_v' + app.getVersion(),
-			'Content-Length': postData.length
-		}
-	};
-	x=await httpPost(url,options,postData);
+	if (defaultcfg.wavelog_pmode) {
+		postData= '<?xml version="1.0"?>';
+		postData+='<methodCall><methodName>rig.set_modeA</methodName><params><param><value>' + to.mode + '</value></param></params></methodCall>';
+		var options = {
+			method: 'POST',
+			headers: {
+				'User-Agent': 'SW2WL_v' + app.getVersion(),
+				'Content-Length': postData.length
+			}
+		};
+		x=await httpPost(url,options,postData);
+	}
 
 	return true;
 }

package.json

@@ -4,7 +4,7 @@
   "description": "Gateway for connecting WSJT-* and FLRig to Wavelog",
   "keywords": [],
   "main": "./main.js",
-  "version": "1.0.16",
+  "version": "1.0.19",
   "author": "DJ7NT",
   "scripts": {
     "start": "electron-forge start",

renderer.js

@@ -28,6 +28,7 @@ $(document).ready(function() {
 	$("#flrig_host").val(cfg.flrig_host);
 	$("#flrig_port").val(cfg.flrig_port);
 	$("#flrig_ena").prop("checked", cfg.flrig_ena);
+	$("#wavelog_pmode").prop("checked", cfg.wavelog_pmode);
 
 	bt_save.addEventListener('click', () => {
 		cfg.wavelog_url=$("#wavelog_url").val().trim();
@@ -37,6 +38,7 @@ $(document).ready(function() {
 		cfg.flrig_host=$("#flrig_host").val().trim();
 		cfg.flrig_port=$("#flrig_port").val().trim();
 		cfg.flrig_ena=$("#flrig_ena").is(':checked');
+		cfg.wavelog_pmode=$("#wavelog_pmode").is(':checked');
 		x=ipcRenderer.sendSync("set_config", cfg);
 		console.log(x);
 	});
@@ -197,6 +199,7 @@ async function informWavelog(CAT) {
 	let data={ radio: "WLGate", key: cfg.wavelog_key, radio: cfg.wavelog_radioname, frequency: (CAT.vfo), mode: CAT.mode };
 	let x=await fetch(cfg.wavelog_url + '/api/radio', {
 		method: 'POST',
+		rejectUnauthorized: false,
 		headers: {
 			Accept: 'application.json',
 			'Content-Type': 'application/json',