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

fhemweb.js: allow id-based anchor (Forum #118915)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23811 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2021-02-23 21:04:49 +00:00
parent 1d181f76c1
commit e34d2a7a69
6 changed files with 73 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
fhem/FHEM/00_MQTT2_CLIENT.pm
View File

@ -653,7 +653,7 @@ MQTT2_CLIENT_getStr($$)
=item summary_DE Verbindung zu einem externen MQTT Server =item summary_DE Verbindung zu einem externen MQTT Server
=begin html =begin html
<a name="MQTT2_CLIENT"></a> <a id="MQTT2_CLIENT"></a>
<h3>MQTT2_CLIENT</h3> <h3>MQTT2_CLIENT</h3>
<ul> <ul>
MQTT2_CLIENT is a cleanroom implementation of an MQTT client (which connects MQTT2_CLIENT is a cleanroom implementation of an MQTT client (which connects
@ -661,7 +661,7 @@ MQTT2_CLIENT_getStr($$)
an IODev to MQTT2_DEVICES. an IODev to MQTT2_DEVICES.
<br> <br> <br> <br>
<a name="MQTT2_CLIENTdefine"></a> <a id="MQTT2_CLIENT-define"></a>
<b>Define</b> <b>Define</b>
<ul> <ul>
<code>define &lt;name&gt; MQTT2_CLIENT &lt;host&gt;:&lt;port&gt;</code> <code>define &lt;name&gt; MQTT2_CLIENT &lt;host&gt;:&lt;port&gt;</code>
@ -676,7 +676,7 @@ MQTT2_CLIENT_getStr($$)
</ul> </ul>
<br> <br>
<a name="MQTT2_CLIENTset"></a> <a id="MQTT2_CLIENT-set"></a>
<b>Set</b> <b>Set</b>
<ul> <ul>
<li>publish -r topic value<br> <li>publish -r topic value<br>
@ -694,15 +694,15 @@ MQTT2_CLIENT_getStr($$)
</ul> </ul>
<br> <br>
<a name="MQTT2_CLIENTget"></a> <a id="MQTT2_CLIENT-get"></a>
<b>Get</b> <b>Get</b>
<ul>N/A</ul><br> <ul>N/A</ul><br>
<a name="MQTT2_CLIENTattr"></a> <a id="MQTT2_CLIENT-attr"></a>
<b>Attributes</b> <b>Attributes</b>
<ul> <ul>
<a name="MQTT_CLIENTautocreate"></a> <a id="MQTT2_CLIENT-autocreate"></a>
<li>autocreate [no|simple|complex]<br> <li>autocreate [no|simple|complex]<br>
if set to simple/complex, at least one MQTT2_DEVICE will be created, and if set to simple/complex, at least one MQTT2_DEVICE will be created, and
its readingsList will be expanded upon reception of published messages. its readingsList will be expanded upon reception of published messages.
@ -720,13 +720,13 @@ MQTT2_CLIENT_getStr($$)
attribute it is not really useful. attribute it is not really useful.
</li></br> </li></br>
<a name="MQTT_CLIENTclientId"></a> <a id="MQTT2_CLIENT-attr-clientId"></a>
<li>clientId &lt;name&gt;<br> <li>clientId &lt;name&gt;<br>
set the MQTT clientId. If not set, the name of the MQTT2_CLIENT instance set the MQTT clientId. If not set, the name of the MQTT2_CLIENT instance
is used, after deleting everything outside 0-9a-zA-Z is used, after deleting everything outside 0-9a-zA-Z
</li></br> </li></br>
<a name="MQTT2_CLIENTclientOrder"></a> <a id="MQTT2_CLIENT-attr-clientOrder"></a>
<li>clientOrder [MQTT2_DEVICE] [MQTT_GENERIC_BRIDGE]<br> <li>clientOrder [MQTT2_DEVICE] [MQTT_GENERIC_BRIDGE]<br>
set the notification order for client modules. This is set the notification order for client modules. This is
relevant when autocreate is active, and the default order relevant when autocreate is active, and the default order
@ -739,52 +739,52 @@ MQTT2_CLIENT_getStr($$)
disable dispatching of messages. disable dispatching of messages.
</li><br> </li><br>
<a name="MQTT2_CLIENTdisconnectAfter"></a> <a id="MQTT2_CLIENTdisconnectAfter"></a>
<li>disconnectAfter &lt;seconds&gt;<br> <li>disconnectAfter &lt;seconds&gt;<br>
if set, the connection will be closed after &lt;seconds&gt; of if set, the connection will be closed after &lt;seconds&gt; of
inactivity, and will be automatically reopened when sending a command. inactivity, and will be automatically reopened when sending a command.
</li> </li>
<a name="MQTT2_CLIENTignoreRegexp"></a> <a id="MQTT2_CLIENTignoreRegexp"></a>
<li>ignoreRegexp<br> <li>ignoreRegexp<br>
if $topic:$message matches ignoreRegexp, then it will be silently ignored. if $topic:$message matches ignoreRegexp, then it will be silently ignored.
</li> </li>
<a name="MQTT_CLIENTlwt"></a> <a id="MQTT2_CLIENT-attr-lwt"></a>
<li>lwt &lt;topic&gt; &lt;message&gt; <br> <li>lwt &lt;topic&gt; &lt;message&gt; <br>
set the LWT (last will and testament) topic and message, default is empty. set the LWT (last will and testament) topic and message, default is empty.
</li></br> </li></br>
<a name="MQTT_CLIENTkeepaliveTimeout"></a> <a id="MQTT2_CLIENT-attr-keepaliveTimeout"></a>
<li>keepaliveTimeout &lt;seconds;&gt;<br> <li>keepaliveTimeout &lt;seconds;&gt;<br>
number of seconds for sending keepalive messages, 0 disables it. number of seconds for sending keepalive messages, 0 disables it.
The broker will disconnect, if there were no messages for The broker will disconnect, if there were no messages for
1.5 * keepaliveTimeout seconds. 1.5 * keepaliveTimeout seconds.
</li></br> </li></br>
<a name="MQTT_CLIENTlwtRetain"></a> <a id="MQTT2_CLIENT-attr-lwtRetain"></a>
<li>lwtRetain<br> <li>lwtRetain<br>
if set, the lwt retain flag is set if set, the lwt retain flag is set
</li></br> </li></br>
<a name="MQTT_CLIENTmqttVersion"></a> <a id="MQTT2_CLIENT-attr-mqttVersion"></a>
<li>mqttVersion 3.1,3.1.1<br> <li>mqttVersion 3.1,3.1.1<br>
set the MQTT protocol version in the CONNECT header, default is 3.1 set the MQTT protocol version in the CONNECT header, default is 3.1
</li></br> </li></br>
<a name="MQTT_CLIENTmsgAfterConnect"></a> <a id="MQTT2_CLIENT-attr-msgAfterConnect"></a>
<li>msgAfterConnect [-r] topic message<br> <li>msgAfterConnect [-r] topic message<br>
publish the topic after each connect or reconnect.<br> publish the topic after each connect or reconnect.<br>
If the optional -r is specified, then the publish sets the retain flag. If the optional -r is specified, then the publish sets the retain flag.
</li></br> </li></br>
<a name="MQTT_CLIENTmsgBeforeDisconnect"></a> <a id="MQTT2_CLIENT-attr-msgBeforeDisconnect"></a>
<li>msgBeforeDisconnect [-r] topic message<br> <li>msgBeforeDisconnect [-r] topic message<br>
publish the topic bofore each disconnect.<br> publish the topic bofore each disconnect.<br>
If the optional -r is specified, then the publish sets the retain flag. If the optional -r is specified, then the publish sets the retain flag.
</li></br> </li></br>
<a name="MQTT_CLIENTqosMaxQueueLength"></a> <a id="MQTT2_CLIENT-attr-qosMaxQueueLength"></a>
<li>qosMaxQueueLength &lt;number&gt;<br> <li>qosMaxQueueLength &lt;number&gt;<br>
if set to a nonzero value, messages are published with QoS=1, and are if set to a nonzero value, messages are published with QoS=1, and are
kept in a memory-only buffer until acknowledged by the server. kept in a memory-only buffer until acknowledged by the server.
@ -792,31 +792,31 @@ MQTT2_CLIENT_getStr($$)
are queued, and resent when the connection is esablished. are queued, and resent when the connection is esablished.
</li></br> </li></br>
<a name="MQTT_CLIENTrawEvents"></a> <a id="MQTT2_CLIENT-attr-rawEvents"></a>
<li>rawEvents &lt;topic-regexp&gt;<br> <li>rawEvents &lt;topic-regexp&gt;<br>
send all messages as events attributed to this MQTT2_CLIENT instance. send all messages as events attributed to this MQTT2_CLIENT instance.
Should only be used, if there is no MQTT2_DEVICE to process the topic. Should only be used, if there is no MQTT2_DEVICE to process the topic.
</li><br> </li><br>
<a name="MQTT_CLIENTsubscriptions"></a> <a id="MQTT2_CLIENT-attr-subscriptions"></a>
<li>subscriptions &lt;subscriptions&gt;<br> <li>subscriptions &lt;subscriptions&gt;<br>
space separated list of MQTT subscriptions, default is #<br> space separated list of MQTT subscriptions, default is #<br>
Note: if the value is the literal setByTheProgram, then the value sent by Note: if the value is the literal setByTheProgram, then the value sent by
the client (e.g. MQTT_GENERIC_BRIDGE) is used. the client (e.g. MQTT_GENERIC_BRIDGE) is used.
</li><br> </li><br>
<a name="MQTT_CLIENTSSL"></a> <a id="MQTT2_CLIENT-attr-SSL"></a>
<li>SSL<br> <li>SSL<br>
Enable SSL (i.e. TLS) Enable SSL (i.e. TLS)
</li><br> </li><br>
<a name="MQTT_CLIENTsslargs"></a> <a id="MQTT2_CLIENT-attr-sslargs"></a>
<li>sslargs<br> <li>sslargs<br>
a list of space separated tuples of key:value, where key is one of the a list of space separated tuples of key:value, where key is one of the
possible options documented in perldoc IO::Socket::SSL possible options documented in perldoc IO::Socket::SSL
</li><br> </li><br>
<a name="MQTT_CLIENTusername"></a> <a id="MQTT2_CLIENT-attr-username"></a>
<li>username &lt;username&gt;<br> <li>username &lt;username&gt;<br>
set the username. The password is set via the set command, and is stored set the username. The password is set via the set command, and is stored
separately, see above. separately, see above.

26
fhem/FHEM/00_MQTT2_SERVER.pm
View File

@ -613,7 +613,7 @@ MQTT2_SERVER_ReadDebug($$)
=item summary_DE Standalone MQTT message broker =item summary_DE Standalone MQTT message broker
=begin html =begin html
<a name="MQTT2_SERVER"></a> <a id="MQTT2_SERVER"></a>
<h3>MQTT2_SERVER</h3> <h3>MQTT2_SERVER</h3>
<ul> <ul>
MQTT2_SERVER is a builtin/cleanroom implementation of an MQTT server using no MQTT2_SERVER is a builtin/cleanroom implementation of an MQTT server using no
@ -622,7 +622,7 @@ MQTT2_SERVER_ReadDebug($$)
and performance). It is intended to simplify connecting MQTT devices to FHEM. and performance). It is intended to simplify connecting MQTT devices to FHEM.
<br> <br> <br> <br>
<a name="MQTT2_SERVERdefine"></a> <a id="MQTT2_SERVER-define"></a>
<b>Define</b> <b>Define</b>
<ul> <ul>
<code>define &lt;name&gt; MQTT2_SERVER &lt;tcp-portnr&gt; [global|IP]</code> <code>define &lt;name&gt; MQTT2_SERVER &lt;tcp-portnr&gt; [global|IP]</code>
@ -643,7 +643,7 @@ MQTT2_SERVER_ReadDebug($$)
</ul> </ul>
<br> <br>
<a name="MQTT2_SERVERset"></a> <a id="MQTT2_SERVER-set"></a>
<b>Set</b> <b>Set</b>
<ul> <ul>
<li>publish -r topic value<br> <li>publish -r topic value<br>
@ -652,15 +652,15 @@ MQTT2_SERVER_ReadDebug($$)
</ul> </ul>
<br> <br>
<a name="MQTT2_SERVERget"></a> <a id="MQTT2_SERVER-get"></a>
<b>Get</b> <b>Get</b>
<ul>N/A</ul><br> <ul>N/A</ul><br>
<a name="MQTT2_SERVERattr"></a> <a id="MQTT2_SERVER-attr"></a>
<b>Attributes</b> <b>Attributes</b>
<ul> <ul>
<a name="MQTT2_SERVERclientId"></a> <a id="MQTT2_SERVER-attr-clientId"></a>
<li>clientId &lt;name&gt;<br> <li>clientId &lt;name&gt;<br>
set the MQTT clientId for all connections, for setups with clients set the MQTT clientId for all connections, for setups with clients
creating a different MQTT-ID for each connection. The autocreate creating a different MQTT-ID for each connection. The autocreate
@ -669,7 +669,7 @@ MQTT2_SERVER_ReadDebug($$)
attributes. attributes.
</li></br> </li></br>
<a name="MQTT2_SERVERclientOrder"></a> <a id="MQTT2_SERVER-attr-clientOrder"></a>
<li>clientOrder [MQTT2_DEVICE] [MQTT_GENERIC_BRIDGE]<br> <li>clientOrder [MQTT2_DEVICE] [MQTT_GENERIC_BRIDGE]<br>
set the notification order for client modules. This is set the notification order for client modules. This is
relevant when autocreate is active, and the default order relevant when autocreate is active, and the default order
@ -683,12 +683,12 @@ MQTT2_SERVER_ReadDebug($$)
messages, but not forward them. messages, but not forward them.
</li><br> </li><br>
<a name="MQTT2_SERVERignoreRegexp"></a> <a id="MQTT2_SERVER-attr-ignoreRegexp"></a>
<li>ignoreRegexp<br> <li>ignoreRegexp<br>
if $topic:$message matches ignoreRegexp, then it will be silently ignored. if $topic:$message matches ignoreRegexp, then it will be silently ignored.
</li> </li>
<a name="MQTT2_SERVERkeepaliveFactor"></a> <a id="MQTT2_SERVER-attr-keepaliveFactor"></a>
<li>keepaliveFactor<br> <li>keepaliveFactor<br>
the oasis spec requires a disconnect, if after 1.5 times the client the oasis spec requires a disconnect, if after 1.5 times the client
supplied keepalive no data or PINGREQ is sent. With this attribute you supplied keepalive no data or PINGREQ is sent. With this attribute you
@ -700,13 +700,13 @@ MQTT2_SERVER_ReadDebug($$)
</ul> </ul>
</li> </li>
<a name="MQTT2_SERVERrawEvents"></a> <a id="MQTT2_SERVER-attr-rawEvents"></a>
<li>rawEvents &lt;topic-regexp&gt;<br> <li>rawEvents &lt;topic-regexp&gt;<br>
Send all messages as events attributed to this MQTT2_SERVER instance. Send all messages as events attributed to this MQTT2_SERVER instance.
Should only be used, if there is no MQTT2_DEVICE to process the topic. Should only be used, if there is no MQTT2_DEVICE to process the topic.
</li><br> </li><br>
<a name="MQTT2_SERVERrePublish"></a> <a id="MQTT2_SERVER-attr-rePublish"></a>
<li>rePublish<br> <li>rePublish<br>
if a topic is published from a source inside of FHEM (e.g. MQTT2_DEVICE), if a topic is published from a source inside of FHEM (e.g. MQTT2_DEVICE),
it is only sent to real MQTT clients, and it will not internally it is only sent to real MQTT clients, and it will not internally
@ -714,7 +714,7 @@ MQTT2_SERVER_ReadDebug($$)
to the FHEM internal clients. to the FHEM internal clients.
</li><br> </li><br>
<a name="MQTT2_SERVERSSL"></a> <a id="MQTT2_SERVER-attr-SSL"></a>
<li>SSL<br> <li>SSL<br>
Enable SSL (i.e. TLS). Enable SSL (i.e. TLS).
</li><br> </li><br>
@ -728,7 +728,7 @@ MQTT2_SERVER_ReadDebug($$)
also the SSL attribute. also the SSL attribute.
</li><br> </li><br>
<a name="MQTT2_SERVERautocreate"></a> <a id="MQTT2_SERVER-attr-autocreate"></a>
<li>autocreate [no|simple|complex]<br> <li>autocreate [no|simple|complex]<br>
MQTT2_DEVICES will be automatically created upon receiving an MQTT2_DEVICES will be automatically created upon receiving an
unknown message. Set this value to no to disable autocreating, the unknown message. Set this value to no to disable autocreating, the

35
fhem/FHEM/10_MQTT2_DEVICE.pm
View File

@ -885,7 +885,7 @@ zigbee2mqtt_devStateIcon255($;$$)
=item summary_DE &uuml;ber den MQTT2_SERVER oder MQTT2_CLIENT kommunizierende Ger&auml;te =item summary_DE &uuml;ber den MQTT2_SERVER oder MQTT2_CLIENT kommunizierende Ger&auml;te
=begin html =begin html
<a name="MQTT2_DEVICE"></a> <a id="MQTT2_DEVICE"></a>
<h3>MQTT2_DEVICE</h3> <h3>MQTT2_DEVICE</h3>
<ul> <ul>
MQTT2_DEVICE is used to represent single devices connected to the MQTT2_DEVICE is used to represent single devices connected to the
@ -893,7 +893,7 @@ zigbee2mqtt_devStateIcon255($;$$)
connecting MQTT devices to FHEM. connecting MQTT devices to FHEM.
<br> <br> <br> <br>
<a name="MQTT2_DEVICEdefine"></a> <a id="MQTT2_DEVICE-define"></a>
<b>Define</b> <b>Define</b>
<ul> <ul>
<code>define &lt;name&gt; MQTT2_DEVICE</code> <code>define &lt;name&gt; MQTT2_DEVICE</code>
@ -903,32 +903,32 @@ zigbee2mqtt_devStateIcon255($;$$)
</ul> </ul>
<br> <br>
<a name="MQTT2_DEVICEset"></a> <a id="MQTT2_DEVICE-set"></a>
<b>Set</b> <b>Set</b>
<ul> <ul>
see the setList attribute documentation below. see the setList attribute documentation below.
</ul> </ul>
<br> <br>
<a name="MQTT2_DEVICEget"></a> <a id="MQTT2_DEVICE-get"></a>
<b>Get</b> <b>Get</b>
<ul> <ul>
see the getList attribute documentation below. see the getList attribute documentation below.
</ul> </ul>
<br> <br>
<a name="MQTT2_DEVICEattr"></a> <a id="MQTT2_DEVICE-attr"></a>
<b>Attributes</b> <b>Attributes</b>
<ul> <ul>
<a name="autocreate"></a> <a id="MQTT2_DEVICE-attr-autocreate"></a>
<li>autocreate {0|1}<br> <li>autocreate {0|1}<br>
if set to 0, disables extending the readingList, when the IODev if set to 0, disables extending the readingList, when the IODev
autocreate is also set. Default is 1, i.e. new topics will be autocreate is also set. Default is 1, i.e. new topics will be
automatically added to the readingList. automatically added to the readingList.
</li> </li>
<a name="bridgeRegexp"></a> <a id="MQTT2_DEVICE-attr-bridgeRegexp"></a>
<li>bridgeRegexp &lt;regexp&gt; newClientId ...<br> <li>bridgeRegexp &lt;regexp&gt; newClientId ...<br>
Used to automatically redirect some types of topics to different Used to automatically redirect some types of topics to different
MQTT2_DEVICE instances. The regexp is checked against the MQTT2_DEVICE instances. The regexp is checked against the
@ -958,14 +958,14 @@ zigbee2mqtt_devStateIcon255($;$$)
</ul> </ul>
</li><br> </li><br>
<a name="devicetopic"></a> <a id="MQTT2_DEVICE-attr-devicetopic"></a>
<li>devicetopic value<br> <li>devicetopic value<br>
replace $DEVICETOPIC in the topic part of readingList, setList and replace $DEVICETOPIC in the topic part of readingList, setList and
getList with value. if not set, $DEVICETOPIC will be replaced with the getList with value. if not set, $DEVICETOPIC will be replaced with the
name of the device. name of the device.
</li><br> </li><br>
<a name="devPos"></a> <a id="MQTT2_DEVICE-attr-devPos"></a>
<li>devPos value<br> <li>devPos value<br>
used internally by the "Show neighbor map" visualizer in FHEMWEB. used internally by the "Show neighbor map" visualizer in FHEMWEB.
This function is active if the graphviz and devices readings are set, This function is active if the graphviz and devices readings are set,
@ -975,7 +975,7 @@ zigbee2mqtt_devStateIcon255($;$$)
<li><a href="#disable">disable</a><br> <li><a href="#disable">disable</a><br>
<a href="#disabledForIntervals">disabledForIntervals</a></li><br> <a href="#disabledForIntervals">disabledForIntervals</a></li><br>
<a name="getList"></a> <a id="MQTT2_DEVICE-attr-getList"></a>
<li>getList cmd reading [topic|perl-Expression] ...<br> <li>getList cmd reading [topic|perl-Expression] ...<br>
When the FHEM command cmd is issued, publish the topic (and optional When the FHEM command cmd is issued, publish the topic (and optional
message, which is separated by space from the topic), wait for the answer message, which is separated by space from the topic), wait for the answer
@ -1006,13 +1006,13 @@ zigbee2mqtt_devStateIcon255($;$$)
</li><br> </li><br>
<a name="imageLink"></a> <a id="MQTT2_DEVICE-attr-imageLink"></a>
<li>imageLink href<br> <li>imageLink href<br>
sets the image to be shown. The "Show neighbor map" function initializes sets the image to be shown. The "Show neighbor map" function initializes
the value automatically. the value automatically.
</li><br> </li><br>
<a name="jsonMap"></a> <a id="MQTT2_DEVICE-attr-jsonMap"></a>
<li>jsonMap oldReading1:newReading1 oldReading2:newReading2...<br> <li>jsonMap oldReading1:newReading1 oldReading2:newReading2...<br>
space or newline separated list of oldReading:newReading pairs.<br> space or newline separated list of oldReading:newReading pairs.<br>
Used in the automatically generated readingList json2nameValue function Used in the automatically generated readingList json2nameValue function
@ -1025,7 +1025,7 @@ zigbee2mqtt_devStateIcon255($;$$)
oldReading. oldReading.
</li><br> </li><br>
<a name="periodicCmd"></a> <a id="MQTT2_DEVICE-attr-periodicCmd"></a>
<li>periodicCmd &lt;cmd1&gt;:&lt;period1&gt; &lt;cmd2&gt;:&lt;period2&gt;... <li>periodicCmd &lt;cmd1&gt;:&lt;period1&gt; &lt;cmd2&gt;:&lt;period2&gt;...
<br> <br>
periodically execute the get or set command. The command will not take periodically execute the get or set command. The command will not take
@ -1033,7 +1033,7 @@ zigbee2mqtt_devStateIcon255($;$$)
period is measured in minutes, and it must be an integer. period is measured in minutes, and it must be an integer.
</li><br> </li><br>
<a name="readingList"></a> <a id="MQTT2_DEVICE-attr-readingList"></a>
<li>readingList &lt;regexp&gt; [readingName|perl-Expression] ... <li>readingList &lt;regexp&gt; [readingName|perl-Expression] ...
<br> <br>
If the regexp matches topic:message or cid:topic:message either set If the regexp matches topic:message or cid:topic:message either set
@ -1070,11 +1070,12 @@ zigbee2mqtt_devStateIcon255($;$$)
</ul> </ul>
</li><br> </li><br>
<li><a name="setExtensionsEvent">setExtensionsEvent</a><br> <a id="MQTT2_DEVICE-attr-setExtensionsEvent"></a>
<li>setExtensionsEvent<br>
If set, the event will contain the command implemented by SetExtensions If set, the event will contain the command implemented by SetExtensions
(e.g. on-for-timer 10), else the executed command (e.g. on).</li><br> (e.g. on-for-timer 10), else the executed command (e.g. on).</li><br>
<a name="setList"></a> <a id="MQTT2_DEVICE-attr-setList"></a>
<li>setList cmd [topic|perl-Expression] ...<br> <li>setList cmd [topic|perl-Expression] ...<br>
When the FHEM command cmd is issued, publish the topic. When the FHEM command cmd is issued, publish the topic.
Multiple tuples can be specified, each of them separated by newline, the Multiple tuples can be specified, each of them separated by newline, the
@ -1102,7 +1103,7 @@ zigbee2mqtt_devStateIcon255($;$$)
</ul> </ul>
</li><br> </li><br>
<a name="setStateList"></a> <a id="MQTT2_DEVICE-attr-setStateList"></a>
<li>setStateList command command ...<br> <li>setStateList command command ...<br>
This attribute is used to get more detailed feedback when switching This attribute is used to get more detailed feedback when switching
devices. I.e. when the command on is contained in the list, state will devices. I.e. when the command on is contained in the list, state will

2
fhem/contrib/commandref_static.pl
View File

@ -98,6 +98,8 @@ for my $lang (@lang) {
$modData{$mName}{$1} =$2 if($l =~ m/^=item\s+(summary[^ ]*)\s(.*)$/); $modData{$mName}{$1} =$2 if($l =~ m/^=item\s+(summary[^ ]*)\s(.*)$/);
$modData{$mName}{modLinks}{$1} = 1 $modData{$mName}{modLinks}{$1} = 1
if($l =~ m/<a\s+name=['"]([^ '"]+)['"]>/); if($l =~ m/<a\s+name=['"]([^ '"]+)['"]>/);
$modData{$mName}{modLinks}{$1} = 1
if($l =~ m/<a\s+id=['"]([^ '"]+)['"]>/);
} }
$modData{$mName}{modLangs} = join(",", @lang); $modData{$mName}{modLangs} = join(",", @lang);
close(FH); close(FH);

