Merge pull request #96 from int2001/rm_split

Fix HamLib bug for ModeChange

Author: int2001

main.js

@@ -633,10 +633,25 @@ function broadcastRadioStatus(radioData) {
 
 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');
+		// Check which radio type is enabled
+		const profile = defaultcfg.profiles[defaultcfg.profile ?? 0];
+
+		if (profile.hamlib_ena) {
+			// For Hamlib, send the command directly
+			ipcMain.once('get_info_result', (event, modes) => {
+				resolve(modes ?? ['CW','LSB','USB']);
+			});
+			s_mainWindow.webContents.send('get_info', 'rig.get_modes');
+		} else if (profile.flrig_ena) {
+			// For FLRig, use the existing method
+			ipcMain.once('get_info_result', (event, modes) => {
+				resolve(modes ?? ['CW','LSB','USB']);
+			});
+			s_mainWindow.webContents.send('get_info', 'rig.get_modes');
+		} else {
+			// No radio control enabled, return default modes
+			resolve(['CW','LSB','USB']);
+		}
 	});
 }
 
@@ -719,7 +734,7 @@ async function settrx(qrg, mode = '') {
 		const client = net.createConnection({ host: defaultcfg.profiles[defaultcfg.profile ?? 0].hamlib_host, port: defaultcfg.profiles[defaultcfg.profile ?? 0].hamlib_port }, () => {
 			client.write("F " + to.qrg + "\n");
 			if (defaultcfg.profiles[defaultcfg.profile ?? 0].wavelog_pmode) {
-				client.write("M " + to.mode + "\n-1");
+				client.write("M " + to.mode + " 0\n");
 			}
 			client.end();
 		});

package.json

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

renderer.js

@@ -312,14 +312,20 @@ async function getInfo(which) {
 		}
 	}
 	if (cfg.profiles[active_cfg].hamlib_ena) {
-		var commands = {"rig.get_vfo": "f", "rig.get_mode": "m", "rig.get_ptt": 0, "rig.get_power": 0, "rig.get_split": 0, "rig.get_vfoB": 0, "rig.get_modeB": 0};
+		var commands = {"rig.get_vfo": "f", "rig.get_mode": "m", "rig.get_modes": "M ? 0", "rig.get_ptt": 0, "rig.get_power": 0, "rig.get_split": 0, "rig.get_vfoB": 0, "rig.get_modeB": 0};
 
 		const host = cfg.profiles[active_cfg].hamlib_host;
 		const port = parseInt(cfg.profiles[active_cfg].hamlib_port, 10);
 
 		return new Promise((resolve, reject) => {
 			if (commands[which]) {
-				const client = net.createConnection({ host, port }, () => client.write(commands[which]));
+				const client = net.createConnection({ host, port }, () => {
+					if (which === 'rig.get_modes') {
+						client.write(commands[which] + "\n");
+					} else {
+						client.write(commands[which]);
+					}
+				});
 
 				// Track the connection for cleanup
 				activeConnections.add(client);
@@ -329,7 +335,13 @@ async function getInfo(which) {
 					if(data.startsWith("RPRT")){
 						reject();
 					} else {
-						resolve(data.split('\n')[0]);
+						if (which === 'rig.get_modes') {
+							// Parse modes list - split by whitespace and filter empty strings
+							const modes = data.trim().split(/\s+/).filter(mode => mode.length > 0);
+							resolve(modes);
+						} else {
+							resolve(data.split('\n')[0]);
+						}
 					}
 					client.end();
 				});