diff --git a/Multiprotocol/Multi_Names.ino b/Multiprotocol/Multi_Names.ino index f2b6e3c..caacff5 100644 --- a/Multiprotocol/Multi_Names.ino +++ b/Multiprotocol/Multi_Names.ino @@ -148,7 +148,8 @@ enum OPTION_TELEM, OPTION_SRVFREQ, OPTION_MAXTHR, - OPTION_RFCHAN + OPTION_RFCHAN, + OPTION_RFPOWER, }; #define NO_SUBTYPE nullptr @@ -243,7 +244,7 @@ const mm_protocol_definition multi_protocols[] = { {PROTO_FRSKYL, STR_FRSKYL, 2, STR_SUBTYPE_FRSKYL, OPTION_RFTUNE }, #endif #if defined(FRSKYR9_SX1276_INO) - {PROTO_FRSKY_R9, STR_FRSKYR9, 4, STR_SUBTYPE_FRSKYR9, OPTION_NONE }, + {PROTO_FRSKY_R9, STR_FRSKYR9, 4, STR_SUBTYPE_FRSKYR9, OPTION_RFPOWER }, #endif #if defined(FX816_NRF24L01_INO) {PROTO_FX816, STR_FX816, 1, STR_SUBTYPE_FX816, OPTION_NONE }, diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index a1e99b0..120ea12 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_REVISION 1 -#define VERSION_PATCH_LEVEL 13 +#define VERSION_PATCH_LEVEL 14 //****************** // Protocols @@ -1070,6 +1070,7 @@ Serial: 100000 Baud 8e2 _ xxxx xxxx p -- OPTION_SRVFREQ 6 OPTION_MAXTHR 7 OPTION_RFCHAN 8 + OPTION_RFPOWER 9 [19&0x0F] Number of sub protocols [20..27] Sub protocol name [8], not null terminated if sub prototcol len == 8 If the current protocol is invalid [12..27] are all 0x00. diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino index 253bdeb..adb809a 100644 --- a/Multiprotocol/Multiprotocol.ino +++ b/Multiprotocol/Multiprotocol.ino @@ -534,7 +534,7 @@ void setup() else #endif #if defined(FORCE_FRSKYX_TUNING) && defined(FRSKYX_CC2500_INO) - if(protocol==PROTO_FRSKYX) + if(protocol==PROTO_FRSKYX || protocol==PROTO_FRSKYX2) option = FORCE_FRSKYX_TUNING; // Use config-defined tuning value for FrSkyX else #endif @@ -766,7 +766,7 @@ bool Update_All() update_led_status(); #if defined(TELEMETRY) #if ( !( defined(MULTI_TELEMETRY) || defined(MULTI_STATUS) ) ) - if((protocol == PROTO_BAYANG_RX) || (protocol == PROTO_AFHDS2A_RX) || (protocol == PROTO_FRSKY_RX) || (protocol == PROTO_SCANNER) || (protocol==PROTO_FRSKYD) || (protocol==PROTO_BAYANG) || (protocol==PROTO_NCC1701) || (protocol==PROTO_BUGS) || (protocol==PROTO_BUGSMINI) || (protocol==PROTO_HUBSAN) || (protocol==PROTO_AFHDS2A) || (protocol==PROTO_FRSKYX) || (protocol==PROTO_DSM) || (protocol==PROTO_CABELL) || (protocol==PROTO_HITEC) || (protocol==PROTO_HOTT) || (protocol==PROTO_FRSKYX2) || (protocol==PROTO_PROPEL) || (protocol==PROTO_DEVO) || (protocol==PROTO_DSM_RX)) + if((protocol == PROTO_BAYANG_RX) || (protocol == PROTO_AFHDS2A_RX) || (protocol == PROTO_FRSKY_RX) || (protocol == PROTO_SCANNER) || (protocol==PROTO_FRSKYD) || (protocol==PROTO_BAYANG) || (protocol==PROTO_NCC1701) || (protocol==PROTO_BUGS) || (protocol==PROTO_BUGSMINI) || (protocol==PROTO_HUBSAN) || (protocol==PROTO_AFHDS2A) || (protocol==PROTO_FRSKYX) || (protocol==PROTO_FRSKYX2) || (protocol==PROTO_DSM) || (protocol==PROTO_CABELL) || (protocol==PROTO_HITEC) || (protocol==PROTO_HOTT) || (protocol==PROTO_PROPEL) || (protocol==PROTO_DEVO) || (protocol==PROTO_DSM_RX)) #endif if(IS_DISABLE_TELEM_off) TelemetryUpdate(); @@ -1697,7 +1697,7 @@ void update_serial_data() else #endif #if defined(FORCE_FRSKYX_TUNING) && defined(FRSKYX_CC2500_INO) - if(protocol==PROTO_FRSKYX) + if(protocol==PROTO_FRSKYX || protocol==PROTO_FRSKYX2) option=FORCE_FRSKYX_TUNING; // Use config-defined tuning value for FrSkyX else #endif