goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Merge pull request #109 from rmc47/master

浏览代码 
Refactoring a bit of the CAT update code
这个提交包含在：
Peter Goodhall 2012-12-13 16:06:32 -08:00
当前提交 10fd03d006
共有 5 个文件被更改，包括 57 次插入 和 111 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

2
.gitignore vendored 普通文件
查看文件

@ -0,0 +1,2 @@
/application/config/database.php
/application/config/config.php

6
application/config/config.php → application/config/config.sample.php
查看文件

@ -28,9 +28,9 @@ $config['callbook'] = "qrz"; // Options are hamio or qrz
| 'display_freq' Show or Hide frequnecy info | 'display_freq' Show or Hide frequnecy info
*/ */
$config['table_name'] = "table_hrd_contacts_v01"; $config['table_name'] = "TABLE_HRD_CONTACTS_V01";
$config['locator'] = "IO91JS"; $config['locator'] = "";
$config['display_freq'] = false; $config['display_freq'] = true;
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

2
application/config/database.php → application/config/database.sample.php
查看文件

@ -37,7 +37,7 @@
// The following values will probably need to be changed. // The following values will probably need to be changed.
$db['default']['username'] = "root"; $db['default']['username'] = "root";
$db['default']['password'] = ""; $db['default']['password'] = "";
$db['default']['database'] = "2e0sql_log"; $db['default']['database'] = "log";
// The following values can probably stay the same. // The following values can probably stay the same.
$db['default']['hostname'] = "localhost"; $db['default']['hostname'] = "localhost";

113
application/views/qso/index.php
查看文件

