kopia lustrzana https://github.com/magicbug/Cloudlog
Unify varible naming
Replace uplink_freq by frequency. Replace uplink_mode by mode Replace downlink_freq by frequency_rx. Replace downlink_mode by mode_rxpull/1582/head
kb-light
rodzic
1a122455f0
commit
4064340bc7
|
|
@ -48,17 +48,23 @@
|
|||
{
|
||||
echo "<tr>";
|
||||
echo "<td>".$row->radio."</td>";
|
||||
if($row->frequency != "0" && $row->frequency != NULL) {
|
||||
|
||||
if (empty($row->frequency) || $row->frequency == "0") {
|
||||
echo "<td>- / -</td>";
|
||||
} elseif (empty($row->downlink_freq) || $row->downlink_freq == "0") {
|
||||
echo "<td>".$this->frequency->hz_to_mhz($row->frequency)."</td>";
|
||||
} else {
|
||||
echo "<td>".$this->frequency->hz_to_mhz($row->downlink_freq)." / ".$this->frequency->hz_to_mhz($row->uplink_freq)."</td>";
|
||||
echo "<td>".$this->frequency->hz_to_mhz($row->downlink_freq)." / ".$this->frequency->hz_to_mhz($row->frequency)."</td>";
|
||||
}
|
||||
|
||||
if($row->mode != "non" && $row->mode != NULL) {
|
||||
if (empty($row->mode) || $row->mode == "non") {
|
||||
echo "<td>N/A</td>";
|
||||
} elseif (empty($row->downlink_mode) || $row->downlink_mode == "non") {
|
||||
echo "<td>".$row->mode."</td>";
|
||||
} else {
|
||||
echo "<td>".$row->downlink_mode." / ".$row->uplink_mode."</td>";
|
||||
echo "<td>".$row->downlink_mode." / ".$row->mode."</td>";
|
||||
}
|
||||
|
||||
$phpdate = strtotime($row->timestamp);
|
||||
echo "<td>".date('H:i:s d-m-y', $phpdate)."</td>" ;
|
||||
echo "<td><a href=\"".site_url('radio/delete')."/".$row->id."\" class=\"btn btn-danger\"> <i class=\"fas fa-trash-alt\"></i> Delete</a></td>" ;
|
||||
|
|
@ -86,22 +92,22 @@
|
|||
foreach ($query->result() as $row)
|
||||
{
|
||||
|
||||
$frequency = $row->frequency;
|
||||
|
||||
if($row->prop_mode == "SAT") {
|
||||
$uplink_freq = $row->uplink_freq;
|
||||
$downlink_freq = $row->downlink_freq;
|
||||
$frequency_rx = $row->downlink_freq;
|
||||
|
||||
$power = $row->power;
|
||||
$power = $row->power;
|
||||
|
||||
$prop_mode = $row->prop_mode;
|
||||
$prop_mode = $row->prop_mode;
|
||||
|
||||
// Check Mode
|
||||
if(strtoupper($row->uplink_mode) == "FMN"){
|
||||
$mode = "FM";
|
||||
} else {
|
||||
$mode = strtoupper($row->uplink_mode);
|
||||
}
|
||||
// Check Mode
|
||||
if(strtoupper($row->mode) == "FMN"){
|
||||
$mode = "FM";
|
||||
} else {
|
||||
$mode = strtoupper($row->mode);
|
||||
}
|
||||
|
||||
if ($row->prop_mode == "SAT") {
|
||||
// Get Satellite Name
|
||||
if($row->sat_name == "AO-07") {
|
||||
$sat_name = "AO-7";
|
||||
|
|
@ -118,21 +124,7 @@
|
|||
if ($uplink_mode != "" && $downlink_mode != "") {
|
||||
$sat_mode = $uplink_mode."/".$downlink_mode;
|
||||
}
|
||||
|
||||
} else {
|
||||
$frequency = $row->frequency;
|
||||
|
||||
$power = $row->power;
|
||||
|
||||
$prop_mode = $row->prop_mode;
|
||||
|
||||
// Check Mode
|
||||
if(strtoupper($row->mode) == "FMN"){
|
||||
$mode = "FM";
|
||||
} else {
|
||||
$mode = strtoupper($row->mode);
|
||||
}
|
||||
|
||||
$sat_name = "";
|
||||
$sat_mode = "";
|
||||
}
|
||||
|
|
@ -149,29 +141,18 @@
|
|||
$updated_at = $minutes;
|
||||
|
||||
// Return Json data
|
||||
if ($prop_mode == "SAT") {
|
||||
echo json_encode(array(
|
||||
"uplink_freq" => $uplink_freq,
|
||||
"downlink_freq" => $downlink_freq,
|
||||
"mode" => $mode,
|
||||
"satmode" => $sat_mode,
|
||||
"satname" => $sat_name,
|
||||
"power" => $power,
|
||||
"prop_mode" => $prop_mode,
|
||||
"updated_minutes_ago" => $updated_at,
|
||||
), JSON_PRETTY_PRINT);
|
||||
} else {
|
||||
echo json_encode(array(
|
||||
"frequency" => $frequency,
|
||||
"mode" => $mode,
|
||||
"power" => $power,
|
||||
"prop_mode" => $prop_mode,
|
||||
"updated_minutes_ago" => $updated_at,
|
||||
), JSON_PRETTY_PRINT);
|
||||
}
|
||||
echo json_encode(array(
|
||||
"frequency" => $frequency,
|
||||
"frequency_rx" => $frequency_rx,
|
||||
"mode" => $mode,
|
||||
"satmode" => $sat_mode,
|
||||
"satname" => $sat_name,
|
||||
"power" => $power,
|
||||
"prop_mode" => $prop_mode,
|
||||
"updated_minutes_ago" => $updated_at,
|
||||
), JSON_PRETTY_PRINT);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function get_mode_designator($frequency)
|
||||
|
|
|
|||
|
|
@ -25,34 +25,17 @@
|
|||
$this->db->where('user_id', $user_id);
|
||||
$query = $this->db->get('cat');
|
||||
|
||||
if ($prop_mode == "SAT") {
|
||||
$data = array(
|
||||
'prop_mode' => $prop_mode,
|
||||
'sat_name' => $result['sat_name'],
|
||||
'downlink_freq' => $result['downlink_freq'],
|
||||
'uplink_freq' => $result['uplink_freq'],
|
||||
'downlink_mode' => $result['downlink_mode'],
|
||||
'uplink_mode' => $result['uplink_mode'],
|
||||
'timestamp' => $timestamp,
|
||||
'mode' => NULL,
|
||||
'frequency' => NULL,
|
||||
);
|
||||
} else {
|
||||
$data = array(
|
||||
'prop_mode' => $result['prop_mode'],
|
||||
'mode' => $result['mode'],
|
||||
'frequency' => $result['frequency'],
|
||||
'downlink_freq' => NULL,
|
||||
'downlink_mode' => NULL,
|
||||
'uplink_freq' => NULL,
|
||||
'uplink_mode' => NULL,
|
||||
'timestamp' => $timestamp,
|
||||
);
|
||||
}
|
||||
|
||||
if (isset($result['power'])) {
|
||||
$data['power'] = $result['power'];
|
||||
}
|
||||
// Let's keep uplink_freq, downlink_freq, uplink_mode and downlink_mode for backward compatibility
|
||||
$data = array(
|
||||
'prop_mode' => $prop_mode,
|
||||
'frequency' => $result['frequency'] ?? $result['uplink_freq'],
|
||||
'downlink_freq' => $result['frequency_rx'] ?? $result['downlink_freq'],
|
||||
'mode' => $result['mode'] ?? $result['uplink_mode'],
|
||||
'downlink_mode' => $result['mode_rx'] ?? $result['downlink_mode'],
|
||||
'power' => $result['power'],
|
||||
'sat_name' => $result['sat_name'],
|
||||
'timestamp' => $timestamp,
|
||||
);
|
||||
|
||||
if ($query->num_rows() > 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1143,33 +1143,25 @@ $(document).on('keypress',function(e) {
|
|||
</script>
|
||||
|
||||
<script>
|
||||
// Javascript for controlling rig frequency.
|
||||
var updateFromCAT = function() {
|
||||
// Javascript for controlling rig frequency.
|
||||
var updateFromCAT = function() {
|
||||
if($('select.radios option:selected').val() != '0') {
|
||||
radioID = $('select.radios option:selected').val();
|
||||
$.getJSON( "radio/json/" + radioID, function( data ) {
|
||||
/* {
|
||||
"uplink_freq": "2400210000",
|
||||
"downlink_freq": "10489710000",
|
||||
"frequency": "2400210000",
|
||||
"frequency_rx": "10489710000",
|
||||
"mode": "SSB",
|
||||
"satmode": "",
|
||||
"satname": "ES'HAIL-2"
|
||||
"satmode": "S/X",
|
||||
"satname": "QO-100"
|
||||
"power": "20"
|
||||
"prop_mode": "SAT"
|
||||
} */
|
||||
if (data.prop_mode == "SAT")
|
||||
//if (data.uplink_freq != "")
|
||||
{
|
||||
$('#frequency').val(data.uplink_freq);
|
||||
$("#band").val(frequencyToBand(data.uplink_freq));
|
||||
} else {
|
||||
$('#frequency').val(data.frequency);
|
||||
$("#band").val(frequencyToBand(data.frequency));
|
||||
}
|
||||
if (data.downlink_freq != "")
|
||||
{
|
||||
$('#frequency_rx').val(data.downlink_freq);
|
||||
$("#band_rx").val(frequencyToBand(data.downlink_freq));
|
||||
$('#frequency').val(data.frequency);
|
||||
$("#band").val(frequencyToBand(data.frequency));
|
||||
if (data.frequency_rx != "") {
|
||||
$('#frequency_rx').val(data.frequency_rx);
|
||||
$("#band_rx").val(frequencyToBand(data.frequency_rx));
|
||||
}
|
||||
|
||||
old_mode = $(".mode").val();
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue