Enable Telemetry on DumbRC receivers (#1111)

Tested with X6FGv1.1, X6FP, X6DC(G)v1.1

I also tested with multiple X6F receivers and some gave RSSI Telem and some gave nothing.
2 of them had the same PCB as the X6FP and neither gave telemetry.
I had a third with the same PCB with the X6FP which did give RSSI
and of my two with an older PCB one gives RSSI telem and the other does not.

Of the receivers I tried only one set packet_in[6] to match the TX packet[1] and it was the
oldest receiver of the ones I own.

.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,43 @@ 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@v3
+      - uses: actions/checkout@v4
       
       - name: Install Arduino CLI
-        uses: arduino/setup-arduino-cli@v1.1.2
+        uses: arduino/setup-arduino-cli@v2
         with:
           version: "0.32.2"
       
@@ -151,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: |
@@ -175,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;
@@ -189,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@v3
+        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 }}

Lua_scripts/DSM FwdPrg_56_Color.lua

@@ -1,5 +1,5 @@
-local toolName = "TNS|DSM Forward Prog v0.55a (Color) |TNE"
-local VERSION  = "v0.55a"
+local toolName = "TNS|DSM Forward Prog v0.56 (Color) |TNE"
+local VERSION  = "v0.56"
 
 ---- #########################################################################
 ---- #                                                                       #

Lua_scripts/DSM FwdPrg_56_STUP.lua

@@ -0,0 +1,951 @@
+local toolName = "TNS|DSM Frwd Prog v0.56a (MIN-SETUP)|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.                          #
+---- #                                                                       #
+---- #########################################################################
+
+
+local VERSION             = "v0.56"
+local DSMLIB_PATH         = "/SCRIPTS/TOOLS/DSMLIB/"
+local DATA_PATH           = "/MODELS/DSMDATA"
+
+local LOG_FILE            = "/LOGS/dsm_min_log.txt"
+
+-- Phase
+local PH_INIT = 0
+local PH_RX_VER, PH_TITLE  = 1, 2
+local PH_VAL_CHANGING, PH_VAL_EDITING, PH_VAL_EDIT_END     = 6, 7, 8
+local PH_WAIT_CMD, PH_EXIT_REQ, PH_EXIT_DONE               = 9, 10, 11
+
+-- Line Types
+local LT_MENU, LT_LIST_NC = 0x1C, 0x6C
+
+local Phase               = PH_INIT
+
+local Text                = {}
+local List_Text           = {}
+local List_Text_Img       = {}
+
+local originalValue       = 0
+
+local  ctx_SelLine = 0      -- Current Selected Line
+local  ctx_EditLine = nil   -- Current Editing Line
+
+local Menu                = { MenuId = 0, Text = "", TextId = 0, PrevId = 0, NextId = 0, BackId = 0 }
+local MenuLines           = {}
+
+local logFile             = nil
+
+local LCD_W_BUTTONS       = 19
+local LCD_H_BUTTONS       = 10
+
+local LCD_X_MAX           = 128
+local LCD_X_RIGHT_BUTTONS = LCD_X_MAX - LCD_W_BUTTONS - 1
+
+local LCD_Y_LINE_HEIGHT   = 7
+local LCD_Y_LOWER_BUTTONS = (8 * LCD_Y_LINE_HEIGHT) + 2
+
+local TEXT_ATTR           = SMLSIZE
+
+local TX_CHANNELS         = 12
+
+local AT_PLANE   = 0
+
+local aircraft_type_text = {[0]="Plane","Heli","Glider","Drone"}
+
+local WT_A1       = 0
+local WT_A2       = 1
+local WT_FLPR     = 2
+local WT_A1_F1    = 3
+local WT_A2_F1    = 4
+local WT_A2_F2    = 5
+local WT_ELEVON_A = 6
+local WT_ELEVON_B = 7
+
+local wing_type_text = {[0]="Normal","Dual Ail","Flapperon", "Ail + Flp","Dual Ail + Flp","Dual Ail/Flp","Elevon A","Elevon B"}
+
+local TT_R1    = 0
+local TT_R1_E1 = 1
+local TT_R1_E2 = 2
+local TT_R2_E1 = 3
+local TT_R2_E2 = 4
+local TT_VT_A  = 5
+local TT_VT_B  = 6
+local TT_TLRN_A = 7
+local TT_TLRN_B = 8
+local TT_TLRN_A_R2 = 9
+local TT_TLRN_B_R2 = 10
+
+local tail_type_text = {[0]="Rud Only","Normal","Rud + Dual Ele","Dual Rud + Elv","Dual Rud/Ele",
+                         "VTail A","VTail B","Taileron A","Taileron B", 
+                         "Taileron A + Dual Rud","Taileron B + Dual Rud"
+                        }
+
+local MT_NORMAL      = 0
+local MT_REVERSE     = 1
+
+local P1 = 0
+local P2 = 1
+local P3 = 2
+local P4 = 3
+local P5 = 4
+local P6 = 5
+local P7 = 6
+local P8 = 7
+--local P9 = 8
+--local P10 = 9
+
+local MV_AIRCRAFT_TYPE = 1001
+local MV_WING_TYPE     = 1002
+local MV_TAIL_TYPE     = 1003
+        
+local MV_CH_BASE       = 1010
+local MV_CH_THR        = 1010
+
+local MV_CH_L_AIL      = 1011
+local MV_CH_R_AIL      = 1012
+local MV_CH_L_FLP      = 1013
+local MV_CH_R_FLP      = 1014
+
+local MV_CH_L_RUD      = 1015
+local MV_CH_R_RUD      = 1016
+local MV_CH_L_ELE      = 1017
+local MV_CH_R_ELE      = 1018
+
+local MV_PORT_BASE       = 1020
+local MV_P1_MODE      = 1020
+--local MV_P2_MODE      = 1021
+--local MV_P3_MODE      = 1022
+--local MV_P4_MODE      = 1023
+--local MV_P5_MODE      = 1024
+local MV_P6_MODE      = 1025
+--local MV_P7_MODE      = 1026
+--local MV_P8_MODE      = 1027
+--local MV_P9_MODE      = 1028
+--local MV_P10_MODE     = 1029
+
+local MV_DATA_END        = 1040
+
+-- MENU DATA Management
+local M_DB = {}            -- Store the variables used in the Menus.
+
+local lastGoodMenu=0      
+  
+local currATyp = -1    
+local currTTyp = -1
+local currWTyp = -1
+
+local menuDataChanged = false
+
+local MODEL = {
+  modelName = "",            -- The name of the model comming from OTX/ETX
+  hashName = nil,
+  modelOutputChannel = {},   -- Output information from OTX/ETX
+
+  TX_CH_TEXT= { }, 
+  PORT_TEXT = { },
+
+  DSM_ChannelInfo = {}       -- Data Created by DSM Configuration Script
+}
+
+local function gc()
+  collectgarbage("collect")
+end
+
+--[[
+local function gcTable(t)
+  if type(t)=="table" then
+    for i,v in pairs(t) do
+      if type(v) == "table" then
+        gcTable(v)
+      end
+      t[i] = nil
+    end
+  end
+  gc()
+  return t 
+end
+--]]
+
+local function LOG_open()
+  logFile = io.open(LOG_FILE, "w")   -- Truncate Log File
+end
+
+local function LOG_write(...)
+  if (logFile == nil) then LOG_open() end
+  local str = string.format(...)
+  io.write(logFile, str)
+end
+
+local function LOG_close()
+  if (logFile ~= nil) then io.close(logFile) end
+end
+
+-- Saves MENU_DATA to a file
+local function ST_SaveFileData() 
+  local fname = MODEL.hashName
+
+  print("Saving File:"..fname)
+  local dataFile = assert(io.open(DATA_PATH .. "/" .. fname, "w"),"Please create "..DATA_PATH.." folder")  -- write File 
+  
+  -- Foreach MENU_DATA with a value write Var_Id:Value into file
+  for i = 0, MV_DATA_END do
+      if (M_DB[i]~=nil) then
+          io.write(dataFile,string.format("%s:%s\n",i,M_DB[i]))
+      end
+  end
+  io.close(dataFile)
+end
+
+local function tailTypeCompatible(a,b)
+
+  local function normalize(tt)
+    if (tt==TT_TLRN_A or tt==TT_TLRN_B) then 
+      return TT_TLRN_A
+    elseif (tt==TT_TLRN_A_R2 or tt==TT_TLRN_B_R2) then
+      return TT_TLRN_A_R2
+    elseif (tt==TT_VT_A or tt==TT_VT_B) then
+      return TT_VT_A
+    else
+      return tt
+    end
+  end
+
+  return (normalize(a)==normalize(b))
+end
+
+local function ST_PlaneWingInit(wingType) 
+    --print("Change Plane WingType:"..wing_type_text[wingType])
+
+    M_DB[MV_WING_TYPE] = wingType
+
+    -- Clear all Wing Data 
+    M_DB[MV_CH_L_AIL] = nil
+    M_DB[MV_CH_R_AIL] = nil
+    M_DB[MV_CH_L_FLP] = nil
+    M_DB[MV_CH_R_FLP] = nil
+
+    M_DB[MV_CH_THR] = P1
+    
+    -- Default Channel Assisgments for each Wing type
+
+    if (wingType==WT_A1) then
+        M_DB[MV_CH_L_AIL] = P2
+    elseif (wingType==WT_A2 or wingType==WT_FLPR) then
+        M_DB[MV_CH_L_AIL] = P6
+        M_DB[MV_CH_R_AIL] = P2
+    elseif (wingType==WT_A1_F1) then
+        M_DB[MV_CH_L_AIL] = P2
+        M_DB[MV_CH_L_FLP] = P6
+    elseif (wingType==WT_A2_F1) then
+        M_DB[MV_CH_L_AIL] = P6
+        M_DB[MV_CH_R_AIL] = P2
+        M_DB[MV_CH_L_FLP] = P5
+    elseif (wingType==WT_A2_F2) then
+        M_DB[MV_CH_L_AIL] = P6
+        M_DB[MV_CH_R_AIL] = P2
+        M_DB[MV_CH_R_FLP] = P5
+        M_DB[MV_CH_L_FLP] = P7
+    elseif (wingType==WT_ELEVON_A) then
+        M_DB[MV_CH_L_AIL] = P2
+        M_DB[MV_CH_R_AIL] = P3
+    elseif (wingType==WT_ELEVON_B) then
+        M_DB[MV_CH_L_AIL] = P3
+        M_DB[MV_CH_R_AIL] = P2
+    else -- Assume normal 
+       print("ERROR: Invalid Wing Type")
+    end 
+end
+
+local function ST_PlaneTailInit(tailType) 
+    if (M_DB[MV_WING_TYPE]==WT_ELEVON_A or
+        M_DB[MV_WING_TYPE]==WT_ELEVON_B) then
+        tailType = TT_R1 -- Delta only have ruder  
+    end
+
+    --print("Change Plane Tail Type:"..tail_type_text[tailType])
+
+    -- Clear all data for Tail 
+    M_DB[MV_TAIL_TYPE] = tailType
+    M_DB[MV_CH_L_ELE] = nil
+    M_DB[MV_CH_R_ELE] = nil
+    M_DB[MV_CH_L_RUD] = nil
+    M_DB[MV_CH_R_RUD] = nil
+
+    -- Setup Channels for different Tail types 
+    if (tailType == TT_R1) then
+        M_DB[MV_CH_L_RUD] = P4
+    elseif (tailType == TT_R1_E1) then
+        M_DB[MV_CH_L_ELE] = P3
+        M_DB[MV_CH_L_RUD] = P4
+    elseif (tailType == TT_R1_E2) then
+        M_DB[MV_CH_L_ELE] = P5
+        M_DB[MV_CH_R_ELE] = P3
+        M_DB[MV_CH_L_RUD] = P4
+    elseif (tailType == TT_R2_E1) then
+        M_DB[MV_CH_L_ELE] = P3
+        M_DB[MV_CH_L_RUD] = P4
+        M_DB[MV_CH_R_RUD] = P5
+    elseif (tailType == TT_R2_E2) then
+        M_DB[MV_CH_L_ELE] = P5
+        M_DB[MV_CH_R_ELE] = P3
+        M_DB[MV_CH_L_RUD] = P4
+        M_DB[MV_CH_R_RUD] = P6
+    elseif (tailType == TT_VT_A or tailType == TT_VT_B) then
+        M_DB[MV_CH_L_ELE] = P3
+        M_DB[MV_CH_R_ELE] = P4
+    elseif (tailType == TT_TLRN_A or tailType == TT_TLRN_B or
+            tailType == TT_TLRN_A_R2 or tailType == TT_TLRN_B_R2) then
+        M_DB[MV_CH_L_RUD] = P4
+        M_DB[MV_CH_L_ELE] = P5
+        M_DB[MV_CH_R_ELE] = P3
+    else -- Assume Normal 
+        print("ERROR:invalid Tail Type")
+    end
+
+    if (tailType == TT_TLRN_A_R2 or tailType == TT_TLRN_B_R2) then
+      M_DB[MV_CH_R_RUD] = P8
+    end
+end
+
+local function ST_AircraftInit(aircraftType)
+    M_DB[MV_AIRCRAFT_TYPE] = aircraftType
+    ST_PlaneWingInit(WT_A1)
+    ST_PlaneTailInit(TT_R1_E1)
+end
+
+
+-- Setup Initial Default Data for the Menus
+local function ST_Default_Data()
+    ST_AircraftInit(AT_PLANE)
+
+    for i=0,9 do
+      M_DB[MV_P1_MODE+i] = MT_NORMAL + MODEL.modelOutputChannel[P1+i].revert
+    end
+end
+
+local function MenuLinePostProcessing(line)
+    line.MenuId = Menu.MenuId
+
+    if line.Type == LT_MENU then
+        -- nothing to do on menu entries
+        line.Val=nil
+    elseif line.Type == LT_LIST_NC then
+        -- Normalize Min/Max to be relative to Zero
+        line.TextStart = line.Min
+        line.Def = line.Def - line.Min -- normalize default value 
+        line.Max = line.Max - line.Min -- normalize max index
+        line.Min = 0 -- min index
+    end
+end
+
+
+local function portUse(p)
+  local out = nil 
+  if p==M_DB[MV_CH_THR] then out = "Thr"
+  elseif p == M_DB[MV_CH_L_AIL] then 
+      out=(M_DB[MV_CH_R_AIL] and "Ail_L") or "Ail"
+  elseif p == M_DB[MV_CH_R_AIL] then out="Ail_R"
+  elseif p == M_DB[MV_CH_L_ELE] then 
+      out=(M_DB[MV_CH_R_ELE] and "Ele_L") or "Ele"
+  elseif p == M_DB[MV_CH_R_ELE] then out="Ele_R"
+  elseif p == M_DB[MV_CH_L_RUD] then 
+      out=(M_DB[MV_CH_R_RUD] and "Rud_L") or "Rud"
+  elseif p == M_DB[MV_CH_R_RUD] then out="Rud-R"
+  elseif p == M_DB[MV_CH_L_FLP] then 
+      out=(M_DB[MV_CH_R_FLP] and "Flp_L") or "Flp"
+  elseif p == M_DB[MV_CH_R_FLP] then out="Flp_R"
+  else
+    out = ""
+  end
+  return out
+end
+
+-- Creates the menus to Render with the GUI
+local function ST_LoadMenu(menuId)
+
+    local function Header(p)
+      return MODEL.PORT_TEXT[p].." "..portUse(p)
+    end
+
+    local function generateGyroReverse(menuId, P_BASE, V_BASE)
+      for i=0,4 do
+        MenuLines[i] = { Type = LT_LIST_NC, Text=Header(P_BASE+i), TextId = 0, ValId = V_BASE+i, Min=45, Max=46, Def=45, Val=M_DB[V_BASE+i] }
+      end
+
+      MenuLines[5] = { Type = LT_MENU, Text="Only TAER affects AS3X/SAFE react dir", TextId = 0, ValId = menuId }
+      MenuLines[6] = { Type = LT_MENU, Text="If changes, RX 'Relearn Servo'", TextId = 0, ValId = menuId }
+
+      ctx_SelLine = 0
+    end
+
+    -- Begin
+    for i = 0, 6 do -- clear menu
+        MenuLines[i] = { MenuId = 0, lineNum = 0, Type = 0 }
+    end
+
+    
+    if (menuId==0x1000) then -- MAIN MENU
+        Menu = { MenuId = 0x1000, Text = "Save-Exit ("..MODEL.modelName..")", PrevId = 0, NextId = 0, BackId = 0, TextId=0 }
+       
+        if (true) then
+            MenuLines[4] = { Type = LT_MENU, Text="Save Changes", TextId = 0, ValId = 0x1005 }
+            MenuLines[5] = { Type = LT_MENU, Text="Discard Changes", TextId = 0, ValId = 0xFFF9 }
+            ctx_SelLine = 4 
+        end
+        lastGoodMenu = menuId
+    elseif (menuId==0x1001) then -- MODEL SETUP
+        local backId = 0xFFF9 -- No changes, just exit
+        local title  =  "Setup  ("..MODEL.modelName..")"
+        if (menuDataChanged) then
+            backId = 0x1000  -- Go to Save menu
+            title = title.." *"
+        end
+        Menu = { MenuId = 0x1001, Text = title, PrevId = 0, NextId = 0, BackId = backId, TextId=0 }
+        MenuLines[0] = { Type = LT_MENU, Text = "Aircraft Setup", ValId = 0x1010,TextId=0 }
+        MenuLines[1] = { Type = LT_MENU, Text = "Wing & Tail Channels ", ValId = 0x1020, TextId=0 } 
+        MenuLines[3] = { Type = LT_MENU, Text = "Gyro Channel Reverse", ValId = 0x1030, TextId=0 } 
+        MenuLines[5] = { Type = LT_MENU, Text = "WARNING: Changing of Aircraft", ValId = 0x1001, TextId=0 } 
+        MenuLines[6] = { Type = LT_MENU, Text = "deletes prev Ch/Port assgmt.", ValId = 0x1001, TextId=0 } 
+
+        ctx_SelLine = 0
+        lastGoodMenu = menuId
+    elseif (menuId==0x1005) then
+        ST_SaveFileData()
+        menuDataChanged = false
+
+        local msg1 = "Data saved to: " 
+        local msg2 = " ../DSMLIB/"..MODEL.hashName
+
+        Menu = { MenuId = 0x1005, Text = "Config Saved", PrevId = 0, NextId = 0, BackId = 0, TextId=0 }
+        MenuLines[2] = { Type = LT_MENU, Text=msg1, TextId = 0, ValId = 0x1005 }
+        MenuLines[3] = { Type = LT_MENU, Text=msg2, TextId = 0, ValId = 0x1005 }
+        MenuLines[6] = { Type = LT_MENU, Text="Complete", TextId = 0, ValId = 0xFFF9 }
+        ctx_SelLine = 6
+        lastGoodMenu = menuId
+    elseif (menuId==0x1010) then
+        Menu = { MenuId = 0x1010, Text = "Aircraft", PrevId = 0, NextId = 0x1011, BackId = 0x1001, TextId=0 }
+        MenuLines[5] = { Type = LT_LIST_NC, Text="Aircraft Type", TextId = 0, ValId = MV_AIRCRAFT_TYPE, Min=15, Max=15, Def=15, Val=M_DB[MV_AIRCRAFT_TYPE] }
+        ctx_SelLine = 5
+        lastGoodMenu = menuId
+    elseif (menuId==0x1011) then
+        Menu = { MenuId = 0x1011, Text = "Model Type: "..aircraft_type_text[currATyp], PrevId = 0, NextId = 0x1020, BackId = 0x1010, TextId=0 }
+        MenuLines[5] = { Type = LT_LIST_NC, Text="Wing Type", TextId = 0, ValId = MV_WING_TYPE, Min=20, Max=27, Def=20, Val=M_DB[MV_WING_TYPE] }
+        MenuLines[6] = { Type = LT_LIST_NC, Text="Tail Type", TextId = 0, ValId = MV_TAIL_TYPE, Min=30, Max=40, Def=30, Val=M_DB[MV_TAIL_TYPE] }
+        ctx_SelLine = 5
+        lastGoodMenu = menuId
+    elseif (menuId==0x1020) then
+        ------ WING  SETUP -------
+        local thr = M_DB[MV_CH_THR]
+        local leftAil = M_DB[MV_CH_L_AIL]
+        local rightAil = M_DB[MV_CH_R_AIL]
+        local leftFlap = M_DB[MV_CH_L_FLP]
+        local rightFlap = M_DB[MV_CH_R_FLP]
+
+        local thrText     = "Thr"
+        local leftAilText = "Left Ail"
+        local rightAilText = "Right Ail"
+        local leftFlapText = "Left Flap"
+        local rightFlapText = "Right Flap"
+
+        if (rightAil==nil) then leftAilText = "Aileron" end
+        if (rightFlap==nil) then leftFlapText = "Flap" end
+
+        local title = aircraft_type_text[currATyp].."   Wing:"..wing_type_text[currWTyp]
+
+        Menu = { MenuId = 0x1020, Text = title, PrevId = 0, NextId = 0x1021, BackId = 0x1011, TextId=0 }
+
+        MenuLines[0] = { Type = LT_LIST_NC, Text=thrText, TextId = 0, ValId = MV_CH_THR, Min=0, Max=10, Def=0, Val= thr }
+
+        MenuLines[2] = { Type = LT_LIST_NC, Text=leftAilText, TextId = 0, ValId = MV_CH_L_AIL, Min=0, Max=9, Def=0, Val= leftAil }
+
+        if (rightAil) then
+            MenuLines[3] = { Type = LT_LIST_NC, Text=rightAilText, TextId = 0, ValId = MV_CH_R_AIL, Min=0, Max=9, Def=0, Val= rightAil }
+        end
+
+        if (leftFlap) then
+            MenuLines[4] = { Type = LT_LIST_NC, Text=leftFlapText, TextId = 0, ValId = MV_CH_L_FLP, Min=0, Max=9, Def=0, Val= leftFlap }
+        end
+        if (rightFlap) then
+            MenuLines[5] = { Type = LT_LIST_NC, Text=rightFlapText, TextId = 0, ValId = MV_CH_R_FLP, Min=0, Max=9, Def=0, Val= rightFlap }
+        end
+
+        ctx_SelLine = 0
+        lastGoodMenu = menuId
+
+    elseif (menuId==0x1021) then
+        ------ TAIL SETUP -------
+        local leftRud = M_DB[MV_CH_L_RUD] 
+        local rightRud = M_DB[MV_CH_R_RUD] 
+        local leftEle = M_DB[MV_CH_L_ELE]
+        local rightEle = M_DB[MV_CH_R_ELE]
+
+        local leftRudText = "Left Rud"
+        local rightRudText = "Right Rud"
+
+        local leftElvText = "Left Ele"
+        local rightElvText = "Right Ele"
+
+        if (rightRud==nil) then leftRudText = "Rud"  end
+        if (rightEle==nil) then leftElvText = "Ele" end
+
+        local title = aircraft_type_text[currATyp].."  Tail:"..tail_type_text[currTTyp]
+
+        Menu = { MenuId = 0x1021, Text = title, PrevId = 0, NextId = 0x1001, BackId = 0x1020, TextId=0 }
+        if (leftRud) then
+            MenuLines[1] = { Type = LT_LIST_NC, Text=leftRudText, TextId = 0, ValId = MV_CH_L_RUD, Min=0, Max=9, Def=0, Val= leftRud}
+        end
+
+        if (rightRud) then
+            MenuLines[2] = { Type = LT_LIST_NC, Text=rightRudText, TextId = 0, ValId = MV_CH_R_RUD, Min=0, Max=9, Def=0, Val=rightRud }
+        end
+
+        if (leftEle) then
+            MenuLines[4] = { Type = LT_LIST_NC, Text=leftElvText, TextId = 0, ValId = MV_CH_L_ELE, Min=0, Max=9, Def=0, Val=leftEle }
+        end
+
+        if (rightEle) then
+            MenuLines[5] = { Type = LT_LIST_NC, Text=rightElvText, TextId = 0, ValId = MV_CH_R_ELE, Min=0, Max=9, Def=0, Val=rightEle }
+        end
+
+        ctx_SelLine = 1
+        lastGoodMenu = menuId
+   
+    elseif (menuId==0x1030) then
+        Menu = { MenuId = 0x1030, Text = "Gyro Reverse (Port 1-5)", PrevId = 0, NextId = 0x1031, BackId = 0x1001, TextId=0 }
+        generateGyroReverse(menuId,P1,MV_P1_MODE)
+        lastGoodMenu = menuId
+    elseif (menuId==0x1031) then
+        Menu = { MenuId = 0x1031, Text = "Gyro Reverse (Port 6-10)", PrevId = 0x1030, NextId = 0, BackId = 0x1001, TextId=0 }
+        generateGyroReverse(menuId,P6,MV_P6_MODE)
+        lastGoodMenu = menuId
+    elseif (menuId==0xFFF9) then
+        ChangePhase(PH_EXIT_DONE)
+        return
+    else
+        Menu = { MenuId = 0x0002, Text = "NOT IMPLEMENTED", TextId = 0, PrevId = 0, NextId = 0, BackId = lastGoodMenu }
+        ctx_SelLine = -1 -- BACK BUTTON
+    end
+
+    for i = 0, 6 do 
+        if (MenuLines[i].Type > 0) then
+            MenuLinePostProcessing(MenuLines[i])
+        end
+    end
+    gc()
+end
+
+-- Inital List and Image Text for this menus
+local function ST_Init_Text(rxId) 
+    -- Channel Names use the Port Text Retrived from OTX/ETX
+    local p = 0
+
+    for i = 0, 9 do List_Text[i] = MODEL.PORT_TEXT[i]  end
+    List_Text[10] = "--"
+
+    -- Aircraft Type
+    List_Text[15+AT_PLANE]  = "Airplane"; 
+
+    -- Wing Types
+    p = 20+WT_A1;    List_Text[p] = "Single Ail";  --List_Text_Img[p]  = "x.png|Single Aileron" 
+    p = 20+WT_A2;    List_Text[p] = "Dual Ail";  --List_Text_Img[p]  = "x.png|Dual Aileron" 
+    p = 20+WT_FLPR;  List_Text[p] = "Flaperon";  --List_Text_Img[p]  = "x.png|Flaperon" 
+    p = 20+WT_A1_F1; List_Text[p] = "Ail + Flap";  --List_Text_Img[p]  = "x.png|Aileron + Flap" 
+    p = 20+WT_A2_F1; List_Text[p] = "Dual Ail + Flap";  --List_Text_Img[p]  = "x.png|Dual Aileron + Flap" 
+    p = 20+WT_A2_F2; List_Text[p] = "Dual Ail + Dual Flap";  --List_Text_Img[p]  = "x.png|Dual Aileron + Dual Flap" 
+    p = 20+WT_ELEVON_A; List_Text[p] = "Delta A";  --List_Text_Img[p]  = "x.png|Delta/Elevon A" 
+    p = 20+WT_ELEVON_B; List_Text[p] = "Delta B";  --List_Text_Img[p]  = "x.png|Delta/Elevon B" 
+
+    -- Tail Types
+    p = 30+TT_R1;    List_Text[p] = "Rudder Only";  --List_Text_Img[p]  = "x.png|Rudder Only" 
+    p = 30+TT_R1_E1; List_Text[p] = "Rud + Ele";  --List_Text_Img[p]  = "x.png|Tail Normal" 
+    p = 30+TT_R1_E2; List_Text[p] = "Rud + Dual Ele";  --List_Text_Img[p]  = "x.png|Rud + Dual Ele" 
+    p = 30+TT_R2_E1; List_Text[p] = "Dual Rud + Ele";  --List_Text_Img[p]  = "x.png|Dual Rud + Ele" 
+    p = 30+TT_R2_E2; List_Text[p] = "Dual Rud + Dual Ele";  --List_Text_Img[p]  = "x.png|Dual Rud + Dual Elev" 
+    p = 30+TT_VT_A;  List_Text[p] = "V-Tail A";  --List_Text_Img[p]  = "x.png|V-Tail A" 
+    p = 30+TT_VT_B;  List_Text[p] = "V-Tail B";  --List_Text_Img[p]  = "x.png|V-Tail B" 
+    p = 30+TT_TLRN_A; List_Text[p] = "Taileron A";  --List_Text_Img[p]  = "x.png|Taileron A" 
+    p = 30+TT_TLRN_B; List_Text[p] = "Taileron B";  --List_Text_Img[p]  = "x.png|Taileron B" 
+    p = 30+TT_TLRN_A_R2; List_Text[p] = "Taileron A + 2x Rud";  --List_Text_Img[p]  = "x.png|Taileron A + Dual Rud" 
+    p = 30+TT_TLRN_B_R2; List_Text[p] = "Taileron B + 2x Rud";  --List_Text_Img[p]  = "x.png|Taileron B + Dual Rud" 
+
+    -- Servo Reverse
+    List_Text[45+MT_NORMAL]  = "Normal"
+    List_Text[45+MT_REVERSE] = "Reverse"
+end
+
+-- Initial Setup
+local function ST_Init()
+    ST_Init_Text(0)
+    gc()
+ 
+    -- Setup default Data if no data loaded
+    menuDataChanged = false
+    if (M_DB[MV_AIRCRAFT_TYPE]==nil) then
+      ST_Default_Data()
+      menuDataChanged = true
+    end
+
+    currATyp = M_DB[MV_AIRCRAFT_TYPE]
+    currWTyp = M_DB[MV_WING_TYPE]
+    currTTyp = M_DB[MV_TAIL_TYPE]
+
+    Phase = PH_RX_VER
+end
+
+----- Line Type
+
+local function isSelectable(line)
+  if (line.Type == LT_MENU and line.ValId == line.MenuId) then return false end -- Menu to same page
+  if (line.Type ~= LT_MENU and  line.Max == 0) then return false end            -- Read only data line 
+  if (line.Type ~= 0 and line.TextId < 0x8000) then return true end          -- Not Flight Mode
+  return false;
+end
+
+local function isListLine(line) 
+  return line.Type==LT_LIST_NC
+end
+
+local function isEditing() 
+  return  ctx_EditLine ~= nil
+end
+
+-----------------------
+local function Get_Text(index)
+  local out = Text[index] or string.format("Unknown_%X", index)
+  return out
+end
+
+local function Get_Text_Value(index)
+  local out = List_Text[index] or Get_Text(index)
+  return out
+end
+
+function ChangePhase(newPhase)
+  Phase = newPhase
+end
+
+local function Value_Add(dir)
+  local line = MenuLines[ctx_SelLine]
+  local inc = dir
+
+  line.Val = line.Val + inc
+
+  if line.Val > line.Max then
+    line.Val = line.Max
+  elseif line.Val < line.Min then
+    line.Val = line.Min
+  end
+end
+--------------
+
+local function GotoMenu(menuId, lastSelectedLine)
+  Menu.MenuId = menuId
+  ctx_SelLine = lastSelectedLine
+  ChangePhase(PH_TITLE)
+end
+
+local function DSM_HandleEvent(event)
+  if event == EVT_VIRTUAL_EXIT then
+    if Phase == PH_RX_VER then
+      Phase = PH_EXIT_DONE -- Exit program
+    else
+      if isEditing() then   -- Editing a Line, need to  restore original value
+        MenuLines[ctx_EditLine].Val = originalValue
+        event = EVT_VIRTUAL_ENTER
+      else
+        if (Menu.BackId > 0 ) then -- Back??
+          ctx_SelLine = -1 --Back Button
+          event = EVT_VIRTUAL_ENTER
+        else
+          ChangePhase(PH_EXIT_REQ)
+        end
+      end
+    end
+  end -- Exit
+
+  if Phase == PH_RX_VER then return end -- nothing else to do 
+
+  if event == EVT_VIRTUAL_NEXT then
+    if isEditing() then -- Editting?
+      Value_Add(1)
+    else
+      if ctx_SelLine < 7 then -- On a regular line
+        local num = ctx_SelLine -- Find the prev selectable 
+        for i = ctx_SelLine + 1, 6, 1 do
+          local line = MenuLines[i]
+          if isSelectable(line) then
+            ctx_SelLine = i
+            break
+          end
+        end
+        if num == ctx_SelLine then       -- No Selectable Line
+          if Menu.NextId ~= 0 then
+            ctx_SelLine = 7 -- Next 
+          elseif Menu.PrevId ~= 0 then
+            ctx_SelLine = 8 -- Prev
+          end
+        end
+      elseif Menu.PrevId ~= 0 then
+        ctx_SelLine = 8 -- Prev
+      end
+    end
+    return
+  end
+  
+  if event == EVT_VIRTUAL_PREV then
+    if isEditing() then -- In Edit Mode
+      Value_Add(-1)
+    else
+      if ctx_SelLine == 8 and Menu.NextId ~= 0 then
+        ctx_SelLine = 7 -- Next 
+      elseif ctx_SelLine > 0 then
+        if ctx_SelLine > 6 then
+          ctx_SelLine = 7 --NEXT 
+        end
+        local num = ctx_SelLine -- Find Prev Selectable line
+        for i = ctx_SelLine - 1, 0, -1 do
+          local line = MenuLines[i]
+          if isSelectable(line) then
+            ctx_SelLine = i
+            break
+          end
+        end
+        if num == ctx_SelLine then   -- No Selectable Line
+          if (Menu.BackId > 0) then 
+            ctx_SelLine = -1 -- Back 
+          end
+        end
+      else
+        ctx_SelLine = -1   -- Back
+      end
+    end
+    return
+  end
+  
+
+  if event == EVT_VIRTUAL_ENTER then
+    if ctx_SelLine == -1 then    -- Back
+      GotoMenu(Menu.BackId, 0x80)
+    elseif ctx_SelLine == 7 then -- Next
+      GotoMenu(Menu.NextId, 0x82)
+    elseif ctx_SelLine == 8 then -- Prev
+      GotoMenu(Menu.PrevId, 0x81)
+    elseif ctx_SelLine >= 0 and MenuLines[ctx_SelLine].Type == LT_MENU then
+      GotoMenu(MenuLines[ctx_SelLine].ValId, ctx_SelLine)  -- ValId is the next menu
+    else
+      -- value entry
+      if isEditing() then
+        ctx_EditLine = nil   -- Done Editting
+        ChangePhase(PH_VAL_EDIT_END)
+      else   -- Start Editing
+        ctx_EditLine = ctx_SelLine
+        originalValue = MenuLines[ctx_SelLine].Val
+        ChangePhase(PH_VAL_EDITING)
+      end
+    end
+  end
+end
+
+local function DSM_Send_Receive()
+
+    if Phase == PH_RX_VER then -- request RX version
+        Phase = PH_TITLE
+        Menu.MenuId = 0x01001
+        Refresh_Display = true
+    elseif Phase == PH_WAIT_CMD then 
+        
+    elseif Phase == PH_TITLE then -- request menu title
+        ST_LoadMenu(Menu.MenuId)
+        if (Phase~=PH_EXIT_DONE) then
+          Phase = PH_WAIT_CMD
+        end
+        Refresh_Display = true
+    elseif Phase == PH_VAL_EDIT_END then -- send value
+        local line = MenuLines[ctx_SelLine] -- Updated Value of SELECTED line
+        
+        -- Update the menu data from the line
+        if (M_DB[line.ValId] ~= line.Val ) then
+            M_DB[line.ValId] = line.Val 
+            print(string.format("MENU_DATA[%d/%s]=%d",line.ValId,line.Text, line.Val))
+            menuDataChanged=true
+        end
+
+        -- Did the Wing type change?
+        local wt = M_DB[MV_WING_TYPE]
+        if (currWTyp ~= wt) then
+            currWTyp = wt
+            ST_PlaneWingInit(currWTyp)
+        
+            -- DELTA has only RUDER 
+            if (currWTyp==WT_ELEVON_A or currWTyp==WT_ELEVON_B) then
+              M_DB[MV_TAIL_TYPE] = TT_R1
+            end
+        end
+
+        --- Did the tail changed?
+        local tt = M_DB[MV_TAIL_TYPE]
+        if (currTTyp ~= tt) then
+            if (not tailTypeCompatible(currTTyp,tt)) then  
+              ST_PlaneTailInit(tt)
+            end
+            currTTyp = tt
+        end
+
+        Phase = PH_WAIT_CMD
+    elseif Phase == PH_EXIT_REQ then
+       Phase=PH_EXIT_DONE
+    end
+end
+
+-----
+
+local function showBitmap(x, y, imgDesc)
+  local f = string.gmatch(imgDesc, '([^%|]+)')   -- Iterator over values split by '|'
+  local imgName, imgMsg = f(), f()
+
+  f = string.gmatch(imgMsg or "", '([^%:]+)')   -- Iterator over values split by ':'
+  local p1, p2 = f(), f()
+
+  lcd.drawText(x, y, p1 or "", TEXT_ATTR)                     -- Alternate Image MSG
+  lcd.drawText(x, y + LCD_Y_LINE_HEIGHT, p2 or "", TEXT_ATTR) -- Alternate Image MSG
+  gc()
+end
+
+
+local function drawButton(x, y, text, active)
+  local attr = TEXT_ATTR
+  if (active) then attr = attr + INVERS end
+  lcd.drawText(x, y, text, attr)
+end
+
+local function DSM_Display()
+  lcd.clear()
+  --Draw RX Menu
+  if Phase == PH_RX_VER then
+    return
+  end
+
+    -- display Program version or RX version
+  local msg =  "FProg "..VERSION
+  lcd.drawText(40, LCD_Y_LOWER_BUTTONS, msg, TEXT_ATTR) 
+
+  if Menu.MenuId == 0 then return end; -- No Title yet
+
+  -- Got a Menu
+  lcd.drawText(1, 0, Menu.Text, TEXT_ATTR + INVERS)
+
+  local y = LCD_Y_LINE_HEIGHT + 2
+  for i = 0, 6 do
+    local attrib = TEXT_ATTR
+    if (i == ctx_SelLine) then attrib = attrib + INVERS end     -- Selected Line
+
+    local line = MenuLines[i]
+
+    if line ~= nil and line.Type ~= 0 then
+      local heading = line.Text 
+
+        local text = nil
+        if line.Type ~= LT_MENU then       -- list/value
+          if line.Val ~= nil then
+            if isListLine(line) then
+              local textId = line.Val + line.TextStart
+              text = Get_Text_Value(textId)
+
+              --local imgDesc = List_Text_Img[textId]
+             
+              --if (imgDesc and i == ctx_SelLine) then             -- Optional Image and Msg for selected value
+              --  showBitmap(1, 20, imgDesc)
+              --end
+            else
+              text = line.Val
+            end
+          end -- if is Value
+
+          if (ctx_EditLine == i) then  -- Editing a Line
+            attrib = BLINK + INVERS + TEXT_ATTR
+          end
+          lcd.drawText(LCD_X_MAX, y, text or "--", attrib + RIGHT) -- display value
+          --lcd.drawText(LCD_X_MAX, y, line.Format or "", TEXT_ATTR + RIGHT) -- display Format
+          attrib = TEXT_ATTR
+        end
+
+      lcd.drawText(1, y, heading, attrib) -- display text
+    end
+    y = y + LCD_Y_LINE_HEIGHT
+  end     -- for
+
+  if Menu.BackId~=0 then
+    drawButton(LCD_X_RIGHT_BUTTONS, 0, "Back", ctx_SelLine == -1)
+  end
+
+  if Menu.NextId~=0 then
+    drawButton(LCD_X_RIGHT_BUTTONS, LCD_Y_LOWER_BUTTONS, "Next", ctx_SelLine == 7)
+  end
+
+  if Menu.PrevId~=0 then
+    drawButton(1, LCD_Y_LOWER_BUTTONS, "Prev", ctx_SelLine == 8)
+  end
+end
+
+------------------------------------------------------------------------------------------------------------
+-- Init
+local function DSM_Init()
+  --LOG_open()
+  ST_Init()
+  gc()
+
+  if (LCD_W > 128) then
+    TEXT_ATTR = 0
+    LCD_Y_LINE_HEIGHT = 25
+    LCD_X_MAX         = 300
+    LCD_X_RIGHT_BUTTONS = LCD_X_MAX - 30
+
+    LCD_Y_LOWER_BUTTONS = (8 * LCD_Y_LINE_HEIGHT) + 2
+  end
+
+  Phase = PH_RX_VER
+end
+
+-- Main
+
+local function DSM_Run(event)
+  if event == nil then
+    error("Cannot be run as a model script!")
+    return 2
+  end
+
+  DSM_Display()
+  DSM_HandleEvent(event)
+  DSM_Send_Receive()
+  gc()
+
+  if Phase == PH_EXIT_DONE then
+    LOG_close()
+    return 2
+  else
+    return 0
+  end
+end
+
+---
+-- Load Model Config 
+gc()
+local r = assert(loadScript(DSMLIB_PATH.."DsmMIN_P1.lua"), "Not-Found: DSMLIB/DsmMIN_P1.lua")
+        (MODEL,M_DB, LOG_write)
+gc()
+----
+return { init = DSM_Init, run = DSM_Run }