1
fhem/contrib/pre-commit
View File

@ -137,6 +137,7 @@ foreach my $row (split("\n", $fList)) {
} elsif(!$skip) { } elsif(!$skip) {
$docCount++; $docCount++;
$hasLink = ($l =~ m/<a name="$modName"/) if(!$hasLink); $hasLink = ($l =~ m/<a name="$modName"/) if(!$hasLink);
$hasLink = ($l =~ m/<a id="$modName"/) if(!$hasLink);
foreach $tag (TAGS) { foreach $tag (TAGS) {
my $ot = ($tagcount{$tag} ? $tagcount{$tag} : 0); my $ot = ($tagcount{$tag} ? $tagcount{$tag} : 0);
if($l =~ m/<$tag ([^>]+)>/i) { if($l =~ m/<$tag ([^>]+)>/i) {

25
fhem/www/pgm2/fhemweb.js
View File

@ -307,26 +307,35 @@ FW_jqueryReadyFn()
if(!m) if(!m)
return; return;
$("#devSpecHelp").remove(); $("#devSpecHelp").remove();
var sel = this; var sel=this, devName=m[2], selType=m[1];
FW_getHelp(m[2], function(data) { // show either the next or the outer li FW_getHelp(devName, function(data) { // show either the next or the outer li
$("#content") $("#content")
.append("<div id='workbench' style='display:none'></div>"); .append("<div id='workbench' style='display:none'></div>");
$("#content > #workbench").html(data); $("#content > #workbench").html(data);
var mtype = $("#content > #workbench a[name]").attr("name"), aTag;
if(mtype) { var mtype = $("#content > #workbench a[id]").attr("id"), aTag;
var mv = (""+mtype+val).replace(/[^a-z0-9_]/ig,'_'); if(!mtype)
aTag = $("#content > #workbench").find("a[name="+mv+"]"); mtype = $("#content > #workbench a[name]").attr("name"), aTag;
if(mtype) { // old style #1 syntax: MODULETYPEattrname
var mv = (""+mtype+"-"+selType+"-"+val).replace(/[^a-z0-9_-]/ig,'_');
aTag = $("#content > #workbench").find("a[id="+mv+"]");
if(!$(aTag).length) {
mv = (""+mtype+val).replace(/[^a-z0-9_]/ig,'_');
aTag = $("#content > #workbench").find("a[name="+mv+"]");
}
} }
if(!$(aTag).length) { // old style syntax without type if(!$(aTag).length) { // old style #2 syntax without type
var v = (val).replace(/[^a-z0-9_]/ig,'_'); var v = (val).replace(/[^a-z0-9_]/ig,'_');
aTag = $("#content > #workbench").find("a[name="+v+"]"); aTag = $("#content > #workbench").find("a[name="+v+"]");
} }
if($(aTag).length) { if($(aTag).length) {
var liTag = $(aTag).next("li"); var liTag = $(aTag).next("li");
if(!$(liTag).length) if(!$(liTag).length)
liTag = $(aTag).parent("li"); liTag = $(aTag).parent("li");
if($(liTag).length) { if($(liTag).length) {
$(sel).closest("div[cmd='"+m[1]+"']") $(sel).closest("div[cmd='"+selType+"']")
.after('<div class="makeTable" id="devSpecHelp"></div>') .after('<div class="makeTable" id="devSpecHelp"></div>')
$("#devSpecHelp").html($(liTag).html()); $("#devSpecHelp").html($(liTag).html());
} }