Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into pr/HB9HIL/1165

Browse Source
This commit is contained in:
HB9HIL
2024-11-17 16:00:55 +01:00
parent 3f3bf3771f bf9d9e5652
commit f0fed3233f
50 changed files with 5847 additions and 5203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
application/libraries/Cabrilloformat.php
View File

@@ -62,7 +62,7 @@ class Cabrilloformat {
return "END-OF-LOG:";
}
public function qso($qso) {
public function qso($qso, $grid_export) {
$freq = substr($qso->COL_FREQ, 0, -3);
if ($freq > 30000) {
if ($freq > 250000000) {
@@ -121,12 +121,19 @@ class Cabrilloformat {
}
}
if($qso->COL_MODE == "SSB") {
// based on the official cabrillo documentation
// https://wwrof.org/cabrillo/cabrillo-qso-data/
if($qso->COL_MODE == "CW") {
$mode = "CW";
} elseif($qso->COL_MODE == "SSB" || $qso->COL_MODE == "AM") {
$mode = "PH";
} elseif($qso->COL_MODE == "FM") {
$mode = "FM";
} elseif($qso->COL_MODE == "RTTY") {
$mode = "RY";
} else {
$mode = $qso->COL_MODE;
$mode = "DG";
}
$time = substr($qso->COL_TIME_ON, 0, -3);
@@ -139,6 +146,10 @@ class Cabrilloformat {
$returnstring .= sprintf("%-6s", sprintf("%03d", $qso->COL_STX)) ." ";
}
if ($grid_export == true) {
$returnstring .= substr($qso->station_gridsquare, 0, 4) ?? '' ." ";
}
if ($qso->COL_STX_STRING != "") {
$returnstring .= $qso->COL_STX_STRING ." ";
}
@@ -148,6 +159,10 @@ class Cabrilloformat {
if ($qso->COL_SRX != NULL) {
$returnstring .= sprintf("%-6s", sprintf("%03d", $qso->COL_SRX)) ." ";
}
if ($grid_export == true) {
$returnstring .= substr($qso->COL_GRIDSQUARE, 0, 4) ?? '' ." ";
}
if ($qso->COL_SRX_STRING != "") {
$returnstring .= $qso->COL_SRX_STRING ." ";