Lua_scripts/DSMLIB/DsmMIN_P1.lua

@@ -0,0 +1,167 @@
+local MODEL, M_DATA, LOG_write = ...
+
+--[[
+local MODEL = {
+    modelName = "",            -- The name of the model comming from OTX/ETX
+    hashName = "",
+    modelOutputChannel = {},   -- Output information from OTX/ETX
+  
+    TX_CH_TEXT= { [0]=""}, 
+    PORT_TEXT = { [0]=""},
+  
+    DSM_ChannelInfo = {}       -- Data Created by DSM Configuration Script
+  }
+
+  -- MENU DATA Management
+local M_DATA = {}            -- Store the variables used in the Menus.
+
+--]]
+
+local DATA_PATH           = "/MODELS/DSMDATA"
+local TX_CHANNELS         = 12
+
+local MV_DATA_END        = 1040
+
+
+  local function hashName(mName)
+    local c=10000;
+  
+    local prefix = string.gsub(mName,"%.","_") -- Change any "." to "_"
+    prefix = string.gsub(prefix,"% ","_") -- Change any space to "_"
+    prefix = string.sub(prefix,1,5) -- Take the first 5 characters
+  
+    -- Simple Hash of the Model Name adding each character 
+    for i = 1, #mName do
+        local ch = string.byte(mName,i,i)
+        c=c+ch
+    end
+  
+    return (prefix .. c) -- Return Prefix + Hash
+  end
+  
+  -- Load Menu Data from a file 
+  local function ST_LoadFileData() 
+    local fname = hashName(MODEL.modelName)..".txt"
+    MODEL.hashName = fname
+  
+    -- Clear Menu Data
+    for i = 0, MV_DATA_END do
+        M_DATA[i]=nil
+    end
+  
+    print("Loading File:"..fname)
+  
+    local dataFile = io.open(DATA_PATH .. "/".. fname, "r")  -- read File 
+    -- cannot read file???
+    if (dataFile==nil) then return 0 end
+  
+    local line = io.read(dataFile, 5000)
+    io.close(dataFile)
+  
+    if #line == 0 then return 0 end -- No data??
+  
+    -- Process the input, each line is "Var_Id : Value" format 
+    -- Store it into MANU_DATA
+    local i=0
+    for k, v in string.gmatch(line, "(%d+):(%d+)") do
+        M_DATA[k+0]=v+0 -- do aritmentic to convert string to number
+        i=i+1
+    end
+  
+    -- Return 0 if no lines processed, 1 otherwise
+    if (i > 0) then return 1 else return 0 end
+  end
+
+  local function getModuleChannelOrder(num) 
+    --Determine fist 4 channels order
+    local ch_n={}
+    local st_n = {[0]= "R", "E", "T", "A" }
+    local c_ord=num -- ch order
+    if (c_ord == -1) then
+      ch_n[0] = st_n[3]
+      ch_n[1] = st_n[1]
+      ch_n[2] = st_n[2]
+      ch_n[3] = st_n[0]
+    else
+      ch_n[bit32.band(c_ord,3)] = st_n[3]
+      c_ord = math.floor(c_ord/4)
+      ch_n[bit32.band(c_ord,3)] = st_n[1]
+      c_ord = math.floor(c_ord/4)
+      ch_n[bit32.band(c_ord,3)] = st_n[2]
+      c_ord = math.floor(c_ord/4)
+      ch_n[bit32.band(c_ord,3)] = st_n[0]
+    end
+  
+    local s = ""
+    for i=0,3 do
+      s=s..ch_n[i]
+    end
+    return s
+  end
+  
+  local function ReadTxModelData()
+    local TRANSLATE_AETR_TO_TAER=false
+    local table = model.getInfo()   -- Get the model name 
+    MODEL.modelName = table.name
+  
+    local module = model.getModule(0) -- Internal
+    if (module==nil or module.Type~=6) then module = model.getModule(1) end -- External
+    if (module~=nil) then
+        if (module.Type==6 ) then -- MULTI-MODULE
+            local chOrder = module.channelsOrder
+            local s = getModuleChannelOrder(chOrder)
+            LOG_write("MultiChannel Ch Order: [%s]  %s\n",chOrder,s) 
+  
+            if (s=="AETR") then TRANSLATE_AETR_TO_TAER=true 
+            else TRANSLATE_AETR_TO_TAER=false 
+            end
+        end
+    end
+  
+    -- Read Ch1 to Ch10
+    local i= 0
+    for i = 0, TX_CHANNELS-1 do 
+        local ch = model.getOutput(i) -- Zero base 
+        if (ch~=nil) then
+            MODEL.modelOutputChannel[i] = ch
+            if (string.len(ch.name)==0) then 
+                ch.formatCh = string.format("TX:Ch%i",i+1)
+            else
+                ch.formatCh = string.format("TX:Ch%i/%s",i+1,ch.name or "--")
+            end
+        end
+    end
+  
+    -- Translate AETR to TAER
+  
+    if (TRANSLATE_AETR_TO_TAER) then 
+        LOG_write("Applying  AETR -> TAER translation\n") 
+        local ail = MODEL.modelOutputChannel[0]
+        local elv = MODEL.modelOutputChannel[1]
+        local thr = MODEL.modelOutputChannel[2]
+  
+        MODEL.modelOutputChannel[0] = thr
+        MODEL.modelOutputChannel[1] = ail
+        MODEL.modelOutputChannel[2] = elv
+    end
+  
+    -- Create the Port Text to be used 
+    LOG_write("Ports/Channels:\n") 
+    for i = 0, TX_CHANNELS-1 do 
+        local ch =  MODEL.modelOutputChannel[i]
+        if (ch~=nil) then
+            MODEL.TX_CH_TEXT[i] = ch.formatCh
+            MODEL.PORT_TEXT[i] = string.format("P%i (%s) ",i+1,MODEL.TX_CH_TEXT[i])  
+            LOG_write("Port%d %s [%d,%d] Rev=%d, Off=%d, ppmC=%d, syn=%d\n",i+1,MODEL.TX_CH_TEXT[i],math.floor(ch.min/10),math.floor(ch.max/10), ch.revert, ch.offset, ch.ppmCenter, ch.symetrical)
+        end
+    end
+  end
+  
+  -- Main Program
+
+  LOG_write("Reading Model Info\n")
+  ReadTxModelData()
+  local r = ST_LoadFileData()
+  return r
+  
+

Lua_scripts/DSMLIB/DsmMIN_P2.lua

@@ -0,0 +1,282 @@
+local MODEL, M_DATA, LOG_write = ...
+
+--[[
+local MODEL = {
+    modelName = "",            -- The name of the model comming from OTX/ETX
+    hashName = "",
+    modelOutputChannel = {},   -- Output information from OTX/ETX
+  
+    TX_CH_TEXT= { [0]=""}, 
+    PORT_TEXT = { [0]=""},
+  
+    DSM_ChannelInfo = {}       -- Data Created by DSM Configuration Script
+  }
+
+  -- MENU DATA Management
+local M_DATA = {}            -- Store the variables used in the Menus.
+
+--]]
+
+
+local TX_CHANNELS         = 12
+
+local AT_PLANE   = 0
+
+local aircraft_type_text = {[0]="Plane","Heli","Glider","Drone"}
+
+--[[
+local WT_A1       = 0
+local WT_A2       = 1
+local WT_FLPR     = 2
+local WT_A1_F1    = 3
+local WT_A2_F1    = 4
+local WT_A2_F2    = 5
+--]]
+local WT_ELEVON_A = 6
+local WT_ELEVON_B = 7
+
+local wing_type_text = {[0]="Normal","Dual Ail","Flapperon", "Ail + Flp","Dual Ail + Flp","Dual Ail/Flp","Elevon A","Elevon B"}
+
+--[[
+local TT_R1    = 0
+local TT_R1_E1 = 1
+local TT_R1_E2 = 2
+local TT_R2_E1 = 3
+local TT_R2_E2 = 4
+--]]
+
+local TT_VT_A  = 5
+local TT_VT_B  = 6
+local TT_TLRN_A = 7
+local TT_TLRN_B = 8
+local TT_TLRN_A_R2 = 9
+local TT_TLRN_B_R2 = 10
+
+local tail_type_text = {[0]="Rud Only","Normal","Rud + Dual Ele","Dual Rud + Elv","Dual Rud/Ele",
+            "VTail A","VTail B","Taileron A","Taileron B","Taileron A + Dual Rud","Taileron B + Dual Rud"}
+
+
+local MV_AIRCRAFT_TYPE = 1001
+local MV_WING_TYPE     = 1002
+local MV_TAIL_TYPE     = 1003
+        
+local MV_CH_BASE       = 1010
+local MV_CH_THR        = 1010
+local MV_CH_L_AIL      = 1011
+local MV_CH_R_AIL      = 1012
+local MV_CH_L_FLP      = 1013
+local MV_CH_R_FLP      = 1014
+
+local MV_CH_L_RUD      = 1015
+local MV_CH_R_RUD      = 1016
+local MV_CH_L_ELE      = 1017
+local MV_CH_R_ELE      = 1018
+
+local MV_PORT_BASE       = 1020
+
+local MV_DATA_END        = 1040
+
+--Channel Types --
+local CT_NONE     = 0x00
+local CT_AIL      = 0x01
+local CT_ELE      = 0x02
+local CT_RUD      = 0x04
+local CT_REVERSE  = 0x20
+local CT_THR      = 0x40
+local CT_SLAVE    = 0x80
+
+-- Seems like Reverse Mix is complement of the 3 bits
+local CMT_NORM     = 0x00   -- 0000
+local CMT_AIL      = 0x10   -- 0001 Taileron
+local CMT_ELE      = 0x20   -- 0010 For VTIAL and Delta-ELEVON
+local CMT_RUD      = 0x30   -- 0011 For VTIAL
+local CMT_RUD_REV  = 0x40   -- 0100 For VTIAL
+local CMT_ELE_REV  = 0x50   -- 0101 For VTIAL and Delta-ELEVON A
+local CMT_AIL_REV  = 0x60   -- 0110 Taileron 
+local CMT_NORM_REV = 0x70    -- 0111
+
+local MT_NORMAL      = 0
+local MT_REVERSE     = 1
+
+local function channelType2String(byte1, byte2) 
+    local s = ""
+  
+    if (byte2==0) then return s end;
+    
+    if (bit32.band(byte2,CT_AIL)>0) then s=s.."Ail" end
+    if (bit32.band(byte2,CT_ELE)>0) then s=s.."Ele" end
+    if (bit32.band(byte2,CT_RUD)>0) then s=s.."Rud" end
+    if (bit32.band(byte2,CT_THR)>0) then s=s.."Thr" end
+  
+    if (bit32.band(byte2,CT_REVERSE)>0) then s=s.."-" end
+  
+    if (bit32.band(byte2,CT_SLAVE)>0) then s=s.." Slv" end
+  
+    if (byte1==CMT_NORM) then s=s.." " 
+    elseif (byte1==CMT_AIL) then s=s.." M_Ail" 
+    elseif (byte1==CMT_ELE) then s=s.." M_Ele" 
+    elseif (byte1==CMT_RUD) then s=s.." M_Rud" 
+    elseif (byte1==CMT_RUD_REV) then s=s.." M_Rud-" 
+    elseif (byte1==CMT_ELE_REV) then s=s.." M_Ele-" 
+    elseif (byte1==CMT_AIL_REV) then s=s.." M_Ail-" 
+    elseif (byte1==CMT_NORM_REV) then s=s.." M-" 
+    end
+  
+    return s;
+  end
+  
+  -- This Creates the Servo Settings that will be used to pass to 
+-- Forward programming
+local function CreateDSMPortChannelInfo()
+    local function ApplyWingMixA(b2)
+        -- ELEVON
+        if (b2==CT_AIL+CT_ELE) then return CMT_ELE end; -- 0x03
+        if (b2==CT_AIL+CT_ELE+CT_SLAVE) then return CMT_NORM end; -- 0x83
+    end
+
+    local function ApplyWingMixB(b2)
+        -- ELEVON 
+        if (b2==CT_AIL+CT_ELE) then return CMT_NORM end; -- 0x03
+        if (b2==CT_AIL+CT_ELE+CT_SLAVE) then return CMT_ELE end; -- 0x83
+   end
+
+    local function ApplyTailMixA(b2)
+        -- VTAIL
+        -- Default normal/reverse behaviour 
+        if (b2==CT_RUD+CT_ELE) then return CMT_NORM end; -- 0x06
+        if (b2==CT_RUD+CT_ELE+CT_SLAVE) then return CMT_ELE end; -- 0x86
+
+        --TAILERON
+        -- Default normal/reverse behaviour 
+        if (b2==CT_AIL+CT_ELE) then return CMT_NORM end; -- 0x03
+        if (b2==CT_AIL+CT_ELE+CT_SLAVE) then return CMT_AIL end; -- 0x83
+    end
+
+    local function ApplyTailMixB(b2)
+        -- VTAIL 
+        -- Default normal/reverse behaviour 
+        if (b2==CT_RUD+CT_ELE) then return CMT_NORM end; -- 0x06
+        if (b2==CT_RUD+CT_ELE+CT_SLAVE) then return CMT_RUD end; -- 0x86
+
+        --TAILERON
+        if (b2==CT_AIL+CT_ELE) then return CMT_AIL end; -- 0x03
+        if (b2==CT_AIL+CT_ELE+CT_SLAVE) then return CMT_NORM end; -- 0x83
+    end
+
+    local function reverseMix(b)
+        if (b==CMT_NORM) then return CMT_NORM_REV end;
+        if (b==CMT_AIL) then return CMT_AIL_REV end;
+        if (b==CMT_ELE) then return CMT_ELE_REV end;
+        if (b==CMT_RUD) then return CMT_RUD_REV end;
+        return b
+    end
+
+    local DSM_Ch = MODEL.DSM_ChannelInfo 
+
+    for i=0, TX_CHANNELS-1 do
+        DSM_Ch[i] = {[0]= CMT_NORM, CT_NONE, nil}  -- Initialize with no special function 
+    end
+
+    --local aircraftType = M_DATA[MV_AIRCRAFT_TYPE]
+    local wingType = M_DATA[MV_WING_TYPE]
+    local tailType = M_DATA[MV_TAIL_TYPE]
+
+    local thrCh  =  M_DATA[MV_CH_THR]
+    local lAilCh =  M_DATA[MV_CH_L_AIL]
+    local rAilCh =  M_DATA[MV_CH_R_AIL]
+
+    local lElevCh = M_DATA[MV_CH_L_ELE]
+    local rElevCh = M_DATA[MV_CH_R_ELE]
+
+    local lRudCh = M_DATA[MV_CH_L_RUD]
+    local rRudCh = M_DATA[MV_CH_R_RUD]
+
+    -- Channels in menu vars are Zero base, Channel info is 1 based 
+    
+    -- THR 
+    if (thrCh~=nil and thrCh < 10) then DSM_Ch[thrCh][1]= CT_THR end
+
+    -- AIL (Left and Right)
+    if (lAilCh~=nil) then DSM_Ch[lAilCh][1] = CT_AIL  end
+    if (rAilCh~=nil) then DSM_Ch[rAilCh][1] = CT_AIL+CT_SLAVE end
+    -- ELE (Left and Right)
+    if (lElevCh~=nil) then DSM_Ch[lElevCh][1] = CT_ELE end
+    if (rElevCh~=nil) then DSM_Ch[rElevCh][1] = CT_ELE+CT_SLAVE end
+    -- RUD (Left and Right)
+    if (lRudCh~=nil) then DSM_Ch[lRudCh][1] = CT_RUD end
+    if (rRudCh~=nil) then DSM_Ch[rRudCh][1] = CT_RUD+CT_SLAVE end
+
+    -- VTAIL: RUD + ELE
+    if (tailType==TT_VT_A) then 
+        DSM_Ch[lElevCh][1] = CT_RUD+CT_ELE
+        DSM_Ch[rElevCh][1] = CT_RUD+CT_ELE+CT_SLAVE
+    elseif (tailType==TT_VT_B) then
+        DSM_Ch[lElevCh][1] = CT_RUD+CT_ELE+CT_SLAVE
+        DSM_Ch[rElevCh][1] = CT_RUD+CT_ELE
+    end
+
+    -- TAILERRON: 2-ELE + AIL
+    if (tailType==TT_TLRN_A or tailType==TT_TLRN_A_R2) then 
+        DSM_Ch[lElevCh][1] = CT_AIL+CT_ELE
+        DSM_Ch[rElevCh][1] = CT_AIL+CT_ELE+CT_SLAVE
+    elseif (tailType==TT_TLRN_B or tailType==TT_TLRN_B_R2) then
+        DSM_Ch[lElevCh][1] = CT_AIL+CT_ELE+CT_SLAVE
+        DSM_Ch[rElevCh][1] = CT_AIL+CT_ELE
+    end
+
+    ---- ELEVON :  AIL + ELE 
+    if (wingType==WT_ELEVON_A) then 
+        DSM_Ch[lAilCh][1] = CT_AIL+CT_ELE
+        DSM_Ch[rAilCh][1] = CT_AIL+CT_ELE+CT_SLAVE
+    elseif (wingType==WT_ELEVON_B) then
+        DSM_Ch[lAilCh][1] = CT_AIL+CT_ELE+CT_SLAVE
+        DSM_Ch[rAilCh][1] = CT_AIL+CT_ELE
+    end
+
+   ------MIXES ---------
+
+    -- TAIL Mixes (Elevator and VTail)
+    if (tailType==TT_VT_A or tailType==TT_TLRN_A or tailType==TT_TLRN_A_R2) then 
+        DSM_Ch[lElevCh][0] = ApplyTailMixA(DSM_Ch[lElevCh][1])
+        DSM_Ch[rElevCh][0] = ApplyTailMixA(DSM_Ch[rElevCh][1])
+    elseif (tailType==TT_VT_B or tailType==TT_TLRN_B or tailType==TT_TLRN_B_R2) then
+        DSM_Ch[lElevCh][0] = ApplyTailMixB(DSM_Ch[lElevCh][1])
+        DSM_Ch[rElevCh][0] = ApplyTailMixB(DSM_Ch[rElevCh][1])
+    end
+
+     ---- ELEVON :  AIL + ELE 
+     if (wingType==WT_ELEVON_A) then 
+        DSM_Ch[lAilCh][0] = ApplyWingMixA(DSM_Ch[lAilCh][1])
+        DSM_Ch[rAilCh][0] = ApplyWingMixA(DSM_Ch[rAilCh][1])
+    elseif (wingType==WT_ELEVON_B) then
+        DSM_Ch[lAilCh][0] = ApplyWingMixB(DSM_Ch[lAilCh][1])
+        DSM_Ch[rAilCh][0] = ApplyWingMixB(DSM_Ch[rAilCh][1])
+    end
+
+    -- Apply Gyro Reverse as needed for each channel as long as it is used 
+    for i=0, TX_CHANNELS-1 do
+        if (M_DATA[MV_PORT_BASE+i]==MT_REVERSE and DSM_Ch[i][1]>0) then
+            DSM_Ch[i][0]=reverseMix(DSM_Ch[i][0])
+            DSM_Ch[i][1]=DSM_Ch[i][1]+CT_REVERSE
+        end
+    end
+
+    -- Show how it looks
+    for i=0, 9 do
+        local b1,b2 =  DSM_Ch[i][0], DSM_Ch[i][1]
+        local s1 =  channelType2String(b1,b2)
+        local s = string.format("%s (%02X %02X)  %s\n", MODEL.PORT_TEXT[i],
+                    b1, b2,s1)
+        DSM_Ch[i][2]=s1
+        LOG_write(s) 
+    end
+
+    --MODEL.AirWingTailDesc = string.format("Aircraft(%s) Wing(%s) Tail(%s)",aircraft_type_text[aircraftType],wing_type_text[wingType],tail_type_text[tailType])
+end
+  
+  -- Main Program
+
+  LOG_write("Creating DSMPort Info\n")
+  CreateDSMPortChannelInfo()
+  
+

