WLV8TX small changes and save few bytes

Update build_release_avr_noboot
Ares: new protocol
2026-08-12 18:43:15 +00:00 · 2026-08-05 00:48:46 +02:00 · 2026-08-04 00:32:59 +02:00 · 2026-08-04 00:28:44 +02:00 · 2026-08-03 23:51:35 +02:00 · 2026-08-03 15:41:23 +02:00
115 changed files with 112704 additions and 2672 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,6 +1,6 @@
 # Workflow for testing MULTI-Module firmware builds

-name: CI
+name: MULTI Test, Build, Deploy, Release

 on:
  # Trigger the workflow on pushes, except those that are tagged (avoids double-testing releases)
@@ -32,33 +32,45 @@ on:
  workflow_dispatch:

 jobs:
-  build:
+  test:
    runs-on: ubuntu-latest

    # Configure the board matrix
    strategy:
      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"
-        ]
+        include:
+          - board: "multi4in1:avr:multiatmega328p:bootloader=none"
+            name: "ATmega328p"
+          - board: "multi4in1:avr:multiatmega328p:bootloader=optiboot"
+            name: "ATmega328p (Optiboot)"
+          - board: "multi4in1:avr:multixmega32d4"
+            name: "OrangeRX"
+          - board: "multi4in1:STM32F1:multistm32f103c8:debug_option=none"
+            name: "STM32F103 (64KB)"
+          - board: "multi4in1:STM32F1:multistm32f103cb:debug_option=none"
+            name: "STM32F103 (128KB)"
+          - board: "multi4in1:STM32F1:multistm32f103cb:debug_option=native"
+            name: "STM32F103 (128KB, USB Debug)"
+          - board: "multi4in1:STM32F1:multistm32f103cb:debug_option=ftdi"
+            name: "STM32F103 (128KB, Serial Debug)"
+          - board: "multi4in1:STM32F1:multi5in1t18int"
+            name: "T18 5-in-1 (128KB)"
+
+    # Set the build name using the friendly board name
+    name: "[Test] ${{ matrix.name }}"

    # Set the environment variables
    env:
      BOARD: ${{ matrix.board }}

    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      
      - name: Install Arduino CLI
-        uses: arduino/setup-arduino-cli@v1.1.1
+        uses: arduino/setup-arduino-cli@v2
+        with:
+          version: "0.32.2"
      
      - name: Prepare build environment
        run: |
@@ -67,15 +79,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 +128,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 +152,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;
@@ -142,23 +161,38 @@ jobs:

      - name: Build serial only
        run: |
-          source ./buildroot/bin/buildFunctions;
-          cp ./_Config.h.bak Multiprotocol/_Config.h
-          opt_disable ENABLE_PPM;
-          buildMulti;
+          # Skip the serial-only build for boards where it's too large now
+          if [[ "$BOARD" =~ ":STM32F1:multistm32f103cb:debug_option=none" ]] || [[ "$BOARD" =~ ":STM32F1:multi5in1t18int" ]]; then
+            printf "Not testing serial-only build for $BOARD.";
+          else
+            source ./buildroot/bin/buildFunctions;
+            cp ./_Config.h.bak Multiprotocol/_Config.h
+            opt_disable ENABLE_PPM;
+            buildMulti;
+          fi
      
      - name: Build PPM only
        run: |
-          source ./buildroot/bin/buildFunctions;
-          cp ./_Config.h.bak Multiprotocol/_Config.h
-          opt_disable ENABLE_SERIAL;
-          buildMulti;
+          # Skip the PPM-only build for boards where it's too large now
+          if [[ "$BOARD" =~ ":STM32F1:multistm32f103cb:debug_option=none" ]] || [[ "$BOARD" =~ ":STM32F1:multi5in1t18int" ]]; then
+            printf "Not testing PPM-only build for $BOARD.";
+          else
+            source ./buildroot/bin/buildFunctions;
+            cp ./_Config.h.bak Multiprotocol/_Config.h
+            opt_disable ENABLE_SERIAL;
+            buildMulti;
+          fi

      - name: Build each RF module individually
        run: |
-          source ./buildroot/bin/buildFunctions;
-          cp ./_Config.h.bak Multiprotocol/_Config.h;
-          buildEachRFModule;
+          # Skip the per-RF module builds for boards which have fixed modules
+          if [[ "$BOARD" =~ ":STM32F1:multi5in1t18int" ]]; then
+            printf "Not testing individual RF module builds for $BOARD.";
+          else
+            source ./buildroot/bin/buildFunctions;
+            cp ./_Config.h.bak Multiprotocol/_Config.h;
+            buildEachRFModule;
+          fi

      - name: Build each protocol individually
        run: |
@@ -166,6 +200,128 @@ jobs:
          cp ./_Config.h.bak Multiprotocol/_Config.h;
          buildEachProtocol;

+  build:
+    runs-on: ubuntu-latest
+
+    # Configure the board matrix
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - board: "multi4in1:avr:multiatmega328p:bootloader=none"
+            name: "ATmega328p"
+            release: "atmega328p"
+          - board: "multi4in1:avr:multiatmega328p:bootloader=optiboot"
+            name: "ATmega328p (Optiboot)"
+            release: "atmega328p-optiboot"
+          - board: "multi4in1:avr:multixmega32d4"
+            name: "OrangeRX"
+            release: "orangerx"
+          - board: "multi4in1:STM32F1:multistm32f103c8:debug_option=none"
+            name: "STM32F103 CC2500 (64KB)"
+            release: "stm32f103-cc2500-64k"
+          - board: "multi4in1:STM32F1:multistm32f103cb:debug_option=none"
+            name: "STM32F103 CC2500 (128KB)"
+            release: "stm32f103-cc2500-128k"
+          - board: "multi4in1:STM32F1:multistm32f103cb:debug_option=none"
+            name: "STM32F103 (128KB)"
+            release: "stm32f103-128k-4in1"
+          - board: "multi4in1:STM32F1:multistm32f103cb:debug_option=native"
+            name: "STM32F103 (128KB, USB Debug)"
+            release: "stm32f103-128k-usb-debug"
+          - board: "multi4in1:STM32F1:multistm32f103cb:debug_option=ftdi"
+            name: "STM32F103 (128KB, Serial Debug)"
+            release: "stm32f103-128k-serial-debug"
+          - board: "multi4in1:STM32F1:multistm32f103cb:debug_option=none"
+            name: "STM32F103 5-in-1 (128KB)"
+            release: "stm32f103-128k-5in1"
+          - board: "multi4in1:STM32F1:multistm32f103cb:debug_option=none"
+            name: "T-Lite 5-in-1 (128KB)"
+            release: "tlite-5in1"
+          - board: "multi4in1:STM32F1:multi5in1t18int"
+            name: "T18 5-in-1 (128KB)"
+            release: "t18-5in1"
+          - board: "none"
+            name: "Scripts"
+            release: "scripts"
+
+    # Set the build name using the friendly board name
+    name: "[Build] ${{ matrix.name }}"
+
+    # Set the environment variables
+    env:
+      BOARD: ${{ matrix.board }}
+      RELEASE: ${{ matrix.release }}
+
+    steps:
+      - uses: actions/checkout@v4
+      
+      - name: Install Arduino CLI
+        uses: arduino/setup-arduino-cli@v2
+        with:
+          version: "0.32.2"
+      
+      - name: Prepare build environment
+        run: |
+          echo "Github Ref: $GITHUB_REF"
+          echo "Event name: ${{ github.event_name }}"
+          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,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" =~ ":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-devel:STM32F1:" ]]; then
+            arduino-cli core install multi4in1-devel:STM32F1
+          elif [[ "$BOARD" =~ "multi4in1:STM32F1:" ]]; then
+            arduino-cli core install multi4in1:STM32F1
+          fi
+
+          chmod +x ${GITHUB_WORKSPACE}/buildroot/bin/*
+          echo "${GITHUB_WORKSPACE}/buildroot/bin" >> $GITHUB_PATH
+
+          mkdir ./build
+          mkdir ./binaries
+
+      - name: Configure MULTI-Module firmware options
+        run: |
+          # Load the build functions
+          source ./buildroot/bin/buildFunctions;  
+          
+          # Get the version
+          getMultiVersion
+          echo "MULTI_VERSION=$(echo $MULTI_VERSION)" >> $GITHUB_ENV
+
+          # Get all the protocols for this board
+          getAllProtocols
+          echo "A7105_PROTOCOLS=$(echo $A7105_PROTOCOLS)" >> $GITHUB_ENV
+          echo "CC2500_PROTOCOLS=$(echo $CC2500_PROTOCOLS)" >> $GITHUB_ENV
+          echo "CYRF6936_PROTOCOLS=$(echo $CYRF6936_PROTOCOLS)" >> $GITHUB_ENV
+          echo "NRF24L01_PROTOCOLS=$(echo $NRF24L01_PROTOCOLS)" >> $GITHUB_ENV
+          echo "SX1276_PROTOCOLS=$(echo $SX1276_PROTOCOLS)" >> $GITHUB_ENV
+          echo "CCNRF_INO_PROTOCOLS=$(echo $CCNRF_INO_PROTOCOLS)" >> $GITHUB_ENV
+          echo "ALL_PROTOCOLS=$(echo $ALL_PROTOCOLS)" >> $GITHUB_ENV
+
+          # Disable CHECK_FOR_BOOTLOADER when not needed
+          if [[ "$BOARD" =~ ":avr:multiatmega328p:bootloader=none" ]]; then
+            opt_disable CHECK_FOR_BOOTLOADER;
+          fi
+
+      - name: Save default firmware configuration
+        run: |
+          cat Multiprotocol/_Config.h
+          cp Multiprotocol/_Config.h ./_Config.h.bak
+
      - name: Build release files
        run: |
          source ./buildroot/bin/buildFunctions;
@@ -180,16 +336,43 @@ jobs:
            echo "HAVE_FILES=false" >> $GITHUB_ENV
          fi

-      - name: Deploy files to release
-        if: github.event_name == 'release' && github.event.action == 'created' && env.HAVE_FILES == 'true'
-        uses: AButler/upload-release-assets@v2.0
-        with:
-          files: './binaries/*'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
      - name: 'Upload Artifacts'
        if: env.HAVE_FILES == 'true'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact/@v4
+        with:
+          name: multi-${{ matrix.release }}
+          path: ./binaries/
+
+  deploy:
+    name: "[Deploy] Attach Build Artifacts"
+    runs-on: ubuntu-latest
+    needs: [test, build]
+    steps:
+      - name: Combine and upload build artifacts
+        uses: actions/upload-artifact/merge@v4
        with:
          name: multi-test-build
-          path: ./binaries/
+          pattern: multi-*
+          delete-merged: true
+          retention-days: 90
+
+  release:
+    name: "[Release] Publish Files to Release"
+    if: github.event_name == 'release' && github.event.action == 'created'
+    runs-on: ubuntu-latest
+    needs: deploy
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: multi-test-build
+          path: ./artifacts/
+      
+      - name: Display downloaded artifacts
+        run: ls -R ./artifacts/
+      
+      - name: Deploy artifacts to release
+        uses: AButler/upload-release-assets@v3.0
+        with:
+          files: './artifacts/*'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
--- a/Lua_scripts/DSM
+++ b/Lua_scripts/DSM
@@ -1,601 +0,0 @@
-local toolName = "TNS|DSM Forward Programming|TNE"
-
---- #########################################################################
---- #                                                                       #
---- # Copyright (C) OpenTX                                                  #
-----#                                                                       #
---- # 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.                          #
---- #                                                                       #
---- #########################################################################
-
-
--###############################################################################
-- Multi buffer for DSM description
-- Multi_Buffer[0..2]=="DSM" -> Lua script is running
-- Multi_Buffer[3]==0x70+len -> TX to RX data ready to be sent
-- Multi_Buffer[4..9]=6 bytes of TX to RX data
-- Multi_Buffer[10..25]=16 bytes of RX to TX data
--
-- To start operation:
--   Write 0x00 at address 3
--   Write 0x00 at address 10
--   Write "DSM" at address 0..2
--###############################################################################
-
-local RX_VERSION, WAIT_CMD, MENU_TITLE, MENU_LINES, MENU_VALUES, VALUE_CHANGING, VALUE_CHANGING_WAIT, VALUE_CHANGED = 0, 1, 2, 3, 4, 5, 6, 7
-local MENU, LIST_MENU_NOCHANGING, LIST_MENU2, PERCENTAGE_VALUE = 0x1C, 0x6C, 0x4C, 0xC0
-local Phase = RX_VERSION
-local Waiting_RX = 0
-local Text = {}
-local Retry=100
-local Blink = 0
-local Value_Changed=0
-
-local Menu = { Cur=nil, Id=nil, Title="", Prev=nil, PrevId=nil, Next=nil, NextId=nil, Back=nil, BackId=nil, CurLine=nil, SelLine=nil, EditLine=nil }
-local Line = {}
-local RX = { Name="", Version="" }
-
-local function conv_int16(number)
-  if number >= 0x8000 then
-    return number - 0x10000
-  end
-  return number
-end
-
-local function Get_Text(index)
-  out = Text[index]
-  if out == nil then -- unknown...
-    out = "Unknown_"..string.format("%X",index)
-  end
-  return out
-end
-
-local function DSM_Release()
-  multiBuffer( 0, 0 )
-end
-
-local function DSM_Send(...)
-  local arg = {...}
-  for i = 1 , #arg do
-    multiBuffer( 3+i, arg[i])
-  end
-  multiBuffer( 3, 0x70+#arg)
-end
-
-local function Value_Add(dir)
-  local line=Line[Menu.SelLine]
-  Speed = getRotEncSpeed()
-  if Speed == ROTENC_MIDSPEED then
-    line.Val = line.Val + (5 * dir)
-  elseif Speed == ROTENC_HIGHSPEED then
-    line.Val = line.Val + (15 * dir)
-  else
-    line.Val = line.Val + dir
-  end
-  if line.Val > line.Max then
-    line.Val = line.Max
-  elseif line.Val < line.Min then
-    line.Val = line.Min
-  end
-  if Line[Menu.SelLine].Type ~= LIST_MENU_NOCHANGING then
-    Phase = VALUE_CHANGING
-    Waiting_RX = 0
-  end
-end
-
-local function DSM_Menu(event)
-  local Speed = 0
-  if event == EVT_VIRTUAL_NEXT then
-    if Menu.EditLine == nil then
-      -- not changing a value
-      if Menu.SelLine ~= nil then
-        if Menu.SelLine < 7 then
-          local num = Menu.SelLine
-          for i = Menu.SelLine + 1, 6, 1 do
-            if Line[i].Type ~= nil and Line[i].Next ~= nil then
-              Menu.SelLine=i
-              break
-            end
-          end
-          if num == Menu.SelLine then
-            if Menu.Next ~= 0 then -- Next
-              Menu.SelLine = 7
-            elseif Menu.Prev ~= 0 then -- Prev
-                Menu.SelLine = 8
-            end
-          end
-        elseif Menu.Prev ~= 0 then -- Prev
-            Menu.SelLine = 8
-        end
-      end
-    else -- need to inc the value
-      Value_Add(1)
-    end
-  elseif event == EVT_VIRTUAL_PREV then
-    if Menu.EditLine == nil then
-      if Menu.SelLine ~= nil then
-        if Menu.SelLine == 8 and Menu.Next ~= 0 then
-          Menu.SelLine = 7
-        elseif Menu.SelLine > 0 then
-          if Menu.SelLine > 6 then
-            Menu.SelLine = 7
-          end
-          local num = Menu.SelLine
-          for i = Menu.SelLine-1, 0, -1 do
-            if Line[i].Type ~= nil and Line[i].Next ~= nil then
-              Menu.SelLine=i
-              break
-            end
-          end
-          if num == Menu.SelLine then -- Back
-            Menu.SelLine = -1
-          end
-        else
-          Menu.SelLine = -1 -- Back
-        end
-      end
-    else -- need to dec the value
-      Value_Add(-1)
-    end
-  elseif event == EVT_VIRTUAL_ENTER then
-    if Menu.SelLine == -1 then -- Back
-        Menu.Cur = Menu.Back
-        Menu.Id = Menu.BackId
-        Menu.SelLine = 0
-        Phase = MENU_TITLE
-        Waiting_RX = 0
-    elseif Menu.SelLine == 7 then -- Next
-        Menu.Cur = Menu.Next
-        Menu.Id = Menu.NextId
-        Menu.SelLine = 0
-        Phase = MENU_TITLE
-        Waiting_RX = 0
-    elseif Menu.SelLine == 8 then -- Prev
-        Menu.Cur = Menu.Prev
-        Menu.Id = Menu.PrevId
-        Menu.SelLine = 0
-        Phase = MENU_TITLE
-        Waiting_RX = 0
-    elseif Menu.SelLine ~= nil and Line[Menu.SelLine].Next ~= nil then
-      if Line[Menu.SelLine].Type == MENU then -- Next menu exist
-        Menu.Cur = Line[Menu.SelLine].Next
-        Menu.Id = Line[Menu.SelLine].NextId
-        Phase = MENU_TITLE
-        Waiting_RX = 0
-      else
-        -- value entry
-        if Menu.EditLine == Menu.SelLine then
-          Menu.EditLine = nil
-          Value_Changed = 0
-          Phase = VALUE_CHANGED
-          Waiting_RX = 0
-        else
-          Menu.EditLine = Menu.SelLine
-        end
-      end
-    end
-  end
-end
-
-local function DSM_Send_Receive()
-  if Waiting_RX == 0 then
-    Waiting_RX = 1
-    -- Need to send a request
-    if Phase == RX_VERSION then -- request RX version
-      DSM_Send(0x11,0x06,0x00,0x14,0x00,0x00)
-    elseif Phase == WAIT_CMD then -- keep connection open
-      DSM_Send(0x00,0x04,0x00,0x00)
-    elseif Phase == MENU_TITLE then -- request menu title
-      if Menu.Cur == nil then
-        DSM_Send(0x12,0x06,0x00,0x14,0x00,0x00) -- first menu only
-        Menu.Cur = 0
-      else
-        DSM_Send(0x16,0x06,Menu.Id,Menu.Cur,0x00,Menu.SelLine)
-      end
-    elseif Phase == MENU_LINES then -- request menu lines
-      if Menu.CurLine == nil then
-        DSM_Send(0x13,0x04,Menu.Id,Menu.Cur) -- line 0
-      elseif Menu.CurLine >= 0x80 then
-        local last_byte={0x40,0x01,0x02,0x04,0x00,0x00} -- unknown...
-        DSM_Send(0x20,0x06,Menu.CurLine-0x80,Menu.CurLine-0x80,0x00,last_byte[Menu.CurLine-0x80+1]) -- line X
-      else
-        DSM_Send(0x14,0x06,Menu.Id,Menu.Cur,0x00,Menu.CurLine) -- line X
-      end
-    elseif Phase == MENU_VALUES then -- request menu values
-      DSM_Send(0x15,0x06,Menu.Id,Menu.Cur,Line[Menu.CurLine].ValId,Menu.CurLine) -- line X
-    elseif Phase == VALUE_CHANGING then -- send value
-      local value=Line[Menu.SelLine].Val
-      if value < 0 then
-        value = 0x10000 + value
-      end
-      DSM_Send(0x18,0x06,Line[Menu.SelLine].ValId,Menu.SelLine,bit32.rshift(value,8),bit32.band(value,0xFF)) -- send current value
-      Phase = VALUE_CHANGING_WAIT
-    elseif Phase == VALUE_CHANGED then -- send value
-      if Value_Changed == 0 then
-        local value=Line[Menu.SelLine].Val
-        if value < 0 then
-          value = 0x10000 + value
-        end
-        DSM_Send(0x18,0x06,Line[Menu.SelLine].ValId,Menu.SelLine,bit32.rshift(value,8),bit32.band(value,0xFF)) -- send current value
-        Value_Changed = Value_Changed + 1
-        Waiting_RX = 0
-      elseif Value_Changed == 1 then
-        DSM_Send(0x19,0x06,Line[Menu.SelLine].ValId,Menu.SelLine) -- validate
-      --  Value_Changed = Value_Changed + 1
-      --  Waiting_RX = 0
-      --elseif Value_Changed == 2 then
-      --  DSM_Send(0x1B,0x06,0x10,Menu.SelLine) -- validate again?
-      --  Value_Changed = Value_Changed + 1
-      end
-    elseif Phase == VALUE_CHANGING_WAIT then
-        DSM_Send(0x1A,0x06,Line[Menu.SelLine].ValId,Menu.SelLine)
-    end
-    multiBuffer(10,0x00);
-    Retry = 50
-  elseif multiBuffer(10) == 0x09 then
-    -- Answer received
-    --if multiBuffer(11) == 0x00 then -- waiting for commands?
-    if multiBuffer(11) == 0x01 then -- read version
-      --ex: 0x09 0x01 0x00 0x15 0x02 0x22 0x01 0x00 0x14 0x00 0x00 0x00 0x00 0x00 0x00 0x00
-      RX.Name = Get_Text(multiBuffer(13))
-      RX.Version = multiBuffer(14).."."..multiBuffer(15).."."..multiBuffer(16)
-      Phase = MENU_TITLE
-    elseif multiBuffer(11) == 0x02 then -- read menu title
-      --ex: 0x09 0x02 0x4F 0x10 0xA5 0x00 0x00 0x00 0x50 0x10 0x10 0x10 0x00 0x00 0x00 0x00
-      Menu.Cur = multiBuffer(12)
-      Menu.Id  = multiBuffer(13)
-      Menu.Title = Get_Text(multiBuffer(14)+multiBuffer(15)*256)
-      Menu.Prev = multiBuffer(16)
-      Menu.PrevId = multiBuffer(17)
-      Menu.Next = multiBuffer(18)
-      Menu.NextId = multiBuffer(19)
-      Menu.Back = multiBuffer(20)
-      Menu.BackId = multiBuffer(21)
-      for i = 0, 6 do  -- clear menu
-        Line[i] = { Menu = nil, Id = nil, Type = nil, Text="", Next = nil, NextId = nil, ValLine = nil, ValId = nil, Min, Max, Def, Val, Unit, Step }
-      end
-      Menu.CurLine = nil
-      if Menu.Next ~= 0 then
-        Menu.SelLine = 7 -- highlight Next
-      else
-        Menu.SelLine = -1 -- highlight Back
-      end
-      Blink = 0
-      Phase = MENU_LINES
-    elseif multiBuffer(11) == 0x03 then -- read menu lines
-      --ex: 0x09 0x03 0x00 0x10 0x00 0x1C 0xF9 0x00 0x10 0x10 0x00 0x00 0x00 0x00 0x03 0x00
-      --              Menu Id   line Type Text_idx  Next  V_Id Val_Min   Val_Max   Val_Def
-      --ex: 0x09 0x03 0x61 0x10 0x00 0x6C 0x50 0x00 0x00 0x10 0x36 0x00 0x49 0x00 0x36 0x00
-      Menu.CurLine = multiBuffer(14)
-      local line = Line[Menu.CurLine]
-      line.Menu = multiBuffer(12)
-      line.Id = multiBuffer(13) -- not quite sure yet
-      line.Type = multiBuffer(15) -- not quite sure yet: 1C is text menu only, 4C/6C is text followed by text list, C0 is text followed by percentage value
-      line.Text = Get_Text(multiBuffer(16)+multiBuffer(17)*256)
-      if multiBuffer(18) == Menu.Cur then
-        line.Next = nil
-      else
-        line.Next = multiBuffer(18) -- not quite sure yet: 1C=text menu=>next menu, others=>line number of the value
-      end
-      if Menu.SelLine == -1 and line.Next ~= nil then -- Auto select first line of the menu
-        Menu.SelLine = Menu.CurLine
-      end
-      line.NextId = multiBuffer(19) -- not quite sure yet
-      line.ValLine = multiBuffer(18) -- not quite sure yet
-      line.ValId = multiBuffer(19) -- not quite sure yet
-      line.Min = conv_int16(multiBuffer(20)+multiBuffer(21)*256)
-      line.Max = conv_int16(multiBuffer(22)+multiBuffer(23)*256)
-      line.Def = conv_int16(multiBuffer(24)+multiBuffer(25)*256)
-      if line.Type == MENU then
-        -- nothing to do on menu entries
-      elseif line.Type == LIST_MENU_NOCHANGING or line.Type == LIST_MENU2 then
-        line.Val = nil --line.Def - line.Min -- use default value not sure if needed
-        line.Def = line.Min -- pointer to the start of the list in Text
-        line.Max = line.Max - line.Min -- max index
-        line.Min = 0 -- min index
-      else -- default to numerical value
-        line.Val = nil --line.Def -- use default value not sure if needed
-      end
-      if line.Type ~= 0x1C then -- value to follow
-        line.Text = line.Text..":"
-      end
-      Phase = MENU_LINES
-    elseif multiBuffer(11) == 0x04 then -- read menu values
-      --ex: 0x09 0x04 0x53 0x10 0x00 0x10 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
-      --              Menu MeId line VaId Value
-      --ex: 0x09 0x04 0x61 0x10 0x02 0x10 0x01 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
-      Menu.CurLine = multiBuffer(14)
-      Line[Menu.CurLine].Val = conv_int16(multiBuffer(16)+multiBuffer(17)*256)
-      Phase = MENU_VALUES
-    elseif multiBuffer(11) == 0x05 then -- unknown... need to get through the lines...
-      Menu.CurLine = 0x80 + multiBuffer(12)
-      Phase = MENU_LINES
-    elseif multiBuffer(11) == 0x00 and Phase == VALUE_CHANGING then
-      Phase = VALUE_CHANGING_WAIT
-    end
-    -- Data processed
-    Waiting_RX = 0
-    multiBuffer(10,0x00)
-    Retry = 50
-  else
-    Retry = Retry - 1
-    if Retry <= 0 then
-      -- Retry the RX request
-      Retry = 50
-      Waiting_RX = 0
-      if Phase ~= RX_VERSION and Phase ~= VALUE_CHANGING_WAIT then
-        Phase = WAIT_CMD
-      end
-    end
-  end
-end
-
-local function DSM_Display()
-  lcd.clear()
-  if LCD_W == 480 then
-    --Draw title
-    lcd.drawFilledRectangle(0, 0, LCD_W, 30, TITLE_BGCOLOR)
-    lcd.drawText(1, 5, "DSM Forward Programming", MENU_TITLE_COLOR)
-    --Draw RX Menu
-    if Phase == RX_VERSION then
-      lcd.drawText(10,50,"No compatible DSM RX...", BLINK)
-    else
-      if Menu.Title ~=  nil then
-        local attrib=0;
-        lcd.drawText(80,32,Menu.Title,MIDSIZE)
-        for i = 0, 6 do
-          if i == Menu.SelLine then
-            attrib = INVERS
-          else
-            attrib = 0
-          end
-          if Line[i] ~= nil and Line[i].Type ~= nil then
-            if Line[i].Type ~= MENU then -- list/value
-              if Line[i].Val ~= nil then
-                local text=""
-                if Line[i].Type == LIST_MENU_NOCHANGING or Line[i].Type == LIST_MENU2 then
-                  text = Get_Text(Line[i].Val+Line[i].Def)
-                elseif Line[i].Type == PERCENTAGE_VALUE then
-                  text = Line[i].Val.." %"
-                else
-                  text = Line[i].Val
-                end
-                if Menu.EditLine == Menu.SelLine then -- blink edited entry
-                  Blink = Blink + 1
-                  if Blink > 25 then
-                    attrib = 0
-                    if Blink > 50 then
-                      Blink = 0
-                    end
-                  end
-                end
-                lcd.drawText(240,32+20*(i+2), text, attrib) -- display value
-              end
-              attrib = 0
-            end
-            lcd.drawText(10,32+20*(i+2), Line[i].Text, attrib) -- display text
-          end
-        end
-        if Menu.SelLine == -1 then
-          lcd.drawText(437,32, "Back", INVERS)
-        else
-          lcd.drawText(437,32, "Back", 0)
-        end
-        lcd.drawRectangle(437-5, 32-2, 47, 25)
-        if Menu.Next ~= 0 then
-          if Menu.SelLine == 7 then
-            lcd.drawText(437,220, "Next",INVERS)
-          else
-            lcd.drawText(437,220, "Next")
-          end
-          lcd.drawRectangle(437-5, 220-2, 47, 25)
-        end
-        if Menu.Prev ~= 0 then
-          if Menu.SelLine == 8 then
-            lcd.drawText(5,220, "Prev",INVERS)
-          else
-            lcd.drawText(5,220, "Prev")
-          end
-          lcd.drawRectangle(5-5, 220-2, 47, 25)
-        end
-      end
-      lcd.drawText(170,252, "RX "..RX.Name.." v"..RX.Version) -- display RX info
-    end
-  else
-    -- --Draw RX Menu on LCD_W=128
-    -- if multiBuffer( 4 ) == 0xFF then
-      -- lcd.drawText(2,17,"No compatible DSM RX...",SMLSIZE)
-    -- else
-      -- if Retry_128 ~= 0 then
-        -- --Intro page
-        -- Retry_128 = Retry_128 - 1
-        -- lcd.drawScreenTitle("DSM Forward Programming",0,0)
-        -- lcd.drawText(2,17,"Press Prev Page for previous Menu" ,SMLSIZE)
-      -- else
-        -- --Menu page
-        -- for line = 0, 7, 1 do
-          -- for i = 0, 21-1, 1 do
-            -- value=multiBuffer( line*21+6+i )
-            -- if value > 0x80 then
-              -- value = value - 0x80
-              -- lcd.drawText(2+i*6,1+8*line,string.char(value).." ",SMLSIZE+INVERS)
-            -- else
-              -- lcd.drawText(2+i*6,1+8*line,string.char(value),SMLSIZE)
-            -- end
-          -- end
-        -- end
-      -- end
-    -- end
-  end
-end
-
-- Init
-local function DSM_Init()
-  --Set protocol to talk to
-  multiBuffer( 0, string.byte('D') )
-  --test if value has been written
-  if multiBuffer( 0 ) ~=  string.byte('D') then
-    error("Not enough memory!")
-    return 2
-  end
-  --Init TX buffer
-  multiBuffer( 3, 0x00 )
-  --Init RX buffer
-  multiBuffer( 10, 0x00 )
-  --Init telemetry
-  multiBuffer( 0, string.byte('D') )
-  multiBuffer( 1, string.byte('S') )
-  multiBuffer( 2, string.byte('M') )
-
-  --Text to be displayed -> need to use a file instead?
-  --RX names--
-  Text[0x0014]="SPM4651T"
-  Text[0x0015]="AR637T"
-  --Lists--
-  Text[0x0036]="Throttle"
-  Text[0x0037]="Aileron"
-  Text[0x0038]="Elevator"
-  Text[0x0039]="Rudder"
-  Text[0x003A]="Gear"
-
-  --******
-  --This part is strange since the AR637T needs
-  for i=1,7 do -- 3B..41
-    Text[0x003A+i]="Aux"..i
-  end
-  for i=1,8 do -- 41..49
-    Text[0x0041+i]="XPlus-"..i
-  end
-  --But FOTO-PETE reports that it should be:
-  Text[0x0040]="Roll"
-  Text[0x0041]="Pitch"
-  Text[0x0042]="Yaw"
-  Text[0x0046]="Priority"
-  --******
-  
-  Text[0x004A]="Failsafe"
-  Text[0x004B]="Main Menu"
-  Text[0x004E]="Position"
-  Text[0x0050]="Outputs"
-  Text[0x0051]="Output Channel 1"
-  Text[0x0052]="Output Channel 2"
-  Text[0x0053]="Output Channel 3"
-  Text[0x0054]="Output Channel 4"
-  Text[0x0055]="Output Channel 5"
-  Text[0x0056]="Output Channel 6"
-  --Text[0x005E]="Inhibit"
-  Text[0x005F]="Hold Last"
-  Text[0x0060]="Preset"
-  --Text[0x0061]="Custom"
-  --Messages--
-  Text[0x0078]="FM Channel"
-  Text[0x0080]="Orientation"
-  Text[0x0085]="Frame Rate"
-  Text[0x0086]="System Setup"
-  Text[0x0087]="F-Mode Setup"
-  Text[0x0088]="Enabled F-Modes"
-  Text[0x008A]="Gain Sensitivity"
-  Text[0x0090]="Apply"
-  Text[0x0093]="Complete"
-  Text[0x0094]="Done"
-  Text[0x0097]="Factory Reset"
-  Text[0x009A]="Capture Failsafe Positions"
-  Text[0x009C]="Custom Failsafe"
-  Text[0x00A5]="First Time Setup"
-  Text[0x00AD]="Gain Channel Select"
-  Text[0x00B6]="FM1"
-  Text[0x00B7]="FM2"
-  Text[0x00B8]="FM3"
-  Text[0x00B9]="FM4"
-  Text[0x00BA]="FM5"
-  Text[0x00BB]="FM6"
-  Text[0x00BC]="FM7"
-  Text[0x00BD]="FM8"
-  Text[0x00BE]="FM9"
-  Text[0x00BF]="FM10"
-  Text[0x00F9]="Gyro settings"
-  Text[0x00FE]="Stick Priority"
-  Text[0x0100]="Make sure the model has been"
-  Text[0x0101]="configured, including wing type,"
-  Text[0x0102]="reversing, travel, trimmed, etc."
-  Text[0x0103]="before continuing setup."
-  Text[0x0104]="0104"
-  Text[0x0105]="0105"
-  Text[0x0106]="Any wing type, channel assignment,"
-  Text[0x0107]="subtrim, or servo reversing changes"
-  Text[0x0108]="require running through initial"
-  Text[0x0109]="setup again."
-  Text[0x010A]="010A"
-  Text[0x010B]="010B"
-  Text[0x0190]="Relearn Servo Settings"
-  Text[0x019C]="Enter Receiver Bind Mode"
-  Text[0x01DC]="AS3X"
-  Text[0x01DD]="AS3X Settings"
-  Text[0x01DE]="AS3X Gains"
-  Text[0x01E0]="Rate Gains"
-  Text[0x020A]="Restore from Backup"
-  Text[0x0209]="Save to Backup"
-  Text[0x020D]="First Time SAFE Setup"
-  Text[0x021A]="Set the model level,"
-  Text[0x021B]="and press Continue."
-  Text[0x021C]="021C"
-  Text[0x021D]="021D"
-  
-  Text[0x021F]="Set the model on its nose,"
-  Text[0x0220]="and press Continue. If the"
-  Text[0x0221]="orientation on the next"
-  Text[0x0222]="screen is wrong go back"
-  Text[0x0223]="and try again."
-  Text[0x0224]="Continue"
-  Text[0x0229]="Set Orientation Manually"
-  
-  Text[0x0227]="Other settings"
-  Text[0x022B]="WARNING!"
-  Text[0x022C]="This will reset the"
-  Text[0x022D]="configuration to factory"
-  Text[0x022E]="defaults. This does not"
-  Text[0x022F]="affect the backup config."
-  Text[0x0230]="0230"
-  Text[0x0231]="This will overwrite the"
-  Text[0x0232]="backup memory with your"
-  Text[0x0233]="current configuartion."
-  Text[0x0234]="0234"
-  Text[0x0235]="0235"
-  Text[0x0236]="This will overwrite the"
-  Text[0x0237]="current config with"
-  Text[0x0238]="that which is in"
-  Text[0x0239]="the backup memory."
-  Text[0x023A]="023A"
-  Text[0x023D]="Copy Flight Mode Settings"
-  Text[0x0240]="Utilities"
-  Text[0x8001]="Flight Mode 1"
-  Text[0x8002]="Flight Mode 2"
-  Text[0x8003]="Flight Mode 3"
-end
-
-- Main
-local function DSM_Run(event)
-  if event == nil then
-    error("Cannot be run as a model script!")
-    return 2
-  elseif event == EVT_VIRTUAL_EXIT then
-    DSM_Release()
-    return 2
-  else
-    DSM_Menu(event)
-    DSM_Send_Receive()
-    DSM_Display()
-    return 0
-  end
-end
-
-return { init=DSM_Init, run=DSM_Run }
--- a/Lua_scripts/DumboRC
+++ b/Lua_scripts/DumboRC
@@ -0,0 +1,305 @@
+local toolName = "TNS|DumboRC P series|TNE"
+
+-- EdgeTX/Multi bridge:
+-- Multi_Buffer[4] is RF payload length, [5..12] is RF payload.
+-- Multi rewrites the 00 00 token and checksum from its hop state.
+-- Special1 payload: 18 00 00 arg_l arg_h 00. Args: 1 poll, 2 Set GY EPA, 3 Set FS.
+-- Special2 payload: 28 00 00 gyro0 gyro1 gyro2 gyro3 00.
+-- Gyro word: bit0 enable, bit1 phase, bits2..5 SEN channel selector
+-- (0=NULL, 1..7=CH2..CH8), bits6..13 SEN, bits14..21 PCA,
+-- bits22..29 AGS, bits30..31 servo frequency (67HZ,250HZ,50HZ,300HZ).
+
+local PROTO_RLINK = 74
+local SUB_DUMBORC_P = 4
+
+local TX_READY = 4
+local TX_PAYLOAD = 5
+local TX_MAX_PAYLOAD = 8
+local RX_READY = 14
+local RX_PAYLOAD = 15
+local RX_MAX_PAYLOAD = 32
+local colorLcd = type(lcd.RGB) == "function"
+
+local servoHz = { "67HZ", "250HZ", "50HZ", "300HZ" }
+
+local gyro = { enable = 0, phase = 0, senCh = 0, sen = 0, pca = 0, ags = 0, flags = 0 }
+local lines = {}
+local sel = 1
+local top = 1
+local edit = false
+local blink = 0
+local moduleOk = false
+local haveValues = false
+
+local function limit(v, mn, mx)
+  if v < mn then return mn end
+  if v > mx then return mx end
+  return v
+end
+
+local function byte(v)
+  return limit(math.floor(tonumber(v) or 0), 0, 255)
+end
+
+local function gyroRaw(v)
+  return limit(math.floor(tonumber(v) or 0), 0, 200)
+end
+
+local function gyroText(v)
+  local raw = gyroRaw(v)
+  return tostring(math.floor(raw / 2)) .. (raw % 2 == 0 and ".0" or ".5")
+end
+
+local function screenLines()
+  if colorLcd then return limit(math.floor(((LCD_H or 272) - 46) / 20), 8, 12) end
+  return 6
+end
+
+local function drawTitle(title)
+  if colorLcd and lcd.drawFilledRectangle then
+    lcd.drawFilledRectangle(0, 0, LCD_W, 30, COLOR_THEME_SECONDARY1)
+    lcd.drawText(3, 5, title, COLOR_THEME_PRIMARY2)
+  elseif lcd.drawScreenTitle then
+    lcd.drawScreenTitle(title, 0, 0)
+  else
+    lcd.drawText(0, 0, title, INVERS)
+  end
+end
+
+local function findModule()
+  for i = 0, 1 do
+    local m = model.getModule(i)
+    if m and m["Type"] == 6 and m["protocol"] == PROTO_RLINK and m["subProtocol"] == SUB_DUMBORC_P then
+      return true
+    end
+  end
+  return false
+end
+
+local function initBuffer()
+  multiBuffer(0, string.byte("R"))
+  if multiBuffer(0) ~= string.byte("R") then
+    error("Not enough memory!")
+    return
+  end
+  multiBuffer(1, string.byte("L"))
+  multiBuffer(2, string.byte("n"))
+  multiBuffer(3, string.byte("k"))
+  multiBuffer(TX_READY, 0)
+  multiBuffer(RX_READY, 0)
+end
+
+local function release()
+  for i = 0, RX_PAYLOAD + RX_MAX_PAYLOAD - 1 do
+    multiBuffer(i, 0)
+  end
+end
+
+local function sendPayload(payload)
+  local len = #payload
+  if len < 1 or len > TX_MAX_PAYLOAD or multiBuffer(TX_READY) ~= 0 then
+    return false
+  end
+  for i = 1, TX_MAX_PAYLOAD do
+    multiBuffer(TX_PAYLOAD + i - 1, 0)
+  end
+  for i = 1, #payload do
+    multiBuffer(TX_PAYLOAD + i - 1, byte(payload[i]))
+  end
+  multiBuffer(TX_READY, len)
+  return true
+end
+
+local function sendSpecial1(arg)
+  return sendPayload({ 0x18, 0, 0, arg % 256, math.floor(arg / 256), 0 })
+end
+
+local function gyroSelector()
+  if gyro.senCh < 2 or gyro.senCh > 8 then return 0 end
+  return gyro.senCh - 1
+end
+
+local function sendGyro()
+  local sen = gyroRaw(gyro.sen)
+  local pca = gyroRaw(gyro.pca)
+  local ags = gyroRaw(gyro.ags)
+  local b0 = gyro.enable + gyro.phase * 2 + gyroSelector() * 4 + (sen % 4) * 64
+  local b1 = math.floor(sen / 4) + (pca % 4) * 64
+  local b2 = math.floor(pca / 4) + (ags % 4) * 64
+  local b3 = math.floor(ags / 4) + limit(gyro.flags, 0, 3) * 64
+  sendPayload({ 0x28, 0, 0, b0, b1, b2, b3, 0 })
+end
+
+local function decodeGyroBytes(b0, b1, b2, b3)
+  b0 = byte(b0); b1 = byte(b1); b2 = byte(b2); b3 = byte(b3)
+  gyro.enable = b0 % 2
+  gyro.phase = math.floor(b0 / 2) % 2
+  local selector = math.floor(b0 / 4) % 16
+  gyro.senCh = selector == 0 and 0 or limit(selector + 1, 2, 8)
+  gyro.sen = gyroRaw(math.floor(b0 / 64) + (b1 % 64) * 4)
+  gyro.pca = gyroRaw(math.floor(b1 / 64) + (b2 % 64) * 4)
+  gyro.ags = gyroRaw(math.floor(b2 / 64) + (b3 % 64) * 4)
+  gyro.flags = math.floor(b3 / 64) % 4
+  haveValues = true
+end
+
+local function pollRx()
+  local len = multiBuffer(RX_READY)
+  if not len or len == 0 then return end
+  if len > RX_MAX_PAYLOAD then
+    multiBuffer(RX_READY, 0)
+    return
+  end
+
+  local p = {}
+  for i = 1, len do
+    p[i] = multiBuffer(RX_PAYLOAD + i - 1)
+  end
+  multiBuffer(RX_READY, 0)
+
+  if len == 7 and p[1] == 0x01 then
+    decodeGyroBytes(p[3], p[4], p[5], p[6])
+  end
+end
+
+local function chText()
+  if gyro.senCh == 0 then return "NULL" end
+  return "CH" .. gyro.senCh
+end
+
+local function rebuildLines()
+  lines = {
+    { "Poll RX", "action", function() sendSpecial1(1) end },
+    { "Gyro", "toggle", "enable" },
+    { "Phase", "toggle", "phase" },
+    { "SEN Ch", "channel", "senCh" },
+    { "SEN", "percent", "sen" },
+    { "PCA", "percent", "pca" },
+    { "AGS", "percent", "ags" },
+    { "Servo Hz", "flags", "flags" },
+    { "Send Gyro", "action", sendGyro },
+    { "Set GY EPA", "action", function() sendSpecial1(2) end },
+    { "Set FS", "action", function() sendSpecial1(3) end },
+  }
+end
+
+local function lineValue(line)
+  if line[2] == "action" then return ">" end
+  if not haveValues then return "--" end
+  if line[2] == "toggle" then return gyro[line[3]] == 0 and "Off" or "On" end
+  if line[2] == "channel" then return chText() end
+  if line[2] == "percent" then return gyroText(gyro[line[3]]) end
+  if line[2] == "flags" then return servoHz[gyro.flags + 1] or tostring(gyro.flags) end
+  return ""
+end
+
+local function changeValue(dir, fast)
+  local line = lines[sel]
+  if not line then return end
+  local step = fast and 20 or 1
+  haveValues = true
+
+  if line[2] == "toggle" then
+    gyro[line[3]] = dir > 0 and 1 or 0
+  elseif line[2] == "channel" then
+    local vals = { 0, 2, 3, 4, 5, 6, 7, 8 }
+    local pos = 1
+    for i = 1, #vals do
+      if vals[i] == gyro.senCh then pos = i end
+    end
+    gyro.senCh = vals[limit(pos + dir, 1, #vals)]
+  elseif line[2] == "percent" then
+    gyro[line[3]] = gyroRaw(gyro[line[3]] + dir * step)
+  elseif line[2] == "flags" then
+    gyro.flags = limit(gyro.flags + dir, 0, 3)
+  end
+end
+
+local function fastRotary()
+  return getRotEncSpeed() > 1
+end
+
+local function handleEvent(event)
+  local nextEvent = edit and EVT_VIRTUAL_INC or EVT_VIRTUAL_NEXT
+  local prevEvent = edit and EVT_VIRTUAL_DEC or EVT_VIRTUAL_PREV
+  if event == nextEvent then
+    if edit then changeValue(1, fastRotary()) else sel = limit(sel + 1, 1, #lines) end
+  elseif event == prevEvent then
+    if edit then changeValue(-1, fastRotary()) else sel = limit(sel - 1, 1, #lines) end
+  elseif event == EVT_VIRTUAL_NEXT_PAGE then
+    if edit then changeValue(1, true) else sel = limit(sel + screenLines(), 1, #lines) end
+  elseif event == EVT_VIRTUAL_PREV_PAGE then
+    if edit then changeValue(-1, true) else sel = limit(sel - screenLines(), 1, #lines) end
+    killEvents(event)
+  elseif event == EVT_VIRTUAL_ENTER then
+    local line = lines[sel]
+    if line and line[2] == "action" then
+      line[3]()
+    elseif line then
+      edit = not edit
+    end
+  end
+
+  local count = screenLines()
+  if sel < top then top = sel end
+  if sel >= top + count then top = sel - count + 1 end
+end
+
+local function draw()
+  lcd.clear()
+  drawTitle("DumboRC P series")
+
+  local font = colorLcd and 0 or SMLSIZE
+  local x = 2
+  local y = colorLcd and 34 or 9
+  local dy = colorLcd and 20 or 8
+  local valueX = colorLcd and 150 or 82
+
+  if not moduleOk then
+    if colorLcd then
+      lcd.drawText(x, y + dy, "Select Multi RadLink/Dumbo_P", font + BLINK)
+    else
+      lcd.drawText(x, y + dy, "Select RadLink", font + BLINK)
+      lcd.drawText(x, y + dy * 2, "Dumbo_P", font + BLINK)
+    end
+    return
+  end
+
+  for i = top, math.min(#lines, top + screenLines() - 1) do
+    local attr = font
+    if i == sel then
+      attr = attr + INVERS
+      if edit then
+        blink = (blink + 1) % 30
+        if blink > 15 then attr = font end
+      end
+    end
+    local yy = y + (i - top) * dy
+    lcd.drawText(x, yy, lines[i][1], attr)
+    lcd.drawText(valueX, yy, lineValue(lines[i]), attr)
+  end
+end
+
+local function init()
+  moduleOk = type(multiBuffer) == "function" and findModule()
+  rebuildLines()
+  if moduleOk then initBuffer() end
+end
+
+local function run(event)
+  if event == nil then
+    error("Cannot be run as a model script!")
+    return 2
+  elseif event == EVT_VIRTUAL_EXIT then
+    if moduleOk then release() end
+    return 2
+  end
+  if moduleOk then
+    pollRx()
+    handleEvent(event)
+  end
+  draw()
+  return 0
+end
+
+return { init = init, run = run }
--- a/Lua_scripts/Graupner
+++ b/Lua_scripts/Graupner
@@ -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}
+
--- a/Lua_scripts/MultiChan.txt
+++ b/Lua_scripts/MultiChan.txt
@@ -35,6 +35,7 @@
 6,3,DSM,X_2F,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,n-a,ThKill
 6,4,DSM,AUTO,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,n-a,ThKill
 6,5,DSM,R_1F,0,AUX3,AUX4,AUX5
+6,6,DSM,2SFC,0
 70,0,DSM_RX,RX,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12
 70,1,DSM_RX,CPPM,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12
 45,0,E01X,E012,1,n-a,Flip,n-a,HLess,RTH
@@ -53,10 +54,9 @@
 28,1,Flysky_AFHDS2A,PPM_IBUS,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14
 28,2,Flysky_AFHDS2A,PWM_SBUS,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14
 28,3,Flysky_AFHDS2A,PPM_SBUS,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14
-28,4,Flysky_AFHDS2A,PWM_IB16,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14,CH15,CH16
-28,5,Flysky_AFHDS2A,PPM_IB16,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14,CH15,CH16
-28,6,Flysky_AFHDS2A,PWM_SB16,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14,CH15,CH16
-28,7,Flysky_AFHDS2A,PPM_SB16,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14,CH15,CH16
+28,4,Flysky_AFHDS2A,Gyro_Off,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,ST_Ga,TH_Ga,Prio,Calib
+28,5,Flysky_AFHDS2A,Gyro_On,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,ST_Ga,TH_Ga,Prio,Calib
+28,6,Flysky_AFHDS2A,G_On_Rev,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,ST_Ga,TH_Ga,Prio,Calib
 56,0,Flysky2A_RX,RX,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14
 56,1,Flysky2A_RX,CPPM,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14
 53,0,Height,5ch,0,Gear
@@ -86,10 +86,17 @@
 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,FX816,1
+58,1,FX,FX620,1
+58,2,FX,9630,1,Rate,Gyro,TrimR,TrimA,TrimE
+58,3,FX,Q560,1,FLIP,Gyro,LEDs
+58,4,FX,QF012,1,FLIP,Gyro,Invert,Reset
+58,5,FX,BM26,1,FLIP,Gyro,LEDs,LED,CALIB
+58,6,FX,A570,1,STOP,Rate,Color,LED,TrimR,TrimA,TrimE
 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
+23,0,FQ777,124,1,Flip,RTH,HLess,Expert
+23,1,FQ777,XBM37,1,Rate,Flip,HLess,LED,Pict,Video,RTH,OK,ETrim,Atrim
 47,0,GD00x,V1,1,Trim,LED,Rate
 47,1,GD00x,V2,1,Trim,LED,Rate
 32,0,GW008,FY326,1,Flip
@@ -106,6 +113,7 @@
 26,1,Hontai,JJRCX1,1,Flip,Arm,Pict,Video,HLess,RTH,Calib
 26,2,Hontai,X5C1,1,Flip,Arm,Pict,Video,HLess,RTH,Calib
 26,3,Hontai,FQ777_951,1,Flip,Arm,Pict,Video,HLess,RTH,Calib
+26,4,Hontai,XKK170,1,Rate,Emerg,TakLan,Calib,TrimA,TrimE,Optic
 57,0,HoTT,Sync,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14,CH15,CH16
 57,1,HoTT,No_Sync,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14,CH15,CH16
 2,0,Hubsan,H107,1,Flip,Light,Pict,Video,HLess
@@ -114,11 +122,13 @@
 22,0,J6Pro,Std,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12
 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
-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
+49,0,KF606,KF606,1,Trim,LED
+49,1,KF606,MIG320,1,Trim,LED
+49,2,KF606,ZCZ50,1,Trim,UNK
+9,0,KN,WLToys,0,DRate,THold,IdleUp,Gyro,Ttrim,Atrim,Etrim,Rtrim,Hover
+9,1,KN,Feilun,0,DRate,THold,IdleUp,Gyro,Ttrim,Atrim,Etrim,Rtrim,Hover
+73,0,Kyosho,FHSS,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14
+73,1,Kyosho,Hype,0,CH5,CH6
 18,0,MJXQ,WHL08,1,Flip,LED,Pict,Video,HLess,RTH,AuFlip,Pan,Tilt,Rate
 18,1,MJXQ,X600,1,Flip,LED,Pict,Video,HLess,RTH,AuFlip,Pan,Tilt,Rate
 18,2,MJXQ,X800,1,Flip,LED,Pict,Video,HLess,RTH,AuFlip,Pan,Tilt,Rate
@@ -126,14 +136,16 @@
 18,4,MJXQ,E010,1,Flip,LED,Pict,Video,HLess,RTH,AuFlip,Pan,Tilt,Rate
 18,5,MJXQ,H26WH,1,Flip,Arm,Pict,Video,HLess,RTH,AuFlip,Pan,Tilt,Rate
 18,6,MJXQ,Phoenix,1,Flip,Arm,Pict,Video,HLess,RTH,AuFlip,Pan,Tilt,Rate
-17,0,MT99XX,Std,1,Flip,LED,Pict,Video,HLess
-17,1,MT99XX,H7,1,Flip,LED,Pict,Video,HLess
-17,2,MT99XX,YZ,1,Flip,LED,Pict,Video,HLess
-17,3,MT99XX,LS,1,Flip,Invert,Pict,Video,HLess
-17,4,MT99XX,FY805,1,Flip,n-a,n-a,n-a,HLess
-17,5,MT99XX,A180,0,3D_6G
-17,6,MT99XX,Dragon,0,Mode,RTH
-17,7,MT99XX,F949G,0,6G_3D,Light
+17,0,MT99XX,Std,1,Flip,LED,Pict,Video,HLess,Atrim,Etrim
+17,1,MT99XX,H7,1,Flip,LED,Pict,Video,HLess,Atrim,Etrim
+17,2,MT99XX,YZ,1,Flip,LED,Pict,Video,HLess,Atrim,Etrim
+17,3,MT99XX,LS,1,Flip,Invert,Pict,Video,HLess,Atrim,Etrim
+17,4,MT99XX,FY805,1,Flip,n-a,n-a,n-a,HLess,Atrim,Etrim
+17,5,MT99XX,A180,0,3D_6G,Rate,3D_6G,n-a,n-a,Atrim,Etrim
+17,6,MT99XX,Dragon,0,Mode,RTH,n-a,n-a,n-a,Atrim,Etrim
+17,7,MT99XX,F949G,0,6G_3D,Light,Rates,Unk1,Unk2,Atrim,Etrim
+92,0,MT99xx2,PA18,0,MODE,FLIP,RTH,n-a,n-a,Atrim,Etrim
+92,1,MT99xx2,SU35,0,Mode,LED,LED_FH,Invert,Rate,Atrim,Etrim
 44,0,NCC1701,Std,1,Warp
 77,0,OMP,M2,0,THold,IdleUp,6G_3D
 60,0,Pelikan,PRO_V4,0,CH5,CH6,CH7,CH8
@@ -151,8 +163,11 @@
 72,0,Q90C,Std,0,FMode,VTX+
 74,0,RadioLink,Surface,0,CH5,CH6,CH7,CH8,FS_CH1,FS_CH2,FS_CH3,FS_CH4,FS_CH5,FS_CH6,FS_CH7,FS_CH8
 74,1,RadioLink,Air,0,CH5,CH6,CH7,CH8,FS_CH1,FS_CH2,FS_CH3,FS_CH4,FS_CH5,FS_CH6,FS_CH7,FS_CH8
-74,2,RadioLink,DumboRC,0,CH5,CH6,CH7,CH8,FS_CH1,FS_CH2,FS_CH3,FS_CH4,FS_CH5,FS_CH6,FS_CH7,FS_CH8
-76,0,Realacc,R11,1,Flip,Light,Calib,HLess,RTH,UNK
+74,2,RadioLink,DumboRC,0,CH5,CH6,CH7,CH8GY,CH9,CH10,n-a,n-a,n-a,n-a,n-a,n-a
+74,3,RadioLink,RC4G,0,CH5,FS_CH1,FS_CH2,FS_CH3,FS_CH4
+74,4,RadioLink,Dumbo_P,0,CH5,CH6,CH7,CH8GY,CH9,CH10,n-a,n-a,n-a,n-a,n-a,n-a
+76,0,Realacc,R11,1,Flip,Light,Calib,HLess,RTH,ThCut,Rotat
+76,1,Realacc,WLV8TX,0,ST_Tr
 50,0,Redpine,Fast,0,sCH5,sCH6,sCH7,sCH8,sCH9,sCH10,sCH11,sCH12,sCH13,sCH14,sCH15,sCH16
 50,1,Redpine,Slow,0,sCH5,sCH6,sCH7,sCH8,sCH9,sCH10,sCH11,sCH12,sCH13,sCH14,sCH15,sCH16
 21,0,Futaba,SFHSS,0,CH5,CH6,CH7,CH8
@@ -163,16 +178,19 @@
 11,2,SLT,Q100,0,Rates,n-a,CH7,CH8,Mode,Flip,n-a,n-a,Calib
 11,3,SLT,Q200,0,Rates,n-a,CH7,CH8,Mode,VidOn,VidOff,Calib
 11,4,SLT,MR100,0,Rates,n-a,CH7,CH8,Mode,Flip,Video,Pict
+11,5,SLT,V1_4CH,0
+11,6,SLT,RF_SIM,0,CH5,CH6,CH7,CH8,CH9,CH10
 10,0,Symax,Std,1,Flip,Rates,Pict,Video,HLess
 10,1,Symax,X5C,1,Flip,Rates,Pict,Video,HLess
-61,0,Tiger,Std,1,Flip,Light
-43,0,Traxxas,6519,0
+43,0,Traxxas,TQ2,0
+43,1,Traxxas,TQ1,0
 5,0,V2x2,Std,1,Flip,Light,Pict,Video,HLess,CalX,CalY
 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,0,V761,3CH,0,Gyro,Calib,Flip,RtnAct,Rtn,Beep
+48,1,V761,4CH,0,Gyro,Calib,Flip,RtnAct,Rtn,Beep
+48,2,V761,TOPRC,0,Gyro,Calib,Flip,RtnAct,Rtn
 46,0,V911s,V911s,1,Calib,Rate
-46,1,V911s,E119,1,Calib,Rate
+46,1,V911s,E119,1,Calib,Rate,6G_3D
 22,0,WFLY,WFR0xS,0,CH5,CH6,CH7,CH8,CH9
 30,0,WK2x01,WK2801,0,CH5,CH6,CH7,CH8
 30,1,WK2x01,WK2401,0
@@ -181,7 +199,10 @@
 30,4,WK2x01,W6HEL,0,Gear,Col,Gyro
 30,5,WK2x01,W6HEL_I,0,Gear,Col,Gyro
 62,0,XK,X450,1,FMode,TakeOf,Emerg,3D_6G,Pict,Video
-62,1,XK,X420,1,FMode,TakeOf,Emerg,3D_6G,Pict,Video
+62,1,XK,X420,1,FMode,TakeOf,Emerg,3D_6G,Pict,Video,Flip,Light
+62,2,XK,Cars,0,FMode,TakeOf,Emerg,3D_6G,Pict,Video,Flip,Light
+99,0,XK2,X4,0,Rate,Mode,Hover,Light,Stunt
+99,1,XK2,P10,0,Rate,Mode,Hover,Light,Stunt
 8,0,YD717,Std,1,Flip,Light,Pict,Video,HLess
 8,1,YD717,SkyWlkr,1,Flip,Light,Pict,Video,HLess
 8,2,YD717,Simax4,1,Flip,Light,Pict,Video,HLess
@@ -194,10 +215,30 @@
 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,Loop,Flip,Debug
 84,0,JOYSWAY,Std,0
 85,0,E016H,Std,1,Stop,Flip,n-a,HLess,RTH
 87,0,IKEA
 89,0,LOSI
-90,0,MouldKg,Analog,0
-90,1,MouldKg,Digit,0
+90,0,MouldKg,A4444,0
+90,1,MouldKg,D4444,0
+90,2,MouldKg,A664,0
 91,0,Xerall,Tank,0,FlTa,TakLan,Rate,HLess,Photo,Video,TrimR,TrimE,TrimA
+93,0,Kyosho2,KT-17,0
+94,0,Scorpio
+95,0,Bluefly,HP100,0,CH5,CH6,CH7,CH8
+96,0,BumbleB
+97,0,SGF22,F22,1,Mode,Flip,LED,Pict,Video,TrRes,Bal,HiBal
+97,1,SGF22,F22S,1,Mode,Flip,LED,Pict,Video,TrRes
+97,2,SGF22,J20,1,Mode,Flip,LED,Pict,Video
+61,0,EazyRC
+98,0,Kyosho3,ASF,0
+100,0,YuXiang,Std,0,Lock,Rate,Land,Manual,Flip,Mode,Pitch
+102,0,JIABAILE,Std,0,Speed,Light,Flash
+102,1,JIABAILE,Gyro,0,Speed,Light,Flash,ST_Tr
+103,0,H36,Std,1,Flip,HLess,RTH
+104,0,KAMTOM,Std,0,ST_Tr,TH_Tr,TH_DR
+105,0,Shenqi2,Std,1
+106,0,WL91x,Std,0
+107,0,WPL,Std,0,Light,TH_DR,ST_DR
+108,0,Ares,6HPA_Tx,0,CH5,CH6
--- a/Lua_scripts/MultiChannelsUpdater.lua
+++ b/Lua_scripts/MultiChannelsUpdater.lua
@@ -257,7 +257,7 @@ local function Multi_Init()
    stick_names[4] = "Aux3"
  elseif ( protocol == 48 and sub_protocol == 0 ) then -- V761 3CH
    stick_names[4] = "n-a"
-  elseif protocol == 47 or  protocol == 49 or  protocol == 58 then -- GD00x, KF606, FX816
+  elseif protocol == 47 or  protocol == 49 or  ( protocol == 58 and sub_protocol < 2 ) then -- GD00x, KF606, FX816
    stick_names[1] = "n-a"
    stick_names[2] = "n-a"
  end
@@ -280,7 +280,7 @@ local function Multi_Init()
  end
 
  --Exceptions on first 4 channels...
-  if ( protocol == 73 or (protocol == 74 and sub_protocol == 0) or (protocol == 60 and sub_protocol == 2) or protocol == 89) then -- Kyosho or RadioLink Surface or Pelikan/SCX24 or Losi
+  if ( protocol == 73 or (protocol == 74 and (sub_protocol == 0 or sub_protocol == 2 or sub_protocol == 4)) or (protocol == 60 and sub_protocol == 2) or protocol == 89) then -- Kyosho or RadioLink (Surface or DumboRC/P) or Pelikan/SCX24 or Losi
    channel_names[1] = "ST"
    channel_names[2] = "THR"
    channel_names[3] = "CH3"
--- a/Lua_scripts/MultiConfig.lua
+++ b/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
@@ -133,10 +135,14 @@ local function Config_Draw_Edit( event )
        Edit = 0
      elseif event == EVT_VIRTUAL_PREV then
      -- Change value
-        Menu_value[Edit_pos] = Menu_value[Edit_pos] - 1
+        if Menu_value[Edit_pos] > 0 then
+          Menu_value[Edit_pos] = Menu_value[Edit_pos] - 1
+        end
      elseif event == EVT_VIRTUAL_NEXT then
      -- Change value
-        Menu_value[Edit_pos] = Menu_value[Edit_pos] + 1
+        if Menu_value[Edit_pos] < 255 then
+          Menu_value[Edit_pos] = Menu_value[Edit_pos] + 1
+        end
      end
      --Blink
      Blink = Blink + 1
@@ -317,9 +323,6 @@ local function Config_Draw_Menu()
      --Read line from buffer
      for i = 0, 20-1, 1 do
        value=multiBuffer( line*20+13+i )
-        if value == 0 then
-          break   -- end of line
-        end
        if value > 0x80 and Menu[line].field_type == 0 then
        -- Read field type
          Menu[line].field_type = bitand(value, 0xF0)
@@ -332,6 +335,9 @@ local function Config_Draw_Menu()
        else
          if Menu[line].field_type == 0 then
          -- Text
+          if value == 0 then
+            break   -- end of line
+          end
            Menu[line].text = Menu[line].text .. string.char(value)
          else
          -- Menu specific fields
@@ -422,7 +428,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
--- a/Lua_scripts/README.md
+++ b/Lua_scripts/README.md
@@ -52,15 +52,17 @@ Notes:

 [![Text mode video](https://img.youtube.com/vi/81wd8NlF3Qw/0.jpg)](https://www.youtube.com/watch?v=81wd8NlF3Qw)

-## DSM Forward Programming
+## Graupner HoTT Model Locator

-This is a work in progress. It's only available for color screens (Horus, TX16S, T16, T18...).
+This is the Graupner HoTT adapted version of the Model Locator script using RSSI.

-If some text appears as Unknown_xxx, please report xxx and what the exact text display should be.
+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.

-Need OpenTX 2.3.10 nightly or above. Located on the radio SD card under \SCRIPTS\TOOLS.
+## DSM Tools for EdgeTX and OpenTx

-[![DSM Forward Programming](https://img.youtube.com/vi/sjIaDw5j9nE/0.jpg)](https://www.youtube.com/watch?v=sjIaDw5j9nE)
+Collection of EdgeTx/OpenTX Tools to use with Spektrum Receivers including forward programming. Extract the color or black&white zip version at the root of your SD card.
+
+Frank is maintaining these awesome tools, check out his [repository](https://github.com/frankiearzu/DSMTools). Feel free to ask questions or open issues there.

 ## DSM PID Flight log gain parameters for Blade micros

--- a/Lua_scripts/dsmtools-ETX-BW-2.4.zip
+++ b/Lua_scripts/dsmtools-ETX-BW-2.4.zip
--- a/Lua_scripts/dsmtools-ETX-color-2.6.zip
+++ b/Lua_scripts/dsmtools-ETX-color-2.6.zip
--- a/Multiprotocol/A7105_SPI.ino
+++ b/Multiprotocol/A7105_SPI.ino
@@ -418,10 +418,10 @@ void A7105_Init(void)
 			#ifdef KYOSHO_A7105_INO
 				if(protocol==PROTO_KYOSHO)
 				{
-					if(sub_protocol==KYOSHO_FHSS)
-						A7105_Regs=(uint8_t*)KYOSHO_A7105_regs;
-					else
+					if(sub_protocol==KYOSHO_HYPE)
 						A7105_Regs=(uint8_t*)KYOSHO_HYPE_A7105_regs;
+					else //FHSS && SYNCRO
+						A7105_Regs=(uint8_t*)KYOSHO_A7105_regs;
 				}
 			#endif
 		}
@@ -446,7 +446,7 @@ void A7105_Init(void)
 	}
 	A7105_Strobe(A7105_STANDBY);

-	if(protocol==PROTO_KYOSHO && sub_protocol==KYOSHO_FHSS)
+	if(protocol==PROTO_KYOSHO && sub_protocol!=KYOSHO_HYPE)
 	{//strange calibration...
 		//IF Filter Bank Calibration
 		A7105_WriteReg(A7105_02_CALC,0x0F);
--- a/Multiprotocol/AFHDS2A_Rx_a7105.ino
+++ b/Multiprotocol/AFHDS2A_Rx_a7105.ino
@@ -183,8 +183,18 @@ uint16_t AFHDS2A_RX_callback()
 	case AFHDS2A_RX_DATA:
 		if (AFHDS2A_RX_data_ready()) {
 			A7105_ReadData(AFHDS2A_RX_TXPACKET_SIZE);
-			if (memcmp(&packet[1], rx_id, 4) == 0 && memcmp(&packet[5], rx_tx_addr, 4) == 0) {
-				if (packet[0] == 0x58 && packet[37] == 0x00 && (telemetry_link&0x7F) == 0) { // standard packet, send channels to TX
+			if (memcmp(&packet[1], rx_id, 4) == 0 && memcmp(&packet[5], rx_tx_addr, 4) == 0)
+			{
+				#if 0
+					//if(packet[0] == 0xAA)
+					{
+						for(uint8_t i=0;i<AFHDS2A_RX_TXPACKET_SIZE;i++)
+							debug(" %02X",packet[i]);
+						debugln("");
+					}
+				#endif
+				if (packet[0] == 0x58 && packet[37] == 0x00 && (telemetry_link&0x7F) == 0)
+				{ // standard packet, send channels to TX
 					int rssi = min(A7105_ReadReg(A7105_1D_RSSI_THOLD),160);
 					RX_RSSI = map16b(rssi, 160, 8, 0, 128);
 					AFHDS2A_RX_build_telemetry_packet();
--- a/Multiprotocol/AFHDS2A_a7105.ino
+++ b/Multiprotocol/AFHDS2A_a7105.ino
@@ -93,15 +93,19 @@ static void AFHDS2A_update_telemetry()
 		if (option & 0x80)
 		{// forward 0xAA and 0xAC telemetry to TX, skip rx and tx id to save space
 			packet_in[0]= TX_RSSI;
-			debug("T(%02X)=",packet[0]);
+			//Fix for CROSSOVER-RX, 
+			if(packet[17+8]==0xFF && packet[21+8]==0xFC && packet[25+8]==0xFF)
+				packet[17+8]=0xFE;	// RX_ERR_RATE needed for TX to validate the telem
+			#if 0
+				debug("T(%02X)=",packet[0]);
+				for(uint8_t i=9;i < AFHDS2A_RXPACKET_SIZE; i++)
+					debug(" %02X",packet[i]);
+				debugln("");
+			#endif
 			for(uint8_t i=9;i < AFHDS2A_RXPACKET_SIZE; i++)
-			{
 				packet_in[i-8]=packet[i];
-				debug(" %02X",packet[i]);
-			}
 			packet_in[29]=packet[0];	// 0xAA Normal telemetry, 0xAC Extended telemetry
 			telemetry_link=2;
-			debugln("");
 			return;
 		}
 	#endif
@@ -186,16 +190,40 @@ static void AFHDS2A_build_packet(uint8_t type)
 		case AFHDS2A_PACKET_STICKS:		
 			packet[0] = 0x58;
 			//16 channels + RX_LQI on channel 17
-			for(uint8_t ch=0; ch<num_ch; ch++)
+			for(uint8_t ch=0; ch<17; ch++)
 			{
-				if(ch == 16 // CH17=RX_LQI
-				#ifdef AFHDS2A_LQI_CH
-					|| ch == (AFHDS2A_LQI_CH-1)	// override channel with LQI
-				#endif
-					)
-					val = 2000 - 10*RX_LQI;
+				val = convert_channel_ppm(sub_protocol<AFHDS2A_GYRO_OFF?CH_AETR[ch]:ch);	// No remapping for BS receivers
+				if(ch<14)
+				{
+					packet[9 +  ch*2] = val;
+					packet[10 + ch*2] = (val>>8)&0x0F;
+				}
 				else
-					val = convert_channel_ppm(CH_AETR[ch]);
+				{
+					if(ch == 16)	//CH17=RX_LQI
+						val = 2000 - 10*RX_LQI;
+					packet[10 + (ch-14)*6] |= (val)<<4;
+					packet[12 + (ch-14)*6] |= (val)&0xF0;
+					packet[14 + (ch-14)*6] |= (val>>4)&0xF0;
+				}
+			}
+			{
+				uint8_t next_hop = (hopping_frequency_no+1)&0x0F;
+				packet[34] |= next_hop<<4;
+				packet[36] |= next_hop?0x80:0x90;
+			}
+			break;
+		case AFHDS2A_PACKET_FAILSAFE:
+			packet[0] = 0x56;
+			for(uint8_t ch=0; ch<16; ch++)
+			{ // Failsafe values
+				#ifdef FAILSAFE_ENABLE
+					val = Failsafe_data[protocol==PROTO_AFHDS2A?CH_AETR[ch]:ch];	// No remapping for BS receivers
+					if(val!=FAILSAFE_CHANNEL_HOLD && val!=FAILSAFE_CHANNEL_NOPULSES)
+						val = (((val<<2)+val)>>3)+860;
+					else
+				#endif
+						val = 0x0FFF;
 				if(ch<14)
 				{
 					packet[9 +  ch*2] = val;
@@ -209,42 +237,6 @@ static void AFHDS2A_build_packet(uint8_t type)
 				}
 			}
 			break;
-		case AFHDS2A_PACKET_FAILSAFE:
-			packet[0] = 0x56;
-			for(uint8_t ch=0; ch<num_ch; ch++)
-			{
-				#ifdef FAILSAFE_ENABLE
-					if(ch<16)
-						val = Failsafe_data[CH_AETR[ch]];
-					else
-						val = FAILSAFE_CHANNEL_NOPULSES;
-					if(val!=FAILSAFE_CHANNEL_HOLD && val!=FAILSAFE_CHANNEL_NOPULSES)
-					{ // Failsafe values
-						val = (((val<<2)+val)>>3)+860;
-						if(ch<14)
-						{
-							packet[9 +  ch*2] = val;
-							packet[10 + ch*2] = (val>>8)&0x0F;
-						}
-						else
-						{
-							packet[10 + (ch-14)*6] &= 0x0F;
-							packet[10 + (ch-14)*6] |= (val)<<4;
-							packet[12 + (ch-14)*6] &= 0x0F;
-							packet[12 + (ch-14)*6] |= (val)&0xF0;
-							packet[14 + (ch-14)*6] &= 0x0F;
-							packet[14 + (ch-14)*6] |= (val>>4)&0xF0;
-						}
-					}
-					else
-				#endif
-						if(ch<14)
-						{ // no values
-							packet[9 + ch*2] = 0xff;
-							packet[10+ ch*2] = 0xff;
-						}
-			}
-			break;
 		case AFHDS2A_PACKET_SETTINGS:
 			packet[0] = 0xaa;
 			packet[9] = 0xfd;
@@ -253,17 +245,43 @@ static void AFHDS2A_build_packet(uint8_t type)
 			if(val<50 || val>400) val=50;	// default is 50Hz
 			packet[11]= val;
 			packet[12]= val >> 8;
-			packet[13] = sub_protocol & 0x01;	// 1 -> PPM output enabled
-			packet[14]= 0x00;
-			for(uint8_t i=15; i<37; i++)
-				packet[i] = 0xff;
-			packet[18] = 0x05;		// ?
-			packet[19] = 0xdc;		// ?
-			packet[20] = 0x05;		// ?
-			if(sub_protocol&2)
-				packet[21] = 0xdd;	// SBUS output enabled
+			memset(&packet[15],0xFF,22);
+#ifndef MULTI_AIR
+			if(sub_protocol < AFHDS2A_GYRO_OFF)
+			{
+#endif
+				packet[13] = sub_protocol & 0x01;	// 1 -> PPM output enabled
+				packet[14] = 0x00;		// ?
+				packet[18] = 0x05;		// ?
+				packet[19] = 0xdc;		// ?
+				packet[20] = 0x05;		// ?
+				if(sub_protocol&2)
+					packet[21] = 0xdd;	// SBUS output enabled
+				else
+					packet[21] = 0xde;	// IBUS
+#ifndef MULTI_AIR
+			}
 			else
-				packet[21] = 0xde;	// IBUS
+			{//BS receivers
+				if(sub_protocol == AFHDS2A_GYRO_OFF)
+				{
+					memset(&packet[15],0x00,4);
+					packet[22] = 0xFC;	// ?
+				}
+				else
+				{//AFHDS2A_GYRO_ON & AFHDS2A_GYRO_ON_REV
+					packet[15] = convert_channel_16b_limit(CH13,0,100);	// ST Gain
+					packet[16] = convert_channel_16b_limit(CH14,0,100);	// TH Gain
+					packet[17] = convert_channel_16b_limit(CH15,0,100);	// Priority
+					if(sub_protocol == AFHDS2A_GYRO_ON_REV)
+						packet[17] |= 0x80;								// Reverse
+					packet[18] = CH16_SW?(0x32|0x80):0x32;				// Calib|50?
+					packet[19] = 0x64;									// 100?
+					packet[20] = 0x64;									// 100?
+					packet[22] = 0xFE;									// ?
+				}
+			}
+#endif
 			break;
 	}
 	packet[37] = 0x00;
@@ -283,6 +301,9 @@ uint16_t AFHDS2A_callback()
 	static uint16_t packet_counter;
 	uint8_t data_rx=0;
 	uint16_t start;
+	#ifndef MULTI_AIR
+		static uint16_t Prev_Channel[4] = { 0,0,0,0 };
+	#endif
 	#ifndef FORCE_AFHDS2A_TUNING
 		A7105_AdjustLOBaseFreq(1);
 	#endif
@@ -292,10 +313,17 @@ uint16_t AFHDS2A_callback()
 		case AFHDS2A_BIND2:
 		case AFHDS2A_BIND3:
 			AFHDS2A_build_bind_packet();
+			data_rx=A7105_ReadReg(A7105_00_MODE);			// Check if something has been received...
 			A7105_WriteData(AFHDS2A_TXPACKET_SIZE, packet_count%2 ? 0x0d : 0x8c);
-			if(!(A7105_ReadReg(A7105_00_MODE) & (1<<5)))	//  removed FECF check due to issues with fs-x6b -> & (1<<5 | 1<<6)
-			{ // CRCF Ok
+			if(!(A7105_ReadReg(A7105_00_MODE) & (1<<5)) && !(data_rx & 1))	// removed FECF check due to issues with fs-x6b ->  & (1<<5 | 1<<6)
+			{ // RX+CRCF Ok
 				A7105_ReadData(AFHDS2A_RXPACKET_SIZE);
+				#if 0
+					debug("RX");
+					for(uint8_t i=0; i<AFHDS2A_RXPACKET_SIZE ; i++)
+						debug(" %02X", packet[i]);
+					debugln("");
+				#endif
 				if(packet[0] == 0xbc && packet[9] == 0x01)
 				{
 					uint16_t addr;
@@ -330,7 +358,7 @@ uint16_t AFHDS2A_callback()
 				if(!(A7105_ReadReg(A7105_00_MODE) & 0x01))
 					break;
 			A7105_SetPower();
-			A7105_SetTxRxMode(TXRX_OFF);					// Turn LNA off since we are in near range and we want to prevent swamping
+			A7105_SetTxRxMode((packet_count & 0x40) ? TXRX_OFF : RX_EN);	// Turn LNA off time to time since we are in near range and we want to prevent swamping
 			A7105_Strobe(A7105_RX);
 			phase &= ~AFHDS2A_WAIT_WRITE;
 			phase++;
@@ -360,10 +388,39 @@ uint16_t AFHDS2A_callback()
 			AFHDS2A_build_packet(packet_type);
 			data_rx=A7105_ReadReg(A7105_00_MODE);			// Check if something has been received...
 			A7105_WriteData(AFHDS2A_TXPACKET_SIZE, hopping_frequency[hopping_frequency_no++]);
-			if(hopping_frequency_no >= AFHDS2A_NUMFREQ)
-				hopping_frequency_no = 0;
+			hopping_frequency_no &= 0x0F;					// AFHDS2A_NUMFREQ
+			#if 0
+				for(uint8_t i=0; i<AFHDS2A_TXPACKET_SIZE; i++)
+					debug(" %02X",packet[i]);
+				debugln("");
+			#endif
+			#ifndef MULTI_AIR
+				if(sub_protocol > AFHDS2A_GYRO_OFF)
+				{//Gyro is on
+					//Check if gyro settings have changed
+					uint16_t val;
+					for(uint8_t i=0;i<4;i++)
+					{
+						val = Channel_data[CH13+i] - Prev_Channel[i];
+						if(val&0x8000) val ^= 0xFFFF;
+						if(val > 10)
+						{//This setting has significantly changed
+							Prev_Channel[i] = Channel_data[CH13+i];
+							packet_sent = 5;
+						}
+					}
+				}
+				if(packet_sent && (packet_counter%5)==0)
+				{//Inform the RX of the change
+					packet_type = AFHDS2A_PACKET_SETTINGS;
+					packet_sent--;
+				}
+				else
+			#endif
 			if(!(packet_counter % 1313))
+			{//Send settings every 5s
 				packet_type = AFHDS2A_PACKET_SETTINGS;
+			}
 			else
 			{
 				#ifdef FAILSAFE_ENABLE
@@ -441,9 +498,6 @@ void AFHDS2A_init()
 			rx_id[i]=eeprom_read_byte((EE_ADDR)(addr+i));
 	}
 	hopping_frequency_no = 0;
-	if(sub_protocol&0x04)
-		num_ch=17;
-	else
-		num_ch=14;
+	packet_sent = 0;
 }
 #endif
--- a/Multiprotocol/Ares_cc2500.ino
+++ b/Multiprotocol/Ares_cc2500.ino
@@ -0,0 +1,254 @@
+/*
+ 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 ARES 6HPA transmitter
+
+#if defined(ARES_CC2500_INO)
+
+#include "iface_cc2500.h"
+
+//#define ARES_FORCE_ID
+
+#define ARES_COARSE				0
+
+#define ARES_PACKET_LEN			17
+#define ARES_NUM_FREQUENCIES	60
+
+enum {
+	ARES_START = 0x00,
+	ARES_CALIB = 0x01,
+	ARES_PREP  = 0x02,
+	ARES_DATA  = 0x03,
+};
+
+// CC2500 register init values captured from the ARES 6HPA transmitter
+const PROGMEM uint8_t ARES_init_values[] = {
+  /* 00 */ 0x06, 0x2E, 0x2E, 0x07, 0x5A, 0x60, 0x30, 0x04,
+  /* 08 */ 0x05, 0x00, 0x00, 0x06, 0x00, 0x5C, 0xB1, 0x3B + ARES_COARSE,
+  /* 10 */ 0x6A, 0xF8, 0x03, 0x23, 0x7A, 0x44, 0x07, 0x30,
+  /* 18 */ 0x18, 0x16, 0x6C, 0x43, 0x40, 0x91, 0x87, 0x6B,
+  /* 20 */ 0xF8, 0x56, 0x10, 0xA9, 0x0A, 0x00, 0x11
+};
+
+// Fixed hopping sequence captured from the ARES 6HPA transmitter.
+// This is a permutation of 60 channel values spread across the band.
+static const PROGMEM uint8_t ARES_hop[] = {
+	0xB0, 0x6F, 0x1D, 0xB4, 0x74, 0x20, 0xB8, 0xD8,
+	0x24, 0xBC, 0xDC, 0x28, 0x48, 0xE0, 0x2C, 0x4C,
+	0xE4, 0x90, 0x50, 0xE8, 0x94, 0x54, 0xEC, 0x00,
+	0x98, 0x58, 0x04, 0x9B, 0x5C, 0x08, 0xA0, 0xC0,
+	0x0C, 0xA4, 0xC3, 0x10, 0x30, 0xC6, 0x14, 0x34,
+	0xCC, 0x78, 0x38, 0xD0, 0x7C, 0x3C, 0xD4, 0x80,
+	0x40, 0x60, 0x84, 0x44, 0x64, 0x88, 0xA8, 0x68,
+	0x8C, 0xAC, 0x6C, 0x18
+};
+
+static void __attribute__((unused)) ARES_CC2500_init()
+{
+	CC2500_Strobe(CC2500_SRES);
+	delayMilliseconds(1);
+	CC2500_Strobe(CC2500_SIDLE);
+
+	for (uint8_t i = 0; i < 39; ++i)
+		CC2500_WriteReg(i, pgm_read_byte_near(&ARES_init_values[i]));
+
+	CC2500_WriteReg(CC2500_0C_FSCTRL0, option);
+	prev_option = option;
+
+	// Write PATABLE to max power (0xFF for all 8 entries) as captured
+	for (uint8_t i = 0; i < 8; i++)
+		CC2500_WriteReg(CC2500_3E_PATABLE, 0xFF);
+
+	CC2500_SetTxRxMode(TX_EN);
+	CC2500_SetPower();
+}
+
+// Load hopping table
+static void __attribute__((unused)) ARES_RF_channels()
+{
+	for (uint8_t i = 0; i < ARES_NUM_FREQUENCIES; i++)
+		hopping_frequency[i] = pgm_read_byte_near(&ARES_hop[i]);
+}
+
+static void __attribute__((unused)) ARES_tune_chan()
+{
+	CC2500_Strobe(CC2500_SIDLE);
+	CC2500_WriteReg(CC2500_0A_CHANNR, hopping_frequency[hopping_frequency_no]);
+	CC2500_Strobe(CC2500_SFTX);
+	CC2500_Strobe(CC2500_SCAL);
+}
+
+static void __attribute__((unused)) ARES_change_chan_fast()
+{
+	CC2500_Strobe(CC2500_SIDLE);
+	CC2500_WriteReg(CC2500_0A_CHANNR, hopping_frequency[hopping_frequency_no]);
+	CC2500_WriteReg(CC2500_25_FSCAL1, calData[hopping_frequency_no]);
+}
+
+// Advance the hop counter: cycles through 0-58 with step, inserting 59 when wrapping through 0
+static uint8_t __attribute__((unused)) ARES_next_counter(uint8_t current, uint8_t step)
+{
+	if (current == 59)
+		return 0;
+	uint8_t next = (current + step) % 59;
+	if (next == 0)
+		return 59;
+	return next;
+}
+
+static void __attribute__((unused)) ARES_build_packet()
+{
+	// Length byte: 16 data bytes follow
+	packet[0] = 0x10;
+
+	// TX ID
+	packet[1] = rx_tx_addr[1];
+	packet[2] = rx_tx_addr[2];
+	packet[3] = rx_tx_addr[3];
+
+	// 6 channels encoded as interleaved 12-bit values in bytes 4-12
+	uint16_t ch[6];
+	for (uint8_t i = 0; i < 6; i++)
+		ch[i] = convert_channel_16b_nolimit(i, 1820, 3300, false);
+
+	packet[4]  = ch[0] >> 4;
+	packet[5]  = ((ch[0] & 0x0F) << 4) | (ch[1] & 0x0F);
+	packet[6]  = ch[1] >> 4;
+	packet[7]  = ch[2] >> 4;
+	packet[8]  = ((ch[2] & 0x0F) << 4) | (ch[3] & 0x0F);
+	packet[9]  = ch[3] >> 4;
+	packet[10] = ch[4] >> 4;
+	packet[11] = ((ch[4] & 0x0F) << 4) | (ch[5] & 0x0F);
+	packet[12] = ch[5] >> 4;
+
+	// Byte 16: counter step size (stored in crc, set to 1-58 in ARES_init)
+	uint8_t step = crc;
+
+	// Bytes 13-15: running counter with rotating bit 7 frame indicator
+	// The counter cycles 0-58 with a step, inserting 59 before wrapping to 0
+	// Each group of 3 packets has 3 consecutive counter values
+	// packet_count holds the current counter value
+	uint8_t c0 = packet_count;
+	uint8_t c1 = ARES_next_counter(c0, step);
+	uint8_t c2 = ARES_next_counter(c1, step);
+
+	// Frame indicator: each data frame is sent 3 times
+	// bind_phase tracks position 0/1/2 within the group of 3
+	packet[13] = c0;
+	packet[14] = c1;
+	packet[15] = c2;
+	packet[16] = step;
+
+	// Set the rotating frame bit (bit 7) on one of bytes 13-15
+	switch (bind_phase)
+	{
+		case 0:
+			packet[13] |= 0x80;
+			break;
+		case 1:
+			packet[14] |= 0x80;
+			break;
+		case 2:
+			packet[15] |= 0x80;
+			break;
+	}
+}
+
+static void __attribute__((unused)) ARES_send_packet()
+{
+	ARES_change_chan_fast();
+	CC2500_SetPower();
+	CC2500_WriteData(packet, ARES_PACKET_LEN);
+}
+
+#define ARES_PACKET_PERIOD	6670	// 6.67ms between packets
+#define ARES_PREP_TIMING	2000
+
+uint16_t ARES_callback()
+{
+	switch(phase)
+	{
+		case ARES_START:
+			ARES_CC2500_init();
+			hopping_frequency_no = 0;
+			bind_phase = 0;
+			ARES_tune_chan();
+			phase = ARES_CALIB;
+			return ARES_PREP_TIMING;
+		case ARES_CALIB:
+			calData[hopping_frequency_no] = CC2500_ReadReg(CC2500_25_FSCAL1);
+			hopping_frequency_no++;
+			if (hopping_frequency_no < ARES_NUM_FREQUENCIES)
+				ARES_tune_chan();
+			else
+			{
+				hopping_frequency_no = 0;
+				phase = ARES_PREP;
+			}
+			return ARES_PREP_TIMING;
+		case ARES_PREP:
+			if (prev_option != option)
+			{
+				phase = ARES_START;
+				return ARES_PREP_TIMING;
+			}
+			#ifdef MULTI_SYNC
+				telemetry_set_input_sync(ARES_PACKET_PERIOD);
+			#endif
+			ARES_build_packet();
+			phase = ARES_DATA;
+			// Fall through
+		case ARES_DATA:
+			ARES_send_packet();
+			hopping_frequency_no++;
+			if (hopping_frequency_no >= ARES_NUM_FREQUENCIES)
+				hopping_frequency_no = 0;
+			bind_phase++;
+			if (bind_phase >= 3)
+			{
+				bind_phase = 0;
+				// Advance counter to start of next group
+				uint8_t step = crc;
+				packet_count = ARES_next_counter(packet_count, step);
+				packet_count = ARES_next_counter(packet_count, step);
+				packet_count = ARES_next_counter(packet_count, step);
+			}
+			phase = ARES_PREP;
+			return ARES_PACKET_PERIOD;
+	}
+	return 0;
+}
+
+void ARES_init()
+{
+	BIND_DONE;	// Autobind protocol - no TX-initiated bind phase
+	ARES_RF_channels();
+
+	// rx_tx_addr[1] and [2] are already set from MProtocol_id by the framework
+	// RX_num (0-63) in byte 3 provides model match
+	rx_tx_addr[3] = RX_num;
+
+	// Counter step and start from capture
+	crc = 23;
+	packet_count = 35;
+
+	#ifdef ARES_FORCE_ID
+		rx_tx_addr[1] = 0xDC;
+		rx_tx_addr[2] = 0xCC;
+		rx_tx_addr[3] = 0x00;
+	#endif
+	phase = ARES_START;
+}
+
+#endif
--- a/Multiprotocol/BUMBLEB_ccnrf.ino
+++ b/Multiprotocol/BUMBLEB_ccnrf.ino
@@ -0,0 +1,196 @@
+/*
+ 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(BUMBLEB_CCNRF_INO)
+
+#include "iface_xn297.h"
+
+#define FORCE_BUMBLEB_ORIGINAL_ID
+#define BUMBLEB_TELEM_DEBUG
+
+#define BUMBLEB_PACKET_PERIOD	10200
+#define BUMBLEB_RF_BIND_CHANNEL	42
+#define BUMBLEB_RF_NUM_CHANNELS	2
+#define BUMBLEB_PAYLOAD_SIZE	7
+
+static void __attribute__((unused)) BUMBLEB_send_packet()
+{
+	packet[6] = 0x00;
+	if(IS_BIND_IN_PROGRESS)
+	{
+		packet[0] = rx_tx_addr[0];
+		packet[1] = rx_tx_addr[1];
+		packet[2] = 0x54;			 //???
+		packet[3] = 0x58;			 //???
+		hopping_frequency_no ^= 0x01;
+		packet[4] = hopping_frequency[hopping_frequency_no];
+	}
+	else
+	{
+		//hopping frequency
+		XN297_Hopping(hopping_frequency_no);
+		hopping_frequency_no ^= 0x01;
+		packet[0] = 0x20
+					|GET_FLAG(CH6_SW,0x80);				// High rate
+		packet[1] = convert_channel_8b_limit_deadband(AILERON,0xBF,0xA0,0x81,40);	// Aileron: Max values:BD..A0..82
+		if(packet[1] < 0xA0)
+			packet[1] = 0x20 - packet[1];				// Reverse low part of aileron
+		packet[2] = convert_channel_8b(CH5)>>2;			// 01..20..3F
+		if(CH7_SW)										// Drive trim from aileron
+		{
+			uint8_t ch=convert_channel_8b(AILERON);
+			if(ch > 0x5A && ch < 0x80-0x07)
+				packet[2] = ch - 0x5A;
+			else if(ch < 0x5A)
+			{
+				if(ch < 0x5A-0x20)
+					packet[2] = 0;
+				else
+					packet[2] = ch - (0x5A-0x20);
+			}
+			else if(packet[1] == 0x89)
+				packet[2] = 0x20;
+			else if(ch > 0xA5)
+			{
+				if(ch > 0xA9+0x1F)
+					packet[2] = 0x3F;
+				else
+					packet[2] = ch - 0x89;
+			}
+			else if(ch > 0xA5-0x1F)
+				packet[2] = ch - (0xA5-0x1F-0x20);
+		}
+		else
+			packet[2] = convert_channel_8b(CH5)>>2;		// 01..20..3F
+		packet[3] = convert_channel_8b(THROTTLE)>>2;	// 00..3F
+		packet[4] = hopping_frequency[hopping_frequency_no];
+	}
+
+	packet[5] = packet[0];
+	for(uint8_t i=1;i<BUMBLEB_PAYLOAD_SIZE-2;i++)
+		packet[5] += packet[i];
+
+	#if 0
+		debug("P:");
+		for(uint8_t i=0;i<BUMBLEB_PAYLOAD_SIZE;i++)
+			debug(" %02X", packet[i]);
+		debugln("");
+	#endif
+
+	XN297_SetPower();									// Set tx_power
+	XN297_SetFreqOffset();								// Set frequency offset
+	XN297_SetTxRxMode(TX_EN);
+	XN297_WritePayload(packet, BUMBLEB_PAYLOAD_SIZE);
+}
+
+static void __attribute__((unused)) BUMBLEB_RF_init()
+{
+	//Config CC2500
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_250K);
+	XN297_SetTXAddr((uint8_t*)"\x55\x55\x55\x55\x55", 5);
+	XN297_HoppingCalib(BUMBLEB_RF_NUM_CHANNELS);		// Calibrate all channels
+	XN297_RFChannel(BUMBLEB_RF_BIND_CHANNEL);			// Set bind channel
+	XN297_SetRXAddr(rx_tx_addr, BUMBLEB_PAYLOAD_SIZE);
+}
+
+static void __attribute__((unused)) BUMBLEB_initialize_txid()
+{
+	calc_fh_channels(BUMBLEB_RF_NUM_CHANNELS);
+	rx_tx_addr[0] = rx_tx_addr[2];
+	rx_tx_addr[1] = rx_tx_addr[3];
+	#ifdef FORCE_BUMBLEB_ORIGINAL_ID
+		rx_tx_addr[0] = 0x33;
+		rx_tx_addr[1] = 0x65;
+		hopping_frequency[0] = 2;
+		hopping_frequency[1] = 40;
+	#endif
+	rx_tx_addr[2] = rx_tx_addr[3] = rx_tx_addr[4] = 0x55;
+}
+
+enum {
+	BUMBLEB_BIND		= 0x00,
+	BUMBLEB_BINDRX		= 0x01,
+	BUMBLEB_DATA		= 0x02,
+};
+
+#define BUMBLEB_WRITE_TIME 850
+
+uint16_t BUMBLEB_callback()
+{
+	bool rx;
+	switch(phase)
+	{
+		case BUMBLEB_BIND:
+			rx = XN297_IsRX();				// Needed for the NRF24L01 since otherwise the bit gets cleared
+
+			BUMBLEB_send_packet();
+
+			if( rx )
+			{ // a packet has been received
+				#ifdef BUMBLEB_TELEM_DEBUG
+					debug("RX :");
+				#endif
+				if(XN297_ReadPayload(packet_in, BUMBLEB_PAYLOAD_SIZE))
+				{ // packet with good CRC
+					#ifdef BUMBLEB_TELEM_DEBUG
+						debug("OK :");
+						for(uint8_t i=0;i<BUMBLEB_PAYLOAD_SIZE;i++)
+							debug(" %02X",packet_in[i]);
+					#endif
+					// packet_in = 4F 71 55 52 58 61 AA
+					rx_tx_addr[2] = packet_in[0];
+					rx_tx_addr[3] = packet_in[1];
+					//rx_tx_addr[4] = packet_in[2];	// to test with other planes...
+					XN297_SetTXAddr(rx_tx_addr, 5);
+					BIND_DONE;
+					phase = BUMBLEB_DATA;
+					break;
+				}
+			}
+			phase++;
+			return BUMBLEB_WRITE_TIME;
+		case BUMBLEB_BINDRX:
+			{
+				uint16_t start=(uint16_t)micros();
+				while ((uint16_t)((uint16_t)micros()-(uint16_t)start) < 500)
+				{
+					if(XN297_IsPacketSent())
+						break;
+				}
+			}
+			XN297_SetTxRxMode(RX_EN);
+			phase = BUMBLEB_BIND;
+			return BUMBLEB_PACKET_PERIOD-BUMBLEB_WRITE_TIME;
+		case BUMBLEB_DATA:
+			#ifdef MULTI_SYNC
+				telemetry_set_input_sync(BUMBLEB_PACKET_PERIOD);
+			#endif
+			BUMBLEB_send_packet();
+			break;
+	}
+	return BUMBLEB_PACKET_PERIOD;
+}
+
+void BUMBLEB_init()
+{
+	BUMBLEB_initialize_txid();
+	BUMBLEB_RF_init();
+	hopping_frequency_no = 0;
+	
+	BIND_IN_PROGRESS;	// autobind protocol
+	phase = BUMBLEB_BIND;
+}
+
+#endif
--- a/Multiprotocol/Bluefly_ccnrf.ino
+++ b/Multiprotocol/Bluefly_ccnrf.ino
@@ -0,0 +1,118 @@
+/*
+ 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 BLUEFLY HP100
+
+#if defined(BLUEFLY_CCNRF_INO)
+
+#include "iface_nrf250k.h"
+
+#define BLUEFLY_PACKET_PERIOD		6000
+#define BLUEFLY_PACKET_SIZE			12
+#define BLUEFLY_RF_BIND_CHANNEL		81
+#define BLUEFLY_NUM_RF_CHANNELS		15
+#define BLUEFLY_BIND_COUNT			800
+#define BLUEFLY_TXID_SIZE			5
+
+static void __attribute__((unused)) BLUEFLY_send_packet()
+{
+	if(IS_BIND_IN_PROGRESS)
+	{
+		memset(packet, 0x55, BLUEFLY_PACKET_SIZE);
+		memcpy(packet, rx_tx_addr, BLUEFLY_TXID_SIZE);
+		packet[5] = hopping_frequency[0];
+	}
+	else
+	{
+		NRF250K_Hopping(hopping_frequency_no);
+		hopping_frequency_no++;
+		if(hopping_frequency_no >= BLUEFLY_NUM_RF_CHANNELS);
+			hopping_frequency_no = 0;
+
+		packet[8] = packet[9] = 0;
+		for(uint8_t i=0; i<8 ; i++)
+		{
+			uint16_t ch = convert_channel_16b_limit(CH_AETR[i], 0, 1000);
+			packet[ i] = ch;
+			ch &= 0x300;
+			ch >>= 2;
+			packet[8 + (i>3?0:1)] = (packet[8 + (i>3?0:1)] >> 2) | ch;
+		}
+		// Checksum
+		uint8_t l, h, t;
+		l = h = 0xff;
+		for (uint8_t i=0; i<10; ++i)
+		{
+			h ^= packet[i];
+			h ^= h >> 4;
+			t = h;
+			h = l;
+			l = t;
+			t = (l<<4) | (l>>4);
+			h ^= ((t<<2) | (t>>6)) & 0x1f;
+			h ^= t & 0xf0;
+			l ^= ((t<<1) | (t>>7)) & 0xe0;
+		}
+		packet[10] = h; 
+		packet[11] = l;
+	}
+	
+	NRF250K_WritePayload(packet, BLUEFLY_PACKET_SIZE);
+	NRF250K_SetPower();				// Set tx_power
+	NRF250K_SetFreqOffset();		// Set frequency offset
+}
+
+static void __attribute__((unused)) BLUEFLY_RF_init()
+{
+	NRF250K_Init();
+	NRF250K_SetTXAddr((uint8_t *)"\x32\xAA\x45\x45\x78", BLUEFLY_TXID_SIZE);	// BLUEFLY Bind address
+	NRF250K_HoppingCalib(BLUEFLY_NUM_RF_CHANNELS);								// Calibrate all channels
+	NRF250K_RFChannel(BLUEFLY_RF_BIND_CHANNEL);									// Set bind channel
+}
+
+static void __attribute__((unused)) BLUEFLY_initialize_txid()
+{
+    uint8_t start = (rx_tx_addr[3] % 47) + 2;
+	for(uint8_t i=0;i<BLUEFLY_NUM_RF_CHANNELS;i++)
+		hopping_frequency[i] = start + i*2;
+	hopping_frequency_no=0;
+}
+
+uint16_t BLUEFLY_callback()
+{
+	#ifdef MULTI_SYNC
+		telemetry_set_input_sync(BLUEFLY_PACKET_PERIOD);
+	#endif
+	if(bind_counter)
+	{
+		bind_counter--;
+		if (bind_counter == 0)
+		{
+			BIND_DONE;
+			NRF250K_SetTXAddr(rx_tx_addr, BLUEFLY_TXID_SIZE);
+		}
+	}
+	BLUEFLY_send_packet();
+	return	BLUEFLY_PACKET_PERIOD;
+}
+
+void BLUEFLY_init(void)
+{
+	BLUEFLY_initialize_txid();
+	BLUEFLY_RF_init();
+
+	bind_counter = IS_BIND_IN_PROGRESS ? BLUEFLY_BIND_COUNT : 1;
+}
+
+#endif
--- a/Multiprotocol/CYRF6936_SPI.ino
+++ b/Multiprotocol/CYRF6936_SPI.ino
@@ -195,11 +195,11 @@ void CYRF_ConfigSOPCode(const uint8_t *sopcodes)
 	CYRF_WriteRegisterMulti(CYRF_22_SOP_CODE, sopcodes, 8);
 }

-void CYRF_ConfigDataCode(const uint8_t *datacodes, uint8_t len)
+void CYRF_ConfigDataCode(const uint8_t *datacodes)
 {
 	//NOTE: This can also be implemented as:
-	//for(i = 0; i < len; i++) WriteRegister)0x23, datacodes[i];
-	CYRF_WriteRegisterMulti(CYRF_23_DATA_CODE, datacodes, len);
+	//for(i = 0; i < 16; i++) WriteRegister)0x23, datacodes[i];
+	CYRF_WriteRegisterMulti(CYRF_23_DATA_CODE, datacodes, 16);
 }

 void CYRF_WritePreamble(uint32_t preamble)
@@ -249,7 +249,7 @@ void CYRF_WriteDataPacket(const uint8_t dpbuffer[])
 }
 */
 //NOTE: This routine will reset the CRC Seed
-void CYRF_FindBestChannels(uint8_t *channels, uint8_t len, uint8_t minspace, uint8_t min, uint8_t max)
+void CYRF_FindBestChannels(uint8_t *channels, uint8_t len, uint8_t minspace, uint8_t min, uint8_t max, uint8_t forced)
 {
 	#define NUM_FREQ 80
 	#define FREQ_OFFSET 4
@@ -269,7 +269,12 @@ void CYRF_FindBestChannels(uint8_t *channels, uint8_t len, uint8_t minspace, uin
 	delayMilliseconds(1);
 	for(i = 0; i < NUM_FREQ; i++)
 	{
-		CYRF_ConfigRFChannel(protocol==PROTO_LOSI?i|1:i);
+		if(((i&1) && forced == FIND_CHANNEL_EVEN) || (!(i&1) && forced == FIND_CHANNEL_ODD))
+		{
+			rssi[i] = 0xFF;
+			continue;
+		}
+		CYRF_ConfigRFChannel(i);	//protocol==PROTO_LOSI?i|1:i);
 		delayMicroseconds(270);					//slow channel require 270usec for synthesizer to settle
        if( !(CYRF_ReadRegister(CYRF_05_RX_CTRL) & 0x80)) {
            CYRF_WriteRegister(CYRF_05_RX_CTRL, 0x80); //Prepare to receive
@@ -298,7 +303,7 @@ void CYRF_FindBestChannels(uint8_t *channels, uint8_t len, uint8_t minspace, uin
 	CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x00);		// Clear abort RX
 }

-#if defined(DEVO_CYRF6936_INO) || defined(J6PRO_CYRF6936_INO)
+#if defined(DEVO_CYRF6936_INO) || defined(J6PRO_CYRF6936_INO) || defined(TRAXXAS_CYRF6936_INO)
 const uint8_t PROGMEM DEVO_j6pro_sopcodes[][8] = {
    /* Note these are in order transmitted (LSB 1st) */
    {0x3C, 0x37, 0xCC, 0x91, 0xE2, 0xF8, 0xCC, 0x91},
@@ -311,7 +316,7 @@ const uint8_t PROGMEM DEVO_j6pro_sopcodes[][8] = {
    {0xB9, 0x8E, 0x19, 0x74, 0x6F, 0x65, 0x18, 0x74},
    {0xDF, 0xB1, 0xC0, 0x49, 0x62, 0xDF, 0xC1, 0x49},
    {0x97, 0xE5, 0x14, 0x72, 0x7F, 0x1A, 0x14, 0x72},
-#if defined(J6PRO_CYRF6936_INO)
+#if defined(J6PRO_CYRF6936_INO) || defined(TRAXXAS_CYRF6936_INO)
    {0x82, 0xC7, 0x90, 0x36, 0x21, 0x03, 0xFF, 0x17},
    {0xE2, 0xF8, 0xCC, 0x91, 0x3C, 0x37, 0xCC, 0x91}, //Note: the '03' was '9E' in the Cypress recommended table
    {0xAD, 0x39, 0xA2, 0x0F, 0x9B, 0xC5, 0xA1, 0x0F}, //The following are the same as the 1st 8 above,
@@ -321,6 +326,7 @@ const uint8_t PROGMEM DEVO_j6pro_sopcodes[][8] = {
    {0xB6, 0x31, 0xAE, 0x46, 0x5A, 0xCC, 0xAE, 0x46},
    {0x9E, 0x82, 0xDC, 0x3C, 0xA1, 0x78, 0xDC, 0x3C},
    {0x6F, 0x65, 0x18, 0x74, 0xB9, 0x8E, 0x19, 0x74},
+    {0x62, 0xDF, 0xC1, 0x49, 0xDF, 0xB1, 0xC0, 0x49}, //j6pro bind
 #endif
 };
 #endif
@@ -328,8 +334,13 @@ const uint8_t PROGMEM DEVO_j6pro_sopcodes[][8] = {
 static void __attribute__((unused)) CYRF_PROGMEM_ConfigSOPCode(const uint8_t *data)
 {
 	uint8_t code[8];
+	//debug("SOP:");
 	for(uint8_t i=0;i<8;i++)
+	{
 		code[i]=pgm_read_byte_near(&data[i]);
+		//debug(" %02X",code[i]);
+	}
+	//debugln("");
 	CYRF_ConfigSOPCode(code);
 }

--- a/Multiprotocol/DSM.ino
+++ b/Multiprotocol/DSM.ino
@@ -4,9 +4,45 @@

 uint8_t sop_col;

-const uint8_t PROGMEM DSM_pncodes[5][9][8] = {
+const uint8_t PROGMEM DSM_pncodes[][8] = {
 	/* Note these are in order transmitted (LSB 1st) */
-	{ /* Row 0 */
+	/* Row 1 */
+		/* Col 0 */ {0x83, 0xF7, 0xA8, 0x2D, 0x7A, 0x44, 0x64, 0xD3},
+		/* Col 1 */ {0x3F, 0x2C, 0x4E, 0xAA, 0x71, 0x48, 0x7A, 0xC9},
+		/* Col 2 */ {0x17, 0xFF, 0x9E, 0x21, 0x36, 0x90, 0xC7, 0x82},
+		/* Col 3 */ {0xBC, 0x5D, 0x9A, 0x5B, 0xEE, 0x7F, 0x42, 0xEB},
+		/* Col 4 */ {0x24, 0xF5, 0xDD, 0xF8, 0x7A, 0x77, 0x74, 0xE7},
+		/* Col 5 */ {0x3D, 0x70, 0x7C, 0x94, 0xDC, 0x84, 0xAD, 0x95},
+		/* Col 6 */ {0x1E, 0x6A, 0xF0, 0x37, 0x52, 0x7B, 0x11, 0xD4},
+		/* Col 7 */ {0x62, 0xF5, 0x2B, 0xAA, 0xFC, 0x33, 0xBF, 0xAF},
+	/* Row 2 */
+		/* Col 0 */ {0x40, 0x56, 0x32, 0xD9, 0x0F, 0xD9, 0x5D, 0x97},
+		/* Col 1 */ {0x8E, 0x4A, 0xD0, 0xA9, 0xA7, 0xFF, 0x20, 0xCA},
+		/* Col 2 */ {0x4C, 0x97, 0x9D, 0xBF, 0xB8, 0x3D, 0xB5, 0xBE},
+		/* Col 3 */ {0x0C, 0x5D, 0x24, 0x30, 0x9F, 0xCA, 0x6D, 0xBD},
+		/* Col 4 */ {0x50, 0x14, 0x33, 0xDE, 0xF1, 0x78, 0x95, 0xAD},
+		/* Col 5 */ {0x0C, 0x3C, 0xFA, 0xF9, 0xF0, 0xF2, 0x10, 0xC9},
+		/* Col 6 */ {0xF4, 0xDA, 0x06, 0xDB, 0xBF, 0x4E, 0x6F, 0xB3},
+		/* Col 7 */ {0x9E, 0x08, 0xD1, 0xAE, 0x59, 0x5E, 0xE8, 0xF0},
+	/* Row 3 */
+		/* Col 0 */ {0xC0, 0x90, 0x8F, 0xBB, 0x7C, 0x8E, 0x2B, 0x8E},
+		/* Col 1 */ {0x80, 0x69, 0x26, 0x80, 0x08, 0xF8, 0x49, 0xE7},
+		/* Col 2 */ {0x7D, 0x2D, 0x49, 0x54, 0xD0, 0x80, 0x40, 0xC1},
+		/* Col 3 */ {0xB6, 0xF2, 0xE6, 0x1B, 0x80, 0x5A, 0x36, 0xB4},
+		/* Col 4 */ {0x42, 0xAE, 0x9C, 0x1C, 0xDA, 0x67, 0x05, 0xF6},
+		/* Col 5 */ {0x9B, 0x75, 0xF7, 0xE0, 0x14, 0x8D, 0xB5, 0x80},
+		/* Col 6 */ {0xBF, 0x54, 0x98, 0xB9, 0xB7, 0x30, 0x5A, 0x88},
+		/* Col 7 */ {0x35, 0xD1, 0xFC, 0x97, 0x23, 0xD4, 0xC9, 0x88},
+	/* Row 4 */
+		/* Col 0 */ {0xE1, 0xD6, 0x31, 0x26, 0x5F, 0xBD, 0x40, 0x93}, // Wrong values used by Orange TX/RX Row 3 Col 8: {0x88, 0xE1, 0xD6, 0x31, 0x26, 0x5F, 0xBD, 0x40}
+		/* Col 1 */ {0xDC, 0x68, 0x08, 0x99, 0x97, 0xAE, 0xAF, 0x8C},
+		/* Col 2 */ {0xC3, 0x0E, 0x01, 0x16, 0x0E, 0x32, 0x06, 0xBA},
+		/* Col 3 */ {0xE0, 0x83, 0x01, 0xFA, 0xAB, 0x3E, 0x8F, 0xAC},
+		/* Col 4 */ {0x5C, 0xD5, 0x9C, 0xB8, 0x46, 0x9C, 0x7D, 0x84},
+		/* Col 5 */ {0xF1, 0xC6, 0xFE, 0x5C, 0x9D, 0xA5, 0x4F, 0xB7},
+		/* Col 6 */ {0x58, 0xB5, 0xB3, 0xDD, 0x0E, 0x28, 0xF1, 0xB0},
+		/* Col 7 */ {0x5F, 0x30, 0x3B, 0x56, 0x96, 0x45, 0xF4, 0xA1},
+	/* Row 0 */
 		/* Col 0 */ {0x03, 0xBC, 0x6E, 0x8A, 0xEF, 0xBD, 0xFE, 0xF8},
 		/* Col 1 */ {0x88, 0x17, 0x13, 0x3B, 0x2D, 0xBF, 0x06, 0xD6},
 		/* Col 2 */ {0xF1, 0x94, 0x30, 0x21, 0xA1, 0x1C, 0x88, 0xA9},
@@ -16,59 +52,15 @@ const uint8_t PROGMEM DSM_pncodes[5][9][8] = {
 		/* Col 6 */ {0xEF, 0x03, 0x95, 0x89, 0xB4, 0x71, 0x61, 0x9D},
 		/* Col 7 */ {0x40, 0xBA, 0x97, 0xD5, 0x86, 0x4F, 0xCC, 0xD1},
 		/* Col 8 */ {0xD7, 0xA1, 0x54, 0xB1, 0x5E, 0x89, 0xAE, 0x86}
-	},
-	{ /* Row 1 */
-		/* Col 0 */ {0x83, 0xF7, 0xA8, 0x2D, 0x7A, 0x44, 0x64, 0xD3},
-		/* Col 1 */ {0x3F, 0x2C, 0x4E, 0xAA, 0x71, 0x48, 0x7A, 0xC9},
-		/* Col 2 */ {0x17, 0xFF, 0x9E, 0x21, 0x36, 0x90, 0xC7, 0x82},
-		/* Col 3 */ {0xBC, 0x5D, 0x9A, 0x5B, 0xEE, 0x7F, 0x42, 0xEB},
-		/* Col 4 */ {0x24, 0xF5, 0xDD, 0xF8, 0x7A, 0x77, 0x74, 0xE7},
-		/* Col 5 */ {0x3D, 0x70, 0x7C, 0x94, 0xDC, 0x84, 0xAD, 0x95},
-		/* Col 6 */ {0x1E, 0x6A, 0xF0, 0x37, 0x52, 0x7B, 0x11, 0xD4},
-		/* Col 7 */ {0x62, 0xF5, 0x2B, 0xAA, 0xFC, 0x33, 0xBF, 0xAF},
-		/* Col 8 */ {0x40, 0x56, 0x32, 0xD9, 0x0F, 0xD9, 0x5D, 0x97}
-	},
-	{ /* Row 2 */
-		/* Col 0 */ {0x40, 0x56, 0x32, 0xD9, 0x0F, 0xD9, 0x5D, 0x97},
-		/* Col 1 */ {0x8E, 0x4A, 0xD0, 0xA9, 0xA7, 0xFF, 0x20, 0xCA},
-		/* Col 2 */ {0x4C, 0x97, 0x9D, 0xBF, 0xB8, 0x3D, 0xB5, 0xBE},
-		/* Col 3 */ {0x0C, 0x5D, 0x24, 0x30, 0x9F, 0xCA, 0x6D, 0xBD},
-		/* Col 4 */ {0x50, 0x14, 0x33, 0xDE, 0xF1, 0x78, 0x95, 0xAD},
-		/* Col 5 */ {0x0C, 0x3C, 0xFA, 0xF9, 0xF0, 0xF2, 0x10, 0xC9},
-		/* Col 6 */ {0xF4, 0xDA, 0x06, 0xDB, 0xBF, 0x4E, 0x6F, 0xB3},
-		/* Col 7 */ {0x9E, 0x08, 0xD1, 0xAE, 0x59, 0x5E, 0xE8, 0xF0},
-		/* Col 8 */ {0xC0, 0x90, 0x8F, 0xBB, 0x7C, 0x8E, 0x2B, 0x8E}
-	},
-	{ /* Row 3 */
-		/* Col 0 */ {0xC0, 0x90, 0x8F, 0xBB, 0x7C, 0x8E, 0x2B, 0x8E},
-		/* Col 1 */ {0x80, 0x69, 0x26, 0x80, 0x08, 0xF8, 0x49, 0xE7},
-		/* Col 2 */ {0x7D, 0x2D, 0x49, 0x54, 0xD0, 0x80, 0x40, 0xC1},
-		/* Col 3 */ {0xB6, 0xF2, 0xE6, 0x1B, 0x80, 0x5A, 0x36, 0xB4},
-		/* Col 4 */ {0x42, 0xAE, 0x9C, 0x1C, 0xDA, 0x67, 0x05, 0xF6},
-		/* Col 5 */ {0x9B, 0x75, 0xF7, 0xE0, 0x14, 0x8D, 0xB5, 0x80},
-		/* Col 6 */ {0xBF, 0x54, 0x98, 0xB9, 0xB7, 0x30, 0x5A, 0x88},
-		/* Col 7 */ {0x35, 0xD1, 0xFC, 0x97, 0x23, 0xD4, 0xC9, 0x88},
-		/* Col 8 */ {0xE1, 0xD6, 0x31, 0x26, 0x5F, 0xBD, 0x40, 0x93}
-// Wrong values used by Orange TX/RX
-//		/* Col 8 */ {0x88, 0xE1, 0xD6, 0x31, 0x26, 0x5F, 0xBD, 0x40}
-	},
-	{ /* Row 4 */
-		/* Col 0 */ {0xE1, 0xD6, 0x31, 0x26, 0x5F, 0xBD, 0x40, 0x93},
-		/* Col 1 */ {0xDC, 0x68, 0x08, 0x99, 0x97, 0xAE, 0xAF, 0x8C},
-		/* Col 2 */ {0xC3, 0x0E, 0x01, 0x16, 0x0E, 0x32, 0x06, 0xBA},
-		/* Col 3 */ {0xE0, 0x83, 0x01, 0xFA, 0xAB, 0x3E, 0x8F, 0xAC},
-		/* Col 4 */ {0x5C, 0xD5, 0x9C, 0xB8, 0x46, 0x9C, 0x7D, 0x84},
-		/* Col 5 */ {0xF1, 0xC6, 0xFE, 0x5C, 0x9D, 0xA5, 0x4F, 0xB7},
-		/* Col 6 */ {0x58, 0xB5, 0xB3, 0xDD, 0x0E, 0x28, 0xF1, 0xB0},
-		/* Col 7 */ {0x5F, 0x30, 0x3B, 0x56, 0x96, 0x45, 0xF4, 0xA1},
-		/* Col 8 */ {0x03, 0xBC, 0x6E, 0x8A, 0xEF, 0xBD, 0xFE, 0xF8}
-	},
 };

-static void __attribute__((unused)) DSM_read_code(uint8_t *buf, uint8_t row, uint8_t col, uint8_t len)
+static void __attribute__((unused)) DSM_read_code(uint8_t *buf, uint8_t row, uint8_t col)
 {
-	for(uint8_t i=0;i<len;i++)
-		buf[i]=pgm_read_byte_near( &DSM_pncodes[row][col][i] );
+	row--;
+	if(row>4)
+		row = 4;
+	for(uint8_t i=0;i<8;i++)
+		buf[i]=pgm_read_byte_near( &DSM_pncodes[row*8+col][i] );
 }

 const uint8_t PROGMEM DSM_init_vals[][2] = {
@@ -137,11 +129,11 @@ static void __attribute__((unused)) DSM_set_sop_data_crc(bool ch2, bool dsmx)
 		debug_time();
 		debug(" crc:%04X,row:%d,col:%d,rf:%02X",(~seed)&0xffff,pn_row,sop_col,hopping_frequency[hopping_frequency_no]);
 	#endif
-	DSM_read_code(code,pn_row,sop_col,8);					// pn_row between 0 and 4, sop_col between 1 and 7
+	DSM_read_code(code,pn_row,sop_col);						// pn_row between 0 and 4, sop_col between 0 and 7
 	CYRF_ConfigSOPCode(code);
-	DSM_read_code(code,pn_row,7 - sop_col,8);				// 7-sop_col between 0 and 6
-	DSM_read_code(code+8,pn_row,7 - sop_col + 1,8);			// 7-sop_col+1 between 1 and 7
-	CYRF_ConfigDataCode(code, 16);
+	DSM_read_code(code,pn_row,7 - sop_col);					// 7-sop_col between 0 and 7
+	DSM_read_code(code+8,pn_row,7 - sop_col + 1);			// 7-sop_col+1 between 1 and 8
+	CYRF_ConfigDataCode(code);

 	CYRF_ConfigRFChannel(hopping_frequency[hopping_frequency_no]);
 	hopping_frequency_no++;
--- a/Multiprotocol/DSM_Rx_cyrf6936.ino
+++ b/Multiprotocol/DSM_Rx_cyrf6936.ino
@@ -39,8 +39,8 @@ static void __attribute__((unused)) DSM_RX_RF_init()
 	{
 		//64 SDR Mode is configured so only the 8 first values are needed but need to write 16 values...
 		uint8_t code[16];
-		DSM_read_code(code,0,8,8);
-		CYRF_ConfigDataCode(code, 16);
+		DSM_read_code(code,0,8);
+		CYRF_ConfigDataCode(code);
 		CYRF_ConfigRFChannel(1);
 		CYRF_SetTxRxMode(RX_EN);									// Force end state read
 		CYRF_WriteRegister(CYRF_05_RX_CTRL, 0x83);					// Prepare to receive
@@ -214,6 +214,15 @@ uint16_t DSM_RX_callback()
 	uint8_t rx_status;
 	static uint8_t read_retry=0;

+	if(sub_protocol == DSM_ERASE)
+	{
+		if(packet_count)
+			packet_count--;
+		else
+			BIND_DONE;
+		return 10000;	//  Nothing to do...
+	}
+
 	switch (phase)
 	{
 		case DSM_RX_BIND1:
@@ -240,10 +249,14 @@ uint16_t DSM_RX_callback()
 					{
 						// store tx info into eeprom
 						uint16_t temp = DSM_RX_EEPROM_OFFSET;
+
 						debug("ID=");
 						for(uint8_t i=0;i<4;i++)
 						{
-							cyrfmfg_id[i]=packet_in[i]^0xFF;
+							if (sub_protocol == DSM_CLONE && i == 3)
+								cyrfmfg_id[i]=(packet_in[i]^RX_num)^0xFF;
+							else
+								cyrfmfg_id[i]=packet_in[i]^0xFF;
 							eeprom_write_byte((EE_ADDR)temp++, cyrfmfg_id[i]);
 							debug(" %02X", cyrfmfg_id[i]);
 						}
@@ -254,6 +267,7 @@ uint16_t DSM_RX_callback()
 							0x01 => 22ms 1024 DSM2 1 packet => number of channels is <8
 							0x02 => 22ms 1024 DSM2 2 packets => either a number of channel >7
 							0x12 => 11ms 2048 DSM2 2 packets => can be any number of channels
+							0x23 => DX3R DSM2 2 surface packets
 							0xA2 => 22ms 2048 DSMX 1 packet => number of channels is <8
 							0xB2 => 11ms 2048 DSMX => can be any number of channels
 							(0x01 or 0xA2) and num_ch < 7 => 22ms else 11ms
@@ -264,7 +278,7 @@ uint16_t DSM_RX_callback()
 						eeprom_write_byte((EE_ADDR)temp, DSM_rx_type);
 						CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x20);	// Abort RX operation
 						CYRF_SetTxRxMode(TX_EN);					// Force end state TX
-						CYRF_ConfigDataCode((const uint8_t *)"\x98\x88\x1B\xE4\x30\x79\x03\x84", 16);
+						CYRF_ConfigDataCode((const uint8_t *)"\x98\x88\x1B\xE4\x30\x79\x03\x84");
 						CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x00);	// Clear abort RX
 						DSM_RX_build_bind_packet();
 						bind_counter=500;
@@ -303,6 +317,14 @@ uint16_t DSM_RX_callback()
 			{
 				BIND_DONE;
 				phase++;											// DSM_RX_DATA_PREP
+				//Copy clone values to EEPROM
+				if (sub_protocol == DSM_CLONE)
+					{
+					uint16_t temp = DSM_CLONE_EEPROM_OFFSET;	
+					for(uint8_t i=0; i<4; i++)
+						eeprom_write_byte((EE_ADDR)temp++, cyrfmfg_id[i]);
+					eeprom_write_byte((EE_ADDR)temp, 0xF0);						
+				}
 			}
 			break;
 		case DSM_RX_DATA_PREP:
@@ -470,20 +492,34 @@ void DSM_RX_init()
 	
 	if (IS_BIND_IN_PROGRESS)
 	{
-		packet_count=0;
-		phase = DSM_RX_BIND1;
+		if(sub_protocol == DSM_ERASE)
+		{
+			// Clear all cloned addresses
+			uint16_t addr = DSM_CLONE_EEPROM_OFFSET;
+			for(uint8_t i=0; i<6; i++)
+				eeprom_write_byte((EE_ADDR)(addr++), 0xFF);
+			packet_count = 100;	
+		}
+		else
+		{
+			packet_count=0;
+			phase = DSM_RX_BIND1;
+		}
 	}
 	else
 	{
 		uint16_t temp = DSM_RX_EEPROM_OFFSET;
+		if (sub_protocol == DSM_CLONE  || sub_protocol == DSM_ERASE )
+			temp = DSM_CLONE_EEPROM_OFFSET;
 		debug("ID=");
 		for(uint8_t i=0;i<4;i++)
 		{
 			cyrfmfg_id[i]=eeprom_read_byte((EE_ADDR)temp++);
 			debug(" %02X", cyrfmfg_id[i]);
 		}
-		DSM_rx_type=eeprom_read_byte((EE_ADDR)temp);
+		DSM_rx_type=eeprom_read_byte((EE_ADDR)DSM_RX_EEPROM_OFFSET+4);
 		debugln(", type=%02X", DSM_rx_type);
+
 		phase = DSM_RX_DATA_PREP;
 	}
 }
--- a/Multiprotocol/DSM_cyrf6936.ino
+++ b/Multiprotocol/DSM_cyrf6936.ino
@@ -18,14 +18,23 @@
 #include "iface_cyrf6936.h"

 //#define DSM_DEBUG_FWD_PGM
+//#define DEBUG_BIND  1

-//#define DSM_GR300
+#define CLONE_BIT_MASK			0x20
+#define MODE_11MS_BIT_MASK		0x40
+#define MAX_THROW_BIT_MASK		0x80
+#define DSM_BIND_CHANNEL		0x0D	//13 This can be any odd channel
+#define DSM2_SFC_PERIOD			16500

-#define DSM_BIND_CHANNEL 0x0d //13 This can be any odd channel
-
-//During binding we will send BIND_COUNT/2 packets
+//During binding we will send BIND_COUNT packets
 //One packet each 10msec
-#define DSM_BIND_COUNT 300
+//
+// Most RXs seems to work properly with a long BIND send count (3s): Spektrum, OrangeRX. 
+// Lemon-RX G2s seems to have a timeout waiting for the channel to get quiet after the 
+// first good BIND packet.. If using 3s (300), Lemon-RX will not transmit the BIND-Response packet. 
+
+#define DSM_BIND_COUNT			180  // About 1.8s
+#define DSM_BIND_COUNT_READ		600  // About 4.2s of waiting for Response

 enum {
 	DSM_BIND_WRITE=0,
@@ -44,6 +53,13 @@ enum {
 	DSM_CH2_READ_B,
 };

+#if defined(DSM_X_PLUS)
+  #define XP_CH   CH13    // X-Plus channel placeholder in frame
+  uint8_t x_plus_ch = 0;  // X-Plus channel currently multiplexing
+#else
+  #define XP_CH   0xff    // No Channel
+#endif
+
 //
 uint8_t ch_map[14];
 const uint8_t PROGMEM DSM_ch_map_progmem[][14] = {
@@ -58,7 +74,7 @@ const uint8_t PROGMEM DSM_ch_map_progmem[][14] = {
 	{1, 5, 2, 3, 6,    0xff, 0xff, 4,    0,    7,    8,    0xff, 0xff, 0xff}, //9ch  - Guess
 	{1, 5, 2, 3, 6,    0xff, 0xff, 4,    0,    7,    8,    9,    0xff, 0xff}, //10ch - Guess
 	{1, 5, 2, 3, 6,    10,   0xff, 4,    0,    7,    8,    9,    0xff, 0xff}, //11ch - Guess
-	{1, 5, 2, 4, 6,    10,   0xff, 0,    7,    3,    8,    9   , 11  , 0xff}, //12ch - DX18/DX8G2
+	{1, 5, 2, 4, 6,    10,  XP_CH, 0,    7,    3,    8,    9   , 11  , 0xff}, //12ch - DX18/DX8G2
 //11ms for 8..11 channels
 	{1, 5, 2, 3, 6,    7,    0xff, 1,    5,    2,    4,    0,    0xff, 0xff}, //8ch  - DX7
 	{1, 5, 2, 3, 6,    7,    0xff, 1,    5,    2,    4,    0,    8,    0xff}, //9ch  - Guess
@@ -87,9 +103,12 @@ static void __attribute__((unused)) DSM_build_bind_packet()
 		packet[11] = 12;
 	else
 		packet[11] = num_ch;				// DX5 DSMR sends 0x48...
+	//packet[11] = 3;						// DX3R

 	if (sub_protocol==DSMR)
 		packet[12] = 0xa2;
+	else if (sub_protocol==DSM2_SFC)
+		packet[12] = 0x23;					// DX3R
 	else if (sub_protocol==DSM2_1F)
 		packet[12] = num_ch<8?0x01:0x02;	// DSM2/1024 1 or 2 packets depending on the number of channels
 	else if(sub_protocol==DSM2_2F)
@@ -102,7 +121,6 @@ static void __attribute__((unused)) DSM_build_bind_packet()
 		#endif
 	else									// DSMX_2F && DSM_AUTO
 		packet[12] = 0xb2;					// DSMX/2048 2 packets
-	

 	packet[13] = 0x00;						//???
 	for(i = 8; i < 14; i++)
@@ -116,8 +134,8 @@ static void __attribute__((unused)) DSM_initialize_bind_phase()
 	CYRF_ConfigRFChannel(DSM_BIND_CHANNEL); //This seems to be random?
 	//64 SDR Mode is configured so only the 8 first values are needed but need to write 16 values...
 	uint8_t code[16];
-	DSM_read_code(code,0,8,8);
-	CYRF_ConfigDataCode(code, 16);
+	DSM_read_code(code,0,8);
+	CYRF_ConfigDataCode(code);
 	DSM_build_bind_packet();
 }

@@ -126,16 +144,23 @@ static void __attribute__((unused)) DSM_update_channels()
 	prev_option=option;
 	num_ch=option & 0x0F;				// Remove flags 0x80=max_throw, 0x40=11ms

-	if(num_ch<3 || num_ch>12)
+	if(num_ch<3)
 		num_ch=6;						// Default to 6 channels if invalid choice...

-	if(sub_protocol==DSMR && num_ch>7)
-		num_ch=7;						// Max 7 channels in DSMR
+	#ifndef MULTI_AIR
+		if(sub_protocol==DSMR && num_ch>7)
+			num_ch=7;						// Max 7 channels in DSMR
+
+		if(sub_protocol==DSM2_SFC && num_ch>5)
+			num_ch=5;						// Max 5 channels in DSM2_SFC
+	#endif

 	// Create channel map based on number of channels and refresh rate
 	uint8_t idx=num_ch-3;
-	if((option & 0x40) && num_ch>7 && num_ch<12)
-		idx+=5;							// In 11ms mode change index only for channels 8..11
+	if(idx > 9)
+		idx = 9;
+	if((option & MODE_11MS_BIT_MASK) && num_ch>7 && num_ch<12)
+		idx += 5;							// In 11ms mode change index only for channels 8..11
 	for(uint8_t i=0;i<14;i++)
 		ch_map[i]=pgm_read_byte_near(&DSM_ch_map_progmem[idx][i]);
 }
@@ -143,7 +168,13 @@ static void __attribute__((unused)) DSM_update_channels()
 static void __attribute__((unused)) DSM_build_data_packet(uint8_t upper)
 {
 	uint8_t bits = 11;
-
+	
+	// Check if clone flag has changed
+	if((prev_option&CLONE_BIT_MASK) != (option&CLONE_BIT_MASK))
+	{
+		DSM_init();
+		prev_option^=CLONE_BIT_MASK;
+	}
 	if(prev_option!=option)
 		DSM_update_channels();

@@ -160,34 +191,41 @@ static void __attribute__((unused)) DSM_build_data_packet(uint8_t upper)
 			bits=10;								// Only DSM2_1F is using a resolution of 1024
 	}

-	if(sub_protocol == DSMR)
-	{
-		for (uint8_t i = 0; i < 7; i++)
-		{
-			uint16_t value = 0x0000;
-			if(i < num_ch)
-				value=Channel_data[i]<<1;
-			packet[i*2+2] = (value >> 8) & 0xff;
-			packet[i*2+3] = (value >> 0) & 0xff;
+	#ifndef MULTI_AIR
+		if(sub_protocol == DSMR || sub_protocol == DSM2_SFC)
+		{ // 12 bits, full range, no reassignment
+			for (uint8_t i = 0; i < 7; i++)
+			{
+				uint16_t value = 0x0000;
+				if(i < num_ch)
+				{
+					value=Channel_data[i]<<1;
+					if(sub_protocol == DSM2_SFC)
+						value |= i<<12;
+				}
+				packet[i*2+2] = (value >> 8) & 0xff;
+				packet[i*2+3] = (value >> 0) & 0xff;
+			}
+			return;
 		}
-		return;
-	}
-
-	#ifdef DSM_THROTTLE_KILL_CH
+	#endif
+	
+	#if defined(DSM_THROTTLE_KILL_CH)
 		uint16_t kill_ch=Channel_data[DSM_THROTTLE_KILL_CH-1];
 	#endif
 	for (uint8_t i = 0; i < 7; i++)
 	{	
 		uint8_t idx = ch_map[(upper?7:0) + i];		// 1,5,2,3,0,4	   
 		uint16_t value = 0xffff;
-		if((option&0x40) == 0 && num_ch < 8 && upper)
+
+		if((option & MODE_11MS_BIT_MASK) == 0 && num_ch < 8 && upper)
 			idx=0xff;								// in 22ms do not transmit upper channels if <8, is it the right method???
-		if (idx != 0xff)
+		else if (idx != 0xff)
 		{
 			/* Spektrum own remotes transmit normal values during bind and actually use this (e.g. Nano CP X) to
 			   select the transmitter mode (e.g. computer vs non-computer radio), so always send normal output */
-			#ifdef DSM_THROTTLE_KILL_CH
-				if(idx==CH1 && kill_ch<=604)
+			#if defined(DSM_THROTTLE_KILL_CH)
+				if(idx==CH1 && kill_ch<=604 && num_ch<=12)
 				{//Activate throttle kill only if channel is throttle and DSM_THROTTLE_KILL_CH below -50%
 					if(kill_ch<CHANNEL_MIN_100)		// restrict val to 0...400
 						kill_ch=0;
@@ -197,16 +235,41 @@ static void __attribute__((unused)) DSM_build_data_packet(uint8_t upper)
 				}
 				else
 			#endif
-				#ifdef DSM_MAX_THROW
-					value=Channel_data[CH_TAER[idx]];										// -100%..+100% => 1024..1976us and -125%..+125% => 904..2096us based on Redcon 6 channel DSM2 RX
-				#else
-					if(option & 0x80)
-						value=Channel_data[CH_TAER[idx]];									// -100%..+100% => 1024..1976us and -125%..+125% => 904..2096us based on Redcon 6 channel DSM2 RX
+				{ 
+					#if defined(DSM_X_PLUS)
+						if (idx==XP_CH) {  // X-Plus special channel placeholder
+							idx = XP_CH + x_plus_ch; // Encode CH13-CH16 instead
+						}
+					#endif
+					#ifdef DSM_MAX_THROW
+						value=Channel_data[CH_TAER[idx]];										// -100%..+100% => 1024..1976us and -125%..+125% => 904..2096us based on Redcon 6 channel DSM2 RX
+					#else
+						if(option & MAX_THROW_BIT_MASK)
+							value=Channel_data[CH_TAER[idx]];									// -100%..+100% => 1024..1976us and -125%..+125% => 904..2096us based on Redcon 6 channel DSM2 RX
+						else
+							value=convert_channel_16b_nolimit(CH_TAER[idx],0x156,0x6AA,false);	// -100%..+100% => 1100..1900us and -125%..+125% => 1000..2000us based on a DX8 G2 dump
+					#endif
+				}
+			#if defined(DSM_X_PLUS)
+				if (idx >= XP_CH) { // X-Plus Channel
+					// Multiplexing 4 chanels on the same frame channel placeholder for channel 13 (ID=12) over time (Refresh cycle 88ms)
+					// CH13-16 lower frame, and Ch17-20 upper. We only do lower right now, since MM cannot handle more than 16ch
+					// Channel value is 9 bits, and upper 2 bits is the X-Plus channel (CH13..CH16). 
+					if(num_ch>12)
+					{
+						value >>= 2; // Convert to 9 bits
+						value |= (XP_CH << 11) | (x_plus_ch << 9); // constant 12 (4 bits), XPlus Ch (2 bits), Value (9 bits)
+						x_plus_ch = (x_plus_ch + 1) % 4;  // only 0..3
+					}
 					else
-						value=convert_channel_16b_nolimit(CH_TAER[idx],0x156,0x6AA,false);	// -100%..+100% => 1100..1900us and -125%..+125% => 1000..2000us based on a DX8 G2 dump
-				#endif
-			if(bits==10) value>>=1;
-			value |= (upper && i==0 ? 0x8000 : 0) | (idx << bits);
+						value = 0xffff;
+				}
+				else 
+			#endif
+				{ // Regular channel
+					if(bits==10) value>>=1;
+					value |= (upper && i==0 ? 0x8000 : 0) | (idx << bits);
+				}
 		}	  
 		packet[i*2+2] = value >> 8;
 		packet[i*2+3] = value;
@@ -249,24 +312,34 @@ 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 || sub_protocol == DSM2_SFC)
+		{
+			SUB_PROTO_INVALID;
+			return 11000;
+		}
+	#endif
+	#if defined MULTI_AIR
+		if(sub_protocol == DSMR || sub_protocol == DSM2_SFC)
+		{
+			SUB_PROTO_INVALID;
+			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
+		#define DSM_READ_DELAY		300			// Time before write to check read phase, and switch channels.
 	#else
 		#define DSM_WRITE_DELAY		1950		// Time after write to verify write complete
+		#define DSM_READ_DELAY		600			// Time before write to check read phase, and switch channels.
 	#endif
-	#define DSM_READ_DELAY		600				// Time before write to check read phase, and switch channels. Was 400 but 600 seems what the 328p needs to read a packet
 	#if defined DSM_TELEMETRY
 		uint8_t rx_phase;
-		uint8_t len;
+		uint8_t length;
 	#endif
 	uint8_t start;
-
-	#ifdef DSM_GR300
-		uint16_t timing=5000+(convert_channel_8b(CH13)*100);
-		debugln("T=%u",timing);
-	#endif
-	
+	//debugln("P=%d",phase);
 	switch(phase)
 	{
 		case DSM_BIND_WRITE:
@@ -280,11 +353,14 @@ uint16_t DSM_callback()
 			return 10000;
 	#if defined DSM_TELEMETRY
 		case DSM_BIND_CHECK:
-			//64 SDR Mode is configured so only the 8 first values are needed but we need to write 16 values...
-			CYRF_ConfigDataCode((const uint8_t *)"\x98\x88\x1B\xE4\x30\x79\x03\x84", 16);
+			#if DEBUG_BIND
+				debugln("Bind Check");
+			#endif
+			//64 SDR Mode is configured so only the 8 first values are needed
+			CYRF_ConfigDataCode((const uint8_t *)"\x98\x88\x1B\xE4\x30\x79\x03\x84");
 			CYRF_SetTxRxMode(RX_EN);							//Receive mode
 			CYRF_WriteRegister(CYRF_05_RX_CTRL, 0x87);			//Prepare to receive
-			bind_counter=2*DSM_BIND_COUNT;						//Timeout of 4.2s if no packet received
+			bind_counter=DSM_BIND_COUNT_READ; //Timeout of 4.2s if no packet received
 			phase++;											// change from BIND_CHECK to BIND_READ
 			return 2000;
 		case DSM_BIND_READ:
@@ -300,10 +376,12 @@ uint16_t DSM_callback()
 					CYRF_ReadDataPacketLen(packet_in+1, 10);
 					if(DSM_Check_RX_packet())
 					{
-						debug("Bind");
-						for(uint8_t i=0;i<10;i++)
-							debug(" %02X",packet_in[i+1]);
-						debugln("");
+						#if DEBUG_BIND
+  						  debug("Bind");
+  						  for(uint8_t i=0;i<10;i++)
+  							debug(" %02X",packet_in[i+1]);
+  						  debugln("");
+						#endif
 						packet_in[0]=0x80;
 						packet_in[6]&=0x0F;						// It looks like there is a flag 0x40 being added by some receivers
 						if(packet_in[6]>12) packet_in[6]=12;
@@ -328,6 +406,9 @@ uint16_t DSM_callback()
 				}
 			if( --bind_counter == 0 )
 			{ // Exit if no answer has been received for some time
+        #if DEBUG_BIND
+          debugln("Bind Read TIMEOUT");
+        #endif
 				phase++;										// DSM_CHANSEL
 				return 7000 ;
 			}
@@ -339,25 +420,38 @@ uint16_t DSM_callback()
 			CYRF_SetTxRxMode(TX_EN);
 			hopping_frequency_no = 0;
 			phase = DSM_CH1_WRITE_A;							// in fact phase++
+			#ifndef MULTI_AIR
 			if(sub_protocol == DSMR)
 				DSM_set_sop_data_crc(false, true);
 			else
+			#endif
 				DSM_set_sop_data_crc(true, sub_protocol==DSMX_2F||sub_protocol==DSMX_1F);	//prep CH1
 			return 10000;
 		case DSM_CH1_WRITE_A:
 			#ifdef MULTI_SYNC
-				telemetry_set_input_sync(11000);				// Always request 11ms spacing even if we don't use half of it in 22ms mode
+				if(sub_protocol!=DSM2_SFC || option&0x40)		// option&40 in this case is 16.5ms/11ms frame rate for DSM2_SFC
+					telemetry_set_input_sync(11000);			// Always request 11ms spacing even if we don't use half of it in 22ms mode
+				else
+					telemetry_set_input_sync(DSM2_SFC_PERIOD);
 			#endif
+			#ifndef MULTI_AIR
 			if(sub_protocol == DSMR)
 				CYRF_SetPower(0x08);							//Keep transmit power in sync
 			else
+			#endif
 				CYRF_SetPower(0x28);							//Keep transmit power in sync
 		case DSM_CH1_WRITE_B:
 			DSM_build_data_packet(phase == DSM_CH1_WRITE_B);	// build lower or upper channels
 		case DSM_CH2_WRITE_A:
 		case DSM_CH2_WRITE_B:
 			CYRF_ReadRegister(CYRF_04_TX_IRQ_STATUS);			// clear IRQ flags
-			CYRF_WriteDataPacket(packet);
+			//debugln_time("");
+			#ifndef MULTI_AIR
+			if(sub_protocol==DSM2_SFC)
+				CYRF_WriteDataPacketLen(packet,2*(num_ch+1));
+			else
+			#endif
+				CYRF_WriteDataPacket(packet);
 			#if 0
 				for(uint8_t i=0;i<16;i++)
 					debug(" %02X", packet[i]);
@@ -394,41 +488,52 @@ uint16_t DSM_callback()
 			phase++;										// change from CH2_CHECK to CH2_READ
 			CYRF_SetTxRxMode(RX_EN);						//Receive mode
 			CYRF_WriteRegister(CYRF_05_RX_CTRL, 0x87);		//0x80??? //Prepare to receive
-			if(sub_protocol==DSMR)
-			{
-				phase = DSM_CH2_READ_B;
-				return 11000 - DSM_WRITE_DELAY - DSM_READ_DELAY;
-			}
-			#ifdef DSM_GR300
-				if(num_ch==3)
-					return timing - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY - DSM_READ_DELAY;
+			#ifndef MULTI_AIR
+				if(sub_protocol==DSMR || sub_protocol == DSM2_SFC)
+				{
+					phase = DSM_CH2_READ_B;
+					if(sub_protocol == DSM2_SFC)
+					{
+						if(option&0x40)		// option&40 in this case is 16.5ms/11ms frame rate for DSM2_SFC
+							return 11000 - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY - DSM_READ_DELAY;
+						else
+							return DSM2_SFC_PERIOD - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY - DSM_READ_DELAY;
+					}
+					return 10900 - DSM_WRITE_DELAY - DSM_READ_DELAY;	//Was 11000 but the SR6200A needs 10900 to report telemetry correctly
+				}
 			#endif
 			return 11000 - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY - DSM_READ_DELAY;
 		case DSM_CH2_READ_A:
 		case DSM_CH2_READ_B:
 			//Read telemetry
 			rx_phase = CYRF_ReadRegister(CYRF_07_RX_IRQ_STATUS);
+			//debug("ST1:%02X ",rx_phase);
 			if((rx_phase & 0x03) == 0x02)  					// RXC=1, RXE=0 then 2nd check is required (debouncing)
 				rx_phase |= CYRF_ReadRegister(CYRF_07_RX_IRQ_STATUS);
+			//debug("ST2:%02X ",rx_phase);
 			if((rx_phase & 0x07) == 0x02)
 			{ // good data (complete with no errors)
 				CYRF_WriteRegister(CYRF_07_RX_IRQ_STATUS, 0x80);	// need to set RXOW before data read
-				len=CYRF_ReadRegister(CYRF_09_RX_COUNT);
-				if(len>TELEMETRY_BUFFER_SIZE-2)
-					len=TELEMETRY_BUFFER_SIZE-2;
-				CYRF_ReadDataPacketLen(packet_in+1, len);
+				length=CYRF_ReadRegister(CYRF_09_RX_COUNT);
+				//debug("RX(%d)",length);
+				if(length>TELEMETRY_BUFFER_SIZE-2)
+					length=TELEMETRY_BUFFER_SIZE-2;
+				CYRF_ReadDataPacketLen(packet_in+1, length);
 				#ifdef DSM_DEBUG_FWD_PGM
 					//debug(" %02X", packet_in[1]);
 					if(packet_in[1]==9)
 					{
-						for(uint8_t i=0;i<len;i++)
+						for(uint8_t i=0;i<length;i++)
 							debug(" %02X", packet_in[i+1]);
 						debugln("");
 					}
 				#endif
 				packet_in[0]=CYRF_ReadRegister(CYRF_13_RSSI)&0x1F;// store RSSI of the received telemetry signal
+				//for(uint8_t i=0;i<length+1;i++)
+				//	debug(" %02X", packet_in[i]);
 				telemetry_link=1;
 			}
+			//debugln("");
 			CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x20);		// Abort RX operation
 			if (phase == DSM_CH2_READ_A && (sub_protocol==DSM2_1F || sub_protocol==DSMX_1F) && num_ch < 8)	// 22ms mode
 			{
@@ -436,10 +541,6 @@ uint16_t DSM_callback()
 				CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x00);	// Clear abort RX operation
 				CYRF_WriteRegister(CYRF_05_RX_CTRL, 0x87);	//0x80???	//Prepare to receive
 				phase = DSM_CH2_READ_B;
-				#ifdef DSM_GR300
-					if(num_ch==3)
-						return timing;
-				#endif
 				return 11000;
 			}
 			if (phase == DSM_CH2_READ_A)
@@ -460,19 +561,20 @@ uint16_t DSM_callback()
 				else										
 				{											//Normal mode 22ms
 					phase = DSM_CH1_WRITE_A;				// change from CH2_CHECK_A to CH1_WRITE_A (ie no upper)
-					#ifdef DSM_GR300
-						if(num_ch==3)
-							return timing - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY ;
+					#ifndef MULTI_AIR
+						if(sub_protocol==DSM2_SFC)
+						{
+							if(option&0x40)					// option&40 in this case is 16.5ms/11ms frame rate for DSM2_SFC
+								return 11000 - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY ;
+							else
+								return DSM2_SFC_PERIOD - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY ;
+						}
 					#endif
 					return 22000 - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY ;
 				}
 			}
 			else
 				phase = DSM_CH1_WRITE_A;					// change from CH2_CHECK_B to CH1_WRITE_A (upper already transmitted so transmit lower)
-			#ifdef DSM_GR300
-				if(num_ch==3)
-					return timing - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY ;
-			#endif
 			return 11000 - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY;
 #endif
 	}
@@ -480,6 +582,7 @@ uint16_t DSM_callback()
 }


+#ifndef MULTI_AIR
 const uint8_t PROGMEM DSMR_ID_FREQ[][4 + 23] = {
 	{ 0x71, 0x74, 0x1c, 0xe4, 0x11, 0x2f, 0x17, 0x3d, 0x23, 0x3b, 0x0f, 0x21, 0x25, 0x49, 0x1d, 0x13, 0x4d, 0x1f, 0x41, 0x4b, 0x47, 0x05, 0x27, 0x15, 0x19, 0x3f, 0x07 },
 	{ 0xfe, 0xfe, 0xfe, 0xfe, 0x45, 0x31, 0x33, 0x4b, 0x11, 0x29, 0x49, 0x3f, 0x09, 0x13, 0x47, 0x21, 0x1d, 0x43, 0x1f, 0x05, 0x41, 0x19, 0x1b, 0x2d, 0x15, 0x4d, 0x0f },
@@ -503,32 +606,73 @@ const uint8_t PROGMEM DSMR_ID_FREQ[][4 + 23] = {
 	{ 0xff, 0xff, 0x00, 0x00, 0x2b, 0x35, 0x1b, 0x1d, 0x0f, 0x47, 0x09, 0x0d, 0x45, 0x41, 0x21, 0x11, 0x2f, 0x43, 0x27, 0x33, 0x4b, 0x37, 0x13, 0x19, 0x4d, 0x23, 0x17 },
 	{ 0x00, 0xff, 0x00, 0x00, 0x1b, 0x1d, 0x33, 0x13, 0x2b, 0x27, 0x09, 0x41, 0x25, 0x17, 0x19, 0x2d, 0x4b, 0x37, 0x45, 0x11, 0x21, 0x0d, 0x3d, 0x4d, 0x07, 0x39, 0x43 },
 	{ 0xff, 0x00, 0x00, 0x00, 0x37, 0x27, 0x43, 0x4b, 0x39, 0x13, 0x07, 0x0d, 0x25, 0x17, 0x29, 0x1b, 0x1d, 0x45, 0x19, 0x2d, 0x0b, 0x3d, 0x15, 0x47, 0x1f, 0x21, 0x4d } };
+#endif

 void DSM_init()
 { 
 	if(sub_protocol == DSMR)
 	{
-		uint8_t row = rx_tx_addr[3]%22;
-		for(uint8_t i=0; i< 4; i++)
-			cyrfmfg_id[i] = pgm_read_byte_near(&DSMR_ID_FREQ[row][i]);
-		for(uint8_t i=0; i< 23; i++)
-			hopping_frequency[i] = pgm_read_byte_near(&DSMR_ID_FREQ[row][i+4]);
+		#ifndef MULTI_AIR
+			if(option&CLONE_BIT_MASK)
+				SUB_PROTO_INVALID;
+			else
+			{
+				//SUB_PROTO_VALID;
+				uint8_t row = rx_tx_addr[3]%22;
+				for(uint8_t i=0; i< 4; i++)
+					cyrfmfg_id[i] = pgm_read_byte_near(&DSMR_ID_FREQ[row][i]);
+				for(uint8_t i=0; i< 23; i++)
+					hopping_frequency[i] = pgm_read_byte_near(&DSMR_ID_FREQ[row][i+4]);
+			}
+		#endif
 	}
 	else
 	{
-		CYRF_GetMfgData(cyrfmfg_id);
-		//Model match
-		cyrfmfg_id[3]^=RX_num;
+		if(option&CLONE_BIT_MASK)
+		{ 
+			if(eeprom_read_byte((EE_ADDR)DSM_CLONE_EEPROM_OFFSET+4)==0xF0)
+			{
+				//read cloned ID from EEPROM
+				uint16_t temp = DSM_CLONE_EEPROM_OFFSET;
+				for(uint8_t i=0;i<4;i++)
+					cyrfmfg_id[i] = eeprom_read_byte((EE_ADDR)temp++);
+					cyrfmfg_id[3]^=RX_num;		//Model match
+				#if DEBUG_BIND
+					debugln("Using cloned ID");  
+					debug("Clone ID=")
+					for(uint8_t i=0;i<4;i++)
+						debug("%02x ", cyrfmfg_id[i]);
+					debugln("");
+				#endif
+			}
+			else
+			{
+				SUB_PROTO_INVALID;
+				#if DEBUG_BIND
+				  debugln("No valid cloned ID");
+				#endif
+			}
+		}
+		else
+		{
+			//SUB_PROTO_VALID;
+			CYRF_GetMfgData(cyrfmfg_id);
+			cyrfmfg_id[3]^=RX_num;			//Model match
+		}
 	}

 	//Calc sop_col
 	sop_col = (cyrfmfg_id[0] + cyrfmfg_id[1] + cyrfmfg_id[2] + 2) & 0x07;

-	//Fix for OrangeRX using wrong DSM_pncodes by preventing access to "Col 8"
-	if(sop_col==0 && sub_protocol != DSMR)
-	{
-	   cyrfmfg_id[rx_tx_addr[0]%3]^=0x01;					//Change a bit so sop_col will be different from 0
-	   sop_col = (cyrfmfg_id[0] + cyrfmfg_id[1] + cyrfmfg_id[2] + 2) & 0x07;
+	//We cannot manipulate the ID if we are cloning
+	if(!(option&CLONE_BIT_MASK))
+	{	
+		//Fix for OrangeRX using wrong DSM_pncodes by preventing access to "Col 8"
+		if(sop_col==0 && sub_protocol != DSMR)
+		{
+			cyrfmfg_id[rx_tx_addr[0]%3]^=0x01;					//Change a bit so sop_col will be different from 0
+			sop_col = (cyrfmfg_id[0] + cyrfmfg_id[1] + cyrfmfg_id[2] + 2) & 0x07;
+		}
 	}

 	//Calc CRC seed
@@ -540,7 +684,7 @@ void DSM_init()
 	else if(sub_protocol != DSMR)
 	{ 
 		uint8_t tmpch[10];
-		CYRF_FindBestChannels(tmpch, 10, 5, 3, 75);
+		CYRF_FindBestChannels(tmpch, 10, 5, 3, 75, FIND_CHANNEL_ANY);
 		//
 		uint8_t idx = random(0xfefefefe) % 10;
 		hopping_frequency[0] = tmpch[idx];
@@ -564,9 +708,12 @@ void DSM_init()
 		DSM_initialize_bind_phase();		
 		phase = DSM_BIND_WRITE;
 		bind_counter=DSM_BIND_COUNT;
+		#if DEBUG_BIND
+			debugln("Bind Started: write count=%d",bind_counter);
+		#endif
 	}
 	else
-		phase = DSM_CHANSEL;//
+		phase = DSM_CHANSEL;
 }

 #endif
--- a/Multiprotocol/Devo_cyrf6936.ino
+++ b/Multiprotocol/Devo_cyrf6936.ino
@@ -55,14 +55,14 @@ static void __attribute__((unused)) DEVO_add_pkt_suffix()
 {
    uint8_t bind_state;
 	#ifdef ENABLE_PPM
-	if(mode_select && option==0 && IS_BIND_DONE) 			//PPM mode and option not already set and bind is finished
+	if(mode_select && (option&0x01)==0 && IS_BIND_DONE) 			//PPM mode and option not already set and bind is finished
 	{
 		BIND_SET_INPUT;
 		BIND_SET_PULLUP;										// set pullup
 		if(IS_BIND_BUTTON_on)
 		{
 			eeprom_write_byte((EE_ADDR)(MODELMODE_EEPROM_OFFSET+RX_num),0x01);	// Set fixed id mode for the current model
-			option=1;
+			option |= 0x01;
 		}
 		BIND_SET_OUTPUT;
 	}
@@ -72,7 +72,7 @@ static void __attribute__((unused)) DEVO_add_pkt_suffix()
 		MProtocol_id = RX_num + MProtocol_id_master;
 		bind_counter=DEVO_BIND_COUNT;
 	}
-	if (option)
+	if (option&0x01)
 	{
        if (bind_counter > 0)
            bind_state = 0xc0;
@@ -220,6 +220,7 @@ static void __attribute__((unused)) DEVO_parse_telemetry_packet()
 	#if defined HUB_TELEMETRY
 	//Telemetry https://github.com/DeviationTX/deviation/blob/5efb6a28bea697af9a61b5a0ed2528cc8d203f90/src/protocol/devo_cyrf6936.c#L232
 		uint16_t val, dec;
+		uint32_t val32;
 		switch(packet[0])
 		{
 			case 0x30:	// Volt and RPM packet
@@ -255,18 +256,30 @@ static void __attribute__((unused)) DEVO_parse_telemetry_packet()
 				break;
 			// GPS Data
 			case 0x32: // Longitude
-				//memcpy(&packet[1],"\x30\x33\x30\x32\x30\x2e\x38\x32\x37\x30\x45\xfb",12);							// 030°20.8270E
-				val = DEVO_text_to_int(&packet[1], 3)*100 + DEVO_text_to_int(&packet[4], 2);						// dddmm
+				//memcpy(&packet[1],"\x30\x33\x30\x32\x30\x2e\x38\x32\x37\x30\x45\xfb",12);							// 030°20.8270E in ddmm.mmmm
+				//memcpy(&packet[1],"\x31\x31\x37\x31\x31\x2e\x35\x39\x34\x37\x57\xfb",12);							// RX705 sends 117°11.5947W which should be 11706.95685W in ddmm.mmmm
+				val = DEVO_text_to_int(&packet[1], 3)*100;															// dd00
+				val32 = DEVO_text_to_int(&packet[4], 2) * 10000 + DEVO_text_to_int(&packet[7], 4);					// mmmmmm
+				if(option&0x02)																						// if RX705 GPS format
+					val32 = (val32*3)/5;																			// then * 6/10 correction
+				dec = val32/10000;
+				val = val + dec;																					// dddmm
 				frsky_send_user_frame(0x12  , val, val>>8);
-				val = DEVO_text_to_int(&packet[7], 4);																// .mmmm
+				val = val32 - dec*10000;																			// .mmmm
 				frsky_send_user_frame(0x12+8, val, val>>8);
 				frsky_send_user_frame(0x1A+8, packet[11], 0x00);													// 'E'/'W'
 				break;
 			case 0x33: // Latitude
-				//memcpy(&packet[1],"\x35\x39\x35\x34\x2e\x37\x37\x37\x36\x4e\x07\x00",12);							// 59°54.776N
-				val = DEVO_text_to_int(&packet[1], 2)*100 + DEVO_text_to_int(&packet[3], 2);						// ddmm
+				//memcpy(&packet[1],"\x35\x39\x35\x34\x2e\x37\x37\x37\x36\x4e\x07\x00",12);							// 59°54.776N in ddmm.mmmm
+				//memcpy(&packet[1],"\x31\x37\x31\x31\x2e\x35\x39\x34\x37\x4e\xfb\x00",12);							// RX705 sends 17°11.5947N which should be 1706.95685N in ddmm.mmmm
+				val = DEVO_text_to_int(&packet[1], 2)*100;															// dd00
+				val32 = DEVO_text_to_int(&packet[3], 2) * 10000 + DEVO_text_to_int(&packet[6], 4);					// mmmmmm
+				if(option&0x02)																						// if RX705 GPS format
+					val32 = (val32*3)/5;																			// then * 6/10 correction
+				dec = val32/10000;
+				val = val + dec;																					// dddmm
 				frsky_send_user_frame(0x13  , val, val>>8);
-				val = DEVO_text_to_int(&packet[6], 4);																// .mmmm
+				val = val32 - dec*10000;																			// .mmmm
 				frsky_send_user_frame(0x13+8, val, val>>8);
 				frsky_send_user_frame(0x1B+8, packet[10], 0x00);													// 'N'/'S'
 				break;
@@ -352,7 +365,7 @@ static void __attribute__((unused)) DEVO_cyrf_init()

 static void __attribute__((unused)) DEVO_set_radio_channels()
 {
-	CYRF_FindBestChannels(hopping_frequency, 3, 4, 4, 80);
+	CYRF_FindBestChannels(hopping_frequency, 3, 4, 4, 80, FIND_CHANNEL_ANY);
 	hopping_frequency[3] = hopping_frequency[0];
 	hopping_frequency[4] = hopping_frequency[1];
 }
@@ -530,13 +543,13 @@ void DEVO_init()
 		{
 			if(IS_BIND_BUTTON_FLAG_on)
 			{
-				eeprom_write_byte((EE_ADDR)(MODELMODE_EEPROM_OFFSET+RX_num),0x00);	// reset to autobind mode for the current model
-				option=0;
+				option &= 0xFE;
+				eeprom_write_byte((EE_ADDR)(MODELMODE_EEPROM_OFFSET+RX_num),option);	// reset to autobind mode for the current model
 			}
 			else
 			{	
-				option=eeprom_read_byte((EE_ADDR)(MODELMODE_EEPROM_OFFSET+RX_num));	// load previous mode: autobind or fixed id
-				if(option!=1) option=0;								// if not fixed id mode then it should be autobind
+				option=eeprom_read_byte((EE_ADDR)(MODELMODE_EEPROM_OFFSET+RX_num));		// load previous mode: autobind or fixed id
+				if(option > 3) option = 0;												// if invalid then it should be autobind
 			}
 		}
 	#endif //ENABLE_PPM
@@ -570,8 +583,13 @@ void DEVO_init()

 	packet_count = 0;

-	prev_option=option;
-	if(option==0)
+	if(option&0x01)
+	{
+		phase = DEVO_BOUND_1;
+		bind_counter = 0;
+		DEVO_cyrf_set_bound_sop_code();
+	}
+	else
 	{
 		MProtocol_id = ((uint32_t)(hopping_frequency[0] ^ cyrfmfg_id[0] ^ cyrfmfg_id[3]) << 16)
 					 | ((uint32_t)(hopping_frequency[1] ^ cyrfmfg_id[1] ^ cyrfmfg_id[4]) << 8)
@@ -581,12 +599,6 @@ void DEVO_init()
 		phase = DEVO_BIND;
 		BIND_IN_PROGRESS;
 	}
-	else
-	{
-		phase = DEVO_BOUND_1;
-		bind_counter = 0;
-		DEVO_cyrf_set_bound_sop_code();
-	}  
 }

 #endif
--- a/Multiprotocol/E01X_cyrf6936.ino
+++ b/Multiprotocol/E01X_cyrf6936.ino
@@ -14,9 +14,9 @@
 */
 // compatible with E012 and E015

-#if defined(E01X_NRF24L01_INO)
+#if defined(E01X_CYRF6936_INO)

-#include "iface_nrf24l01.h"
+#include "iface_hs6200.h"

 //Protocols constants
 #define E01X_BIND_COUNT			500
@@ -28,7 +28,8 @@
 #define E012_NUM_RF_CHANNELS	4
 #define E012_PACKET_SIZE		15

-#define E015_PACKET_PERIOD		4500	// stock Tx=9000, but let's send more packets ...
+//#define E015_FORCE_ID
+#define E015_PACKET_PERIOD		9000
 #define E015_RF_CHANNEL			0x2d	// 2445 MHz
 #define E015_PACKET_SIZE		10
 #define E015_BIND_PACKET_SIZE	9
@@ -87,13 +88,15 @@ static void __attribute__((unused)) E01X_send_packet()
 		packet[0] = rx_tx_addr[1];
 		if(IS_BIND_IN_PROGRESS)
 		{
+			rf_ch_num = E012_RF_BIND_CHANNEL;
 			packet[1] = 0xaa;
 			memcpy(&packet[2], hopping_frequency, E012_NUM_RF_CHANNELS);
 			memcpy(&packet[6], rx_tx_addr, E01X_ADDRESS_LENGTH);
-			rf_ch_num=E012_RF_BIND_CHANNEL;
 		}
 		else
 		{
+			rf_ch_num = hopping_frequency[hopping_frequency_no++];
+			hopping_frequency_no %= E012_NUM_RF_CHANNELS;
 			packet[1] = 0x01
 				| GET_FLAG(E01X_RTH_SW,			E012_FLAG_RTH)
 				| GET_FLAG(E01X_HEADLESS_SW,	E012_FLAG_HEADLESS)
@@ -107,8 +110,6 @@ static void __attribute__((unused)) E01X_send_packet()
 			packet[8] = 0x00;
 			packet[9] = 0x00;
 			packet[10]= 0x00;
-			rf_ch_num=hopping_frequency[hopping_frequency_no++];
-			hopping_frequency_no %= E012_NUM_RF_CHANNELS;
 		}
 		packet[11] = 0x00;
 		packet[12] = 0x00;
@@ -117,6 +118,7 @@ static void __attribute__((unused)) E01X_send_packet()
 	}
 	else
 	{ // E015
+		rf_ch_num = E015_RF_CHANNEL;
 		if(IS_BIND_IN_PROGRESS)
 		{
 			packet[0] = 0x18;
@@ -124,10 +126,11 @@ static void __attribute__((unused)) E01X_send_packet()
 			packet[2] = 0x06;
 			// data phase address
 			memcpy(&packet[3], rx_tx_addr, E01X_ADDRESS_LENGTH);
+			packet[8] = 0x63;	// unknown calculation
 			// checksum
-			packet[8] = packet[3];
-			for(uint8_t i=4; i<8; i++)
-				packet[8] += packet[i];
+			//packet[8] = packet[3];
+			//for(uint8_t i=4; i<8; i++)
+			//	packet[8] += packet[i];
 			packet_length=E015_BIND_PACKET_SIZE;
 		}
 		else
@@ -154,24 +157,15 @@ static void __attribute__((unused)) E01X_send_packet()
 		}
 	}

-	HS6200_Configure(_BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO) | _BV(NRF24L01_00_PWR_UP));
-	NRF24L01_WriteReg(NRF24L01_05_RF_CH, rf_ch_num);
-
-	NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);
-	NRF24L01_FlushTx();
-
-	HS6200_WritePayload(packet, packet_length);
-
-	// Check and adjust transmission power. We do this after
-	// transmission to not bother with timeout after power
-	// settings change -  we have plenty of time until next
-	// packet.
-	NRF24L01_SetPower();
+	HS6200_RFChannel(rf_ch_num);
+	HS6200_SetPower();
+	delayMicroseconds(270);		// Wait for RF channel to settle
+	HS6200_SendPayload(packet, packet_length);
 }

 static void __attribute__((unused)) E01X_RF_init()
 {
-	NRF24L01_Initialize();
+	HS6200_Init(true);	// CRC enabled

 	if(sub_protocol==E012)
 		HS6200_SetTXAddr((uint8_t *)"\x55\x42\x9C\x8F\xC9", E01X_ADDRESS_LENGTH);
@@ -218,8 +212,21 @@ void E01X_init()
 	}
 	else //E015
 	{
+		#ifdef E015_FORCE_ID
+			rx_tx_addr[0] = 0x06;
+			rx_tx_addr[1] = 0xC6;
+			rx_tx_addr[2] = 0xB7;
+			rx_tx_addr[3] = 0x56;
+			rx_tx_addr[4] = 0x8A;
+		#endif
+
+		//force the sum to give 0x63 since the id calculation is unknown
+		uint8_t sum=0x63;
+		for(uint8_t i=0; i < 4; i++)
+			sum -= rx_tx_addr[i];
+		rx_tx_addr[4] = sum;
+
 		packet_period=E015_PACKET_PERIOD;
-		rf_ch_num=E015_RF_CHANNEL;
 		armed = 0;
 		arm_flags = 0;
 		arm_channel_previous = E01X_ARM_SW;
--- a/Multiprotocol/E129_cyrf6936.ino
+++ b/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;
@@ -39,12 +41,31 @@ 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->...
-		packet[ 4] = GET_FLAG(CH5_SW, 0x20)				// Take off/Land 0x20
-				| GET_FLAG(CH6_SW, 0x04);				// Emergency stop 0x04
-		
+		packet[ 1] = 0xA6;								// Set to A5 every few packets??
+
+		//Flags
+		packet[ 2] = 0xF7;								// E129 High rate 0xF7, low 0xF4
+		if(sub_protocol == E129_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] = GET_FLAG(CH10_SW, 0x40)			// C159: loop flight 0x40
+				   | GET_FLAG(CH11_SW, 0x08);			// C129V2: flip
+		//Other flags seen in packet[3]
+		//  Flag 0x04 is set on some helis (C159/C190)
+		//  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(CH12_SW, 0x80);			// C190: debug mode->remote THR trim down sets 0x80
+		//Other flags seen in packet[4]
+		//  C190 remote LANDING sets 0x10
+		//  C190 remote THR trim down sets 0x80
+
+		//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 +88,12 @@ 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
+	for(uint8_t i=0;i<packet_length-2;i++)
+		packet[packet_length-2] += packet[i];
+	if(sub_protocol == E129_C186)
+		packet[packet_length-2] -= 0x80;
+
 	RF2500_BuildPayload(packet);
 }

@@ -83,7 +106,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 +132,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 +142,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 +162,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

--- a/Multiprotocol/EazyRC_nrf24l01.ino
+++ b/Multiprotocol/EazyRC_nrf24l01.ino
@@ -0,0 +1,166 @@
+/*
+ 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(EAZYRC_NRF24L01_INO)
+
+#include "iface_xn297.h"
+
+//#define FORCE_EAZYRC_ORIGINAL_ID
+
+#define EAZYRC_PAYLOAD_SIZE			10
+#define EAZYRC_RF_NUM_CHANNELS		4
+#define EAZYRC_BIND_CHANNEL			18
+#define EAZYRC_PACKET_PERIOD		5000
+
+enum {
+	EAZYRC_BINDTX=0,
+	EAZYRC_BINDRX,
+	EAZYRC_DATA,
+};
+
+static void __attribute__((unused)) EAZYRC_send_packet()
+{
+	//Bind:
+	// TX:    C=18 S=Y A= AA BB CC DD EE P(10)= 1A A0 01 00 00 00 1E 00 78 51
+	//   packet[0..2]=tx_addr, packet[6]=first rf channel, packet[8]=unk, packet[9]=sum(packet[0..8])
+	// RX:    C=18 S=Y A= AA BB CC DD EE P(10)= 41 AD 01 1A A0 01 1E 00 87 4F
+	//   packet[0..2]=rx_addr, packet[3..5]=tx_addr, packet[6]=first rf channel, packet[8]=unk but swapped, packet[9]=sum(packet[0..8])
+	//Normal: C=30 S=Y A= 1A A0 41 AD 02 P(10)= 7F 7F 1F 19 00 00 1E 00 AB FF
+	//   packet[0]=THR, packet[1]=ST, packet[2]=unk, packet[3]=unk, packet[6]=first rf channel, packet[8]=unk, packet[9]=sum(packet[0..8])
+	//Bound : C=18 S=Y A= AA BB CC DD EE P(10)= 1A A0 01 41 AD 01 1E 00 79 41
+	//   packet[0..2]=tx_addr, packet[3..5]=rx_addr, packet[6]=first rf channel, packet[8]=unk, packet[9]=sum(packet[0..8])
+	//   sent every 12 packets in normal mode, but is it really needed if the car loose power then you need to rebind...
+	//Packet period around 5ms with a large jitter
+
+	memset(&packet[3], 0x00, 7);
+	if(IS_BIND_IN_PROGRESS)
+	{
+		memcpy(&packet,rx_tx_addr,3);
+		packet[6] = hopping_frequency[0];
+		packet[8] = 0x78;						//??? packet type?
+	}
+	else
+	{
+		XN297_Hopping(hopping_frequency_no);
+		hopping_frequency_no++;
+		hopping_frequency_no &= 3;
+		
+		packet[0] = convert_channel_8b(THROTTLE);
+		packet[1] = convert_channel_8b(AILERON);
+		packet[2] = 0x1F;						//??? additional channel?
+		packet[3] = 0x19;						//??? additional channel?
+		packet[6] = hopping_frequency[0];
+		packet[8] = 0xAB;						//??? packet type?
+	}
+	for(uint8_t i=0;i<EAZYRC_PAYLOAD_SIZE-1;i++)
+		packet[9] += packet[i];
+	// Send
+	XN297_SetPower();
+	XN297_SetTxRxMode(TX_EN);
+	XN297_WritePayload(packet, EAZYRC_PAYLOAD_SIZE);
+	#ifdef DEBUG_SERIAL
+		for(uint8_t i=0; i < len; i++)
+			debug("%02X ", packet[i]);
+		debugln();
+	#endif
+}
+
+static void __attribute__((unused)) EAZYRC_initialize_txid()
+{
+	rx_tx_addr[1] = rx_tx_addr[3];
+	hopping_frequency[0] = (rx_tx_addr[3]%20) + 0x1E;		// Wild guess... First channel between 30 and 49so a full range of 30 to 79
+	#ifdef FORCE_EAZYRC_ORIGINAL_ID
+		rx_tx_addr[0] = 0x1A;
+		rx_tx_addr[1] = 0xA0;
+		rx_tx_addr[2] = 0x01;
+		hopping_frequency[0] = 0x1E;
+	#endif
+	rx_tx_addr[2] = 0x01;									// Not sure if this is needed...
+	for(uint8_t i=1; i<EAZYRC_RF_NUM_CHANNELS; i++)
+		hopping_frequency[i] = hopping_frequency[0] + 10*i;
+}
+
+static void __attribute__((unused)) EAZYRC_RF_init()
+{
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
+	XN297_SetTXAddr((uint8_t*)"\xAA\xBB\xCC\xDD\xEE", 5);
+	XN297_SetRXAddr((uint8_t*)"\xAA\xBB\xCC\xDD\xEE", EAZYRC_PAYLOAD_SIZE);
+	XN297_RFChannel(EAZYRC_BIND_CHANNEL);
+}
+
+uint16_t EAZYRC_callback()
+{
+	uint8_t rf,n;
+	uint16_t addr;
+	switch(phase)
+	{
+		case EAZYRC_BINDTX:
+			if(XN297_IsRX())
+			{
+				//Example:	TX: C=18 S=Y A= AA BB CC DD EE P(10)= 1A A0 01 00 00 00 1E 00 78 51
+				// packet[0..2]=tx_addr, packet[6]=first rf channel, packet[8]=unk, packet[9]=sum(packet[0..8])
+				//			RX: C=18 S=Y A= AA BB CC DD EE P(10)= 41 AD 01 1A A0 01 1E 00 87 4F
+				// packet[0..2]=rx_addr, packet[3..5]=tx_addr, packet[6]=first rf channel, packet[8]=unk but swapped, packet[9]=sum(packet[0..8])
+				XN297_ReadPayload(packet_in, EAZYRC_PAYLOAD_SIZE);
+				#ifdef DEBUG_SERIAL
+					for(uint8_t i=0; i < EAZYRC_PAYLOAD_SIZE; i++)
+						debug("%02X ", packet_in[i]);
+					debugln();
+				#endif
+				//could check the validity of the packet by looking at the sum...
+				if(memcmp(&packet_in[3],&rx_tx_addr,3)==0)
+				{//TX ID match, TX addr to use: 1A A0 41 AD 02
+					rx_tx_addr[4] = rx_tx_addr[2] + packet_in[2];	//wild guess
+					rx_tx_addr[2] = packet_in[0];
+					rx_tx_addr[3] = packet_in[1];
+					BIND_DONE;
+					XN297_SetTxRxMode(TXRX_OFF);
+					XN297_SetTXAddr(rx_tx_addr, 5);
+					phase = EAZYRC_DATA;
+					return 5000;
+				}
+			}
+			XN297_SetTxRxMode(TXRX_OFF);
+			EAZYRC_send_packet();
+			phase++;
+			return 1000;
+		case EAZYRC_BINDRX:
+			//Wait for the packet transmission to finish
+			while(XN297_IsPacketSent()==false);
+			//Switch to RX
+			XN297_SetTxRxMode(TXRX_OFF);
+			XN297_SetTxRxMode(RX_EN);
+			phase = EAZYRC_BINDTX;
+			return 10000;
+		case EAZYRC_DATA:
+			#ifdef MULTI_SYNC
+				telemetry_set_input_sync(EAZYRC_PACKET_PERIOD);
+			#endif
+			EAZYRC_send_packet();
+			break;
+	}
+	return EAZYRC_PACKET_PERIOD;
+}
+
+void EAZYRC_init()
+{
+	BIND_IN_PROGRESS;
+	EAZYRC_initialize_txid();
+	EAZYRC_RF_init();
+	phase = EAZYRC_BINDTX;
+	packet_count = 0;
+	hopping_frequency_no = 0;
+}
+
+#endif
--- a/Multiprotocol/FQ777_nrf24l01.ino
+++ b/Multiprotocol/FQ777_nrf24l01.ino
@@ -31,6 +31,19 @@ enum {
 	FQ777_FLAG_FLIP       = 0x80,
 };

+enum {
+	XBM37_B5_OK           = 0x80,
+	XBM37_B6_RATE_LOW     = 0x00,
+	XBM37_B6_RATE_MID     = 0x01,
+	XBM37_B6_RATE_HIGH    = 0x02,
+	XBM37_B6_LED_OFF      = 0x04,
+	XBM37_B6_RTH          = 0x08,
+	XBM37_B6_HEADLESS     = 0x10,
+	XBM37_B6_VIDEO        = 0x20,
+	XBM37_B6_PICTURE      = 0x40,
+	XBM37_B6_FLIP         = 0x80,
+};
+
 const uint8_t ssv_xor[] = {0x80,0x44,0x64,0x75,0x6C,0x71,0x2A,0x36,0x7C,0xF1,0x6E,0x52,0x9,0x9D,0x1F,0x78,0x3F,0xE1,0xEE,0x16,0x6D,0xE8,0x73,0x9,0x15,0xD7,0x92,0xE7,0x3,0xBA};
 uint8_t FQ777_bind_addr []   = {0xe7,0xe7,0xe7,0xe7,0x67};

@@ -87,12 +100,21 @@ static void __attribute__((unused)) FQ777_send_packet()
 	uint8_t packet_ori[8];
 	if (IS_BIND_IN_PROGRESS)
 	{
-		// 4,5,6 = address fields
-		// last field is checksum of address fields
+		// Byte 0 is always 0x20; bytes 1-3 are sub-protocol specific
 		packet_ori[0] = 0x20;
-		packet_ori[1] = 0x15;
-		packet_ori[2] = 0x05;
-		packet_ori[3] = 0x06;
+		if (sub_protocol == XBM37)
+		{
+			packet_ori[1] = 0x14;
+			packet_ori[2] = 0x07;
+			packet_ori[3] = 0x03;
+		}
+		else  // FQ777
+		{
+			packet_ori[1] = 0x15;
+			packet_ori[2] = 0x05;
+			packet_ori[3] = 0x06;
+		}
+		// Bytes 4-6: address fields, byte 7: checksum of address fields (shared by both protocols)
 		packet_ori[4] = rx_tx_addr[0];
 		packet_ori[5] = rx_tx_addr[1];
 		packet_ori[6] = rx_tx_addr[2];
@@ -100,36 +122,64 @@ static void __attribute__((unused)) FQ777_send_packet()
 	}
 	else
 	{
-		// throt, yaw, pitch, roll, trims, flags/left button,00,right button
-		//0-3 0x00-0x64
-		//4 roll/pitch/yaw trims. cycles through one trim at a time - 0-40 trim1, 40-80 trim2, 80-C0 trim3 (center:  A0 20 60)
-		//5 flags for throttle button, two buttons above throttle - def: 0x40
-		//6 00 ??
-		//7 checksum - add values in other fields 
+		if (sub_protocol == XBM37)
+		{
+			packet_ori[0] = convert_channel_16b_limit(THROTTLE,0xE1,0);	// reverse channel
+			packet_ori[1] = convert_channel_16b_limit(RUDDER,0,0xE1);
+			packet_ori[2] = convert_channel_16b_limit(AILERON,0xE1,0);	// reverse channel
+			packet_ori[3] = convert_channel_16b_limit(ELEVATOR,0xE1,0);	// reverse channel
+			packet_ori[4] = (convert_channel_8b(CH13) >> 2) + 1;		// ele trim (01..20..40) front ^ plus 0x01, back - minus 0x01 per click
+			packet_ori[5] = 0x3F - (convert_channel_8b(CH14) >> 2)		// ail trim (40..20..01) left <- plus 0x01, right -> minus 0x01 per click
+							| GET_FLAG(CH12_SW, XBM37_B5_OK);				// bit7 = OK button ...unknown use for this model?

-		
-		// Trims are usually done through the radio configuration but leaving the code here just in case...
-		uint8_t trim_mod  = packet_count % 144;
-		uint8_t trim_val  = 0;
-		if (36 <= trim_mod && trim_mod < 72) // yaw
-			trim_val  = 0x20; // don't modify yaw trim
-		else
-			if (108 < trim_mod && trim_mod) // pitch
-				trim_val = 0xA0;
-			else // roll
-				trim_val = 0x60;
+			uint8_t rate_bits;
+			if (CH5_SW)
+				rate_bits = XBM37_B6_RATE_HIGH;				// high rate
+			else if (Channel_data[CH5] < CHANNEL_MIN_COMMAND)
+				rate_bits = XBM37_B6_RATE_LOW;				// low rate
+			else
+				rate_bits = XBM37_B6_RATE_MID;				// medium rate

-		packet_ori[0] = convert_channel_16b_limit(THROTTLE,0,0x64);
-		packet_ori[1] = convert_channel_16b_limit(RUDDER,0,0x64);
-		packet_ori[2] = convert_channel_16b_limit(ELEVATOR,0,0x64);
-		packet_ori[3] = convert_channel_16b_limit(AILERON,0,0x64);
-		packet_ori[4] = trim_val; // calculated above
-		packet_ori[5] = GET_FLAG(CH5_SW, FQ777_FLAG_FLIP)
-				  | GET_FLAG(CH7_SW, FQ777_FLAG_HEADLESS)
-				  | GET_FLAG(!CH6_SW, FQ777_FLAG_RETURN)
-				  | GET_FLAG(CH8_SW,FQ777_FLAG_EXPERT);
-		packet_ori[6] = 0x00;
-		// calculate checksum
+			packet_ori[6] = rate_bits						// bits[1:0] = rate
+					| GET_FLAG(CH8_SW, XBM37_B6_LED_OFF)	// bit2 = LED off
+					| GET_FLAG(CH11_SW, XBM37_B6_RTH)		// bit3 = RTH
+					| GET_FLAG(CH7_SW, XBM37_B6_HEADLESS)	// bit4 = headless
+					| GET_FLAG(CH10_SW, XBM37_B6_VIDEO)		// bit5 = video
+					| GET_FLAG(CH9_SW, XBM37_B6_PICTURE)	// bit6 = picture
+					| GET_FLAG(CH6_SW, XBM37_B6_FLIP);		// bit7 = flip
+		}
+		else  // FQ777
+		{
+			// throt, yaw, pitch, roll, trims, flags/left button,00,right button
+			//0-3 0x00-0x64
+			//4 roll/pitch/yaw trims. cycles through one trim at a time - 0-40 trim1, 40-80 trim2, 80-C0 trim3 (center:  A0 20 60)
+			//5 flags for throttle button, two buttons above throttle - def: 0x40
+			//6 00 ??
+			//7 checksum - add values in other fields
+
+			// Trims are usually done through the radio configuration but leaving the code here just in case...
+			uint8_t trim_mod  = packet_count % 144;
+			uint8_t trim_val  = 0;
+			if (36 <= trim_mod && trim_mod < 72) // yaw
+				trim_val  = 0x20; // don't modify yaw trim
+			else
+				if (108 < trim_mod && trim_mod) // pitch
+					trim_val = 0xA0;
+				else // roll
+					trim_val = 0x60;
+
+			packet_ori[0] = convert_channel_16b_limit(THROTTLE,0,0x64);
+			packet_ori[1] = convert_channel_16b_limit(RUDDER,0,0x64);
+			packet_ori[2] = convert_channel_16b_limit(ELEVATOR,0,0x64);
+			packet_ori[3] = convert_channel_16b_limit(AILERON,0,0x64);
+			packet_ori[4] = trim_val; // calculated above
+			packet_ori[5] = GET_FLAG(CH5_SW, FQ777_FLAG_FLIP)
+					  | GET_FLAG(CH7_SW, FQ777_FLAG_HEADLESS)
+					  | GET_FLAG(!CH6_SW, FQ777_FLAG_RETURN)
+					  | GET_FLAG(CH8_SW,FQ777_FLAG_EXPERT);
+			packet_ori[6] = 0x00;
+		}
+		// Data packet checksum: sum of bytes 0-6 (not applied to bind packets)
 		uint8_t checksum = 0;
 		for (int i = 0; i < 7; ++i)
 			checksum += packet_ori[i];
@@ -181,12 +231,17 @@ void FQ777_init(void)
 	BIND_IN_PROGRESS;	// autobind protocol
 	bind_counter = FQ777_BIND_COUNT;
 	packet_count=0;
-	hopping_frequency[0] = 0x4D;
-	hopping_frequency[1] = 0x43;
-	hopping_frequency[2] = 0x27;
+	// Sub-protocol hop channel table: first 3 channels differ; channel[3]=0x07 is shared
+	static const uint8_t hop_ch[2][3] = {
+		{0x4D, 0x43, 0x27},  // FQ777
+		{0x49, 0x34, 0x26},  // XBM-37
+	};
+	hopping_frequency[0] = hop_ch[sub_protocol][0];
+	hopping_frequency[1] = hop_ch[sub_protocol][1];
+	hopping_frequency[2] = hop_ch[sub_protocol][2];
 	hopping_frequency[3] = 0x07;
 	hopping_frequency_no=0;
-	rx_tx_addr[2] = 0x00;
+	rx_tx_addr[2] = (sub_protocol == XBM37) ? (RX_num & 0x3F) : 0x00; // XBM-37 uses receiver number (0-63) for model match capability
 	rx_tx_addr[3] = 0xe7;
 	rx_tx_addr[4] = 0x67;
 	FQ777_RF_init();
--- a/Multiprotocol/FX816_nrf24l01.ino
+++ b/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
--- a/Multiprotocol/FX_nrf24l01.ino
+++ b/Multiprotocol/FX_nrf24l01.ino
@@ -0,0 +1,415 @@
+/*
+ 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 FX9630_PACKET_PERIOD		8124	//8156 on QIDI-560
+#define FX9630_BIND_CHANNEL			51
+#define FX9630_PAYLOAD_SIZE			8
+#define FX9630_NUM_CHANNELS			3
+#define FX9630_WRITE_TIME			500
+
+#define FX_QF012_PACKET_PERIOD		12194
+#define FX_QF012_RX_PAYLOAD_SIZE	3
+
+#define FX_BM26_BIND_CHANNEL		40      
+#define FX_BM26_PACKET_PERIOD		14066
+
+#define FX_A570_PACKET_PERIOD		10270
+
+//#define FORCE_FX620_ID
+//#define FORCE_FX9630_ID
+//#define FORCE_QIDI_ID
+//#define FORCE_FX_A570_ID
+
+enum 
+{
+	FX_DATA=0,
+	FX_RX,
+};
+
+static void __attribute__((unused)) FX_send_packet()
+{
+	static uint8_t trim_ch = 0;
+
+	//Hopp
+	if(IS_BIND_DONE)
+	{
+		XN297_Hopping(hopping_frequency_no++);
+		if(sub_protocol >= FX9630)
+		{ // FX9630 & FX_Q560 & FX_QF012 & FX_A570
+			if (hopping_frequency_no >= FX9630_NUM_CHANNELS)
+			{
+				hopping_frequency_no = 0;
+				if(sub_protocol == FX9630)
+				{
+					trim_ch++;
+					trim_ch &= 3;
+				}
+				else // FX_Q560 & FX_QF012 & FX_A570
+					trim_ch = 0;
+			}
+		}
+		else // FX816 & FX620
+		{
+			hopping_frequency_no &= 0x03;
+		}
+	}
+
+	memset(packet,0x00,packet_length);
+
+	//Channels
+	uint8_t val;
+	if (sub_protocol == FX816 || sub_protocol == FX620)
+	{
+		uint8_t offset=sub_protocol == FX816 ? FX816_CH_OFFSET:FX620_CH_OFFSET;
+		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
+	}
+	else if (sub_protocol == FX_A570)
+	{
+		packet[0] = convert_channel_16b_limit(THROTTLE,0x1C,0xE4);
+		packet[1] = convert_channel_16b_limit(AILERON,0xE4,0x1C);
+		packet[2] = convert_channel_16b_limit(ELEVATOR,0xE4,0x1C);
+		packet[3] = convert_channel_16b_limit(RUDDER,0x1C,0xE4);
+				// Trims - Ruddder L:01 R:02, Aileron L:03 R:04, Elevator Fwd:05 Back:06
+		packet[4]  =  (Channel_data[CH10] < CHANNEL_MIN_COMMAND ? 0x01 : GET_FLAG(CH10_SW, 0x02))  // Rudder trim
+					| (Channel_data[CH11] < CHANNEL_MIN_COMMAND ? 0x03 : GET_FLAG(CH11_SW, 0x04))  // Aileron trim
+					| (Channel_data[CH12] < CHANNEL_MIN_COMMAND ? 0x06 : GET_FLAG(CH12_SW, 0x05)); // Elevator trim
+		packet[5]  =  GET_FLAG(CH5_SW, 0x40)  // motors stop
+				// A570 flight modes = 0>vertical flight(3 axis mode):00, 1>flat flight(6G):02, 2>vertical flight(2 axis mode):04
+					| (Channel_data[CH6] < CHANNEL_MIN_COMMAND ? 0x00 : (Channel_data[CH6] > CHANNEL_MAX_COMMAND ? 0x04 : 0x02))
+					| GET_FLAG(CH7_SW, 0x01)  // 0:low rate, 1:high rate
+					| GET_FLAG(CH8_SW, 0x08)  // LED color change
+					| GET_FLAG(CH9_SW, 0x10); // LED off
+	}
+	else
+	{ // FX9630 & FX_Q560 & FX_QF012 & FX_BM26
+		packet[0] = convert_channel_8b(THROTTLE);
+		packet[1] = convert_channel_8b(AILERON);
+		packet[2] = 0xFF - convert_channel_8b(ELEVATOR);
+		packet[3] = convert_channel_8b(RUDDER);
+		if ( sub_protocol == FX_BM26 )  // BM26 Ail, Elev, Rud range between 0x00-0x3F-0x7F
+    	{
+			packet[1] >>= 1;
+			packet[2] >>= 1;
+			packet[3] >>= 1;
+    	}
+		val = trim_ch==0 ? 0x20 : (convert_channel_8b(trim_ch + CH6) >> 2);	// no trim on Throttle
+		packet[4] = val;			// Trim for channel x 0C..20..34
+		packet[5] = (trim_ch << 4)	// channel x << 4
+					| GET_FLAG(CH5_SW, (sub_protocol == FX_QF012 ? 0x08 : 0x01))  // DR toggle swich: 0 small throw, 1 large throw / Q560 acrobatic / QF012 Special effects
+					// FX9630  =>0:6G small throw, 1:6G large throw, 2:3D
+					// QIDI-550=>0:3D, 1:6G, 2:Torque
+					// QF012=>0:beginner(6G), 1:mid(3D), 2:expert(Gyro off) 
+					| (Channel_data[CH6] < CHANNEL_MIN_COMMAND ? 0x00 : (Channel_data[CH6] > CHANNEL_MAX_COMMAND ? 0x04 : 0x02));
+		if(sub_protocol == FX_Q560)
+			packet[5] |= GET_FLAG(CH7_SW, 0x18);		// Q560 LED flag 0x10 conflicting with trim_ch... Corrected on new boards using 0x08 instead
+		else if (sub_protocol == FX_QF012) 
+      			packet[5] |=  GET_FLAG(CH7_SW, 0x40)	// QF012 invert flight
+                		  |   GET_FLAG(CH8_SW, 0x80);	// QF012 Restore fine tunning midpoint
+		else if ( sub_protocol == FX_BM26 ) 
+		{
+			packet[5] &= 0xC0;
+			packet[5] += 0x40;
+			// BM26 P51=>0:beginner(6G), 1:mid(3D), 2:expert(Gyro off) 
+			packet[5] |= (Channel_data[CH6] < CHANNEL_MIN_COMMAND ? 0x08 : (Channel_data[CH6] > CHANNEL_MAX_COMMAND ? 0x0C : 0x0A));
+			packet[6] = GET_FLAG( CH5_SW, 0x20)		// 6G Roll
+        			  | GET_FLAG(!CH7_SW, 0x08)		// Light control switch, default on
+            		  | GET_FLAG(!CH8_SW, 0x10)		// Turn signal switch, default on
+        			  | GET_FLAG( CH9_SW, 0x01);	// Gyro Calibration
+    	}  
+	}
+
+	//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 if(sub_protocol == 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??
+		}
+	}
+	else // FX9630 & FX_Q560 & FX_QF012 & FX_BM26 & FX_A570 
+	{
+		if(IS_BIND_IN_PROGRESS)
+		{
+			memcpy(packet,rx_tx_addr, 4);
+			packet[4] = hopping_frequency[1];
+			packet[5] = hopping_frequency[2];
+			packet[7] = 0x55;
+		}
+	}
+
+	//Check
+	uint8_t last_packet_idx = packet_length-1;
+	if (sub_protocol >= FX9630 && IS_BIND_IN_PROGRESS)
+		last_packet_idx--;
+	val=0;
+	for(uint8_t i=0;i<last_packet_idx;i++)
+		val+=packet[i];
+	if (sub_protocol >= FX9630)
+		val = val ^ 0xFF;
+	packet[last_packet_idx]=val;
+
+	if ( IS_BIND_IN_PROGRESS && sub_protocol == FX_BM26 ) packet[7] = packet[6];
+	
+	//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);
+   	packet_length = FX9630_PAYLOAD_SIZE;	// default
+	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 if(sub_protocol == 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;
+	}
+	else if (sub_protocol == FX_BM26)
+	{
+		XN297_SetTXAddr((uint8_t *)"\x12\x34\x10\x10", 4); 
+    	XN297_RFChannel(FX_BM26_BIND_CHANNEL); 
+    	packet_period = FX_BM26_PACKET_PERIOD;
+	}
+	else if(sub_protocol == FX_A570)
+	{
+		XN297_SetTXAddr((uint8_t *)"\x56\x78\x92\x13", 4);
+		XN297_RFChannel(FX9630_BIND_CHANNEL);
+		packet_period = FX_A570_PACKET_PERIOD;
+	}
+	else // FX9630 & FX_Q560 & FX_QF012
+	{
+		XN297_SetTXAddr((uint8_t *)"\x56\x78\x90\x12", 4);
+		XN297_RFChannel(FX9630_BIND_CHANNEL);
+		packet_period = sub_protocol == FX_QF012 ? FX_QF012_PACKET_PERIOD : FX9630_PACKET_PERIOD;
+	}
+}
+
+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 if(sub_protocol == 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];
+	}
+	else // FX9630 & FX_Q560 & FX_QF012 & FX_BM26 & FX_A570
+	{
+		//??? Need to find out how the first RF channel is calculated ???
+		hopping_frequency[0] = sub_protocol == FX_BM26? 0x0C : 0x13;
+		if (sub_protocol == FX_A570) hopping_frequency[0] = 0x0E;
+		//Other 2 RF channels are sent during the bind phase so they can be whatever
+		hopping_frequency[1] = RX_num & 0x0F + 0x1A;
+		hopping_frequency[2] = rx_tx_addr[3] & 0x0F + 0x38;
+		#ifdef FORCE_FX9630_ID
+			memcpy(rx_tx_addr,(uint8_t*)"\xCE\x31\x9B\x73", 4);
+			memcpy(hopping_frequency,"\x13\x1A\x38", FX9630_NUM_CHANNELS);		//Original dump=>19=0x13,26=0x1A,56=0x38
+		#endif
+		#ifdef FORCE_QIDI_ID
+			memcpy(rx_tx_addr,(uint8_t*)"\x23\xDC\x76\xA2", 4);
+			memcpy(hopping_frequency,"\x08\x25\x33", FX9630_NUM_CHANNELS);		//Original dump=>08=0x08,37=0x25,51=0x33
+
+			//QIDI-560 #1
+			//memcpy(rx_tx_addr,(uint8_t*)"\x38\xC7\x6D\x8D", 4);
+			//memcpy(hopping_frequency,"\x0D\x20\x3A", FX9630_NUM_CHANNELS);
+		#endif
+		// BM26 rx_tx_addr: "\x17\x03\x00\x00", hopping_frequency: 0x0C,0x30,0x43(12,48,67)
+		#ifdef FORCE_FX_A570_ID
+			memcpy(rx_tx_addr,(uint8_t*)"\xA9\x56\xFC\x1C", 4);
+			memcpy(hopping_frequency,"\x0E\x1F\x39", FX9630_NUM_CHANNELS);		//Original dump=>14=0x0E,31=0x1F,57=0x39
+		#endif
+	} 
+}
+
+uint16_t FX_callback()
+{
+	#ifdef FX_HUB_TELEMETRY
+		bool rx=false;
+		static uint8_t telem_count = 0;
+		switch(phase)
+		{
+			case FX_DATA:
+				rx = XN297_IsRX();
+				XN297_SetTxRxMode(TXRX_OFF);
+	#endif
+				#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;
+						}
+						else if(sub_protocol >= FX9630)
+						{ // FX9630 & FX_Q560 & FX_QF012
+							XN297_SetTXAddr(rx_tx_addr, 4);
+	#ifdef FX_HUB_TELEMETRY
+							XN297_SetRXAddr(rx_tx_addr, FX_QF012_RX_PAYLOAD_SIZE);
+	#endif
+						}
+					}
+				FX_send_packet();
+	#ifdef FX_HUB_TELEMETRY
+				if (sub_protocol == FX816 || sub_protocol == FX620 || sub_protocol == FX_A570)
+					break;
+				if(rx)
+				{
+					debug("RX");
+					if(XN297_ReadPayload(packet_in, FX_QF012_RX_PAYLOAD_SIZE))
+					{//Good CRC
+						telemetry_link = 1;
+						telemetry_lost = 0;
+						telem_count = 0;
+						if ( sub_protocol == FX_BM26 )
+							v_lipo1 = packet_in[0] <  packet_in[2] ? 60:81;	// packets: AA 00 55 -> 55 00 AA = low voltage 3.7V
+						else
+							v_lipo1 = packet_in[1] ? 60:81;					// packets: A5 00 11 -> A5 01 11 = low voltage 3.7V
+						#if 0
+							for(uint8_t i=0; i < FX_QF012_RX_PAYLOAD_SIZE; i++)
+								debug(" %02X", packet_in[i]);
+						#endif
+					}
+					debugln();
+				}
+				if(telem_count > 4*63)				// Around 3.5 sec with no telemetry
+					telemetry_lost = 1;
+				else
+				{
+					telem_count++;
+					if(!telemetry_lost && (telem_count & 0x3F) == 0)
+					{// Should have received a telem packet but... Send telem to the radio to keep it alive
+						telemetry_link = 1;
+						#if 0
+							debugln("Miss");
+						#endif
+					}
+				}
+				phase++;
+				return FX9630_WRITE_TIME;
+			default: //FX_RX
+				/* { // Wait for packet to be sent before switching to receive mode
+					uint16_t start=(uint16_t)micros(), count=0;
+					while ((uint16_t)((uint16_t)micros()-(uint16_t)start) < 500)
+					{
+						if(XN297_IsPacketSent())
+							break;
+						count++;
+					}
+					debug("%d",count);
+				} */
+				//Switch to RX
+				XN297_SetTxRxMode(TXRX_OFF);
+				XN297_SetTxRxMode(RX_EN);
+				phase = FX_DATA;
+				return packet_period - FX9630_WRITE_TIME;
+		}
+	#endif
+	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;
+	#ifdef FX_HUB_TELEMETRY
+		RX_RSSI = 100;		// Dummy value
+		telemetry_lost = 1;
+		phase = FX_DATA;
+	#endif
+}
+
+#endif
--- a/Multiprotocol/FrSkyX_cc2500.ino
+++ b/Multiprotocol/FrSkyX_cc2500.ino
@@ -51,9 +51,9 @@ static void __attribute__((unused)) FrSkyX_build_bind_packet()
 		//packet 1D 03 01 0E 1C 02 00 00 32 0B 00 00 A8 26 28 01 A1 00 00 00 3E F6 87 C7 00 00 00 00 C9 C9
 		//Unknown bytes
 		if(state & 0x01)
-			memcpy(&packet[7],"\x00\x18\x0A\x00\x00\xE0\x02\x0B\x01\xD3\x08\x00\x00\x4C\xFE\x87\xC7",17);
+			memcpy(&packet[7],"\x00\xCC\x00\x00\x00\x70\x14\x15\x00\xD3\x08\x00\x00\xCE\xE2\x85\xC7\x00\x00\x00\x00",21);
 		else
-			memcpy(&packet[7],"\x27\xAD\x02\x00\x00\x64\xC8\x46\x00\x64\x00\x00\x00\xFB\xF6\x87\xC7",17);
+			memcpy(&packet[7],"\x27\xFB\x00\x00\x00\xBC\xEF\x19\x00\x26\x07\x00\x00\xB7\xED\x85\xC7\xA7\xA7\xA7\xA7",21);
 		//ID
 		packet[5] = rx_tx_addr[1];			// ID
 		packet[6] = RX_num;
@@ -63,8 +63,9 @@ static void __attribute__((unused)) FrSkyX_build_bind_packet()
 		if(binding_idx&0x02)
 			packet[7] |= 0x80;				// CH9-16
 		//Replace the ID
-		packet[20] ^= 0x0E ^ rx_tx_addr[3];	// Update the ID
-		packet[21] ^= 0x1C ^ rx_tx_addr[2];	// Update the ID
+		packet[20] ^= rx_tx_addr[3]; 		// Update the ID
+		packet[21] ^= rx_tx_addr[2]; 		// Update the ID
+		packet[22] ^= rx_tx_addr[1] & 0x3F;	// Update the ID
 		//Xor
 		for(uint8_t i=3; i<packet_length-1; i++)
 			packet[i] ^= 0xA7;
@@ -100,7 +101,7 @@ static void __attribute__((unused)) FrSkyX_build_packet()
 	FrSkyX_channels(7);					// Set packet[7]=failsafe, packet[8]=0?? and packet[9..20]=channels data
 	
 	//Sequence and send SPort
-	FrSkyX_seq_sport(21,packet_length-2);	//21=RX|TXseq, 22=bytes count, 23..packet_length-2=data
+	FrSkyX_seq_sport(21,packet_length-((protocol==PROTO_FRSKYX && (FrSkyFormat & 2 )) ? 4 : 2)); //21=RX|TXseq, 22=bytes count, 23..packet_length-2=data

 	//CRC
 	uint16_t lcrc = FrSkyX_crc(&packet[3], packet_length-4);
@@ -116,6 +117,10 @@ static void __attribute__((unused)) FrSkyX_build_packet()

 uint16_t FRSKYX_callback()
 {
+	#if defined MULTI_EU
+		if(sub_protocol == CH_16 || sub_protocol == CH_8)
+			return 9000;
+	#endif
 	switch(state)
 	{	
 		default: 
--- a/Multiprotocol/H36_nrf24l01.ino
+++ b/Multiprotocol/H36_nrf24l01.ino
@@ -0,0 +1,132 @@
+/*
+ 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(H36_NRF24L01_INO)
+
+#include "iface_xn297.h"
+
+//#define FORCE_H36_ORIGINAL_ID
+
+#define H36_PAYLOAD_SIZE		13
+#define H36_RF_NUM_CHANNELS		4
+#define H36_BIND_PACKET_PERIOD	10285
+#define H36_BIND_COUNT			648		//3sec
+
+enum {
+	H36_DATA1=0,
+	H36_DATA2,
+	H36_DATA3,
+	H36_DATA4,
+};
+
+static void __attribute__((unused)) H36_send_packet()
+{
+	if(IS_BIND_DONE && phase == H36_DATA1)
+	{
+		hopping_frequency_no++;
+		hopping_frequency_no&=3;
+		XN297_Hopping(hopping_frequency_no);
+	}
+
+	packet[0] = 0x2E; 							// constant?
+	memcpy(&packet[2],rx_tx_addr,3);
+	if(IS_BIND_IN_PROGRESS)
+	{//Bind
+		memcpy(&packet[5],hopping_frequency,4);
+		memset(&packet[9], 0x00, 3);
+		packet[12] = 0xED; 						// constant?
+		bind_counter--;
+		if(bind_counter == 0)
+			BIND_DONE;
+	}
+	else
+	{//Normal
+		packet[5] = convert_channel_8b(THROTTLE);
+		packet[6] = convert_channel_8b(RUDDER);
+		packet[7] = convert_channel_8b(ELEVATOR);
+		packet[8] = convert_channel_8b(AILERON);
+		packet[9] = GET_FLAG(CH6_SW,  0x02)		//Headless
+				   |GET_FLAG(CH7_SW,  0x04);	//RTH(temporary)
+		packet[10] = 0x20; 						//Trim A centered(0x20)
+		packet[11] = CH5_SW?0x60:0x20;			//Flip(0x40)|Trim E centered(0x20)
+		packet[12] = 0xA0; 						//High(0x80)/Low(0x40) rates|Trim R centered(0x20)?
+	}
+	//crc
+	packet[1]=0xAA;
+	for(uint8_t i=5;i<12;i++)
+		packet[1] ^= packet[i];
+	//Send
+	XN297_SetPower();
+	XN297_SetTxRxMode(TX_EN);
+	XN297_WritePayload(packet, H36_PAYLOAD_SIZE);
+	#ifdef DEBUG_SERIAL
+		debug("H%d P",hopping_frequency_no);
+		for(uint8_t i=0; i < H36_PAYLOAD_SIZE; i++)
+			debug(" %02X", packet[i]);
+		debugln();
+	#endif
+}
+
+static void __attribute__((unused)) H36_initialize_txid()
+{
+	rx_tx_addr[0] = rx_tx_addr[3];
+	calc_fh_channels(4);
+	#ifdef FORCE_H36_ORIGINAL_ID
+		if(!RX_num)
+		{
+			memcpy(rx_tx_addr,(uint8_t *)"\x00\x11\x00",3);
+			memcpy(hopping_frequency,(uint8_t *)"\x36\x3A\x31\x2B",4);	//54, 58, 49, 43 
+		}
+	#endif
+}
+
+static void __attribute__((unused)) H36_RF_init()
+{
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
+	XN297_SetTXAddr((uint8_t*)"\xCC\x6C\x47\x90\x53", 5);
+	XN297_RFChannel(50);		//Bind channel
+}
+
+uint16_t H36_callback()
+{
+	H36_send_packet();
+	switch(phase)
+	{
+		case H36_DATA1:
+			phase++;
+			return 1830;
+		case H36_DATA2:
+		case H36_DATA3:
+			phase++;
+			return 3085;
+		default://DATA4
+			#ifdef MULTI_SYNC
+				telemetry_set_input_sync(18500);
+			#endif
+			phase = H36_DATA1;
+			break;
+	}
+	return 10500;
+}
+
+void H36_init()
+{
+	BIND_IN_PROGRESS;	// Autobind protocol
+	H36_initialize_txid();
+	H36_RF_init();
+	phase = H36_DATA1;
+	hopping_frequency_no = 0;
+	bind_counter = H36_BIND_COUNT;
+}
+#endif
--- a/Multiprotocol/HOTT_cc2500.ino
+++ b/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)
 		{
@@ -390,7 +401,7 @@ uint16_t HOTT_callback()
 						{	//Telemetry
 							// [0..4] = TXID
 							// [5..9] = RXID
-							// [10] = 0x40 bind, 0x00 normal, 0x80 config menu
+							// [10] = holds warnings issued by hott devices
 							// [11] = telmetry pages. For sensors 0x00 to 0x04, for config mennu 0x00 to 0x12.
 							// Normal telem page 0 = 0x55, 0x32, 0x38, 0x55, 0x64, 0x32, 0xD0, 0x07, 0x00, 0x55
 							//   Page 0 [12] = [21] = [15]
@@ -400,7 +411,7 @@ uint16_t HOTT_callback()
 							//   Page 0 [16] = RX_LQI in %
 							//   Page 0 [17] = RX_Voltage Min*10 in V
 							//   Page 0 [18,19] = [19]<<8+[18]=max lost packet time in ms, max value seems 2s=0x7D0
-							//   Page 0 [20] = 0x00 ??
+							//   Page 0 [20] = rx events
 							//
 							// Config menu consists of the different telem pages put all together
 							//   Page X [12] = seems like all the telem pages with the same value are going together to make the full config menu text. Seen so far 'a', 'b', 'c', 'd' 
@@ -412,6 +423,7 @@ uint16_t HOTT_callback()
 							// Reduce telemetry to 14 bytes
 							packet_in[0]= packet_in[HOTT_RX_PACKET_LEN];
 							packet_in[1]= TX_LQI;
+							uint8_t hott_warnings = packet_in[10];						// save warnings from hott devices
 							bool send_telem=true;
 							HOTT_sensor_seq++;											// Increment RX sequence counter
 							if(packet[29] & 1)
@@ -464,6 +476,7 @@ uint16_t HOTT_callback()
 								packet_in[i-8]=packet_in[i];
 								debug(" %02X",packet_in[i]);
 							}
+							packet_in[14] = hott_warnings;								// restore saved warnings from hott devices
 							debugln("");
 							if(send_telem)
 								telemetry_link=2;
--- a/Multiprotocol/HS6200_EMU.ino
+++ b/Multiprotocol/HS6200_EMU.ino
@@ -0,0 +1,112 @@
+/*
+ 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/>.
+ */
+#ifdef CYRF6936_INSTALLED
+#include "iface_hs6200.h"
+
+static bool HS6200_crc;
+static uint16_t HS6200_crc_init;
+static uint8_t HS6200_address_length, HS6200_tx_addr[5];
+
+static void __attribute__((unused)) HS6200_Init(bool crc_en)
+{
+	CYRF_GFSK1M_Init(32, 1);	//Dummy number of bytes for now
+	HS6200_crc = crc_en;
+}
+
+static void __attribute__((unused)) HS6200_SetTXAddr(const uint8_t* addr, uint8_t addr_len)
+{
+	// precompute address crc
+	crc = 0xffff;
+	for(uint8_t i=0; i<addr_len; i++)
+		crc16_update(addr[addr_len-1-i], 8);
+	HS6200_crc_init=crc;
+	memcpy(HS6200_tx_addr, addr, addr_len);
+	HS6200_address_length = addr_len;
+}
+
+static uint16_t __attribute__((unused)) HS6200_calc_crc(uint8_t* msg, uint8_t len)
+{
+    uint8_t pos;
+    
+	crc = HS6200_crc_init;
+    // pcf + payload
+    for(pos=0; pos < len-1; pos++)
+        crc16_update(msg[pos], 8);
+    // last byte (1 bit only)
+    if(len > 0)
+        crc16_update(msg[pos+1], 1);
+    return crc;
+}
+
+static void __attribute__((unused)) HS6200_SendPayload(uint8_t* msg, uint8_t len)
+{
+	static const uint8_t HS6200_scramble[] = { 0x80,0xf5,0x3b,0x0d,0x6d,0x2a,0xf9,0xbc,0x51,0x8e,0x4c,0xfd,0xc1,0x65,0xd0 }; // todo: find all 32 bytes ...
+	uint8_t payload[32];
+	const uint8_t no_ack = 1; // never ask for an ack
+	static uint8_t pid;
+	uint8_t pos = 0;
+
+	if(len > sizeof(HS6200_scramble))
+		len = sizeof(HS6200_scramble);
+
+	// address
+	for(int8_t i=HS6200_address_length-1; i>=0; i--)
+		payload[pos++] = HS6200_tx_addr[i];
+
+	// guard bytes
+	payload[pos++] = HS6200_tx_addr[0];
+	payload[pos++] = HS6200_tx_addr[0];
+
+	// packet control field
+	payload[pos++] = ((len & 0x3f) << 2) | (pid & 0x03);
+	payload[pos] = (no_ack & 0x01) << 7;
+	pid++;
+
+	// scrambled payload
+	if(len > 0)
+	{
+		payload[pos++] |= (msg[0] ^ HS6200_scramble[0]) >> 1; 
+		for(uint8_t i=1; i<len; i++)
+			payload[pos++] = ((msg[i-1] ^ HS6200_scramble[i-1]) << 7) | ((msg[i] ^ HS6200_scramble[i]) >> 1);
+		payload[pos] = (msg[len-1] ^ HS6200_scramble[len-1]) << 7; 
+	}
+
+	// crc
+	if(HS6200_crc)
+	{
+		uint16_t crc = HS6200_calc_crc(&payload[HS6200_address_length+2], len+2);
+		uint8_t hcrc = crc >> 8;
+		uint8_t lcrc = crc & 0xff;
+		payload[pos++] |= (hcrc >> 1);
+		payload[pos++] = (hcrc << 7) | (lcrc >> 1);
+		payload[pos++] = lcrc << 7;
+	}
+
+	#if 0
+		debug("E:");
+		for(uint8_t i=0; i<pos; i++)
+			debug(" %02X",payload[i]);
+		debugln("");
+	#endif
+
+	//CYRF wants LSB first
+	for(uint8_t i=0; i<pos; i++)
+		payload[i]=bit_reverse(payload[i]);
+	//Send
+	CYRF_WriteRegister(CYRF_01_TX_LENGTH, pos);
+	CYRF_GFSK1M_SendPayload(payload, pos);
+}
+
+#endif
--- a/Multiprotocol/Hisky_nrf24l01.ino
+++ b/Multiprotocol/Hisky_nrf24l01.ino
@@ -66,8 +66,10 @@ static void __attribute__((unused)) HISKY_RF_init()
 	NRF24L01_WriteRegisterMulti(NRF24L01_0A_RX_ADDR_P0, rx_tx_addr, 5);
 	NRF24L01_WriteRegisterMulti(NRF24L01_10_TX_ADDR, rx_tx_addr, 5);
 	NRF24L01_WriteReg(NRF24L01_11_RX_PW_P0, 10);		// payload size = 10
+	#ifndef MULTI_AIR
 	if(sub_protocol==HK310)
 		NRF24L01_SetBitrate(NRF24L01_BR_250K);			// 250Kbps
+	#endif
 }

 // HiSky channel sequence: AILE  ELEV  THRO  RUDD  GEAR  PITCH, channel data value is from 0 to 1000
@@ -92,6 +94,13 @@ static void __attribute__((unused)) HISKY_build_ch_data()
 uint16_t HISKY_callback()
 {
 	phase++;
+	#ifdef MULTI_AIR
+		if(sub_protocol==HK310)
+		{
+			SUB_PROTO_INVALID;
+			return 10000;
+		}
+	#else
 	if(sub_protocol==HK310)
 		switch(phase)
 		{
@@ -132,6 +141,7 @@ uint16_t HISKY_callback()
 				phase=8;
 				break;
 		}
+	#endif
 	switch(phase)
 	{
 		case 1:
@@ -195,6 +205,7 @@ uint16_t HISKY_callback()
 static void __attribute__((unused)) HISKY_initialize_tx_id()
 {
 	//Generate frequency hopping table	
+	#ifndef MULTI_AIR
 	if(sub_protocol==HK310)
 	{
 		// for HiSky surface protocol, the transmitter always generates hop channels in sequential order. 
@@ -204,10 +215,11 @@ static void __attribute__((unused)) HISKY_initialize_tx_id()
 			hopping_frequency[i]=hopping_frequency_no++;	// Sequential order hop channels...
 	}
 	else
-		calc_fh_channels(HISKY_FREQUENCE_NUM);
+	#endif
 		// HiSky air protocol uses TX id as an address for nRF24L01, and uses frequency hopping sequence
 		// which does not depend on this id and is passed explicitly in binding sequence. So we are free
 		// to generate this sequence as we wish. It should be in the range [02..77]
+		calc_fh_channels(HISKY_FREQUENCE_NUM);
 }

 void HISKY_init()
--- a/Multiprotocol/Hontai_nrf24l01.ino
+++ b/Multiprotocol/Hontai_nrf24l01.ino
@@ -17,21 +17,25 @@

 #include "iface_xn297.h"	// mix of nrf and xn297 at 1Mb...

-#define HONTAI_BIND_COUNT 80
-#define HONTAI_PACKET_PERIOD    13500
-#define FQ777_951_PACKET_PERIOD	10000
-#define HONTAI_INITIAL_WAIT       500
-#define HONTAI_BIND_PACKET_SIZE   10
-#define HONTAI_PACKET_SIZE        12
-#define HONTAI_RF_BIND_CHANNEL    0
+#define HONTAI_BIND_COUNT			80
+#define HONTAI_PACKET_PERIOD		13500
+#define FQ777_951_PACKET_PERIOD		10000
+#define HONTAI_INITIAL_WAIT			500
+#define HONTAI_BIND_PACKET_SIZE		10
+#define HONTAI_PACKET_SIZE			12
+#define HONTAI_RF_BIND_CHANNEL		0
+#define HONTAI_XKK170_RF_BIND_CHANNEL	20
+#define HONTAI_XKK170_PACKET_PERIOD	8085
+
+//#define FORCE_HONTAI_XKK170_ORIGINAL_ID

 enum{
-    HONTAI_FLAG_FLIP      = 0x01, 
-    HONTAI_FLAG_PICTURE   = 0x02, 
-    HONTAI_FLAG_VIDEO     = 0x04, 
-    HONTAI_FLAG_HEADLESS  = 0x08, 
-    HONTAI_FLAG_RTH       = 0x10,
-    HONTAI_FLAG_CALIBRATE = 0x20,
+	HONTAI_FLAG_FLIP		= 0x01,
+	HONTAI_FLAG_PICTURE		= 0x02,
+	HONTAI_FLAG_VIDEO		= 0x04,
+	HONTAI_FLAG_HEADLESS	= 0x08,
+	HONTAI_FLAG_RTH			= 0x10,
+	HONTAI_FLAG_CALIBRATE	= 0x20,
 };

 static void __attribute__((unused)) HONTAI_send_packet()
@@ -40,6 +44,8 @@ static void __attribute__((unused)) HONTAI_send_packet()
 	{
 		memcpy(packet, rx_tx_addr, 5);
 		memset(&packet[5], 0, 3);
+		//if(sub_protocol == HONTAI_XKK170)
+		//	packet[6] = 0xD2;
 		packet_length = HONTAI_BIND_PACKET_SIZE;
 	}
 	else
@@ -50,58 +56,88 @@ static void __attribute__((unused)) HONTAI_send_packet()
 			XN297_Hopping(hopping_frequency_no++);
 		hopping_frequency_no %= 3;
 		memset(packet,0,HONTAI_PACKET_SIZE);
-		packet[3] = convert_channel_16b_limit(THROTTLE, 0, 127) << 1;	// Throttle
-		packet[4] = convert_channel_16b_limit(AILERON, 63, 0);			// Aileron
-		packet[5] = convert_channel_16b_limit(ELEVATOR, 0, 63);			// Elevator
-		packet[6] = convert_channel_16b_limit(RUDDER, 0, 63);			// Rudder
-		if(sub_protocol == X5C1)
-			packet[7] = convert_channel_16b_limit(AILERON, 0, 63)-31;	// Aileron trim
+		for(uint8_t i=0; i<4; i++)
+			packet[i+3] = convert_channel_8b(CH_TAER[i]);
+		if(sub_protocol != HONTAI_XKK170)
+		{
+			//Drive trims
+			packet[7] = (packet[4]>>3)-16;
+			packet[8] = (packet[6]>>3)-16;
+			packet[9] = (packet[5]>>3)-16;
+			//Reverse aileron
+			packet[4] ^= 0xFF;
+			//Limit range
+			for(uint8_t i=3; i<7; i++)
+				packet[i] >>= 2;			//00..63
+		}
 		else
-			packet[7] = convert_channel_16b_limit(AILERON, 0, 32)-16;	// Aileron trim
-		packet[8] = convert_channel_16b_limit(RUDDER, 0, 32)-16;			// Rudder trim
-		if (sub_protocol == X5C1)
-			packet[9] = convert_channel_16b_limit(ELEVATOR, 0, 63)-31;	// Elevator trim
-		else
-			packet[9] = convert_channel_16b_limit(ELEVATOR, 0, 32)-16;	// Elevator trim
+		{//K170
+			//packet[2] = 0xAB; //This value keeps changing when touching any button... Left over from debug?
+			//Sticks
+			for(uint8_t i=1; i<4; i++)
+				packet[i+3] = convert_channel_16b_limit(CH_TAER[i],0x28,0xD8);
+			packet[6] ^= 0xFF;	//Reverse rudder
+			//flags
+			packet[1] =  GET_FLAG(CH8_SW, 0x04)		//Gyro calibration (momentary)
+						|GET_FLAG(CH11_SW, 0x10);	//XK K270 optical flow switch
+			//			|GET_FLAG(CH_SW, 0x08)		//Unk long press second top right button (momentary)
+			//			|GET_FLAG(CH_SW, 0x10)		//Unk short press second top right button (toggle)
+			//			|GET_FLAG(CH_SW, 0x40)		//Unk short press second top left button (momentary)
+			//			|GET_FLAG(CH_SW, 0x80);		//Unk long press second top left button (momentary)
+			uint8_t rate = 0x80;					//Mid rate
+			if(CH5_SW)
+				rate = 0xC0;						//High rate
+			else if(Channel_data[CH5] < CHANNEL_MIN_COMMAND)
+				rate = 0x40;						//Low rate
+			packet[8] = rate
+						|GET_FLAG(CH7_SW, 0x04)		//Take-off/Landing (momentary)
+						|GET_FLAG(CH6_SW, 0x10);	//Emergency (momentary)
+			//Trims
+			packet[7] = ((convert_channel_8b(CH9)^0xFF)>>2)-31;	// Trim Aileron
+			packet[9] = ( convert_channel_8b(CH10)     >>2)-32;	// Trim Elevator
+		}
+		
 		switch(sub_protocol)
 		{
 			case HONTAI:
 				packet[0]  = 0x0B;
 				packet[3] |= GET_FLAG(CH7_SW, 0x01);				// Picture
-				packet[4] |= GET_FLAG(CH10_SW, 0x80)					// RTH
+				packet[4] |= GET_FLAG(CH10_SW, 0x80)				// RTH
 						  |  GET_FLAG(CH9_SW, 0x40);				// Headless
-				packet[5] |= GET_FLAG(CH11_SW, 0x80)					// Calibrate
+				packet[5] |= GET_FLAG(CH11_SW, 0x80)				// Calibrate
 						  |  GET_FLAG(CH5_SW, 0x40);				// Flip
 				packet[6] |= GET_FLAG(CH8_SW, 0x80);				// Video
 				break;
 			case JJRCX1:
 				packet[0]  = GET_FLAG(CH6_SW, 0x02);				// Arm
 				packet[3] |= GET_FLAG(CH7_SW, 0x01);				// Picture
-				packet[4] |= 0x80;										// unknown
-				packet[5] |= GET_FLAG(CH11_SW, 0x80)					// Calibrate
+				packet[4] |= 0x80;									// unknown
+				packet[5] |= GET_FLAG(CH11_SW, 0x80)				// Calibrate
 						  |  GET_FLAG(CH5_SW, 0x40);				// Flip
 				packet[6] |= GET_FLAG(CH8_SW, 0x80);				// Video
-				packet[8]  = 0xC0										// high rate, no rudder trim
-						  |  GET_FLAG(CH10_SW, 0x02)					// RTH
+				packet[8]  = 0xC0									// high rate, no rudder trim
+						  |  GET_FLAG(CH10_SW, 0x02)				// RTH
 						  |  GET_FLAG(CH9_SW, 0x01);				// Headless
 				break;
 			case X5C1:
 				packet[0]  = 0x0B;
 				packet[3] |= GET_FLAG(CH7_SW, 0x01);				// Picture
-				packet[4]  = 0x80										// unknown
+				packet[4]  = 0x80									// unknown
 						  |  GET_FLAG(CH6_SW, 0x40);				// Lights
-				packet[5] |= GET_FLAG(CH11_SW, 0x80)					// Calibrate
+				packet[5] |= GET_FLAG(CH11_SW, 0x80)				// Calibrate
 						  |  GET_FLAG(CH5_SW, 0x40);				// Flip
 				packet[6] |= GET_FLAG(CH8_SW, 0x80);				// Video
-				packet[8]  = 0xC0										// high rate, no rudder trim
-						  |  GET_FLAG(CH10_SW, 0x02)					// RTH
+				packet[7] <<= 1;									// Aileron trim
+				packet[8]  = 0xC0									// high rate, no rudder trim
+						  |  GET_FLAG(CH10_SW, 0x02)				// RTH
 						  |  GET_FLAG(CH9_SW, 0x01);				// Headless
+				packet[9] <<= 1;									// Elevator trim
 				break;
 			case FQ777_951:
 				packet[0]  = GET_FLAG(CH7_SW, 0x01)					// Picture
 						  |  GET_FLAG(CH8_SW, 0x02);				// Video
 				packet[3] |= GET_FLAG(CH5_SW, 0x01);				// Flip
-				packet[4] |= 0xC0;										// High rate (mid=0xa0, low=0x60)
+				packet[4] |= 0xC0;									// High rate (mid=0xa0, low=0x60)
 				packet[5] |= GET_FLAG(CH11_SW, 0x80);				// Calibrate
 				packet[6] |= GET_FLAG(CH9_SW, 0x40);				// Headless
 				break;
@@ -109,13 +145,18 @@ static void __attribute__((unused)) HONTAI_send_packet()
 		packet_length = HONTAI_PACKET_SIZE;
 	}

-	// CRC 16 bits reflected in and out
-	crc=0xFFFF;
-	for(uint8_t i=0; i< packet_length-2; i++)
-		crc16_update(bit_reverse(packet[i]),8);
-	crc ^= 0xFFFF;
-	packet[packet_length-2]=bit_reverse(crc>>8);
-	packet[packet_length-1]=bit_reverse(crc);
+	if(sub_protocol != HONTAI_XKK170)
+	{
+		// CRC 16 bits reflected in and out
+		crc=0xFFFF;
+		for(uint8_t i=0; i< packet_length-2; i++)
+			crc16_update(bit_reverse(packet[i]),8);
+		crc ^= 0xFFFF;
+		packet[packet_length-2]=bit_reverse(crc>>8);
+		packet[packet_length-1]=bit_reverse(crc);
+	}
+	else
+		memset(&packet[packet_length-2], 0xAA, 2);

 	// Power on, TX mode, 2byte CRC
 	/*if(sub_protocol == JJRCX1)
@@ -135,6 +176,11 @@ static void __attribute__((unused)) HONTAI_send_packet()
 		NRF24L01_WritePayload(packet, packet_length);
 	else
 		XN297_WritePayload(packet, packet_length);
+	#ifdef DEBUG_SERIAL
+		for(uint8_t i=0; i < packet_length; i++)
+			debug("%02X ", packet[i]);
+		debugln();
+	#endif
 }

 static void __attribute__((unused)) HONTAI_RF_init()
@@ -152,15 +198,16 @@ static void __attribute__((unused)) HONTAI_RF_init()
 	}
 	else
 	{
-		XN297_SetTXAddr((const uint8_t*)"\xd2\xb5\x99\xb3\x4a", 5);
+		memcpy(rx_id,(const uint8_t*)"\xD2\xB5\x99\xB3\x41",5);
+		if(sub_protocol == HONTAI_XKK170)
+			rx_id[4] = 0x4A;
+		XN297_SetTXAddr(rx_id, 5);
 		//XN297_HoppingCalib(3);
 	}
-	XN297_RFChannel(HONTAI_RF_BIND_CHANNEL);
+	XN297_RFChannel(sub_protocol==HONTAI_XKK170?HONTAI_XKK170_RF_BIND_CHANNEL:HONTAI_RF_BIND_CHANNEL);
 }

-const uint8_t PROGMEM HONTAI_hopping_frequency_nonels[][3] = {
-	{0x05, 0x19, 0x28},     // Hontai
-	{0x0a, 0x1e, 0x2d}};    // JJRC X1
+const uint8_t PROGMEM HONTAI_hopping_frequency[3] = { 0x05, 0x19, 0x28 };

 const uint8_t PROGMEM HONTAI_addr_vals[4][16] = {
 	{0x24, 0x26, 0x2a, 0x2c, 0x32, 0x34, 0x36, 0x4a, 0x4c, 0x4e, 0x54, 0x56, 0x5a, 0x64, 0x66, 0x6a},
@@ -178,32 +225,69 @@ static void __attribute__((unused)) HONTAI_init2()
 	data_tx_addr[2] = pgm_read_byte_near( &HONTAI_addr_vals[2][ rx_tx_addr[4]       & 0x0f]);
 	data_tx_addr[3] = pgm_read_byte_near( &HONTAI_addr_vals[3][(rx_tx_addr[4] >> 4) & 0x0f]);
 	data_tx_addr[4] = 0x24;
+	#ifdef DEBUG_SERIAL
+		debug("A N");
+		for(uint8_t i=0; i < 5; i++)
+			debug(" %02X", data_tx_addr[i]);
+		debugln();
+	#endif
 	if(sub_protocol == JJRCX1)
 		NRF24L01_WriteRegisterMulti(NRF24L01_10_TX_ADDR, data_tx_addr, 5);
 	else
 		XN297_SetTXAddr(data_tx_addr, 5);

 	//Hopping frequency table
+	uint8_t val;
 	for(uint8_t i=0;i<3;i++)
-		hopping_frequency[i]=pgm_read_byte_near( &HONTAI_hopping_frequency_nonels[sub_protocol == JJRCX1?1:0][i] );
+	{
+		if(sub_protocol==HONTAI_XKK170)
+			val = 60+10*i;
+		else
+		{
+			val = pgm_read_byte_near( &HONTAI_hopping_frequency[i] );
+			if(sub_protocol == JJRCX1)
+				val += 5;
+		}
+		hopping_frequency[i] = val;
+	}
 	hopping_frequency_no=0;
+	#ifdef DEBUG_SERIAL
+		debug("H");
+		for(uint8_t i=0; i < 3; i++)
+			debug(" %d(%02X)", hopping_frequency[i], hopping_frequency[i]);
+		debugln();
+	#endif
 }

 static void __attribute__((unused)) HONTAI_initialize_txid()
 {
 	rx_tx_addr[4] = rx_tx_addr[2]; 
-	if(sub_protocol == HONTAI || sub_protocol == FQ777_951)
-	{
-		rx_tx_addr[0] = 0x4c; // first three bytes some kind of model id? - set same as stock tx
-		rx_tx_addr[1] = 0x4b;
-		rx_tx_addr[2] = 0x3a;
+	// First three bytes some kind of model id? - set same as stock tx
+	if(sub_protocol == JJRCX1 || sub_protocol == X5C1)
+	{//JJRCX1 & X5C1
+		rx_tx_addr[0] = 0x4B;
+		rx_tx_addr[1] = 0x59;
+		rx_tx_addr[2] = 0x3A;
 	}
 	else
-	{
-		rx_tx_addr[0] = 0x4b; // JJRC X1
-		rx_tx_addr[1] = 0x59;
-		rx_tx_addr[2] = 0x3a;
+	{//HONTAI, FQ777_951, HONTAI_XKK170
+		rx_tx_addr[0] = 0x4C;
+		rx_tx_addr[1] = 0x4B;
+		rx_tx_addr[2] = 0x3A;
+		#ifdef FORCE_HONTAI_XKK170_ORIGINAL_ID
+			if(sub_protocol == HONTAI_XKK170)
+			{
+				rx_tx_addr[3] = 0x5A;
+				rx_tx_addr[4] = 0x06;
+			}
+		#endif
 	}
+	#ifdef DEBUG_SERIAL
+		debug("A B");
+		for(uint8_t i=0; i < 5; i++)
+			debug(" %02X", rx_tx_addr[i]);
+		debugln();
+	#endif
 }

 uint16_t HONTAI_callback()
@@ -228,8 +312,14 @@ void HONTAI_init()
 {
 	BIND_IN_PROGRESS;	// autobind protocol
 	bind_counter = HONTAI_BIND_COUNT;
-	HONTAI_initialize_txid();
 	HONTAI_RF_init();
-	packet_period = sub_protocol == FQ777_951 ? FQ777_951_PACKET_PERIOD : HONTAI_PACKET_PERIOD;
+	HONTAI_initialize_txid();
+	if(sub_protocol == FQ777_951)
+		packet_period = FQ777_951_PACKET_PERIOD;
+	else if(sub_protocol == HONTAI_XKK170)
+		packet_period = HONTAI_XKK170_PACKET_PERIOD;
+	else
+		packet_period = HONTAI_PACKET_PERIOD;
+			
 }
 #endif
--- a/Multiprotocol/J6Pro_cyrf6936.ino
+++ b/Multiprotocol/J6Pro_cyrf6936.ino
@@ -35,8 +35,7 @@ enum PktState {
    J6PRO_CHAN_4,
 };

-const uint8_t PROGMEM j6pro_bind_sop_code[] = {0x62, 0xdf, 0xc1, 0x49, 0xdf, 0xb1, 0xc0, 0x49};
-const uint8_t j6pro_data_code[] = {0x02, 0xf9, 0x93, 0x97, 0x02, 0xfa, 0x5c, 0xe3, 0x01, 0x2b, 0xf1, 0xdb, 0x01, 0x32, 0xbe, 0x6f};
+const uint8_t j6pro_data_code[] = {0x02, 0xf9, 0x93, 0x97, 0x02, 0xfa, 0x5c, 0xe3, 0x01, 0x2b, 0xf1, 0xdb, 0x01, 0x32, 0xbe, 0x6f}; // unneeded since this is the default table after a reset

 static void __attribute__((unused)) j6pro_build_bind_packet()
 {
@@ -84,7 +83,9 @@ static void __attribute__((unused)) j6pro_cyrf_init()
    CYRF_WriteRegister(CYRF_10_FRAMING_CFG, 0xee);
    CYRF_WriteRegister(CYRF_1F_TX_OVERRIDE, 0x00);
    CYRF_WriteRegister(CYRF_1E_RX_OVERRIDE, 0x00);
-    CYRF_ConfigDataCode(j6pro_data_code, 16);
+    
+	//Same as default reset but issues if not configured...
+	CYRF_ConfigDataCode(j6pro_data_code);
    CYRF_WritePreamble(0x333302);

    CYRF_GetMfgData(cyrfmfg_id);
@@ -97,7 +98,7 @@ static void __attribute__((unused)) cyrf_bindinit()
    /* Use when binding */
    CYRF_SetPower(0x28); //Deviation using max power, replaced by bind power...
    //CYRF_ConfigRFChannel(0x52);
-    CYRF_PROGMEM_ConfigSOPCode(j6pro_bind_sop_code);
+    CYRF_PROGMEM_ConfigSOPCode(DEVO_j6pro_sopcodes[19]);
    CYRF_ConfigCRCSeed(0x0000);
    //CYRF_WriteRegister(CYRF_06_RX_CFG, 0x4a);
    //CYRF_WriteRegister(CYRF_05_RX_CTRL, 0x80);
@@ -122,7 +123,7 @@ static void __attribute__((unused)) j6pro_set_radio_channels()
 {
    //FIXME: Query free channels
    //lowest channel is 0x08, upper channel is 0x4d?
-    CYRF_FindBestChannels(hopping_frequency, 3, 5, 8, 77);
+    CYRF_FindBestChannels(hopping_frequency, 3, 5, 8, 77, FIND_CHANNEL_ANY);
    hopping_frequency[3] = hopping_frequency[0];
 }

--- a/Multiprotocol/JIABAILE_nrf24l01.ino
+++ b/Multiprotocol/JIABAILE_nrf24l01.ino
@@ -0,0 +1,450 @@
+/*
+ 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(JIABAILE_NRF24L01_INO)
+
+#include "iface_xn297.h"
+
+//#define FORCE_JIABAILE_ORIGINAL_ID
+//#define FORCE_JIABAILE_GYRO_ORIGINAL_ID
+
+#define JIABAILE_PAYLOAD_SIZE			8
+#define JIABAILE_RX_PAYLOAD_SIZE		7
+#define JIABAILE_RF_NUM_CHANNELS		3
+#define JIABAILE_BIND_PACKET_PERIOD		12700
+#define JIABAILE_PACKET_PERIOD			2408
+#define JIABAILE_GYRO_PACKET_PERIOD		8205
+#define JIABAILE_BIND_COUNT				160		//2 sec
+#define JIABAILE_WRITE_TIME				1000
+
+enum {
+	JIABAILE_BIND=0,
+	JIABAILE_RX,
+	JIABAILE_PREP_DATA,
+	JIABAILE_DATA,
+};
+
+static uint8_t __attribute__((unused)) JIABAILE_channel(uint8_t num)
+{
+	uint8_t val=convert_channel_16b_limit(num,0,100);
+	if(val > 50+num)
+	{
+		packet[3] |= 0x01;
+		return val-50;
+	}
+	if(val < 50-num)
+	{
+		packet[3] |= 0x02;
+		return 50-val;
+	}
+	return 0;
+}
+
+static void __attribute__((unused)) JIABAILE_send_packet()
+{
+	if(!(sub_protocol == JIABAILE_GYRO && IS_BIND_IN_PROGRESS))
+	{
+		hopping_frequency_no++;
+		if(hopping_frequency_no > 2)
+			hopping_frequency_no = 0;
+		XN297_Hopping(hopping_frequency_no);
+	}
+
+	if(sub_protocol == JIABAILE_STD)
+	{//Std
+		memcpy(packet,rx_tx_addr,3);
+		memset(&packet[3], 0x00, 4);
+		if(IS_BIND_DONE)
+		{//Normal
+			packet[4] = convert_channel_16b_limit(RUDDER,0,50)-25;	//ST Trim
+			packet[6] = JIABAILE_channel(AILERON);					//ST
+			packet[3] ^= 0x03;										//Reverse ST channel
+			packet[3] <<= 2;										//Move ST channel where it should be
+			packet[5] = JIABAILE_channel(ELEVATOR);					//TH
+			packet[3] |= GET_FLAG(CH5_SW,  0x20)					//Low speed
+						|GET_FLAG(CH7_SW,  0x40)					//Flash light
+						|GET_FLAG(!CH6_SW,  0x80);					//Light
+			if(!CH5_SW && Channel_data[CH5] > CHANNEL_MIN_COMMAND)
+				packet[3] |= 0x10;									//Mid speed
+		}
+		else
+		{
+			bind_counter--;
+			if(!bind_counter)
+			{
+				BIND_DONE;
+				phase = JIABAILE_PREP_DATA;
+			}
+		}
+		packet[7] = 0x55 + hopping_frequency[hopping_frequency_no];
+		for(uint8_t i=0;i<JIABAILE_PAYLOAD_SIZE-1;i++)
+			packet[7] += packet[i];
+	}
+	else
+	{//Gyro
+		if(bind_counter)
+		{
+			bind_counter--;
+			if(!bind_counter)
+			{
+				BIND_DONE;
+				XN297_SetTXAddr(rx_tx_addr, 4);
+			}
+		}
+		uint8_t crc_pos;
+		if(IS_BIND_IN_PROGRESS)
+		{
+			memcpy(packet,rx_tx_addr,4);
+			packet[4] = hopping_frequency[1];
+			packet[5] = hopping_frequency[2];
+			crc_pos = 6;
+			packet[7] = 0x55;
+		}
+		else
+		{
+			packet[0] = convert_channel_16b_limit(CH2,0x60,0xA0);	//Throttle
+			packet[1] = convert_channel_16b_limit(CH1,0x40,0xC0);	//Steering
+			if(Channel_data[CH5] < CHANNEL_MIN_COMMAND)
+				packet[2] = 0x02;										//High speed
+			else if(CH5_SW)
+				packet[2] = 0x00;										//Low speed
+			else
+				packet[2] = 0x01;										//Mid speed
+			packet[3] = convert_channel_8b(CH3) ^0xFF;					//Gyro
+			uint8_t val = GET_FLAG(CH6_SW,  0x04)						//Light
+						 |GET_FLAG(CH7_SW,  0x08);						//Flash
+			if(Channel_data[CH4] > CHANNEL_MAX_COMMAND)
+				val |= 0x01;											//Trim right
+			else if(Channel_data[CH4] < CHANNEL_MIN_COMMAND)
+				val |= 0x02;											//Trim left
+			packet[4] = val;
+			packet[5] = packet[6] = 0x00;								//?
+			crc_pos = 7;
+		}
+		uint8_t sum=0;
+		for(uint8_t i=0; i<crc_pos; i++)
+			sum += packet[i];
+		sum ^= 0xFF;
+		packet[crc_pos] = sum;	
+	}
+	
+	// Send
+	XN297_SetPower();
+	XN297_SetTxRxMode(TX_EN);
+	XN297_WritePayload(packet, JIABAILE_PAYLOAD_SIZE);
+	#if 0
+		debug("B%d ",bind_counter);
+		debug("H%d RF%d",hopping_frequency_no,hopping_frequency[hopping_frequency_no]);
+		for(uint8_t i=0; i < JIABAILE_PAYLOAD_SIZE; i++)
+			debug(" %02X", packet[i]);
+		debugln();
+	#endif
+}
+
+static void __attribute__((unused)) JIABAILE_initialize_txid()
+{
+	if(sub_protocol == JIABAILE_STD)
+	{//Std
+		rx_tx_addr[0] = rx_tx_addr[3];
+		#ifdef FORCE_JIABAILE_ORIGINAL_ID
+			memcpy(rx_tx_addr,(uint8_t *)"\xCB\x03\xA5",3);
+			//memcpy(rx_tx_addr,(uint8_t *)"\x3D\x08\xA2",3);
+			//Normal frequencies are calculated from the car ID...
+			//memcpy(&hopping_frequency[3],(uint8_t *)"\x23\x2D\x4B",3);	//35,45,75
+			memcpy(&hopping_frequency[3],(uint8_t *)"\x24\x43\x4C",3);	//36,67,76
+		#endif
+		//Bind frequencies
+		memcpy(hopping_frequency,(uint8_t *)"\x07\x27\x45",3);	//7,39,69
+	}
+	else
+	{//Gyro
+		rx_tx_addr[0] += RX_num;
+		uint8_t val = (rx_tx_addr[0] & 0x0F) + 5;	//5..20
+		for(uint8_t i=0; i<3; i++)
+			hopping_frequency[i] = val+ 20*i;		//hopping_frequency[1,2] could be whatever but...
+		#ifdef FORCE_JIABAILE_GYRO_ORIGINAL_ID
+			if(RX_num)
+			{
+				memcpy(rx_tx_addr,(uint8_t *)"\x7D\x82\x28\xC2",4);
+				memcpy(hopping_frequency,(uint8_t *)"\x12\x1B\x35",3);	//18,27,53
+			}
+			else
+			{
+				memcpy(rx_tx_addr,(uint8_t *)"\x0C\xF3\x59\xB3",4);
+				memcpy(hopping_frequency,(uint8_t *)"\x11\x1C\x36",3);	//17,28,54
+			}
+		#endif
+		debugln("ID: %02X %02X %02X %02X, HOP: %2d %2d %2d",rx_tx_addr[0],rx_tx_addr[1],rx_tx_addr[2],rx_tx_addr[3],hopping_frequency[0],hopping_frequency[1],hopping_frequency[2]);
+	}
+}
+
+static void __attribute__((unused)) JIABAILE_RF_init()
+{
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
+	//Bind address
+	if(sub_protocol == JIABAILE_STD)
+	{//Std
+		memcpy(rx_id,(uint8_t*)"\xA7\x07\x57\xA7\x26", 5);
+		XN297_SetTXAddr(rx_id, 5);
+		XN297_SetRXAddr(rx_id, JIABAILE_RX_PAYLOAD_SIZE);
+	}
+	else
+	{//Gyro
+		XN297_SetTXAddr((uint8_t*)"\x14\x41\x11\x13", 4);
+		XN297_RFChannel(0x29);	//41
+	}
+}
+
+uint16_t JIABAILE_callback()
+{
+	uint8_t sum;
+	uint16_t addr;
+
+	switch(phase)
+	{
+		case JIABAILE_BIND:
+			phase++;		// JIABAILE_RX but is overwritten if RX or bind timeout
+			if(XN297_IsRX())
+			{
+				if(XN297_ReadPayload(packet_in, JIABAILE_RX_PAYLOAD_SIZE))
+				{//CRC OK
+					#ifdef DEBUG_SERIAL
+						debug("RX");
+						for(uint8_t i=0; i < JIABAILE_RX_PAYLOAD_SIZE; i++)
+							debug(" %02X", packet_in[i]);
+						debugln();
+					#endif
+					//RX: CB 03 A5 9D 05 A2 68
+					if(memcmp(packet_in,rx_tx_addr,3)==0)
+					{//TX ID match
+						//Check packet
+						sum=0xAA + hopping_frequency[hopping_frequency_no];
+						for(uint8_t i=0; i < JIABAILE_RX_PAYLOAD_SIZE-1; i++)
+							sum+=packet_in[i];
+						if(sum==packet_in[6])
+						{
+							//Write the RXID
+							#ifdef DEBUG_SERIAL
+								debug("RXID ");
+								for(uint8_t i=0; i < 3; i++)
+									debug(" %02X", packet_in[3+i]);
+								debugln();
+							#endif
+							addr=JIABAILE_EEPROM_OFFSET+RX_num*3;
+							for(uint8_t i=0;i<3;i++)
+								eeprom_write_byte((EE_ADDR)(addr+i),packet_in[3+i]);
+							//Switch to normal mode
+							BIND_DONE;
+							phase = JIABAILE_PREP_DATA;
+						}
+			#ifdef DEBUG_SERIAL
+						else
+							debug("Wrong Sum");
+					}
+					else
+						debug("Wrong TX ID");
+				}
+				else
+					debug("Bad CRC");
+				debugln("");
+			#else
+					}
+				}
+			#endif
+			}
+			XN297_SetTxRxMode(TXRX_OFF);
+			JIABAILE_send_packet();
+			return JIABAILE_WRITE_TIME;
+		case JIABAILE_RX:
+			//Wait for the packet transmission to finish
+			while(XN297_IsPacketSent()==false);
+			//Switch to RX
+			XN297_SetTxRxMode(TXRX_OFF);
+			XN297_SetTxRxMode(RX_EN);
+			phase = JIABAILE_BIND;
+			return JIABAILE_BIND_PACKET_PERIOD - JIABAILE_WRITE_TIME;
+		case JIABAILE_PREP_DATA:
+			//Read the RXID
+			addr=JIABAILE_EEPROM_OFFSET+RX_num*3;
+			for(uint8_t i=0;i<3;i++)
+				rx_id[i+1] = eeprom_read_byte((EE_ADDR)(addr+i));
+			#ifdef DEBUG_SERIAL
+				debug("RXID ");
+				for(uint8_t i=0; i < 3; i++)
+					debug(" %02X", rx_id[i+1]);
+			#endif
+			XN297_SetTxRxMode(TXRX_OFF);
+			XN297_SetTXAddr(rx_id, 5);
+			//Set the normal frequencies
+			sum=rx_id[1]&0x07;
+			hopping_frequency[0] = (sum>4?30:8) + sum;
+			if(sum==4 || sum ==7)
+				hopping_frequency[0]++;
+			hopping_frequency[1] = 40 + sum;
+			if((sum & 0x06) == 0x06)
+				hopping_frequency[1] += 21;
+			hopping_frequency[2] = 70 + sum;
+			#ifdef DEBUG_SERIAL
+				debug(" RF");
+				for(uint8_t i=0; i < 3; i++)
+					debug(" %d", hopping_frequency[i]);
+				debugln();
+			#endif
+			phase++;
+		default:	//JIABAILE_DATA
+			#ifdef MULTI_SYNC
+				telemetry_set_input_sync(packet_period);
+			#endif
+			JIABAILE_send_packet();
+			break;
+	}
+	return packet_period;
+}
+
+void JIABAILE_init()
+{
+	JIABAILE_initialize_txid();
+	JIABAILE_RF_init();
+	if(sub_protocol == JIABAILE_STD)
+	{//Std
+		if(IS_BIND_IN_PROGRESS)
+		{
+			phase = JIABAILE_BIND;
+			bind_counter = JIABAILE_BIND_COUNT;
+		}
+		else
+			phase = JIABAILE_PREP_DATA;
+		packet_period = JIABAILE_PACKET_PERIOD;
+	}
+	else
+	{//Gyro
+		phase = JIABAILE_DATA;
+		bind_counter = IS_BIND_IN_PROGRESS?JIABAILE_BIND_COUNT>>2:1;
+		packet_period = JIABAILE_GYRO_PACKET_PERIOD;
+	}	
+	hopping_frequency_no = 0;
+}
+
+#endif
+/*
+// CAR RX debug code
+
+static void __attribute__((unused)) JIABAILE_RF_init()
+{
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
+	//Bind address
+	memcpy(rx_id,(uint8_t*)"\xA7\x07\x57\xA7\x26", 5);
+	XN297_SetTXAddr(rx_id, 5);
+	XN297_SetRXAddr(rx_id, JIABAILE_PAYLOAD_SIZE);
+	XN297_RFChannel(7);
+	rx_tx_addr[0] = 0x00;
+	rx_tx_addr[1] = RX_num;
+	rx_tx_addr[2] = 0x00;
+}
+
+uint16_t JIABAILE_callback()
+{
+	switch(phase)
+	{
+		case JIABAILE_BIND:
+			if(XN297_IsRX())
+			{
+				if(XN297_ReadPayload(packet_in, JIABAILE_PAYLOAD_SIZE))
+				{//CRC OK
+					XN297_SetTxRxMode(TXRX_OFF);
+					#ifdef DEBUG_SERIAL
+						debug("RX Bind");
+						for(uint8_t i=0; i < JIABAILE_PAYLOAD_SIZE; i++)
+							debug(" %02X", packet_in[i]);
+						debugln();
+					#endif
+					memcpy(packet,packet_in,3);
+					memcpy(&packet[3],rx_tx_addr,3);
+					packet[6]=0xAA + 7;
+					for(uint8_t i=0; i < JIABAILE_RX_PAYLOAD_SIZE-1; i++)
+						packet[6]+=packet[i];
+					XN297_SetTxRxMode(TX_EN);
+					memcpy(&rx_id[1],rx_tx_addr,3);
+					bind_counter = 10;
+					phase = JIABAILE_RX;
+				}
+			}
+			return JIABAILE_WRITE_TIME;
+		case JIABAILE_RX:
+			if(bind_counter)
+			{
+				bind_counter--;
+				XN297_WritePayload(packet, JIABAILE_RX_PAYLOAD_SIZE);
+				#ifdef DEBUG_SERIAL
+					debug("TX Bind");
+					for(uint8_t i=0; i < JIABAILE_RX_PAYLOAD_SIZE; i++)
+						debug(" %02X", packet[i]);
+					debugln();
+				#endif
+				return JIABAILE_PACKET_PERIOD;
+			}
+			//Wait for the packet transmission to finish
+			//while(XN297_IsPacketSent()==false);
+			//Switch to RX
+			XN297_SetTxRxMode(TXRX_OFF);
+			XN297_SetRXAddr(rx_id, JIABAILE_PAYLOAD_SIZE);
+			hopping_frequency_no++;
+			if(hopping_frequency_no>84)
+				hopping_frequency_no = 0;
+			debug(".");
+			XN297_RFChannel(hopping_frequency_no);
+			XN297_SetTxRxMode(RX_EN);
+			phase = JIABAILE_DATA;
+			return JIABAILE_BIND_PACKET_PERIOD;
+		case JIABAILE_DATA:
+			if(XN297_IsRX())
+			{
+				debugln("");
+				if(XN297_ReadPayload(packet_in, JIABAILE_PAYLOAD_SIZE))
+				{//CRC OK
+					#ifdef DEBUG_SERIAL
+						debug("CH=%d=%02X P:",hopping_frequency_no,hopping_frequency_no);
+						for(uint8_t i=0; i < JIABAILE_PAYLOAD_SIZE; i++)
+							debug(" %02X", packet_in[i]);
+					#endif
+					//Check packet
+					uint8_t sum=0x55 + hopping_frequency_no;
+					for(uint8_t i=0; i < JIABAILE_PAYLOAD_SIZE-1; i++)
+						sum+=packet_in[i];
+					if(sum==packet_in[7])
+					{
+						debug("Good channel");
+					}
+					else
+						debug("Wrong Sum");
+				}
+				else
+					debug("Bad CRC");
+				debugln("");
+			}
+			phase = JIABAILE_RX;
+			break;
+	}
+	return JIABAILE_PACKET_PERIOD;
+}
+
+void JIABAILE_init()
+{
+	JIABAILE_RF_init();
+	XN297_SetTxRxMode(TXRX_OFF);
+	XN297_SetTxRxMode(RX_EN);
+	phase = JIABAILE_BIND;
+	hopping_frequency_no = 7;
+}
+*/
--- a/Multiprotocol/KF606_ccnrf.ino
+++ b/Multiprotocol/KF606_ccnrf.ino
@@ -20,6 +20,7 @@ Multiprotocol is distributed in the hope that it will be useful,

 //#define FORCE_KF606_ORIGINAL_ID
 //#define FORCE_MIG320_ORIGINAL_ID
+//#define FORCE_ZCZ50_ORIGINAL_ID

 #define KF606_INITIAL_WAIT    500
 #define KF606_PACKET_PERIOD   3000
@@ -30,10 +31,16 @@ Multiprotocol is distributed in the hope that it will be useful,

 static void __attribute__((unused)) KF606_send_packet()
 {
+	uint8_t len = KF606_PAYLOAD_SIZE;
 	if(IS_BIND_IN_PROGRESS)
 	{
-		packet[0] = 0xAA;
-		memcpy(&packet[1],rx_tx_addr,3);
+		if(sub_protocol != KF606_ZCZ50)
+		{
+			packet[0] = 0xAA;
+			memcpy(&packet[1],rx_tx_addr,3);
+		}
+		else
+			memcpy(packet,rx_tx_addr,4);
 	}
 	else
 	{
@@ -41,26 +48,21 @@ static void __attribute__((unused)) KF606_send_packet()
 		hopping_frequency_no ^= 1;			// 2 RF channels

 		packet[0] = 0x55;
-		packet[1] = convert_channel_8b(THROTTLE);					// 0..255
+		if(sub_protocol == KF606_ZCZ50) len--;
+		packet[len-3] = convert_channel_8b(THROTTLE);									// 0..255
 		// Deadband is needed on aileron, 40 gives +-6%
-		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
-		}
-		else
-		{
-			packet[2] = convert_channel_8b_limit_deadband(AILERON,0x00,0x80,0xFF,40);	// Aileron: High rate:2B..80..DA
-			packet[3] = convert_channel_16b_limit(CH5,0x01,0x1F);						// Aileron trim must be on a separated channel 01..10..1F
-			packet[3] += (packet[2]-0x80)>>3;											// Drive trims for more aileron authority
-			if(packet[3] > 0x80)
-				packet[3] = 0x01;
-			else if(packet[3] > 0x1F)
-				packet[3] = 0x1F;
-		}
+		packet[len-2] = convert_channel_8b_limit_deadband(AILERON,0x00,0x80,0xFF,40);	// Aileron: High rate:2B..80..DA
+		uint8_t p3;
+		p3 = convert_channel_8b(CH5)>>3;												// Aileron trim must be on a separated channel 01..10..1F
+		p3 += (packet[2]-0x80)>>3;														// Drive trims for more aileron authority
+		if(p3 > 0x80)
+			p3 = 0x01;
+		else if(p3 > 0x1F)
+			p3 = 0x1F;
+		p3 |= GET_FLAG(CH6_SW, 0xC0);													// 0xC0 and 0xE0 are both turning the LED off, not sure if there is another hidden feature
+		packet[len-1] = p3;
 	}

-	uint8_t len = KF606_PAYLOAD_SIZE;
 	if(sub_protocol == KF606_MIG320)
 	{
 		len++;
@@ -106,6 +108,19 @@ static void __attribute__((unused)) KF606_initialize_txid()
 		hopping_frequency[0]=68;
 		hopping_frequency[1]=71;
 	#endif
+	if(sub_protocol == KF606_ZCZ50)
+	{
+		rx_tx_addr[1] = rx_tx_addr[0];
+		rx_tx_addr[0]=0xAA;
+	}
+	#ifdef FORCE_ZCZ50_ORIGINAL_ID
+		rx_tx_addr[0]=0xAA;
+		rx_tx_addr[1]=0x67;
+		rx_tx_addr[2]=0x64;
+		rx_tx_addr[3]=0x01;
+		hopping_frequency[0]=48;
+		hopping_frequency[1]=51;
+	#endif
 }

 static void __attribute__((unused)) KF606_RF_init()
@@ -125,7 +140,7 @@ uint16_t KF606_callback()
 		if(--bind_counter==0)
 		{
 			BIND_DONE;
-			XN297_SetTXAddr(rx_tx_addr, 3);
+			XN297_SetTXAddr(rx_tx_addr, sub_protocol != KF606_ZCZ50 ? 3 : 4);
 		}
 	KF606_send_packet();
 	return KF606_PACKET_PERIOD;
@@ -152,3 +167,14 @@ void KF606_init()
 // P[2] = AIL 2B..80..DA
 // P[3] = TRIM 01..10..1F
 // channels 68=BB&3F+9 and 71
+
+
+// ZCZ50v2 protocol (with fake front propeller)
+// Bind
+// 250K C=7 S=Y A= E7 E7 E7 E7 E7 P(4)= AA 67 64 01
+// 3ms on ch7
+// Normal
+// 250K C=48 S=Y A= AA 67 64 01 P(3)= 00 80 10
+// P[0] = THR 0x00..0xFF
+// P[1] = AIL low rate 0x52..0x80..0xB1, high rate: 0x41..0x80..0xC3
+// P[2] = TRIM 0x01..0x10..0x1F + UNKNOWN 0x00 or 0xC0
--- a/Multiprotocol/KN_nrf24l01.ino
+++ b/Multiprotocol/KN_nrf24l01.ino
@@ -63,7 +63,7 @@ enum {
 	KN_FLAG_DR     = 0x01, // Dual Rate: 1 - full range
 	KN_FLAG_TH     = 0x02, // Throttle Hold: 1 - hold
 	KN_FLAG_IDLEUP = 0x04, // Idle up: 1 - 3D
-	KN_FLAG_RES1   = 0x08,
+	KN_FLAG_RES1   = 0x08, // HoverDebugging
 	KN_FLAG_RES2   = 0x10,
 	KN_FLAG_RES3   = 0x20,
 	KN_FLAG_GYRO3  = 0x40, // 0 - 6G mode, 1 - 3G mode
@@ -141,19 +141,13 @@ static void __attribute__((unused)) kn_update_packet_control_data()
 	packet[8]  = convert_channel_16b_limit(CH9,0,200); // 0x64; // T
 	packet[9]  = convert_channel_16b_limit(CH10,0,200); // 0x64; // A
 	packet[10] = convert_channel_16b_limit(CH11,0,200); // 0x64; // E
-	packet[11] = 0x64; // R
+	packet[11] = convert_channel_16b_limit(CH12,0,200); // 0x64; // R

-	flags=0;
-	if (CH5_SW)
-		flags = KN_FLAG_DR;
-	if (CH6_SW)
-		flags |= KN_FLAG_TH;
-	if (CH7_SW)
-		flags |= KN_FLAG_IDLEUP;
-	if (CH8_SW)
-		flags |= KN_FLAG_GYRO3;
-
-	packet[12] = flags;
+	packet[12] = GET_FLAG(CH5_SW,  KN_FLAG_DR)
+				|GET_FLAG(CH6_SW,  KN_FLAG_TH)
+				|GET_FLAG(CH7_SW,  KN_FLAG_IDLEUP)
+				|GET_FLAG(CH8_SW,  KN_FLAG_GYRO3)
+				|GET_FLAG(CH13_SW, KN_FLAG_RES1);	//Hover debugging

 	packet[13] = 0x00;
 	if(sub_protocol==WLTOYS)
--- a/Multiprotocol/Kamtom_nrf24l01.ino
+++ b/Multiprotocol/Kamtom_nrf24l01.ino
@@ -0,0 +1,185 @@
+/*
+ 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(KAMTOM_NRF24L01_INO)
+
+#include "iface_xn297.h"
+
+//#define FORCE_KAMTOM_ORIGINAL_ID
+
+#define KAMTOM_PAYLOAD_SIZE			16
+#define KAMTOM_RF_NUM_CHANNELS		4
+#define KAMTOM_BIND_COUNT			2000
+#define KAMTOM_WRITE_TIME			650
+#define KAMTOM_BIND_CHANNEL			0x28	//40
+#define KAMTOM_PACKET_PERIOD		3585
+
+
+enum {
+	KAMTOM_DATA,
+	KAMTOM_RX,
+};
+
+static void __attribute__((unused)) KAMTOM_send_packet()
+{
+	if(bind_counter)
+	{
+		bind_counter--;
+		if(!bind_counter)
+			BIND_DONE;
+	}
+
+	memset(packet, 0x00, 16);
+
+	if(IS_BIND_DONE)
+	{//Normal
+		XN297_Hopping(hopping_frequency_no);
+		hopping_frequency_no++;
+		hopping_frequency_no &= 3;
+
+		//RXID
+		packet[0] = rx_tx_addr[0];
+		packet[2] = rx_tx_addr[1];
+		//Next RF channel
+		packet[1] = hopping_frequency[hopping_frequency_no];
+		//Channels and trims
+		for(uint8_t i=0; i<6; i++)
+		{
+			packet[4+i] = convert_channel_s8b(CH_TAER[i]);
+			if(i>3) //ST_TR and TH_TR
+				packet[4+i] >>= 2;
+		}
+		//packet[11] = 0x00;	//??
+		//TH_DR
+		packet[12] = convert_channel_16b_limit(CH7,0x25,0x64);
+	}
+	else
+	{
+		packet[1] = KAMTOM_BIND_CHANNEL;
+		memcpy(&packet[4],hopping_frequency,4);
+		packet[12] = 0xA5;
+	}
+	packet[10] = 0x40;	//??
+	//Checksum
+	uint16_t sum = packet[1];
+	for(uint8_t i=4;i<13;i++)
+		 sum += packet[i];
+	packet[13] = sum;
+	packet[3] = (sum>>6) & 0xFC;
+	//TXID
+	packet[14] = rx_tx_addr[2];
+	packet[15] = rx_tx_addr[3];
+	// Send
+	XN297_SetPower();
+	XN297_SetTxRxMode(TX_EN);
+	XN297_WriteEnhancedPayload(packet, KAMTOM_PAYLOAD_SIZE,false);
+	#if 0
+	//def DEBUG_SERIAL
+		for(uint8_t i=0; i < KAMTOM_PAYLOAD_SIZE; i++)
+			debug("%02X ", packet[i]);
+		debugln();
+	#endif
+}
+
+static void __attribute__((unused)) KAMTOM_initialize_txid()
+{
+	calc_fh_channels(4);
+	#ifdef FORCE_KAMTOM_ORIGINAL_ID
+		rx_tx_addr[0] = 0xC7;
+		rx_tx_addr[1] = 0x78;
+		rx_tx_addr[2] = 0x2C;
+		rx_tx_addr[3] = 0x25;
+		hopping_frequency[0] = 59;
+		hopping_frequency[1] = 59;
+		hopping_frequency[2] = 71;
+		hopping_frequency[3] = 65;
+	#endif
+}
+
+static void __attribute__((unused)) KAMTOM_RF_init()
+{
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
+	//Address
+	XN297_SetTXAddr((uint8_t*)"\xCC\xDD\xEE\xDD", 4);
+	XN297_SetRXAddr((uint8_t*)"\xCC\xDD\xEE\xDD", KAMTOM_PAYLOAD_SIZE);
+	XN297_RFChannel(KAMTOM_BIND_CHANNEL);
+}
+
+uint16_t KAMTOM_callback()
+{
+	static bool rx=false;
+	
+	switch(phase)
+	{
+		case KAMTOM_DATA:
+			rx = XN297_IsRX();
+			XN297_SetTxRxMode(TXRX_OFF);
+			#ifdef MULTI_SYNC
+				telemetry_set_input_sync(KAMTOM_PACKET_PERIOD);
+			#endif
+			KAMTOM_send_packet();
+			if(rx)
+			{
+				uint8_t val=XN297_ReadEnhancedPayload(packet_in, KAMTOM_PAYLOAD_SIZE);
+				if(val==KAMTOM_PAYLOAD_SIZE)
+				{
+					BIND_DONE;
+					if(packet_in[0] == 0xA0 && packet_in[14] == rx_tx_addr[2] && packet_in[15] == rx_tx_addr[3])
+					{//Good packet with our TXID
+						rx_tx_addr[0] = packet_in[9];
+						rx_tx_addr[1] = packet_in[10];
+						#ifdef KAMTOM_HUB_TELEMETRY
+							v_lipo1 = packet_in[1] == 0x03 ? 0x00:0xFF;		// low voltage
+							telemetry_link = 1;
+						#endif
+					}
+					#if 0
+						for(uint8_t i=0; i < KAMTOM_PAYLOAD_SIZE; i++)
+							debug(" %02X", packet_in[i]);
+						debugln();
+					#endif
+				}
+			}
+			phase++;
+			return KAMTOM_WRITE_TIME;
+		default: //KAMTOM_RX
+			//{ // Wait for packet to be sent before switching to receive mode
+			//	uint16_t start=(uint16_t)micros();
+			//	while ((uint16_t)((uint16_t)micros()-(uint16_t)start) < 500)
+			//		if(XN297_IsPacketSent())
+			//			break;
+			//}
+			//Switch to RX
+			XN297_SetTxRxMode(TXRX_OFF);
+			XN297_SetTxRxMode(RX_EN);
+			phase = KAMTOM_DATA;
+			return KAMTOM_PACKET_PERIOD - KAMTOM_WRITE_TIME;
+	}
+	return 0;
+}
+
+void KAMTOM_init()
+{
+	KAMTOM_initialize_txid();
+	KAMTOM_RF_init();
+
+	bind_counter = KAMTOM_BIND_COUNT;
+	phase = KAMTOM_DATA;
+	hopping_frequency_no = 0;
+	#ifdef KAMTOM_HUB_TELEMETRY
+		RX_RSSI = 100;		// Dummy value
+	#endif
+}
+
+#endif
--- a/Multiprotocol/Kyosho2_nrf24l01.ino
+++ b/Multiprotocol/Kyosho2_nrf24l01.ino
@@ -0,0 +1,141 @@
+/*
+ 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
+#define KYOSHO2_BIND_PACKET_PERIOD		1600
+#define KYOSHO2_BIND_COUNT				6000	// about 9sec
+#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
+	KYOSHO2_send_packet();
+	if(bind_counter)
+	{
+		if(--bind_counter==0)
+		{
+			BIND_DONE;
+			KYOSHO2_resend = false;
+		}
+		return KYOSHO2_BIND_PACKET_PERIOD;
+	}
+	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
--- a/Multiprotocol/Kyosho3_cyrf6936.ino
+++ b/Multiprotocol/Kyosho3_cyrf6936.ino
@@ -0,0 +1,124 @@
+/*
+ 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(KYOSHO3_CYRF6936_INO)
+
+#include "iface_cyrf6936.h"
+
+//#define KYOSHO3_FORCE_ID
+//#define KYOSHO3_DEBUG
+
+#define KYOSHO3_BIND_PACKET_SIZE	4
+#define KYOSHO3_PACKET_SIZE			9
+
+const uint8_t PROGMEM KYOSHO3_init_vals[][2] = {
+	//Init from dump
+	{CYRF_0B_PWR_CTRL, 0x00},					// PMU
+	{CYRF_32_AUTO_CAL_TIME, 0x3C},				// Default init value
+	{CYRF_35_AUTOCAL_OFFSET, 0x14},				// Default init value
+	{CYRF_03_TX_CFG, 0x28 | CYRF_BIND_POWER},	// 8DR Mode, 64 chip codes
+	{CYRF_10_FRAMING_CFG, 0xA4},				// SOP and LEN enable
+	{CYRF_1F_TX_OVERRIDE, 0x05},				// Disable CRC, Data invert
+	{CYRF_1E_RX_OVERRIDE, 0x04},				// CRC check disabled
+	//{CYRF_11_DATA32_THOLD, 0x04},				// ???Using 64 chip...
+	{CYRF_12_DATA64_THOLD, 0x0E},				// Default
+	{CYRF_06_RX_CFG, 0x52},						// AGC disabled, LNA enabled, override enabled
+};
+
+static uint16_t __attribute__((unused)) KYOSHO3_send_packet()
+{
+	CYRF_SetPower(0x28);
+	if(IS_BIND_IN_PROGRESS)
+	{
+		if(--bind_counter==0)
+			BIND_DONE;
+		packet[0] = 0xAA;
+		//ID
+		memcpy(&packet[1],&rx_tx_addr[1],3);
+		CYRF_WriteDataPacketLen(packet, KYOSHO3_BIND_PACKET_SIZE);
+		#ifdef KYOSHO3_DEBUG
+			debug("P:");
+			for(uint8_t i=0;i<KYOSHO3_BIND_PACKET_SIZE;i++)
+				debug(" %02X",packet[i]);
+			debugln("");
+		#endif
+		return 2434;
+	}
+	else
+	{
+		//ID
+		memcpy(packet,&rx_tx_addr[1],3);
+		//Channels
+		for(uint8_t i=0;i<4;i++)
+		{
+			packet[3] >>= 2;
+			packet[3] |= Channel_data[i]<<6;
+			packet[4+i]  = Channel_data[i]>>3;
+		}
+		//Checksum
+		packet[8] = packet[3];
+		for(uint8_t i=4;i<8;i++)
+			packet[8] += packet[i];
+		//Timing
+		phase ^= 0x01;
+		CYRF_WriteDataPacketLen(packet, KYOSHO3_PACKET_SIZE);
+		#ifdef KYOSHO3_DEBUG
+			debug("P:");
+			for(uint8_t i=0;i<KYOSHO3_PACKET_SIZE;i++)
+				debug(" %02X",packet[i]);
+			debugln("");
+		#endif
+		if(phase)
+			return 9047;
+	}
+	return 6957;
+}
+
+uint16_t KYOSHO3_callback()
+{
+	return KYOSHO3_send_packet();
+}
+
+void KYOSHO3_init()
+{ 
+	//Config CYRF registers
+	for(uint8_t i = 0; i < sizeof(KYOSHO3_init_vals) / 2; i++)	
+		CYRF_WriteRegister(pgm_read_byte_near(&KYOSHO3_init_vals[i][0]), pgm_read_byte_near(&KYOSHO3_init_vals[i][1]));
+	CYRF_WritePreamble(0x333304);
+
+	//Find a free even channel
+	CYRF_FindBestChannels(hopping_frequency,1,1,0x04,0x50, FIND_CHANNEL_EVEN);
+
+	#ifdef KYOSHO3_FORCE_ID					// data taken from TX dump
+		rx_tx_addr[1] = 0x01;
+		rx_tx_addr[2] = 0xAB;
+		rx_tx_addr[3] = 0x31;
+		hopping_frequency[0] = 0x04;
+	#endif
+	#ifdef KYOSHO3_DEBUG
+		debugln("ID: %02X %02X %02X",rx_tx_addr[1],rx_tx_addr[2],rx_tx_addr[3]);
+		debugln("RF CH: %02X",hopping_frequency[0]);
+	#endif
+
+	if(IS_BIND_IN_PROGRESS)
+		CYRF_ConfigRFChannel(0x04);
+	else
+		CYRF_ConfigRFChannel(hopping_frequency[0]);
+	
+	bind_counter = 8217;
+	phase = 0;
+}
+
+#endif
--- a/Multiprotocol/Kyosho_a7105.ino
+++ b/Multiprotocol/Kyosho_a7105.ino
@@ -19,10 +19,12 @@

 //#define KYOSHO_FORCE_ID_FHSS
 //#define KYOSHO_FORCE_ID_HYPE
+//#define KYOSHO_FORCE_ID_SYNCRO

 //Kyosho constants & variables
 #define KYOSHO_BIND_COUNT 2500

+#ifndef MULTI_AIR
 static void __attribute__((unused)) KYOSHO_send_packet()
 {
 	//ID
@@ -32,7 +34,7 @@ static void __attribute__((unused)) KYOSHO_send_packet()
 	packet[4] = rx_tx_addr[3];
 	//unknown may be RX ID on some other remotes
 	memset(packet+5,0xFF,4);
-	
+
 	if(IS_BIND_IN_PROGRESS)
 	{
 		packet[ 0]  = 0xBC;						// bind indicator
@@ -42,8 +44,9 @@ static void __attribute__((unused)) KYOSHO_send_packet()
 		//RF table
 		for(uint8_t i=0; i<16;i++)
 			packet[i+11]=hopping_frequency[i+(packet[9]<<4)];
-		//unknwon
-		packet[27]  = 0x05;
+		//TX type
+		packet[27]  = (bind_counter & 0x40) ? 0x05:0x07;	// FHSS is 5 and Syncro is 7
+		//Unknown
 		packet[28]  = 0x00;
 		memset(packet+29,0xFF,8);
 		//frequency hop during bind
@@ -55,13 +58,23 @@ static void __attribute__((unused)) KYOSHO_send_packet()
 	else
 	{
 		packet[ 0]  = 0x58;						// normal packet
-		//14 channels: steering, throttle, ...
-		for(uint8_t i = 0; i < 14; i++)
+		//FHSS  14 channels: steering, throttle, ...
+		//Syncro 6 channels: steering, throttle, ...
+		for(uint8_t i = 0; i < 14; i++) 		//needed? i < (sub_protocol==KYOSHO_FHSS?14:6); i++)
 		{
-			uint16_t temp=convert_channel_ppm(i);
-			packet[9 + i*2]=temp&0xFF;			// low byte of servo timing(1000-2000us)
-			packet[10 + i*2]=(temp>>8)&0xFF;	// high byte of servo timing(1000-2000us)
+			uint16_t temp = convert_channel_ppm(i);
+			packet[ 9 + i*2] = temp&0xFF;		// low byte of servo timing(1000-2000us)
+			packet[10 + i*2] = (temp>>8)&0xFF;	// high byte of servo timing(1000-2000us)
 		}
+		// if(sub_protocol==KYOSHO_SYNCRO) 	// needed?
+		// {
+			// memcpy(&packet[21],&hopping_frequency[11],6);
+			// packet[27]  = 0x07;
+			// packet[28]  = 0x00;
+			// memset(packet+29,0xFF,8);
+			// packet[34] = 0x0F;
+			// packet[36] = 0x0F;
+		// }
 		rf_ch_num=hopping_frequency[hopping_frequency_no];
 		hopping_frequency_no++;
 		packet[34] |= (hopping_frequency_no&0x0F)<<4;
@@ -76,6 +89,7 @@ static void __attribute__((unused)) KYOSHO_send_packet()
 	#endif
 	A7105_WriteData(37, rf_ch_num);
 }
+#endif //MULTI_AIR

 static void __attribute__((unused)) KYOSHO_hype_send_packet()
 {
@@ -150,10 +164,14 @@ uint16_t KYOSHO_callback()
 			telemetry_set_input_sync(packet_period);
 		#endif
 	}
-	if(sub_protocol==KYOSHO_FHSS)
-		KYOSHO_send_packet();
-	else//HYPE
+	if(sub_protocol==KYOSHO_HYPE)
 		KYOSHO_hype_send_packet();
+	else //FHSS && SYNCRO
+	#ifndef MULTI_AIR
+		KYOSHO_send_packet();
+	#else
+		SUB_PROTO_INVALID;
+	#endif
 	return packet_period;
 }

@@ -162,7 +180,7 @@ void KYOSHO_init()
 	A7105_Init();

 	// compute channels from ID
-	calc_fh_channels(sub_protocol==KYOSHO_FHSS?32:15);
+	calc_fh_channels(sub_protocol==KYOSHO_HYPE?15:32);
 	hopping_frequency_no=0;

 	#ifdef KYOSHO_FORCE_ID_FHSS
@@ -172,6 +190,13 @@ void KYOSHO_init()
 			memcpy(hopping_frequency,"\x29\x4C\x67\x92\x31\x1C\x77\x18\x23\x6E\x81\x5C\x8F\x5A\x51\x94\x7A\x12\x45\x6C\x7F\x1E\x0D\x88\x63\x8C\x4F\x37\x26\x61\x2C\x8A",32);
 		}
 	#endif
+	#ifdef KYOSHO_FORCE_ID_SYNCRO
+		if(sub_protocol==KYOSHO_FHSS)
+		{
+			memcpy(rx_tx_addr,"\x00\xC2\x24\x00",4);
+			memcpy(hopping_frequency,"\x73\x12\x7D\x88\x63\x4A\x8D\x60\x57\x16\x5D\x8B\x25\x53\x6E\x3C\x41\x70\x20\x83\x2A\x19\x94\x2F\x91\x4C\x47\x36\x78\x10\x5A\x31",32);
+		}
+	#endif
 	if(sub_protocol==KYOSHO_HYPE)
 	{
 		MProtocol_id &= 0x00FF00FF;
--- a/Multiprotocol/Losi_cyrf6936.ino
+++ b/Multiprotocol/Losi_cyrf6936.ino
@@ -17,26 +17,64 @@

 #include "iface_cyrf6936.h"

-#define LOSI_FORCE_ID
+//#define LOSI_FORCE_ID

-const uint8_t PROGMEM LOSI_bind_sop_code[] = {0x62, 0xdf, 0xc1, 0x49, 0xdf, 0xb1, 0xc0, 0x49};
-const uint8_t LOSI_data_code[][16] = {
-	{ 0xD7, 0xA1, 0x54, 0xB1, 0x5E, 0x89, 0xAE, 0x86, 0xC9, 0x2C, 0x06, 0x93, 0x86, 0xB9, 0x9E, 0xD7 }, //bind
-/*	{ 0xE1, 0xD6, 0x31, 0x26, 0x5F, 0xBD, 0x40, 0x93, 0xDC, 0x68, 0x08, 0x99, 0x97, 0xAE, 0xAF, 0x8C },
-	{ 0xDC, 0x68, 0x08, 0x99, 0x97, 0xAE, 0xAF, 0x8C, 0xC3, 0x0E, 0x01, 0x16, 0x0E, 0x32, 0x06, 0xBA },
-	{ 0xC3, 0x0E, 0x01, 0x16, 0x0E, 0x32, 0x06, 0xBA, 0xE0, 0x83, 0x01, 0xFA, 0xAB, 0x3E, 0x8F, 0xAC },
-	{ 0xE0, 0x83, 0x01, 0xFA, 0xAB, 0x3E, 0x8F, 0xAC, 0x5C, 0xD5, 0x9C, 0xB8, 0x46, 0x9C, 0x7D, 0x84 },
-	{ 0x5C, 0xD5, 0x9C, 0xB8, 0x46, 0x9C, 0x7D, 0x84, 0xF1, 0xC6, 0xFE, 0x5C, 0x9D, 0xA5, 0x4F, 0xB7 },
-	{ 0xF1, 0xC6, 0xFE, 0x5C, 0x9D, 0xA5, 0x4F, 0xB7, 0x58, 0xB5, 0xB3, 0xDD, 0x0E, 0x28, 0xF1, 0xB0 },
-	{ 0x58, 0xB5, 0xB3, 0xDD, 0x0E, 0x28, 0xF1, 0xB0, 0x5F, 0x30, 0x3B, 0x56, 0x96, 0x45, 0xF4, 0xA1 },*/
-	{ 0x5F, 0x30, 0x3B, 0x56, 0x96, 0x45, 0xF4, 0xA1, 0x03, 0xBC, 0x6E, 0x8A, 0xEF, 0xBD, 0xFE, 0xF8 }	//normal
-};
+/* Using DSM.ino data codes since they are the same
+const uint8_t LOSI_data_code[][8] = {
+	//(Freq-1)%5=0
+	{ 0x83, 0xF7, 0xA8, 0x2D, 0x7A, 0x44, 0x64, 0xD3 },
+	{ 0x3F, 0x2C, 0x4E, 0xAA, 0x71, 0x48, 0x7A, 0xC9 },
+	{ 0x17, 0xFF, 0x9E, 0x21, 0x36, 0x90, 0xC7, 0x82 },
+	{ 0xBC, 0x5D, 0x9A, 0x5B, 0xEE, 0x7F, 0x42, 0xEB },
+	{ 0x24, 0xF5, 0xDD, 0xF8, 0x7A, 0x77, 0x74, 0xE7 },
+	{ 0x3D, 0x70, 0x7C, 0x94, 0xDC, 0x84, 0xAD, 0x95 },
+	{ 0x1E, 0x6A, 0xF0, 0x37, 0x52, 0x7B, 0x11, 0xD4 },
+	{ 0x62, 0xF5, 0x2B, 0xAA, 0xFC, 0x33, 0xBF, 0xAF },
+	//(Freq-1)%5=1
+	{ 0x40, 0x56, 0x32, 0xD9, 0x0F, 0xD9, 0x5D, 0x97 },
+	{ 0x8E, 0x4A, 0xD0, 0xA9, 0xA7, 0xFF, 0x20, 0xCA },
+	{ 0x4C, 0x97, 0x9D, 0xBF, 0xB8, 0x3D, 0xB5, 0xBE },
+	{ 0x0C, 0x5D, 0x24, 0x30, 0x9F, 0xCA, 0x6D, 0xBD },
+	{ 0x50, 0x14, 0x33, 0xDE, 0xF1, 0x78, 0x95, 0xAD },
+	{ 0x0C, 0x3C, 0xFA, 0xF9, 0xF0, 0xF2, 0x10, 0xC9 },
+	{ 0xF4, 0xDA, 0x06, 0xDB, 0xBF, 0x4E, 0x6F, 0xB3 },
+	{ 0x9E, 0x08, 0xD1, 0xAE, 0x59, 0x5E, 0xE8, 0xF0 },
+	//(Freq-1)%5=2
+	{ 0xC0, 0x90, 0x8F, 0xBB, 0x7C, 0x8E, 0x2B, 0x8E },
+	{ 0x80, 0x69, 0x26, 0x80, 0x08, 0xF8, 0x49, 0xE7 },
+	{ 0x7D, 0x2D, 0x49, 0x54, 0xD0, 0x80, 0x40, 0xC1 },
+	{ 0xB6, 0xF2, 0xE6, 0x1B, 0x80, 0x5A, 0x36, 0xB4 },
+	{ 0x42, 0xAE, 0x9C, 0x1C, 0xDA, 0x67, 0x05, 0xF6 },
+	{ 0x9B, 0x75, 0xF7, 0xE0, 0x14, 0x8D, 0xB5, 0x80 },
+	{ 0xBF, 0x54, 0x98, 0xB9, 0xB7, 0x30, 0x5A, 0x88 },
+	{ 0x35, 0xD1, 0xFC, 0x97, 0x23, 0xD4, 0xC9, 0x88 },
+	//(Freq-1)%5=3
+	{ 0xE1, 0xD6, 0x31, 0x26, 0x5F, 0xBD, 0x40, 0x93 },
+	{ 0xDC, 0x68, 0x08, 0x99, 0x97, 0xAE, 0xAF, 0x8C },
+	{ 0xC3, 0x0E, 0x01, 0x16, 0x0E, 0x32, 0x06, 0xBA },
+	{ 0xE0, 0x83, 0x01, 0xFA, 0xAB, 0x3E, 0x8F, 0xAC },
+	{ 0x5C, 0xD5, 0x9C, 0xB8, 0x46, 0x9C, 0x7D, 0x84 },
+	{ 0xF1, 0xC6, 0xFE, 0x5C, 0x9D, 0xA5, 0x4F, 0xB7 },
+	{ 0x58, 0xB5, 0xB3, 0xDD, 0x0E, 0x28, 0xF1, 0xB0 },
+	{ 0x5F, 0x30, 0x3B, 0x56, 0x96, 0x45, 0xF4, 0xA1 },
+	//(Freq-1)%5=4
+	{ 0x03, 0xBC, 0x6E, 0x8A, 0xEF, 0xBD, 0xFE, 0xF8 },
+	{ 0x88, 0x17, 0x13, 0x3B, 0x2D, 0xBF, 0x06, 0xD6 },
+	{ 0xF1, 0x94, 0x30, 0x21, 0xA1, 0x1C, 0x88, 0xA9 },
+	{ 0xD0, 0xD2, 0x8E, 0xBC, 0x82, 0x2F, 0xE3, 0xB4 },
+	{ 0x8C, 0xFA, 0x47, 0x9B, 0x83, 0xA5, 0x66, 0xD0 },
+	{ 0x07, 0xBD, 0x9F, 0x26, 0xC8, 0x31, 0x0F, 0xB8 },
+	{ 0xEF, 0x03, 0x95, 0x89, 0xB4, 0x71, 0x61, 0x9D },
+	{ 0x40, 0xBA, 0x97, 0xD5, 0x86, 0x4F, 0xCC, 0xD1 },
+	//Bind
+	{ 0xD7, 0xA1, 0x54, 0xB1, 0x5E, 0x89, 0xAE, 0x86 }
+};*/

 static uint16_t __attribute__((unused)) LOSI_check(uint16_t val)
 {
 	const uint8_t PROGMEM tab[] = { 0xF1, 0xDA, 0xB6, 0xC8 };
-	uint8_t res = 0x0B, tmp;
-	uint16_t calc = val>>2; 									// don't care about the 2 first bits
+	uint8_t res = crc8, tmp;
+	uint16_t calc = val>>2; 								// don't care about the 2 first bits
 	for(uint8_t i=0; i<5; i++)
 	{
 		tmp=pgm_read_byte_near(&tab[i&0x03]);
@@ -56,8 +94,11 @@ static void __attribute__((unused)) LOSI_send_packet()
 	if(IS_BIND_IN_PROGRESS)
 	{
 		memcpy(&packet[4], rx_tx_addr, 4);
-		packet[8] = 0x05;               				    	// CRC?
-		packet[9] = 0x52;                   					// CRC?
+		crc = 0x0170;
+		for(uint8_t i=0; i < 8; i++)
+			crc += packet[i];
+		packet[8] = crc >> 8;
+		packet[9] = crc;
 	}
 	else
 	{
@@ -88,60 +129,88 @@ static void __attribute__((unused)) LOSI_cyrf_init()
 	CYRF_WriteRegister(CYRF_1B_TX_OFFSET_LSB, 0x55);
 	CYRF_WriteRegister(CYRF_1C_TX_OFFSET_MSB, 0x05);
 	//CYRF_WriteRegister(CYRF_0F_XACT_CFG, 0x24);
-	CYRF_SetPower(0x38);
+	CYRF_SetPower(0x38);									// 64 SDR mode -> 8 bytes data code
 	CYRF_WriteRegister(CYRF_12_DATA64_THOLD, 0x0A);
 	CYRF_WriteRegister(CYRF_39_ANALOG_CTRL, 0x01);
 	CYRF_WritePreamble(0x333304);
 	//CYRF_WriteRegister(CYRF_27_CLK_OVERRIDE, 0x00);
 	CYRF_WriteRegister(CYRF_10_FRAMING_CFG, 0x4A);
-	CYRF_WriteRegister(CYRF_1F_TX_OVERRIDE, 0x04);				// No CRC
+	CYRF_WriteRegister(CYRF_1F_TX_OVERRIDE, 0x04);			// No CRC
 	//CYRF_WriteRegister(CYRF_1E_RX_OVERRIDE, 0x14);
 	//CYRF_WriteRegister(CYRF_14_EOP_CTRL, 0x02);
+	uint8_t code[16];
+	DSM_read_code(code,0,8);								// Load bind data code by default
+	CYRF_ConfigDataCode(code);
 }

 uint16_t LOSI_callback()
 {
 	#ifdef MULTI_SYNC
-		telemetry_set_input_sync(19738);
+		telemetry_set_input_sync(packet_period);
 	#endif
-	LOSI_send_packet();
 	if(bind_counter)
 	{
 		bind_counter--;
 		if(bind_counter==0)
 		{
 			BIND_DONE;
-			CYRF_ConfigDataCode(LOSI_data_code[1], 16);			// Load normal data code
+			// Load normal data code
+			uint8_t code[16];
+			DSM_read_code(code,hopping_frequency[0] % 5,(rx_tx_addr[0] + rx_tx_addr[1] + rx_tx_addr[2]) % 8);
+			CYRF_ConfigDataCode(code);
+			packet_period = 19738;
 		}
-		return 8763;
 	}
-	return 19738;
+	LOSI_send_packet();
+	return packet_period;
 }

 void LOSI_init()
 {
 	LOSI_cyrf_init();
-	//CYRF_FindBestChannels(hopping_frequency, 1, 0, 0x13, 75);	// 75 is unknown since dump stops at 0x27, this routine resets the CRC Seed to 0
-	//CYRF_ConfigRFChannel(hopping_frequency[0] | 1);				// Only odd channels
+
+	CYRF_FindBestChannels(hopping_frequency, 1, 0, 0x07, 0x4F, FIND_CHANNEL_ODD);	// 0x07 and 0x4F are unknown limits, this routine resets the CRC Seed to 0
+
+	crc8 = 0;
+	crc8 = (uint16_t)LOSI_check(((rx_tx_addr[2]&0x0F) << 8) + rx_tx_addr[3]) >> 12;

 	#ifdef LOSI_FORCE_ID
+		/*	
 		rx_tx_addr[0] = 0x47;
 		rx_tx_addr[1] = 0x52;
 		rx_tx_addr[2] = 0xAE;
 		rx_tx_addr[3] = 0xAA;
-		CYRF_ConfigRFChannel(0x27);
+		crc8 = 0x0B;
+		num_ch = 0x07;
+		//Data codes for hopping_frequency[0] % 5
+		//{ 0x40, 0xBA, 0x97, 0xD5, 0x86, 0x4F, 0xCC, 0xD1, 0xD7, 0xA1, 0x54, 0xB1, 0x5E, 0x89, 0xAE, 0x86 },
+		//{ 0x62, 0xF5, 0x2B, 0xAA, 0xFC, 0x33, 0xBF, 0xAF, 0x40, 0x56, 0x32, 0xD9, 0x0F, 0xD9, 0x5D, 0x97 },
+		//{ 0x9E, 0x08, 0xD1, 0xAE, 0x59, 0x5E, 0xE8, 0xF0, 0xC0, 0x90, 0x8F, 0xBB, 0x7C, 0x8E, 0x2B, 0x8E },
+		//{ 0x35, 0xD1, 0xFC, 0x97, 0x23, 0xD4, 0xC9, 0x88, 0xE1, 0xD6, 0x31, 0x26, 0x5F, 0xBD, 0x40, 0x93 },
+		//{ 0x5F, 0x30, 0x3B, 0x56, 0x96, 0x45, 0xF4, 0xA1, 0x03, 0xBC, 0x6E, 0x8A, 0xEF, 0xBD, 0xFE, 0xF8 }
+		*/
+		rx_tx_addr[0] = 0x56;
+		rx_tx_addr[1] = 0x52;
+		rx_tx_addr[2] = 0x22;
+		rx_tx_addr[3] = 0x8A;
+		crc8 = 0x0F;
+		num_ch = 0x02;
+		//Data codes for hopping_frequency[0] % 5
+		//{ 0xF1, 0x94, 0x30, 0x21, 0xA1, 0x1C, 0x88, 0xA9, 0xD0, 0xD2, 0x8E, 0xBC, 0x82, 0x2F, 0xE3, 0xB4 },
+		//{ 0x17, 0xFF, 0x9E, 0x21, 0x36, 0x90, 0xC7, 0x82, 0xBC, 0x5D, 0x9A, 0x5B, 0xEE, 0x7F, 0x42, 0xEB },
+		//{ 0x4C, 0x97, 0x9D, 0xBF, 0xB8, 0x3D, 0xB5, 0xBE, 0x0C, 0x5D, 0x24, 0x30, 0x9F, 0xCA, 0x6D, 0xBD },
+		//{ 0x7D, 0x2D, 0x49, 0x54, 0xD0, 0x80, 0x40, 0xC1, 0xB6, 0xF2, 0xE6, 0x1B, 0x80, 0x5A, 0x36, 0xB4 },
+		//{ 0xC3, 0x0E, 0x01, 0x16, 0x0E, 0x32, 0x06, 0xBA, 0xE0, 0x83, 0x01, 0xFA, 0xAB, 0x3E, 0x8F, 0xAC }
+		
+		// Note: crc8=00..0F and num_ch=00..07
+		// num_ch = (rx_tx_addr[0] + rx_tx_addr[1] + rx_tx_addr[2]) % 8;
+		// crc8 = (uint16_t)LOSI_check(((rx_tx_addr[2]&0x0F) << 8) + rx_tx_addr[3]) >> 12;
 	#endif

-	if(IS_BIND_IN_PROGRESS)
-	{
-		bind_counter = 300;
-		CYRF_ConfigDataCode(LOSI_data_code[0], 16);				// Load bind data code
-	}
-	else
-	{
-		CYRF_ConfigDataCode(LOSI_data_code[1], 16);				// Load normal data code
-		bind_counter = 0;
-	}
+	CYRF_ConfigRFChannel(hopping_frequency[0]);
+
+	bind_counter = IS_BIND_IN_PROGRESS?300:1;
+	packet_period = 8763;
 }

 #endif
--- a/Multiprotocol/MLINK_cyrf6936.ino
+++ b/Multiprotocol/MLINK_cyrf6936.ino
@@ -421,7 +421,7 @@ uint16_t MLINK_callback()


 		case MLINK_PREP_DATA:
-			CYRF_ConfigDataCode(MLINK_Data_Code,16);
+			CYRF_ConfigDataCode(MLINK_Data_Code);
 			MLINK_CRC_Init += 0xED;
 			hopping_frequency_no = 0x00;
 			CYRF_ConfigRFChannel(hopping_frequency[hopping_frequency_no]);
@@ -597,7 +597,7 @@ void MLINK_init()
 	{
 		packet_count = 0;
 		bind_counter = MLINK_BIND_COUNT;
-		CYRF_ConfigDataCode((uint8_t*)"\x6F\xBE\x32\x01\xDB\xF1\x2B\x01\xE3\x5C\xFA\x02\x97\x93\xF9\x02",16); //Bind data code
+		CYRF_ConfigDataCode((uint8_t*)"\x6F\xBE\x32\x01\xDB\xF1\x2B\x01\xE3\x5C\xFA\x02\x97\x93\xF9\x02"); //Bind data code
 		CYRF_ConfigRFChannel(MLINK_BIND_CHANNEL);
 		phase = MLINK_BIND_TX;
 	}
--- a/Multiprotocol/MT99xx_ccnrf.ino
+++ b/Multiprotocol/MT99xx_ccnrf.ino
@@ -12,7 +12,7 @@
 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 MT99xx, Eachine H7, Yi Zhan i6S and LS114/124
+// compatible with MT99xx, Eachine H7, Yi Zhan i6S, LS114/124, QF009 Su35
 // Last sync with Goebish mt99xx_nrf24l01.c dated 2016-01-29

 #if defined(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,
@@ -80,7 +83,27 @@ enum{
 enum{
    // flags going to packet[6] (F949G)
    FLAG_F949G_LIGHT	= 0x01,
+	FLAG_F949G_RATES	= 0x02,
    FLAG_F949G_3D6G		= 0x20,
+    FLAG_BF109_RATES	= 0x01,	// short press right
+    FLAG_BF109_LIGHT	= 0x02,	// short press left
+    FLAG_BF109_UNK1		= 0x08,	// long press right
+    FLAG_BF109_UNK2		= 0x10,	// long press left
+};
+enum{
+    // flags going to packet[6] (PA18)
+	FLAG_PA18_RTH		= 0x08,
+	FLAG_PA18_FLIP		= 0x80,
+};
+
+enum{
+    // flags going to packet[6] (QF009 Su35)
+    FLAG_SU35_6G     = 0x00,
+    FLAG_SU35_3D     = 0x40, 
+    FLAG_SU35_HIRATE = 0x01,
+    FLAG_SU35_LED    = 0x02,
+    FLAG_SU35_FLASH  = 0x04,
+    FLAG_SU35_INVERT = 0x08,   
 };

 const uint8_t h7_mys_byte[] = {
@@ -107,11 +130,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 +144,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 +154,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,25 +167,35 @@ 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
 			packet[3] = convert_channel_16b_limit(ELEVATOR,0x00,0xE1);	// elevator
-			packet[4] = 0x20; 											// pitch trim (0x3f-0x20-0x00)
-			packet[5] = 0x20; 											// roll trim (0x00-0x20-0x3f)
+			packet[4] = (convert_channel_8b(CH10) ^ 0xFF) >> 2; 		// aileron trim  (3F..20..00)
+			packet[5] =  convert_channel_8b(CH11)         >> 2;			// elevator trim (00..20..3F)
 			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,15 +226,16 @@ static void __attribute__((unused)) MT99XX_send_packet()
 					crc8=0;
 					break;
 				case A180:
-					packet[6] = FLAG_A180_RATE
-						| GET_FLAG( CH5_SW, FLAG_A180_3D6G );
+					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 );
@@ -221,12 +250,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
@@ -234,23 +263,46 @@ static void __attribute__((unused)) MT99XX_send_packet()
 					#endif
 					break;
 				case F949G:
-					packet[6] = 0x02
-							  | GET_FLAG( CH5_SW, FLAG_F949G_3D6G )
-							  | GET_FLAG( CH6_SW, FLAG_F949G_LIGHT );
+					packet[6] = GET_FLAG( CH5_SW, FLAG_F949G_3D6G )
+							  | GET_FLAG( CH6_SW, FLAG_F949G_LIGHT )	//FLAG_BF109_RATES
+							  | GET_FLAG(!CH7_SW, FLAG_F949G_RATES )	//FLAG_BF109_LIGHT
+							  | GET_FLAG( CH8_SW, FLAG_BF109_UNK1 )		//BF109 long press right, temporary flag
+							  | GET_FLAG( CH9_SW, FLAG_BF109_UNK2 );	//BF109 long press left, temporary flag
 					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;
+				case SU35+8:
+					packet[6] = FLAG_SU35_6G
+						| GET_FLAG( CH5_SW, FLAG_SU35_3D )
+						| GET_FLAG( !CH6_SW, FLAG_SU35_LED )
+						| GET_FLAG( CH7_SW, FLAG_SU35_FLASH )
+						| GET_FLAG( CH8_SW, FLAG_SU35_INVERT )
+						| GET_FLAG( CH9_SW, FLAG_SU35_HIRATE );
+					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 ++;
@@ -260,11 +312,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];
@@ -274,7 +326,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;
@@ -284,6 +336,12 @@ static void __attribute__((unused)) MT99XX_send_packet()
 	XN297_SetFreqOffset();
 	XN297_SetTxRxMode(TX_EN);
 	XN297_WritePayload(packet, MT99XX_PACKET_SIZE);
+	
+	#if 1
+		for(uint8_t i=0; i<MT99XX_PACKET_SIZE; i++)
+			debug(" %02X",packet[i]);
+		debugln();
+	#endif
 }

 static void __attribute__((unused)) MT99XX_RF_init()
@@ -304,9 +362,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)
@@ -348,8 +406,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;
 	}
 	
@@ -439,14 +524,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 && sub_protocol != SU35+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;
--- a/Multiprotocol/MouldKg_nrf24l01.ino
+++ b/Multiprotocol/MouldKg_nrf24l01.ino
@@ -50,12 +50,19 @@ static void __attribute__((unused)) MOULDKG_send_packet()
 	else
 	{
 		uint8_t n = num_ch<<2;
-		if(sub_protocol == MOULDKG_ANALOG)
+		if(sub_protocol == MOULDKG_ANALOG4 || sub_protocol == MOULDKG_ANALOG6 )
 		{
 			packet[0] = 0x36;
-			uint8_t ch[]={ 1,0,2,3 };
-			for(uint8_t i=0;i<4;i++)
-				packet[i+4] = convert_channel_8b(ch[i]+n);
+			const uint8_t ch[]={ 1,0,2,3,5,4 };
+			if(sub_protocol == MOULDKG_ANALOG6)
+				n += num_ch<<1;
+			for(uint8_t i=0;i<6;i++)
+			{
+				if( (i > 3 && sub_protocol == MOULDKG_ANALOG4) || i + n > 15)
+					packet[i+4] = 0x80;							//Centered channel
+				else
+					packet[i+4] = convert_channel_8b(ch[i]+n);
+			}
 			len = MOULDKG_PAYLOAD_SIZE_ANALOG;
 		}
 		else
--- a/Multiprotocol/Multi.txt
+++ b/Multiprotocol/Multi.txt
@@ -3,12 +3,12 @@
 3,FrskyD,D8,Cloned
 4,Hisky,Hisky,HK310
 5,V2x2,V2x2,JXD506,MR101
-6,DSM,DSM2_1F,DSM2_2F,DSMX_1F,DSMX_2F,AUTO,DSMR_1F
+6,DSM,DSM2_1F,DSM2_2F,DSMX_1F,DSMX_2F,AUTO,DSMR_1F,DSMR,DSM2_SFC
 7,Devo,8CH,10CH,12CH,6CH,7CH
 8,YD717,YD717,SKYWLKR,SYMAX4,XINXUN,NIHUI
 9,KN,WLTOYS,FEILUN
 10,SymaX,SYMAX,SYMAX5C
-11,SLT,SLT_V1,SLT_V2,Q100,Q200,MR100
+11,SLT,SLT_V1,SLT_V2,Q100,Q200,MR100,V1_4CH,RF_SIM,SLT6TX
 12,CX10,GREEN,BLUE,DM007,---,J3015_1,J3015_2,MK33041
 13,CG023,CG023,YD829
 14,Bayang,Bayang,H8S3D,X16_AH,IRDRONE,DHD_D4,QX100
@@ -20,12 +20,12 @@
 20,FY326,FY326,FY319
 21,Futaba,SFHSS
 22,J6PRO
-23,FQ777
+23,FQ777,124,XBM37
 24,ASSAN
 25,FrskyV
-26,HONTAI,HONTAI,JJRCX1,X5C1,FQ777_951
+26,HONTAI,HONTAI,JJRCX1,X5C1,FQ777_951,XKK170
 27,OpnLrs
-28,AFHDS2A,PWM_IBUS,PPM_IBUS,PWM_SBUS,PPM_SBUS,PWM_IB16,PPM_IB16,PWM_SB16,PPM_SB16
+28,AFHDS2A,PWM_IBUS,PPM_IBUS,PWM_SBUS,PPM_SBUS,Gyro_Off,Gyro_On,G_On_Rev
 29,Q2X2,Q222,Q242,Q282
 30,WK2x01,WK2801,WK2401,W6_5_1,W6_6_1,W6_HEL,W6_HEL_I
 31,Q303,Q303,CX35,CX10D,CX10WD
@@ -40,13 +40,13 @@
 40,WFLY,WFR0x
 41,BUGS
 42,BUGSMINI,BUGSMINI,BUGS3H
-43,Traxxas,RX6519
+43,Traxxas,TQ
 44,NCC1701
 45,E01X,E012,E015
 46,V911S,V911S,E119
 47,GD00x,GD_V1,GD_V2
-48,V761,3CH,4CH
-49,KF606,KF606,MIG320
+48,V761,3CH,4CH,TOPRC
+49,KF606,KF606,MIG320,ZCZ50
 50,Redpine,Fast,Slow
 51,Potensic,A20
 52,ZSX,280
@@ -55,11 +55,11 @@
 55,Frsky_RX,Multi,CloneTX,EraseTX,CPPM
 56,AFHDS2A_RX,Multi,CPPM
 57,HoTT,Sync,No_Sync
-58,FX816,P38
+58,FX,FX816,FX620,9630,Q560,QF012,BM26,A570
 59,Bayang_RX,Multi,CPPM
 60,Pelikan,Pro,Lite,SCX24
-61,Tiger
-62,XK,X450,X420
+61,EazyRC
+62,XK,X450,X420,Cars
 63,XN_DUMP,250K,1M,2M,AUTO
 64,FrskyX2,CH_16,CH_8,EU_16,EU_8,Cloned
 65,FrSkyR9,915MHz,868MHz,915_8ch,868_8ch,FCC,--,FCC_8ch,--_8ch
@@ -67,24 +67,40 @@
 67,LR12,LR12,LR12_6ch
 68,Skyartec
 69,ESKYv2,150V2
-70,DSM_RX,Multi,CPPM
+70,DSM_RX,Multi,CloneTX,EraseTX,CPPM
 71,JJRC345,JJRC345,SkyTmblr
 72,Q90C
 73,Kyosho,FHSS,Hype
-74,RadioLink,Surface,Air,DumboRC
+74,RadioLink,Surface,Air,DumboRC,RC4G,Dumbo_P
 75,---
-76,Realacc,R11
+76,Realacc,R11,WLV8TX
 77,OMP
 78,M-Link
 79,WFLY,RF20x
 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
+90,MouldKg,A4444,D4444,A664
+91,Xerall
+92,MT99xx,PA18,SU35
+93,Kyosho2,KT-17
+94,Scorpio
+95,BlueFly
+96,BumbleB
+97,SGF22,F22,F22S,J20
+98,Kyosho3
+99,XK2,X4,P10
+100,YuXiang
+102,JIABAILE,STD,GYRO
+103,H36
+104,KAMTOM
+105,Shenqi2
+106,WL91x
+107,WPL
+108,0,Ares
--- a/Multiprotocol/Multi_Protos.ino
+++ b/Multiprotocol/Multi_Protos.ino
@@ -33,8 +33,10 @@ 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_SHENQI2[]	="Shenqi2";
 const char STR_FY326[]		="FY326";
 const char STR_FUTABA[]		="Futaba";
 const char STR_J6PRO[]		="J6 Pro";
@@ -54,6 +56,7 @@ const char STR_DM002[]		="DM002";
 const char STR_CABELL[]		="Cabell";
 const char STR_ESKY150[]	="Esky150";
 const char STR_ESKY150V2[]	="EskyV2";
+const char STR_H36[]		="H36";
 const char STR_H8_3D[]		="H8 3D";
 const char STR_CORONA[]		="Corona";
 const char STR_CFLIE[]		="CFlie";
@@ -77,16 +80,17 @@ 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";
 const char STR_XK[]			="XK";
+const char STR_XK2[]		="XK2";
 const char STR_XN297DUMP[]	="XN297DP";
 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";
@@ -103,27 +107,50 @@ const char STR_CONFIG[]     ="Config";
 const char STR_LOSI[]       ="Losi";
 const char STR_MOULDKG[]    ="MouldKg";
 const char STR_XERALL[]     ="Xerall";
+const char STR_SCORPIO[]    ="Scorpio";
+const char STR_BLUEFLY[]    ="BlueFly";
+const char STR_BUMBLEB[]    ="BumbleB";
+const char STR_SGF22[]      ="SGF22";
+const char STR_EAZYRC[]     ="EazyRC";
+const char STR_KYOSHO3[]    ="Kyosho3";
+const char STR_YUXIANG[]    ="YuXiang";
+const char STR_UDIRC[]      ="UDIRC";
+const char STR_JIABAILE[]   ="JIABAILE";
+const char STR_KAMTOM[]     ="KAMTOM";
+const char STR_WL91X[]      ="WL91x";
+const char STR_WPL[]        ="WPL";
+const char STR_ARES[]        ="ARES";

 const char STR_SUBTYPE_FLYSKY[] =     "\x04""Std\0""V9x9""V6x6""V912""CX20";
 const char STR_SUBTYPE_HUBSAN[] =     "\x04""H107""H301""H501";
 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";
+#ifndef MULTI_EU
+	const char STR_SUBTYPE_FRSKYX[] =     "\x07""D16\0   ""D16 8ch""LBT(EU)""LBT 8ch""Cloned\0""Clo 8ch";
+#else
+	const char STR_SUBTYPE_FRSKYX[] =     "\x07""--->\0  ""--->\0  ""LBT(EU)""LBT 8ch""Cloned\0""Clo 8ch";
+#endif
 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""2SFC";
+#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";
 const char STR_SUBTYPE_SYMAX[] =      "\x03""Std""X5C";
-const char STR_SUBTYPE_SLT[] =        "\x06""V1_6ch""V2_8ch""Q100\0 ""Q200\0 ""MR100\0";
+const char STR_SUBTYPE_SLT[] =        "\x06""V1_6ch""V2_8ch""Q100\0 ""Q200\0 ""MR100\0""V1_4ch""RF_SIM""SLT6TX";
 const char STR_SUBTYPE_CX10[] =       "\x07""Green\0 ""Blue\0  ""DM007\0 ""-\0     ""JC3015a""JC3015b""MK33041";
 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""SU35";
 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";
-const char STR_SUBTYPE_AFHDS2A[] =    "\x08""PWM,IBUS""PPM,IBUS""PWM,SBUS""PPM,SBUS""PWM,IB16""PPM,IB16""PWM,SB16""PPM,SB16";
+const char STR_SUBTYPE_FQ777[] =      "\x05""124\0 ""XBM37";
+const char STR_SUBTYPE_HONTAI[] =     "\x06""Std\0  ""JJRCX1""X5C1\0 ""FQ_951""XKK170";
+const char STR_SUBTYPE_AFHDS2A[] =    "\x08""PWM,IBUS""PPM,IBUS""PWM,SBUS""PPM,SBUS""Gyro_Off""Gyro_On\0""G_On_Rev";
 const char STR_SUBTYPE_Q2X2[] =       "\x04""Q222""Q242""Q282";
 const char STR_SUBTYPE_WK2x01[] =     "\x06""WK2801""WK2401""W6_5_1""W6_6_1""W6_HeL""W6_HeI";
 const char STR_SUBTYPE_Q303[] =       "\x06""Std\0  ""CX35\0 ""CX10D\0""CX10WD";
@@ -132,19 +159,19 @@ const char STR_SUBTYPE_H83D[] =       "\x07""Std\0   ""H20H\0  ""H20Mini""H30Min
 const char STR_SUBTYPE_CORONA[] =     "\x05""V1\0  ""V2\0  ""FD V3";
 const char STR_SUBTYPE_HITEC[] =      "\x07""Optima\0""Opt Hub""Minima\0";
 const char STR_SUBTYPE_BUGS_MINI[] =  "\x06""Std\0  ""Bugs3H";
-const char STR_SUBTYPE_TRAXXAS[] =    "\x04""6519";
+const char STR_SUBTYPE_TRAXXAS[] =    "\x03""TQ2""TQ1";
 const char STR_SUBTYPE_E01X[] =       "\x05""E012\0""E015\0";
 const char STR_SUBTYPE_GD00X[] =      "\x05""GD_V1""GD_V2";
 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_XN297DUMP[] =  "\x07""250Kbps""1Mbps\0 ""2Mbps\0 ""Auto\0  ""NRF\0   ""CC2500\0""XN297\0 ";
 const char STR_SUBTYPE_ESKY150[] =    "\x03""4ch""7ch";
 const char STR_SUBTYPE_ESKY150V2[] =  "\x05""150V2";
 const char STR_SUBTYPE_V911S[] =      "\x05""V911S""E119\0";
-const char STR_SUBTYPE_XK[] =         "\x04""X450""X420";
+const char STR_SUBTYPE_XK[] =         "\x04""X450""X420""Cars";
+const char STR_SUBTYPE_XK2[] =        "\x03""X4\0""P10";
 const char STR_SUBTYPE_FRSKYR9[] =    "\x07""915MHz\0""868MHz\0""915 8ch""868 8ch""FCC\0   ""--\0    ""FCC 8ch""-- 8ch\0";
 const char STR_SUBTYPE_ESKY[] =       "\x03""Std""ET4";
 const char STR_SUBTYPE_PROPEL[] =     "\x04""74-Z";
@@ -153,25 +180,34 @@ 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_RLINK[] =      "\x07""Surface""Air\0   ""DumboRC";
-const char STR_SUBTYPE_REALACC[] =    "\x03""R11";
+const char STR_SUBTYPE_V761[] =       "\x05""3ch\0 ""4ch\0 ""TOPRC";
+const char STR_SUBTYPE_RLINK[] =      "\x07""Surface""Air\0   ""DumboRC""RC4G\0  ""Dumbo_P";
+const char STR_SUBTYPE_REALACC[] =    "\x06""R11\0  ""WLV8TX";
 const char STR_SUBTYPE_KYOSHO[] =     "\x04""FHSS""Hype";
+const char STR_SUBTYPE_KYOSHO2[] =    "\x05""KT-17";
+const char STR_SUBTYPE_KYOSHO3[] =    "\x03""ASF";
 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_MOULDKG[] =    "\x05""A4444""D4444""A664\0";
+const char STR_SUBTYPE_KF606[] =      "\x06""KF606\0""MIG320""ZCZ50\0";
+const char STR_SUBTYPE_E129[] =       "\x04""E129""C186";
+const char STR_SUBTYPE_FX[] =         "\x05""FX816""FX620""9630\0""Q560\0""QF012""BM26\0""A570\0";
+const char STR_SUBTYPE_SGF22[] =      "\x04""F22\0""F22S""J20\0""CX10";
+const char STR_SUBTYPE_JIABAILE[] =   "\x04""Std\0""Gyro";
 #define NO_SUBTYPE		nullptr

 #ifdef SEND_CPPM
 	const char STR_SUB_FRSKY_RX[] =   "\x07""Multi\0 ""CloneTX""EraseTX""CPPM\0  ";
+	const char STR_SUB_DSM_RX[] =   "\x07""Multi\0 ""CloneTX""EraseTX""CPPM\0  ";
 	#define FRCPPM   4
+	#define DSMCPPM   4
 	const char STR_CPPM[] =           "\x05""Multi""CPPM\0";
 	#define NBR_CPPM 2
 #else
 	const char STR_SUB_FRSKY_RX[] =   "\x07""Multi\0 ""CloneTX""EraseTX";
+	const char STR_SUB_DSM_RX[] =   "\x07""Multi\0 ""CloneTX""EraseTX";
 	#define FRCPPM   3
+	#define DSMCPPM   3
 	#define STR_CPPM NO_SUBTYPE
 	#define NBR_CPPM 0
 #endif
@@ -196,6 +232,9 @@ const mm_protocol_definition multi_protocols[] = {
 	#if defined(MULTI_CONFIG_INO)
 		{PROTO_CONFIG,     STR_CONFIG,    NO_SUBTYPE,            0, OPTION_NONE,    0, 0, 0,         CONFIG_init,     CONFIG_callback     },
 	#endif
+	#if defined(ARES_CC2500_INO)
+		{PROTO_ARES,       STR_ARES,      NO_SUBTYPE,            0, OPTION_RFTUNE,  0, 0, SW_CC2500, ARES_init,       ARES_callback       },
+	#endif
 	#if defined(ASSAN_NRF24L01_INO)
 		{PROTO_ASSAN,      STR_ASSAN,     NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_NRF,    ASSAN_init,      ASSAN_callback      },
 	#endif
@@ -205,6 +244,12 @@ const mm_protocol_definition multi_protocols[] = {
 	#if defined(BAYANG_RX_NRF24L01_INO)
 		{PROTO_BAYANG_RX,  STR_BAYANG_RX, STR_CPPM,       NBR_CPPM, OPTION_NONE,    0, 0, SW_NRF,    BAYANG_RX_init,  BAYANG_RX_callback  },	
 	#endif
+	#if defined(BLUEFLY_CCNRF_INO)
+		{PROTO_BLUEFLY,    STR_BLUEFLY,   NO_SUBTYPE,            0, OPTION_RFTUNE,  0, 0, SW_NRF,    BLUEFLY_init,    BLUEFLY_callback    },
+	#endif
+	#if defined(BUMBLEB_CCNRF_INO)
+		{PROTO_BUMBLEB,    STR_BUMBLEB,   NO_SUBTYPE,            0, OPTION_RFTUNE,  0, 0, SW_NRF,    BUMBLEB_init,    BUMBLEB_callback    },
+	#endif
 	#if defined(BUGS_A7105_INO)
 		{PROTO_BUGS,       STR_BUGS,      NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_A7105,  BUGS_init,       BUGS_callback       },
 	#endif
@@ -233,10 +278,10 @@ const mm_protocol_definition multi_protocols[] = {
 		{PROTO_DM002,      STR_DM002,     NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_NRF,    DM002_init,      DM002_callback      },
 	#endif
 	#if defined(DSM_CYRF6936_INO)
-		{PROTO_DSM,        STR_DSM,       STR_SUBTYPE_DSM,       6, OPTION_MAXTHR,  0, 1, SW_CYRF,   DSM_init,        DSM_callback        },
+		{PROTO_DSM,        STR_DSM,       STR_SUBTYPE_DSM,       7, OPTION_MAXTHR,  0, 1, SW_CYRF,   DSM_init,        DSM_callback        },
 	#endif
 	#if defined(DSM_RX_CYRF6936_INO)
-		{PROTO_DSM_RX,     STR_DSM_RX,    STR_CPPM,       NBR_CPPM, OPTION_NONE,    0, 1, SW_CYRF,   DSM_RX_init,     DSM_RX_callback     },
+		{PROTO_DSM_RX,     STR_DSM_RX,    STR_SUB_DSM_RX,  DSMCPPM, OPTION_NONE,    0, 1, SW_CYRF,   DSM_RX_init,     DSM_RX_callback     },
 	#endif
 	#if defined(E010R5_CYRF6936_INO)
 		{PROTO_E010R5,     STR_E010R5,    NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_CYRF,   E010R5_init,     E010R5_callback     },
@@ -247,11 +292,14 @@ const mm_protocol_definition multi_protocols[] = {
 	#if defined(E016HV2_CC2500_INO)
 		{PROTO_E016HV2,    STR_E016HV2,   NO_SUBTYPE,            0, OPTION_RFTUNE,  0, 0, SW_CC2500, E016HV2_init,    E016HV2_callback    },
 	#endif
-	#if defined(E01X_NRF24L01_INO)
-		{PROTO_E01X,       STR_E01X,      STR_SUBTYPE_E01X,      2, OPTION_OPTION,  0, 0, SW_NRF,    E01X_init,       E01X_callback       },
+	#if defined(E01X_CYRF6936_INO)
+		{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(EAZYRC_NRF24L01_INO)
+		{PROTO_EAZYRC,     STR_EAZYRC,    NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_NRF,    EAZYRC_init,     EAZYRC_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       },
@@ -266,13 +314,13 @@ const mm_protocol_definition multi_protocols[] = {
 		{PROTO_FLYSKY,     STR_FLYSKY,    STR_SUBTYPE_FLYSKY,    5, OPTION_NONE,    0, 1, SW_A7105,  FLYSKY_init,     FLYSKY_callback     },
 	#endif
 	#if defined(AFHDS2A_A7105_INO)
-		{PROTO_AFHDS2A,    STR_AFHDS2A,   STR_SUBTYPE_AFHDS2A,   8, OPTION_SRVFREQ, 1, 1, SW_A7105,  AFHDS2A_init,    AFHDS2A_callback    },
+		{PROTO_AFHDS2A,    STR_AFHDS2A,   STR_SUBTYPE_AFHDS2A,   7, OPTION_SRVFREQ, 1, 1, SW_A7105,  AFHDS2A_init,    AFHDS2A_callback    },
 	#endif
 	#if defined(AFHDS2A_RX_A7105_INO)
 		{PROTO_AFHDS2A_RX, STR_AFHDS2A_RX,STR_CPPM,       NBR_CPPM, OPTION_NONE,    0, 0, SW_A7105,  AFHDS2A_RX_init, AFHDS2A_RX_callback },
 	#endif
 	#if defined(FQ777_NRF24L01_INO)
-		{PROTO_FQ777,      STR_FQ777,     NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_NRF,    FQ777_init,      FQ777_callback      },
+		{PROTO_FQ777,      STR_FQ777,     STR_SUBTYPE_FQ777,     2, OPTION_NONE,    0, 0, SW_NRF,    FQ777_init,      FQ777_callback      },
 	#endif
 //OpenTX 2.3.x issue: DO NOT CHANGE ORDER below
 	#if defined(FRSKY_RX_CC2500_INO)
@@ -302,8 +350,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,        7, 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      },
@@ -314,6 +362,9 @@ const mm_protocol_definition multi_protocols[] = {
 	#if defined(GW008_NRF24L01_INO)
 		{PROTO_GW008,      STR_GW008,     NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_NRF,    GW008_init,      GW008_callback      },
 	#endif
+	#if defined(H36_NRF24L01_INO)
+		{PROTO_H36,        STR_H36,       NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_NRF,    H36_init,        H36_callback        },
+	#endif
 	#if defined(H8_3D_NRF24L01_INO)
 		{PROTO_H8_3D,      STR_H8_3D,     STR_SUBTYPE_H83D,      4, OPTION_NONE,    0, 0, SW_NRF,    H8_3D_init,      H8_3D_callback      },
 	#endif
@@ -327,7 +378,7 @@ const mm_protocol_definition multi_protocols[] = {
 		{PROTO_HITEC,      STR_HITEC,     STR_SUBTYPE_HITEC,     3, OPTION_RFTUNE,  0, 0, SW_CC2500, HITEC_init,      HITEC_callback      },
 	#endif
 	#if defined(HONTAI_NRF24L01_INO)
-		{PROTO_HONTAI,     STR_HONTAI,    STR_SUBTYPE_HONTAI,    4, OPTION_NONE,    0, 0, SW_NRF,    HONTAI_init,     HONTAI_callback     },
+		{PROTO_HONTAI,     STR_HONTAI,    STR_SUBTYPE_HONTAI,    5, OPTION_NONE,    0, 0, SW_NRF,    HONTAI_init,     HONTAI_callback     },
 	#endif
 	#if defined(HOTT_CC2500_INO)
 		{PROTO_HOTT,       STR_HOTT,      STR_SUBTYPE_HOTT,      2, OPTION_RFTUNE,  1, 0, SW_CC2500, HOTT_init,       HOTT_callback       },
@@ -341,14 +392,20 @@ const mm_protocol_definition multi_protocols[] = {
 	#if defined(J6PRO_CYRF6936_INO)
 		{PROTO_J6PRO,      STR_J6PRO,     NO_SUBTYPE,            0, OPTION_NONE,    0, 1, SW_CYRF,   J6PRO_init,      J6PRO_callback      },
 	#endif
+	#if defined(JIABAILE_NRF24L01_INO)
+		{PROTO_JIABAILE,   STR_JIABAILE,  STR_SUBTYPE_JIABAILE,  2, OPTION_NONE,    0, 0, SW_NRF,    JIABAILE_init,   JIABAILE_callback   },
+	#endif
 	#if defined(JJRC345_NRF24L01_INO)
 		{PROTO_JJRC345,    STR_JJRC345,   STR_SUBTYPE_JJRC345,   2, OPTION_NONE,    0, 0, SW_NRF,    JJRC345_init,    JJRC345_callback    },
 	#endif
 	#if defined(JOYSWAY_A7105_INO)
 		{PROTO_JOYSWAY,    STR_JOYSWAY,   NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_A7105,  JOYSWAY_init,    JOYSWAY_callback    },
 	#endif
+	#if defined(KAMTOM_NRF24L01_INO)
+		{PROTO_KAMTOM,     STR_KAMTOM,    NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_NRF,    KAMTOM_init,     KAMTOM_callback     },
+	#endif
 	#if defined(KF606_CCNRF_INO)
-		{PROTO_KF606,      STR_KF606,     STR_SUBTYPE_KF606,     2, OPTION_RFTUNE,  0, 0, SW_NRF,    KF606_init,      KF606_callback      },
+		{PROTO_KF606,      STR_KF606,     STR_SUBTYPE_KF606,     3, OPTION_RFTUNE,  0, 0, SW_NRF,    KF606_init,      KF606_callback      },
 	#endif
 	#if defined(KN_NRF24L01_INO)
 		{PROTO_KN,         STR_KN,        STR_SUBTYPE_KN,        2, OPTION_NONE,    0, 0, SW_NRF,    KN_init,         KN_callback         },
@@ -356,6 +413,12 @@ 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(KYOSHO3_CYRF6936_INO)
+		{PROTO_KYOSHO3,    STR_KYOSHO3,   STR_SUBTYPE_KYOSHO3,   1, OPTION_NONE,    0, 0, SW_CYRF,   KYOSHO3_init,    KYOSHO3_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
@@ -369,11 +432,14 @@ const mm_protocol_definition multi_protocols[] = {
 		{PROTO_MLINK,      STR_MLINK,     NO_SUBTYPE,            0, OPTION_NONE,    1, 0, SW_CYRF,   MLINK_init,      MLINK_callback      },
 	#endif
 	#if defined(MOULDKG_NRF24L01_INO)
-		{PROTO_MOULDKG,    STR_MOULDKG,   STR_SUBTYPE_MOULKG,    2, OPTION_OPTION,  0, 0, SW_NRF,    MOULDKG_init,    MOULDKG_callback    },
+		{PROTO_MOULDKG,    STR_MOULDKG,   STR_SUBTYPE_MOULDKG,   3, OPTION_OPTION,  0, 0, SW_NRF,    MOULDKG_init,    MOULDKG_callback    },
 	#endif
 	#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,     2, 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
@@ -399,10 +465,10 @@ const mm_protocol_definition multi_protocols[] = {
 		{PROTO_Q90C,       STR_Q90C,      NO_SUBTYPE,            0, OPTION_RFTUNE,  0, 0, SW_NRF,    Q90C_init,       Q90C_callback       },
 	#endif
 	#if defined(RLINK_CC2500_INO)
-		{PROTO_RLINK,      STR_RLINK,     STR_SUBTYPE_RLINK,     3, OPTION_RFTUNE,  0, 0, SW_CC2500, RLINK_init,      RLINK_callback      },
+		{PROTO_RLINK,      STR_RLINK,     STR_SUBTYPE_RLINK,     5, OPTION_RFTUNE,  0, 0, SW_CC2500, RLINK_init,      RLINK_callback      },
 	#endif
 	#if defined(REALACC_NRF24L01_INO)
-		{PROTO_REALACC,    STR_REALACC,   STR_SUBTYPE_REALACC,   1, OPTION_NONE,    0, 0, SW_NRF,    REALACC_init,    REALACC_callback    },
+		{PROTO_REALACC,    STR_REALACC,   STR_SUBTYPE_REALACC,   2, OPTION_NONE,    0, 0, SW_NRF,    REALACC_init,    REALACC_callback    },
 	#endif
 	#if defined(REDPINE_CC2500_INO)
 		{PROTO_REDPINE,    STR_REDPINE,   STR_SUBTYPE_REDPINE,   2, OPTION_RFTUNE,  0, 0, SW_CC2500, REDPINE_init,    REDPINE_callback    },
@@ -410,36 +476,42 @@ const mm_protocol_definition multi_protocols[] = {
 	#if defined(SCANNER_CC2500_INO)
 		{PROTO_SCANNER,    STR_SCANNER,   NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_CC2500, SCANNER_init,    SCANNER_callback    },
 	#endif
+	#if defined(SCORPIO_CYRF6936_INO)
+		{PROTO_SCORPIO,    STR_SCORPIO,   NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_CYRF,   SCORPIO_init,    SCORPIO_callback    },
+	#endif
+	#if defined(SGF22_NRF24L01_INO)
+		{PROTO_SGF22,      STR_SGF22,     STR_SUBTYPE_SGF22,     4, OPTION_NONE,    0, 0, SW_NRF,    SGF22_init,      SGF22_callback      },
+	#endif
 	#if defined(SHENQI_NRF24L01_INO)
 		{PROTO_SHENQI,     STR_SHENQI,    NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_NRF,    SHENQI_init,     SHENQI_callback     },
 	#endif
+	#if defined(SHENQI2_NRF24L01_INO)
+		{PROTO_SHENQI2,    STR_SHENQI2,   NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_NRF,    SHENQI2_init,     SHENQI2_callback   },
+	#endif
 	#if defined(SKYARTEC_CC2500_INO)
 		{PROTO_SKYARTEC,   STR_SKYARTEC,  NO_SUBTYPE,            0, OPTION_RFTUNE,  0, 1, SW_CC2500, SKYARTEC_init,   SKYARTEC_callback   },
 	#endif
 	#if defined(SLT_CCNRF_INO)
-		{PROTO_SLT,        STR_SLT,       STR_SUBTYPE_SLT,       5, OPTION_RFTUNE,  0, 1, SW_NRF,    SLT_init,        SLT_callback        },
+		{PROTO_SLT,        STR_SLT,       STR_SUBTYPE_SLT,       8, OPTION_RFTUNE,  0, 1, SW_NRF,    SLT_init,        SLT_callback        },
 	#endif
 	#if defined(SYMAX_NRF24L01_INO)
 		{PROTO_SYMAX,      STR_SYMAX,     STR_SUBTYPE_SYMAX,     2, OPTION_NONE,    0, 0, SW_NRF,    SYMAX_init,      SYMAX_callback      },
 	#endif
-	#if defined(TIGER_NRF24L01_INO)
-		{PROTO_TIGER,      STR_TIGER,     NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_NRF,    TIGER_init,      TIGER_callback      },	
-	#endif
 	#if defined(TRAXXAS_CYRF6936_INO)
-		{PROTO_TRAXXAS,    STR_TRAXXAS,   STR_SUBTYPE_TRAXXAS,   1, OPTION_NONE,    0, 0, SW_CYRF,   TRAXXAS_init,    TRAXXAS_callback    },
+		{PROTO_TRAXXAS,    STR_TRAXXAS,   STR_SUBTYPE_TRAXXAS,   2, OPTION_NONE,    0, 0, SW_CYRF,   TRAXXAS_init,    TRAXXAS_callback    },
+	#endif
+	#if defined(UDIRC_CCNRF_INO)
+		{PROTO_UDIRC,      STR_UDIRC,     NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_NRF,    UDIRC_init,      UDIRC_callback      },
 	#endif
 	#if defined(V2X2_NRF24L01_INO)
 		{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      },
 	#endif
-	#if defined(WK2x01_CYRF6936_INO)
-		{PROTO_WK2x01,     STR_WK2x01,    STR_SUBTYPE_WK2x01,    6, OPTION_NONE,    1, 1, SW_CYRF,   WK_init,         WK_callback         },
-	#endif
 	#if defined(WFLY_CYRF6936_INO)
 		{PROTO_WFLY,       STR_WFLY,      STR_SUBTYPE_WFLY,      1, OPTION_NONE,    1, 0, SW_CYRF,   WFLY_init,       WFLY_callback       },
 	#endif
@@ -447,18 +519,33 @@ const mm_protocol_definition multi_protocols[] = {
 		{PROTO_WFLY2,      STR_WFLY2,     STR_SUBTYPE_WFLY2,     1, OPTION_OPTION,  1, 0, SW_A7105,  WFLY2_init,      WFLY2_callback      },
 //		{PROTO_WFLY2,      STR_WFLY2,     STR_SUBTYPE_WFLY2,     1, OPTION_WBUS,    1, 0, SW_A7105,  WFLY2_init,      WFLY2_callback      },// crash OpenTX...
 	#endif
+	#if defined(WK2x01_CYRF6936_INO)
+		{PROTO_WK2x01,     STR_WK2x01,    STR_SUBTYPE_WK2x01,    6, OPTION_NONE,    1, 1, SW_CYRF,   WK_init,         WK_callback         },
+	#endif
+	#if defined(WL91X_CCNRF_INO)
+		{PROTO_WL91X,      STR_WL91X,     NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_NRF,    WL91X_init,      WL91X_callback      },
+	#endif
+	#if defined(WPL_NRF24L01_INO)
+		{PROTO_WPL,        STR_WPL,       NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_NRF,    WPL_init,        WPL_callback        },
+	#endif
 	#if defined(XERALL_NRF24L01_INO)
 		{PROTO_XERALL,     STR_XERALL,    NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_NRF,    XERALL_init,     XERALL_callback     },	
 	#endif
 	#if defined(XK_CCNRF_INO)
-		{PROTO_XK,         STR_XK,        STR_SUBTYPE_XK,        2, OPTION_RFTUNE,  0, 0, SW_NRF,    XK_init,         XK_callback         },	
+		{PROTO_XK,         STR_XK,        STR_SUBTYPE_XK,        3, OPTION_RFTUNE,  0, 0, SW_NRF,    XK_init,         XK_callback         },	
+	#endif
+	#if defined(XK2_CCNRF_INO)
+		{PROTO_XK2,        STR_XK2,       STR_SUBTYPE_XK2,       2, OPTION_RFTUNE,  0, 0, SW_NRF,    XK2_init,        XK2_callback        },	
 	#endif
 	#if defined(XN297DUMP_NRF24L01_INO)
-		{PROTO_XN297DUMP,  STR_XN297DUMP, STR_SUBTYPE_XN297DUMP, 6, OPTION_RFCHAN,  0, 0, SW_NRF,    XN297Dump_init,  XN297Dump_callback  },
+		{PROTO_XN297DUMP,  STR_XN297DUMP, STR_SUBTYPE_XN297DUMP, 7, OPTION_RFCHAN,  0, 0, SW_NRF,    XN297Dump_init,  XN297Dump_callback  },
 	#endif
 	#if defined(YD717_NRF24L01_INO)
 		{PROTO_YD717,      STR_YD717,     STR_SUBTYPE_YD717,     5, OPTION_NONE,    0, 0, SW_NRF,    YD717_init,      YD717_callback      },
 	#endif
+	#if defined(YUXIANG_NRF24L01_INO)
+		{PROTO_YUXIANG,    STR_YUXIANG,   NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_NRF,    YUXIANG_init,    YUXIANG_callback    },
+	#endif
 	#if defined(ZSX_NRF24L01_INO)
 		{PROTO_ZSX,        STR_ZSX,       STR_SUBTYPE_ZSX,       1, OPTION_NONE,    0, 0, SW_NRF,    ZSX_init,        ZSX_callback        },
 	#endif
@@ -513,7 +600,10 @@ uint16_t PROTOLIST_callback()
 			Serial_write(multi_protocols[option].protocol);
 			//Protocol name
 			for(uint8_t i=0;i<proto_len;i++)
+			{
 				Serial_write(multi_protocols[option].ProtoString[i]);
+				//debug("%c",multi_protocols[option].ProtoString[i]);
+			}
 			//Flags
 			uint8_t flags=0;
 			#ifdef FAILSAFE_ENABLE
@@ -523,16 +613,21 @@ uint16_t PROTOLIST_callback()
 			if(multi_protocols[option].chMap)
 				flags |= 0x02;			//Disable_ch_mapping supported
 			Serial_write( flags | (multi_protocols[option].optionType<<4));	// flags && option type
+			//debug(" Flag=%02X",flags | (multi_protocols[option].optionType<<4));
 			//Number of sub protocols
 			Serial_write(nbr_sub);
-			
+			//debug(" NSub=%02X ",nbr_sub);
 			if(nbr_sub !=0 )
 			{//Sub protocols length and texts
 				for(uint8_t i=0;i<=nbr_sub*sub_len;i++)
+				{
 					Serial_write(multi_protocols[option].SubProtoString[i]);
+					//debug("%c",multi_protocols[option].SubProtoString[i]);
+				}
 			}
+			//debugln("");
 		}
 	}
 	return 1000;
 }
-#endif
+#endif
--- a/Multiprotocol/Multiprotocol.h
+++ b/Multiprotocol/Multiprotocol.h
@@ -18,8 +18,8 @@
 //******************
 #define VERSION_MAJOR		1
 #define VERSION_MINOR		3
-#define VERSION_REVISION	3
-#define VERSION_PATCH_LEVEL	0
+#define VERSION_REVISION	4
+#define VERSION_PATCH_LEVEL	63

 #define MODE_SERIAL 0

@@ -73,9 +73,9 @@ enum PROTOCOLS
 	PROTO_BUGSMINI	= 42,	// =>NRF24L01
 	PROTO_TRAXXAS	= 43,	// =>CYRF6936
 	PROTO_NCC1701	= 44,	// =>NRF24L01
-	PROTO_E01X		= 45,	// =>NRF24L01
+	PROTO_E01X		= 45,	// =>CYRF6936
 	PROTO_V911S		= 46,	// =>NRF24L01
-	PROTO_GD00X		= 47,	// =>NRF24L01
+	PROTO_GD00X		= 47,	// =>CC2500 & NRF24L01
 	PROTO_V761		= 48,	// =>NRF24L01
 	PROTO_KF606		= 49,	// =>NRF24L01
 	PROTO_REDPINE	= 50,	// =>CC2500
@@ -86,10 +86,10 @@ 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
+	PROTO_EAZYRC	= 61,	// =>NRF24L01
 	PROTO_XK		= 62,	// =>NRF24L01
 	PROTO_XN297DUMP	= 63,	// =>NRF24L01
 	PROTO_FRSKYX2	= 64,	// =>CC2500
@@ -119,7 +119,24 @@ 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_SCORPIO	= 94,	// =>CYRF6936
+	PROTO_BLUEFLY	= 95,	// =>CC2500 & NRF24L01
+	PROTO_BUMBLEB	= 96,	// =>CC2500 & NRF24L01
+	PROTO_SGF22		= 97,	// =>NRF24L01
+	PROTO_KYOSHO3	= 98,	// =>CYRF6936
+	PROTO_XK2		= 99,	// =>CC2500 & NRF24L01
+	PROTO_YUXIANG	= 100,	// =>NRF24L01
+	PROTO_UDIRC		= 101,	// =>CC2500 & NRF24L01
+	PROTO_JIABAILE	= 102,	// =>NRF24L01
+	PROTO_H36		= 103,	// =>NRF24L01
+	PROTO_KAMTOM	= 104,	// =>NRF24L01
+	PROTO_SHENQI2	= 105,	// =>NRF24L01
+	PROTO_WL91X		= 106,	// =>CC2500 & NRF24L01
+	PROTO_WPL		= 107,	// =>NRF24L01
+	PROTO_ARES		= 108,	// =>CC2500
+	
 	PROTO_NANORF	= 126,	// =>NRF24L01
 	PROTO_TEST		= 127,	// =>CC2500
 };
@@ -144,14 +161,13 @@ enum Hubsan
 };
 enum AFHDS2A
 {
-	PWM_IBUS = 0,
-	PPM_IBUS = 1,
-	PWM_SBUS = 2,
-	PPM_SBUS = 3,
-	PWM_IB16 = 4,
-	PPM_IB16 = 5,
-	PWM_SB16 = 6,
-	PPM_SB16 = 7,
+	PWM_IBUS			= 0,
+	PPM_IBUS			= 1,
+	PWM_SBUS			= 2,
+	PPM_SBUS			= 3,
+	AFHDS2A_GYRO_OFF	= 4,
+	AFHDS2A_GYRO_ON		= 5,
+	AFHDS2A_GYRO_ON_REV	= 6,
 };
 enum Hisky
 {
@@ -166,6 +182,13 @@ enum DSM
 	DSMX_2F		= 3,
 	DSM_AUTO	= 4,
 	DSMR		= 5,
+	DSM2_SFC	= 6,
+};
+enum DSM_RX
+{
+	DSM_RX		= 0,
+	DSM_CLONE	= 1,
+	DSM_ERASE	= 2,
 };
 enum YD717
 {       			
@@ -187,11 +210,14 @@ enum SYMAX
 };
 enum SLT
 {
-	SLT_V1	= 0,
-	SLT_V2	= 1,
-	Q100	= 2,
-	Q200	= 3,
-	MR100	= 4,
+	SLT_V1		= 0,
+	SLT_V2		= 1,
+	Q100		= 2,
+	Q200		= 3,
+	MR100		= 4,
+	SLT_V1_4	= 5,
+	RF_SIM		= 6,
+	SLT6TX		= 7,
 };
 enum CX10
 {
@@ -236,6 +262,11 @@ enum MT99XX
 	DRAGON	= 6,
 	F949G	= 7,
 };
+enum MT99XX2
+{
+	PA18	= 0,  
+	SU35	= 1,
+};
 enum MJXQ
 {
 	WLH08	= 0,
@@ -262,10 +293,11 @@ enum FRSKYX
 };
 enum HONTAI
 {
-	HONTAI	= 0,
-	JJRCX1	= 1,
-	X5C1	= 2,
-	FQ777_951 =3,
+	HONTAI			= 0,
+	JJRCX1			= 1,
+	X5C1			= 2,
+	FQ777_951		= 3,
+	HONTAI_XKK170	= 4,
 };
 enum V2X2
 {
@@ -343,7 +375,8 @@ enum REDPINE
 };
 enum TRAXXAS
 {
-	RX6519	= 0,
+	TRAXXAS_TQ2	= 0,
+	TRAXXAS_TQ1	= 1,
 };
 enum ESKY150
 {
@@ -359,6 +392,7 @@ enum XK
 {
 	X450	= 0,
 	X420	= 1,
+	XK_CARS	= 2,
 };
 enum XN297DUMP
 {
@@ -368,6 +402,7 @@ enum XN297DUMP
 	XN297DUMP_AUTO	= 3,
 	XN297DUMP_NRF	= 4,
 	XN297DUMP_CC2500	= 5,
+	XN297DUMP_XN297	= 6,
 };
 enum FRSKY_R9
 {
@@ -385,7 +420,11 @@ enum ESKY
 	ESKY_STD	= 0,
 	ESKY_ET4	= 1,
 };
-
+enum FQ777
+{
+	FQ777	= 0,
+	XBM37	= 1,
+};
 enum FRSKY_RX
 {
 	FRSKY_RX	= 0,
@@ -393,67 +432,99 @@ 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,
+	RLINK_RC4G		= 3,
+	RLINK_DUMBORC_P	= 4,
+};
+enum REALACC
+{
+	REALACC_R11		= 0,
+	REALACC_WLV8TX	= 1,
 };
-
 enum MOULDKG
 {
-	MOULDKG_ANALOG	= 0,
-	MOULDKG_DIGIT	= 1,
+	MOULDKG_ANALOG4	= 0,
+	MOULDKG_DIGIT4	= 1,
+	MOULDKG_ANALOG6	= 2,
 };
-
 enum KF606
 {
 	KF606_KF606		= 0,
 	KF606_MIG320	= 1,
+	KF606_ZCZ50		= 2,
+};
+enum E129
+{
+	E129_E129		= 0,
+	E129_C186		= 1,
+};
+enum FX
+{
+	FX816			= 0,
+	FX620			= 1,
+    FX9630          = 2,
+	FX_Q560			= 3,
+	FX_QF012		= 4,
+	FX_BM26			= 5,
+	FX_A570			= 6,
+};
+enum SGF22
+{
+	SGF22_F22		= 0,
+	SGF22_F22S		= 1,
+	SGF22_J20 		= 2,
+	SGF22_CX10		= 3,
+};
+enum JIABAILE
+{
+	JIABAILE_STD	= 0,
+	JIABAILE_GYRO	= 1,
+};
+enum XK2
+{
+	XK2_X4	= 0,
+	XK2_P10	= 1,
 };

 #define NONE 		0
@@ -521,6 +592,7 @@ enum MultiPacketTypes
 	MULTI_TELEMETRY_MLINK			= 15,
 	MULTI_TELEMETRY_CONFIG			= 16,
 	MULTI_TELEMETRY_PROTO			= 17,
+	MULTI_TELEMETRY_RLINK			= 18,
 };

 // Macros
@@ -814,7 +886,11 @@ enum {
 #define FRSKYX2_CLONE_EEPROM_OFFSET	873	// (1) format + (3) TX ID, 4 bytes, end is 877
 #define DSM_RX_EEPROM_OFFSET	877		// (4) TX ID + format, 5 bytes, end is 882
 #define MOULDKG_EEPROM_OFFSET	882		// RX ID, 3 bytes per model, end is 882+64*3=1074
-//#define CONFIG_EEPROM_OFFSET 	1074	// Current configuration of the multimodule
+#define DSM_CLONE_EEPROM_OFFSET	1074	// (4) TX ID, (1) Initialized, end is 1079
+#define TRAXXAS_EEPROM_OFFSET	1079	// RX ID and SOP index, 3 bytes per model id, end is 1079+192=1271
+#define XK2_EEPROM_OFFSET		1271	// RX ID checksum, 1 byte per model, end is 1271+64=1335
+#define JIABAILE_EEPROM_OFFSET	1335	// RX ID, 3 bytes per model, end is 1335+64*3=1527
+//#define CONFIG_EEPROM_OFFSET 	1527	// Current configuration of the multimodule

 /* STM32 Flash Size */
 #ifndef DISABLE_FLASH_SIZE_CHECK
@@ -900,10 +976,9 @@ 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
 				XK			62
 				XN297DUMP	63
 				FRSKYX2		64
@@ -953,6 +1028,10 @@ Serial: 100000 Baud 8e2      _ xxxx xxxx p --
 			DSMX_1F 	2
 			DSMX_2F 	3
 			DSM_AUTO	4
+		sub_protocol==DSM_RX
+			DSM_RX		0
+			DSM_CLONE	1
+			DSM_ERASE	2
 		sub_protocol==YD717
 			YD717		0
 			SKYWLKR		1
@@ -1070,6 +1149,9 @@ Serial: 100000 Baud 8e2      _ xxxx xxxx p --
 			Q100		2
 			Q200		3
 			MR100		4
+			SLT_V1_4CH	5
+			RF_SIM		6
+			SLT6TX		7
 		sub_protocol==E01X
 			E012		0
 			E015		1
@@ -1080,7 +1162,7 @@ Serial: 100000 Baud 8e2      _ xxxx xxxx p --
 			RED_FAST	0
 			RED_SLOW	1
 		sub_protocol==TRAXXAS
-			RX6519		0
+			TQ			0
 		sub_protocol==ESKY150
 			ESKY150_4CH	0
 			ESKY150_7CH	1
@@ -1128,6 +1210,8 @@ Serial: 100000 Baud 8e2      _ xxxx xxxx p --
 			RLINK_SURFACE	0
 			RLINK_AIR		1
 			RLINK_DUMBORC	2
+			RLINK_RC4G		3
+			RLINK_DUMBORC_P	4

   Power value => 0x80	0=High/1=Low
  Stream[3]   = option_protocol;
@@ -1155,6 +1239,7 @@ Serial: 100000 Baud 8e2      _ xxxx xxxx p --
      FrSkyX and FrSkyX2: Stream[27..34] during normal operation unstuffed SPort data to be sent
 	  HoTT: Stream[27] 1 byte for telemetry type
 	  DSM: Stream[27..33] Forward Programming
+	  RadioLink/DumboRC P: Stream[27..35] raw command payload, used to send failsafe and gyro settings
 */
 /*
  Multiprotocol telemetry/command definition for OpenTX and erskyTX
@@ -1276,12 +1361,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
@@ -1305,5 +1390,9 @@ Serial: 100000 Baud 8e2      _ xxxx xxxx p --
   data[n+2]   = number of sub protocols
   data[n+3]   = sub protocols text length, only sent if nbr_sub != 0
   data[n+4..] = sub protocol names, only sent if nbr_sub != 0
-   
+
+  Type 0x12 RadioLink/DumboRC P raw command payload
+   length: variable
+   data[0..] = raw command payload, used to send failsafe and gyro settings
+
 */
--- a/Multiprotocol/Multiprotocol.ino
+++ b/Multiprotocol/Multiprotocol.ino
@@ -104,7 +104,7 @@ uint16_t packet_period;
 uint8_t  packet_count;
 uint8_t  packet_sent;
 uint8_t  packet_length;
-#if defined(HOTT_CC2500_INO) || defined(ESKY150V2_CC2500_INO) || defined(MLINK_CYRF6936_INO)
+#if defined(HOTT_CC2500_INO) || defined(ESKY150V2_CC2500_INO) || defined(MLINK_CYRF6936_INO) || defined(ARES_CC2500_INO)
 	uint8_t  hopping_frequency[78];
 #else
 	uint8_t  hopping_frequency[50];
@@ -130,7 +130,7 @@ uint16_t pps_counter;
 #ifdef CC2500_INSTALLED
 	#ifdef SCANNER_CC2500_INO
 		uint8_t calData[255];
-	#elif defined(HOTT_CC2500_INO) || defined(ESKY150V2_CC2500_INO)
+	#elif defined(HOTT_CC2500_INO) || defined(ESKY150V2_CC2500_INO) || defined(ARES_CC2500_INO)
 		uint8_t calData[75];
 	#else
 		uint8_t calData[50];
@@ -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
@@ -265,6 +265,11 @@ uint8_t packet_in[TELEMETRY_BUFFER_SIZE];//telemetry receiving packets
 		uint8_t CONFIG_SerialRX_val[7];
 		bool CONFIG_SerialRX=false;
 	#endif
+	#ifdef RLINK_HUB_TELEMETRY
+		uint8_t RLINK_SerialRX_val[8];
+		uint8_t RLINK_SerialRX_len=0;
+		bool RLINK_SerialRX=false;
+	#endif
 #endif // TELEMETRY

 uint8_t multi_protocols_index=0xFF;
@@ -630,7 +635,11 @@ void setup()
 				option			=	FORCE_HOTT_TUNING;			// Use config-defined tuning value for HOTT
 			else
 		#endif
-				option			=	(uint8_t)PPM_prot_line->option;	// Use radio-defined option value
+		#if defined(FORCE_ARES_TUNING) && defined(ARES_CC2500_INO)
+			if (protocol==PROTO_ARES)
+				option			=	FORCE_ARES_TUNING;			// Use config-defined tuning value for ARES
+			else
+		#endif				option			=	(uint8_t)PPM_prot_line->option;	// Use radio-defined option value

 		if(PPM_prot_line->power)		POWER_FLAG_on;
 		if(PPM_prot_line->autobind)
@@ -1199,9 +1208,9 @@ static void protocol_init()
 			modules_reset();				

 			uint8_t index=0;
-			#if defined(FRSKYX_CC2500_INO) && defined(EU_MODULE)
-				if( ! ( (protocol == PROTO_FRSKYX || protocol == PROTO_FRSKYX2) && sub_protocol < 2 ) )
-			#endif
+			//#if defined(FRSKYX_CC2500_INO) && defined(MULTI_EU)
+			//	if( ! ( (protocol == PROTO_FRSKYX || protocol == PROTO_FRSKYX2) && sub_protocol < 2 ) )
+			//#endif
 			while(multi_protocols[index].protocol != 0xFF)
 			{
 				if(multi_protocols[index].protocol==protocol)
@@ -1371,6 +1380,11 @@ void update_serial_data()
 		if (protocol==PROTO_HOTT)
 			option=FORCE_HOTT_TUNING;			// Use config-defined tuning value for HOTT
 		else
+	#endif
+	#if defined(FORCE_ARES_TUNING) && defined(ARES_CC2500_INO)
+		if (protocol==PROTO_ARES)
+			option=FORCE_ARES_TUNING;			// Use config-defined tuning value for ARES
+		else
 	#endif
 			option=rx_ok_buff[3];				// Use radio-defined option value

@@ -1577,6 +1591,15 @@ void update_serial_data()
 				CONFIG_SerialRX=true;
 			}
 		#endif
+		#ifdef RLINK_HUB_TELEMETRY
+			if(protocol==PROTO_RLINK && sub_protocol==RLINK_DUMBORC_P
+				&& rx_len>27 && rx_len<=27+sizeof(RLINK_SerialRX_val))
+			{//DumboRC P raw command payload from Lua/multiBuffer bridge
+				RLINK_SerialRX_len=rx_len-27;
+				memcpy(RLINK_SerialRX_val, (const void *)&rx_ok_buff[27], RLINK_SerialRX_len);
+				RLINK_SerialRX=true;
+			}
+		#endif
 	}

 	RX_DONOTUPDATE_off;
--- a/Multiprotocol/NRF24l01_SPI.ino
+++ b/Multiprotocol/NRF24l01_SPI.ino
@@ -183,11 +183,9 @@ void NRF24L01_SetPower()
 		power=NRF_POWER_0;
 	if(prev_power != power)
 	{
-		rf_setup = (rf_setup & 0xF9) | (power << 1);
+		rf_setup = (rf_setup & 0xF8) | (power << 1);
 		if(power==3)
-			rf_setup |=0x01;	// Si24r01 full power, unused bit for NRF
-		else
-			rf_setup &=0xFE;
+			rf_setup |= 0x01;	// Si24r01 full power, unused bit for NRF
 		NRF24L01_WriteReg(NRF24L01_06_RF_SETUP, rf_setup);
 		prev_power=power;
 	}
@@ -246,112 +244,6 @@ uint8_t NRF24L01_packet_ack()
 	return PKT_PENDING;
 }

-//
-// HS6200 emulation layer
-///////////////////////////
-static uint8_t hs6200_crc;
-static uint16_t hs6200_crc_init;
-static uint8_t hs6200_tx_addr[5];
-static uint8_t hs6200_address_length;
-
-static const uint8_t hs6200_scramble[] = {
-	0x80,0xf5,0x3b,0x0d,0x6d,0x2a,0xf9,0xbc,
-	0x51,0x8e,0x4c,0xfd,0xc1,0x65,0xd0 }; // todo: find all 32 bytes ...
-
-void HS6200_SetTXAddr(const uint8_t* addr, uint8_t len)
-{
-	if(len < 4)
-		len = 4;
-	else if(len > 5)
-		len = 5;
-
-	// use nrf24 address field as a longer preamble
-	if(addr[len-1] & 0x80)
-		NRF24L01_WriteRegisterMulti(NRF24L01_10_TX_ADDR, (uint8_t*)"\x55\x55\x55\x55\x55", 5);
-	else
-		NRF24L01_WriteRegisterMulti(NRF24L01_10_TX_ADDR, (uint8_t*)"\xaa\xaa\xaa\xaa\xaa", 5);
-
-	// precompute address crc
-	crc = 0xffff;
-	for(int i=0; i<len; i++)
-		crc16_update(addr[len-1-i], 8);
-	hs6200_crc_init=crc;
-	memcpy(hs6200_tx_addr, addr, len);
-	hs6200_address_length = len;
-}
-
-static uint16_t hs6200_calc_crc(uint8_t* msg, uint8_t len)
-{
-    uint8_t pos;
-    
-	crc = hs6200_crc_init;
-    // pcf + payload
-    for(pos=0; pos < len-1; pos++)
-        crc16_update(msg[pos], 8);
-    // last byte (1 bit only)
-    if(len > 0)
-        crc16_update(msg[pos+1], 1);
-    return crc;
-}
-
-void HS6200_Configure(uint8_t flags)
-{
-	hs6200_crc = !!(flags & _BV(NRF24L01_00_EN_CRC));
-	flags &= ~(_BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO));
-	NRF24L01_WriteReg(NRF24L01_00_CONFIG, flags & 0xff);      
-}
-
-void HS6200_WritePayload(uint8_t* msg, uint8_t len)
-{
-	uint8_t payload[32];
-	const uint8_t no_ack = 1; // never ask for an ack
-	static uint8_t pid;
-	uint8_t pos = 0;
-
-	if(len > sizeof(hs6200_scramble))
-		len = sizeof(hs6200_scramble);
-
-	// address
-	for(int i=hs6200_address_length-1; i>=0; i--)
-		payload[pos++] = hs6200_tx_addr[i];
-
-	// guard bytes
-	payload[pos++] = hs6200_tx_addr[0];
-	payload[pos++] = hs6200_tx_addr[0];
-
-	// packet control field
-	payload[pos++] = ((len & 0x3f) << 2) | (pid & 0x03);
-	payload[pos] = (no_ack & 0x01) << 7;
-	pid++;
-
-	// scrambled payload
-	if(len > 0)
-	{
-		payload[pos++] |= (msg[0] ^ hs6200_scramble[0]) >> 1; 
-		for(uint8_t i=1; i<len; i++)
-			payload[pos++] = ((msg[i-1] ^ hs6200_scramble[i-1]) << 7) | ((msg[i] ^ hs6200_scramble[i]) >> 1);
-		payload[pos] = (msg[len-1] ^ hs6200_scramble[len-1]) << 7; 
-	}
-
-	// crc
-	if(hs6200_crc)
-	{
-		uint16_t crc = hs6200_calc_crc(&payload[hs6200_address_length+2], len+2);
-		uint8_t hcrc = crc >> 8;
-		uint8_t lcrc = crc & 0xff;
-		payload[pos++] |= (hcrc >> 1);
-		payload[pos++] = (hcrc << 7) | (lcrc >> 1);
-		payload[pos++] = lcrc << 7;
-	}
-
-	NRF24L01_WritePayload(payload, pos);
-	delayMicroseconds(option+20);
-	NRF24L01_WritePayload(payload, pos);
-}
-//
-// End of HS6200 emulation
-////////////////////////////
-
 ///////////////
 // LT8900 emulation layer
 uint8_t LT8900_buffer[64];
--- a/Multiprotocol/NRF250K_EMU.ino
+++ b/Multiprotocol/NRF250K_EMU.ino
@@ -16,13 +16,25 @@

 #include "iface_nrf250k.h"

+#if defined(CC2500_INSTALLED) && defined(NRF24L01_INSTALLED)
+	extern bool xn297_rf;
+#endif
+
 uint8_t cc2500_nrf_tx_addr[5], cc2500_nrf_addr_len;

 static void __attribute__((unused)) NRF250K_SetTXAddr(uint8_t* addr, uint8_t len)
 {
 	if (len > 5) len = 5;
 	if (len < 3) len = 3;
-	#if defined(CC2500_INSTALLED)
+	#if defined(CC2500_INSTALLED) && defined(NRF24L01_INSTALLED)
+		cc2500_nrf_addr_len = len;
+		memcpy(cc2500_nrf_tx_addr, addr, len);
+		if(xn297_rf == XN297_NRF)
+		{
+			NRF24L01_WriteReg(NRF24L01_03_SETUP_AW, len-2);
+			NRF24L01_WriteRegisterMulti(NRF24L01_10_TX_ADDR, addr, len);
+		}
+	#elif defined(CC2500_INSTALLED)
 		cc2500_nrf_addr_len = len;
 		memcpy(cc2500_nrf_tx_addr, addr, len);
 	#elif defined(NRF24L01_INSTALLED)
@@ -33,6 +45,22 @@ static void __attribute__((unused)) NRF250K_SetTXAddr(uint8_t* addr, uint8_t len

 static void __attribute__((unused)) NRF250K_WritePayload(uint8_t* msg, uint8_t len)
 {
+	#if defined(NRF24L01_INSTALLED)
+		#if defined(CC2500_INSTALLED)
+			if(xn297_rf == XN297_NRF)
+		#endif
+		{
+			if(len<=32)
+			{
+				NRF24L01_FlushTx();
+				NRF24L01_WriteReg(NRF24L01_07_STATUS, _BV(NRF24L01_07_TX_DS) | _BV(NRF24L01_07_RX_DR) | _BV(NRF24L01_07_MAX_RT));
+				NRF24L01_WritePayload(msg, len);
+			}
+			#if defined(CC2500_INSTALLED)
+				return;
+			#endif
+		}
+	#endif
 	#if defined(CC2500_INSTALLED)
 		#if defined(ESKY150V2_CC2500_INO)
 			uint8_t buf[158];
@@ -106,13 +134,6 @@ static void __attribute__((unused)) NRF250K_WritePayload(uint8_t* msg, uint8_t l
 			CC2500_WriteRegisterMulti(CC2500_3F_TXFIFO, buff, last);
 			CC2500_Strobe(CC2500_STX);
 		}
-	#elif defined(NRF24L01_INSTALLED)
-		if(len<=32)
-		{
-			NRF24L01_FlushTx();
-			NRF24L01_WriteReg(NRF24L01_07_STATUS, _BV(NRF24L01_07_TX_DS) | _BV(NRF24L01_07_RX_DR) | _BV(NRF24L01_07_MAX_RT));
-			NRF24L01_WritePayload(msg, len);
-		}
 	#endif
 }

--- a/Multiprotocol/Pelikan_a7105.ino
+++ b/Multiprotocol/Pelikan_a7105.ino
@@ -22,7 +22,7 @@
 //#define PELIKAN_LITE_FORCE_ID
 #define PELIKAN_LITE_FORCE_HOP				// hop sequence creation is unknown
 //#define PELIKAN_SCX24_FORCE_ID
-#define PELIKAN_SCX24_FORCE_HOP				// hop sequence creation is unknown
+//#define PELIKAN_SCX24_FORCE_HOP				// hop sequence creation is unknown

 #define PELIKAN_BIND_COUNT		400			// 3sec
 #define PELIKAN_BIND_RF			0x3C
@@ -30,6 +30,7 @@
 #define PELIKAN_PACKET_PERIOD	7980
 #define PELIKAN_LITE_PACKET_PERIOD 18000
 #define PELIKAN_SCX24_PACKET_PERIOD 15069
+#define PELIKAN_SCX_HOP_LIMIT 90

 static void __attribute__((unused)) pelikan_build_packet()
 {
@@ -37,9 +38,11 @@ static void __attribute__((unused)) pelikan_build_packet()
 	uint8_t sum;
 	uint16_t channel;

+	#ifndef MULTI_AIR
 	if(sub_protocol == PELIKAN_SCX24)
 		packet[0] = 0x11;
 	else //PELIKAN_PRO & PELIKAN_LITE
+	#endif
 		packet[0] = 0x15;
    if(IS_BIND_IN_PROGRESS)
 	{
@@ -48,6 +51,7 @@ static void __attribute__((unused)) pelikan_build_packet()
 		packet[4] = rx_tx_addr[2];
 		packet[5] = rx_tx_addr[3];

+		#ifndef MULTI_AIR
 		if(sub_protocol == PELIKAN_SCX24)
 		{
 			packet[1] = 0x65;				//??
@@ -55,6 +59,7 @@ static void __attribute__((unused)) pelikan_build_packet()
 			packet[7] = 0xAA;				//??
 		}
 		else
+		#endif
 		{//PELIKAN_PRO & PELIKAN_LITE
 			packet[1] = 0x04;				//version??
 			if(sub_protocol==PELIKAN_PRO)
@@ -70,6 +75,7 @@ static void __attribute__((unused)) pelikan_build_packet()
 	{
 		//ID
 		packet[1]  = rx_tx_addr[0];
+		#ifndef MULTI_AIR
 		if(sub_protocol == PELIKAN_SCX24)
 		{
 			//ID
@@ -95,6 +101,7 @@ static void __attribute__((unused)) pelikan_build_packet()
 			packet_length = 14;
 		}
 		else
+		#endif
 		{//PELIKAN_PRO & PELIKAN_LITE
 			//ID
 			packet[7]  = rx_tx_addr[1];
@@ -158,6 +165,13 @@ static void __attribute__((unused)) pelikan_build_packet()

 uint16_t PELIKAN_callback()
 {
+	#ifdef MULTI_AIR
+		if(sub_protocol == PELIKAN_SCX24)
+		{
+			SUB_PROTO_INVALID;
+			return 10000;
+		}
+	#endif
 	if(phase==0)
 	{
 		#ifndef FORCE_PELIKAN_TUNING
@@ -172,10 +186,12 @@ uint16_t PELIKAN_callback()
 				A7105_Strobe(A7105_STANDBY);
 				if(sub_protocol==PELIKAN_PRO)
 					A7105_WriteReg(A7105_03_FIFOI,0x28); //????
-				else if(sub_protocol==PELIKAN_SCX24)
-					A7105_WriteReg(A7105_03_FIFOI,0x0D);
-				else//PELIKAN_LITE
+				else if(sub_protocol==PELIKAN_LITE)
 					A7105_WriteID(MProtocol_id);
+				#ifndef MULTI_AIR
+				else // PELIKAN_SCX24
+					A7105_WriteReg(A7105_03_FIFOI,0x0D);
+				#endif
 			}
 		}
 		#ifdef MULTI_SYNC
@@ -216,6 +232,82 @@ static uint8_t pelikan_firstCh(uint8_t u, uint8_t l)
 	return 0;
 }

+static uint8_t pelikan_firstCh_scx(uint8_t i, uint8_t j)
+{
+	uint8_t ch;
+	switch (j) {
+		case 0:
+			ch = 30;
+			break;
+		case 1:
+		case 2:
+			ch = (i * 4) + 42;
+			break;
+		case 3:
+			ch = (i * 2) + 36;
+			break;
+		case 4:
+			ch = (i * 8) + 54;
+			break;
+		case 5:
+			ch = 30;
+			break;
+	}
+
+	if (ch > PELIKAN_SCX_HOP_LIMIT)
+	{
+		do
+		{
+			ch -= 62;
+		} while (ch > PELIKAN_SCX_HOP_LIMIT);
+	}
+
+	switch (ch) {
+		case 48:
+			if (j == 3)
+				ch += 18;
+			else if (j == 4)
+				ch += 20;
+			else
+				ch += 40;
+			break;
+		case 40:
+			if (j == 4)
+				ch += 18;
+			break;
+		case 52:
+			if (j < 3)
+				ch -= 20;
+			else if (j == 4)
+				ch -= 10;
+			break;
+		case 66:
+			if  (j < 3)
+				ch += 18;
+			else if (j == 4)
+				ch -= 22;
+			break;
+		case 72:
+			if (j < 3)
+				ch -= 10;
+			else if (j ==3)
+				ch -= 20;
+			else if (j == 4)
+				ch -= 36;
+			break;
+		case 74:
+			if (j == 4)
+				ch -= 20;
+			break;
+		case 86:
+			if (j == 4)
+				ch -= 48;
+			break;
+	}
+
+	return ch;
+}
+
 static uint8_t pelikan_adjust_value(uint8_t value, uint8_t addition, uint8_t limit)
 {
 	uint8_t i;
@@ -234,6 +326,10 @@ static uint8_t pelikan_adjust_value(uint8_t value, uint8_t addition, uint8_t lim
 			value += addition;
 			i++;
 		}
+		if (value == 72) {
+			value += addition;
+			i++;
+		}
 	}
 	while (i > 0);

@@ -278,6 +374,121 @@ static void __attribute__((unused)) pelikan_init_hop()
 	debugln("");
 }

+#ifndef MULTI_AIR
+
+const uint8_t PROGMEM scx_ch_map[4][PELIKAN_NUM_RF_CHAN] = 
+	{
+		{0,1,2,26,27,28,23,24,25,20,21,22,17,18,19,14,15,16,11,12,13,8,9,10,5,6,7,4,3},
+		{0,1,2,28,25,26,27,24,21,22,23,20,17,18,19,16,13,14,15,12,9,10,11,8,5,6,7,3,4},
+		{0,1,27,28,25,26,23,24,21,22,19,20,17,18,15,16,13,14,11,12,9,10,7,8,5,6,3,4,2},
+		{0,1,28,1,4,2,23,26,22,24,27,25,17,20,16,18,21,19,11,14,10,12,15,13,27,8,6,7,9}
+	};
+
+static void pelikan_shuffle(uint8_t j)
+{
+	uint8_t temp[PELIKAN_NUM_RF_CHAN];
+	for (uint8_t i = 0; i < PELIKAN_NUM_RF_CHAN; i++)
+		temp[i] = hopping_frequency[pgm_read_byte_near(&scx_ch_map[j-1][i])];
+
+	for (uint8_t i = 0; i < PELIKAN_NUM_RF_CHAN; i++)
+		hopping_frequency[i] = temp[i];
+}
+
+static void __attribute__((unused)) pelikan_init_hop_scx()
+{
+	rx_tx_addr[0] = 0x10;
+	rx_tx_addr[1] = (rx_tx_addr[1] + RX_num) % 192;
+	debugln("TX[0]: %02X TX[1]: %02X", rx_tx_addr[0], rx_tx_addr[1]);
+	
+	uint8_t high = (rx_tx_addr[1]>>4);
+	uint8_t low = rx_tx_addr[1] & 0x0F;
+	int16_t i = (high * 10) + low - 23;
+	uint8_t j = 0;
+
+	if (i > 0)
+		j = 1;
+	
+	if (i > 24)
+	{
+		do
+		{
+			i -= 24;
+			j++;
+		} while (i > 24);
+	}
+
+	debugln("H: %02X L: %02X I: %02X J: %02X", high, low, i, j);
+
+	uint8_t first_channel;
+	uint8_t last_channel;
+	uint8_t addition;
+
+	first_channel = pelikan_firstCh_scx(i, j);
+
+	if (j == 0)
+		last_channel = 42 - (high * 10) - low;
+	else
+		last_channel = 42 - i + 1;
+
+	if (last_channel == 24)
+		last_channel += 9;
+	
+	if (last_channel == 36)
+		last_channel -= 10;
+
+	if (j == 0)
+		addition = (2 * i) + 54;
+	else if (j == 5)
+		addition = (2 * i) + 6;
+	else
+		addition = 56 - (2 * i);
+
+	hopping_frequency[0] = first_channel;
+	for (uint8_t i = 1; i < PELIKAN_NUM_RF_CHAN; i++)
+	{
+		hopping_frequency[i] = pelikan_add(hopping_frequency[i-1], addition, PELIKAN_SCX_HOP_LIMIT);
+	}
+
+	if (j > 0 && j < 5)
+		pelikan_shuffle(j);
+
+	if (j == 2)
+	{
+		hopping_frequency[PELIKAN_NUM_RF_CHAN - 2] = last_channel;
+	} else if (j == 4)
+	{
+		uint8_t t = (2 * i) + 36;
+		if (t == 48)
+			t += 18;
+		if (t == 72)
+			t -= 20;
+
+		hopping_frequency[1] = t;
+		hopping_frequency[PELIKAN_NUM_RF_CHAN - 5] = last_channel;
+	}	
+	else
+	{
+		hopping_frequency[PELIKAN_NUM_RF_CHAN - 1] = last_channel;
+	}
+
+	#ifdef DEBUG_SERIAL
+		for (uint8_t i = 0; i < PELIKAN_NUM_RF_CHAN; i++)
+			debug("%02X ", hopping_frequency[i]);
+		debugln("");
+	#endif
+}
+
+#ifdef PELIKAN_SCX24_FORCE_HOP
+const uint8_t PROGMEM pelikan_scx24_hopp[][PELIKAN_NUM_RF_CHAN] = {
+/*TX1*/	{ 0x1E,0x32,0x46,0x5A,0x44,0x58,0x2E,0x42,0x56,0x2C,0x40,0x54,0x2A,0x3E,0x52,0x28,0x3C,0x50,0x26,0x3A,0x4E,0x24,0x38,0x4C,0x22,0x36,0x4A,0x20,0x1A },
+/*TX2*/	{ 0x2C,0x44,0x1E,0x52,0x56,0x22,0x3A,0x3E,0x34,0x4C,0x26,0x5A,0x50,0x2A,0x42,0x38,0x2E,0x46,0x20,0x54,0x4A,0x24,0x3C,0x32,0x28,0x40,0x58,0x1B,0x4E },
+/*TX3*/	{ 0x3C,0x4C,0x1E,0x4A,0x5A,0x2C,0x58,0x2A,0x3A,0x56,0x28,0x38,0x26,0x36,0x46,0x34,0x44,0x54,0x42,0x52,0x24,0x50,0x22,0x32,0x4E,0x20,0x40,0x3E,0x17 },
+/*TX4*/	{ 0x46,0x32,0x1E,0x58,0x44,0x5A,0x56,0x42,0x2E,0x54,0x40,0x2C,0x52,0x3E,0x2A,0x50,0x3C,0x28,0x4E,0x3A,0x26,0x4C,0x38,0x24,0x4A,0x36,0x22,0x20,0x1A }
+};
+#endif //PELIKAN_SCX24_FORCE_HOP
+
+#endif //MULTI_AIR
+
 #ifdef PELIKAN_FORCE_ID
 const uint8_t PROGMEM pelikan_hopp[][PELIKAN_NUM_RF_CHAN] = {
 	{ 0x5A,0x46,0x32,0x6E,0x6C,0x58,0x44,0x42,0x40,0x6A,0x56,0x54,0x52,0x3E,0x68,0x66,0x64,0x50,0x3C,0x3A,0x38,0x62,0x4E,0x4C,0x5E,0x4A,0x36,0x5C,0x34 }
@@ -289,12 +500,6 @@ const uint8_t PROGMEM pelikan_lite_hopp[][PELIKAN_NUM_RF_CHAN] = {
 	{ 0x46,0x2A,0x3E,0x5A,0x5C,0x24,0x4E,0x32,0x54,0x26,0x2C,0x34,0x56,0x1E,0x3A,0x3C,0x50,0x4A,0x2E,0x42,0x20,0x52,0x28,0x22,0x44,0x58,0x36,0x38,0x4C }
 };
 #endif
-#ifdef PELIKAN_SCX24_FORCE_HOP
-const uint8_t PROGMEM pelikan_scx24_hopp[][PELIKAN_NUM_RF_CHAN] = {
-	{ 0x1E,0x32,0x46,0x5A,0x44,0x58,0x2E,0x42,0x56,0x2C,0x40,0x54,0x2A,0x3E,0x52,0x28,0x3C,0x50,0x26,0x3A,0x4E,0x24,0x38,0x4C,0x22,0x36,0x4A,0x20,0x1A },
-	{ 0x2C,0x44,0x1E,0x52,0x56,0x22,0x3A,0x3E,0x34,0x4C,0x26,0x5A,0x50,0x2A,0x42,0x38,0x2E,0x46,0x20,0x54,0x4A,0x24,0x3C,0x32,0x28,0x40,0x58,0x1B,0x4E }
-};
-#endif

 void PELIKAN_init()
 {
@@ -341,22 +546,32 @@ void PELIKAN_init()
 				A7105_WriteID(MProtocol_id);
 			packet_period = PELIKAN_LITE_PACKET_PERIOD;
 		}
+		#ifndef MULTI_AIR
 		else// if(sub_protocol==PELIKAN_SCX24)
 		{
+			pelikan_init_hop_scx();
 			#if defined(PELIKAN_SCX24_FORCE_HOP)
 				// Hop frequency table
-				uint8_t num=rx_tx_addr[3] & 0x01;
-				if(num)
-				{//1
-					rx_tx_addr[0]=0x10;		// hopping freq TX2
-					rx_tx_addr[1]=0x63;		// hopping freq TX2
+				uint8_t num=rx_tx_addr[3] & 0x03;
+				switch(num)
+				{
+					case 1:
+						rx_tx_addr[0]=0x10;		// hopping freq TX2
+						rx_tx_addr[1]=0x63;		// hopping freq TX2
+						break;
+					case 2:
+						rx_tx_addr[0]=0x81;		// hopping freq TX3
+						rx_tx_addr[1]=0x63;		// hopping freq TX3
+						break;
+					case 3:
+						rx_tx_addr[0]=0x36;		// hopping freq TX4
+						rx_tx_addr[1]=0x5C;		// hopping freq TX4
+						break;
+					default:
+						rx_tx_addr[0]=0x12;		// hopping freq TX1
+						rx_tx_addr[1]=0x46;		// hopping freq TX1
+						break;
 				}
-				else
-				{//0
-					rx_tx_addr[0]=0x12;		// hopping freq TX1
-					rx_tx_addr[1]=0x46;		// hopping freq TX1
-				}
-
 				for(uint8_t i=0;i<PELIKAN_NUM_RF_CHAN;i++)
 					hopping_frequency[i]=pgm_read_byte_near(&pelikan_scx24_hopp[num][i]);
 			#endif
@@ -366,12 +581,17 @@ void PELIKAN_init()
 				rx_tx_addr[3]=0x19;			// TX1
 				rx_tx_addr[2]=0x80;			// TX2
 				rx_tx_addr[3]=0x22;			// TX2
+				rx_tx_addr[2]=0x30;			// TX3
+				rx_tx_addr[3]=0x18;			// TX3
+				rx_tx_addr[2]=0x30;			// TX4
+				rx_tx_addr[3]=0x17;			// TX4
 			#endif
 			A7105_WriteReg(A7105_0E_DATA_RATE,0x03);
 			if(IS_BIND_DONE)
 				A7105_WriteReg(A7105_03_FIFOI,0x0D);
 			packet_period = PELIKAN_SCX24_PACKET_PERIOD;
 		}
+		#endif //MULTI_AIR
 	}

 	hopping_frequency_no = PELIKAN_NUM_RF_CHAN;
--- a/Multiprotocol/Propel_nrf24l01.ino
+++ b/Multiprotocol/Propel_nrf24l01.ino
@@ -250,11 +250,16 @@ uint16_t PROPEL_callback()
 				if (_BV(NRF24L01_07_RX_DR) & NRF24L01_ReadReg(NRF24L01_07_STATUS))
 				{// data received from the model
 					NRF24L01_ReadPayload(packet_in, PROPEL_PACKET_SIZE);
+					#if 1
+						for(uint8_t i=0; i<PROPEL_PACKET_SIZE; i++)
+							debug("%02X ",packet_in[i]);
+						debugln("");
+					#endif
 					if (packet_in[0] == 0xa3 && memcmp(&packet_in[1],rx_id,3)==0)
 					{
 						telemetry_counter++;	//LQI
-						v_lipo1=packet[5];		//number of life left?
-						v_lipo2=packet[4];		//bit mask: 0x80=flying, 0x08=taking off, 0x04=landing, 0x00=landed/crashed
+						v_lipo1=packet_in[5];	//number of life left?
+						v_lipo2=packet_in[4];	//bit mask: 0x80=flying, 0x08=taking off, 0x04=landing, 0x00=landed/crashed
 						if(telemetry_lost==0)
 							telemetry_link=1;
 					}
--- a/Multiprotocol/REALACC_nrf24l01.ino
+++ b/Multiprotocol/REALACC_nrf24l01.ino
@@ -18,7 +18,8 @@ Multiprotocol is distributed in the hope that it will be useful,

 #include "iface_xn297.h"

-#define FORCE_REALACC_ORIGINAL_ID
+//#define FORCE_REALACC_ORIGINAL_ID
+//#define FORCE_REALACC_WLV8TX_ID

 #define REALACC_INITIAL_WAIT		500
 #define REALACC_PACKET_PERIOD		2268
@@ -28,29 +29,66 @@ Multiprotocol is distributed in the hope that it will be useful,
 #define REALACC_BIND_COUNT			50
 #define REALACC_RF_NUM_CHANNELS		5

+#ifndef MULTI_AIR
+#define WLV8TX_PACKET_PERIOD		16279
+#define WLV8TX_BIND2_PAYLOAD_SIZE	12
+#define WLV8TX_RX_PAYLOAD_SIZE		6
+
+enum
+{
+	REALACC_WLV8TX_BIND_TX = 0,
+	REALACC_WLV8TX_BIND_RX_SETUP,
+	REALACC_WLV8TX_BIND_RX_CHECK,
+	REALACC_WLV8TX_DATA
+};
+
+#endif
+static uint8_t realacc_bind_packet[REALACC_BIND_PAYLOAD_SIZE];
+
 static void __attribute__((unused)) REALACC_send_packet()
 {
-	packet[ 0]= 0xDC;
-	packet[ 1]= convert_channel_8b(AILERON);	// 00..80..FF
-	packet[ 2]= convert_channel_8b(ELEVATOR);	// 00..80..FF
-	packet[ 3]= convert_channel_8b(THROTTLE);	// 00..FF
-	packet[ 4]= convert_channel_8b(RUDDER);		// 00..80..FF
-	packet[ 5]= 0x20; 							// Trim
-	packet[ 6]= 0x20; 							// Trim
-	packet[ 7]= 0x20; 							// Trim
-	packet[ 8]= 0x20; 							// Trim
-	packet[ 9]= num_ch;							// Change at each power up
-	packet[10]= 0x04 							// Flag1
-		| 0x02									//   Rate1=0, Rate2=1, Rate3=2
-		| GET_FLAG(CH8_SW, 0x20);				//   Headless
-	packet[11]= 0x00 							// Flag2
-		| GET_FLAG(CH7_SW, 0x01)				//   Calib
-		| GET_FLAG(CH9_SW, 0x20)				//   Return
-		| GET_FLAG(CH10_SW,0x80);				//   Unknown
-	packet[12]= 0x00 							// Flag3
-		| GET_FLAG(CH5_SW, 0x01)				//   Flip
-		| GET_FLAG(CH6_SW, 0x80);				//   Light
-
+	#ifndef MULTI_AIR
+	if(sub_protocol == REALACC_WLV8TX)
+	{
+		packet[ 0]= 0xDC;										// DC
+		packet[ 1]= 0x80;										// not used
+		packet[ 2]= 0x80;										// not used
+		packet[ 3]= convert_channel_16b_limit(CH2,0x0F,0xF1);	// Throttle 0F..80..F7 (spring center)
+		packet[ 4]= convert_channel_16b_limit(CH1,0xE7,0x19);	// Steering E7..80..1F (reversed)
+		packet[ 5]=(convert_channel_8b(CH3) >> 2);				// GY Trim (Rate)    02..20..3D
+		packet[ 6]= 0x20; 										// Constant?
+		packet[ 7]= (convert_channel_8b(CH4) >> 2);				// TH Trim (Rate)    02..20..3D
+		packet[ 8]=((convert_channel_8b(CH5) >> 2) ^ 0x3F);		// ST Trim (R..C..L) 3F..20..01 (reversed)
+		packet[ 9]= 0x77;										// Change at each power up? 07 0D 25 50 77 82 89 A5 E4
+		packet[10]= 0x0C;										// WL-V8Tx: fixed value = 0C
+		packet[11]= 0x00;										// Constant?
+		packet[12]= 0x00;										// Constant?
+	}
+	else
+	#endif
+	{
+		packet[ 0]= 0xDC;							// DC/D6/DE
+		packet[ 1]= convert_channel_8b(AILERON);	// 00..80..FF
+		packet[ 2]= convert_channel_8b(ELEVATOR);	// 00..80..FF
+		packet[ 3]= convert_channel_8b(THROTTLE);	// 00..FF
+		packet[ 4]= convert_channel_8b(RUDDER);		// 00..80..FF
+		packet[ 5]= 0x20; 							// Trim
+		packet[ 6]= 0x20; 							// Trim
+		packet[ 7]= 0x20; 							// Trim
+		packet[ 8]= 0x20; 							// Trim
+		packet[ 9]= 0x88;							// Change at each power up: C5 A2 77 F0 84 58, fixed for the E017 = 88
+		packet[10]= 0x04 							// Flag1: R11=04, E017=0C
+			| 0x02									//   Rate1=0, Rate2=1, Rate3=2
+			| GET_FLAG(CH8_SW, 0x20);				//   Headless
+		packet[11]= 0x00 							// Flag2
+			| GET_FLAG(CH7_SW, 0x01)				//   Calib
+			| GET_FLAG(CH9_SW, 0x20)				//   Return
+			| GET_FLAG(CH10_SW,0x80);				//   Throttle cut
+		packet[12]= 0x00 							// Flag3
+			| GET_FLAG(CH5_SW, 0x01)				//   Flip
+			| GET_FLAG(CH11_SW,0x02)				//   Rotating
+			| GET_FLAG(CH6_SW, 0x80);				//   Light
+	}
 	XN297_Hopping(hopping_frequency_no);
 	hopping_frequency_no++;
 	hopping_frequency_no %= REALACC_RF_NUM_CHANNELS;
@@ -59,30 +97,75 @@ static void __attribute__((unused)) REALACC_send_packet()

 static void __attribute__((unused)) REALACC_send_bind_packet()
 {
-	packet[0] = 0xB1;
-	memcpy(&packet[1],rx_tx_addr,4);
-	memcpy(&packet[5],hopping_frequency,5);
-
-	XN297_WriteEnhancedPayload(packet, REALACC_BIND_PAYLOAD_SIZE,1);
+	#ifndef MULTI_AIR
+	if(sub_protocol == REALACC_WLV8TX && rx_id[0])
+	{ // WLV8TX bind sent after RX packet B3 acknowledged
+		packet[0] = 0xB4;
+		packet[1] = rx_id[1];
+		packet[2] = rx_id[2];
+		memcpy(&packet[3], realacc_bind_packet, 4);	// Original TX ID before XOR
+		memcpy(&packet[7], hopping_frequency, 5);	// RF frequencies
+		XN297_WriteEnhancedPayload(packet, WLV8TX_BIND2_PAYLOAD_SIZE,1);
+	}
+	else
+	#endif
+	{ // initial bind sent for all models
+		packet[0] = 0xB1;							// B0/B1
+		memcpy(&packet[1],realacc_bind_packet,4);	// Address
+		memcpy(&packet[5],hopping_frequency,5);		// RF frequencies
+		XN297_WriteEnhancedPayload(packet, REALACC_BIND_PAYLOAD_SIZE,1);
+	}
 }

 static void __attribute__((unused)) REALACC_initialize_txid()
 {
+	rx_tx_addr[3] &= 0x3F;
 	calc_fh_channels(REALACC_RF_NUM_CHANNELS);
-	num_ch=random(0xfefefefe);		// 00..FF
-
 	#ifdef FORCE_REALACC_ORIGINAL_ID
-		//Dump
-		rx_tx_addr[0]=0x99;
-		rx_tx_addr[1]=0x06;
-		rx_tx_addr[2]=0x00;
-		rx_tx_addr[3]=0x00;
-		hopping_frequency[0]=0x55;
-		hopping_frequency[1]=0x59;
-		hopping_frequency[2]=0x5A;
-		hopping_frequency[3]=0x5A;
-		hopping_frequency[4]=0x62;
-		num_ch=0xC5;				// Value in dumps: C5 A2 77 F0 84 58
+		if(RX_num==0)
+		{//TX1
+			rx_tx_addr[0]=0x99;
+			rx_tx_addr[1]=0x06;
+			rx_tx_addr[2]=0x00;
+			rx_tx_addr[3]=0x00;	// 00..3F:OK, 40..:NOK
+			hopping_frequency[0]=0x55;
+			hopping_frequency[1]=0x59;
+			hopping_frequency[2]=0x5A;
+			hopping_frequency[3]=0x5A;
+			hopping_frequency[4]=0x62;
+		}
+		else
+		{//TX2
+			rx_tx_addr[0]=0x4F;
+			rx_tx_addr[1]=0xB9;
+			rx_tx_addr[2]=0xA1;
+			rx_tx_addr[3]=0x17;
+			hopping_frequency[0]=0x45;
+			hopping_frequency[1]=0x38;
+			hopping_frequency[2]=0x3C;
+			hopping_frequency[3]=0x41;
+			hopping_frequency[4]=0x3F;
+		}
+	#endif
+	#ifdef FORCE_REALACC_WLV8TX_ID
+	{
+		rx_tx_addr[0]=0x32;
+		rx_tx_addr[1]=0xE9;
+		rx_tx_addr[2]=0xDE;
+		rx_tx_addr[3]=0x0A;
+		hopping_frequency[0]=0x45;
+		hopping_frequency[1]=0x42;
+		hopping_frequency[2]=0x38;
+		hopping_frequency[3]=0x3C;
+		hopping_frequency[4]=0x4A;
+	}
+	#endif
+	memcpy(realacc_bind_packet, rx_tx_addr, 4);
+	#if 0
+		debug("ID: %02X %02X %02X %02X, C: ",rx_tx_addr[0],rx_tx_addr[1],rx_tx_addr[2],rx_tx_addr[3]);
+		for(uint8_t i=0; i<REALACC_RF_NUM_CHANNELS; i++)
+			debug(" %02X",hopping_frequency[i]);
+		debugln("");
 	#endif
 }

@@ -93,12 +176,82 @@ static void __attribute__((unused)) REALACC_RF_init()
 	XN297_RFChannel(REALACC_BIND_RF_CHANNEL);	// Set bind channel
 }

+#ifndef MULTI_AIR
+static void __attribute__((unused)) REALACC_wlv8tx_process_rx()
+{
+	if(!XN297_IsRX())
+		return;
+	uint8_t len = XN297_ReadEnhancedPayload(packet_in, WLV8TX_RX_PAYLOAD_SIZE);
+	if(len != 3)
+		return;
+
+	if(packet_in[0] == 0xB3 && !rx_id[0])
+	{
+		rx_id[0] = 0x01;
+		rx_id[1] = packet_in[1];
+		rx_id[2] = packet_in[2];
+		rx_tx_addr[2] ^= packet_in[1];
+		rx_tx_addr[3] ^= packet_in[2];
+		rx_tx_addr[3] |= 0x80;
+	}
+	else if(packet_in[0] == 0xB5 && rx_id[0])
+	{
+		BIND_DONE;
+		XN297_SetTXAddr(rx_tx_addr, 4);
+		XN297_SetTxRxMode(TXRX_OFF);
+		bind_phase = REALACC_WLV8TX_DATA;
+	}
+}
+#endif
+
 uint16_t REALACC_callback()
 {
 	#ifdef MULTI_SYNC
 		telemetry_set_input_sync(REALACC_PACKET_PERIOD);
 	#endif
 	XN297_SetPower();
+
+	#ifdef MULTI_AIR
+		if(sub_protocol == REALACC_WLV8TX)
+		{
+			SUB_PROTO_INVALID;
+			return 10000;
+		}
+	#else
+	if(sub_protocol == REALACC_WLV8TX)
+	{
+		if(bind_phase == REALACC_WLV8TX_DATA)
+		{
+			XN297_SetTxRxMode(TX_EN);
+			REALACC_send_packet();
+			return WLV8TX_PACKET_PERIOD;
+		}
+
+		if(bind_phase == REALACC_WLV8TX_BIND_RX_SETUP)
+		{
+			XN297_SetTxRxMode(TXRX_OFF);
+			XN297_SetTxRxMode(RX_EN);
+			bind_phase = REALACC_WLV8TX_BIND_RX_CHECK;
+			return WLV8TX_PACKET_PERIOD/3;
+		}
+
+		if(bind_phase == REALACC_WLV8TX_BIND_RX_CHECK)
+		{
+			REALACC_wlv8tx_process_rx();
+			if(bind_phase == REALACC_WLV8TX_DATA)
+				return WLV8TX_PACKET_PERIOD;
+			bind_phase = REALACC_WLV8TX_BIND_TX;
+			return WLV8TX_PACKET_PERIOD/3;
+		}
+		//Bind Phase
+		XN297_SetTxRxMode(TXRX_OFF);
+		XN297_SetTxRxMode(TX_EN);
+		REALACC_send_bind_packet();
+		bind_phase = REALACC_WLV8TX_BIND_RX_SETUP;
+		return WLV8TX_PACKET_PERIOD/3;
+	}
+	#endif
+
 	XN297_SetTxRxMode(TX_EN);
 	if(IS_BIND_IN_PROGRESS)
 	{
@@ -119,7 +272,20 @@ void REALACC_init()
 	BIND_IN_PROGRESS;	// autobind protocol
 	REALACC_initialize_txid();
 	REALACC_RF_init();
-	bind_counter=REALACC_BIND_COUNT;
+	#ifndef MULTI_AIR
+	if(sub_protocol == REALACC_WLV8TX)
+	{
+		rx_id[0] = 0;	// realacc_wlv8tx_rx_b3
+		rx_id[1] = 0;
+		rx_id[2] = 0;
+		bind_phase = REALACC_WLV8TX_BIND_TX;
+		memcpy(packet, realacc_bind_packet, 4);
+		packet[3] |= 0x80;
+		XN297_SetRXAddr(packet, 4);
+	}
+	else
+	#endif
+		bind_counter=REALACC_BIND_COUNT;
 	hopping_frequency_no=0;
 }

@@ -129,18 +295,63 @@ void REALACC_init()
 // Bind
 //   Address = 4D 41 49 4E = 'MAIN'
 //   Channel = 80 (most likely from dump)
-//   P(10) = B1 99 06 00 00 55 59 5A 5A 62
-//     B1 indicates bind packet
+//   TX1
+//   ---
+//     P(10) = B1 99 06 00 00 55 59 5A 5A 62
+//     Bx indicates bind packet, why x=1?
 //     99 06 00 00 = ID = address of normal packets
-//     55 59 5A 5A 62 = 85, 89, 90, 90, 98 = RF channels to be used (kind of match previous dumps)// Normal
+//     55 59 5A 5A 62 = 85, 89, 90, 90, 98 = RF channels to be used (kind of match previous dumps)
+//   TX2
+//   ---
+//     P(10) = B0 4F B9 A1 17 45 38 3C 41 3F
+//     Bx indicates bind packet, why x=0?
+//     4F B9 A1 17 = ID = address of normal packets
+//     45 38 3C 41 3F  = 69, 56, 60, 65, 63 = RF channels to be used
+//   WLtoys Car 284019A V8-Tx
+// ------> TX sends
+//     P(10)= B1 32 E9 DE 0A 45 42 38 3C 4A
+//     B1 indicates bind packet
+//     32 E9 DE 0A = ID -> address of normal TX packets before bind
+//     45 42 38 3C 4A  = 69, 66, 56, 60, 74 -> RF channels to be used
+//     P(12)= B4 D4 E9 32 E9 DE 0A 45 42 38 3C 4A -> B4 designates TX found RX?,  P(10) to P(12), TX inserts packet[1] and [2] from RX
+//     32 E9 0A E3 = ID -> address of normal TX packets after bind (XOR rx_tx_addr[2],[3] with values from RX)
+// ------> RX returns
+//     32 E9 DE 8A = -> RX ID address returning bind info, same as TX address except (packet[3]|0x80)
+//     P(3)= B3 D4 E9 = B3=bind initiates Tx found, D4=XOR with rx_tx_addr[2], E9=XOR with rx_tx_addr[3]
+//     P(3)= B5 D4 E9 = B5=bind completed
+//     P(6)= 40 83 00 00 00 00 = RX returns on some hopping channels - unknown? telemetry? not used on this model?
 // Normal
-//   Address = 99 06 00 00
-//   Channels = 84, 89, 90, 90, 98 (guess from bind)
-//   P(13)= DC 80 80 32 80 20 20 20 20 58 04 00 00
-//   DC = normal packet
-//   80 80 32 80 : AETR 00..80..FF
-//   20 20 20 20 : Trims
-//   58 : changing every time the TX restart
-//   04 : |0x20=headless, |0x01=rate2, |0x02=rate3
-//   00 : |0x01=calib, |0x20=return, |0x80=unknown
-//   00 : |0x80=light, |0x01=flip
+//   TX1
+//   ---
+//     Address = 99 06 00 00
+//     Channels = 84, 89, 90, 90, 98 (guess from bind)
+//     P(13)= DC 80 80 32 80 20 20 20 20 58 04 00 00
+//     Dx = normal packet, why C ?
+//     80 80 32 80 : AETR 00..80..FF
+//     20 20 20 20 : Trims
+//     58 : changing every time the TX restart
+//     04 : |0x20=headless, |0x01=rate2, |0x02=rate3
+//     00 : |0x01=calib, |0x20=return, |0x80=unknown
+//     00 : |0x80=light, |0x01=flip
+//   TX2
+//   ---
+//     Address = 4F B9 A1 17
+//     P(13)= D6/DE 80 80 80 80 20 20 20 20 88 0C 00 00
+//     Dx = normal packet, why 6/E ?
+//     80 80 32 80 : AETR 00..80..FF
+//     20 20 20 20 : Trims
+//     88 : not changing unknown
+//     0C : |0x20=headless, |0x01=rate2, |0x02=rate3
+//     00 : |0x01=calib, |0x20=return, |0x80=unknown
+//     00 : |0x80=light, |0x01=flip, |0x02=Rotating
+//   WLtoys Car 284019A V8-Tx
+//   ---
+//     Address = 32 E9 DE 0A (before bind), 32 E9 0A E3 (after bind and XOR)
+//     P(13)= DC 80 80 80 80 20 20 20 20 77 0C 00 00
+//     Dx = normal packet, why C ?
+//     80 80 80 80 : AE=80 TR 00..80..FF
+//     20 20 20 20 : Gyro Rate, Constant?, Throttle Rate, Steer Trim
+//     77 : changing every time the TX restart
+//     0C : Constant?
+//     00 : Constant?
+//     00 : Constant?
--- a/Multiprotocol/RF2500_EMU.ino
+++ b/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;
--- a/Multiprotocol/RadioLink_cc2500.ino
+++ b/Multiprotocol/RadioLink_cc2500.ino
@@ -12,13 +12,17 @@
 You should have received a copy of the GNU General Public License
 along with Multiprotocol.  If not, see <http://www.gnu.org/licenses/>.
 */
-// Radiolink surface protocol. TXs: RC4GS,RC6GS. Compatible RXs:R7FG(Std),R6FG,R6F,R8EF,R8FM,R8F,R4FGM 
+// Radiolink surface protocol. TXs: RC4GS,RC6GS. Compatible RXs:R7FG(Std),R6FG,R6F,R8EF,R8FM,R8F,R4FGM

 #if defined(RLINK_CC2500_INO)

 #include "iface_cc2500.h"

+//#define RLINK_DEBUG
+//#define RLINK_DEBUG_TELEM
+
 //#define RLINK_FORCE_ID
+//#define RLINK_RC4G_FORCE_ID

 #define RLINK_TX_PACKET_LEN	33
 #define RLINK_RX_PACKET_LEN	15
@@ -33,6 +37,7 @@ enum {

 uint32_t RLINK_rand1;
 uint32_t RLINK_rand2;
+uint32_t RLINK_pseudo;

 static uint32_t __attribute__((unused)) RLINK_prng_next(uint32_t r)
 {
@@ -80,7 +85,7 @@ static void __attribute__((unused)) RLINK_shuffle_freqs(uint32_t seed)
 static void __attribute__((unused)) RLINK_hop()
 {
 	uint8_t inc=3*(rx_tx_addr[0]&3);
-	
+
 	// init hop table
 	for(uint8_t i=0; i<RLINK_HOP; i++)
 		hopping_frequency[i] = (12*i) + inc;
@@ -89,24 +94,103 @@ static void __attribute__((unused)) RLINK_hop()
 	RLINK_shuffle_freqs(RLINK_compute_start_id(rx_tx_addr[0] + (rx_tx_addr[1] << 8)));
 	RLINK_shuffle_freqs(RLINK_compute_start_id(rx_tx_addr[2] + (rx_tx_addr[3] << 8)));

-	// replace one of the channel randomely
+	// replace one of the channel randomly
 	rf_ch_num=random(0xfefefefe)%0x11;		// 0x00..0x10
 	if(inc==9) inc=6;						// frequency exception
 	hopping_frequency[rf_ch_num]=12*16+inc;
 }

+static void __attribute__((unused)) RLINK_hop_RC4G()
+{
+  // Find 2 unused channels
+  //  first  channel is a multiple of 3 between 00 and 5D
+  //  second channel is a multiple of 3 between 63 and BD
+  CC2500_Strobe(CC2500_SIDLE);
+  CC2500_WriteReg(CC2500_17_MCSM1,0x3C);
+  CC2500_Strobe(CC2500_SFRX);
+  CC2500_SetTxRxMode(RX_EN);
+  CC2500_Strobe(CC2500_SRX);
+  delayMilliseconds(1);           //wait for RX mode
+  uint16_t val;
+  uint8_t val_low = 0xFF;
+  hopping_frequency[0] = 0x00;
+  hopping_frequency[1] = 0x63;
+  for(uint8_t ch=0; ch<=0xBD; ch+=3)
+  {
+    if(ch==0x63)
+      val_low = 0xFF;           //init for second block
+    if(ch==0x60)
+      continue;             //skip channel
+    CC2500_WriteReg(CC2500_0A_CHANNR, ch);  //switch channel
+    delayMicroseconds(370);         //wait to read
+    val = 0;
+    for(uint8_t i=0;i<16;i++)
+      val += CC2500_ReadReg(CC2500_34_RSSI | CC2500_READ_BURST);
+    val >>= 4;
+    debug("C:%02X RSSI:%02X",ch,val);
+    if(val_low > val)
+    {
+      debug(" OK");
+      val_low = val;
+      hopping_frequency[ch<0x63?0:1]=ch;  //save best channel
+    }
+    debugln("");
+  }
+  CC2500_WriteReg(CC2500_17_MCSM1,0x30);
+  CC2500_Strobe(CC2500_SIDLE);
+  CC2500_SetTxRxMode(TX_EN);
+  #ifdef RLINK_RC4G_FORCE_ID
+    hopping_frequency[0] = 0x03;
+    hopping_frequency[1] = 0x6F;
+  #endif
+}
+
+// calc next pseudo random value
+static void __attribute__((unused)) RLINK_next_pseudo()
+{
+	RLINK_pseudo = ((RLINK_pseudo * 0xAA) + 0x03) % 0x7673;
+}
+
+static void __attribute__((unused)) RLINK_set_next_channel()
+{
+	CC2500_WriteReg(CC2500_0A_CHANNR, hopping_frequency[RLINK_pseudo & 0x0F]);
+}
+
+static uint8_t __attribute__((unused)) RLINK_checksum(const uint8_t *data, uint8_t payload_len, bool include_id=false)
+{
+	uint8_t sum=0;
+	for(uint8_t i=0;i<payload_len;i++)
+		sum+=data[i];
+	if(include_id)
+		for(uint8_t i=0;i<RLINK_TX_ID_LEN;i++)
+			sum+=rx_tx_addr[i];
+	return sum;
+}
+
 static void __attribute__((unused)) RLINK_TXID_init()
 {
+	#ifdef RLINK_RC4G_FORCE_ID
+		//TODO: test any ID
+		if(sub_protocol==RLINK_RC4G)
+		{
+			rx_tx_addr[1]=0x77;
+			rx_tx_addr[2]=0x00;
+			rx_tx_addr[3]=0x00;
+		}
+	#endif
 	#ifdef RLINK_FORCE_ID
-		//surface RC6GS
-		memcpy(rx_tx_addr,"\x3A\x99\x22\x3A",RLINK_TX_ID_LEN);
-		//air T8FB
-		//memcpy(rx_tx_addr,"\xFC\x11\x0D\x20",RLINK_TX_ID_LEN);
+		if(sub_protocol==RLINK_SURFACE)
+			memcpy(rx_tx_addr,"\x3A\x99\x22\x3A",RLINK_TX_ID_LEN);	//surface RC6GS
+		else
+			memcpy(rx_tx_addr,"\xFC\x11\x0D\x20",RLINK_TX_ID_LEN);	//air T8FB
 	#endif
 	// channels order depend on ID
-	RLINK_hop();
+	if(sub_protocol==RLINK_RC4G)
+    RLINK_hop_RC4G();
+	else
+    RLINK_hop();

- 	#if 0
+ 	#ifdef RLINK_DEBUG
 		debug("ID:");
 		for(uint8_t i=0;i<RLINK_TX_ID_LEN;i++)
 			debug(" 0x%02X",rx_tx_addr[i]);
@@ -133,20 +217,21 @@ static void __attribute__((unused)) RLINK_rf_init()
 	for (uint8_t i = 0; i < 39; ++i)
 		CC2500_WriteReg(i, pgm_read_byte_near(&RLINK_init_values[i]));

-	if(sub_protocol==RLINK_DUMBORC)
+	if(sub_protocol == RLINK_DUMBORC || sub_protocol == RLINK_DUMBORC_P)
 	{
 		CC2500_WriteReg(4, 0xBA);
 		CC2500_WriteReg(5, 0xDC);
 	}
+	else if(sub_protocol==RLINK_RC4G)
+		CC2500_WriteReg(5, 0xA5);

 	CC2500_WriteReg(CC2500_0C_FSCTRL0, option);
-	
+
 	CC2500_SetTxRxMode(TX_EN);
 }

 static void __attribute__((unused)) RLINK_send_packet()
 {
-	static uint32_t pseudo=0;
 	uint32_t bits = 0;
 	uint8_t bitsavailable = 0;
 	uint8_t idx = 6;
@@ -165,17 +250,18 @@ static void __attribute__((unused)) RLINK_send_packet()
 	{
 		case RLINK_SURFACE:
 			packet[1] |= 0x01;
-			//radiolink additionnal ID which is working only on a small set of RXs
+			//radiolink additional ID which is working only on a small set of RXs
 			//if(RX_num) packet[1] |= ((RX_num+2)<<4)+4;	// RX number limited to 10 values, 0 is a wildcard
 			break;
 		case RLINK_AIR:
 			packet[1] |= 0x21;					//air 0x21 on dump but it looks to support telemetry at least RSSI
 			break;
 		case RLINK_DUMBORC:
-			packet[1]  = 0x00;					//always 0x00 on dump
+		case RLINK_DUMBORC_P:
+			packet[1] |= 0x01;					//always 0x00 on dump but does appear to support telemtry on newer transmitters
 			break;
 	}
-	
+
 	// ID
 	memcpy(&packet[2],rx_tx_addr,RLINK_TX_ID_LEN);

@@ -196,41 +282,176 @@ static void __attribute__((unused)) RLINK_send_packet()
 			bitsavailable -= 8;
 		}
 	}
-	
+
 	// hop
-	pseudo=((pseudo * 0xAA) + 0x03) % 0x7673;	// calc next pseudo random value
-	CC2500_WriteReg(CC2500_0A_CHANNR, hopping_frequency[pseudo & 0x0F]);
-	packet[28]= pseudo;
-	packet[29]= pseudo >> 8;
+	RLINK_next_pseudo();
+	RLINK_set_next_channel();
+	packet[28]= RLINK_pseudo;
+	packet[29]= RLINK_pseudo >> 8;
 	packet[30]= 0x00;						// unknown
 	packet[31]= 0x00;						// unknown
 	packet[32]= rf_ch_num;					// index of value changed in the RF table
-	
+
 	// check
-	uint8_t sum=0;
-	for(uint8_t i=1;i<33;i++)
-		sum+=packet[i];
-	packet[33]=sum;
+	packet[33]=RLINK_checksum(&packet[1], RLINK_TX_PACKET_LEN-1);

 	// send packet
 	CC2500_WriteData(packet, RLINK_TX_PACKET_LEN+1);
-	
+
 	// packets type
 	packet_count++;
 	if(packet_count>5) packet_count=0;

-	//debugln("C= 0x%02X",hopping_frequency[pseudo & 0x0F]);
-	//debug("P=");
-	//for(uint8_t i=1;i<RLINK_TX_PACKET_LEN+1;i++)
-	//	debug(" 0x%02X",packet[i]);
-	//debugln("");
+	#ifdef RLINK_DEBUG
+		debugln("C= 0x%02X",hopping_frequency[RLINK_pseudo & 0x0F]);
+		debug("P=");
+		for(uint8_t i=1;i<RLINK_TX_PACKET_LEN+1;i++)
+			debug(" 0x%02X",packet[i]);
+		debugln("");
+	#endif
 }

+#ifdef RLINK_HUB_TELEMETRY
+
+static bool __attribute__((unused)) RLINK_DUMBORC_send_command()
+{
+	if(!RLINK_SerialRX || sub_protocol != RLINK_DUMBORC_P)
+		return false;
+
+	RLINK_SerialRX=false;
+
+	if(RLINK_SerialRX_len > sizeof(RLINK_SerialRX_val))
+		return false;
+
+	CC2500_Strobe(CC2500_SIDLE);
+
+	RLINK_next_pseudo();
+	RLINK_set_next_channel();
+
+	packet[0] = RLINK_SerialRX_len;
+	memcpy(&packet[1], RLINK_SerialRX_val, RLINK_SerialRX_len);
+	packet[2] = RLINK_pseudo;
+	packet[3] = RLINK_pseudo >> 8;
+	// special packages have id check embedded in checksum
+	packet[RLINK_SerialRX_len] = RLINK_checksum(&packet[1], RLINK_SerialRX_len - 1, true);
+
+	CC2500_WriteData(packet, RLINK_SerialRX_len + 1);
+
+	packet_count++;
+	if(packet_count>5) packet_count=0;
+
+	#ifdef RLINK_DEBUG
+		debugln("C= 0x%02X",hopping_frequency[RLINK_pseudo & 0x0F]);
+		debug("DumboRC P command=");
+		for(uint8_t i=1;i<packet[0]+1;i++)
+			debug(" 0x%02X",packet[i]);
+		debugln("");
+	#endif
+
+	return true;
+}
+#endif
+
+// logic is rougly copied from ddf-350, which in itself seems to be based on cc2500 docs
+static uint8_t __attribute__((unused)) RLINK_DUMBORC_tele_rssi_as_percent(uint8_t rssi)
+{
+	if(rssi < 15)
+		rssi=15;
+	else if(rssi > 90)
+		rssi=90;
+	return ((90 - rssi) * 100) / 75;
+}
+
+static bool __attribute__((unused)) RLINK_DUMBORC_validate_telemetry_packet(const uint8_t *data)
+{
+	const uint8_t declaredLen = data[0];
+
+	if(data[1] == 0x00)
+	{
+		// telemetry package follows base radiolink procotol with slightly less rules
+		if(declaredLen != RLINK_RX_PACKET_LEN || memcmp(&data[2], rx_tx_addr, RLINK_TX_ID_LEN) != 0)
+			return false;
+
+		// telemetry packages do not have id check embeeded in checksum, just like base RadioLink
+		return data[RLINK_RX_PACKET_LEN] == RLINK_checksum(&data[1], RLINK_RX_PACKET_LEN - 1);
+	}
+
+	if(sub_protocol != RLINK_DUMBORC_P)
+		return false;
+
+	// special packages have id check embedded in checksum
+	return data[declaredLen] == RLINK_checksum(&data[1], declaredLen - 1, true);
+}
+
+#ifndef MULTI_AIR
+static void __attribute__((unused)) RLINK_RC4G_send_packet()
+{
+	uint32_t val;
+	//hop
+	CC2500_WriteReg(CC2500_0A_CHANNR, hopping_frequency[packet_count>>1]);
+	#ifdef RLINK_DEBUG
+		debug("C= 0x%02X ",hopping_frequency[packet_count>>1]);
+	#endif
+	// packet length
+	packet[0] = 0x0F;
+	//address
+	memcpy(&packet[1], &rx_tx_addr[1], 3);
+	//channels
+	for(uint8_t i=0;i<2;i++)
+	{
+		val = Channel_data[2*i  ] +400 -24;
+		packet[4+i*2] = val;
+		packet[8+i  ] = val>>8;
+		val = Channel_data[2*i+1] +400 -24;
+		packet[5+i*2] = val;
+		packet[8+i  ] |= (val>>4) & 0xF0;
+	}
+	//special channel which is linked to gyro on the original TX but allocating it on CH5 here
+	packet[10] = convert_channel_16b_limit(CH5,0,100);
+	//failsafe
+	for(uint8_t i=0;i<4;i++)
+		packet[11+i] = convert_channel_16b_limit(CH6+i,0,200);
+	//next hop
+	packet_count++;
+	packet_count &= 0x03;
+	packet[15] = hopping_frequency[packet_count>>1];
+	// send packet
+	CC2500_WriteData(packet, 16);
+
+	#ifdef RLINK_DEBUG
+		debug("P=");
+		for(uint8_t i=1;i<16;i++)
+			debug(" 0x%02X",packet[i]);
+		debugln("");
+	#endif
+}
+#endif
+
+#if defined RLINK_HUB_TELEMETRY
+uint16_t RLINK_timing_last_rfsend = 0;
+#endif
+
 #define RLINK_TIMING_PROTO	20000-100		// -100 for compatibility with R8EF
 #define RLINK_TIMING_RFSEND	10500
 #define RLINK_TIMING_CHECK	2000
+#define RLINK_RC4G_TIMING_PROTO 14460
+#define RLINK_DUMBORC_COMMAND_RFSEND 5000
 uint16_t RLINK_callback()
 {
+	if(sub_protocol == RLINK_RC4G)
+	{
+		#ifndef MULTI_AIR
+			#ifdef MULTI_SYNC
+				telemetry_set_input_sync(RLINK_RC4G_TIMING_PROTO);
+			#endif
+			CC2500_SetPower();
+			CC2500_SetFreqOffset();
+			RLINK_RC4G_send_packet();
+		#else
+			SUB_PROTO_INVALID;
+		#endif
+		return RLINK_RC4G_TIMING_PROTO;
+	}
 	switch(phase)
 	{
 		case RLINK_DATA:
@@ -239,46 +460,96 @@ uint16_t RLINK_callback()
 			#endif
 			CC2500_SetPower();
 			CC2500_SetFreqOffset();
-			RLINK_send_packet();
 #if not defined RLINK_HUB_TELEMETRY
-			return RLINK_TIMING_PROTO;
+			RLINK_send_packet();
+			return RLINK_TIMING_PROTO;						// RLINK_DATA
 #else
+			if(RLINK_DUMBORC_send_command())
+			{
+				phase++;									// RX1
+				RLINK_timing_last_rfsend = RLINK_DUMBORC_COMMAND_RFSEND;
+				return RLINK_timing_last_rfsend;
+			}
+
+			RLINK_send_packet();
+
 			if(!(packet[1]&0x02))
-				return RLINK_TIMING_PROTO;					//Normal packet
-															//Telemetry packet
+				return RLINK_TIMING_PROTO;					// Normal packet -> RLINK_DATA
+															// Telemetry packet
 			phase++;										// RX1
-			return RLINK_TIMING_RFSEND;
+			RLINK_timing_last_rfsend = RLINK_TIMING_RFSEND;
+			return RLINK_timing_last_rfsend;
 		case RLINK_RX1:
 			CC2500_Strobe(CC2500_SIDLE);
 			CC2500_Strobe(CC2500_SFRX);
 			CC2500_SetTxRxMode(RX_EN);
 			CC2500_Strobe(CC2500_SRX);
 			phase++;										// RX2
-			return RLINK_TIMING_PROTO-RLINK_TIMING_RFSEND-RLINK_TIMING_CHECK;
+			return RLINK_TIMING_PROTO-RLINK_timing_last_rfsend-RLINK_TIMING_CHECK;
 		case RLINK_RX2:
-			len = CC2500_ReadReg(CC2500_3B_RXBYTES | CC2500_READ_BURST) & 0x7F;	
-			if (len == RLINK_RX_PACKET_LEN + 1 + 2)			//Telemetry frame is 15 bytes + 1 byte for length + 2 bytes for RSSI&LQI&CRC
+			len = CC2500_ReadReg(CC2500_3B_RXBYTES | CC2500_READ_BURST) & 0x7F;
+			const bool dumborc_family = sub_protocol == RLINK_DUMBORC || sub_protocol == RLINK_DUMBORC_P;
+			//Telemetry frame is 15 bytes + 1 byte for length + 2 bytes for RSSI&LQI&CRC
+			const bool rlink_telem_len = !dumborc_family && len == RLINK_RX_PACKET_LEN + 1 + 2;
+			// length byte + type byte + checksum byte + RSSI/LQI/CRC
+			const bool dumborc_len     = dumborc_family && len >= 5 && len <= sizeof(packet_in);
+			if (rlink_telem_len || dumborc_len)
 			{
-				//debug("Telem:");
+				#ifdef RLINK_DEBUG_TELEM
+					debug("Telem:");
+				#endif
 				CC2500_ReadData(packet_in, len);
-				if(packet_in[0]==RLINK_RX_PACKET_LEN && (packet_in[len-1] & 0x80) && memcmp(&packet[2],rx_tx_addr,RLINK_TX_ID_LEN)==0 && packet_in[6]==packet[1])
-				{//Correct telemetry received: length, CRC, ID and type
-					//Debug
-					//for(uint8_t i=0;i<len;i++)
-					//	debug(" %02X",packet_in[i]);
-					TX_RSSI = packet_in[len-2];
-					if(TX_RSSI >=128)
-						TX_RSSI -= 128;
-					else
-						TX_RSSI += 128;
-					RX_RSSI=packet_in[7]&0x7F;				//Should be packet_in[7]-256 but since it's an uint8_t...
-					v_lipo1=packet_in[8]<<1;				//RX Batt
-					v_lipo2=packet_in[9];					//Batt
-					telemetry_link=1;						//Send telemetry out
-					pps_counter++;
-					packet_count=0;
+				if(len >= 3 && packet_in[0] == len - 3 && (packet_in[len-1] & 0x80))
+				{//Telemetry received with correct length and CC2500 CRC
+					#ifdef RLINK_DEBUG_TELEM
+						for(uint8_t i=0;i<len;i++)
+							debug(" %02X",packet_in[i]);
+					#endif
+					bool valid_telem=false;
+					if(dumborc_family)
+					{
+						if(RLINK_DUMBORC_validate_telemetry_packet(packet_in))
+						{
+							if(packet_in[1] == 0x00)
+							{
+								uint8_t tele_rssi = RLINK_DUMBORC_tele_rssi_as_percent(packet_in[7]);
+								uint16_t ext_v = packet_in[9] | (((uint16_t)packet_in[10]) << 8);
+								uint16_t direct_rssi = packet_in[11] | (((uint16_t)packet_in[12]) << 8);
+								direct_rssi = direct_rssi > 100 ? 100 : direct_rssi;
+								RX_RSSI = direct_rssi ? direct_rssi : tele_rssi;
+								v_lipo1 = 0;							//Has no RX batt
+								v_lipo2 = ext_v > 255 ? 255 : ext_v;	//Batt in same position as base radiolink
+								valid_telem=true;
+							}
+							else if(sub_protocol == RLINK_DUMBORC_P)
+							{
+								telemetry_link=2; // Raw DumboRC P packet to Lua/multiBuffer handling.
+								pps_counter++;
+							}
+						}
+					}
+					else if(packet_in[0] == RLINK_RX_PACKET_LEN && memcmp(&packet[2],rx_tx_addr,RLINK_TX_ID_LEN)==0 && packet_in[6]==packet[1])
+					{
+						RX_RSSI=packet_in[7]&0x7F;			//Should be packet_in[7]-256 but since it's an uint8_t...
+						v_lipo1=packet_in[8]<<1;			//RX Batt
+						v_lipo2=packet_in[9];				//Batt
+						valid_telem=true;
+					}
+					if(valid_telem)
+					{
+						TX_RSSI = packet_in[len-2];
+						if(TX_RSSI >=128)
+							TX_RSSI -= 128;
+						else
+							TX_RSSI += 128;
+						telemetry_link=1;					//Send telemetry out
+						pps_counter++;
+						packet_count=0;
+					}
 				}
-				//debugln("");
+				#ifdef RLINK_DEBUG_TELEM
+					debugln("");
+				#endif
 			}
 			if (millis() - pps_timer >= 2000)
 			{//1 telemetry packet every 100ms
@@ -308,4 +579,4 @@ void RLINK_init()
 	phase = RLINK_DATA;
 }

-#endif
+#endif
--- a/Multiprotocol/SGF22_nrf24l01.ino
+++ b/Multiprotocol/SGF22_nrf24l01.ino
@@ -0,0 +1,308 @@
+/*
+ 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 SGF22, ParkTen F22S, KF700 J20
+
+#if defined(SGF22_NRF24L01_INO)
+
+#include "iface_xn297.h"
+
+//#define FORCE_SGF22_ORIGINAL_ID
+#define FORCE_SGF22_CX10_ORIGINAL_ID
+
+#define SGF22_PACKET_PERIOD				11950 //10240
+#define SGF22_PAYLOAD_SIZE				12
+#define SGF22_BIND_COUNT				50
+#define SGF22_RF_NUM_CHANNELS			4
+#define SGF22_BIND_RF_CHANNEL			78
+#define SGF22_F22S_BIND_RF_CHANNEL		10
+#define SGF22_J20_BIND_RF_CHANNEL  		28
+#define SGF22_CX10_BIND_RF_CHANNEL		48
+
+//packet[8]
+#define SGF22_FLAG_3D					0x00
+#define SGF22_FLAG_LIGHT				0x04
+#define SGF22_FLAG_ROLL					0x08
+#define SGF22_FLAG_VIDEO				0x10
+#define SGF22_FLAG_6G					0x40
+#define SGF22_FLAG_VERTICAL				0xC0
+
+#define SGF22_J20_FLAG_HORIZONTAL		0x80
+//#define SGF22_J20_FLAG_SPEED			0x01	// Up/Down trim, not implemented
+
+#define SGF22_FX922_FLAG_BALANCEHIGH	0x01
+#define SGF22_FX922_FLAG_BALANCE		0x02
+
+
+//packet[9]
+#define SGF22_FLAG_TRIMRESET			0x04
+#define SGF22_FLAG_PHOTO				0x40	// #define SGF22_J20_FLAG_INVERT  0x40
+#define SGF22_J20_FLAG_FIXHEIGHT		0x80
+
+#define SGF22_WRITE_TIME				1000
+
+enum {
+	SGF22_DATA1,
+	SGF22_DATA2,
+	SGF22_DATA3,
+	SGF22_RX,
+};
+
+static void __attribute__((unused)) SGF22_send_packet()
+{
+	if(IS_BIND_IN_PROGRESS)
+	{
+		packet[ 0] = 0x5B;
+		packet[ 8] = 0x00;								// ??? do they have to be 0 for bind to succeed ?
+		packet[ 9] = 0x00;								// ??? do they have to be 0 for bind to succeed ?
+		packet[10] = 0xAA;
+		packet[11] = 0x55;
+	}
+	else
+	{
+		//hop
+		XN297_Hopping(packet_sent & 0x03);				// ??? from the dumps I can't really say how hop and seq are sync, there could be an offset (0,1,2,3)...
+		//sequence from 02 to 7A by increments of 4, sometimes with a flag 0x80 from 82 to FA, I can't tell from the dumps when the switch happens
+		if( (packet_sent & 0x03) == 0x02)
+			packet_count = packet_sent;
+		packet_sent++;
+		if(packet_sent > 0x7B)
+			packet_sent = 0;
+		//packet
+		packet[0] = 0x1B;
+		if (sub_protocol != SGF22_CX10)
+		{//SGF22_F22,SGF22_F22S,SGF22_J20
+			packet[8] = SGF22_FLAG_3D           			// CH5 -100%, F22 & F22S - 3D mode, J20 - Gyro off  
+				| GET_FLAG(CH6_SW, SGF22_FLAG_ROLL)			// roll
+				| GET_FLAG(CH7_SW, SGF22_FLAG_LIGHT)		// push up throttle trim for light in the stock TX
+				| GET_FLAG(CH9_SW, SGF22_FLAG_VIDEO)		// push down throttle trim for video in the stock TX
+				| GET_FLAG(CH11_SW, SGF22_FX922_FLAG_BALANCE)
+				| GET_FLAG(CH12_SW, SGF22_FX922_FLAG_BALANCEHIGH);
+			if(Channel_data[CH5] > CHANNEL_MAX_COMMAND)
+				packet[8] |= SGF22_FLAG_VERTICAL;     		// CH5 100%,  vertical mode (torque)    
+			else if(Channel_data[CH5] > CHANNEL_MIN_COMMAND )
+			packet[8] |= ( sub_protocol == SGF22_J20 ? SGF22_J20_FLAG_HORIZONTAL : SGF22_FLAG_6G );     // CH5 0%, F22 & F22S - 6G mode, J20 - Horizontal mode
+		}
+		else //SGF22_CX10 114548
+		{
+			if(CH6_SW)
+				flags = 0x06;								// high rate
+			else
+				if(Channel_data[CH6] < CHANNEL_MIN_COMMAND)
+					flags = 0x04;							// low rate
+				else
+					flags = 0x05;							// mid rate
+			packet[8] = flags
+				| GET_FLAG(CH5_SW, 0x08);					// flip
+		}
+		packet[9] = GET_FLAG(CH8_SW, SGF22_FLAG_PHOTO)		// F22: photo, press in throttle trim in the stock TX, J20: invert flight
+			| GET_FLAG(CH10_SW, ( sub_protocol == SGF22_J20 ? SGF22_J20_FLAG_FIXHEIGHT : SGF22_FLAG_TRIMRESET )) ;   // F22: Both sticks down inwards in the stock TX, J20: Altitude hold
+		packet[10] = 0x42;									// no fine tune
+		packet[11] = 0x10;									// no fine tune
+	}
+	if(sub_protocol == SGF22_F22S)
+		packet[0] += 6;
+	else if (sub_protocol == SGF22_J20)
+    		packet[0] += 3; 
+	else if (sub_protocol == SGF22_CX10)
+    		packet[0] += 0x6A; 
+	packet[1] = packet_count;								// sequence
+	packet[2] = rx_tx_addr[2];
+	packet[3] = rx_tx_addr[3];
+	packet[4] = convert_channel_8b(THROTTLE);
+	packet[5] = convert_channel_8b(RUDDER);
+	packet[6] = convert_channel_8b(ELEVATOR);
+	packet[7] = convert_channel_8b(AILERON);
+
+	XN297_SetPower();
+	XN297_SetTxRxMode(TX_EN);
+	if (sub_protocol != SGF22_CX10)
+		XN297_WriteEnhancedPayload(packet, SGF22_PAYLOAD_SIZE,0);
+	else
+		XN297_WritePayload(packet, SGF22_PAYLOAD_SIZE);
+	#if 0
+		debug_time("");
+		for(uint8_t i=0; i<SGF22_PAYLOAD_SIZE; i++)
+			debug(" %02X",packet[i]);
+		debugln("");
+	#endif
+}
+
+static void __attribute__((unused)) SGF22_initialize_txid()
+{
+	uint16_t val = ( rx_tx_addr[2] << 8 ) | rx_tx_addr[3];
+	if ( rx_tx_addr[2] > ( 0xFF - rx_tx_addr[3]) )
+		val--;
+	val %= 5;
+
+	const uint8_t hop[5][4] =
+	{ { 0x0C, 0x2A, 0x1B, 0x39 },
+	  { 0x0F, 0x2D, 0x1E, 0x3D },
+	  { 0x12, 0x31, 0x21, 0x41 },
+	  { 0x15, 0x34, 0x24, 0x44 },
+	  { 0x18, 0x37, 0x27, 0x47 } };
+	memcpy(hopping_frequency, &hop[val], SGF22_RF_NUM_CHANNELS);
+
+	/*//Same code size...
+	hopping_frequency[0] = 0x0C + 3 * val;
+	hopping_frequency[1] = hopping_frequency[0] + 0x1E;
+	if(val > 1) hopping_frequency[1]++;
+	hopping_frequency[2] = hopping_frequency[0] + 0x0F;
+	hopping_frequency[3] = hopping_frequency[1] + 0x0F;
+	if(val    ) hopping_frequency[3]++;*/
+	
+	#ifdef FORCE_SGF22_ORIGINAL_ID
+		rx_tx_addr[2] = 0x1F;	// TX2:27 TX3:2B
+		rx_tx_addr[3] = 0x61;	// TX2:51 TX3:0C
+		memcpy(hopping_frequency,"\x15\x34\x24\x44", SGF22_RF_NUM_CHANNELS);    //Original dump=>21=0x15,52=0x34,36=0x24,68=0x44
+	#endif
+	#ifdef FORCE_SGF22_CX10_ORIGINAL_ID
+		if(sub_protocol == SGF22_CX10)
+		{
+			if(rx_tx_addr[3] & 1)
+			{
+				rx_tx_addr[2] = 0x4C;
+				rx_tx_addr[3] = 0xD7;
+				memcpy(hopping_frequency, "\x37\x42\x47\x3c", SGF22_RF_NUM_CHANNELS);
+			}
+			else
+			{
+				rx_tx_addr[2] = 0x50;
+				rx_tx_addr[3] = 0xE1;
+				memcpy(hopping_frequency, "\x3b\x4b\x46\x41", SGF22_RF_NUM_CHANNELS);
+			}
+		}
+	#endif
+	#if 0
+		debug("ID: %02X %02X, C: ",rx_tx_addr[2],rx_tx_addr[3]);
+		for(uint8_t i=0; i<SGF22_RF_NUM_CHANNELS; i++)
+			debug(" %02X",hopping_frequency[i]);
+		debugln("");
+	#endif
+}
+
+static void __attribute__((unused)) SGF22_RF_init()
+{
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
+	XN297_SetTXAddr((uint8_t*)"\xC7\x95\x3C\xBB\xA5", 5);
+	#ifdef SGF22_HUB_TELEMETRY
+		XN297_SetRXAddr((uint8_t*)"\xC7\x95\x3C\xBB\xA5", SGF22_PAYLOAD_SIZE);
+	#endif
+
+	const uint8_t bind_chan[] = {SGF22_BIND_RF_CHANNEL, SGF22_F22S_BIND_RF_CHANNEL, SGF22_J20_BIND_RF_CHANNEL, SGF22_CX10_BIND_RF_CHANNEL};
+	XN297_RFChannel(bind_chan[sub_protocol]);	// Set bind channel
+}
+
+uint16_t SGF22_callback()
+{
+	#ifdef SGF22_HUB_TELEMETRY
+		bool rx = false;
+		static uint8_t telem_count = 0;
+	#endif
+
+	switch(phase)
+	{
+		case SGF22_DATA1:
+			#ifdef MULTI_SYNC
+				telemetry_set_input_sync(SGF22_PACKET_PERIOD);
+			#endif
+	#ifdef SGF22_HUB_TELEMETRY
+			rx = XN297_IsRX();
+			XN297_SetTxRxMode(TXRX_OFF);
+	#endif
+			SGF22_send_packet();
+			if(IS_BIND_IN_PROGRESS)
+			{
+				if(--bind_counter==0)
+					BIND_DONE;
+			}
+	#ifdef SGF22_HUB_TELEMETRY
+			if(rx)
+			{
+				uint8_t p_len = XN297_ReadEnhancedPayload(packet_in, SGF22_PAYLOAD_SIZE);
+				if(p_len == 3 && packet_in[0] == rx_tx_addr[2] && packet_in[1] == rx_tx_addr[3])
+				{//packets: 00 0B 00 -> 00 0B 01
+					telemetry_link = 1;
+					v_lipo1 = packet_in[2] ? 0 : 255;	//2.9V for 1S, 7.0V for 2S
+					telemetry_lost = 0;
+					telem_count = 0;
+				}
+				#if 0
+					debug("L %d ",p_len);
+					debug("RX");
+					for(uint8_t i=0; i<SGF22_PAYLOAD_SIZE; i++)
+						debug(" %02X",packet_in[i]);
+					debugln("");
+				#endif
+			}
+			if(telem_count > 4*63)				// Around 3.5sec with no telemetry
+				telemetry_lost = 1;
+			else
+			{
+				telem_count++;
+				if(!telemetry_lost && (telem_count & 0x3F) == 0)
+				{// Should have received a telem packet but... Send telem to the radio to keep it alive
+					telemetry_link = 1;
+					#if 0
+						debugln("Miss");
+					#endif
+				}
+			}
+
+	#endif
+			phase++;
+			break;
+		case SGF22_DATA2:
+		case SGF22_DATA3:
+			//send 3 times in total the same packet
+			XN297_ReSendPayload();
+			phase++;
+			break;
+		default: //SGF22_RX
+	#ifdef SGF22_HUB_TELEMETRY
+			/*{ // Wait for packet to be sent before switching to receive mode
+				uint16_t start=(uint16_t)micros(), count=0;
+				while ((uint16_t)((uint16_t)micros()-(uint16_t)start) < 500)
+				{
+					if(XN297_IsPacketSent())
+						break;
+					count++;
+				}
+				debugln("%d",count);
+			}*/
+			//Switch to RX
+			XN297_SetTxRxMode(TXRX_OFF);
+			XN297_SetTxRxMode(RX_EN);
+	#endif
+			phase = SGF22_DATA1;
+			return SGF22_PACKET_PERIOD - 3*1550;
+	}
+	return 1550;
+}
+
+void SGF22_init()
+{
+	BIND_IN_PROGRESS;	// autobind protocol
+	SGF22_initialize_txid();
+	SGF22_RF_init();
+	bind_counter=SGF22_BIND_COUNT;
+	packet_sent = packet_count = 0x26;	// TX2:26 TX3:26
+	phase = SGF22_DATA1;
+	#ifdef SGF22_HUB_TELEMETRY
+		RX_RSSI = 100;		// Dummy value
+		telemetry_lost = 1;
+	#endif
+}
+
+#endif
--- a/Multiprotocol/SHENQI2_nrf24l01.ino
+++ b/Multiprotocol/SHENQI2_nrf24l01.ino
@@ -0,0 +1,232 @@
+/*
+ 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(SHENQI2_NRF24L01_INO)
+
+#include "iface_xn297.h"
+
+//#define FORCE_SHENQI2_ORIGINAL_ID
+
+#define SHENQI2_PAYLOAD_SIZE		8
+#define SHENQI2_RF_NUM_CHANNELS		16
+#define SHENQI2_BIND_COUNT			2000
+#define SHENQI2_WRITE_TIME			650
+#define SHENQI2_BIND_CHANNEL		44
+#define SHENQI2_PACKET_PERIOD		8210
+
+
+enum {
+	SHENQI2_BIND = 0,
+	SHENQI2_BIND_RX,
+	SHENQI2_DATA,
+};
+
+static void __attribute__((unused)) SHENQI2_send_packet()
+{
+	if(bind_counter)
+	{
+		bind_counter--;
+		if(!bind_counter)
+			BIND_DONE;
+	}
+
+	memset(packet, 0x00, SHENQI2_PAYLOAD_SIZE);
+
+	packet_count &= 0x0F;
+	packet[0] = packet_count;
+	
+	memcpy(&packet[1],rx_tx_addr,5);
+
+	if(IS_BIND_DONE)
+	{//Normal
+		uint8_t val = convert_channel_8b(CH2);
+		if(val < 0x70)
+			val = 0x30;
+		else if(val < 0x80)
+			val = 0x00;
+		else
+		{
+			val &= 0x7F;
+			val >>= 2;
+		}
+		if(Channel_data[CH1] > 1024+50)
+			val |= 0x40;
+		else if(Channel_data[CH1] < 1024-50)
+			val |= 0x80;
+		packet[6] = val;
+		//packet[7] = 0x00;		// ??
+	}
+	else
+		packet[0] |= 0x30;
+
+	// Send
+	XN297_SetPower();
+	XN297_SetTxRxMode(TX_EN);
+	XN297_WriteEnhancedPayload(packet, SHENQI2_PAYLOAD_SIZE, false);
+	#ifdef DEBUG_SERIAL
+		for(uint8_t i=0; i < SHENQI2_PAYLOAD_SIZE; i++)
+			debug("%02X ", packet[i]);
+		debugln();
+	#endif
+}
+
+static void __attribute__((unused)) SHENQI2_initialize_txid()
+{
+	#ifdef FORCE_SHENQI2_ORIGINAL_ID
+		//TXID
+		rx_tx_addr[0] = 0x51;
+		rx_tx_addr[1] = 0x70;
+		rx_tx_addr[2] = 0x02;
+		//RXID
+		rx_tx_addr[3] = 0x46;
+		rx_tx_addr[4] = 0xBE;
+	#endif
+	rx_tx_addr[3] = 0x00;
+	rx_tx_addr[4] = 0x00;
+	//Freq
+	memcpy(hopping_frequency,(uint8_t*)"\x05\x09\x0E\x0F\x17\x1C\x21\x27\x2A\x2C\x33\x39\x3D\x42\x48\x4C",16);
+}
+
+static void __attribute__((unused)) SHENQI2_RF_init()
+{
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
+	//Address
+	XN297_SetTXAddr((uint8_t*)"\x74\xD1\x3A\xF5\x6C", 5);
+	XN297_SetRXAddr((uint8_t*)"\x74\xD1\x3A\xF5\x6C", SHENQI2_PAYLOAD_SIZE);
+	XN297_RFChannel(SHENQI2_BIND_CHANNEL);
+}
+
+uint16_t SHENQI2_callback()
+{
+	static bool rx=false;
+	
+	switch(phase)
+	{
+		case SHENQI2_BIND:
+			rx = XN297_IsRX();
+			XN297_SetTxRxMode(TXRX_OFF);
+			SHENQI2_send_packet();
+			packet_count++;
+			if(rx)
+			{
+				uint8_t val=XN297_ReadEnhancedPayload(packet_in, SHENQI2_PAYLOAD_SIZE);
+				if(val == SHENQI2_PAYLOAD_SIZE)
+				{
+					if(memcmp(rx_tx_addr, packet_in, 3) == 0)
+					{//Good packet with our TXID
+						BIND_DONE;
+						rx_tx_addr[3] = packet_in[3];
+						rx_tx_addr[4] = packet_in[4];
+						packet_count = 0;
+						phase = SHENQI2_DATA;
+					}
+					#ifdef DEBUG_SERIAL
+						for(uint8_t i=0; i < SHENQI2_PAYLOAD_SIZE; i++)
+							debug(" %02X", packet_in[i]);
+						debugln();
+					#endif
+				}
+			}
+			phase++;
+			return SHENQI2_WRITE_TIME;
+		case SHENQI2_BIND_RX:
+			XN297_SetTxRxMode(TXRX_OFF);
+			XN297_SetTxRxMode(RX_EN);
+			phase = SHENQI2_BIND;
+			return SHENQI2_PACKET_PERIOD - SHENQI2_WRITE_TIME;
+		default: //SHENQI2_DATA
+			//Since I don't know the order of the channels, I'm hopping on all the channels quickly
+			//Refresh rate from the motorcycle perspective is 32ms instead of 8ms...
+			XN297_Hopping(hopping_frequency_no);
+			hopping_frequency_no++;
+			hopping_frequency_no &= 0x0F;
+			SHENQI2_send_packet();
+			if(hopping_frequency_no%4 == 0)
+				packet_count++;
+			return SHENQI2_PACKET_PERIOD/4;
+	}
+	return 0;
+}
+
+void SHENQI2_init()
+{
+	BIND_IN_PROGRESS;
+	SHENQI2_initialize_txid();
+	SHENQI2_RF_init();
+
+	bind_counter = SHENQI2_BIND_COUNT;
+	phase = SHENQI2_BIND;
+	hopping_frequency_no = 0;
+}
+
+#endif
+/*
+XN297 1Mb Enhanced,Acked,Scrambled
+
+Bind
+---
+RX on channel: 44, Time:  2890us P: 34 51 70 02 00 00 00 00
+RX on channel: 44, Time:  1780us P: 34 51 70 02 00 00 00 00
+RX on channel: 44, Time:  1773us P: 34 51 70 02 00 00 00 00
+RX on channel: 44, Time:  1772us P: 34 51 70 02 00 00 00 00
+RX on channel: 44, Time:  2889us P: 35 51 70 02 00 00 00 00
+RX on channel: 44, Time:  1769us P: 35 51 70 02 00 00 00 00
+RX on channel: 44, Time:  1774us P: 35 51 70 02 00 00 00 00
+RX on channel: 44, Time:  1771us P: 35 51 70 02 00 00 00 00
+RX on channel: 44, Time:  2894us P: 36 51 70 02 00 00 00 00
+
+A= 74 D1 3A F5 6C
+RF:44
+Timing: 1772µs between the same 4 packets, 2892µs to the next packet, 8208µs between 2 packets
+Request ack, if no ack repeat the packet 4 times
+
+P[0] = counter 00..0F | 30 bind
+P[1] = TXID[0]
+P[2] = TXID[1]
+P[3] = TXID[2]
+P[4] = RXID[0]
+P[5] = RXID[1]
+P[6] = TH 00..1F, Break 30, 40 ST_right, 80 ST_left
+P[7] = 00?
+
+Answer from motorcycle:
+P: 51 70 02 46 BE 00 00 00
+P[0] = TXID[0]
+P[1] = TXID[1]
+P[2] = TXID[2]
+P[3] = RXID[0]
+P[4] = RXID[1]
+P[5] = 00
+P[6] = 00
+P[7] = 00
+
+Normal packets
+---
+A= 74 D1 3A F5 6C
+RF:5,9,14,15,23,28,33,39,42,44,51,57,61,66,72,76
+RF:\x05\x09\x0E\x0F\x17\x1C\x21\x27\x2A\x2C\x33\x39\x3D\x42\x48\x4C
+- order of the channels is unknown and vary over time
+- send 16 times on each channel and switch (counter 00..0F)
+Timing:1772µs between the same 4 packets, 2892µs to the next packet, 8208µs between 2 packets
+Timing:8208 between packets if acked
+P: 00 51 70 02 46 BE 00 00
+P[0] = counter 00..0F
+P[1] = TXID[0]
+P[2] = TXID[1]
+P[3] = TXID[2]
+P[4] = RXID[0]
+P[5] = RXID[1]
+P[6] = TH 00..1F, Break 30, 40 ST_right, 80 ST_left
+P[7] = 00?
+*/
--- a/Multiprotocol/SLT_ccnrf.ino
+++ b/Multiprotocol/SLT_ccnrf.ino
@@ -19,13 +19,18 @@
 #include "iface_nrf250k.h"

 //#define SLT_Q200_FORCE_ID
+//#define SLT_V1_4_FORCE_ID

 // For code readability
-#define SLT_PAYLOADSIZE_V1 7
-#define SLT_PAYLOADSIZE_V2 11
-#define SLT_NFREQCHANNELS 15
-#define SLT_TXID_SIZE 4
-#define SLT_BIND_CHANNEL 0x50
+#define SLT_PAYLOADSIZE_V1		7
+#define SLT_PAYLOADSIZE_V1_4	5
+#define SLT_PAYLOADSIZE_V2		11
+#define SLT_NFREQCHANNELS		15
+#define SLT_TXID_SIZE			4
+#define SLT_BIND_CHANNEL		0x50
+#define SLT6_CH_MIN				182		// 10-bit AETR minimum (captures: 180-185, symmetric around 512)
+#define SLT6_CH_MAX				842		// 10-bit AETR maximum (captures: 829-843, symmetric around 512)
+#define SLT6_SW_THRESHOLD		273		// ~33% of half-range (820/3) for 3-position switch zones

 enum{
 	// flags going to packet[6] (Q200)
@@ -52,9 +57,32 @@ enum {
 	SLT_BIND2,
 };

+// SLT6 sub-cycle states: 3 sub-cycles per triple, each with 2 copies
+enum {
+	SLT6_BUILD_A=0,		// Build packet, configure for 7B sub-cycle
+	SLT6_DATA_A1,		// Send 7B copy 1
+	SLT6_DATA_A2,		// Send 7B copy 2, configure for 6B sub-cycle
+	SLT6_DATA_B1,		// Send 6B copy 1
+	SLT6_DATA_B2,		// Send 6B copy 2, configure for 5B sub-cycle
+	SLT6_DATA_C1,		// Send 5B copy 1
+	SLT6_DATA_C2,		// Send 5B copy 2
+	SLT6_BIND,			// Send bind packet
+};
+
+// SLT6 address XOR values for the 3 sub-cycles
+#define SLT6_ADDR_XOR_A		0x00	// 7B sub-cycle: base address
+#define SLT6_ADDR_XOR_B		0x06	// 6B sub-cycle: byte[0] XOR 0x06
+#define SLT6_ADDR_XOR_C		0x09	// 5B sub-cycle: byte[0] XOR 0x09
+
+// SLT6 timing (from capture 12b, in microseconds)
+#define SLT6_TIMING_SUBCYCLE	5994	// ~6000us between sub-cycle starts
+#define SLT6_TIMING_PAIR		1633	// ~1633us between the two copies within a sub-cycle
+#define SLT6_TIMING_BUILD		1000	// Build+config time at start of each triple
+#define SLT6_TIMING_TRIPLE		(3 * SLT6_TIMING_SUBCYCLE)	// ~18ms triple period
+
 static void __attribute__((unused)) SLT_RF_init()
 {
-	NRF250K_Init();
+	NRF250K_Init(option == 0);	// SLT: option==0 uses NRF24L01, option!=0 uses CC2500 with freq tuning
 	NRF250K_SetTXAddr(rx_tx_addr, SLT_TXID_SIZE);
 }

@@ -72,12 +100,12 @@ static void __attribute__((unused)) SLT_set_freq(void)
 	}

 	// Unique freq
-	uint8_t max_freq=0x50;	//V1 and V2
-	if(sub_protocol==Q200)
+	uint8_t max_freq = 0x50;	//V1 and V2
+	if(sub_protocol == Q200)
 		max_freq=45;
 	for (uint8_t i = 0; i < SLT_NFREQCHANNELS; ++i)
 	{
-		if(sub_protocol==Q200 && hopping_frequency[i] >= max_freq)
+		if(sub_protocol == Q200 && hopping_frequency[i] >= max_freq)
 			hopping_frequency[i] = hopping_frequency[i] - max_freq + 0x03;
 		uint8_t done = 0;
 		while (!done)
@@ -93,9 +121,15 @@ static void __attribute__((unused)) SLT_set_freq(void)
 				}
 		}
 	}
+	#ifdef DEBUG_SERIAL
+		debug("CH:");
+		for (uint8_t i = 0; i < SLT_NFREQCHANNELS; ++i)
+			debug(" %02X(%d)", hopping_frequency[i], hopping_frequency[i]);
+		debugln();
+	#endif
 	
 	//Bind channel
-	hopping_frequency[SLT_NFREQCHANNELS]=SLT_BIND_CHANNEL;
+	hopping_frequency[SLT_NFREQCHANNELS] = SLT_BIND_CHANNEL;
 	
 	//Calib all channels
 	NRF250K_HoppingCalib(SLT_NFREQCHANNELS+1);
@@ -129,44 +163,94 @@ static void __attribute__((unused)) SLT_build_packet()
 	uint8_t e = 0; // byte where extension 2 bits for every 10-bit channel are packed
 	for (uint8_t i = 0; i < 4; ++i)
 	{
-		uint16_t v = convert_channel_10b(CH_AETR[i], false);
-		if(sub_protocol>SLT_V2 && (i==CH2 || i==CH3) )
+		uint16_t v = convert_channel_10b(sub_protocol != SLT_V1_4 ? CH_AETR[i] : i, false);
+		if(sub_protocol>SLT_V2 && (i==CH2 || i==CH3) && sub_protocol != SLT_V1_4 && sub_protocol != RF_SIM)
 			v=1023-v;	// reverse throttle and elevator channels for Q100/Q200/MR100 protocols
 		packet[i] = v;
 		e = (e >> 2) | (uint8_t) ((v >> 2) & 0xC0);
 	}
 	// Extra bits for AETR
 	packet[4] = e;
+
+	//->V1_4CH stops here
+
 	// 8-bit channels
 	packet[5] = convert_channel_8b(CH5);
 	packet[6] = convert_channel_8b(CH6);
-	if(sub_protocol!=SLT_V1)
+
+	if(sub_protocol == Q200)
+		packet[6] =  GET_FLAG(CH9_SW , FLAG_Q200_FMODE)
+					|GET_FLAG(CH10_SW, FLAG_Q200_FLIP)
+					|GET_FLAG(CH11_SW, FLAG_Q200_VIDON)
+					|GET_FLAG(CH12_SW, FLAG_Q200_VIDOFF);
+	else if(sub_protocol == MR100 || sub_protocol == Q100)
+		packet[6] =  GET_FLAG(CH9_SW , FLAG_MR100_FMODE)
+					|GET_FLAG(CH10_SW, FLAG_MR100_FLIP)
+					|GET_FLAG(CH11_SW, FLAG_MR100_VIDEO)	// Does not exist on the Q100 but...
+					|GET_FLAG(CH12_SW, FLAG_MR100_PICTURE);	// Does not exist on the Q100 but...
+	packet[7] = convert_channel_8b(CH7);
+	packet[8] = convert_channel_8b(CH8);
+	if(sub_protocol == RF_SIM)
 	{
-		if(sub_protocol==Q200)
-			packet[6] =  GET_FLAG(CH9_SW , FLAG_Q200_FMODE)
-						|GET_FLAG(CH10_SW, FLAG_Q200_FLIP)
-						|GET_FLAG(CH11_SW, FLAG_Q200_VIDON)
-						|GET_FLAG(CH12_SW, FLAG_Q200_VIDOFF);
-		else if(sub_protocol==MR100 || sub_protocol==Q100)
-			packet[6] =  GET_FLAG(CH9_SW , FLAG_MR100_FMODE)
-						|GET_FLAG(CH10_SW, FLAG_MR100_FLIP)
-						|GET_FLAG(CH11_SW, FLAG_MR100_VIDEO)	// Does not exist on the Q100 but...
-						|GET_FLAG(CH12_SW, FLAG_MR100_PICTURE);	// Does not exist on the Q100 but...
-		packet[7]=convert_channel_8b(CH7);
-		packet[8]=convert_channel_8b(CH8);
-		packet[9]=0xAA;				//normal mode for Q100/Q200, unknown for V2/MR100
-		packet[10]=0x00;			//normal mode for Q100/Q200, unknown for V2/MR100
-		if((sub_protocol==Q100 || sub_protocol==Q200) && CH13_SW)
-		{//Calibrate
-			packet[9]=0x77;			//enter calibration
-			if(calib_counter>=20 && calib_counter<=25)	// 7 packets for Q100 / 3 packets for Q200
-				packet[10]=0x20;	//launch calibration
-			calib_counter++;
-			if(calib_counter>250) calib_counter=250;
-		}
-		else
-			calib_counter=0;
+		packet[9]  = convert_channel_8b(CH9);
+		packet[10] = convert_channel_8b(CH10);
 	}
+	else
+	{
+		packet[9]  = 0xAA;		//normal mode for Q100/Q200, unknown for V2/MR100
+		packet[10] = 0x00;		//normal mode for Q100/Q200, unknown for V2/MR100
+	}
+	if((sub_protocol == Q100 || sub_protocol == Q200) && CH13_SW)
+	{//Calibrate
+		packet[9] = 0x77;			//enter calibration
+		if(calib_counter >= 20 && calib_counter <= 25)	// 7 packets for Q100 / 3 packets for Q200
+			packet[10] = 0x20;	//launch calibration
+		calib_counter++;
+		if(calib_counter > 250) calib_counter = 250;
+	}
+	else
+		calib_counter = 0;
+}
+
+// SLT6: build 7-byte data packet from current channel values
+static void __attribute__((unused)) SLT6_build_packet()
+{
+	// aileron, elevator, throttle, rudder (10-bit, limited range)
+	uint8_t e = 0;
+	for (uint8_t i = 0; i < 4; ++i)
+	{
+		uint16_t v = convert_channel_16b_limit(CH_AETR[i], SLT6_CH_MIN, SLT6_CH_MAX);
+		packet[i] = v;
+		e = (e >> 2) | (uint8_t) ((v >> 2) & 0xC0);
+	}
+	packet[4] = e;
+
+	// Flight mode: 3 positions at ~33% each
+	if(Channel_data[CH5] > CHANNEL_MID + SLT6_SW_THRESHOLD)
+		packet[5] = 0xD0;
+	else if(Channel_data[CH5] < CHANNEL_MID - SLT6_SW_THRESHOLD)
+		packet[5] = 0x30;
+	else
+		packet[5] = 0x80;
+
+	// Panic: only active when CH6 is below -33%, center and up = no panic
+	if(Channel_data[CH6] < CHANNEL_MID - SLT6_SW_THRESHOLD)
+		packet[6] = 0x30;
+	else
+		packet[6] = 0xD0;
+}
+
+// SLT6: configure radio for a sub-cycle (set address and channel)
+static void __attribute__((unused)) SLT6_configure_radio(uint8_t addr_xor, uint8_t hop_offset)
+{
+	SLT_wait_radio();
+	// Set TX address with XOR on byte[0]
+	uint8_t addr[SLT_TXID_SIZE];
+	memcpy(addr, rx_tx_addr, SLT_TXID_SIZE);
+	addr[0] ^= addr_xor;
+	NRF250K_SetTXAddr(addr, SLT_TXID_SIZE);
+	// Set RF channel
+	NRF250K_Hopping((hopping_frequency_no + hop_offset) % SLT_NFREQCHANNELS);
 }

 static void __attribute__((unused)) SLT_send_bind_packet()
@@ -177,8 +261,8 @@ static void __attribute__((unused)) SLT_send_bind_packet()
 	NRF250K_SetPower();
 	BIND_DONE;
 	NRF250K_SetTXAddr((uint8_t *)"\x7E\xB8\x63\xA9", SLT_TXID_SIZE);
-	memcpy((void*)packet,(void*)rx_tx_addr,SLT_TXID_SIZE);
-	if(phase==SLT_BIND2)
+	memcpy((void*)packet, (void*)rx_tx_addr, SLT_TXID_SIZE);
+	if(phase == SLT_BIND2 || phase == SLT6_BIND)
 		SLT_send_packet(SLT_TXID_SIZE);
 	else // SLT_BIND1
 		SLT_send_packet(SLT_PAYLOADSIZE_V2);
@@ -186,17 +270,82 @@ static void __attribute__((unused)) SLT_send_bind_packet()

 #define SLT_TIMING_BUILD		1000
 #define SLT_V1_TIMING_PACKET	1000
+#define SLT_V1_4_TIMING_PACKET	1643
 #define SLT_V2_TIMING_PACKET	2042
 #define SLT_V1_TIMING_BIND2		1000
 #define SLT_V2_TIMING_BIND1		6507
 #define SLT_V2_TIMING_BIND2		2112
-uint16_t SLT_callback()
+
+// SLT6 callback: triple-address state machine
+// Each triple: 3 sub-cycles (7B, 6B, 5B), each sent twice, with different addresses and channels
+static uint16_t __attribute__((unused)) SLT6_callback()
 {
 	switch (phase)
 	{
-		case SLT_BUILD:
+		case SLT6_BUILD_A:
 			#ifdef MULTI_SYNC
-				telemetry_set_input_sync(sub_protocol==SLT_V1?20000:13730);
+				telemetry_set_input_sync(SLT6_TIMING_TRIPLE);
+			#endif
+			SLT6_build_packet();
+			NRF250K_SetPower();
+			SLT6_configure_radio(SLT6_ADDR_XOR_A, 0);	// 7B sub-cycle: base address, hop+0
+			phase = SLT6_DATA_A1;
+			return SLT6_TIMING_BUILD;
+		case SLT6_DATA_A1:
+			SLT_send_packet(7);
+			phase = SLT6_DATA_A2;
+			return SLT6_TIMING_PAIR;					// 1633us between copies
+		case SLT6_DATA_A2:
+			SLT_send_packet(7);
+			SLT6_configure_radio(SLT6_ADDR_XOR_B, 3);	// 6B sub-cycle: XOR 0x06 address, hop+3
+			phase = SLT6_DATA_B1;
+			return SLT6_TIMING_SUBCYCLE - SLT6_TIMING_PAIR;	// 4361us to next sub-cycle TX
+		case SLT6_DATA_B1:
+			SLT_send_packet(6);
+			phase = SLT6_DATA_B2;
+			return SLT6_TIMING_PAIR;
+		case SLT6_DATA_B2:
+			SLT_send_packet(6);
+			SLT6_configure_radio(SLT6_ADDR_XOR_C, 6);	// 5B sub-cycle: XOR 0x09 address, hop+6
+			phase = SLT6_DATA_C1;
+			return SLT6_TIMING_SUBCYCLE - SLT6_TIMING_PAIR;	// 4361us
+		case SLT6_DATA_C1:
+			SLT_send_packet(5);
+			phase = SLT6_DATA_C2;
+			return SLT6_TIMING_PAIR;
+		case SLT6_DATA_C2:
+			SLT_send_packet(5);
+			// Advance hopping for next triple
+			if (++hopping_frequency_no >= SLT_NFREQCHANNELS)
+				hopping_frequency_no = 0;
+			if (++packet_count >= 100)
+			{// Send bind packet periodically
+				packet_count = 0;
+				phase = SLT6_BIND;
+				return SLT_V1_TIMING_BIND2;
+			}
+			phase = SLT6_BUILD_A;
+			return SLT6_TIMING_SUBCYCLE - SLT6_TIMING_PAIR - SLT6_TIMING_BUILD;	// Gap before next build
+		case SLT6_BIND:
+			SLT_send_bind_packet();
+			phase = SLT6_BUILD_A;
+			return SLT6_TIMING_SUBCYCLE - SLT6_TIMING_PAIR - SLT6_TIMING_BUILD;
+	}
+	return SLT6_TIMING_TRIPLE;
+}
+
+uint16_t SLT_callback()
+{
+	// SLT6 has its own state machine
+	if(sub_protocol == SLT6TX)
+		return SLT6_callback();
+
+	switch (phase)
+	{
+		case SLT_BUILD:
+			//debugln_time("b ");
+			#ifdef MULTI_SYNC
+				telemetry_set_input_sync(packet_period);
 			#endif
 			SLT_build_packet();
 			NRF250K_SetPower();					//Change power level
@@ -206,42 +355,39 @@ uint16_t SLT_callback()
 		case SLT_DATA1:
 		case SLT_DATA2:
 			phase++;
-			if(sub_protocol==SLT_V1)
-			{
-				SLT_send_packet(SLT_PAYLOADSIZE_V1);
+			SLT_send_packet(packet_length);
+			if(sub_protocol == SLT_V1)
 				return SLT_V1_TIMING_PACKET;
-			}
-			else //V2
+			if(sub_protocol == SLT_V1_4)
 			{
-				SLT_send_packet(SLT_PAYLOADSIZE_V2);
-				return SLT_V2_TIMING_PACKET;
+				phase++;						//Packets are sent two times only
+				return SLT_V1_4_TIMING_PACKET;
 			}
+			//V2
+			return SLT_V2_TIMING_PACKET;
 		case SLT_DATA3:
-			if(sub_protocol==SLT_V1)
-				SLT_send_packet(SLT_PAYLOADSIZE_V1);
-			else //V2
-				SLT_send_packet(SLT_PAYLOADSIZE_V2);
+			SLT_send_packet(packet_length);
 			if (++packet_count >= 100)
 			{// Send bind packet
 				packet_count = 0;
-				if(sub_protocol==SLT_V1)
+				if(sub_protocol == SLT_V1 || sub_protocol == SLT_V1_4)
 				{
-					phase=SLT_BIND2;
+					phase = SLT_BIND2;
 					return SLT_V1_TIMING_BIND2;
 				}
-				else //V2
-				{
-					phase=SLT_BIND1;
-					return SLT_V2_TIMING_BIND1;
-				}
+				//V2
+				phase = SLT_BIND1;
+				return SLT_V2_TIMING_BIND1;
 			}
 			else
 			{// Continue to send normal packets
 				phase = SLT_BUILD;
-				if(sub_protocol==SLT_V1)
-					return 20000-SLT_TIMING_BUILD;
-				else //V2
-					return 13730-SLT_TIMING_BUILD;
+				if(sub_protocol == SLT_V1)
+					return 20000 - SLT_TIMING_BUILD;
+				if(sub_protocol==SLT_V1_4)
+					return 18000 - SLT_TIMING_BUILD - SLT_V1_4_TIMING_PACKET;
+				//V2
+				return 13730 - SLT_TIMING_BUILD;
 			}
 		case SLT_BIND1:
 			SLT_send_bind_packet();
@@ -250,10 +396,12 @@ uint16_t SLT_callback()
 		case SLT_BIND2:
 			SLT_send_bind_packet();
 			phase = SLT_BUILD;
-			if(sub_protocol==SLT_V1)
-				return 20000-SLT_TIMING_BUILD-SLT_V1_TIMING_BIND2;
-			else //V2
-				return 13730-SLT_TIMING_BUILD-SLT_V2_TIMING_BIND1-SLT_V2_TIMING_BIND2;
+			if(sub_protocol == SLT_V1)
+				return 20000 - SLT_TIMING_BUILD - SLT_V1_TIMING_BIND2;
+			if(sub_protocol == SLT_V1_4)
+				return 18000 - SLT_TIMING_BUILD - SLT_V1_TIMING_BIND2 - SLT_V1_4_TIMING_PACKET;
+			//V2
+			return 13730 - SLT_TIMING_BUILD - SLT_V2_TIMING_BIND1 - SLT_V2_TIMING_BIND2;
 	}
 	return 19000;
 }
@@ -264,7 +412,44 @@ void SLT_init()
 	packet_count = 0;
 	packet_sent = 0;
 	hopping_frequency_no = 0;
-	if(sub_protocol==Q200)
+
+	if(sub_protocol == SLT6TX)
+	{
+		hopping_frequency_no = 1;	// SLT6 starts hopping at index 1 (verified from captures)
+		// packet_length not used for SLT6 (lengths vary per sub-cycle)
+		#ifdef MULTI_SYNC
+			packet_period = SLT6_TIMING_TRIPLE;
+		#endif
+	}
+	else if(sub_protocol == SLT_V1)
+	{
+		packet_length = SLT_PAYLOADSIZE_V1;
+		#ifdef MULTI_SYNC
+			packet_period = 20000+2*SLT_V1_TIMING_PACKET;		//22ms
+		#endif
+	}
+	else if(sub_protocol == SLT_V1_4)
+	{
+		packet_length = SLT_PAYLOADSIZE_V1_4;
+		#ifdef MULTI_SYNC
+			packet_period = 18000;								//18ms
+		#endif
+		 //Force high part of the ID otherwise the RF frequencies do not match, only tested the 2 last bytes...
+		rx_tx_addr[0]=0xF4;
+		rx_tx_addr[1]=0x71;
+		#ifdef SLT_V1_4_FORCE_ID	// ID taken from TX dumps
+			memcpy(rx_tx_addr,"\xF4\x71\x8D\x01",SLT_TXID_SIZE);
+		#endif
+	}
+	else //V2
+	{
+		packet_length = SLT_PAYLOADSIZE_V2;
+		#ifdef MULTI_SYNC
+			packet_period = 13730+2*SLT_V2_TIMING_PACKET;		//~18ms
+		#endif
+	}
+
+	if(sub_protocol == Q200)
 	{ //Q200: Force high part of the ID otherwise it won't bind
 		rx_tx_addr[0]=0x01;
 		rx_tx_addr[1]=0x02;
@@ -273,9 +458,16 @@ void SLT_init()
 		/*	rx_tx_addr[0]=0x01;rx_tx_addr[1]=0x02;rx_tx_addr[2]=0x0B;rx_tx_addr[3]=0x57;*/
 		#endif
 	}
+
 	SLT_RF_init();
 	SLT_set_freq();
-	phase = SLT_BUILD;
+
+	if(sub_protocol == SLT6TX)
+		phase = SLT6_BUILD_A;
+	else
+		phase = SLT_BUILD;
 }

 #endif
+//SLT v1_4ch timing
+//268363 + 1643 / 15 = 18000
--- a/Multiprotocol/Scorpio_cyrf6936.ino
+++ b/Multiprotocol/Scorpio_cyrf6936.ino
@@ -0,0 +1,123 @@
+/*
+ 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(SCORPIO_CYRF6936_INO)
+
+#include "iface_cyrf6936.h"
+
+//#define SCORPIO_FORCE_ID
+
+#define SCORPIO_PACKET_PERIOD		12000
+#define SCORPIO_PACKETCH_PERIOD		2580
+#define SCORPIO_BINDPAYLOAD_SIZE	8
+#define SCORPIO_PAYLOAD_SIZE		10
+#define SCORPIO_BIND_COUNT			1000
+#define SCORPIO_RF_NUM_CHANNELS		3
+
+static uint16_t __attribute__((unused)) SCORPIO_send_packet()
+{
+	if(IS_BIND_IN_PROGRESS)
+	{
+		packet[0] = 0x88;					//FIXME: What is this?
+		packet[1] = 0x55;					//FIXME: What is this?
+		packet[2] = crc;					//CRC_low  for normal packets
+		packet[3] = crc >> 8;				//CRC_high for normal packets
+		packet[4] = hopping_frequency[0];	//RF freq 0
+		packet[5] = hopping_frequency[1];	//RF freq 1
+		packet[6] = hopping_frequency[2];	//RF freq 2
+		packet[7] = 0x80;					//FIXME: What is this?
+		//SendPacket
+		CYRF_WriteDataPacketLen(packet, SCORPIO_BINDPAYLOAD_SIZE);
+		return SCORPIO_PACKET_PERIOD;
+	}
+	CYRF_ConfigRFChannel(hopping_frequency[hopping_frequency_no]);
+	CYRF_SetPower(0x28);					//Update power
+	delayMicroseconds(180);					//Frequency settle time
+	packet[0] = hopping_frequency[0];
+	packet[1] = hopping_frequency[1];
+	packet[2] = hopping_frequency[2];
+	packet[3] = convert_channel_8b(THROTTLE);
+	packet[4] = 0xFF - convert_channel_8b(RUDDER);
+	packet[5] = convert_channel_8b(ELEVATOR);
+	packet[6] = convert_channel_8b(AILERON);
+	packet[7] = 0x55;						//FIXME: What is this?
+	packet[8] = 0x00;						//FIXME: What is this?
+	packet[9] = 0x00;						//FIXME: What is this?
+	CYRF_WriteDataPacketLen(packet, SCORPIO_PAYLOAD_SIZE);
+	hopping_frequency_no++;
+	if(hopping_frequency_no >= SCORPIO_RF_NUM_CHANNELS)
+	{
+		hopping_frequency_no = 0;
+		return SCORPIO_PACKET_PERIOD - 2*SCORPIO_PACKETCH_PERIOD;
+	}
+	return SCORPIO_PACKETCH_PERIOD;
+}
+
+static void __attribute__((unused)) SCORPIO_RF_init()
+{
+	/* Initialise CYRF chip */
+	CYRF_WriteRegister(CYRF_32_AUTO_CAL_TIME,	0x3C);
+	CYRF_WriteRegister(CYRF_35_AUTOCAL_OFFSET,	0x14);
+	CYRF_WriteRegister(CYRF_1B_TX_OFFSET_LSB,	0x55);
+	CYRF_WriteRegister(CYRF_1C_TX_OFFSET_MSB,	0x05);
+	CYRF_WriteRegister(CYRF_10_FRAMING_CFG,		0xE8);
+	CYRF_SetPower(0x28);
+	CYRF_SetTxRxMode(TX_EN);
+}
+
+static void __attribute__((unused)) SCORPIO_TX_init()
+{
+	calc_fh_channels(3);	// select 3 frequencies between 2 and 77. FIXME: Could they be choosen on the spot finding empty frequencies?
+	crc = (rx_tx_addr[0] ^ rx_tx_addr[1] ^ RX_num) + ((rx_tx_addr[2] ^ rx_tx_addr[3] ^ RX_num) << 8);
+
+	#ifdef SCORPIO_FORCE_ID
+		crc = 0x689C;
+		hopping_frequency[0] = 0x26;
+		hopping_frequency[1] = 0x49;
+		hopping_frequency[2] = 0x2E;
+	#endif
+	//debugln("C0:%02X, C1:%02X, C2:%02X, CRC:%04X", hopping_frequency[0], hopping_frequency[1], hopping_frequency[2], crc);
+	CYRF_ConfigRFChannel(hopping_frequency[0]);	// Use first RF channel for bind
+}
+
+uint16_t SCORPIO_callback()
+{
+	#ifdef MULTI_SYNC
+		telemetry_set_input_sync(SCORPIO_PACKET_PERIOD);
+	#endif
+	if(bind_counter)
+		if(--bind_counter==0)
+		{
+			CYRF_ConfigCRCSeed(crc);
+			BIND_DONE;
+		}
+	return SCORPIO_send_packet();
+}
+
+void SCORPIO_init()
+{
+	SCORPIO_RF_init();
+	SCORPIO_TX_init();
+	if(IS_BIND_IN_PROGRESS)
+	{
+		bind_counter = SCORPIO_BIND_COUNT;
+		CYRF_ConfigCRCSeed(0x0001);
+	}
+	else
+		bind_counter = 1;
+	hopping_frequency_no = 0;
+}
+
+#endif
--- a/Multiprotocol/TRAXXAS_cyrf6936.ino
+++ b/Multiprotocol/TRAXXAS_cyrf6936.ino
@@ -19,56 +19,72 @@

 #include "iface_cyrf6936.h"

-//#define TRAXXAS_FORCE_ID
+#define TRAXXAS_TQ1_FORCE_ID
+//#define TRAXXAS_TQ2_FORCE_ID
+#define TRAXXAS_DEBUG

-#define TRAXXAS_CHANNEL 0x05
-#define TRAXXAS_BIND_CHANNEL 0x2B
-#define TRAXXAS_PACKET_SIZE 16
+#define TRAXXAS_BIND_CHANNEL		0x2B
+#define TRAXXAS_CHECK_CHANNEL		0x22
+#define TRAXXAS_PACKET_SIZE			16
+
+#define TRAXXAS_TQ1_BIND_CHANNEL	0x04
+#define TRAXXAS_TQ1_CHECK_CHANNEL	0x34

 enum {
 	TRAXXAS_BIND_PREP_RX=0,
 	TRAXXAS_BIND_RX,
 	TRAXXAS_BIND_TX1,
+	TRAXXAS_PREP_RX,
+	TRAXXAS_RX,
 	TRAXXAS_PREP_DATA,
 	TRAXXAS_DATA,
+	TRAXXAS_TQ1_BIND,
+	TRAXXAS_TQ1_DATA1,
+	TRAXXAS_TQ1_DATA2,
 };

-const uint8_t PROGMEM TRAXXAS_sop_bind[] ={ 0x3C, 0x37, 0xCC, 0x91, 0xE2, 0xF8, 0xCC, 0x91 };
-const uint8_t PROGMEM TRAXXAS_sop_data[] ={ 0xA1, 0x78, 0xDC, 0x3C, 0x9E, 0x82, 0xDC, 0x3C };
-//const uint8_t PROGMEM TRAXXAS_sop_check[]={ 0x97, 0xE5, 0x14, 0x72, 0x7F, 0x1A, 0x14, 0x72 };
-
 const uint8_t PROGMEM TRAXXAS_init_vals[][2] = {
 	//Init from dump
-	{CYRF_0B_PWR_CTRL, 0x00},					// PMU
 	{CYRF_32_AUTO_CAL_TIME, 0x3C},				// Default init value
 	{CYRF_35_AUTOCAL_OFFSET, 0x14},				// Default init value
 	{CYRF_1B_TX_OFFSET_LSB, 0x55},				// Default init value
 	{CYRF_1C_TX_OFFSET_MSB, 0x05},				// Default init value
 	{CYRF_28_CLK_EN, 0x02},						// Force Receive Clock Enable
+	{CYRF_03_TX_CFG, 0x08 | CYRF_BIND_POWER},	// 8DR Mode, 32 chip codes
+	{CYRF_0B_PWR_CTRL, 0x00},					// PMU
 	{CYRF_06_RX_CFG, 0x88 | 0x02},				// AGC enabled, Fast Turn Mode enabled, adding overwrite enable to not lockup RX
 	{CYRF_1E_RX_OVERRIDE, 0x08},				// Reject packets with 0 seed
-	{CYRF_03_TX_CFG, 0x08 | CYRF_BIND_POWER},	// 8DR Mode, 32 chip codes
 };

 static void __attribute__((unused)) TRAXXAS_cyrf_bind_config()
 {
-	CYRF_PROGMEM_ConfigSOPCode(TRAXXAS_sop_bind);
+	CYRF_PROGMEM_ConfigSOPCode(DEVO_j6pro_sopcodes[0]);
 	CYRF_WriteRegister(CYRF_15_CRC_SEED_LSB, 0x5A);
 	CYRF_WriteRegister(CYRF_16_CRC_SEED_MSB, 0x5A);
 	CYRF_ConfigRFChannel(TRAXXAS_BIND_CHANNEL);
 }

+static void __attribute__((unused)) TRAXXAS_cyrf_check_config()
+{
+	CYRF_ConfigRFChannel(TRAXXAS_CHECK_CHANNEL);
+	CYRF_PROGMEM_ConfigSOPCode(DEVO_j6pro_sopcodes[9]);
+	CYRF_WriteRegister(CYRF_15_CRC_SEED_LSB, 0xA5);
+	CYRF_WriteRegister(CYRF_16_CRC_SEED_MSB, 0xA5);
+}
+
 static void __attribute__((unused)) TRAXXAS_cyrf_data_config()
 {
-	CYRF_PROGMEM_ConfigSOPCode(TRAXXAS_sop_data);
+	CYRF_ConfigRFChannel(hopping_frequency[0]);
 	#ifdef TRAXXAS_FORCE_ID					// data taken from TX dump
 		CYRF_WriteRegister(CYRF_15_CRC_SEED_LSB, 0x1B);
 		CYRF_WriteRegister(CYRF_16_CRC_SEED_MSB, 0x3F);
+		CYRF_PROGMEM_ConfigSOPCode(DEVO_j6pro_sopcodes[6]);
 	#else
-		CYRF_WriteRegister(CYRF_15_CRC_SEED_LSB, cyrfmfg_id[0]+0xB6);
-		CYRF_WriteRegister(CYRF_16_CRC_SEED_MSB, cyrfmfg_id[1]+0x5D);
+		uint16_t addr=TRAXXAS_EEPROM_OFFSET+RX_num*3;
+		CYRF_WriteRegister(CYRF_15_CRC_SEED_LSB, cyrfmfg_id[0] - eeprom_read_byte((EE_ADDR)(addr + 0)));
+		CYRF_WriteRegister(CYRF_16_CRC_SEED_MSB, cyrfmfg_id[1] - eeprom_read_byte((EE_ADDR)(addr + 1)));
+		CYRF_PROGMEM_ConfigSOPCode(DEVO_j6pro_sopcodes[eeprom_read_byte((EE_ADDR)(addr + 2)) % 20]);
 	#endif
-	CYRF_ConfigRFChannel(TRAXXAS_CHANNEL);
 	CYRF_SetTxRxMode(TX_EN);
 }

@@ -76,25 +92,60 @@ static void __attribute__((unused)) TRAXXAS_send_data_packet()
 {
 	packet[0] = 0x01;
 	memset(&packet[1],0x00,TRAXXAS_PACKET_SIZE-1);
-	//Steering
-	uint16_t ch = convert_channel_16b_nolimit(RUDDER,500,1000,false);
-	packet[2]=ch>>8;
-	packet[3]=ch;
-	//Throttle
-	ch = convert_channel_16b_nolimit(THROTTLE,500,1000,false);
-	packet[4]=ch>>8;
-	packet[5]=ch;
-	//AUX3
-	ch = convert_channel_16b_nolimit(AILERON,500,1000,false);
-	packet[6]=ch>>8;
-	packet[7]=ch;
-	//AUX4???
-	ch = convert_channel_16b_nolimit(ELEVATOR,500,1000,false);
-	packet[12]=ch>>8;
-	packet[13]=ch;
+	//Next RF channel ? 0x00 -> keep current, 0x0E change to F=15
+	//packet[1] = hopping_frequency[0] - 1;
+	
+	//6 channels
+	uint16_t ch;
+	for(uint8_t i=0; i<6; i++)
+	{
+		ch = convert_channel_16b_nolimit(i,500,1000,false);
+		packet[2+i*2]=ch>>8;
+		packet[3+i*2]=ch;
+	}

 	CYRF_SetPower(0x08);
-	CYRF_WriteDataPacketLen(packet, TRAXXAS_PACKET_SIZE);
+	CYRF_WriteDataPacket(packet);
+}
+
+static void __attribute__((unused)) TRAXXAS_TQ1_send_data_packet()
+{
+	memcpy(&packet[1], cyrfmfg_id, 4);
+	if(IS_BIND_IN_PROGRESS)
+	{
+		packet_length = 8;
+		packet[0] = 0x2A;						// Bind packet
+		packet[5] = 0xA0;						// Bind phase 0
+		packet[6] = TRAXXAS_TQ1_BIND_CHANNEL-1;	// Not sure...
+	}
+	else
+	{
+		packet_length = 16;
+		packet[0] = 0x02;						// Normal packet
+		packet[5] = 0xA2;						// Bind phase 2 = completed?
+		//4 channels
+		uint16_t ch;
+		for(uint8_t i=0; i<4; i++)
+		{
+			ch = convert_channel_ppm(i);
+			packet[6+i*2]=ch;
+			packet[7+i*2]=ch>>8;
+		}
+		packet[14] = hopping_frequency[0]-1;	// Not sure...
+	}
+	uint8_t xor_value=0;
+	for(uint8_t i=0; i<packet_length-1; i++)
+		xor_value ^= packet[i];
+	packet[packet_length-1] = xor_value;
+
+	CYRF_SetPower(0x08);
+	CYRF_WriteDataPacketLen(packet, packet_length);
+	#ifdef TRAXXAS_DEBUG
+		debug("P:");
+		for(uint8_t i=0; i<packet_length; i++)
+			debug(" %02X",packet[i]);
+		debugln("");
+	#endif
 }

 uint16_t TRAXXAS_callback()
@@ -103,133 +154,443 @@ uint16_t TRAXXAS_callback()
 	
 	switch(phase)
 	{
+		//TQ2
 		case TRAXXAS_BIND_PREP_RX:
-			TRAXXAS_cyrf_bind_config();
+		case TRAXXAS_PREP_RX:
+			//debugln("PREP_RX");
+			if(phase == TRAXXAS_BIND_PREP_RX)
+				TRAXXAS_cyrf_bind_config();
+			else
+				TRAXXAS_cyrf_check_config();
 			CYRF_SetTxRxMode(RX_EN);								//Receive mode
 			CYRF_WriteRegister(CYRF_05_RX_CTRL, 0x83);				//Prepare to receive
 			packet_count=100;										//Timeout for RX
-			phase=TRAXXAS_BIND_RX;
-			return 700;
+			phase++;	// TRAXXAS_BIND_RX or TRAXXAS_RX
+			return 7000;
 		case TRAXXAS_BIND_RX:
+		case TRAXXAS_RX:
+			//debugln("RX");
 			//Read data from RX
 			status = CYRF_ReadRegister(CYRF_07_RX_IRQ_STATUS);
 			if((status & 0x03) == 0x02)  							// RXC=1, RXE=0 then 2nd check is required (debouncing)
 				status |= CYRF_ReadRegister(CYRF_07_RX_IRQ_STATUS);
-			debugln("s=%02X",status);
+			#ifdef TRAXXAS_DEBUG
+				//debugln("s=%02X",status);
+			#endif
 			CYRF_WriteRegister(CYRF_07_RX_IRQ_STATUS, 0x80);		// need to set RXOW before data read
 			if((status & 0x07) == 0x02)
 			{ // Data received with no errors
 				len=CYRF_ReadRegister(CYRF_09_RX_COUNT);
-				debugln("L=%02X",len)
+				#ifdef TRAXXAS_DEBUG
+					debugln("L=%02X",len)
+				#endif
 				if(len==TRAXXAS_PACKET_SIZE)
 				{
 					CYRF_ReadDataPacketLen(packet, TRAXXAS_PACKET_SIZE);
-					debug("RX=");
-					for(uint8_t i=0;i<TRAXXAS_PACKET_SIZE;i++)
-						debug(" %02X",packet[i]);
-					debugln("");
+					#ifdef TRAXXAS_DEBUG
+						debug("RX=");
+						for(uint8_t i=0;i<TRAXXAS_PACKET_SIZE;i++)
+							debug(" %02X",packet[i]);
+						debugln("");
+					#endif
+					uint16_t addr=TRAXXAS_EEPROM_OFFSET+RX_num*3;
+					if(phase == TRAXXAS_BIND_RX)
+					{
+						// Store RX ID
+						for(uint8_t i=0;i<2;i++)
+							eeprom_write_byte((EE_ADDR)(addr+i),packet[i+1]);
+						//Store SOP index
+						eeprom_write_byte((EE_ADDR)(addr+2),packet[7]);
+					}
+					else
+					{
+						//check RX ID and SOP
+						if(eeprom_read_byte((EE_ADDR)(addr + 0)) != packet[1] || eeprom_read_byte((EE_ADDR)(addr + 1)) != packet[2] || eeprom_read_byte((EE_ADDR)(addr + 2)) != packet[7])
+						{ // Not our RX
+							phase++;	// TRAXXAS_PREP_DATA
+							return 10000-7000-500;
+						}
+					}
+					// Replace RX ID by TX ID
 					for(uint8_t i=0;i<6;i++)
 						packet[i+1]=cyrfmfg_id[i];
-					packet[10]=0x01;
+					//packet[7 ] = 0xEE;							// Not needed ??
+					packet[8 ] = hopping_frequency[0] - 1;
+					packet[10] = 0x01;								// Must change otherwise bind doesn't complete
+					//packet[13] = 0x05;							// Not needed ??
 					packet_count=12;
 					CYRF_SetTxRxMode(TX_EN);
 					phase=TRAXXAS_BIND_TX1;
-					return 200;
+					return 10000;
 				}
 			}
-			if( --packet_count == 0 )
-			{ // Retry RX
-				CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x20);			// Enable RX abort
-				CYRF_WriteRegister(CYRF_0F_XACT_CFG, 0x24);			// Force end state
-				CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x00);			// Disable RX abort
-				if(--bind_counter != 0)
-					phase=TRAXXAS_BIND_PREP_RX;						// Retry receiving bind packet
-				else
-					phase=TRAXXAS_PREP_DATA;						// Abort binding
+			if(phase == TRAXXAS_BIND_RX)
+			{
+				if( --packet_count == 0 )
+				{ // Retry RX
+					CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x20);		// Enable RX abort
+					CYRF_WriteRegister(CYRF_0F_XACT_CFG, 0x24);		// Force end state
+					CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x00);		// Disable RX abort
+					if(--bind_counter != 0)
+						phase=TRAXXAS_BIND_PREP_RX;					// Retry receiving bind packet
+					else
+						phase=TRAXXAS_PREP_DATA;					// Abort binding
+				}
+				return 700;
 			}
-			return 700;
+			CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x20);				// Enable RX abort
+			CYRF_WriteRegister(CYRF_0F_XACT_CFG, 0x24);				// Force end state
+			CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x00);				// Disable RX abort
+			phase++;	// TRAXXAS_PREP_DATA
+			return 10000-7000-500;
 		case TRAXXAS_BIND_TX1:
+			//debugln("BIND_TX1");
 			CYRF_WriteDataPacketLen(packet, TRAXXAS_PACKET_SIZE);
-			debug("P=");
-			for(uint8_t i=0;i<TRAXXAS_PACKET_SIZE;i++)
-				debug(" %02X",packet[i]);
-			debugln("");
+			#ifdef TRAXXAS_DEBUG
+				debug("P=");
+				for(uint8_t i=0;i<TRAXXAS_PACKET_SIZE;i++)
+					debug(" %02X",packet[i]);
+				debugln("");
+			#endif
 			if(--packet_count==0)	// Switch to normal mode
 				phase=TRAXXAS_PREP_DATA;
 			break;
 		case TRAXXAS_PREP_DATA:
+			//debugln("PREP_DATA");
 			BIND_DONE;
 			TRAXXAS_cyrf_data_config();
 			phase++;
+			return 500;
 		case TRAXXAS_DATA:
+			//debugln_time("DATA");
 			#ifdef MULTI_SYNC
-				telemetry_set_input_sync(13940);
+				telemetry_set_input_sync(10000);
 			#endif
 			TRAXXAS_send_data_packet();
-			break;
+			phase = TRAXXAS_PREP_RX;
+			return 1000;
+		//TQ1
+		case TRAXXAS_TQ1_BIND:
+			if(bind_counter)
+			{
+				CYRF_ConfigRFChannel(TRAXXAS_TQ1_BIND_CHANNEL);
+				TRAXXAS_TQ1_send_data_packet();
+				bind_counter--;
+				if(bind_counter == 0)
+				{
+					BIND_DONE;
+					phase++;
+				}
+			}
+			return 10000;
+		case TRAXXAS_TQ1_DATA1:
+			#ifdef MULTI_SYNC
+				telemetry_set_input_sync(19900);
+			#endif
+			CYRF_ConfigRFChannel(TRAXXAS_TQ1_CHECK_CHANNEL);
+			TRAXXAS_TQ1_send_data_packet();
+			phase++;
+			return 7100;
+		case TRAXXAS_TQ1_DATA2:
+			CYRF_ConfigRFChannel(hopping_frequency[0]);
+			TRAXXAS_TQ1_send_data_packet();
+			phase = TRAXXAS_TQ1_DATA1;
+			return 12800;
 	}
-	return 13940;
+	return 10000;
 }

 void TRAXXAS_init()
 { 
 	//Config CYRF registers
-	for(uint8_t i = 0; i < sizeof(TRAXXAS_init_vals) / 2; i++)	
-		CYRF_WriteRegister(pgm_read_byte_near(&TRAXXAS_init_vals[i][0]), pgm_read_byte_near(&TRAXXAS_init_vals[i][1]));
+	uint8_t init;
+	if(sub_protocol == TRAXXAS_TQ1)
+	{
+		//CYRF_WriteRegister(CYRF_06_RX_CFG, 0x48 | 0x02);
+		//CYRF_WriteRegister(CYRF_26_XTAL_CFG, 0x08);
+		init = 5;
+	}
+	else //TQ2
+	{
+		init = sizeof(TRAXXAS_init_vals) / 2;
+		for(uint8_t i = 0; i < init; i++)	
+			CYRF_WriteRegister(pgm_read_byte_near(&TRAXXAS_init_vals[i][0]), pgm_read_byte_near(&TRAXXAS_init_vals[i][1]));
+	}

 	//Read CYRF ID
 	CYRF_GetMfgData(cyrfmfg_id);
-	cyrfmfg_id[0]+=RX_num;
-
-	#ifdef TRAXXAS_FORCE_ID					// data taken from TX dump
-		cyrfmfg_id[0]=0x65;					// CYRF MFG ID
-		cyrfmfg_id[1]=0xE2;
-		cyrfmfg_id[2]=0x5E;
-		cyrfmfg_id[3]=0x55;
-		cyrfmfg_id[4]=0x4D;
-		cyrfmfg_id[5]=0xFE;
-	#endif
-
-	if(IS_BIND_IN_PROGRESS)
+	//Find a free channel
+	if(sub_protocol == TRAXXAS_TQ1)
 	{
-		bind_counter=100;
-		phase = TRAXXAS_BIND_PREP_RX;
+		cyrfmfg_id[3]+=RX_num;				// Not needed for TQ2 since the TX and RX have to match
+		//CYRF_FindBestChannels(hopping_frequency,1,1,0x0B,0x30, FIND_CHANNEL_ANY);	// Complete guess
+	}
+	else //TRAXXAS_TQ2
+		CYRF_FindBestChannels(hopping_frequency,1,1,0x02,0x21, FIND_CHANNEL_ANY);
+
+	#ifdef TRAXXAS_TQ1_FORCE_ID				// data taken from TX dump
+		if(sub_protocol == TRAXXAS_TQ1)
+		{
+			cyrfmfg_id[0]=0xD8;				// CYRF MFG ID
+			cyrfmfg_id[1]=0xAA;
+			cyrfmfg_id[2]=0x59;
+			cyrfmfg_id[3]=0xE6;
+			//cyrfmfg_id[4]=0x44;			// Unused
+			//cyrfmfg_id[5]=0xFB;			// Unused
+			hopping_frequency[0] = 0x0B;
+		}
+	#endif
+	#ifdef TRAXXAS_TQ2_FORCE_ID				// data taken from TX dump
+		if(sub_protocol == TRAXXAS_TQ2)
+		{
+			cyrfmfg_id[0]=0x65;				// CYRF MFG ID
+			cyrfmfg_id[1]=0xE2;
+			cyrfmfg_id[2]=0x5E;
+			cyrfmfg_id[3]=0x55;
+			cyrfmfg_id[4]=0x4D;
+			cyrfmfg_id[5]=0xFE;
+			hopping_frequency[0] = 0x05;	// seen 05 and 0F
+		}
+	#endif
+	#ifdef TRAXXAS_DEBUG
+		debugln("ID: %02X %02X %02X %02X %02X %02X",cyrfmfg_id[0],cyrfmfg_id[1],cyrfmfg_id[2],cyrfmfg_id[3],cyrfmfg_id[4],cyrfmfg_id[5]);
+		debugln("RF CH: %02X",hopping_frequency[0]);
+	#endif
+	
+	bind_counter=100;
+	if(sub_protocol == TRAXXAS_TQ1)
+	{
+		CYRF_WriteRegister(CYRF_28_CLK_EN, 0x02);
+		CYRF_WriteRegister(CYRF_32_AUTO_CAL_TIME, 0x3C);
+		CYRF_WriteRegister(CYRF_35_AUTOCAL_OFFSET, 0x14);
+		CYRF_WriteRegister(CYRF_26_XTAL_CFG, 0x08);
+		CYRF_WriteRegister(CYRF_06_RX_CFG, 0x48);
+		CYRF_WriteRegister(CYRF_1B_TX_OFFSET_LSB, 0x55);
+		CYRF_WriteRegister(CYRF_1C_TX_OFFSET_MSB, 0x05);
+		CYRF_WriteRegister(CYRF_0F_XACT_CFG, 0x21);
+		CYRF_WriteRegister(CYRF_03_TX_CFG, 0x0C);
+		CYRF_PROGMEM_ConfigSOPCode(DEVO_j6pro_sopcodes[0]);
+		CYRF_SetTxRxMode(TX_EN);
+		CYRF_WriteRegister(CYRF_0F_XACT_CFG, 0x21);
+		if(IS_BIND_IN_PROGRESS)
+			phase = TRAXXAS_TQ1_BIND;
+		else
+			phase = TRAXXAS_TQ1_DATA1;
 	}
 	else
-		phase = TRAXXAS_PREP_DATA;
+	{//TRAXXAS_TQ2
+		if(IS_BIND_IN_PROGRESS)
+			phase = TRAXXAS_BIND_PREP_RX;
+		else
+			phase = TRAXXAS_PREP_DATA;
+	}
+	//
+//	phase = TRAXXAS_BIND_TX1;
+//	TRAXXAS_cyrf_bind_config();
+//	CYRF_SetTxRxMode(TX_EN);
+//	memcpy(packet,(uint8_t *)"\x02\x4A\xA3\x2D\x1A\x49\xFE\x06\x00\x00\x02\x01\x06\x06\x00\x00",TRAXXAS_PACKET_SIZE);
+//	memcpy(packet,(uint8_t *)"\x02\x49\xAC\x4F\x55\x4D\xFE\x05\x00\x00\x02\x01\x06\x06\x00\x00",TRAXXAS_PACKET_SIZE);
 }

 /*
-Bind phase 1
+Traxxas TQ 2nd generation
+-------------------------
+Packets 0x02: Bind learn TX/RX addresses
 CHANNEL:	0x2B
 SOP_CODE:	0x3C	0x37	0xCC	0x91	0xE2	0xF8	0xCC	0x91
 CRC_SEED_LSB:	0x5A
 CRC_SEED_MSB:	0x5A
-RX1:	0x02	0x4A	0xA3	0x2D	0x1A	0x49	0xFE	0x06	0x00	0x00	0x02	0x01	0x06	0x06	0x00	0x00
-TX1:	0x02	0x65	0xE2	0x5E	0x55	0x4D	0xFE	0xEE	0x00	0x00	0x01	0x01	0x06	0x05	0x00	0x00
-Note: RX cyrfmfg_id is 0x4A,0xA3,0x2D,0x1A,0x49,0xFE and TX cyrfmfg_id is 0x65,0xE2,0x5E,0x55,0x4D,0xFE
+RX:	0x02	0x4A	0xA3	0x2D	0x1A	0x49	0xFE	0x06	0x00	0x00	0x02	0x01	0x06	0x06	0x00	0x00
+TX:	0x02	0x65	0xE2	0x5E	0x55	0x4D	0xFE	0xEE	0x00	0x00	0x01	0x01	0x06	0x05	0x00	0x00
+Notes:
+ - RX cyrfmfg_id is 0x4A,0xA3,0x2D,0x1A,0x49,0xFE and TX cyrfmfg_id is 0x65,0xE2,0x5E,0x55,0x4D,0xFE
+ - P[7] = RX SOP code index, changes from 0x06 to 0xEE but not needed to complete the bind -> doesn't care??
+ - P[8] RF channel - 1 (on packets type 0x03)
+ - P[9] 0x00 unchanged??
+ - P[10] needs to be set to 0x01 to complete the bind -> normal packet P[0]??
+ - P[11] unchanged ?? -> no bind if set to 0x00 or 0x81
+ - P[12] unchanged ?? -> no bind if set to 0x05 or 0x86
+ - P[13] changes from 0x06 to 0x05 but not needed to complete the bind -> doesn't care??
+ - P[14..15]=0x00 unchanged??

-Bind phase 2 (looks like normal mode?)
-CHANNEL:	0x05
-SOP_CODE:	0xA1	0x78	0xDC	0x3C	0x9E	0x82	0xDC	0x3C
-CRC_SEED_LSB:	0x1B
-CRC_SEED_MSB:	0x3F
-RX2:	0x03	0x4A	0xA3	0x2D	0x1A	0x49	0xFE	0x06	0x00	0x00	0x02	0x01	0x06	0x06	0x00	0x00
-TX2:	0x01	0x65	0x01	0xF4	0x03	0xE7	0x02	0x08	0x00	0x00	0x01	0x01	0x02	0xEE	0x00	0x00
-Note: TX2 is nearly a normal packet at the exception of the 2nd byte equal to cyrfmfg_id[0]
-
-Bind phase 3 (check?)
+Packets 0x03: Which RF channel
 CHANNEL:	0x22
 SOP_CODE:	0x97	0xE5	0x14	0x72	0x7F	0x1A	0x14	0x72
 CRC_SEED_LSB:	0xA5
 CRC_SEED_MSB:	0xA5
-RX3:	0x04	0x4A	0xA3	0x2D	0x1A	0x49	0xFE	0x06	0x00	0x00	0x02	0x01	0x06	0x06	0x00	0x00
+RX:	0x03	0x4A	0xA3	0x2D	0x1A	0x49	0xFE	0x06	0x00	0x00	0x02	0x01	0x06	0x06	0x00	0x00
+TX:	0x03	0x65	0xE2	0x5E	0x55	0x4D	0xFE	0xEE	0x0E	0x00	0x01	0x01	0x06	0x05	0x00	0x00
+ - P[8] RF channel - 1

-Switch to normal mode
+Packets 0x04: unknown
+RX: 0x04	0x4A	0xA3	0x2D	0x1A	0x49	0xFE	0x06	0x00	0x00	0x02	0x01	0x06	0x06	0x00	0x00
+
+Packets 0x01: Normal mode
 CHANNEL: 	0x05
 SOP_CODE:	0xA1	0x78	0xDC	0x3C	0x9E	0x82	0xDC	0x3C
 CRC_SEED_LSB:	0x1B
 CRC_SEED_MSB:	0x3F
 TX3:	0x01	0x00	0x02	0xA8	0x03	0xE7	0x02	0x08	0x00	0x00	0x01	0x01	0x02	0xEE	0x00	0x00
+
+CRC_SEED:
+TX ID: \x65\xE2\x5E\x55\x4D\xFE
+RX ID: \x4A\xA3\x2D\x1A\x49\xFE CRC 0x1B 0x3F => CRC: 65-4A=1B E2-A3=3F
+RX ID: \x4B\xA3\x2D\x1A\x49\xFE CRC 0x1A 0x3F => CRC: 65-4B=1A E2-A3=3F
+RX ID: \x00\x00\x2D\x1A\x49\xFE CRC 0x65 0xE2 => CRC: 65-00=65 E2-00=E2
+RX ID: \x00\xFF\x2D\x1A\x49\xFE CRC 0x65 0xE3 => CRC: 65-00=65 E2-FF=E3
+RX ID: \xFF\x00\x2D\x1A\x49\xFE CRC 0x66 0xE2 => CRC: 65-FF=66 E2-00=E2
+
+SOP Codes:
+RX1: 02 4A A3 2D 1A 49 FE 06 00 00 02 01 06 06 00 00
+SOP: A1 78 DC 3C 9E 82 DC 3C
+RX2: 02 49 AC 4F 55 4D FE 05 00 00 02 01 06 06 00 00
+SOP: 5A CC AE 46 B6 31 AE 46
+RX3: 02 CA F3 62 55 4D FE 03 00 00 02 01 06 06 00 00
+SOP: 66 CD 7C 50 DD 26 7C 50
+
+Dump of SOP Codes:
+00: 3C 37 CC 91 E2 F8 CC 91 => bind
+01: 9B C5 A1 0F AD 39 A2 0F
+02: EF 64 B0 2A D2 8F B1 2A
+03: 66 CD 7C 50 DD 26 7C 50
+04: 5C E1 F6 44 AD 16 F6 44
+05: 5A CC AE 46 B6 31 AE 46
+06: A1 78 DC 3C 9E 82 DC 3C
+07: B9 8E 19 74 6F 65 18 74
+08: DF B1 C0 49 62 DF C1 49
+09: 97 E5 14 72 7F 1A 14 72 => check
+10: 82 C7 90 36 21 03 FF 17
+11: E2 F8 CC 91 3C 37 CC 91 => bind 4 bytes group swapped
+12: AD 39 A2 0F 9B C5 A1 0F => 01 4 bytes group swapped
+13: D2 8F B1 2A EF 64 B0 2A => 02 4 bytes group swapped
+14: DD 26 7C 50 66 CD 7C 50 => 03 4 bytes group swapped
+...
+19: 62 DF C1 49 DF B1 C0 49 => 08 4 bytes group swapped
+20: 00 00 00 33 DE AD BA BE ??over??
 */
+
+/*
+Traxxas TQ 1st generation
+-------------------------
+https://github.com/pascallanger/DIY-Multiprotocol-TX-Module/issues/967#issuecomment-2079038576
+*/
+/*
+Traxxas TQi
+-------------------------
+Unknown 3 first packets:
+CHANNEL:	0x2B
+SOP_CODE:	0x3C	0x37	0xCC	0x91	0xE2	0xF8	0xCC	0x91
+CRC_SEED_LSB:	0x5A
+CRC_SEED_MSB:	0x5A
+RX: 0xA0	0x1F	0x60	0x58	0x34	0x44	0x1C	0x11	0xA5	0x72	0x8D	0x9D	0xEA	0x49	0x2B	0xE2
+RX: 0xD3	0x53	0xD4	0x45	0x1B	0x6F	0x75	0x42	0xEF	0x8A	0xD2	0x24	0x8E	0xF0	0x05	0x6C
+RX: 0xAA	0xD7	0xD7	0x43	0x0F	0x2F	0x02	0x8F	0x06	0x54	0x3A	0x35	0xF5	0xCF	0x0F	0x82
+
+Packets 0x02: Bind learn TX/RX addresses same as TQ 2nd:
+CHANNEL:	0x2B
+SOP_CODE:	0x3C	0x37	0xCC	0x91	0xE2	0xF8	0xCC	0x91
+CRC_SEED_LSB:	0x5A
+CRC_SEED_MSB:	0x5A
+RX:	0x02	0x5B	0xE9	0x7E	0x14	0xF1	0xFE	0x0D	0x00	0x00	0x02	0x02	0x00	0x26	0x00	0x00
+TX:	0x02	0xE0	0xAC	0x7F	0x14	0xF1	0xFE	0x00	0x00	0x00	0x01	0x02	0x00	0x51	0x00	0x00
+
+Notes:
+ - P[1..6] = RX cyrfmfg_id is 0x5B,0xE9,0x7E,0x14,0xF1,0xFE and TX cyrfmfg_id is 0xE0,0xAC,0x7F,0x14,0xF1,0xFE
+ - P[7] RX SOP code index, changes from 0x0D to 0x00 (but not needed to complete the bind -> doesn't care??)
+ - P[8] RF channel - 1 (on packets type 0x03)
+ - P[9] 0x00 unchanged??
+ - P[10] needs to be set to 0x01 to complete the bind -> normal packet P[0]??
+ - P[11] unchanged ?? (-> no bind if set to 0x00 or 0x81)
+ - P[12] unchanged ?? (-> no bind if set to 0x05 or 0x86)
+ - P[13] changes from 0x26 to 0x51 (but not needed to complete the bind -> doesn't care??)
+ - P[14..15]=0x00 unchanged??
+ 
+Next steps:
+Packets 0x08: ???
+TX: 0x08	0x00	0x03	0x14	0xFD	0x3E	0x28	0xB9	0xCA	0x48	0x76	0x4E	0x00	0x51	0x00	0x00
+TX: 0x08	0x00	0x02	0x14	0xFD	0x3E	0x28	0xB9	0xCA	0x48	0x76	0x4E	0x00	0x51	0x00	0x00
+TX: 0x08	0x00	0x01	0x14	0xFD	0x3E	0x28	0xB9	0xCA	0x48	0x76	0x4E	0x00	0x51	0x00	0x00
+RX: 0x08	0x00	0x03	0x14	0xFD	0x24	0x20	0xB8	0xCA	0x48	0x76	0x4E	0x00	0x26	0x00	0x00
+RX: 0x08	0x00	0x01	0x14	0xFD	0x24	0x20	0xB8	0xCA	0x48	0x76	0x4E	0x00	0x26	0x00	0x00
+P[1] index
+P[2] sequence number
+
+Packets 0x09: ???
+TX: 0x09	0x00	0x03	0xEE	0x12	0x49	0x57	0x1F	0x4B	0x60	0x6B	0x4D	0x14	0xEF	0x69	0xC4
+TX: 0x09	0x00	0x02	0xEE	0x12	0x49	0x57	0x1F	0x4B	0x60	0x6B	0x4D	0x14	0xEF	0x69	0xC4
+TX: 0x09	0x00	0x01	0xEE	0x12	0x49	0x57	0x1F	0x4B	0x60	0x6B	0x4D	0x14	0xEF	0x69	0xC4
+TX: 0x09	0x01	0x03	0xB2	0x63	0x43	0x25	0x22	0x4D	0xA1	0x15	0xFE	0xBA	0x7D	0x67	0x3E
+TX: 0x09	0x01	0x02	0xB2	0x63	0x43	0x25	0x22	0x4D	0xA1	0x15	0xFE	0xBA	0x7D	0x67	0x3E
+TX: 0x09	0x01	0x01	0xB2	0x63	0x43	0x25	0x22	0x4D	0xA1	0x15	0xFE	0xBA	0x7D	0x67	0x3E
+TX: 0x09	0x02	0x03	0xCB	0xBE	0xA6	0xD1	0xCD	0x23	0xA1	0x15	0xFE	0xBA	0x7D	0x67	0x3E
+TX: 0x09	0x02	0x02	0xCB	0xBE	0xA6	0xD1	0xCD	0x23	0xA1	0x15	0xFE	0xBA	0x7D	0x67	0x3E
+TX: 0x09	0x02	0x01	0xCB	0xBE	0xA6	0xD1	0xCD	0x23	0xA1	0x15	0xFE	0xBA	0x7D	0x67	0x3E
+RX: 0x09	0x00	0x03	0x90	0x24	0x93	0x08	0x41	0xC7	0x7F	0x59	0xB4	0xE3	0x25	0x77	0xB5
+RX: 0x09	0x00	0x01	0x90	0x24	0x93	0x08	0x41	0xC7	0x7F	0x59	0xB4	0xE3	0x25	0x77	0xB5
+RX: 0x09	0x01	0x02	0x88	0xFA	0x4D	0xFB	0x33	0xD4	0xFE	0x5F	0x1C	0xA9	0x0B	0x7A	0xE6
+RX: 0x09	0x02	0x03	0x86	0xAF	0xD0	0x91	0xF6	0xDD	0xFE	0x5F	0x1C	0xA9	0x0B	0x7A	0xE6
+RX: 0x09	0x02	0x01	0x86	0xAF	0xD0	0x91	0xF6	0xDD	0xFE	0x5F	0x1C	0xA9	0x0B	0x7A	0xE6
+P[1] index
+P[2] sequence number
+
+Switch to normal mode:
+SOP_CODE:	0xD2	0x8F	0xB1	0x2A	0xEF	0x64	0xB0	0x2A
+CRC_SEED_LSB:	0x85
+CRC_SEED_MSB:	0xC3
+CHANNEL:	0x05
+TX: 0x01	0x00	0x02	0xF5	0x02	0x9E	0x00	0x00	0x00	0x00	0x00	0x00	0x02	0x99	0x67	0x3E
+Normal content except P[14]&P[15] = 0x67&0x3E from previous packet sent
+
+SOP_CODE:	0x97	0xE5	0x14	0x72	0x7F	0x1A	0x14	0x72
+CRC_SEED_LSB:	0xA5
+CRC_SEED_MSB:	0xA5
+CHANNEL:	0x22
+RX: 0x04	0x5B	0xE9	0x7E	0x14	0xF1	0xFE	0x0D	0xDD	0xFE	0x02	0x02	0x00	0x26	0x7A	0xE6
+RX packets 0x04: RX identity ?
+P[1..6] = RX cyrfmfg_id 0x5B,0xE9,0x7E,0x14,0xF1,0xFE
+P[7] = SOP index
+P[8] = unknown
+P[9] = unknown
+P[10] = same value as bind 0x02
+P[11] = same value as bind 0x02
+P[12] = same value as bind 0x00
+P[13] = same value as bind 0x26
+P[14] = unknown
+P[15] = unknown
+
+SOP_CODE:	0xD2	0x8F	0xB1	0x2A	0xEF	0x64	0xB0	0x2A
+CRC_SEED_LSB:	0x85
+CRC_SEED_MSB:	0xC3
+CHANNEL:	0x05
+TX: 0x14	0x00	0x03	0xF5	0x02	0x9E	0x00	0x00	0x00	0x00	0x00	0x00	0x02	0x99	0x67	0x3E
+TX: 0x14	0x00	0x02	0xF5	0x02	0x9E	0x00	0x00	0x00	0x00	0x00	0x00	0x02	0x99	0x67	0x3E
+TX: 0x14	0x00	0x01	0xF5	0x02	0x9E	0x00	0x00	0x00	0x00	0x00	0x00	0x02	0x99	0x67	0x3E
+RX: 0x14	0x00	0x03	0x22	0xEC	0x42	0x9B	0xD7	0x99	0x3B	0xBB	0x85	0x17	0x41	0x67	0xA0
+RX: 0x14	0x00	0x01	0x22	0xEC	0x42	0x9B	0xD7	0x99	0x3B	0xBB	0x85	0x17	0x41	0x67	0xA0
+RX: 0x14	0x01	0x02	0x22	0xEF	0x42	0x9C	0xCA	0xFB	0x39	0xBB	0x85	0x17	0x41	0x67	0xA0
+TX packets 0x14 same as packets 0x01 with a sequence number on P[2]
+RX packets 0x14 unknown content
+
+Packets 0x01 & 0x07: normal and telemetry request/answer
+TX: 0x01	0x00	0x02	0xF5	0x02	0x9E	0x00	0x00	0x00	0x00	0x00	0x00	0x02	0x99	0x00	0x00
+TX: 0x07	0x00	0x02	0xF5	0x02	0x9E	0x00	0x00	0x00	0x00	0x00	0x00	0x02	0x99	0x00	0x00
+RX: 0x07	0x01	0x00	0x00	0x00	0x00	0x00	0x00	0xFB	0x00	0x00	0x85	0x17	0x41	0x67	0xA0
+TX: 0x01	0x00	0x02	0xF5	0x02	0x9E	0x00	0x00	0x00	0x00	0x00	0x00	0x02	0x99	0x00	0x00
+TX: 0x07	0x00	0x02	0xF5	0x02	0x9E	0x00	0x00	0x00	0x00	0x00	0x00	0x02	0x99	0x00	0x00
+RX: 0x07	0x01	0x00	0x00	0x00	0x11	0x49	0xC8	0xFB	0x00	0x00	0x85	0x17	0x41	0x67	0xA0
+TX: 0x01	0x00	0x02	0xF5	0x02	0x9E	0x00	0x00	0x00	0x00	0x00	0x00	0x02	0x99	0x00	0x00
+TX: 0x07	0x00	0x02	0xF5	0x02	0x9E	0x00	0x00	0x00	0x00	0x00	0x00	0x02	0x99	0x00	0x00
+RX: 0x07	0x01	0x00	0x00	0x00	0x12	0xDC	0x20	0xFB	0x00	0x00	0x85	0x17	0x41	0x67	0xA0
+TX packets 0x07: request for telemetry
+RX packets 0x07: unknown
+
+CRC calc same as TQ 2nd:
+TX ID: 0xE0,0xAC,0x7F,0x14,0xF1,0xFE
+RX ID: 0x5B,0xE9,0x7E,0x14,0xF1,0xFE CRC 0x85 0xC3 => CRC: E0-5B=85 AC-E9=C3
+SOP index same as TQ 2nd:
+SOP index=0x0D, SOP code= 0xD2, 0x8F, 0xB1, 0x2A, 0xEF, 0x64, 0xB0, 0x2A 
+
+*/
+
+
 #endif
--- a/Multiprotocol/Telemetry.ino
+++ b/Multiprotocol/Telemetry.ino
@@ -309,8 +309,17 @@ static void multi_send_status()
 #ifdef HOTT_FW_TELEMETRY
 	void HOTT_short_frame()
 	{
-		multi_send_header(MULTI_TELEMETRY_HOTT, 14);
-		for (uint8_t i = 0; i < 14; i++)			// TX RSSI and TX LQI values followed by frame number and telemetry data
+		multi_send_header(MULTI_TELEMETRY_HOTT, 15);
+		for (uint8_t i = 0; i < 15; i++)			// TX RSSI and TX LQI values followed by frame number and telemetry data
+			Serial_write(packet_in[i]);
+	}
+#endif
+
+#ifdef RLINK_HUB_TELEMETRY
+	void RLINK_raw_frame()
+	{
+		multi_send_header(MULTI_TELEMETRY_RLINK, packet_in[0]);
+		for (uint8_t i = 1; i <= packet_in[0]; i++)	// raw DumboRC reply payload
 			Serial_write(packet_in[i]);
 	}
 #endif
@@ -887,7 +896,7 @@ void TelemetryUpdate()
 			t += TXBUFFER_SIZE - h ;
 		else
 			t -= h ;
-		if ( t < 32 )
+		if ( t < 48 ) //32 )
 		{
 			debugln("TEL_BUF_FULL %d",t);
 			return ;
@@ -992,6 +1001,14 @@ void TelemetryUpdate()
 				return;
 			}
 		#endif
+		#if defined RLINK_HUB_TELEMETRY
+			if(telemetry_link == 2 && protocol == PROTO_RLINK)
+			{
+				RLINK_raw_frame();
+				telemetry_link=0;
+				return;
+			}
+		#endif
 		#if defined SCANNER_TELEMETRY
 			if (telemetry_link && protocol == PROTO_SCANNER)
 			{
--- a/Multiprotocol/Tiger_nrf24l01.ino
+++ b/Multiprotocol/Tiger_nrf24l01.ino
@@ -1,163 +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 Tiger Drone 1400782.
-
-#if defined(TIGER_NRF24L01_INO)
-
-#include "iface_xn297.h"
-
-#define TIGER_FORCE_ID
-
-#define TIGER_INITIAL_WAIT    500
-#define TIGER_PACKET_PERIOD   3940
-#define TIGER_RF_NUM_CHANNELS 4
-#define TIGER_BIND_RF_NUM_CHANNELS 8
-#define TIGER_PAYLOAD_SIZE    16
-#define TIGER_BIND_COUNT	  761		//3sec
-
-
-static uint8_t __attribute__((unused)) TIGER_convert_channel(uint8_t num)
-{
-	uint8_t val=convert_channel_8b(num);
-	// 7F..01=left, 00=center, 80..FF=right
-	if(val==0x80)
-		val=0;				// 0
-	else
-		if(val>0x80)
-			val--;			// 80..FE
-		else
-		{
-			val=0x80-val;	// 80..01
-			if(val==0x80)
-				val--;		// 7F..01
-		}
-	return val;
-}
-
-static void __attribute__((unused)) TIGER_send_packet()
-{
-	if(IS_BIND_DONE)
-	{
-		//Channels
-		packet[0]=convert_channel_8b(THROTTLE);		// 00..FF
-		packet[1]=TIGER_convert_channel(RUDDER);	// 7F..01=left, 00=center, 80..FF=right
-		packet[2]=TIGER_convert_channel(ELEVATOR);	// 7F..01=down, 00=center, 80..FF=up
-		packet[3]=TIGER_convert_channel(AILERON);	// 7F..01=left, 00=center, 80..FF=right
-		//Flags
-		packet[14]= GET_FLAG(CH5_SW, 0x04)			//FLIP
-				  | GET_FLAG(CH6_SW, 0x10);			//LIGHT
-	}
-	//Check
-	crc8=0;
-	for(uint8_t i=0;i<TIGER_PAYLOAD_SIZE-1;i++)
-		crc8+=packet[i];
-	packet[TIGER_PAYLOAD_SIZE-1]=crc8;
-
-	//Hopping frequency
-	XN297_Hopping(hopping_frequency_no>>1);
-	hopping_frequency_no++;
-	if(IS_BIND_IN_PROGRESS)
-	{
-		if(hopping_frequency_no>=2*TIGER_BIND_RF_NUM_CHANNELS)
-			hopping_frequency_no=0;
-	}
-	else
-	{
-		if(hopping_frequency_no>=2*(TIGER_BIND_RF_NUM_CHANNELS+TIGER_RF_NUM_CHANNELS))
-			hopping_frequency_no=2*TIGER_BIND_RF_NUM_CHANNELS;
-	}
-
-	//Send
-	XN297_SetPower();
-	XN297_SetTxRxMode(TX_EN);
-	XN297_WritePayload(packet, TIGER_PAYLOAD_SIZE);
-}
-
-static void __attribute__((unused)) TIGER_RF_init()
-{
-	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
-	XN297_SetTXAddr((uint8_t *)"\x68\x94\xA6\xD5\xC3", 5);
-}
-
-static void __attribute__((unused)) TIGER_initialize_txid()
-{
-#ifdef TIGER_FORCE_ID
-	rx_tx_addr[0]=0x64;
-	rx_tx_addr[1]=0x39;
-	rx_tx_addr[2]=0x12;
-	rx_tx_addr[3]=0x00;
-	rx_tx_addr[4]=0x00;
-	memcpy(hopping_frequency,"\x0E\x39\x1C\x07\x24\x3E\x2B\x47",TIGER_BIND_RF_NUM_CHANNELS);
-	memcpy(&hopping_frequency[TIGER_BIND_RF_NUM_CHANNELS],"\x36\x41\x37\x4E",TIGER_RF_NUM_CHANNELS);
-#endif
-	//prepare bind packet
-	memset(&packet[0], 0x00, 4);
-	memset(&packet[4], 0x40, 10);
-	memcpy(&packet[7], rx_tx_addr, 5);
-	packet[14]=0xC0;
-}
-
-uint16_t TIGER_callback()
-{
-	#ifdef MULTI_SYNC
-		telemetry_set_input_sync(TIGER_PACKET_PERIOD);
-	#endif
-	if(bind_counter)
-		if(--bind_counter==0)
-		{
-			BIND_DONE;
-			XN297_SetTXAddr((uint8_t *)"\x49\xA6\x83\xEB\x4B", 5);
-		}
-	TIGER_send_packet();
-	return TIGER_PACKET_PERIOD;
-}
-
-void TIGER_init()
-{
-	BIND_IN_PROGRESS;	// autobind protocol
-	TIGER_initialize_txid();
-	TIGER_RF_init();
-	hopping_frequency_no = 0;
-	bind_counter=TIGER_BIND_COUNT;
-}
-
-#endif
-/*Bind
- RF setup: 1Mbps, scrambled, CRC
- TX addr: 0x68 0x94 0xA6 0xD5 0xC3
- 8 RF channels: 0x0E 0x39 0x1C 0x07 0x24 0x3E 0x2B 0x47
- 2 packets per RF channel, 3940µs between packets
- payload 16 bytes: 0x00 0x00 0x00 0x00 0x40 0x40 0x40 0x64 0x39 0x12 0x00 0x00 0x40 0x40 0xC0 0xAF
- payload[15]=sum of payload[0..14]
- the only difference with normal packets is the payload[14]=0xC0
- ??? payload[7..11] TX ID ???
-
-Normal
- RF setup: 1Mbps
- TX addr: 0x49 0xA6 0x83 0xEB 0x4B
- 4 RF channels: 0x36 0x41 0x37 0x4E
- 2 packets per RF channel, 3940µs between packets
- payload 16 bytes: 0x00 0x00 0x00 0x00 0x40 0x40 0x40 0x64 0x39 0x12 0x00 0x00 0x40 0x40 0x00 0xEF
- payload[15]=sum of payload[0..14]
- throttle is on payload[0] 00..FF
- rudder is on payload[1] 00=center, 80..FF=right, 01..7F=left
- elevator is on payload[2] 00=center, 80..FF=up, 01..7F=down
- aileron is on payload[3] 00=center, 80..FF=right, 01..7F=left
- trims payload[4..6]
- ??? payload[7..11] TX ID ???
- ??? payload[12..13] ???
- flip is on payload[14] and flag 0x04
- light is on payload[14] and flag 0x10
-*/
--- a/Multiprotocol/UDIRC_ccnrf.ino
+++ b/Multiprotocol/UDIRC_ccnrf.ino
@@ -0,0 +1,184 @@
+/*
+ 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/>.
+ */
+//Models: UDIRC UD160x(PRO), Pinecone Models SG-160x, Eachine EAT15
+
+#if defined(UDIRC_CCNRF_INO)
+
+#include "iface_xn297.h"
+
+#define FORCE_UDIRC_ORIGINAL_ID
+
+#define UDIRC_PAYLOAD_SIZE			15
+#define UDIRC_RF_NUM_CHANNELS		4
+#define UDIRC_PACKET_PERIOD			21000
+#define UDIRC_BIND_COUNT			2000
+#define UDIRC_P1_P2_TIME			5000
+#define UDIRC_WRITE_TIME			1500
+
+enum {
+	UDIRC_DATA1=0,
+	UDIRC_DATA2,
+	UDIRC_DATA3,
+	UDIRC_RX,
+};
+
+static void __attribute__((unused)) UDIRC_send_packet()
+{
+	if(rf_ch_num==0)
+	{
+		XN297_Hopping(hopping_frequency_no);
+		debug("H %d ",hopping_frequency_no);
+		hopping_frequency_no++;
+		hopping_frequency_no &= 3;
+	}
+
+	memset(&packet[3], 0x00, 12);
+	if(bind_counter)
+	{//Bind in progress
+		bind_counter--;
+		if(bind_counter)
+		{//Bind
+			packet[0] = 0x01;
+			memcpy(&packet[1],rx_tx_addr,5);
+		}
+		else
+		{//Switch to normal
+			rf_ch_num = 1;
+			BIND_DONE;
+			XN297_SetTXAddr(rx_tx_addr, 5);
+			XN297_SetRXAddr(rx_tx_addr, UDIRC_PAYLOAD_SIZE);
+		}
+	}
+	if(!bind_counter)
+	{//Normal
+		packet[0] = 0x08;
+		//Channels SG-16xx: ST/TH/CH4 /CH3  /UNK/UNK/UNK/UNK/GYRO/ST_TRIM/ST_DR
+		//Channels EAT15  : ST/TH/RATE/LIGHT/UNK/UNK/UNK/UNK/GYRO/ST_TRIM/ST_DR
+		for(uint8_t i=0; i<12; i++)
+			packet[i+1] = convert_channel_16b_limit(i,0,200);
+		//Just for now let's set the additional channels to 0
+		packet[5] = packet[6] = packet[7] = packet[8] = 0;
+	}
+	packet[12] = GET_FLAG(CH12_SW,  0x40)						//TH.REV
+				|GET_FLAG(CH13_SW,  0x80);						//ST.REV
+	//packet[13] = 00; //Unknown, future flags?
+	for(uint8_t i=0;i<UDIRC_PAYLOAD_SIZE-1;i++)
+		packet[14] += packet[i];
+	// Send
+	XN297_SetFreqOffset();
+	XN297_SetPower();
+	XN297_SetTxRxMode(TX_EN);
+	XN297_WriteEnhancedPayload(packet, UDIRC_PAYLOAD_SIZE,false);
+	#ifdef DEBUG_SERIAL
+		for(uint8_t i=0; i < UDIRC_PAYLOAD_SIZE; i++)
+			debug("%02X ", packet[i]);
+		debugln();
+	#endif
+}
+
+static void __attribute__((unused)) UDIRC_initialize_txid()
+{
+	#ifdef FORCE_UDIRC_ORIGINAL_ID
+		if(RX_num)
+		{
+			rx_tx_addr[0] = 0xD0;
+			rx_tx_addr[1] = 0x06;
+			rx_tx_addr[2] = 0x00;
+			rx_tx_addr[3] = 0x00;
+			rx_tx_addr[4] = 0x81;
+		}
+		else
+		{
+			rx_tx_addr[0] = 0xF6;
+			rx_tx_addr[1] = 0x96;
+			rx_tx_addr[2] = 0x01;
+			rx_tx_addr[3] = 0x00;
+			rx_tx_addr[4] = 0x81;
+		}
+		hopping_frequency[0] = 45;
+		hopping_frequency[1] = 59;
+		hopping_frequency[2] = 52;
+		hopping_frequency[3] = 67;
+	#endif
+}
+
+static void __attribute__((unused)) UDIRC_RF_init()
+{
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_250K);
+	//Bind address
+	XN297_SetTXAddr((uint8_t*)"\x01\x03\x05\x07\x09", 5);
+	XN297_SetRXAddr((uint8_t*)"\x01\x03\x05\x07\x09", UDIRC_PAYLOAD_SIZE);
+	XN297_HoppingCalib(UDIRC_RF_NUM_CHANNELS);
+}
+
+uint16_t UDIRC_callback()
+{
+	bool rx;
+	switch(phase)
+	{
+		case UDIRC_DATA1:
+			rx = XN297_IsRX();
+			XN297_SetTxRxMode(TXRX_OFF);
+			#ifdef MULTI_SYNC
+				telemetry_set_input_sync(UDIRC_PACKET_PERIOD);
+			#endif
+			UDIRC_send_packet();
+			if(rx)
+			{
+				uint8_t val=XN297_ReadEnhancedPayload(packet_in, UDIRC_PAYLOAD_SIZE);
+				debug("RX(%d):",val);
+				if(val != 255)
+				{
+					rf_ch_num = 1;
+					if(bind_counter)
+						bind_counter=1;
+					#ifdef DEBUG_SERIAL
+						for(uint8_t i=0; i < UDIRC_PAYLOAD_SIZE; i++)
+							debug(" %02X", packet_in[i]);
+					#endif
+				}
+				debugln("");
+			}
+			phase++;
+			return UDIRC_P1_P2_TIME;
+		case UDIRC_DATA2:
+			//Resend packet
+			XN297_ReSendPayload();
+			phase++;
+			return UDIRC_WRITE_TIME;
+		default: //UDIRC_RX
+			//Wait for the packet transmission to finish
+			while(XN297_IsPacketSent()==false);
+			//Switch to RX
+			XN297_SetTxRxMode(TXRX_OFF);
+			XN297_SetTxRxMode(RX_EN);
+			phase = UDIRC_DATA1;
+			return UDIRC_PACKET_PERIOD - UDIRC_P1_P2_TIME - UDIRC_WRITE_TIME;
+	}
+	return 0;
+}
+
+void UDIRC_init()
+{
+	UDIRC_initialize_txid();
+	UDIRC_RF_init();
+
+	bind_counter = IS_BIND_IN_PROGRESS ? UDIRC_BIND_COUNT : 1;
+	phase = UDIRC_DATA1;
+	hopping_frequency_no = 0;
+	rf_ch_num = 0;
+}
+
+#endif
--- a/Multiprotocol/V761_nrf24l01.ino
+++ b/Multiprotocol/V761_nrf24l01.ino
@@ -22,16 +22,25 @@ Multiprotocol is distributed in the hope that it will be useful,
 #define V761_PACKET_PERIOD		7060 // Timeout for callback in uSec
 #define V761_INITIAL_WAIT		500
 #define V761_PACKET_SIZE		8
+#define V761_RXPAYLOAD_SIZE		3
 #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
+
+#define V761_WRITE_TIME			450
+#define V761_TELEM_PACKET_PERIOD	14088 // Timeout for callback in uSec
+//#define V761_TELEM_DEBUG

 enum 
-   {
-    V761_BIND1 = 0,
-    V761_BIND2,
-    V761_DATA
-   };
+{
+	V761_BIND1 = 0,
+	V761_BIND2,
+	V761_RX_CHECK,
+	V761_DATA,
+	V761_RX
+};

 static void __attribute__((unused)) V761_set_checksum()
 {
@@ -56,41 +65,41 @@ 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
 	{ 
+		#ifdef V761_TELEM_DEBUG
+			debug_time("");
+			debugln(" Ph:%d",hopping_frequency_no);
+		#endif
 		XN297_Hopping(hopping_frequency_no++);
 		if(hopping_frequency_no >= V761_RF_NUM_CHANNELS)
 		{
 			hopping_frequency_no = 0;
-			packet_count++;
-			if(packet_count >= 4)
-				packet_count = 0;
+			packet_sent++;
+			packet_sent &= 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[5] = packet_sent<<6;						// 0X, 4X, 8X, CX
 		packet[4] = 0x20;								// Trims 00..20..40, 0X->20 4X->TrAil 8X->TrEle CX->TrRud

 		if(CH5_SW)										// Mode Expert Gyro off
@@ -109,10 +118,11 @@ static void __attribute__((unused)) V761_send_packet()

 		packet[5] |= flags;

-		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)
+		packet[6] =  GET_FLAG(CH7_SW,  0x20) 			// Flip
+					|GET_FLAG(CH8_SW,  0x08)			// RTH activation
+					|GET_FLAG(CH9_SW,  0x10)			// RTH on/off
+					|GET_FLAG(CH10_SW, 0x40);			// Beeper on/off
+		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 +147,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
@@ -174,53 +192,148 @@ static void __attribute__((unused)) V761_initialize_txid()

 uint16_t V761_callback()
 {
+	static bool rx = false;
+	static uint8_t packet_telem = 0;
+
 	switch(phase)
 	{
 		case V761_BIND1:
 			if(bind_counter) 
 				bind_counter--;
-			packet_count ++;
-			XN297_RFChannel(V761_BIND_FREQ);
-			XN297_SetTXAddr((uint8_t*)"\x34\x43\x10\x10", 4);
+			packet_sent ++;
+			XN297_RFChannel(sub_protocol == V761_TOPRC ? TOPRC_BIND_FREQ : V761_BIND_FREQ);
+			XN297_SetTXAddr(rx_id, 4);
 			V761_send_packet();
-			if(packet_count >= 20) 
+			if(packet_sent >= 20) 
 			{
-				packet_count = 0;
+				packet_sent = 0;
 				phase = V761_BIND2;
 			}
 			return 15730;
 		case V761_BIND2:
 			if(bind_counter) 
 				bind_counter--;
-			packet_count ++;
+			packet_sent ++;
 			XN297_Hopping(0);
 			XN297_SetTXAddr(rx_tx_addr, 4);
 			V761_send_packet();
 			if(bind_counter == 0) 
 			{
-				packet_count = 0;
+				packet_sent = 0;
 				BIND_DONE;
 				phase = V761_DATA;
+				#ifdef V761_HUB_TELEMETRY
+					XN297_SetRXAddr(rx_tx_addr, V761_RXPAYLOAD_SIZE);
+				#endif
 			}
-			else if(packet_count >= 20) 
+			else if(packet_sent >= 20) 
 			{
-				packet_count = 0;
+				packet_sent = 0;
 				phase = V761_BIND1;
 			}
 			return 15730;
+	#ifdef V761_HUB_TELEMETRY
+		case V761_RX_CHECK:
+			rx = XN297_IsRX();					// Needed for the NRF24L01 since otherwise the bit gets cleared
+			XN297_SetTxRxMode(TXRX_OFF);
+			if(packet_count > 4*63)				// Around 3.5sec with no telemetry
+			{
+				telemetry_lost = 1;
+				packet_period = V761_PACKET_PERIOD;
+			}
+			else
+			{
+				packet_count++;
+				if(!telemetry_lost && !rx && (packet_count & 0x3F) == 0)
+				{// Should have received a telem packet but... Send telem to the radio to keep it alive
+					telemetry_link = 1;
+					#ifdef V761_TELEM_DEBUG
+						debugln("Miss");
+					#endif
+				}
+			}
+			phase++;
+	#endif
 		case V761_DATA:
 			#ifdef MULTI_SYNC
-				telemetry_set_input_sync(V761_PACKET_PERIOD);
+				telemetry_set_input_sync(packet_period);
 			#endif
 			V761_send_packet();
+	#ifdef V761_HUB_TELEMETRY
+			if(sub_protocol == V761_TOPRC)
+				break;
+			if(rx)
+			{ // Check if a packet has been received
+				#ifdef V761_TELEM_DEBUG
+					debug("RX ");
+				#endif
+				if(XN297_ReadPayload(packet_in, V761_RXPAYLOAD_SIZE))
+				{ // packet with good CRC and length
+					#ifdef V761_TELEM_DEBUG
+						debug("OK:");
+						for(uint8_t i=0;i<V761_RXPAYLOAD_SIZE;i++)
+							debug(" %02X",packet_in[i]);
+						debug(" pps:%d", packet_count);
+					#endif
+					// packet_in[] = AA 00 55 -> battery ok
+					// packet_in[] = 55 00 AA -> low battery
+					crc8 = 0;
+					for(uint8_t i=0;i<V761_RXPAYLOAD_SIZE;i++)
+						crc8 ^= packet_in[i];
+					if(crc8 == 0xFF)
+					{
+						v_lipo1 = packet_in[0] >> 1;
+						telemetry_link = 1;
+						telemetry_lost = 0;
+						packet_count = 0;
+						packet_period = V761_TELEM_PACKET_PERIOD;
+					}
+					#ifdef V761_TELEM_DEBUG
+					else // Bad packet
+						debug(" NOK");
+					#endif
+				}
+				#ifdef V761_TELEM_DEBUG
+				else // Bad packet
+					debug("NOK");
+				debugln("");
+				#endif
+				rx = false;
+			}
+			phase++;
+			return V761_WRITE_TIME;
+		case V761_RX:
+			{ // Wait for packet to be sent before switching to receive mode
+				uint16_t start=(uint16_t)micros();
+				while ((uint16_t)((uint16_t)micros()-(uint16_t)start) < 500)
+					if(XN297_IsPacketSent())
+						break;
+			}
+			XN297_SetTxRxMode(RX_EN);
+			phase = V761_RX_CHECK;
+			return packet_period - V761_WRITE_TIME;
+	#else
 			break;
+	#endif
 	}
-	return V761_PACKET_PERIOD;
+	return packet_period;
 }

 void V761_init(void)
 {
 	V761_initialize_txid();
+	V761_RF_init();
+	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;
@@ -229,12 +342,19 @@ void V761_init(void)
 	else
 	{
 		XN297_SetTXAddr(rx_tx_addr, 4);
+		#ifdef V761_HUB_TELEMETRY
+			XN297_SetRXAddr(rx_tx_addr, V761_RXPAYLOAD_SIZE);
+		#endif
 		phase = V761_DATA;
 	}
-		
-	V761_RF_init();
+
 	hopping_frequency_no = 0;
-	packet_count = 0;
+	packet_sent = 0;
+	#ifdef V761_HUB_TELEMETRY
+		packet_count = 0;
+		telemetry_lost = 1;
+		RX_RSSI = 100;		// Dummy value
+	#endif
 }

 #endif
--- a/Multiprotocol/V911S_ccnrf.ino
+++ b/Multiprotocol/V911S_ccnrf.ino
@@ -26,7 +26,7 @@
 #define V911S_PACKET_SIZE			16
 #define V911S_RF_BIND_CHANNEL		35
 #define V911S_NUM_RF_CHANNELS		8
-#define V911S_BIND_COUNT			200
+#define V911S_BIND_COUNT			800

 // flags going to packet[1]
 #define	V911S_FLAG_EXPERT	0x04
@@ -34,6 +34,9 @@
 #define	E119_FLAG_CALIB		0x40
 // flags going to packet[2]
 #define	V911S_FLAG_CALIB	0x01
+#define A220_FLAG_6G3D		0x04
+#define A280_FLAG_6GSENIOR	0x08
+#define A280_FLAG_LIGHT		0x20

 static void __attribute__((unused)) V911S_send_packet()
 {
@@ -69,9 +72,14 @@ static void __attribute__((unused)) V911S_send_packet()
 			packet[ 1]=GET_FLAG(!CH6_SW,V911S_FLAG_EXPERT);	// short press on left button
 			packet[ 2]=GET_FLAG(CH5_SW,V911S_FLAG_CALIB);	// long  press on right button
 		}
-		else
+		else//E119
+		{
 			packet[ 1]=GET_FLAG(!CH6_SW,E119_FLAG_EXPERT)	// short  press on left button
 					  |GET_FLAG( CH5_SW,E119_FLAG_CALIB);	// short  press on right button
+			packet[ 2]=GET_FLAG( CH7_SW,A220_FLAG_6G3D)	// short  press on right button
+					  |GET_FLAG( CH8_SW,A280_FLAG_6GSENIOR)    // -100% - 6G, +100% - Senior mode (turn off gyro)
+					  |GET_FLAG( CH9_SW,A280_FLAG_LIGHT);	// cycle the light through on-flash-off when the CH9 value is changed from -100% to 100% 
+		}
 			
 		//packet[3..6]=trims TAER signed
 		uint16_t ch=convert_channel_16b_limit(THROTTLE ,0,0x7FF);
@@ -90,7 +98,7 @@ static void __attribute__((unused)) V911S_send_packet()
 			packet[12] = ch>>5;
 		}
 		else
-		{
+		{//E119
 			ch=0x7FF-ch;
 			packet[ 9]|= ch<<6;
 			packet[10] = ch>>2;
@@ -103,7 +111,7 @@ static void __attribute__((unused)) V911S_send_packet()
 	
 	if(sub_protocol==V911S_STD)
 		XN297_WritePayload(packet, V911S_PACKET_SIZE);
-	else
+	else//E119
 		XN297_WriteEnhancedPayload(packet, V911S_PACKET_SIZE, IS_BIND_IN_PROGRESS?0:1);
 	
 	XN297_SetPower();				// Set tx_power
@@ -115,7 +123,7 @@ static void __attribute__((unused)) V911S_RF_init()
 	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_250K);
 	if(sub_protocol==V911S_STD)
 		XN297_SetTXAddr((uint8_t *)"KNBND",5);		// V911S Bind address
-	else
+	else//E119
 		XN297_SetTXAddr((uint8_t *)"XPBND",5);		// E119 Bind address
 	XN297_HoppingCalib(V911S_NUM_RF_CHANNELS);		// Calibrate all channels
 	XN297_RFChannel(V911S_RF_BIND_CHANNEL);		// Set bind channel
@@ -171,8 +179,7 @@ void V911S_init(void)
 			rf_ch_num=0;
 		}
 		else
-		{
-			//E119
+		{//E119
 			rx_tx_addr[0]=0x30;
 			rx_tx_addr[1]=0xFF;
 			rx_tx_addr[2]=0xD1;
--- a/Multiprotocol/Validate.h
+++ b/Multiprotocol/Validate.h
@@ -69,6 +69,11 @@

 // Check forced tuning values are valid
 //CC2500
+#ifdef FORCE_ARES_TUNING
+	#if ( FORCE_ARES_TUNING < -127 ) || ( FORCE_ARES_TUNING > 127 )
+		#error "The ARES forced frequency tuning value is outside of the range -127..127."
+	#endif
+#endif
 #ifdef FORCE_CORONA_TUNING
 	#if ( FORCE_CORONA_TUNING < -127 ) || ( FORCE_CORONA_TUNING > 127 )
 		#error "The CORONA forced frequency tuning value is outside of the range -127..127."
@@ -241,53 +246,72 @@
 #endif

 //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
+#if not defined(A7105_INSTALLED) || defined MULTI_EU
+	#undef	AFHDS2A_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
+	#undef	HUBSAN_A7105_INO
+	#undef	JOYSWAY_A7105_INO
+	#undef	KYOSHO_A7105_INO
+	#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
 	#undef	J6PRO_CYRF6936_INO
+	#undef	KYOSHO3_CYRF6936_INO
 	#undef	LOSI_CYRF6936_INO
 	#undef	MLINK_CYRF6936_INO
 	#undef	TRAXXAS_CYRF6936_INO
+	#undef	SCORPIO_CYRF6936_INO
 	#undef	WFLY_CYRF6936_INO
 	#undef	WK2x01_CYRF6936_INO
 #endif
-#ifndef CC2500_INSTALLED
+
+#if not defined(CC2500_INSTALLED) || defined MULTI_EU
+	#undef	ARES_CC2500_INO
 	#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
@@ -295,34 +319,43 @@
 	#undef	CX10_NRF24L01_INO
 	#undef	DM002_NRF24L01_INO
 	#undef	E016H_NRF24L01_INO
-	#undef	E01X_NRF24L01_INO
+	#undef	EAZYRC_NRF24L01_INO
 	#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
+	#undef	H36_NRF24L01_INO
 	#undef	HISKY_NRF24L01_INO
 	#undef	HONTAI_NRF24L01_INO
+	#undef	JIABAILE_NRF24L01_INO
 	#undef	JJRC345_NRF24L01_INO
+	#undef	KAMTOM_NRF24L01_INO
 	#undef	KN_NRF24L01_INO
+	#undef	KYOSHO2_NRF24L01_INO
 	#undef	LOLI_NRF24L01_INO
 	#undef	MOULDKG_NRF24L01_INO
 	#undef	NCC1701_NRF24L01_INO
 	#undef	POTENSIC_NRF24L01_INO
 	#undef	PROPEL_NRF24L01_INO
 	#undef	REALACC_NRF24L01_INO
+	#undef	SGF22_NRF24L01_INO
 	#undef	SHENQI_NRF24L01_INO
+	#undef	SHENQI2_NRF24L01_INO
 	#undef	SYMAX_NRF24L01_INO
-	#undef	TIGER_NRF24L01_INO
 	#undef	V2X2_NRF24L01_INO
 	#undef	V761_NRF24L01_INO
+	#undef	WPL_NRF24L01_INO
 	#undef	XERALL_NRF24L01_INO
 	#undef	YD717_NRF24L01_INO
+	#undef	YUXIANG_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	BLUEFLY_CCNRF_INO
+	#undef	BUMBLEB_CCNRF_INO
 	#undef	GD00X_CCNRF_INO
 	#undef	KF606_CCNRF_INO
 	#undef	MJXQ_CCNRF_INO
@@ -331,8 +364,14 @@
 	#undef	Q303_CCNRF_INO
 	#undef	Q90C_CCNRF_INO
 	#undef	SLT_CCNRF_INO
+	#undef	UDIRC_CCNRF_INO
 	#undef	V911S_CCNRF_INO
+	#undef	WL91X_CCNRF_INO
 	#undef	XK_CCNRF_INO
+	#undef	XK2_CCNRF_INO
+#endif
+#if not defined(DSM_CYRF6936_INO)
+	#undef	LOSI_CYRF6936_INO
 #endif
 #if not defined(STM32_BOARD)
 	//RF2500 emulation does not work on atmega...
@@ -342,10 +381,98 @@
 #if not defined(STM32_BOARD)
 	#undef SX1276_INSTALLED
 #endif
-#ifndef SX1276_INSTALLED
+#if not defined(SX1276_INSTALLED) || defined MULTI_EU
 	#undef FRSKYR9_SX1276_INO
 #endif

+#ifdef MULTI_AIR
+	#undef	JOYSWAY_A7105_INO
+	//#undef	KYOSHO_A7105_INO
+	//#undef	PELIKAN_A7105_INO
+	#undef	LOSI_CYRF6936_INO		//Need DSM to be enabled
+	#undef	TRAXXAS_CYRF6936_INO
+	#undef	EAZYRC_NRF24L01_INO
+	//#undef	KYOSHO2_NRF24L01_INO
+	#undef	KYOSHO3_CYRF6936_INO
+	#undef	MOULDKG_NRF24L01_INO
+	#undef	SHENQI_NRF24L01_INO
+	#undef	SHENQI2_NRF24L01_INO
+	#undef	JIABAILE_NRF24L01_INO
+	#undef	UDIRC_CCNRF_INO
+	#undef	KAMTOM_NRF24L01_INO
+	#undef	WL91X_CCNRF_INO
+	#undef	WPL_NRF24L01_INO
+#endif
+
+#if defined(MULTI_AIR) || defined(MCU_STM32F103C8)
+	// Save flash space...
+	#undef	BUMBLEB_CCNRF_INO
+	#undef	CABELL_NRF24L01_INO
+	#undef	FQ777_NRF24L01_INO
+	#undef	NCC1701_NRF24L01_INO
+	#undef	Q303_CCNRF_INO
+	#undef	Q90C_CCNRF_INO
+	#undef	REDPINE_CC2500_INO
+#endif
+
+#ifdef MULTI_SURFACE
+	#undef	ARES_CC2500_INO
+	#undef	BUGS_A7105_INO
+	#undef	HEIGHT_A7105_INO
+	#undef	HUBSAN_A7105_INO
+	#undef	E010R5_CYRF6936_INO
+	#undef	E01X_CYRF6936_INO
+	#undef	E129_CYRF6936_INO
+	#undef	J6PRO_CYRF6936_INO
+	#undef	SCORPIO_CYRF6936_INO
+	#undef	E016HV2_CC2500_INO
+	#undef	ESKY150V2_CC2500_INO
+	#undef	IKEAANSLUTA_CC2500_INO  // This is mostly a "for-fun" kind of a thing, not needed for most users
+	#undef	SKYARTEC_CC2500_INO
+	#undef	REDPINE_CC2500_INO
+	#undef	BAYANG_NRF24L01_INO
+	#undef	BAYANG_RX_NRF24L01_INO
+	#undef	BUGSMINI_NRF24L01_INO
+	#undef	CABELL_NRF24L01_INO
+	#undef	CFLIE_NRF24L01_INO
+	#undef	CG023_NRF24L01_INO
+	#undef	CX10_NRF24L01_INO
+	#undef	DM002_NRF24L01_INO
+	#undef	E016H_NRF24L01_INO
+	#undef	ESKY_NRF24L01_INO
+	#undef	ESKY150_NRF24L01_INO
+	#undef	FQ777_NRF24L01_INO
+	#undef	FX_NRF24L01_INO
+	#undef	FY326_NRF24L01_INO
+	#undef	GW008_NRF24L01_INO
+	#undef	HONTAI_NRF24L01_INO
+	#undef	H8_3D_NRF24L01_INO
+	#undef	H36_NRF24L01_INO
+	#undef	JJRC345_NRF24L01_INO
+	#undef	KN_NRF24L01_INO
+	#undef	LOLI_NRF24L01_INO
+	#undef	NCC1701_NRF24L01_INO
+	#undef	POTENSIC_NRF24L01_INO
+	#undef	PROPEL_NRF24L01_INO
+	//#undef	REALACC_NRF24L01_INO // This now contains a WLtoys car sub protocol
+	#undef	SGF22_NRF24L01_INO
+	#undef	SYMAX_NRF24L01_INO
+	#undef	V761_NRF24L01_INO
+	#undef	XERALL_NRF24L01_INO
+	#undef	YD717_NRF24L01_INO
+	#undef	ZSX_NRF24L01_INO
+	#undef	GD00X_CCNRF_INO
+	#undef	KF606_CCNRF_INO
+	#undef	MJXQ_CCNRF_INO
+	#undef	MT99XX_CCNRF_INO
+	#undef	OMP_CCNRF_INO
+	#undef	Q303_CCNRF_INO
+	#undef	Q90C_CCNRF_INO
+	#undef	V911S_CCNRF_INO
+	#undef	SGF22_NRF24L01_INO
+	#undef	YUXIANG_NRF24L01_INO
+#endif
+
 //OpenTX 2.3.x issue
 #if defined (FRSKYD_CC2500_INO) || defined(FRSKYV_CC2500_INO) || defined(FRSKYX_CC2500_INO)
 	#define	FRSKYX_CC2500_INO
@@ -381,6 +508,12 @@
 	#undef DEVO_HUB_TELEMETRY
 	#undef PROPEL_HUB_TELEMETRY
 	#undef OMP_HUB_TELEMETRY
+	#undef V761_HUB_TELEMETRY
+	#undef FX_HUB_TELEMETRY
+	#undef XK2_HUB_TELEMETRY
+	#undef SGF22_HUB_TELEMETRY
+	#undef KAMTOM_HUB_TELEMETRY
+	#undef YUXIANG_HUB_TELEMETRY
 	#undef RLINK_HUB_TELEMETRY
 	#undef DSM_RX_CYRF6936_INO
 	#undef DSM_FWD_PGM
@@ -416,6 +549,24 @@
 	#if not defined(OMP_CCNRF_INO)
 		#undef OMP_HUB_TELEMETRY
 	#endif
+	#if not defined(V761_NRF24L01_INO)
+		#undef V761_HUB_TELEMETRY
+	#endif
+	#if not defined(FX_NRF24L01_INO)
+		#undef FX_HUB_TELEMETRY
+	#endif
+	#if not defined(XK2_CCNRF_INO)
+		#undef XK2_HUB_TELEMETRY
+	#endif
+	#if not defined(SGF22_NRF24L01_INO)
+		#undef SGF22_HUB_TELEMETRY
+	#endif
+	#if not defined(KAMTOM_NRF24L01_INO)
+		#undef KAMTOM_HUB_TELEMETRY
+	#endif
+	#if not defined(YUXIANG_NRF24L01_INO)
+		#undef YUXIANG_HUB_TELEMETRY
+	#endif
 	#if not defined(PROPEL_NRF24L01_INO)
 		#undef PROPEL_HUB_TELEMETRY
 	#endif
@@ -473,7 +624,7 @@
 		//protocols using FRSKYD user frames
 		#undef HUB_TELEMETRY 
 	#endif
-	#if not defined(HOTT_FW_TELEMETRY) && not defined(DSM_TELEMETRY) && not defined(SPORT_TELEMETRY) && not defined(HUB_TELEMETRY) && not defined(HUBSAN_HUB_TELEMETRY) && not defined(BUGS_HUB_TELEMETRY) && not defined(NCC1701_HUB_TELEMETRY) && not defined(BAYANG_HUB_TELEMETRY) && not defined(CABELL_HUB_TELEMETRY) && not defined(RLINK_HUB_TELEMETRY) && not defined(AFHDS2A_HUB_TELEMETRY) && not defined(AFHDS2A_FW_TELEMETRY) && not defined(MULTI_TELEMETRY) && not defined(MULTI_STATUS) && not defined(HITEC_HUB_TELEMETRY) && not defined(HITEC_FW_TELEMETRY) && not defined(SCANNER_TELEMETRY) && not defined(FRSKY_RX_TELEMETRY) && not defined(AFHDS2A_RX_TELEMETRY) && not defined(BAYANG_RX_TELEMETRY) && not defined(DEVO_HUB_TELEMETRY) && not defined(PROPEL_HUB_TELEMETRY) && not defined(OMP_HUB_TELEMETRY) && not defined(WFLY2_HUB_TELEMETRY) && not defined(LOLI_HUB_TELEMETRY) && not defined(MLINK_HUB_TELEMETRY) && not defined(MLINK_FW_TELEMETRY) && not defined(MT99XX_HUB_TELEMETRY) && not defined(MULTI_CONFIG_INO)
+	#if not defined(HOTT_FW_TELEMETRY) && not defined(DSM_TELEMETRY) && not defined(SPORT_TELEMETRY) && not defined(HUB_TELEMETRY) && not defined(HUBSAN_HUB_TELEMETRY) && not defined(BUGS_HUB_TELEMETRY) && not defined(NCC1701_HUB_TELEMETRY) && not defined(BAYANG_HUB_TELEMETRY) && not defined(CABELL_HUB_TELEMETRY) && not defined(RLINK_HUB_TELEMETRY) && not defined(AFHDS2A_HUB_TELEMETRY) && not defined(AFHDS2A_FW_TELEMETRY) && not defined(MULTI_TELEMETRY) && not defined(MULTI_STATUS) && not defined(HITEC_HUB_TELEMETRY) && not defined(HITEC_FW_TELEMETRY) && not defined(SCANNER_TELEMETRY) && not defined(FRSKY_RX_TELEMETRY) && not defined(AFHDS2A_RX_TELEMETRY) && not defined(BAYANG_RX_TELEMETRY) && not defined(DEVO_HUB_TELEMETRY) && not defined(PROPEL_HUB_TELEMETRY) && not defined(OMP_HUB_TELEMETRY) && not defined(V761_HUB_TELEMETRY) && not defined(SGF22_HUB_TELEMETRY) && not defined(XK2_HUB_TELEMETRY) && not defined(FX_HUB_TELEMETRY) && not defined(KAMTOM_HUB_TELEMETRY) && not defined(YUXIANG_HUB_TELEMETRY) && not defined(WFLY2_HUB_TELEMETRY) && not defined(LOLI_HUB_TELEMETRY) && not defined(MLINK_HUB_TELEMETRY) && not defined(MLINK_FW_TELEMETRY) && not defined(MT99XX_HUB_TELEMETRY) && not defined(MULTI_CONFIG_INO)
 		#undef TELEMETRY
 		#undef INVERT_TELEMETRY
 		#undef MULTI_TELEMETRY
--- a/Multiprotocol/WK2x01_cyrf6936.ino
+++ b/Multiprotocol/WK2x01_cyrf6936.ino
@@ -487,7 +487,7 @@ void WK_init()
 	CYRF_SetTxRxMode(TX_EN);

 	hopping_frequency_no=0;
-	CYRF_FindBestChannels(hopping_frequency, 3, 4, 4, 80);
+	CYRF_FindBestChannels(hopping_frequency, 3, 4, 4, 80, FIND_CHANNEL_ANY);
 	CYRF_ConfigRFChannel(hopping_frequency[0]);

 	packet_count = 0;
--- a/Multiprotocol/WL91X_ccnrf.ino
+++ b/Multiprotocol/WL91X_ccnrf.ino
@@ -0,0 +1,96 @@
+/*
+ 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(WL91X_CCNRF_INO)
+
+#include "iface_xn297.h"
+
+//#define FORCE_WL91X_ORIGINAL_ID
+
+#define WL91X_PAYLOAD_SIZE		9
+#define WL91X_RF_NUM_CHANNELS	3
+#define WL91X_PACKET_PERIOD		2594
+
+static void __attribute__((unused)) WL91X_send_packet()
+{
+	uint8_t val;
+
+	//RF freq
+	XN297_Hopping(hopping_frequency_no++);
+	hopping_frequency_no %= WL91X_RF_NUM_CHANNELS;
+
+	//Sticks
+	val = convert_channel_16b_limit(CH2,0x21,0xE0);			//THR forward 00..5F, backward 80..DF
+	if(val < 128) val = 127 - val;
+	packet[0] = val - 0x80;
+	val = convert_channel_s8b(CH1);							//ST right 00..7F, left 80..FF
+	packet[1] = val - 0x80;
+	//Trims
+	val = convert_channel_s8b(CH3);							//ST_Trim centered=80, increment/decrement=4, right 04..7C, left 84..FC
+	packet[2] = val - 0x80;
+	packet[3] = convert_channel_16b_limit(CH4,0x00,0x70);	//TH_Trim increment/decrement=3, 00..39..6F
+	//TX_ID
+	memcpy(&packet[4], rx_tx_addr, 4);
+	//Checksum
+	val = 0;
+	for(uint8_t i=0; i<WL91X_PAYLOAD_SIZE-1; i++)
+		val += packet[i];
+	packet[8] = val;
+
+	//Send
+	XN297_SetPower();
+	XN297_SetFreqOffset();
+	XN297_SetTxRxMode(TX_EN);
+	XN297_WritePayload(packet, WL91X_PAYLOAD_SIZE);
+	#ifdef DEBUG_SERIAL
+		for(uint8_t i=0; i < WL91X_PAYLOAD_SIZE; i++)
+			debug("%02X ", packet[i]);
+		debugln();
+	#endif
+}
+
+static void __attribute__((unused)) WL91X_RF_init()
+{
+	XN297_Configure(XN297_CRCEN, XN297_UNSCRAMBLED, XN297_250K);
+	XN297_HoppingCalib(WL91X_RF_NUM_CHANNELS);
+	XN297_SetTXAddr((uint8_t*)"\x46\x14\x7B\x08", 4);
+}
+
+static void __attribute__((unused)) WL91X_initialize_txid()
+{
+	#ifdef FORCE_WL91X_ORIGINAL_ID
+		memcpy(rx_tx_addr, (uint8_t*)"\x00\x1E\x33\x02",4);
+	#endif
+	memcpy(hopping_frequency, (uint8_t*)"\x1A\x3B\x3B",3);	//26,59,59
+}
+
+uint16_t WL91X_callback()
+{
+	#ifdef MULTI_SYNC
+		telemetry_set_input_sync(WL91X_PACKET_PERIOD);
+	#endif
+	WL91X_send_packet();
+	return WL91X_PACKET_PERIOD;
+}
+
+void WL91X_init()
+{
+	BIND_DONE;	//No bind for this protocol
+	WL91X_initialize_txid();
+	WL91X_RF_init();
+	hopping_frequency_no = 0;
+}
+
+#endif
--- a/Multiprotocol/WPL_nrf24l01.ino
+++ b/Multiprotocol/WPL_nrf24l01.ino
@@ -0,0 +1,158 @@
+/*
+ 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 WPL "Basic" TX models D12, D12KM, D22, D32, D42, D14
+
+#if defined(WPL_NRF24L01_INO)
+
+#include "iface_xn297.h"
+
+#define FORCE_WPL_ORIGINAL_ID
+
+#define WPL_PACKET_PERIOD   9875
+#define WPL_RF_NUM_CHANNELS 4
+#define WPL_PAYLOAD_SIZE    16
+#define WPL_BIND_COUNT		303	//3sec
+
+static void __attribute__((unused)) WPL_send_packet()
+{
+	#if 0
+		debug("no:%d, rf:%d, ",hopping_frequency_no + (IS_BIND_IN_PROGRESS?0:4),hopping_frequency[hopping_frequency_no + (IS_BIND_IN_PROGRESS?0:4)]);
+	#endif
+	XN297_Hopping(hopping_frequency_no + (IS_BIND_IN_PROGRESS?0:4) );
+	hopping_frequency_no++;
+	hopping_frequency_no &= WPL_RF_NUM_CHANNELS-1;	// 4 RF channels
+
+	memset(&packet[8],0,7);
+	packet[0] = 0x94;											//??
+	packet[1] = 0x16;											//??
+	packet[2] = 0xCC;											//??
+	
+	if(IS_BIND_IN_PROGRESS)
+	{
+		memcpy(&packet[3],rx_tx_addr,5);
+		packet[9] = 0x08;										// ?? Not bound + Headlights on
+	}
+	else
+	{
+		packet[3 ] = convert_channel_s8b(CH1);					// Throttle
+		packet[4 ] = convert_channel_s8b(CH2);					// Steering
+		packet[5 ] = convert_channel_16b_limit(CH3,0x22,0x5E);	// Steering trim
+		packet[6 ] = rx_tx_addr[3];								// 0x32??
+		packet[7 ] = convert_channel_s8b(CH4);					// Aux
+		packet[9 ] = 0x80										// ?? Bound
+				   | GET_FLAG(CH5_SW, 0x08)						// Headlights 100%=on
+				   | GET_FLAG(CH6_SW, 0x04)						// Throttle rate 100%=high
+				   | GET_FLAG(CH7_SW, 0x02);					// Steering rate 100%=high
+	}
+	uint8_t sum = 0x66;
+	for(uint8_t i=0;i<WPL_PAYLOAD_SIZE-1;i++)
+		sum += packet[i];
+	packet[WPL_PAYLOAD_SIZE-1] = sum;
+	// Send
+	XN297_SetPower();
+	XN297_SetTxRxMode(TX_EN);
+	XN297_WritePayload(packet, WPL_PAYLOAD_SIZE);
+	#if 0
+		for(uint8_t i=0; i<WPL_PAYLOAD_SIZE; i++)
+			debug(" %02X",packet[i]);
+		debugln("");
+	#endif
+}
+
+static void __attribute__((unused)) WPL_RF_init()
+{
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
+	XN297_SetTXAddr((uint8_t*)"\x69\xA5\x37\x4D\x8B", 5);
+	XN297_HoppingCalib(WPL_RF_NUM_CHANNELS*2);	// Calibrate bind and normal channels
+}
+
+static void __attribute__((unused)) WPL_initialize_txid()
+{
+	//Bind frequencies
+	memcpy(hopping_frequency  ,"\x17\x25\x46\x36", WPL_RF_NUM_CHANNELS);	//23=17, 37=25, 70=46, 54=36
+	#ifdef FORCE_WPL_ORIGINAL_ID
+		//Original ID
+		memcpy(rx_tx_addr,"\x96\x2A\xA9\x32\xB4",5);
+		//Normal frequencies
+		memcpy(hopping_frequency+4,"\x0C\x2A\x3D\x1D", WPL_RF_NUM_CHANNELS);	//12=0C, 42=2A, 61=3D, 29=1D
+	#endif
+}
+
+uint16_t WPL_callback()
+{
+	#ifdef MULTI_SYNC
+		telemetry_set_input_sync(WPL_PACKET_PERIOD);
+	#endif
+	if(bind_counter)
+		if(--bind_counter==0)
+		{
+			BIND_DONE;
+			XN297_SetTXAddr(rx_tx_addr, 5);
+		}
+	WPL_send_packet();
+	return WPL_PACKET_PERIOD;
+}
+
+void WPL_init()
+{
+	BIND_IN_PROGRESS;	// autobind protocol
+	WPL_initialize_txid();
+	WPL_RF_init();
+	hopping_frequency_no = 0;
+	bind_counter=WPL_BIND_COUNT;
+}
+
+#endif
+/* https://github.com/pascallanger/DIY-Multiprotocol-TX-Module/issues/1120
+Bind packet
+-----------
+XN297 1Mb Scrambled
+Bind address: 69 A5 37 4D 8B
+RF channels: 23, 37, 70, 54
+Timing: 9875µs
+Payload 16 bytes: 94 16 CC 96 2A A9 32 B4 00 08 00 00 00 00 00 33
+
+P[0] = 94 ??
+P[1] = 16 ??
+P[2] = CC ??
+P[3..7] = Normal address
+P[8] = 00 ??
+P[9] = 08 ?? not bound?, Throttle and Steering rate low, Headlights on
+P[10..14] = 00 ??
+P[15] = sum(P[0..14])+66 why 66? 66=(94+16)^CC...
+
+Normal packet
+-----------
+XN297 1Mb Scrambled
+Normal address: 96 2A A9 32 B4
+RF channels: 12=0C, 42=2A, 61=3D, 29=1D -> no idea where they come from...
+Timing: 9875µs
+Payload 16 bytes: 94 16 CC 80 80 38 32 80 00 88 00 00 00 00 00 4E
+P[0] = 94 ??
+P[1] = 16 ??
+P[2] = CC ??
+P[3] = Throttle, not enough data on dumps... Same coding as Steering?
+P[4] = Steering, not enough data on dumps, looks like one side goes from 7F to 00 and the other 80 to FF which would be s8b
+P[5] = Steering trim 22..5E, mid gives 40 not 38... Was the trim centered on the other dumps with value 38?
+P[6] = 32 ?? Left over from the bind packet TX_ADDR[3]?
+P[7] = 80 ?? Additional channel? It moves at the same time as the trim but my guess is that it is an unconnected channel.
+P[8] = 00 ??
+P[9] = 80 ?? bound?, Throttle and Steering rate low, Headlights off
+      |02 -> Steering rate high
+      |04 -> Throttle rate high
+      |08 -> Headlights on
+P[10..14] = 00 ??
+P[15] = sum(P[0..14])+66 why 66? 66=(94+16)^CC...
+*/
--- a/Multiprotocol/XK2_ccnrf.ino
+++ b/Multiprotocol/XK2_ccnrf.ino
@@ -0,0 +1,432 @@
+/*
+ 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 XK TX X4 and model A160S.
+
+#if defined(XK2_CCNRF_INO)
+
+#include "iface_xn297.h"
+
+//#define FORCE_XK2_ID
+//#define FORCE_XK2_P10_ID
+
+#define XK2_RF_BIND_CHANNEL		71
+#define XK2_P10_RF_BIND_CHANNEL	69
+#define XK2_PAYLOAD_SIZE		9
+#define XK2_PACKET_PERIOD		4911
+#define XK2_RF_NUM_CHANNELS		4
+#define XK2_WRITE_TIME			1000
+
+enum {
+	XK2_BIND1,
+	XK2_BIND2,
+	XK2_DATA_PREP,
+	XK2_DATA,
+	XK2_RX,
+};
+
+static uint8_t __attribute__((unused)) XK2_checksum(uint8_t init)
+{
+	for(uint8_t i=0; i<XK2_PAYLOAD_SIZE-1; i++)
+		init += packet[i];
+	if(sub_protocol == XK2_P10)
+		init += 0x10;
+	return init;
+}
+
+static void __attribute__((unused)) XK2_send_packet()
+{
+	static uint8_t trim_ch=0;
+	
+	if(IS_BIND_IN_PROGRESS)
+	{
+		packet[0] = 0x9D;
+		//TXID
+		memcpy(&packet[1], rx_tx_addr, 3);
+		//RXID
+		//memcpy(&packet[4], rx_id     , 3);
+		//Unknown
+		packet[7] = 0x00;
+	}
+	else
+	{
+		XN297_Hopping(hopping_frequency_no);
+		hopping_frequency_no++;
+		hopping_frequency_no &= 0x03;
+		//Channels
+		packet[0] = convert_channel_16b_limit(AILERON ,0x00,0x64);		//Aileron
+		packet[1] = convert_channel_16b_limit(ELEVATOR,0x00,0x64);		//Elevator
+		packet[2] = convert_channel_16b_limit(THROTTLE,0x00,0x64);		//Throttle
+		packet[3] = convert_channel_16b_limit(RUDDER  ,0x00,0x64);		//Rudder
+		//Center the trims
+		trim_ch++;
+		if(trim_ch > 2) trim_ch = 0;
+		packet[4] = 0x20 + 0x40 * trim_ch;								//Trims are A=01..20..3F/E=41..60..7F/R=81..A0..BF, E0 appears when telemetry is received, C1 when p[6] changes from 00->08, C0 when p[6] changes from 08->00
+		if(trim_ch == 2)												//Drive rudder trim since otherwise there is no control...
+		{
+			packet[4] = 0x80 + (convert_channel_8b(RUDDER)>>2);
+			if(packet[4] <= 0x81) packet[4] = 0x81;
+		}
+		//Flags
+		packet[5] = GET_FLAG(CH5_SW, 0x01)								//Rate
+				  | GET_FLAG(CH7_SW, 0x20)								//Hover
+				  | GET_FLAG(CH8_SW, 0x40);								//Light
+		if(CH6_SW)
+			packet[5] |= 0x10;											//Gyro off (senior mode)
+		else if(Channel_data[CH6] > CHANNEL_MIN_COMMAND)
+			packet[5] |= 0x08;											//3D
+		packet[5] |= GET_FLAG(CH9_SW, 0x04);							//Sky Viper Vector stunt flag
+		//Request telemetry flag
+		packet[6] = 0x01;
+		//RXID checksum
+		packet[7] = crc8;												//Sum RX_ID[0..2]
+	}
+	//Checksum
+	packet[8] = XK2_checksum(IS_BIND_IN_PROGRESS ? 0xC0 : num_ch);
+
+	// Send
+	XN297_SetFreqOffset();
+	XN297_SetPower();
+	XN297_SetTxRxMode(TX_EN);
+	XN297_WritePayload(packet, XK2_PAYLOAD_SIZE);
+	#if 0
+		debug("P");
+		for(uint8_t i=0; i<XK2_PAYLOAD_SIZE; i++)
+			debug(" %02X",packet[i]);
+		debugln();
+	#endif
+}
+
+static void __attribute__((unused)) XK2_RF_init()
+{
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_250K);
+	
+	XN297_SetTXAddr((uint8_t*)"\xcc\xcc\xcc\xcc\xcc", 5);
+	XN297_SetRXAddr((uint8_t*)"\xcc\xcc\xcc\xcc\xcc", XK2_PAYLOAD_SIZE);
+
+	XN297_HoppingCalib(XK2_RF_NUM_CHANNELS);
+	XN297_RFChannel(sub_protocol==XK2_X4?XK2_RF_BIND_CHANNEL:XK2_P10_RF_BIND_CHANNEL);
+}
+
+static void __attribute__((unused)) XK2_initialize_txid()
+{
+	rx_tx_addr[0] = rx_tx_addr[3];				// Use RX_num
+
+	num_ch = 0x21 + rx_tx_addr[0] - rx_tx_addr[1] + rx_tx_addr[2];
+
+	//RF frequencies for X4: 65=0x41, 69=0x45, 73=0x49, 77=0x4D
+	//RF frequencies for P10: 67, unknown
+	uint8_t start = 65;
+	if(sub_protocol == XK2_P10) start += 2;
+	for(uint8_t i=0;i<XK2_RF_NUM_CHANNELS;i++)
+		hopping_frequency[i] = start + i*4;
+
+	#ifdef FORCE_XK2_ID
+		if(rx_tx_addr[3]&1)
+		{//Pascal
+			rx_tx_addr[0] = 0x66;
+			rx_tx_addr[1] = 0x4F;
+			rx_tx_addr[2] = 0x47;
+			num_ch = 0x7F;
+			//hopping frequencies 65=0x41, 69=0x45, 73=0x49, 77=0x4D
+		}
+		else
+		{//Marc
+			rx_tx_addr[0] = 0x36;
+			rx_tx_addr[1] = 0x49;
+			rx_tx_addr[2] = 0x6B;
+			num_ch = 0x79;
+			//hopping frequencies 65=0x41, 69=0x45, 73=0x49, 77=0x4D
+		}
+	#endif
+	#ifdef FORCE_XK2_P10_ID
+		rx_tx_addr[0] = 0xE8;
+		rx_tx_addr[1] = 0x25;
+		rx_tx_addr[2] = 0x3B;
+		num_ch = 0x1F;
+		//hopping frequencies 67=0x43, =0x, =0x, =0x
+	#endif
+
+	rx_tx_addr[3] = rx_tx_addr[4] = 0xCC;
+	debugln("ID: %02X %02X %02X %02X %02X, OFFSET: %02X, HOP: %02X %02X %02X %02X",rx_tx_addr[0],rx_tx_addr[1],rx_tx_addr[2],rx_tx_addr[3],rx_tx_addr[4],num_ch,hopping_frequency[0],hopping_frequency[1],hopping_frequency[2],hopping_frequency[3]);
+}
+
+uint16_t XK2_callback()
+{
+	static bool rx = false;
+
+	switch(phase)
+	{
+		case XK2_BIND1:
+			// switch to RX mode
+			XN297_SetTxRxMode(TXRX_OFF);
+			XN297_SetTxRxMode(RX_EN);
+			phase++;
+			return 5000;
+		case XK2_BIND2:
+			if(XN297_IsRX())
+			{
+				XN297_ReadPayload(packet, XK2_PAYLOAD_SIZE);
+				#if 0
+					debug("RX");
+					for(uint8_t i=0; i<XK2_PAYLOAD_SIZE; i++)
+						debug(" %02X",packet[i]);
+					debugln("");
+				#endif
+				if(XK2_checksum(0xBF) != packet[8])
+				{//Wrong checksum
+					phase = XK2_BIND1;
+					return 1000;
+				}
+				if(packet[0] == 0x9B)
+					phase++;
+				else
+				{
+					//checksum of RX_ID
+					crc8 = packet[4] + packet[5] + packet[6];
+					debugln("W:RX_ID=%02X",crc8);
+					eeprom_write_byte((EE_ADDR)(XK2_EEPROM_OFFSET+RX_num),crc8);
+					XN297_SetTxRxMode(TXRX_OFF);
+					XN297_SetTxRxMode(TX_EN);
+					bind_counter = 10;					//send 10 bind end packets
+					phase = XK2_DATA;
+				}
+			}
+			return 1000;
+		case XK2_DATA_PREP:
+			crc8 = eeprom_read_byte((EE_ADDR)(XK2_EEPROM_OFFSET+RX_num));
+			debugln("R:RX_ID=%02X",crc8);
+			XN297_SetTxRxMode(TXRX_OFF);
+			XN297_SetTxRxMode(TX_EN);
+			XN297_SetTXAddr(rx_tx_addr, 5);
+	#ifdef XK2_HUB_TELEMETRY
+			XN297_SetRXAddr(rx_tx_addr, XK2_PAYLOAD_SIZE);
+	#endif
+			BIND_DONE;
+			phase++;
+		case XK2_DATA:
+			#ifdef MULTI_SYNC
+				telemetry_set_input_sync(XK2_PACKET_PERIOD);
+			#endif
+	#ifdef XK2_HUB_TELEMETRY
+			rx = XN297_IsRX();
+			XN297_SetTxRxMode(TXRX_OFF);
+	#endif
+			XK2_send_packet();
+	#ifdef XK2_HUB_TELEMETRY
+			if(rx)
+			{
+				XN297_ReadPayload(packet, XK2_PAYLOAD_SIZE);
+				#if 0
+					debug("RX");
+					for(uint8_t i=0; i<XK2_PAYLOAD_SIZE; i++)
+						debug(" %02X",packet[i]);
+					debugln("");
+				#endif
+				if(XK2_checksum(0xCC) == packet[8] && memcmp(packet, rx_tx_addr, 3) == 0)
+				{//Good checksum and TXID
+					//packets: E5 20 F2 00 00 00 00 00 C3 -> E5 20 F2 80 00 00 00 00 43
+					telemetry_link = 1;
+					v_lipo1 = packet[3] ? 137:162;		// low voltage 7.1V
+				}
+			}
+	#endif
+			if(bind_counter)
+			{
+				bind_counter--;
+				if(bind_counter == 0)
+					phase = XK2_DATA_PREP;
+				break;
+			}
+	#ifndef XK2_HUB_TELEMETRY
+			break;
+	#else
+			phase++;
+			return XK2_WRITE_TIME;
+		default: //XK2_RX
+			/*{ // Wait for packet to be sent before switching to receive mode
+				uint16_t start=(uint16_t)micros(), count=0;
+				while ((uint16_t)((uint16_t)micros()-(uint16_t)start) < 500)
+				{
+					if(XN297_IsPacketSent())
+						break;
+					count++;
+				}
+				debugln("%d",count);
+			}*/
+			//Switch to RX
+			XN297_SetTxRxMode(TXRX_OFF);
+			XN297_SetTxRxMode(RX_EN);
+			phase = XK2_DATA;
+			return XK2_PACKET_PERIOD-XK2_WRITE_TIME;
+	#endif
+	}
+	return XK2_PACKET_PERIOD;
+}
+
+void XK2_init()
+{
+	//BIND_IN_PROGRESS;	// autobind protocol
+	XK2_initialize_txid();
+	XK2_RF_init();
+	
+	if(IS_BIND_IN_PROGRESS)
+		phase = XK2_BIND1;
+	else
+		phase = XK2_DATA_PREP;
+	bind_counter = 0;
+	hopping_frequency_no = 0;
+	#ifdef XK2_HUB_TELEMETRY
+		RX_RSSI = 100;		// Dummy value
+	#endif
+}
+
+#endif
+
+/*
+XK A160 Piper CUB
+
+Bind
+----
+Plane sends these packets:
+RX:     0us C=71 S=Y A= CC CC CC CC CC P(9)= 9C BB CC DD 38 12 10 00 19
+P[0] = 9C bind phase 1
+P[1] = Dummy TX_ID
+P[2] = Dummy TX_ID
+P[3] = Dummy TX_ID
+P[4] = RX_ID[0]
+P[5] = RX_ID[1]
+P[6] = RX_ID[2]
+P[7] = 00
+P[8] = sum P[0..7] + BF
+
+TX responds to plane:
+RX 9D 66 4F 47 38 12 10 00 B3
+P[0] = 9D bind phase 2
+P[1] = TX_ID[0]
+P[2] = TX_ID[1]
+P[3] = TX_ID[2]
+P[4] = RX_ID[0]
+P[5] = RX_ID[1]
+P[6] = RX_ID[2]
+P[7] = 00
+P[8] = sum P[0..7] + C0
+
+Planes ack:
+RX:  4299us C=71 S=Y A= CC CC CC CC CC P(9)= 9B 66 4F 47 38 12 10 00 B0
+RX: 26222us C=71 S=Y A= CC CC CC CC CC P(9)= 9B 66 4F 47 38 12 10 00 B0
+RX:  8743us C=71 S=Y A= CC CC CC CC CC P(9)= 9B 66 4F 47 38 12 10 00 B0
+P[0] = 9B bind phase 3
+P[1] = TX_ID[0]
+P[2] = TX_ID[1]
+P[3] = TX_ID[2]
+P[4] = RX_ID[0]
+P[5] = RX_ID[1]
+P[6] = RX_ID[2]
+P[7] = 00
+P[8] = sum P[0..7] + BF
+
+Normal
+------
+TX sends
+C=65,69,73,77 -> only one channel when telemetry is working
+250K C=69 S=Y A= 66 4F 47 CC CC P(9)= 32 32 00 32 E0 00 01 5A 50
+P[0] = A 00..32..64
+P[1] = E 00..32..64
+P[2] = T 00..64
+P[3] = R 00..32..64
+P[4] = alternates 20,60,A0,E0
+       trims
+		A 01..20..3F
+		E 41..60..7F
+		R 81..A0..BF
+	   telemetry
+	    E0 present when the telemetry works
+	   6g/3d
+		C1 few times if P[6] flag 00->08
+		C0 few times if P[6] = flag 08->00
+P[5] = flags
+        01=high rate
+		20=hover=long_press_left
+		40=light -> temporary
+		08=6g/3d=short_press_right sequece also switches for a few packets to C1 if 8 C0 if 0
+P[6] = 00 telemetry nok
+       01 telemetry ok but sometimes switch to 1 also when telemetry is nok...
+P[7] = 5A -> sum RX_ID[0..2] 
+P[8] = sum P[0..7] + TX_ID[0] - TX_ID[1] + TX_ID[2] + 21
+
+Telemetry
+RX on channel: 69, Time:  3408us P: 66 4F 47 00 00 00 00 00 C8
+P[0] = TX_ID[0]
+P[1] = TX_ID[1]
+P[2] = TX_ID[2]
+P[8] = sum P[0..7] + CC
+
+Timing when plane is not detected:
+RF
+2469 110713 0
+2473 114560 3847
+2477 120291 5731
+2465 135684 15393
+2469 142138 6454
+2473 145984 3846
+2477 151753 5769
+2465 155330 3577
+
+*/
+/* P10 Piper CUB
+Bind
+----
+Phase 1
+Plane sends these packets:
+250K C=69 S=Y A= CC CC CC CC CC P(9)= 9C BB CC DD 84 24 20 00 97
+P[0] = 9C bind phase 1
+P[1] = Dummy TX_ID
+P[2] = Dummy TX_ID
+P[3] = Dummy TX_ID
+P[4] = RX_ID[0]
+P[5] = RX_ID[1]
+P[6] = RX_ID[2]
+P[7] = 00
+P[8] = sum P[0..7] + BF + 10
+
+Normal
+------
+TX sends
+C=67 -> only one channel when telemetry is working
+A= E8 25 3B CC CC P(9)= 32 32 00 32 A0 40 01 C8 6E
+P[0] = A 00..32..64
+P[1] = E 00..32..64
+P[2] = T 00..64
+P[3] = R 00..32..64
+P[4] = alternates 20,60,A0,E0
+       trims
+		A 01..20..3F
+		E 41..60..7F
+		R 81..A0..BF
+	   telemetry
+	    E0 present when the telemetry works
+	   6g/3d
+		C1 few times if P[6] flag 00->08
+		C0 few times if P[6] = flag 08->00
+P[5] = flags
+        01=high rate
+		20=hover=long_press_left
+		40=light -> temporary
+		08=6g/3d=short_press_right sequece also switches for a few packets to C1 if 8 C0 if 0
+P[6] = 00 telemetry nok
+       01 telemetry ok but sometimes switch to 1 also when telemetry is nok...
+P[7] = C8 -> sum RX_ID[0..2] 
+P[8] = sum P[0..7] + TX_ID[0] - TX_ID[1] + TX_ID[2] + 21 +10
+*/
--- a/Multiprotocol/XK_ccnrf.ino
+++ b/Multiprotocol/XK_ccnrf.ino
@@ -29,11 +29,18 @@ Multiprotocol is distributed in the hope that it will be useful,

 static uint16_t __attribute__((unused)) XK_convert_channel(uint8_t num)
 {
-	// Introduce deadband on all channels to prevent twitching
-	//debug("val:%d",val);
-	uint16_t val=convert_channel_8b_limit_deadband(num,0x00,0x80, 0xFF, 40)<<2;
-	//debugln(",%d",val);
-
+	uint16_t val;
+	
+	if(sub_protocol != XK_CARS)
+	{
+		// Introduce deadband on all channels to prevent twitching
+		//debug("val:%d",val);
+		val=convert_channel_8b_limit_deadband(num,0x00,0x80, 0xFF, 40)<<2;
+		//debugln(",%d",val);
+	}
+	else
+		val=convert_channel_16b_limit(num,0x00,0x3FF);
+	
 	// 1FF..01=left, 00=center, 200..3FF=right
 	if(val==0x200)
 		val=0;									// 0
@@ -89,12 +96,14 @@ static void __attribute__((unused)) XK_send_packet()
 				packet[10] = 0x04; 				// 6G-Mode
 		//0x00 default M-Mode
 		
-		packet[10] |= GET_FLAG(CH7_SW,0x80);	// Emergency stop momentary switch
+		packet[10] |= GET_FLAG(CH7_SW ,0x80);	// Emergency stop momentary switch

-		packet[11]  = GET_FLAG(CH8_SW,0x03)		// 3D/6G momentary switch
-					 |GET_FLAG(CH6_SW,0x40);	// Take off momentary switch
-		packet[14]  = GET_FLAG(CH9_SW,0x01)		// Photo momentary switch
-					 |GET_FLAG(CH10_SW,0x2);	// Video momentary switch
+		packet[11]  = GET_FLAG(CH8_SW ,0x03)	// 3D/6G momentary switch
+					 |GET_FLAG(CH6_SW ,0x40);	// Take off momentary switch
+		packet[14]  = GET_FLAG(CH9_SW ,0x01)	// Photo momentary switch
+					 |GET_FLAG(CH10_SW,0x02)	// Video momentary switch
+					 |GET_FLAG(CH11_SW,0x04)	// Flip
+					 |GET_FLAG(CH12_SW,0x10);	// Light
 		//debugln("P1:%02X,P12:%02X",packet[1],packet[12]);
 	}

@@ -187,7 +196,7 @@ static void __attribute__((unused)) XK_initialize_txid()

 static void __attribute__((unused)) XK_RF_init()
 {
-	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, sub_protocol==X420 ? XN297_1M : XN297_250K);
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, sub_protocol==X450 ? XN297_250K : XN297_1M );
 	XN297_SetTXAddr((uint8_t*)"\x68\x94\xA6\xD5\xC3", 5);						// Bind address
 	XN297_HoppingCalib(XK_RF_BIND_NUM_CHANNELS+XK_RF_NUM_CHANNELS);				// Calibrate all channels
 }
@@ -209,7 +218,8 @@ uint16_t XK_callback()

 void XK_init()
 {
-	BIND_IN_PROGRESS;															// Autobind protocol
+	if(sub_protocol != XK_CARS)
+		BIND_IN_PROGRESS;															// Autobind protocol
 	XK_initialize_txid();
 	XK_RF_init();
 	hopping_frequency_no = 0;
--- a/Multiprotocol/XN297Dump_nrf24l01.ino
+++ b/Multiprotocol/XN297Dump_nrf24l01.ino
@@ -22,8 +22,10 @@
 #include "iface_xn297.h"

 // Parameters which can be modified
-#define XN297DUMP_PERIOD_SCAN		50000 	// 25000
-#define XN297DUMP_MAX_RF_CHANNEL	127		// Default 84
+#define XN297DUMP_PERIOD_FAST_SCAN	50000	// 50000
+#define XN297DUMP_PERIOD_SLOW_SCAN	100000 	// 75000
+#define XN297DUMP_MAX_PACKET		50 		// 20
+#define XN297DUMP_MAX_RF_CHANNEL	84		// Default 84

 // Do not touch from there
 #define XN297DUMP_INITIAL_WAIT		500
@@ -37,6 +39,8 @@ boolean enhanced;
 boolean ack;
 uint8_t pid;
 uint8_t bitrate;
+uint8_t old_option;
+uint32_t scan_counter;

 static void __attribute__((unused)) XN297Dump_RF_init()
 {
@@ -185,6 +189,7 @@ static void __attribute__((unused)) XN297Dump_overflow()
 static uint16_t XN297Dump_callback()
 {
 	static uint32_t time=0,*time_rf;
+	static uint8_t *nbr_rf,compare_channel;

 	//!!!Blocking mode protocol!!!
 	TX_MAIN_PAUSE_off;
@@ -193,10 +198,10 @@ static uint16_t XN297Dump_callback()
 	{
 		if(sub_protocol<XN297DUMP_AUTO)
 		{
-			if(option==0xFF && bind_counter>XN297DUMP_PERIOD_SCAN)
+			if(option==0xFF && scan_counter>XN297DUMP_PERIOD_SLOW_SCAN)
 			{	// Scan frequencies
 				hopping_frequency_no++;
-				bind_counter=0;
+				scan_counter=0;
 			}
 			if(hopping_frequency_no!=rf_ch_num)
 			{	// Channel has changed
@@ -292,10 +297,10 @@ static uint16_t XN297Dump_callback()
 					phase++;
 					break;
 				case 1:
-					if(bind_counter>XN297DUMP_PERIOD_SCAN)
+					if(scan_counter>XN297DUMP_PERIOD_FAST_SCAN)
 					{	// Scan frequencies
 						hopping_frequency_no++;
-						bind_counter=0;
+						scan_counter=0;
 						if(hopping_frequency_no>XN297DUMP_MAX_RF_CHANNEL)
 						{
 							hopping_frequency_no=0;
@@ -365,12 +370,18 @@ static uint16_t XN297Dump_callback()
 								debugln("\r\n--------------------------------");
 								phase=2;
 								debugln("Identifying all RF channels in use.");
-								bind_counter=0;
+								scan_counter=0;
 								hopping_frequency_no=0;
 								rf_ch_num=0;
 								packet_count=0;
+								nbr_rf=(uint8_t*)malloc(XN297DUMP_MAX_RF_CHANNEL*sizeof(uint8_t));
+								if(nbr_rf==NULL)
+								{
+									debugln("\r\nCan't allocate memory for next phase!!!");
+									phase=0;
+									break;
+								}
 								debug("Trying RF channel: 0");
-
 								XN297_SetTXAddr(rx_tx_addr,address_length);
 								XN297_SetRXAddr(rx_tx_addr,packet_length);
 								XN297_RFChannel(0);
@@ -381,18 +392,43 @@ static uint16_t XN297Dump_callback()
 					}
 					break;
 				case 2:
-					if(bind_counter>XN297DUMP_PERIOD_SCAN)
+					if(scan_counter>XN297DUMP_PERIOD_SLOW_SCAN)
 					{	// Scan frequencies
 						hopping_frequency_no++;
-						bind_counter=0;
-						if(packet_count && packet_count<=20)
+						scan_counter=0;
+						if(packet_count && packet_count<=XN297DUMP_MAX_PACKET)
 							debug("\r\nTrying RF channel: ");
 						packet_count=0;
 						if(hopping_frequency_no>XN297DUMP_MAX_RF_CHANNEL)
 						{
+							uint8_t nbr_max=0,j=0;
 							debug("\r\n\r\n%d RF channels identified:",rf_ch_num);
+							compare_channel=0;
 							for(uint8_t i=0;i<rf_ch_num;i++)
-								debug(" %d",hopping_frequency[i]);
+							{
+								debug(" %d[%d]",hopping_frequency[i],nbr_rf[i]);
+								if(nbr_rf[i]>nbr_max)
+								{
+									nbr_max=nbr_rf[i];
+									compare_channel=i;
+								}
+							}
+							nbr_max = (nbr_max*2)/3;
+							debug("\r\nKeeping only RF channels with more than %d packets:", nbr_max);
+							for(uint8_t i=0;i<rf_ch_num;i++)
+								if(nbr_rf[i]>=nbr_max)
+								{
+									hopping_frequency[j]=hopping_frequency[i];
+									debug(" %d",hopping_frequency[j]);
+									if(compare_channel==i)
+									{
+										compare_channel=j;
+										debug("*");
+									}
+									j++;
+								}
+							rf_ch_num = j;
+							free(nbr_rf);
 							time_rf=(uint32_t*)malloc(rf_ch_num*sizeof(time));
 							if(time_rf==NULL)
 							{
@@ -402,13 +438,13 @@ static uint16_t XN297Dump_callback()
 							}
 							debugln("\r\n--------------------------------");
 							debugln("Identifying RF channels order.");
-							hopping_frequency_no=1;
+							hopping_frequency_no=0;
 							phase=3;
 							packet_count=0;
-							bind_counter=0;
-							debugln("Time between CH:%d and CH:%d",hopping_frequency[0],hopping_frequency[hopping_frequency_no]);
+							scan_counter=0;
+							debugln("Time between CH:%d and CH:%d",hopping_frequency[compare_channel],hopping_frequency[hopping_frequency_no]);
 							time_rf[hopping_frequency_no]=0xFFFFFFFF;
-							XN297_RFChannel(hopping_frequency[0]);
+							XN297_RFChannel(hopping_frequency[compare_channel]);
 							uint16_t timeL=TCNT1;
 							if(TIMER2_BASE->SR & TIMER_SR_UIF)
 							{//timer just rolled over...
@@ -429,7 +465,7 @@ static uint16_t XN297Dump_callback()
 					}
 					if( XN297_IsRX() )
 					{ // RX fifo data ready
-						//	if(NRF24L01_ReadReg(NRF24L01_09_CD))
+						if(NRF24L01_ReadReg(NRF24L01_09_CD))
 						{
 							uint8_t res;
 							if(enhanced)
@@ -461,9 +497,10 @@ static uint16_t XN297Dump_callback()
 								for(uint8_t i=0;i<packet_length;i++)
 									debug(" %02X",packet[i]);
 								packet_count++;
-								if(packet_count>20)
+								nbr_rf[rf_ch_num-1]=packet_count;
+								if(packet_count>XN297DUMP_MAX_PACKET)
 								{//change channel
-									bind_counter=XN297DUMP_PERIOD_SCAN+1;
+									scan_counter=XN297DUMP_PERIOD_SLOW_SCAN+1;
 									debug("\r\nTrying RF channel: ");
 								}
 							}
@@ -475,23 +512,23 @@ static uint16_t XN297Dump_callback()
 					XN297Dump_overflow();
 					break;
 				case 3:
-					if(bind_counter>XN297DUMP_PERIOD_SCAN)
+					if(scan_counter>XN297DUMP_PERIOD_SLOW_SCAN)
 					{	// Scan frequencies
 						hopping_frequency_no++;
-						bind_counter=0;
+						scan_counter=0;
 						if(hopping_frequency_no>=rf_ch_num)
 						{
 							uint8_t next=0;
 							debugln("\r\n\r\nChannel order:");
-							debugln("%d:     0us",hopping_frequency[0]);
-							uint8_t i=1;
+							debugln("%d:     0us",hopping_frequency[compare_channel]);
+							uint8_t i=0;
 							do
 							{
 								time=time_rf[i];
 								if(time!=0xFFFFFFFF)
 								{
 									next=i;
-									for(uint8_t j=2;j<rf_ch_num;j++)
+									for(uint8_t j=1;j<rf_ch_num;j++)
 										if(time>time_rf[j])
 										{
 											next=j;
@@ -511,9 +548,9 @@ static uint16_t XN297Dump_callback()
 							hopping_frequency_no=0;
 							break;
 						}
-						debugln("Time between CH:%d and CH:%d",hopping_frequency[0],hopping_frequency[hopping_frequency_no]);
+						debugln("Time between CH:%d and CH:%d",hopping_frequency[compare_channel],hopping_frequency[hopping_frequency_no]);
 						time_rf[hopping_frequency_no]=-1;
-						XN297_RFChannel(hopping_frequency[0]);
+						XN297_RFChannel(hopping_frequency[compare_channel]);
 						uint16_t timeL=TCNT1;
 						if(TIMER2_BASE->SR & TIMER_SR_UIF)
 						{//timer just rolled over...
@@ -527,7 +564,7 @@ static uint16_t XN297Dump_callback()
 					}
 					if( XN297_IsRX() )
 					{ // RX fifo data ready
-						//if(NRF24L01_ReadReg(NRF24L01_09_CD))
+						if(NRF24L01_ReadReg(NRF24L01_09_CD))
 						{
 							uint8_t res;
 							if(enhanced)
@@ -552,7 +589,7 @@ static uint16_t XN297Dump_callback()
 									if(time_rf[hopping_frequency_no] > (time>>1))
 										time_rf[hopping_frequency_no]=time>>1;
 									debugln("Time: %5luus", time>>1);
-									XN297_RFChannel(hopping_frequency[0]);
+									XN297_RFChannel(hopping_frequency[compare_channel]);
 								}
 								else
 								{
@@ -562,7 +599,7 @@ static uint16_t XN297Dump_callback()
 								packet_count++;
 								if(packet_count>24)
 								{
-									bind_counter=XN297DUMP_PERIOD_SCAN+1;
+									scan_counter=XN297DUMP_PERIOD_SLOW_SCAN+1;
 									packet_count=0;
 								}
 							}
@@ -610,11 +647,10 @@ 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"
-
+				memcpy(rx_tx_addr, (uint8_t *)"\xCC\xCC\xCC\xCC\xCC", address_length);	// bind \x7E\xB8\x63\xA9
 				bitrate=XN297DUMP_250K;
-				packet_length=32;
-				hopping_frequency_no=54; //bind ?, normal 60
+				packet_length=9;
+				hopping_frequency_no=71; //bind 71, normal ??
 				
 				NRF24L01_Initialize();
 				NRF24L01_SetTxRxMode(TXRX_OFF);
@@ -622,9 +658,10 @@ 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);
-
-				debug("NRF dump, len=%d, rf=%d, address length=%d, bitrate=",packet_length,hopping_frequency_no,address_length);
+				NRF24L01_WriteReg(NRF24L01_05_RF_CH, option);	//hopping_frequency_no);
+				old_option = option;
+				
+				debug("NRF dump, len=%d, rf=%d, address length=%d, bitrate=",packet_length,option,address_length);	//hopping_frequency_no,address_length);
 				switch(bitrate)
 				{
 					case XN297DUMP_250K:
@@ -643,6 +680,7 @@ static uint16_t XN297Dump_callback()
 				}
 				NRF24L01_WriteReg(NRF24L01_00_CONFIG, _BV(NRF24L01_00_PWR_UP) | _BV(NRF24L01_00_PRIM_RX)); //_BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO) | 
 				phase++;
+				time=0;
 			}
 			else
 			{
@@ -650,13 +688,23 @@ static uint16_t XN297Dump_callback()
 				{ // RX fifo data ready
 					if(NRF24L01_ReadReg(NRF24L01_09_CD))
 					{
+						XN297Dump_overflow();
+						uint16_t timeL=TCNT1;
+						if(TIMER2_BASE->SR & TIMER_SR_UIF)
+						{//timer just rolled over...
+							XN297Dump_overflow();
+							timeL=0;
+						}
+						time=(timeH<<16)+timeL-time;
+						debug("RX: %5luus ", time>>1);
+						time=(timeH<<16)+timeL;
 						NRF24L01_ReadPayload(packet, packet_length);
 						//bool ok=true;
 						uint8_t buffer[40];
 						memcpy(buffer,packet,packet_length);
 						//if(memcmp(&packet_in[0],&packet[0],packet_length))
 						{
-							debug("P:");
+							debug("C: %02X P:", option);
 							for(uint8_t i=0;i<packet_length;i++)
 								debug(" %02X",packet[i]);
 							debugln("");
@@ -718,6 +766,12 @@ 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) |
 				}
+				XN297Dump_overflow();
+				if(old_option != option)
+				{
+					NRF24L01_WriteReg(NRF24L01_05_RF_CH, option);	//hopping_frequency_no);
+					old_option = option;
+				}
 			}
 		}
 		else if(sub_protocol == XN297DUMP_CC2500)
@@ -833,7 +887,64 @@ static uint16_t XN297Dump_callback()
 			}
 		#endif
 		}
-		bind_counter++;
+		else if(sub_protocol == XN297DUMP_XN297)
+		{
+			if(phase==0)
+			{
+				address_length=5;
+				memcpy(rx_tx_addr, (uint8_t *)"\x00\x00\x00\x00\x00", address_length);	// bind \x7E\xB8\x63\xA9
+				packet_length=9;
+				hopping_frequency_no=0x30;
+				
+				XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
+				XN297_SetTxRxMode(TXRX_OFF);
+				XN297_SetTXAddr(rx_tx_addr, address_length);
+				XN297_SetRXAddr(rx_tx_addr, packet_length);
+				XN297_Hopping(option);
+				old_option = option;
+				XN297_SetTxRxMode(RX_EN);
+				
+				debugln("XN297 dump, len=%d, rf=%d, address length=%d",packet_length,option,address_length);	//hopping_frequency_no,address_length);
+				phase = 1;
+			}
+			else
+			{
+				bool rx = XN297_IsRX();					// Needed for the NRF24L01 since otherwise the bit gets cleared
+				if(rx)
+				{ // RX fifo data ready
+					XN297_SetTxRxMode(TXRX_OFF);
+					XN297Dump_overflow();
+					uint16_t timeL=TCNT1;
+					if(TIMER2_BASE->SR & TIMER_SR_UIF)
+					{//timer just rolled over...
+						XN297Dump_overflow();
+						timeL=0;
+					}
+					time=(timeH<<16)+timeL-time;
+					debug("RX: %5luus ", time>>1);
+					time=(timeH<<16)+timeL;
+					if(XN297_ReadPayload(packet_in, packet_length))
+					{
+						debug("OK:");
+						for(uint8_t i=0;i<packet_length;i++)
+							debug(" %02X",packet_in[i]);
+					}
+					else // Bad packet
+						debug(" NOK");
+					debugln("");
+					// restart RX mode
+					XN297_SetTxRxMode(RX_EN);
+				}
+				XN297Dump_overflow();
+				if(old_option != option)
+				{
+					debugln("C=%d(%02X)",option,option);
+					XN297_Hopping(option);
+					old_option = option;
+				}
+			}
+		}
+		scan_counter++;
 		if(IS_RX_FLAG_on)					// Let the radio update the protocol
 		{
 			if(Update_All()) return 10000;	// New protocol selected
@@ -859,7 +970,7 @@ void XN297Dump_init(void)
 	if(address_length<3||address_length>5)
 		address_length=5;	//default
 	XN297Dump_RF_init();
-	bind_counter=0;
+	scan_counter=0;
 	rf_ch_num=0xFF;
 	prev_option=option^0x55;
 	phase=0;				// init
--- a/Multiprotocol/XN297_EMU.ino
+++ b/Multiprotocol/XN297_EMU.ino
@@ -133,10 +133,9 @@ static void __attribute__((unused)) XN297_SetRXAddr(const uint8_t* addr, uint8_t
 		if(xn297_rf == XN297_NRF)
 		{
 			NRF24L01_WriteRegisterMulti(NRF24L01_0A_RX_ADDR_P0, xn297_rx_addr, xn297_addr_len);
-			if(rx_packet_len >= 32)
-				NRF24L01_WriteReg(NRF24L01_11_RX_PW_P0, 32);
-			else
-				NRF24L01_WriteReg(NRF24L01_11_RX_PW_P0, rx_packet_len);
+			if(rx_packet_len > 32)
+				rx_packet_len = 32;
+			NRF24L01_WriteReg(NRF24L01_11_RX_PW_P0, rx_packet_len);
 		}
 	#endif
 	#ifdef CC2500_INSTALLED
@@ -208,6 +207,27 @@ static void __attribute__((unused)) XN297_SetTxRxMode(enum TXRX_State mode)
 	#endif
 }

+#ifdef CC2500_INSTALLED
+uint8_t XN297_Buffer[32];
+uint8_t XN297_Buffer_Len = 0;
+
+static void __attribute__((unused)) XN297_SendCC2500Payload()
+{
+	// stop TX/RX
+	CC2500_Strobe(CC2500_SIDLE);
+	// flush tx FIFO
+	CC2500_Strobe(CC2500_SFTX);
+	// packet length
+	CC2500_WriteReg(CC2500_06_PKTLEN, XN297_Buffer_Len + 4);  // Packet len, fix packet len
+	// xn297L preamble
+	CC2500_WriteRegisterMulti(CC2500_3F_TXFIFO, (uint8_t*)"\x0C\x71\x0F\x55", 4);
+	// xn297 packet
+	CC2500_WriteRegisterMulti(CC2500_3F_TXFIFO, XN297_Buffer, XN297_Buffer_Len);
+	// transmit
+	CC2500_Strobe(CC2500_STX);
+}
+#endif
+
 static void __attribute__((unused)) XN297_SendPayload(uint8_t* msg, uint8_t len)
 {
 	#ifdef NRF24L01_INSTALLED
@@ -221,22 +241,25 @@ static void __attribute__((unused)) XN297_SendPayload(uint8_t* msg, uint8_t len)
 	#ifdef CC2500_INSTALLED
 		if(xn297_rf == XN297_CC2500)
 		{
-			// stop TX/RX
-			CC2500_Strobe(CC2500_SIDLE);
-			// flush tx FIFO
-			CC2500_Strobe(CC2500_SFTX);
-			// packet length
-			CC2500_WriteReg(CC2500_06_PKTLEN, len + 4);  // Packet len, fix packet len
-			// xn297L preamble
-			CC2500_WriteRegisterMulti(CC2500_3F_TXFIFO, (uint8_t*)"\x0C\x71\x0F\x55", 4);
-			// xn297 packet
-			CC2500_WriteRegisterMulti(CC2500_3F_TXFIFO, msg, len);
-			// transmit
-			CC2500_Strobe(CC2500_STX);
+			memcpy(XN297_Buffer, msg, len);
+			XN297_Buffer_Len = len;
+			XN297_SendCC2500Payload();
 		}
 	#endif
 }

+static void __attribute__((unused)) XN297_ReSendPayload()
+{
+	#ifdef NRF24L01_INSTALLED
+		if(xn297_rf == XN297_NRF)
+			NRF24L01_Strobe(NRF24L01_E3_REUSE_TX_PL);
+	#endif
+	#ifdef CC2500_INSTALLED
+		if(xn297_rf == XN297_CC2500)
+			XN297_SendCC2500Payload();
+	#endif
+}
+
 static void __attribute__((unused)) XN297_WritePayload(uint8_t* msg, uint8_t len)
 {
 	uint8_t buf[32];
@@ -330,9 +353,9 @@ static void __attribute__((unused)) XN297_WriteEnhancedPayload(uint8_t* msg, uin

 		last++;
 		buf[last] = bit_reverse(msg[len-1]) << 6; // last 2 bit of payload
-		if(xn297_scramble_enabled)
-			buf[last] ^= xn297_scramble[scramble_index++] & 0xc0;
 	}
+	if(xn297_scramble_enabled)
+		buf[last] ^= xn297_scramble[scramble_index++] & 0xc0;

 	// crc
 	if (xn297_crc)
@@ -352,8 +375,7 @@ static void __attribute__((unused)) XN297_WriteEnhancedPayload(uint8_t* msg, uin
 		buf[last++] = (crc & 0xff) << 6;
 	}
 	pid++;
-	if(pid>3)
-		pid=0;
+	pid &= 0x03;

 	// send packet
 	XN297_SendPayload(buf, last);
@@ -441,7 +463,6 @@ static uint8_t __attribute__((unused)) XN297_ReadEnhancedPayload(uint8_t* msg, u

 	// Read payload
 	XN297_ReceivePayload(buffer, len+2);		// Read pcf + payload + CRC
-
 	// Decode payload
 	pcf_size = buffer[0];
 	if(xn297_scramble_enabled)
--- a/Multiprotocol/Yuxiang_nrf24l01.ino
+++ b/Multiprotocol/Yuxiang_nrf24l01.ino
@@ -0,0 +1,261 @@
+/*
+ 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/>.
+ 
+ Thanks to  Goebish ,Ported  from his deviation firmware
+ */
+
+#if defined(YUXIANG_NRF24L01_INO)
+
+#include "iface_xn297.h"
+
+//#define YUXIANG_FORCE_ID
+
+#define YUXIANG_PACKET_PERIOD		12422
+#define YUXIANG_PACKET_SIZE			9
+#define YUXIANG_BIND_COUNT			150
+#define YUXIANG_BIND_FREQ			0x30	//48
+#define YUXIANG_RF_NUM_CHANNELS		4
+
+#define YUXIANG_WRITE_TIME			1000
+//#define YUXIANG_TELEM_DEBUG
+
+enum 
+{
+	YUXIANG_DATA = 0,
+	YUXIANG_RX
+};
+
+static void __attribute__((unused)) YUXIANG_send_packet()
+{
+	if(bind_counter && packet_sent < 5 && (hopping_frequency_no & 0x07) == 0)
+	{
+		bind_counter--;
+		if(!bind_counter)
+			BIND_DONE;
+	#if 0
+		debug("B C:%d, ",YUXIANG_BIND_FREQ);
+	#endif
+		XN297_RFChannel(YUXIANG_BIND_FREQ);
+		XN297_SetTXAddr((uint8_t*)"\x00\x00\x00\x00\x00", 5);
+		bind_phase = 1;
+		packet_sent++;
+	}
+	else
+	{//Normal operation
+		XN297_Hopping(hopping_frequency_no & 0x03);
+	#if 0
+		debug("C:%d, ",hopping_frequency[hopping_frequency_no & 0x03]);
+	#endif
+		hopping_frequency_no++;
+		if(bind_phase)
+		{
+			XN297_SetTXAddr(rx_tx_addr, 5);
+			XN297_SetRXAddr(rx_tx_addr, YUXIANG_PACKET_SIZE);
+			bind_phase = 0;
+			packet_sent = 0;
+		}
+	}
+
+	packet[0] = GET_FLAG(!bind_phase, 0x80)		// Bind packet
+			| GET_FLAG(telemetry_lost, 0x20)	// No telem
+			| GET_FLAG(!CH5_SW, 0x10)			// Lock
+			| GET_FLAG(CH6_SW, 0x08)			// High
+			| GET_FLAG(CH11_SW, 0x01);			// Screw pitch -> temporary
+	
+	packet[1] = GET_FLAG(CH7_SW, 0x08)			// Land only when unlock
+			| GET_FLAG(CH10_SW, 0x20);			// Mode
+
+	packet[2] = GET_FLAG(CH5_SW, 0x02)			// Altitude hold set when unlock
+			| GET_FLAG(CH8_SW, 0x01)			// Manual
+			| GET_FLAG(CH9_SW, 0x40);			// Flip
+
+	uint16_t value = convert_channel_16b_limit(AILERON,0,1000);
+	packet[3] = value;
+	packet[7] = value >> 8;
+	value = convert_channel_16b_limit(ELEVATOR,0,1000);
+	packet[4] = value;
+	packet[7] |= (value >> 6) & 0x0C;
+	value = convert_channel_16b_limit(THROTTLE,0,1000);
+	packet[5] = value;
+	packet[7] |= (value >> 4) & 0x30;
+	value = convert_channel_16b_limit(RUDDER,0,1000);
+	packet[6] = value;
+	packet[7] |= (value >> 2) & 0xC0;
+
+	if(bind_phase)
+		memcpy(&packet[3], rx_tx_addr, 4);
+
+	uint8_t checksum = 0;
+	for(uint8_t i=0; i<YUXIANG_PACKET_SIZE-1; i++)
+		checksum += packet[i];
+	packet[8] = checksum;
+	
+	#if 0
+		debug("P:");
+		for(uint8_t i=0;i<YUXIANG_PACKET_SIZE;i++)
+			debug(" %02X",packet[i]);
+		debugln("");
+	#endif
+	// Send
+	XN297_SetPower();
+	XN297_SetTxRxMode(TX_EN);
+	XN297_WritePayload(packet, YUXIANG_PACKET_SIZE);
+}
+
+static void __attribute__((unused)) YUXIANG_RF_init()
+{
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
+}
+
+static void __attribute__((unused)) YUXIANG_initialize_txid()
+{
+	//Modify address to influence hop 
+	rx_tx_addr[0] += RX_num;
+	//Calc hop
+	uint8_t val;
+	for(uint8_t i=0; i<4; i++)
+	{
+		val = i*0x06;
+		if(i) val |= 0x01;
+		val += rx_tx_addr[0];
+		val &= 0x1F;
+		val += 47;
+		if(val < 50)
+			val = 50;
+		if(val > 62 && val < 66)
+			val = 62;
+		hopping_frequency[i] = val;
+	}
+
+	#ifdef YUXIANG_FORCE_ID
+		switch(RX_num)
+		{
+			case 0://TX1
+				memcpy(rx_tx_addr,(uint8_t *)"\xB3\x13\x36\xDD",4); 		//rx_tx_addr[4]=0xD9
+				memcpy(hopping_frequency,(uint8_t *)"\x42\x49\x32\x35",4);	//66,73,50,53
+				break;
+			case 1://TX2
+				memcpy(rx_tx_addr,(uint8_t *)"\xEB\x13\x36\xAC",4);			//rx_tx_addr[4]=0xE0
+				memcpy(hopping_frequency,(uint8_t *)"\x47\x4D\x3A\x3E",4);	//58,62,71,77
+				break;
+		}
+	#endif
+
+	uint8_t sum=0;
+	for(uint8_t i=0; i<4; i++)
+		sum += rx_tx_addr[i];
+	rx_tx_addr[4] = sum;
+	debugln("ID: %02X %02X %02X %02X %02X , HOP: %2d %2d %2d %2d",rx_tx_addr[0],rx_tx_addr[1],rx_tx_addr[2],rx_tx_addr[3],rx_tx_addr[4],hopping_frequency[0],hopping_frequency[1],hopping_frequency[2],hopping_frequency[3]);
+}
+
+uint16_t YUXIANG_callback()
+{
+	bool rx = false;
+	
+	switch(phase)
+	{
+		case YUXIANG_DATA:
+			rx = XN297_IsRX();					// Needed for the NRF24L01 since otherwise the bit gets cleared
+			XN297_SetTxRxMode(TXRX_OFF);
+	#ifdef YUXIANG_HUB_TELEMETRY
+			if(packet_count > 240)				// Around 3sec with no telemetry
+				telemetry_lost = 1;
+			else
+				packet_count++;
+	#endif
+			#ifdef MULTI_SYNC
+				telemetry_set_input_sync(YUXIANG_PACKET_PERIOD);
+			#endif
+			YUXIANG_send_packet();
+			if(rx)
+			{ // Check if a packet has been received
+				#ifdef YUXIANG_TELEM_DEBUG
+					debug("RX ");
+				#endif
+				if(XN297_ReadPayload(packet_in, YUXIANG_PACKET_SIZE))
+				{ // packet with good CRC and length
+					uint8_t checksum = 0;
+					for(uint8_t i=0; i<YUXIANG_PACKET_SIZE-1; i++)
+						checksum += packet_in[i];
+					if(packet_in[8] == checksum)
+					{
+	#ifdef YUXIANG_HUB_TELEMETRY
+						if(packet_in[0]==0x78)
+						{
+							#ifdef YUXIANG_TELEM_DEBUG
+								debug("OK:");
+								for(uint8_t i=0;i<YUXIANG_PACKET_SIZE;i++)
+									debug(" %02X",packet_in[i]);
+							#endif
+							v_lipo1 = packet_in[4];
+							v_lipo2 = packet_in[6];
+						}
+						telemetry_link = 1;
+	#endif
+						telemetry_lost = 0;
+						packet_count = 0;
+						bind_counter = 0;	// Stop bind
+						BIND_DONE;
+					}
+					#ifdef YUXIANG_TELEM_DEBUG
+					else // Bad packet
+						debug(" NOK");
+					#endif
+				}
+				#ifdef YUXIANG_TELEM_DEBUG
+				else // Bad packet
+					debug("NOK");
+				debugln("");
+				#endif
+				rx = false;
+			}
+			phase++;
+			return YUXIANG_WRITE_TIME;
+		default:
+			// RX
+			{ // Wait for packet to be sent before switching to receive mode
+				uint16_t start=(uint16_t)micros();
+				while ((uint16_t)((uint16_t)micros()-(uint16_t)start) < 500)
+					if(XN297_IsPacketSent())
+						break;
+			}
+			//if(bind_phase)
+			//	XN297_Hopping(3);
+			XN297_SetTxRxMode(RX_EN);
+			phase = YUXIANG_DATA;
+			return YUXIANG_PACKET_PERIOD - YUXIANG_WRITE_TIME;
+	}
+	return 0;
+}
+
+void YUXIANG_init(void)
+{
+	YUXIANG_initialize_txid();
+	YUXIANG_RF_init();
+
+	if(IS_BIND_IN_PROGRESS)
+		bind_counter = YUXIANG_BIND_COUNT;
+	else
+		bind_counter = 0;
+		
+	phase = YUXIANG_DATA;
+	hopping_frequency_no = 0;
+	bind_phase = 1;
+	packet_sent = 8;
+	#ifdef YUXIANG_HUB_TELEMETRY
+		packet_count = 0;
+		telemetry_lost = 1;
+		RX_RSSI = 100;		// Dummy value
+	#endif
+}
+
+#endif
--- a/Multiprotocol/_Config.h
+++ b/Multiprotocol/_Config.h
@@ -107,6 +107,7 @@
 //#define FORCE_REDPINE_TUNING	0
 //#define FORCE_FUTABA_TUNING	0
 //#define FORCE_SKYARTEC_TUNING	0
+//#define FORCE_ARES_TUNING		0

 /** A7105 Fine Frequency Tuning **/
 //This is required in rare cases where some A7105 modules and/or RXs have an inaccurate crystal oscillator.
@@ -165,9 +166,14 @@
 /*** PROTOCOLS TO INCLUDE ***/
 /****************************/
 //In this section select the protocols you want to be accessible when using the module.
-//All the protocols will not fit in the Atmega328p module so you need to pick and choose.
+//All the protocols will not fit in the STM32 or Atmega328p modules so you need to pick and choose.
 //Comment the protocols you are not using with "//" to save Flash space.

+//Already defined protocols selection
+//#define MULTI_AIR			//Only Air protocols will be available, all the others are disabled
+//#define MULTI_SURFACE		//Only Surface protocols will be available, all the others are disabled
+//#define MULTI_EU			//Only LBT/EU protocols will be available, all the others are disabled
+
 //Protocol for module configuration
 #define MULTI_CONFIG_INO

@@ -188,28 +194,32 @@
 #define	DSM_CYRF6936_INO
 #define	DSM_RX_CYRF6936_INO
 #define	E010R5_CYRF6936_INO
+#define	E01X_CYRF6936_INO
 #define	E129_CYRF6936_INO
 #define	J6PRO_CYRF6936_INO
-#define	LOSI_CYRF6936_INO
+#define	KYOSHO3_CYRF6936_INO
+#define	LOSI_CYRF6936_INO		//Need DSM to be enabled
 #define	MLINK_CYRF6936_INO
+#define	SCORPIO_CYRF6936_INO
 #define	TRAXXAS_CYRF6936_INO
 #define	WFLY_CYRF6936_INO
 #define	WK2x01_CYRF6936_INO

 //The protocols below need a CC2500 to be installed
+#define	ARES_CC2500_INO
 #define	CORONA_CC2500_INO
 #define	E016HV2_CC2500_INO
 #define	ESKY150V2_CC2500_INO
 #define	FRSKYL_CC2500_INO
 #define	FRSKYD_CC2500_INO
 #define	FRSKYV_CC2500_INO
-#define	FRSKYX_CC2500_INO
+#define	FRSKYX_CC2500_INO		//Include FRSKYX2 protocol
 #define	FRSKY_RX_CC2500_INO
+#define	FUTABA_CC2500_INO
 #define	HITEC_CC2500_INO
 #define	HOTT_CC2500_INO
 //#define	IKEAANSLUTA_CC2500_INO  // This is mostly a "for-fun" kind of a thing, not needed for most users
 #define	SCANNER_CC2500_INO
-#define	FUTABA_CC2500_INO
 #define	SKYARTEC_CC2500_INO
 #define	REDPINE_CC2500_INO
 #define	RLINK_CC2500_INO
@@ -220,49 +230,59 @@
 #define	BAYANG_RX_NRF24L01_INO
 #define	BUGSMINI_NRF24L01_INO
 #define	CABELL_NRF24L01_INO
-//#define	CFLIE_NRF24L01_INO
+#define	CFLIE_NRF24L01_INO
 #define	CG023_NRF24L01_INO
 #define	CX10_NRF24L01_INO		//Include Q2X2 protocol
 #define	DM002_NRF24L01_INO
 #define	E016H_NRF24L01_INO
-#define	E01X_NRF24L01_INO
+#define	EAZYRC_NRF24L01_INO
 #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	H36_NRF24L01_INO
+#define	H8_3D_NRF24L01_INO
 #define	HISKY_NRF24L01_INO
 #define	HONTAI_NRF24L01_INO
-#define	H8_3D_NRF24L01_INO
+#define JIABAILE_NRF24L01_INO
 #define	JJRC345_NRF24L01_INO
+#define	KAMTOM_NRF24L01_INO
 #define	KN_NRF24L01_INO
+#define	KYOSHO2_NRF24L01_INO
 #define	LOLI_NRF24L01_INO
-//#define	MOULDKG_NRF24L01_INO
+#define	MOULDKG_NRF24L01_INO
 #define	NCC1701_NRF24L01_INO
 #define	POTENSIC_NRF24L01_INO
 #define	PROPEL_NRF24L01_INO
 #define	REALACC_NRF24L01_INO
+#define	SGF22_NRF24L01_INO
 #define	SHENQI_NRF24L01_INO
+#define	SHENQI2_NRF24L01_INO
 #define	SYMAX_NRF24L01_INO
-#define	TIGER_NRF24L01_INO
 #define	V2X2_NRF24L01_INO
 #define	V761_NRF24L01_INO
+#define	WPL_NRF24L01_INO
 #define	XERALL_NRF24L01_INO
 #define	YD717_NRF24L01_INO
+#define	YUXIANG_NRF24L01_INO
 #define	ZSX_NRF24L01_INO

 //The protocols below need either a CC2500 or NRF24L01 to be installed
 #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
 #define	SLT_CCNRF_INO
+#define	UDIRC_CCNRF_INO
 #define	V911S_CCNRF_INO
+#define	WL91X_CCNRF_INO
 #define	XK_CCNRF_INO
+#define	XK2_CCNRF_INO

 //The protocols below need a SX1276 to be installed
 #define	FRSKYR9_SX1276_INO
@@ -276,6 +296,10 @@
 //The DSM protocol is using by default the Spektrum throw of 1100..1900us @100% and 1000..2000us @125%.
 // For more throw, 1024..1976us @100% and 904..2096us @125%, remove the "//" on the line below. Be aware that too much throw can damage some UMX servos. To achieve standard throw in this mode use a channel weight of 84%.
 //#define DSM_MAX_THROW
+
+//Enable X-Plus channels, Ch13-16.. if Enabled, will still respect the DSM_THROTTLE_KILL_CH feature
+#define DSM_X_PLUS
+
 //Some models (X-Vert, Blade 230S...) require a special value to instant stop the motor(s).
 // You can disable this feature by adding "//" on the line below. You have to specify which channel (14 by default) will be used to kill the throttle channel.
 // If the channel 14 is above -50% the throttle is untouched but if it is between -50% and -100%, the throttle output will be forced between -100% and -150%.
@@ -285,11 +309,6 @@
 //Enable DSM Forward Programming
 #define DSM_FWD_PGM

-//AFHDS2A specific settings
-//-------------------------
-//When enabled (remove the "//"), the below setting makes LQI (Link Quality Indicator) available on one of the RX ouput channel (5-14).
-//#define AFHDS2A_LQI_CH 14
-
 /**************************/
 /*** FAILSAFE SETTINGS  ***/
 /**************************/
@@ -335,13 +354,19 @@
 #define HUBSAN_HUB_TELEMETRY		// Use FrSkyD Hub format to send telemetry to TX
 #define NCC1701_HUB_TELEMETRY		// Use FrSkyD Hub format to send telemetry to TX
 #define OMP_HUB_TELEMETRY			// Use FrSkyD Hub format to send telemetry to TX
+#define V761_HUB_TELEMETRY			// Use FrSkyD Hub format to send telemetry to TX
+#define KAMTOM_HUB_TELEMETRY		// Use FrSkyD Hub format to send telemetry to TX
+#define FX_HUB_TELEMETRY			// Use FrSkyD Hub format to send telemetry to TX
+#define XK2_HUB_TELEMETRY			// Use FrSkyD Hub format to send telemetry to TX
+#define SGF22_HUB_TELEMETRY			// Use FrSkyD Hub format to send telemetry to TX
+#define YUXIANG_HUB_TELEMETRY		// Use FrSkyD Hub format to send telemetry to TX
 #define PROPEL_HUB_TELEMETRY		// Use FrSkyD Hub format to send telemetry to TX
 #define CABELL_HUB_TELEMETRY		// Use FrSkyD Hub format to send telemetry to TX
 #define RLINK_HUB_TELEMETRY			// Use FrSkyD Hub format to send telemetry to TX
 #define WFLY2_HUB_TELEMETRY			// Use FrSkyD Hub format to send telemetry to TX
 #define LOLI_HUB_TELEMETRY			// Use FrSkyD Hub format to send telemetry to TX
 #define MT99XX_HUB_TELEMETRY		// Use FrSkyD Hub format to send telemetry to TX
-//#define MLINK_HUB_TELEMETRY			// Use FrSkyD Hub format to send telemetry to TX
+//#define MLINK_HUB_TELEMETRY		// Use FrSkyD Hub format to send telemetry to TX
 #define MLINK_FW_TELEMETRY			// Forward received telemetry packet directly to TX to be decoded by erskyTX and OpenTX
 //#define HITEC_HUB_TELEMETRY		// Use FrSkyD Hub format to send basic telemetry to the radios which can decode it like er9x, erskyTX and OpenTX
 #define HITEC_FW_TELEMETRY			// Forward received telemetry packets to be decoded by erskyTX and OpenTX
@@ -542,15 +567,16 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 //  - 0x0000ABCD will give to the protocol the channels in the order 1,2,3,4,10,11,12,13 which potentially enables acces to channels not available on your TX. Note A=10,B=11,C=12,D=13,E=14,F=15.

 /* Available protocols and associated sub protocols to pick and choose from (Listed in alphabetical order)
+	PROTO_ARES
+		NONE
 	PROTO_AFHDS2A
 		PWM_IBUS
 		PPM_IBUS
 		PWM_SBUS
 		PPM_SBUS
-		PWM_IB16
-		PPM_IB16
-		PWM_SB16
-		PPM_SB16
+		AFHDS2A_GYRO_OFF
+		AFHDS2A_GYRO_ON
+		AFHDS2A_GYRO_ON_REV
 	PROTO_AFHDS2A_RX
 		NONE
 	PROTO_ASSAN
@@ -564,6 +590,8 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		QX100
 	PROTO_BAYANG_RX
 		NONE
+	PROTO_BLUEFLY
+		NONE
 	PROTO_BUGS
 		NONE
 	PROTO_BUGSMINI
@@ -600,8 +628,11 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		DSMX_1F
 		DSMX_2F
 		DSMR
+		DSM2_SFC
 	PROTO_DSM_RX
-		NONE
+		DSM_RX
+		DSM_CLONE
+  		DSM_ERASE
 	PROTO_E010R5
 		NONE
 	PROTO_E016H
@@ -612,6 +643,9 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		E012
 		E015
 	PROTO_E129
+		E129_E129
+		E129_C186
+	PROTO_EAZYRC
 		NONE
 	PROTO_ESKY
 		ESKY_STD
@@ -628,7 +662,8 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		V912
 		CX20
 	PROTO_FQ777
-		NONE
+		FQ777
+		XBM37
 	PROTO_FRSKY_RX
 		FRSKY_RX
 		FRSKY_CLONE
@@ -665,8 +700,16 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 	PROTO_FRSKY_RX
 		FRSKY_RX
 		FRSKY_CLONE
-	PROTO_FX816
+	PROTO_FUTABA
 		NONE
+	PROTO_FX
+		FX816
+		FX620
+		FX9630
+		FX_Q560
+		FX_QF012
+		FX_BM26
+		FX_A570
 	PROTO_FY326
 		FY326
 		FY319
@@ -675,6 +718,7 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		GD_V2
 	PROTO_GW008
 		NONE
+	PROTO_H36
 	PROTO_H8_3D
 		H8_3D
 		H20H
@@ -695,6 +739,7 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		JJRCX1
 		X5C1
 		FQ777_951
+		HONTAI_XKK170
 	PROTO_HOTT
 		HOTT_SYNC
 		HOTT_NO_SYNC
@@ -706,20 +751,30 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		NONE
 	PROTO_J6PRO
 		NONE
+	PROTO_JIABAILE
+		JIABAILE_STD
+		JIABAILE_GYRO
 	PROTO_JJRC345
 		JJRC345
 		SKYTMBLR
 	PROTO_JOYSWAY
 		NONE
+	PROTO_KAMTOM
+		NONE
 	PROTO_KF606
 		KF606_KF606
 		KF606_MIG320
+		KF606_ZCZ50
 	PROTO_KN
 		WLTOYS
 		FEILUN
 	PROTO_KYOSHO
 		KYOSHO_FHSS
 		KYOSHO_HYPE
+	PROTO_KYOSHO2
+		NONE
+	PROTO_KYOSHO3
+		NONE
 	PROTO_LOLI
 		NONE
 	PROTO_LOSI
@@ -735,8 +790,9 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 	PROTO_MLINK
 		NONE
 	PROTO_MOULDKG
-		MOULDKG_ANALOG
-		MOULDKG_DIGIT
+		MOULDKG_ANALOG4
+		MOULDKG_DIGIT4
+		MOULDKG_ANALOG6
 	PROTO_MT99XX
 		MT99
 		H7
@@ -746,6 +802,9 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		A180
 		DRAGON
 		F949G
+	PROTO_MT99XX2
+		PA18
+  		SU35
 	PROTO_NCC1701
 		NONE
 	PROTO_OMP
@@ -770,7 +829,8 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 	PROTO_Q90C
 		NONE
 	PROTO_REALACC
-		NONE
+		REALACC_R11
+		REALACC_WLV8TX
 	PROTO_REDPINE
 		RED_FAST
 		RED_SLOW
@@ -778,12 +838,21 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		RLINK_SURFACE
 		RLINK_AIR
 		RLINK_DUMBORC
+		RLINK_RC4G
+		RLINK_DUMBORC_P
 	PROTO_SCANNER
 		NONE
-	PROTO_FUTABA
+	PROTO_SCORPIO
 		NONE
+	PROTO_SGF22
+		SGF22
+		F22S
+  		J20
+		CX10
 	PROTO_SHENQI
 		NONE
+	PROTO_SHENQI2
+		NONE
 	PROTO_SKYARTEC
 		NONE
 	PROTO_SLT
@@ -792,13 +861,16 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		Q100
 		Q200
 		MR100
+		V1_4CH
+		RF_SIM
+		SLT6TX
 	PROTO_SYMAX
 		SYMAX
 		SYMAX5C
-	PROTO_TIGER
-		NONE
 	PROTO_TRAXXAS
-		RX6519
+		NONE
+	PROTO_UDIRC
+		NONE
 	PROTO_V2X2
 		V2X2
 		JXD506
@@ -820,17 +892,25 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		W6_6_1
 		W6_HEL
 		W6_HEL_I
+	PROTO_WPL
+		NONE
 	PROTO_XERALL
 		NONE
 	PROTO_XK
 		X450
 		X420
+		XK_CARS
+	PROTO_XK2
+		XK2_X4
+		XK2_P10
 	PROTO_YD717
 		YD717
 		SKYWLKR
 		SYMAX4
 		XINXUN
 		NIHUI
+	PROTO_YUXIANG
+		NONE
 	PROTO_ZSX
 		NONE
 */
--- a/Multiprotocol/iface_cyrf6936.h
+++ b/Multiprotocol/iface_cyrf6936.h
@@ -71,7 +71,11 @@ enum CYRF_PWR {
    CYRF_PWR_DEFAULT,
 };

-
+enum FIND_CHANNEL {
+	FIND_CHANNEL_ANY  = 0,
+	FIND_CHANNEL_EVEN = 1,
+	FIND_CHANNEL_ODD  = 2,
+};

 /* SPI CYRF6936 */
 /*
@@ -85,7 +89,7 @@ void CYRF_SetPower(u8 power);
 void CYRF_ConfigCRCSeed(u16 crc);
 static void CYRF_StartReceive();
 void CYRF_ConfigSOPCode(const u8 *sopcodes);
-void CYRF_ConfigDataCode(const u8 *datacodes, u8 len);
+void CYRF_ConfigDataCode(const u8 *datacodes);
 static u8 CYRF_ReadRSSI(u32 dodummyread);
 static void CYRF_ReadDataPacket(u8 dpbuffer[]); 
 void CYRF_WriteDataPacket(const u8 dpbuffer[]);
--- a/Multiprotocol/iface_hs6200.h
+++ b/Multiprotocol/iface_hs6200.h
@@ -0,0 +1,13 @@
+#ifndef _IFACE_HS6200_H_
+#define _IFACE_HS6200_H_
+
+#include "iface_cyrf6936.h"
+
+//HS6200
+static void __attribute__((unused)) HS6200_Init(bool);
+static void __attribute__((unused)) HS6200_SetTXAddr(const uint8_t*, uint8_t);
+static void __attribute__((unused)) HS6200_SendPayload(uint8_t*, uint8_t);
+#define HS6200_SetPower() CYRF_GFSK1M_SetPower()
+#define HS6200_RFChannel(X) CYRF_ConfigRFChannel(X)
+
+#endif
--- a/Multiprotocol/iface_nrf250k.h
+++ b/Multiprotocol/iface_nrf250k.h
@@ -13,7 +13,7 @@

 //////////////
 // Functions
-#define NRF250K_Init()			XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_250K)
+#define NRF250K_Init(X)			XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_250K, X)
 #define NRF250K_HoppingCalib(X)	XN297_HoppingCalib(X)
 #define NRF250K_Hopping(X)		XN297_Hopping(X)
 #define NRF250K_RFChannel(X)	XN297_RFChannel(X)
--- a/Multiprotocol/iface_xn297.h
+++ b/Multiprotocol/iface_xn297.h
@@ -28,6 +28,7 @@ static void __attribute__((unused)) XN297_SetTXAddr(const uint8_t*, uint8_t);
 static void __attribute__((unused)) XN297_SetRXAddr(const uint8_t*, uint8_t);
 static void __attribute__((unused)) XN297_SetTxRxMode(enum TXRX_State);
 static void __attribute__((unused)) XN297_SendPayload(uint8_t*, uint8_t);
+static void __attribute__((unused)) XN297_ReSendPayload();
 static void __attribute__((unused)) XN297_WritePayload(uint8_t*, uint8_t);
 static void __attribute__((unused)) XN297_WriteEnhancedPayload(uint8_t*, uint8_t, uint8_t);
 static bool __attribute__((unused)) XN297_IsRX();
--- a/Protocols_Details.md
+++ b/Protocols_Details.md
--- a/README.md
+++ b/README.md
@@ -100,9 +100,9 @@ For example, if you have no interest in binding your Tx to an model with and FrS

 ## **Choice 3:** Which protocols to upload to the MULTI-Module

-In the case of the ATmega328, the memory required by all the possible protocols exceeds the 32KB flash limit considerably. This means that you will need to make a choice of which protocols you will compile into your firmware.  Fortunately, the process of selecting and compiling is not too difficult and it is fully documented on the [Compiling and Programming](docs/Compiling.md) page.
+As the list of supported protocols grows even the STM32 ARM microcontroller cannot hold all of the protocols. You can select the protocols you need and complie your own firmware. Fortunately, the process of selecting and compiling is not too difficult and it is fully documented on the [Compiling and Programming](docs/Compiling.md) page. You can also download firmware from the [Multi-Module](https://downloads.multi-module.org) website. These firmware files have been split into two groups, surface "SFC" and air "AIR". You can check which protocols are included in each of these groups in the [Validate.h](Multiprotocol/Validate.h) source file.

-An alternative is to use a STM32 ARM microcontroller based module which can hold all the protocols.
+In the case of the ATmega328, the memory required by all the possible protocols exceeds the 32KB flash limit considerably. This means that you will need to make a choice of which protocols you will compile into your firmware.

 ## **Choice 4:** Choosing the type of interface between the MULTI-Module and your radio (PPM or Serial)

@@ -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.
--- a/PL18/Casing/MPM-BF.stl
+++ b/PL18/Casing/MPM-BF.stl
--- a/PL18/Casing/MPM-TF.stl
+++ b/PL18/Casing/MPM-TF.stl
--- a/PL18/Casing/MPM.blend
+++ b/PL18/Casing/MPM.blend
--- a/PL18/PL18_multiprotocol/Multi.kicad_sym
+++ b/PL18/PL18_multiprotocol/Multi.kicad_sym
@@ -0,0 +1,130 @@
+(kicad_symbol_lib (version 20211014) (generator kicad_symbol_editor)
+  (symbol "MULTIRF4IN1SMT" (in_bom yes) (on_board yes)
+    (property "Reference" "M" (id 0) (at -12.7 21.59 0)
+      (effects (font (size 1.27 1.0795)) (justify left bottom))
+    )
+    (property "Value" "MULTIRF4IN1SMT" (id 1) (at -12.7 -16.51 0)
+      (effects (font (size 1.778 1.5113)) (justify left top))
+    )
+    (property "Footprint" "Multi:MULTIRF4IN1-SMT" (id 2) (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (symbol "MULTIRF4IN1SMT_1_0"
+      (polyline
+        (pts
+          (xy -12.7 -15.24)
+          (xy 12.7 -15.24)
+        )
+        (stroke (width 0.254) (type default) (color 0 0 0 0))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy -12.7 20.32)
+          (xy -12.7 -15.24)
+        )
+        (stroke (width 0.254) (type default) (color 0 0 0 0))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 12.7 -15.24)
+          (xy 12.7 20.32)
+        )
+        (stroke (width 0.254) (type default) (color 0 0 0 0))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 12.7 20.32)
+          (xy -12.7 20.32)
+        )
+        (stroke (width 0.254) (type default) (color 0 0 0 0))
+        (fill (type none))
+      )
+      (pin bidirectional line (at 15.24 17.78 180) (length 2.54)
+        (name "CE_2401" (effects (font (size 1.27 1.27))))
+        (number "CE_2401" (effects (font (size 0 0))))
+      )
+      (pin bidirectional line (at 15.24 2.54 180) (length 2.54)
+        (name "CS_2401" (effects (font (size 1.27 1.27))))
+        (number "CS_2401" (effects (font (size 0 0))))
+      )
+      (pin bidirectional line (at 15.24 0 180) (length 2.54)
+        (name "CS_2500" (effects (font (size 1.27 1.27))))
+        (number "CS_2500" (effects (font (size 0 0))))
+      )
+      (pin bidirectional line (at 15.24 5.08 180) (length 2.54)
+        (name "CS_6936" (effects (font (size 1.27 1.27))))
+        (number "CS_6936" (effects (font (size 0 0))))
+      )
+      (pin bidirectional line (at 15.24 -2.54 180) (length 2.54)
+        (name "CS_7105" (effects (font (size 1.27 1.27))))
+        (number "CS_7105" (effects (font (size 0 0))))
+      )
+      (pin power_in line (at 15.24 -10.16 180) (length 2.54)
+        (name "GND" (effects (font (size 1.27 1.27))))
+        (number "GND" (effects (font (size 0 0))))
+      )
+      (pin power_in line (at -15.24 17.78 0) (length 2.54)
+        (name "GND@1" (effects (font (size 1.27 1.27))))
+        (number "GND@1" (effects (font (size 0 0))))
+      )
+      (pin power_in line (at -15.24 15.24 0) (length 2.54)
+        (name "GND@2" (effects (font (size 1.27 1.27))))
+        (number "GND@2" (effects (font (size 0 0))))
+      )
+      (pin power_in line (at -15.24 5.08 0) (length 2.54)
+        (name "GND@3" (effects (font (size 1.27 1.27))))
+        (number "GND@3" (effects (font (size 0 0))))
+      )
+      (pin power_in line (at -15.24 0 0) (length 2.54)
+        (name "GND@4" (effects (font (size 1.27 1.27))))
+        (number "GND@4" (effects (font (size 0 0))))
+      )
+      (pin power_in line (at -15.24 -10.16 0) (length 2.54)
+        (name "GND@5" (effects (font (size 1.27 1.27))))
+        (number "GND@5" (effects (font (size 0 0))))
+      )
+      (pin power_in line (at -15.24 -12.7 0) (length 2.54)
+        (name "GND@6" (effects (font (size 1.27 1.27))))
+        (number "GND@6" (effects (font (size 0 0))))
+      )
+      (pin bidirectional line (at 15.24 12.7 180) (length 2.54)
+        (name "MISO" (effects (font (size 1.27 1.27))))
+        (number "MISO" (effects (font (size 0 0))))
+      )
+      (pin bidirectional line (at 15.24 10.16 180) (length 2.54)
+        (name "MOSI" (effects (font (size 1.27 1.27))))
+        (number "MOSI" (effects (font (size 0 0))))
+      )
+      (pin bidirectional line (at 15.24 -7.62 180) (length 2.54)
+        (name "PE1" (effects (font (size 1.27 1.27))))
+        (number "PE1" (effects (font (size 0 0))))
+      )
+      (pin bidirectional line (at 15.24 -5.08 180) (length 2.54)
+        (name "PE2" (effects (font (size 1.27 1.27))))
+        (number "PE2" (effects (font (size 0 0))))
+      )
+      (pin output line (at -15.24 2.54 0) (length 2.54)
+        (name "RF" (effects (font (size 1.27 1.27))))
+        (number "RF" (effects (font (size 0 0))))
+      )
+      (pin bidirectional line (at 15.24 15.24 180) (length 2.54)
+        (name "RST_CYFR" (effects (font (size 1.27 1.27))))
+        (number "RST_CYFR" (effects (font (size 0 0))))
+      )
+      (pin bidirectional line (at 15.24 7.62 180) (length 2.54)
+        (name "SCK" (effects (font (size 1.27 1.27))))
+        (number "SCK" (effects (font (size 0 0))))
+      )
+      (pin power_in line (at 15.24 -12.7 180) (length 2.54)
+        (name "VCC" (effects (font (size 1.27 1.27))))
+        (number "VCC" (effects (font (size 0 0))))
+      )
+    )
+  )
+)
--- a/PL18/PL18_multiprotocol/Multi.pretty/DS-B01F-A-S2.kicad_mod
+++ b/PL18/PL18_multiprotocol/Multi.pretty/DS-B01F-A-S2.kicad_mod
@@ -0,0 +1,42 @@
+(footprint "DS-B01F-A-S2" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 59FED5CC)
+  (descr "Through hole straight pin header, 1x05, 2.54mm pitch, single row")
+  (tags "Through hole pin header THT 1x05 2.54mm single row")
+  (attr through_hole)
+  (fp_text reference "REF**" (at -0.25 -4.75) (layer "F.SilkS")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp d518c7db-9a4d-4905-902c-7b6d95f659cb)
+  )
+  (fp_text value "DS-B01F-A-S2" (at 0 12.49) (layer "F.Fab")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 614f538e-5f2b-401d-b0ab-3346d3ff44e4)
+  )
+  (fp_text user "${REFERENCE}" (at 0 5.08 90) (layer "F.Fab")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 9586cda1-48da-45c7-86f7-751657e7c25a)
+  )
+  (fp_line (start -4.5 13.5) (end 1.25 13.5) (layer "F.SilkS") (width 0.12) (tstamp 05393a00-de07-40a8-8064-67c0a8a1e9ef))
+  (fp_line (start 1.25 -3.5) (end 1.25 13.5) (layer "F.SilkS") (width 0.12) (tstamp 09bf1fa9-9ec6-4d5c-bed9-fcd1fe76bd8e))
+  (fp_line (start -4.5 -3.5) (end 1.25 -3.5) (layer "F.SilkS") (width 0.12) (tstamp 2f1dd441-3cdc-4eed-9839-dc1fa6a931ba))
+  (fp_line (start -4.5 -3.5) (end -4.5 13.5) (layer "F.SilkS") (width 0.12) (tstamp 35bb1bb5-998b-4ce9-a139-e009425d4e40))
+  (fp_line (start -4.5 -3.5) (end -4.5 13.5) (layer "F.CrtYd") (width 0.05) (tstamp 346ee0d3-e13a-49f6-8f6c-eb860777d6c4))
+  (fp_line (start 1.25 13.5) (end 1.25 -3.5) (layer "F.CrtYd") (width 0.05) (tstamp 93808e54-10fb-4c6c-984b-3a91c36dbafa))
+  (fp_line (start 1.25 -3.5) (end -4.5 -3.5) (layer "F.CrtYd") (width 0.05) (tstamp d7a0888c-6be2-4a97-ac01-de345dcd2919))
+  (fp_line (start -4.5 13.5) (end 1.25 13.5) (layer "F.CrtYd") (width 0.05) (tstamp ee85719d-9f71-411e-a024-43105a50c262))
+  (fp_line (start -1.27 11.43) (end -1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp 085f4818-84f1-415f-823e-e6076d0e732d))
+  (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp 602c4495-9f5f-4ae3-9800-df18526e3c50))
+  (fp_line (start 1.27 -1.27) (end 1.27 11.43) (layer "F.Fab") (width 0.1) (tstamp 73eb4832-b804-463c-ae2b-563755d89978))
+  (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp aed66e63-a453-441e-94eb-3442ef294c72))
+  (fp_line (start 1.27 11.43) (end -1.27 11.43) (layer "F.Fab") (width 0.1) (tstamp dde86203-069d-47dc-8693-34fe614da099))
+  (pad "1" thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 174ecd2f-6484-485c-a83d-71d6a1dc733a))
+  (pad "2" thru_hole oval (at 0 2.5) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 997a59d1-7e2b-4400-b74b-3cb21ad33038))
+  (pad "3" thru_hole oval (at 0 5) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 7aa5c04b-5bd3-4c72-bbaf-9ec87c5447e0))
+  (pad "4" thru_hole oval (at 0 7.5) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp 8a6c42bd-bf44-40be-9e58-41dc76d10644))
+  (pad "5" thru_hole oval (at 0 10) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) (tstamp c1741286-ba0e-4f33-8f37-5fd51504bac5))
+  (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x05_P2.54mm_Vertical.wrl"
+    (offset (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
--- a/PL18/PL18_multiprotocol/Multi.pretty/MULTIRF4IN1-SMT.kicad_mod
+++ b/PL18/PL18_multiprotocol/Multi.pretty/MULTIRF4IN1-SMT.kicad_mod
@@ -0,0 +1,60 @@
+(footprint "MULTIRF4IN1-SMT" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 0)
+  (fp_text reference "REF**" (at 0 -0.75) (layer "F.SilkS")
+    (effects (font (size 1.27 1.27) (thickness 0.15)))
+    (tstamp c70c9e03-6ffa-4ea8-9291-15d2673122a0)
+  )
+  (fp_text value "Val**" (at 0 1) (layer "F.Fab")
+    (effects (font (size 1.27 1.27) (thickness 0.15)))
+    (tstamp c3246ecf-81bc-4b14-94a2-7b86227cabaf)
+  )
+  (fp_line (start -13 11.9) (end -13 17) (layer "F.SilkS") (width 0.12) (tstamp 21d8aff3-5b17-43c7-9d08-4e33edbcbeb9))
+  (fp_line (start -13 3.4) (end -13 8.1) (layer "F.SilkS") (width 0.12) (tstamp 4a2c9e01-3f0b-4116-a39b-baa7e7b94b8a))
+  (fp_line (start -13 -8.1) (end -13 -2.4) (layer "F.SilkS") (width 0.12) (tstamp 960baeae-d7ca-4f76-ac15-6cd68f041702))
+  (fp_line (start 13 -17) (end 13 -13.9) (layer "F.SilkS") (width 0.12) (tstamp a22c44ee-0c9a-42e0-81e0-94f90a0da388))
+  (fp_line (start 13 11.9) (end 13 17) (layer "F.SilkS") (width 0.12) (tstamp a8050edb-a9eb-479e-abea-105077de87b8))
+  (fp_line (start -13 -17) (end -13 -11.9) (layer "F.SilkS") (width 0.12) (tstamp dbeb96d9-bbc7-4dae-ba00-6746209bdc43))
+  (fp_line (start 13 -17) (end -13 -17) (layer "F.SilkS") (width 0.12) (tstamp de173627-aedf-48e0-8674-66cfe17b969a))
+  (fp_line (start 13 17) (end -13 17) (layer "F.SilkS") (width 0.12) (tstamp edb180b5-b35e-4fa4-8440-d021574908ae))
+  (pad "CE_2401" smd rect (at 12.49 -13) (size 1.52 1.27) (layers "F.Cu" "F.Paste" "F.Mask")
+    (solder_mask_margin 0.1) (tstamp 177c8408-9b8a-453c-871a-7a335239833a))
+  (pad "CS_2401" smd rect (at 12.49 -1) (size 1.52 1.27) (layers "F.Cu" "F.Paste" "F.Mask")
+    (solder_mask_margin 0.1) (tstamp deb3cbb7-c404-4161-b154-3014395e2a30))
+  (pad "CS_2500" smd rect (at 12.49 1) (size 1.52 1.27) (layers "F.Cu" "F.Paste" "F.Mask")
+    (solder_mask_margin 0.1) (tstamp e8ecba2d-0746-43bc-b641-9cc180ff9253))
+  (pad "CS_6936" smd rect (at 12.49 -3) (size 1.52 1.27) (layers "F.Cu" "F.Paste" "F.Mask")
+    (solder_mask_margin 0.1) (tstamp 90314976-271d-4f34-b2f0-dff6de6b86e7))
+  (pad "CS_7105" smd rect (at 12.49 3) (size 1.52 1.27) (layers "F.Cu" "F.Paste" "F.Mask")
+    (solder_mask_margin 0.1) (tstamp 1f154bf6-42ea-456f-89ac-fed01ff7208b))
+  (pad "GND" smd rect (at 12.49 9) (size 1.52 1.27) (layers "F.Cu" "F.Paste" "F.Mask")
+    (solder_mask_margin 0.1) (tstamp 14373cb3-8424-453e-b0d3-1a6022ea35b1))
+  (pad "GND@1" smd rect (at -12.49 -11) (size 1.52 1.27) (layers "F.Cu" "F.Paste" "F.Mask")
+    (solder_mask_margin 0.1) (tstamp b15a1378-3e57-41cb-96b2-030f4848402c))
+  (pad "GND@2" smd rect (at -12.49 -9) (size 1.52 1.27) (layers "F.Cu" "F.Paste" "F.Mask")
+    (solder_mask_margin 0.1) (tstamp 71e83330-d2fe-4680-bbc4-fbbb511ecf3d))
+  (pad "GND@3" smd rect (at -12.49 -1.5) (size 1.52 1.27) (layers "F.Cu" "F.Paste" "F.Mask")
+    (solder_mask_margin 0.1) (tstamp 27f29ad7-d4f7-416a-bc00-7c36c9ffbaca))
+  (pad "GND@4" smd rect (at -12.49 2.5) (size 1.52 1.27) (layers "F.Cu" "F.Paste" "F.Mask")
+    (solder_mask_margin 0.1) (tstamp 6b446947-9739-4960-abfc-ef89034a0437))
+  (pad "GND@5" smd rect (at -12.49 9) (size 1.52 1.27) (layers "F.Cu" "F.Paste" "F.Mask")
+    (solder_mask_margin 0.1) (tstamp 589b3137-9b71-4e00-93fe-63222c56ecc3))
+  (pad "GND@6" smd rect (at -12.49 11) (size 1.52 1.27) (layers "F.Cu" "F.Paste" "F.Mask")
+    (solder_mask_margin 0.1) (tstamp 371c3d69-e48f-46fb-a1b6-b681b17bacb1))
+  (pad "MISO" smd rect (at 12.49 -9) (size 1.52 1.27) (layers "F.Cu" "F.Paste" "F.Mask")
+    (solder_mask_margin 0.1) (tstamp a1ef8d67-bdf4-443e-88f7-406670c2aef9))
+  (pad "MOSI" smd rect (at 12.49 -7) (size 1.52 1.27) (layers "F.Cu" "F.Paste" "F.Mask")
+    (solder_mask_margin 0.1) (tstamp d9f5d5e2-2571-4cc2-800c-f5758bd5695f))
+  (pad "PE1" smd rect (at 12.49 7) (size 1.52 1.27) (layers "F.Cu" "F.Paste" "F.Mask")
+    (solder_mask_margin 0.1) (tstamp 06684ce2-c9de-48bf-9621-ada44ca8a12c))
+  (pad "PE2" smd rect (at 12.49 5) (size 1.52 1.27) (layers "F.Cu" "F.Paste" "F.Mask")
+    (solder_mask_margin 0.1) (tstamp bd470244-7da3-4d59-894b-19e4071da146))
+  (pad "RF" smd rect (at -12.49 0.5) (size 1.52 1.27) (layers "F.Cu" "F.Paste" "F.Mask")
+    (solder_mask_margin 0.1) (tstamp e91e6b83-902b-42be-92fa-6ac19487af54))
+  (pad "RST_CYFR" smd rect (at 12.49 -11) (size 1.52 1.27) (layers "F.Cu" "F.Paste" "F.Mask")
+    (solder_mask_margin 0.1) (tstamp dc86e8ca-1f6b-4f0d-9576-5c57346768bf))
+  (pad "SCK" smd rect (at 12.49 -5) (size 1.52 1.27) (layers "F.Cu" "F.Paste" "F.Mask")
+    (solder_mask_margin 0.1) (tstamp 483e384c-d6af-490d-b4f9-371490f0e46f))
+  (pad "VCC" smd rect (at 12.49 11) (size 1.52 1.27) (layers "F.Cu" "F.Paste" "F.Mask")
+    (solder_mask_margin 0.1) (tstamp 8796d68c-81fa-42ef-ace9-9d8c76827e59))
+)
--- a/PL18/PL18_multiprotocol/PL18_multiprotocol.kicad_pcb
+++ b/PL18/PL18_multiprotocol/PL18_multiprotocol.kicad_pcb
--- a/PL18/PL18_multiprotocol/PL18_multiprotocol.kicad_prl
+++ b/PL18/PL18_multiprotocol/PL18_multiprotocol.kicad_prl
@@ -0,0 +1,75 @@
+{
+  "board": {
+    "active_layer": 0,
+    "active_layer_preset": "All Layers",
+    "auto_track_width": false,
+    "hidden_nets": [],
+    "high_contrast_mode": 0,
+    "net_color_mode": 1,
+    "opacity": {
+      "pads": 1.0,
+      "tracks": 1.0,
+      "vias": 1.0,
+      "zones": 0.6
+    },
+    "ratsnest_display_mode": 0,
+    "selection_filter": {
+      "dimensions": true,
+      "footprints": true,
+      "graphics": true,
+      "keepouts": true,
+      "lockedItems": true,
+      "otherItems": true,
+      "pads": true,
+      "text": true,
+      "tracks": true,
+      "vias": true,
+      "zones": true
+    },
+    "visible_items": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      8,
+      9,
+      10,
+      11,
+      12,
+      13,
+      14,
+      15,
+      16,
+      17,
+      18,
+      19,
+      20,
+      21,
+      22,
+      23,
+      24,
+      25,
+      26,
+      27,
+      28,
+      29,
+      30,
+      32,
+      33,
+      34,
+      35,
+      36
+    ],
+    "visible_layers": "fffffff_ffffffff",
+    "zone_display_mode": 0
+  },
+  "meta": {
+    "filename": "PL18_multiprotocol.kicad_prl",
+    "version": 3
+  },
+  "project": {
+    "files": []
+  }
+}
--- a/PL18/PL18_multiprotocol/PL18_multiprotocol.kicad_pro
+++ b/PL18/PL18_multiprotocol/PL18_multiprotocol.kicad_pro
@@ -0,0 +1,462 @@
+{
+  "board": {
+    "design_settings": {
+      "defaults": {
+        "board_outline_line_width": 0.09999999999999999,
+        "copper_line_width": 0.19999999999999998,
+        "copper_text_italic": false,
+        "copper_text_size_h": 1.5,
+        "copper_text_size_v": 1.5,
+        "copper_text_thickness": 0.3,
+        "copper_text_upright": false,
+        "courtyard_line_width": 0.049999999999999996,
+        "dimension_precision": 4,
+        "dimension_units": 3,
+        "dimensions": {
+          "arrow_length": 1270000,
+          "extension_offset": 500000,
+          "keep_text_aligned": true,
+          "suppress_zeroes": false,
+          "text_position": 0,
+          "units_format": 1
+        },
+        "fab_line_width": 0.09999999999999999,
+        "fab_text_italic": false,
+        "fab_text_size_h": 1.0,
+        "fab_text_size_v": 1.0,
+        "fab_text_thickness": 0.15,
+        "fab_text_upright": false,
+        "other_line_width": 0.15,
+        "other_text_italic": false,
+        "other_text_size_h": 1.0,
+        "other_text_size_v": 1.0,
+        "other_text_thickness": 0.15,
+        "other_text_upright": false,
+        "pads": {
+          "drill": 0.762,
+          "height": 1.524,
+          "width": 1.524
+        },
+        "silk_line_width": 0.15,
+        "silk_text_italic": false,
+        "silk_text_size_h": 1.0,
+        "silk_text_size_v": 1.0,
+        "silk_text_thickness": 0.15,
+        "silk_text_upright": false,
+        "zones": {
+          "45_degree_only": false,
+          "min_clearance": 0.19999999999999998
+        }
+      },
+      "diff_pair_dimensions": [
+        {
+          "gap": 0.0,
+          "via_gap": 0.0,
+          "width": 0.0
+        }
+      ],
+      "drc_exclusions": [
+        "copper_edge_clearance|34900000|34735000|785ef911-e457-413e-ac63-cf1535b242cb|be0d3c71-0f5b-45b9-9c9b-72866af0f7a2",
+        "copper_edge_clearance|34900000|36735000|785ef911-e457-413e-ac63-cf1535b242cb|e7b16a25-ec09-4bb5-aa09-fe00038c1f1f",
+        "copper_edge_clearance|34900000|38735000|785ef911-e457-413e-ac63-cf1535b242cb|e65ad8dc-91cb-4c5d-b0fe-169b84ac0b55",
+        "copper_edge_clearance|34900000|40735000|785ef911-e457-413e-ac63-cf1535b242cb|95287391-9e27-4475-a375-0f63337ce67a",
+        "copper_edge_clearance|34900000|42735000|785ef911-e457-413e-ac63-cf1535b242cb|c29c966c-91b2-4b36-b1bc-6673192d38fe",
+        "copper_edge_clearance|34900000|44735000|785ef911-e457-413e-ac63-cf1535b242cb|4f24c66e-64cb-408b-9295-97d993d96225",
+        "copper_edge_clearance|34900000|46735000|785ef911-e457-413e-ac63-cf1535b242cb|0ddbf31e-bbeb-43d6-ae3b-cab85e65b36d",
+        "copper_edge_clearance|34900000|48735000|785ef911-e457-413e-ac63-cf1535b242cb|4dcf731f-2949-4865-b539-ff1e637244c5",
+        "copper_edge_clearance|34900000|50735000|785ef911-e457-413e-ac63-cf1535b242cb|34e18046-0932-48eb-854b-3707688a2215",
+        "copper_edge_clearance|34900000|52735000|785ef911-e457-413e-ac63-cf1535b242cb|5c40c44b-70c5-4c30-aafc-a4724555cbb1",
+        "copper_edge_clearance|34900000|54735000|785ef911-e457-413e-ac63-cf1535b242cb|bb59f967-af06-40a4-adc7-d38dcc40fc54",
+        "copper_edge_clearance|34900000|56735000|785ef911-e457-413e-ac63-cf1535b242cb|27057d15-87f3-4a5e-bab7-6c1fa0d1954f",
+        "copper_edge_clearance|34900000|58735000|785ef911-e457-413e-ac63-cf1535b242cb|13a669d2-833b-4c54-a87d-44fb38d91e82",
+        "copper_edge_clearance|61100000|36735000|b1556ea3-f1cc-4201-b942-480142bd0c54|5bd3edee-4a1d-4d5f-8aae-d7afd4bced8c",
+        "copper_edge_clearance|61100000|38735000|b1556ea3-f1cc-4201-b942-480142bd0c54|2bcfc76b-5219-4cb8-b24e-4fb83ce73dfb",
+        "copper_edge_clearance|61100000|46235000|b1556ea3-f1cc-4201-b942-480142bd0c54|ad1d31a9-5733-4b73-be03-a80ca4f16773",
+        "copper_edge_clearance|61100000|48235000|b1556ea3-f1cc-4201-b942-480142bd0c54|0967fce8-8cdb-4026-bedd-d620a9cd0bad",
+        "copper_edge_clearance|61100000|50235000|b1556ea3-f1cc-4201-b942-480142bd0c54|7aa764ba-7abe-485a-b859-ce8f0595e5cd",
+        "copper_edge_clearance|61100000|56735000|b1556ea3-f1cc-4201-b942-480142bd0c54|7dbb4403-9304-4fc0-8912-17af08ce6248",
+        "copper_edge_clearance|61100000|58735000|b1556ea3-f1cc-4201-b942-480142bd0c54|425646f1-4301-496a-bd77-d52b64168923"
+      ],
+      "meta": {
+        "version": 2
+      },
+      "rule_severities": {
+        "annular_width": "error",
+        "clearance": "error",
+        "copper_edge_clearance": "error",
+        "courtyards_overlap": "error",
+        "diff_pair_gap_out_of_range": "error",
+        "diff_pair_uncoupled_length_too_long": "error",
+        "drill_out_of_range": "error",
+        "duplicate_footprints": "warning",
+        "extra_footprint": "warning",
+        "footprint_type_mismatch": "error",
+        "hole_clearance": "error",
+        "hole_near_hole": "error",
+        "invalid_outline": "error",
+        "item_on_disabled_layer": "error",
+        "items_not_allowed": "error",
+        "length_out_of_range": "error",
+        "malformed_courtyard": "error",
+        "microvia_drill_out_of_range": "error",
+        "missing_courtyard": "ignore",
+        "missing_footprint": "warning",
+        "net_conflict": "warning",
+        "npth_inside_courtyard": "ignore",
+        "padstack": "error",
+        "pth_inside_courtyard": "ignore",
+        "shorting_items": "error",
+        "silk_over_copper": "warning",
+        "silk_overlap": "warning",
+        "skew_out_of_range": "error",
+        "through_hole_pad_without_hole": "error",
+        "too_many_vias": "error",
+        "track_dangling": "warning",
+        "track_width": "error",
+        "tracks_crossing": "error",
+        "unconnected_items": "error",
+        "unresolved_variable": "error",
+        "via_dangling": "warning",
+        "zone_has_empty_net": "error",
+        "zones_intersect": "error"
+      },
+      "rules": {
+        "allow_blind_buried_vias": false,
+        "allow_microvias": false,
+        "max_error": 0.005,
+        "min_clearance": 0.0,
+        "min_copper_edge_clearance": 0.0,
+        "min_hole_clearance": 0.25,
+        "min_hole_to_hole": 0.25,
+        "min_microvia_diameter": 0.19999999999999998,
+        "min_microvia_drill": 0.09999999999999999,
+        "min_silk_clearance": 0.0,
+        "min_through_hole_diameter": 0.3,
+        "min_track_width": 0.19999999999999998,
+        "min_via_annular_width": 0.049999999999999996,
+        "min_via_diameter": 0.39999999999999997,
+        "solder_mask_clearance": 0.0,
+        "solder_mask_min_width": 0.0,
+        "use_height_for_length_calcs": true
+      },
+      "track_widths": [
+        0.0,
+        0.4,
+        0.6,
+        0.603595,
+        1.0
+      ],
+      "via_dimensions": [
+        {
+          "diameter": 0.0,
+          "drill": 0.0
+        },
+        {
+          "diameter": 1.2,
+          "drill": 0.6
+        }
+      ],
+      "zones_allow_external_fillets": false,
+      "zones_use_no_outline": true
+    },
+    "layer_presets": []
+  },
+  "boards": [],
+  "cvpcb": {
+    "equivalence_files": []
+  },
+  "erc": {
+    "erc_exclusions": [],
+    "meta": {
+      "version": 0
+    },
+    "pin_map": [
+      [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        2
+      ],
+      [
+        0,
+        2,
+        0,
+        1,
+        0,
+        0,
+        1,
+        0,
+        2,
+        2,
+        2,
+        2
+      ],
+      [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0,
+        1,
+        0,
+        1,
+        2
+      ],
+      [
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        2,
+        1,
+        1,
+        2
+      ],
+      [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        2
+      ],
+      [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        2
+      ],
+      [
+        1,
+        1,
+        1,
+        1,
+        1,
+        0,
+        1,
+        1,
+        1,
+        1,
+        1,
+        2
+      ],
+      [
+        0,
+        0,
+        0,
+        1,
+        0,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        2
+      ],
+      [
+        0,
+        2,
+        1,
+        2,
+        0,
+        0,
+        1,
+        0,
+        2,
+        2,
+        2,
+        2
+      ],
+      [
+        0,
+        2,
+        0,
+        1,
+        0,
+        0,
+        1,
+        0,
+        2,
+        0,
+        0,
+        2
+      ],
+      [
+        0,
+        2,
+        1,
+        1,
+        0,
+        0,
+        1,
+        0,
+        2,
+        0,
+        0,
+        2
+      ],
+      [
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2
+      ]
+    ],
+    "rule_severities": {
+      "bus_definition_conflict": "error",
+      "bus_entry_needed": "error",
+      "bus_label_syntax": "error",
+      "bus_to_bus_conflict": "error",
+      "bus_to_net_conflict": "error",
+      "different_unit_footprint": "error",
+      "different_unit_net": "error",
+      "duplicate_reference": "error",
+      "duplicate_sheet_names": "error",
+      "extra_units": "error",
+      "global_label_dangling": "warning",
+      "hier_label_mismatch": "error",
+      "label_dangling": "error",
+      "lib_symbol_issues": "warning",
+      "multiple_net_names": "warning",
+      "net_not_bus_member": "warning",
+      "no_connect_connected": "warning",
+      "no_connect_dangling": "warning",
+      "pin_not_connected": "error",
+      "pin_not_driven": "error",
+      "pin_to_pin": "warning",
+      "power_pin_not_driven": "error",
+      "similar_labels": "warning",
+      "unannotated": "error",
+      "unit_value_mismatch": "error",
+      "unresolved_variable": "error",
+      "wire_dangling": "error"
+    }
+  },
+  "libraries": {
+    "pinned_footprint_libs": [],
+    "pinned_symbol_libs": []
+  },
+  "meta": {
+    "filename": "PL18_multiprotocol.kicad_pro",
+    "version": 1
+  },
+  "net_settings": {
+    "classes": [
+      {
+        "bus_width": 12.0,
+        "clearance": 0.2,
+        "diff_pair_gap": 0.25,
+        "diff_pair_via_gap": 0.25,
+        "diff_pair_width": 0.2,
+        "line_style": 0,
+        "microvia_diameter": 0.3,
+        "microvia_drill": 0.1,
+        "name": "Default",
+        "pcb_color": "rgba(0, 0, 0, 0.000)",
+        "schematic_color": "rgba(0, 0, 0, 0.000)",
+        "track_width": 0.25,
+        "via_diameter": 0.8,
+        "via_drill": 0.4,
+        "wire_width": 6.0
+      }
+    ],
+    "meta": {
+      "version": 2
+    },
+    "net_colors": null
+  },
+  "pcbnew": {
+    "last_paths": {
+      "gencad": "",
+      "idf": "",
+      "netlist": "",
+      "specctra_dsn": "",
+      "step": "",
+      "vrml": ""
+    },
+    "page_layout_descr_file": ""
+  },
+  "schematic": {
+    "annotate_start_num": 0,
+    "drawing": {
+      "default_line_thickness": 6.0,
+      "default_text_size": 50.0,
+      "field_names": [],
+      "intersheets_ref_own_page": false,
+      "intersheets_ref_prefix": "",
+      "intersheets_ref_short": false,
+      "intersheets_ref_show": false,
+      "intersheets_ref_suffix": "",
+      "junction_size_choice": 3,
+      "label_size_ratio": 0.375,
+      "pin_symbol_size": 25.0,
+      "text_offset_ratio": 0.15
+    },
+    "legacy_lib_dir": "",
+    "legacy_lib_list": [],
+    "meta": {
+      "version": 1
+    },
+    "net_format_name": "",
+    "ngspice": {
+      "fix_include_paths": true,
+      "fix_passive_vals": false,
+      "meta": {
+        "version": 0
+      },
+      "model_mode": 0,
+      "workbook_filename": ""
+    },
+    "page_layout_descr_file": "",
+    "plot_directory": "",
+    "spice_adjust_passive_values": false,
+    "spice_external_command": "spice \"%I\"",
+    "subpart_first_id": 65,
+    "subpart_id_separator": 0
+  },
+  "sheets": [
+    [
+      "e6b36db3-d652-4d66-bbfe-8c61f998d4b2",
+      ""
+    ]
+  ],
+  "text_variables": {}
+}
--- a/PL18/PL18_multiprotocol/PL18_multiprotocol.kicad_sch
+++ b/PL18/PL18_multiprotocol/PL18_multiprotocol.kicad_sch
--- a/PL18/PL18_multiprotocol/fp-info-cache
+++ b/PL18/PL18_multiprotocol/fp-info-cache
--- a/PL18/PL18_multiprotocol/fp-lib-table
+++ b/PL18/PL18_multiprotocol/fp-lib-table
@@ -0,0 +1,3 @@
+(fp_lib_table
+  (lib (name "Multi")(type "KiCad")(uri "${KIPRJMOD}/Multi.pretty")(options "")(descr ""))
+)
--- a/PL18/PL18_multiprotocol/sym-lib-table
+++ b/PL18/PL18_multiprotocol/sym-lib-table
@@ -0,0 +1,3 @@
+(sym_lib_table
+  (lib (name "Multi")(type "KiCad")(uri "${KIPRJMOD}/Multi.kicad_sym")(options "")(descr ""))
+)
--- a/PL18/README.md
+++ b/PL18/README.md
@@ -0,0 +1,5 @@
+# MPM for Flysky PL18
+
+The PCB design is located in PL18_multiprotocol folder and is designed using KiCad 6.0.
+
+The casing is located in Casing folder and is designed using Blender 3.3.1.  The model included 2 pieces, T is the top piece and B is the bottom pieces.  These 2 pieces is cloned into TF and BF respectively to apply all modifiers and make manifold for 3D printing.  I have included the stl files generated for simplity.
--- a/buildroot/bin/buildFunctions
+++ b/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,22 +84,30 @@ buildEachRFModule() {
 }

 buildReleaseFiles(){
-    if [[ "$BOARD" == "multi4in1:avr:multixmega32d4" ]]; then
+    if [[ "$RELEASE" == "scripts" ]]; then
+        build_release_scripts;
+    elif [[ "$RELEASE" == "orangerx" ]]; then
        build_release_orx;
-    elif [[ "$BOARD" == "multi4in1:avr:multiatmega328p:bootloader=none" ]]; then
+    elif [[ "$RELEASE" == "atmega328p" ]]; then
        build_release_avr_noboot;
-    elif [[ "$BOARD" == "multi4in1:avr:multiatmega328p:bootloader=optiboot" ]]; then
+    elif [[ "$RELEASE" == "atmega328p-optiboot" ]]; then
        build_release_avr_optiboot;
-    elif [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103cb:debug_option=none" ]]; then
-        build_release_stm32f1_no_debug;
-    elif [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103cb:debug_option=native" ]]; then
-        build_release_stm32f1_native_debug;
-    elif [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103cb:debug_option=ftdi" ]]; then
-        build_release_stm32f1_serial_debug;
-    elif [[ "$BOARD" == "multi4in1:STM32F1:multi5in1t18int" ]]; then
+    elif [[ "$RELEASE" == "stm32f103-128k-4in1" ]]; then
+        build_release_stm32f1_4in1_no_debug;
+    elif [[ "$RELEASE" == "stm32f103-128k-usb-debug" ]]; then
+        build_release_stm32f1_4in1_native_debug;
+    elif [[ "$RELEASE" == "stm32f103-128k-serial-debug" ]]; then
+        build_release_stm32f1_4in1_serial_debug;
+    elif [[ "$RELEASE" == "stm32f103-cc2500-64k" ]]; then
+        build_release_stm32f1_cc2500_64k;
+    elif [[ "$RELEASE" == "stm32f103-cc2500-128k" ]]; then
+        build_release_stm32f1_cc2500_128k;
+    elif [[ "$RELEASE" == "stm32f103-128k-5in1" ]]; then
+        build_release_stm32f1_5in1;
+    elif [[ "$RELEASE" == "tlite-5in1" ]]; then
+        build_release_stm32f1_tlite;
+    elif [[ "$RELEASE" == "t18-5in1" ]]; then
        build_release_stm32f1_t18int;
-    elif [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103c8:debug_option=none" ]]; then
-        build_release_stm32f1_64k;
    else
      printf "No release files for this board.";
    fi
--- a/buildroot/bin/build_release_avr_noboot
+++ b/buildroot/bin/build_release_avr_noboot
@@ -14,7 +14,7 @@ mv build/Multiprotocol.ino.bin ./binaries/mm-avr-usbasp-aetr-A7105-inv-v$MULTI_V
 printf "\e[33;1mBuilding mm-avr-usbasp-aetr-CC2500-inv-v$MULTI_VERSION.bin\e[0m\n";
 opt_disable $ALL_PROTOCOLS;
 opt_enable $CC2500_PROTOCOLS;
-opt_disable HITEC_CC2500_INO REDPINE_CC2500_INO OMP_CC2500_INO SKYARTEC_CC2500_INO SCANNER_CC2500_INO FRSKYL_CC2500_INO;
+opt_disable HITEC_CC2500_INO REDPINE_CC2500_INO OMP_CC2500_INO SKYARTEC_CC2500_INO SCANNER_CC2500_INO FRSKYL_CC2500_INO ARES_CC2500_INO;
 buildMulti;
 exitcode=$((exitcode+$?));
 mv build/Multiprotocol.ino.bin ./binaries/mm-avr-usbasp-aetr-CC2500-inv-v$MULTI_VERSION.bin;
@@ -22,6 +22,7 @@ mv build/Multiprotocol.ino.bin ./binaries/mm-avr-usbasp-aetr-CC2500-inv-v$MULTI_
 printf "\e[33;1mBuilding mm-avr-usbasp-aetr-CYRF6936-inv-v$MULTI_VERSION.bin\e[0m\n";
 opt_disable $ALL_PROTOCOLS;
 opt_enable $CYRF6936_PROTOCOLS;
+opt_disable E01X_CYRF6936_INO LOSI_CYRF6936_INO
 buildMulti;
 exitcode=$((exitcode+$?));
 mv build/Multiprotocol.ino.bin ./binaries/mm-avr-usbasp-aetr-CYRF6936-inv-v$MULTI_VERSION.bin;
--- a/buildroot/bin/build_release_avr_optiboot
+++ b/buildroot/bin/build_release_avr_optiboot
@@ -14,7 +14,7 @@ mv build/Multiprotocol.ino.bin ./binaries/mm-avr-txflash-aetr-A7105-inv-v$MULTI_
 printf "\e[33;1mBuilding mm-avr-txflash-aetr-CC2500-inv-v$MULTI_VERSION.bin\e[0m\n";
 opt_disable $ALL_PROTOCOLS;
 opt_enable $CC2500_PROTOCOLS;
-opt_disable HITEC_CC2500_INO REDPINE_CC2500_INO OMP_CC2500_INO SKYARTEC_CC2500_INO SCANNER_CC2500_INO FRSKYL_CC2500_INO;
+opt_disable HITEC_CC2500_INO REDPINE_CC2500_INO OMP_CC2500_INO SKYARTEC_CC2500_INO SCANNER_CC2500_INO FRSKYL_CC2500_INO RLINK_CC2500_INO ARES_CC2500_INO;
 buildMulti;
 exitcode=$((exitcode+$?));
 mv build/Multiprotocol.ino.bin ./binaries/mm-avr-txflash-aetr-CC2500-inv-v$MULTI_VERSION.bin;
@@ -22,6 +22,7 @@ mv build/Multiprotocol.ino.bin ./binaries/mm-avr-txflash-aetr-CC2500-inv-v$MULTI
 printf "\e[33;1mBuilding mm-avr-txflash-aetr-CYRF6936-inv-v$MULTI_VERSION.bin\e[0m\n";
 opt_disable $ALL_PROTOCOLS;
 opt_enable $CYRF6936_PROTOCOLS;
+opt_disable E01X_CYRF6936_INO LOSI_CYRF6936_INO
 buildMulti;
 exitcode=$((exitcode+$?));
 mv build/Multiprotocol.ino.bin ./binaries/mm-avr-txflash-aetr-CYRF6936-inv-v$MULTI_VERSION.bin; 
--- a/buildroot/bin/build_release_orx
+++ b/buildroot/bin/build_release_orx
@@ -16,11 +16,4 @@ buildMulti;
 exitcode=$((exitcode+$?));
 mv build/Multiprotocol.ino.bin ./binaries/mm-orangerx-aetr-blue-inv-v$MULTI_VERSION.bin;

-printf "\e[33;1mPackaging ancilliary files for v$MULTI_VERSION\e[0m\n";
-cp Multiprotocol/Multi.txt ./binaries/Multi.txt;
-mkdir -p SCRIPTS/TOOLS;
-cp Lua_scripts/*.lua SCRIPTS/TOOLS/;
-cp Lua_scripts/*.txt SCRIPTS/TOOLS/;
-zip -q ./binaries/MultiLuaScripts.zip SCRIPTS/TOOLS/*;
-
 exit $exitcode;
--- a/Show More
+++ b/Show More