From 1471ac03128944b2c51ed3973a6e60664c2bd380 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Fri, 4 Sep 2020 15:41:19 -0400
Subject: [PATCH] Remove all FST4/FST4W default frequencies for bands 3.5 MHz
 and higher.

---
 models/FrequencyList.cpp | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/models/FrequencyList.cpp b/models/FrequencyList.cpp
index 6829514c7..ec3c185ff 100644
--- a/models/FrequencyList.cpp
+++ b/models/FrequencyList.cpp
@@ -91,10 +91,8 @@ namespace
       // 
       {3570000, Modes::JT65, IARURegions::ALL}, // JA compatible
       {3572000, Modes::JT9, IARURegions::ALL},
-      {3572000, Modes::FST4, IARURegions::ALL},
       {3573000, Modes::FT8, IARURegions::ALL}, // above as below JT65 is out of DM allocation
       {3568600, Modes::WSPR, IARURegions::ALL}, // needs guard marker and lock out
-      {3568800, Modes::FST4W, IARURegions::ALL},
       {3575000, Modes::FT4, IARURegions::ALL},  // provisional
       {3568000, Modes::FT4, IARURegions::R3},   // provisional
 
@@ -130,11 +128,9 @@ namespace
       //     7110         LSB EMCOMM
       //
       {7038600, Modes::WSPR, IARURegions::ALL},
-      {7038800, Modes::FST4W, IARURegions::ALL},
       {7074000, Modes::FT8, IARURegions::ALL},
       {7076000, Modes::JT65, IARURegions::ALL},
       {7078000, Modes::JT9, IARURegions::ALL},
-      {7078000, Modes::FST4, IARURegions::ALL},
       {7047500, Modes::FT4, IARURegions::ALL}, // provisional - moved
                                                // up 500Hz to clear
                                                // W1AW code practice QRG
@@ -168,9 +164,7 @@ namespace
       {10136000, Modes::FT8, IARURegions::ALL},
       {10138000, Modes::JT65, IARURegions::ALL},
       {10138700, Modes::WSPR, IARURegions::ALL},
-      {10138900, Modes::FST4W, IARURegions::ALL},
       {10140000, Modes::JT9, IARURegions::ALL},
-      {10140000, Modes::FST4, IARURegions::ALL},
       {10140000, Modes::FT4, IARURegions::ALL}, // provisional
 
       // Band plans (all USB dial unless stated otherwise)
@@ -211,11 +205,9 @@ namespace
       //     14106.5            OLIVIA 1000 (main QRG)
       // 
       {14095600, Modes::WSPR, IARURegions::ALL},
-      {14095800, Modes::FST4W, IARURegions::ALL},
       {14074000, Modes::FT8, IARURegions::ALL},
       {14076000, Modes::JT65, IARURegions::ALL},
       {14078000, Modes::JT9, IARURegions::ALL},
-      {14078000, Modes::FST4, IARURegions::ALL},
       {14080000, Modes::FT4, IARURegions::ALL}, // provisional
 
       // Band plans (all USB dial unless stated otherwise)
@@ -248,33 +240,25 @@ namespace
       {18100000, Modes::FT8, IARURegions::ALL},
       {18102000, Modes::JT65, IARURegions::ALL},
       {18104000, Modes::JT9, IARURegions::ALL},
-      {18104000, Modes::FST4, IARURegions::ALL},
       {18104000, Modes::FT4, IARURegions::ALL}, // provisional
       {18104600, Modes::WSPR, IARURegions::ALL},
-      {18104800, Modes::FST4W, IARURegions::ALL},
 
       {21074000, Modes::FT8, IARURegions::ALL},
       {21076000, Modes::JT65, IARURegions::ALL},
       {21078000, Modes::JT9, IARURegions::ALL},
-      {21078000, Modes::FST4, IARURegions::ALL},
       {21094600, Modes::WSPR, IARURegions::ALL},
-      {21094800, Modes::FST4W, IARURegions::ALL},
       {21140000, Modes::FT4, IARURegions::ALL},
 
       {24915000, Modes::FT8, IARURegions::ALL},
       {24917000, Modes::JT65, IARURegions::ALL},
       {24919000, Modes::JT9, IARURegions::ALL},
-      {24919000, Modes::FST4, IARURegions::ALL},
       {24919000, Modes::FT4, IARURegions::ALL}, // provisional
       {24924600, Modes::WSPR, IARURegions::ALL},
-      {24924800, Modes::FST4W, IARURegions::ALL},
 
       {28074000, Modes::FT8, IARURegions::ALL},
       {28076000, Modes::JT65, IARURegions::ALL},
       {28078000, Modes::JT9, IARURegions::ALL},
-      {28078000, Modes::FST4, IARURegions::ALL},
       {28124600, Modes::WSPR, IARURegions::ALL},
-      {28124800, Modes::FST4W, IARURegions::ALL},
       {28180000, Modes::FT4, IARURegions::ALL},
 
       {50200000, Modes::Echo, IARURegions::ALL},
@@ -285,11 +269,8 @@ namespace
       {50260000, Modes::MSK144, IARURegions::R3},
       {50293000, Modes::WSPR, IARURegions::R2},
       {50293000, Modes::WSPR, IARURegions::R3},
-      {50293200, Modes::FST4W, IARURegions::R2},
-      {50293200, Modes::FST4W, IARURegions::R3},
       {50310000, Modes::JT65, IARURegions::ALL},
       {50312000, Modes::JT9, IARURegions::ALL},
-      {50312000, Modes::FST4, IARURegions::ALL},
       {50313000, Modes::FT8, IARURegions::ALL},
       {50318000, Modes::FT4, IARURegions::ALL}, // provisional
       {50323000, Modes::FT8, IARURegions::ALL},
@@ -298,7 +279,6 @@ namespace
       {70102000, Modes::JT65, IARURegions::R1},
       {70104000, Modes::JT9, IARURegions::R1},
       {70091000, Modes::WSPR, IARURegions::R1},
-      {70091200, Modes::FST4W, IARURegions::R2},
       {70230000, Modes::MSK144, IARURegions::R1},
       
       {144120000, Modes::JT65, IARURegions::ALL},
@@ -308,7 +288,6 @@ namespace
       {144360000, Modes::MSK144, IARURegions::R1},
       {144150000, Modes::MSK144, IARURegions::R2},
       {144489000, Modes::WSPR, IARURegions::ALL},
-      {144489200, Modes::FST4W, IARURegions::R2},
       {144120000, Modes::QRA64, IARURegions::ALL},
       
       {222065000, Modes::Echo, IARURegions::R2},