Merge pull request #66 from int2001/multiradio

Support also Radios with "strange" CW-Modes

Author: int2001

main.js

@@ -252,7 +252,7 @@ if (!gotTheLock) {
 			s_mainWindow.hide();
 		}
 	});
-	if (process.platform === 'darwin') {
+	if (app.isPackaged && (process.platform === 'darwin')) {
 		app.dock.hide();
 	}
 	})
@@ -515,11 +515,52 @@ function startserver() {
 	}
 }
 
+
+async function get_modes() {
+	return new Promise((resolve) => {
+		ipcMain.once('get_info_result', (event, modes) => {
+			resolve(modes);
+		});
+		s_mainWindow.webContents.send('get_info', 'rig.get_modes');
+	});
+}
+
+function getClosestMode(requestedMode, availableModes) {
+	if (availableModes.includes(requestedMode)) {	// Check perfect matches
+		return requestedMode;
+	}
+
+	const modeFallbacks = {
+		'CW': ['CW-L', 'CW-R', 'CW', 'LSB', 'USB'],
+		'RTTY': ['RTTY', 'RTTY-R'],
+	};
+
+	if (modeFallbacks[requestedMode]) {
+		for (let variant of modeFallbacks[requestedMode]) {
+			if (availableModes.includes(variant)) {
+				return variant;
+			}
+		}
+	}
+
+	const found = availableModes.find(mode =>
+					  mode.toUpperCase().startsWith(requestedMode.toUpperCase())
+					 );
+					 if (found) return found;
+					 return null;
+}
+
 async function settrx(qrg, mode = '') {
+	let avail_modes={};
+	try {
+		avail_modes=await get_modes();
+	} catch(e) {
+		avail_modes=[];
+	} 
 	let to={};
 	to.qrg=qrg;
 	if (mode == 'cw') {
-		to.mode='CW';
+		to.mode=getClosestMode(mode,avail_modes);
 	} else {
 		if ((to.qrg) < 7999000) {
 			to.mode='LSB';

package.json

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

renderer.js

@@ -116,6 +116,11 @@ $(document).ready(function() {
 		obj.ani=false;
 		resizeme(obj);
 	});
+
+	ipcRenderer.on('get_info', async (event, arg) => {
+		const result = await getInfo(arg); 
+		ipcRenderer.send('get_info_result', result);
+	});
 });
 
 async function load_config() {
@@ -196,10 +201,23 @@ async function getInfo(which) {
 				}
 			);
 			const data = await response.text();
-			var parser = new DOMParser();
-			var xmlDoc = parser.parseFromString(data, "text/xml");
-			var qrgplain = xmlDoc.getElementsByTagName("value")[0].textContent;
-			return qrgplain;
+			const parser = new DOMParser();
+			const xmlDoc = parser.parseFromString(data, "application/xml");
+
+			const valueNode = xmlDoc.querySelector("methodResponse > params > param > value");
+
+			if (!valueNode) {
+				return null;
+			}
+
+			const arrayNode = valueNode.querySelector("array > data");
+			if (arrayNode) {
+				const items = Array.from(arrayNode.querySelectorAll("value string, value"))
+				.map(node => node.textContent.trim());
+				return items;
+			} else {
+				return valueNode.textContent.trim();
+			}
 		} catch (e) {
 			return '';
 		}