FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-01 01:09:47 +00:00
Code Issues Releases Wiki Activity

98_MSwitch.pm:add cmd reload_timer

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17409 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Byte09 2018-09-27 03:50:48 +00:00
parent 9fcf4e8fd9
commit f294fb3168
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fhem/FHEM/98_MSwitch.pm
View File

@ -92,6 +92,7 @@ sub MSwitch_confchange($$);
my %sets = ( my %sets = (
"on" => "noArg", "on" => "noArg",
"off" => "noArg", "off" => "noArg",
"reload_timer" => "noArg",
"active" => "noArg", "active" => "noArg",
"inactive" => "noArg", "inactive" => "noArg",
"devices" => "noArg", "devices" => "noArg",
@ -832,15 +833,15 @@ sub MSwitch_Set($@) {
if ( AttrVal( $name, 'MSwitch_Mode', 'Full' ) eq "Notify" ) if ( AttrVal( $name, 'MSwitch_Mode', 'Full' ) eq "Notify" )
{ {
return "Unknown argument $cmd, choose one of active:noArg inactive:noArg del_delays:noArg backup_MSwitch:all_devices fakeevent exec_cmd1 exec_cmd2 exec_cmd1+2 wait"; return "Unknown argument $cmd, choose one of active:noArg inactive:noArg del_delays:noArg backup_MSwitch:all_devices fakeevent exec_cmd1 exec_cmd2 exec_cmd1+2 wait reload_timer:noArg";
} }
elsif ( AttrVal( $name, 'MSwitch_Mode', 'Full' ) eq "Toggle" ) elsif ( AttrVal( $name, 'MSwitch_Mode', 'Full' ) eq "Toggle" )
{ {
return "Unknown argument $cmd, choose one of on offdel_delays:noArg backup_MSwitch:all_devices fakeevent wait"; return "Unknown argument $cmd, choose one of on offdel_delays:noArg backup_MSwitch:all_devices fakeevent wait reload_timer:noArg";
} }
else else
{ {
return "Unknown argument $cmd, choose one of on off del_delays:noArg backup_MSwitch:all_devices fakeevent exec_cmd1 exec_cmd2 exec_cmd1+2 wait $special"; return "Unknown argument $cmd, choose one of on off del_delays:noArg backup_MSwitch:all_devices fakeevent exec_cmd1 exec_cmd2 exec_cmd1+2 wait reload_timer:noArg $special";
} }
} }
@ -851,6 +852,16 @@ sub MSwitch_Set($@) {
MSwitch_Createnumber1($hash); MSwitch_Createnumber1($hash);
} }
#######################################
if ( $cmd eq 'reload_timer' )
{
MSwitch_Clear_timer($hash);
MSwitch_Createtimer($hash);
return;
}
####################################### #######################################
if ( $cmd eq 'VUpdate' ) if ( $cmd eq 'VUpdate' )
{ {
@ -7190,7 +7201,7 @@ $todec =~ s/#\[wa\]/|/g;
$todec =~ s/MSwitch_Self/$name/; $todec =~ s/MSwitch_Self/$name/;
@ -7361,7 +7372,7 @@ sub MSwitch_makefreecmd($$) {
$cs =~ s/#.*\n//g; $cs =~ s/#.*\n//g;
# entferne zeilenumbruch # entferne zeilenumbruch
$cs =~ s/\n//g; $cs =~ s/\n//g;
$cs =~ s/#\[wa\]/|/g;
# ersetze Eventvariablen # ersetze Eventvariablen
$ersetzung = ReadingsVal( $name, "EVTPART3", "" ); $ersetzung = ReadingsVal( $name, "EVTPART3", "" );
$cs =~ s/\$EVTPART3/$ersetzung/g; $cs =~ s/\$EVTPART3/$ersetzung/g;