From 8c32cdf5fd87db8d3132ecbd127ab88e1b57e639 Mon Sep 17 00:00:00 2001
From: pascallanger <pascal_langer@yahoo.fr>
Date: Sun, 12 Jan 2020 13:00:30 +0100
Subject: [PATCH] Pelikan: fix TX and multi ID

Still 1 hopping freq table
---
 Multiprotocol/A7105_SPI.ino     | 18 ++++--------------
 Multiprotocol/Pelikan_a7105.ino | 14 ++++++++------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/Multiprotocol/A7105_SPI.ino b/Multiprotocol/A7105_SPI.ino
index 53c0f1c..38ea07a 100644
--- a/Multiprotocol/A7105_SPI.ino
+++ b/Multiprotocol/A7105_SPI.ino
@@ -224,22 +224,12 @@ void A7105_AdjustLOBaseFreq(uint8_t cmd)
 	offset<<=1;
 	if(offset < 0)
 	{
-		#ifdef PROTO_PELIKAN
-		if(protocol==PROTO_PELIKAN)
-			bip = 0x63;
-		else
-		#endif
-			bip = 0x4a;	// 2368 MHz
+		bip = 0x4a;	// 2368 MHz
 		bfp = 0xffff + offset;
 	}
 	else
 	{
-		#ifdef PROTO_PELIKAN
-		if(protocol==PROTO_PELIKAN)
-			bip = 0x64;	// default
-		else
-		#endif
-			bip = 0x4b;	// 2400 MHz (default)
+		bip = 0x4b;	// 2400 MHz (default)
 		bfp = offset;
 	}
 	A7105_WriteReg( A7105_11_PLL_III, bip);
@@ -310,8 +300,8 @@ const uint8_t PROGMEM HUBSAN_A7105_regs[] = {
 #endif
 #ifdef PELIKAN_A7105_INO
 const uint8_t PROGMEM PELIKAN_A7105_regs[] = {
-	0xff, 0x42, 0x00, 0x0F, 0x00, 0xff, 0xff ,0x00, 0x00, 0x00, 0x00, 0x01, 0x21, 0xb7, 0x01, 0x50,	// 00 - 0f
-	0x96, 0x64, 0x00, 0x02, 0x16, 0x2f, 0x12, 0x00, 0x62, 0x80, 0x80, 0x00, 0x0a, 0x32, 0xc3, 0x07,	// 10 - 1f
+	0xff, 0x42, 0x00, 0x0F, 0x00, 0xff, 0xff ,0x00, 0x00, 0x00, 0x00, 0x01, 0x21, 0x05, 0x01, 0x50,	// 00 - 0f
+	0x9e, 0x4b, 0x00, 0x02, 0x16, 0x2b, 0x12, 0x00, 0x62, 0x80, 0x80, 0x00, 0x0a, 0x32, 0xc3, 0x07,	// 10 - 1f
 	0x16, 0x00, 0x00, 0xff, 0x00, 0x00, 0x3b, 0x00, 0x1f, 0x47, 0x80, 0x03, 0x01, 0x45, 0x18, 0x00,	// 20 - 2f
 	0x01, 0x0f // 30 - 31
 };
diff --git a/Multiprotocol/Pelikan_a7105.ino b/Multiprotocol/Pelikan_a7105.ino
index 9ac9de9..6150916 100644
--- a/Multiprotocol/Pelikan_a7105.ino
+++ b/Multiprotocol/Pelikan_a7105.ino
@@ -18,7 +18,7 @@
 
 #include "iface_a7105.h"
 
-#define PELIKAN_FORCE_ID
+//#define PELIKAN_FORCE_ID
 
 #define PELIKAN_BIND_COUNT		400
 #define PELIKAN_BIND_RF			0x3C
@@ -136,15 +136,17 @@ uint16_t initPelikan()
 	if(IS_BIND_IN_PROGRESS)
 		A7105_WriteReg(A7105_03_FIFOI,0x10);
 	
-	//ID
+	//ID from dump
 	#ifdef PELIKAN_FORCE_ID
-		rx_tx_addr[0]=0x0D;
-        rx_tx_addr[1]=0xF4;
-        rx_tx_addr[2]=0x50;
-        rx_tx_addr[3]=0x18;
+		rx_tx_addr[0]=0x0D;		// hopping freq
+		rx_tx_addr[1]=0xF4;		// hopping freq
+		rx_tx_addr[2]=0x50;		// ID
+		rx_tx_addr[3]=0x18;		// ID
 	#endif
 
 	// Fill frequency table
+	rx_tx_addr[0]=0x0D;			// hopping freq
+	rx_tx_addr[1]=0xF4;			// hopping freq
 	for(uint8_t i=0;i<PELIKAN_NUM_RF_CHAN;i++)
 		hopping_frequency[i]=pgm_read_byte_near(&pelikan_hopp[0][i]);