DTux/moha
1
0
Fork 0
Code Activity

making compatibility with mqtt's friendly names

Browse Source
This commit is contained in:
daniel Tartavel
2021-12-31 14:34:20 +01:00
parent 5162731a16
commit 57390d099b
5 changed files with 151 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
mqtt_functions.php
View File

@@ -13,12 +13,12 @@ function message($message)
break;
case "devices":
$topics[$topic[0]]->devices = json_decode($message->payload);
mkDevicesDB($topic[0], $topics[$topic[0]]->devices);
fwrite($logFh, print_r($topics[$topic[0]]->devices, true));
mkDevicesDB($topic[0], $topics[$topic[0]]->devices);
break;
case "groups":
$topics[$topic[0]]->groups = json_decode($message->payload);
mkDevicesDB($topic[0], $topics[$topic[0]]->groups);
mkDevicesDB($topic[0], $topics[$topic[0]]->groups, true);
break;
case "extensions":
$topics[$topic[0]]->extensions = json_decode($message->payload);
@@ -37,11 +37,23 @@ function message($message)
};
}elseif (($topic[array_key_last($topic)]) != "get" and ($topic[array_key_last($topic)]) != "set")
{
$topic = explode ("/", $message->topic, 2);
$topic = explode ("/", $message->topic, 2); // get topic name
$fnTree = explode ("/" , $topic[1]); // get friendlyname
echo $topic[0] . " => " . $topic[1] . EOL;
$devices[$topic[0]][$topic[1]]->json = json_decode($message->payload);
changeDevice($topic[0], $topic[1], $devices[$topic[0]][$topic[1]]);
//$devices[$topic[0]][$fnTree[0]]->json = json_decode($message->payload);
$device = & $devices[$topic[0]];
foreach($fnTree as $fn)
{
//print_r($device) ;
if (!isset($device[$fn]))
{
logger(LOG_INFO, $logFh, "init of " . $fn .EOL);
$device[$fn] = array();
$device[$fn]["device"] = new device;
}
$device = & $device[$fn];
}
changeDevice($topic[0], $topic[1], $device["device"], $message->payload);
//fwrite($logFh, print_r($msg, true));
}
}
@@ -52,17 +64,19 @@ function message($message)
function publish($device, $payload, $commande="set", $eventKey)
{
global $client, $mids, $logFh;
print_r($payload);
//print_r($payload);
$string = $device->topic . "/" . $device->friendlyName . "/" . $commande;
$mid = $client->publish($string, json_encode($payload) , 2);
if ($mids[$mid])
if (isset($mids[$mid]))
{
//echo "unsetting mids" .EOL;
unset ($mids[$mid]);
}else
{
//echo "setting mids" .EOL;
$mids[$mid] = true;
}
echo $string . " =>>>>>> " . json_encode($payload) . EOL;
//echo $string . " =>>>>>> " . json_encode($payload) . EOL;
logger(LOG_INFO, $logFh, "Publishing " . $string . " with payload => " . json_encode($payload));
}
@@ -127,9 +141,11 @@ function publishResponse($mid)
logger(LOG_INFO, "Event with mid = " . $mid . " published by MQTT broker");
if (isset($mids[$mid]))
{
//echo "unsetting mids" . EOL;
unset ($mids[$mid]);
}else
{
//echo "setting mids" . EOL;
$mids[$mid] = true;
}
}