From 50636f7745fe2b94627c9fe99e9495156b8bda66 Mon Sep 17 00:00:00 2001
From: RWensveen <RWensveen@users.noreply.github.com>
Date: Fri, 13 Jul 2018 18:57:36 +0200
Subject: [PATCH] for debug, add compatibility mode in app-settings

---
 app.json                         |   2 +-
 drivers/A1/pair/start.html       |  13 ++--
 drivers/BroadlinkDriver.js       |  15 +++-
 drivers/Hysen/pair/start.html    |  13 ++--
 drivers/MP1/device.js            |  81 ++-------------------
 drivers/MP1/pair/start.html      |  13 ++--
 drivers/RM3_mini/pair/start.html |  13 ++--
 drivers/RM_plus/device.js        |  22 ++++--
 drivers/RM_plus/pair/start.html  |  13 ++--
 drivers/RM_pro/pair/start.html   |  13 ++--
 drivers/SP1/pair/start.html      |  13 ++--
 drivers/SP2/pair/start.html      |  13 ++--
 drivers/SP3S/pair/start.html     |  13 ++--
 lib/Communicate.js               | 121 +++++++++++++++++--------------
 lib/DeviceInfo.js                |  12 ++-
 locales/en.json                  |   9 ++-
 locales/nl.json                  |   9 ++-
 17 files changed, 167 insertions(+), 221 deletions(-)

