Skip to content

Commit 145032d

Browse files
committed
Merge branch 'dev'
2 parents da2db2e + bb03856 commit 145032d

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

.github/workflows/electron.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,14 @@ jobs:
1212
- uses: actions/checkout@v4
1313
- name: install dependencies
1414
run: npm install
15-
- name: build and publish
15+
- name: build and publish x64
1616
env:
1717
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1818
run: npx electron-forge publish --platform linux --arch=x64
19+
- name: build and publish armhf
20+
env:
21+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
22+
run: npx electron-forge publish --platform linux --arch=armv7l
1923

2024
build_on_mac:
2125
runs-on: macos-14

forge.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ module.exports = {
3232
{
3333
name: '@electron-forge/maker-deb',
3434
config: { "bin":"wlgate" },
35-
arch: ['x86']
35+
arch: ['x86','armv7l']
3636
},
3737
],
3838
plugins: [

main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ WServer.on('message',async function(msg,info){
229229
xml.parseString(msg.toString(), function (err,dat) {
230230
parsedXML=dat;
231231
});
232-
let qsodatum = new Date(Date.parse(parsedXML.contactinfo.timestamp[0]));
232+
let qsodatum = new Date(Date.parse(parsedXML.contactinfo.timestamp[0]+"Z")); // Added Z to make it UTC
233233
qsodat=fmt(qsodatum);
234234
if (parsedXML.contactinfo.mode[0] == 'USB' || parsedXML.contactinfo.mode[0] == 'LSB') { // TCADIF lib is not capable of using USB/LSB
235235
parsedXML.contactinfo.mode[0]='SSB';

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.0.16",
7+
"version": "1.0.17",
88
"author": "DJ7NT",
99
"scripts": {
1010
"start": "electron-forge start",

renderer.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ async function informWavelog(CAT) {
185185
let data={ radio: "WLGate", key: cfg.wavelog_key, radio: cfg.wavelog_radioname, frequency: (CAT.vfo), mode: CAT.mode };
186186
let x=await fetch(cfg.wavelog_url + '/api/radio', {
187187
method: 'POST',
188+
rejectUnauthorized: false,
188189
headers: {
189190
Accept: 'application.json',
190191
'Content-Type': 'application/json',

0 commit comments

Comments
 (0)