From 96263ed8a6fae8c40ae661871735128eda07f935 Mon Sep 17 00:00:00 2001 From: Pascal Langer Date: Fri, 4 Dec 2020 09:00:17 +0100 Subject: [PATCH] Prep for M-LINK --- Lua_scripts/MultiChan.txt | 1 + Multiprotocol/Multi.txt | 3 ++- Multiprotocol/Multi_Names.ino | 4 ++++ Multiprotocol/Multiprotocol.ino | 11 +++++++++-- Multiprotocol/Validate.h | 1 + 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Lua_scripts/MultiChan.txt b/Lua_scripts/MultiChan.txt index 68702d8..5d5ede4 100644 --- a/Lua_scripts/MultiChan.txt +++ b/Lua_scripts/MultiChan.txt @@ -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 diff --git a/Multiprotocol/Multi.txt b/Multiprotocol/Multi.txt index 71921b1..670ec23 100644 --- a/Multiprotocol/Multi.txt +++ b/Multiprotocol/Multi.txt @@ -74,4 +74,5 @@ 74,RadioLink,Surface,Air 75,--- 76,Realacc,R11 -77,OMP \ No newline at end of file +77,OMP +78,M-Link diff --git a/Multiprotocol/Multi_Names.ino b/Multiprotocol/Multi_Names.ino index 129bf3d..27bb5bf 100644 --- a/Multiprotocol/Multi_Names.ino +++ b/Multiprotocol/Multi_Names.ino @@ -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"; @@ -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 diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino index e989ecd..f1c8b77 100644 --- a/Multiprotocol/Multiprotocol.ino +++ b/Multiprotocol/Multiprotocol.ino @@ -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 @@ -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 diff --git a/Multiprotocol/Validate.h b/Multiprotocol/Validate.h index 923d6d4..045d677 100644 --- a/Multiprotocol/Validate.h +++ b/Multiprotocol/Validate.h @@ -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