diff --git a/application/libraries/Frequency.php b/application/libraries/Frequency.php index d19a8c64..42e838be 100644 --- a/application/libraries/Frequency.php +++ b/application/libraries/Frequency.php @@ -2,10 +2,9 @@ class Frequency { const modes = array('SSB','FM','AM','CW','DSTAR','F4M','DMR','DIGITALVOICE', - 'PSK31','PSK63','RTTY', - 'JT65','JT65B','JT6C','JT9-1','JT9','FT8', - 'FSK441','JTMS','ISCAT','MSK144','JTMSK', - 'QRA64','PKT','SSTV','HELL','HELL80'); + 'PSK31','PSK63','RTTY','JT65','JT65B','JT6C','JT9-1', + 'JT9','FT8','FSK441','JTMS','ISCAT','MSK144','JTMSK', + 'QRA64','PKT','SSTV','HELL','HELL80'); public $defaultFrequencies = array( '160m'=>array( @@ -55,7 +54,7 @@ class Frequency { '2m'=>array( 'SSB'=>"144300000", 'DATA'=>"144370000", - 'CW'=>"144.050000"), + 'CW'=>"144050000"), '70cm'=>array( 'SSB'=>"432200000", 'DATA'=>"432088000", @@ -80,35 +79,34 @@ class Frequency { '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') { - // Modes for which we've set a frequency - $known_modes = array('SSB', 'DATA', 'CW'); - - // Data modes that are being treated as 'DATA' for frequency lookup - $data_modes = array('PSK31','PSK63','RTTY', - 'JT65','JT65B','JT6C','JT9-1','JT9','FT8', - 'FSK441','JTMS','ISCAT','MSK144','JTMSK', - 'QRA64','PKT','SSTV','HELL','HELL80'); - - // Use 'DATA' for any of the data modes - if(in_array($mode, $data_modes)){ - $mode= "DATA"; - } + // Modes for which we've set a frequency + $known_modes = array('SSB', 'DATA', 'CW'); + + // Data modes that are being treated as 'DATA' for frequency lookup + $data_modes = array('PSK31','PSK63','RTTY', + 'JT65','JT65B','JT6C','JT9-1','JT9','FT8', + 'FSK441','JTMS','ISCAT','MSK144','JTMSK', + 'QRA64','PKT','SSTV','HELL','HELL80'); + + // Use 'DATA' for any of the data modes + if(in_array($mode, $data_modes)){ + $mode= "DATA"; + } - // If the mode isn't listed, default to SSB frequency - if (!in_array($mode, $known_modes)){ - $mode = 'SSB'; - } + // If the mode isn't listed, default to SSB frequency + if (!in_array($mode, $known_modes)){ + $mode = 'SSB'; + } return $this->defaultFrequencies[$band][$mode]; + } - } - - public function GetBand($Frequency) { + public function GetBand($Frequency) { $Band = NULL; if ($Frequency > 1000000 && $Frequency < 2000000) { $Band = "160m"; diff --git a/application/views/layout/header.php b/application/views/layout/header.php index 84afcfdd..26d63055 100644 --- a/application/views/layout/header.php +++ b/application/views/layout/header.php @@ -49,9 +49,9 @@