diff --git a/application/controllers/Radio.php b/application/controllers/Radio.php index 2ce8a1b7d..e58673a43 100644 --- a/application/controllers/Radio.php +++ b/application/controllers/Radio.php @@ -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; diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 4625b603a..149ac1b32 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1197,7 +1197,7 @@ $($('#callsign')).on('keypress',function(e) { } } else { $(".radio_timeout_error" ).remove(); - text = 'TX: '+(Math.round(parseInt(data.frequency)/100)/10000).toFixed(4)+' MHz'; + text = 'TX: ' + data.frequency_formatted; if(data.mode != null) { text = text+''+data.mode; } @@ -1212,7 +1212,7 @@ $($('#callsign')).on('keypress',function(e) { } } if(data.frequency_rx != null && data.frequency_rx != 0) { - ptext = ptext + 'RX: ' + (Math.round(parseInt(data.frequency_rx)/1000)/1000).toFixed(3) + ' MHz'; + ptext = ptext + 'RX: ' + data.frequency_rx_formatted; } if( ptext != '') { text = text + '(' + ptext + ')';} if (! $('#radio_cat_state').length) {