V761/TOPRC: new sub protocol

Top RC Hobby mini planes

.github/workflows/main.yml

@@ -40,14 +40,14 @@ jobs:
       fail-fast: false
       matrix:
         board: [
-          "multi4in1:avr:multiatmega328p:bootloader=none", 
-          "multi4in1:avr:multiatmega328p:bootloader=optiboot", 
-          "multi4in1:avr:multixmega32d4", 
-          "multi4in1:STM32F1:multi5in1t18int", 
-          "multi4in1:STM32F1:multistm32f103cb:debug_option=none", 
-          "multi4in1:STM32F1:multistm32f103cb:debug_option=native", 
-          "multi4in1:STM32F1:multistm32f103cb:debug_option=ftdi", 
-          "multi4in1:STM32F1:multistm32f103c8:debug_option=none"
+          "multi4in1-devel:avr:multiatmega328p:bootloader=none", 
+          "multi4in1-devel:avr:multiatmega328p:bootloader=optiboot", 
+          "multi4in1-devel:avr:multixmega32d4", 
+          "multi4in1-devel:STM32F1:multi5in1t18int", 
+          "multi4in1-devel:STM32F1:multistm32f103cb:debug_option=none", 
+          "multi4in1-devel:STM32F1:multistm32f103cb:debug_option=native", 
+          "multi4in1-devel:STM32F1:multistm32f103cb:debug_option=ftdi", 
+          "multi4in1-devel:STM32F1:multistm32f103c8:debug_option=none"
         ]
 
     # Set the environment variables
@@ -67,15 +67,22 @@ jobs:
           echo "Event action: ${{ github.event.action }}"
           echo "Tag name: ${{ github.event.release.tag_name }}"
 
-          arduino-cli config init --additional-urls https://raw.githubusercontent.com/pascallanger/DIY-Multiprotocol-TX-Module-Boards/master/package_multi_4in1_board_index.json
+          arduino-cli config init --additional-urls https://raw.githubusercontent.com/pascallanger/DIY-Multiprotocol-TX-Module-Boards/master/package_multi_4in1_board_index.json,https://raw.githubusercontent.com/pascallanger/DIY-Multiprotocol-TX-Module-Boards/devel/source/package_multi_4in1_board_devel_index.json
           arduino-cli core update-index
           
-          if [[ "$BOARD" =~ "multi4in1:avr:" ]]; then
+          if [[ "$BOARD" =~ ":avr:" ]]; then
             arduino-cli core install arduino:avr;
+          fi
+
+          if [[ "$BOARD" =~ "multi4in1-devel:avr" ]]; then
+            arduino-cli core install multi4in1-devel:avr
+          elif [[ "$BOARD" =~ "multi4in1:avr" ]]; then
             arduino-cli core install multi4in1:avr
           fi
 
-          if [[ "$BOARD" =~ "multi4in1:STM32F1:" ]]; then
+          if [[ "$BOARD" =~ "multi4in1-devel:STM32F1:" ]]; then
+            arduino-cli core install multi4in1-devel:STM32F1
+          elif [[ "$BOARD" =~ "multi4in1:STM32F1:" ]]; then
             arduino-cli core install multi4in1:STM32F1
           fi
 
@@ -109,18 +116,18 @@ jobs:
           echo "ALL_RFMODULES=$(echo $ALL_RFMODULES)" >> $GITHUB_ENV
 
           # Disable CHECK_FOR_BOOTLOADER when not needed
-          if [[ "$BOARD" == "multi4in1:avr:multiatmega328p:bootloader=none" ]]; then
+          if [[ "$BOARD" =~ ":avr:multiatmega328p:bootloader=none" ]]; then
             opt_disable CHECK_FOR_BOOTLOADER;
           fi
 
           # Trim the build down for the Atmega328p board
-          if [[ "$BOARD" =~ "multi4in1:avr:multiatmega328p:" ]]; then
+          if [[ "$BOARD" =~ ":avr:multiatmega328p:" ]]; then
             opt_disable $ALL_PROTOCOLS
             opt_enable FRSKYX_CC2500_INO AFHDS2A_A7105_INO MJXQ_NRF24L01_INO DSM_CYRF6936_INO;
           fi
 
           # Trim the enabled protocols down for the STM32F103CB board with debugging or the STM32F103C8 board in general
-          if [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103cb:debug_option=ftdi" ]] || [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103cb:debug_option=native" ]] || [[ "$BOARD" =~ "multi4in1:STM32F1:multistm32f103c8" ]]; then
+          if [[ "$BOARD" =~ ":STM32F1:multistm32f103cb:debug_option=ftdi" ]] || [[ "$BOARD" =~ ":STM32F1:multistm32f103cb:debug_option=native" ]] || [[ "$BOARD" =~ ":STM32F1:multistm32f103c8" ]]; then
             opt_disable $ALL_PROTOCOLS;
             opt_enable FRSKYX_CC2500_INO AFHDS2A_A7105_INO MJXQ_NRF24L01_INO DSM_CYRF6936_INO;
           fi
@@ -133,7 +140,7 @@ jobs:
       - name: Build default configuration
         run: |
           # Skip the default build for boards where it's too large now
-          if [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103cb:debug_option=none" ]] || [[ "$BOARD" == "multi4in1:STM32F1:multi5in1t18int" ]]; then
+          if [[ "$BOARD" =~ ":STM32F1:multistm32f103cb:debug_option=none" ]] || [[ "$BOARD" =~ ":STM32F1:multi5in1t18int" ]]; then
             printf "Not testing default build for $BOARD.";
           else
             source ./buildroot/bin/buildFunctions;

Lua_scripts/DSM FwdPrg.lua

@@ -552,8 +552,8 @@ local function DSM_Init()
   RxName[0x001E]="AR631"
 
   --Text to be displayed -> need to use a file instead?
-  Text[0x0001]="On"
-  Text[0x0002]="Off"
+  Text[0x0001]="Off"
+  Text[0x0002]="On"
   Text[0x0003]="Inh"
   Text[0x0004]="Act"
   Text[0x000C]="Inhibit?" --?
@@ -630,6 +630,7 @@ local function DSM_Init()
   Text[0x00AA]="Capture Gyro Gains"
   Text[0x00AD]="Gain Channel Select"
   Text[0x00B0]="Self-Level/Angle Dem"
+  Text[0x00B1]="Envelope"
   Text[0x00B5]="Inhibit"
   Text[0x00B6]="FM1"
   Text[0x00B7]="FM2"

Lua_scripts/Graupner HoTT Model Locator.lua

@@ -0,0 +1,167 @@
+---- #########################################################################
+---- #                                                                       #
+---- # Telemetry Widget script for FrSky Horus/Radio Master TX16s            #
+---- # Copyright (C) EdgeTX                                                  #
+-----#                                                                       #
+---- # License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html               #
+---- #                                                                       #
+---- # This program is free software; you can redistribute it and/or modify  #
+---- # it under the terms of the GNU General Public License version 2 as     #
+---- # published by the Free Software Foundation.                            #
+---- #                                                                       #
+---- # This program is distributed in the hope that it will be useful        #
+---- # but WITHOUT ANY WARRANTY; without even the implied warranty of        #
+---- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         #
+---- # GNU General Public License for more details.                          #
+---- #                                                                       #
+---- #########################################################################
+
+-- Model Locator by RSSI
+-- Offer Shmuely (based on code from Scott Bauer 6/21/2015)
+-- Date: 2021
+-- ver: 0.1
+
+-- MHA (based on code from Offer Shmuely)
+-- Date: 2022
+-- ver: 0.11
+-- changes: made version for Graupner HoTT. Uses real Rssi data scaled -15db to -115db to 100..0
+
+-- This widget help to find a lost/crashed model based on the RSSI (if still available)
+-- The widget produce audio representation (variometer style) of the RSSI from the lost model
+-- The widget also  display the RSSI in a visible colorized bar (0-100%)
+
+-- There are two way to use it
+-- 1. The simple way:
+--    walk toward the quad/plane that crashed,
+--    as you get closer to your model the beeps will become more frequent with higher pitch (and a visual bar graph as well)
+--    until you get close enough to find it visually
+
+-- 2. the more accurate way:
+--    turn the antenna straight away (i.e. to point from you, straight away)
+--    try to find the weakest signal! (not the highest), i.e. the lowest RSSI you can find, this is the direction to the model.
+--    now walk to the side (not toward the model), find again the weakest signal, this is also the direction to your model
+--    triangulate the two lines, and it will be :-)
+
+local delayMillis = 100
+local nextPlayTime = getTime()
+local img = Bitmap.open("/SCRIPTS/TOOLS/Model Locator (by RSSI).png")
+
+--------------------------------------------------------------
+local function log(s)
+  --return;
+  print("locator: " .. s)
+end
+--------------------------------------------------------------
+
+
+-- init_func is called once when model is loaded
+local function init()
+  return 0
+end
+
+-- bg_func is called periodically when screen is not visible
+local function bg()
+  return 0
+end
+
+-- This function returns green at gvalue, red at rvalue and graduate in between
+local function getRangeColor(value, red_value, green_value)
+  local range = math.abs(green_value - red_value)
+  if range == 0 then
+    return lcd.RGB(0, 0xdf, 0)
+  end
+  if value == nil then
+    return lcd.RGB(0, 0xdf, 0)
+  end
+
+  if green_value > red_value then
+    if value > green_value then
+      return lcd.RGB(0, 0xdf, 0)
+    end
+    if value < red_value then
+      return lcd.RGB(0xdf, 0, 0)
+    end
+    g = math.floor(0xdf * (value - red_value) / range)
+    r = 0xdf - g
+    return lcd.RGB(r, g, 0)
+  else
+    if value > green_value then
+      return lcd.RGB(0, 0xdf, 0)
+    end
+    if value < red_value then
+      return lcd.RGB(0xdf, 0, 0)
+    end
+    r = math.floor(0xdf * (value - green_value) / range)
+    g = 0xdf - r
+    return lcd.RGB(r, g, 0)
+  end
+end
+
+local function main(event)
+
+  lcd.clear()
+  
+	-- fetch uplink rssi (HoTT sensor Rssi)
+	local rssi = getValue("Rssi")
+
+	-- calculate a percentage for the color bar (range -115db to -15db) 
+	local rssiP = rssi							
+
+	if(rssi ~= 0) then							-- rssi < 0 -> telemtry data received
+		if(rssi >= -15) then					-- -15db to -1db => 100%
+			rssiP = 100
+		else
+			if(rssi >=  -115) then			-- between -115db and -15db => 0% to 100%				
+				rssiP = 100+rssi+15				
+			else
+				rssiP = 0									-- less than -115 => 0%
+			end
+		end
+	end
+	
+  lcd.drawBitmap(img, 250, 50, 40)
+
+  -- Title
+  lcd.drawText(3, 3, "Graupner HoTT Rssi Model Locator", 0)
+  myColor = getRangeColor(rssi, 0, 100)
+  lcd.setColor(CUSTOM_COLOR, myColor)
+
+  -- draw current value
+	local dx = 0
+	if rssi < -99 then
+		dx = -33
+	end
+	
+	if rssi == 0 then	
+		lcd.drawText(115, 73, "no telemetry", DBLSIZE + CUSTOM_COLOR)
+	else
+	  lcd.drawNumber(180+dx, 30, rssi, XXLSIZE + CUSTOM_COLOR)
+		lcd.drawText(275, 73, "db", 0 + CUSTOM_COLOR)
+	end
+
+  -- draw main bar
+  lcd.setColor(CUSTOM_COLOR, YELLOW) -- RED / YELLOW
+  local xMin = 0
+  local yMin = 270
+  local xMax = 480
+  local yMax = 200
+  local h = 0
+  local rssiAsX = (rssiP * xMax) / 100
+
+  for xx = xMin, rssiAsX, 20 do
+    lcd.setColor(CUSTOM_COLOR, getRangeColor(xx, xMin, xMax - 40))
+    h = h + 10
+    lcd.drawFilledRectangle(xx, yMin - h, 15, h, CUSTOM_COLOR)
+  end
+
+  -- beep
+  if getTime() >= nextPlayTime then
+    playFile("/SCRIPTS/TOOLS/Model Locator (by RSSI).wav")
+    nextPlayTime = getTime() + delayMillis - rssiP
+  end
+
+  return 0
+end
+
+return {init = init,run = main,background = bg}
+

Lua_scripts/MultiChan.txt

@@ -86,7 +86,8 @@
 55,1,FrSkyRX,CloneTX,0
 55,2,FrSkyRX,EraseTX,0
 55,3,FrSkyRX,CPPM,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14,CH15,CH16
-58,0,FX816,P38,1
+58,0,FX,816,1
+58,1,FX,620,1
 20,0,FY326,FY326,1,Flip,RTH,HLess,Expert,Calib
 20,1,FY326,FY319,1,Flip,RTH,HLess,Expert,Calib
 23,0,FY326,FY326,1,Flip,RTH,HLess,Expert
@@ -115,7 +116,7 @@
 71,0,JJRC345,JJRC345,1,Flip,HLess,RTH,LED,UNK1,UNK2,UNK3
 71,1,JJRC345,SkyTmblr,1,Flip,HLess,RTH,LED,UNK1,UNK2,UNK3
 49,0,KF606,KF606,1,Trim
-49,1,KF606,MIG320,1,Trim
+49,1,KF606,MIG320,1,Trim,LED
 9,0,KN,WLToys,0,DRate,THold,IdleUp,Gyro,Ttrim,Atrim,Etrim
 9,1,KN,Feilun,0,DRate,THold,IdleUp,Gyro,Ttrim,Atrim,Etrim
 73,0,Kyosho,Std,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14
@@ -171,6 +172,7 @@
 5,1,V2x2,JXD506,1,Flip,Light,Pict,Video,HLess,StaSto,Emerg,Cam_UD
 48,0,V761,3CH,0,Gyro,Calib,Flip,RtnAct,Rtn
 48,1,V761,4CH,0,Gyro,Calib,Flip,RtnAct,Rtn
+48,2,V761,TOPRC,0,Gyro,Calib,Flip,RtnAct,Rtn
 46,0,V911s,V911s,1,Calib,Rate
 46,1,V911s,E119,1,Calib,Rate,6G_3D
 22,0,WFLY,WFR0xS,0,CH5,CH6,CH7,CH8,CH9
@@ -194,6 +196,7 @@
 81,0,E010r5,E010r5,1,Flip,LED,CALIB,HLess,RTH,GLIDE
 82,0,LOLI,Std,0,CH5,CH6,CH7,CH8,1SwSePpPw,2SwSePw,3SwSe,4SwSe,5SwSeSb,6SwSe,7SwSePw,8SwSe
 83,0,E129,E129,1,TakLan,EmStop,TrimA,TrimE,TrimR
+83,1,E129,C186,1,TakLan,EmStop,TrimA,TrimE,TrimR
 84,0,JOYSWAY,Std,0
 85,0,E016H,Std,1,Stop,Flip,n-a,HLess,RTH
 87,0,IKEA
