From b153b2bcb96bf538a31f5ca5918d4ae679556794 Mon Sep 17 00:00:00 2001
From: ntruchsess <ntruchsess@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Mon, 14 Apr 2014 10:10:17 +0000
Subject: [PATCH] OWX: add attribute dokick (synonym for 'buspower=real')

git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@5522 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/00_OWX.pm | 43 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 39 insertions(+), 4 deletions(-)

diff --git a/fhem/FHEM/00_OWX.pm b/fhem/FHEM/00_OWX.pm
index ec4138ee8..5611f7c5b 100644
--- a/fhem/FHEM/00_OWX.pm
+++ b/fhem/FHEM/00_OWX.pm
@@ -130,7 +130,8 @@ sub OWX_Initialize ($) {
   $hash->{GetFn}   = "OWX_Get";
   $hash->{SetFn}   = "OWX_Set";
   $hash->{NotifyFn} = "OWX_Notify";
-  $hash->{AttrList}= "loglevel:0,1,2,3,4,5,6 buspower:real,parasitic IODev";
+  $hash->{AttrFn}  = "OWX_Attr";
+  $hash->{AttrList}= "loglevel:0,1,2,3,4,5,6 buspower:real,parasitic dokick:1,0 interval IODev";
 
   #-- Adapt to FRM
   $hash->{InitFn}   = "FRM_OWX_Init";
@@ -244,7 +245,7 @@ sub OWX_Start ($) {
   InternalTimer(gettimeofday()+10, "OWX_Discover", $hash,0);
   
   #-- Default settings
-  $hash->{interval}     = 300;          # kick every 5 minutes
+  $hash->{interval}     = AttrVal($hash->{NAME},"interval",300);          # kick every 5 minutes
   $hash->{followAlarms} = "off";
   $hash->{ALARMED}      = "no";
   
@@ -267,6 +268,40 @@ sub OWX_Notify {
   }
 }
 
+#######################################################################################
+#
+# OWTX_Attr - Set one attribute value for device
+#
+#  Parameter hash = hash of device addressed
+#            a = argument array
+#
+########################################################################################
+
+sub OWX_Attr(@) {
+  my ($do,$name,$key,$value) = @_;
+  
+  my $hash = $defs{$name};
+  my $ret;
+  
+  if ( $do eq "set") {
+  	ARGUMENT_HANDLER: {
+      $key eq "buspower" and do {
+        #-- check value
+        $attr{$hash->{NAME}}{dokick} = $value eq "real" ? 1 : 0;
+        last;
+      };
+      $key eq "interval" and do {
+        $hash->{interval} = $value;
+        if ($main::init_done) {
+          OWX_Kick($hash);
+        }
+        last;
+      };
+    }
+  }
+  return $ret;
+}
+
 ########################################################################################
 #
 # OWX_Alarms - Find devices on the 1-Wire bus, 
@@ -911,7 +946,7 @@ sub OWX_Kick($) {
   OWX_Reset($hash);
    
   #-- Only if we have real power on the bus
-  if( defined($attr{$hash->{NAME}}{buspower}) &&  ($attr{$hash->{NAME}}{buspower} eq "real") ){
+  if( AttrVal($hash->{NAME},"dokick",0) ) {
     #-- issue the skip ROM command \xCC followed by start conversion command \x44 
     $ret = OWX_Complex($hash,"","\xCC\x44",0);
     if( $ret eq 0 ){
@@ -1010,7 +1045,7 @@ sub OWX_Set($@) {
     
   }
   Log GetLogLevel($name,3), "OWX_Set $name ".join(" ",@a)." => $res";  
-  DoTrigger($name, undef) if($init_done);
+  DoTrigger($name, undef) if($main::init_done);
   return "OWX_Set => $name ".join(" ",@a)." => $res";
 }