@ -1,10 +1,9 @@
<!-- JS --> <!-- JS -->
<script type="text/javascript" src="<?php echo base_url() ;?>/fancybox/jquery.mousewheel-3.0.4.pack.js"></script> <script type="text/javascript" src="<?php echo base_url() ;?>/fancybox/jquery.mousewheel-3.0.4.pack.js"></script>
<script type="text/javascript" src="<?php echo base_url() ;?>/fancybox/jquery.fancybox-1.3.4.pack.js"></script> <script type="text/javascript" src="<?php echo base_url() ;?>/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
<script type="text/javascript" src="<?php echo base_url() ;?>/js/jquery.jclock.js"></script> <script type="text/javascript" src="<?php echo base_url() ;?>/js/jquery.jclock.js"></script>
<script type="text/javascript" src="<?php echo base_url() ;?>/js/radiohelpers.js"></script>
<link rel="stylesheet" type="text/css" href="<?php echo base_url() ;?>/fancybox/jquery.fancybox-1.3.4.css" media="screen" /> <link rel="stylesheet" type="text/css" href="<?php echo base_url() ;?>/fancybox/jquery.fancybox-1.3.4.css" media="screen" />
@ -295,54 +294,12 @@
$("#callsign").focus(); $("#callsign").focus();
/* Javascript for controlling rig frequency. */ /* Javascript for controlling rig frequency. */
// Update frequency every second var updateFromCAT = function() {
setInterval(function() {
if($('select.radios option:selected').val() != '0') { if($('select.radios option:selected').val() != '0') {
// Get frequency // Get frequency
$.get('radio/frequency/' + $('select.radios option:selected').val(), function(result) { $.get('radio/frequency/' + $('select.radios option:selected').val(), function(result) {
$('#frequency').val(result); $('#frequency').val(result);
$(".band").val(frequencyToBand(result));
result = parseInt(result);
if(result >= 14000000 && result <= 14400000) {
$(".band").val('20m');
}
else if(result >= 18000000 && result <= 19000000) {
$(".band").val('17m');
}
else if(result >= 1810000 && result <= 2000000) {
$(".band").val('160m');
}
else if(result >= 3000000 && result <= 4000000) {
$(".band").val('80m');
}
else if(result >= 5250000 && result <= 5450000) {
$(".band").val('60m');
}
else if(result >= 7000000 && result <= 7500000) {
$(".band").val('40m');
}
else if(result >= 10000000 && result <= 11000000) {
$(".band").val('30m');
}
else if(result >= 21000000 && result <= 21600000) {
$(".band").val('15m');
}
else if(result >= 24000000 && result <= 25000000) {
$(".band").val('12m');
}
else if(result >= 28000000 && result <= 30000000) {
$(".band").val('10m');
}
else if(result >= 50000000 && result <= 56000000) {
$(".band").val('6m');
}
else if(result >= 144000000 && result <= 148000000) {
$(".band").val('2m');
}
else if(result >= 430000000 && result <= 440000000) {
$(".band").val('70cm');
}
}); });
// Get Mode // Get Mode
@ -354,69 +311,13 @@
} }
}); });
} }
}, 1000); };
// Update frequency every second
setInterval(updateFromCAT, 1000);
// If a radios selected from drop down select radio update. // If a radios selected from drop down select radio update.
$('.radios').change(function() { $('.radios').change(updateFromCAT);
if($('select.radios option:selected').val() != '0') {
// Get frequency
$.get('radio/frequency/' + $('select.radios option:selected').val(), function(result) {
$('#frequency').val(result);
result = parseInt(result);
if(result >= 14000000 && result <= 14400000) {
$(".band").val('20m');
}
else if(result >= 18000000 && result <= 19000000) {
$(".band").val('17m');
}
else if(result >= 1810000 && result <= 2000000) {
$(".band").val('160m');
}
else if(result >= 3000000 && result <= 4000000) {
$(".band").val('80m');
}
else if(result >= 5250000 && result <= 5450000) {
$(".band").val('60m');
}
else if(result >= 7000000 && result <= 7500000) {
$(".band").val('40m');
}
else if(result >= 10000000 && result <= 11000000) {
$(".band").val('30m');
}
else if(result >= 21000000 && result <= 21600000) {
$(".band").val('15m');
}
else if(result >= 24000000 && result <= 25000000) {
$(".band").val('12m');
}
else if(result >= 28000000 && result <= 30000000) {
$(".band").val('10m');
}
else if(result >= 50000000 && result <= 56000000) {
$(".band").val('6m');
}
else if(result >= 144000000 && result <= 148000000) {
$(".band").val('2m');
}
else if(result >= 430000000 && result <= 440000000) {
$(".band").val('70cm');
}
});
// Get Mode
$.get('radio/mode/' + $('select.radios option:selected').val(), function(result) {
if (result == "LSB" || result == "USB" || result == "SSB") {
$(".mode").val('SSB');
} else {
$(".mode").val(result);
}
});
}
});
/* On Page Load */ /* On Page Load */
var catcher = function() { var catcher = function() {

43
js/radiohelpers.js 普通文件
查看文件

@ -0,0 +1,43 @@
function frequencyToBand(frequency) {
result = parseInt(frequency);
if(result >= 14000000 && result <= 14400000) {
return '20m';
}
else if(result >= 18000000 && result <= 19000000) {
return '17m';
}
else if(result >= 1810000 && result <= 2000000) {
return '160m';
}
else if(result >= 3000000 && result <= 4000000) {
return '80m';
}
else if(result >= 5250000 && result <= 5450000) {
return '60m';
}
else if(result >= 7000000 && result <= 7500000) {
return '40m';
}
else if(result >= 10000000 && result <= 11000000) {
return '30m';
}
else if(result >= 21000000 && result <= 21600000) {
return '15m';
}
else if(result >= 24000000 && result <= 25000000) {
return '12m';
}
else if(result >= 28000000 && result <= 30000000) {
return '10m';
}
else if(result >= 50000000 && result <= 56000000) {
return '6m';
}
else if(result >= 144000000 && result <= 148000000) {
return '2m';
}
else if(result >= 430000000 && result <= 440000000) {
return '70cm';
}
}