diff --git a/Multiprotocol/DSM_cyrf6936.ino b/Multiprotocol/DSM_cyrf6936.ino index dce9bb5..5f2c562 100644 --- a/Multiprotocol/DSM_cyrf6936.ino +++ b/Multiprotocol/DSM_cyrf6936.ino @@ -249,6 +249,10 @@ static uint8_t __attribute__((unused)) DSM_Check_RX_packet() uint16_t DSM_callback() { + #if defined MULTI_EU + if(sub_protocol == DSM2_1F || sub_protocol == DSM2_2F) + return 11000; + #endif #define DSM_CH1_CH2_DELAY 4010 // Time between write of channel 1 and channel 2 #ifdef STM32_BOARD #define DSM_WRITE_DELAY 1600 // Time after write to verify write complete diff --git a/Multiprotocol/Multi_Protos.ino b/Multiprotocol/Multi_Protos.ino index 1b1c729..6165dd9 100644 --- a/Multiprotocol/Multi_Protos.ino +++ b/Multiprotocol/Multi_Protos.ino @@ -112,7 +112,11 @@ const char STR_SUBTYPE_FRSKYD[] = "\x06""D8\0 ""Cloned"; const char STR_SUBTYPE_FRSKYX[] = "\x07""D16\0 ""D16 8ch""LBT(EU)""LBT 8ch""Cloned\0""Clo 8ch"; const char STR_SUBTYPE_HISKY[] = "\x05""Std\0 ""HK310"; const char STR_SUBTYPE_V2X2[] = "\x06""Std\0 ""JXD506""MR101\0"; -const char STR_SUBTYPE_DSM[] = "\x04""2 1F""2 2F""X 1F""X 2F""Auto""R 1F"; +#ifndef MULTI_EU + const char STR_SUBTYPE_DSM[] = "\x04""2 1F""2 2F""X 1F""X 2F""Auto""R 1F"; +#else + const char STR_SUBTYPE_DSM[] = "\x04""--->""--->""X 1F""X 2F""Auto""R 1F"; +#endif const char STR_SUBTYPE_DEVO[] = "\x04""8ch\0""10ch""12ch""6ch\0""7ch\0"; const char STR_SUBTYPE_YD717[] = "\x07""Std\0 ""SkyWlkr""Syma X4""XINXUN\0""NIHUI\0 "; const char STR_SUBTYPE_KN[] = "\x06""WLtoys""FeiLun"; diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 052d8d8..d07a1bf 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_REVISION 3 -#define VERSION_PATCH_LEVEL 21 +#define VERSION_PATCH_LEVEL 22 #define MODE_SERIAL 0 diff --git a/Multiprotocol/Validate.h b/Multiprotocol/Validate.h index 8e56e38..39bec1b 100644 --- a/Multiprotocol/Validate.h +++ b/Multiprotocol/Validate.h @@ -241,9 +241,11 @@ #endif //Make sure protocols are selected correctly -#ifndef A7105_INSTALLED +#if not defined(A7105_INSTALLED) || defined MULTI_EU #undef AFHDS2A_A7105_INO - #undef AFHDS2A_RX_A7105_INO + #if not defined(A7105_INSTALLED) + #undef AFHDS2A_RX_A7105_INO + #endif #undef BUGS_A7105_INO #undef FLYSKY_A7105_INO #undef HEIGHT_A7105_INO @@ -253,10 +255,13 @@ #undef PELIKAN_A7105_INO #undef WFLY2_A7105_INO #endif -#ifndef CYRF6936_INSTALLED + +#if not defined(CYRF6936_INSTALLED) || defined MULTI_EU #undef DEVO_CYRF6936_INO - #undef DSM_CYRF6936_INO - #undef DSM_RX_CYRF6936_INO + #if not defined(CYRF6936_INSTALLED) + #undef DSM_CYRF6936_INO + #undef DSM_RX_CYRF6936_INO + #endif #undef E010R5_CYRF6936_INO #undef E01X_CYRF6936_INO #undef E129_CYRF6936_INO @@ -267,28 +272,38 @@ #undef WFLY_CYRF6936_INO #undef WK2x01_CYRF6936_INO #endif -#ifndef CC2500_INSTALLED + +#if not defined(CC2500_INSTALLED) || defined MULTI_EU #undef CORONA_CC2500_INO #undef E016HV2_CC2500_INO #undef ESKY150V2_CC2500_INO #undef FRSKYD_CC2500_INO #undef FRSKYL_CC2500_INO #undef FRSKYV_CC2500_INO - #undef FRSKYX_CC2500_INO - #undef FRSKY_RX_CC2500_INO + #if not defined(CC2500_INSTALLED) + #undef FRSKYX_CC2500_INO + #undef FRSKY_RX_CC2500_INO + #endif #undef HITEC_CC2500_INO - #undef HOTT_CC2500_INO + #if not defined(CC2500_INSTALLED) + #undef HOTT_CC2500_INO + #endif #undef IKEAANSLUTA_CC2500_INO #undef REDPINE_CC2500_INO #undef RLINK_CC2500_INO - #undef SCANNER_CC2500_INO + #if not defined(CC2500_INSTALLED) + #undef SCANNER_CC2500_INO + #endif #undef FUTABA_CC2500_INO #undef SKYARTEC_CC2500_INO #endif -#ifndef NRF24L01_INSTALLED + +#if not defined(NRF24L01_INSTALLED) || defined MULTI_EU #undef ASSAN_NRF24L01_INO #undef BAYANG_NRF24L01_INO - #undef BAYANG_RX_NRF24L01_INO + #if not defined(NRF24L01_INSTALLED) + #undef BAYANG_RX_NRF24L01_INO + #endif #undef BUGSMINI_NRF24L01_INO #undef CABELL_NRF24L01_INO #undef CFLIE_NRF24L01_INO @@ -323,7 +338,7 @@ #undef YD717_NRF24L01_INO #undef ZSX_NRF24L01_INO #endif -#if not defined(CC2500_INSTALLED) && not defined(NRF24L01_INSTALLED) +#if ( not defined(CC2500_INSTALLED) && not defined(NRF24L01_INSTALLED) ) || defined MULTI_EU #undef GD00X_CCNRF_INO #undef KF606_CCNRF_INO #undef MJXQ_CCNRF_INO @@ -343,7 +358,7 @@ #if not defined(STM32_BOARD) #undef SX1276_INSTALLED #endif -#ifndef SX1276_INSTALLED +#ifndef SX1276_INSTALLED || defined MULTI_EU #undef FRSKYR9_SX1276_INO #endif