Skip to content

Commit

Permalink
Prep for M-LINK
Browse files Browse the repository at this point in the history
  • Loading branch information
Pascal Langer committed Dec 4, 2020
1 parent 7bb1cb9 commit 96263ed
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 3 deletions.
1 change: 1 addition & 0 deletions Lua_scripts/MultiChan.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,3 +175,4 @@
8,3,YD717,XinXun,1,Flip,Light,Pict,Video,HLess
8,4,YD717,NiHui,1,Flip,Light,Pict,Video,HLess
52,0,ZSX,280,1,Light
78,0,M-Link,Std,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14,CH15,CH16
3 changes: 2 additions & 1 deletion Multiprotocol/Multi.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,5 @@
74,RadioLink,Surface,Air
75,---
76,Realacc,R11
77,OMP
77,OMP
78,M-Link
4 changes: 4 additions & 0 deletions Multiprotocol/Multi_Names.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ const char STR_KYOSHO[] ="Kyosho";
const char STR_RLINK[] ="RadLink";
const char STR_REALACC[] ="Realacc";
const char STR_OMP[] ="OMP";
const char STR_MLINK[] ="M-Link";
const char STR_TEST[] ="Test";
const char STR_NANORF[] ="NanoRF";

Expand Down Expand Up @@ -308,6 +309,9 @@ const mm_protocol_definition multi_protocols[] = {
#if defined(MJXQ_NRF24L01_INO)
{PROTO_MJXQ, STR_MJXQ, 7, STR_SUBTYPE_MJXQ, OPTION_RFTUNE },
#endif
#if defined(MLINK_CYRF6936_INO)
{PROTO_MLINK, STR_MLINK, 0, NO_SUBTYPE, OPTION_NONE },
#endif
#if defined(MT99XX_NRF24L01_INO)
{PROTO_MT99XX, STR_MT99XX, 5, STR_SUBTYPE_MT99, OPTION_NONE },
#endif
Expand Down
11 changes: 9 additions & 2 deletions Multiprotocol/Multiprotocol.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ uint16_t packet_period;
uint8_t packet_count;
uint8_t packet_sent;
uint8_t packet_length;
#if defined(HOTT_CC2500_INO) || defined(ESKY150V2_CC2500_INO)
uint8_t hopping_frequency[75];
#if defined(HOTT_CC2500_INO) || defined(ESKY150V2_CC2500_INO) || defined(MLINK_CYRF6936_INO)
uint8_t hopping_frequency[78];
#else
uint8_t hopping_frequency[50];
#endif
Expand Down Expand Up @@ -1338,6 +1338,13 @@ static void protocol_init()
remote_callback = ReadWFLY;
break;
#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)
case PROTO_DEVO:
#ifdef ENABLE_PPM
Expand Down
1 change: 1 addition & 0 deletions Multiprotocol/Validate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@
#undef DSM_CYRF6936_INO
#undef DSM_RX_CYRF6936_INO
#undef J6PRO_CYRF6936_INO
#undef MLINK_CYRF6936_INO
#undef TRAXXAS_CYRF6936_INO
#undef WFLY_CYRF6936_INO
#undef WK2x01_CYRF6936_INO
Expand Down

0 comments on commit 96263ed

Please sign in to comment.