From 5b6dbf91d7fbf4071ab00b7301f869b0c3c557f7 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Sat, 29 Dec 2007 15:57:42 +0000 Subject: [PATCH] devspec added delattr reenamed to deleteattr git-svn-id: https://svn.fhem.de/fhem/trunk@135 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 2 + fhem/FHEM/99_SUNRISE_EL.pm | 2 +- fhem/HISTORY | 22 +- fhem/docs/commandref.html | 91 ++++++-- fhem/examples/07_sunset_windowed | 6 +- fhem/fhem.pl | 371 ++++++++++++++++++++----------- 6 files changed, 332 insertions(+), 162 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index bde4601da..aa880bce2 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -369,6 +369,8 @@ - feature: Generate warning if too many commands were sent in the last hour - doc: linux.html: Introduction (Peter S.) - feature: contrib/82_M232Voltage.pm (by Boris, 24.12) + - feature: delattr renamed to deleteattr (Rudi, 29.12) + - feature: device spec (list/range/regexp) for most commands implemented - TODO emem -2.5kW / getDevData for emwz -1 diff --git a/fhem/FHEM/99_SUNRISE_EL.pm b/fhem/FHEM/99_SUNRISE_EL.pm index b47a7eb0a..2ff24cdbe 100755 --- a/fhem/FHEM/99_SUNRISE_EL.pm +++ b/fhem/FHEM/99_SUNRISE_EL.pm @@ -71,7 +71,7 @@ sr($$$$) $sst += ($seconds/3600); my $diff = 0; - if($nh > $sst) { + if($nh >= $sst) { $nt += 86400; # Tommorow $diff = 24; @lt = localtime($nt); diff --git a/fhem/HISTORY b/fhem/HISTORY index d718828fa..9ffd349af 100644 --- a/fhem/HISTORY +++ b/fhem/HISTORY @@ -2,7 +2,7 @@ Created the file HISTORY and the file README.DEV - Pest, Thu Feb 1 20:45 MET 2007 - Added description for attribute "model" in commandref.html + Added description for attribute , - Rudi, Sun Feb 11 18:56:05 MET 2007 - showtime added for pgm2 (useful for FS20 piri display) @@ -23,7 +23,7 @@ - Rudi, Sun Mar 4 11:18:10 MET 2007 Reorganization. Goal: making attribute adding/deleting more uniform - ("at/notify" and other device differences), and making web-configuration + (, possible (i.e. saving the configfile, list of possible devices etc). Internal changes: @@ -34,24 +34,24 @@ -> User written scripts can more easily analyze device states User visible changes: - - at/notify "renamed" to "define at/notify", both moved to external + - at/notify , modules. Now it is possible - - to have a further "at" or "notify" modules + - to have a further , (notify & filelog use the same interface) - to have more than one notify for the same event - to delete at commands without strange escapes. The delete syntax changed (no more def/at/ntfy needed) - at/notify can have attributes Drawback: each at and notify must have a name, which is strange first. - - logfile/modpath/pidfile/port/verbose "renamed" to "attr global xxx" + - logfile/modpath/pidfile/port/verbose , Dumping and extending these attributes is easier, no special handling required in the web-frontend. - - savefile renamed to "attr global statefile" + - savefile renamed to , - configfile global attribute added. - save command added, it writes the statefile and then the configfile. - delattr added to delete single attributes - list/xmllist format changed, they contain more information. - - "define/set/get/attr name ?" returns a list of possible arguments + - , in the same format. This data is contained in the xmllist. - disable attribute for at/notify/filelog - rename added @@ -92,7 +92,7 @@ - feature: modify command added. It helps change e.g. only the time component for an at command, without deleting and creating it again and then reapplying all the attributes. - - feature: the "-" character is disallowed in defined names. Use dot (.) or _ + - feature: the , instead. The - is used to separate ranges in the set command. - Rudi, Sun May 27 12:51:52 MEST 2007 @@ -164,3 +164,9 @@ - Peter Sun Dec 23 19:59:00 MEST 2007 - linux.html: Introduction refinement. +- Rudi Sat Dec 29 16:27:14 MET 2007 + - delattr renamed to deleteattr + - devicespec introduced: + it may contain a list of devices, a range of devices, or multiple devices + identified by regexp. Following commands take a devicespec as argument: + attr, deleteattr, delete, get, list, set, setstate, trigger diff --git a/fhem/docs/commandref.html b/fhem/docs/commandref.html index a85d5f22e..a60abd932 100644 --- a/fhem/docs/commandref.html +++ b/fhem/docs/commandref.html @@ -15,7 +15,7 @@ attr
defattr
define
-delattr
+deleteattr
delete
get
include
@@ -32,6 +32,7 @@ trigger
sleep
xmllist
+Device specification
Perl specials
@@ -115,7 +116,7 @@ split in multiple lines

attr

@@ -1093,18 +1096,20 @@ split in multiple lines

- -

delattr

+ +

deleteattr

@@ -1112,10 +1117,11 @@ split in multiple lines

delete