Merge branch 'master' into 'call-roster-refactor'

# Conflicts:
#   debian/changelog
#   package.nw/package.json
merge-requests/144/head
Matthew Chambers 2021-10-21 02:05:41 +00:00
commit 6b1fe76ad9
11 zmienionych plików z 242 dodań i 71 usunięć

Wyświetl plik

@ -183,6 +183,10 @@ intel-packaging:
arm-packaging:
stage: package
variables:
NWJS_VERSION: "v0.54.2"
NWJS32_BUILD: "nw54_2021-07-09"
NWJS64_BUILD: "nw54-arm64_2021-07-10"
rules:
# only do this with a manual tag starting with v or test_
- if: '$CI_COMMIT_TAG =~ /^(v|test_).*/'
@ -212,23 +216,39 @@ arm-packaging:
apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" build-dep .
echo -e "\e[0Ksection_end:`date +%s`:apt_get\r\e[0K"
- test `node version.js` = `dpkg-parsechangelog -S version` || (echo "package.nw/package.json and debian/changelog version mismatch"; exit 1)
# This is for ARM arch build
# This is for ARM 32 arch build
- |
echo -e "\e[0Ksection_start:`date +%s`:arm_build\r\e[0KBuilding ARM packages"
wget https://github.com/LeonardLaszlo/nw.js-armv7-binaries/releases/download/nw49_2020-10-26/nw49_2020-10-26.tar.gz
tar -xf nw49_2020-10-26.tar.gz
tar -xf usr/docker/dist/nwjs-chromium-ffmpeg-branding/nwjs-v0.49.2-linux-arm.tar.gz
rm nwjs-v0.49.2-linux-arm/locales/*.info
mv nwjs-v0.49.2-linux-arm/nw nwjs-v0.49.2-linux-arm/GridTracker
wget https://github.com/LeonardLaszlo/nw.js-armv7-binaries/releases/download/$NWJS32_BUILD/$NWJS32_BUILD.tar.gz
tar -xf $NWJS32_BUILD.tar.gz
tar -xf usr/docker/dist/nwjs-chromium-ffmpeg-branding/nwjs-$NWJS_VERSION-linux-arm.tar.gz
rm nwjs-$NWJS_VERSION-linux-arm/locales/*.info
mv nwjs-$NWJS_VERSION-linux-arm/nw nwjs-$NWJS_VERSION-linux-arm/GridTracker
ls
version=`node ./version.js`
mkdir GridTracker-$version-linux-arm
cp -r nwjs-v0.49.2-linux-arm/* GridTracker-$version-linux-arm/
cp -r arm/* GridTracker-$version-linux-arm/
cp -r package.nw GridTracker-$version-linux-arm/
cp LICENSE GridTracker-$version-linux-arm/
tar -czf GridTracker-$version-linux-arm.tar.gz GridTracker-$version-linux-arm
mv GridTracker-$version-linux-arm.tar.gz artifacts/
mkdir GridTracker-$version-linux-arm32
cp -r nwjs-$NWJS_VERSION-linux-arm/* GridTracker-$version-linux-arm32/
cp -r arm/* GridTracker-$version-linux-arm32/
cp -r package.nw GridTracker-$version-linux-arm32/
cp LICENSE GridTracker-$version-linux-arm32/
tar -czf GridTracker-$version-linux-arm32.tar.gz GridTracker-$version-linux-arm32
mv GridTracker-$version-linux-arm32.tar.gz artifacts/
# This is for ARM 64 arch build
- |
wget https://github.com/LeonardLaszlo/nw.js-armv7-binaries/releases/download/$NWJS64_BUILD/$NWJS64_BUILD.tar.gz
tar -xf $NWJS64_BUILD.tar.gz
tar -xf usr/docker/dist/nwjs-chromium-ffmpeg-branding/nwjs-$NWJS_VERSION-linux-arm64.tar.gz
rm nwjs-$NWJS_VERSION-linux-arm64/locales/*.info
mv nwjs-$NWJS_VERSION-linux-arm64/nw nwjs-$NWJS_VERSION-linux-arm64/GridTracker
ls
version=`node ./version.js`
mkdir GridTracker-$version-linux-arm64
cp -r nwjs-$NWJS_VERSION-linux-arm64/* GridTracker-$version-linux-arm64/
cp -r arm/* GridTracker-$version-linux-arm64/
cp -r package.nw GridTracker-$version-linux-arm64/
cp LICENSE GridTracker-$version-linux-arm64/
tar -czf GridTracker-$version-linux-arm64.tar.gz GridTracker-$version-linux-arm64
mv GridTracker-$version-linux-arm64.tar.gz artifacts/
# This section handles making RPMs for Fedora/CentOS/RHEL
#- |
# echo -e "\e[0Ksection_start:`date +%s`:rpm_build\r\e[0KBuilding RPM packages"
@ -253,6 +273,8 @@ arm-packaging:
nr0q_upload_testing:
stage: deploy
image: alpine
variables:
GIT_STRATEGY: none
rules:
- if: '$CI_COMMIT_TAG =~ /^(test_).*/ && $NR0Q_SERVER_KEY != ""'
before_script:
@ -310,6 +332,8 @@ nr0q_upload_release:
source_release:
stage: deploy
image: registry.gitlab.com/gitlab-org/release-cli:latest
variables:
GIT_STRATEGY: none
rules:
- if: '$CI_COMMIT_TAG =~ /^(v).*/'
release:

