Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

correct format in live status (qso view)

Browse Source
This commit is contained in:
HB9HIL
2024-08-21 14:21:34 +02:00
parent 1534d21eb9
commit 7772c5d6f4
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Radio.php
View File

@@ -197,8 +197,10 @@ class Radio extends CI_Controller {
// Return Json data
$a_ret['frequency'] = $frequency;
$a_ret['frequency_formatted'] = $this->frequency->qrg_conversion($frequency);
if (isset($frequency_rx) && ($frequency_rx != null)) {
$a_ret['frequency_rx'] = $frequency_rx;
$a_ret['frequency_rx_formatted'] = $this->frequency->qrg_conversion($frequency_rx);
}
if (isset($mode) && ($mode != null)) {
$a_ret['mode'] = $mode;

4
application/views/interface_assets/footer.php
View File

@@ -1197,7 +1197,7 @@ $($('#callsign')).on('keypress',function(e) {
}
} else {
$(".radio_timeout_error" ).remove();
text = '<i class="fas fa-broadcast-tower"></i><span style="margin-left:10px;"></span><b>TX:</b> '+(Math.round(parseInt(data.frequency)/100)/10000).toFixed(4)+' MHz';
text = '<i class="fas fa-broadcast-tower"></i><span style="margin-left:10px;"></span><b>TX:</b> ' + data.frequency_formatted;
if(data.mode != null) {
text = text+'<span style="margin-left:10px"></span>'+data.mode;
}
@@ -1212,7 +1212,7 @@ $($('#callsign')).on('keypress',function(e) {
}
}
if(data.frequency_rx != null && data.frequency_rx != 0) {
ptext = ptext + '<span style="margin-left:10px"></span><b>RX:</b> ' + (Math.round(parseInt(data.frequency_rx)/1000)/1000).toFixed(3) + ' MHz';
ptext = ptext + '<span style="margin-left:10px"></span><b>RX:</b> ' + data.frequency_rx_formatted;
}
if( ptext != '') { text = text + '<span style="margin-left:10px"></span>(' + ptext + ')';}
if (! $('#radio_cat_state').length) {