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

Handle non-SAT cases without throwing errors

Browse Source 
* Also test mode and frequency for != "NULL"
* Remove useless code
* Forgotten change of variable name
* Set NULL as default for missing frequency
This commit is contained in:
Florian (DF2ET)
2022-09-29 23:06:06 +02:00
committed by GitHub
parent 07b7930f64
commit f39a561a3a
2 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Radio.php
View File

@@ -118,7 +118,7 @@
}
// Get Satellite Mode
$uplink_mode = $this->get_mode_designator($row->uplink_freq);
$uplink_mode = $this->get_mode_designator($row->frequency);
$downlink_mode = $this->get_mode_designator($row->downlink_freq);
if (empty($uplink_mode)) {

38
application/models/Cat.php
View File

@@ -4,11 +4,7 @@
function update($result, $user_id) {
if ($result['timestamp'] != "") {
$timestamp = gmdate("Y-m-d H:i:s");
} else {
$timestamp = gmdate("Y-m-d H:i:s");
}
$timestamp = gmdate("Y-m-d H:i:s");
if (isset($result['prop_mode'])) {
$prop_mode = $result['prop_mode'];
@@ -28,14 +24,34 @@
// 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'],
'power' => $result['power'] ?? 0,
'sat_name' => $result['sat_name'] ?? NULL,
'timestamp' => $timestamp,
);
if (isset($result['frequency']) && $result['frequency'] != "NULL") {
$data['frequency'] = $result['frequency'];
} else {
$data['frequency'] = $result['uplink_freq'];
}
if (isset($result['mode']) && $result['mode'] != "NULL") {
$data['mode'] = $result['mode'];
} else {
$data['mode'] = $result['uplink_mode'];
}
if (isset($result['frequency_rx'])) {
$data['downlink_freq'] = $result['frequency_rx'];
} else if (isset($result['downlink_freq'])) {
$data['downlink_freq'] = $result['downlink_freq'];
} else {
$data['downlink_freq'] = NULL;
}
if (isset($result['mode_rx'])) {
$data['downlink_mode'] = $result['mode_rx'];
} else if (isset($result['downlink_freq'])) {
$data['downlink_mode'] = $result['downlink_mode'];
} else {
$data['downlink_mode'] = NULL;
}
if ($query->num_rows() > 0)
{