kopia lustrzana https://github.com/magicbug/Cloudlog
Merge pull request #233 from teabreakninja/master
Fixed adding non 'SSB','DATA','CW' qsopull/234/head
commit
b7a153bbba
|
@ -1,6 +1,12 @@
|
|||
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
|
||||
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');
|
||||
|
||||
public $defaultFrequencies = array(
|
||||
'160m'=>array(
|
||||
'SSB'=>"1900000",
|
||||
|
@ -75,17 +81,34 @@ class Frequency {
|
|||
'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";
|
||||
// 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";
|
||||
}
|
||||
|
||||
return $this->defaultFrequencies[$band][$mode];
|
||||
// If the mode isn't listed, default to SSB frequency
|
||||
if (!in_array($mode, $known_modes)){
|
||||
$mode = 'SSB';
|
||||
}
|
||||
|
||||
}
|
||||
public function GetBand($Frequency) {
|
||||
return $this->defaultFrequencies[$band][$mode];
|
||||
|
||||
}
|
||||
|
||||
public function GetBand($Frequency) {
|
||||
$Band = NULL;
|
||||
if ($Frequency > 1000000 && $Frequency < 2000000) {
|
||||
$Band = "160m";
|
||||
|
|
|
@ -69,31 +69,15 @@
|
|||
<tr>
|
||||
<td class="title">Mode</td>
|
||||
<td><select name="mode" class="mode">
|
||||
<option value="SSB" <?php if($this->session->userdata('mode') == "" || $this->session->userdata('mode') == "SSB") { echo "selected=\"selected\""; } ?>>SSB</option>
|
||||
<option value="AM" <?php if($this->session->userdata('mode') == "AM") { echo "selected=\"selected\""; } ?>>AM</option>
|
||||
<option value="FM" <?php if($this->session->userdata('mode') == "FM") { echo "selected=\"selected\""; } ?>>FM</option>
|
||||
<option value="CW" <?php if($this->session->userdata('mode') == "CW") { echo "selected=\"selected\""; } ?>>CW</option>
|
||||
<option value="RTTY" <?php if($this->session->userdata('mode') == "RTTY") { echo "selected=\"selected\""; } ?>>RTTY</option>
|
||||
<option value="PSK31" <?php if($this->session->userdata('mode') == "PSK31") { echo "selected=\"selected\""; } ?>>PSK31</option>
|
||||
<option value="PSK63" <?php if($this->session->userdata('mode') == "PSK63") { echo "selected=\"selected\""; } ?>>PSK63</option>
|
||||
<option value="JT65" <?php if($this->session->userdata('mode') == "JT65") { echo "selected=\"selected\""; } ?>>JT65</option>
|
||||
<option value="JT65B" <?php if($this->session->userdata('mode') == "JT65B") { echo "selected=\"selected\""; } ?>>JT65B</option>
|
||||
<option value="JT6C" <?php if($this->session->userdata('mode') == "JT6C") { echo "selected=\"selected\""; } ?>>JT6C</option>
|
||||
<option value="JT6M" <?php if($this->session->userdata('mode') == "JT6M") { echo "selected=\"selected\""; } ?>>JT6M</option>
|
||||
<option value="JT9-1" <?php if($this->session->userdata('mode') == "JT9-1") { echo "selected=\"selected\""; } ?>>JT9-1</option>
|
||||
<option value="FSK441" <?php if($this->session->userdata('mode') == "FSK441") { echo "selected=\"selected\""; } ?>>FSK441</option>
|
||||
<option value="JTMS" <?php if($this->session->userdata('mode') == "JTMS") { echo "selected=\"selected\""; } ?>>JTMS</option>
|
||||
<option value="ISCAT" <?php if($this->session->userdata('mode') == "ISCAT") { echo "selected=\"selected\""; } ?>>ISCAT</option>
|
||||
<option value="MSK144" <?php if($this->session->userdata('mode') == "MSK144") { echo "selected=\"selected\""; } ?>>MSK144</option>
|
||||
<option value="JTMSK" <?php if($this->session->userdata('mode') == "JTMSK") { echo "selected=\"selected\""; } ?>>JTMSK</option>
|
||||
<option value="QRA64" <?php if($this->session->userdata('mode') == "QRA64") { echo "selected=\"selected\""; } ?>>QRA64</option>
|
||||
<option value="PKT" <?php if($this->session->userdata('mode') == "PKT") { echo "selected=\"selected\""; } ?>>PKT</option>
|
||||
<option value="FT8" <?php if($this->session->userdata('mode') == "FT8") { echo "selected=\"selected\""; } ?>>FT8</option>
|
||||
<option value="SSTV" <?php if($this->session->userdata('mode') == "SSTV") { echo "selected=\"selected\""; } ?>>SSTV</option>
|
||||
<option value="HELL" <?php if($this->session->userdata('mode') == "HELL") { echo "selected=\"selected\""; } ?>>HELL</option>
|
||||
<option value="HELL80" <?php if($this->session->userdata('mode') == "HELL80") { echo "selected=\"selected\""; } ?>>HELL80</option>
|
||||
<option value="DSTAR" <?php if($this->session->userdata('mode') == "DSTAR") { echo "selected=\"selected\""; } ?>>DSTAR</option>
|
||||
<option value="DIGITALVOICE" <?php if($this->session->userdata('mode') == "DIGITALVOICE") { echo "selected=\"selected\""; } ?>>DIGITALVOICE</option>
|
||||
<?php
|
||||
$this->load->library('frequency');
|
||||
foreach(Frequency::modes as $mode){
|
||||
printf("<option value=\"%s\" %s>%s</option>",
|
||||
$mode,
|
||||
$this->session->userdata('mode')==$mode?"selected=\"selected\"":"",
|
||||
$mode);
|
||||
}
|
||||
?>
|
||||
</select>
|
||||
|
||||
<span class="title">Band</span>
|
||||
|
@ -492,4 +476,4 @@
|
|||
}
|
||||
|
||||
|
||||
</script>
|
||||
</script>
|
||||
|
|
Ładowanie…
Reference in New Issue