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 2020-03-28 10:26:51 +01:00 committed by GitHub
parent 91f6aec703
commit acc6a5f35a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
FHEM/98_Siro.pm
View File

@ -1,4 +1,4 @@
# $Id: 98_Siro.pm 19825 2019-07-14 08:05:23Z Byte09 $
# $Id: 98_Siro.pm 20772 2019-12-17 16:52:51Z Byte09 $
#
# Siro module for FHEM
# Thanks for templates/coding from SIGNALduino team and Jarnsen_darkmission_ralf9
@ -127,6 +127,7 @@ my %sets = (
"down" => "noArg",
"off" => "noArg",
"stop" => "noArg",
"longstop" => "noArg",
"on" => "noArg",
"fav" => "noArg",
"prog" => "noArg",
@ -154,6 +155,7 @@ my %setsstandart = (
"down" => "noArg",
"off" => "noArg",
"stop" => "noArg",
"longstop" => "noArg",
"on" => "noArg",
"fav" => "noArg",
"prog" => "noArg",
@ -190,6 +192,7 @@ my %sendCommands = (
"level" => "level",
"position" => "level",
"stop" => "stop",
"longstop" => "longstop",
"off" => "off",
"on" => "on",
"open" => "off",
@ -363,6 +366,19 @@ sub SendCommand($@) {
my $command = $siro_c2b{$cmd};
my $io = $hash->{IODev}; # IO-Device (SIGNALduino)
Log3( $name, 5,"Siro_sendCommand: cmd - $cmd");
if ($cmd eq "longstop")
{
$args[1]="longstop";
$cmd="stop";
$command = $siro_c2b{$cmd};
}
Log3( $name, 5,"Siro_sendCommand: args1 - $args[1]") if defined $args[1];
if ( defined($hash->{helper}{exexcmd}) and $hash->{helper}{exexcmd} eq "off") # send kommand blockiert / keine ausf?hrung
{
Log3( $name, 4,"Siro_sendCommand: ausfuehrung durch helper blockiert ");
@ -378,7 +394,7 @@ sub SendCommand($@) {
}
Log3( $name, 4,"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"))
if ( (defined($args[1]) and $args[1] eq "longstop" ))
@ -437,9 +453,7 @@ sub Parse($$) {
my $doubelmsgtime = AttrVal( $name, 'SIRO_dbl_msg_block',2 ); # zeit in sek in der doppelte nachrichten blockiert werden
my $favcheck = $doubelmsgtime + 2;# zeit in der ein zweiter stop kommen muss/darf für fav
Log3( $name, 0,"$name Testversion siro_parse abgebrochen");
return;
# Log3( $name, 0,"name $name");
return "" if ( IsDisabled($name) );
@ -869,6 +883,8 @@ sub Set($@) {
if ($hash->{helper}{progmode} eq "on")
{
Log3( $name, 5, "Siro-Programmiermodus: ".$sendCommands{$cmd});
SendCommand( $hash, $sendCommands{$cmd} );
delete( $hash->{Signalduino_RAWMSG} );
delete( $hash->{Signalduino_MSGCNT} );
@ -1588,6 +1604,9 @@ my ( $FW_wname, $d, $room, $pageHash ) =@_; # pageHash is set for summaryFn.
$msg.= "<input style=\"height: 80px; width: 150px;\" type=\"button\" id=\"siro_prog_down\" value=\"STOP\" onClick=\"javascript:prog('stop');\">";
$msg.= "&nbsp;";
$msg.= "<input style=\"height: 80px; width: 150px;\" type=\"button\" id=\"siro_prog_down\" value=\"LONGSTOP\" onClick=\"javascript:prog('longstop');\">";
$msg.= "&nbsp;";
$msg.= "&nbsp;";
$msg.= "&nbsp;";
$msg.= "&nbsp;";