From fde19eebd880953e05542a5684fb9a76668eb4c5 Mon Sep 17 00:00:00 2001 From: Jordan Sherer Date: Thu, 16 Aug 2018 15:53:46 -0400 Subject: [PATCH] Updated frequencies to be closer aligned with existing allocations --- FrequencyList.cpp | 45 ++++++++++----------------------------------- 1 file changed, 10 insertions(+), 35 deletions(-) diff --git a/FrequencyList.cpp b/FrequencyList.cpp index a8c35c2..a7c696d 100644 --- a/FrequencyList.cpp +++ b/FrequencyList.cpp @@ -22,45 +22,20 @@ #include "moc_FrequencyList.cpp" -#define ALTFREQS 0 - namespace { FrequencyList_v2::FrequencyItems const default_frequency_list = { -#if ALTFREQS - { 1834000, Modes::FT8CALL, IARURegions::ALL}, // 6 below - { 1842000, Modes::FT8CALL, IARURegions::ALL}, // 2 above -#else - { 1838000, Modes::FT8CALL, IARURegions::ALL}, // 2 below -#endif -#if ALTFREQS - { 3576000, Modes::FT8CALL, IARURegions::ALL}, // 3 above -#else - { 3582000, Modes::FT8CALL, IARURegions::ALL}, // 9 above -#endif - { 7080000, Modes::FT8CALL, IARURegions::ALL}, // 7 above - {10130000, Modes::FT8CALL, IARURegions::ALL}, // 6 below -#if ALTFREQS - {14090000, Modes::FT8CALL, IARURegions::ALL}, // 16 above - {14078000, Modes::FT8CALL, IARURegions::ALL}, // 16 above -#else - {14080000, Modes::FT8CALL, IARURegions::ALL}, // 6 above -#endif - {18104000, Modes::FT8CALL, IARURegions::ALL}, // 4 above -#if ALTFREQS - {21100000, Modes::FT8CALL, IARURegions::ALL}, // 26 above - {21078000, Modes::FT8CALL, IARURegions::ALL}, // 4 above -#else - {21080000, Modes::FT8CALL, IARURegions::ALL}, // 6 above -#endif - {24922000, Modes::FT8CALL, IARURegions::ALL}, // 7 above - {28080000, Modes::FT8CALL, IARURegions::ALL}, // 6 above -#if ALTFREQS - {50318000, Modes::FT8CALL, IARURegions::ALL}, // 5 above -#else - {50300000, Modes::FT8CALL, IARURegions::ALL}, // 13 below -#endif + { 1842500, Modes::FT8CALL, IARURegions::ALL}, // 2.5 above + { 3578500, Modes::FT8CALL, IARURegions::ALL}, // 5.5 above + { 7078500, Modes::FT8CALL, IARURegions::ALL}, // 4.5 above + {10130500, Modes::FT8CALL, IARURegions::ALL}, // 5.5 below + {14078500, Modes::FT8CALL, IARURegions::ALL}, // 4.5 above + {18104500, Modes::FT8CALL, IARURegions::ALL}, // 4.5 above + {21078500, Modes::FT8CALL, IARURegions::ALL}, // 4.5 above + {24922500, Modes::FT8CALL, IARURegions::ALL}, // 9.5 above + {28078500, Modes::FT8CALL, IARURegions::ALL}, // 4.5 above + {50318500, Modes::FT8CALL, IARURegions::ALL}, // 5.5 above }; }