Lua_scripts/DSMLIB/DsmMainMenuLib.lua

@@ -1,5 +1,5 @@
 local Log, menuLib, modelLib, DEBUG_ON, SIMULATION_ON = ... -- Get DebugON from parameters
-local MAIN_MENU_LIB_VERSION = "0.55"
+local MAIN_MENU_LIB_VERSION = "0.56"
 local MODEL     = modelLib.MODEL
 
 local PHASE     = menuLib.PHASE

Lua_scripts/DSMLIB/DsmMenuLib.lua

@@ -547,7 +547,12 @@ function MenuLib.GetFlightModeValue(line)
         end
     else
         -- No adjustment needed
-        ret=ret..(val + 1)
+        if (val==190) then
+            ret=ret.."Err:Out of Range"
+        else
+            ret=ret..(val + 1)
+        end
+        
     end    
     return ret
 end

Lua_scripts/DSMLIB/DsmModelLib.lua

@@ -31,14 +31,15 @@ local CH_TYPE = {
 
 -- Seems like Reverse Mix is complement of the 3 bits
 local CH_MIX_TYPE = {
-    NORMAL       = 0x00,   -- 0000
-    MIX_AIL_B    = 0x10,   -- 0001 Taileron B
-    MIX_ELE_A    = 0x20,   -- 0010 For VTIAL and Delta-ELEVON A
-    MIX_ELE_B_REV= 0x30,   -- 0011 For VTIAL and Delta-ELEVON B
-    MIX_ELE_B    = 0x40,   -- 0100 For VTIAL and Delta-ELEVON B
-    MIX_ELE_A_REV= 0x50,   -- 0101 For VTIAL and Delta-ELEVON A
-    MIX_AIL_B_REV= 0x60,   -- 0110 Taileron B Rev
-    NORM_REV     = 0x70    -- 0111
+    MIX_NORM     = 0x00,   -- 0000
+    MIX_AIL      = 0x10,   -- 0001 Taileron
+    MIX_ELE      = 0x20,   -- 0010 For VTIAL and Delta-ELEVON
+    MIX_RUD      = 0x30,   -- 0011 For VTIAL
+
+    MIX_RUD_REV  = 0x40,   -- 0100 For VTIAL
+    MIX_ELE_REV  = 0x50,   -- 0101 For VTIAL and Delta-ELEVON A
+    MIX_AIL_REV  = 0x60,   -- 0110 Taileron 
+    MIX_NORM_REV = 0x70    -- 0111
 }
 
 local AIRCRAFT_TYPE = {
@@ -72,8 +73,11 @@ local TAIL_TYPE = {
     VTAIL_B      = 6,  -- 2
     TRAILERON_A  = 7,  -- 3
     TRAILERON_B  = 8,  -- 3
+    TRAILERON_A_R2  = 9,  -- 3
+    TRAILERON_B_R2  = 10  -- 3
 }
-local tail_type_text = {[0]="Rud Only","Normal","Rud + Dual Ele","Dual Rud + Elv","Dual Rud/Ele","VTail A","VTail B","Traileron A","Traileron B"}
+local tail_type_text = {[0]="Rud Only","Normal","Rud + Dual Ele","Dual Rud + Elv","Dual Rud/Ele",
+                        "VTail A","VTail B","Taileron A","Taileron B","Taileron A + 2x Rud","Taileron B + 2x Rud"}
 
 local CH_MODE_TYPE = {
     NORMAL      = 0,
@@ -156,18 +160,18 @@ local MENU_DATA = {}            -- Store the variables used in the Menus.
 
 -- DEFAULT Simple Plane Port configuration (The Configuration tool will overrride this)
 MODEL.DSM_ChannelInfo= {[0]= -- Start array at position 0
-                        {[0]=  CH_MIX_TYPE.NONE, CH_TYPE.THR},    -- Ch1 Thr  (0x40)
-                        {[0]=  CH_MIX_TYPE.NONE, CH_TYPE.AIL},    -- Ch2 Ail  (0x01)
-                        {[0]=  CH_MIX_TYPE.NONE, CH_TYPE.ELE},    -- Ch2 ElE  (0x02)
-                        {[0]=  CH_MIX_TYPE.NONE, CH_TYPE.RUD},    -- Ch4 Rud  (0x04)
-                        {[0]=  CH_MIX_TYPE.NONE, CH_TYPE.NONE},   -- Ch5 Gear (0x00)
-                        {[0]=  CH_MIX_TYPE.NONE, CH_TYPE.NONE},   -- Ch6 Aux1 (0x00)
-                        {[0]=  CH_MIX_TYPE.NONE, CH_TYPE.NONE},   -- Ch7 Aux2 (0x00)
-                        {[0]=  CH_MIX_TYPE.NONE, CH_TYPE.NONE},   -- Ch8 Aux3 (0x00)
-                        {[0]=  CH_MIX_TYPE.NONE, CH_TYPE.NONE},   -- Ch9 Aux4 (0x00)
-                        {[0]=  CH_MIX_TYPE.NONE, CH_TYPE.NONE},   -- Ch10 Aux5 (0x00)
-                        {[0]=  CH_MIX_TYPE.NONE, CH_TYPE.NONE},   -- Ch11 Aux6 (0x00)
-                        {[0]=  CH_MIX_TYPE.NONE, CH_TYPE.NONE}    -- Ch12 Aux7 (0x00)
+                        {[0]=  CH_MIX_TYPE.MIX_NORM, CH_TYPE.THR},    -- Ch1 Thr  (0x40)
+                        {[0]=  CH_MIX_TYPE.MIX_NORM, CH_TYPE.AIL},    -- Ch2 Ail  (0x01)
+                        {[0]=  CH_MIX_TYPE.MIX_NORM, CH_TYPE.ELE},    -- Ch2 ElE  (0x02)
+                        {[0]=  CH_MIX_TYPE.MIX_NORM, CH_TYPE.RUD},    -- Ch4 Rud  (0x04)
+                        {[0]=  CH_MIX_TYPE.MIX_NORM, CH_TYPE.NONE},   -- Ch5 Gear (0x00)
+                        {[0]=  CH_MIX_TYPE.MIX_NORM, CH_TYPE.NONE},   -- Ch6 Aux1 (0x00)
+                        {[0]=  CH_MIX_TYPE.MIX_NORM, CH_TYPE.NONE},   -- Ch7 Aux2 (0x00)
+                        {[0]=  CH_MIX_TYPE.MIX_NORM, CH_TYPE.NONE},   -- Ch8 Aux3 (0x00)
+                        {[0]=  CH_MIX_TYPE.MIX_NORM, CH_TYPE.NONE},   -- Ch9 Aux4 (0x00)
+                        {[0]=  CH_MIX_TYPE.MIX_NORM, CH_TYPE.NONE},   -- Ch10 Aux5 (0x00)
+                        {[0]=  CH_MIX_TYPE.MIX_NORM, CH_TYPE.NONE},   -- Ch11 Aux6 (0x00)
+                        {[0]=  CH_MIX_TYPE.MIX_NORM, CH_TYPE.NONE}    -- Ch12 Aux7 (0x00)
                     }   
 
 function ModelLib.printChannelSummary(a,w,t)
@@ -200,21 +204,24 @@ function ModelLib.channelType2String(byte1, byte2)
     local s = ""
 
     if (byte2==0) then return s end;
-    if (bit32.band(byte2,CH_TYPE.AIL)>0) then s=s.."AIL " end
-    if (bit32.band(byte2,CH_TYPE.ELE)>0) then s=s.."ELE " end
-    if (bit32.band(byte2,CH_TYPE.RUD)>0) then s=s.."RUD " end
-    if (bit32.band(byte2,CH_TYPE.THR)>0) then s=s.."THR " end
-    if (bit32.band(byte2,CH_TYPE.SLAVE)>0) then s=s.."SLAVE " end
-    if (bit32.band(byte2,CH_TYPE.REVERSE)>0) then s=s.."REVERSE " end
+    
+    if (bit32.band(byte2,CH_TYPE.AIL)>0) then s=s.."Ail" end
+    if (bit32.band(byte2,CH_TYPE.ELE)>0) then s=s.."Ele" end
+    if (bit32.band(byte2,CH_TYPE.RUD)>0) then s=s.."Rud" end
+    if (bit32.band(byte2,CH_TYPE.THR)>0) then s=s.."Thr" end
 
-    if (byte1==CH_MIX_TYPE.NORMAL) then s=s.." MIX_NOR" 
-    elseif (byte1==CH_MIX_TYPE.MIX_AIL_B) then s=s.." MIX_AIL_B" 
-    elseif (byte1==CH_MIX_TYPE.MIX_ELE_A) then s=s.." MIX_ELE_A" 
-    elseif (byte1==CH_MIX_TYPE.MIX_ELE_B_REV) then s=s.." MIX_ELE_B_Rev" 
-    elseif (byte1==CH_MIX_TYPE.MIX_ELE_B) then s=s.." MIX_ELE_B" 
-    elseif (byte1==CH_MIX_TYPE.MIX_ELE_A_REV) then s=s.." MIX_ELE_A_Rev" 
-    elseif (byte1==CH_MIX_TYPE.MIX_AIL_B_REV) then s=s.." MIX_AIL_B_Rev" 
-    elseif (byte1==CH_MIX_TYPE.NORM_REV) then s=s.." MIX_NOR_Rev" 
+    if (bit32.band(byte2,CH_TYPE.REVERSE)>0) then s=s.."-" end
+
+    if (bit32.band(byte2,CH_TYPE.SLAVE)>0) then s=s.." Slv" end
+
+    if (byte1==CH_MIX_TYPE.MIX_NORM) then s=s.." " 
+    elseif (byte1==CH_MIX_TYPE.MIX_AIL) then s=s.." M_Ail" 
+    elseif (byte1==CH_MIX_TYPE.MIX_ELE) then s=s.." M_Ele" 
+    elseif (byte1==CH_MIX_TYPE.MIX_RUD) then s=s.." M_Rud" 
+    elseif (byte1==CH_MIX_TYPE.MIX_RUD_REV) then s=s.." M_Rud-" 
+    elseif (byte1==CH_MIX_TYPE.MIX_ELE_REV) then s=s.." M_Ele-" 
+    elseif (byte1==CH_MIX_TYPE.MIX_AIL_REV) then s=s.." M_Ail-" 
+    elseif (byte1==CH_MIX_TYPE.MIX_NORM_REV) then s=s.." M-" 
     end
 
     return s;
@@ -257,7 +264,7 @@ function ModelLib.ReadTxModelData()
   MODEL.modelName = table.name
 
   local module = model.getModule(0) -- Internal
-  if (module==nil) then module = model.getModule(1) end -- External
+  if (module==nil or module.Type~=6) then module = model.getModule(1) end -- External
   if (module~=nil) then
       if (module.Type==6 ) then -- MULTI-MODULE
           local chOrder = module.channelsOrder
@@ -307,11 +314,7 @@ function ModelLib.ReadTxModelData()
       local ch =  MODEL.modelOutputChannel[i]
       if (ch~=nil) then
           MODEL.TX_CH_TEXT[i] = ch.formatCh
-          if LCD_W <= 128 then -- SMALLER SCREENS
-              MODEL.PORT_TEXT[i] = string.format("P%i (%s) ",i+1,MODEL.TX_CH_TEXT[i])
-          else
-              MODEL.PORT_TEXT[i] = string.format("Port%i (%s) ",i+1,MODEL.TX_CH_TEXT[i])
-          end
+          MODEL.PORT_TEXT[i] = string.format("P%i (%s) ",i+1,MODEL.TX_CH_TEXT[i])
           
           Log.LOG_write("Port%d %s [%d,%d] Rev=%d, Off=%d, ppmC=%d, syn=%d\n",i+1,MODEL.TX_CH_TEXT[i],math.floor(ch.min/10),math.floor(ch.max/10), ch.revert, ch.offset, ch.ppmCenter, ch.symetrical)
       end
@@ -343,6 +346,11 @@ end
 function ModelLib.ST_LoadFileData() 
     local fname = ModelLib.hashName(MODEL.modelName)..".txt"
 
+    -- Clear Menu Data
+    for i = 0, MEMU_VAR.DATA_END do
+        MENU_DATA[i]=nil
+    end
+
     print("Loading File:"..fname)
 
     local dataFile = io.open(DATA_PATH .. "/".. fname, "r")  -- read File 
@@ -401,60 +409,45 @@ end
 function ModelLib.CreateDSMPortChannelInfo()
     local function ApplyWingMixA(b2)
         -- ELEVON
-        if (b2==CH_TYPE.AIL+CH_TYPE.ELE) then return CH_MIX_TYPE.MIX_ELE_A end; -- 0x03
-        if (b2==CH_TYPE.AIL+CH_TYPE.ELE+CH_TYPE.REVERSE) then return CH_MIX_TYPE.MIX_ELE_A_REV end; -- 0x23
-       
-       -- Default normal/reverse behaviour 
-        if (b2==CH_TYPE.AIL+CH_TYPE.ELE+CH_TYPE.SLAVE) then return CH_MIX_TYPE.NORMAL end; -- 0x83
-        if (b2==CH_TYPE.AIL+CH_TYPE.ELE+CH_TYPE.SLAVE+CH_TYPE.REVERSE) then return CH_MIX_TYPE.NORM_REV end; -- 0xA3
+        if (b2==CH_TYPE.AIL+CH_TYPE.ELE) then return CH_MIX_TYPE.MIX_ELE end; -- 0x03
+        if (b2==CH_TYPE.AIL+CH_TYPE.ELE+CH_TYPE.SLAVE) then return CH_MIX_TYPE.MIX_NORM end; -- 0x83
     end
 
     local function ApplyWingMixB(b2)
         -- ELEVON 
-        -- Default normal/reverse behaviour 
-        if (b2==CH_TYPE.AIL+CH_TYPE.ELE) then return CH_MIX_TYPE.NORMAL end; -- 0x03
-        if (b2==CH_TYPE.AIL+CH_TYPE.ELE+CH_TYPE.REVERSE) then return CH_MIX_TYPE.NORM_REV end; -- 0x23
-
-        -- Difference with B 
-        if (b2==CH_TYPE.AIL+CH_TYPE.ELE+CH_TYPE.SLAVE) then return CH_MIX_TYPE.MIX_ELE_A end; -- 0x83
-        if (b2==CH_TYPE.AIL+CH_TYPE.ELE+CH_TYPE.SLAVE+CH_TYPE.REVERSE) then return CH_MIX_TYPE.MIX_ELE_A_REV  end; -- 0xA3
+        if (b2==CH_TYPE.AIL+CH_TYPE.ELE) then return CH_MIX_TYPE.MIX_NORM end; -- 0x03
+        if (b2==CH_TYPE.AIL+CH_TYPE.ELE+CH_TYPE.SLAVE) then return CH_MIX_TYPE.MIX_ELE end; -- 0x83
    end
 
     local function ApplyTailMixA(b2)
         -- VTAIL
         -- Default normal/reverse behaviour 
-        if (b2==CH_TYPE.RUD+CH_TYPE.ELE) then return CH_MIX_TYPE.NORMAL end; -- 0x06
-        if (b2==CH_TYPE.RUD+CH_TYPE.ELE+CH_TYPE.REVERSE) then return CH_MIX_TYPE.NORM_REV end; -- 0x26
-
-        if (b2==CH_TYPE.RUD+CH_TYPE.ELE+CH_TYPE.SLAVE) then return CH_MIX_TYPE.MIX_ELE_A end; -- 0x86
-        if (b2==CH_TYPE.RUD+CH_TYPE.ELE+CH_TYPE.SLAVE+CH_TYPE.REVERSE) then return CH_MIX_TYPE.MIX_ELE_A_REV  end; -- 0xA6
+        if (b2==CH_TYPE.RUD+CH_TYPE.ELE) then return CH_MIX_TYPE.MIX_NORM end; -- 0x06
+        if (b2==CH_TYPE.RUD+CH_TYPE.ELE+CH_TYPE.SLAVE) then return CH_MIX_TYPE.MIX_ELE end; -- 0x86
 
         --TAILERON
-         -- Default normal/reverse behaviour 
-        if (b2==CH_TYPE.AIL+CH_TYPE.ELE) then return CH_MIX_TYPE.NORMAL end; -- 0x03
-        if (b2==CH_TYPE.AIL+CH_TYPE.ELE+CH_TYPE.REVERSE) then return CH_MIX_TYPE.NORM_REV end; -- 0x23
-
-        if (b2==CH_TYPE.AIL+CH_TYPE.ELE+CH_TYPE.SLAVE) then return CH_MIX_TYPE.MIX_AIL_B end; -- 0x83
-        if (b2==CH_TYPE.AIL+CH_TYPE.ELE+CH_TYPE.SLAVE+CH_TYPE.REVERSE) then return CH_MIX_TYPE.MIX_AIL_B_REV end; -- 0xA3
-
+        -- Default normal/reverse behaviour 
+        if (b2==CH_TYPE.AIL+CH_TYPE.ELE) then return CH_MIX_TYPE.MIX_NORM end; -- 0x03
+        if (b2==CH_TYPE.AIL+CH_TYPE.ELE+CH_TYPE.SLAVE) then return CH_MIX_TYPE.MIX_AIL end; -- 0x83
     end
 
     local function ApplyTailMixB(b2)
         -- VTAIL 
         -- Default normal/reverse behaviour 
-        if (b2==CH_TYPE.RUD+CH_TYPE.ELE) then return CH_MIX_TYPE.NORMAL end; -- 0x06
-        if (b2==CH_TYPE.RUD+CH_TYPE.ELE+CH_TYPE.REVERSE) then return CH_MIX_TYPE.NORM_REV end; -- 0x26
-
-        if (b2==CH_TYPE.RUD+CH_TYPE.ELE+CH_TYPE.SLAVE) then return CH_MIX_TYPE.MIX_ELE_B end; -- 0x86
-        if (b2==CH_TYPE.RUD+CH_TYPE.ELE+CH_TYPE.SLAVE+CH_TYPE.REVERSE) then return CH_MIX_TYPE.MIX_ELE_B_REV end; -- 0xA6
+        if (b2==CH_TYPE.RUD+CH_TYPE.ELE) then return CH_MIX_TYPE.MIX_NORM end; -- 0x06
+        if (b2==CH_TYPE.RUD+CH_TYPE.ELE+CH_TYPE.SLAVE) then return CH_MIX_TYPE.MIX_RUD end; -- 0x86
 
         --TAILERON
-        if (b2==CH_TYPE.AIL+CH_TYPE.ELE) then return CH_MIX_TYPE.MIX_AIL_B end; -- 0x03
-        if (b2==CH_TYPE.AIL+CH_TYPE.ELE+CH_TYPE.REVERSE) then return CH_MIX_TYPE.MIX_AIL_B_REV end; -- 0x23
+        if (b2==CH_TYPE.AIL+CH_TYPE.ELE) then return CH_MIX_TYPE.MIX_AIL end; -- 0x03
+        if (b2==CH_TYPE.AIL+CH_TYPE.ELE+CH_TYPE.SLAVE) then return CH_MIX_TYPE.MIX_NORM end; -- 0x83
+    end
 
-        -- Default normal/reverse behaviour 
-        if (b2==CH_TYPE.AIL+CH_TYPE.ELE+CH_TYPE.SLAVE) then return CH_MIX_TYPE.NORMAL end; -- 0x83
-        if (b2==CH_TYPE.AIL+CH_TYPE.ELE+CH_TYPE.SLAVE+CH_TYPE.REVERSE) then return CH_MIX_TYPE.NORM_REV end; -- 0xA3
+    local function reverseMix(b)
+        if (b==CH_MIX_TYPE.MIX_NORM) then return CH_MIX_TYPE.MIX_NORM_REV end;
+        if (b==CH_MIX_TYPE.MIX_AIL) then return CH_MIX_TYPE.MIX_AIL_REV end;
+        if (b==CH_MIX_TYPE.MIX_ELE) then return CH_MIX_TYPE.MIX_ELE_REV end;
+        if (b==CH_MIX_TYPE.MIX_RUD) then return CH_MIX_TYPE.MIX_RUD_REV end;
+        return b
     end
 
 
@@ -462,7 +455,7 @@ function ModelLib.CreateDSMPortChannelInfo()
     local DSM_ChannelInfo = MODEL.DSM_ChannelInfo 
 
     for i=0, TX_CHANNELS-1 do
-        DSM_ChannelInfo[i] = {[0]= 0x00, CH_TYPE.NONE} -- Initialize with no special function 
+        DSM_ChannelInfo[i] = {[0]= CH_MIX_TYPE.MIX_NORM, CH_TYPE.NONE} -- Initialize with no special function 
     end
 
     local aircraftType = MENU_DATA[MEMU_VAR.AIRCRAFT_TYPE]
@@ -484,7 +477,7 @@ function ModelLib.CreateDSMPortChannelInfo()
     -- Channels in menu vars are Zero base, Channel info is 1 based 
     
     -- THR 
-    if (thrCh~=nil) then DSM_ChannelInfo[thrCh][1]= CH_TYPE.THR end
+    if (thrCh~=nil and thrCh < 10) then DSM_ChannelInfo[thrCh][1]= CH_TYPE.THR end
 
     -- AIL (Left and Right)
     if (lAilCh~=nil) then DSM_ChannelInfo[lAilCh][1] = CH_TYPE.AIL  end
@@ -497,59 +490,36 @@ function ModelLib.CreateDSMPortChannelInfo()
     if (rRudCh~=nil) then DSM_ChannelInfo[rRudCh][1] = CH_TYPE.RUD+CH_TYPE.SLAVE end
 
     -- VTAIL: RUD + ELE
-    if (tailType==TAIL_TYPE.VTAIL_A) then 
+    if (tailType==TAIL_TYPE.VTAIL_A or tailType==TAIL_TYPE.VTAIL_B) then 
         DSM_ChannelInfo[lElevCh][1] = CH_TYPE.RUD+CH_TYPE.ELE
         DSM_ChannelInfo[rElevCh][1] = CH_TYPE.RUD+CH_TYPE.ELE+CH_TYPE.SLAVE
-    elseif (tailType==TAIL_TYPE.VTAIL_B) then
-        DSM_ChannelInfo[lElevCh][1] = CH_TYPE.RUD+CH_TYPE.ELE+CH_TYPE.SLAVE
-        DSM_ChannelInfo[rElevCh][1] = CH_TYPE.RUD+CH_TYPE.ELE
     end
 
-    -- TRAILERRON: 2-ELE + AIL
-    if (tailType==TAIL_TYPE.TRAILERON_A) then 
+    -- TAILERRON: 2-ELE + AIL
+    if (tailType==TAIL_TYPE.TRAILERON_A or tailType==TAIL_TYPE.TRAILERON_A_R2 or
+        tailType==TAIL_TYPE.TRAILERON_B or tailType==TAIL_TYPE.TRAILERON_B_R2) then 
         DSM_ChannelInfo[lElevCh][1] = CH_TYPE.AIL+CH_TYPE.ELE
         DSM_ChannelInfo[rElevCh][1] = CH_TYPE.AIL+CH_TYPE.ELE+CH_TYPE.SLAVE
-    elseif (tailType==TAIL_TYPE.TRAILERON_B) then
-        DSM_ChannelInfo[lElevCh][1] = CH_TYPE.AIL+CH_TYPE.ELE+CH_TYPE.SLAVE
-        DSM_ChannelInfo[rElevCh][1] = CH_TYPE.AIL+CH_TYPE.ELE
     end
 
     ---- ELEVON :  AIL + ELE 
-    if (wingType==WING_TYPE.ELEVON_A) then 
-        DSM_ChannelInfo[lAilCh][1] = CH_TYPE.AIL+CH_TYPE.ELE
-        DSM_ChannelInfo[rAilCh][1] = CH_TYPE.AIL+CH_TYPE.ELE+CH_TYPE.SLAVE
-    elseif (wingType==WING_TYPE.ELEVON_B) then
+    if (wingType==WING_TYPE.ELEVON_A or wingType==WING_TYPE.ELEVON_B) then 
         DSM_ChannelInfo[lAilCh][1] = CH_TYPE.AIL+CH_TYPE.ELE
         DSM_ChannelInfo[rAilCh][1] = CH_TYPE.AIL+CH_TYPE.ELE+CH_TYPE.SLAVE
     end
 
-    -- Apply Gyro Reverse as needed for each channel as long as it is used 
-    for i=0, TX_CHANNELS-1 do
-        if (MENU_DATA[MEMU_VAR.PORT_BASE+i]==CH_MODE_TYPE.REVERSE and DSM_ChannelInfo[i][1]>0) then
-            DSM_ChannelInfo[i][0]=DSM_ChannelInfo[i][1]+CH_MIX_TYPE.NORM_REV -- ALL REVERSE is 0x70 for normal
-            DSM_ChannelInfo[i][1]=DSM_ChannelInfo[i][1]+CH_TYPE.REVERSE
-        end
-    end
+    ------MIXES ---------
 
-    -- VTAIL: RUD + ELE
-    if (tailType==TAIL_TYPE.VTAIL_A) then 
+    -- TAIL Mixes (Elevator and VTail)
+    if (tailType==TAIL_TYPE.VTAIL_A or tailType==TAIL_TYPE.TRAILERON_A or tailType==TAIL_TYPE.TRAILERON_A_R2) then 
+        DSM_ChannelInfo[lElevCh][0] = ApplyTailMixA(DSM_ChannelInfo[lElevCh][1])
+        DSM_ChannelInfo[rElevCh][0] = ApplyTailMixA(DSM_ChannelInfo[rElevCh][1])
+    elseif (tailType==TAIL_TYPE.VTAIL_B or tailType==TAIL_TYPE.TRAILERON_B or tailType==TAIL_TYPE.TRAILERON_B_R2) then 
         DSM_ChannelInfo[lElevCh][0] = ApplyTailMixA(DSM_ChannelInfo[lElevCh][1])
         DSM_ChannelInfo[rElevCh][0] = ApplyTailMixA(DSM_ChannelInfo[rElevCh][1])
-    elseif (tailType==TAIL_TYPE.VTAIL_B) then
-        DSM_ChannelInfo[lElevCh][0] = ApplyTailMixB(DSM_ChannelInfo[lElevCh][1])
-        DSM_ChannelInfo[rElevCh][0] = ApplyTailMixB(DSM_ChannelInfo[rElevCh][1])
     end
 
-    -- TRAILERRON: ELE + AIL
-    if (tailType==TAIL_TYPE.TRAILERON_A) then 
-        DSM_ChannelInfo[lElevCh][1] = ApplyTailMixA(DSM_ChannelInfo[lElevCh][1])
-        DSM_ChannelInfo[rElevCh][1] = ApplyTailMixA(DSM_ChannelInfo[rElevCh][1])
-    elseif (tailType==TAIL_TYPE.TRAILERON_B) then
-        DSM_ChannelInfo[lElevCh][1] = ApplyTailMixB(DSM_ChannelInfo[lElevCh][1])
-        DSM_ChannelInfo[rElevCh][1] = ApplyTailMixB(DSM_ChannelInfo[rElevCh][1])
-    end
-
-     ---- ELEVON :  AIL + ELE 
+     ---- Wing Mixes 
      if (wingType==WING_TYPE.ELEVON_A) then 
         DSM_ChannelInfo[lAilCh][0] = ApplyWingMixA(DSM_ChannelInfo[lAilCh][1])
         DSM_ChannelInfo[rAilCh][0] = ApplyWingMixA(DSM_ChannelInfo[rAilCh][1])
@@ -558,6 +528,14 @@ function ModelLib.CreateDSMPortChannelInfo()
         DSM_ChannelInfo[rAilCh][0] = ApplyWingMixB(DSM_ChannelInfo[rAilCh][1])
     end
 
+    -- Apply Gyro Reverse as needed for each channel as long as it is used 
+    for i=0, TX_CHANNELS-1 do
+        if (MENU_DATA[MEMU_VAR.PORT_BASE+i]==CH_MODE_TYPE.REVERSE and DSM_ChannelInfo[i][1]>0) then
+            DSM_ChannelInfo[i][0]=reverseMix(DSM_ChannelInfo[i][0])
+            DSM_ChannelInfo[i][1]=DSM_ChannelInfo[i][1]+CH_TYPE.REVERSE
+        end
+    end
+
     -- Show how it looks
     for i=0, 9 do
         local b1,b2 =  DSM_ChannelInfo[i][0], DSM_ChannelInfo[i][1]
@@ -618,7 +596,8 @@ function ModelLib.ST_PlaneWingInit(wingType)
 end
 
 function ModelLib.ST_PlaneTailInit(tailType) 
-    if (MENU_DATA[MEMU_VAR.WING_TYPE]==WING_TYPE.ELEVON_A) then
+    if (MENU_DATA[MEMU_VAR.WING_TYPE]==WING_TYPE.ELEVON_A or
+        MENU_DATA[MEMU_VAR.WING_TYPE]==WING_TYPE.ELEVON_B) then
         tailType = TAIL_TYPE.RUD_1 -- Delta only have ruder  
     end
 
@@ -643,29 +622,29 @@ function ModelLib.ST_PlaneTailInit(tailType)
         MENU_DATA[MEMU_VAR.CH_L_RUD] = PORT.PORT4
     elseif (tailType == TAIL_TYPE.RUD_2_ELEV_1) then
         MENU_DATA[MEMU_VAR.CH_L_ELE] = PORT.PORT3
-        MENU_DATA[MEMU_VAR.CH_L_RUD] = PORT.PORT5
-        MENU_DATA[MEMU_VAR.CH_R_RUD] = PORT.PORT4
+        MENU_DATA[MEMU_VAR.CH_L_RUD] = PORT.PORT4
+        MENU_DATA[MEMU_VAR.CH_R_RUD] = PORT.PORT5
     elseif (tailType == TAIL_TYPE.RUD_2_ELEV_2) then
         MENU_DATA[MEMU_VAR.CH_L_ELE] = PORT.PORT5
         MENU_DATA[MEMU_VAR.CH_R_ELE] = PORT.PORT3
-        MENU_DATA[MEMU_VAR.CH_L_RUD] = PORT.PORT6
-        MENU_DATA[MEMU_VAR.CH_R_RUD] = PORT.PORT4
-    elseif (tailType == TAIL_TYPE.VTAIL_A) then
-        MENU_DATA[MEMU_VAR.CH_L_ELE]  = PORT.PORT4
+        MENU_DATA[MEMU_VAR.CH_L_RUD] = PORT.PORT4
+        MENU_DATA[MEMU_VAR.CH_R_RUD] = PORT.PORT6
+    elseif (tailType == TAIL_TYPE.VTAIL_A or tailType == TAIL_TYPE.VTAIL_B) then
+        MENU_DATA[MEMU_VAR.CH_L_ELE] = PORT.PORT4
         MENU_DATA[MEMU_VAR.CH_R_ELE] = PORT.PORT3
-    elseif (tailType == TAIL_TYPE.VTAIL_B) then
-        MENU_DATA[MEMU_VAR.CH_L_ELE]   = PORT.PORT3
-        MENU_DATA[MEMU_VAR.CH_R_ELE]  = PORT.PORT4
-    elseif (tailType == TAIL_TYPE.TRAILERON_A) then
-        MENU_DATA[MEMU_VAR.CH_L_ELE]  = PORT.PORT5
+    elseif (tailType == TAIL_TYPE.TRAILERON_A or tailType==TAIL_TYPE.TRAILERON_A_R2 or
+            tailType == TAIL_TYPE.TRAILERON_B or tailType==TAIL_TYPE.TRAILERON_B_R2) then
+        MENU_DATA[MEMU_VAR.CH_L_RUD] = PORT.PORT4
+        MENU_DATA[MEMU_VAR.CH_L_ELE] = PORT.PORT5
         MENU_DATA[MEMU_VAR.CH_R_ELE] = PORT.PORT3
-    elseif (tailType == TAIL_TYPE.TRAILERON_B) then
-        MENU_DATA[MEMU_VAR.CH_L_ELE]   = PORT.PORT5
-        MENU_DATA[MEMU_VAR.CH_R_ELE]  = PORT.PORT3
     else -- Assume Normal 
         print("ERROR:invalid Tail Type")
     end
 
+    if (tailType == TAIL_TYPE.TRAILERON_A_R2 or tailType==TAIL_TYPE.TRAILERON_B_R2) then
+        MENU_DATA[MEMU_VAR.CH_R_RUD] = PORT.PORT7
+    end
+
     ModelLib.printChannelSummary()
 end
 
@@ -732,11 +711,11 @@ function ModelLib.ST_GliderTailInit(tailType)
         MENU_DATA[MEMU_VAR.CH_L_ELE] = PORT.PORT3
         MENU_DATA[MEMU_VAR.CH_L_RUD] = PORT.PORT4
     elseif (tailType == TAIL_TYPE.VTAIL_A) then
-        MENU_DATA[MEMU_VAR.CH_L_ELE]  = PORT.PORT4
+        MENU_DATA[MEMU_VAR.CH_L_ELE] = PORT.PORT4
         MENU_DATA[MEMU_VAR.CH_R_ELE] = PORT.PORT3
     elseif (tailType == TAIL_TYPE.VTAIL_B) then
-        MENU_DATA[MEMU_VAR.CH_L_ELE]   = PORT.PORT3
-        MENU_DATA[MEMU_VAR.CH_R_ELE]  = PORT.PORT4
+        MENU_DATA[MEMU_VAR.CH_L_ELE] = PORT.PORT3
+        MENU_DATA[MEMU_VAR.CH_R_ELE] = PORT.PORT4
     else -- Assume Normal 
         print("ERROR: Invalid Tail Type")
     end

Lua_scripts/DSMLIB/DsmSetupMenuLib.lua

@@ -24,7 +24,7 @@
 ------------------------------------------------------------------------------
 
 local Log, menuLib, modelLib, DEBUG_ON, SIMULATION_ON = ... -- Get DebugON from parameters
-local SETUP_LIB_VERSION = "0.55"
+local SETUP_LIB_VERSION = "0.56"
 
 local DATA_PATH = modelLib.DATA_PATH
 
@@ -53,26 +53,61 @@ local currWingType = -1         -- Current TailType selected, and to detect chan
 local menuDataChanged = false   -- Flag to notify if any data has changed
 
 
+local function tailTypeCompatible(a,b)
 
+    local function normalize(tt)
+      if (tt==TAIL_TYPE.TRAILERON_A or tt==TAIL_TYPE.TRAILERON_B) then 
+        return TAIL_TYPE.TRAILERON_A
+    elseif (tt==TAIL_TYPE.TRAILERON_A_R2 or tt==TAIL_TYPE.TRAILERON_B_R2) then 
+        return TAIL_TYPE.TRAILERON_A_R2  
+      elseif (tt==TAIL_TYPE.VTAIL_A or tt==TAIL_TYPE.VTAIL_B) then
+        return TAIL_TYPE.VTAIL_A
+      else
+        return tt
+      end
+    end
+  
+    return (normalize(a)==normalize(b))
+  end
 
 
 -- Creates the menus to Render with the GUI
 local function ST_LoadMenu(menuId)
     local ctx = menuLib.DSM_Context
 
-    local function formatTXRevert(port)
-        if  (MODEL.modelOutputChannel[port].revert==0) then
-            return " (Tx:"..menuLib.Get_List_Text(300+CH_MODE_TYPE.NORMAL)..")"
-        else
-            return " (Tx:"..menuLib.Get_List_Text(300+CH_MODE_TYPE.REVERSE)..")"
+    local function portUse(p)
+        local out = "" 
+        if p==MENU_DATA[MEMU_VAR.CH_THR] then out = "Thr"
+        elseif p == MENU_DATA[MEMU_VAR.CH_L_AIL] then 
+            out=(MENU_DATA[MEMU_VAR.CH_R_AIL] and "Ail_L") or "Ail"
+        elseif p == MENU_DATA[MEMU_VAR.CH_R_AIL] then out="Ail_R"
+        elseif p == MENU_DATA[MEMU_VAR.CH_L_ELE] then 
+            out=(MENU_DATA[MEMU_VAR.CH_R_ELE] and "Ele_L") or "Ele"
+        elseif p == MENU_DATA[MEMU_VAR.CH_R_ELE] then out="Ele_R"
+        elseif p == MENU_DATA[MEMU_VAR.CH_L_RUD] then 
+            out=(MENU_DATA[MEMU_VAR.CH_R_RUD] and "Rud_L") or "Rud"
+        elseif p == MENU_DATA[MEMU_VAR.CH_R_RUD] then out="Rud_R"
+        elseif p == MENU_DATA[MEMU_VAR.CH_L_FLP] then 
+            out=(MENU_DATA[MEMU_VAR.CH_R_FLP] and "Flp_L") or "Flp"
+        elseif p == MENU_DATA[MEMU_VAR.CH_R_FLP] then out="Flp_R"
         end
+        return out
+    end
+
+    local function formatTXRevert(port)
+        local out = " " .. modelLib.channelType2String(MODEL.DSM_ChannelInfo[port][0], MODEL.DSM_ChannelInfo[port][1]);
+        return out
+    end
+
+    local function Header(p)
+        return MODEL.PORT_TEXT[p].." "..portUse(p)
     end
 
     menuLib.clearMenuLines()
 
     
     if (menuId==0x1000) then -- MAIN MENU
-        ctx.Menu = { MenuId = 0x1000, Text = "Save-Exit ("..MODEL.modelName..")", PrevId = 0, NextId = 0, BackId = 0xFFF9, TextId=0 }
+        ctx.Menu = { MenuId = 0x1000, Text = "Save-Exit ("..MODEL.modelName..")", PrevId = 0, NextId = 0, BackId = 0, TextId=0 }
        
         if (true) then
             ctx.MenuLines[4] = { Type = LINE_TYPE.MENU, Text="Save Changes", TextId = 0, ValId = 0x1005 }
@@ -128,6 +163,7 @@ local function ST_LoadMenu(menuId)
         ctx.SelLine = 6
         lastGoodMenu = menuId
     elseif (menuId==0x1010) then
+        modelLib.printChannelSummary()
         ctx.Menu = { MenuId = 0x1010, Text = "Aircraft Type", PrevId = 0, NextId = 0x1011, BackId = 0x1001, TextId=0 }
         ctx.MenuLines[5] = { Type = LINE_TYPE.LIST_MENU_NC, Text="Aircraft Type", TextId = 0, ValId = MEMU_VAR.AIRCRAFT_TYPE, Min=50, Max=53, Def=50, Val=MENU_DATA[MEMU_VAR.AIRCRAFT_TYPE] }
         ctx.SelLine = 5
@@ -135,7 +171,7 @@ local function ST_LoadMenu(menuId)
     elseif (menuId==0x1011) then
         ctx.Menu = { MenuId = 0x1011, Text = "Model Type:"..modelLib.aircraft_type_text[currAircraftType], PrevId = 0, NextId = 0x1020, BackId = 0x1010, TextId=0 }
         ctx.MenuLines[5] = { Type = LINE_TYPE.LIST_MENU_NC, Text="Wing Type", TextId = 0, ValId = MEMU_VAR.WING_TYPE, Min=100, Max=107, Def=100, Val=MENU_DATA[MEMU_VAR.WING_TYPE] }
-        ctx.MenuLines[6] = { Type = LINE_TYPE.LIST_MENU_NC, Text="Tail Type", TextId = 0, ValId = MEMU_VAR.TAIL_TYPE, Min=200, Max=208, Def=200, Val=MENU_DATA[MEMU_VAR.TAIL_TYPE] }
+        ctx.MenuLines[6] = { Type = LINE_TYPE.LIST_MENU_NC, Text="Tail Type", TextId = 0, ValId = MEMU_VAR.TAIL_TYPE, Min=200, Max=210, Def=200, Val=MENU_DATA[MEMU_VAR.TAIL_TYPE] }
         ctx.SelLine = 5
         lastGoodMenu = menuId
     elseif (menuId==0x1020) then
@@ -159,7 +195,7 @@ local function ST_LoadMenu(menuId)
 
         ctx.Menu = { MenuId = 0x1020, Text = title, PrevId = 0, NextId = 0x1021, BackId = 0x1011, TextId=0 }
 
-        ctx.MenuLines[0] = { Type = LINE_TYPE.LIST_MENU_NC, Text=thrText, TextId = 0, ValId = MEMU_VAR.CH_THR, Min=0, Max=9, Def=0, Val= thr }
+        ctx.MenuLines[0] = { Type = LINE_TYPE.LIST_MENU_NC, Text=thrText, TextId = 0, ValId = MEMU_VAR.CH_THR, Min=0, Max=10, Def=0, Val= thr }
 
         ctx.MenuLines[2] = { Type = LINE_TYPE.LIST_MENU_NC, Text=leftAilText, TextId = 0, ValId = MEMU_VAR.CH_L_AIL, Min=0, Max=9, Def=0, Val= leftAil }
 
@@ -174,7 +210,7 @@ local function ST_LoadMenu(menuId)
             ctx.MenuLines[5] = { Type = LINE_TYPE.LIST_MENU_NC, Text=rightFlapText, TextId = 0, ValId = MEMU_VAR.CH_R_FLP, Min=0, Max=9, Def=0, Val= rightFlap }
         end
 
-        ctx.SelLine = 1
+        ctx.SelLine = 0
         lastGoodMenu = menuId
 
     elseif (menuId==0x1021) then
@@ -216,14 +252,15 @@ local function ST_LoadMenu(menuId)
         lastGoodMenu = menuId
    
     elseif (menuId==0x1030) then
+        modelLib.CreateDSMPortChannelInfo()
         modelLib.printChannelSummary()
         
         ctx.Menu = { MenuId = 0x1030, Text = "Gyro Channel Reverse (Port 1-5)", PrevId = 0, NextId = 0x1031, BackId = 0x1001, TextId=0 }
-        ctx.MenuLines[0] = { Type = LINE_TYPE.LIST_MENU_NC, Text=MODEL.PORT_TEXT[PORT.PORT1], TextId = 0, ValId = MEMU_VAR.PORT1_MODE, Min=300, Max=301, Def=300, Val=MENU_DATA[MEMU_VAR.PORT1_MODE], Format = formatTXRevert(PORT.PORT1) }
-        ctx.MenuLines[1] = { Type = LINE_TYPE.LIST_MENU_NC, Text=MODEL.PORT_TEXT[PORT.PORT2], TextId = 0, ValId = MEMU_VAR.PORT2_MODE, Min=300, Max=301, Def=300, Val=MENU_DATA[MEMU_VAR.PORT2_MODE], Format = formatTXRevert(PORT.PORT2) }
-        ctx.MenuLines[2] = { Type = LINE_TYPE.LIST_MENU_NC, Text=MODEL.PORT_TEXT[PORT.PORT3], TextId = 0, ValId = MEMU_VAR.PORT3_MODE, Min=300, Max=301, Def=300, Val=MENU_DATA[MEMU_VAR.PORT3_MODE], Format = formatTXRevert(PORT.PORT3) }
-        ctx.MenuLines[3] = { Type = LINE_TYPE.LIST_MENU_NC, Text=MODEL.PORT_TEXT[PORT.PORT4], TextId = 0, ValId = MEMU_VAR.PORT4_MODE, Min=300, Max=301, Def=300, Val=MENU_DATA[MEMU_VAR.PORT4_MODE], Format = formatTXRevert(PORT.PORT4) }
-        ctx.MenuLines[4] = { Type = LINE_TYPE.LIST_MENU_NC, Text=MODEL.PORT_TEXT[PORT.PORT5], TextId = 0, ValId = MEMU_VAR.PORT5_MODE, Min=300, Max=301, Def=300, Val=MENU_DATA[MEMU_VAR.PORT5_MODE], Format = formatTXRevert(PORT.PORT5) }
+        ctx.MenuLines[0] = { Type = LINE_TYPE.LIST_MENU_NC, Text=Header(PORT.PORT1), TextId = 0, ValId = MEMU_VAR.PORT1_MODE, Min=300, Max=301, Def=300, Val=MENU_DATA[MEMU_VAR.PORT1_MODE], Format = formatTXRevert(PORT.PORT1) }
+        ctx.MenuLines[1] = { Type = LINE_TYPE.LIST_MENU_NC, Text=Header(PORT.PORT2), TextId = 0, ValId = MEMU_VAR.PORT2_MODE, Min=300, Max=301, Def=300, Val=MENU_DATA[MEMU_VAR.PORT2_MODE], Format = formatTXRevert(PORT.PORT2) }
+        ctx.MenuLines[2] = { Type = LINE_TYPE.LIST_MENU_NC, Text=Header(PORT.PORT3), TextId = 0, ValId = MEMU_VAR.PORT3_MODE, Min=300, Max=301, Def=300, Val=MENU_DATA[MEMU_VAR.PORT3_MODE], Format = formatTXRevert(PORT.PORT3) }
+        ctx.MenuLines[3] = { Type = LINE_TYPE.LIST_MENU_NC, Text=Header(PORT.PORT4), TextId = 0, ValId = MEMU_VAR.PORT4_MODE, Min=300, Max=301, Def=300, Val=MENU_DATA[MEMU_VAR.PORT4_MODE], Format = formatTXRevert(PORT.PORT4) }
+        ctx.MenuLines[4] = { Type = LINE_TYPE.LIST_MENU_NC, Text=Header(PORT.PORT5), TextId = 0, ValId = MEMU_VAR.PORT5_MODE, Min=300, Max=301, Def=300, Val=MENU_DATA[MEMU_VAR.PORT5_MODE], Format = formatTXRevert(PORT.PORT5) }
 
         ctx.MenuLines[5] = { Type = LINE_TYPE.MENU, Text="Only Thr/Ail/Rud/Ele. This affects AS3X/SAFE reaction dir./b", TextId = 0, ValId = 0x1030 }
         ctx.MenuLines[6] = { Type = LINE_TYPE.MENU, Text="Any changes, use RX 'Relearn Servo Settings'/b", TextId = 0, ValId = 0x1030 }
@@ -231,13 +268,14 @@ local function ST_LoadMenu(menuId)
         ctx.SelLine = 0
         lastGoodMenu = menuId
     elseif (menuId==0x1031) then
+        modelLib.CreateDSMPortChannelInfo()
         modelLib.printChannelSummary()
         ctx.Menu = { MenuId = 0x1031, Text = "Gyro Channel Reverse (Port 6-10)", PrevId = 0x1030, NextId = 0, BackId = 0x1001, TextId=0 }
-        ctx.MenuLines[0] = { Type = LINE_TYPE.LIST_MENU_NC, Text=MODEL.PORT_TEXT[PORT.PORT6], TextId = 0, ValId = MEMU_VAR.PORT6_MODE, Min=300, Max=301, Def=300, Val=MENU_DATA[MEMU_VAR.PORT6_MODE], Format = formatTXRevert(PORT.PORT6) }
-        ctx.MenuLines[1] = { Type = LINE_TYPE.LIST_MENU_NC, Text=MODEL.PORT_TEXT[PORT.PORT7], TextId = 0, ValId = MEMU_VAR.PORT7_MODE, Min=300, Max=301, Def=300, Val=MENU_DATA[MEMU_VAR.PORT7_MODE], Format = formatTXRevert(PORT.PORT7) }
-        ctx.MenuLines[2] = { Type = LINE_TYPE.LIST_MENU_NC, Text=MODEL.PORT_TEXT[PORT.PORT8], TextId = 0, ValId = MEMU_VAR.PORT8_MODE, Min=300, Max=301, Def=300, Val=MENU_DATA[MEMU_VAR.PORT8_MODE], Format = formatTXRevert(PORT.PORT8) }
-        ctx.MenuLines[3] = { Type = LINE_TYPE.LIST_MENU_NC, Text=MODEL.PORT_TEXT[PORT.PORT9], TextId = 0, ValId = MEMU_VAR.PORT9_MODE, Min=300, Max=301, Def=300, Val=MENU_DATA[MEMU_VAR.PORT9_MODE], Format = formatTXRevert(PORT.PORT9) }
-        ctx.MenuLines[4] = { Type = LINE_TYPE.LIST_MENU_NC, Text=MODEL.PORT_TEXT[PORT.PORT10], TextId = 0, ValId = MEMU_VAR.PORT10_MODE, Min=300, Max=301, Def=300, Val=MENU_DATA[MEMU_VAR.PORT10_MODE], Format = formatTXRevert(PORT.PORT10) }
+        ctx.MenuLines[0] = { Type = LINE_TYPE.LIST_MENU_NC, Text=Header(PORT.PORT6), TextId = 0, ValId = MEMU_VAR.PORT6_MODE, Min=300, Max=301, Def=300, Val=MENU_DATA[MEMU_VAR.PORT6_MODE], Format = formatTXRevert(PORT.PORT6) }
+        ctx.MenuLines[1] = { Type = LINE_TYPE.LIST_MENU_NC, Text=Header(PORT.PORT7), TextId = 0, ValId = MEMU_VAR.PORT7_MODE, Min=300, Max=301, Def=300, Val=MENU_DATA[MEMU_VAR.PORT7_MODE], Format = formatTXRevert(PORT.PORT7) }
+        ctx.MenuLines[2] = { Type = LINE_TYPE.LIST_MENU_NC, Text=Header(PORT.PORT8), TextId = 0, ValId = MEMU_VAR.PORT8_MODE, Min=300, Max=301, Def=300, Val=MENU_DATA[MEMU_VAR.PORT8_MODE], Format = formatTXRevert(PORT.PORT8) }
+        ctx.MenuLines[3] = { Type = LINE_TYPE.LIST_MENU_NC, Text=Header(PORT.PORT9), TextId = 0, ValId = MEMU_VAR.PORT9_MODE, Min=300, Max=301, Def=300, Val=MENU_DATA[MEMU_VAR.PORT9_MODE], Format = formatTXRevert(PORT.PORT9) }
+        ctx.MenuLines[4] = { Type = LINE_TYPE.LIST_MENU_NC, Text=Header(PORT.PORT10), TextId = 0, ValId = MEMU_VAR.PORT10_MODE, Min=300, Max=301, Def=300, Val=MENU_DATA[MEMU_VAR.PORT10_MODE], Format = formatTXRevert(PORT.PORT10) }
      
         ctx.MenuLines[5] = { Type = LINE_TYPE.MENU, Text="Only Thr/Ail/Rud/Ele. This affects AS3X/SAFE reaction dir./b", TextId = 0, ValId = 0x1031 }
         ctx.MenuLines[6] = { Type = LINE_TYPE.MENU, Text="Any changes, use RX 'Relearn Servo Settings'/b", TextId = 0, ValId = 0x1031 }
@@ -321,18 +359,21 @@ local function ST_SendReceive()
 
             -- DELTA has only RUDER 
             if ((currWingType==WING_TYPE.ELEVON_A or currWingType==WING_TYPE.ELEVON_B) and TAIL_TYPE~=TAIL_TYPE.RUD_1) then
-                currTailType = TAIL_TYPE.RUD_1
+                MENU_DATA[MEMU_VAR.TAIL_TYPE] = TAIL_TYPE.RUD_1
             end
         end
 
         --- Did the tail changed?
-        if (currTailType ~= MENU_DATA[MEMU_VAR.TAIL_TYPE]) then
+        local ntt = MENU_DATA[MEMU_VAR.TAIL_TYPE]
+        if (currTailType ~= ntt) then
             if (currAircraftType==AIRCRAFT_TYPE.GLIDER) then
-                currTailType = MENU_DATA[MEMU_VAR.TAIL_TYPE]
+                currTailType = ntt
                 modelLib.ST_GliderTailInit(currTailType)
             else
-                currTailType = MENU_DATA[MEMU_VAR.TAIL_TYPE]
-                modelLib.ST_PlaneTailInit(currTailType)
+                if (not tailTypeCompatible(currTailType,ntt)) then
+                    modelLib.ST_PlaneTailInit(ntt)
+                end
+                currTailType = ntt
             end
         end
 
@@ -355,6 +396,7 @@ local function ST_Init_Text(rxId)
 
     -- Channel Names use the Port Text Retrived from OTX/ETX
     for i = 0, 9 do List_Text[i] = MODEL.PORT_TEXT[i]  end
+    List_Text[10]="--"
 
     -- Aircraft Type
     List_Text[50+AIRCRAFT_TYPE.PLANE]  = "Airplane";    --List_Text_Img[50+AIRCRAFT_TYPE.PLANE]   = "at_plane.png|Airplane" 
@@ -380,8 +422,11 @@ local function ST_Init_Text(rxId)
     List_Text[200+TAIL_TYPE.RUD_2_ELEV_2] = "Dual Rud + Dual Ele";  List_Text_Img[200+TAIL_TYPE.RUD_2_ELEV_2]  = "tt_2rud_2ele.png|Dual Rud + Dual Elev" 
     List_Text[200+TAIL_TYPE.VTAIL_A] = "V-Tail A";  List_Text_Img[200+TAIL_TYPE.VTAIL_A]  = "tt_vtail.png|V-Tail A" 
     List_Text[200+TAIL_TYPE.VTAIL_B] = "V-Tail B";  List_Text_Img[200+TAIL_TYPE.VTAIL_B]  = "tt_vtail.png|V-Tail B" 
-    List_Text[200+TAIL_TYPE.TRAILERON_A] = "Traileron A";  List_Text_Img[200+TAIL_TYPE.TRAILERON_A]  = "tt_traileron.png|Traileron A" 
-    List_Text[200+TAIL_TYPE.TRAILERON_B] = "Traileron B";  List_Text_Img[200+TAIL_TYPE.TRAILERON_B]  = "tt_traileron.png|Traileron B" 
+    List_Text[200+TAIL_TYPE.TRAILERON_A] = "Taileron A";  List_Text_Img[200+TAIL_TYPE.TRAILERON_A]  = "tt_taileron.png|Taileron A" 
+    List_Text[200+TAIL_TYPE.TRAILERON_B] = "Taileron B";  List_Text_Img[200+TAIL_TYPE.TRAILERON_B]  = "tt_taileron.png|Taileron B" 
+    List_Text[200+TAIL_TYPE.TRAILERON_A_R2] = "Taileron A + 2x Rud";  List_Text_Img[200+TAIL_TYPE.TRAILERON_A_R2]  = "tt_taileron2.png|Taileron A + Dual Rud" 
+    List_Text[200+TAIL_TYPE.TRAILERON_B_R2] = "Taileron B + 2x Rud";  List_Text_Img[200+TAIL_TYPE.TRAILERON_B_R2]  = "tt_taileron2.png|Taileron B + Dual Rud" 
+
 
     -- Servo Reverse
     if (LCD_W > 128) then
@@ -399,8 +444,9 @@ local function ST_Init()
     ST_Init_Text(0)
 
     -- Setup default Data, and load a file if exist
-    modelLib.ST_Default_Data()
+    --modelLib.ST_Default_Data()
     if (modelLib.ST_LoadFileData()==0) then -- Did not load a file
+        modelLib.ST_Default_Data()
         modelLib.ST_SaveFileData() -- Save Defaults
     end
     menuDataChanged = false

Lua_scripts/DSMLIB/DsmSimMenuLib.lua

@@ -26,7 +26,7 @@
 
 
 local Log, menuLib, modelLib, DEBUG_ON = ... -- Get DebugON from parameters
-local SIM_LIB_VERSION = "0.55"
+local SIM_LIB_VERSION = "0.56"
 local MSG_FILE = "/SCRIPTS/TOOLS/DSMLIB/msg_fwdp_en.txt"
 
 local PHASE = menuLib.PHASE

Lua_scripts/DSMLIB/MIN_msg_fwdp_en.txt

@@ -6,10 +6,5 @@
 T |0x0097|DONT USE: Factory Reset
 T |0x0098|DONT USE: Factory Reset
 T |0x00A5|DONT USE: First Time Setup
-T |0x00B0|Self-Lev/Ang Dem
-T |0x00CD|Level model & capt attitude
 T |0x0190|DONT USE: Relearn Servo Settings
 T |0x020D|DONT USE: First Time SAFE Setup
-T |0x0254|Pos = Up, Neg = Down
-T |0x0267|Pos = Nose Up/Roll Right
-T |0x0268|Neg = Nose Down/Roll Left

Lua_scripts/DSMLIB/msg_fwdp_en.txt

@@ -69,6 +69,10 @@ T |0x0053|Output Channel 3
 T |0x0054|Output Channel 4
 T |0x0055|Output Channel 5
 T |0x0056|Output Channel 6
+T |0x0057|Output Channel 7
+T |0x0058|Output Channel 8
+T |0x0059|Output Channel 9
+T |0x005A|Output Channel 10
 --
 -- FailSafe Options
 --LT|0x005E|Inh
@@ -143,7 +147,7 @@ T |0x00A5|First Time Setup
 T |0x00AA|Capture Gyro Gains
 T |0x00AD|Gain Channel Select
 T |0x00AF|Dynamic
-LT|0x00B0|Self-Level/Angle Dem
+LT|0x00B0|Self-Level
 LT|0x00B1|Envelope
 --
 -- Flight Modes List Options 
@@ -163,9 +167,9 @@ T |0x00BE|Unknown_BE -- Used in Reset menu (0x0001) while the RX is rebooting
 --
 T |0x00C7|Calibrate Sensor
 T |0x00C8|Sensor is Calibrating.. Wait 
-T |0x00CA|SAFE/Panic Mode Setup
+T |0x00CA|SAFE & Panic Mode Setup
 --
-T |0x00CD|Level model and capture attitude/m -- SPECIAL MENU to itself who is not a comment
+T |0x00CD|Level model & capt attitude/m -- SPECIAL MENU to itself who is not a comment
 T |0x00CE|Error TX Conf
 T |0x00CF|Invalid TX Ch Conf 1
 T |0x00D0|Invalid TX Ch Conf 2
@@ -382,7 +386,7 @@ T |0x0251|Are you sure you want to ovewrite the "Target"
 T |0x0252|with the "Source" ? 
 T |0x0253| -- Blank
 --
-T |0x0254|Postive = Up, Negative = Down
+T |0x0254|Pos = Up, Neg = Down
 --
 -- First time safe setup Page 1  (maybe ask to select Flight Mode cannel)
 T |0x0255|Before setting up SAFE
@@ -404,8 +408,8 @@ T |0x0262|by "Source"
 --
 T |0x0263|Fixed/Adjustable Gains/c/b
 T |0x0266|Heading Gain/c/b
-T |0x0267|Positive = Nose Up/Roll Right
-T |0x0268|Negative = Nose Down/Roll Left
+T |0x0267|Pos = Nose Up/Roll Right
+T |0x0268|Neg = Nose Down/Roll Left
 T |0x0269|SAFE - Thr to Pitch
 T |0x026A|Use CAUTION for Yaw gain!/b
 --

Lua_scripts/DSMLIB/readme.md

@@ -4,255 +4,19 @@ Rewrite/Enhancements by: Francisco Arzu
 
 Thanks to all the people volunteered to test it.
 
-# NOTE for FC6250HX FC+RX version
-For the full size FC6250HX, Only use V0.55 or newer.
+Release Notes for
 
-DO NOT use previous versions to do the Swashplate -> RX Orientation. The problem was that it did not have the orientation messages.. and you are choosing blind. The calibration will never stop until you place the RX in the right orientation, even after restarting the RX (if flashing red, is not in the right orientation.. if flashshing white is in the right orientation).  If you run into this problem, and lights are blinking red, rotate the FC on the longer axis until you get white blinking.. keep it stable, will blink white faster andlet calibration finishes.. after that is back to normal.
+## COLOR Radios
+Read more [Color radios](./readme_color.md) 
 
-# Introduction  (v0.55)
+![main-menu](https://user-images.githubusercontent.com/32604366/230751340-dd118f36-1884-405b-b12b-81cba16c7321.png)
+![flight-mode-setup](https://user-images.githubusercontent.com/32604366/230751281-0c71ff4a-179f-41fd-9290-302a6e0fe821.png)
 
-This script library enhances the original DSM Forward Programming tool. DSM Forward Programming is needed to setup many of the new Spektrum Receivers with Gyro AS3X/SAFE features. For the Gyro (/Safe) to correct the plane in flight, it needs to move the right surfaces therefore the RX needs to know the configuration of the plane (Wing Type, Tail Type, Mixers, Servo Assignments, Servo Reverse). That info tells the RX where the aileron(s) are (one or two), where the elevator(s) are (one or two),  V-Tail, Delta Wing, etc. 
+## Black & White Radios (Small Screens)
+Read more [black & whire radios](./readme_bw.md) 
 
-Since EdgeTx/OpenTx doesn’t have an equivalent setup that is stored in the radio, we have to create our own version. This info is stored inside the `/MODELS/DSMDATA` directory/folder (which needs to be created by manually).
+![image](https://github.com/frankiearzu/DSMTools/assets/32604366/be03ad40-3e2f-45e1-8f50-d231c3931169)
+![image](https://github.com/frankiearzu/DSMTools/assets/32604366/5010a361-1234-4c83-97b2-2eb6ae0d1061)
+![image](https://github.com/frankiearzu/DSMTools/assets/32604366/0d4e04dc-90d7-4322-9ad1-f57cbde49029)
+![IMG_3024](https://user-images.githubusercontent.com/32604366/230123260-614f4e5e-9546-4439-9196-db885894083f.jpg)
 
-During `"Gyro Settings->initial setup"`, the RX asks the TX for model information behind the scenes.  After setup, `"Gyro Settings->System Tools-> Relearn Servo Settings"` requests the TX servo configuration and stores it in the RX. 
-
-# Deployment
-
-When upgrading from a previous version of this tool, delete your /SCRIPTS/TOOLS/DSMLIB before copying the new one (if you customized your images, inside "DSMLIB/img" do a backup first)
-
-Uncompress the Zip file (ZIP version) into your local computer.
-In another window, open your TX SDCard.
-
-1. The zip file has the same structure as your SDCard. If you want to copy all the content of the zip file into your SDCard top level folder, it will create all the directories and files in the right place.
-2. Make sure to check that  `/MODELS/DSMDATA` is there. The script will complain at startup if it does not exist. Here the script saves the Spektrun settings for each of your models.
-
-Your TX SDCard should looks like this:
-
-    /SCRIPTS/TOOLS/     -- you only need one of the 3 to save some space in your TOOLS screen
-        DSM FwdPrg_05_BW.lua      -- black/white text only 
-        DSM FwdPrg_05_Color.lua   -- Color and touch radios
-        DSM FwdPrg_05_MIN.lua     -- `NEW!` Minimalistic version for radios with LOW memory (cannot setup new planes)
-        
-    /SCRIPTS/TOOLS/DSMLIB/        -- (ALL CAPITALS) Libraries ane extra files
-            DsmFwPrgLib.lua       -- DSM Protocol Message and Menu   engine
-            DsmFwPrgSIMLib.lua    -- Simulation of AR631, FC6250HX  (For GUI development)
-            SetupLib.lua          -- Model Setup Screens
-            msg_fwdp_en.txt       -- `NEW!` Messages for forward programing externalized. To support other langs (english)
-	    ... a few other files
-
-    /SCRIPTS/TOOLS/DSMLIB/img                -- Images for RX orientations
-
-Other Directories
-
-    /MODELS/DSMDATA                 --(ALL CAPITALS) Data of model config (Wing Type, Servo Assignments)
-    /LOGS/dsm_log.txt		    --Readable log of the last RX/TX session, usefull for debugging problems
-
-
-
-# Common Questions
-1. `RX not accepting channels higher than Ch6 for Flight-mode o Gains:`
-- V0.55 and newer:  Problem solved.. Should allow you to select up to 12ch with the switch technique or with the scroller.
-
-- V0.53/0.54:  The RX is listening to channel changes for this options. Configure the Switch to the channel, togling once the switch will select the channel on the menu field.  
-
-2. `Only able to switch to Fligh-mode 2 and 3, but not 1:`
-Check that the module "Enable max throw" is OFF in you Multi-Module settings (where you do BIND), otherwise the TX signals will be out of range.
-The multi-module is already adjusting the TX/FrSky servo range internally to match Spektrum.
-
-3. `Why Ch1 says Ch1 (TX:Ch3/Thr)?`:
- Radios with Multi-Module are usually configured to work the standard AETR convention. Spektrum uses TAER. The multi-module does the conversion when transmitting the signals. So `Spektrum Ch1 (Throttle)` really comes from the `TX Ch3`.  We show both information (+name from the TX output).  If your multi-module/radio is setup as TAER, the script will not do the re-arrangement.  
-
-4. `If i change the model name, the original model settings are lost.` This is correct, the model name is used to generate the file name (inside /MODEL/DSMDATA) who stores the model configuration. Currently EdgeTx and OpenTX has differt features where i could get either the Model Name or the YAML file where the EdgeTX model configuration is stored.. to keep the code compatible, the model name is used.
-
-5. `Reversing a channel in my TX do not reverse the AS3X/SAFE reaction.` Correct, the chanel stick direction and the Gyro direction are two separate things.
-
-    5.1: First, you have setup your model so that the sticks and switches moves the surfaces in the right direction.
- 
-    5.2: Go to the script, `Model Setup` and setup your wing type, tail type, and select the channel assigment for each surface. Leave the servo settings the same as the values in the TX to start.
- 
-    5.3: Go to `Forward programming->Gyro Setting->Initial Setup` (New/factory reset), or `Forward programming->Gyro Setting->System Setup->Relearn Servo Settings` (not new). This will load your current Gyro servo settings into the plane's RX. This moves the current servo TX settings to the RX, so it is now in a known state.
- 
-    5.4: Verify that the AS3X and SAFE reacts in the proper direction. You can use the Flight mode configured as "Safe Mode: Auto-Level" to see if it moves the surfaces in the right direction.  
- 
-    5.5: If a surface don't move in the right direction, go to the `Model Setup->Gyro Channel Reverse` to reverse the Gyro on the channels needed, and do again the `Forward programming->Gyro Setting->System Setup->Relearn Servo Settings` to tranfer the new settings to the RX.
-
-    5.6: Specktrum TX always passes the TX servo reverse as the Gyro Reverse, but on many OpenTX/EdgeTX radios, the Rud/Ail are usually reversed by default compared to Specktrum. So far i don't think that i can use this as a rule, that is why the `Gyro Channel Reverse` page exist. 
-    
-
-
----
----
-
-# Changes and fixes 
-V0.55:
-1. Finally found where the TX reports to the RX how many channels is transmiting. The TX now reports itself as a 12ch radio instead of 6h. (DSM Multi-Module limit).  This fixes a few things:
-    
-    
-    a. Many places where you have to select channels > CH6 for Flight-Mode, Gains, Panic now works properly with the scroller. The radio is still validating that you are not selecting an invalid channel. For example, if you have an additional AIL on CH6, it will not allow you to use CH6 for FM or Gains.. it just move to the next valid one.
-
-    b. When setting up AIL/ELE on channels greater than CH6, on previous versions SAFE/AS3X was not moving them.. now they work up correctly.  Set them up in the first in CH1-CH10.  Why CH10?? Thats what fits on the reverse screen, otherwise, have to add more screens.
-
-    c. Some individual Gain channels was not allowing to setup on CH greater than CH6. Now is fixed.
-
-2. User Interface:
-    a. `RTN` Key now works as `Back` when the screen has a `Back`. Makes it easy for navigation.. Presing `RTN` on the main screen exists the tool.
-    b. Much faster refresh of the menus. Optimize the process of send/recive menu data from the RX.
-
-3. The TX now comunicates the SubTrim positions to the RX during `Relearn Servo Setting`. This changes the center of movement to one side or another. Really not much difference with small amounts of subtrim, previous versions where asuming subtrim of 0. When you have an extreame subtrim to one side, it was not moving simetrically.
-
-4. Support for FC6250HX (the one with separate RX).. Setup Swashplate type, RX orientation works properly.. This are menu options that the smaller version that comes in the
-Blade 230S did not have.
-
-
-V0.54:
-1. Fix a problem in the Attitude Trim page (`Gyro Settings->System Setup->SAFE/Panic Setup->Attitude Trim`). It was not saving the values after exiting the menu. This is to change what SAFE considers "Level" flying.
-2. Wings 2-Ail 2-Flaps had a bug on the 2nd flap.
-3. New Minimalistic script (`DsmFwdPrg_05_MIN.lua`): For radios with very low memory (FrSky QX7, RM Zorro, others). It can only change existing settings, but does not have the Plane Setup menus to setup a completly new plane.  In some radios, the very first time it runs (compile + run), it might give you a `not enouth memory` error.. try to run it again.
-4. External menu message file (DSMLIB/msg_fwdp_en.txt and MIN_msg_fwdp_en.txt).  Intial work to do localization and different languages.
-
-V0.53:
-1. Improved channel selection (Flight mode, Panic Channel, Gains Channel). Now during editing a channel, you can select any channel (>Ch4). Also, of you toggle the switch/channel it will populate the screen.
-2. Support for smaller screens (128x64) in B&W. The problem with this older radios is memory. In some, it does not have enouth memory to load the additional DSMLIB libraries.
-3. Fix formatting problem with some TX channel names who could affect the screen.. for example, rud channel should show "Ch4/rud", but shows "Ch4ud" because /r is for right justify formatting on messages. Now the formatting is only if it appears at the end of the message.
-
-V0.52:
-1. Menus to be able to configure Plane in a similar way as Spektrum Radio (v0.52)
-2. Make "Gyro Settings"->"Initial Setup" works (Tested on AR631,AR637xx with PLANE type of aircraft)
-3. Properly reset and restart after initial configuration and SAFE changes.
-4. Write Log of the conversation between RX/TX. To be used for debugging a problem is reported. 
-5. Provide a simulation of RX to do GUI development in Companion, and understand patterns of how the data is organized.
-
-
-# Tested Hardware
-- AR631/AR637xx
-- FC6250HX (Blade 230S V2 Helicopter; FC+RX in one, mini version)
-- FC6250HX (Separate RX.. use only V55 or newer of this tool)
-- AR636 (Blade 230S V1 Heli firmware 4.40)
-
-- Radiomaster TX16S  (All versions)
-
-Please report if you have tested it with other receivers to allow us to update the documentation. Code should work up to 10 channels for the main surfaces (Ail/Ele/etc).  All Spektrum RX are internally 20 channels, so you can use Ch7 for Flight Mode even if your RX is only 6 channels (See common Questions)
-
-
-# Messages Displayed in the GUI
-
-If in a screen you get text that looks like `Unknown_XX` (ex: Unknown_D3), that message has not been setup in the script in english. If you can determine what the proper message is,  you can send us a message to be added to the library.
-The `XX` represents a Hex Number (0..9,A..F)  message ID. 
-
-
-### Version 0.53 and older: 
-If you want to fix it in your local copy, all messages are towards the end in the file `SCRIPT\TOOS\DSMLIB\DsmFwPrgLib.lua`. Messages for Headers are stored in `Text` and messages for Options are stored in `List_Text`.  Lua scripts are text files, and can be edited with Notepad or equivalent.
-
-Portion of DsmFwPrgLib.lua:
-
-    Text[0x0097] = "Factory Reset"
-    Text[0x0098] = "Factory Reset" -- FC6250HX: Title
-    Text[0x0099] = "Advanced Setup"
-    Text[0x009A] = "Capture Failsafe Positions"
-    Text[0x009C] = "Custom Failsafe"
-
-    Text[0x009F] = "Save & Reset RX"  -- TODO: Find the Proper Spektrum Value ??
-
-    Text[0x00A5] = "First Time Setup"
-    Text[0x00AA] = "Capture Gyro Gains"
-    Text[0x00AD] = "Gain Channel Select"
-
-    -- Safe mode options, Inhibit + the values 
-    local safeModeOptions = {0x0003,0x00B0,0x00B1}  -- inh (gap), "Self-Level/Angle Dem, Envelope
-    List_Text[0x00B0] = "Self-Level/Angle Dem"
-    List_Text[0x00B1] = "Envelope"
-
-For example, if you get `Unknown_9D` in the GUI and your now that it should say **NEW Text**, you can edit the lua script to look like this:
-
-    Text[0x009A] = "Capture Failsafe Positions"
-    Text[0x009C] = "Custom Failsafe"
-
-    Text[0x009D] = "NEW Text" -- NEW Text added for AR98xx
-
-    Text[0x009F] = "Save & Reset RX"  -- TODO: Find the proper Spektrum text
-
-### Version 0.54 and newer:
-The menu messages are stored in DSMLIB/msg_fwdp_en.txt (For english). Just add the message there. MIN_msg_fwdp_en.txt has shorter messages overrides for screens who are smaller (for minimalistic 128x64 version).   The reference to the message file is at the file `/DSMLIB/DsmFwPrgLib.lua` if you want to change to use another language.
-
-    T |0x0097|Factory Reset
-    LT|0x00B0|Self-Level/Angle Dem
-    LT|0x00B1|Envelope
-
-
-# LOG File
-
-The log file of the last use of the script is located at `/LOGS/dsm_log.txt`. **It is overridden on every start to avoid filling up the SD card**. So if you want to keep it, copy or rename it before starting the script again. (it can be renamed in the TX by browsing the SD card)
-
-The log is human readable. The first number is the number of seconds since the start, and then what is the current state of the Library, and what has been sent and received. The info in the log can be easily used to create a new simulation for that RX in the future.
-
-Example Log:
-
-    5.340 WAIT_CMD: DSM_GotoMenu(0x1010,LastSelectedLine=0)
-    5.350 MENU_TITLE: SEND DSM_getMenu(MenuId=0x1010 LastSelectedLine=0)
-    5.440 MENU_TITLE: RESPONSE Menu: M[Id=0x1010 P=0x0 N=0x0 B=0x1000 Text="Gyro settings"[0xF9]]
-    5.490 MENU_LINES: SEND DSM_getFirstMenuLine(MenuId=0x1010)
-    5.590 MENU_LINES: RESPONSE MenuLine: L[#0 T=M VId=0x1011 Text="AS3X Settings"[0x1DD]   MId=0x1010 ]
-    5.640 MENU_LINES: SEND DSM_getNextLine(MenuId=0x1010,LastLine=0)
-    5.740 MENU_LINES: RESPONSE MenuLine: L[#1 T=M VId=0x1019 Text="SAFE Settings"[0x1E2]   MId=0x1010 ]
-    5.790 MENU_LINES: SEND DSM_getNextLine(MenuId=0x1010,LastLine=1)
-    5.850 MENU_LINES: RESPONSE MenuLine: L[#2 T=M VId=0x1021 Text="F-Mode Setup"[0x87]   MId=0x1010 ]
-    5.910 MENU_LINES: SEND DSM_getNextLine(MenuId=0x1010,LastLine=2)
-    5.970 MENU_LINES: RESPONSE MenuLine: L[#3 T=M VId=0x1022 Text="System Setup"[0x86]   MId=0x1010 ]
-    6.020 MENU_LINES: SEND DSM_getNextLine(MenuId=0x1010,LastLine=3
-
-# Validation of data by the RX
-
-The RX validates the data. if you change to an invalid channel or do a invalid number range, the RX will change it at the end of editing the field.
-
----
-# Version 0.53
-- Improve Channel selection in menus
-- Support smaller screens 128x64 in the black/white mode.
-
-# Version 0.52
-- Fix Reversing of Servos
-- Properly detect Multimodule Ch settings AETR 
----
-
-# Version 0.51  (volunteer testing version, not for production)
-- New Screens to Configure Model (Wing Type/Tail Tail, etc)
-- Finally got understanding that the previous unknown 0x05 lines are to send Model/Servo data to RX.
-- Fix use of AR636B (Firmware version 4.40.0 for Blade 230 heli, is the only one with Forward Programming)
-- Aircraft types:  Tested With Plane type only.. Glider and other in progress
-
-### Known Problems:
-- 4-Servo Wing type (Dual Ail/Tail) in planes give conflicting servo assignments by defaults.. Solution choose your own Ch.
-- Glider, Heli, Drone: Still in development. In glider, only a few wing type works.. needs to restrict menu options for the only valid one.
-
-
-# Version 0.5
-
-- Make the code more readable and understandable
-- Separate the DSM Forwards Programming logic from the GUI
-- Log the communication with the RX on a /LOGS/dsm_log.txt to allow to debug it easier 
-	and see the exchange of data between the RX/TX
-- Created a black/white Text only version with only Key/Roller Inputs
-- Created a nicer GUI for EdgeTX touch screen color Radios
-- RX simulation for GUI development:  turn on `SIMULATION_ON=true` in the beginning of the lua file
-- Test it on AR631, AR637xx, FC6250HX (Helicopter)
-
-### Some settings that can change (top of Lua file):
-    SIMULATION_ON = false   -- FALSE: hide similation menu (DEFAULT), TRUE: show RX simulation menu 
-	DEBUG_ON = 1           -- 0=NO DEBUG, 1=HIGH LEVEL 2=LOW LEVEL   (Debug logged into the /LOGS/dsm_log.txt)
-	USE_SPECKTRUM_COLORS = true -- true: Use spectrum colors, false: use theme colors (default on OpenTX, OpenTX handle colors different) 
-
-
-### Known Problems:
-1. **Incorrect List Value Options:** Some Menu List line (`LINE_TYPE.LIST_MENU1` or `L_m1` in logs), the range (min/max) of valid values seems to be incorrect, but the RX corrects the values.
-in the MINimalistic version, the RX is doing all the range validation, and will show invalid options temporarilly. In an Spektrum radio, it happens so fast, that you don't notice it, but in LUA scripts who are slower, you can see it in the screen. 
-In the COLOR version, The code has hardcoded the valid ranges to avoid this problem.
-
-2. Glider/Heli/Drone wing types not ready.
-
-For Helicopter, use airplane normal wing and normal tail
-
-
-# Version 0.2
-Original Version from Pascal Langer
- 

Lua_scripts/DSMLIB/readme_bw.md

@@ -0,0 +1,181 @@
+# Credits
+Code is based on the code/work by: Pascal Langer (Author of the Multi-Module) 
+Rewrite/Enhancements by: Francisco Arzu
+
+Thanks to all the people volunteered to test it.
+
+# Introduction  (v0.56 Black & White  Small Radios)
+
+!!!!!NEW!!!!!!: Finally was able to create the Plane Setup for Smaller Radios
+There is still significant memory limitations in some of this radios, so the Setup and FP was split in two files.
+The file 'DSM FwdPrg_56_STUP.lua' is the new one to create the planes setup that works together with 'DSM FwdPrg_56_MIN.lua'
+
+# How to Use it
+
+Step #1: Make sure that the /MODELS/DSMDATA folder exist.
+
+Step #2: Run the "DSM FwdPrg_56_STUP" first to setup the plane wing, tail and channels to use for each surface. At the end it will ask you to "save" the configuration. That saves a file in the /MODELS/DSMDATA folder.
+
+![image](https://github.com/frankiearzu/DSMTools/assets/32604366/be03ad40-3e2f-45e1-8f50-d231c3931169)
+![image](https://github.com/frankiearzu/DSMTools/assets/32604366/5010a361-1234-4c83-97b2-2eb6ae0d1061)
+![image](https://github.com/frankiearzu/DSMTools/assets/32604366/0d4e04dc-90d7-4322-9ad1-f57cbde49029)
+
+Why the RX needs to know the Plane Setup??   The AS3X/Gyro and SAFE needs to know what surfaces to move to do the proper correction in flight. It needs to know what channels are you using for ailerons, elevarors and rudders (could be 1 or 2 of each). Also if you have special Wing like a delta wing, the elevator and aileron functions are on the same channels.. same with V-Trails, Ruder/Elevator are combined. All this information is shared with the RX during "First Time Setup" as well as "Relearn Servo Setting".   Older version of 0.55 MIN hardcoded this info to be a plain 4-ch regular plane, thats why we discourage to use those function.
+
+
+Step #3: Run the "DSM FwdPrg_56_MIN". It uses the model configuration created in step #2 to properly tell the receiver the plane configuration for initial setup.  If you get "Cannot load model config", that means that the file was not created on step #2.   Once it shows the intial forward programming page for your receiver, usuall "Gyro Settings and Other Settings". You can properly setup the a plane from initial setup... if you are not familiar with this step, view some of the videos. There are already multiple videos showing how to do it EdgeTX color version, or the Spektrum official videos, the menus are the same.
+
+
+## Dealing with Low memory
+On my FrSky QX7 (Probably the one with the lower memory compared to Radiomaster Boxter and maybe Zorro), it will give you "not enouth memory"
+the very first time you try to run it since is compiling + running. Try to run them at least 2 times again, this times wll just run (not compile).
+In some ocations that keeps giving memory problems, i have to restart the radio, and try to run it right after restart.
+
+After it runs fine, and you try to run it the 2nd time and gives "not enouth memory", you have restart the radio.. for me this is random.. 
+sometimes i can run it many times consecutively.. but once it gives memory error, have to restart to be able to run again. 
+Once it starts, it should work find after... is the statup who loads what it needs to memory.
+
+I am running EdgeTX 2.9.2 (there was some memory cleanup in 2.9.0, and 2.9.1 to get a bit more memory)
+I left version 0.55 in the files, since it uses less memory, it can change the mayority of FP parameters, but cannot setup plane or Relearn Servo Settings
+(don't execute the menus who say 'DON'T USE!!').. v0.55 and v0.56 MINs can co-exist.
+
+Video of how to deal with memory:
+https://www.youtube.com/watch?v=kG3RfVa_brU
+
+# Deployment
+
+Uncompress the Zip file (ZIP version) into your local computer.
+In another window, open your TX SDCard and go to `/SCRIPTS/TOOLS`.
+
+When upgrading from a previous version of this tool, delete your `/SCRIPTS/TOOLS/DSMLIB` before copying the new one (if you customized the menu messages, inside `DSMLIB` do a backup of the message files first)
+
+1. The zip file has the same structure as your SDCard. If you want to copy all the content of the zip file into your SDCard, it will create all the directories and files in the right place.
+
+For the MINimalistic version, Your TX SDCard should looks like this:
+
+    /SCRIPTS/TOOLS
+        DSM FwdPrg_56_MIN.lua     -- Minimalistic version for radios with LOW memory (Can setup planes)
+        DSM FwdPrg_56_STUP.lua    -- `NEW!` Setup plane for minimalistic version (LOW Memory radios)
+        DSM FwdPrg_55_MIN.lua     -- Uses less memory than v56, but cannot do initial setup of the plane
+
+    /SCRIPTS/TOOLS/DSMLIB/       -- (ALL CAPITALS) Libraries ane extra files
+        DsmFwPrgMIN_P1.lua            -- Part1 of extra files for Min
+        DsmFwPrgMIN_P2.lua            -- Part2 of extra files for Min
+        msg_fwdp_en.txt               -- Menu messages in English  (common for all radios)
+        MIN_msg_fwdp_en.txt           -- Menu messages in English  (overrides for 128x164 resolution)
+
+### Other Directories/Files
+
+    /LOGS/dsm_log.txt		       	--Readable log of the last RX/TX session, usefull for debugging problems
+
+# NOTE for FC6250HX FC+RX version
+For the full size FC6250HX, Only use V0.55 or newer.
+
+DO NOT use previous versions to do the Setup -> Gyro Settings -> Orientation. The problem was that it did not have the orientation messages.. and you are were choosing blind. The calibration will never stop until you place the RX in the right orientation, even after restarting the RX (if flashing red, is not in the right orientation.. if flashshing white is in the right orientation).  If you run into this problem, and lights are blinking red, rotate the FC on the longer axis until you get white blinking.. keep it stable, will blink white faster andlet calibration finishes.. after that is back to normal.
+
+OpenTX: When you enter "forward programming" you will hear "Telemetry lost" and "Telemetry recovered".. The FC led will blink white, but when exit FP, will blink red...is not problem.. but will need to be power cycled to get blinking green again.. i think is something related to temporarilly loosing the connection with the radio..researching the OpenTX code since it only happens with this helis FC. 
+
+# Common Questions
+1. `RX not accepting channels higher than Ch6 for Flight-mode o Gains:`
+    - All Spektrum RX are 20 channels internally, even if it only has 6 external Ch/Ports to connect servos.
+
+    - Make sure that when you bind your RX, you select the proper range of channels to use.. By default, ch1-ch8.
+    
+    - You have to mapped a Switch/Slider to the channel, togling/moving  will select the channel on the menu field.
+
+    - The RX validates the channels, and it does not detect signal on a channel, it will not allow to select it..that is why is important to move the switch/slider, so that the RX knows that is a valid channel.   
+
+
+# Changes and fixes 
+
+v0.56:
+1. Fix Tail-Type "Taileron" functionality that was not working. Also validated V-Tail and Delta wings.
+2. Added Taileron and two Rudder config (Many Freewing Jets like F18,F16, etc)
+3. Gyro-Reverse Screen now shows what is the channel/port used for (Ail, Ele, Rud, etc)
+4. COLOR ONLY: Gyro-Reverse Screen now shows what information that shared with the RX about each channel (Role, Slave, Reverse).
+5. NEW!! Initial version of Plane Setup for B&W radios
+
+V0.55:
+1. Finally found where the TX reports to the RX how many channels is transmiting. The TX now reports itself as a 12ch radio instead of 6h. (DSM Multi-Module limit).  This fixes a few things:
+    
+    a. Many places where you have to select channels > CH6 for Flight-Mode, Gains, Panic now works properly with the scroller. The radio is still validating that you are not selecting an invalid channel. For example, if you have an additional AIL on CH6, it will not allow you to use CH6 for FM or Gains.. it just move to the next valid one.
+
+    b. When setting up AIL/ELE on channels greater than CH6, on previous versions SAFE/AS3X was not moving them.. now they work up correctly.  Set them up in the first in CH1-CH10.  Why CH10?? Thats what fits on the reverse screen, otherwise, have to add more screens.
+
+    c. Some individual Gain channels was not allowing to setup on CH greater than CH6. Now is fixed.
+
+2. User Interface:
+    a. `RTN` Key now works as `Back` when the screen has a `Back`. Makes it easy for navigation.. Presing `RTN` on the main screen exists the tool.
+    b. Much faster refresh of the menus. Optimize the process of send/recive menu data from the RX.
+
+3. Support for FC6250HX (the one with separate RX).. Setup Swashplate type, RX orientation works properly.. This are menu options that the smaller version that comes in the
+Blade 230S did not have.
+
+V0.54 Beta:
+- First version for the small screens, and limited memory.  Only can change existing values, it cannot setup a brand new plane or new RX from Zero
+- Fix problem on editing the SAFE Mode Attitude Trim
+- First version with externalize merges, so that it can be translated to other languages
+
+# Tested Radios and RXs
+- Radio: FrSky QX7:   Due to limited memory, could be that the first time is does not start (not enouth memory to compile+run), but try again after a fresh TX restart.
+
+- AR631/AR637xx
+- FC6250HX (Blade 230S V2 Helicopter)
+- FC6250HX (Separate RX.. use only V55 or newer of this tool)
+- AR636 (Blade 230S V1 Heli firmware 4.40)
+
+Please report if you have tested it with other receivers to allow us to update the documentation. Code should work up to 10 channels for the main surfaces (Ail/Ele/etc).  All Spektrum RX are internally 20 channels, so you can use Ch7 for Flight Mode even if your RX is only 6 channels (See common Questions)
+
+# Messages Displayed in the GUI
+
+If in a screen you get text that looks like `Unknown_XX` (ex: Unknown_D3), that message has not been setup in the script in english. If you can determine what the proper message is,  you can send us a message to be added to the library.
+The `XX` represents a Hex Number (0..9,A..F)  message ID. 
+
+If you want to fix it in your local copy, all messages are in the file `SCRIPT\TOOS\DSMLIB\msg_fwdp_en.txt`. (english version)
+
+Example::
+
+    T |0x0080|Orientation
+    T |0x0082|Heading
+    T |0x0085|Frame Rate
+    T |0x0086|System Setup
+    T |0x0087|F-Mode Setup
+    T |0x0088|Enabled F-Modes
+    T |0x0089|Gain Channel
+    T |0x008A|Gain Sensitivity/r  -- Right Align
+    T |0x008B|Panic
+    T |0x008E|Panic Delay
+
+For example, if you get `Unknown_9D` in the GUI and your now that it should say **NEW Text**, you can edit the lua script to look like this:
+    T |0x009D|NEW Text -- NEW Text added for AR98xx
+
+# Local Language Support 
+Some settings that can change (top of Lua file):
+`local LANGUAGE            = "en"`
+
+If you want to translate the menu messages to another language (like french), copy the file `msg_fwdp_en.txt` into `msg_fwdp_fr.txt`, translate it, and change the language in the lua file to `"fr"`.
+
+
+# LOG File
+
+The log file of the last use of the script is located at `/LOGS/dsm_log.txt`. **It is overridden on every start to avoid filling up the SD card**. So if you want to keep it, copy or rename it before starting the script again. (it can be renamed in the TX by browsing the SD card)
+
+The log is human readable, and can help use debug problems remotrly
+
+
+# Validation of data by the RX
+
+When you change a value in the GUI, the RX validates that the value is valid.  This applies to channels as well as values.
+
+
+---
+# Version 0.54
+First version for Small Radios
+
+### Known Problems:
+- Currently cannot setup a plane from scratch.. (Working on it).
+- The first time you run it, it will give you "not enouth memory", but should work the 2nd time after the first compilation (creation of .luac). After that, it should start right away.
+ 
+# Version 0.2
+Original Version from Pascal Langer
+ 

Lua_scripts/DSMLIB/readme_color.md

@@ -0,0 +1,284 @@
+# Credits
+Code is based on the code/work by: Pascal Langer (Author of the Multi-Module) 
+Rewrite/Enhancements by: Francisco Arzu
+
+Thanks to all the people volunteered to test it.
+
+# Introduction  (v0.56)
+
+NOTE: Unless you use special tail types, probably not worth the upgrade. The changes are mostly cosmetic on the Gyro Reverse page to show extra information.
+
+In 0.56, focused on validating and fixing the Wing and Tail type special mixing. Vtail/Delta was working but Taileron was not. The Gyro Reverse screen now show what type of servo information is sharing with the TX.  This affects the Gyro AS3X and SAFE behaviour, you still needs to set your TX with the proper mixes to do V-Tail/Taileron/etc.
+
+- The first is the "Role" of the port (`Ail/Ele/Rud/Thr`). Combination is posible for for special types of wing/tails: Vtail:`EleRud`, Delta & Taileron: `AilEle`.
+- The `-` (Minus) is Reverse.
+- Information is if it the Master or Slave (Master is implicit)
+- The type of mix applied: for V-Tail, the left/right Elevators (`EleRud`) uses `M_Rud` (Mix Rudder), For Delta, the left/right Ailerons (`AilEle`) uses `M_Ele` (Mix Elevator), and finally the Tailerons, the the left/right Elevators (`AilEle`) uses `M_Ail` (Mix Aileron).  Looks like the Mixes are for the entire RX and only needs to be set in one of the ports, The difference between the "A" and "B" configuration is just if the mix is set on the Master or Slave port (like Taileron_A or Taileron_B) and affects the direction.. sometimes you have to try both. Start by setting the right direction for the primary roll, and then use the A/B configurations. For exmaple, in Taileron, the primary roll is Elevators, the secondary roll is Aileron (Mix Aileron).    Below is a Taileron example: Two independent Elevators and 2 independent ailerons. 
+
+![image](https://github.com/frankiearzu/DSMTools/assets/32604366/4bbeb234-c92c-4663-b464-549df1c134a0)
+![image](https://github.com/frankiearzu/DSMTools/assets/32604366/f8fa62b4-9843-4d81-9c67-7c8bfcf252f2)
+
+
+With spektrum constantly updating its firmware, you only need to update the message file if you see in the screen any message "Unknown_xyz".
+
+
+This script library enhances the original DSM Forward Programming tool. DSM Forward Programming is needed to setup many of the new Spektrum Receivers with Gyro AS3X/SAFE features. For the Gyro (/Safe) to correct the plane in flight, it needs to move the right surfaces therefore the RX needs to know the configuration of the plane (Wing Type, Tail Type, Mixers, Servo Assignments, Servo Reverse). That info tells the RX where the aileron(s) are (one or two), where the elevator(s) are (one or two),  V-Tail, Delta Wing, etc. 
+
+Since EdgeTx/OpenTx doesn’t have an equivalent setup that is stored in the radio, we have to create our own version. This info is stored inside the `/MODELS/DSMDATA` directory/folder (which needs to be created by manually).
+
+During `"Gyro Settings->initial setup"`, the RX asks the TX for model information behind the scenes.  After setup, `"Gyro Settings->System Tools-> Relearn Servo Settings"` requests the TX servo configuration and stores it in the RX. 
+
+# Deployment
+
+When upgrading from a previous version of this tool, delete your /SCRIPTS/TOOLS/DSMLIB before copying the new one (if you customized your images, inside "DSMLIB/img" do a backup first). Also you can delete the previous DSM_FwdProg*.* from /SCRIPTS/TOOLS.
+
+Uncompress the Zip file (ZIP version) into your local computer.
+In another window, open your TX SDCard.
+
+1. The zip file has the same structure as your SDCard. If you want to copy all the content of the zip file into your SDCard top level folder, it will create all the directories and files in the right place.
+2. Make sure to check that  `/MODELS/DSMDATA` is there. The script will complain at startup if it does not exist. Here the script saves the Spektrun settings for each of your models.
+
+Your TX SDCard should looks like this:
+
+    /SCRIPTS/TOOLS/     -- you only need one of the 3 to save some space in your TOOLS screen
+        DSM FwdPrg_56_Color.lua   -- Color and touch radios
+
+        
+    /SCRIPTS/TOOLS/DSMLIB/        -- (ALL CAPITALS) Libraries ane extra files
+            DsmFwPrgLib.lua       -- DSM Protocol Message and Menu   engine
+            DsmFwPrgSIMLib.lua    -- Simulation of AR631, FC6250HX  (For GUI development)
+            SetupLib.lua          -- Model Setup Screens
+            msg_fwdp_en.txt       -- `NEW!` Messages for forward programing externalized. To support other langs (english)
+	    ... a few other files
+
+    /SCRIPTS/TOOLS/DSMLIB/img                -- Images for RX orientations
+
+Other Directories
+
+    /MODELS/DSMDATA                 --(ALL CAPITALS) Data of model config (Wing Type, Servo Assignments)
+    /LOGS/dsm_log.txt		    --Readable log of the last RX/TX session, usefull for debugging problems
+
+# NOTE for FC6250HX FC+RX version
+For the full size FC6250HX, Only use V0.55 or newer.
+
+DO NOT use previous versions to do the Setup -> Gyro Settings -> Orientation. The problem was that it did not have the orientation messages.. and you are were choosing blind. The calibration will never stop until you place the RX in the right orientation, even after restarting the RX (if flashing red, is not in the right orientation.. if flashshing white is in the right orientation).  If you run into this problem, and lights are blinking red, rotate the FC on the longer axis until you get white blinking.. keep it stable, will blink white faster andlet calibration finishes.. after that is back to normal.
+
+OpenTX: When you enter "forward programming" you will hear "Telemetry lost" and "Telemetry recovered".. The FC led will blink white, but when exit FP, will blink red...is not problem.. but will need to be power cycled to get blinking green again.. i think is something related to temporarilly loosing the connection with the radio..researching the OpenTX code since it only happens with this helis FC. 
+
+# Common Questions
+1. `RX not accepting channels higher than Ch6 for Flight-mode o Gains:`
+- V0.55 and newer:  Problem solved.. Should allow you to select up to 12ch with the switch technique or with the scroller.
+
+- V0.53/0.54:  The RX is listening to channel changes for this options. Configure the Switch to the channel, togling once the switch will select the channel on the menu field.  
+
+2. `Only able to switch to Fligh-mode 2 and 3, but not 1:`
+Check that the module "Enable max throw" is OFF in you Multi-Module settings (where you do BIND), otherwise the TX signals will be out of range.
+The multi-module is already adjusting the TX/FrSky servo range internally to match Spektrum.
+
+3. `Why Ch1 says Ch1 (TX:Ch3/Thr)?`:
+ Radios with Multi-Module are usually configured to work the standard AETR convention. Spektrum uses TAER. The multi-module does the conversion when transmitting the signals. So `Spektrum Ch1 (Throttle)` really comes from the `TX Ch3`.  We show both information (+name from the TX output).  If your multi-module/radio is setup as TAER, the script will not do the re-arrangement.  
+
+4. `If i change the model name, the original model settings are lost.` This is correct, the model name is used to generate the file name (inside /MODEL/DSMDATA) who stores the model configuration. Currently EdgeTx and OpenTX has differt features where i could get either the Model Name or the YAML file where the EdgeTX model configuration is stored.. to keep the code compatible, the model name is used.
+
+5. `Reversing a channel in my TX do not reverse the AS3X/SAFE reaction.` Correct, the chanel stick direction and the Gyro direction are two separate things.
+
+    5.1: First, you have setup your model so that the sticks and switches moves the surfaces in the right direction.
+ 
+    5.2: Go to the script, `Model Setup` and setup your wing type, tail type, and select the channel assigment for each surface. Leave the servo settings the same as the values in the TX to start.
+ 
+    5.3: Go to `Forward programming->Gyro Setting->Initial Setup` (New/factory reset), or `Forward programming->Gyro Setting->System Setup->Relearn Servo Settings` (not new). This will load your current Gyro servo settings into the plane's RX. This moves the current servo TX settings to the RX, so it is now in a known state.
+ 
+    5.4: Verify that the AS3X and SAFE reacts in the proper direction. You can use the Flight mode configured as "Safe Mode: Auto-Level" to see if it moves the surfaces in the right direction.  
+ 
+    5.5: If a surface don't move in the right direction, go to the `Model Setup->Gyro Channel Reverse` to reverse the Gyro on the channels needed, and do again the `Forward programming->Gyro Setting->System Setup->Relearn Servo Settings` to tranfer the new settings to the RX.
+
+    5.6: Specktrum TX always passes the TX servo reverse as the Gyro Reverse, but on many OpenTX/EdgeTX radios, the Rud/Ail are usually reversed by default compared to Specktrum. So far i don't think that i can use this as a rule, that is why the `Gyro Channel Reverse` page exist. 
+    
+
+
+---
+---
+
+# Changes and fixes 
+V0.56:
+
+1. Fix Tail-Type "Taileron" functionality that was not working. Also validated V-Tail and Delta wings.
+2. Added Taileron and two Rudder config (Many Freewing Jets like F18,F16, etc)
+3. Gyro-Reverse Screen now shows what is the channel/port used for (Ail, Ele, Rud, etc)
+4. COLOR ONLY: Gyro-Reverse Screen now shows what information that shared with the RX about each channel (Role, Slave, Reverse).
+5. NEW!! Initial version of Plane Setup for B&W radios
+
+V0.55a:
+1. Fix loading external messages file for OpenTX.
+   
+V0.55:
+1. Finally found where the TX reports to the RX how many channels is transmiting. The TX now reports itself as a 12ch radio instead of 6h. (DSM Multi-Module limit).  This fixes a few things:
+    
+    
+    a. Many places where you have to select channels > CH6 for Flight-Mode, Gains, Panic now works properly with the scroller. The radio is still validating that you are not selecting an invalid channel. For example, if you have an additional AIL on CH6, it will not allow you to use CH6 for FM or Gains.. it just move to the next valid one.
+
+    b. When setting up AIL/ELE on channels greater than CH6, on previous versions SAFE/AS3X was not moving them.. now they work up correctly.  Set them up in the first in CH1-CH10.  Why CH10?? Thats what fits on the reverse screen, otherwise, have to add more screens.
+
+    c. Some individual Gain channels was not allowing to setup on CH greater than CH6. Now is fixed.
+
+2. User Interface:
+    a. `RTN` Key now works as `Back` when the screen has a `Back`. Makes it easy for navigation.. Presing `RTN` on the main screen exists the tool.
+    b. Much faster refresh of the menus. Optimize the process of send/recive menu data from the RX.
+
+3. The TX now comunicates the SubTrim positions to the RX during `Relearn Servo Setting`. This changes the center of movement to one side or another. Really not much difference with small amounts of subtrim, previous versions where asuming subtrim of 0. When you have an extreame subtrim to one side, it was not moving simetrically.
+
+4. Support for FC6250HX (the one with separate RX).. Setup Swashplate type, RX orientation works properly.. This are menu options that the smaller version that comes in the
+Blade 230S did not have.
+
+
+V0.54:
+1. Fix a problem in the Attitude Trim page (`Gyro Settings->System Setup->SAFE/Panic Setup->Attitude Trim`). It was not saving the values after exiting the menu. This is to change what SAFE considers "Level" flying.
+2. Wings 2-Ail 2-Flaps had a bug on the 2nd flap.
+3. New Minimalistic script (`DsmFwdPrg_05_MIN.lua`): For radios with very low memory (FrSky QX7, RM Zorro, others). It can only change existing settings, but does not have the Plane Setup menus to setup a completly new plane.  In some radios, the very first time it runs (compile + run), it might give you a `not enouth memory` error.. try to run it again.
+4. External menu message file (DSMLIB/msg_fwdp_en.txt and MIN_msg_fwdp_en.txt).  Intial work to do localization and different languages.
+
+V0.53:
+1. Improved channel selection (Flight mode, Panic Channel, Gains Channel). Now during editing a channel, you can select any channel (>Ch4). Also, of you toggle the switch/channel it will populate the screen.
+2. Support for smaller screens (128x64) in B&W. The problem with this older radios is memory. In some, it does not have enouth memory to load the additional DSMLIB libraries.
+3. Fix formatting problem with some TX channel names who could affect the screen.. for example, rud channel should show "Ch4/rud", but shows "Ch4ud" because /r is for right justify formatting on messages. Now the formatting is only if it appears at the end of the message.
+
+V0.52:
+1. Menus to be able to configure Plane in a similar way as Spektrum Radio (v0.52)
+2. Make "Gyro Settings"->"Initial Setup" works (Tested on AR631,AR637xx with PLANE type of aircraft)
+3. Properly reset and restart after initial configuration and SAFE changes.
+4. Write Log of the conversation between RX/TX. To be used for debugging a problem is reported. 
+5. Provide a simulation of RX to do GUI development in Companion, and understand patterns of how the data is organized.
+
+
+# Tested Hardware
+- AR631/AR637xx
+- FC6250HX (Blade 230S V2 Helicopter; FC+RX in one, mini version)
+- FC6250HX (Separate RX.. use only V55 or newer of this tool)
+- AR636 (Blade 230S V1 Heli firmware 4.40)
+
+- Radiomaster TX16S  (All versions)
+
+Please report if you have tested it with other receivers to allow us to update the documentation. Code should work up to 10 channels for the main surfaces (Ail/Ele/etc).  All Spektrum RX are internally 20 channels, so you can use Ch7 for Flight Mode even if your RX is only 6 channels (See common Questions)
+
+
+# Messages Displayed in the GUI
+
+If in a screen you get text that looks like `Unknown_XX` (ex: Unknown_D3), that message has not been setup in the script in english. If you can determine what the proper message is,  you can send us a message to be added to the library.
+The `XX` represents a Hex Number (0..9,A..F)  message ID. 
+
+
+### Version 0.53 and older: 
+If you want to fix it in your local copy, all messages are towards the end in the file `SCRIPT\TOOS\DSMLIB\DsmFwPrgLib.lua`. Messages for Headers are stored in `Text` and messages for Options are stored in `List_Text`.  Lua scripts are text files, and can be edited with Notepad or equivalent.
+
+Portion of DsmFwPrgLib.lua:
+
+    Text[0x0097] = "Factory Reset"
+    Text[0x0098] = "Factory Reset" -- FC6250HX: Title
+    Text[0x0099] = "Advanced Setup"
+    Text[0x009A] = "Capture Failsafe Positions"
+    Text[0x009C] = "Custom Failsafe"
+
+    Text[0x009F] = "Save & Reset RX"  -- TODO: Find the Proper Spektrum Value ??
+
+    Text[0x00A5] = "First Time Setup"
+    Text[0x00AA] = "Capture Gyro Gains"
+    Text[0x00AD] = "Gain Channel Select"
+
+    -- Safe mode options, Inhibit + the values 
+    local safeModeOptions = {0x0003,0x00B0,0x00B1}  -- inh (gap), "Self-Level/Angle Dem, Envelope
+    List_Text[0x00B0] = "Self-Level/Angle Dem"
+    List_Text[0x00B1] = "Envelope"
+
+For example, if you get `Unknown_9D` in the GUI and your now that it should say **NEW Text**, you can edit the lua script to look like this:
+
+    Text[0x009A] = "Capture Failsafe Positions"
+    Text[0x009C] = "Custom Failsafe"
+
+    Text[0x009D] = "NEW Text" -- NEW Text added for AR98xx
+
+    Text[0x009F] = "Save & Reset RX"  -- TODO: Find the proper Spektrum text
+
+### Version 0.54 and newer:
+The menu messages are stored in DSMLIB/msg_fwdp_en.txt (For english). Just add the message there. MIN_msg_fwdp_en.txt has shorter messages overrides for screens who are smaller (for minimalistic 128x64 version).   The reference to the message file is at the file `/DSMLIB/DsmFwPrgLib.lua` if you want to change to use another language.
+
+    T |0x0097|Factory Reset
+    LT|0x00B0|Self-Level/Angle Dem
+    LT|0x00B1|Envelope
+
+
+# LOG File
+
+The log file of the last use of the script is located at `/LOGS/dsm_log.txt`. **It is overridden on every start to avoid filling up the SD card**. So if you want to keep it, copy or rename it before starting the script again. (it can be renamed in the TX by browsing the SD card)
+
+The log is human readable. The first number is the number of seconds since the start, and then what is the current state of the Library, and what has been sent and received. The info in the log can be easily used to create a new simulation for that RX in the future.
+
+Example Log:
+
+    5.340 WAIT_CMD: DSM_GotoMenu(0x1010,LastSelectedLine=0)
+    5.350 MENU_TITLE: SEND DSM_getMenu(MenuId=0x1010 LastSelectedLine=0)
+    5.440 MENU_TITLE: RESPONSE Menu: M[Id=0x1010 P=0x0 N=0x0 B=0x1000 Text="Gyro settings"[0xF9]]
+    5.490 MENU_LINES: SEND DSM_getFirstMenuLine(MenuId=0x1010)
+    5.590 MENU_LINES: RESPONSE MenuLine: L[#0 T=M VId=0x1011 Text="AS3X Settings"[0x1DD]   MId=0x1010 ]
+    5.640 MENU_LINES: SEND DSM_getNextLine(MenuId=0x1010,LastLine=0)
+    5.740 MENU_LINES: RESPONSE MenuLine: L[#1 T=M VId=0x1019 Text="SAFE Settings"[0x1E2]   MId=0x1010 ]
+    5.790 MENU_LINES: SEND DSM_getNextLine(MenuId=0x1010,LastLine=1)
+    5.850 MENU_LINES: RESPONSE MenuLine: L[#2 T=M VId=0x1021 Text="F-Mode Setup"[0x87]   MId=0x1010 ]
+    5.910 MENU_LINES: SEND DSM_getNextLine(MenuId=0x1010,LastLine=2)
+    5.970 MENU_LINES: RESPONSE MenuLine: L[#3 T=M VId=0x1022 Text="System Setup"[0x86]   MId=0x1010 ]
+    6.020 MENU_LINES: SEND DSM_getNextLine(MenuId=0x1010,LastLine=3
+
+# Validation of data by the RX
+
+The RX validates the data. if you change to an invalid channel or do a invalid number range, the RX will change it at the end of editing the field.
+
+---
+# Version 0.53
+- Improve Channel selection in menus
+- Support smaller screens 128x64 in the black/white mode.
+
+# Version 0.52
+- Fix Reversing of Servos
+- Properly detect Multimodule Ch settings AETR 
+---
+
+# Version 0.51  (volunteer testing version, not for production)
+- New Screens to Configure Model (Wing Type/Tail Tail, etc)
+- Finally got understanding that the previous unknown 0x05 lines are to send Model/Servo data to RX.
+- Fix use of AR636B (Firmware version 4.40.0 for Blade 230 heli, is the only one with Forward Programming)
+- Aircraft types:  Tested With Plane type only.. Glider and other in progress
+
+### Known Problems:
+- 4-Servo Wing type (Dual Ail/Tail) in planes give conflicting servo assignments by defaults.. Solution choose your own Ch.
+- Glider, Heli, Drone: Still in development. In glider, only a few wing type works.. needs to restrict menu options for the only valid one.
+
+
+# Version 0.5
+
+- Make the code more readable and understandable
+- Separate the DSM Forwards Programming logic from the GUI
+- Log the communication with the RX on a /LOGS/dsm_log.txt to allow to debug it easier 
+	and see the exchange of data between the RX/TX
+- Created a black/white Text only version with only Key/Roller Inputs
+- Created a nicer GUI for EdgeTX touch screen color Radios
+- RX simulation for GUI development:  turn on `SIMULATION_ON=true` in the beginning of the lua file
+- Test it on AR631, AR637xx, FC6250HX (Helicopter)
+
+### Some settings that can change (top of Lua file):
+    SIMULATION_ON = false   -- FALSE: hide similation menu (DEFAULT), TRUE: show RX simulation menu 
+	DEBUG_ON = 1           -- 0=NO DEBUG, 1=HIGH LEVEL 2=LOW LEVEL   (Debug logged into the /LOGS/dsm_log.txt)
+	USE_SPECKTRUM_COLORS = true -- true: Use spectrum colors, false: use theme colors (default on OpenTX, OpenTX handle colors different) 
+
+
+### Known Problems:
+1. **Incorrect List Value Options:** Some Menu List line (`LINE_TYPE.LIST_MENU1` or `L_m1` in logs), the range (min/max) of valid values seems to be incorrect, but the RX corrects the values.
+in the MINimalistic version, the RX is doing all the range validation, and will show invalid options temporarilly. In an Spektrum radio, it happens so fast, that you don't notice it, but in LUA scripts who are slower, you can see it in the screen. 
+In the COLOR version, The code has hardcoded the valid ranges to avoid this problem.
+
+2. Glider/Heli/Drone wing types not ready.
+
+For Helicopter, use airplane normal wing and normal tail
+
+
+# Version 0.2
+Original Version from Pascal Langer
+ 

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
@@ -89,6 +89,8 @@
 58,0,FX,816,1
 58,1,FX,620,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
 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
@@ -108,6 +110,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
 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
@@ -119,9 +122,10 @@
 49,0,KF606,KF606,1,Trim
 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
-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
+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
@@ -129,14 +133,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
@@ -155,7 +161,8 @@
 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,3,RadioLink,RC4G,0,CH5,FS_CH1,FS_CH2,FS_CH3,FS_CH4
+76,0,Realacc,Std,1,Flip,Light,Calib,HLess,RTH,ThCut,Rotat
 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
@@ -166,14 +173,16 @@
 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,6G_3D
@@ -185,7 +194,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
+99,1,XK2,P10,0,Rate,Mode,Hover,Light
 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
@@ -198,14 +210,28 @@
 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
+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
-92,0,MT99xx2,PA18,0,MODE,FLIP,RTH
 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

Lua_scripts/MultiConfig.lua

@@ -135,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
@@ -319,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)
@@ -334,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

Lua_scripts/README.md

@@ -58,15 +58,11 @@ This is the Graupner HoTT adapted version of the Model Locator script using RSSI
 
 The OpenTX sensor "RSSI" is populated by the individual OpenTX telemetry protocol implementations and returns a value from 0..100 (percent) originating from the early FrSky implementation. It turns out that FrSky did not really provide a genuine signal strength indicator in units of dbm but a link quality indicator in 0..100%. With Graupner HoTT the link quality indicator is not a good basis for the model locator as it is very non-linear and doesn't change much with distance. Using the Graupner HoTT telemetry sensor "Rssi" which is a true signal strength indicator serves the purpose of locating a model much better as it varies much more with distance.
 
-## DSM Forward Programming
+## DSM Tools for EdgeTX and OpenTx
 
-This is a work in progress. It's available for color(+touch) and B&W screens.
+Collection of EdgeTx/OpenTX Tools to use with Spektrum Receivers including forward programming. Located on the radio SD card under \SCRIPTS\TOOLS, make sure to copy the DSMLIB folder!
 
-Work on OpenTX and EdgeTX. Located on the radio SD card under \SCRIPTS\TOOLS, make sure to copy the DSMLIB folder along with DSM FwdPrg_05_Color.lua or DSM FwdPrg_05_BW.lua.
-
-[![DSM Forward Programming](https://img.youtube.com/vi/sjIaDw5j9nE/0.jpg)](https://www.youtube.com/watch?v=sjIaDw5j9nE)
-
-If some text appears as Unknown_xxx, please report xxx and what the exact text display should be.
+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
 

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);

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();

Multiprotocol/AFHDS2A_a7105.ino

@@ -93,15 +93,16 @@ 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]);
+			#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 +187,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 +234,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 +242,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 +298,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
@@ -367,10 +385,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
@@ -448,9 +495,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

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

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

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);
 }
 

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++;

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
@@ -267,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
@@ -277,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;

Multiprotocol/DSM_cyrf6936.ino

@@ -18,16 +18,21 @@
 #include "iface_cyrf6936.h"
 
 //#define DSM_DEBUG_FWD_PGM
+//#define DEBUG_BIND  1
 
-//#define DSM_GR300
+#define CLONE_BIT_MASK			0x20
+#define DSM_BIND_CHANNEL		0x0D	//13 This can be any odd channel
+#define DSM2_SFC_PERIOD			16500
 
-#define CLONE_BIT_MASK 0x20 
-
-#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,
@@ -89,9 +94,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)
@@ -104,7 +112,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++)
@@ -118,8 +125,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();
 }
 
@@ -131,8 +138,13 @@ static void __attribute__((unused)) DSM_update_channels()
 	if(num_ch<3 || num_ch>12)
 		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;
@@ -168,19 +180,25 @@ 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;
-	}
-
+	#endif
+	
 	#ifdef DSM_THROTTLE_KILL_CH
 		uint16_t kill_ch=Channel_data[DSM_THROTTLE_KILL_CH-1];
 	#endif
@@ -258,27 +276,33 @@ 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)
+		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:
@@ -292,11 +316,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:
@@ -312,10 +339,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;
@@ -340,6 +369,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 ;
 			}
@@ -351,25 +383,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]);
@@ -406,41 +451,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
 			{
@@ -448,10 +504,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)
@@ -472,19 +524,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
 	}
@@ -492,6 +545,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 },
@@ -515,22 +569,25 @@ 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)
 	{
-		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]);
-		}
+		#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
 	{
@@ -539,29 +596,33 @@ void DSM_init()
 			if(eeprom_read_byte((EE_ADDR)DSM_CLONE_EEPROM_OFFSET+4)==0xF0)
 			{
 				//read cloned ID from EEPROM
-				debugln("Using cloned ID");
 				uint16_t temp = DSM_CLONE_EEPROM_OFFSET;
 				for(uint8_t i=0;i<4;i++)
 					cyrfmfg_id[i] = eeprom_read_byte((EE_ADDR)temp++);
-				debug("Clone ID=")
-				for(uint8_t i=0;i<4;i++)
-					debug("%02x ", cyrfmfg_id[i]);
-				debugln("");
+				#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;
-				debugln("No valid cloned ID");
+				#if DEBUG_BIND
+				  debugln("No valid cloned ID");
+				#endif
 			}
 		}
 		else
 		{
-			SUB_PROTO_VALID;
+			//SUB_PROTO_VALID;
 			CYRF_GetMfgData(cyrfmfg_id);
+			//Model match
+			cyrfmfg_id[3]^=RX_num;
 		}
 	}
-	//Model match
-	cyrfmfg_id[3]^=RX_num;
 
 	//Calc sop_col
 	sop_col = (cyrfmfg_id[0] + cyrfmfg_id[1] + cyrfmfg_id[2] + 2) & 0x07;
@@ -572,8 +633,8 @@ void DSM_init()
 		//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;
+			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;
 		}
 	}
 
@@ -586,7 +647,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];
@@ -610,9 +671,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

Multiprotocol/Devo_cyrf6936.ino

@@ -365,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];
 }

Multiprotocol/E129_cyrf6936.ino

@@ -41,7 +41,8 @@ static void __attribute__((unused)) E129_build_data_packet()
 	}
 	else
 	{
-		packet[ 1] = 0xA6;
+		packet[ 1] = 0xA6;								// Set to A5 every few packets??
+
 		//Flags
 		if(sub_protocol == E129_E129)
 			packet[ 2] = 0xF7;							// High rate 0xF7, low 0xF4
@@ -53,9 +54,18 @@ static void __attribute__((unused)) E129_build_data_packet()
 			packet[15] = bit_reverse(rx_tx_addr[0]);
 			packet[16] = bit_reverse(rx_tx_addr[1]);
 		}
