FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 06:39:11 +00:00
Code Issues Releases Wiki Activity

mqtt2.template: small fixes to ebus templates and code

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@24831 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Beta-User 2021-08-06 06:03:27 +00:00
parent a2f4078d7d
commit fca1c55e15
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/lib/AttrTemplate/mqtt2.template
View File

@ -3480,8 +3480,8 @@ attr DEVICE devStateIcon 1.true:it_net 1.false:it_net@red 2.true:lan_rs485 2.fa
attr DEVICE setList getKnown:noArg DEV_ID/list onlyknown\
getAll:noArg DEV_ID/list
set DEVICE getKnown
attr DEVICE comment NOTE: additional templates and code have been downloaded from svn (contrib).<br>Pls. inform the maintainer, if the bridgeRegexp doesn't fit to all of your devices connected to the bus.
farewell:template has been applied successfully. <br>NOTE: additional templates and code have been downloaded from svn (contrib). <br>To configure further parts of your ebus ecosystem, have a look at these templates and the <a href=https://wiki.fhem.de/wiki/EBUS-MQTT2">Wiki</a>, to see more info about the provided code, issue <i>help attrTmqtt2_ebus_Utils</i>.
attr DEVICE comment <html>NOTE: additional templates and code have been downloaded from svn (contrib).<br>Pls. inform the maintainer, if the bridgeRegexp doesn't fit to all of your devices connected to the bus.
farewell:template has been applied successfully. <br>NOTE: additional templates and code have been downloaded from svn (contrib). <br>To configure further parts of your ebus ecosystem, have a look at these templates and the <a href=https://wiki.fhem.de/wiki/EBUS-MQTT2">Wiki</a>, to see more info about the provided code, issue <i>help attrTmqtt2_ebus_Utils</i></html>.
attr DEVICE model eBus_daemon_splitter
setreading DEVICE attrTemplateVersion 20210715
@ -3491,7 +3491,7 @@ desc:template to download or update additional code and attrTemplates from svn.
order:E_01a1
{ Svn_GetFile('contrib/AttrTemplate/99_attrTmqtt2_ebus_Utils.pm', 'FHEM/99_attrTmqtt2_ebus_Utils.pm', sub(){ CommandReload(undef, '99_attrTmqtt2_ebus_Utils') }) }
{ Svn_GetFile("contrib/AttrTemplate/mqtt2.ebus.template", "FHEM/lib/AttrTemplate/mqtt2.ebus.template", sub(){ AttrTemplate_Initialize() }) }
farewell:Download has been initiated. You may find <a href=https://wiki.fhem.de/wiki/EBUS-MQTT2">Wiki</a> usefull; to see more info about the provided code, issue <i>help attrTmqtt2_ebus_Utils</i>
farewell:Download has been initiated. You may find the wiki (https://wiki.fhem.de/wiki/EBUS-MQTT2) usefull; to see more info about the provided code, issue "help attrTmqtt2_ebus_Utils".
###########################################
# ems-esp

4
fhem/contrib/AttrTemplate/99_attrTmqtt2_ebus_Utils.pm
View File

@ -80,7 +80,7 @@ sub j2singleReading {
my $values = json2nameValue($EVENT, $pre, $filt, $not);
my @all;
for my $item ( sort keys %{$values} ) {
push @all, qq{$item: $values->{$item}};
push @all, qq{$item: $values->{$item}} if defined $values->{$item};
}
return { $rName => join q{ - }, @all };
}
@ -450,7 +450,7 @@ sub createBarView {
sub _getVersion {
my $modpath = (exists($attr{global}{modpath}) ? $attr{global}{modpath} : "");
my $fn = "$modpath.FHEM/99_attrTmqtt2_ebus_Utils.pm"; # configDB
my $fn = "$modpath/FHEM/99_attrTmqtt2_ebus_Utils.pm"; # configDB
my ($ret, @content) = FileRead($fn);
if ($ret) {
Log3(undef, 1, "Error reading file $fn!") ;

2
fhem/contrib/AttrTemplate/mqtt2.ebus.template
View File

@ -21,7 +21,7 @@ filter:TYPE=MQTT2_DEVICE
desc:The JSON messages generated by ebusd are special. The code provided by 99_attrTmqtt2_ebus_Utils.pm includes some special functions to get shorter reading names (e.g. without the _value appendix). This template calls a function to analyze the readingList attribute and the available readings to find out which kind of pree-treatment seems to be appropriate for each line calling json2nameValue(). This works best if autocreate in "complex" mode had been used to fill the readingList attribute. <br>For details on these funtions, see commandref or <code>help attrTmqtt2_ebus_Utils</code>.
order:E_01a02
{ FHEM::aTm2u_ebus::analyzeReadingList("DEVICE") }
farewell:Please check results now (additional devices may have been created!<br>For details on the ebus specific funtions, issue <code>help attrTmqtt2_ebus_Utils</code>.
farewell:Please check results now (additional devices may have been created! \nFor details on the ebus specific funtions, issue "help attrTmqtt2_ebus_Utils".
name:eBus_bai_jsonMap_Status01
filter:TYPE=MQTT2_DEVICE