mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Unify varible naming 

Replace uplink_freq by frequency.
Replace uplink_mode by mode
Replace downlink_freq by frequency_rx.
Replace downlink_mode by mode_rx
pull/1582/head
kb-light 2022-08-29 00:12:28 +00:00
rodzic 1a122455f0
commit 4064340bc7
3 zmienionych plików z 53 dodań i 97 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

81
application/controllers/Radio.php
Wyświetl plik

@ -48,17 +48,23 @@
{ {
echo "<tr>"; echo "<tr>";
echo "<td>".$row->radio."</td>"; 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>"; echo "<td>".$this->frequency->hz_to_mhz($row->frequency)."</td>";
} else { } 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>"; echo "<td>".$row->mode."</td>";
} else { } else {
echo "<td>".$row->downlink_mode." / ".$row->uplink_mode."</td>"; echo "<td>".$row->downlink_mode." / ".$row->mode."</td>";
} }
$phpdate = strtotime($row->timestamp); $phpdate = strtotime($row->timestamp);
echo "<td>".date('H:i:s d-m-y', $phpdate)."</td>" ; 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>" ; 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) foreach ($query->result() as $row)
{ {
$frequency = $row->frequency;
if($row->prop_mode == "SAT") { $frequency_rx = $row->downlink_freq;
$uplink_freq = $row->uplink_freq;
$downlink_freq = $row->downlink_freq;
$power = $row->power; $power = $row->power;
$prop_mode = $row->prop_mode; $prop_mode = $row->prop_mode;
// Check Mode // Check Mode
if(strtoupper($row->uplink_mode) == "FMN"){ if(strtoupper($row->mode) == "FMN"){
$mode = "FM"; $mode = "FM";
} else { } else {
$mode = strtoupper($row->uplink_mode); $mode = strtoupper($row->mode);
} }
if ($row->prop_mode == "SAT") {
// Get Satellite Name // Get Satellite Name
if($row->sat_name == "AO-07") { if($row->sat_name == "AO-07") {
$sat_name = "AO-7"; $sat_name = "AO-7";
@ -118,21 +124,7 @@
if ($uplink_mode != "" && $downlink_mode != "") { if ($uplink_mode != "" && $downlink_mode != "") {
$sat_mode = $uplink_mode."/".$downlink_mode; $sat_mode = $uplink_mode."/".$downlink_mode;
} }
} else { } 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_name = "";
$sat_mode = ""; $sat_mode = "";
} }
@ -149,29 +141,18 @@
$updated_at = $minutes; $updated_at = $minutes;
// Return Json data // Return Json data
if ($prop_mode == "SAT") { echo json_encode(array(
echo json_encode(array( "frequency" => $frequency,
"uplink_freq" => $uplink_freq, "frequency_rx" => $frequency_rx,
"downlink_freq" => $downlink_freq, "mode" => $mode,
"mode" => $mode, "satmode" => $sat_mode,
"satmode" => $sat_mode, "satname" => $sat_name,
"satname" => $sat_name, "power" => $power,
"power" => $power, "prop_mode" => $prop_mode,
"prop_mode" => $prop_mode, "updated_minutes_ago" => $updated_at,
"updated_minutes_ago" => $updated_at, ), JSON_PRETTY_PRINT);
), 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);
}
} }
} }
} }
function get_mode_designator($frequency) function get_mode_designator($frequency)

39
application/models/Cat.php
Wyświetl plik

@ -25,34 +25,17 @@
$this->db->where('user_id', $user_id); $this->db->where('user_id', $user_id);
$query = $this->db->get('cat'); $query = $this->db->get('cat');
if ($prop_mode == "SAT") { // Let's keep uplink_freq, downlink_freq, uplink_mode and downlink_mode for backward compatibility
$data = array( $data = array(
'prop_mode' => $prop_mode, 'prop_mode' => $prop_mode,
'sat_name' => $result['sat_name'], 'frequency' => $result['frequency'] ?? $result['uplink_freq'],
'downlink_freq' => $result['downlink_freq'], 'downlink_freq' => $result['frequency_rx'] ?? $result['downlink_freq'],
'uplink_freq' => $result['uplink_freq'], 'mode' => $result['mode'] ?? $result['uplink_mode'],
'downlink_mode' => $result['downlink_mode'], 'downlink_mode' => $result['mode_rx'] ?? $result['downlink_mode'],
'uplink_mode' => $result['uplink_mode'], 'power' => $result['power'],
'timestamp' => $timestamp, 'sat_name' => $result['sat_name'],
'mode' => NULL, 'timestamp' => $timestamp,
'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'];
}
if ($query->num_rows() > 0) if ($query->num_rows() > 0)
{ {

30
application/views/interface_assets/footer.php
Wyświetl plik

@ -1143,33 +1143,25 @@ $(document).on('keypress',function(e) {
</script> </script>
<script> <script>
// Javascript for controlling rig frequency. // Javascript for controlling rig frequency.
var updateFromCAT = function() { var updateFromCAT = function() {
if($('select.radios option:selected').val() != '0') { if($('select.radios option:selected').val() != '0') {
radioID = $('select.radios option:selected').val(); radioID = $('select.radios option:selected').val();
$.getJSON( "radio/json/" + radioID, function( data ) { $.getJSON( "radio/json/" + radioID, function( data ) {
/* { /* {
"uplink_freq": "2400210000", "frequency": "2400210000",
"downlink_freq": "10489710000", "frequency_rx": "10489710000",
"mode": "SSB", "mode": "SSB",
"satmode": "", "satmode": "S/X",
"satname": "ES'HAIL-2" "satname": "QO-100"
"power": "20" "power": "20"
"prop_mode": "SAT" "prop_mode": "SAT"
} */ } */
if (data.prop_mode == "SAT") $('#frequency').val(data.frequency);
//if (data.uplink_freq != "") $("#band").val(frequencyToBand(data.frequency));
{ if (data.frequency_rx != "") {
$('#frequency').val(data.uplink_freq); $('#frequency_rx').val(data.frequency_rx);
$("#band").val(frequencyToBand(data.uplink_freq)); $("#band_rx").val(frequencyToBand(data.frequency_rx));
} 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));
} }
old_mode = $(".mode").val(); old_mode = $(".mode").val();