FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

98_MSwitch.pm:add CMD "reset_cmd_count:1,2"

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18076 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Byte09 2018-12-28 12:36:22 +00:00
parent 80397ac9c2
commit a159f31da4
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
fhem/FHEM/98_MSwitch.pm
View File

@ -173,6 +173,7 @@ my %sets = (
"confchange" => "noArg", "confchange" => "noArg",
"clearlog" => "noArg", "clearlog" => "noArg",
"set_trigger" => "noArg", "set_trigger" => "noArg",
"reset_cmd_count" => "",
"change_renamed" => "" "change_renamed" => ""
); );
@ -1032,7 +1033,7 @@ sub MSwitch_Set($@) {
if ( $devicemode eq "Notify" ) { if ( $devicemode eq "Notify" ) {
return return
"Unknown argument $cmd, choose one of active:noArg inactive:noArg del_delays:noArg backup_MSwitch:all_devices fakeevent exec_cmd_1 exec_cmd_2 wait reload_timer:noArg change_renamed $setList $special"; "Unknown argument $cmd, choose one of active:noArg inactive:noArg del_delays:noArg backup_MSwitch:all_devices fakeevent exec_cmd_1 exec_cmd_2 wait reload_timer:noArg change_renamed reset_cmd_count:1,2 $setList $special";
} }
elsif ( $devicemode eq "Toggle" ) { elsif ( $devicemode eq "Toggle" ) {
return return
@ -1047,7 +1048,7 @@ sub MSwitch_Set($@) {
else { else {
#full #full
return return
"Unknown argument $cmd, choose one of active:noArg inactive:noArg on off del_delays:noArg backup_MSwitch:all_devices fakeevent exec_cmd_1 exec_cmd_2 wait reload_timer:noArg change_renamed $setList $special"; "Unknown argument $cmd, choose one of active:noArg inactive:noArg on off del_delays:noArg backup_MSwitch:all_devices fakeevent exec_cmd_1 exec_cmd_2 wait reload_timer:noArg change_renamed reset_cmd_count:1,2 $setList $special";
} }
} }
@ -1079,6 +1080,27 @@ sub MSwitch_Set($@) {
MSwitch_confchange( $hash, $changestring ); MSwitch_confchange( $hash, $changestring );
return; return;
} }
##################################
if ( $cmd eq 'reset_cmd_count' ) {
if ($args[0] eq "1")
{
delete( $hash->{READINGS}{EVT_CMD1_COUNT} );
}
if ($args[0] eq "2")
{
delete( $hash->{READINGS}{EVT_CMD2_COUNT} );
}
return;
}
####################################### #######################################
if ( $cmd eq 'reload_timer' ) { if ( $cmd eq 'reload_timer' ) {
MSwitch_Clear_timer($hash); MSwitch_Clear_timer($hash);
@ -2100,27 +2122,13 @@ sub MSwitch_Attr(@) {
} }
if ( $cmd eq "set" && $aName eq "MSwitch_Read_Log" ) { if ( $cmd eq "set" && $aName eq "MSwitch_Read_Log" ) {
# MSwitch_LOG( 'test', 0, "writelog".$test );
#if(!defined($aVal) || $aVal)
if ( defined($aVal) && $aVal eq "1" ) { if ( defined($aVal) && $aVal eq "1" ) {
$logInform{$name} = sub($$) { $logInform{$name} = sub($$) {
my ( $me, $msg ) = @_; my ( $me, $msg ) = @_;
#my $test = $hash->{helper}{writelog};
#return if(defined($hash->{CHANGED}));
return if ( defined( $hash->{helper}{writelog} ) ); return if ( defined( $hash->{helper}{writelog} ) );
#my $test1 = $dev;
#$hash->{CHANGED}[0] = $msg;
$hash->{helper}{writelog} = $msg; $hash->{helper}{writelog} = $msg;
MSwitch_Log_Event( $hash, $msg, $me ); MSwitch_Log_Event( $hash, $msg, $me );
#delete($hash->{CHANGED});
} }
} }
@ -2130,7 +2138,6 @@ sub MSwitch_Attr(@) {
delete $logInform{$name}; delete $logInform{$name};
} }
#return;
} }
if ( $cmd eq 'set' && $aName eq 'disable' && $aVal == 1 ) { if ( $cmd eq 'set' && $aName eq 'disable' && $aVal == 1 ) {