1
0

a lot of debug

This commit is contained in:
2022-04-23 02:00:52 +02:00
parent f8fc3f63ec
commit d1f1065e44
21 changed files with 544 additions and 217 deletions

View File

@@ -11,50 +11,53 @@ function pws2mqttCallback($topic, $message)
$device = & $devices[$topicName];
$payloadArray = json_decode($message->payload, true);
// friendlyname
if (!array_key_exists($fn, $device))
if ( $fn != "get")
{
echo "initializing $fn";
$device[$fn] = array("device" => new device);
$device = &$device[$fn];
$device["device"]->friendlyName = $payloadArray["friendly_name"];
$device["device"]->ieeeAddress = $payloadArray["ieeeAddress"];
$device["device"]->type = $payloadArray["type"];
$device["device"]->topic = $topicName;
//$indexDevices[$device["device"]->ieeeAddress] = & $device["device"];
//$indexFriendlyNames[$topicName][$fn] = & $device["device"];
mkIndexes();
if (!array_key_exists($fn, $device))
{
echo "initializing $fn";
$device[$fn] = array("device" => new device);
$device = &$device[$fn];
$device["device"]->friendlyName = $payloadArray["friendly_name"];
$device["device"]->ieeeAddress = $payloadArray["ieeeAddress"];
$device["device"]->type = $payloadArray["type"];
$device["device"]->topic = $topicName;
//$indexDevices[$device["device"]->ieeeAddress] = & $device["device"];
//$indexFriendlyNames[$topicName][$fn] = & $device["device"];
mkIndexes();
}else
{
$device = &$device[$fn];
}
unset($payloadArray["friendly_name"]);
unset($payloadArray["ieeeAddress"]);
unset($payloadArray["type"]);
}else
{
$device = &$device[$fn];
}
unset($payloadArray["friendly_name"]);
unset($payloadArray["ieeeAddress"]);
unset($payloadArray["type"]);
foreach ($payloadArray as $property => $value)
{
$str = substr($property, -1);
if ($str == "f")
foreach ($payloadArray as $property => $value)
{
$newProperty = rtrim($property, "f") . "c";
$payloadArray[$newProperty] = farenheit2celsius($value);
}elseif ($str == "h")
{
$newProperty = substr($property, 0, -3) . "kmh";
$payloadArray[$newProperty] = mph2kmh($value);
$str = substr($property, -1);
if ($str == "f")
{
$newProperty = rtrim($property, "f") . "c";
$payloadArray[$newProperty] = farenheit2celsius($value);
}elseif ($str == "h")
{
$newProperty = substr($property, 0, -3) . "kmh";
$payloadArray[$newProperty] = mph2kmh($value);
}
if ($property == "baromin")
{
$newProperty = "barominmb";
$payloadArray["barominmb"] = millibars($value);
}
}
if ($property == "baromin")
//$device = getDeviceByFriendlyname($topicName, $fn, $payloadArray, true);
if (!empty($payloadArray))
{
$newProperty = "barominmb";
$payloadArray["barominmb"] = millibars($value);
changeDevice($topicName, $fn, $device["device"], $payloadArray);
}
}
//$device = getDeviceByFriendlyname($topicName, $fn, $payloadArray, true);
if (!empty($payloadArray))
{
changeDevice($topicName, $fn, $device["device"], $payloadArray);
}
};
$topics["pws2mqtt"]->callback = "pws2mqttCallback";
@@ -66,5 +69,4 @@ if (!is_callable("pws2mqttGetList"))
}
}
pws2mqttGetList();
?>