From 46d713616c8f72b233cb84efb3fe652e210e59e8 Mon Sep 17 00:00:00 2001
From: DL1YCF <dl1ycf@darc.de>
Date: Wed, 1 Jan 2020 14:04:18 +0100
Subject: [PATCH] 60m band WRC15 corrections

---
 band.c      | 15 +++++----------
 band.h      |  2 +-
 frequency.c |  1 +
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/band.c b/band.c
index 7bb9c87..ca073d5 100644
--- a/band.c
+++ b/band.c
@@ -57,9 +57,9 @@ BANDSTACK_ENTRY bandstack_entries80[] =
      {3850000LL,modeLSB,filterF5,-2800,-200,-2800,-200}};
 
 BANDSTACK_ENTRY bandstack_entries60_WRC15[] =
-    {{5352750LL,modeCWU,filterF6,200,2800,200,2800},    // WRC15 60m band allocation
-     {5357000LL,modeUSB,filterF5,200,2800,200,2800},    // sub-bands reflect IARU R1
-     {5363000LL,modeUSB,filterF5,200,2800,200,2800}};   // recommendation
+    {{5352750LL,modeCWU,filterF6,200,2800,200,2800},
+     {5357000LL,modeUSB,filterF5,200,2800,200,2800},
+     {5363000LL,modeUSB,filterF5,200,2800,200,2800}};
 
 BANDSTACK_ENTRY bandstack_entries60_OTHER[] =
     {{5332000LL,modeUSB,filterF5,-2800,-200,-2800,-200}, // default channels for
@@ -317,15 +317,10 @@ CHANNEL band_channels_60m_UK[UK_CHANNEL_ENTRIES] =
 
 //
 // Many countries have now allowed ham radio on the 60m
-// band based on WRC15. There are no "channels", but
-// an IARU region 1 recommendation can be read that
-// there is a CW segment, an all-mode segment
-// and a small weak-signal segment.
+// band based on WRC15. There is a single 15 kHz wide "channel"
 //
 CHANNEL band_channels_60m_WRC15[WRC15_CHANNEL_ENTRIES] =
-     {{5352750LL, 2500LL},    // CW channel:           5351.5 to 5354   kHz
-      {5360000LL,12000LL},    // Phone and DigiModes:  5354   to 5360   kHz
-      {5366250LL, 500LL}};    // Weak narrow signals:  5366   to 5366.5 kHz
+     {{5359000LL,15000LL}};
 
 CHANNEL band_channels_60m_OTHER[OTHER_CHANNEL_ENTRIES] =
      {{5332000LL,2800LL},
diff --git a/band.h b/band.h
index 8e1762e..026f318 100644
--- a/band.h
+++ b/band.h
@@ -97,7 +97,7 @@ gboolean displayHF;
 
 #define UK_CHANNEL_ENTRIES 11
 #define OTHER_CHANNEL_ENTRIES 5
-#define WRC15_CHANNEL_ENTRIES 3
+#define WRC15_CHANNEL_ENTRIES 1
 
 extern int channel_entries;
 extern CHANNEL *band_channels_60m;
diff --git a/frequency.c b/frequency.c
index 16bb720..9505fbd 100644
--- a/frequency.c
+++ b/frequency.c
@@ -372,6 +372,7 @@ struct frequency_info frequencyInfo[]=
         {    4750000LL,     4999999LL, "60M Short Wave",                     bandGen, FALSE},
         {    5000000LL,     5000000LL, "WWV",                                bandWWV, FALSE},
         {    5261250LL,     5408000LL, "60M",                                band60,  TRUE },
+        {    5261250LL,     5408000LL, "60M",                                band60,  FALSE},
         {    5900000LL,     6200000LL, "49M Short Wave",                     bandGen, FALSE},
         {    7000000LL,     7299999LL, "40M",                                band40,  TRUE },
         {    7300000LL,     7350000LL, "41M Short Wave",                     bandGen, FALSE},
-- 
2.45.2