Skip to content

Commit

Permalink
Merge branch 'master' into pre-release
Browse files Browse the repository at this point in the history
  • Loading branch information
HomeAutoUser committed Jan 3, 2024
2 parents 1ef0209 + 7cc0613 commit b7764a8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 4 additions & 0 deletions CHANGED
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2024-01-03 - Update 88_Timer.pm

- remove old versionsstring
- added commandref for groups
2024-01-03 - Automaitc updated controls and CHANGED
2024-01-03 - Automaitc updated controls and CHANGED
2024-01-03 - Update 88_Timer.pm
Expand Down
6 changes: 2 additions & 4 deletions FHEM/88_Timer.pm
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ use warnings;
use Time::HiRes qw(gettimeofday);
use FHEM::Meta;

our $VERSION_Timer = '2024-01-03';

my @action = qw(on off DEF);
my @names;
my @designations;
Expand Down Expand Up @@ -114,8 +112,6 @@ sub Timer_Define {
if (!defined AttrVal($name, 'room', undef)) { CommandAttr($hash,"$name room $typ"); } # set room, if only undef --> new def
}

$hash->{versionModule} = $VERSION_Timer;

### default value´s ###
readingsBeginUpdate($hash);
readingsBulkUpdate($hash, 'state' , 'Defined');
Expand Down Expand Up @@ -1356,6 +1352,7 @@ This makes it possible, for example, to have a timer run every Sunday at 15:30:0
<b><i><u>Hints:</u></i></b><br>
<ul><li>Entries in the system logfile like: <code>2019.09.20 22:15:01 3: Timer: time difference too large! interval=59, Sekunde=01</code> say that the timer has recalculated the time.</li></ul>
<ul><li>The offset function can only be activated at sunrise (SR) and sunset (SS).</li></ul>
<ul><li>To implement a switching group, you can combine the timer module with the structure module.</li></ul>
</ul>
=end html
Expand Down Expand Up @@ -1484,6 +1481,7 @@ Damit ist es m&ouml;glich, einen Timer beispielsweise nur jeden Sonntag um 15:30
<b><i><u>Hinweise:</u></i></b><br>
<ul><li>Eintr&auml;ge im Systemlogfile wie: <code>2019.09.20 22:15:01 3: Timer: time difference too large! interval=59, Sekunde=01</code> sagen aus, das der Timer die Zeit neu berechnet hat.</li></ul>
<ul><li>Die Funktion Offset ist nur bei Sonnenaufgang (SA) und Sonnenuntergang (SU) aktivierbar.</li></ul>
<ul><li>Um eine Gruppenschaltung umzusetzen, so kann man das Timer Modul mit dem structure Modul kombinieren.</li></ul>
</ul>
=end html_DE
Expand Down
2 changes: 1 addition & 1 deletion controls_Timer.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
UPD 2024-01-03_17:21:16 76172 FHEM/88_Timer.pm
UPD 2024-01-03_18:48:41 76322 FHEM/88_Timer.pm

0 comments on commit b7764a8

Please sign in to comment.