Merge branch 'dev' into mqtt

This commit is contained in:
int2001
2025-04-04 08:38:12 +00:00
37 changed files with 1087 additions and 565 deletions

View File

@@ -24,10 +24,16 @@
// Let's keep uplink_freq, downlink_freq, uplink_mode and downlink_mode for backward compatibility
$data = array(
'prop_mode' => $prop_mode,
'power' => $result['power'] ?? NULL,
'sat_name' => $result['sat_name'] ?? NULL,
'timestamp' => $timestamp,
);
if ( (isset($result['power'])) && ($result['power'] != "NULL") && ($result['power'] != '') && (is_numeric($result['power']))) {
$data['power'] = $result['power'];
} else {
unset($data['power']); // Do not update power since it isn't provided or not numeric
}
if ( (isset($result['frequency'])) && ($result['frequency'] != "NULL") && ($result['frequency'] != '') && (is_numeric($result['frequency']))) {
$data['frequency'] = $result['frequency'];
} else {
@@ -37,6 +43,7 @@
unset($data['frequency']); // Do not update Frequency since it wasn't provided
}
}
if (isset($result['mode']) && $result['mode'] != "NULL") {
$data['mode'] = $result['mode'];
} else {