@@ -201,3 +204,5 @@
 90,0,MouldKg,Analog,0
 90,1,MouldKg,Digit,0
 91,0,Xerall,Tank,0,FlTa,TakLan,Rate,HLess,Photo,Video,TrimR,TrimE,TrimA
+92,0,MT99xx2,PA18,0,MODE,FLIP,RTH
+93,0,Kyosho2,KT-17,0

Lua_scripts/MultiConfig.lua

@@ -48,6 +48,7 @@ local ModuleNumber = 0
 local ModuleType = ""
 local Module = {}
 local InitialProtocol = 0
+local InitialSubProtocol = 0
 
 function bitand(a, b)
     local result = 0
@@ -76,6 +77,7 @@ end
 local function Config_Release()
   --Set the protocol back to what it was
   Module.protocol = InitialProtocol
+  Module.subProtocol = InitialSubProtocol
   model.setModule(ModuleNumber, Module)
 
   --Stop requesting updates
@@ -422,7 +424,9 @@ local function Config_Init()
   --Get Module settings and set it to config protocol
   Module = model.getModule(ModuleNumber)
   InitialProtocol = Module.protocol
+  InitialSubProtocol = Module.subProtocol
   Module.protocol = 86
+  Module.subProtocol = 0
   model.setModule(ModuleNumber, Module)
   --pause while waiting for the module to switch to config
   for i = 0, 10, 1 do end

Lua_scripts/README.md

