Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
int2001 committed Nov 6, 2024
2 parents da2db2e + bb03856 commit 145032d
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 4 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/electron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@ jobs:
- uses: actions/checkout@v4
- name: install dependencies
run: npm install
- name: build and publish
- name: build and publish x64
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: npx electron-forge publish --platform linux --arch=x64
- name: build and publish armhf
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: npx electron-forge publish --platform linux --arch=armv7l

build_on_mac:
runs-on: macos-14
Expand Down
2 changes: 1 addition & 1 deletion forge.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module.exports = {
{
name: '@electron-forge/maker-deb',
config: { "bin":"wlgate" },
arch: ['x86']
arch: ['x86','armv7l']
},
],
plugins: [
Expand Down
2 changes: 1 addition & 1 deletion main.js
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ WServer.on('message',async function(msg,info){
xml.parseString(msg.toString(), function (err,dat) {
parsedXML=dat;
});
let qsodatum = new Date(Date.parse(parsedXML.contactinfo.timestamp[0]));
let qsodatum = new Date(Date.parse(parsedXML.contactinfo.timestamp[0]+"Z")); // Added Z to make it UTC
qsodat=fmt(qsodatum);
if (parsedXML.contactinfo.mode[0] == 'USB' || parsedXML.contactinfo.mode[0] == 'LSB') { // TCADIF lib is not capable of using USB/LSB
parsedXML.contactinfo.mode[0]='SSB';
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Gateway for connecting WSJT-* and FLRig to Wavelog",
"keywords": [],
"main": "./main.js",
"version": "1.0.16",
"version": "1.0.17",
"author": "DJ7NT",
"scripts": {
"start": "electron-forge start",
Expand Down
1 change: 1 addition & 0 deletions renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ async function informWavelog(CAT) {
let data={ radio: "WLGate", key: cfg.wavelog_key, radio: cfg.wavelog_radioname, frequency: (CAT.vfo), mode: CAT.mode };
let x=await fetch(cfg.wavelog_url + '/api/radio', {
method: 'POST',
rejectUnauthorized: false,
headers: {
Accept: 'application.json',
'Content-Type': 'application/json',
Expand Down

0 comments on commit 145032d

Please sign in to comment.