22
NWJS-LICENSE 100644
Wyświetl plik

@ -0,0 +1,22 @@
NW.JS, the framekwork on which GridTracker is built is licensed uner the MIT licensed
Copyright (c) 2011-2019 NW.js Authors
Copyright (c) 2011-2019 The Chromium Authors
Copyright (c) 2011-2018 Intel Corp
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR
A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Wyświetl plik

@ -1,5 +1,15 @@
# About GridTracker
GridTracker is designed for Amateur radio use. It's original tag-line was:   "GridTracker listens to traffic from WSJT-X and displays it on a map. It will also load ADIF log files".
This was back in February of 2018.  At its core GridTracker has remained true to that description but it has evolved to be a very powerful amateur radio tool and not just for FT8.
GridTracker is a warehouse of amateur radio information presented in an easy to use interface, from live traffic decodes, logbooks, spot reports, weather, current solar conditions and more.
[Read more](https://gitlab.com/gridtracker.org/gridtracker/-/wikis/Introduction/What-is-GridTracker)
See the [Wiki](https://gitlab.com/gridtracker.org/gridtracker/-/wikis/home) for the user documentation.
# Getting GridTracker
GridTracker can be downloaded for nearly all common platforms (Windows, MacOS, Linux, Raspberry Pi) from the [downloads](https://gridtracker.org/downloads/) page on our website GridTracker.org.
# Developing GridTracker
GridTracker runs using [NWJS](https://nwjs.io/), a tools that wraps both Chrome windows and node processes into

33
debian/changelog vendored
Wyświetl plik

@ -1,8 +1,13 @@
gridtracker (1.21.1021) untable; urgency=low
- Test beta of call roster refactoring
gridtracker (1.21.0928) unstable; urgency=medium
[Bug Fixes]
- Treat ADIF record values as byte length vs string length (to better handle UTF-8 data).
- Remove looking at fetched records for last date for LoTW fetches, Use only headers (More reliable LoTW fetches).
[Enhancements]
- ARM builds now with NWJS 0.54.2 and 64 bit ARM binaries.
-- Matthew Chambers <nr0q@gridtracker.org> Thu, 21 Jan 2021 00:39:00 -0000
-- Matthew Chambers <nr0q@gridtracker.org> Sun, 28 Sept 2021 00:00:00 -0000
-- Matthew Chambers <nr0q@gridtracker.org> Sund, 26 Sept 2021 19:03:30 -0000
gridtracker (1.21.0620) unstable; urgency=medium
[Bug Fixes]
- Fix pulling down of LoTW logs at start-up with a differential log syncing mechanism that only get's changes since last sync, also cool down timer to prevent rapid reloading of LoTW log.
@ -17,7 +22,7 @@ gridtracker (1.21.0613) unstable; urgency=medium
[Enhancements]
- Updated list of contributors
-- Matthew Chambers <nr0q@gridtracker.org> Sun, 13 June 2021 03:04:00 -0000
-- Matthew Chambers <nr0q@gridtracker.org> Sun, 13 June 2021 03:04:00 -0000
gridtracker (1.21.0530) unstable; urgency=medium
[Bug Fixes]
@ -30,7 +35,7 @@ gridtracker (1.21.0530) unstable; urgency=medium
[Enhancements]
- Add statistical information to call roster title bar
-- Matthew Chambers <nr0q@gridtracker.org> Sat, 30 May 2021 00:10:00 -0000
-- Matthew Chambers <nr0q@gridtracker.org> Sat, 30 May 2021 00:10:00 -0000
gridtracker (1.21.0520) unstable; urgency=medium
[Bug Fixes]
@ -46,7 +51,7 @@ gridtracker (1.21.0520) unstable; urgency=medium
- Make settings icon a toggle that both opens and closes the settings pane
- Grid and IP Address Fields are slightly wider
-- Matthew Chambers <nr0q@gridtracker.org> Mon, 17 May 2021 02:30:00 -0000
-- Matthew Chambers <nr0q@gridtracker.org> Mon, 17 May 2021 02:30:00 -0000
gridtracker (1.21.0407) unstable; urgency=medium
[Bug Fixes]
@ -57,12 +62,12 @@ gridtracker (1.21.0407) unstable; urgency=medium
- new icon to request ClubLog OQRS QSL
- add eQSL check in log file processing
-- Matthew Chambers <nr0q@gridtracker.org> Wed, 07 Apr 2021 00:00:00 -0000
-- Matthew Chambers <nr0q@gridtracker.org> Wed, 07 Apr 2021 00:00:00 -0000
gridtracker (1.21.0327) unstable; urgency=medium
This is the public release of the 1.21.0324 hotfix release candidates
-- Matthew Chambers <nr0q@gridtracker.org> Fri, 27 Mar 2021 00:38:00 -0000
-- Matthew Chambers <nr0q@gridtracker.org> Fri, 27 Mar 2021 00:38:00 -0000
gridtracker (1.21.0324) unstable; urgency=medium
[Christian Bayer]
@ -72,7 +77,7 @@ gridtracker (1.21.0324) unstable; urgency=medium
* Fixed #71 bug with loading adif files
This is the hotfix release of the first public release of 1.21.0322
-- Christian Bayer <chrbayer84@googlemail.com> Wed, 22 Mar 2021 22:00:00 -0500
-- Christian Bayer <chrbayer84@googlemail.com> Wed, 22 Mar 2021 22:00:00 -0500
gridtracker (1.21.0322) unstable; urgency=medium
[Christian Bayer]
@ -81,7 +86,7 @@ gridtracker (1.21.0322) unstable; urgency=medium
* Fixed linux and arm packaging
This is the public release of 1.21.0307 release candidates
-- Matthew Chambers <nr0q@gridtracker.org> Mon, 22 Mar 2021 20:30:00 -0500
-- Matthew Chambers <nr0q@gridtracker.org> Mon, 22 Mar 2021 20:30:00 -0500
gridtracker (1.21.0307) unstable; urgency=medium
@ -109,6 +114,8 @@ gridtracker (1.21.0307) unstable; urgency=medium
queried from Callook since it usually has more data than free QRZ lookup
* fixed CR alert script not being triggered for Awared Tracker hits
-- Matthew Chambers <nr0q@gridtracker.org> Sun, 7 Mar 2021 12:00:00 -0000
gridtracker (1.20.1118) unstable; urgency=low
* GridTracker is now Open Source! Copyright assigned to GridTracker.org and
@ -138,13 +145,13 @@ gridtracker (1.20.1118) unstable; urgency=low
* Improve debugging/developer experience by enabling context menus when
using nwjs's SDK.
-- Paul Traina <216482-pleasantone@users.noreply.gitlab.com> Wed, 04 Nov 2020 15:58:29 -0800
-- Paul Traina <216482-pleasantone@users.noreply.gitlab.com> Wed, 04 Nov 2020 15:58:29 -0800
gridtracker (1.20.0927+repack1) unstable; urgency=high
* Clean up nw execution in .desktop and .sh file.
-- Paul Traina <216482-pleasantone@users.noreply.gitlab.com> Wed, 07 Oct 2020 09:16:02 -0700
-- Paul Traina <216482-pleasantone@users.noreply.gitlab.com> Wed, 07 Oct 2020 09:16:02 -0700
gridtracker (1.20.0927) unstable; urgency=medium
@ -154,4 +161,4 @@ gridtracker (1.20.0927) unstable; urgency=medium
[ Paul Traina ]
* Debian package building support
-- Paul Traina <216482-pleasantone@users.noreply.gitlab.com> Mon, 28 Sep 2020 14:06:49 -0700
-- Paul Traina <216482-pleasantone@users.noreply.gitlab.com> Mon, 28 Sep 2020 14:06:49 -0700

Wyświetl plik

@ -1,4 +1,8 @@
{
"2M0SYH": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"A41MK": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
@ -19,6 +23,10 @@
"badge": "img/emojis/books.png",
"message": "GridTracker Documentation"
},
"AI5CA": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"AJ6RX": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
@ -39,6 +47,10 @@
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"DL9QB": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"EI8GS": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
@ -51,6 +63,14 @@
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"HA5OLA": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"HB9HKE": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"HB9VKL": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
@ -63,6 +83,10 @@
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"IK0ZSN": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"IW2BUW": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
@ -75,6 +99,10 @@
"badge": "img/emojis/books.png",
"message": "GridTracker Documentation"
},
"K0GUZ": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"K1JT": {
"badge": "img/emojis/star.png",
"message": "Creator of FT8 and WSJT-X"
@ -83,6 +111,10 @@
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"K4KPG": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"K4TLS": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
@ -95,6 +127,10 @@
"badge": "img/emojis/penguin.png",
"message": "GridTracker Partner"
},
"K6WRF": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"K7CGA": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
@ -111,6 +147,10 @@
"badge": "img/emojis/star.png",
"message": "Co-Creator of FT8"
},
"K9BAW": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"K9MIH": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
@ -171,22 +211,46 @@
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"KE4GNB": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"KE4WLE": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"KE8HIM": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"KF5QHQ": {
"badge": "img/emojis/trophy.png",
"message": "GridTracker Developer"
},
"KG5RJ": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"KI0Y": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"KI2D": {
"badge": "img/emojis/flatbread.png",
"message": "GridTracker Developer"
},
"KJ6RJY": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"KJ7KRN": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"KK4WZI": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"KL4NE": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
@ -195,10 +259,18 @@
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"KM4RL": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"KM4TY": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"KM5GN": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"KM6JS": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
@ -207,6 +279,18 @@
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"KN4YZY": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"KN6NCT": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"KNC6EWM": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"KO4BCN": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
@ -255,6 +339,10 @@
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"N4SFS": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"N6GEB": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
@ -279,6 +367,10 @@
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"ON4VT": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"ON7IVE": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
@ -295,6 +387,22 @@
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"PD9DP": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"SM0ONR": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"SV2RIM": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"VA3DJL": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"VA7CND": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
@ -303,6 +411,14 @@
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"VE3HNA": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"VE4MAR": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"VE7LGP": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
@ -311,6 +427,10 @@
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"VK4OO": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"W0SP": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
@ -335,6 +455,10 @@
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"W8PSP": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"W9LL": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
@ -343,6 +467,10 @@
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"WA2LAN": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"WA4YA": {
"badge": "img/emojis/trophy.png",
"message": "GridTracker Developer"
@ -351,6 +479,18 @@
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"WA8P": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"WB0SMX": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"WB5WAJ": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"WB6RJH": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
@ -362,5 +502,9 @@
"WS4S": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
},
"ZL4CAT": {
"badge": "img/emojis/money-bag.png",
"message": "GridTracker Donor"
}
}

Wyświetl plik

@ -31878,6 +31878,7 @@
"=NH6MG",
"=NH6NG",
"=NH6NS",
"=NH6PK",
"=NH6QR",
"=NH6R",
"=NH6RG",

Plik binarny nie jest wyświetlany.

Plik binarny nie jest wyświetlany.

Wyświetl plik

@ -86,36 +86,6 @@ function onAdiLoadComplete(adiBuffer, saveAdifFile, adifFileName, newFile)
{
let finalMode = "";
let appLoTW_RXQSO = findAdiField(
activeAdifArray[x],
"APP_LoTW_RXQSO"
);
if (appLoTW_RXQSO != "")
{
let dRXQSO = Date.parse(appLoTW_RXQSO);
let dLastLOTW_QSO = Date.parse(g_adifLogSettings.lastFetch.lotw_qso);
if ((isNaN(dRXQSO) == false) && (isNaN(dLastLOTW_QSO) == false) && (dRXQSO > dLastLOTW_QSO))
{
g_adifLogSettings.lastFetch.lotw_qso = appLoTW_RXQSO;
}
}
let appLoTW_RXQSL = findAdiField(
activeAdifArray[x],
"APP_LoTW_RXQSL"
);
if (appLoTW_RXQSL != "")
{
let dRXQSL = Date.parse(appLoTW_RXQSL);
let dLastLOTW_QSL = Date.parse(g_adifLogSettings.lastFetch.lotw_qsl);
if ((isNaN(dRXQSL) == false) && (isNaN(dLastLOTW_QSL) == false) && (dRXQSL > dLastLOTW_QSL))
{
g_adifLogSettings.lastFetch.lotw_qsl = appLoTW_RXQSL;
}
}
if (activeAdifArray[x].length > 3)
{
if (activeAdifLogMode)
@ -1668,7 +1638,7 @@ function sendTcpMessage(msg, length, port, address)
client.setTimeout(30000);
client.connect(port, address, function ()
{
client.write(msg);
client.write(Buffer.from(msg, "utf-8"));
});
client.on("close", function () {});
@ -1677,7 +1647,7 @@ function sendTcpMessage(msg, length, port, address)
function valueToAdiField(field, value)
{
var adi = "<" + field + ":";
adi += String(value).length + ">";
adi += Buffer.byteLength(String(value)) + ">";
adi += String(value) + " ";
return adi;
}
@ -1957,7 +1927,7 @@ function finishSendingReport(record, localMode)
for (let key in record)
{
report += "<" + key + ":" + record[key].length + ">" + record[key] + " ";
report += "<" + key + ":" + Buffer.byteLength(record[key]) + ">" + record[key] + " ";
}
report += "<EOR>";
@ -2139,7 +2109,7 @@ function finishSendingReport(record, localMode)
for (var key in record)
{
report +=
"<" + key + ":" + record[key].length + ">" + record[key] + " ";
"<" + key + ":" + Buffer.byteLength(record[key]) + ">" + record[key] + " ";
}
report += "<EOR>";
}

Wyświetl plik

@ -116,14 +116,7 @@ function loadAllSettings()
def_adifLogSettings
);
g_msgSettings = loadDefaultsAndMerge("msgSettings", def_msgSettings);
// one-time override of oams pop-up messages: if pop-ups disabled
// and new version, reset msgActionSelect to 1 (pop up)
if (g_msgSettings.msgActionSelect == 0 &&
String(gtVersion) != String(g_startVersion))
{
g_msgSettings.msgActionSelect = 1;
localStorage.msgSettings = JSON.stringify(g_msgSettings);
}
g_receptionSettings = loadDefaultsAndMerge(
"receptionSettings",
def_receptionSettings

Wyświetl plik

@ -1,8 +1,8 @@
{
"name": "GridTracker",
"product_string_do_not_use": "gridtracker",
"version": "1.21.1021",
"betaVersion": "On The Roster",
"version": "1.21.0928",
"betaVersion": "",
"description": "GridTracker, an amateur radio companion",
"author": "Stephen Loomis (N0TTL) and GridTracker.org",
"license": "BSD-3-Clause",