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

Merge pull request #2434 from int2001/websocket_radio

Browse Source 
Websocket radio
This commit is contained in:
Joerg (DJ7NT)
2025-10-26 05:28:15 +01:00
committed by GitHub
parent 371f9757e6 a13f646cee
commit a5278f468f
6 changed files with 335 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/views/bandmap/list.php
View File

@@ -67,6 +67,7 @@
<label class="my-1 me-2" for="radio"><?= __("Radio"); ?></label>
<select class="form-select form-select-sm radios my-1 me-sm-2 w-auto" id="radio" name="radio">
<option value="0" selected="selected"><?= __("None"); ?></option>
<option value="ws"<?php if ($this->session->userdata('radio') == 'ws') { echo ' selected="selected"'; } ?>><?= __("WebSocket (Requires WLGate>1.1.10)"); ?></option>
<?php foreach ($radios->result() as $row) { ?>
<option value="<?php echo $row->id; ?>" <?php if ($this->session->userdata('radio') == $row->id) {
echo "selected=\"selected\"";

1
application/views/contesting/index.php
View File

@@ -157,6 +157,7 @@
<label for="inputRadio"><?= __("Radio"); ?></label>
<select class="form-select form-select-sm radios" id="radio" name="radio">
<option value="0" selected="selected"><?= __("None"); ?></option>
<option value="ws"<?php if ($this->session->userdata('radio') == 'ws') { echo ' selected="selected"'; } ?>><?= __("WebSocket (Requires WLGate>1.1.10)"); ?></option>
<?php foreach ($radios->result() as $row) { ?>
<option value="<?php echo $row->id; ?>" <?php if($this->session->userdata('radio') == $row->id) { echo "selected=\"selected\""; } ?>><?php echo $row->radio; ?> <?php if ($radio_last_updated->id == $row->id) { echo "(".__("last updated").")"; } else { echo ''; } ?></option>
<?php } ?>

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

@@ -1365,25 +1365,167 @@ mymap.on('mousemove', onQsoMapMove);
<script>
$( document ).ready(function() {
// Javascript for controlling rig frequency.
var updateFromCAT = function() {
var cat2UI = function(ui, cat, allow_empty, allow_zero, callback_on_update) {
// Check, if cat-data is available
if(cat == null) {
return;
} else if (typeof allow_empty !== 'undefined' && !allow_empty && cat == '') {
return;
} else if (typeof allow_zero !== 'undefined' && !allow_zero && cat == '0' ) {
return;
}
// Only update the ui-element, if cat-data has changed
if (ui.data('catValue') != cat) {
ui.val(cat);
ui.data('catValue',cat);
if (typeof callback_on_update === 'function') { callback_on_update(cat); }
}
let websocket = null;
let reconnectAttempts = 0;
let websocketEnabled = false;
let CATInterval=null;
function initializeWebSocketConnection() {
try {
websocket = new WebSocket('ws://localhost:54322');
websocket.onopen = function(event) {
reconnectAttempts = 0;
websocketEnabled = true;
};
websocket.onmessage = function(event) {
try {
const data = JSON.parse(event.data);
handleWebSocketData(data);
} catch (error) {
}
};
websocket.onerror = function(error) {
websocketEnabled=false;
};
websocket.onclose = function(event) {
websocketEnabled = false;
if (reconnectAttempts < 5) {
setTimeout(() => {
reconnectAttempts++;
initializeWebSocketConnection();
}, 2000 * reconnectAttempts);
} else {
$(".radio_cat_state" ).remove();
$('#radio_status').html('<div class="alert alert-danger radio_timeout_error" role="alert"><i class="fas fa-broadcast-tower"></i> Radio connection timed-out: ' + $('select.radios option:selected').text() + ' Websocket connection lost, chose another radio.</div>');
websocketEnabled = false;
}
};
} catch (error) {
websocketEnabled=false;
}
}
function handleWebSocketData(data) {
// Handle welcome message
if (data.type === 'welcome') {
return;
}
// Handle radio status updates
if (data.type === 'radio_status' && data.radio && ($(".radios option:selected").val() == 'ws')) {
data.updated_minutes_ago = Math.floor((Date.now() - data.timestamp) / 60000);
// Cache the radio data
updateCATui(data);
}
}
// Javascript for controlling rig frequency.
const cat2UI = function(ui, cat, allow_empty, allow_zero, callback_on_update) {
// Check, if cat-data is available
if(cat == null) {
return;
} else if (typeof allow_empty !== 'undefined' && !allow_empty && cat == '') {
return;
} else if (typeof allow_zero !== 'undefined' && !allow_zero && cat == '0' ) {
return;
}
// Only update the ui-element, if cat-data has changed
if (ui.data('catValue') != cat) {
ui.val(cat);
ui.data('catValue',cat);
if (typeof callback_on_update === 'function') { callback_on_update(cat); }
}
}
function format_frequency(freq) {
const qrgunit = localStorage.getItem('qrgunit_' + $('#band').val());
let frequency_formatted=null;
if (qrgunit == 'Hz') {
frequency_formatted=freq;
} else if (qrgunit == 'kHz') {
frequency_formatted=(freq / 1000);
} else if (qrgunit == 'MHz') {
frequency_formatted=(freq / 1000000);
} else if (qrgunit == 'GHz') {
frequency_formatted=(freq / 1000000000);
}
return frequency_formatted+''+qrgunit;
}
function updateCATui(data) {
cat2UI($('#frequency'),data.frequency,false,true,function(d){
$('#frequency').trigger('change');
if ($("#band").val() != frequencyToBand(d)) {
$("#band").val(frequencyToBand(d)).trigger('change'); // Let's only change if we really have a different band!
}
});
cat2UI($('#frequency_rx'),data.frequency_rx,false,true,function(d){$("#band_rx").val(frequencyToBand(d))});
cat2UI($('.mode'),catmode(data.mode),false,false,function(d){setRst($(".mode").val())});
cat2UI($('#sat_name'),data.satname,false,false);
cat2UI($('#sat_mode'),data.satmode,false,false);
cat2UI($('#transmit_power'),data.power,false,false);
cat2UI($('#selectPropagation'),data.prop_mode,false,false);
// Display CAT Timeout warning based on the figure given in the config file
var minutes = Math.floor(<?php echo $this->optionslib->get_option('cat_timeout_interval'); ?> / 60);
if(data.updated_minutes_ago > minutes) {
$(".radio_cat_state" ).remove();
if($('.radio_timeout_error').length == 0) {
$('#radio_status').prepend('<div class="alert alert-danger radio_timeout_error" role="alert"><i class="fas fa-broadcast-tower"></i> Radio connection timed-out: ' + $('select.radios option:selected').text() + ' data is ' + data.updated_minutes_ago + ' minutes old.</div>');
} else {
$('.radio_timeout_error').html('Radio connection timed-out: ' + $('select.radios option:selected').text() + ' data is ' + data.updated_minutes_ago + ' minutes old.');
}
} else {
$(".radio_timeout_error" ).remove();
separator = '<span style="margin-left:10px"></span>';
if (!(data.frequency_formatted)) {
data.frequency_formatted=format_frequency(data.frequency);
}
if (data.frequency_formatted) {
text = '<i class="fas fa-broadcast-tower"></i>' + separator + '<b>TX:</b> ' + data.frequency_formatted;
}
if(data.mode != null) {
text = text + separator + data.mode;
}
if(data.power != null && data.power != 0) {
text = text + separator + data.power+' W';
}
complementary_info = []
if(data.prop_mode != null && data.prop_mode != '') {
if (data.prop_mode == 'SAT') {
complementary_info.push(data.prop_mode + ' ' + data.satname);
} else {
complementary_info.push(data.prop_mode);
}
}
if(data.frequency_rx != null && data.frequency_rx != 0) {
data.frequency_rx_formatted=format_frequency(data.frequency_rx);
complementary_info.push('<b>RX:</b> ' + data.frequency_rx_formatted);
}
if( complementary_info.length > 0) {
text = text + separator + '(' + complementary_info.join(separator) + ')';
}
if (! $('#radio_cat_state').length) {
$('#radio_status').prepend('<div aria-hidden="true"><div id="radio_cat_state" class="alert alert-success radio_cat_state" role="alert">'+text+'</div></div>');
} else {
$('#radio_cat_state').html(text);
}
}
}
var updateFromCAT = function() {
if($('select.radios option:selected').val() != '0') {
radioID = $('select.radios option:selected').val();
if ((typeof radioID !== 'undefined') && (radioID !== null) && (radioID !== "")) {
@@ -1410,75 +1552,25 @@ mymap.on('mousemove', onQsoMapMove);
if($('.radio_login_error').length != 0) {
$(".radio_login_error" ).remove();
}
cat2UI($('#frequency'),data.frequency,false,true,function(d){
$('#frequency').trigger('change');
if ($("#band").val() != frequencyToBand(d)) {
$("#band").val(frequencyToBand(d)).trigger('change'); // Let's only change if we really have a different band!
}
});
cat2UI($('#frequency_rx'),data.frequency_rx,false,true,function(d){$("#band_rx").val(frequencyToBand(d))});
cat2UI($('.mode'),data.mode,false,false,function(d){setRst($(".mode").val())});
cat2UI($('#sat_name'),data.satname,false,false);
cat2UI($('#sat_mode'),data.satmode,false,false);
cat2UI($('#transmit_power'),data.power,false,false);
cat2UI($('#selectPropagation'),data.prop_mode,false,false);
// Display CAT Timeout warning based on the figure given in the config file
var minutes = Math.floor(<?php echo $this->optionslib->get_option('cat_timeout_interval'); ?> / 60);
if(data.updated_minutes_ago > minutes) {
$(".radio_cat_state" ).remove();
if($('.radio_timeout_error').length == 0) {
$('#radio_status').prepend('<div class="alert alert-danger radio_timeout_error" role="alert"><i class="fas fa-broadcast-tower"></i> Radio connection timed-out: ' + $('select.radios option:selected').text() + ' data is ' + data.updated_minutes_ago + ' minutes old.</div>');
} else {
$('.radio_timeout_error').html('Radio connection timed-out: ' + $('select.radios option:selected').text() + ' data is ' + data.updated_minutes_ago + ' minutes old.');
}
} else {
$(".radio_timeout_error" ).remove();
separator = '<span style="margin-left:10px"></span>';
text = '<i class="fas fa-broadcast-tower"></i>' + separator + '<b>TX:</b> ' + data.frequency_formatted;
if(data.mode != null) {
text = text + separator + data.mode;
}
if(data.power != null && data.power != 0) {
text = text + separator + data.power+' W';
}
complementary_info = []
if(data.prop_mode != null && data.prop_mode != '') {
if (data.prop_mode == 'SAT') {
complementary_info.push(data.prop_mode + ' ' + data.satname);
} else {
complementary_info.push(data.prop_mode);
}
}
if(data.frequency_rx != null && data.frequency_rx != 0) {
complementary_info.push('<b>RX:</b> ' + data.frequency_rx_formatted);
}
if( complementary_info.length > 0) {
text = text + separator + '(' + complementary_info.join(separator) + ')';
}
if (! $('#radio_cat_state').length) {
$('#radio_status').prepend('<div aria-hidden="true"><div id="radio_cat_state" class="alert alert-success radio_cat_state" role="alert">'+text+'</div></div>');
} else {
$('#radio_cat_state').html(text);
}
}
updateCATui(data);
}
});
}
}
};
// Update frequency every three second
setInterval(updateFromCAT, 3000);
// If a radios selected from drop down select radio update.
$('.radios').change(updateFromCAT);
// If no radio is selected clear data
$( ".radios" ).change(function() {
if ($(".radios option:selected").val() == 0) {
if (CATInterval) { // We've a change - stop polling if active
clearInterval(CATInterval);
CATInterval=null;
}
if (websocket) { // close possible websocket connection
websocket.close();
websocketEnabled = false;
}
if ($(".radios option:selected").val() == '0') {
$("#sat_name").val("");
$("#sat_mode").val("");
$("#frequency").val("");
@@ -1486,9 +1578,15 @@ mymap.on('mousemove', onQsoMapMove);
$("#band_rx").val("");
$("#selectPropagation").val($("#selectPropagation option:first").val());
$(".radio_timeout_error" ).remove();
$(".radio_cat_state" ).remove();
$(".radio_cat_state" ).remove();
} else if ($(".radios option:selected").val() == 'ws') {
initializeWebSocketConnection();
} else {
// Update frequency every three second
CATInterval=setInterval(updateFromCAT, 3000);
}
});
$('.radios').change(); // Initial trigger for pre-chosen radio
});
</script>

1
application/views/qso/index.php
View File

@@ -350,6 +350,7 @@ switch ($date_format) {
<label for="radio"><?= __("Radio"); ?></label>
<select class="form-select radios" id="radio" name="radio">
<option value="0" selected="selected"><?= __("None"); ?></option>
<option value="ws"<?php if ($this->session->userdata('radio') == 'ws') { echo ' selected="selected"'; } ?>><?= __("WebSocket (Requires WLGate>1.1.10)"); ?></option>
<?php foreach ($radios->result() as $row) { ?>
<option value="<?php echo $row->id; ?>" <?php if($this->session->userdata('radio') == $row->id) { echo "selected=\"selected\""; } ?>><?php echo $row->radio; ?> <?php if ($radio_last_updated->id == $row->id) { echo "(".__("last updated").")"; } else { echo ''; } ?></option>
<?php } ?>

28
assets/js/radiohelpers.js
View File

@@ -66,6 +66,34 @@ function frequencyToBand(frequency) {
}
}
function catmode(mode) {
switch ((mode || '').toUpperCase()) {
case 'CW-U':
case 'CW-L':
case 'CW-R':
case 'CWU':
case 'CWL':
return 'CW';
break;
case 'RTTY-L':
case 'RTTY-U':
case 'RTTY-R':
return 'RTTY';
break;
case 'USB-D':
case 'USB-D1':
return 'USB';
break;
case 'LSB-D':
case 'LSB-D1':
return 'LSB';
break;
default:
return (mode || '');;
break;
}
}
function LatLng2Loc(y, x, num) {
if (x<-180) {x=x+360;}
if (x>180) {x=x-360;}

180
assets/js/sections/bandmap_list.js
View File

@@ -231,6 +231,7 @@ $(function() {
},500);
let bc2qso = new BroadcastChannel('qso_wish');
var CatCallbackURL = "http://127.0.0.1:54321";
// set some times
let wait4pong = 2000; // we wait in max 2 seconds for the pong
@@ -306,67 +307,142 @@ $(function() {
}
});
var CatCallbackURL = "http://127.0.0.1:54321";
var updateFromCAT = function() {
let websocket = null;
let reconnectAttempts = 0;
let websocketEnabled = false;
let CATInterval=null;
if($('select.radios option:selected').val() != '0') {
radioID = $('select.radios option:selected').val();
$.getJSON( base_url+"index.php/radio/json/" + radioID, function( data ) {
if (data.error) {
if (data.error == 'not_logged_in') {
$(".radio_cat_state" ).remove();
if($('.radio_login_error').length == 0) {
$('.messages').prepend('<div class="alert alert-danger radio_login_error" role="alert"><i class="fas fa-broadcast-tower"></i> You\'re not logged it. Please <a href="'+base_url+'">login</a></div>');
}
}
// Put future Errorhandling here
} else {
if($('.radio_login_error').length != 0) {
$(".radio_login_error" ).remove();
}
var band = frequencyToBand(data.frequency);
CatCallbackURL=data.cat_url;
if (band !== $("#band").val()) {
$("#band").val(band);
$("#band").trigger("change");
function initializeWebSocketConnection() {
try {
websocket = new WebSocket('ws://localhost:54322');
websocket.onopen = function(event) {
reconnectAttempts = 0;
websocketEnabled = true;
};
websocket.onmessage = function(event) {
try {
const data = JSON.parse(event.data);
handleWebSocketData(data);
} catch (error) {
}
};
websocket.onerror = function(error) {
websocketEnabled=false;
};
websocket.onclose = function(event) {
websocketEnabled = false;
var minutes = Math.floor(cat_timeout_interval / 60);
if(data.updated_minutes_ago > minutes) {
$(".radio_cat_state" ).remove();
if($('.radio_timeout_error').length == 0) {
$('.messages').prepend('<div class="alert alert-danger radio_timeout_error" role="alert"><i class="fas fa-broadcast-tower"></i> Radio connection timed-out: ' + $('select.radios option:selected').text() + ' data is ' + data.updated_minutes_ago + ' minutes old.</div>');
} else {
$('.radio_timeout_error').html('Radio connection timed-out: ' + $('select.radios option:selected').text() + ' data is ' + data.updated_minutes_ago + ' minutes old.');
}
if (reconnectAttempts < 5) {
setTimeout(() => {
reconnectAttempts++;
initializeWebSocketConnection();
}, 2000 * reconnectAttempts);
} 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';
highlight_current_qrg((parseInt(data.frequency))/1000);
if(data.mode != null) {
text = text+'<span style="margin-left:10px"></span>'+data.mode;
}
if(data.power != null && data.power != 0) {
text = text+'<span style="margin-left:10px"></span>'+data.power+' W';
}
if (! $('#radio_cat_state').length) {
$('.messages').prepend('<div aria-hidden="true"><div id="radio_cat_state" class="alert alert-success radio_cat_state" role="alert">'+text+'</div></div>');
} else {
$('#radio_cat_state').html(text);
}
$(".radio_cat_state" ).remove();
$('#radio_status').html('<div class="alert alert-danger radio_timeout_error" role="alert"><i class="fas fa-broadcast-tower"></i> Radio connection timed-out: ' + $('select.radios option:selected').text() + ' Websocket connection lost, chose another radio.</div>');
websocketEnabled = false;
}
}
});
};
} catch (error) {
websocketEnabled=false;
}
}
};
function handleWebSocketData(data) {
// Handle welcome message
if (data.type === 'welcome') {
return;
}
// Handle radio status updates
if (data.type === 'radio_status' && data.radio && ($(".radios option:selected").val() == 'ws')) {
data.updated_minutes_ago = Math.floor((Date.now() - data.timestamp) / 60000);
data.cat_url = 'http://127.0.0.1:54321';
// Cache the radio data
updateCATui(data);
}
}
$( "#radio" ).change(function() {
if (CATInterval) { // We've a change - stop polling if active
clearInterval(CATInterval);
CATInterval=null;
}
if (websocket) { // close possible websocket connection
websocket.close();
websocketEnabled = false;
}
if ($("#radio option:selected").val() == '0') {
$(".radio_cat_state" ).remove();
} else if ($("#radio option:selected").val() == 'ws') {
initializeWebSocketConnection();
} else {
// Update frequency every three second
CATInterval=setInterval(updateFromCAT, 3000);
}
});
function updateCATui(data) {
const band = frequencyToBand(data.frequency);
CatCallbackURL=data.cat_url;
if (band !== $("#band").val()) {
$("#band").val(band);
$("#band").trigger("change");
}
const minutes = Math.floor(cat_timeout_interval / 60);
if(data.updated_minutes_ago > minutes) {
$(".radio_cat_state" ).remove();
if($('.radio_timeout_error').length == 0) {
$('.messages').prepend('<div class="alert alert-danger radio_timeout_error" role="alert"><i class="fas fa-broadcast-tower"></i> Radio connection timed-out: ' + $('select.radios option:selected').text() + ' data is ' + data.updated_minutes_ago + ' minutes old.</div>');
} else {
$('.radio_timeout_error').html('Radio connection timed-out: ' + $('select.radios option:selected').text() + ' data is ' + data.updated_minutes_ago + ' minutes old.');
}
} 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';
highlight_current_qrg((parseInt(data.frequency))/1000);
if(data.mode != null) {
text = text+'<span style="margin-left:10px"></span>'+data.mode;
}
if(data.power != null && data.power != 0) {
text = text+'<span style="margin-left:10px"></span>'+data.power+' W';
}
if (! $('#radio_cat_state').length) {
$('.messages').prepend('<div aria-hidden="true"><div id="radio_cat_state" class="alert alert-success radio_cat_state" role="alert">'+text+'</div></div>');
} else {
$('#radio_cat_state').html(text);
}
}
}
var updateFromCAT = function() {
if($('select.radios option:selected').val() != '0') {
radioID = $('select.radios option:selected').val();
$.getJSON( base_url+"index.php/radio/json/" + radioID, function( data ) {
if (data.error) {
if (data.error == 'not_logged_in') {
$(".radio_cat_state" ).remove();
if($('.radio_login_error').length == 0) {
$('.messages').prepend('<div class="alert alert-danger radio_login_error" role="alert"><i class="fas fa-broadcast-tower"></i> You\'re not logged it. Please <a href="'+base_url+'">login</a></div>');
}
}
// Put future Errorhandling here
} else {
if($('.radio_login_error').length != 0) {
$(".radio_login_error" ).remove();
}
updateCATui(data);
}
});
}
};
$.fn.dataTable.moment(custom_date_format + ' HH:mm');
// Update frequency every three second
setInterval(updateFromCAT, 3000);
// If a radios selected from drop down select radio update.
$('.radios').change(updateFromCAT);
$('#radio').change();
});