Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-01 20:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

98_Siro.pm: separation of stop and longstop in programming mode

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@20772 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Byte09 2019-12-17 16:52:51 +00:00
parent 9b7f569ec8
commit 1bdaa2c269
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
FHEM/98_Siro.pm
View File

@ -127,6 +127,7 @@ my %sets = (
"down" => "noArg", "down" => "noArg",
"off" => "noArg", "off" => "noArg",
"stop" => "noArg", "stop" => "noArg",
"longstop" => "noArg",
"on" => "noArg", "on" => "noArg",
"fav" => "noArg", "fav" => "noArg",
"prog" => "noArg", "prog" => "noArg",
@ -154,6 +155,7 @@ my %setsstandart = (
"down" => "noArg", "down" => "noArg",
"off" => "noArg", "off" => "noArg",
"stop" => "noArg", "stop" => "noArg",
"longstop" => "noArg",
"on" => "noArg", "on" => "noArg",
"fav" => "noArg", "fav" => "noArg",
"prog" => "noArg", "prog" => "noArg",
@ -190,6 +192,7 @@ my %sendCommands = (
"level" => "level", "level" => "level",
"position" => "level", "position" => "level",
"stop" => "stop", "stop" => "stop",
"longstop" => "longstop",
"off" => "off", "off" => "off",
"on" => "on", "on" => "on",
"open" => "off", "open" => "off",
@ -363,6 +366,19 @@ sub SendCommand($@) {
my $command = $siro_c2b{$cmd}; my $command = $siro_c2b{$cmd};
my $io = $hash->{IODev}; # IO-Device (SIGNALduino) 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 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 "); 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" )|| (defined $hash->{helper}{progmode} and $hash->{helper}{progmode} eq "on"))
if ( (defined($args[1]) and $args[1] eq "longstop" )) if ( (defined($args[1]) and $args[1] eq "longstop" ))
@ -867,6 +883,8 @@ sub Set($@) {
if ($hash->{helper}{progmode} eq "on") if ($hash->{helper}{progmode} eq "on")
{ {
Log3( $name, 5, "Siro-Programmiermodus: ".$sendCommands{$cmd});
SendCommand( $hash, $sendCommands{$cmd} ); SendCommand( $hash, $sendCommands{$cmd} );
delete( $hash->{Signalduino_RAWMSG} ); delete( $hash->{Signalduino_RAWMSG} );
delete( $hash->{Signalduino_MSGCNT} ); delete( $hash->{Signalduino_MSGCNT} );
@ -1586,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.= "<input style=\"height: 80px; width: 150px;\" type=\"button\" id=\"siro_prog_down\" value=\"STOP\" onClick=\"javascript:prog('stop');\">";
$msg.= "&nbsp;"; $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;"; $msg.= "&nbsp;";
$msg.= "&nbsp;"; $msg.= "&nbsp;";