-		//packet[ 3] = 0x00;							// E129 Mode: short press=0x20->0x00->0x20->..., long press=0x10->0x30->0x10->... => C186 throttle trim is doing the same:up=short press and down=long press
-		packet[ 4] = GET_FLAG(CH5_SW, 0x20)				// Take off/Land 0x20
-				   | GET_FLAG(CH6_SW, 0x04);			// Emergency stop 0x04
+		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;
@@ -80,13 +90,11 @@ static void __attribute__((unused)) E129_build_data_packet()
 		packet[12] = val;								// channel (0x000...0x200...0x3FF)
 	}
 	//Check
-	if(sub_protocol == E129_E129)
-		packet[packet_length-2] = packet[0] + packet[1];
-	else
-		packet[packet_length-2] = 0x24 + packet[0] + (packet[1]&0x03);	// ??
-	for(uint8_t i=2;i<packet_length-2;i++)
+	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);
 }
 

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

Multiprotocol/FX_nrf24l01.ino

@@ -33,16 +33,25 @@ Multiprotocol is distributed in the hope that it will be useful,
 #define FX620_PAYLOAD_SIZE			7
 #define FX620_CH_OFFSET				1
 
-#define FX9630_PACKET_PERIOD		8124
-#define FX9630_BIND_PACKET_PERIOD	8124
+#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 FORCE_FX620_ID
 //#define FORCE_FX9630_ID
 //#define FORCE_QIDI_ID
 
