gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-02-04 16:48:10 +00:00
Code Issues Projects Releases Wiki Activity

Fix for DSM-Auto Bind on Lemon-RX Gen2 (#918)

Browse Source 
* #916 Fix for Auto-Bind on Lemon-RX Gen2

Tested with multiple brands (Spektrum, OrangeRX, Lemon-Rx, Admiral).  Even some old DSM 2 receivers.
All work with "Auto" now.   Just in case one needs a LONG bind sending period, when not using "Auto" works the same as before.

* Use 1.8s for Bind Send

Removed the short and long bind count logic.
This commit is contained in:
Frankie Arzu 2023-12-18 12:02:57 +01:00 committed by GitHub
parent 62aa58d32d
commit 549d3ad653
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
Multiprotocol/DSM_cyrf6936.ino
View File

@ -18,16 +18,22 @@
#include "iface_cyrf6936.h" #include "iface_cyrf6936.h"
//#define DSM_DEBUG_FWD_PGM //#define DSM_DEBUG_FWD_PGM
//#define DEBUG_BIND 1
//#define DSM_GR300 //#define DSM_GR300
#define CLONE_BIT_MASK 0x20 #define CLONE_BIT_MASK 0x20
#define DSM_BIND_CHANNEL 0x0d //13 This can be any odd channel #define DSM_BIND_CHANNEL 0x0d //13 This can be any odd channel
//During binding we will send BIND_COUNT/2 packets //During binding we will send BIND_COUNT packets
//One packet each 10msec //One packet each 10msec
#define DSM_BIND_COUNT 300 //
// Most RXs seems to work properly with a long BIND send count (3s): Spektrum, OrangeRX.
// Lemon-RX G2s seems to have a timeout waiting for the channel to get quiet after the
// first good BIND packet.. If using 3s (300), Lemon-RX will not transmit the BIND-Response packet.
#define DSM_BIND_COUNT 180 // About 1.8s
#define DSM_BIND_COUNT_READ 600 // About 4.2s of waiting for Response
enum { enum {
DSM_BIND_WRITE=0, DSM_BIND_WRITE=0,
@ -292,11 +298,14 @@ uint16_t DSM_callback()
return 10000; return 10000;
#if defined DSM_TELEMETRY #if defined DSM_TELEMETRY
case DSM_BIND_CHECK: case DSM_BIND_CHECK:
//64 SDR Mode is configured so only the 8 first values are needed #if DEBUG_BIND
CYRF_ConfigDataCode((const uint8_t *)"\x98\x88\x1B\xE4\x30\x79\x03\x84"); debugln("Bind Check");
#endif
//64 SDR Mode is configured so only the 8 first values are needed
CYRF_ConfigDataCode((const uint8_t *)"\x98\x88\x1B\xE4\x30\x79\x03\x84");
CYRF_SetTxRxMode(RX_EN); //Receive mode CYRF_SetTxRxMode(RX_EN); //Receive mode
CYRF_WriteRegister(CYRF_05_RX_CTRL, 0x87); //Prepare to receive CYRF_WriteRegister(CYRF_05_RX_CTRL, 0x87); //Prepare to receive
bind_counter=2*DSM_BIND_COUNT; //Timeout of 4.2s if no packet received bind_counter=DSM_BIND_COUNT_READ; //Timeout of 4.2s if no packet received
phase++; // change from BIND_CHECK to BIND_READ phase++; // change from BIND_CHECK to BIND_READ
return 2000; return 2000;
case DSM_BIND_READ: case DSM_BIND_READ:
@ -312,10 +321,12 @@ uint16_t DSM_callback()
CYRF_ReadDataPacketLen(packet_in+1, 10); CYRF_ReadDataPacketLen(packet_in+1, 10);
if(DSM_Check_RX_packet()) if(DSM_Check_RX_packet())
{ {
debug("Bind"); #if DEBUG_BIND
for(uint8_t i=0;i<10;i++) debug("Bind");
debug(" %02X",packet_in[i+1]); for(uint8_t i=0;i<10;i++)
debugln(""); debug(" %02X",packet_in[i+1]);
debugln("");
#endif
packet_in[0]=0x80; packet_in[0]=0x80;
packet_in[6]&=0x0F; // It looks like there is a flag 0x40 being added by some receivers packet_in[6]&=0x0F; // It looks like there is a flag 0x40 being added by some receivers
if(packet_in[6]>12) packet_in[6]=12; if(packet_in[6]>12) packet_in[6]=12;
@ -340,6 +351,9 @@ uint16_t DSM_callback()
} }
if( --bind_counter == 0 ) if( --bind_counter == 0 )
{ // Exit if no answer has been received for some time { // Exit if no answer has been received for some time
#if DEBUG_BIND
debugln("Bind Read TIMEOUT");
#endif
phase++; // DSM_CHANSEL phase++; // DSM_CHANSEL
return 7000 ; return 7000 ;
} }
@ -539,19 +553,23 @@ void DSM_init()
if(eeprom_read_byte((EE_ADDR)DSM_CLONE_EEPROM_OFFSET+4)==0xF0) if(eeprom_read_byte((EE_ADDR)DSM_CLONE_EEPROM_OFFSET+4)==0xF0)
{ {
//read cloned ID from EEPROM //read cloned ID from EEPROM
debugln("Using cloned ID");
uint16_t temp = DSM_CLONE_EEPROM_OFFSET; uint16_t temp = DSM_CLONE_EEPROM_OFFSET;
for(uint8_t i=0;i<4;i++) for(uint8_t i=0;i<4;i++)
cyrfmfg_id[i] = eeprom_read_byte((EE_ADDR)temp++); cyrfmfg_id[i] = eeprom_read_byte((EE_ADDR)temp++);
debug("Clone ID=") #if DEBUG_BIND
for(uint8_t i=0;i<4;i++) debugln("Using cloned ID");
debug("%02x ", cyrfmfg_id[i]); debug("Clone ID=")
debugln(""); for(uint8_t i=0;i<4;i++)
debug("%02x ", cyrfmfg_id[i]);
debugln("");
#endif
} }
else else
{ {
SUB_PROTO_INVALID; SUB_PROTO_INVALID;
debugln("No valid cloned ID"); #if DEBUG_BIND
debugln("No valid cloned ID");
#endif
} }
} }
else else
@ -609,10 +627,13 @@ void DSM_init()
{ {
DSM_initialize_bind_phase(); DSM_initialize_bind_phase();
phase = DSM_BIND_WRITE; phase = DSM_BIND_WRITE;
bind_counter=DSM_BIND_COUNT; bind_counter=DSM_BIND_COUNT;
#if DEBUG_BIND
debugln("Bind Started: write count=%d",bind_counter);
#endif
} }
else else
phase = DSM_CHANSEL;// phase = DSM_CHANSEL;
} }
#endif #endif