kopia lustrzana https://gitlab.com/gridtracker.org/gridtracker
More clean up
rodzic
21ebb3fb8c
commit
b177946a84
|
@ -268,7 +268,7 @@ function onAdiLoadComplete(adiBuffer, saveAdifFile, adifFileName, newFile)
|
|||
finalMode,
|
||||
finalBand,
|
||||
confirmed,
|
||||
false,
|
||||
true,
|
||||
finalRSTrecv,
|
||||
finalDxcc,
|
||||
finalState,
|
||||
|
@ -344,7 +344,7 @@ function onAdiLoadComplete(adiBuffer, saveAdifFile, adifFileName, newFile)
|
|||
finalMode,
|
||||
finalBand,
|
||||
false,
|
||||
true,
|
||||
false,
|
||||
finalRSTsent,
|
||||
finalDxcc,
|
||||
null,
|
||||
|
@ -366,7 +366,7 @@ function onAdiLoadComplete(adiBuffer, saveAdifFile, adifFileName, newFile)
|
|||
finalMode,
|
||||
finalBand,
|
||||
false,
|
||||
true,
|
||||
false,
|
||||
null,
|
||||
finalDxcc,
|
||||
null,
|
||||
|
@ -388,7 +388,7 @@ function onAdiLoadComplete(adiBuffer, saveAdifFile, adifFileName, newFile)
|
|||
finalMode,
|
||||
finalBand,
|
||||
false,
|
||||
true,
|
||||
false,
|
||||
null,
|
||||
finalDxcc,
|
||||
null,
|
||||
|
|
|
@ -1064,7 +1064,7 @@ function addDeDx(
|
|||
mode,
|
||||
band,
|
||||
confirmed,
|
||||
notQso,
|
||||
isQSO,
|
||||
finalRSTrecv,
|
||||
finalDxcc,
|
||||
finalState,
|
||||
|
@ -1097,7 +1097,7 @@ function addDeDx(
|
|||
var finalMsg = ifinalMsg.trim();
|
||||
if (finalMsg.length > 40) finalMsg = finalMsg.substring(0, 40) + "...";
|
||||
var details = null;
|
||||
if (!notQso)
|
||||
if (isQSO)
|
||||
{
|
||||
var timeMod = finalTime - (finalTime % 360) + 180;
|
||||
hash = unique(mode + band + finalDXcall + timeMod);
|
||||
|
@ -1495,12 +1495,12 @@ function addDeDx(
|
|||
if (finalDxcc < 1) finalDxcc = callsignToDxcc(finalDXcall);
|
||||
|
||||
hash = finalDXcall + band + mode;
|
||||
if (notQso)
|
||||
if (!isQSO)
|
||||
{
|
||||
if (hash in g_liveCallsigns) callsign = g_liveCallsigns[hash];
|
||||
}
|
||||
|
||||
if (!notQso)
|
||||
if (isQSO)
|
||||
{
|
||||
if (validateMapBandAndMode(band, mode) && validatePropMode(finalPropMode))
|
||||
{
|
||||
|
@ -7655,7 +7655,7 @@ function handleWsjtxWSPR(newMessage)
|
|||
"WSPR",
|
||||
Number(newMessage.Frequency / 1000000).formatBand(),
|
||||
false,
|
||||
true,
|
||||
false,
|
||||
null,
|
||||
callsignToDxcc(newMessage.Callsign),
|
||||
null,
|
||||
|
|
|
@ -179,11 +179,11 @@ function reportPotaRBN(callSpot)
|
|||
{
|
||||
let report = {
|
||||
activator: callSpot.activator,
|
||||
spotter: myDEcall,
|
||||
spotter: myDEcall + "-#",
|
||||
frequency: String(parseInt(callSpot.frequency * 1000)),
|
||||
reference: callSpot.reference,
|
||||
mode: callSpot.mode,
|
||||
source: "GT",
|
||||
source: "RBN",
|
||||
comments: callSpot.comments,
|
||||
activatorGrid: callSpot.activatorGrid,
|
||||
spotterGrid: callSpot.spotterGrid
|
||||
|
@ -204,8 +204,16 @@ function reportPotaRBN(callSpot)
|
|||
|
||||
function rbnReportResult(buffer, flag, cookies)
|
||||
{
|
||||
// It worked, but do we take these spots?
|
||||
// console.log(String(buffer));
|
||||
// It worked! process latest spots!
|
||||
if (g_pota.spotsTimeout)
|
||||
{
|
||||
clearTimeout(g_pota.spotsTimeout);
|
||||
g_pota.spotsTimeout = null;
|
||||
}
|
||||
|
||||
processPotaSpots(String(buffer));
|
||||
|
||||
g_pota.spotsTimeout = setTimeout(getPotaSpots, 300000);
|
||||
}
|
||||
|
||||
function spotFromCallObj(callObj, park, inCount, rbnTime)
|
||||
|
@ -213,7 +221,7 @@ function spotFromCallObj(callObj, park, inCount, rbnTime)
|
|||
let callSpot = {
|
||||
activator: callObj.DEcall,
|
||||
activatorGrid: callObj.grid,
|
||||
spotter: myDEcall,
|
||||
spotter: myDEcall + "-#",
|
||||
spotterGrid: myDEGrid,
|
||||
frequency: Number((g_instances[callObj.instance].status.Frequency / 1000000).toFixed(3)),
|
||||
reference: park,
|
||||
|
@ -222,7 +230,7 @@ function spotFromCallObj(callObj, park, inCount, rbnTime)
|
|||
spotTime: Date.now(),
|
||||
source: "GT",
|
||||
count: inCount + 1,
|
||||
comments: "GT " + callObj.RSTsent + " dB " + myDEGrid
|
||||
comments: "GT " + callObj.RSTsent + " dB " + myDEGrid + " via " + myDEcall + "-#"
|
||||
};
|
||||
return callSpot;
|
||||
}
|
||||
|
|
Ładowanie…
Reference in New Issue