+enum 
+{
+	FX_DATA=0,
+	FX_RX,
+};
+
 static void __attribute__((unused)) FX_send_packet()
 {
 	static uint8_t trim_ch = 0;
@@ -51,17 +60,21 @@ static void __attribute__((unused)) FX_send_packet()
 	if(IS_BIND_DONE)
 	{
 		XN297_Hopping(hopping_frequency_no++);
-		if(sub_protocol == FX9630)
-		{
-			XN297_SetTXAddr(rx_tx_addr, 4);
+		if(sub_protocol >= FX9630)
+		{ // FX9630 & FX_Q560 & FX_QF012
 			if (hopping_frequency_no >= FX9630_NUM_CHANNELS)
 			{
 				hopping_frequency_no = 0;
-				trim_ch++;
-				if(trim_ch > 3) trim_ch = 0;
+				if(sub_protocol == FX9630)
+				{
+					trim_ch++;
+					trim_ch &= 3;
+				}
+				else // FX_Q560 & FX_QF012
+					trim_ch = 0;
 			}
 		}
-		else // FX816 and FX620
+		else // FX816 & FX620
 		{
 			hopping_frequency_no &= 0x03;
 		}
@@ -71,8 +84,8 @@ static void __attribute__((unused)) FX_send_packet()
 
 	//Channels
 	uint8_t val;
-	if (sub_protocol == FX9630)
-	{
+	if (sub_protocol >= FX9630)
+	{ // FX9630 & FX_Q560 & FX_QF012
 		packet[0] = convert_channel_8b(THROTTLE);
 		packet[1] = convert_channel_8b(AILERON);
 		packet[2] = 0xFF - convert_channel_8b(ELEVATOR);
@@ -80,12 +93,18 @@ static void __attribute__((unused)) FX_send_packet()
 		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, 0x01)  // DR toggle swich: 0 small throw, 1 large throw
+					| 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
-					| ((Channel_data[CH6] < CHANNEL_MIN_COMMAND ? 0x00 : (Channel_data[CH6] > CHANNEL_MAX_COMMAND ? 0x02 : 0x01)) << 1);
+					// 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 // FX816 and FX620
+	else // FX816 & FX620
 	{
 		uint8_t offset=sub_protocol == FX816 ? FX816_CH_OFFSET:FX620_CH_OFFSET;
 		val=convert_channel_8b(AILERON);
@@ -123,7 +142,7 @@ static void __attribute__((unused)) FX_send_packet()
 			packet[5] = 0xAB;	// Is it based on ID??
 		}
 	}
-	else // FX9630
+	else // FX9630 & FX_Q560 & FX_QF012
 	{
 		if(IS_BIND_IN_PROGRESS)
 		{
@@ -136,12 +155,12 @@ static void __attribute__((unused)) FX_send_packet()
 
 	//Check
 	uint8_t last_packet_idx = packet_length-1;
-	if (sub_protocol == FX9630 && IS_BIND_IN_PROGRESS)
+	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)
+	if (sub_protocol >= FX9630)
 		val = val ^ 0xFF;
 	packet[last_packet_idx]=val;
 
@@ -175,11 +194,11 @@ static void __attribute__((unused)) FX_RF_init()
 		packet_period = FX620_BIND_PACKET_PERIOD;
 		packet_length = FX620_PAYLOAD_SIZE;
 	}
-	else // FX9630
+	else // FX9630 & FX_Q560 & FX_QF012
 	{
 		XN297_SetTXAddr((uint8_t *)"\x56\x78\x90\x12", 4);
 		XN297_RFChannel(FX9630_BIND_CHANNEL);
-		packet_period = FX9630_BIND_PACKET_PERIOD;
+		packet_period = sub_protocol == FX_QF012 ? FX_QF012_PACKET_PERIOD : FX9630_PACKET_PERIOD;
 		packet_length = FX9630_PAYLOAD_SIZE;
 	}
 }
@@ -207,40 +226,98 @@ static void __attribute__((unused)) FX_initialize_txid()
 		for(uint8_t i=1;i<FX_NUM_CHANNELS;i++)
 			hopping_frequency[i] = i*10 + hopping_frequency[0];
 	}
-	else // FX9630
+	else // FX9630 & FX_Q560 & FX_QF012
 	{
+		//??? Need to find out how the first RF channel is calculated ???
+		hopping_frequency[0] = 0x13;
+		//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
-		#else
-			hopping_frequency[0] = 0x13; // constant???
-			hopping_frequency[1] = RX_num & 0x0F + 0x1A;
-			hopping_frequency[2] = rx_tx_addr[3] & 0x0F + 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
-		//??? Need to find out how the first RF channel is calculated ???
 	}
 }
 
 uint16_t FX_callback()
 {
-	#ifdef MULTI_SYNC
-		telemetry_set_input_sync(packet_period);
-	#endif
-	if(bind_counter)
-		if(--bind_counter==0)
+	#ifdef FX_HUB_TELEMETRY
+		bool rx=false;
+		
+		switch(phase)
 		{
-			BIND_DONE;
-			if(sub_protocol == FX620)
-			{
-				XN297_SetTXAddr(rx_tx_addr, 3);
-				packet_period = FX620_PACKET_PERIOD;
-			}
+			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 < FX9630)
+					break;
+				if(rx)
+				{
+					debug("RX");
+					if(XN297_ReadPayload(packet_in, FX_QF012_RX_PAYLOAD_SIZE))
+					{//Good CRC
+						//packets: A5 00 11 -> A5 01 11
+						telemetry_link = 1;
+						v_lipo1 = packet_in[1] ? 60:81;		// 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();
+				}
+				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;
 		}
-	FX_send_packet();
+	#endif
 	return packet_period;
 }
 
