10_OWServer autocreate coexists with OWXXX modules

git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@6321 2b470e98-0d58-463d-a4d8-8e2adae1ed80

fhem/CHANGED

@@ -1,5 +1,6 @@
 # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
 # Do not insert empty lines here, update check depends on it.
+  - feature: 10_OWServer autocreate coexists with OWXXX modules (Boris & ntruchsess)
   - feature: added 36_Level.pm
   - feature: netatmo: added plz support for public stations
   - change:  70_ENIGMA2: keep reading for recordings up-to-date during standby

fhem/FHEM/10_OWServer.pm

@@ -381,9 +381,11 @@ OWServer_Autocreate($)
 
   my %defined = ();
   foreach my $d (keys %defs) {
-    next if($defs{$d}{TYPE} ne "OWDevice");
+    next if($defs{$d}{TYPE} !~ /^OW(Device|AD|ID|MULTI|COUNT|LCD|SWITCH|THERM)$/);
     if(defined($defs{$d}{fhem}) && defined($defs{$d}{fhem}{address})) {
-      $defined{$defs{$d}{fhem}{address}} = $d;
+      $defined{$defs{$d}{fhem}{address}} = $d; 
+    } elsif(defined($defs{$d}{OW_ID}) and defined($defs{$d}{OW_FAMILY})) {
+      $defined{"$defs{$d}{OW_FAMILY}.$defs{$d}{OW_ID}"} = $d;
     }
   }