Skip to content

Commit 85bc466

Browse files
int2001int2001
authored
Merge pull request #40 from wavelog/two_profiles
First draft for 2nd profile
2 parents 2edc80f + a25b9e8 commit 85bc466

File tree

5 files changed

+129
-85
lines changed

5 files changed

+129
-85
lines changed

‎advanced.js‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ const bt_save=document.querySelector("#save");
77
$(document).ready(function() {
88
cfg=ipcRenderer.sendSync("get_config", '');
99

10-
$("#hamlib_host").val(cfg.hamlib_host);
11-
$("#hamlib_port").val(cfg.hamlib_port);
12-
$("#hamlib_ena").prop("checked", cfg.hamlib_ena);
13-
$("#ignore_pwr").prop("checked", cfg.ignore_pwr);
14-
15-
bt_save.addEventListener('click', () => {
16-
cfg=ipcRenderer.sendSync("get_config", '');
17-
cfg.hamlib_host=$("#hamlib_host").val().trim();
18-
cfg.hamlib_port=$("#hamlib_port").val().trim();
19-
cfg.hamlib_ena=$("#hamlib_ena").is(':checked');
20-
cfg.ignore_pwr=$("#ignore_pwr").is(':checked');
21-
22-
if ($("#hamlib_ena").is(':checked') && cfg.flrig_ena){cfg.flrig_ena = false;}
10+
$("#hamlib_host").val(cfg.profiles[cfg.profile].hamlib_host ?? '');
11+
$("#hamlib_port").val(cfg.profiles[cfg.profile].hamlib_port ?? '');
12+
$("#hamlib_ena").prop("checked", cfg.profiles[cfg.profile].hamlib_ena ?? '');
13+
$("#ignore_pwr").prop("checked", cfg.profiles[cfg.profile].ignore_pwr ?? '');
14+
15+
bt_save.addEventListener('click', async () => {
16+
cfg=await ipcRenderer.sendSync("get_config", '');
17+
cfg.profiles[cfg.profile].hamlib_host=$("#hamlib_host").val().trim();
18+
cfg.profiles[cfg.profile].hamlib_port=$("#hamlib_port").val().trim();
19+
cfg.profiles[cfg.profile].hamlib_ena=$("#hamlib_ena").is(':checked');
20+
cfg.profiles[cfg.profile].ignore_pwr=$("#ignore_pwr").is(':checked');
21+
22+
if ($("#hamlib_ena").is(':checked') && cfg.profiles[cfg.profile].flrig_ena){cfg.profiles[cfg.profile].flrig_ena = false;}
2323

2424
x=ipcRenderer.sendSync("set_config", cfg);
2525
// console.log(x);

‎index.html‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -225,18 +225,23 @@
225225
</div>
226226
<div class="row" id="buttonsRow">
227227
<div class="col">
228-
<div class="mb-3 col-mb-3" style="text-align: left">
229-
<button type="button" class="btn btn-primary" id="save"></i>Save</button>
228+
<div class="mb-4 col-mb-4" style="text-align: left">
229+
<button type="button" class="btn btn-primary" id="save">Save</button>
230230
</div>
231231
</div>
232232
<div class="col">
233-
<div class="mb-3 col-mb-3" style="text-align: center">
234-
<button type="button" class="btn btn-primary" id="test"></i>Test</button>
233+
<div class="mb-4 col-mb-4" style="text-align: left">
234+
<button type="button" class="btn btn-primary" id="toggle" title="change config-profile">1</button>
235235
</div>
236236
</div>
237237
<div class="col">
238-
<div class="mb-3 col-mb-3" style="text-align: right">
239-
<button type="button" class="btn btn-primary" id="quit"></i>Quit</button>
238+
<div class="mb-4 col-mb-4" style="text-align: center">
239+
<button type="button" class="btn btn-primary" id="test">Test</button>
240+
</div>
241+
</div>
242+
<div class="col">
243+
<div class="mb-4 col-mb-4" style="text-align: right">
244+
<button type="button" class="btn btn-primary" id="quit">Quit</button>
240245
</div>
241246
</div>
242247
</div>

‎main.js‎

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ function createAdvancedWindow (mainWindow) {
9292
}
9393

9494
ipcMain.on("set_config", async (event,arg) => {
95-
defaultcfg=arg;
95+
defaultcfg=arg;
9696
storage.set('basic', defaultcfg, function(e) {
9797
if (e) throw e;
9898
});
@@ -107,13 +107,24 @@ ipcMain.on("resize", async (event,arg) => {
107107
});
108108

109109
ipcMain.on("get_config", async (event, arg) => {
110-
const storedcfg = storage.getSync('basic');
111-
for (const key in storedcfg) {
112-
if (storedcfg[key] !== "" && storedcfg[key] !== undefined) {
113-
defaultcfg[key] = storedcfg[key];
114-
}
115-
}
116-
event.returnValue = defaultcfg;
110+
var storedcfg = storage.getSync('basic');
111+
var realcfg={};
112+
if (!(storedcfg.wavelog_url) && !(storedcfg.profiles)) { storedcfg=defaultcfg; } // Old config not present, add default-cfg
113+
if (!(storedcfg.profiles)) { // Old Config without array? Convert it
114+
(realcfg.profiles = realcfg.profiles || []).push(storedcfg);
115+
realcfg.profiles.push(defaultcfg);
116+
realcfg.profile=(storedcfg.profile ?? 0);
117+
} else {
118+
realcfg=storedcfg;
119+
}
120+
if ((arg ?? '') !== '') {
121+
realcfg.profile=arg;
122+
}
123+
defaultcfg=realcfg;
124+
storage.set('basic', realcfg, function(e) { // Store one time
125+
if (e) throw e;
126+
});
127+
event.returnValue = realcfg;
117128
});
118129

119130
ipcMain.on("setCAT", async (event,arg) => {
@@ -174,7 +185,6 @@ function parseADIF(adifdata) {
174185
function writeADIF(adifObject) {
175186
const { ADIF } = require("tcadif");
176187
var adiWriter = new ADIF(adifObject);
177-
// console.log(adiWriter);
178188
return adiWriter;
179189
}
180190

@@ -184,7 +194,6 @@ function send2wavelog(o_cfg,adif, dryrun = false) {
184194
clpayload.station_profile_id=o_cfg.wavelog_id.trim();
185195
clpayload.type='adif';
186196
clpayload.string=adif;
187-
// console.log(clpayload);
188197
postData=JSON.stringify(clpayload);
189198
let httpmod='http';
190199
if (o_cfg.wavelog_url.toLowerCase().startsWith('https')) {
@@ -307,7 +316,7 @@ ports.forEach(port => {
307316
let x={};
308317
try {
309318
outadif=writeADIF(adobject);
310-
plainret=await send2wavelog(defaultcfg,outadif.stringify());
319+
plainret=await send2wavelog(defaultcfg.profiles[defaultcfg.profile ?? 0],outadif.stringify());
311320
x.state=plainret.statusCode;
312321
x.payload = JSON.parse(plainret.resString);
313322
} catch(e) {
@@ -370,7 +379,7 @@ async function settrx(qrg) {
370379
} else {
371380
to.mode='USB';
372381
}
373-
if (defaultcfg.flrig_ena) {
382+
if (defaultcfg.profiles[defaultcfg.profile ?? 0].flrig_ena) {
374383
postData= '<?xml version="1.0"?>';
375384
postData+='<methodCall><methodName>main.set_frequency</methodName><params><param><value><double>' + to.qrg + '</double></value></param></params></methodCall>';
376385
var options = {
@@ -380,10 +389,10 @@ async function settrx(qrg) {
380389
'Content-Length': postData.length
381390
}
382391
};
383-
let url="http://"+defaultcfg.flrig_host+':'+defaultcfg.flrig_port+'/';
392+
let url="http://"+defaultcfg.profiles[defaultcfg.profile ?? 0].flrig_host+':'+defaultcfg.profiles[defaultcfg.profile ?? 0].flrig_port+'/';
384393
x=await httpPost(url,options,postData);
385394

386-
if (defaultcfg.wavelog_pmode) {
395+
if (defaultcfg.profiles[defaultcfg.profile ?? 0].wavelog_pmode) {
387396
postData= '<?xml version="1.0"?>';
388397
postData+='<methodCall><methodName>rig.set_modeA</methodName><params><param><value>' + to.mode + '</value></param></params></methodCall>';
389398
var options = {
@@ -396,10 +405,10 @@ async function settrx(qrg) {
396405
x=await httpPost(url,options,postData);
397406
}
398407
}
399-
if (defaultcfg.hamlib_ena) {
400-
const client = net.createConnection({ host: defaultcfg.flrig_host, port: defaultcfg.flrig_port }, () => {
408+
if (defaultcfg.profiles[defaultcfg.profile ?? 0].hamlib_ena) {
409+
const client = net.createConnection({ host: defaultcfg.profiles[defaultcfg.profile ?? 0].flrig_host, port: defaultcfg.profiles[defaultcfg.profile ?? 0].flrig_port }, () => {
401410
client.write("F " + to.qrg + "\n");
402-
if (defaultcfg.wavelog_pmode) {
411+
if (defaultcfg.profiles[defaultcfg.profile ?? 0].wavelog_pmode) {
403412
client.write("M " + to.mode + "\n-1");
404413
}
405414
client.end();

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "Gateway for connecting WSJT-* and FLRig to Wavelog",
55
"keywords": [],
66
"main": "./main.js",
7-
"version": "1.1.1",
7+
"version": "1.1.2",
88
"author": "DJ7NT",
99
"scripts": {
1010
"start": "electron-forge start",

0 commit comments

Comments
 (0)