@@ -251,6 +328,10 @@ void FX_init()
 	FX_RF_init();
 	hopping_frequency_no = 0;
 	bind_counter=FX_BIND_COUNT;
+	#ifdef FX_HUB_TELEMETRY
+		RX_RSSI = 100;		// Dummy value
+		phase = FX_DATA;
+	#endif
 }
 
 #endif

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

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()

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,87 @@ 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(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 +144,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 +175,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 +197,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 +224,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 +311,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

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}; // unneeded since this is the default table after a reset
+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];
 }
 

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;
+}
+*/

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)

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

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

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;

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

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;
 	}

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)
@@ -96,6 +96,16 @@ enum{
 	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[] = {
 	0x01, 0x11, 0x02, 0x12, 0x03, 0x13, 0x04, 0x14, 
 	0x05, 0x15, 0x06, 0x16, 0x07, 0x17, 0x00, 0x10
@@ -179,8 +189,8 @@ static void __attribute__((unused)) MT99XX_send_packet()
 			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 );
 			if(sub_protocol != PA18+8)
 				packet[7] = h7_mys_byte[hopping_frequency_no];			// next rf channel index ?
@@ -271,6 +281,14 @@ static void __attribute__((unused)) MT99XX_send_packet()
 					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++)
@@ -319,7 +337,7 @@ static void __attribute__((unused)) MT99XX_send_packet()
 	XN297_SetTxRxMode(TX_EN);
 	XN297_WritePayload(packet, MT99XX_PACKET_SIZE);
 	
