From 325699d83f70e0beaab468a234a8e74808029668 Mon Sep 17 00:00:00 2001 From: phl0 Date: Thu, 2 Jan 2025 22:13:52 +0100 Subject: [PATCH 1/3] Extend band edges to IARU R2 bandplan(s) --- assets/js/radiohelpers.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/js/radiohelpers.js b/assets/js/radiohelpers.js index 102038d8d..7323bec95 100644 --- a/assets/js/radiohelpers.js +++ b/assets/js/radiohelpers.js @@ -40,7 +40,7 @@ function frequencyToBand(frequency) { else if(result >= 219000000 && result <= 225000000) { return '1.25m'; } - else if(result >= 430000000 && result <= 440000000) { + else if(result >= 430000000 && result <= 450000000) { return '70cm'; } else if(result >= 902000000 && result <= 928000000) { @@ -49,16 +49,16 @@ function frequencyToBand(frequency) { else if(result >= 1200000000 && result <= 1600000000) { return '23cm'; } - else if(result >= 2300800000 && result <= 2890800000) { + else if(result >= 2300000000 && result <= 2890800000) { return '13cm'; } - else if(result >= 3300000000 && result <= 3450000000) { + else if(result >= 3300000000 && result <= 3500000000) { return '9cm'; } - else if(result >= 5650000000 && result <= 5700000000) { + else if(result >= 5650000000 && result <= 5925000000) { return '6cm'; } - else if(result >= 10125000000 && result <= 10525000000) { + else if(result >= 10000000000 && result <= 10525000000) { return '3cm'; } } @@ -93,4 +93,4 @@ function LatLng2Loc(y, x, num) { if (num >= 10) qthloc+=String.fromCharCode(yn[8] + 0x61) + String.fromCharCode(yn[9] + 0x61); return qthloc; -} \ No newline at end of file +} From 343a05ce3aacbd3e244a88e8b50f304cf05466d4 Mon Sep 17 00:00:00 2001 From: phl0 Date: Thu, 2 Jan 2025 22:16:53 +0100 Subject: [PATCH 2/3] Also fix freq lib --- application/libraries/Frequency.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/libraries/Frequency.php b/application/libraries/Frequency.php index 1690d85e1..b61aee72d 100644 --- a/application/libraries/Frequency.php +++ b/application/libraries/Frequency.php @@ -193,7 +193,7 @@ class Frequency { $Band = "2m"; } else if ($Frequency > 218000000 && $Frequency < 226000000) { $Band = "1.25m"; - } else if ($Frequency > 430000000 && $Frequency < 440000000) { + } else if ($Frequency > 430000000 && $Frequency < 450000000) { $Band = "70cm"; } else if ($Frequency > 900000000 && $Frequency < 930000000) { $Band = "33cm"; From 8fb8391434217cff059d83595c6c92fcfcbb41b8 Mon Sep 17 00:00:00 2001 From: phl0 Date: Thu, 2 Jan 2025 22:19:33 +0100 Subject: [PATCH 3/3] Lower edge is 420MHz even --- application/libraries/Frequency.php | 2 +- assets/js/radiohelpers.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/libraries/Frequency.php b/application/libraries/Frequency.php index b61aee72d..bcea54baf 100644 --- a/application/libraries/Frequency.php +++ b/application/libraries/Frequency.php @@ -193,7 +193,7 @@ class Frequency { $Band = "2m"; } else if ($Frequency > 218000000 && $Frequency < 226000000) { $Band = "1.25m"; - } else if ($Frequency > 430000000 && $Frequency < 450000000) { + } else if ($Frequency > 420000000 && $Frequency < 450000000) { $Band = "70cm"; } else if ($Frequency > 900000000 && $Frequency < 930000000) { $Band = "33cm"; diff --git a/assets/js/radiohelpers.js b/assets/js/radiohelpers.js index 7323bec95..74da03d56 100644 --- a/assets/js/radiohelpers.js +++ b/assets/js/radiohelpers.js @@ -40,7 +40,7 @@ function frequencyToBand(frequency) { else if(result >= 219000000 && result <= 225000000) { return '1.25m'; } - else if(result >= 430000000 && result <= 450000000) { + else if(result >= 420000000 && result <= 450000000) { return '70cm'; } else if(result >= 902000000 && result <= 928000000) {