From 44b72d75dc529c365b80a4a11fcc6ebd035f75e8 Mon Sep 17 00:00:00 2001
From: mgehre <>
Date: Sat, 8 Dec 2012 00:28:23 +0000
Subject: [PATCH] MAX: move removeDevice into factoryReset

git-svn-id: https://svn.fhem.de/fhem/trunk@2280 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/00_MAXLAN.pm |  1 +
 fhem/FHEM/10_MAX.pm    | 20 ++++++++------------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/fhem/FHEM/00_MAXLAN.pm b/fhem/FHEM/00_MAXLAN.pm
index 2d6da5bd5..a20a2016a 100755
--- a/fhem/FHEM/00_MAXLAN.pm
+++ b/fhem/FHEM/00_MAXLAN.pm
@@ -680,6 +680,7 @@ sub
 MAXLAN_RemoveDevice($$)
 {
   my ($hash,$addr) = @_;
+  #This does a factoryReset on the Device
   return MAXLAN_Write($hash,"t:1,1,".encode_base64(pack("H6",$addr),""), "A:");
 }
 
diff --git a/fhem/FHEM/10_MAX.pm b/fhem/FHEM/10_MAX.pm
index 3238fffeb..2415cc8a1 100755
--- a/fhem/FHEM/10_MAX.pm
+++ b/fhem/FHEM/10_MAX.pm
@@ -197,14 +197,6 @@ MAX_Set($@)
                                               $comfort,$eco,$max,$min,$offset,$windowOpenTemp,$windowOpenTime);
     return ($hash->{IODev}{SendDeviceCmd})->($hash->{IODev},$payload);
 
-  }elsif($setting eq "removeDevice") {
-    return "Cannot set without IODev" if(!defined($hash->{IODev}));
-    if(exists($hash->{IODev}{RemoveDevice})) {
-      return ($hash->{IODev}{RemoveDevice})->($hash->{IODev},$hash->{addr});
-    } else {
-      return "IODev does not need removeDevice";
-    }
-
   } elsif($setting eq "displayActualTemperature" and $hash->{type} eq "WallMountedThermostat") {
     return "Cannot set without IODev" if(!exists($hash->{IODev}));
     return "Invalid arg" if($args[0] ne "0" and $args[0] ne "1");
@@ -229,8 +221,14 @@ MAX_Set($@)
     return ($hash->{IODev}{SendDeviceCmd})->($hash->{IODev},$payload);
 
   } elsif($setting eq "factoryReset") {
-    my $payload = pack("CCCCCCH6C",0x00,0x00,0xF0,0x00,0x00,0x00,$hash->{addr}, 0);
-    return ($hash->{IODev}{SendDeviceCmd})->($hash->{IODev},$payload);
+    if(exists($hash->{IODev}{RemoveDevice})) {
+      #MAXLAN
+      return ($hash->{IODev}{RemoveDevice})->($hash->{IODev},$hash->{addr});
+    } else {
+      #CUL_MAXK
+      my $payload = pack("CCCCCCH6C",0x00,0x00,0xF0,0x00,0x00,0x00,$hash->{addr}, 0);
+      return ($hash->{IODev}{SendDeviceCmd})->($hash->{IODev},$payload);
+    }
 
   } elsif($setting eq "wakeUp") {
     my $payload = pack("CCCCCCH6CC",0x00,0x00,0xF1,0x00,0x00,0x00,$hash->{addr}, 0, 0x3F);
@@ -485,8 +483,6 @@ MAX_Parse($$)
     <li>groupid &lt;id&gt;<br>
       For devices of type HeatingThermostat only.
       Writes the given group id the device's memory. It is usually not necessary to change this.</li>
-    <li>removeDevice<br>
-      Removes the device from the cube, i.e. deletes the pairing.</li>
     <li>ecoTemperature &lt;value&gt;<br>
       For devices of type HeatingThermostat only. Writes the given eco temperature to the device's memory. It can be activated by pressing the rightmost physical button on the device.</li>
     <li>comfortTemperature &lt;value&gt;<br>