-	#if 0
+	#if 1
 		for(uint8_t i=0; i<MT99XX_PACKET_SIZE; i++)
 			debug(" %02X",packet[i]);
 		debugln();

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

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
 12,CX10,GREEN,BLUE,DM007,---,J3015_1,J3015_2,MK33041
 13,CG023,CG023,YD829
 14,Bayang,Bayang,H8S3D,X16_AH,IRDRONE,DHD_D4,QX100
@@ -23,9 +23,9 @@
 23,FQ777
 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,7 +40,7 @@
 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
@@ -55,11 +55,11 @@
 55,Frsky_RX,Multi,CloneTX,EraseTX,CPPM
 56,AFHDS2A_RX,Multi,CPPM
 57,HoTT,Sync,No_Sync
-58,FX,816,620,9630
+58,FX,816,620,9630,Q560,QF012
 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
@@ -71,9 +71,9 @@
 71,JJRC345,JJRC345,SkyTmblr
 72,Q90C
 73,Kyosho,FHSS,Hype
-74,RadioLink,Surface,Air,DumboRC
+74,RadioLink,Surface,Air,DumboRC,RC4G
 75,---
-76,Realacc,R11
+76,Realacc
 77,OMP
 78,M-Link
 79,WFLY,RF20x
@@ -86,8 +86,19 @@
 87,IKEA
 88,WILLIFM
 89,Losi
-90,MouldKg,Analog,Digit
+90,MouldKg,A4444,D4444,A664
 91,Xerall
-92,MT99xx,PA18
+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

Multiprotocol/Multi_Protos.ino

@@ -36,6 +36,7 @@ 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";
@@ -55,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";
@@ -78,11 +80,11 @@ 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_FX[]		="FX";
+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";
@@ -106,6 +108,16 @@ 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_SUBTYPE_FLYSKY[] =     "\x04""Std\0""V9x9""V6x6""V912""CX20";
 const char STR_SUBTYPE_HUBSAN[] =     "\x04""H107""H301""H501";
@@ -118,24 +130,24 @@ const char STR_SUBTYPE_FRSKYD[] =     "\x06""D8\0   ""Cloned";
 const char STR_SUBTYPE_HISKY[] =      "\x05""Std\0 ""HK310";
 const char STR_SUBTYPE_V2X2[] =       "\x06""Std\0  ""JXD506""MR101\0";
 #ifndef MULTI_EU
-	const char STR_SUBTYPE_DSM[] =        "\x04""2 1F""2 2F""X 1F""X 2F""Auto""R 1F";
+	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";
+	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";
 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";
+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_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";
@@ -144,18 +156,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_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";
@@ -165,16 +178,18 @@ 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[] =       "\x05""3ch\0 ""4ch\0 ""TOPRC";
-const char STR_SUBTYPE_RLINK[] =      "\x07""Surface""Air\0   ""DumboRC";
-const char STR_SUBTYPE_REALACC[] =    "\x03""R11";
+const char STR_SUBTYPE_RLINK[] =      "\x07""Surface""Air\0   ""DumboRC""RC4G\0  ";
 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_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[] =         "\x04""816\0""620\0""9630";
+const char STR_SUBTYPE_FX[] =         "\x05""816\0 ""620\0 ""9630\0""Q560\0""QF012";
+const char STR_SUBTYPE_SGF22[] =      "\x04""F22\0""F22S""J20\0";
+const char STR_SUBTYPE_JIABAILE[] =   "\x04""Std\0""Gyro";
 #define NO_SUBTYPE		nullptr
 
 #ifdef SEND_CPPM
@@ -222,6 +237,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
@@ -250,7 +271,7 @@ 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_SUB_DSM_RX,  DSMCPPM, OPTION_NONE,    0, 1, SW_CYRF,   DSM_RX_init,     DSM_RX_callback     },
@@ -270,6 +291,9 @@ const mm_protocol_definition multi_protocols[] = {
 	#if defined(E129_CYRF6936_INO)
 		{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       },
 	#endif
@@ -283,7 +307,7 @@ 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 },
@@ -320,7 +344,7 @@ const mm_protocol_definition multi_protocols[] = {
 		{PROTO_FUTABA,     STR_FUTABA,    STR_SUBTYPE_FUTABA,    1, OPTION_RFTUNE,  1, 1, SW_CC2500, SFHSS_init,      SFHSS_callback      },
 	#endif
 	#if defined(FX_NRF24L01_INO)
-		{PROTO_FX,         STR_FX,        STR_SUBTYPE_FX,        3, OPTION_NONE,    0, 0, SW_NRF,    FX_init,         FX_callback         },
+		{PROTO_FX,         STR_FX,        STR_SUBTYPE_FX,        5, 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      },
@@ -331,6 +355,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
@@ -344,7 +371,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       },
@@ -358,12 +385,18 @@ 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,     3, OPTION_RFTUNE,  0, 0, SW_NRF,    KF606_init,      KF606_callback      },
 	#endif
@@ -376,6 +409,9 @@ const mm_protocol_definition multi_protocols[] = {
 	#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
@@ -389,13 +425,13 @@ 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,     1, OPTION_NONE,    0, 0, SW_NRF,    MT99XX_init,     MT99XX_callback     },
+		{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        },
@@ -422,10 +458,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,     4, 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,   NO_SUBTYPE,            0, 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    },
@@ -436,23 +472,29 @@ const mm_protocol_definition multi_protocols[] = {
 	#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,     3, 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,       7, 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       },
@@ -463,9 +505,6 @@ const mm_protocol_definition multi_protocols[] = {
 	#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
@@ -473,18 +512,31 @@ 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(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
@@ -539,7 +591,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
@@ -549,16 +604,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

Multiprotocol/Multiprotocol.h

@@ -18,8 +18,8 @@
 //******************
 #define VERSION_MAJOR		1
 #define VERSION_MINOR		3
-#define VERSION_REVISION	3
-#define VERSION_PATCH_LEVEL	33
+#define VERSION_REVISION	4
+#define VERSION_PATCH_LEVEL	50
 
 #define MODE_SERIAL 0
 
@@ -75,7 +75,7 @@ enum PROTOCOLS
 	PROTO_NCC1701	= 44,	// =>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
@@ -89,7 +89,7 @@ enum PROTOCOLS
 	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
@@ -122,6 +122,18 @@ enum PROTOCOLS
 	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_NANORF	= 126,	// =>NRF24L01
 	PROTO_TEST		= 127,	// =>CC2500
@@ -147,14 +159,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
 {
@@ -169,6 +180,7 @@ enum DSM
 	DSMX_2F		= 3,
 	DSM_AUTO	= 4,
 	DSMR		= 5,
+	DSM2_SFC	= 6,
 };
 enum DSM_RX
 {
@@ -196,11 +208,13 @@ 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,
 };
 enum CX10
 {
@@ -247,7 +261,8 @@ enum MT99XX
 };
 enum MT99XX2
 {
-	PA18	= 0,
+	PA18	= 0,  
+	SU35	= 1,
 };
 enum MJXQ
 {
@@ -275,10 +290,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
 {
@@ -356,7 +372,8 @@ enum REDPINE
 };
 enum TRAXXAS
 {
-	RX6519	= 0,
+	TRAXXAS_TQ2	= 0,
+	TRAXXAS_TQ1	= 1,
 };
 enum ESKY150
 {
@@ -372,6 +389,7 @@ enum XK
 {
 	X450	= 0,
 	X420	= 1,
+	XK_CARS	= 2,
 };
 enum XN297DUMP
 {
@@ -381,6 +399,7 @@ enum XN297DUMP
 	XN297DUMP_AUTO	= 3,
 	XN297DUMP_NRF	= 4,
 	XN297DUMP_CC2500	= 5,
+	XN297DUMP_XN297	= 6,
 };
 enum FRSKY_R9
 {
@@ -447,11 +466,13 @@ enum RLINK
 	RLINK_SURFACE	= 0,
 	RLINK_AIR		= 1,
 	RLINK_DUMBORC	= 2,
+	RLINK_RC4G		= 3,
 };
 enum MOULDKG
 {
-	MOULDKG_ANALOG	= 0,
-	MOULDKG_DIGIT	= 1,
+	MOULDKG_ANALOG4	= 0,
+	MOULDKG_DIGIT4	= 1,
+	MOULDKG_ANALOG6	= 2,
 };
 enum KF606
 {
@@ -469,6 +490,24 @@ enum FX
 	FX816			= 0,
 	FX620			= 1,
     FX9630          = 2,
+	FX_Q560			= 3,
+	FX_QF012		= 4,
+};
+enum SGF22
+{
+	SGF22_F22		= 0,
+	SGF22_F22S		= 1,
+	SGF22_J20 		= 2,
+};
+enum JIABAILE
+{
+	JIABAILE_STD	= 0,
+	JIABAILE_GYRO	= 1,
+};
+enum XK2
+{
+	XK2_X4	= 0,
+	XK2_P10	= 1,
 };
 
 #define NONE 		0
@@ -829,8 +868,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 DSM_CLONE_EEPROM_OFFSET 1074	// (4) TX ID, (1) Initialized, end is 1079
-//#define CONFIG_EEPROM_OFFSET 	1079	// 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
@@ -919,7 +961,6 @@ Serial: 100000 Baud 8e2      _ xxxx xxxx p --
 				FX		58
 				BAYANG_RX	59
 				PELIKAN		60
-				TIGER		61
 				XK			62
 				XN297DUMP	63
 				FRSKYX2		64
@@ -1090,6 +1131,8 @@ Serial: 100000 Baud 8e2      _ xxxx xxxx p --
 			Q100		2
 			Q200		3
 			MR100		4
+			SLT_V1_4CH	5
+			RF_SIM		6
 		sub_protocol==E01X
 			E012		0
 			E015		1
@@ -1100,7 +1143,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

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;

Multiprotocol/REALACC_nrf24l01.ino

@@ -18,7 +18,7 @@ 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 REALACC_INITIAL_WAIT		500
 #define REALACC_PACKET_PERIOD		2268
@@ -30,7 +30,7 @@ Multiprotocol is distributed in the hope that it will be useful,
 
 static void __attribute__((unused)) REALACC_send_packet()
 {
-	packet[ 0]= 0xDC;
+	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
@@ -39,16 +39,17 @@ static void __attribute__((unused)) REALACC_send_packet()
 	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
+	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);				//   Unknown
+		| 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);
@@ -59,31 +60,50 @@ 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);
+	packet[0] = 0xB1;							// B0/B1
+	memcpy(&packet[1],rx_tx_addr,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
+	#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
+
 }
 
 static void __attribute__((unused)) REALACC_RF_init()
@@ -129,18 +149,39 @@ 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
 // 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

Multiprotocol/RadioLink_cc2500.ino

@@ -18,7 +18,11 @@
 
 #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
@@ -97,16 +101,70 @@ static void __attribute__((unused)) RLINK_hop()
 
 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();
+	else
+	{//RLINK_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
+	}
 
- 	#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]);
@@ -138,7 +196,9 @@ static void __attribute__((unused)) RLINK_rf_init()
 		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);
@@ -172,7 +232,7 @@ static void __attribute__((unused)) RLINK_send_packet()
 			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
+			packet[1] |= 0x01;					//always 0x00 on dump but does appear to support telemtry on newer transmitters
 			break;
 	}
 	
@@ -219,18 +279,79 @@ static void __attribute__((unused)) RLINK_send_packet()
 	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[pseudo & 0x0F]);
+		debug("P=");
+		for(uint8_t i=1;i<RLINK_TX_PACKET_LEN+1;i++)
+			debug(" 0x%02X",packet[i]);
+		debugln("");
+	#endif
 }
 
+#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 orginal 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
+
 #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
 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:
@@ -259,13 +380,17 @@ uint16_t RLINK_callback()
 			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
 			{
-				//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])
+				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] || sub_protocol == RLINK_DUMBORC))
 				{//Correct telemetry received: length, CRC, ID and type
-					//Debug
-					//for(uint8_t i=0;i<len;i++)
-					//	debug(" %02X",packet_in[i]);
+				 //packet_in[6] is 0x00 on almost all DumboRC RX so assume it is always valid
+					#ifdef RLINK_DEBUG_TELEM
+						for(uint8_t i=0;i<len;i++)
+							debug(" %02X",packet_in[i]);
+					#endif
 					TX_RSSI = packet_in[len-2];
 					if(TX_RSSI >=128)
 						TX_RSSI -= 128;
@@ -278,7 +403,9 @@ uint16_t RLINK_callback()
 					pps_counter++;
 					packet_count=0;
 				}
-				//debugln("");
+				#ifdef RLINK_DEBUG_TELEM
+					debugln("");
+				#endif
 			}
 			if (millis() - pps_timer >= 2000)
 			{//1 telemetry packet every 100ms

Multiprotocol/SGF22_nrf24l01.ino

@@ -0,0 +1,269 @@
+/*
+ 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 SGF22_PACKET_PERIOD				11950 //10240
+#define SGF22_BIND_RF_CHANNEL			78
+#define SGF22_PAYLOAD_SIZE				12
+#define SGF22_BIND_COUNT				50
+#define SGF22_RF_NUM_CHANNELS			4
+#define SGF22_F22S_BIND_RF_CHANNEL		10
+#define SGF22_J20_BIND_RF_CHANNEL  		28
+
+//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;
+		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
+		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; 
+	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);
+	XN297_WriteEnhancedPayload(packet, SGF22_PAYLOAD_SIZE,0);
+	#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 sze...
+	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
+	#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}; 
+	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

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?
+*/

Multiprotocol/SLT_ccnrf.ino

@@ -19,13 +19,15 @@
 #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
 
 enum{
 	// flags going to packet[6] (Q200)
@@ -72,12 +74,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 +95,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 +137,55 @@ 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)
+
+	//->V1 stops here
+
+	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;
 }
 
 static void __attribute__((unused)) SLT_send_bind_packet()
@@ -177,8 +196,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)
 		SLT_send_packet(SLT_TXID_SIZE);
 	else // SLT_BIND1
 		SLT_send_packet(SLT_PAYLOADSIZE_V2);
@@ -186,6 +205,7 @@ 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
@@ -195,8 +215,9 @@ uint16_t SLT_callback()
 	switch (phase)
 	{
 		case SLT_BUILD:
+			//debugln_time("b ");
 			#ifdef MULTI_SYNC
-				telemetry_set_input_sync(sub_protocol==SLT_V1?20000:13730);
+				telemetry_set_input_sync(packet_period);
 			#endif
 			SLT_build_packet();
 			NRF250K_SetPower();					//Change power level
@@ -206,42 +227,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 +268,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 +284,36 @@ void SLT_init()
 	packet_count = 0;
 	packet_sent = 0;
 	hopping_frequency_no = 0;
-	if(sub_protocol==Q200)
+
+	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 +322,13 @@ 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;
 }
 
 #endif
+//SLT v1_4ch timing
+//268363 + 1643 / 15 = 18000

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,324 @@ 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] 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
 */
 #endif

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
-*/

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

Multiprotocol/V761_nrf24l01.ino

@@ -118,9 +118,10 @@ 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
+		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
 	}
