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

Rechtschreibfehler verbessert, Version 0.8.0

Browse Source
This commit is contained in:
Marko Oldenburg 2015-10-29 09:22:54 +01:00
parent d39456769e
commit d7833b3752
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
74_AMAD.pm
View File

@ -35,11 +35,7 @@ use Time::HiRes qw(gettimeofday);
use HttpUtils; use HttpUtils;
use TcpServerUtils; use TcpServerUtils;
<<<<<<< HEAD
my $version = "0.6.3";
=======
my $version = "0.8.0"; my $version = "0.8.0";
>>>>>>> devel
@ -94,15 +90,11 @@ sub AMAD_Define($$) {
if( ! $hash->{HOST} ) { if( ! $hash->{HOST} ) {
return "there is already a AMAD Bridge" if( $modules{AMAD}{defptr}{BRIDGE} ); return "there is already a AMAD Bridge" if( $modules{AMAD}{defptr}{BRIDGE} );
<<<<<<< HEAD
Log3 $name, 3, "AMAD ($name) - defined with host $hash->{HOST} on port $hash->{PORT} and interval $hash->{INTERVAL} (sec)";
=======
$hash->{BRIDGE} = 1; $hash->{BRIDGE} = 1;
$modules{AMAD}{defptr}{BRIDGE} = $hash; $modules{AMAD}{defptr}{BRIDGE} = $hash;
$attr{$name}{room} = "AMAD"; $attr{$name}{room} = "AMAD";
Log3 $name, 3, "AMAD ($name) - defined Bridge with Socketport $hash->{PORT}"; Log3 $name, 3, "AMAD ($name) - defined Bridge with Socketport $hash->{PORT}";
AMAD_CommBridge_Open( $hash ); AMAD_CommBridge_Open( $hash );
>>>>>>> devel
} else { } else {
if( ! $modules{AMAD}{defptr}{BRIDGE} && $init_done ) { if( ! $modules{AMAD}{defptr}{BRIDGE} && $init_done ) {