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

WFLY2: fix bind after code cleanup...

Browse Source
This commit is contained in:
Pascal Langer 2020-12-15 09:51:11 +01:00
parent cfe80edcb6
commit 4887fca873
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Multiprotocol/A7105_SPI.ino
View File

@ -27,7 +27,7 @@ void A7105_WriteData(uint8_t len, uint8_t channel)
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
SPI_Write(packet[i]); SPI_Write(packet[i]);
A7105_CSN_on; A7105_CSN_on;
if(protocol!=PROTO_WFLY2) if(protocol!=PROTO_WFLY2 || phase==0)
{ {
if(!(protocol==PROTO_FLYSKY || protocol==PROTO_KYOSHO)) if(!(protocol==PROTO_FLYSKY || protocol==PROTO_KYOSHO))
{ {

2
Multiprotocol/Multiprotocol.h
View File

@ -19,7 +19,7 @@
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 3 #define VERSION_MINOR 3
#define VERSION_REVISION 1 #define VERSION_REVISION 1
#define VERSION_PATCH_LEVEL 84 #define VERSION_PATCH_LEVEL 85
//****************** //******************
// Protocols // Protocols

11
Multiprotocol/WFLY2_a7105.ino
View File

@ -153,7 +153,7 @@ static void __attribute__((unused)) WFLY2_build_packet()
} }
#endif #endif
#define WFLY2_PACKET_PERIOD 3600 //3600 #define WFLY2_PACKET_PERIOD 3600 //3600
#define WFLY2_BUFFER_TIME 1500 //1500 #define WFLY2_BUFFER_TIME 1500 //1500
#define WFLY2_WRITE_TIME 800 //942 #define WFLY2_WRITE_TIME 800 //942
@ -171,15 +171,18 @@ uint16_t ReadWFLY2()
{ {
case WFLY2_BIND: case WFLY2_BIND:
bind_counter--; bind_counter--;
if (bind_counter == 0) if (bind_counter)
{
WFLY2_send_bind_packet();
return WFLY2_PACKET_PERIOD;
}
else
{ {
BIND_DONE; BIND_DONE;
A7105_WriteID(MProtocol_id); A7105_WriteID(MProtocol_id);
rf_ch_num = 0; rf_ch_num = 0;
phase++; // WFLY2_DATA phase++; // WFLY2_DATA
} }
WFLY2_send_bind_packet();
return WFLY2_PACKET_PERIOD;
case WFLY2_DATA: case WFLY2_DATA:
#ifdef MULTI_SYNC #ifdef MULTI_SYNC

3
Multiprotocol/_Config.h
View File

@ -173,8 +173,9 @@
#define FLYSKY_A7105_INO #define FLYSKY_A7105_INO
#define HEIGHT_A7105_INO #define HEIGHT_A7105_INO
#define HUBSAN_A7105_INO #define HUBSAN_A7105_INO
#define KYOSHO_A7105_INO #define KYOSHO_A7105_INO
#define PELIKAN_A7105_INO #define PELIKAN_A7105_INO
#define WFLY2_A7105_INO
//The protocols below need a CYRF6936 to be installed //The protocols below need a CYRF6936 to be installed
#define DEVO_CYRF6936_INO #define DEVO_CYRF6936_INO