Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: switching between internal and full activation or vice versa requires Unset first

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@1848 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
fladdy 2012-09-15 13:17:23 +00:00
parent 4d5955334c
commit 759dd8e330
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
contrib/58_SecvestIP.pm
View File

@ -1,18 +1,29 @@
##################################################################### #####################################################################
# # # #
# SecvestIP.pm written by Peter J. Flathmann # # SecvestIP.pm written by Peter J. Flathmann #
# Version 0.1, 2012-09-07 # # Version 0.3, 2012-09-15 #
# Version 0.2, 2012-09-13 #
# SecvestIP firmware version 2.3.4 # # SecvestIP firmware version 2.3.4 #
# # # #
# ----------------------------------------------------------------- #
# # # #
# Usage: define <name> SecvestIP <hostname> <user> <password> # # Usage: #
# # # #
# define <name> SecvestIP <hostname> <user> <password> #
# set <name> <Set|PartSet|Unset> #
# # # #
# Example: # # Example: #
# # # #
# define EMA SecvestIP secvestip admin geheimesKennwort # # define EMA SecvestIP secvestip admin geheimesKennwort #
# attr EMA webCmd state # # attr EMA webCmd state #
# set EMA Set #
# #
# ----------------------------------------------------------------- #
# #
# Possible states: #
# #
# Set: activated #
# PartSet: internally activated #
# Unset: deactivated #
# # # #
##################################################################### #####################################################################
@ -52,11 +63,11 @@ sub SecvestIP_Get($) {
Password => $hash->{PASSWORD}} Password => $hash->{PASSWORD}}
); );
# Get SecvestIP state
$response = $agent->get ($url.'getMode.cgi?ts='.time().'&Action=AudioAlarm&Source=Webpage'); $response = $agent->get ($url.'getMode.cgi?ts='.time().'&Action=AudioAlarm&Source=Webpage');
my @pairs = split(/\s+/,$response->content); my @pairs = split(/\s+/,$response->content);
my @state = split('=',$pairs[0]); my @state = split('=',$pairs[0]);
$hash->{STATE} = $state[1]; $hash->{STATE} = $state[1];
return undef; return undef;
@ -65,13 +76,13 @@ sub SecvestIP_Get($) {
sub SecvestIP_Set($$$) { sub SecvestIP_Set($$$) {
my ($hash, $name ,$cmd) = @_; my ($hash, $name ,$cmd) = @_;
return "Unknown argument $cmd, choose one of state:Set,Unset,PartSet" if ($cmd eq "?");
Log 1, "SecvestIP: Set $name $cmd"; Log 1, "SecvestIP: Set $name $cmd";
if ("?" eq $cmd) { # Get current SecvestIP state
SecvestIP_Get($hash); SecvestIP_Get($hash);
return "Unknown argument $cmd, choose one of state:Set,Unset,PartSet";
}
my $url = 'http://'.$hash->{HOST}.'/'; my $url = 'http://'.$hash->{HOST}.'/';
@ -86,13 +97,16 @@ sub SecvestIP_Set($$$) {
UserName => $hash->{USER}, UserName => $hash->{USER},
Password => $hash->{PASSWORD}} Password => $hash->{PASSWORD}}
); );
# switching between internal and full activation or vice versa requires Unset first
if ($cmd eq "Set" and $hash->{STATE} eq "PartSet" or $cmd eq "PartSet" and $hash->{STATE} eq "Set") {
Log 1, "SecvestIP: switching from $hash->{STATE} to $cmd";
$response = $agent->get ($url.'setMode.cgi?Mode=Unset&Source=Webpage&ts='.time() );
sleep(2); # wait a moment to avoid confusing SecvestIP's web interface
}
$response = $agent->get ($url.'setMode.cgi?Mode='.$cmd.'&Source=Webpage&ts='.time() ); $response = $agent->get ($url.'setMode.cgi?Mode='.$cmd.'&Source=Webpage&ts='.time() );
SecvestIP_Get($hash);
readingsBeginUpdate($hash);
readingsUpdate($hash, 'state', $cmd);
readingsEndUpdate($hash, 1);
$hash->{STATE} = $cmd;
return undef; return undef;
} }