[LoTW][Sync] Adds remapping support for FT-4

This remaps FT-4 to fit within its specs and also puts code in place to further support mode remapping for sub modes.
这个提交包含在:
Peter Goodhall 2021-03-20 15:26:31 +00:00 提交者 GitHub
当前提交 257f973b0f
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 3 个文件被更改,包括 13 次插入5 次删除

查看文件

@ -912,15 +912,23 @@ class Lotw extends CI_Controller {
/*
| Function: mode_map
| Requires: mode as $mode
| Requires: mode as $mode, submode as $submode
|
| This converts ADIF modes to the mode that LoTW expects if its non standard
*/
function mode_map($mode) {
function mode_map($mode, $submode) {
switch ($mode):
case "PKT":
return "PACKET";
break;
case "MFSK":
if ($submode == "FT4") {
return "FT4";
break;
} else {
return "MFSK";
break;
}
default:
return $mode;
endswitch;

查看文件

@ -2256,7 +2256,7 @@ class Logbook_model extends CI_Model {
function get_lotw_qsos_to_upload($station_id, $start_date, $end_date) {
$this->db->select('COL_PRIMARY_KEY,COL_CALL, COL_BAND, COL_BAND_RX, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_FREQ, COL_FREQ_RX, COL_GRIDSQUARE, COL_SAT_NAME, COL_PROP_MODE, COL_LOTW_QSL_SENT, station_id');
$this->db->select('COL_PRIMARY_KEY,COL_CALL, COL_BAND, COL_BAND_RX, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_SUBMODE, COL_FREQ, COL_FREQ_RX, COL_GRIDSQUARE, COL_SAT_NAME, COL_PROP_MODE, COL_LOTW_QSL_SENT, station_id');
$this->db->where("station_id", $station_id);
$this->db->where('COL_LOTW_QSL_SENT !=', "Y");

查看文件

@ -42,7 +42,7 @@ $cert2 = str_replace("-----END CERTIFICATE-----", "", $cert1);
<BAND:<?php echo strlen($qso->COL_BAND); ?>><?php echo strtoupper($qso->COL_BAND); ?>
<MODE:<?php echo strlen($CI->mode_map($qso->COL_MODE)); ?>><?php echo strtoupper($CI->mode_map(strtoupper($qso->COL_MODE))); ?>
<MODE:<?php echo strlen($CI->mode_map($qso->COL_MODE, $qso->COL_SUBMODE)); ?>><?php echo strtoupper($CI->mode_map(strtoupper($qso->COL_MODE), strtoupper($qso->COL_SUBMODE))); ?>
<?php if($qso->COL_FREQ != "" || $qso->COL_FREQ != "0") { ?><?php $freq_in_mhz = $qso->COL_FREQ / 1000000; ?><FREQ:<?php echo strlen($freq_in_mhz); ?>><?php echo $freq_in_mhz; ?><?php } ?>
@ -134,7 +134,7 @@ if($qso->COL_FREQ_RX != "" || $qso->COL_FREQ_RX != "0") {
}
if($qso->COL_MODE) {
$sign_string .= strtoupper($CI->mode_map($qso->COL_MODE));
$sign_string .= strtoupper($CI->mode_map($qso->COL_MODE, $qso->COL_SUBMODE));
}