Squashed commits '${title}'

merge-requests/162/merge
Matthew Chambers 2022-03-05 03:17:51 +00:00
rodzic 3e060f24ca
commit 94fb3cb677
4 zmienionych plików z 284 dodań i 300 usunięć

Wyświetl plik

@ -97,7 +97,7 @@ win:package:
eval $(ssh-agent -s)
echo "$NR0Q_PRIV" | tr -d '\r' | ssh-add -
mkdir -p ~/.ssh; chmod 700 ~/.ssh
scp -o StrictHostKeyChecking=no mchambers@$NR0Q_SERVER_ADDRESS:~/codecert.spc ./
scp -o StrictHostKeyChecking=no -P $NR0Q_SSH_PORT mchambers@$NR0Q_SERVER_ADDRESS:~/codecert.spc ./
script:
- |
# Making our Windows packages
@ -299,7 +299,7 @@ uploadtest:
echo "Calculating MD5 Hash for $FILE"
md5sum $FILE > $FILE.md5
done
ssh -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT gridtracker@$NR0Q_SERVER_ADDRESS "mkdir ~/$CI_COMMIT_TAG" && scp -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT -r ./* gridtracker@$NR0Q_SERVER_ADDRESS:~/$CI_COMMIT_TAG/ && ssh -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT gridtracker@$NR0Q_SERVER_ADDRESS "rm latest_test && ln -s $CI_COMMIT_TAG latest_test"
ssh -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT gridtracker@$NR0Q_SERVER_ADDRESS "mkdir ~/$CI_COMMIT_TAG" && scp -o StrictHostKeyChecking=no -P $NR0Q_SSH_PORT -r ./* gridtracker@$NR0Q_SERVER_ADDRESS:~/$CI_COMMIT_TAG/ && ssh -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT gridtracker@$NR0Q_SERVER_ADDRESS "rm latest_test && ln -s $CI_COMMIT_TAG latest_test"
# copy release assets to NR0Q's server
uploadrelease:
@ -321,7 +321,7 @@ uploadrelease:
echo "Calculating MD5 Hash for $FILE"
md5sum $FILE > $FILE.md5
done
ssh -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT gridtracker@$NR0Q_SERVER_ADDRESS "mkdir ~/$CI_COMMIT_TAG" && scp -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT -r ./* gridtracker@$NR0Q_SERVER_ADDRESS:~/$CI_COMMIT_TAG/
ssh -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT gridtracker@$NR0Q_SERVER_ADDRESS "mkdir ~/$CI_COMMIT_TAG" && scp -o StrictHostKeyChecking=no -P $NR0Q_SSH_PORT -r ./* gridtracker@$NR0Q_SERVER_ADDRESS:~/$CI_COMMIT_TAG/
# this only creates a "source code release" -- gitlab doesn't specify binaries
# except as links to external storage, which is suboptimal for now

Wyświetl plik

@ -1,3 +1,9 @@
// FIXME ****************************************************************************** //
// The datepicker's "Time" section doesn't work. This really needs to be fixed before
// the next big RTTY Roundup or Field Day where there may be a lot of hams that want
// to use this feature to only reference their log starting when the contest starts.
// Which isn't always 00:00 UTC.
// ************************************************************************************ //
var picker = {
attach: function (opt)
{

Wyświetl plik

@ -1,266 +1,266 @@
var validSettings = [
"HRDLogbookLogSettings",
"N1MMSettings",
"acLogSettings",
"adifLogSettings",
"alertSettings",
"appSettings",
"audioSettings",
"awardTracker",
"bandActivity",
"blockedCQ",
"blockedCalls",
"blockedDxcc",
"callsignLookups",
"classicAlerts",
"classicAlertsVersion",
"currentVersion",
"dxkLogSettings",
"log4OMSettings",
"mapMemory",
"mapSettings",
"msgSettings",
"receptionSettings",
"rosterSettings",
"savedAlerts",
"speechSettings",
"startupLogs",
"trustedQslSettings",
"screenSettings",
"legendColors"
];
var def_appSettings = {
alertMute: 0,
rosterAlwaysOnTop: false,
centerGridsquare: "",
chatUUID: "",
crScript: 0,
distanceUnit: "MI",
earthImgSrc: 0,
gridViewMode: 3,
gridsquareDecayTime: 300,
gtAgree: "",
gtBandFilter: "",
gtFlagImgSrc: 0,
gtModeFilter: "",
gtPropFilter: "mixed",
gtMsgEnable: true,
gtShareEnable: true,
heatEnabled: 0,
loadAdifAtStartup: false,
lookupLoginCq: "",
lookupLoginQrz: "",
lookupLoginQth: "",
lookupOnTx: false,
lookupCloseLog: false,
lookupMerge: true,
lookupMissingGrid: false,
lookupPasswordCq: "",
lookupPasswordQrz: "",
lookupPasswordQth: "",
lookupService: "CALLOOK",
lookupCallookPreferred: false,
clearRosterOnBandChange: false,
moonPath: 0,
moonTrack: 0,
mouseTrack: 0,
multicast: false,
myBand: "OOB",
myDEGrid: "",
myDEcall: "NOCALL",
myMode: "",
myRawCall: "NOCALL",
myRawFreq: "",
myRawGrid: "",
pathWidthWeight: 1.0,
pushPinMode: false,
qrzPathWidthWeight: 1.2,
sixWideMode: 0,
savedAppData: null,
soundCard: "default",
spotsEnabled: 0,
stopAskingVersion: false,
useLocalTime: 0,
wsjtForwardUdpEnable: false,
wsjtForwardUdpIp: "127.0.0.1",
wsjtForwardUdpPort: 2238,
wsjtIP: "",
wsjtUdpPort: 0,
workingCallsignEnable: false,
workingCallsigns: {},
workingDateEnable: false,
workingDate: 0,
gtSpotEnable: true
};
var def_mapSettings = {
animate: true,
animateSpeed: 4,
CQhilite: true,
fitQRZ: false,
focusRig: true,
gridAlpha: 136,
haltAllOnTx: true,
legend: true,
longitude: 0.0,
latitude: 0.0,
loudness: 1,
mapIndex: 19,
mergeOverlay: false,
mouseOver: true,
nightLoudness: 0.8,
nightMapEnable: false,
nightMapIndex: 20,
nightPathColor: 361,
nightQrzPathColor: 1,
offlineMode: false,
pathColor: 0,
qrzDxccFallback: false,
qrzPathColor: 1,
rosterTime: 120,
shadow: 0.1,
splitQSL: true,
strikes: false,
strikesAlert: 2,
strikesGlobal: false,
strikesNotify: false,
trafficDecode: true,
usNexrad: false,
zoom: 4,
mapTrans: 0.5
};
var def_adifLogSettings = {
menu: {
buttonAdifCheckBox: false,
buttonClubCheckBox: false,
buttonLOTWCheckBox: false,
buttonQRZCheckBox: false,
buttonPsk24CheckBox: true
},
startup: {
loadAdifCheckBox: false,
loadPsk24CheckBox: false,
loadQRZCheckBox: false,
loadLOTWCheckBox: false,
loadClubCheckBox: false,
loadGTCheckBox: true
},
qsolog: {
logQRZqsoCheckBox: false,
logGTqsoCheckBox: true,
logLOTWqsoCheckBox: false,
logHRDLOGqsoCheckBox: false,
logClubqsoCheckBox: false,
logCloudlogQSOCheckBox: false,
logeQSLQSOCheckBox: false
},
nickname: {
nicknameeQSLCheckBox: false
},
text: {
lotwLogin: "",
clubCall: "",
clubEmail: "",
clubPassword: "",
lotwPassword: "",
lotwTrusted: "",
lotwStation: "",
qrzApiKey: "",
HRDLOGCallsign: "",
HRDLOGUploadCode: "",
CloudlogURL: "http://127.0.0.1/index.php/api/qso",
CloudlogAPI: "",
eQSLUser: "",
eQSLPassword: "",
eQSLNickname: ""
},
downloads: {},
lastFetch: {
lotw_qso: "1970-01-01",
lotw_qsl: "1970-01-01"
}
};
var def_msgSettings = {
msgAlertSelect: 1,
msgAlertWord: "New chat message",
msgAlertMedia: "none",
msgFrequencySelect: 0,
msgActionSelect: 1,
msgAwaySelect: 0,
msgAwayText: "I am away from the shack at the moment"
};
var def_receptionSettings = {
lastSequenceNumber: "0", // Treat as a string, it's friggin big
lastDownloadTimeSec: 0,
viewHistoryTimeSec: 900,
viewPaths: false,
pathColor: -1,
pathNightColor: 361,
spotWidth: 0.8,
mergeSpots: true
};
var def_N1MMSettings = {
enable: false,
port: 2333,
ip: "127.0.0.1"
};
var def_log4OMSettings = {
enable: false,
port: 2236,
ip: "127.0.0.1"
};
var def_dxkLogSettings = {
enable: false,
port: 52000,
ip: "127.0.0.1"
};
var def_HRDLogbookLogSettings = {
enable: false,
port: 7826,
ip: "127.0.0.1"
};
var def_acLogSettings = {
enable: false,
port: 1100,
ip: "127.0.0.1"
};
var def_trustedQslSettings = {
stationFile: "",
stationFileValid: false,
binaryFile: "",
binaryFileValid: false
};
var def_callsignLookups = {
lotwUseEnable: true,
lotwWeeklyEnable: true,
lotwLastUpdate: 0,
eqslUseEnable: true,
eqslWeeklyEnable: true,
eqslLastUpdate: 0,
ulsUseEnable: true,
ulsWeeklyEnable: true,
ulsLastUpdate: 0,
oqrsUseEnable: false,
oqrsWeeklyEnable: false,
oqrsLastUpdate: 0
};
var def_bandActivity = {
lastUpdate: {},
lines: {}
};
var def_legendColors = {
QSO: "#EEEE00",
QSL: "#EE0000",
QSX: "#1111EE",
CQ: "#00FF00",
CQDX: "#00FFFF",
QRZ: "#FFFF00",
QTH: "#FFA600"
};
var validSettings = [
"HRDLogbookLogSettings",
"N1MMSettings",
"acLogSettings",
"adifLogSettings",
"alertSettings",
"appSettings",
"audioSettings",
"awardTracker",
"bandActivity",
"blockedCQ",
"blockedCalls",
"blockedDxcc",
"callsignLookups",
"classicAlerts",
"classicAlertsVersion",
"currentVersion",
"dxkLogSettings",
"log4OMSettings",
"mapMemory",
"mapSettings",
"msgSettings",
"receptionSettings",
"rosterSettings",
"savedAlerts",
"speechSettings",
"startupLogs",
"trustedQslSettings",
"screenSettings",
"legendColors"
];
var def_appSettings = {
alertMute: 0,
rosterAlwaysOnTop: false,
centerGridsquare: "",
chatUUID: "",
crScript: 0,
distanceUnit: "MI",
earthImgSrc: 0,
gridViewMode: 3,
gridsquareDecayTime: 300,
gtAgree: "",
gtBandFilter: "",
gtFlagImgSrc: 0,
gtModeFilter: "",
gtPropFilter: "mixed",
gtMsgEnable: true,
gtShareEnable: true,
heatEnabled: 0,
loadAdifAtStartup: false,
lookupLoginCq: "",
lookupLoginQrz: "",
lookupLoginQth: "",
lookupOnTx: false,
lookupCloseLog: false,
lookupMerge: true,
lookupMissingGrid: false,
lookupPasswordCq: "",
lookupPasswordQrz: "",
lookupPasswordQth: "",
lookupService: "CALLOOK",
lookupCallookPreferred: false,
clearRosterOnBandChange: false,
moonPath: 0,
moonTrack: 0,
mouseTrack: 0,
multicast: false,
myBand: "OOB",
myDEGrid: "",
myDEcall: "NOCALL",
myMode: "",
myRawCall: "NOCALL",
myRawFreq: "",
myRawGrid: "",
pathWidthWeight: 1.0,
pushPinMode: false,
qrzPathWidthWeight: 1.2,
sixWideMode: 0,
savedAppData: null,
soundCard: "default",
spotsEnabled: 0,
stopAskingVersion: false,
useLocalTime: 0,
wsjtForwardUdpEnable: false,
wsjtForwardUdpIp: "127.0.0.1",
wsjtForwardUdpPort: 2238,
wsjtIP: "",
wsjtUdpPort: 0,
workingCallsignEnable: false,
workingCallsigns: {},
workingDateEnable: false,
workingDate: 0,
gtSpotEnable: true
};
var def_mapSettings = {
animate: true,
animateSpeed: 4,
CQhilite: true,
fitQRZ: false,
focusRig: true,
gridAlpha: 136,
haltAllOnTx: true,
legend: true,
longitude: 0.0,
latitude: 0.0,
loudness: 1,
mapIndex: 19,
mergeOverlay: false,
mouseOver: true,
nightLoudness: 0.8,
nightMapEnable: false,
nightMapIndex: 20,
nightPathColor: 361,
nightQrzPathColor: 1,
offlineMode: false,
pathColor: 0,
qrzDxccFallback: false,
qrzPathColor: 1,
rosterTime: 120,
shadow: 0.1,
splitQSL: true,
strikes: false,
strikesAlert: 2,
strikesGlobal: false,
strikesNotify: false,
trafficDecode: true,
usNexrad: false,
zoom: 4,
mapTrans: 0.5
};
var def_adifLogSettings = {
menu: {
buttonAdifCheckBox: false,
buttonClubCheckBox: false,
buttonLOTWCheckBox: false,
buttonQRZCheckBox: false,
buttonPsk24CheckBox: true
},
startup: {
loadAdifCheckBox: false,
loadPsk24CheckBox: false,
loadQRZCheckBox: false,
loadLOTWCheckBox: false,
loadClubCheckBox: false,
loadGTCheckBox: true
},
qsolog: {
logQRZqsoCheckBox: false,
logGTqsoCheckBox: true,
logLOTWqsoCheckBox: false,
logHRDLOGqsoCheckBox: false,
logClubqsoCheckBox: false,
logCloudlogQSOCheckBox: false,
logeQSLQSOCheckBox: false
},
nickname: {
nicknameeQSLCheckBox: false
},
text: {
lotwLogin: "",
clubCall: "",
clubEmail: "",
clubPassword: "",
lotwPassword: "",
lotwTrusted: "",
lotwStation: "",
qrzApiKey: "",
HRDLOGCallsign: "",
HRDLOGUploadCode: "",
CloudlogURL: "http://127.0.0.1/index.php/api/qso",
CloudlogAPI: "",
eQSLUser: "",
eQSLPassword: "",
eQSLNickname: ""
},
downloads: {},
lastFetch: {
lotw_qso: "1970-01-01",
lotw_qsl: "1970-01-01"
}
};
var def_msgSettings = {
msgAlertSelect: 1,
msgAlertWord: "New chat message",
msgAlertMedia: "none",
msgFrequencySelect: 0,
msgActionSelect: 1,
msgAwaySelect: 0,
msgAwayText: "I am away from the shack at the moment"
};
var def_receptionSettings = {
lastSequenceNumber: "0", // Treat as a string, it's friggin big
lastDownloadTimeSec: 0,
viewHistoryTimeSec: 900,
viewPaths: false,
pathColor: -1,
pathNightColor: 361,
spotWidth: 0.8,
mergeSpots: true
};
var def_N1MMSettings = {
enable: false,
port: 2333,
ip: "127.0.0.1"
};
var def_log4OMSettings = {
enable: false,
port: 2236,
ip: "127.0.0.1"
};
var def_dxkLogSettings = {
enable: false,
port: 52000,
ip: "127.0.0.1"
};
var def_HRDLogbookLogSettings = {
enable: false,
port: 7826,
ip: "127.0.0.1"
};
var def_acLogSettings = {
enable: false,
port: 1100,
ip: "127.0.0.1"
};
var def_trustedQslSettings = {
stationFile: "",
stationFileValid: false,
binaryFile: "",
binaryFileValid: false
};
var def_callsignLookups = {
lotwUseEnable: true,
lotwWeeklyEnable: true,
lotwLastUpdate: 0,
eqslUseEnable: true,
eqslWeeklyEnable: true,
eqslLastUpdate: 0,
ulsUseEnable: true,
ulsWeeklyEnable: true,
ulsLastUpdate: 0,
oqrsUseEnable: false,
oqrsWeeklyEnable: false,
oqrsLastUpdate: 0
};
var def_bandActivity = {
lastUpdate: {},
lines: {}
};
var def_legendColors = {
QSO: "#EEEE00",
QSL: "#EE0000",
QSX: "#1111EE",
CQ: "#00FF00",
CQDX: "#00FFFF",
QRZ: "#FFFF00",
QTH: "#FFA600"
};

Wyświetl plik

@ -10070,7 +10070,7 @@ function renderStatsBox()
worker +=
"<br/> In Section: " +
scoreSection +
"<br/>Error Generating Stats<br/>Please take a screenshot and send to gridtracker@gmail.com";
"<br/>Error Generating Stats<br/>Please take a screenshot and send to team@gridtracker.org";
}
setStatsDiv("statViewDiv", worker);
@ -11305,7 +11305,13 @@ function pskBandActivityCallback(buffer, flag)
renderBandActivity();
}
/* FIXME ******************************************************************************
Should we somewhere in settings, have a checkbox to enable / disable PSK spots
specifically? We can disable the overall spots, both PSK and OAMS, and OAMS has a
checkbox in the OAMS tab. I'm thinking for the situation where I only want to
pull in OAMS spots and not PSK reporter's spots.
************************************************************************************
*/
function pskGetBandActivity()
{
if (g_mapSettings.offlineMode == true) return;
@ -11569,14 +11575,7 @@ function updateBasedOnIni()
{
if (typeof nw != "undefined")
{
// lets see if we can find our location the hard way
getBuffer(
"https://api.ipstack.com/check?access_key=8c9233ec1c09861a707951ab3718a7f6&format=1",
ipLocation,
null,
"https",
443
);
alert("Location not available!\nEither start WSJT-X/JTDX or enter your grid square in the settings ");
}
}
}
@ -12054,27 +12053,6 @@ function selectElementContents(el)
}
}
function ipLocation(buffer, flag)
{
var obj = JSON.parse(buffer);
if (
typeof obj != "undefined" &&
obj != null &&
typeof obj.latitude != "undefined"
)
{
g_appSettings.centerGridsquare = latLonToGridSquare(
obj.latitude,
obj.longitude
).substr(0, 6);
if (g_appSettings.centerGridsquare.length > 0)
{
homeQTHInput.value = g_appSettings.centerGridsquare;
if (ValidateGridsquare(homeQTHInput, null)) setCenterGridsquare();
}
}
}
function popupNewWindows()
{
if (typeof nw != "undefined")