diff --git a/app.json b/app.json
index 5ec1d0b..d6d6810 100644
--- a/app.json
+++ b/app.json
@@ -1,6 +1,6 @@
 {
 	"id": "com.broadlink",
-	"version": "1.3.2",
+	"version": "1.3.3",
 	"compatibility": ">=1.5.0",
 	"sdk": 2,
 	"name": {
diff --git a/drivers/A1/pair/start.html b/drivers/A1/pair/start.html
index 0e9c8af..f329103 100644
--- a/drivers/A1/pair/start.html
+++ b/drivers/A1/pair/start.html
@@ -16,6 +16,9 @@
  * along with com.broadlink.  If not, see http://www.gnu.org/licenses/.
 -->
 
+<script>
+
+</script>
 
 <style type="text/css">
   span label {
@@ -63,9 +66,7 @@
 
 <script type="text/javascript">
 
-
-
-
+Homey.setTitle(Homey.__('pair.title'));
 
 
 function showError( msg ) {
@@ -73,6 +74,7 @@
     $('.broadlink-error-msg').html( msg );
 }
 
+
 function add( data ) {
 
 	var ipAddressElement = document.getElementById('address');
@@ -95,15 +97,10 @@
 }
 
 
-
-
 Homey.on('discovered', function (device) {
 
 	if( device ) {
-		//showError( "found " + device.data.devtype);
-		
 		if( device.isCompatible ) {
-			//showError( `found complatible device: ${device.data.name} (${device.data.devtype})`);
 			Homey.showView('list_devices');
 		}
 		else {
diff --git a/drivers/BroadlinkDriver.js b/drivers/BroadlinkDriver.js
index 36f8a7f..5f308f2 100644
--- a/drivers/BroadlinkDriver.js
+++ b/drivers/BroadlinkDriver.js
@@ -60,10 +60,12 @@ class BroadlinkDriver extends Homey.Driver {
 		var that = this
 		
         socket.on('disconnect', function() {
-			that.discoveredDevices = [];
-			that._communicate.destroy();
-			that._communicate = undefined;
-       	});
+        	try {
+				that.discoveredDevices = [];
+				that._communicate.destroy();
+				that._communicate = undefined;
+        	} catch( err ) { ; }
+       	}); 
 		
 		socket.on( 'start_discover', function(userdata, callback ) {
 
@@ -90,16 +92,21 @@ class BroadlinkDriver extends Homey.Driver {
 			           				isCompatible: devinfo.isCompatible
 			           		}
 			           		that.discoveredDevices.push( device )
+			           		
+			           		Util.debugLog('->onPair.discovered = ' + JSON.stringify(device))
 			           		socket.emit('discovered', device )
 			           		
 			           	},  rejectReason => {
+			           		Util.debugLog('**>onPair.reject: ' + rejectReason)
 			           		socket.emit('discovered', null )
 			           	})
 			           	.catch( err => {
+			           		Util.debugLog('**>onPair.catch: ' + err)
 			           		socket.emit('discovered', null )
 			           	})
 				})
 				.catch( function(err) {
+					Util.debugLog('**>onPair.catch: ' + err)
 					socket.emit('discovered',null)
 				})
 		})
diff --git a/drivers/Hysen/pair/start.html b/drivers/Hysen/pair/start.html
index 0e9c8af..f329103 100644
--- a/drivers/Hysen/pair/start.html
+++ b/drivers/Hysen/pair/start.html
@@ -16,6 +16,9 @@
  * along with com.broadlink.  If not, see http://www.gnu.org/licenses/.
 -->
 
+<script>
+
+</script>
 
 <style type="text/css">
   span label {
@@ -63,9 +66,7 @@
 
 <script type="text/javascript">
 
-
-
-
+Homey.setTitle(Homey.__('pair.title'));
 
 
 function showError( msg ) {
@@ -73,6 +74,7 @@
     $('.broadlink-error-msg').html( msg );
 }
 
+
 function add( data ) {
 
 	var ipAddressElement = document.getElementById('address');
@@ -95,15 +97,10 @@
 }
 
 
-
-
 Homey.on('discovered', function (device) {
 
 	if( device ) {
-		//showError( "found " + device.data.devtype);
-		
 		if( device.isCompatible ) {
-			//showError( `found complatible device: ${device.data.name} (${device.data.devtype})`);
 			Homey.showView('list_devices');
 		}
 		else {
diff --git a/drivers/MP1/device.js b/drivers/MP1/device.js
index d0d7131..34335be 100644
--- a/drivers/MP1/device.js
+++ b/drivers/MP1/device.js
@@ -54,7 +54,7 @@ class MP1Device  extends BroadlinkDevice {
 	stop_state_check() {
 		if( this.checkTimer ) {
 			clearInterval( this.checkTimer);
-			this.checkTimer=undefined;
+			this.checkTimer = null;
 		}
 	}
 	
@@ -129,10 +129,10 @@ class MP1Device  extends BroadlinkDevice {
 	
 	onInit() {
 		super.onInit();
-		this.registerCapabilityListener('onoff.s1', onCapabilityOnOff_1.bind(this) )
-		this.registerCapabilityListener('onoff.s2', onCapabilityOnOff_2.bind(this) )
-		this.registerCapabilityListener('onoff.s3', onCapabilityOnOff_3.bind(this) )
-		this.registerCapabilityListener('onoff.s4', onCapabilityOnOff_4.bind(this) )
+		this.registerCapabilityListener('onoff.s1', this.onCapabilityOnOff_1.bind(this) )
+		this.registerCapabilityListener('onoff.s2', this.onCapabilityOnOff_2.bind(this) )
+		this.registerCapabilityListener('onoff.s3', this.onCapabilityOnOff_3.bind(this) )
+		this.registerCapabilityListener('onoff.s4', this.onCapabilityOnOff_4.bind(this) )
 	}
 	
 	/**
@@ -158,74 +158,3 @@ class MP1Device  extends BroadlinkDevice {
 }
 
 module.exports = MP1Device;
-
-
-
-
-
-
-/****
-class mp1(device):
-  def __init__ (self, host, mac, devtype):
-    device.__init__(self, host, mac, devtype)
-    self.type = "MP1"
-
-  def set_power_mask(self, sid_mask, state):
-    """Sets the power state of the smart power strip."""
-
-    packet = bytearray(16)
-    packet[0x00] = 0x0d
-    packet[0x02] = 0xa5
-    packet[0x03] = 0xa5
-    packet[0x04] = 0x5a
-    packet[0x05] = 0x5a
-    packet[0x06] = 0xb2 + ((sid_mask<<1) if state else sid_mask)
-    packet[0x07] = 0xc0
-    packet[0x08] = 0x02
-    packet[0x0a] = 0x03
-    packet[0x0d] = sid_mask
-    packet[0x0e] = sid_mask if state else 0
-
-    response = self.send_packet(0x6a, packet)
-
-    err = response[0x22] | (response[0x23] << 8)
-
-  def set_power(self, sid, state):
-    """Sets the power state of the smart power strip."""
-    sid_mask = 0x01 << (sid - 1)
-    return self.set_power_mask(sid_mask, state)
-
-  def check_power_raw(self):
-    """Returns the power state of the smart power strip in raw format."""
-    packet = bytearray(16)
-    packet[0x00] = 0x0a
-    packet[0x02] = 0xa5
-    packet[0x03] = 0xa5
-    packet[0x04] = 0x5a
-    packet[0x05] = 0x5a
-    packet[0x06] = 0xae
-    packet[0x07] = 0xc0
-    packet[0x08] = 0x01
-
-    response = self.send_packet(0x6a, packet)
-    err = response[0x22] | (response[0x23] << 8)
-    if err == 0:
-      payload = self.decrypt(bytes(response[0x38:]))
-      if type(payload[0x4]) == int:
-        state = payload[0x0e]
-      else:
-        state = ord(payload[0x0e])
-      return state
-
-  def check_power(self):
-    """Returns the power state of the smart power strip."""
-    state = self.check_power_raw()
-    data = {}
-    data['s1'] = bool(state & 0x01)
-    data['s2'] = bool(state & 0x02)
-    data['s3'] = bool(state & 0x04)
-    data['s4'] = bool(state & 0x08)
-    return data
-
- ****/
- 
\ No newline at end of file
diff --git a/drivers/MP1/pair/start.html b/drivers/MP1/pair/start.html
index 0e9c8af..f329103 100644
--- a/drivers/MP1/pair/start.html
+++ b/drivers/MP1/pair/start.html
@@ -16,6 +16,9 @@
  * along with com.broadlink.  If not, see http://www.gnu.org/licenses/.
 -->
 
+<script>
+
+</script>
 
 <style type="text/css">
   span label {
@@ -63,9 +66,7 @@
 
 <script type="text/javascript">
 
-
-
-
+Homey.setTitle(Homey.__('pair.title'));
 
 
 function showError( msg ) {
@@ -73,6 +74,7 @@
     $('.broadlink-error-msg').html( msg );
 }
 
+
 function add( data ) {
 
 	var ipAddressElement = document.getElementById('address');
@@ -95,15 +97,10 @@
 }
 
 
-
-
 Homey.on('discovered', function (device) {
 
 	if( device ) {
-		//showError( "found " + device.data.devtype);
-		
 		if( device.isCompatible ) {
-			//showError( `found complatible device: ${device.data.name} (${device.data.devtype})`);
 			Homey.showView('list_devices');
 		}
 		else {
diff --git a/drivers/RM3_mini/pair/start.html b/drivers/RM3_mini/pair/start.html
index 0e9c8af..f329103 100644
--- a/drivers/RM3_mini/pair/start.html
+++ b/drivers/RM3_mini/pair/start.html
@@ -16,6 +16,9 @@
  * along with com.broadlink.  If not, see http://www.gnu.org/licenses/.
 -->
 
+<script>
+
+</script>
 
 <style type="text/css">
   span label {
@@ -63,9 +66,7 @@
 
 <script type="text/javascript">
 
-
-
-
+Homey.setTitle(Homey.__('pair.title'));
 
 
 function showError( msg ) {
@@ -73,6 +74,7 @@
     $('.broadlink-error-msg').html( msg );
 }
 
+
 function add( data ) {
 
 	var ipAddressElement = document.getElementById('address');
@@ -95,15 +97,10 @@
 }
 
 
-
-
 Homey.on('discovered', function (device) {
 
 	if( device ) {
-		//showError( "found " + device.data.devtype);
-		
 		if( device.isCompatible ) {
-			//showError( `found complatible device: ${device.data.name} (${device.data.devtype})`);
 			Homey.showView('list_devices');
 		}
 		else {
diff --git a/drivers/RM_plus/device.js b/drivers/RM_plus/device.js
index 7815486..1d3e829 100644
--- a/drivers/RM_plus/device.js
+++ b/drivers/RM_plus/device.js
@@ -19,6 +19,7 @@
 'use strict';
 
 const RM3MiniDevice = require('./../RM3_mini/device');
+const Util = require('./../../lib/util.js');
 
 
 class RmPlusDevice extends RM3MiniDevice {
@@ -26,8 +27,9 @@ class RmPlusDevice extends RM3MiniDevice {
 	
 	onInit() {
 		super.onInit();
+		this.learn = false;
 		
-		this.registerCapabilityListener('learnRFCmd', this.onCapabilityLearnRF.bind(this));
+		this.registerCapabilityListener('learnRFcmd', this.onCapabilityLearnRF.bind(this));
 	}
 	
 
@@ -37,7 +39,7 @@ class RmPlusDevice extends RM3MiniDevice {
 	 * @returns {Promise}
 	 */
 	onCapabilityLearnRF(onoff) {
-	    //Util.debugLog('==>RM3miniDevice.onCapabilityLearnIR');
+	    Util.debugLog('==>RM3miniDevice.onCapabilityLearnIR');
 	    if( this.learn ) { 
 	    	return Promise.resolve() 
 	    }
@@ -46,26 +48,36 @@ class RmPlusDevice extends RM3MiniDevice {
 	    var that = this
 	    return this._communicate.enterRFSweep()
 			.then( response => {
-				//Util.debugLog('entered learning');
+				Util.debugLog('   sweeping');
 				that._communicate.checkRFData()
 					.then( data => {
+						Util.debugLog('  checked RF data ')
+						that._communicate.cancelRFSweep();
 						that._communicate.checkRFData2()
 							.then( data => {
+								Util.debugLog('  checked RF data 2')
 								that.learn = false;
 								if( data ) {
-									that._communicate.cancelRFSweep();
 									let idx = that.dataStore.dataArray.length + 1;
 									let cmdname = 'cmd' + idx;
 									this.dataStore.addCommand( cmdname, data);
 							
-									this.storeCmdSetting( cmdname )
+									this.storeCmdSetting( cmdname );
 								}
+							}, rej => { 
+								Util.debugLog('  check RF data 2: reject')
 							})
+					}, rej => { 
+						Util.debugLog('  check RF data : reject')
+						that._communicate.cancelRFSweep();
 					})
 					.catch( err => {
 						that.learn = false;
 						Util.debugLog('**> RMPlusDevice.onCapabilityLearnIR, error checking data: '+err);
 					})
+			}, rej => { 
+				Util.debugLog('  sweep : reject ')
+				that._communicate.cancelRFSweep();
 			})
 			.catch( err => {
 				Util.debugLog('**> error learning: '+err);
diff --git a/drivers/RM_plus/pair/start.html b/drivers/RM_plus/pair/start.html
index 0e9c8af..f329103 100644
--- a/drivers/RM_plus/pair/start.html
+++ b/drivers/RM_plus/pair/start.html
@@ -16,6 +16,9 @@
  * along with com.broadlink.  If not, see http://www.gnu.org/licenses/.
 -->
 
+<script>
+
+</script>
 
 <style type="text/css">
   span label {
@@ -63,9 +66,7 @@
 
 <script type="text/javascript">
 
-
-
-
+Homey.setTitle(Homey.__('pair.title'));
 
 
 function showError( msg ) {
@@ -73,6 +74,7 @@
     $('.broadlink-error-msg').html( msg );
 }
 
+
 function add( data ) {
 
 	var ipAddressElement = document.getElementById('address');
@@ -95,15 +97,10 @@
 }
 
 
-
-
 Homey.on('discovered', function (device) {
 
 	if( device ) {
-		//showError( "found " + device.data.devtype);
-		
 		if( device.isCompatible ) {
-			//showError( `found complatible device: ${device.data.name} (${device.data.devtype})`);
 			Homey.showView('list_devices');
 		}
 		else {
diff --git a/drivers/RM_pro/pair/start.html b/drivers/RM_pro/pair/start.html
index 0e9c8af..f329103 100644
--- a/drivers/RM_pro/pair/start.html
+++ b/drivers/RM_pro/pair/start.html
@@ -16,6 +16,9 @@
  * along with com.broadlink.  If not, see http://www.gnu.org/licenses/.
 -->
 
+<script>
+
+</script>
 
 <style type="text/css">
   span label {
@@ -63,9 +66,7 @@
 
 <script type="text/javascript">
 
-
-
-
+Homey.setTitle(Homey.__('pair.title'));
 
 
 function showError( msg ) {
@@ -73,6 +74,7 @@
     $('.broadlink-error-msg').html( msg );
 }
 
+
 function add( data ) {
 
 	var ipAddressElement = document.getElementById('address');
@@ -95,15 +97,10 @@
 }
 
 
-
-
 Homey.on('discovered', function (device) {
 
 	if( device ) {
-		//showError( "found " + device.data.devtype);
-		
 		if( device.isCompatible ) {
-			//showError( `found complatible device: ${device.data.name} (${device.data.devtype})`);
 			Homey.showView('list_devices');
 		}
 		else {
diff --git a/drivers/SP1/pair/start.html b/drivers/SP1/pair/start.html
index 0e9c8af..f329103 100644
--- a/drivers/SP1/pair/start.html
+++ b/drivers/SP1/pair/start.html
@@ -16,6 +16,9 @@
  * along with com.broadlink.  If not, see http://www.gnu.org/licenses/.
 -->
 
+<script>
+
+</script>
 
 <style type="text/css">
   span label {
@@ -63,9 +66,7 @@
 
 <script type="text/javascript">
 
-
-
-
+Homey.setTitle(Homey.__('pair.title'));
 
 
 function showError( msg ) {
@@ -73,6 +74,7 @@
     $('.broadlink-error-msg').html( msg );
 }
 
+
 function add( data ) {
 
 	var ipAddressElement = document.getElementById('address');
@@ -95,15 +97,10 @@
 }
 
 
-
-
 Homey.on('discovered', function (device) {
 
 	if( device ) {
-		//showError( "found " + device.data.devtype);
-		
 		if( device.isCompatible ) {
-			//showError( `found complatible device: ${device.data.name} (${device.data.devtype})`);
 			Homey.showView('list_devices');
 		}
 		else {
diff --git a/drivers/SP2/pair/start.html b/drivers/SP2/pair/start.html
index 0e9c8af..f329103 100644
--- a/drivers/SP2/pair/start.html
+++ b/drivers/SP2/pair/start.html
@@ -16,6 +16,9 @@
  * along with com.broadlink.  If not, see http://www.gnu.org/licenses/.
 -->
 
+<script>
+
+</script>
 
 <style type="text/css">
   span label {
@@ -63,9 +66,7 @@
 
 <script type="text/javascript">
 
-
-
-
+Homey.setTitle(Homey.__('pair.title'));
 
 
 function showError( msg ) {
@@ -73,6 +74,7 @@
     $('.broadlink-error-msg').html( msg );
 }
 
+
 function add( data ) {
 
 	var ipAddressElement = document.getElementById('address');
@@ -95,15 +97,10 @@
 }
 
 
-
-
 Homey.on('discovered', function (device) {
 
 	if( device ) {
-		//showError( "found " + device.data.devtype);
-		
 		if( device.isCompatible ) {
-			//showError( `found complatible device: ${device.data.name} (${device.data.devtype})`);
 			Homey.showView('list_devices');
 		}
 		else {
diff --git a/drivers/SP3S/pair/start.html b/drivers/SP3S/pair/start.html
index 0e9c8af..f329103 100644
--- a/drivers/SP3S/pair/start.html
+++ b/drivers/SP3S/pair/start.html
@@ -16,6 +16,9 @@
  * along with com.broadlink.  If not, see http://www.gnu.org/licenses/.
 -->
 
+<script>
+
+</script>
 
 <style type="text/css">
   span label {
@@ -63,9 +66,7 @@
 
 <script type="text/javascript">
 
-
-
-
+Homey.setTitle(Homey.__('pair.title'));
 
 
 function showError( msg ) {
@@ -73,6 +74,7 @@
     $('.broadlink-error-msg').html( msg );
 }
 
+
 function add( data ) {
 
 	var ipAddressElement = document.getElementById('address');
@@ -95,15 +97,10 @@
 }
 
 
-
-
 Homey.on('discovered', function (device) {
 
 	if( device ) {
-		//showError( "found " + device.data.devtype);
-		
 		if( device.isCompatible ) {
-			//showError( `found complatible device: ${device.data.name} (${device.data.devtype})`);
 			Homey.showView('list_devices');
 		}
 		else {
diff --git a/lib/Communicate.js b/lib/Communicate.js
index d3c8b05..071a3d3 100644
--- a/lib/Communicate.js
+++ b/lib/Communicate.js
@@ -135,7 +135,7 @@ class Communicate  {
      * return: [Promise]
      *         from Promise, return [Buffer] with response
      */
-     send_packet(command, payload) {
+     send_packet(command, version, payload) {
         let i=0;
         
         this.count = (this.count + 1) & 0xffff;
@@ -148,7 +148,7 @@ class Communicate  {
         packet[0x05] = 0xa5;
         packet[0x06] = 0xaa;
         packet[0x07] = 0x55;
-        packet[0x24] = 0x2a;
+        packet[0x24] = version? 0x9d : 0x2a;
         packet[0x25] = 0x27;
         packet[0x26] = command;
         packet[0x28] = this.count & 0xff;
@@ -164,7 +164,7 @@ class Communicate  {
         packet[0x32] = this.id[2];
         packet[0x33] = this.id[3];
 
-        // pad the payload for AES encryption, should bine in multiples of 16 bytes
+        // pad the payload for AES encryption, should be in in multiples of 16 bytes
         if( payload.length > 0 ) {
             var numpad = (Math.trunc( payload.length / 16) +1)*16 - payload.length;
             payload=Util.concatTypedArrays(payload,new Uint8Array(numpad));
@@ -196,16 +196,16 @@ class Communicate  {
         packet[0x20] = checksum & 0xff;
         packet[0x21] = checksum >> 8;
         
+        Util.debugLog('->send_packet: pact='+Util.asHex(packet));
         // send packet
         return this.sendto( packet, this.ipAddress, 80, 5 )
             .then( function( response ) {
-                    return response.data;
+            		Util.debugLog('->send_packet: resp='+Util.asHex(response.data))
+            		return response.data;
                 }, function( error ) {
-                    //Util.debugLog('  send_packet error: ' + error)
                     throw error;
                 })
             .catch( function( err ) {
-                //Util.debugLog('  send_packet catch' + err)
                 throw err;
                 });
     }
@@ -284,28 +284,32 @@ class Communicate  {
         payload[0x36] = '1'.charCodeAt();
 
         var that = this;
-        return this.send_packet(0x65, payload)
+        return this.send_packet(0x65, false, payload)
             .then( function( response ) {
-                        
-                        var payload = that.decrypt(response.slice(0x38))
-                        if( !payload ) {
-                            throw  new Error(Homey.__('errors.decrypt_payload'))
-                        }
+            	
+            	var payload = that.decrypt(response.slice(0x38))
+            	if( !payload ) {
+            		Util.debugLog('**> auth: decrypt payload error')
+            		throw  new Error(Homey.__('errors.decrypt_payload'))
+            	}
+
+                var key = payload.slice(0x04,0x14);
+                if( key.length % 16 != 0 ) {
+                	Util.debugLog('**> auth: keylength error')
+                	throw  new Error(Homey.__('errors.decrypt_keylength') + key.length)
+                }
+                var id = payload.slice(0x00,0x04);
+                that.id = id;
+                that.key = key;
+                let authData = { id:  id,
+                                 key: key 
+                }
+                Util.debugLog('**> auth: auth data :'+JSON.stringify(authData))
 
-                        var key = payload.slice(0x04,0x14);
-                        if( key.length % 16 != 0 ) {
-                            throw  new Error(Homey.__('errors.decrypt_keylength') + key.length)
-                        }
-                        var id = payload.slice(0x00,0x04);
-                        that.id = id;
-                        that.key = key;
-                        let authData = { id:  id,
-                                         key: key 
-                        }
-                        return ( authData );
+                return ( authData );
             })
             .catch( err => {
-                    throw err;
+                throw err;
             })
     }
 
@@ -394,10 +398,9 @@ class Communicate  {
         packet[0x20] = checksum & 0xff;
         packet[0x21] = (checksum >> 8 ) & 0xff;
 
-        return this.sendto( packet, device_ip_address, 80, timeout )
+       return this.sendto( packet, device_ip_address, 80, timeout )
             .then( function( response ) {
-                    
-                    let info = { ipAddress : response.address,
+                   let info = { ipAddress : response.address,
                                  mac       : response.data.slice(0x3a,0x3a+6),
                                  devtype   : response.data[0x34] | response.data[0x35] << 8
                            };
@@ -405,6 +408,7 @@ class Communicate  {
                     return ( info );
                 })
             .catch( function( err ) {
+                	Util.debugLog('**> discover: catch = '+err);
                     throw err;
                 });
     }
@@ -423,7 +427,7 @@ class Communicate  {
         var payload = new Uint8Array(16);
         payload[0] = 3;
         
-        return this.send_packet(0x6a, payload)
+        return this.send_packet(0x6a, false, payload)
             .then ( response => {
                 Promise.resolve( response );
             })
@@ -445,30 +449,37 @@ class Communicate  {
         return new Promise( function(resolve, reject ) {
             let repeatCount = 8
             let tm = setInterval( function() {
-                
-                that.send_packet(0x6a, payload)
+                Util.debugLog('_check_data - repeat='+repeatCount)
+                that.send_packet(0x6a, false, payload)
                     .then ( response => {
+                    	let err = -1
                         if( response ) {
-                        
-                            let err = response[0x22] | (response[0x23] << 8)
-                            if( err == 0 ) {
-                                clearInterval(tm)
-                            
-                                let payload = that.decrypt(response.slice(0x38))  // remove 0x38 bytes from start of array
-                                let p = payload.slice(0x04)                       // remove first 4 bytes of array
+                            err = response[0x22] | (response[0x23] << 8)
+                        }
+                    	if( err == 0 ) {
+                    		clearInterval(tm)
+                    		tm = null
+                    		let payload = that.decrypt(response.slice(0x38))  // remove 0x38 bytes from start of array
+                    		let p = payload.slice(0x04)                       // remove first 4 bytes of array
                                 
-                                resolve( p )
-                            }
-                            else {
-                                repeatCount = repeatCount -1;
-                                if( repeatCount <= 0 ) {
-                                    clearInterval(tm);
-                                    resolve( null )
-                                }
+                    		resolve( p )
+                        }
+                    	else {
+                    		repeatCount = repeatCount -1;
+                    		if( repeatCount <= 0 ) {
+                    			clearInterval(tm);
+                    			tm=null
+                    			resolve( null )
                             }
                         }
+                    }, rejection => {
+                    	clearInterval(tm);
+                    	tm=null;
+                    	reject(rejection)
                     })
                     .catch( err => {
+                    	clearInterval(tm);
+                    	tm=null;
                         reject( err );
                     })
             },
@@ -489,8 +500,8 @@ class Communicate  {
     enterRFSweep() {
         var payload = new Uint8Array(16);
         payload[0] = 0x19;
-        
-        return this.send_packet(0x6a, payload)
+        Util.debugLog('->enterRFSweep');
+        return this.send_packet(0x6a, true, payload)
             .then ( response => {
                 return response;
             })
@@ -517,7 +528,7 @@ class Communicate  {
         var payload = new Uint8Array(16);
         payload[0] = 0x1e;
         
-        return this.send_packet(0x6a, payload)
+        return this.send_packet(0x6a, false, payload)
             .then ( response => {
                 return response;
             })
@@ -536,7 +547,7 @@ class Communicate  {
         payload[0] = 0x02
         payload = Util.concatTypedArrays( payload, data );
         
-        return this.send_packet(0x6a, payload)
+        return this.send_packet(0x6a, false, payload)
             .then (response => {
                 return response;
             }, rejection => {
@@ -559,7 +570,7 @@ class Communicate  {
         return new Promise( function(resolve, reject ) {
             var payload = new Uint8Array(16);
             payload[0] = 0x01;
-            that.send_packet(0x6a, payload)
+            that.send_packet(0x6a, false, payload)
                 .then ( response => {
                     let err = response[0x22] | (response[0x23] << 8)
                     if( err == 0 ) {
@@ -590,7 +601,7 @@ class Communicate  {
         var payload = new Uint8Array(16);
         payload[0] = 0x02;
         payload[4] = state;
-        return this.send_packet(0x6a, payload)
+        return this.send_packet(0x6a, false, payload)
             .then ( response => {
                 return response;
             }, rejection => {
@@ -610,7 +621,7 @@ class Communicate  {
         return new Promise( function(resolve, reject ) {
             var payload = new Uint8Array([8, 0, 254, 1, 5, 1, 0, 0, 0, 45]);
             
-            that.send_packet(0x6a, payload)
+            that.send_packet(0x6a, false, payload)
                 .then ( response => {
 
                 	let err = response[0x22] | (response[0x23] << 8)
@@ -650,7 +661,7 @@ class Communicate  {
             
         var that = this
 
-        return this.send_packet(0x6a, payload)
+        return this.send_packet(0x6a, false, payload)
             .then ( response => {
                
                 let err = response[0x22] | (response[0x23] << 8)
@@ -692,7 +703,7 @@ class Communicate  {
         payload[0x0d] = sid_mask
         payload[0x0e] = mode ? sid_mask : 0
 
-        return this.send_packet(0x6a, payload)
+        return this.send_packet(0x6a, false, payload)
             .then( r => { return Promise.resolve(true) }, 
                    rejection => { return Promise.reject(rejection) }
                  )
@@ -712,7 +723,7 @@ class Communicate  {
         else {
             payload[0] = 0x00;
         }
-        return this.send_packet(0x66, payload)
+        return this.send_packet(0x66, false, payload)
             .then ( response => {
                 return response;
             }, rejection => {
diff --git a/lib/DeviceInfo.js b/lib/DeviceInfo.js
index 777961b..79241e2 100644
--- a/lib/DeviceInfo.js
+++ b/lib/DeviceInfo.js
@@ -19,6 +19,7 @@
 'use strict'
 
 const Util = require('./util.js');
+const Homey = require('homey');
 
 var BroadlinkType = { 'UNKNOWN' : 0,
                       'SP1'     : 1,
@@ -115,11 +116,14 @@ exports.getDeviceInfo = function( founddevID, expecteddevID ) {
 	var foundInfo = devType2Info( founddevID );
 	var expectedInfo = devType2Info( expecteddevID );
 
-	if( foundInfo.type === expectedInfo.type ) { foundInfo.isCompatible = true; }
+	if( foundInfo.type == expectedInfo.type ) { foundInfo.isCompatible = true; }
+	
+	let mode = Homey.ManagerSettings.get('CompatSettings');
+	if( mode ) {
+		foundInfo.isCompatible = true; // TODO: DEBUG ONLY
+		Util.debugLog('getDeviceInfo: found = ' + founddevID + '  expected = ' + expecteddevID + '  isComp = ' + foundInfo.isCompatible)
+	}
 	
-	//foundInfo.isCompatible = true; // TODO: DEBUG ONLY
-	//Util.debugLog('getDeviceInfo: found = ' + founddevID + '  expected = ' + expecteddevID + '  isComp = ' + foundInfo.isCompatible)
-
 	return foundInfo
 }
 
diff --git a/locales/en.json b/locales/en.json
index 6d7b43a..5f012c7 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -11,10 +11,10 @@
     "invalid_response": "invalid response from device"
   },
   "pair": {
-    "title": "Pair Broadlink RM3 Mini",
+    "title": "Pair Broadlink Device",
     "nosettings": "Please fill in all the fields.",
     "invalidsettings":"Please use correct format for address and mac",
-    "intro": "Configure the RM3-mini with the e-Control app on a smartphone.<br>Get the IP address from your wifi router",
+    "intro": "Configure the device with the e-Control app on a smartphone.<br>Get the IP address from your wifi router.",
 	"cancel": "Cancel",
 	"add": "Add",
 	"address": "IP address",
@@ -24,6 +24,11 @@
 	"invalid_ipaddress": "Invalid IP address",
 	"discovering": "Discovering device..."
   },
+  "settings":{
+  	"title": "Broadlink Debug Settings",
+  	"intro": "In compatibility mode, any device found during pairing will be accepted as the selected device type. This means the device paired will be treated as the choosen device type. As a result, not all (if any) of the capablities of the device will work properly",
+  	"compatmode": "Compatibility mode"
+  },
   "air_quality": {
     "excellent": "excellent",
     "good": "good",
diff --git a/locales/nl.json b/locales/nl.json
index 065a1e3..aa42a19 100644
--- a/locales/nl.json
+++ b/locales/nl.json
@@ -11,10 +11,10 @@
     "invalid_response": "ongeldig antwoord van apparaat"
   },
   "pair": {
-    "title": "Broadlink RM3 Mini toevoegen",
+    "title": "Broadlink Apparaat Toevoegen",
     "nosettings": "Niet alle velden zijn ingevuld.",
     "invalidsettings":"Gebruik juiste formaat voor IP adres.",
-    "intro": "Configureer de RM3 Mini met de e-Control app op een smartphone.<br>Zoek dan het IP adres op de wifi router",
+    "intro": "Configureer het apparaat met de e-Control app op een smartphone.<br>Zoek dan het IP adres op de WiFi router.",
 	"cancel": "Stop",
 	"add": "Toevoegen",
 	"address": "IP address",
@@ -24,6 +24,11 @@
 	"invalid_ipaddress": "Ongeldig IP adres",
 	"discovering": "Probeer apparaat te ontdekken..."
   },
+  "settings":{
+  	"title": "Broadlink Debug Instellingen",
+  	"intro": "In eenheidsmode, ieder apparaat dat gevonden wordt tijdens paren, zal geaccepteerd worden alsof het van het gewenste type is. Dit betekent dat het geinstalleerde apparaat aangesproken wordt alsof het een apparaat van dat type is. Hierdoor zullen niet alle (of zelfs geen enkele) van zijn mogelijkheden naar behoren werken.",
+   	"compatmode": "Eenheidsmode"
+  },
   "air_quality": {
     "excellent": "uitstekend",
     "good": "goed",