diff --git a/fhem/FHEM/00_CUL.pm b/fhem/FHEM/00_CUL.pm index 91aa62754..dc4cff954 100755 --- a/fhem/FHEM/00_CUL.pm +++ b/fhem/FHEM/00_CUL.pm @@ -47,7 +47,7 @@ my $clientsSlowRF = ":FS20:FHT:FHT8V:KS300:USF1000:BS:HMS: " . ":CUL_EM:CUL_WS:CUL_FHTTK:CUL_RFR:CUL_HOERMANN: " . ":ESA2000:CUL_IR:CUL_TX"; -my $clientsHomeMatic = ":CUL_HM:HMS:"; +my $clientsHomeMatic = ":CUL_HM:HMS:"; # OneWire emulated as HMS on a CUNO my %matchListSlowRF = ( "1:USF1000" => "^81..(04|0c)..0101a001a5ceaa00....", @@ -715,7 +715,7 @@ CUL_SendFromQueue($$) if($bstring ne "") { my $sp = AttrVal($name, "sendpool", undef); - if($sp) { # Is one of the CUL-fellows sending data? + if($sp) { # Is one of the CUL-fellows sending data? my @fellows = split(",", $sp); foreach my $f (@fellows) { if($f ne $name && diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index a30933c7c..e180f357c 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -1392,8 +1392,8 @@ CUL_HM_Pair(@) # Create shadow device for multi-channel if($stn eq "switch" && - $devInfo =~ m,(..)(..)(..), ) { - my ($b1, $b2, $b3) = (hex($1), hex($2), $3); + $devInfo =~ m,(..)(..)(..), ) { + my ($b1, $b2, $b3) = (hex($1)&0xf, hex($2), $3); for(my $i = $b2+1; $i<=$b1; $i++) { my $nSrc = sprintf("%s%02X", $src, $i); if(!defined($modules{CUL_HM}{defptr}{$nSrc})) { diff --git a/fhem/contrib/FB7390/startfhem b/fhem/contrib/FB7390/startfhem index 4fe549112..3fa96cd25 100755 --- a/fhem/contrib/FB7390/startfhem +++ b/fhem/contrib/FB7390/startfhem @@ -18,11 +18,14 @@ export LD_LIBRARY_PATH=$home/lib export PERL5LIB=$home/lib/perl5/site_perl/5.12.2/mips-linux:$home/lib/perl5/site_perl/5.12.2:$home/lib/perl5/5.12.2/mips-linux:$home/lib/perl5/5.12.2 # let FHEM run as user boxusr80 by adding user fhem with uid of boxusr80 +# Using this feature the following will not work: ping,WOL,lcd4linux +# start fhem-user id fhem > /dev/null 2>&1 if [ "$?" -ne "0" ]; then echo "user fhem does not exist. Adding it." echo "fhem:any:1080:0:fhem:/home-not-used:/bin/sh" >>/var/tmp/passwd fi +# end fhem-user # set file ownership chown -R boxusr80 ${home}/log diff --git a/fhem/contrib/survey.pl b/fhem/contrib/survey.pl index 139f49040..cd5548e0d 100755 --- a/fhem/contrib/survey.pl +++ b/fhem/contrib/survey.pl @@ -13,16 +13,16 @@ my @hw = qw( OWFS X10 OWTEMP ALL3076 ALL4027 WEBIO WEBIO_12DIGITAL WEBTHERM RFXCOM OREGON RFXMETER RFXX10REC RFXELSE WS300 Weather EM EMWZ EMEM EMGZ ESA2000 ECMD ECMDDevice SCIVT SISPM USBWX WS3600 M232 xxLG7000 M232Counter LGTV - M232Voltage WS2000 ALL4000T IPWE VantagePro2 + M232Voltage WS2000 ALL4000T IPWE VantagePro2 WOL NetIO230B IT CUL_IR ); my @help = qw( - at notify sequence watchdog FileLog FHEM2FHEM PachLog holiday PID autocreate - dummy structure SUNRISE_EL Utils XmlList updatefhem + at average notify sequence watchdog FileLog FHEM2FHEM PachLog holiday PID + autocreate dummy structure JsonList SUNRISE_EL Utils XmlList updatefhem ); my @fe = ( "FHEMRENDERER", "fheME", "iPhone: dhs-computertechnik", "iPhone: fhemgw", "iPhone: fhemobile", "iPhone: phyfhem", "myHCE", "pgm2/FHEMWEB with SVG", - "pgm2/FHEMWEB with gnuplot", "pgm3", "pgm5", "HomeMini", + "pgm2/FHEMWEB with gnuplot", "pgm3", "pgm5", "HomeMini", "android: andFHEM", ); my @platform = ( "PC: Linux", "OSX", "PC: Windows", "PC: BSD", "Fritz!Box 7390", "Fritz!Box 7270",