@@ -243,7 +244,7 @@ uint16_t V761_callback()
 			else
 			{
 				packet_count++;
-				if(!telemetry_lost && !rx && (packet_count%64) == 0)
+				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

Multiprotocol/V911S_ccnrf.ino

@@ -35,6 +35,8 @@
 // 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()
 {
@@ -74,7 +76,9 @@ static void __attribute__((unused)) V911S_send_packet()
 		{
 			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
+			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

Multiprotocol/Validate.h

@@ -266,6 +266,7 @@
 	#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
@@ -312,6 +313,7 @@
 	#undef	CX10_NRF24L01_INO
 	#undef	DM002_NRF24L01_INO
 	#undef	E016H_NRF24L01_INO
+	#undef	EAZYRC_NRF24L01_INO
 	#undef	ESKY_NRF24L01_INO
 	#undef	ESKY150_NRF24L01_INO
 	#undef	FQ777_NRF24L01_INO
@@ -319,9 +321,12 @@
 	#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
@@ -330,16 +335,20 @@
 	#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	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) ) || defined MULTI_EU
+	#undef	BLUEFLY_CCNRF_INO
+	#undef	BUMBLEB_CCNRF_INO
 	#undef	GD00X_CCNRF_INO
 	#undef	KF606_CCNRF_INO
 	#undef	MJXQ_CCNRF_INO
@@ -348,8 +357,19 @@
 	#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 defined(MCU_STM32F103C8)	// Save flash space...
+	#undef	BUMBLEB_CCNRF_INO
+	#undef	Q303_CCNRF_INO
+	#undef	Q90C_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...
@@ -363,6 +383,84 @@
 	#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
+	//Save flash space...
+	#undef	CABELL_NRF24L01_INO
+	#undef	REDPINE_CC2500_INO
+#endif
+
+#ifdef MULTI_SURFACE
+	#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
+	#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
@@ -399,6 +497,11 @@
 	#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
@@ -437,6 +540,21 @@
 	#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
@@ -494,7 +612,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(V761_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

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;

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

Multiprotocol/XK2_ccnrf.ino

@@ -0,0 +1,431 @@
+/*
+ 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
+		//Requiest 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
+*/

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;

Multiprotocol/XN297Dump_nrf24l01.ino

@@ -23,7 +23,7 @@
 
 // Parameters which can be modified
 #define XN297DUMP_PERIOD_SCAN		50000 	// 25000
-#define XN297DUMP_MAX_RF_CHANNEL	127		// Default 84
+#define XN297DUMP_MAX_RF_CHANNEL	84		// Default 84
 
 // Do not touch from there
 #define XN297DUMP_INITIAL_WAIT		500
@@ -37,6 +37,7 @@ boolean enhanced;
 boolean ack;
 uint8_t pid;
 uint8_t bitrate;
+uint8_t old_option;
 
 static void __attribute__((unused)) XN297Dump_RF_init()
 {
@@ -185,6 +186,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;
@@ -369,8 +371,14 @@ static uint16_t XN297Dump_callback()
 								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);
@@ -390,9 +398,34 @@ static uint16_t XN297Dump_callback()
 						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 +435,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]);
+							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 +462,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,6 +494,7 @@ static uint16_t XN297Dump_callback()
 								for(uint8_t i=0;i<packet_length;i++)
 									debug(" %02X",packet[i]);
 								packet_count++;
+								nbr_rf[rf_ch_num-1]=packet_count;
 								if(packet_count>20)
 								{//change channel
 									bind_counter=XN297DUMP_PERIOD_SCAN+1;
@@ -483,15 +517,15 @@ static uint16_t XN297Dump_callback()
 						{
 							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 +545,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 +561,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 +586,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
 								{
@@ -609,12 +643,11 @@ static uint16_t XN297Dump_callback()
 		{
 			if(phase==0)
 			{
-				address_length=3;
-				memcpy(rx_tx_addr, (uint8_t *)"\xBD\x54\x78", address_length); //"\x62\xE6\xBD\x54\x78"
-
-				bitrate=XN297DUMP_1M;
-				packet_length=7;
-				hopping_frequency_no=40; //bind ?, normal 40
+				address_length=5;
+				memcpy(rx_tx_addr, (uint8_t *)"\xCC\xCC\xCC\xCC\xCC", address_length);	// bind \x7E\xB8\x63\xA9
+				bitrate=XN297DUMP_250K;
+				packet_length=9;
+				hopping_frequency_no=71; //bind 71, normal ??
 				
 				NRF24L01_Initialize();
 				NRF24L01_SetTxRxMode(TXRX_OFF);
@@ -623,8 +656,9 @@ static uint16_t XN297Dump_callback()
 				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, option);	//hopping_frequency_no);
-
-				debug("NRF dump, len=%d, rf=%d, address length=%d, bitrate=",packet_length,hopping_frequency_no,address_length);
+				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 +677,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 +685,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,7 +763,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) |
 				}
-				NRF24L01_WriteReg(NRF24L01_05_RF_CH, option);	//hopping_frequency_no);
+				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)
@@ -834,6 +884,63 @@ static uint16_t XN297Dump_callback()
 			}
 		#endif
 		}
+		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;
+				}
+			}
+		}
 		bind_counter++;
 		if(IS_RX_FLAG_on)					// Let the radio update the protocol
 		{

Multiprotocol/XN297_EMU.ino

@@ -207,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
@@ -220,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];
@@ -329,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)
@@ -351,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);
@@ -440,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)

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

Multiprotocol/_Config.h

@@ -165,9 +165,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,10 +193,11 @@
 #define	DSM_CYRF6936_INO
 #define	DSM_RX_CYRF6936_INO
 #define	E010R5_CYRF6936_INO
-//#define	E01X_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
@@ -205,7 +211,7 @@
 #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	HITEC_CC2500_INO
 #define	HOTT_CC2500_INO
@@ -222,36 +228,42 @@
 #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	EAZYRC_NRF24L01_INO
 #define	ESKY_NRF24L01_INO
 #define	ESKY150_NRF24L01_INO
 #define	FQ777_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	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
@@ -263,8 +275,11 @@
 #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
@@ -287,11 +302,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  ***/
 /**************************/
@@ -338,13 +348,18 @@
 #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
@@ -550,10 +565,9 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		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
@@ -567,6 +581,8 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		QX100
 	PROTO_BAYANG_RX
 		NONE
+	PROTO_BLUEFLY
+		NONE
 	PROTO_BUGS
 		NONE
 	PROTO_BUGSMINI
@@ -603,6 +619,7 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		DSMX_1F
 		DSMX_2F
 		DSMR
+		DSM2_SFC
 	PROTO_DSM_RX
 		DSM_RX
 		DSM_CLONE
@@ -619,6 +636,8 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 	PROTO_E129
 		E129_E129
 		E129_C186
+	PROTO_EAZYRC
+		NONE
 	PROTO_ESKY
 		ESKY_STD
 		ESKY_ET4
@@ -677,6 +696,8 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		FX816
 		FX620
 		FX9630
+		Q560
+		QF012
 	PROTO_FY326
 		FY326
 		FY319
@@ -685,6 +706,7 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		GD_V2
 	PROTO_GW008
 		NONE
+	PROTO_H36
 	PROTO_H8_3D
 		H8_3D
 		H20H
@@ -705,6 +727,7 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		JJRCX1
 		X5C1
 		FQ777_951
+		HONTAI_XKK170
 	PROTO_HOTT
 		HOTT_SYNC
 		HOTT_NO_SYNC
@@ -716,11 +739,16 @@ 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
@@ -733,6 +761,8 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		KYOSHO_HYPE
 	PROTO_KYOSHO2
 		NONE
+	PROTO_KYOSHO3
+		NONE
 	PROTO_LOLI
 		NONE
 	PROTO_LOSI
@@ -748,8 +778,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
@@ -761,6 +792,7 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		F949G
 	PROTO_MT99XX2
 		PA18
+  		SU35
 	PROTO_NCC1701
 		NONE
 	PROTO_OMP
@@ -793,12 +825,19 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		RLINK_SURFACE
 		RLINK_AIR
 		RLINK_DUMBORC
+		RLINK_RC4G
 	PROTO_SCANNER
 		NONE
 	PROTO_SCORPIO
 		NONE
+	PROTO_SGF22
+		SGF22
+		F22S
+  		J20
 	PROTO_SHENQI
 		NONE
+	PROTO_SHENQI2
+		NONE
 	PROTO_SKYARTEC
 		NONE
 	PROTO_SLT
@@ -807,13 +846,15 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		Q100
 		Q200
 		MR100
+		V1_4CH
+		RF_SIM
 	PROTO_SYMAX
 		SYMAX
 		SYMAX5C
-	PROTO_TIGER
-		NONE
 	PROTO_TRAXXAS
-		RX6519
+		NONE
+	PROTO_UDIRC
+		NONE
 	PROTO_V2X2
 		V2X2
 		JXD506
@@ -840,12 +881,18 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 	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
 */

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[]);

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();

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)
 

buildroot/bin/buildFunctions

@@ -84,22 +84,30 @@ buildEachRFModule() {
 }
 
 buildReleaseFiles(){
-    if [[ "$BOARD" =~ ":avr:multixmega32d4" ]]; then
+    if [[ "$RELEASE" == "scripts" ]]; then
+        build_release_scripts;
+    elif [[ "$RELEASE" == "orangerx" ]]; then
         build_release_orx;
-    elif [[ "$BOARD" =~ ":avr:multiatmega328p:bootloader=none" ]]; then
+    elif [[ "$RELEASE" == "atmega328p" ]]; then
         build_release_avr_noboot;
-    elif [[ "$BOARD" =~ ":avr:multiatmega328p:bootloader=optiboot" ]]; then
+    elif [[ "$RELEASE" == "atmega328p-optiboot" ]]; then
         build_release_avr_optiboot;
-    elif [[ "$BOARD" =~ ":STM32F1:multistm32f103cb:debug_option=none" ]]; then
-        build_release_stm32f1_no_debug;
-    elif [[ "$BOARD" =~ ":STM32F1:multistm32f103cb:debug_option=native" ]]; then
-        build_release_stm32f1_native_debug;
-    elif [[ "$BOARD" =~ ":STM32F1:multistm32f103cb:debug_option=ftdi" ]]; then
-        build_release_stm32f1_serial_debug;
-    elif [[ "$BOARD" =~ ":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" =~ ":STM32F1:multistm32f103c8:debug_option=none" ]]; then
-        build_release_stm32f1_64k;
     else
       printf "No release files for this board.";
     fi

buildroot/bin/build_release_avr_noboot

@@ -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;

buildroot/bin/build_release_avr_optiboot

@@ -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; 

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;

buildroot/bin/build_release_scripts

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+source ./buildroot/bin/buildFunctions;
+exitcode=0;
+
+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 -r Lua_scripts/* SCRIPTS/TOOLS/;
+find SCRIPTS/TOOLS -type f -name "*.md" -delete
+
+zip -q -r ./binaries/MultiLuaScripts.zip SCRIPTS/TOOLS/*;
+
+exit $exitcode;

buildroot/bin/build_release_stm32f1_4in1_no_debug

@@ -0,0 +1,97 @@
+#!/usr/bin/env bash
+
+source ./buildroot/bin/buildFunctions;
+exitcode=0;
+
+# Generic 4-in-1 AIR builds
+printf "\e[33;1mBuilding mm-stm-serial-aetr-air-v$MULTI_VERSION.bin\e[0m\n";
+opt_add MULTI_AIR
+opt_disable ENABLE_PPM;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-serial-aetr-air-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-stm-serial-taer-air-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace AETR TAER;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-serial-taer-air-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-stm-serial-reta-air-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace TAER RETA;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-serial-reta-air-v$MULTI_VERSION.bin;
+
+# Generic 4-in-1 SURFACE builds
+printf "\e[33;1mBuilding mm-stm-serial-aetr-sfc-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace RETA AETR;
+opt_remove MULTI_AIR;
+opt_add MULTI_SURFACE;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-serial-aetr-sfc-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-stm-serial-taer-sfc-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace AETR TAER;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-serial-taer-sfc-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-stm-serial-reta-sfc-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace TAER RETA;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-serial-reta-sfc-v$MULTI_VERSION.bin;
+
+# Generic 4-in-1 LBT/EU builds
+printf "\e[33;1mBuilding mm-stm-serial-aetr-lbt-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace RETA AETR;
+opt_remove MULTI_SURFACE;
+opt_add MULTI_EU;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-serial-aetr-lbt-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-stm-serial-taer-lbt-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace AETR TAER;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-serial-taer-lbt-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-stm-serial-reta-lbt-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace TAER RETA;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-serial-reta-lbt-v$MULTI_VERSION.bin;
+
+# 4-in-1 PPM builds
+printf "\e[33;1mBuilding mm-stm-ppm-aetr-v$MULTI_VERSION.bin\e[0m\n";
+opt_add MULTI_AIR;
+opt_enable A7105_INSTALLED;
+opt_enable CYRF6936_INSTALLED;
+opt_enable NRF24L01_INSTALLED;
+opt_remove MULTI_EU;
+opt_enable ENABLE_PPM;
+opt_disable ENABLE_SERIAL;
+opt_replace RETA AETR;
+opt_disable MULTI_STATUS;
+opt_disable MULTI_TELEMETRY;
+opt_set NBR_BANKS 5;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-ppm-aetr-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-stm-ppm-taer-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace AETR TAER;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-ppm-taer-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-stm-ppm-reta-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace TAER RETA;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-ppm-reta-v$MULTI_VERSION.bin; 
+
+exit $exitcode;

buildroot/bin/build_release_stm32f1_5in1

@@ -0,0 +1,71 @@
+#!/usr/bin/env bash
+
+source ./buildroot/bin/buildFunctions;
+exitcode=0;
+
+# DIY 5-in-1 AIR builds
+printf "\e[33;1mBuilding mm-stm-5in1-aetr-air-v$MULTI_VERSION.bin\e[0m\n";
+opt_add MULTI_AIR;
+opt_disable ENABLE_PPM;
+opt_disable CFLIE_NRF24L01_INO
+opt_enable SX1276_INSTALLED;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-5in1-aetr-air-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-stm-5in1-taer-air-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace AETR TAER;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-5in1-taer-air-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-stm-5in1-reta-air-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace TAER RETA;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-5in1-reta-air-v$MULTI_VERSION.bin;
+
+# DIY 5-in-1 SURFACE builds
+printf "\e[33;1mBuilding mm-stm-5in1-aetr-sfc-v$MULTI_VERSION.bin\e[0m\n";
+opt_add MULTI_SURFACE;
+opt_remove MULTI_AIR;
+opt_enable CFLIE_NRF24L01_INO
+opt_replace RETA AETR;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-5in1-aetr-sfc-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-stm-5in1-taer-sfc-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace AETR TAER;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-5in1-taer-sfc-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-stm-5in1-reta-sfc-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace TAER RETA;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-5in1-reta-sfc-v$MULTI_VERSION.bin;
+
+# DIY 5-in-1 LBT builds
+printf "\e[33;1mBuilding mm-stm-5in1-aetr-lbt-v$MULTI_VERSION.bin\e[0m\n";
+opt_remove MULTI_SURFACE;
+opt_add MULTI_EU;
+opt_replace RETA AETR;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-5in1-aetr-lbt-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-stm-5in1-taer-lbt-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace AETR TAER;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-5in1-taer-lbt-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-stm-5in1-reta-lbt-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace TAER RETA;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-5in1-reta-lbt-v$MULTI_VERSION.bin;
+
+exit $exitcode;

buildroot/bin/build_release_stm32f1_cc2500_128k

@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+
+source ./buildroot/bin/buildFunctions;
+exitcode=0;
+
+# CC2500-only FCC builds
+printf "\e[33;1mBuilding mm-stm-cc2500-aetr-v$MULTI_VERSION.bin\e[0m\n";
+opt_disable A7105_INSTALLED;
+opt_disable CYRF6936_INSTALLED;
+opt_disable NRF24L01_INSTALLED;
+opt_disable ENABLE_PPM;
+opt_disable INVERT_TELEMETRY;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-cc2500-aetr-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-stm-cc2500-taer-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace AETR TAER;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-cc2500-taer-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-stm-cc2500-reta-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace TAER RETA;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-cc2500-reta-v$MULTI_VERSION.bin;
+
+# CC2500-only LBT/EU builds
+printf "\e[33;1mBuilding mm-stm-cc2500-aetr-lbt-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace RETA AETR;
+opt_add MULTI_EU;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-cc2500-aetr-lbt-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-stm-cc2500-taer-lbt-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace AETR TAER;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-cc2500-taer-lbt-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-stm-cc2500-reta-lbt-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace TAER RETA;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-cc2500-reta-lbt-v$MULTI_VERSION.bin;
+
+exit $exitcode;

buildroot/bin/build_release_stm32f1_cc2500_64k

@@ -3,10 +3,9 @@
 source ./buildroot/bin/buildFunctions;
 exitcode=0;
 
-# CC2500-only 64Kb builds
+# CC2500-only 64Kb FCC builds
 printf "\e[33;1mBuilding mm-stm-cc2500-64-aetr-v$MULTI_VERSION.bin\e[0m\n";
-opt_enable $ALL_PROTOCOLS;
-opt_disable IKEAANSLUTA_CC2500_INO;
+opt_disable SCANNER_CC2500_INO;
 opt_disable ENABLE_PPM;
 opt_disable A7105_INSTALLED;
 opt_disable CYRF6936_INSTALLED;
@@ -28,4 +27,24 @@ buildMulti;
 exitcode=$((exitcode+$?));
 mv build/Multiprotocol.ino.bin ./binaries/mm-stm-cc2500-64-reta-v$MULTI_VERSION.bin;
 
+# CC2500-only 64Kb LBT/EU builds
+printf "\e[33;1mBuilding mm-stm-cc2500-64-aetr-lbt-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace RETA AETR;
+opt_add MULTI_EU;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-cc2500-64-aetr-lbt-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-stm-cc2500-64-taer-lbt-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace AETR TAER;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-cc2500-64-taer-lbt-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-stm-cc2500-64-reta-lbt-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace TAER RETA;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-stm-cc2500-64-reta-lbt-v$MULTI_VERSION.bin;
+
 exit $exitcode;

buildroot/bin/build_release_stm32f1_no_debug

@@ -1,124 +0,0 @@
-#!/usr/bin/env bash
-
-source ./buildroot/bin/buildFunctions;
-exitcode=0;
-
-# Builds for the DIY 5-in-1 module exceed the 120KB working capacity of the STM32F103CB
-# To work around this we have to disable some protocols in the builds for this module
-#DIY_5IN1_DISABLED="MOULDKG_NRF24L01_INO";
-
-# Generic 4-in-1 builds
-printf "\e[33;1mBuilding mm-stm-serial-aetr-v$MULTI_VERSION.bin\e[0m\n";
-opt_disable ENABLE_PPM;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/mm-stm-serial-aetr-v$MULTI_VERSION.bin;
-
-printf "\e[33;1mBuilding mm-stm-serial-taer-v$MULTI_VERSION.bin\e[0m\n";
-opt_replace AETR TAER;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/mm-stm-serial-taer-v$MULTI_VERSION.bin;
-
-printf "\e[33;1mBuilding mm-stm-serial-reta-v$MULTI_VERSION.bin\e[0m\n";
-opt_replace TAER RETA;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/mm-stm-serial-reta-v$MULTI_VERSION.bin;
-
-# DIY 5-in-1 builds
-printf "\e[33;1mBuilding mm-stm-5in1-aetr-v$MULTI_VERSION.bin\e[0m\n";
-opt_replace RETA AETR;
-#opt_disable $DIY_5IN1_DISABLED;
-opt_enable SX1276_INSTALLED;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/mm-stm-5in1-aetr-v$MULTI_VERSION.bin;
-
-printf "\e[33;1mBuilding mm-stm-5in1-taer-v$MULTI_VERSION.bin\e[0m\n";
-opt_replace AETR TAER;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/mm-stm-5in1-taer-v$MULTI_VERSION.bin;
-
-printf "\e[33;1mBuilding mm-stm-5in1-reta-v$MULTI_VERSION.bin\e[0m\n";
-opt_replace TAER RETA;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/mm-stm-5in1-reta-v$MULTI_VERSION.bin;
-
-# T-Lite 5-in-1 builds
-printf "\e[33;1mBuilding mm-tlite5in1-aetr-v$MULTI_VERSION.bin\e[0m\n";
-opt_replace RETA AETR;
-opt_disable INVERT_TELEMETRY;
-opt_disable SX1276_INSTALLED;
-#opt_enable $DIY_5IN1_DISABLED;
-opt_enable "MULTI_5IN1_INTERNAL JP_TLite"
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/mm-tlite5in1-aetr-v$MULTI_VERSION.bin;
-
-printf "\e[33;1mBuilding mm-tlite5in1-taer-v$MULTI_VERSION.bin\e[0m\n";
-opt_replace AETR TAER;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/mm-tlite5in1-taer-v$MULTI_VERSION.bin;
-
-printf "\e[33;1mBuilding mm-tlite5in1-reta-v$MULTI_VERSION.bin\e[0m\n";
-opt_replace TAER RETA;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/mm-tlite5in1-reta-v$MULTI_VERSION.bin;
-
-# CC2500-only builds
-printf "\e[33;1mBuilding mm-stm-cc2500-aetr-v$MULTI_VERSION.bin\e[0m\n";
-opt_replace RETA AETR;
-opt_disable "MULTI_5IN1_INTERNAL JP_TLite"
-opt_disable A7105_INSTALLED;
-opt_disable CYRF6936_INSTALLED;
-opt_disable NRF24L01_INSTALLED;
-opt_disable INVERT_TELEMETRY;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/mm-stm-cc2500-aetr-v$MULTI_VERSION.bin;
-
-printf "\e[33;1mBuilding mm-stm-cc2500-taer-v$MULTI_VERSION.bin\e[0m\n";
-opt_replace AETR TAER;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/mm-stm-cc2500-taer-v$MULTI_VERSION.bin;
-
-printf "\e[33;1mBuilding mm-stm-cc2500-reta-v$MULTI_VERSION.bin\e[0m\n";
-opt_replace TAER RETA;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/mm-stm-cc2500-reta-v$MULTI_VERSION.bin;
-
-# 4-in-1 PPM builds
-printf "\e[33;1mBuilding mm-stm-ppm-aetr-v$MULTI_VERSION.bin\e[0m\n";
-opt_enable A7105_INSTALLED;
-opt_enable CYRF6936_INSTALLED;
-opt_enable NRF24L01_INSTALLED;
-opt_enable ENABLE_PPM;
-opt_disable ENABLE_SERIAL;
-opt_replace RETA AETR;
-opt_disable MULTI_STATUS;
-opt_disable MULTI_TELEMETRY;
-opt_set NBR_BANKS 5;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/mm-stm-ppm-aetr-v$MULTI_VERSION.bin;
-
-printf "\e[33;1mBuilding mm-stm-ppm-taer-v$MULTI_VERSION.bin\e[0m\n";
-opt_replace AETR TAER;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/mm-stm-ppm-taer-v$MULTI_VERSION.bin;
-
-printf "\e[33;1mBuilding mm-stm-ppm-reta-v$MULTI_VERSION.bin\e[0m\n";
-opt_replace TAER RETA;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/mm-stm-ppm-reta-v$MULTI_VERSION.bin; 
-
-exit $exitcode;

buildroot/bin/build_release_stm32f1_t18int

@@ -3,23 +3,65 @@
 source ./buildroot/bin/buildFunctions;
 exitcode=0;
 
-printf "\e[33;1mBuilding mm-t18int-aetr-v$MULTI_VERSION.bin\e[0m\n";
+# T18 5-in-1 AIR builds
+printf "\e[33;1mBuilding mm-t18int-aetr-air-v$MULTI_VERSION.bin\e[0m\n";
+opt_add MULTI_AIR
 opt_disable ENABLE_PPM;
 opt_disable INVERT_TELEMETRY;
 buildMulti;
 exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/mm-t18int-aetr-v$MULTI_VERSION.bin;
+mv build/Multiprotocol.ino.bin ./binaries/mm-t18int-aetr-air-v$MULTI_VERSION.bin;
 
-printf "\e[33;1mBuilding mm-t18int-taer-v$MULTI_VERSION.bin\e[0m\n";
+printf "\e[33;1mBuilding mm-t18int-taer-air-v$MULTI_VERSION.bin\e[0m\n";
 opt_replace AETR TAER;
 buildMulti;
 exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/mm-t18int-taer-v$MULTI_VERSION.bin;
+mv build/Multiprotocol.ino.bin ./binaries/mm-t18int-taer-air-v$MULTI_VERSION.bin;
 
-printf "\e[33;1mBuilding mm-t18int-reta-v$MULTI_VERSION.bin\e[0m\n";
+printf "\e[33;1mBuilding mm-t18int-reta-air-v$MULTI_VERSION.bin\e[0m\n";
 opt_replace TAER RETA;
 buildMulti;
 exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/mm-t18int-reta-v$MULTI_VERSION.bin;
+mv build/Multiprotocol.ino.bin ./binaries/mm-t18int-reta-air-v$MULTI_VERSION.bin;
+
+# T18 5-in-1 SURFACE builds
+printf "\e[33;1mBuilding mm-t18int-aetr-sfc-v$MULTI_VERSION.bin\e[0m\n";
+opt_remove MULTI_AIR
+opt_add MULTI_SURFACE
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-t18int-aetr-sfc-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-t18int-taer-sfc-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace AETR TAER;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-t18int-taer-sfc-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-t18int-reta-sfc-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace TAER RETA;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-t18int-reta-sfc-v$MULTI_VERSION.bin;
+
+# T18 5-in-1 LBT/EU builds
+printf "\e[33;1mBuilding mm-t18int-aetr-lbt-v$MULTI_VERSION.bin\e[0m\n";
+opt_remove MULTI_SURFACE
+opt_add MULTI_EU
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-t18int-aetr-lbt-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-t18int-taer-lbt-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace AETR TAER;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-t18int-taer-lbt-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-t18int-reta-lbt-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace TAER RETA;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-t18int-reta-lbt-v$MULTI_VERSION.bin;
 
 exit $exitcode;

buildroot/bin/build_release_stm32f1_tlite

@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+
+source ./buildroot/bin/buildFunctions;
+exitcode=0;
+
+# T-Lite 5-in-1 AIR builds
+printf "\e[33;1mBuilding mm-tlite5in1-aetr-air-v$MULTI_VERSION.bin\e[0m\n";
+opt_add MULTI_AIR;
+opt_disable ENABLE_PPM;
+opt_disable INVERT_TELEMETRY;
+opt_enable "MULTI_5IN1_INTERNAL JP_TLite"
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-tlite5in1-aetr-air-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-tlite5in1-taer-air-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace AETR TAER;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-tlite5in1-taer-air-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-tlite5in1-reta-air-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace TAER RETA;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-tlite5in1-reta-air-v$MULTI_VERSION.bin;
+
+# T-Lite 5-in-1 SURFACE builds
+printf "\e[33;1mBuilding mm-tlite5in1-aetr-sfc-v$MULTI_VERSION.bin\e[0m\n";
+opt_add MULTI_SURFACE;
+opt_remove MULTI_AIR;
+opt_replace RETA AETR;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-tlite5in1-aetr-sfc-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-tlite5in1-taer-sfc-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace AETR TAER;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-tlite5in1-taer-sfc-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-tlite5in1-reta-sfc-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace TAER RETA;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-tlite5in1-reta-sfc-v$MULTI_VERSION.bin;
+
+# T-Lite 5-in-1 SURFACE builds
+printf "\e[33;1mBuilding mm-tlite5in1-aetr-lbt-v$MULTI_VERSION.bin\e[0m\n";
+opt_remove MULTI_SURFACE;
+opt_add MULTI_EU;
+opt_replace RETA AETR;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-tlite5in1-aetr-lbt-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-tlite5in1-taer-lbt-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace AETR TAER;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-tlite5in1-taer-lbt-v$MULTI_VERSION.bin;
+
+printf "\e[33;1mBuilding mm-tlite5in1-reta-lbt-v$MULTI_VERSION.bin\e[0m\n";
+opt_replace TAER RETA;
+buildMulti;
+exitcode=$((exitcode+$?));
+mv build/Multiprotocol.ino.bin ./binaries/mm-tlite5in1-reta-lbt-v$MULTI_VERSION.bin;
+
+exit $exitcode;

buildroot/bin/opt_remove

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+SED=$(which gsed || which sed)
+
+eval "${SED} -i '/#define \b${1}/d' Multiprotocol/_Config.h"

docs/Compiling.md

@@ -108,7 +108,7 @@ The images below indicate the pin layout and the location of the ground pin on t
 |:---:|:---:|:---:|
 <img src="images/V2b_ISP.jpeg" width="189" height="200" /> | <img src="images/MPTM_PCB_2.3d_ISP.png" width="486" height="201" /> | <img src="images/ProMini_ISP.png" width="195" height="200" /> |
 
-You are now ready to plug in the USB programmer to the computer.  If you are looking for a good working USBasp Windows driver, [use this one](http://www.protostack.com/download/USBasp-win-driver-x86-x64-v3.0.7.zip).
+You are now ready to plug in the USB programmer to the computer.  If you are looking for a good working USBasp Windows driver, [use this one](https://protostack.com.au/download/USBasp-win-driver-x86-x64-v3.0.7.zip).
 
 ### Burn bootloader and set fuses
 The bootloader only needs to be burned once, unless you decide to switch from one option to the other (or it is accidentally erased).  If you have already burned the bootloader / set the fuses you can skip this step.