From 61f19f44a26916cafc9ed94acd913b8b2b9e30d3 Mon Sep 17 00:00:00 2001
From: Jeff Rizzo <riz@tastylime.net>
Date: Tue, 15 Nov 2022 10:24:10 -0800
Subject: [PATCH 1/2] Correct USA amateur allocations below 2GHz

 - add 2200m band
 - add 630m band
 - fix 80m band - in US, it's 3.5-4.0 MHz
 - 60m band is 5 discrete "channels"
 - 40m band in US is 7.0-7.3 MHz
 - 10m band in US is 28.0-29.7 MHz
 - 1.25m band is in two parts; 219-220MHz and 222-225 MHz

Source: ARRL, FCC
---
 root/res/bandplans/usa.json | 62 +++++++++++++++++++++++++++++--------
 1 file changed, 49 insertions(+), 13 deletions(-)

diff --git a/root/res/bandplans/usa.json b/root/res/bandplans/usa.json
index 7b1a6f1e..d0daa486 100644
--- a/root/res/bandplans/usa.json
+++ b/root/res/bandplans/usa.json
@@ -5,6 +5,18 @@
     "author_name": "Joshua Kimsey",
     "author_url": "http://jkimsey.tech",
     "bands": [
+        {
+            "name": "2200m Band",
+            "type": "amateur",
+            "start": 135700,
+            "end": 137800
+        },
+        {
+            "name": "630m Band",
+            "type": "amateur",
+            "start": 472000,
+            "end": 479000
+        },
         {
             "name": "Long Wave",
             "type": "broadcast",
@@ -39,12 +51,6 @@
             "name": "80m Ham Band",
             "type": "amateur",
             "start": 3500000,
-            "end": 3950000
-        },
-        {
-            "name": "Shortwave Broadcast",
-            "type": "broadcast",
-            "start": 3950000,
             "end": 4000000
         },
         {
@@ -60,10 +66,34 @@
             "end": 5060000
         },
         {
-            "name": "60m Ham Band",
+            "name": "60m Channel 1",
             "type": "amateur",
-            "start": 5351500,
-            "end": 5366500
+            "start": 5330500,
+            "end": 5333500
+        },
+        {
+            "name": "60m Channel 2",
+            "type": "amateur",
+            "start": 5346500,
+            "end": 5349500
+        },
+        {
+            "name": "60m Channel 3",
+            "type": "amateur",
+            "start": 5357000,
+            "end": 5360000
+        },
+        {
+            "name": "60m Channel 4",
+            "type": "amateur",
+            "start": 5371500,
+            "end": 5374500
+        },
+        {
+            "name": "60m Channel 5",
+            "type": "amateur",
+            "start": 5403500,
+            "end": 5406500
         },
         {
             "name": "Shortwave Broadcast",
@@ -75,12 +105,12 @@
             "name": "40m Ham Band",
             "type": "amateur",
             "start": 7000000,
-            "end": 7200000
+            "end": 7300000
         },
         {
             "name": "Shortwave Broadcast",
             "type": "broadcast",
-            "start": 7200000,
+            "start": 7300000,
             "end": 7450000
         },
         {
@@ -171,7 +201,7 @@
             "name": "10m Ham Band",
             "type": "amateur",
             "start": 28000000,
-            "end": 29750000
+            "end": 29700000
         },
         {
             "name": "6m Ham Band",
@@ -240,7 +270,13 @@
             "end": 216000000
         },
         {
-            "name": "1.25m Ham Band",
+            "name": "1.25m Band (lower)",
+            "type": "amateur",
+            "start": 219000000,
+            "end": 220000000
+        },
+        {
+            "name": "1.25m Band (upper)",
             "type": "amateur",
             "start": 222000000,
             "end": 225000000

From 35204242086da2daf95d848dea606755b7ff2b89 Mon Sep 17 00:00:00 2001
From: AlexandreRouma <alexandre.rouma@gmail.com>
Date: Wed, 23 Nov 2022 08:57:50 +0100
Subject: [PATCH 2/2] Update usa.json

---
 root/res/bandplans/usa.json | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/root/res/bandplans/usa.json b/root/res/bandplans/usa.json
index d0daa486..f0a3884e 100644
--- a/root/res/bandplans/usa.json
+++ b/root/res/bandplans/usa.json
@@ -66,33 +66,9 @@
             "end": 5060000
         },
         {
-            "name": "60m Channel 1",
+            "name": "60m Ham Band",
             "type": "amateur",
             "start": 5330500,
-            "end": 5333500
-        },
-        {
-            "name": "60m Channel 2",
-            "type": "amateur",
-            "start": 5346500,
-            "end": 5349500
-        },
-        {
-            "name": "60m Channel 3",
-            "type": "amateur",
-            "start": 5357000,
-            "end": 5360000
-        },
-        {
-            "name": "60m Channel 4",
-            "type": "amateur",
-            "start": 5371500,
-            "end": 5374500
-        },
-        {
-            "name": "60m Channel 5",
-            "type": "amateur",
-            "start": 5403500,
             "end": 5406500
         },
         {
@@ -360,4 +336,4 @@
             "end": 2450000000
         }
     ]
-}
\ No newline at end of file
+}