From a4e9082f539cb4f58b9959e9297a359288e6d1d3 Mon Sep 17 00:00:00 2001
From: Pascal Langer <planger@mathworks.com>
Date: Thu, 20 Feb 2020 17:37:58 +0100
Subject: [PATCH] SLT CC2500 fix

---
 Multiprotocol/Multiprotocol.h  | 2 +-
 Multiprotocol/NRF250K_EMU.ino  | 6 ++++--
 Multiprotocol/SLT_nrf24l01.ino | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h
index bb40431..94dced6 100644
--- a/Multiprotocol/Multiprotocol.h
+++ b/Multiprotocol/Multiprotocol.h
@@ -19,7 +19,7 @@
 #define VERSION_MAJOR		1
 #define VERSION_MINOR		3
 #define VERSION_REVISION	0
-#define VERSION_PATCH_LEVEL	72
+#define VERSION_PATCH_LEVEL	73
 
 //******************
 // Protocols
diff --git a/Multiprotocol/NRF250K_EMU.ino b/Multiprotocol/NRF250K_EMU.ino
index bfd070a..daf959a 100644
--- a/Multiprotocol/NRF250K_EMU.ino
+++ b/Multiprotocol/NRF250K_EMU.ino
@@ -356,8 +356,6 @@ static void __attribute__((unused)) NRF250K_SetTXAddr(uint8_t* addr, uint8_t len
 	if (len > 5) len = 5;
 	if (len < 3) len = 3;
 	#ifdef CC2500_INSTALLED
-	xn297_addr_len = len;
-	memcpy(xn297_tx_addr, addr, len);
 	if(option==0)
 	#endif
 	{//NRF
@@ -366,6 +364,10 @@ static void __attribute__((unused)) NRF250K_SetTXAddr(uint8_t* addr, uint8_t len
 		return;
 	}
 	//CC2500
+	#ifdef CC2500_INSTALLED
+		xn297_addr_len = len;
+		memcpy(xn297_tx_addr, addr, len);
+	#endif
 }
 
 static void __attribute__((unused)) NRF250K_WritePayload(uint8_t* msg, uint8_t len)
diff --git a/Multiprotocol/SLT_nrf24l01.ino b/Multiprotocol/SLT_nrf24l01.ino
index 8e8ee07..b5f62e6 100644
--- a/Multiprotocol/SLT_nrf24l01.ino
+++ b/Multiprotocol/SLT_nrf24l01.ino
@@ -272,10 +272,9 @@ uint16_t initSLT()
 		/*	rx_tx_addr[0]=0x01;rx_tx_addr[1]=0x02;rx_tx_addr[2]=0x0B;rx_tx_addr[3]=0x57;*/
 		#endif
 	}
-	SLT_set_freq();
 	SLT_init();
+	SLT_set_freq();
 	phase = SLT_BUILD;
-	
 	return 50000;
 }