@@ -52,6 +52,12 @@ Notes:
 
 [![Text mode video](https://img.youtube.com/vi/81wd8NlF3Qw/0.jpg)](https://www.youtube.com/watch?v=81wd8NlF3Qw)
 
+## Graupner HoTT Model Locator
+
+This is the Graupner HoTT adapted version of the Model Locator script using RSSI.
+
+The OpenTX sensor "RSSI" is populated by the individual OpenTX telemetry protocol implementations and returns a value from 0..100 (percent) originating from the early FrSky implementation. It turns out that FrSky did not really provide a genuine signal strength indicator in units of dbm but a link quality indicator in 0..100%. With Graupner HoTT the link quality indicator is not a good basis for the model locator as it is very non-linear and doesn't change much with distance. Using the Graupner HoTT telemetry sensor "Rssi" which is a true signal strength indicator serves the purpose of locating a model much better as it varies much more with distance.
+
 ## DSM Forward Programming
 
 Navigation is mainly done using the scroll wheel and ENT. Short press on ENT will edit a value. When editing a value a long ENT press will restore the value to its default. To exit the script and terminate all current operations correctly short press RTN (if you don't do this the RX might not store the changes).

Multiprotocol/E129_cyrf6936.ino

@@ -18,15 +18,17 @@
 #include "iface_rf2500.h"
 
 //#define E129_FORCE_ID
+//#define C186_FORCE_ID
 
 #define E129_BIND_CH		0x2D	//45
 #define E129_PAYLOAD_SIZE	16
+#define C186_PAYLOAD_SIZE	19
 
 static void __attribute__((unused)) E129_build_data_packet()
 {
 	//Build the packet
-	memset(packet,0,E129_PAYLOAD_SIZE);
-	packet[ 0] = 0x0F;									// Packet length
+	memset(packet,0,packet_length);
+	packet[ 0] = packet_length - 1;						// Packet length
 	if(IS_BIND_IN_PROGRESS)
 	{
 		packet[ 1] = 0xA4;
@@ -40,11 +42,21 @@ static void __attribute__((unused)) E129_build_data_packet()
 	else
 	{
 		packet[ 1] = 0xA6;
-		packet[ 2] = 0xF7;								// High rate 0xF7, low rate 0xF4
-		//packet[ 3] = 0x00;							// Mode: short press=0x20->0x00->0x20->..., long press=0x10->0x30->0x10->...
+		//Flags
+		if(sub_protocol == E129_E129)
+			packet[ 2] = 0xF7;							// High rate 0xF7, low 0xF4
+		else //C186
+		{
+			packet[ 2] = 0xFA;							// High rate 0xFA, medium 0xF7, low 0xF4
+			packet[13] = bit_reverse(rx_tx_addr[2]);
+			packet[14] = bit_reverse(rx_tx_addr[3]);
+			packet[15] = bit_reverse(rx_tx_addr[0]);
+			packet[16] = bit_reverse(rx_tx_addr[1]);
+		}
+		//packet[ 3] = 0x00;							// E129 Mode: short press=0x20->0x00->0x20->..., long press=0x10->0x30->0x10->... => C186 throttle trim is doing the same:up=short press and down=long press
 		packet[ 4] = GET_FLAG(CH5_SW, 0x20)				// Take off/Land 0x20
-				| GET_FLAG(CH6_SW, 0x04);				// Emergency stop 0x04
-		
+				   | GET_FLAG(CH6_SW, 0x04);			// Emergency stop 0x04
+		//Channels and trims
 		uint16_t val = convert_channel_10b(AILERON,false);
 		uint8_t trim = convert_channel_8b(CH7) & 0xFC;
 		packet[ 5] = trim | (val >>8);					// Trim (0x00..0x1F..0x3E) << 2 | channel >> 8
@@ -67,10 +79,14 @@ static void __attribute__((unused)) E129_build_data_packet()
 		packet[11] = trim | (val >>8);					// Trim (0x00..0x1F..0x3E) << 2 | channel >> 8
 		packet[12] = val;								// channel (0x000...0x200...0x3FF)
 	}
-	packet[14] = 0x00;									// Check
-	for(uint8_t i=0;i<14;i++)
-		packet[14] += packet[i];
-	
+	//Check
+	if(sub_protocol == E129_E129)
+		packet[packet_length-2] = packet[0] + packet[1];
+	else
+		packet[packet_length-2] = 0x24 + packet[0] + (packet[1]&0x03);	// ??
+	for(uint8_t i=2;i<packet_length-2;i++)
+		packet[packet_length-2] += packet[i];
+		
 	RF2500_BuildPayload(packet);
 }
 
@@ -83,7 +99,7 @@ uint16_t E129_callback()
 	//Send packet
 	RF2500_SendPayload();
 	
-	//Send twice on same channel
+	//E129 sends twice on same channel, not the C186 but there is a bug somewhere if I don't send the packets back to back
 	if(phase==0)
 	{
 		phase++;
@@ -109,7 +125,9 @@ uint16_t E129_callback()
 	hopping_frequency_no &= 3;
 
 	phase=0;
-	return 5200-1260;
+	if(sub_protocol==E129_E129)
+		return 5200-1260;
+	return 5500-1260;						//E129_C186
 }
 
 void E129_init()
@@ -117,8 +135,9 @@ void E129_init()
 	BIND_IN_PROGRESS;						// Autobind protocol
     bind_counter = 384;						// ~2sec
 
-    //RF2500 emu init
-	RF2500_Init(E129_PAYLOAD_SIZE, true);	// 16 bytes, Scrambled
+	//RF2500 emu init
+	packet_length = sub_protocol == E129_E129?E129_PAYLOAD_SIZE:C186_PAYLOAD_SIZE;
+	RF2500_Init(packet_length, true);		// 16/19 bytes, Scrambled
    
 	//Freq hopping
 	calc_fh_channels(4);
@@ -136,6 +155,16 @@ void E129_init()
         hopping_frequency[2]=0x4B;			//75
         hopping_frequency[3]=0x41;			//65
     #endif
+    #ifdef C186_FORCE_ID
+        rx_tx_addr[0]=0x91;
+        rx_tx_addr[1]=0x02;
+        rx_tx_addr[2]=0x5D;
+        rx_tx_addr[3]=0x33;
+        hopping_frequency[0]=0x44 + 2;
+        hopping_frequency[1]=0x41 + 2;
+        hopping_frequency[2]=0x43 + 2;
+        hopping_frequency[3]=0x49 + 2;
+    #endif
 
 	RF2500_SetTXAddr((uint8_t*)"\xE2\x32\xE0\xC8");	// 4 bytes of bind address
 

Multiprotocol/FX816_nrf24l01.ino

@@ -1,100 +0,0 @@
-/*
- This project is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
-Multiprotocol is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Multiprotocol.  If not, see <http://www.gnu.org/licenses/>.
- */
-// Compatible with FEI XIONG P38 plane.
-
-#if defined(FX816_NRF24L01_INO)
-
-#include "iface_xn297.h"
-
-#define FX816_INITIAL_WAIT    500
-#define FX816_PACKET_PERIOD   10000
-#define FX816_RF_BIND_CHANNEL 0x28		//40
-#define FX816_RF_NUM_CHANNELS 4
-#define FX816_PAYLOAD_SIZE    6
-#define FX816_BIND_COUNT	  300		//3sec
-
-static void __attribute__((unused)) FX816_send_packet()
-{
-	if(IS_BIND_IN_PROGRESS)
-		packet[0] = 0x55;
-	else
-	{
-		XN297_Hopping(hopping_frequency_no++);
-		hopping_frequency_no%=FX816_RF_NUM_CHANNELS;
-		packet[0] = 0xAA;
-	}
-	packet[1] = rx_tx_addr[0];
-	packet[2] = rx_tx_addr[1];
-	uint8_t val=convert_channel_8b(AILERON);
-	#define FX816_SWITCH 20
-	if(val>127+FX816_SWITCH)
-		packet[3] = 1;
-	else if(val<127-FX816_SWITCH)
-		packet[3] = 2;
-	else
-		packet[3] = 0;
-	packet[4] = convert_channel_16b_limit(THROTTLE,0,100);
-	val=0;
-	for(uint8_t i=0;i<FX816_PAYLOAD_SIZE-1;i++)
-		val+=packet[i];
-	packet[5]=val;
-
-	// Send
-	XN297_SetPower();
-	XN297_SetTxRxMode(TX_EN);
-	XN297_WritePayload(packet, FX816_PAYLOAD_SIZE);
-}
-
-static void __attribute__((unused)) FX816_RF_init()
-{
-	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
-	XN297_SetTXAddr((uint8_t *)"\xcc\xcc\xcc\xcc\xcc", 5);
-	//XN297_HoppingCalib(FX816_RF_NUM_CHANNELS);
-	XN297_RFChannel(FX816_RF_BIND_CHANNEL);
-}
-
-static void __attribute__((unused)) FX816_initialize_txid()
-{
-	//Only 8 IDs: the RX led does not indicate frame loss.
-	//I didn't open the plane to find out if I could connect there so this is the best I came up with with few trial and errors...
-	rx_tx_addr[0]=0x35+(rx_tx_addr[3]&0x07);							//Original dump=0x35
-	rx_tx_addr[1]=0x09;													//Original dump=0x09
-	memcpy(hopping_frequency,"\x09\x1B\x30\x42",FX816_RF_NUM_CHANNELS); //Original dump=9=0x09,27=0x1B,48=0x30,66=0x42
-	for(uint8_t i=0;i<FX816_RF_NUM_CHANNELS;i++)
-		hopping_frequency[i]+=rx_tx_addr[3]&0x07;
-}
-
-uint16_t FX816_callback()
-{
-	#ifdef MULTI_SYNC
-		telemetry_set_input_sync(FX816_PACKET_PERIOD);
-	#endif
-	if(bind_counter)
-		if(--bind_counter==0)
-			BIND_DONE;
-	FX816_send_packet();
-	return FX816_PACKET_PERIOD;
-}
-
-void FX816_init()
-{
-	BIND_IN_PROGRESS;	// autobind protocol
-	FX816_initialize_txid();
-	FX816_RF_init();
-	hopping_frequency_no = 0;
-	bind_counter=FX816_BIND_COUNT;
-}
-
-#endif

Multiprotocol/FX_nrf24l01.ino

@@ -0,0 +1,177 @@
+/*
+ This project is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+Multiprotocol is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Multiprotocol.  If not, see <http://www.gnu.org/licenses/>.
+ */
+// Compatible with FEI XIONG P38 plane.
+
+#if defined(FX_NRF24L01_INO)
+
+#include "iface_xn297.h"
+
+#define FX_BIND_COUNT				300		//3sec
+#define FX_SWITCH					20
+#define FX_NUM_CHANNELS				4
+
+#define FX816_PACKET_PERIOD			10000
+#define FX816_BIND_CHANNEL			40
+#define FX816_PAYLOAD_SIZE			6
+#define FX816_CH_OFFSET				3
+
+#define FX620_PACKET_PERIOD 		3250
+#define FX620_BIND_PACKET_PERIOD	4500
+#define FX620_BIND_CHANNEL			18
+#define FX620_PAYLOAD_SIZE			7
+#define FX620_CH_OFFSET				1
+
+//#define FORCE_FX620_ID
+
+static void __attribute__((unused)) FX_send_packet()
+{
+	//Hopp
+	if(IS_BIND_DONE)
+	{
+		XN297_Hopping(hopping_frequency_no++);
+		hopping_frequency_no &= 0x03;
+	}
+
+	memset(packet,0x00,packet_length);
+
+	//Channels
+	uint8_t offset=sub_protocol == FX816 ? FX816_CH_OFFSET:FX620_CH_OFFSET;
+	uint8_t val=convert_channel_8b(AILERON);
+	if(val>127+FX_SWITCH)
+		packet[offset] = sub_protocol == FX816 ? 1:0xFF;
+	else if(val<127-FX_SWITCH)
+		packet[offset] = sub_protocol == FX816 ? 2:0x00;
+	else
+		packet[offset] = sub_protocol == FX816 ? 0:0x7F;
+	packet[offset+1] = convert_channel_16b_limit(THROTTLE,0,100);	//FX816:0x00..0x63, FX620:0x00..0x5E but that should work
+
+	//Bind and specifics
+	if(sub_protocol == FX816)
+	{
+		if(IS_BIND_IN_PROGRESS)
+			packet[0] = 0x55;
+		else
+			packet[0] = 0xAA;
+		packet[1] = rx_tx_addr[0];
+		packet[2] = rx_tx_addr[1];
+	}
+	else //FX620
+	{
+		if(IS_BIND_IN_PROGRESS)
+		{
+			memcpy(packet,rx_tx_addr,3);
+			packet[3] = hopping_frequency[0];
+			if(bind_counter > (FX_BIND_COUNT >> 1))
+				packet[5] = 0x78;
+		}
+		else
+		{
+			packet[0] = 0x1F;	// Is it based on ID??
+			packet[5] = 0xAB;	// Is it based on ID??
+		}
+	}
+
+	//Check
+	val=0;
+	for(uint8_t i=0;i<packet_length-1;i++)
+		val+=packet[i];
+	packet[packet_length-1]=val;
+
+	//Debug
+	#if 0
+		for(uint8_t i=0;i<packet_length;i++)
+			debug("%02X ",packet[i]);
+		debugln("");
+	#endif
+	
+	// Send
+	XN297_SetPower();
+	XN297_SetTxRxMode(TX_EN);
+	XN297_WritePayload(packet, packet_length);
+}
+
+static void __attribute__((unused)) FX_RF_init()
+{
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
+	if(sub_protocol == FX816)
+	{
+		XN297_SetTXAddr((uint8_t *)"\xcc\xcc\xcc\xcc\xcc", 5);
+		XN297_RFChannel(FX816_BIND_CHANNEL);
+		packet_period = FX816_PACKET_PERIOD;
+		packet_length = FX816_PAYLOAD_SIZE;
+	}
+	else //FX620
+	{
+		XN297_SetTXAddr((uint8_t *)"\xaa\xbb\xcc", 3);
+		XN297_RFChannel(FX620_BIND_CHANNEL);
+		packet_period = FX620_BIND_PACKET_PERIOD;
+		packet_length = FX620_PAYLOAD_SIZE;
+	}
+}
+
+static void __attribute__((unused)) FX_initialize_txid()
+{
+	if(sub_protocol == FX816)
+	{
+		//Only 8 IDs: the RX led does not indicate frame loss.
+		//I didn't open the plane to find out if I could connect there so this is the best I came up with with few trial and errors...
+		rx_tx_addr[0]=0x35+(rx_tx_addr[3]&0x07);							//Original dump=0x35
+		rx_tx_addr[1]=0x09;													//Original dump=0x09
+		memcpy(hopping_frequency,"\x09\x1B\x30\x42",FX_NUM_CHANNELS);		//Original dump=9=0x09,27=0x1B,48=0x30,66=0x42
+		for(uint8_t i=0;i<FX_NUM_CHANNELS;i++)
+			hopping_frequency[i]+=rx_tx_addr[3]&0x07;
+	}
+	else//FX620
+	{
+		rx_tx_addr[0] = rx_tx_addr[3];
+		hopping_frequency[0] = 0x18 + rx_tx_addr[3]&0x07;	// just to try something
+		#ifdef FORCE_FX620_ID
+			memcpy(rx_tx_addr,(uint8_t*)"\x34\xA9\x32",3);
+			hopping_frequency[0] = 0x18;	//on dump: 24 34 44 54
+		#endif
+		for(uint8_t i=1;i<FX_NUM_CHANNELS;i++)
+			hopping_frequency[i] = i*10 + hopping_frequency[0];
+	}
+}
+
+uint16_t FX_callback()
+{
+	#ifdef MULTI_SYNC
+		telemetry_set_input_sync(packet_period);
+	#endif
+	if(bind_counter)
+		if(--bind_counter==0)
+		{
+			BIND_DONE;
+			if(sub_protocol == FX620)
+			{
+				XN297_SetTXAddr(rx_tx_addr, 3);
+				packet_period = FX620_PACKET_PERIOD;
+			}
+		}
+	FX_send_packet();
+	return packet_period;
+}
+
+void FX_init()
+{
+	BIND_IN_PROGRESS;	// autobind protocol
+	FX_initialize_txid();
+	FX_RF_init();
+	hopping_frequency_no = 0;
+	bind_counter=FX_BIND_COUNT;
+}
+
+#endif

Multiprotocol/HOTT_cc2500.ino

@@ -169,66 +169,77 @@ static void __attribute__((unused)) HOTT_TXID_init()
 	}
 }
 
-static void __attribute__((unused)) HOTT_prep_data_packet()
-{
-	static uint8_t upper=0;
+static void __attribute__((unused)) HOTT_prep_data_packet() {
+	static uint8_t upper = 0;								// toggles between sending channels 1..8,9..12 and 1..8,13..16
+	
+	packet[2] = hopping_frequency_no;						// send next frequency to be used
+	packet[3] = upper;										// indicate upper or lower channels (only supporting 16 channels)										
 	
-	packet[2] = hopping_frequency_no;
-
-	packet[3] = upper;									// used for failsafe and upper channels (only supporting 16 channels)
 	#ifdef FAILSAFE_ENABLE
-		static uint8_t failsafe_count=0;
-		if(IS_FAILSAFE_VALUES_on && IS_BIND_DONE)
-		{
-			failsafe_count++;
-			if(failsafe_count>=3)
-			{
-				FAILSAFE_VALUES_off;
-				failsafe_count=0;
+		static uint8_t failsafe_count = 0;					// failsafe packet state machine (need to send two packets)
+
+		if(IS_FAILSAFE_VALUES_on && IS_BIND_DONE) {			// if TX wants to send failsafe data and RX is connected
+			failsafe_count++;								// prepare to send next packet
+
+			if(failsafe_count >= 3) {						// done sending two failsafe channel data packets
+				FAILSAFE_VALUES_off;					
+				failsafe_count = 0;
 			}
 		}
 		else
-			failsafe_count=0;
+			failsafe_count = 0;
 	#endif
 
 	// Channels value are PPM*2, -100%=1100µs, +100%=1900µs, order TAER
+	//
+	// Note: failsafe packets are differnt to normal operation packets
+	// normal operation toggles between sending channels 1..8,9..12 and 1..8,13..16 using bit0 as high/low indicator in packet[3]
+	// while failsafe packets send channels 1..12, 13..24 (and probably 25..32) using bit0 in packet[3] as packet type indicator
+	// packet[3] = 0x40 -> failsafe packet with data for channels 1..12
+	// packet[3] = 0x41 -> failsafe packet with data for channels 13..24
+	//
 	uint16_t val;
-	for(uint8_t i=4;i<28;i+=2)
-	{
-		uint8_t ch=(i-4)>>1;
-		if(upper && ch >= 8)
-			ch+=4;										// when upper swap CH9..CH12 by CH13..16
-		val=Channel_data[ch];
-		val=(((val<<2)+val)>>2)+860*2;					// value range 860<->2140 *2 <-> -125%<->+125%
+	for(uint8_t i = 0 ; i < 12*2 ; i += 2) {				// working 12 channels (using 2 bytes per channel)
+		uint8_t chIndex = i >> 1 ;							// normal operation channel number
+		uint8_t fschIndex = chIndex;						// linear channel number for failsafe
+		
+		if(upper && chIndex >= 8) chIndex += 4;				// for normal operation toggle between channels 1..8,9..12 and 1..8,13..16
+		val = Channel_data[chIndex];						// get normal operation channel data
+		val = (((val << 2) + val) >> 2)+ 860*2;				// convert channel data 0..2047 to 1720..4278 <-> -125%<->+125%
+															// val = (val*5/4+860*2)
+
 		#ifdef FAILSAFE_ENABLE
-			if(failsafe_count==1)
-			{ // first failsafe packet
-				packet[3] |= 0x40;
-				uint16_t fs=Failsafe_data[ch];
-				if( fs == FAILSAFE_CHANNEL_HOLD || fs == FAILSAFE_CHANNEL_NOPULSES)
-					val|=0x8000;						// channel hold flag
-				else
-				{
-					val=(((fs<<2)+fs)>>2)+860*2;		// value range 860<->2140 *2 <-> -125%<->+125%
-					val|=0x4000;						// channel specific position flag
+			if(failsafe_count == 1 || failsafe_count == 2) {// failsafe data needs to be sent to RX
+				uint16_t fs = 0x8000;						// default failsafe mode is hold
+
+				if(failsafe_count == 1) {					// send fail safe packet containing channels 1..12
+					packet[3] = 0x40;						// indicate packet has failsafe values for channels 1..12
+					fs = Failsafe_data[fschIndex];			// get failsafe channel data
+				} else {									// send fail safe packet containing channels 13..24
+					packet[3] = 0x41;						// indicate packet has failsafe values for channels 13..24
+					if(fschIndex < 4)						// we only work 16 channels so send channels 13..16, rest default
+						fs = Failsafe_data[fschIndex+12];	// get failsafe channel data 13..16
+				  } 
+
+				if( fs == FAILSAFE_CHANNEL_HOLD ||			// treat HOLD and NOPULSES as channel hold 
+					fs == FAILSAFE_CHANNEL_NOPULSES)
+					val = 0x8000;							// set channel failsafe mode hold flag
+				else {
+					val = (((fs << 2) + fs) >> 2) +860*2; 	// convert channel data 0..2047 to 1720..4278 <-> -125%<->+125%
+					val |= 0x4000;							// set channel failsafe mode position flag					
 				}
-			}
-			else if(failsafe_count==2)
-			{ // second failsafe packet=timing?
-				packet[3] |= 0x50;
-				if(i==4)
-					val=2;
-				else
-					val=0;
-			}
+			} 
 		#endif
-		packet[i] = val;
-		packet[i+1] = val>>8;
+
+		packet[i + 4]   = val;								// first channel data at packet[4] and packet[5]
+		packet[i + 4+1] = val >> 8;
 	}
-	upper ^= 0x01;										// toggle between CH9..CH12 and CH13..16
-	
-	packet[28] = 0x80;									// no sensor
-	packet[29] = 0x02;									// 0x02 when bind starts then when RX replies cycle in sequence 0x1A/22/2A/0A/12, 0x02 during normal packets, 0x01->text config menu, 0x0A->no more RX telemetry
+
+	upper ^= 0x01;											// toggle to upper and lower channels
+
+	packet[28] = 0x80;										// no sensor
+	packet[29] = 0x02;										// 0x02 when bind starts then when RX replies cycle in sequence 0x1A/22/2A/0A/12, 0x02 during normal packets, 0x01->text config menu, 0x0A->no more RX telemetry
+
 	#ifdef HOTT_FW_TELEMETRY
 		if(IS_BIND_DONE)
 		{

Multiprotocol/KF606_ccnrf.ino

@@ -46,7 +46,7 @@ static void __attribute__((unused)) KF606_send_packet()
 		if(sub_protocol == KF606_KF606)
 		{
 			packet[2] = convert_channel_8b_limit_deadband(AILERON,0x20,0x80,0xE0,40);	// Aileron: Max values:20..80..E0, Low rates:50..80..AF, High rates:3E..80..C1
-			packet[3] = convert_channel_16b_limit(CH5,0xC1,0xDF);	// Aileron trim must be on a separated channel C1..D0..DF
+			packet[3] = convert_channel_16b_limit(CH5,0xC1,0xDF);						// Aileron trim must be on a separated channel C1..D0..DF
 		}
 		else
 		{
@@ -57,6 +57,7 @@ static void __attribute__((unused)) KF606_send_packet()
 				packet[3] = 0x01;
 			else if(packet[3] > 0x1F)
 				packet[3] = 0x1F;
+			packet[3] |= GET_FLAG(CH6_SW, 0xC0);										// 0xC0 and 0xE0 are both turning the LED off, not sure if there is another hidden feature
 		}
 	}
 

Multiprotocol/Kyosho2_nrf24l01.ino

@@ -0,0 +1,137 @@
+/*
+ This project is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Multiprotocol is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Multiprotocol.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#if defined(KYOSHO2_NRF24L01_INO)
+
+#include "iface_nrf24l01.h"
+
+#define KYOSHO2_PACKET_PERIOD			1120	// 1600 for bind, let's see
+#define KYOSHO2_BIND_COUNT				2000	// about 3sec
+#define KYOSHO2_BIND_CHANNEL			0x50
+#define KYOSHO2_PAYLOAD_SIZE			28
+#define KYOSHO2_RF_CHANNELS				15
+#define KYOSHO2_START_RF_CHANNEL		0x13	// No idea where it comes from... ID or unknown bytes during the bind?
+#define KYOSHO2_NUM_CHANNEL				10		// Only 4 on the dumps but there is space for 10 channels in the payload...
+
+#define FORCE_KYOSHO2_ID
+
+bool KYOSHO2_resend;
+//
+static void __attribute__((unused)) KYOSHO2_send_packet()
+{
+	if(KYOSHO2_resend == true)
+	{
+		NRF24L01_Strobe(NRF24L01_E3_REUSE_TX_PL);
+		if(IS_BIND_DONE)
+			KYOSHO2_resend = false;
+		return;
+	}
+	
+	memset(packet,0x00,KYOSHO2_PAYLOAD_SIZE);
+	
+	if(IS_BIND_IN_PROGRESS)
+	{
+		memcpy(packet, (uint8_t*)"\x01\x02\x05\x08\x1A\x2B\x3C\x4D", 8);	// unknown bytes, parameters on how to build the rf channels?
+		memcpy(&packet[8], rx_tx_addr, 4);
+	}
+	else
+	{
+		memcpy(packet, rx_tx_addr, 4);
+		//Hopp
+		packet[6] = hopping_frequency_no + KYOSHO2_START_RF_CHANNEL;
+		packet[7] = hopping_frequency[hopping_frequency_no];
+		NRF24L01_WriteReg(NRF24L01_05_RF_CH, packet[6+(rf_ch_num&0x01)]);
+		rf_ch_num++;
+		//Channels
+		uint16_t temp;
+		for (uint8_t i = 0; i< KYOSHO2_NUM_CHANNEL; i++)
+		{
+			temp=convert_channel_16b_limit(i,0,0x3FF);
+			packet[8+i*2] = temp >> 8;
+			packet[9+i*2] = temp;
+		}
+	}
+	//Send
+    NRF24L01_WriteReg(NRF24L01_07_STATUS, (_BV(NRF24L01_07_TX_DS) | _BV(NRF24L01_07_MAX_RT)));	// Reset flags
+    NRF24L01_FlushTx();
+	NRF24L01_WritePayload(packet,KYOSHO2_PAYLOAD_SIZE);
+	NRF24L01_SetPower();
+	KYOSHO2_resend = true;
+	
+	#if 0
+		for(uint8_t i=0;i<KYOSHO2_PAYLOAD_SIZE;i++)
+			debug("%02X ", packet[i]);
+		debugln("");
+	#endif
+}
+
+static void __attribute__((unused)) KYOSHO2_RF_init()
+{
+	NRF24L01_Initialize();
+	NRF24L01_WriteReg(NRF24L01_05_RF_CH, KYOSHO2_BIND_CHANNEL);
+	NRF24L01_WriteRegisterMulti(NRF24L01_10_TX_ADDR, (uint8_t*)"\x69\x53\x10\xAC\xEF", 5);
+}
+
+static void __attribute__((unused)) KYOSHO2_initialize_tx_id()
+{
+	hopping_frequency_no = rx_tx_addr[3]%KYOSHO2_RF_CHANNELS;
+	hopping_frequency[0] = 0x4A;
+	#ifdef FORCE_KYOSHO2_ID
+		memcpy(rx_tx_addr, (uint8_t*)"\x0A\xBD\x31\xDF", 4);
+		hopping_frequency[0] = 0x4A;						// No idea where it comes from... ID or unknown bytes during the bind?
+	#endif
+	for(uint8_t i=1;i<KYOSHO2_RF_CHANNELS;i++)
+	{
+		if(hopping_frequency[i-1]+5 < 0x50)
+			hopping_frequency[i] = hopping_frequency[i-1]+5;
+		else
+			hopping_frequency[i] = hopping_frequency[i-1]-0x21;
+	}
+	#if 0
+		for(uint8_t i=0;i<KYOSHO2_RF_CHANNELS;i++)
+			debugln("1:%02X, 2: %02X", i + KYOSHO2_START_RF_CHANNEL, hopping_frequency[i]);
+		debugln("Selected 1:%02X, 2: %02X", hopping_frequency_no + KYOSHO2_START_RF_CHANNEL, hopping_frequency[hopping_frequency_no]);
+	#endif
+}
+
+uint16_t KYOSHO2_callback()
+{
+	#ifdef MULTI_SYNC
+		telemetry_set_input_sync(KYOSHO2_PACKET_PERIOD);
+	#endif
+	if(bind_counter)
+		if(--bind_counter==0)
+		{
+			BIND_DONE;
+			KYOSHO2_resend = false;
+		}
+	KYOSHO2_send_packet();
+	return KYOSHO2_PACKET_PERIOD;
+}
+
+void KYOSHO2_init()
+{
+	KYOSHO2_initialize_tx_id();
+	KYOSHO2_RF_init();
+	rf_ch_num = 0;
+
+	if(IS_BIND_IN_PROGRESS)
+		bind_counter = KYOSHO2_BIND_COUNT;
+	else 
+		bind_counter = 0;
+	KYOSHO2_resend = false;
+}
+
+#endif

Multiprotocol/MT99xx_ccnrf.ino

@@ -27,12 +27,15 @@
 #define MT99XX_PACKET_PERIOD_DRAGON	1038	// there is a pause of 2x1038 between two packets, no idea why and how since it is not even stable on a same dump...
 #define MT99XX_PACKET_PERIOD_DRAGON_TELEM	10265	// long pause to receive the telemetry packets, 3 are sent by the RX one after the other
 #define MT99XX_PACKET_PERIOD_F949G	3450
+#define MT99XX_PACKET_PERIOD_PA18	1338
 #define MT99XX_INITIAL_WAIT			500
 #define MT99XX_PACKET_SIZE			9
 
 //#define FORCE_A180_ID
 //#define FORCE_DRAGON_ID
 //#define FORCE_F949G_ID
+#define FORCE_PA18_ID1
+//#define FORCE_PA18_ID2
 
 enum {
     MT99XX_DATA,
@@ -82,6 +85,11 @@ enum{
     FLAG_F949G_LIGHT	= 0x01,
     FLAG_F949G_3D6G		= 0x20,
 };
+enum{
+    // flags going to packet[6] (PA18)
+	FLAG_PA18_RTH		= 0x08,
+	FLAG_PA18_FLIP		= 0x80,
+};
 
 const uint8_t h7_mys_byte[] = {
 	0x01, 0x11, 0x02, 0x12, 0x03, 0x13, 0x04, 0x14, 
@@ -107,11 +115,11 @@ static void __attribute__((unused)) MT99XX_send_packet()
 
 	//Set RF freq
 	if(sub_protocol == LS)
-		XN297_RFChannel(0x2D); // LS always transmits on the same channel
+		XN297_RFChannel(0x2D); 			// LS always transmits on the same channel
 	else
 		if(sub_protocol==FY805)
-			XN297_RFChannel(0x4B); // FY805 always transmits on the same channel
-		else // MT99 & H7 & YZ & A180 & DRAGON & F949G
+			XN297_RFChannel(0x4B);		// FY805 always transmits on the same channel
+		else // MT99 & H7 & YZ & A180 & DRAGON & F949G & PA18
 			XN297_Hopping(hopping_frequency_no);
 
 	if(IS_BIND_IN_PROGRESS)
@@ -121,7 +129,6 @@ static void __attribute__((unused)) MT99XX_send_packet()
 		switch(sub_protocol)
 		{
 			case YZ:
-				packet_period = MT99XX_PACKET_PERIOD_YZ;
 				packet[1] = 0x15;
 				packet[2] = 0x05;
 				packet[3] = 0x06;
@@ -132,15 +139,11 @@ static void __attribute__((unused)) MT99XX_send_packet()
 				packet[3] = 0x11;
 				break;
 			case FY805:
-				packet_period = MT99XX_PACKET_PERIOD_FY805;
 				packet[1] = 0x15;
 				packet[2] = 0x12;
 				packet[3] = 0x17;
 				break;
-			case F949G:
-			case A180:
-				packet_period = MT99XX_PACKET_PERIOD_A180;
-			default:	// MT99 & H7 & A180 & DRAGON & F949G
+			default:	// MT99 & H7 & A180 & DRAGON & F949G & PA18
 				packet[1] = 0x14;
 				packet[2] = 0x03;
 				packet[3] = 0x25;
@@ -149,16 +152,24 @@ static void __attribute__((unused)) MT99XX_send_packet()
 		packet[4] = rx_tx_addr[0];
 		packet[5] = rx_tx_addr[1];
 		packet[6] = rx_tx_addr[2];
-		packet[7] = crc8;												// checksum offset
-		if(sub_protocol != F949G)
-			packet[8] = 0xAA;											// fixed
+		if(sub_protocol == PA18+8)
+		{
+			packet[7] = num_ch;											// checksum offset
+			packet[8] = 0x55;											// fixed
+		}
 		else
-			packet[8] = 0x00;
+		{ // all others
+			packet[7] = crc8;											// checksum offset
+			if(sub_protocol != F949G)
+				packet[8] = 0xAA;										// fixed
+			else
+				packet[8] = 0x00;
+		}
 	}
 	else
 	{
 		if(sub_protocol != YZ)
-		{ // MT99XX & H7 & LS & FY805 & A180 & DRAGON & F949G
+		{ // MT99XX & H7 & LS & FY805 & A180 & DRAGON & F949G & PA18
 			packet[0] = convert_channel_16b_limit(THROTTLE,0xE1,0x00);	// throttle
 			packet[1] = convert_channel_16b_limit(RUDDER  ,0x00,0xE1);	// rudder
 			packet[2] = convert_channel_16b_limit(AILERON ,0xE1,0x00);	// aileron
@@ -166,8 +177,10 @@ static void __attribute__((unused)) MT99XX_send_packet()
 			packet[4] = 0x20; 											// pitch trim (0x3f-0x20-0x00)
 			packet[5] = 0x20; 											// roll trim (0x00-0x20-0x3f)
 			packet[6] = GET_FLAG( CH5_SW, FLAG_MT_FLIP );
-			packet[7] = h7_mys_byte[hopping_frequency_no];				// next rf channel index ?
-
+			if(sub_protocol != PA18+8)
+				packet[7] = h7_mys_byte[hopping_frequency_no];			// next rf channel index ?
+			else
+				packet[7] = (packet[7]&0xBF)|0x20;
 			switch(sub_protocol)
 			{
 				case MT99:
@@ -198,16 +211,16 @@ static void __attribute__((unused)) MT99XX_send_packet()
 					crc8=0;
 					break;
 				case A180:
-					packet[6] = GET_FLAG( !CH6_SW,FLAG_A180_RATE)	// 0x02, A180=RATE,  F949S=LED
-							   |GET_FLAG( CH5_SW, FLAG_A180_3D6G )	// 0x01, A180=3D_6G, F949S=RATE
-							   |GET_FLAG( CH7_SW, 0x20 );			// 0x20, F949S=3D_6G
+					packet[6] = GET_FLAG( !CH6_SW,FLAG_A180_RATE)		// 0x02, A180=RATE,  F949S=LED
+							   |GET_FLAG( CH5_SW, FLAG_A180_3D6G )		// 0x01, A180=3D_6G, F949S=RATE
+							   |GET_FLAG( CH7_SW, 0x20 );				// 0x20, F949S=3D_6G
 					packet[7] = 0x00;
 					break;
 				case DRAGON:
-					if(CH5_SW)										// Advanced mode
+					if(CH5_SW)											// Advanced mode
 						packet[5] |= 0x80;
 					else
-						if(Channel_data[CH5] > CHANNEL_MIN_COMMAND)	// Beginner mode
+						if(Channel_data[CH5] > CHANNEL_MIN_COMMAND)		// Beginner mode
 							packet[5] |= 0x40;
 					packet[6] = FLAG_DRAGON_RATE
 						| GET_FLAG( CH6_SW, FLAG_DRAGON_RTH );
@@ -222,12 +235,12 @@ static void __attribute__((unused)) MT99XX_send_packet()
 							if(packet_count > 11)
 								packet_count = 0;
 						}
-						if(packet_count > 10)						// Telemetry packet request every 10 or 11 packets
+						if(packet_count > 10)							// Telemetry packet request every 10 or 11 packets
 						{
-							packet[6] |= 0x04;						// Request telemetry flag
+							packet[6] |= 0x04;							// Request telemetry flag
 							phase = MT99XX_RX;
 						}
-						packet[7] = DRAGON_seq[seq_num];			// seq: 20 80 20 60 20 80 20 60... 80 changes to 80+batt from telem
+						packet[7] = DRAGON_seq[seq_num];				// seq: 20 80 20 60 20 80 20 60... 80 changes to 80+batt from telem
 						if(seq_num==3)
 							packet[7] |= v_lipo1;
 					#else
@@ -240,18 +253,31 @@ static void __attribute__((unused)) MT99XX_send_packet()
 							  | GET_FLAG( CH6_SW, FLAG_F949G_LIGHT );
 					packet[7] = 0x00;
 					break;
+				case PA18+8:
+					if(Channel_data[CH5] > CHANNEL_MAX_COMMAND)			// Expert mode
+						packet[5] = 0xA0;
+					else
+						if(Channel_data[CH5] > CHANNEL_MIN_COMMAND)		// Intermediate mode
+							packet[5] = 0x60;
+					packet[6] = GET_FLAG( CH6_SW, FLAG_PA18_FLIP )		// Flip
+							  | GET_FLAG( CH7_SW, FLAG_PA18_RTH );		// RTH
+					if(hopping_frequency_no == 0)
+						packet[7] ^= 0x40;
+					break;
 			}
 			uint8_t result=crc8;
 			for(uint8_t i=0; i<8; i++)
 				result += packet[i];
+			if(sub_protocol == PA18+8)
+				result += num_ch;
 			packet[8] = result;
 		}
 		else
 		{ // YZ
-			packet[0] = convert_channel_16b_limit(THROTTLE,0x00,0x64);	// throttle
-			packet[1] = convert_channel_16b_limit(RUDDER  ,0x64,0x00);	// rudder
-			packet[2] = convert_channel_16b_limit(ELEVATOR,0x00,0x64);	// elevator
-			packet[3] = convert_channel_16b_limit(AILERON ,0x64,0x00);	// aileron
+			packet[0] = convert_channel_16b_limit(THROTTLE,0x00,0x64);		// throttle
+			packet[1] = convert_channel_16b_limit(RUDDER  ,0x64,0x00);		// rudder
+			packet[2] = convert_channel_16b_limit(ELEVATOR,0x00,0x64);		// elevator
+			packet[3] = convert_channel_16b_limit(AILERON ,0x64,0x00);		// aileron
 			if(packet_count++ >= 23)
 			{
 				seq_num ++;
@@ -261,11 +287,11 @@ static void __attribute__((unused)) MT99XX_send_packet()
 			}
 			packet[4] = yz_p4_seq[seq_num];
 			packet[5] = 0x02 // expert ? (0=unarmed, 1=normal)
-						| GET_FLAG(CH8_SW, 0x10)		//VIDEO
-						| GET_FLAG(CH5_SW, 0x80)		//FLIP
-						| GET_FLAG(CH9_SW, 0x04)		//HEADLESS
-						| GET_FLAG(CH7_SW, 0x20);		//SNAPSHOT
-			packet[6] =   GET_FLAG(CH6_SW, 0x80);		//LED
+						| GET_FLAG(CH8_SW, 0x10)							//VIDEO
+						| GET_FLAG(CH5_SW, 0x80)							//FLIP
+						| GET_FLAG(CH9_SW, 0x04)							//HEADLESS
+						| GET_FLAG(CH7_SW, 0x20);							//SNAPSHOT
+			packet[6] =   GET_FLAG(CH6_SW, 0x80);							//LED
 			packet[7] = packet[0];            
 			for(uint8_t idx = 1; idx < MT99XX_PACKET_SIZE-2; idx++)
 				packet[7] += packet[idx];
@@ -275,7 +301,7 @@ static void __attribute__((unused)) MT99XX_send_packet()
 
 	//Hopp
 	hopping_frequency_no++;
-	if(sub_protocol == YZ || sub_protocol == A180 || sub_protocol == DRAGON || sub_protocol == F949G)
+	if(sub_protocol == YZ || sub_protocol == A180 || sub_protocol == DRAGON || sub_protocol == F949G || sub_protocol == PA18+8)
 		hopping_frequency_no++; // skip every other channel
 	if(hopping_frequency_no > 15)
 		hopping_frequency_no = 0;
@@ -311,9 +337,9 @@ static void __attribute__((unused)) MT99XX_RF_init()
 
 static void __attribute__((unused)) MT99XX_initialize_txid()
 {
-	rx_tx_addr[1] = rx_tx_addr[3]; // RX_Num
-
-	switch(protocol)
+	num_ch = rx_tx_addr[1];			// PA18
+	rx_tx_addr[1] = rx_tx_addr[3];	// RX_Num
+	switch(sub_protocol)
 	{
 		case YZ:
 			rx_tx_addr[0] = 0x53;	// test (SB id)
@@ -355,8 +381,35 @@ static void __attribute__((unused)) MT99XX_initialize_txid()
 			//channel_offset  = 0x03
 			break;
 	#endif
-		default: //MT99 & H7 & A180 & DRAGON & F949G
+	#ifdef FORCE_PA18_ID1
+		case PA18+8:
+			rx_tx_addr[0] = 0xC9;	// zebble ID
+			rx_tx_addr[1] = 0x02;
+			rx_tx_addr[2] = 0x13;
+			num_ch = 0x89;			// additional crc init. How is this calculated? or could it be random?
+			//crc8 = 0xDE
+			//channel_offset  = 0x03
+			//1Mb C=5 S=Y A= C9 02 13 CC CC P(9)= E1 70 70 70 20 20 00 20 1A -> 0x91 + 0x89 => 0x1A
+			//        S=Y A= C9 02 13 CC CC P(9)= E1 70 70 70 20 A0 00 20 9A -> 0x11 + 0x89 => 0x9A
+			//bind    S=Y A= CC CC CC CC CC P(9)= 20 14 03 25 C9 02 13 89 55
+			break;
+	#endif
+	#ifdef FORCE_PA18_ID2
+		case PA18+8:
+			rx_tx_addr[0] = 0x0E;
+			rx_tx_addr[1] = 0x05;
+			rx_tx_addr[2] = 0x13;
+			num_ch = 0xD1;			// additional crc init. How is this calculated? or could it be random?
+			//crc8 = 0x28
+			//channel_offset  = 0x00
+			//1Mb C=2 S=Y A= 0E 05 13 CC CC P(9)= E1 70 70 70 20 60 00 60 E2 -> 0x11 + 0xD1 => 0xE2
+			//bind    S=Y A= CC CC CC CC CC P(9)= 20 14 03 25 0E 05 13 D1 55
+			break;
+	#endif
+		default: //MT99 & H7 & A180 & DRAGON & F949G & PA18
 			rx_tx_addr[2] = 0x00;
+			if(sub_protocol == PA18+8)
+				rx_tx_addr[2] = 0x13;
 			break;
 	}
 	
@@ -446,14 +499,40 @@ uint16_t MT99XX_callback()
 
 void MT99XX_init(void)
 {
-	if(sub_protocol != A180 && sub_protocol != DRAGON && sub_protocol != F949G)
-		BIND_IN_PROGRESS;	// autobind protocol
+	if(protocol == PROTO_MT99XX2)
+		sub_protocol|=0x08;		// Increase the number of sub_protocols for MT99XX
+
     bind_counter = MT99XX_BIND_COUNT;
+	if(IS_BIND_DONE)
+	{		
+		if(sub_protocol != A180 && sub_protocol != DRAGON && sub_protocol != F949G && sub_protocol != PA18+8)
+			BIND_IN_PROGRESS;	// autobind protocol
+		else
+		    bind_counter = 1;
+	}
 
 	MT99XX_initialize_txid();
 	MT99XX_RF_init();
 
-	packet_period = MT99XX_PACKET_PERIOD_MT;
+	switch(sub_protocol)
+	{
+		case YZ:
+			packet_period = MT99XX_PACKET_PERIOD_YZ;
+			break;
+		case FY805:
+			packet_period = MT99XX_PACKET_PERIOD_FY805;
+			break;
+		case F949G:
+		case A180:
+			packet_period = MT99XX_PACKET_PERIOD_A180;
+			break;
+		case PA18+8:
+			packet_period = MT99XX_PACKET_PERIOD_PA18;
+			break;
+		default:
+			packet_period = MT99XX_PACKET_PERIOD_MT;
+			break;
+	}
 
 	packet_count=0;
 	phase=MT99XX_DATA;

Multiprotocol/Multi.txt

@@ -45,7 +45,7 @@
 45,E01X,E012,E015
 46,V911S,V911S,E119
 47,GD00x,GD_V1,GD_V2
-48,V761,3CH,4CH
+48,V761,3CH,4CH,TOPRC
 49,KF606,KF606,MIG320
 50,Redpine,Fast,Slow
 51,Potensic,A20
@@ -55,7 +55,7 @@
 55,Frsky_RX,Multi,CloneTX,EraseTX,CPPM
 56,AFHDS2A_RX,Multi,CPPM
 57,HoTT,Sync,No_Sync
-58,FX816,P38
+58,FX,816,620
 59,Bayang_RX,Multi,CPPM
 60,Pelikan,Pro,Lite,SCX24
 61,Tiger
@@ -80,11 +80,13 @@
 80,E016H,E016Hv2
 81,E010r5
 82,LOLI
-83,E129
+83,E129,E129,C186
 84,JOYSWAY
 85,E016H
 87,IKEA
 88,WILLIFM
 89,Losi
 90,MouldKg,Analog,Digit
-91,Xerall
+91,Xerall
+92,MT99xx,PA18
+93,Kyosho2,KT-17

Multiprotocol/Multi_Protos.ino

@@ -33,6 +33,7 @@ const char STR_FRSKYX[]		="FrSky X";
 const char STR_FRSKYX2[]	="FrSkyX2";
 const char STR_ESKY[]		="ESky";
 const char STR_MT99XX[]		="MT99XX";
+const char STR_MT99XX2[]	="MT99XX2";
 const char STR_MJXQ[]		="MJXq";
 const char STR_SHENQI[]		="Shenqi";
 const char STR_FY326[]		="FY326";
@@ -77,7 +78,7 @@ const char STR_SCANNER[]	="Scanner";
 const char STR_FRSKY_RX[]	="FrSkyRX";
 const char STR_AFHDS2A_RX[]	="FS2A_RX";
 const char STR_HOTT[]		="HoTT";
-const char STR_FX816[]		="FX816";
+const char STR_FX[]		="FX";
 const char STR_BAYANG_RX[]	="BayanRX";
 const char STR_PELIKAN[]	="Pelikan";
 const char STR_TIGER[]		="Tiger";
@@ -87,6 +88,7 @@ const char STR_FRSKYR9[]	="FrSkyR9";
 const char STR_PROPEL[]		="Propel";
 const char STR_SKYARTEC[]	="Skyartc";
 const char STR_KYOSHO[]		="Kyosho";
+const char STR_KYOSHO2[]	="Kyosho2";
 const char STR_RLINK[]		="RadLink";
 const char STR_REALACC[]	="Realacc";
 const char STR_OMP[]		="OMP";
@@ -120,6 +122,7 @@ const char STR_SUBTYPE_CX10[] =       "\x07""Green\0 ""Blue\0  ""DM007\0 ""-\0
 const char STR_SUBTYPE_CG023[] =      "\x05""Std\0 ""YD829";
 const char STR_SUBTYPE_BAYANG[] =     "\x07""Std\0   ""H8S3D\0 ""X16 AH\0""IRDrone""DHD D4\0""QX100\0 ";
 const char STR_SUBTYPE_MT99[] =       "\x06""MT99\0 ""H7\0   ""YZ\0   ""LS\0   ""FY805\0""A180\0 ""Dragon""F949G\0";
+const char STR_SUBTYPE_MT992[] =      "\x04""PA18";
 const char STR_SUBTYPE_MJXQ[] =       "\x07""WLH08\0 ""X600\0  ""X800\0  ""H26D\0  ""E010\0  ""H26WH\0 ""Phoenix";
 const char STR_SUBTYPE_FY326[] =      "\x05""Std\0 ""FY319";
 const char STR_SUBTYPE_HONTAI[] =     "\x07""Std\0   ""JJRC X1""X5C1\0  ""FQ_951";
@@ -139,7 +142,6 @@ const char STR_SUBTYPE_REDPINE[] =    "\x04""Fast""Slow";
 const char STR_SUBTYPE_POTENSIC[] =   "\x03""A20";
 const char STR_SUBTYPE_ZSX[] =        "\x07""280JJRC";
 const char STR_SUBTYPE_HEIGHT[] =     "\x03""5ch""8ch";
-const char STR_SUBTYPE_FX816[] =      "\x03""P38";
 const char STR_SUBTYPE_XN297DUMP[] =  "\x07""250Kbps""1Mbps\0 ""2Mbps\0 ""Auto\0  ""NRF\0   ""CC2500\0";
 const char STR_SUBTYPE_ESKY150[] =    "\x03""4ch""7ch";
 const char STR_SUBTYPE_ESKY150V2[] =  "\x05""150V2";
@@ -153,15 +155,17 @@ const char STR_SUBTYPE_WFLY[] =       "\x05""WFR0x";
 const char STR_SUBTYPE_WFLY2[] =      "\x05""RF20x";
 const char STR_SUBTYPE_HOTT[] =       "\x07""Sync\0  ""No_Sync";
 const char STR_SUBTYPE_PELIKAN[] =    "\x05""Pro\0 ""Lite\0""SCX24";
-const char STR_SUBTYPE_V761[] =       "\x03""3ch""4ch";
+const char STR_SUBTYPE_V761[] =       "\x05""3ch\0 ""4ch\0 ""TOPRC";
 const char STR_SUBTYPE_RLINK[] =      "\x07""Surface""Air\0   ""DumboRC";
 const char STR_SUBTYPE_REALACC[] =    "\x03""R11";
 const char STR_SUBTYPE_KYOSHO[] =     "\x04""FHSS""Hype";
+const char STR_SUBTYPE_KYOSHO2[] =    "\x05""KT-17";
 const char STR_SUBTYPE_FUTABA[] =     "\x05""SFHSS";
 const char STR_SUBTYPE_JJRC345[] =    "\x08""JJRC345\0""SkyTmblr";
 const char STR_SUBTYPE_MOULKG[] =     "\x06""Analog""Digit\0";
 const char STR_SUBTYPE_KF606[] =      "\x06""KF606\0""MIG320";
-
+const char STR_SUBTYPE_E129[] =       "\x04""E129""C186";
+const char STR_SUBTYPE_FX[] =         "\x03""816""620";
 #define NO_SUBTYPE		nullptr
 
 #ifdef SEND_CPPM
@@ -251,7 +255,7 @@ const mm_protocol_definition multi_protocols[] = {
 		{PROTO_E01X,       STR_E01X,      STR_SUBTYPE_E01X,      2, OPTION_NONE,    0, 0, SW_CYRF,   E01X_init,       E01X_callback       },
 	#endif
 	#if defined(E129_CYRF6936_INO)
-		{PROTO_E129,       STR_E129,      NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_CYRF,   E129_init,       E129_callback       },
+		{PROTO_E129,       STR_E129,      STR_SUBTYPE_E129,      2, OPTION_NONE,    0, 0, SW_CYRF,   E129_init,       E129_callback       },
 	#endif
 	#if defined(ESKY_NRF24L01_INO)
 		{PROTO_ESKY,       STR_ESKY,      STR_SUBTYPE_ESKY,      2, OPTION_NONE,    0, 1, SW_NRF,    ESKY_init,       ESKY_callback       },
@@ -302,8 +306,8 @@ const mm_protocol_definition multi_protocols[] = {
 	#if defined(FUTABA_CC2500_INO)
 		{PROTO_FUTABA,     STR_FUTABA,    STR_SUBTYPE_FUTABA,    1, OPTION_RFTUNE,  1, 1, SW_CC2500, SFHSS_init,      SFHSS_callback      },
 	#endif
-	#if defined(FX816_NRF24L01_INO)
-		{PROTO_FX816,      STR_FX816,     STR_SUBTYPE_FX816,     1, OPTION_NONE,    0, 0, SW_NRF,    FX816_init,      FX816_callback      },
+	#if defined(FX_NRF24L01_INO)
+		{PROTO_FX,         STR_FX,        STR_SUBTYPE_FX,        2, OPTION_NONE,    0, 0, SW_NRF,    FX_init,         FX_callback         },
 	#endif
 	#if defined(FY326_NRF24L01_INO)
 		{PROTO_FY326,      STR_FY326,     STR_SUBTYPE_FY326,     2, OPTION_NONE,    0, 0, SW_NRF,    FY326_init,      FY326_callback      },
@@ -356,6 +360,9 @@ const mm_protocol_definition multi_protocols[] = {
 	#if defined(KYOSHO_A7105_INO)
 		{PROTO_KYOSHO,     STR_KYOSHO,    STR_SUBTYPE_KYOSHO,    2, OPTION_NONE,    0, 1, SW_A7105,  KYOSHO_init,     KYOSHO_callback     },
 	#endif
+	#if defined(KYOSHO2_NRF24L01_INO)
+		{PROTO_KYOSHO2,    STR_KYOSHO2,   STR_SUBTYPE_KYOSHO2,   1, OPTION_NONE,    0, 0, SW_NRF,    KYOSHO2_init,    KYOSHO2_callback    },
+	#endif
 	#if defined(LOLI_NRF24L01_INO)
 		{PROTO_LOLI,       STR_LOLI,      NO_SUBTYPE,            0, OPTION_NONE,    1, 0, SW_NRF,    LOLI_init,       LOLI_callback       },
 	#endif
@@ -374,6 +381,9 @@ const mm_protocol_definition multi_protocols[] = {
 	#if defined(MT99XX_CCNRF_INO)
 		{PROTO_MT99XX,     STR_MT99XX,    STR_SUBTYPE_MT99,      8, OPTION_NONE,    0, 0, SW_NRF,    MT99XX_init,     MT99XX_callback     },
 	#endif
+	#if defined(MT99XX_CCNRF_INO)
+		{PROTO_MT99XX2,    STR_MT99XX2,   STR_SUBTYPE_MT992,     1, OPTION_NONE,    0, 0, SW_NRF,    MT99XX_init,     MT99XX_callback     },
+	#endif
 	#if defined(NCC1701_NRF24L01_INO)
 		{PROTO_NCC1701,    STR_NCC1701,   NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_NRF,    NCC_init,        NCC_callback        },
 	#endif
@@ -432,7 +442,7 @@ const mm_protocol_definition multi_protocols[] = {
 		{PROTO_V2X2,       STR_V2X2,      STR_SUBTYPE_V2X2,      3, OPTION_NONE,    0, 0, SW_NRF,    V2X2_init,       V2X2_callback       },
 	#endif
 	#if defined(V761_NRF24L01_INO)
-		{PROTO_V761,       STR_V761,      STR_SUBTYPE_V761,      2, OPTION_NONE,    0, 0, SW_NRF,    V761_init,       V761_callback       },
+		{PROTO_V761,       STR_V761,      STR_SUBTYPE_V761,      3, OPTION_NONE,    0, 0, SW_NRF,    V761_init,       V761_callback       },
 	#endif
 	#if defined(V911S_CCNRF_INO)
 		{PROTO_V911S,      STR_V911S,     STR_SUBTYPE_V911S,     2, OPTION_RFTUNE,  0, 0, SW_NRF,    V911S_init,      V911S_callback      },

Multiprotocol/Multiprotocol.h

@@ -19,7 +19,7 @@
 #define VERSION_MAJOR		1
 #define VERSION_MINOR		3
 #define VERSION_REVISION	3
-#define VERSION_PATCH_LEVEL	7
+#define VERSION_PATCH_LEVEL	20
 
 #define MODE_SERIAL 0
 
@@ -86,7 +86,7 @@ enum PROTOCOLS
 	PROTO_FRSKY_RX	= 55,	// =>CC2500
 	PROTO_AFHDS2A_RX= 56,	// =>A7105
 	PROTO_HOTT		= 57,	// =>CC2500
-	PROTO_FX816		= 58,	// =>NRF24L01
+	PROTO_FX		= 58,	// =>NRF24L01
 	PROTO_BAYANG_RX	= 59,	// =>NRF24L01
 	PROTO_PELIKAN	= 60,	// =>A7105
 	PROTO_TIGER		= 61,	// =>NRF24L01
@@ -119,6 +119,8 @@ enum PROTOCOLS
 	PROTO_LOSI		= 89,	// =>CYRF6936
 	PROTO_MOULDKG	= 90,	// =>NRF24L01
 	PROTO_XERALL	= 91,	// =>NRF24L01
+	PROTO_MT99XX2	= 92,	// =>NRF24L01, extension of MT99XX protocol
+	PROTO_KYOSHO2	= 93,	// =>NRF24L01
 
 	PROTO_NANORF	= 126,	// =>NRF24L01
 	PROTO_TEST		= 127,	// =>CC2500
@@ -236,6 +238,10 @@ enum MT99XX
 	DRAGON	= 6,
 	F949G	= 7,
 };
+enum MT99XX2
+{
+	PA18	= 0,
+};
 enum MJXQ
 {
 	WLH08	= 0,
@@ -385,7 +391,6 @@ enum ESKY
 	ESKY_STD	= 0,
 	ESKY_ET4	= 1,
 };
-
 enum FRSKY_RX
 {
 	FRSKY_RX	= 0,
@@ -393,68 +398,69 @@ enum FRSKY_RX
 	FRSKY_ERASE	= 2,
 	FRSKY_CPPM  = 3,
 };
-
 enum FRSKYL
 {
 	LR12		= 0,
 	LR12_6CH	= 1,
 };
-
 enum HOTT
 {
 	HOTT_SYNC	= 0,
 	HOTT_NO_SYNC= 1,
 };
-
 enum PELIKAN
 {
 	PELIKAN_PRO	= 0,
 	PELIKAN_LITE= 1,
 	PELIKAN_SCX24=2,
 };
-
 enum V761
 {
 	V761_3CH	= 0,
 	V761_4CH	= 1,
+	V761_TOPRC	= 2,
 };
-
 enum HEIGHT
 {
 	HEIGHT_5CH	= 0,
 	HEIGHT_8CH	= 1,
 };
-
 enum KYOSHO
 {
 	KYOSHO_FHSS	= 0,
 	KYOSHO_HYPE	= 1,
 };
-
 enum JJRC345
 {
 	JJRC345		= 0,
 	SKYTMBLR	= 1,
 };
-
 enum RLINK
 {
 	RLINK_SURFACE	= 0,
 	RLINK_AIR		= 1,
 	RLINK_DUMBORC	= 2,
 };
-
 enum MOULDKG
 {
 	MOULDKG_ANALOG	= 0,
 	MOULDKG_DIGIT	= 1,
 };
-
 enum KF606
 {
 	KF606_KF606		= 0,
 	KF606_MIG320	= 1,
 };
+enum E129
+{
+	E129_E129		= 0,
+	E129_C186		= 1,
+};
+enum FX
+{
+	FX816			= 0,
+	FX620			= 1,
+};
 
 #define NONE 		0
 #define P_HIGH		1
@@ -900,7 +906,7 @@ Serial: 100000 Baud 8e2      _ xxxx xxxx p --
 				FRSKY_RX	55
 				AFHDS2A_RX	56
 				HOTT		57
-				FX816		58
+				FX		58
 				BAYANG_RX	59
 				PELIKAN		60
 				TIGER		61
@@ -1276,12 +1282,12 @@ Serial: 100000 Baud 8e2      _ xxxx xxxx p --
    data[4-]= packed channels data, 11 bit per channel
 
   Type 0x0E HoTT telemetry
-   length: 14
+   length: 15
    data[0] = TX_RSSI
    data[1] = TX_LQI
    data[2] = type
    data[3] = page
-   data[4-13] = data
+   data[4-14] = data
 
   Type 0x0F M-Link telemetry
    length: 10

Multiprotocol/Multiprotocol.ino

@@ -179,7 +179,7 @@ uint8_t option;
 uint8_t cur_protocol[3];
 uint8_t prev_option;
 uint8_t prev_power=0xFD; // unused power value
-uint8_t  RX_num;
+uint8_t RX_num;
 
 //Serial RX variables
 #define BAUD 100000

Multiprotocol/RF2500_EMU.ino

@@ -17,7 +17,7 @@
 
 #define RF2500_ADDR_LENGTH 4
 
-uint8_t RF2500_payload_length, RF2500_tx_addr[RF2500_ADDR_LENGTH], RF2500_buf[80];
+uint8_t RF2500_payload_length, RF2500_tx_addr[RF2500_ADDR_LENGTH], RF2500_buf[100];
 bool RF2500_scramble_enabled;
 
 static void __attribute__((unused)) RF2500_Init(uint8_t payload_length, bool scramble)
@@ -35,9 +35,17 @@ static void __attribute__((unused)) RF2500_SetTXAddr(const uint8_t* addr)
 
 static void __attribute__((unused)) RF2500_BuildPayload(uint8_t* buffer)
 {
-	const uint8_t RF2500_scramble[] = { 0xD0, 0x9E, 0x53, 0x33, 0xD8, 0xBA, 0x98, 0x08, 0x24, 0xCB, 0x3B, 0xFC, 0x71, 0xA3, 0xF4, 0x55 };
-	const uint16_t RF2500_crc_xorout_scramble = 0xAEE4;
+	const uint8_t RF2500_scramble[] = { 0xD0, 0x9E, 0x53, 0x33, 0xD8, 0xBA, 0x98, 0x08, 0x24, 0xCB, 0x3B, 0xFC, 0x71, 0xA3, 0xF4, 0x55, 0x68, 0x4F, 0xA9 }; //0x4F: unsure
+	uint16_t RF2500_crc_xorout_scramble;
+	if(RF2500_payload_length == 16)
+		RF2500_crc_xorout_scramble = 0xAEE4;
+	else //19
+		RF2500_crc_xorout_scramble = 0xE7C5;
 
+	#if 0
+		for(uint8_t i=0; i<RF2500_payload_length; i++)
+			debug("%02X ", buffer[i]);
+	#endif
 	//Scramble the incoming buffer
 	if(RF2500_scramble_enabled)
 		for(uint8_t i=0; i<RF2500_payload_length; i++)
@@ -50,6 +58,10 @@ static void __attribute__((unused)) RF2500_BuildPayload(uint8_t* buffer)
 	buffer[RF2500_payload_length  ] = bit_reverse(crc>>8);
 	buffer[RF2500_payload_length+1] = bit_reverse(crc);
 
+	#if 0
+		debugln("C:%02X %02X",buffer[RF2500_payload_length  ], buffer[RF2500_payload_length+1]);
+	#endif
+
 	if(RF2500_scramble_enabled)
 	{
 		buffer[RF2500_payload_length  ] ^= RF2500_crc_xorout_scramble>>8;

Multiprotocol/V761_nrf24l01.ino

@@ -25,13 +25,15 @@ Multiprotocol is distributed in the hope that it will be useful,
 #define V761_BIND_COUNT			200
 #define V761_BIND_FREQ			0x28
 #define V761_RF_NUM_CHANNELS	3
+#define TOPRC_BIND_FREQ			0x2A
+#define TOPRC_PACKET_PERIOD		14120 // Timeout for callback in uSec
 
 enum 
-   {
+{
     V761_BIND1 = 0,
     V761_BIND2,
     V761_DATA
-   };
+};
 
 static void __attribute__((unused)) V761_set_checksum()
 {
@@ -56,14 +58,11 @@ static void __attribute__((unused)) V761_send_packet()
 
 	if(phase != V761_DATA)
 	{
-		packet[0] = rx_tx_addr[0];
-		packet[1] = rx_tx_addr[1];
-		packet[2] = rx_tx_addr[2];
-		packet[3] = rx_tx_addr[3];
+		memcpy(packet, rx_tx_addr, 4);
 		packet[4] = hopping_frequency[1];
 		packet[5] = hopping_frequency[2];
 		if(phase == V761_BIND2)
-			packet[6] = 0xf0; // ?
+			packet[6] = 0xF0;							// ?
 	}
 	else
 	{ 
@@ -72,23 +71,22 @@ static void __attribute__((unused)) V761_send_packet()
 		{
 			hopping_frequency_no = 0;
 			packet_count++;
-			if(packet_count >= 4)
-				packet_count = 0;
+			packet_count &= 0x03;
 		}
 
 		packet[0] = convert_channel_8b(THROTTLE);		// Throttle
 		packet[2] = convert_channel_8b(ELEVATOR)>>1;	// Elevator
 
-		if(sub_protocol==V761_3CH)
-		{
-			packet[1] = convert_channel_8b(RUDDER)>>1;	// Rudder
-			packet[3] = convert_channel_8b(AILERON)>>1;	// Aileron
-		}
-		else
+		if(sub_protocol == V761_4CH || sub_protocol == V761_TOPRC)
 		{
 			packet[1] = convert_channel_8b(AILERON)>>1;	// Aileron
 			packet[3] = convert_channel_8b(RUDDER)>>1;	// Rudder
 		}
+		else
+		{
+			packet[1] = convert_channel_8b(RUDDER)>>1;	// Rudder
+			packet[3] = convert_channel_8b(AILERON)>>1;	// Aileron
+		}
 
 		packet[5] = packet_count<<6;					// 0X, 4X, 8X, CX
 		packet[4] = 0x20;								// Trims 00..20..40, 0X->20 4X->TrAil 8X->TrEle CX->TrRud
@@ -112,7 +110,7 @@ static void __attribute__((unused)) V761_send_packet()
 		packet[6] =  GET_FLAG(CH7_SW, 0x20) 			// Flip
 					|GET_FLAG(CH8_SW, 0x08)				// RTH activation
 					|GET_FLAG(CH9_SW, 0x10);			// RTH on/off
-		if(sub_protocol==V761_3CH)
+		if(sub_protocol == V761_3CH)
 			packet[6] |= 0x80;							// Unknown, set on original V761-1 dump but not on eachine dumps, keeping for compatibility
 	}
 	V761_set_checksum();
@@ -137,28 +135,36 @@ static void __attribute__((unused)) V761_RF_init()
 static void __attribute__((unused)) V761_initialize_txid()
 {
 	#ifdef V761_FORCE_ID
-		switch(RX_num%5)
+		if(sub_protocol == V761_TOPRC)
+		{ //Dump from air on TopRCHobby TX
+			memcpy(rx_tx_addr,(uint8_t *)"\xD5\x01\x00\x00",4);
+			memcpy(hopping_frequency,(uint8_t *)"\x2E\x41",2);
+		}
+		else
 		{
-			case 1:	//Dump from air on Protonus TX
-				memcpy(rx_tx_addr,(uint8_t *)"\xE8\xE4\x45\x09",4);
-				memcpy(hopping_frequency,(uint8_t *)"\x0D\x21",2);
-				break;
-			case 2:	//Dump from air on mshagg2 TX
-				memcpy(rx_tx_addr,(uint8_t *)"\xAE\xD1\x45\x09",4);
-				memcpy(hopping_frequency,(uint8_t *)"\x13\x1D",2);
-				break;
-			case 3:	//Dump from air on MikeHRC Eachine TX
-				memcpy(rx_tx_addr,(uint8_t *)"\x08\x03\x00\xA0",4);
-				memcpy(hopping_frequency,(uint8_t *)"\x0D\x21",2);
-				break;
-			case 4:	//Dump from air on Crashanium Eachine TX
-				memcpy(rx_tx_addr,(uint8_t *)"\x58\x08\x00\xA0",4);
-				memcpy(hopping_frequency,(uint8_t *)"\x0D\x31",2);
-				break;
-			default: //Dump from SPI
-				memcpy(rx_tx_addr,(uint8_t *)"\x6f\x2c\xb1\x93",4);
-				memcpy(hopping_frequency,(uint8_t *)"\x14\x1e",2);
-				break;
+			switch(RX_num%5)
+			{
+				case 1:	//Dump from air on Protonus TX
+					memcpy(rx_tx_addr,(uint8_t *)"\xE8\xE4\x45\x09",4);
+					memcpy(hopping_frequency,(uint8_t *)"\x0D\x21",2);
+					break;
+				case 2:	//Dump from air on mshagg2 TX
+					memcpy(rx_tx_addr,(uint8_t *)"\xAE\xD1\x45\x09",4);
+					memcpy(hopping_frequency,(uint8_t *)"\x13\x1D",2);
+					break;
+				case 3:	//Dump from air on MikeHRC Eachine TX
+					memcpy(rx_tx_addr,(uint8_t *)"\x08\x03\x00\xA0",4);
+					memcpy(hopping_frequency,(uint8_t *)"\x0D\x21",2);
+					break;
+				case 4:	//Dump from air on Crashanium Eachine TX
+					memcpy(rx_tx_addr,(uint8_t *)"\x58\x08\x00\xA0",4);
+					memcpy(hopping_frequency,(uint8_t *)"\x0D\x31",2);
+					break;
+				default: //Dump from SPI
+					memcpy(rx_tx_addr,(uint8_t *)"\x6f\x2c\xb1\x93",4);
+					memcpy(hopping_frequency,(uint8_t *)"\x14\x1e",2);
+					break;
+			}
 		}
 	#else
 		//Tested with Eachine RX
@@ -180,8 +186,8 @@ uint16_t V761_callback()
 			if(bind_counter) 
 				bind_counter--;
 			packet_count ++;
-			XN297_RFChannel(V761_BIND_FREQ);
-			XN297_SetTXAddr((uint8_t*)"\x34\x43\x10\x10", 4);
+			XN297_RFChannel(sub_protocol == V761_TOPRC ? TOPRC_BIND_FREQ : V761_BIND_FREQ);
+			XN297_SetTXAddr(rx_id, 4);
 			V761_send_packet();
 			if(packet_count >= 20) 
 			{
@@ -210,17 +216,28 @@ uint16_t V761_callback()
 			return 15730;
 		case V761_DATA:
 			#ifdef MULTI_SYNC
-				telemetry_set_input_sync(V761_PACKET_PERIOD);
+				telemetry_set_input_sync(packet_period);
 			#endif
 			V761_send_packet();
 			break;
 	}
-	return V761_PACKET_PERIOD;
+	return packet_period;
 }
 
 void V761_init(void)
 {
 	V761_initialize_txid();
+	if(sub_protocol == V761_TOPRC)
+	{
+		memcpy(rx_id,(uint8_t*)"\x20\x21\x05\x0A",4);
+		packet_period = TOPRC_PACKET_PERIOD;
+	}
+	else
+	{
+		memcpy(rx_id,(uint8_t*)"\x34\x43\x10\x10",4);
+		packet_period = V761_PACKET_PERIOD;
+	}
+
 	if(IS_BIND_IN_PROGRESS)
 	{
 		bind_counter = V761_BIND_COUNT;
@@ -231,7 +248,7 @@ void V761_init(void)
 		XN297_SetTXAddr(rx_tx_addr, 4);
 		phase = V761_DATA;
 	}
-		
+
 	V761_RF_init();
 	hopping_frequency_no = 0;
 	packet_count = 0;

Multiprotocol/Validate.h

@@ -242,16 +242,16 @@
 
 //Make sure protocols are selected correctly
 #ifndef A7105_INSTALLED
-	#undef AFHDS2A_A7105_INO
-	#undef AFHDS2A_RX_A7105_INO
-	#undef BUGS_A7105_INO
-	#undef FLYSKY_A7105_INO
-	#undef HEIGHT_A7105_INO
-	#undef HUBSAN_A7105_INO
-	#undef JOYSWAY_A7105_INO
-	#undef KYOSHO_A7105_INO
-	#undef PELIKAN_A7105_INO
-	#undef WFLY2_A7105_INO
+	#undef	AFHDS2A_A7105_INO
+	#undef	AFHDS2A_RX_A7105_INO
+	#undef	BUGS_A7105_INO
+	#undef	FLYSKY_A7105_INO
+	#undef	HEIGHT_A7105_INO
+	#undef	HUBSAN_A7105_INO
+	#undef	JOYSWAY_A7105_INO
+	#undef	KYOSHO_A7105_INO
+	#undef	PELIKAN_A7105_INO
+	#undef	WFLY2_A7105_INO
 #endif
 #ifndef CYRF6936_INSTALLED
 	#undef	DEVO_CYRF6936_INO
@@ -299,7 +299,7 @@
 	#undef	ESKY_NRF24L01_INO
 	#undef	ESKY150_NRF24L01_INO
 	#undef	FQ777_NRF24L01_INO
-	#undef	FX816_NRF24L01_INO
+	#undef	FX_NRF24L01_INO
 	#undef	FY326_NRF24L01_INO
 	#undef	GW008_NRF24L01_INO
 	#undef	H8_3D_NRF24L01_INO
@@ -307,6 +307,7 @@
 	#undef	HONTAI_NRF24L01_INO
 	#undef	JJRC345_NRF24L01_INO
 	#undef	KN_NRF24L01_INO
+	#undef	KYOSHO2_NRF24L01_INO
 	#undef	LOLI_NRF24L01_INO
 	#undef	MOULDKG_NRF24L01_INO
 	#undef	NCC1701_NRF24L01_INO

Multiprotocol/XN297Dump_nrf24l01.ino

@@ -609,12 +609,12 @@ static uint16_t XN297Dump_callback()
 		{
 			if(phase==0)
 			{
-				address_length=5;
-				memcpy(rx_tx_addr, (uint8_t *)"\x61\x94\x17\x27\xED", address_length); //"\xA3\x05\x22\xC1""\x5A\x20\x12\xAC"
+				address_length=3;
+				memcpy(rx_tx_addr, (uint8_t *)"\xBD\x54\x78", address_length); //"\x62\xE6\xBD\x54\x78"
 
-				bitrate=XN297DUMP_250K;
-				packet_length=32;
-				hopping_frequency_no=54; //bind ?, normal 60
+				bitrate=XN297DUMP_1M;
+				packet_length=7;
+				hopping_frequency_no=40; //bind ?, normal 40
 				
 				NRF24L01_Initialize();
 				NRF24L01_SetTxRxMode(TXRX_OFF);
@@ -622,7 +622,7 @@ static uint16_t XN297Dump_callback()
 				NRF24L01_WriteReg(NRF24L01_03_SETUP_AW, address_length-2);			// RX/TX address length
 				NRF24L01_WriteRegisterMulti(NRF24L01_0A_RX_ADDR_P0, rx_tx_addr, address_length);	// set up RX address
 				NRF24L01_WriteReg(NRF24L01_11_RX_PW_P0, packet_length);				// Enable rx pipe 0
-				NRF24L01_WriteReg(NRF24L01_05_RF_CH, hopping_frequency_no);
+				NRF24L01_WriteReg(NRF24L01_05_RF_CH, option);	//hopping_frequency_no);
 
 				debug("NRF dump, len=%d, rf=%d, address length=%d, bitrate=",packet_length,hopping_frequency_no,address_length);
 				switch(bitrate)
@@ -718,6 +718,7 @@ static uint16_t XN297Dump_callback()
 					NRF24L01_FlushRx();
 					NRF24L01_WriteReg(NRF24L01_00_CONFIG, _BV(NRF24L01_00_PWR_UP) | _BV(NRF24L01_00_PRIM_RX)); //  _BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO) |
 				}
+				NRF24L01_WriteReg(NRF24L01_05_RF_CH, option);	//hopping_frequency_no);
 			}
 		}
 		else if(sub_protocol == XN297DUMP_CC2500)

Multiprotocol/_Config.h

@@ -229,7 +229,7 @@
 #define	ESKY_NRF24L01_INO
 #define	ESKY150_NRF24L01_INO
 #define	FQ777_NRF24L01_INO
-#define	FX816_NRF24L01_INO
+#define	FX_NRF24L01_INO
 #define	FY326_NRF24L01_INO
 #define	GW008_NRF24L01_INO
 #define	HISKY_NRF24L01_INO
@@ -237,6 +237,7 @@
 #define	H8_3D_NRF24L01_INO
 #define	JJRC345_NRF24L01_INO
 #define	KN_NRF24L01_INO
+#define	KYOSHO2_NRF24L01_INO
 #define	LOLI_NRF24L01_INO
 //#define	MOULDKG_NRF24L01_INO
 #define	NCC1701_NRF24L01_INO
@@ -256,7 +257,7 @@
 #define	GD00X_CCNRF_INO
 #define	KF606_CCNRF_INO
 #define	MJXQ_CCNRF_INO
-#define	MT99XX_CCNRF_INO
+#define	MT99XX_CCNRF_INO		//Include MT99XX2 protocol
 #define	OMP_CCNRF_INO
 #define	Q303_CCNRF_INO
 #define	Q90C_CCNRF_INO
@@ -612,7 +613,8 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		E012
 		E015
 	PROTO_E129
-		NONE
+		E129_E129
+		E129_C186
 	PROTO_ESKY
 		ESKY_STD
 		ESKY_ET4
@@ -665,8 +667,9 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 	PROTO_FRSKY_RX
 		FRSKY_RX
 		FRSKY_CLONE
-	PROTO_FX816
-		NONE
+	PROTO_FX
+		FX816
+		FX620
 	PROTO_FY326
 		FY326
 		FY319
@@ -720,6 +723,8 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 	PROTO_KYOSHO
 		KYOSHO_FHSS
 		KYOSHO_HYPE
+	PROTO_KYOSHO2
+		NONE
 	PROTO_LOLI
 		NONE
 	PROTO_LOSI
@@ -746,6 +751,8 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		A180
 		DRAGON
 		F949G
+	PROTO_MT99XX2
+		PA18
 	PROTO_NCC1701
 		NONE
 	PROTO_OMP

Protocols_Details.md

@@ -76,11 +76,11 @@ CFlie|38|CFlie||||||||NRF24L01|
 [DM002](Protocols_Details.md#DM002---33)|33|||||||||NRF24L01|XN297
 [DSM](Protocols_Details.md#DSM---6)|6|DSM2_1F|DSM2_2F|DSMX_1F|DSMX_2F|AUTO|DSMR_1F|||CYRF6936|
 [DSM_RX](Protocols_Details.md#DSM_RX---70)|70|Multi|CPPM|||||||CYRF6936|
-[E010R5](Protocols_Details.md#E010R5---81)|81|||||||||CYRF6936/NRF24L01|RF2500
+[E010R5](Protocols_Details.md#E010R5---81)|81|||||||||CYRF6936|RF2500
 [E016H](Protocols_Details.md#E016H---85)|85|||||||||NRF24L01|XN297
 [E016HV2](Protocols_Details.md#E016HV2---80)|80|||||||||CC2500/NRF24L01|unknown
 [E01X](Protocols_Details.md#E01X---45)|45|E012|E015|||||||CYRF6936|HS6200
-[E129](Protocols_Details.md#E129---83)|83|||||||||CYRF6936/NRF24L01|RF2500
+[E129](Protocols_Details.md#E129---83)|83|E129|C186|||||||CYRF6936|RF2500
 [ESky](Protocols_Details.md#ESKY---16)|16|ESky|ET4|||||||NRF24L01|
 [ESky150](Protocols_Details.md#ESKY150---35)|35|||||||||NRF24L01|
 [ESky150V2](Protocols_Details.md#ESKY150V2---69)|69|||||||||CC2500|NRF51822
@@ -96,7 +96,7 @@ CFlie|38|CFlie||||||||NRF24L01|
 [FrskyX2](Protocols_Details.md#FRSKYX2---64)|64|CH_16|CH_8|EU_16|EU_8|Cloned|Cloned_8|||CC2500|
 [Frsky_RX](Protocols_Details.md#FRSKY_RX---55)|55|Multi|CloneTX|EraseTX|CPPM|||||CC2500|
 [Futaba/SFHSS](Protocols_Details.md#Futaba---21)|21|SFHSS||||||||CC2500|
-[FX816](Protocols_Details.md#FX816---58)|28|FX816|P38|||||||NRF24L01|
+[FX](Protocols_Details.md#FX---58)|28|816|620|||||||NRF24L01|
 [FY326](Protocols_Details.md#FY326---20)|20|FY326|FY319|||||||NRF24L01|
 [GD00X](Protocols_Details.md#GD00X---47)|47|GD_V1*|GD_V2*|||||||NRF24L01|XN297L
 [GW008](Protocols_Details.md#GW008---32)|32|||||||||NRF24L01|XN297
@@ -113,12 +113,14 @@ CFlie|38|CFlie||||||||NRF24L01|
 [KF606](Protocols_Details.md#KF606---49)|49|KF606|MIG320|||||||NRF24L01|XN297
 [KN](Protocols_Details.md#KN---9)|9|WLTOYS|FEILUN|||||||NRF24L01|
 [Kyosho](Protocols_Details.md#Kyosho---73)|73|FHSS|Hype|||||||A7105|
+[Kyosho2](Protocols_Details.md#Kyosho2---93)|93|KT-17||||||||NRF24L01|
 [LOLI](Protocols_Details.md#LOLI---82)|82|||||||||NRF24L01|
 [Losi](Protocols_Details.md#Losi---89)|89|||||||||CYRF6936|
 [MJXq](Protocols_Details.md#MJXQ---18)|18|WLH08|X600|X800|H26D|E010*|H26WH|PHOENIX*||NRF24L01|XN297
 [MLINK](Protocols_Details.md#MLINK---78)|78|||||||||CYRF6936|
 [MouldKg](Protocols_Details.md#mouldkg---90)|90|Analog|Digit|||||||NRF24L01|XN297
 [MT99xx](Protocols_Details.md#MT99XX---17)|17|MT|H7|YZ|LS|FY805|A180|DRAGON|F949G|NRF24L01|XN297
+[MT99xx2](Protocols_Details.md#MT99XX2---92)|92|PA18||||||||NRF24L01|XN297
 [NCC1701](Protocols_Details.md#NCC1701---44)|44|||||||||NRF24L01|
 [OMP](Protocols_Details.md#OMP---77)|77|||||||||CC2500&NRF24L01|XN297L
 [OpenLRS](Protocols_Details.md#OpenLRS---27)|27|||||||||None|
@@ -139,7 +141,7 @@ CFlie|38|CFlie||||||||NRF24L01|
 [Tiger](Protocols_Details.md#Tiger---61)|61|||||||||NRF24L01|XN297
 [Traxxas](Protocols_Details.md#Traxxas---43)|43|6519 RX||||||||CYRF6936|
 [V2x2](Protocols_Details.md#V2X2---5)|5|V2x2|JXD506|MR101||||||NRF24L01|
-[V761](Protocols_Details.md#V761---48)|48|3CH|4CH|||||||NRF24L01|XN297
+[V761](Protocols_Details.md#V761---48)|48|3CH|4CH|TOPRC||||||NRF24L01|XN297
 [V911S](Protocols_Details.md#V911S---46)|46|V911S*|E119*|||||||NRF24L01|XN297
 [WFLY](Protocols_Details.md#WFLY---40)|40|WFR0x||||||||CYRF6936|
 [WFLY2](Protocols_Details.md#WFLY2---79)|79|RF20x||||||||A7105|
@@ -596,9 +598,8 @@ CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9
 A|E|T|R|ARM|FLIP|LED|HEADLESS|RTH
 
 ## E129 - *83*
-Models: Eachine E129/E130 and Twister Ninja 250
 
-Not supported by Atmega328p modules.
+**Not supported by Atmega328p modules.**
 
 CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9
 ---|---|---|---|---|---|---|---|---
@@ -610,6 +611,14 @@ Take off with a none spring throttle is easier by putting both sticks down outwa
 
 Calib is the same as the original radio with both sticks down and to the left in Mode 1/2, not sure about other modes.
 
+### Sub_protocol E129 - *0*
+Models: Eachine E129/E130 and Twister Ninja 250
+
+### Sub_protocol C186 - *1*
+Models: C186/E120, C127/E110, K127
+
+The FC of the heli seems to store the trims Trim A/E/R=CH7..9. If you use these trims, make sure to center them after powering off the heli or they will be added to the previous trims and over correct.
+
 ## J6Pro - *22*
 
 CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9|CH10|CH11|CH12
@@ -976,15 +985,17 @@ Compatible RXs: X6/X6F/X6FG
 Also called SFHSS depending on radio version.
 
 ### Sub_protocol SFHSS - *0*
-Models: Futaba SFHSS RXs and XK models.
+Models: Futaba SFHSS RXs and some XK models.
 
-Extended limits and failsafe supported
+Extended limits and failsafe supported.
 
 RX output will match the Futaba standard servo throw, mid point and the channel order AETR independently of the input configuration AETR, RETA... unless if on OpenTX 2.3.3+ you use the "Disable channel mapping" feature on the GUI.
 
 Option for this protocol corresponds to fine frequency tuning. This value is different for each Module and **must** be accurate otherwise the link will not be stable.
 Check the [Frequency Tuning page](/docs/Frequency_Tuning.md) to determine it.
 
+This protocol does not use bind on the TX side. The RX attaches to the first S-FHHSS TX around it when the bind button is pressed.
+
 CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8
 ---|---|---|---|---|---|---|---
 A|E|T|R|CH5|CH6|CH7|CH8
@@ -1024,16 +1035,20 @@ New generation of GD models
 
 ## KF606 - *49*
 
+### Sub_protocol KF606 - *0*
+Model: KF606
+
 CH1|CH2|CH3|CH4|CH5
 ---|---|---|---|---
 A||T||TRIM
 
-### Sub_protocol KF606 - *0*
-Model: KF606
-
 ### Sub_protocol MIG320 - *1*
 Model: Zhiyang MIG-320
 
+CH1|CH2|CH3|CH4|CH5|CH6
+---|---|---|---|---|---
+A||T||TRIM|LED
+
 ## MJXQ - *18*
 Autobind protocol
 
@@ -1115,7 +1130,7 @@ CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9
 A|E|T|R|FLIP||||HEADLESS
 
 ### Sub_protocol A180 - *5*
-Model: XK A180, F949S
+Model: XK A180, F949S, F959
 
 A180:
 CH1|CH2|CH3|CH4|CH5|CH6
@@ -1145,6 +1160,17 @@ CH1|CH2|CH3|CH4|CH5|CH6
 ---|---|---|---|---|---
 A|E|T|R|6G3D|Light
 
+## MT99XX2 - *92*
+
+### Sub_protocol PA18 - *92*
+Model: PA18 mini
+
+CH1|CH2|CH3|CH4|CH5|CH6|CH7
+---|---|---|---|---|---|---
+A|E|T|R|MODE|FLIP|RTH
+
+MODE: -100% beginner, 0% intermediate, +100% Expert
+
 ## OMP - *77*
 Model: OMPHOBBY M1 & M2 Helis, T720 RC Glider
 
@@ -1312,7 +1338,7 @@ Rate: -100% High, +100% Low
 Models: WLtoys V911S, XK A110
 
 ### Sub_protocol E119 - *1*
-Models: Eachine E119, JJRC W01-J3, XK A220 P-40, newer XK A800
+Models: Eachine E119, JJRC W01-J3, XK A220 P-40, XK A800 R2, F959S R2, A160 R2, A280
 
 CH1|CH2|CH3|CH4|CH5|CH6|CH7
 ---|---|---|---|---|---|---
@@ -1575,15 +1601,21 @@ A|E|T|R|FMODE|AUX6|AUX7
 
 FMODE and AUX7 have 4 positions: -100%..-50%=>0, -50%..5%=>1, 5%..50%=>2, 50%..100%=>3
 
-## FX816 - *58*
-Model: FEI XIONG FX816 P38
-
-Only 8 TX IDs available
+## FX - *58*
+FEI XIONG
 
 CH1|CH2|CH3|CH4
 ---|---|---|---
 A|-|T|-
 
+### Sub_protocol 816 - *0*
+Model: FX816 P38, B17
+
+Only 8 TX IDs available
+
+### Sub_protocol 620 - *1*
+Model: FX620 SU35
+
 ## FY326 - *20*
 
 ### Sub_protocol FY326 - *0*
@@ -1616,7 +1648,7 @@ A|E|T|R|FLIP
 Autobind protocol
 
 ### Sub_protocol H8_3D - *0*
-Models: EAchine H8 mini 3D, JJRC H20/H22/H11D
+Models: Eachine H8 mini 3D,Eachine E10, JJRC H20/H22/H11D
 
 CH5|CH6|CH7|CH8|CH9|CH10|CH11|CH12|CH13
 ---|---|---|---|---|---|---|---|---
@@ -1700,6 +1732,13 @@ Model: DF-Models SkyTumbler
 
 RTH not supported
 
+## KYOSHO2 - *93*
+Model: TX KT-17, Minium Edge 540, Minium Citabria
+
+CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9|CH10
+---|---|---|---|---|---|---|---|---|----
+CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9|CH10
+
 ## LOLI - *82*
 LOLI3 receivers: https://github.com/wooddoor/Loli3
 
@@ -1903,7 +1942,7 @@ A|E|T|R|FLIP|LIGHT
 
 ## V761 - *48*
 
-Gyro: -100%=Beginer mode (Gyro on, yaw and pitch rate limited), 0%=Mid Mode ( Gyro on no rate limits), +100%=Mode Expert Gyro off
+Gyro: -100%=Beginner mode (Gyro on, yaw and pitch rate limited), 0%=Mid Mode ( Gyro on no rate limits), +100%=Mode Expert Gyro off
 
 Calib: momentary switch, calib will happen one the channel goes from -100% to +100%
 
@@ -1912,14 +1951,21 @@ Flip: momentary switch: hold flip(+100%), indicate flip direction with Ele or Ai
 RTN_ACT and RTN: -100% disable, +100% enable
 
 ### Sub_protocol 3CH - *0*
-Model: Volantex V761-1, V761-3 and may be others
+Models: Volantex V761-1, V761-3 and may be others
 
 CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9
 ---|---|---|---|---|---|---|---|---
 -|E|T|R|GYRO|CALIB|FLIP|RTN_ACT|RTN
 
 ### Sub_protocol 4CH - *1*
-Model: Volantex V761-4+ and Eachine P51-D, F4U, F22 and may be others
+Models: Volantex V761-4+ and Eachine P51-D, F4U, F22 and may be others
+
+CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9
+---|---|---|---|---|---|---|---|---
+A|E|T|R|GYRO|CALIB|FLIP|RTN_ACT|RTN
+
+### Sub_protocol TOPRC - *2*
+Models: Top RC Hobby Spitfire, P51D, BF-109
 
 CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9
 ---|---|---|---|---|---|---|---|---

README.md

@@ -115,14 +115,14 @@ Most of the older FM radios support the PPM interface.
 
 If you are the owner of a transmitter that supports the er9X/erSky9X or OpenTX firmwares (Frsky Taranis, Horus or the FlySky TH9X or the Turnigy 9X family) you have the additional option to use a serial protocol to communicate between your Tx and the MULTI-Module. (Owners of Walkera Devo transmitters should look at the [Deviation Tx](http://www.deviationtx.com) project for how to achieve the same end goal). This serial protocol does not require any hardware modifications, but will likely require updating the firmware on your radio. For those willing to do this, there are some nice advantages:
   - The model protocol selection, associated parameters, failsafe and binding is done from the Model Settings menu on the Tx
-  - For telemetry capable transmitters, the telemetry integration is done seamlessly with the Tx firmware. (Note that FrSky TH9X/Turnigy 9X/R transmitters require a telemetry mod to be done before telemetry can work).  Click on the link corressponding to your Tx on the [Transmitters](docs/Transmitters.md) page for more details.
+  - For telemetry capable transmitters, the telemetry integration is done seamlessly with the Tx firmware. (Note that FrSky TH9X/Turnigy 9X/R transmitters require a telemetry mod to be done before telemetry can work).  Click on the link corresponding to your Tx on the [Transmitters](docs/Transmitters.md) page for more details.
 
 # How to get started?
 1. Browse the [Protocols](Protocols_Details.md) page to see which protocols you would like on your module
 1. Go to the [Hardware Options](docs/Hardware.md) page to decide which of the MULTI-Module hardware options appeals to you and which RF modules you plan to integrate
 1. Once you have your module, you should review what jumper settings or modifications are required to the module to support serial communication and possibly telemetry
 1. Go to [Compiling and Programming](docs/Compiling.md) page to download, compile and program your MULTI-Module
-1. Finally, you should visit the setup page for your transmitter by clicking on the link corressponding to your Tx on the [Transmitters](docs/Transmitters.md) page to configure the last few settings before you can fly to your heart’s content!!!!!
+1. Finally, you should visit the setup page for your transmitter by clicking on the link corresponding to your Tx on the [Transmitters](docs/Transmitters.md) page to configure the last few settings before you can fly to your heart’s content!!!!!
 
 # Troubleshooting
 Visit the [Troubleshooting](docs/Troubleshooting.md) page.  Please bear in mind that the MULTI-Module is a complex system of hardware and software and it may take some patience to get it up and running.  Also remember that the developers of the system are actual users of the system.  This means that at any moment in time the system is working perfectly for them.  A corollary to this is that if you are struggling there are likely two scenarios.  First, that the problem is with your hardware or with your configuration, second, and much more unlikely but not impossible scenario, is that you are struggling with a new undiscovered bug.  (The author of this documentation speaks from experience ;-)   Please check the RC Groups forum and search for keywords relating to your problem before posting a reply.  When you do post a reply please so humbly and respectfully – you will find many helpful people there.  In your reply please include as much relevant information as possible and attach compilation output and ```_Config.h``` files as text attachments to keep the forum clean.

buildroot/bin/buildFunctions

@@ -9,11 +9,11 @@ getMultiVersion() {
 }
 
 getAllRFModules() {
-    if [[ "$BOARD" =~ "multi4in1:avr:multixmega32d4" ]]; then
+    if [[ "$BOARD" =~ ":avr:multixmega32d4" ]]; then
         ALL_RFMODULES=$(echo CYRF6936_INSTALLED);
-    elif [[ "$BOARD" =~ "multi4in1:avr:multiatmega328p:" ]]; then
+    elif [[ "$BOARD" =~ ":avr:multiatmega328p:" ]]; then
         ALL_RFMODULES=$(echo A7105_INSTALLED CYRF6936_INSTALLED CC2500_INSTALLED NRF24L01_INSTALLED);
-    elif [[ "$BOARD" =~ "multi4in1:STM32F1:" ]]; then
+    elif [[ "$BOARD" =~ ":STM32F1:" ]]; then
         ALL_RFMODULES=$(echo A7105_INSTALLED CYRF6936_INSTALLED CC2500_INSTALLED NRF24L01_INSTALLED SX1276_INSTALLED);
     fi
 }
@@ -26,11 +26,11 @@ getAllProtocols() {
     CCNRF_PROTOCOLS=$(sed -n 's/[\/\/]*[[:blank:]]*#define[[:blank:]]*\([[:alnum:]_]*_CCNRF_INO\)\(.*\)/\1/p' Multiprotocol/_Config.h)
     SX1276_PROTOCOLS=$(sed -n 's/[\/\/]*[[:blank:]]*#define[[:blank:]]*\([[:alnum:]_]*_SX1276_INO\)\(.*\)/\1/p' Multiprotocol/_Config.h)
 
-    if [[ "$BOARD" =~ "multi4in1:avr:multixmega32d4" ]]; then
+    if [[ "$BOARD" =~ ":avr:multixmega32d4" ]]; then
         ALL_PROTOCOLS=$(echo $CYRF6936_PROTOCOLS);
-    elif [[ "$BOARD" =~ "multi4in1:avr:multiatmega328p:" ]]; then
+    elif [[ "$BOARD" =~ ":avr:multiatmega328p:" ]]; then
         ALL_PROTOCOLS=$(echo $A7105_PROTOCOLS $CC2500_PROTOCOLS $CYRF6936_PROTOCOLS $NRF24L01_PROTOCOLS $CCNRF_PROTOCOLS);
-    elif [[ "$BOARD" =~ "multi4in1:STM32F1:" ]]; then
+    elif [[ "$BOARD" =~ ":STM32F1:" ]]; then
         ALL_PROTOCOLS=$(echo $A7105_PROTOCOLS $CC2500_PROTOCOLS $CYRF6936_PROTOCOLS $NRF24L01_PROTOCOLS $CCNRF_PROTOCOLS $SX1276_PROTOCOLS);
     fi
 }
@@ -84,21 +84,21 @@ buildEachRFModule() {
 }
 
 buildReleaseFiles(){
-    if [[ "$BOARD" == "multi4in1:avr:multixmega32d4" ]]; then
+    if [[ "$BOARD" =~ ":avr:multixmega32d4" ]]; then
         build_release_orx;
-    elif [[ "$BOARD" == "multi4in1:avr:multiatmega328p:bootloader=none" ]]; then
+    elif [[ "$BOARD" =~ ":avr:multiatmega328p:bootloader=none" ]]; then
         build_release_avr_noboot;
-    elif [[ "$BOARD" == "multi4in1:avr:multiatmega328p:bootloader=optiboot" ]]; then
+    elif [[ "$BOARD" =~ ":avr:multiatmega328p:bootloader=optiboot" ]]; then
         build_release_avr_optiboot;
-    elif [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103cb:debug_option=none" ]]; then
+    elif [[ "$BOARD" =~ ":STM32F1:multistm32f103cb:debug_option=none" ]]; then
         build_release_stm32f1_no_debug;
-    elif [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103cb:debug_option=native" ]]; then
+    elif [[ "$BOARD" =~ ":STM32F1:multistm32f103cb:debug_option=native" ]]; then
         build_release_stm32f1_native_debug;
-    elif [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103cb:debug_option=ftdi" ]]; then
+    elif [[ "$BOARD" =~ ":STM32F1:multistm32f103cb:debug_option=ftdi" ]]; then
         build_release_stm32f1_serial_debug;
-    elif [[ "$BOARD" == "multi4in1:STM32F1:multi5in1t18int" ]]; then
+    elif [[ "$BOARD" =~ ":STM32F1:multi5in1t18int" ]]; then
         build_release_stm32f1_t18int;
-    elif [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103c8:debug_option=none" ]]; then
+    elif [[ "$BOARD" =~ ":STM32F1:multistm32f103c8:debug_option=none" ]]; then
         build_release_stm32f1_64k;
     else
       printf "No release files for this board.";

docs/Hardware.md

@@ -30,7 +30,7 @@ These are examples of the well-known ready-made Multiprotocol modules.  Inclusio
 | **iRangeX IRX4 STM32** | <img src="images/irx4.jpg" width="200"/> | [STM32F103C](Compiling_STM32.md "Firmware compiling and uploading instructions for STM32") | US$39 | <ul><li>Includes case</li><li>Serial mode only</li></ul> | [Banggood](https://www.banggood.com/IRangeX-IRX4-2_4G-CC2500-NRF24L01-A7105-CTRF6936-4-IN-1-Multiprotocol-STM32-TX-Module-With-Case-p-1197130.html) |
 | **iRangeX IRX4 Plus STM32** | <img src="images/irx4-plus.jpg" width="200"/> | [STM32F103C](Compiling_STM32.md "Firmware compiling and uploading instructions for STM32") | US$37 | <ul><li>Includes case</li><li>Has USB port and LED</li><li>Serial and PPM</li></ul> | [Banggood](https://www.banggood.com/IRangeX-IRX4-Plus-2_4G-CC2500-NRF24L01-A7105-CYRF6936-4-IN-1-Multiprotocol-STM32-TX-Module-With-Case-p-1225080.html) |
 | **Jumper JP4IN1 Multi Protocol Transmitter Module** | <img src="images/jp4in1.jpg" width="200"/> | [STM32F103](Compiling_STM32.md "Firmware compiling and uploading instructions for STM32") | US$40 | <ul><li>Includes case</li><li>Has USB port and LED</li><li>Serial and PPM</li></ul> | [Hobbyking](https://hobbyking.com/en_us/jumper-jp4in1-multi-protocal-radio-transmitter-module.html) |
-| **Vantac MPM Lite 2.4G Transmitter Module for X-Lite** | <img src="images/mpm1n.jpg" width="200" /> | [STM32F103C](Compiling_STM32.md "Firmware compiling and uploading instructions for STM32") | $49 | <ul><li>Specially for Frsky X-Lite (not JR bay compatible)</li><li>USB Bootloader preflashed</li><li>Has USB and LED</li></ul> | [Banggood](https://www.banggood.com/Vantac-MPM-Lite-2_4G-Multiple-Protocol-TX-Module-for-Taranis-X-Lite-Radio-Transmitter-p-1307645.html?p=RN27072889497201510A) [HorusRC](https://www.horusrc.com/en/vantac-mpm-lite-2-4g-transmitter-module-for-x-lite.html?acc=9860) |
+| **Vantac MPM Lite 2.4G Transmitter Module for X-Lite** | <img src="images/mpm1n.jpg" width="200" /> | [STM32F103C](Compiling_STM32.md "Firmware compiling and uploading instructions for STM32") | $49 | <ul><li>**64KB flash only, you need to compile the firmware on your own and select only the protocols you need to fit in the space.**</li><li>Specially for Frsky X-Lite (not JR bay compatible)</li><li>USB Bootloader preflashed</li><li>Has USB and LED</li></ul> | [Banggood](https://www.banggood.com/Vantac-MPM-Lite-2_4G-Multiple-Protocol-TX-Module-for-Taranis-X-Lite-Radio-Transmitter-p-1307645.html?p=RN27072889497201510A) [HorusRC](https://www.horusrc.com/en/vantac-mpm-lite-2-4g-transmitter-module-for-x-lite.html?acc=9860) |
 
 *Table last updated June 24th, 2018*