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:48:12 +00:00
Code Issues Projects Releases Wiki Activity

Prep for M-LINK

Browse Source
This commit is contained in:
Pascal Langer 2020-12-04 09:00:17 +01:00
parent 7bb1cb9ae3
commit 96263ed8a6
5 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Lua_scripts/MultiChan.txt
View File

@ -175,3 +175,4 @@
8,3,YD717,XinXun,1,Flip,Light,Pict,Video,HLess 8,3,YD717,XinXun,1,Flip,Light,Pict,Video,HLess
8,4,YD717,NiHui,1,Flip,Light,Pict,Video,HLess 8,4,YD717,NiHui,1,Flip,Light,Pict,Video,HLess
52,0,ZSX,280,1,Light 52,0,ZSX,280,1,Light
78,0,M-Link,Std,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14,CH15,CH16

1
Multiprotocol/Multi.txt
View File

@ -75,3 +75,4 @@
75,--- 75,---
76,Realacc,R11 76,Realacc,R11
77,OMP 77,OMP
78,M-Link

4
Multiprotocol/Multi_Names.ino
View File

@ -90,6 +90,7 @@ const char STR_KYOSHO[] ="Kyosho";
const char STR_RLINK[] ="RadLink"; const char STR_RLINK[] ="RadLink";
const char STR_REALACC[] ="Realacc"; const char STR_REALACC[] ="Realacc";
const char STR_OMP[] ="OMP"; const char STR_OMP[] ="OMP";
const char STR_MLINK[] ="M-Link";
const char STR_TEST[] ="Test"; const char STR_TEST[] ="Test";
const char STR_NANORF[] ="NanoRF"; const char STR_NANORF[] ="NanoRF";
@ -308,6 +309,9 @@ const mm_protocol_definition multi_protocols[] = {
#if defined(MJXQ_NRF24L01_INO) #if defined(MJXQ_NRF24L01_INO)
{PROTO_MJXQ, STR_MJXQ, 7, STR_SUBTYPE_MJXQ, OPTION_RFTUNE }, {PROTO_MJXQ, STR_MJXQ, 7, STR_SUBTYPE_MJXQ, OPTION_RFTUNE },
#endif #endif
#if defined(MLINK_CYRF6936_INO)
{PROTO_MLINK, STR_MLINK, 0, NO_SUBTYPE, OPTION_NONE },
#endif
#if defined(MT99XX_NRF24L01_INO) #if defined(MT99XX_NRF24L01_INO)
{PROTO_MT99XX, STR_MT99XX, 5, STR_SUBTYPE_MT99, OPTION_NONE }, {PROTO_MT99XX, STR_MT99XX, 5, STR_SUBTYPE_MT99, OPTION_NONE },
#endif #endif

11
Multiprotocol/Multiprotocol.ino
View File

@ -101,8 +101,8 @@ uint16_t packet_period;
uint8_t packet_count; uint8_t packet_count;
uint8_t packet_sent; uint8_t packet_sent;
uint8_t packet_length; uint8_t packet_length;
#if defined(HOTT_CC2500_INO) || defined(ESKY150V2_CC2500_INO) #if defined(HOTT_CC2500_INO) || defined(ESKY150V2_CC2500_INO) || defined(MLINK_CYRF6936_INO)
uint8_t hopping_frequency[75]; uint8_t hopping_frequency[78];
#else #else
uint8_t hopping_frequency[50]; uint8_t hopping_frequency[50];
#endif #endif
@ -1338,6 +1338,13 @@ static void protocol_init()
remote_callback = ReadWFLY; remote_callback = ReadWFLY;
break; break;
#endif #endif
#if defined(MLINK_CYRF6936_INO)
case PROTO_MLINK:
PE2_on; //antenna RF4
next_callback = initMLINK();
remote_callback = ReadMLINK;
break;
#endif
#if defined(DEVO_CYRF6936_INO) #if defined(DEVO_CYRF6936_INO)
case PROTO_DEVO: case PROTO_DEVO:
#ifdef ENABLE_PPM #ifdef ENABLE_PPM

1
Multiprotocol/Validate.h
View File

@ -233,6 +233,7 @@
#undef DSM_CYRF6936_INO #undef DSM_CYRF6936_INO
#undef DSM_RX_CYRF6936_INO #undef DSM_RX_CYRF6936_INO
#undef J6PRO_CYRF6936_INO #undef J6PRO_CYRF6936_INO
#undef MLINK_CYRF6936_INO
#undef TRAXXAS_CYRF6936_INO #undef TRAXXAS_CYRF6936_INO
#undef WFLY_CYRF6936_INO #undef WFLY_CYRF6936_INO
#undef WK2x01_CYRF6936_INO #undef WK2x01_CYRF6936_INO