mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Addition of 33cm and 1.25m bands where appropriate, reclassification of some bands as Microwave rather than UHF

pull/1377/head
Ryan Zink 2022-01-20 21:10:16 -07:00
rodzic 1b343f036e
commit 6b4a328bc1
7 zmienionych plików z 47 dodań i 20 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
application/config/bands.php
Wyświetl plik

@ -1,4 +1,4 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
$config['bands_available'] = array("160m", "80m", "60m", "40m", "30m", "20m", "17m", "15m", "12m", "10m", "6m", "4m", "2m", "70cm", "23cm", "13cm", "9cm", "6cm", "3cm", "1.25cm");
$config['bands_available'] = array("160m", "80m", "60m", "40m", "30m", "20m", "17m", "15m", "12m", "10m", "6m", "4m", "2m", "1.25m", "70cm", "33cm", "23cm", "13cm", "9cm", "6cm", "3cm", "1.25cm");

8
application/libraries/Frequency.php
Wyświetl plik

@ -54,10 +54,18 @@ class Frequency {
'SSB'=>"144300000",
'DATA'=>"144370000",
'CW'=>"144050000"),
'1.25m'=>array(
'SSB'=>"222100000",
'DATA'=>"222100000",
'CW'=>"222100000"),
'70cm'=>array(
'SSB'=>"432200000",
'DATA'=>"432088000",
'CW'=>"432050000"),
'33cm'=>array(
'SSB'=>"902100000",
'DATA'=>"902100000",
'CW'=>"902100000"),
'23cm'=>array(
'SSB'=>"1296000000",
'DATA'=>"1296138000",

8
application/models/Bands.php
Wyświetl plik

@ -13,10 +13,12 @@ class Bands extends CI_Model {
"15m"=>0,
"12m"=>0,
"10m"=>0,
"6m" =>0,
"4m" =>0,
"2m" =>0,
"6m"=>0,
"4m"=>0,
"2m"=>0,
"1.25m"=>0,
"70cm"=>0,
"33cm"=>0,
"23cm"=>0,
"13cm"=>0,
"9cm"=>0,

8
application/views/contesting/index.php
Wyświetl plik

@ -77,16 +77,18 @@
<option value="6m" <?php if($this->session->userdata('band') == "6m") { echo "selected=\"selected\""; } ?>>6m</option>
<option value="4m" <?php if($this->session->userdata('band') == "4m") { echo "selected=\"selected\""; } ?>>4m</option>
<option value="2m" <?php if($this->session->userdata('band') == "2m") { echo "selected=\"selected\""; } ?>>2m</option>
<option value="1.25m"> <?php if($this->session->userdata('band') == "1.25m") echo "selected=\"selected\""; } ?>>1.25m</option>
</optgroup>
<optgroup label="UHF">
<option value="70cm" <?php if($this->session->userdata('band') == "70cm") { echo "selected=\"selected\""; } ?>>70cm</option>
<option value="23cm" <?php if($this->session->userdata('band') == "23cm") { echo "selected=\"selected\""; } ?>>23cm</option>
<option value="13cm" <?php if($this->session->userdata('band') == "13cm") { echo "selected=\"selected\""; } ?>>13cm</option>
<option value="9cm" <?php if($this->session->userdata('band') == "9cm") { echo "selected=\"selected\""; } ?>>9cm</option>
<option value="33cm" <?php if($this->session->userdata('band') == "33cm") { echo "selected=\"selected\""; } ?>>33cm</option>
</optgroup>
<optgroup label="Microwave">
<option value="23cm" <?php if($this->session->userdata('band') == "23cm") { echo "selected=\"selected\""; } ?>>23cm</option>
<option value="13cm" <?php if($this->session->userdata('band') == "13cm") { echo "selected=\"selected\""; } ?>>13cm</option>
<option value="9cm" <?php if($this->session->userdata('band') == "9cm") { echo "selected=\"selected\""; } ?>>9cm</option>
<option value="6cm" <?php if($this->session->userdata('band') == "6cm") { echo "selected=\"selected\""; } ?>>6cm</option>
<option value="3cm" <?php if($this->session->userdata('band') == "3cm") { echo "selected=\"selected\""; } ?>>3cm</option>
</optgroup>

19
application/views/qso/edit_ajax.php
Wyświetl plik

@ -105,17 +105,20 @@
<option value="6m" <?php if(strtolower($qso->COL_BAND == "6m")) { echo "selected=\"selected\""; } ?>>6m</option>
<option value="4m" <?php if(strtolower($qso->COL_BAND == "4m")) { echo "selected=\"selected\""; } ?>>4m</option>
<option value="2m" <?php if(strtolower($qso->COL_BAND == "2m")) { echo "selected=\"selected\""; } ?>>2m</option>
<option value="1.25m" <?php if(strtolower($qso->COL_BAND == "1.25m")) { echo "selected=\"selected\""; } ?>>1.25m</option>
</optgroup>
<optgroup label="UHF">
<option value="70cm" <?php if(strtolower($qso->COL_BAND == "70cm")) { echo "selected=\"selected\""; } ?>>70cm</option>
<option value="23cm" <?php if(strtolower($qso->COL_BAND == "23cm")) { echo "selected=\"selected\""; } ?>>23cm</option>
<option value="13cm" <?php if(strtolower($qso->COL_BAND == "13cm")) { echo "selected=\"selected\""; } ?>>13cm</option>
<option value="9cm" <?php if(strtolower($qso->COL_BAND == "9cm")) { echo "selected=\"selected\""; } ?>>9cm</option>
<option value="33cm" <?php if(strtolower($qso->COL_BAND == "33cm")) { echo "selected=\"selected\""; } ?>>33cm</option>
</optgroup>
<optgroup label="Microwave">
<option value="3cm" <?php if($qso->COL_BAND == "3cm") { echo "selected=\"selected\""; } ?>>3cm</option>
<option value="23cm" <?php if(strtolower($qso->COL_BAND == "23cm")) { echo "selected=\"selected\""; } ?>>23cm</option>
<option value="13cm" <?php if(strtolower($qso->COL_BAND == "13cm")) { echo "selected=\"selected\""; } ?>>13cm</option>
<option value="9cm" <?php if(strtolower($qso->COL_BAND == "9cm")) { echo "selected=\"selected\""; } ?>>9cm</option>
<option value="6cm" <?php if(strtolower($qso->COL_BAND == "6cm")) { echo "selected=\"selected\""; } ?>>6cm</option>
<option value="3cm" <?php if(strtolower($qso->COL_BAND == "3cm")) { echo "selected=\"selected\""; } ?>>3cm</option>
</optgroup>
</select>
</div>
@ -141,17 +144,19 @@
<option value="6m" <?php if(strtolower($qso->COL_BAND_RX == "6m")) { echo "selected=\"selected\""; } ?>>6m</option>
<option value="4m" <?php if(strtolower($qso->COL_BAND_RX == "4m")) { echo "selected=\"selected\""; } ?>>4m</option>
<option value="2m" <?php if(strtolower($qso->COL_BAND_RX == "2m")) { echo "selected=\"selected\""; } ?>>2m</option>
<option value="1.25m" <?php if(strtolower($qso->COL_BAND_RX == "1.25m")) { echo "selected=\"selected\""; } ?>>1.25m</option>
</optgroup>
<optgroup label="UHF">
<option value="70cm" <?php if(strtolower($qso->COL_BAND_RX == "70cm")) { echo "selected=\"selected\""; } ?>>70cm</option>
<option value="23cm" <?php if(strtolower($qso->COL_BAND_RX == "23cm")) { echo "selected=\"selected\""; } ?>>23cm</option>
<option value="13cm" <?php if(strtolower($qso->COL_BAND_RX == "13cm")) { echo "selected=\"selected\""; } ?>>13cm</option>
<option value="9cm" <?php if(strtolower($qso->COL_BAND_RX == "9cm")) { echo "selected=\"selected\""; } ?>>9cm</option>
</optgroup>
<optgroup label="Microwave">
<option value="3cm" <?php if($qso->COL_BAND_RX == "3cm") { echo "selected=\"selected\""; } ?>>3cm</option>
<option value="13cm" <?php if(strtolower($qso->COL_BAND_RX == "13cm")) { echo "selected=\"selected\""; } ?>>13cm</option>
<option value="9cm" <?php if(strtolower($qso->COL_BAND_RX == "9cm")) { echo "selected=\"selected\""; } ?>>9cm</option>
<option value="6cm" <?php if(strtolower($qso->COL_BAND_RX == "6cm")) { echo "selected=\"selected\""; } ?>>6cm</option>
<option value="3cm" <?php if(strtolower($qso->COL_BAND_RX == "3cm")) { echo "selected=\"selected\""; } ?>>3cm</option>
</optgroup>
</select>
</div>

16
application/views/qso/index.php
Wyświetl plik

@ -108,16 +108,18 @@
<option value="6m" <?php if($this->session->userdata('band') == "6m") { echo "selected=\"selected\""; } ?>>6m</option>
<option value="4m" <?php if($this->session->userdata('band') == "4m") { echo "selected=\"selected\""; } ?>>4m</option>
<option value="2m" <?php if($this->session->userdata('band') == "2m") { echo "selected=\"selected\""; } ?>>2m</option>
<option value="1.25m" <?php if($this->session->userdata('band') == "1.25m") { echo "selected=\"selected\""; } ?>>1.25m</option>
</optgroup>
<optgroup label="UHF">
<option value="70cm" <?php if($this->session->userdata('band') == "70cm") { echo "selected=\"selected\""; } ?>>70cm</option>
<option value="23cm" <?php if($this->session->userdata('band') == "23cm") { echo "selected=\"selected\""; } ?>>23cm</option>
<option value="13cm" <?php if($this->session->userdata('band') == "13cm") { echo "selected=\"selected\""; } ?>>13cm</option>
<option value="9cm" <?php if($this->session->userdata('band') == "9cm") { echo "selected=\"selected\""; } ?>>9cm</option>
<option value="33cm" <?php if($this->session->userdata('band') == "33cm") { echo "selected=\"selected\""; } ?>>33cm</option>
</optgroup>
<optgroup label="Microwave">
<option value="23cm" <?php if($this->session->userdata('band') == "23cm") { echo "selected=\"selected\""; } ?>>23cm</option>
<option value="13cm" <?php if($this->session->userdata('band') == "13cm") { echo "selected=\"selected\""; } ?>>13cm</option>
<option value="9cm" <?php if($this->session->userdata('band') == "9cm") { echo "selected=\"selected\""; } ?>>9cm</option>
<option value="6cm" <?php if($this->session->userdata('band') == "6cm") { echo "selected=\"selected\""; } ?>>6cm</option>
<option value="3cm" <?php if($this->session->userdata('band') == "3cm") { echo "selected=\"selected\""; } ?>>3cm</option>
</optgroup>
@ -223,16 +225,18 @@
<option value="6m" <?php if($this->session->userdata('band_rx') == "6m") { echo "selected=\"selected\""; } ?>>6m</option>
<option value="4m" <?php if($this->session->userdata('band_rx') == "4m") { echo "selected=\"selected\""; } ?>>4m</option>
<option value="2m" <?php if($this->session->userdata('band_rx') == "2m") { echo "selected=\"selected\""; } ?>>2m</option>
<option value="1.25m" <?php if($this->session->userdata('band_rx') == "1.25m") { echo "selected=\"selected\""; } ?>>1.25m</option>
</optgroup>
<optgroup label="UHF">
<option value="70cm" <?php if($this->session->userdata('band_rx') == "70cm") { echo "selected=\"selected\""; } ?>>70cm</option>
<option value="23cm" <?php if($this->session->userdata('band_rx') == "23cm") { echo "selected=\"selected\""; } ?>>23cm</option>
<option value="13cm" <?php if($this->session->userdata('band_rx') == "13cm") { echo "selected=\"selected\""; } ?>>13cm</option>
<option value="9cm" <?php if($this->session->userdata('band_rx') == "9cm") { echo "selected=\"selected\""; } ?>>9cm</option>
<option value="33cm" <?php if($this->session->userdata('band_rx') == "33cm") { echo "selected=\"selected\""; } ?>>33cm</option>
</optgroup>
<optgroup label="Microwave">
<option value="23cm" <?php if($this->session->userdata('band_rx') == "23cm") { echo "selected=\"selected\""; } ?>>23cm</option>
<option value="13cm" <?php if($this->session->userdata('band_rx') == "13cm") { echo "selected=\"selected\""; } ?>>13cm</option>
<option value="9cm" <?php if($this->session->userdata('band_rx') == "9cm") { echo "selected=\"selected\""; } ?>>9cm</option>
<option value="6cm" <?php if($this->session->userdata('band_rx') == "6cm") { echo "selected=\"selected\""; } ?>>6cm</option>
<option value="3cm" <?php if($this->session->userdata('band_rx') == "3cm") { echo "selected=\"selected\""; } ?>>3cm</option>
</optgroup>

6
assets/js/radiohelpers.js
Wyświetl plik

@ -37,9 +37,15 @@ function frequencyToBand(frequency) {
else if(result >= 144000000 && result <= 148000000) {
return '2m';
}
else if(result >= 219000000 && result <= 225000000) {
return '1.25m';
}
else if(result >= 430000000 && result <= 440000000) {
return '70cm';
}
else if(result >= 902000000 && result <= 928000000) {
return '33cm';
}
else if(result >= 1200000000 && result <= 1600000000) {
return '23cm';
}