Skip to content

Commit 785ec91

Browse files
author
Joerg Dorgeist
committed
Multiradio
1 parent 327c90f commit 785ec91

File tree

2 files changed

+31
-4
lines changed

2 files changed

+31
-4
lines changed

main.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,16 @@ function startserver() {
515515
}
516516
}
517517

518+
async function get_modes() {
519+
s_mainWindow.webContents.send('get_info','rig.get_modes');
520+
}
518521
async function settrx(qrg, mode = '') {
522+
let avail_modes={};
523+
try {
524+
avail_modes=await get_modes();
525+
} catch(e) {
526+
avail_modes={};
527+
}
519528
let to={};
520529
to.qrg=qrg;
521530
if (mode == 'cw') {

renderer.js

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,11 @@ $(document).ready(function() {
116116
obj.ani=false;
117117
resizeme(obj);
118118
});
119+
120+
ipcRenderer.on('get_info', (event, arg) => {
121+
const result = getInfo(arg);
122+
ipcRenderer.send('get_info_result', result);
123+
}
119124
});
120125

121126
async function load_config() {
@@ -196,10 +201,23 @@ async function getInfo(which) {
196201
}
197202
);
198203
const data = await response.text();
199-
var parser = new DOMParser();
200-
var xmlDoc = parser.parseFromString(data, "text/xml");
201-
var qrgplain = xmlDoc.getElementsByTagName("value")[0].textContent;
202-
return qrgplain;
204+
const parser = new DOMParser();
205+
const xmlDoc = parser.parseFromString(data, "application/xml");
206+
207+
const valueNode = xmlDoc.querySelector("methodResponse > params > param > value");
208+
209+
if (!valueNode) {
210+
return null;
211+
}
212+
213+
const arrayNode = valueNode.querySelector("array > data");
214+
if (arrayNode) {
215+
const items = Array.from(arrayNode.querySelectorAll("value string, value"))
216+
.map(node => node.textContent.trim());
217+
return items;
218+
} else {
219+
return valueNode.textContent.trim();
220+
}
203221
} catch (e) {
204222
return '';
205223
}

0 commit comments

Comments
 (0)