FHEM/mod-Siro
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add files via upload

Browse Source
This commit is contained in:
Byte009 2019-06-14 18:22:29 +02:00 committed by GitHub
parent ce5761f1cd
commit 23c54364f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
FHEM/98_Siro.pm
View File

@ -151,7 +151,8 @@ my %sets = (
"sequenz" => "noArg",
"prog_mode_on" => "noArg",
"prog_mode_off" => "noArg",
"remote_lock" => "on,off",
"lock_remote" => "on,off",
"lock_cmd" => "on,off",
"reset_motor_term" => "noArg",
"pct" => "slider,0,1,100", # Wird nur bei vorhandenen time_to attributen gesetzt
"position" => "slider,0,1,100", # Wird nur bei vorhandenen time_to attributen gesetzt
@ -176,7 +177,8 @@ my %setsstandart = (
"sequenz" => "noArg",
"prog_mode_on" => "noArg",
"prog_mode_off" => "noArg",
"remote_lock" => "on,off",
"lock_remote" => "on,off",
"lock_cmd" => "on,off",
"reset_motor_term" => "noArg",
"pct" => "slider,0,1,100", # Wird nur bei vorhandenen time_to attributen gesetzt
"position" => "slider,0,1,100", # Wird nur bei vorhandenen time_to attributen gesetzt
@ -215,7 +217,8 @@ my %sendCommands = (
"reset_motor_term" => "reset_motor_term",
"up_for_timer" => "upfortimer",
"down_for_timer" => "downfortimer",
"remote_lock" => "remote_lock"
"lock_remote" => "lock_remote",
"lock_cmd" => "lock_cmd"
);
@ -390,7 +393,7 @@ sub SendCommand($@) {
}
Log3( $name, 5,"Siro_sendCommand: args1 - $args[1]");
Log3( $name, 5,"Siro_sendCommand: args1 - $args[1]") if defined $args[1];
if ( (defined($args[1]) and $args[1] eq "longstop" )|| (defined $hash->{helper}{progmode} and $hash->{helper}{progmode} eq "on"))
{
@ -439,7 +442,7 @@ sub Parse($$) {
my @args;
my ( $hash, $msg ) = @_;
my $doubelmsgtime = 5; # zeit in sek in der doppelte nachrichten blockiert werden
my $doubelmsgtime = 1; # zeit in sek in der doppelte nachrichten blockiert werden
my $favcheck = $doubelmsgtime +1;# zeit in der ein zweiter stop kommen muss/darf für fav
my $testid = substr( $msg, 4, 8 );
my $testcmd = substr( $msg, 12, 2 );
@ -584,7 +587,7 @@ sub Parse($$) {
}
my $aktstate = ReadingsVal( $name, 'state', '0' );
my $lock =ReadingsVal( $name, 'remote_lock', 'off' );
my $lock =ReadingsVal( $name, 'lock_remote', 'off' );
if ($defchannnel ne '0')
{
@ -600,12 +603,12 @@ sub Parse($$) {
Log3 $lh, 5, "Siro_Parse: hash->{helper}{remotecmd} - ".$lh->{helper}{remotecmd};
Log3( $name, 3, "Siro-Parse ($name) : Signal FB emfangen - $newstate");
Log3( $name, 5, "Siro-Parse ($name) : test remote_lock - $lock");
Log3( $name, 5, "Siro-Parse ($name) : test lock_remote - $lock");
if ($lock eq 'on')
# remotelock
{
Log3( $name, 5, "Siro-Parse ($name) : founde remote_lock - target: $aktstate");
Log3( $name, 5, "Siro-Parse ($name) : founde lock_remote - target: $aktstate");
$lh->{helper}{savedcmds}{cmd1} = 'pct' ;
$lh->{helper}{savedcmds}{cmd1} = 'open' if $aktstate eq "0" ;
$lh->{helper}{savedcmds}{cmd1} = 'close' if $aktstate eq "100" ;
@ -827,7 +830,7 @@ sub Set($@) {
#############################
# befehl ist von distributor abgesetzt - kam von kanal 0
Log3( $name, 5, "Siro-Set: param - $param");
if ($param eq "fakeremote")
if (defined $param and $param eq "fakeremote")
{
$hash->{helper}{exexcmd} = "off" ;
$aktcmdfrom = "remote";
@ -874,12 +877,29 @@ sub Set($@) {
$zielposition = $downlimit;
}
}
############################# remote_lock
if ($comand eq "remote_lock")
############################# lock_remote
if ($comand eq "lock_remote")
{
readingsSingleUpdate( $hash, "remote_lock", $args[1], 1 ) ;
readingsSingleUpdate( $hash, "lock_remote", $args[1], 1 ) ;
return;
}
############################# lock_cmd
if ($comand eq "lock_cmd")
{
readingsSingleUpdate( $hash, "lock_cmd", $args[1], 1 ) ;
return;
}
if (ReadingsVal( $name, 'lock_cmd', 'off' ) eq 'on' and $param ne "fakeremote" and $hash->{helper}{exexcmd} eq "on" )
{
Log3( $name, 4, "Siro-Set: angefragte Aktion abgebrochen ( lock_cmd -> on)");
readingsSingleUpdate( $hash, "pct", $position , 1 );
readingsSingleUpdate( $hash, "position", $position , 1 );
return;
}
#############################
# set reset_motor_term reset_motor_term
@ -1584,18 +1604,24 @@ my ( $FW_wname, $d, $room, $pageHash ) =@_; # pageHash is set for summaryFn.
}
#############################
sub Siro_icon($)
sub Siro_icon(@)
{
my ($name) = @_;
my ($name,$icon) = @_;
my $hash = $defs{$name};
my $state = ReadingsVal( $name, 'state', 'undef' );
if ($state =~ m/[a-z].*/){$state=0;}
my $sticon = "fts_shutter_1w_";
$sticon = $icon if defined $icon;
my $invers = AttrVal( $name, 'SIRO_inversPosition',0 );
my $ret ="programming:edit_settings notAvaible:hue_room_garage runningUp.*:fts_shutter_up runningDown.*:fts_shutter_down ".$state.":fts_shutter_1w_".(int($state/10)*10);
$ret ="programming:edit_settings notAvaible:hue_room_garage runningUp.*:fts_shutter_up runningDown.*:fts_shutter_down ".$state.":fts_shutter_1w_".(100 - (int($state/10)*10)) if $invers eq "1";
my $ret ="programming:edit_settings notAvaible:hue_room_garage runningUp.*:fts_shutter_up runningDown.*:fts_shutter_down ".$state.":".$sticon.(int($state/10)*10);
$ret ="programming:edit_settings notAvaible:hue_room_garage runningUp.*:fts_shutter_up runningDown.*:fts_shutter_down ".$state.":".$sticon.(100 - (int($state/10)*10)) if $invers eq "1";
$ret =".*:fts_shutter_all" if ($hash->{CHANNEL_RECEIVE} eq '0');
$ret =".*:secur_locked\@red" if ReadingsVal( $name, 'lock_cmd', 'off' ) eq 'on';
return $ret;
}