From 3e366d60152593cf31a860e052a53175e2eba086 Mon Sep 17 00:00:00 2001 From: phl0 Date: Mon, 9 Mar 2026 17:45:29 +0100 Subject: [PATCH 1/7] Rename existing SAT mappings for AMSAT SAT status upload --- application/models/Logbook_model.php | 44 +++++++--------------------- 1 file changed, 11 insertions(+), 33 deletions(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index a5edce4c8..b05b1f56e 100644 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -1257,53 +1257,31 @@ class Logbook_model extends CI_Model { $sat_name = ''; if ($data['COL_SAT_NAME'] == 'AO-7') { if ($data['COL_BAND'] == '2m' && $data['COL_BAND_RX'] == '10m') { - $sat_name = 'AO-7[A]'; + $sat_name = 'AO-7 [V/a]'; } if ($data['COL_BAND'] == '70cm' && $data['COL_BAND_RX'] == '2m') { - $sat_name = 'AO-7[B]'; + $sat_name = 'AO-7_[U/v]'; } } else if ($data['COL_SAT_NAME'] == 'QO-100') { - $sat_name = 'QO-100_NB'; + $sat_name = 'QO-100_[NB]'; } else if ($data['COL_SAT_NAME'] == 'AO-92') { - if ($data['COL_BAND'] == '70cm' && $data['COL_BAND_RX'] == '2m') { - $sat_name = 'AO-92_U/v'; - } - if ($data['COL_BAND'] == '23cm' && $data['COL_BAND_RX'] == '2m') { - $sat_name = 'AO-92_L/v'; - } + return; } else if ($data['COL_SAT_NAME'] == 'AO-95') { - if ($data['COL_BAND'] == '70cm' && $data['COL_BAND_RX'] == '2m') { - $sat_name = 'AO-95_U/v'; - } - if ($data['COL_BAND'] == '23cm' && $data['COL_BAND_RX'] == '2m') { - $sat_name = 'AO-95_L/v'; - } + return; } else if ($data['COL_SAT_NAME'] == 'PO-101') { - if ($data['COL_MODE'] == 'PKT') { - $sat_name = 'PO-101[APRS]'; - } else { - $sat_name = 'PO-101[FM]'; - } + $sat_name = 'PO-101_[FM]'; } else if ($data['COL_SAT_NAME'] == 'FO-118') { - if ($data['COL_BAND'] == '2m') { - if ($data['COL_MODE'] == 'FM') { - $sat_name = 'FO-118[V/u FM]'; - } else if ($data['COL_MODE'] == 'SSB') { - $sat_name = 'FO-118[V/u]'; - } - } else if ($data['COL_BAND'] == '15m') { - $sat_name = 'FO-118[H/u]'; - } + return; } else if ($data['COL_SAT_NAME'] == 'ARISS' || $data['COL_SAT_NAME'] == 'ISS') { if ($data['COL_MODE'] == 'FM') { - $sat_name = 'ISS-FM'; + $sat_name = 'ISS_[FM]'; } else if ($data['COL_MODE'] == 'PKT') { - $sat_name = 'ISS-DATA'; + $sat_name = 'ISS_[APRS]'; } } else if ($data['COL_SAT_NAME'] == 'CAS-3H') { - $sat_name = 'LilacSat-2'; + $sat_name = 'CAS-3H_[FM]'; } else if (preg_match('/TEV2-[1-9]/', ($data['COL_SAT_NAME'] ?? ''))) { - $sat_name = str_replace('TEV2-', 'TEVEL2-', ($data['COL_SAT_NAME'] ?? '')); + return; } else { $sat_name = ($data['COL_SAT_NAME'] ?? ''); } From 69b41e2c5618190b0525c03fe22169999295edd1 Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 10 Mar 2026 13:26:53 +0100 Subject: [PATCH 2/7] Use switch case instead of if else --- application/models/Logbook_model.php | 64 +++++++++++++++------------- 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index b05b1f56e..c929a0a4d 100644 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -1255,35 +1255,41 @@ class Logbook_model extends CI_Model { function upload_amsat_status($data) { $sat_name = ''; - if ($data['COL_SAT_NAME'] == 'AO-7') { - if ($data['COL_BAND'] == '2m' && $data['COL_BAND_RX'] == '10m') { - $sat_name = 'AO-7 [V/a]'; - } - if ($data['COL_BAND'] == '70cm' && $data['COL_BAND_RX'] == '2m') { - $sat_name = 'AO-7_[U/v]'; - } - } else if ($data['COL_SAT_NAME'] == 'QO-100') { - $sat_name = 'QO-100_[NB]'; - } else if ($data['COL_SAT_NAME'] == 'AO-92') { - return; - } else if ($data['COL_SAT_NAME'] == 'AO-95') { - return; - } else if ($data['COL_SAT_NAME'] == 'PO-101') { - $sat_name = 'PO-101_[FM]'; - } else if ($data['COL_SAT_NAME'] == 'FO-118') { - return; - } else if ($data['COL_SAT_NAME'] == 'ARISS' || $data['COL_SAT_NAME'] == 'ISS') { - if ($data['COL_MODE'] == 'FM') { - $sat_name = 'ISS_[FM]'; - } else if ($data['COL_MODE'] == 'PKT') { - $sat_name = 'ISS_[APRS]'; - } - } else if ($data['COL_SAT_NAME'] == 'CAS-3H') { - $sat_name = 'CAS-3H_[FM]'; - } else if (preg_match('/TEV2-[1-9]/', ($data['COL_SAT_NAME'] ?? ''))) { - return; - } else { - $sat_name = ($data['COL_SAT_NAME'] ?? ''); + switch ($data['COL_SAT_NAME']) { + case 'AO-7': + if ($data['COL_BAND'] == '2m' && $data['COL_BAND_RX'] == '10m') { + $sat_name = 'AO-7 [V/a]'; + } + if ($data['COL_BAND'] == '70cm' && $data['COL_BAND_RX'] == '2m') { + $sat_name = 'AO-7_[U/v]'; + } + break; + case 'QO-100': + $sat_name = 'QO-100_[NB]'; + break; + case 'PO-101': + $sat_name = 'PO-101_[FM]'; + break; + case 'ARISS': + case 'ISS': + if ($data['COL_MODE'] == 'FM') { + $sat_name = 'ISS_[FM]'; + } else if ($data['COL_MODE'] == 'PKT') { + $sat_name = 'ISS_[APRS]'; + } + break; + case 'CAS-3H': + $sat_name = 'CAS-3H_[FM]'; + break; + case (preg_match('/TEV2-[1-9]/', ($data['COL_SAT_NAME'] ?? '')) ? true : false): + case 'AO-92': + case 'AO-95': + case 'FO-118': + return; + break; + default: + $sat_name = ($data['COL_SAT_NAME'] ?? ''); + break; } $amsat_source_grid = ''; if (array_key_exists('COL_MY_GRIDSQUARE', $data)) { From a4ef69c6103779dd59543ad55ce464a813324990 Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 10 Mar 2026 13:50:18 +0100 Subject: [PATCH 3/7] Add remaining SAT name mappings --- application/models/Logbook_model.php | 37 ++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index c929a0a4d..f209bd9bf 100644 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -1281,6 +1281,43 @@ class Logbook_model extends CI_Model { case 'CAS-3H': $sat_name = 'CAS-3H_[FM]'; break; + case 'AO-73': + $sat_name = 'AO-73_[U/v]'; + break; + case 'AO-91': + $sat_name = 'AO-91_[FM]'; + break; + case 'AO-123': + $sat_name = 'AO-123_[FM]'; + break; + case 'FO-29': + $sat_name = 'FO-29_[V/u]'; + break; + case 'IO-86': + $sat_name = 'IO-86_[FM]'; + break; + case 'JO-97': + $sat_name = 'JO-97_[U/v]'; + break; + case 'NO-44': + $sat_name = 'NO-44_[APRS]'; + break; + case 'RS-44': + $sat_name = 'RS-44_[V/u]'; + break; + case 'SO-125': + $sat_name = 'SO-125_[FM]'; + break; + case 'SO-50': + $sat_name = 'SO-50_[FM]'; + break; + case 'SONATE2': + if ($data['COL_MODE'] == 'PKT') { + $sat_name = 'SONATE-2_[APRS]'; + } else { + $sat_name = 'SONATE-2_[SSTV]'; + } + break; case (preg_match('/TEV2-[1-9]/', ($data['COL_SAT_NAME'] ?? '')) ? true : false): case 'AO-92': case 'AO-95': From 6c1cbc637954df56b62b9f6485dc605b52767a10 Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 10 Mar 2026 14:22:52 +0100 Subject: [PATCH 4/7] No break needed here --- application/models/Logbook_model.php | 1 - 1 file changed, 1 deletion(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index f209bd9bf..7ccf68ba7 100644 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -1323,7 +1323,6 @@ class Logbook_model extends CI_Model { case 'AO-95': case 'FO-118': return; - break; default: $sat_name = ($data['COL_SAT_NAME'] ?? ''); break; From 60d762584a77292e8d0afc88c39d5efedbfa96f6 Mon Sep 17 00:00:00 2001 From: phl0 Date: Fri, 13 Mar 2026 12:44:58 +0100 Subject: [PATCH 5/7] Add PO-101 APRS --- application/models/Logbook_model.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 7ccf68ba7..62b8cb9cf 100644 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -1268,7 +1268,11 @@ class Logbook_model extends CI_Model { $sat_name = 'QO-100_[NB]'; break; case 'PO-101': - $sat_name = 'PO-101_[FM]'; + if ($data['COL_MODE'] == 'FM') { + $sat_name = 'PO-101_[FM]'; + } else if ($data['COL_MODE'] == 'PKT') { + $sat_name = 'PO-101_[APRS]'; + } break; case 'ARISS': case 'ISS': From 42b5449314d1dda543eed881983b2bf39b07dd44 Mon Sep 17 00:00:00 2001 From: phl0 Date: Fri, 13 Mar 2026 12:45:55 +0100 Subject: [PATCH 6/7] Skip all other SAT (notification will fail very likely due to wrong SAT name anyway) --- application/models/Logbook_model.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 62b8cb9cf..39dc2f529 100644 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -1322,14 +1322,8 @@ class Logbook_model extends CI_Model { $sat_name = 'SONATE-2_[SSTV]'; } break; - case (preg_match('/TEV2-[1-9]/', ($data['COL_SAT_NAME'] ?? '')) ? true : false): - case 'AO-92': - case 'AO-95': - case 'FO-118': - return; default: - $sat_name = ($data['COL_SAT_NAME'] ?? ''); - break; + return; } $amsat_source_grid = ''; if (array_key_exists('COL_MY_GRIDSQUARE', $data)) { From 75c9c446a36c7ea455936af3b0facec339f53805 Mon Sep 17 00:00:00 2001 From: phl0 Date: Fri, 13 Mar 2026 16:47:47 +0100 Subject: [PATCH 7/7] Fix typo --- application/models/Logbook_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 39dc2f529..5fc9befc5 100644 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -1258,7 +1258,7 @@ class Logbook_model extends CI_Model { switch ($data['COL_SAT_NAME']) { case 'AO-7': if ($data['COL_BAND'] == '2m' && $data['COL_BAND_RX'] == '10m') { - $sat_name = 'AO-7 [V/a]'; + $sat_name = 'AO-7_[V/a]'; } if ($data['COL_BAND'] == '70cm' && $data['COL_BAND_RX'] == '2m') { $sat_name = 'AO-7_[U/v]';