mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fhem.pl: add genericDisplayType (Forum #32652), add sleep warning (Forum

Browse Source 
#27305)
00_CUL.pm:      reactivate CUL_TIME
01_FHEMWEB.pm:  enable refresh for non-room pages, Cors patch (Forum #39384)
98_XmlList:     Avoid warning (Forum #39385)
93_FHEM2FHEM.pm:Avoid reconnect if disabled (Forum #39386)


git-svn-id: https://svn.fhem.de/fhem/trunk@9002 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2015-07-29 05:46:10 +00:00
parent 0342603df3
commit 1612f149e7
9 changed files with 57 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
fhem/docs/commandref_frame.html
View File

@@ -407,6 +407,13 @@ Device specific attributes are documented in the corresponding device section.
rooms for certain FHEMWEB instances.
</li>
<a name="genericDisplayType"></a>
<li>genericDisplayType<br>
used by some frontends (but not FHEMWEB) to offer a default image or
appropriate commands for this device. Currently the following values
are supported: switch,outlet,light,blind,speaker,thermostat
</li>
<a name="group"></a>
<li>group<br>
Group devices. Recognized by web-pgm2 (module <a href="#FHEMWEB">FHEMWEB</a>), it makes
@@ -1215,23 +1222,25 @@ The following local attributes are used by a wider range of devices:
<ul>
<code>sleep &lt;sec&gt; [quiet]</code>
<br><br>
Sleep for a given amount. The unit is seconds, with millisecond accuracy, as
you can specify decimal places.<br>
sleep followed by another command is comparable to a nameless <a
href="#at">at</a>, it executes the following commands after waiting the
specified time. The unit is seconds, with millisecond accuracy, as you can
specify decimal places.<br><br>
When called in a notify/at/etc, then nonempty return values of the following
commands is logged to the global logfile with loglevel 2.<br>
If quiet is specified, then skip this logging.
commands are logged to the global logfile with loglevel 2.<br> If quiet is
specified, then skip this logging.
<br><br>
Example:
<ul>
<code>sleep 0.5</code><br>
<code>define n3 notify btn3.* set lamp toggle;;sleep 0.5;;set lamp
toggle</code><br>
<code>define a3 at +*00:05 set Windsensor 1w_measure;; sleep 2 quiet;; get
Windsensor 1w_temp</code>
define n3 notify btn3.* set lamp on;;sleep 1.5;;set lamp off<br>
define a3 at +*00:05 set Windsensor 1w_measure;; sleep 2 quiet;; get
Windsensor 1w_temp
</ul>
<br>
Note: sleep followed by another command is not blocking FHEM, and is
comparable to a nameless at<br>
Note: a sleep not followed by any command will block FHEM, is deprecated, and
it issues a WARNING in the FHEM log.
<br>
</ul>
<a name="version"></a>