From 8db85dc69a7a399e60438521b9ccc5edb08857cf Mon Sep 17 00:00:00 2001
From: Robert Kaldenbach <robert.kaldenbach@gmail.com>
Date: Sat, 18 Feb 2017 14:10:32 -0500
Subject: [PATCH] refactored  convent band function

---
 application/libraries/Frequency.php | 161 +++++++++++++---------------
 1 file changed, 75 insertions(+), 86 deletions(-)

diff --git a/application/libraries/Frequency.php b/application/libraries/Frequency.php
index 36bb4788..aeb12841 100644
--- a/application/libraries/Frequency.php
+++ b/application/libraries/Frequency.php
@@ -1,100 +1,92 @@
 <?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
-
 class Frequency {
 
+  public $defaultFrequencies = array(
+        '160m'=>array(
+  	'SSB'=>"1900000",
+  	'DATA'=>"1838000",
+  	'CW'=>"1830000"),
+        '80m'=>array(
+  	'SSB'=>"3700000",
+  	'DATA'=>"3583000",
+  	"CW"=>"3550000"),
+        '40m'=>array(
+  	'SSB'=>"7100000",
+  	'DATA'=>"7040000",
+  	'CW'=>"7020000"),
+        '30m'=>array(
+  	'SSB'=>"10120000",
+  	'DATA'=>"10145000",
+  	'CW'=>"10120000"),
+        '20m'=>array(
+  	'SSB'=>"14200000",
+  	'DATA'=>"14080000",
+  	'CW'=>"14020000"),
+        '17m'=>array(
+  	'SSB'=>"18130000",
+  	'DATA'=>"18105000",
+  	'CW'=>"18080000"),
+        '15m'=>array(
+  	'SSB'=>"21300000",
+  	'DATA'=>"21080000",
+  	'CW'=>"21020000"),
+        '12m'=>array(
+  	'SSB'=>"24950000",
+  	'DATA'=>"24925000",
+  	'CW'=>"24900000"),
+        '10m'=>array(
+  	'SSB'=>"28300000",
+  	'DATA'=>"28120000",
+  	'CW'=>"21050000"),
+        '6m'=>array(
+  	'SSB'=>"50150000",
+  	'DATA'=>"50230000",
+  	'CW'=>"50090000"),
+        '4m'=>array(
+  	'SSB'=>"70200000",
+  	'DATA'=>"70200000",
+  	'CW'=>"70200000"),
+        '2m'=>array(
+  	'SSB'=>"144300000",
+  	'DATA'=>"144370000",
+  	'CW'=>"144.050000"),
+        '70cm'=>array(
+  	'SSB'=>"432200000",
+  	'DATA'=>"432088000",
+  	'CW'=>"432050000"),
+        '23cm'=>array(
+  	'SSB'=>"1296000000",
+  	'DATA'=>"1296138000",
+  	'CW'=>"129600000"),
+        '13cm'=>array(
+  	'SSB'=>"232080000",
+  	'DATA'=>"232080000",
+  	'CW'=>"232080000"),
+        '9cm'=>array(
+  	'SSB'=>"341000000",
+  	'DATA'=>"341000000",
+  	'CW'=>"340000000"),
+        '6cm'=>array(
+  	'SSB'=>"567000000",
+  	'DATA'=>"567000000",
+  	'CW'=>"567000000"),
+        '3cm'=>array(
+  	'SSB'=>"1022500000",
+  	'DATA'=>"1022500000",
+  	'CW'=>"1022500000")
+        );
 	/* Class to convert band and mode into a frequnecy in a format based on the specifications of the database table */
-
 	public function convent_band($band, $mode='SSB')
 	{
-
 	    if($mode == "PSK31" || $mode == "PSK63" || $mode == "RTTY" || $mode == "JT65"){
   		$mode= "DATA";
 	    }
-    
 
-    $frequency = array(
-      '160m'=>array(
-	'SSB'=>"1900000",
-	'DATA'=>"1838000",
-	'CW'=>"1830000"),
-      '80m'=>array(
-	'SSB'=>"3700000",
-	'DATA'=>"3583000",
-	"CW"=>"3550000"),
-      '40m'=>array(
-	'SSB'=>"7100000",
-	'DATA'=>"7040000",
-	'CW'=>"7020000"),
-      '30m'=>array(
-	'SSB'=>"10120000",
-	'DATA'=>"10145000",
-	'CW'=>"10120000"),
-      '20m'=>array(
-	'SSB'=>"14200000",
-	'DATA'=>"14080000",
-	'CW'=>"14020000"),
-      '17m'=>array(
-	'SSB'=>"18130000",
-	'DATA'=>"18105000",
-	'CW'=>"18080000"),
-      '15m'=>array(
-	'SSB'=>"21300000",
-	'DATA'=>"21080000",
-	'CW'=>"21020000"),
-      '12m'=>array(
-	'SSB'=>"24950000",
-	'DATA'=>"24925000",
-	'CW'=>"24900000"),
-      '10m'=>array(
-	'SSB'=>"28300000",
-	'DATA'=>"28120000",
-	'CW'=>"21050000"),
-      '6m'=>array(
-	'SSB'=>"50150000",
-	'DATA'=>"50230000",
-	'CW'=>"50090000"),
-      '4m'=>array(
-	'SSB'=>"70200000",
-	'DATA'=>"70200000",
-	'CW'=>"70200000"),
-      '2m'=>array(
-	'SSB'=>"144300000",
-	'DATA'=>"144370000",
-	'CW'=>"144.050000"),
-      '70cm'=>array(
-	'SSB'=>"432200000",
-	'DATA'=>"432088000",
-	'CW'=>"432050000"),
-      '23cm'=>array(
-	'SSB'=>"1296000000",
-	'DATA'=>"1296138000",
-	'CW'=>"129600000"),
-      '13cm'=>array(
-	'SSB'=>"232080000",
-	'DATA'=>"232080000",
-	'CW'=>"232080000"),
-      '9cm'=>array(
-	'SSB'=>"341000000",
-	'DATA'=>"341000000",
-	'CW'=>"340000000"),
-      '6cm'=>array(
-	'SSB'=>"567000000",
-	'DATA'=>"567000000",
-	'CW'=>"567000000"),
-      '3cm'=>array(
-	'SSB'=>"1022500000",
-	'DATA'=>"1022500000",
-	'CW'=>"1022500000")
-      );
+			return $this->defaultFrequencies[$band][$mode];
 
-			return $frequency[$band][$mode];
-		
 }
-
-
 public function GetBand($Frequency) {
 		$Band = NULL;
-
 		if ($Frequency > 1000000 && $Frequency < 2000000) {
 			$Band = "160m";
 		} else if ($Frequency > 3000000 && $Frequency < 4000000) {
@@ -150,10 +142,7 @@ public function GetBand($Frequency) {
 		} else if ($Frequency >= 250000000000) {
 			$Band = "<1mm";
 		}
-
 		return $Band;
 	}
-
 }
-
 /* End of file Frequency.php */