Frankie dsm fwrd prg enhancements (#762)

* #751 DSM Enhancements

 #751 DSM Forward Programming Enhancements (New GUI, etc)

* Make both work on EdgeTx and OpenTX

* #751 Turn OFF simulation by default

Distribution code with RX simulation OFF
Simulation should be only for Development

* #751 Update Readme Documentation

Updated the Readme.txt documentation
and removed compiled luac file that was check in by mistake

* #751 Fix problems With Reset RX

1. Fix problem when trying to Factory Reset. Enter Bind Mode. Save backup, Restore Backup

2. Found a way to advance on the Gyro initial Setup menus.. a bit of a hack, but works.

3. Handle RX resets properly. It needed after initial setup

* #751 Cosmetic and Show Orientation Images

#751
1. Fix problems when text contradictions between Menu/Line Headers and List Values
2. Show Images of RX orientations
3. Able to Hack getting into Initial Setup and other menus who was failing before
4. Custumize the way Flight Mode reports the Value on Screen

* #751 add check for required libraries

Add check that the required files in DSMLIB exist

Co-authored-by: pascallanger <pascal_langer@yahoo.fr>

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: [pascallanger]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=VF2K9T23DRY56&lc=US&item_name=DIY%20Multiprotocol&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted

.github/workflows/main.yml

@@ -0,0 +1,202 @@
+# Workflow for testing MULTI-Module firmware builds
+
+name: CI
+
+on:
+  # Trigger the workflow on pushes, except those that are tagged (avoids double-testing releases)
+  push:
+    branches:
+    - '**'
+    tags-ignore:
+      - '**'
+    paths:
+    - '.github/workflows/**'
+    - 'buildroot/bin/**'
+    - 'Multiprotocol/**'
+
+  # Trigger the workflow on pull requests to the master branch
+  pull_request:
+    branches:
+      - master
+    paths:
+    - '.github/workflows/**'
+    - 'buildroot/bin/**'
+    - 'Multiprotocol/**'
+
+  # Triggers the workflow on release creation
+  release:
+    types:
+      - created
+
+  # Allows the workflow to be triggered manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    # Configure the board matrix
+    strategy:
+      fail-fast: false
+      matrix:
+        board: [
+          "multi4in1-devel:avr:multiatmega328p:bootloader=none", 
+          "multi4in1-devel:avr:multiatmega328p:bootloader=optiboot", 
+          "multi4in1-devel:avr:multixmega32d4", 
+          "multi4in1-devel:STM32F1:multi5in1t18int", 
+          "multi4in1-devel:STM32F1:multistm32f103cb:debug_option=none", 
+          "multi4in1-devel:STM32F1:multistm32f103cb:debug_option=native", 
+          "multi4in1-devel:STM32F1:multistm32f103cb:debug_option=ftdi", 
+          "multi4in1-devel:STM32F1:multistm32f103c8:debug_option=none"
+        ]
+
+    # Set the environment variables
+    env:
+      BOARD: ${{ matrix.board }}
+
+    steps:
+      - uses: actions/checkout@v2
+      
+      - name: Install Arduino CLI
+        uses: arduino/setup-arduino-cli@v1.1.1
+      
+      - 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
+
+          # Get all the RF modules for this board
+          getAllRFModules
+          echo "ALL_RFMODULES=$(echo $ALL_RFMODULES)" >> $GITHUB_ENV
+
+          # Disable CHECK_FOR_BOOTLOADER when not needed
+          if [[ "$BOARD" =~ ":avr:multiatmega328p:bootloader=none" ]]; then
+            opt_disable CHECK_FOR_BOOTLOADER;
+          fi
+
+          # Trim the build down for the Atmega328p board
+          if [[ "$BOARD" =~ ":avr:multiatmega328p:" ]]; then
+            opt_disable $ALL_PROTOCOLS
+            opt_enable FRSKYX_CC2500_INO AFHDS2A_A7105_INO MJXQ_NRF24L01_INO DSM_CYRF6936_INO;
+          fi
+
+          # Trim the enabled protocols down for the STM32F103CB board with debugging or the STM32F103C8 board in general
+          if [[ "$BOARD" =~ ":STM32F1:multistm32f103cb:debug_option=ftdi" ]] || [[ "$BOARD" =~ ":STM32F1:multistm32f103cb:debug_option=native" ]] || [[ "$BOARD" =~ ":STM32F1:multistm32f103c8" ]]; then
+            opt_disable $ALL_PROTOCOLS;
+            opt_enable FRSKYX_CC2500_INO AFHDS2A_A7105_INO MJXQ_NRF24L01_INO DSM_CYRF6936_INO;
+          fi
+
+      - name: Save default firmware configuration
+        run: |
+          cat Multiprotocol/_Config.h
+          cp Multiprotocol/_Config.h ./_Config.h.bak
+
+      - name: Build default configuration
+        run: |
+          # Skip the default build for boards where it's too large now
+          if [[ "$BOARD" =~ ":STM32F1:multistm32f103cb:debug_option=none" ]] || [[ "$BOARD" =~ ":STM32F1:multi5in1t18int" ]]; then
+            printf "Not testing default build for $BOARD.";
+          else
+            source ./buildroot/bin/buildFunctions;
+            buildMulti
+          fi
+
+      - name: Build serial only
+        run: |
+          source ./buildroot/bin/buildFunctions;
+          cp ./_Config.h.bak Multiprotocol/_Config.h
+          opt_disable ENABLE_PPM;
+          buildMulti;
+      
+      - name: Build PPM only
+        run: |
+          source ./buildroot/bin/buildFunctions;
+          cp ./_Config.h.bak Multiprotocol/_Config.h
+          opt_disable ENABLE_SERIAL;
+          buildMulti;
+
+      - name: Build each RF module individually
+        run: |
+          source ./buildroot/bin/buildFunctions;
+          cp ./_Config.h.bak Multiprotocol/_Config.h;
+          buildEachRFModule;
+
+      - name: Build each protocol individually
+        run: |
+          source ./buildroot/bin/buildFunctions;
+          cp ./_Config.h.bak Multiprotocol/_Config.h;
+          buildEachProtocol;
+
+      - name: Build release files
+        run: |
+          source ./buildroot/bin/buildFunctions;
+          cp ./_Config.h.bak Multiprotocol/_Config.h;
+          buildReleaseFiles;
+          ls -al ./binaries;
+
+          NUM_FILES=$(ls -l ./binaries | grep ^- | wc -l);
+          if [ $NUM_FILES -gt 0 ]; then 
+            echo "HAVE_FILES=true" >> $GITHUB_ENV
+          else
+            echo "HAVE_FILES=false" >> $GITHUB_ENV
+          fi
+
+      - name: Deploy files to release
+        if: github.event_name == 'release' && github.event.action == 'created' && env.HAVE_FILES == 'true'
+        uses: AButler/upload-release-assets@v2.0
+        with:
+          files: './binaries/*'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: 'Upload Artifacts'
+        if: env.HAVE_FILES == 'true'
+        uses: actions/upload-artifact@v2
+        with:
+          name: multi-test-build
+          path: ./binaries/

.travis.yml

@@ -1,392 +0,0 @@
-os: linux
-dist: bionic
-language: c
-
-env:
-  jobs:
-    - BOARD="multi4in1:avr:multiatmega328p:bootloader=none"
-    - BOARD="multi4in1:avr:multiatmega328p:bootloader=optiboot"
-    - BOARD="multi4in1:avr:multixmega32d4"
-    - BOARD="multi4in1:STM32F1:multi5in1t18int"
-    - BOARD="multi4in1:STM32F1:multistm32f103c:debug_option=none"
-    - BOARD="multi4in1:STM32F1:multistm32f103c:debug_option=native"
-    - BOARD="multi4in1:STM32F1:multistm32f103c:debug_option=ftdi"
-
-notifications:
-  email: false
-
-before_install:
-  # Fetch the tag information for the current branch
-  - git fetch origin --tags
-
-  # Publish the buildroot script folder
-  - chmod +x ${TRAVIS_BUILD_DIR}/buildroot/bin/*
-  - export PATH=${TRAVIS_BUILD_DIR}/buildroot/bin/:${PATH}
-
-  # Helper functions for the builds
-  - buildMulti() { start_fold config_diff; travis_time_start; git diff Multiprotocol/_Config.h; end_fold config_diff; exitcode=0; BUILDCMD="arduino-cli compile -b $BOARD Multiprotocol/Multiprotocol.ino --build-path ${TRAVIS_BUILD_DIR}/build/"; echo $BUILDCMD; $BUILDCMD; if [ $? -ne 0 ]; then exitcode=1; fi; echo; return $exitcode; }
-  - buildProtocol() { exitcode=0; opt_disable $ALL_PROTOCOLS; opt_enable $1; buildMulti; if [ $? -ne 0 ]; then exitcode=1; fi; return $exitcode; }
-  - buildEachProtocol() { exitcodesum=0; for PROTOCOL in $ALL_PROTOCOLS ; do printf "\e[33;1mBuilding $PROTOCOL\e[0m"; buildProtocol $PROTOCOL; if [ $? -ne 0 ]; then exitcodesum=$((exitcodesum + 1)); fi; done; return $exitcodesum; }
-  - buildRFModule() { exitcode=0; opt_disable $ALL_RFMODULES; opt_enable $1; buildMulti; if [ $? -ne 0 ]; then exitcode=1; fi; return $exitcode; }
-  - buildEachRFModule() { exitcodesum=0; for RFMODULE in $ALL_RFMODULES; do printf "\e[33;1mBuilding $RFMODULE\e[0m"; buildRFModule $RFMODULE; if [ $? -ne 0 ]; then exitcodesum=$((exitcodesum + 1)); fi; done; return $exitcodesum; }
-  - buildDefault() { exitcode=0; printf "\n\e[33;1mBuilding default configuration\e[0m\n"; buildMulti; if [ $? -ne 0 ]; then exitcode=1; fi; return $exitcode; }
-  - buildSerialOnly() { exitcode=0; printf "\n\e[33;1mBuilding serial mode only\e[0m\n"; opt_disable ENABLE_PPM; opt_enable ENABLE_SERIAL; buildMulti; if [ $? -ne 0 ]; then exitcode=1; fi; return $exitcode; }
-  - buildPPMOnly() { exitcode=0; printf "\n\e[33;1mBuilding PPM mode only\e[0m\n"; opt_enable ENABLE_PPM; opt_disable ENABLE_SERIAL; buildMulti; if [ $? -ne 0 ]; then exitcode=1; fi; return $exitcode; }
-
-  # Function to build the release files - dependent on board type
-  - if [[ "$BOARD" == "multi4in1:avr:multixmega32d4" ]]; then
-      buildReleaseFiles(){
-        exitcode=0;
-        printf "\n\e[33;1mBuilding multi-orangerx-aetr-green-inv-v$MULTI_VERSION.bin\e[0m";
-        opt_enable $ALL_PROTOCOLS;
-        opt_disable ORANGE_TX_BLUE;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-orangerx-aetr-green-inv-v$MULTI_VERSION.bin;
-        printf "\n\e[33;1mBuilding multi-orangerx-aetr-blue-inv-v$MULTI_VERSION.bin\e[0m";
-        opt_enable ORANGE_TX_BLUE;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-orangerx-aetr-blue-inv-v$MULTI_VERSION.bin;
-        cp Multiprotocol/Multi.txt ./binaries/Multi.txt;
-        mkdir -p TOOLS/SCRIPTS;
-        cp Lua_scripts/*.lua TOOLS/SCRIPTS/;
-        cp Lua_scripts/*.txt TOOLS/SCRIPTS/;
-        zip ./binaries/MultiLuaScripts.zip TOOLS/SCRIPTS/*;
-        return $exitcode; };
-    elif [[ "$BOARD" == "multi4in1:avr:multiatmega328p:bootloader=none" ]]; then
-      buildReleaseFiles(){
-        printf "\n\e[33;1mBuilding multi-avr-usbasp-aetr-A7105-inv-v$MULTI_VERSION.bin\e[0m";
-        exitcode=0;
-        opt_disable CHECK_FOR_BOOTLOADER;
-        opt_disable $ALL_PROTOCOLS;
-        opt_enable $A7105_PROTOCOLS;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-avr-usbasp-aetr-A7105-inv-v$MULTI_VERSION.bin;
-        printf "\n\e[33;1mBuilding multi-avr-usbasp-aetr-CC2500-inv-v$MULTI_VERSION.bin\e[0m";
-        opt_disable $ALL_PROTOCOLS;
-        opt_enable $CC2500_PROTOCOLS;
-        opt_disable HITEC_CC2500_INO REDPINE_CC2500_INO SKYARTEC_CC2500_INO SCANNER_CC2500_INO;
-        buildMulti;
-        mv build/Multiprotocol.ino.bin ./binaries/multi-avr-usbasp-aetr-CC2500-inv-v$MULTI_VERSION.bin;
-        printf "\n\e[33;1mBuilding multi-avr-usbasp-aetr-CYRF6936-inv-v$MULTI_VERSION.bin\e[0m";
-        opt_disable $ALL_PROTOCOLS;
-        opt_enable $CYRF6936_PROTOCOLS;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-avr-usbasp-aetr-CYRF6936-inv-v$MULTI_VERSION.bin; 
-        return $exitcode; };
-    elif [[ "$BOARD" == "multi4in1:avr:multiatmega328p:bootloader=optiboot" ]]; then
-      buildReleaseFiles(){
-        printf "\n\e[33;1mBuilding multi-avr-txflash-aetr-A7105-inv-v$MULTI_VERSION.bin\e[0m";
-        exitcode=0;
-        opt_enable CHECK_FOR_BOOTLOADER;
-        opt_disable $ALL_PROTOCOLS;
-        opt_enable $A7105_PROTOCOLS;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-avr-txflash-aetr-A7105-inv-v$MULTI_VERSION.bin;
-        printf "\n\e[33;1mBuilding multi-avr-txflash-aetr-CC2500-inv-v$MULTI_VERSION.bin\e[0m";
-        opt_disable $ALL_PROTOCOLS;
-        opt_enable $CC2500_PROTOCOLS;
-        opt_disable HITEC_CC2500_INO REDPINE_CC2500_INO SKYARTEC_CC2500_INO SCANNER_CC2500_INO;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-avr-txflash-aetr-CC2500-inv-v$MULTI_VERSION.bin;
-        printf "\n\e[33;1mBuilding multi-avr-txflash-aetr-CYRF6936-inv-v$MULTI_VERSION.bin\e[0m";
-        opt_disable $ALL_PROTOCOLS;
-        opt_enable $CYRF6936_PROTOCOLS;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-avr-txflash-aetr-CYRF6936-inv-v$MULTI_VERSION.bin; 
-        return $exitcode; };
-    elif [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103c:debug_option=none" ]]; then
-      buildReleaseFiles(){
-        printf "\n\e[33;1mBuilding multi-stm-erskytx-aetr-inv-v$MULTI_VERSION.bin\e[0m";
-        exitcode=0;
-        opt_enable CHECK_FOR_BOOTLOADER;
-        opt_enable $ALL_PROTOCOLS;
-        opt_enable MULTI_STATUS;
-        opt_disable MULTI_TELEMETRY;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-aetr-inv-v$MULTI_VERSION.bin;
-        printf "\n\e[33;1mBuilding multi-stm-erskytx-taer-inv-v$MULTI_VERSION.bin\e[0m";
-        opt_replace AETR TAER;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-taer-inv-v$MULTI_VERSION.bin;
-        printf "\n\e[33;1mBuilding multi-stm-erskytx-reta-inv-v$MULTI_VERSION.bin\e[0m";
-        opt_replace TAER RETA;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-reta-inv-v$MULTI_VERSION.bin;
-        printf "\n\e[33;1mBuilding multi-stm-erskytx-aetr-noinv-v$MULTI_VERSION.bin\e[0m";
-        opt_replace RETA AETR;
-        opt_disable INVERT_TELEMETRY;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-aetr-noinv-v$MULTI_VERSION.bin;
-        printf "\n\e[33;1mBuilding multi-stm-erskytx-taer-noinv-v$MULTI_VERSION.bin\e[0m";
-        opt_replace AETR TAER;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-taer-noinv-v$MULTI_VERSION.bin;
-        printf "\n\e[33;1mBuilding multi-stm-erskytx-reta-noinv-v$MULTI_VERSION.bin\e[0m";
-        opt_replace TAER RETA;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-reta-noinv-v$MULTI_VERSION.bin;
-        printf "\n\e[33;1mBuilding multi-stm-opentx-aetr-inv-v$MULTI_VERSION.bin\e[0m";
-        opt_replace RETA AETR;
-        opt_disable MULTI_STATUS;
-        opt_enable MULTI_TELEMETRY;
-        opt_enable INVERT_TELEMETRY;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-stm-opentx-aetr-inv-v$MULTI_VERSION.bin;
-        printf "\n\e[33;1mBuilding multi-stm-opentx-taer-inv-v$MULTI_VERSION.bin\e[0m";
-        opt_replace AETR TAER;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-stm-opentx-taer-inv-v$MULTI_VERSION.bin;
-        printf "\n\e[33;1mBuilding multi-stm-opentx-reta-inv-v$MULTI_VERSION.bin\e[0m";
-        opt_replace TAER RETA;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-stm-opentx-reta-inv-v$MULTI_VERSION.bin;
-        printf "\n\e[33;1mBuilding multi-stm-opentx-aetr-noinv-v$MULTI_VERSION.bin\e[0m";
-        opt_replace RETA AETR;
-        opt_disable INVERT_TELEMETRY;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-stm-opentx-aetr-noinv-v$MULTI_VERSION.bin;
-        printf "\n\e[33;1mBuilding multi-stm-opentx-taer-noinv-v$MULTI_VERSION.bin\e[0m";
-        opt_replace AETR TAER;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-stm-opentx-taer-noinv-v$MULTI_VERSION.bin;
-        printf "\n\e[33;1mBuilding multi-stm-opentx-reta-noinv-v$MULTI_VERSION.bin\e[0m";
-        opt_replace TAER RETA;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-stm-opentx-reta-noinv-v$MULTI_VERSION.bin;
-        printf "\n\e[33;1mBuilding multi-stm-ppm-aetr-noinv-v$MULTI_VERSION.bin\e[0m";
-        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/multi-stm-ppm-aetr-noinv-v$MULTI_VERSION.bin;
-        printf "\n\e[33;1mBuilding multi-stm-ppm-taer-noinv-v$MULTI_VERSION.bin\e[0m";
-        opt_replace AETR TAER;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-stm-ppm-taer-noinv-v$MULTI_VERSION.bin;
-        printf "\n\e[33;1mBuilding multi-stm-ppm-reta-noinv-v$MULTI_VERSION.bin\e[0m";
-        opt_replace TAER RETA;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-stm-ppm-reta-noinv-v$MULTI_VERSION.bin; 
-        return $exitcode; };
-    elif [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103c:debug_option=native" ]]; then
-      buildReleaseFiles(){
-        printf "\n\e[33;1mBuilding multi-stm-erskytx-xn297dump-inv-usbdebug-v$MULTI_VERSION.bin\e[0m";
-        exitcode=0;
-        opt_enable CHECK_FOR_BOOTLOADER;
-        opt_disable $ALL_PROTOCOLS;
-        opt_add XN297DUMP_NRF24L01_INO;
-        opt_enable MULTI_STATUS;
-        opt_disable MULTI_TELEMETRY;
-        opt_enable INVERT_TELEMETRY;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-xn297dump-inv-usbdebug-v$MULTI_VERSION.bin;
-        printf "\n\e[33;1mBuilding multi-stm-opentx-xn297dump-inv-usbdebug-v$MULTI_VERSION.bin\e[0m";
-        opt_disable $ALL_PROTOCOLS;
-        opt_disable MULTI_STATUS;
-        opt_enable MULTI_TELEMETRY;
-        opt_enable INVERT_TELEMETRY;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-stm-opentx-xn297dump-inv-usbdebug-v$MULTI_VERSION.bin;
-        return $exitcode; };
-    elif [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103c:debug_option=ftdi" ]]; then
-      buildReleaseFiles(){
-        printf "\n\e[33;1mBuilding multi-stm-erskytx-xn297dump-inv-ftdidebug-v$MULTI_VERSION.bin\e[0m";
-        exitcode=0;
-        opt_enable CHECK_FOR_BOOTLOADER;
-        opt_disable $ALL_PROTOCOLS;
-        opt_add XN297DUMP_NRF24L01_INO;
-        opt_enable MULTI_STATUS;
-        opt_disable MULTI_TELEMETRY;
-        opt_enable INVERT_TELEMETRY;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-xn297dump-inv-ftdidebug-v$MULTI_VERSION.bin;
-        printf "\n\e[33;1mBuilding multi-stm-opentx-xn297dump-inv-ftdidebug-v$MULTI_VERSION.bin\e[0m";
-        opt_disable $ALL_PROTOCOLS;
-        opt_disable MULTI_STATUS;
-        opt_enable MULTI_TELEMETRY;
-        opt_enable INVERT_TELEMETRY;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-stm-opentx-xn297dump-inv-ftdidebug-v$MULTI_VERSION.bin;
-        return $exitcode; };
-    elif [[ "$BOARD" == "multi4in1:STM32F1:multi5in1t18int" ]]; then
-      buildReleaseFiles(){
-        printf "\n\e[33;1mBuilding multi-t18int-opentx-aetr-noinv-v$MULTI_VERSION.bin\e[0m";
-        opt_disable INVERT_TELEMETRY;
-        exitcode=0;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-t18int-opentx-aetr-noinv-v$MULTI_VERSION.bin;
-        printf "\n\e[33;1mBuilding multi-t18int-opentx-taer-noinv-v$MULTI_VERSION.bin\e[0m";
-        opt_replace AETR TAER;
-        exitcode=0;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-t18int-opentx-taer-noinv-v$MULTI_VERSION.bin;
-        printf "\n\e[33;1mBuilding multi-t18int-opentx-reta-noinv-v$MULTI_VERSION.bin\e[0m";
-        opt_replace TAER RETA;
-        exitcode=0;
-        buildMulti;
-        exitcode=$((exitcode+$?));
-        mv build/Multiprotocol.ino.bin ./binaries/multi-t18int-opentx-reta-noinv-v$MULTI_VERSION.bin;
-        return $exitcode; };
-    else
-      buildReleaseFiles() { echo "No release files for this board."; };
-    fi
-
-install:
-  # Install Arduino CLI
-  - mkdir ~/arduino-cli
-  - curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR=~/arduino-cli sh;
-  - export PATH=$PATH:$HOME/arduino-cli
-
-  # Update the board url and package index
-  - arduino-cli core update-index --additional-urls https://raw.githubusercontent.com/pascallanger/DIY-Multiprotocol-TX-Module-Boards/master/package_multi_4in1_board_index.json
-
-  # Install the STM32 board if needed
-  - if [[ "$BOARD" =~ "multi4in1:STM32F1:" ]]; then
-      arduino-cli core install multi4in1:STM32F1 --additional-urls https://raw.githubusercontent.com/pascallanger/DIY-Multiprotocol-TX-Module-Boards/master/package_multi_4in1_board_index.json;
-    fi
-
-  # Install the AVR board if needed
-  - if [[ "$BOARD" =~ "multi4in1:avr:" ]]; then
-      arduino-cli core install arduino:avr;
-      arduino-cli core install multi4in1:avr --additional-urls https://raw.githubusercontent.com/pascallanger/DIY-Multiprotocol-TX-Module-Boards/master/package_multi_4in1_board_index.json;
-    fi
-
-before_script:
-  # Change current working directory to the build dir
-  - cd ${TRAVIS_BUILD_DIR}
-
-  # Create somwhere to put the exported binaries
-  - mkdir ./binaries
-
-  # Log the initial Multi config 
-  - cat Multiprotocol/_Config.h
-
-  # Back up the configuration
-  - cp Multiprotocol/_Config.h ./_Config.h.bak
-
-  # Get the firmware version number from the source
-  - MAJOR_VERSION=$(grep "VERSION_MAJOR" "Multiprotocol/Multiprotocol.h" | awk -v N=3 '{gsub(/\r/,""); print $N}')
-  - MINOR_VERSION=$(grep "VERSION_MINOR" "Multiprotocol/Multiprotocol.h" | awk -v N=3 '{gsub(/\r/,""); print $N}')
-  - REVISION_VERSION=$(grep "VERSION_REVISION" "Multiprotocol//Multiprotocol.h" | awk -v N=3 '{gsub(/\r/,""); print $N}')
-  - PATCH_VERSION=$(grep "VERSION_PATCH" "Multiprotocol//Multiprotocol.h" | awk -v N=3 '{gsub(/\r/,""); print $N}')
-  - MULTI_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$REVISION_VERSION.$PATCH_VERSION
-
-  # Derive the Multi protocols from the Multi source
-  - A7105_PROTOCOLS=$(sed -n 's/[\/\/]*[[:blank:]]*#define[[:blank:]]*\([[:alnum:]_]*_A7105_INO\)\(.*\)/\1/p' Multiprotocol/_Config.h)
-  - CC2500_PROTOCOLS=$(sed -n 's/[\/\/]*[[:blank:]]*#define[[:blank:]]*\([[:alnum:]_]*_CC2500_INO\)\(.*\)/\1/p' Multiprotocol/_Config.h)
-  - CYRF6936_PROTOCOLS=$(sed -n 's/[\/\/]*[[:blank:]]*#define[[:blank:]]*\([[:alnum:]_]*_CYRF6936_INO\)\(.*\)/\1/p' Multiprotocol/_Config.h)
-  - NRF24L01_PROTOCOLS=$(sed -n 's/[\/\/]*[[:blank:]]*#define[[:blank:]]*\([[:alnum:]_]*_NRF24L01_INO\)\(.*\)/\1/p' Multiprotocol/_Config.h)
-  - SX1276_PROTOCOLS=$(sed -n 's/[\/\/]*[[:blank:]]*#define[[:blank:]]*\([[:alnum:]_]*_SX1276_INO\)\(.*\)/\1/p' Multiprotocol/_Config.h)
-
-  # Get the full set of protocols for each board
-  - if [[ "$BOARD" =~ "multi4in1:avr:multixmega32d4" ]]; then
-      ALL_PROTOCOLS=$(echo $CYRF6936_PROTOCOLS);
-    elif [[ "$BOARD" =~ "multi4in1:avr:multiatmega328p:" ]]; then
-      ALL_PROTOCOLS=$(echo $A7105_PROTOCOLS $CC2500_PROTOCOLS $CYRF6936_PROTOCOLS $NRF24L01_PROTOCOLS);
-    elif [[ "$BOARD" =~ "multi4in1:STM32F1:" ]]; then
-      ALL_PROTOCOLS=$(echo $A7105_PROTOCOLS $CC2500_PROTOCOLS $CYRF6936_PROTOCOLS $NRF24L01_PROTOCOLS $SX1276_PROTOCOLS);
-    fi
-  - echo $ALL_PROTOCOLS
-
-  # Declare all the installed modules
-  - if [[ "$BOARD" =~ "multi4in1:STM32F1:" ]]; then
-      ALL_RFMODULES=$(echo A7105_INSTALLED CYRF6936_INSTALLED CC2500_INSTALLED NRF24L01_INSTALLED SX1276_INSTALLED);
-    else
-      ALL_RFMODULES=$(echo A7105_INSTALLED CYRF6936_INSTALLED CC2500_INSTALLED NRF24L01_INSTALLED);
-    fi
-
-  # Disable CHECK_FOR_BOOTLOADER when not needed
-  - if [[ "$BOARD" == "multi4in1:avr:multiatmega328p:bootloader=none" ]]; then
-      opt_disable CHECK_FOR_BOOTLOADER;
-    fi
-
-  # Trim the enabled protocols down for the STM32 board with debugging
-  - if [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103c:debug_option=ftdi" ]] || [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103c:debug_option=native" ]]; then
-      opt_disable $ALL_PROTOCOLS;
-      opt_enable FRSKYX_CC2500_INO AFHDS2A_A7105_INO MJXQ_NRF24L01_INO DSM_CYRF6936_INO;
-    fi
-
-  # Trim the enabled protocols down for the Atmega328p board
-  - if [[ "$BOARD" =~ "multi4in1:avr:multiatmega328p:" ]]; then
-      opt_disable $ALL_PROTOCOLS;
-      opt_enable FRSKYX_CC2500_INO AFHDS2A_A7105_INO MJXQ_NRF24L01_INO DSM_CYRF6936_INO;
-    fi
-
-  # Useful Travis functions
-  - export -f travis_fold
-  - export -f travis_nanoseconds
-  - export -f travis_time_start
-  - export -f travis_time_finish
-  - start_fold() { echo -e "travis_fold:start:$1"; }
-  - end_fold() { echo -e "\ntravis_fold:end:$1\r"; }
-
-script:
-  # Build with default configuration - all protocols are enabled for STM32; a subset of protocols for Atmega or STM32 debugging
-  - buildDefault
-
-  # Serial only
-  - buildSerialOnly
-
-  # PPM only
-  - buildPPMOnly
-
-  # Re-enable PPM and serial
-  - opt_enable ENABLE_SERIAL
-  - opt_enable ENABLE_PPM
-
-  # Build for each RF module individually
-  - buildEachRFModule
-
-  # Restore the default configuration
-  - cp ./_Config.h.bak Multiprotocol/_Config.h
-
-  # Build each protocol individually
-  - buildEachProtocol
-
-  # Restore the default configuration
-  - cp ./_Config.h.bak Multiprotocol/_Config.h
-
-  # Restore the default configuration
-  - cp ./_Config.h.bak Multiprotocol/_Config.h
-
-  # Builds the files for a release - always built, but only copied to Github if the test is tagged as a release
-  - buildReleaseFiles
-
-deploy:
-  provider: releases
-  token:
-    secure: KGXaoqvd8rbZ3AZtL9Rrn1JYiocGsPaihRUyR8gM8vTfvH9WYAE1+h6SzROQOuJSwr89MvTo3SBOTlM/0PDBnEGLec9Irt7cwO0xf9xM2vPuUG8DYcUzmJJzME9dkn/7qHof1JGgRpp1duUAN1triE9NxhKxL1hbs+tUUbDPAejxwoFNfnta/T4PfD6xmkZNJbneIfYFuFgyLpwwFhuUy9JP7s1AFOiT+fCHxPaZrPn5GsXqAi95Cb7Q3w1iVSt3BmrGxL2j3CeNpWzFY1RrMdc8ay+ppOhSPEIl2vyM7VeLRRBL3EVeFWkiS4ywevqw70wOivTczluv3OeuIJAe5o2UU+w5+59c7+i44Nih23PDAZBhAG5JkLUYUN0XUJpXJ5ZlZsb8IS8sI1txlZa5tNVoXO9+soGEY4rKSpZaPptuENm792CzzAjcaUI9pOFJ/0CBoSCbu5MpM/plkJCMd8fY27EE8cNYvolMuRATNlXs7h9mURGR69pmcR1jFShH+A7Kyp1S1sH19sGCEU16rt2aAtf2FadFg/gKACC2y9rB3wBb4Qnapu2AwNRlTYNuU1+G+kb2FXRwMl04q+38S+cIBHH9NHfdftp9MRPf8Ekatojs92be/Ux21S+hcA7sx/DV22Dl45V6l4mXzR7U4x1nQcdn1SGuy5I4lL6IYCk=
-  skip_cleanup: true
-  file_glob: true
-  file: binaries/*
-  on:
-    tags: true

BootLoaders/package_multi_4in1_board_index.json

@@ -170,6 +170,24 @@
         ],
         "toolsDependencies": []
       },
+      {
+        "name": "MULTI-Module AVR Boards",
+        "architecture": "avr",
+        "version": "1.1.1",
+        "category": "Contributed",
+        "help": {
+          "online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module"
+        },
+        "url": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module-Boards/raw/master/archives/package_multi_4in1_avr_board_v1.1.1.tar.gz",
+        "archiveFileName": "package_multi_4in1_avr_board_v1.1.1.tar.gz",
+        "checksum": "SHA-256:02158258b4dbaca61bedbb6933336200d13b02ad0db981e2dda253682c482e99",
+        "size": "324512",
+        "boards": [
+          {"name": "Multi 4-in-1 (Atmega328p, 3.3V, 16MHz)"},
+          {"name": "Multi 4-in-1 (OrangeRX)"}
+        ],
+        "toolsDependencies": []
+      },
       {
         "name": "Multi 4-in-1 STM32 Board",
         "architecture": "STM32F1",
@@ -549,6 +567,73 @@
           "version": "4.8.3-2014q1"
         }]
       },
+      {
+        "name": "Multi X-in-1 STM32 Boards",
+        "architecture": "STM32F1",
+        "version": "1.2.0",
+        "category": "Contributed",
+        "help": {
+          "online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module"
+        },
+        "url": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module-Boards/raw/master/archives/package_multi_4in1_stm32_board_v1.2.0.tar.gz",
+        "archiveFileName": "package_multi_4in1_stm32_board_v1.2.0.tar.gz",
+        "checksum": "SHA-256:754f08ca2a553701cc9112b645c079b6041107f1bf863648305e560c136a6ac5",
+        "size": "7496214",
+        "boards": [
+          {"name": "Multi 4-in-1 (STM32F103C)"},
+          {"name": "Multi 5-in-1 (Jumper T18 Internal)"}
+        ],
+        "toolsDependencies": [{
+          "packager": "arduino",
+          "name": "arm-none-eabi-gcc",
+          "version": "4.8.3-2014q1"
+        }]
+      },
+      {
+        "name": "Multi X-in-1 STM32 Boards",
+        "architecture": "STM32F1",
+        "version": "1.2.1",
+        "category": "Contributed",
+        "help": {
+          "online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module"
+        },
+        "url": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module-Boards/raw/master/archives/package_multi_4in1_stm32_board_v1.2.1.tar.gz",
+        "archiveFileName": "package_multi_4in1_stm32_board_v1.2.1.tar.gz",
+        "checksum": "SHA-256:c66d34afadc5b21e9e28c4d477fa03a6d55db0b74b59ff2dcb07b4d6ef06da1a",
+        "size": "7496448",
+        "boards": [
+          {"name": "Multi 4-in-1 (STM32F103C)"},
+          {"name": "Multi 5-in-1 (Jumper T18 Internal)"}
+        ],
+        "toolsDependencies": [{
+          "packager": "arduino",
+          "name": "arm-none-eabi-gcc",
+          "version": "4.8.3-2014q1"
+        }]
+      },
+      {
+        "name": "MULTI-Module STM32 Boards",
+        "architecture": "STM32F1",
+        "version": "1.2.2",
+        "category": "Contributed",
+        "help": {
+          "online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module"
+        },
+        "url": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module-Boards/raw/master/archives/package_multi_4in1_stm32_board_v1.2.2.tar.gz",
+        "archiveFileName": "package_multi_4in1_stm32_board_v1.2.2.tar.gz",
+        "checksum": "SHA-256:0fe4a8899438bbc31dc37714acca13968e43d75a47e59143343d83b634d2e47d",
+        "size": "7485662",
+        "boards": [
+          {"name": "Multi X-in-1 STM32F103CB (128KB)"},
+          {"name": "Multi X-in-1 STM32F103C8 (64KB)"},
+          {"name": "Multi 5-in-1 (Jumper T18 Internal)"}
+        ],
+        "toolsDependencies": [{
+          "packager": "arduino",
+          "name": "arm-none-eabi-gcc",
+          "version": "4.8.3-2014q1"
+        }]
+      },
       {
         "name": "Multi 4-in-1 OrangeRX Board - DEPRECATED, USE MULTI 4-IN-1 AVR BOARDS PACKAGE INSTEAD",
         "architecture": "orangerx",

Lua_scripts/DSM FwdPrg_05_BW.lua

@@ -0,0 +1,464 @@
+local toolName = "TNS|DSM Forward Prog v0.5 (Text B&W) |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 SIMULATION_ON = false  -- FALSE: use real communication to DSM RX (DEFAULT), TRUE: use a simulated version of RX 
+local DEBUG_ON = 1           -- 0=NO DEBUG, 1=HIGH LEVEL 2=LOW LEVEL   (Debug logged into the /LOGS/dsm.log)
+local DEBUG_ON_LCD = false   -- Interactive Information on LCD of Menu data from RX 
+
+local DSMLIB_PATH = "/SCRIPTS/TOOLS/DSMLIB/"
+
+local dirExist = fstat(DSMLIB_PATH.."DsmFwPrgLib.lua")
+if (dirExist==nil) then error("Make sure "..DSMLIB_PATH.." contains DsmFwPrgLib.lua") end
+dirExist = fstat(DSMLIB_PATH.."DsmFwPrgSIMLib.lua")
+if (dirExist==nil) then error("Make sure "..DSMLIB_PATH.." contains DsmFwPrgSIMLib.lua") end
+
+local dsmLib
+if (SIMULATION_ON) then
+  -- library with SIMILATION VERSION.  Works really well in Companion for GUI development
+  dsmLib = loadScript(DSMLIB_PATH .. "DsmFwPrgSIMLib.lua")(DEBUG_ON)
+else
+  dsmLib = loadScript(DSMLIB_PATH .. "DsmFwPrgLib.lua")(DEBUG_ON)
+end
+
+local PHASE = dsmLib.PHASE
+local LINE_TYPE = dsmLib.LINE_TYPE
+local DISP_ATTR = dsmLib.DISP_ATTR
+
+local DSM_Context = dsmLib.DSM_Context
+
+local LCD_W_USABLE          = LCD_W-10
+-- X for Menu Lines
+local LCD_X_LINE_MENU       = 10  
+-- X offsets for (Title: [Value] debugInfo) lines
+local LCD_X_LINE_TITLE      = 10
+local LCD_X_LINE_VALUE      = 230
+local LCD_X_LINE_DEBUG      = 390
+
+-- Line Height: make it smaller debugging info tp LCD (some space buttom) 
+local LCD_Y_LINE_HEIGHT      = (DEBUG_ON_LCD and 23)  or 27   -- if DEBUG 23 else 27
+-- Y offsets
+local LCD_Y_MENU_TITLE       = 20
+-- Y offet
+local LCD_Y_LINE_FIRST       = LCD_Y_MENU_TITLE + 30
+local LCD_Y_LOWER_BUTTONS    = LCD_Y_LINE_FIRST + 7 * LCD_Y_LINE_HEIGHT
+
+local LCD_W_BUTTONS          = 47
+local LCD_H_BUTTONS          = 25
+local LCD_X_RIGHT_BUTTONS    = LCD_W - LCD_W_BUTTONS - 5
+
+local TEXT_SIZE             = 0 -- NORMAL
+
+local lastRefresh=0         -- Last time the screen was refreshed
+local REFRESH_GUI_MS = 500/10   -- 500ms.. Screen Refresh Rate.. to not use unneded CPU time  (in 10ms units to be compatible with getTime())
+local originalValue = nil
+
+------------------------------------------------------------------------------------------------------------
+local function GUI_SwitchSimulationOFF()
+  dsmLib.ReleaseConnection()  
+  dsmLib.LOG_close()
+
+  SIMULATION_ON = false
+  dsmLib = loadScript(DSMLIB_PATH .. "DsmFwPrgLib.lua")(DEBUG_ON)
+  DSM_Context = dsmLib.DSM_Context
+
+  dsmLib.Init(toolName)  -- Initialize Library 
+  dsmLib.StartConnection()
+  DSM_Context.Refresh_Display = true
+end
+
+local function openTx_lcd_sizeText(s)
+  return string.len(s)*5
+end
+
+local function GUI_Diplay_Button(x,y,w,h,text,selected)
+  local attr = (selected) and INVERS or 0    -- INVERS if line Selected
+  lcd.drawText(x+5,y+2, text, attr + TEXT_SIZE)
+  lcd.drawRectangle(x, y, w, h, LINE_COLOR)
+end
+
+local function GUI_Display_Menu(menu)
+  local ctx = DSM_Context
+  local w=  LCD_W_USABLE - LCD_W_BUTTONS - 10  -- usable Width for the Menu/Lines
+
+  -- Center Header
+  local tw = openTx_lcd_sizeText(menu.Text) 
+  local x = w/2 - tw/2  -- Center of Screen - Center of Text
+
+  local bold = 0
+  if (TEXT_SIZE~=SMLSIZE) then  -- Ignore Bold on small size screens
+      bold = BOLD
+  end
+  lcd.drawText(x,LCD_Y_MENU_TITLE,menu.Text,bold + TEXT_SIZE)
+
+  -- Back
+  if menu.BackId ~= 0 then
+    GUI_Diplay_Button(LCD_X_RIGHT_BUTTONS,LCD_Y_MENU_TITLE,LCD_W_BUTTONS,LCD_H_BUTTONS,"Back",ctx.SelLine == dsmLib.BACK_BUTTON)
+  end
+  -- Next ?
+  if menu.NextId ~= 0 then
+    GUI_Diplay_Button(LCD_X_RIGHT_BUTTONS,LCD_Y_LOWER_BUTTONS,LCD_W_BUTTONS,LCD_H_BUTTONS,"Next",ctx.SelLine == dsmLib.NEXT_BUTTON)
+  end
+  -- Prev?
+  if menu.PrevId ~= 0 then
+    GUI_Diplay_Button(0,LCD_Y_LOWER_BUTTONS,LCD_W_BUTTONS,LCD_H_BUTTONS,"Prev",ctx.SelLine == dsmLib.PREV_BUTTON)
+  end
+
+  -- Debug into LCD 
+  if (DEBUG_ON_LCD) then lcd.drawText(0,LCD_Y_MENU_TITLE,dsmLib.phase2String(ctx.Phase),TEXT_SIZE + WARNING_COLOR) end  -- Phase we are in 
+  if (DEBUG_ON_LCD) then lcd.drawText(LCD_X_LINE_MENU,240,dsmLib.menu2String(menu),TEXT_SIZE + WARNING_COLOR) end  -- Menu Info
+end
+
+local function GUI_Display_Line_Menu(x,y,w,h,line,selected)
+  local attr = (selected and INVERS) or 0    -- INVERS if line Selected
+  local bold = 0
+  local text = line.Text
+
+  if dsmLib.isSelectableLine(line) then  
+      -- Menu Line
+      text = text .. "  >"  
+  else  -- SubHeaders and plain text lines
+      if (TEXT_SIZE~=SMLSIZE) then -- ignore bold on small size screens
+        bold = (dsmLib.isDisplayAttr(line.TextAttr,DISP_ATTR.BOLD) and BOLD) or 0  
+      end
+    
+      if dsmLib.isDisplayAttr(line.TextAttr,DISP_ATTR.RIGHT) then -- Right Align???
+          local tw = openTx_lcd_sizeText(line.Text)+4
+          x =  LCD_X_LINE_VALUE - tw     -- Right 
+      elseif dsmLib.isDisplayAttr(line.TextAttr,DISP_ATTR.CENTER) then -- Center??
+          local tw = openTx_lcd_sizeText(line.Text) 
+          x =  x + (LCD_X_LINE_VALUE - LCD_X_LINE_MENU)/2 - tw/2  -- Center - 1/2 Text
+      end
+  end
+
+  lcd.drawText(x,y, text, attr + bold + TEXT_SIZE)
+
+end
+------------------------------------------------------------------------------------------------------------
+local function GUI_Display_Line_Value(lineNum, line, value, selected, editing)
+  local bold      = 0
+
+  local y = LCD_Y_LINE_FIRST+(LCD_Y_LINE_HEIGHT*lineNum)
+  local x = LCD_X_LINE_TITLE
+
+  ---------- NAME Part 
+  local header = line.Text
+  -- ONLY do this for Flight Mode (Right Align or Centered)
+  if (dsmLib.isFlightModeText(line.TextId)) then
+       -- Display Header + Value together
+       header = dsmLib.GetFlightModeValue(line.TextId,header,value)
+
+      -- Flight mode display attributes
+      if (TEXT_SIZE~=SMLSIZE) then -- ignore bold on small size screens
+          bold = (dsmLib.isDisplayAttr(line.TextAttr,DISP_ATTR.BOLD) and BOLD) or 0
+      end
+
+      if dsmLib.isDisplayAttr(line.TextAttr,DISP_ATTR.RIGHT) then -- Right Align
+          local tw = openTx_lcd_sizeText(header)+4
+          x =  LCD_X_LINE_VALUE - tw     -- Right 
+      elseif dsmLib.isDisplayAttr(line.TextAttr,DISP_ATTR.CENTER) then -- Centered
+          local tw = openTx_lcd_sizeText(header)
+          x =  x + (LCD_X_LINE_VALUE - LCD_X_LINE_TITLE)/2 - tw/2  -- Center - 1/2 Text
+      end
+  else
+    -- No Flight Mode, no effects here
+    header = header .. ":"
+  end
+
+  lcd.drawText(x, y, header, bold + TEXT_SIZE) -- display Line Header
+
+  --------- VALUE PART,  Skip for Flight Mode since already show the value 
+  if not dsmLib.isFlightModeText(line.TextId) then 
+    local attrib    = 0
+    value = value .. (line.Format or "")  -- Append % if needed
+
+    if selected then
+      attrib = INVERS
+      if editing then -- blink editing entry
+        attrib = attrib + BLINK
+        value = "[ " .. value .. " ]"
+      end
+    end
+    
+    lcd.drawText(LCD_X_LINE_VALUE,y, value, attrib + TEXT_SIZE) -- display value
+  end
+
+  if (DEBUG_ON_LCD) then  lcd.drawText(LCD_X_LINE_DEBUG,y, line.MinMaxDebug or "", TEXT_SIZE + WARNING_COLOR) end -- display debug
+end
+
+------------------------------------------------------------------------------------------------------------
+local function GUI_ShowBitmap(x,y,imgData)
+  -- imgData format "bitmap.png|alt message"
+  local f = string.gmatch(imgData, '([^%|]+)') -- Iterator over values split by '|'
+  local imgName, imgMsg = f(), f()
+
+  lcd.drawText(x, y, imgMsg or "")  -- Alternate Image MSG 
+
+  -- NO IMAGES in Text B&W 
+  --local imgPath = IMAGE_PATH .. (imgName or "")
+  --local bitmap  = Bitmap.open(imgPath)
+  --if (bitmap~=nil) then
+  --   lcd.drawBitmap(bitmap, x,y+20)
+  --end
+end
+
+------------------------------------------------------------------------------------------------------------
+local function GUI_Display()
+  local ctx = DSM_Context
+  lcd.clear()
+ 
+    local header = "DSM Fwrd Programming      "
+    if ctx.Phase ~= PHASE.RX_VERSION then
+      header = header .. "RX "..ctx.RX.Name.." v"..ctx.RX.Version
+    end
+
+    --Draw title
+    if (TEXT_SIZE~=SMLSIZE) then -- ignore tool title small size screens
+        lcd.drawFilledRectangle(0, 0, LCD_W, 20, TITLE_BGCOLOR)
+        lcd.drawText(5, 0, header, MENU_TITLE_COLOR  + TEXT_SIZE)
+    end
+    --Draw RX Menu
+    if ctx.Phase == PHASE.RX_VERSION then
+      if (ctx.isReset) then
+        lcd.drawText(LCD_X_LINE_TITLE,50,"Waiting for RX to Restart", BLINK + TEXT_SIZE)
+      else
+        lcd.drawText(LCD_X_LINE_TITLE,50,"No compatible DSM RX...", BLINK + TEXT_SIZE)
+      end
+    else
+      local menu = ctx.Menu
+      if menu.Text ~=  nil then
+
+        GUI_Display_Menu(menu)
+
+        for i = 0, dsmLib.MAX_MENU_LINES do
+          local line = ctx.MenuLines[i]
+
+          if i == ctx.SelLine then
+            -- DEBUG: Display Selected Line info for ON SCREEN Debugging
+            if (DEBUG_ON_LCD) then lcd.drawText(LCD_X_LINE_TITLE,255,dsmLib.menuLine2String(line),TEXT_SIZE + WARNING_COLOR) end
+          end
+
+          if line ~= nil and line.Type ~= 0 then
+            if line.Type == LINE_TYPE.MENU then 
+              -- Menu Line 
+              GUI_Display_Line_Menu(LCD_X_LINE_MENU,LCD_Y_LINE_FIRST+(LCD_Y_LINE_HEIGHT*i), 350, LCD_Y_LINE_HEIGHT, line, i == ctx.SelLine)
+            else  
+              -- list/value line 
+              local value = line.Val
+              if line.Val ~= nil then
+                if dsmLib.isListLine(line) then    -- for Lists of Strings, get the text
+                  value = dsmLib.Get_List_Text(line.Val + line.TextStart) -- TextStart is the initial offset for text
+                  local imgData = dsmLib.Get_List_Text_Img(line.Val + line.TextStart)   -- Complentary IMAGE for this value to Display??
+                    
+                  if (imgData) then  -- Optional Image and Msg for value
+                    GUI_ShowBitmap(LCD_X_LINE_TITLE,LCD_Y_LINE_FIRST+LCD_Y_LINE_HEIGHT, imgData)
+                  end
+                end
+
+                GUI_Display_Line_Value(i, line, value, i == ctx.SelLine, i == ctx.EditLine)
+              end
+            end -- if ~MENU
+          end -- if Line[i]~=nil
+        end  -- for
+      end 
+    end
+  
+end
+
+-------------------------------------------------------------------------------------------------------------
+local function GUI_RotEncVal(dir) -- return encoder speed to inc or dec values
+  local inc = 0
+  local Speed = getRotEncSpeed()
+
+  if Speed == ROTENC_MIDSPEED then
+    inc = (5 * dir)
+  elseif Speed == ROTENC_HIGHSPEED then
+    inc = (15 * dir)
+  else
+    inc = dir
+  end
+
+  return inc
+end
+
+------------------------------------------------------------------------------------------------------------
+local function GUI_HandleEvent(event, touchState)
+  local ctx = DSM_Context
+  local menu = ctx.Menu
+  local menuLines = ctx.MenuLines
+
+  if event == EVT_VIRTUAL_EXIT then
+    ctx.Refresh_Display=true
+    if (DEBUG_ON) then dsmLib.LOG_write("%s: EVT_VIRTUAL_EXIT\n",dsmLib.phase2String(ctx.Phase)) end
+    if ctx.Phase == PHASE.RX_VERSION then
+      dsmLib.ReleaseConnection()
+    else
+      if ctx.isEditing() then  -- Editing a Line, need to  restore original value
+        ctx.MenuLines[ctx.EditLine].Val = originalValue        
+        dsmLib.ChangePhase(PHASE.VALUE_CHANGE_END)  -- Update+Validate value in RX 
+        ctx.EditLine = nil   -- Exit Edit Mode (By clearing the line editing)
+      else
+        dsmLib.ChangePhase(PHASE.EXIT)
+      end
+    end
+    return
+  end
+  
+  if event == EVT_VIRTUAL_NEXT then
+    ctx.Refresh_Display=true
+    if (DEBUG_ON) then dsmLib.LOG_write("%s: EVT_VIRTUAL_NEXT\n",dsmLib.phase2String(ctx.Phase)) end
+    if ctx.isEditing() then  -- Editing a Line, need to inc the value
+      local line=ctx.MenuLines[ctx.EditLine]
+      dsmLib.Value_Add(line, GUI_RotEncVal(1))
+    else  -- not editing, move selected line to NEXT
+      dsmLib.MoveSelectionLine(1)
+    end
+    return
+  end
+
+  if event == EVT_VIRTUAL_PREV then
+    ctx.Refresh_Display=true
+    if (DEBUG_ON) then dsmLib.LOG_write("%s: EVT_VIRTUAL_PREV\n",dsmLib.phase2String(ctx.Phase)) end
+    if ctx.isEditing() then  -- Editiing a line, need to dec the value
+      local line=ctx.MenuLines[ctx.EditLine]
+      dsmLib.Value_Add(line, GUI_RotEncVal(-1))
+    else  -- not editing, move selected line to PREV
+      dsmLib.MoveSelectionLine(-1)
+    end
+    return
+  end
+
+  if event == EVT_VIRTUAL_ENTER_LONG then
+    ctx.Refresh_Display=true
+    if (DEBUG_ON) then dsmLib.LOG_write("%s: EVT_VIRTUAL_ENTER_LONG\n",dsmLib.phase2String(ctx.Phase)) end
+    if ctx.isEditing() then
+    -- reset the value to default
+      dsmLib.Value_Default( menuLines[ctx.EditLine])   -- Update RX value as needed
+    end
+    return
+  end
+
+  if event == EVT_VIRTUAL_ENTER then
+    ctx.Refresh_Display=true
+    if (DEBUG_ON) then dsmLib.LOG_write("%s: EVT_VIRTUAL_ENTER\n",dsmLib.phase2String(ctx.Phase)) end
+    if ctx.SelLine == dsmLib.BACK_BUTTON then -- Back
+      dsmLib.GotoMenu(menu.BackId,0)
+    elseif ctx.SelLine == dsmLib.NEXT_BUTTON then -- Next
+      dsmLib.GotoMenu(menu.NextId,0)
+    elseif ctx.SelLine == dsmLib.PREV_BUTTON then -- Prev
+      dsmLib.GotoMenu(menu.PrevId,0)
+    elseif menuLines[ctx.SelLine].ValId ~= 0 then  
+      if menuLines[ctx.SelLine].Type == LINE_TYPE.MENU then -- Next menu exist
+        if (SIMULATION_ON and menuLines[ctx.SelLine].ValId==0xFFFF) then 
+          -- SPECIAL Simulation menu to Exit Simulation and
+          -- comunicate with Real RX 
+          GUI_SwitchSimulationOFF()
+        else
+          dsmLib.GotoMenu(menuLines[ctx.SelLine].ValId,ctx.SelLine)  -- ValId is the MenuId to navigate to
+        end
+      else
+        -- Editing a Line???? 
+        if ctx.isEditing() then
+          -- Change the Value and exit edit 
+          ctx.EditLine = nil
+          dsmLib.ChangePhase(PHASE.VALUE_CHANGE_END)
+        else
+          -- enter Edit the current line  
+          ctx.EditLine = ctx.SelLine
+          originalValue = menuLines[ctx.SelLine].Val
+        end
+      end
+    end
+  end
+end
+
+local function init_screen_pos()
+    if LCD_W == 480 then -- TX16
+        -- use defaults in the script header
+    elseif LCD_W == 128 then --TX12  (128x64) -- Still needs some work on the vertical
+      DEBUG_ON_LCD = false -- no space for this
+      TEXT_SIZE             = SMLSIZE
+      LCD_W_USABLE          = 128
+
+      LCD_W_BUTTONS          = 30
+      LCD_H_BUTTONS          = 17
+      LCD_X_RIGHT_BUTTONS    = 128 - LCD_W_BUTTONS - 5
+
+      LCD_X_LINE_MENU       = 0  
+      -- X offsets for (Title: [Value] debugInfo) lines
+      LCD_X_LINE_TITLE      = 0
+      LCD_X_LINE_VALUE      = 90
+      LCD_X_LINE_DEBUG      = 110
+
+      LCD_Y_LINE_HEIGHT      = 17
+      LCD_Y_MENU_TITLE       = 0
+      LCD_Y_LINE_FIRST       = LCD_Y_MENU_TITLE + 17
+      LCD_Y_LOWER_BUTTONS    = LCD_Y_LINE_FIRST + 7 * LCD_Y_LINE_HEIGHT
+    end
+end
+
+------------------------------------------------------------------------------------------------------------
+-- Init
+local function DSM_Init()
+  init_screen_pos()
+  dsmLib.Init(toolName)  -- Initialize Library 
+  return dsmLib.StartConnection()
+end
+
+
+------------------------------------------------------------------------------------------------------------
+-- Main
+
+
+local function DSM_Run(event)
+  local ctx = DSM_Context
+
+  if event == nil then
+    error("Cannot be run as a model script!")
+    dsmLib.LOG_close()
+    return 2
+  end
+
+  GUI_HandleEvent(event)
+
+  dsmLib.Send_Receive()  -- Handle Send and Receive DSM Forward Programming Messages
+
+  local refreshInterval =  REFRESH_GUI_MS
+  -- When using LCD BLINK attribute, we need faster refresh for BLINK to SHOW on LCD 
+  if (ctx.EditLine or (ctx.Phase == PHASE.RX_VERSION)) then  -- Editing or Requesting RX Version?
+    ctx.Refresh_Display=true  
+    refreshInterval = 20 -- 200ms
+  end
+
+  -- Refresh display only if needed and no faster than 500ms, utilize more CPU to speedup DSM communications
+  if (ctx.Refresh_Display and (getTime()-lastRefresh) > refreshInterval) then --300ms from last refresh 
+    GUI_Display()
+    ctx.Refresh_Display=false
+    lastRefresh=getTime()
+  end
+  
+  if ctx.Phase == PHASE.EXIT_DONE then
+    dsmLib.LOG_close()
+    return 2
+  else
+    return 0
+  end
+end
+
+
+return { init=DSM_Init, run=DSM_Run }

Lua_scripts/DSM FwdPrg_05_Color.lua

@@ -0,0 +1,651 @@
+local toolName = "TNS|DSM Forward Prog v0.5 (Color+Touch) |TNE"
+local VERSION  = "v0.5"
+
+---- #########################################################################
+---- #                                                                       #
+---- # 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 SIMULATION_ON = false   -- FALSE: use real communication to DSM RX (DEFAULT), TRUE: use a simulated version of RX 
+local DEBUG_ON = 1           -- 0=NO DEBUG, 1=HIGH LEVEL 2=LOW LEVEL   (Debug logged into the /LOGS/dsm.log)
+local DEBUG_ON_LCD = false   -- Interactive Information on LCD of Menu data from RX 
+local USE_SPECKTRUM_COLORS = true -- true: Use spectrum colors, false: use theme colors (default on OpenTX) 
+local DSMLIB_PATH = "/SCRIPTS/TOOLS/DSMLIB/"
+local IMAGE_PATH = DSMLIB_PATH .. "img/"
+
+local dirExist = fstat(DSMLIB_PATH.."DsmFwPrgLib.lua")
+if (dirExist==nil) then error("Make sure "..DSMLIB_PATH.." contains DsmFwPrgLib.lua") end
+dirExist = fstat(DSMLIB_PATH.."DsmFwPrgSIMLib.lua")
+if (dirExist==nil) then error("Make sure "..DSMLIB_PATH.." contains DsmFwPrgSIMLib.lua") end
+
+local dsmLib
+if (SIMULATION_ON) then
+  -- library with SIMILATION VERSION.  Works really well in Companion for GUI development
+  dsmLib = loadScript(DSMLIB_PATH.."DsmFwPrgSIMLib.lua")(DEBUG_ON)
+else
+  dsmLib = loadScript(DSMLIB_PATH.."DsmFwPrgLib.lua")(DEBUG_ON)
+end
+
+
+local PHASE = dsmLib.PHASE
+local LINE_TYPE = dsmLib.LINE_TYPE
+local DISP_ATTR   = dsmLib.DISP_ATTR
+local DSM_Context = dsmLib.DSM_Context
+
+
+local lastRefresh=0         -- Last time the screen was refreshed
+local REFRESH_GUI_MS = 300/10   -- 300ms.. Screen Refresh Rate.. to not waste CPU time  (in 10ms units to be compatible with getTime())
+local originalValue = nil
+
+local touchButtonArea           = {}
+local EDIT_BUTTON = {  DEFAULT=1001, DEC_10=1002, DEC_1=1003, INC_1=1004, INC_10=5, OK=1006, ESC=1007 }
+
+local IS_EDGETX   = false     -- DEFAULT until Init changed it
+
+local LCD_Y_MENU_TITLE      = 20
+local LCD_W_MENU_TITLE      = LCD_W-100
+
+local LCD_X_LINE_MENU       = 30
+local LCD_W_LINE_MENU       = 350
+
+local LCD_X_LINE_TITLE      = 30
+local LCD_X_LINE_VALUE      = 230
+local LCD_X_LINE_DEBUG      = 390
+
+
+local LCD_Y_LINE_START       = LCD_Y_MENU_TITLE + 30
+local LCD_Y_LINE_HEIGHT      = (DEBUG_ON_LCD and 23)  or 27   -- if DEBUG 23 else 27 
+
+local LCD_Y_LOWER_BUTTONS    = LCD_Y_LINE_START + 3 + (7 * LCD_Y_LINE_HEIGHT)
+
+
+-- TOOL HEADER 
+local LCD_TOOL_HDR_COLOR      = MENU_TITLE_COLOR
+local LCD_TOOL_HDR_BGCOLOR    = TITLE_BGCOLOR
+-- MENU HEADER
+local LCD_MENU_COLOR          = MENU_TITLE_COLOR 
+local LCD_MENU_BGCOLOR        = MENU_TITLE_BGCOLOR
+-- LINE SELECTED 
+local LCD_SELECTED_COLOR      = TEXT_INVERTED_COLOR
+local LCD_SELECTED_BGCOLOR    = TEXT_INVERTED_BGCOLOR
+local LCD_EDIT_BGCOLOR        = WARNING_COLOR 
+-- NORMAL TEXT  
+local LCD_NORMAL_COLOR        = TEXT_COLOR
+local LCD_DISABLE_COLOR       = TEXT_DISABLE_COLOR
+local LCD_DEBUG_COLOR         = LINE_COLOR
+-- NORMAL BOX FRAME COLOR 
+local LCD_BOX_COLOR           = TEXT_DISABLE_COLOR  
+
+
+
+--------------------- lcd.sizeText replacement -------------------------------------------------
+-- EdgeTx dont have lcd.sizeText, so we do an equivalent one using the string length and 5px per character
+local function my_lcd_sizeText(s)
+  -- return: If IS_EDGETX then lcd.sizeText() else string.len()
+  return (IS_EDGETX and lcd.sizeText(s)) or (string.len(s)*10)  
+end
+
+
+local function GUI_SwitchSimulationOFF()
+  dsmLib.ReleaseConnection()  
+  dsmLib.LOG_close()
+
+  SIMULATION_ON = false
+  dsmLib = loadScript(DSMLIB_PATH .. "DsmFwPrgLib.lua")(DEBUG_ON)
+  DSM_Context = dsmLib.DSM_Context
+
+  dsmLib.Init(toolName)  -- Initialize Library 
+  dsmLib.StartConnection()
+  DSM_Context.Refresh_Display = true
+end
+
+
+--------------------- Toucch Button Helpers ------------------------------------------------------------
+local function GUI_addTouchButton(x,y,w,h,line)
+  -- Add new button info to end of the array
+  touchButtonArea[#touchButtonArea+1] = {x=x, y=y, w=w, h=h, line=line}
+end
+
+local function GUI_getTouchButton(x,y)
+  for i = 1, #touchButtonArea do
+    local button = touchButtonArea[i]
+    -- is the coordinate inside the button area??
+    if (x >= button.x and x <= (button.x+button.w) and y >= button.y and (y <= button.y+button.h)) then
+      return button.line
+    end
+  end
+  return nil
+end
+
+local function GUI_clearTouchButtons()
+  touchButtonArea           = {}
+end
+
+---------- Return Color to display Menu Lines ----------------------------------------------------------------
+local function GUI_GetTextColor(lineNum)
+  local ctx = DSM_Context
+  local txtColor  = LCD_NORMAL_COLOR
+  -- Gray Out any other line except the one been edited
+  if (ctx.isEditing() and ctx.EditLine~=lineNum) then txtColor=LCD_DISABLE_COLOR end
+  return txtColor
+end
+
+local function GUI_GetFrameColor(lineNum)  -- Frame Color for Value/Menu Boxes
+  local ctx = DSM_Context
+  local txtColor  = LCD_BOX_COLOR
+  -- Gray Out any other line except the one been edited
+  if (ctx.EditLine~=lineNum) then txtColor=LCD_DISABLE_COLOR end 
+  return txtColor
+end
+
+--------------------------------------------------------------------------------------------------------
+-- Display Text inside a Rectangle.  Inv: true means solid rectangle, false=only perimeter
+local function GUI_Display_Boxed_Text(lineNum,x,y,w,h,text,inv)
+  local ctx = DSM_Context
+  local txtColor  = GUI_GetTextColor(lineNum)
+  local frameColor = GUI_GetFrameColor(lineNum)
+  -- If editing this lineNum, chose EDIT Color, else SELECTED Color
+  local selectedBGColor = (ctx.EditLine==lineNum and LCD_EDIT_BGCOLOR) or LCD_SELECTED_BGCOLOR 
+  
+  if (inv) then
+    txtColor  = LCD_SELECTED_COLOR 
+    lcd.drawFilledRectangle(x-5, y-2, w, h, selectedBGColor)
+  else
+    lcd.drawRectangle(x-5, y-2, w, h, frameColor)
+  end
+  lcd.drawText(x , y, text, txtColor) 
+
+end
+
+------ Display Pre/Next/Back buttons
+local function GUI_Diplay_Button(x,y,w,h,text,selected)
+  GUI_Display_Boxed_Text(-1,x,y,w,h,text,selected)
+end
+
+------ Display MENU type of lines (Navigation, SubHeaders, and plain text comments)
+local function GUI_Display_Line_Menu(lineNum,line,selected)
+  -- Menu Lines can be navidation to other Menus (if Selectable)
+  -- Or SubHeaders or Messages
+
+  local txtColor  = GUI_GetTextColor(lineNum)
+  local y = LCD_Y_LINE_START+(LCD_Y_LINE_HEIGHT*lineNum)
+  local x = LCD_X_LINE_MENU
+ 
+  if dsmLib.isSelectableLine(line) then -- Draw Selectable Menus in Boxes
+    GUI_Display_Boxed_Text(lineNum,x, y, LCD_W_LINE_MENU, LCD_Y_LINE_HEIGHT, line.Text,selected)
+    GUI_addTouchButton(x, y, LCD_W_LINE_MENU, LCD_Y_LINE_HEIGHT,lineNum)
+  else
+    -- Non Selectable Menu Lines, plain text
+    -- Can be use for sub headers or just regular text lines (like warnings)
+
+    local bold = (dsmLib.isDisplayAttr(line.TextAttr,DISP_ATTR.BOLD) and BOLD) or 0  
+
+    if dsmLib.isDisplayAttr(line.TextAttr,DISP_ATTR.RIGHT) then -- Right Align???
+        local tw = my_lcd_sizeText(line.Text)+4
+        x =  LCD_X_LINE_VALUE - tw     -- Right 
+    elseif dsmLib.isDisplayAttr(line.TextAttr,DISP_ATTR.CENTER) then -- Center??
+        local tw = my_lcd_sizeText(line.Text) 
+        x =  x + (LCD_X_LINE_VALUE - LCD_X_LINE_MENU)/2 - tw/2  -- Center - 1/2 Text
+    end
+
+    lcd.drawText(x, y, line.Text, txtColor + bold)  
+  end
+end
+
+------ Display NAME : VALUES type of lines 
+local function GUI_Display_Line_Value(lineNum, line, value, selected, editing)
+  -- This Displays Name and Value Pairs
+  local txtColor  = GUI_GetTextColor(lineNum)
+  local bold      = 0
+  local y = LCD_Y_LINE_START+(LCD_Y_LINE_HEIGHT*lineNum)
+  local x = LCD_X_LINE_TITLE
+
+  --if (editing) then -- Any Special color/effect when editing??
+  --  value = "["..value .. "]"
+  --end
+
+  ---------- NAME Part 
+  local header = line.Text
+  -- ONLY do this for Flight Mode (Right Align or Centered)
+  if (dsmLib.isFlightModeText(line.TextId)) then
+      -- Display Header + Value together
+      header = dsmLib.GetFlightModeValue(line.TextId,header,value)
+
+      -- Bold Text???
+      bold = (dsmLib.isDisplayAttr(line.TextAttr,DISP_ATTR.BOLD) and BOLD) or 0
+
+      if dsmLib.isDisplayAttr(line.TextAttr,DISP_ATTR.RIGHT) then -- Right Align
+          local tw = my_lcd_sizeText(header)+4
+          x =  LCD_X_LINE_VALUE - tw     -- Right 
+      elseif dsmLib.isDisplayAttr(line.TextAttr,DISP_ATTR.CENTER) then -- Centered
+          local tw = my_lcd_sizeText(header)
+          x =  x + (LCD_X_LINE_VALUE - LCD_X_LINE_TITLE)/2 - tw/2  -- Center - 1/2 Text
+      end
+  else
+    -- No Flight Mode, no effects here
+    header = header .. ":"
+  end
+
+  lcd.drawText(x, y, header, txtColor + bold) -- display Line Header
+
+  --------- VALUE PART,  Skip for Flight Mode since already show the value 
+  if not dsmLib.isFlightModeText(line.TextId) then 
+    value = value .. (line.Format or "")  -- Append % if needed
+    
+    if dsmLib.isSelectableLine(line) then 
+      -- Can select/edit value, Box it 
+      local tw = my_lcd_sizeText(value)+10 -- Width of the Text in the lcd
+      GUI_Display_Boxed_Text(lineNum,LCD_X_LINE_VALUE,y,tw,LCD_Y_LINE_HEIGHT,value,selected)
+      GUI_addTouchButton(LCD_X_LINE_VALUE,y,tw,LCD_Y_LINE_HEIGHT,lineNum)
+    else -- Not Editable, Plain Text 
+      lcd.drawText(LCD_X_LINE_VALUE, y, value, txtColor)
+    end
+  end
+  
+  -- Debug info for line Value RANGE when Debug on LCD
+  if (DEBUG_ON_LCD) then  lcd.drawText(LCD_X_LINE_DEBUG, y, line.MinMaxDebug or "", SMLSIZE + LCD_DEBUG_COLOR) end -- display debug Min/Max
+end
+
+local function GUI_Display_Menu(menu)
+  local ctx = DSM_Context
+  local w=  LCD_W_MENU_TITLE
+
+  -- Center Header
+  local tw = my_lcd_sizeText(menu.Text) 
+  local x = w/2 - tw/2  -- Center of Screen - Center of Text
+
+  lcd.drawFilledRectangle(0, LCD_Y_MENU_TITLE-2, w, LCD_Y_LINE_HEIGHT-2, LCD_MENU_BGCOLOR)
+  lcd.drawText(x,LCD_Y_MENU_TITLE,menu.Text,  LCD_MENU_COLOR + BOLD) 
+
+  -- Back Button
+  if menu.BackId ~= 0 then
+    GUI_Diplay_Button(437-5,LCD_Y_MENU_TITLE+3,47,LCD_Y_LINE_HEIGHT,"Back",ctx.SelLine == dsmLib.BACK_BUTTON)
+    GUI_addTouchButton(437-5,LCD_Y_MENU_TITLE+3,47,LCD_Y_LINE_HEIGHT,dsmLib.BACK_BUTTON)
+  end
+  -- Next Button
+  if menu.NextId ~= 0 then
+    GUI_Diplay_Button(437-5,LCD_Y_LOWER_BUTTONS,47,LCD_Y_LINE_HEIGHT,"Next",ctx.SelLine == dsmLib.NEXT_BUTTON)
+    GUI_addTouchButton(437-5,LCD_Y_LOWER_BUTTONS,47,LCD_Y_LINE_HEIGHT,dsmLib.NEXT_BUTTON)
+  end
+  -- Prev Button
+  if menu.PrevId ~= 0 then
+    GUI_Diplay_Button(10,LCD_Y_LOWER_BUTTONS,47,LCD_Y_LINE_HEIGHT,"Prev",ctx.SelLine == dsmLib.PREV_BUTTON)
+    GUI_addTouchButton(10,LCD_Y_LOWER_BUTTONS,47,LCD_Y_LINE_HEIGHT,dsmLib.PREV_BUTTON)
+  end
+
+  -- Debug on LCD, Show the menu Indo and Phase we are on 
+  if (DEBUG_ON_LCD) then lcd.drawText(0,LCD_Y_MENU_TITLE,dsmLib.phase2String(ctx.Phase),SMLSIZE+LCD_DEBUG_COLOR) end  -- Phase we are in 
+  if (DEBUG_ON_LCD) then lcd.drawText(0,240,dsmLib.menu2String(menu),SMLSIZE+LCD_DEBUG_COLOR) end  -- Menu Info
+end
+
+------------------------------------------------------------------------------------------------------------
+-- Display the EDIT mode buttons when editing a value 
+
+local function GUI_Display_Edit_Buttons(line)
+  GUI_clearTouchButtons() -- Only this buttons can be touched
+  local x = 15 -- Inittial X position
+  local w = 55 -- Width of the buttons
+
+  local showPrev = line.Val > line.Min
+  local showNext = line.Val < line.Max
+
+  GUI_Diplay_Button(x,LCD_Y_LOWER_BUTTONS,w,LCD_Y_LINE_HEIGHT,"ESC",true)
+  GUI_addTouchButton(x,LCD_Y_LOWER_BUTTONS,w,LCD_Y_LINE_HEIGHT,EDIT_BUTTON.ESC)
+
+  x=x+w+10
+  GUI_Diplay_Button(x,LCD_Y_LOWER_BUTTONS,w,LCD_Y_LINE_HEIGHT,"  Def",true)
+  GUI_addTouchButton(x,LCD_Y_LOWER_BUTTONS,w,LCD_Y_LINE_HEIGHT,EDIT_BUTTON.DEFAULT)
+
+  x=x+w+10
+  if (not dsmLib.isListLine(line)) then
+    GUI_Diplay_Button(x,LCD_Y_LOWER_BUTTONS,w,LCD_Y_LINE_HEIGHT,"  <<  ",showPrev)
+    GUI_addTouchButton(x,LCD_Y_LOWER_BUTTONS,w,LCD_Y_LINE_HEIGHT,EDIT_BUTTON.DEC_10)
+  end
+
+  x=x+w+10
+  GUI_Diplay_Button(x,LCD_Y_LOWER_BUTTONS,w,LCD_Y_LINE_HEIGHT,"    <",showPrev)
+  GUI_addTouchButton(x,LCD_Y_LOWER_BUTTONS,w,LCD_Y_LINE_HEIGHT,EDIT_BUTTON.DEC_1)
+
+  x=x+w+10
+  GUI_Diplay_Button(x,LCD_Y_LOWER_BUTTONS,w,LCD_Y_LINE_HEIGHT,"    >",showNext)
+  GUI_addTouchButton(x,LCD_Y_LOWER_BUTTONS,w,LCD_Y_LINE_HEIGHT,EDIT_BUTTON.INC_1)
+
+  x=x+w+10
+  if (not dsmLib.isListLine(line)) then
+    GUI_Diplay_Button(x,LCD_Y_LOWER_BUTTONS,w,LCD_Y_LINE_HEIGHT,"   >>",showNext)
+    GUI_addTouchButton(x,LCD_Y_LOWER_BUTTONS,w,LCD_Y_LINE_HEIGHT,EDIT_BUTTON.INC_10)
+  end
+    
+  x=x+w+10
+  GUI_Diplay_Button(x,LCD_Y_LOWER_BUTTONS,w,LCD_Y_LINE_HEIGHT,"   OK",true)
+  GUI_addTouchButton(x,LCD_Y_LOWER_BUTTONS,w,LCD_Y_LINE_HEIGHT,EDIT_BUTTON.OK)
+
+end
+
+local function GUI_ShowBitmap(x,y,imgData)
+    -- imgData format "bitmap.png|alt message"
+    local f = string.gmatch(imgData, '([^%|]+)') -- Iterator over values split by '|'
+    local imgName, imgMsg = f(), f()
+
+    lcd.drawText(x, y, imgMsg or "")  -- Alternate Image MSG 
+
+    local imgPath = IMAGE_PATH .. (imgName or "")
+    local bitmap  = Bitmap.open(imgPath)
+    if (bitmap~=nil) then
+       lcd.drawBitmap(bitmap, x,y+20)
+    end
+end
+
+------------------------------------------------------------------------------------------------------------
+local function GUI_Display()
+  local ctx = DSM_Context
+  lcd.clear()
+  GUI_clearTouchButtons()
+ 
+  if LCD_W == 480 then
+    local header = "DSM Forward Programming "..VERSION.."                   "
+    if ctx.Phase ~= PHASE.RX_VERSION then
+      header = header .. "RX "..ctx.RX.Name.." v"..ctx.RX.Version
+    end
+
+    --Draw title
+    lcd.drawFilledRectangle(0, 0, LCD_W, 17, LCD_TOOL_HDR_BGCOLOR)
+    lcd.drawText(5, 0, header,  LCD_TOOL_HDR_COLOR + SMLSIZE)
+    --Draw RX Menu
+    if ctx.Phase == PHASE.RX_VERSION then
+      if (ctx.isReset) then
+        lcd.drawText(LCD_X_LINE_TITLE,100,"Waiting for RX to Restart", BLINK)
+      else
+        lcd.drawText(LCD_X_LINE_TITLE,100,"No compatible DSM RX...", BLINK)
+      end
+    else
+      local menu = ctx.Menu
+      
+
+      if menu.Text ~=  nil then
+        GUI_Display_Menu(menu)
+
+        for i = 0, dsmLib.MAX_MENU_LINES do
+          local line = ctx.MenuLines[i]
+
+          if i == ctx.SelLine then
+            -- DEBUG: Display Selected Line info for ON SCREEN Debugging
+            if (DEBUG_ON_LCD) then lcd.drawText(0,255,dsmLib.menuLine2String(line),SMLSIZE + LCD_DEBUG_COLOR) end
+          end
+
+          if line ~= nil and line.Type ~= 0 then
+            if line.Type == LINE_TYPE.MENU then 
+              GUI_Display_Line_Menu(i, line, i == ctx.SelLine)
+            else  
+              if line.Val ~= nil then
+                local value = line.Val
+
+                if dsmLib.isListLine(line) then    -- for Lists of Strings, get the text
+                  value = dsmLib.Get_List_Text(line.Val + line.TextStart) -- TextStart is the initial offset for text
+                  local imgData = dsmLib.Get_List_Text_Img(line.Val + line.TextStart)   -- Complentary IMAGE for this value to Display??
+                    
+                  if (imgData) then  -- Optional Image and Msg for value
+                    GUI_ShowBitmap(LCD_X_LINE_TITLE,LCD_Y_LINE_START, imgData)
+                  end
+                end
+
+                GUI_Display_Line_Value(i, line, value, i == ctx.SelLine, i == ctx.EditLine)
+              end
+            end -- if ~MENU
+          end -- if Line[i]~=nil
+        end  -- for
+
+        if IS_EDGETX and ctx.isEditing()  then
+          -- Display Touch button for Editing values
+          GUI_Display_Edit_Buttons(ctx.MenuLines[ctx.EditLine])
+        end
+      end 
+    end
+  else
+    -- Different Resolution.. Maybe just adjusting some of the constants will work, adjust it in DSM_Init??
+    -- LCD_X_LINE_TITLE,  LCD_Y_LINE_START, etc
+    lcd.drawText(LCD_X_LINE_TITLE,100,"Only supported in Color Radios of 480 resolution", BLINK)
+  end
+end
+
+-------------------------------------------------------------------------------------------------------------
+local function GUI_RotEncVal(dir) -- return encoder speed to inc or dec values
+  local inc = 0
+  local Speed = getRotEncSpeed()
+
+  if Speed == ROTENC_MIDSPEED then  inc = (5 * dir)
+  elseif Speed == ROTENC_HIGHSPEED then  inc = (15 * dir)
+  else  inc = dir  end
+
+  return inc
+end
+
+------------------------------------------------------------------------------------
+-- Translate Tap/Touch of EDIT buttons to equivalent Key events
+local function GUI_Translate_Edit_Buttons(button)
+    local event = EVT_TOUCH_TAP
+    local editInc = nil
+
+    if (button==EDIT_BUTTON.ESC) then   -- ESC 
+      event = EVT_VIRTUAL_EXIT
+    elseif (button==EDIT_BUTTON.DEFAULT) then   -- Default 
+      event = EVT_VIRTUAL_ENTER_LONG
+    elseif (button==EDIT_BUTTON.DEC_10) then --  -10
+        event = EVT_VIRTUAL_PREV
+        editInc = -10
+    elseif (button==EDIT_BUTTON.DEC_1) then  -- -1
+      event = EVT_VIRTUAL_PREV
+      editInc = -1
+    elseif (button==EDIT_BUTTON.INC_1) then  -- +1
+      event = EVT_VIRTUAL_NEXT
+      editInc = 1
+    elseif (button==EDIT_BUTTON.INC_10) then  -- + 10 
+      event = EVT_VIRTUAL_NEXT
+      editInc = 10
+    elseif (button==EDIT_BUTTON.OK) then  -- OK 
+      event = EVT_VIRTUAL_ENTER
+    else
+
+    end
+    
+    return event, editInc
+end
+
+------------------------------------------------------------------------------------------------------------
+-- Handle Events comming from the GUI
+local function GUI_HandleEvent(event, touchState)
+  local ctx = DSM_Context
+  local menu = ctx.Menu
+  local menuLines = ctx.MenuLines
+  local editInc   = nil 
+
+  if (IS_EDGETX) then
+    if (event == EVT_TOUCH_TAP and ctx.isEditing()) then -- Touch and Editing 
+      local button = GUI_getTouchButton(touchState.x, touchState.y)
+      if (button) then
+        event, editInc = GUI_Translate_Edit_Buttons(button)
+      end
+    end
+
+    if (event == EVT_TOUCH_TAP or event == EVT_TOUCH_FIRST) and not ctx.isEditing() then  -- Touch and NOT editing
+      if (DEBUG_ON) then dsmLib.LOG_write("%s: EVT_TOUCH_TAP %d,%d\n",dsmLib.phase2String(ctx.Phase),touchState.x, touchState.y) end
+        local button = GUI_getTouchButton(touchState.x, touchState.y)
+        if button then
+          -- Found a valid line
+          ctx.SelLine = button
+          ctx.Refresh_Display=true
+          if event == EVT_TOUCH_TAP then  -- EVT_TOUCH_FIRST only move focus
+            event = EVT_VIRTUAL_ENTER
+          end
+        end
+    end
+  end -- IS_EDGETX
+
+  if event == EVT_VIRTUAL_EXIT then
+    ctx.Refresh_Display=true
+    if (DEBUG_ON) then dsmLib.LOG_write("%s: EVT_VIRTUAL_EXIT\n",dsmLib.phase2String(ctx.Phase)) end
+    if ctx.Phase == PHASE.RX_VERSION then
+      dsmLib.ReleaseConnection()  -- Just Exit the Script 
+    else
+      if ctx.isEditing() then  -- Editing a Line, need to  restore original value
+        ctx.MenuLines[ctx.EditLine].Val = originalValue
+        dsmLib.ChangePhase(PHASE.VALUE_CHANGE_END) -- Update + Validate value in RX 
+        ctx.EditLine = nil   -- Exit Edit Mode (By clearing the line editing)
+      else
+        dsmLib.ChangePhase(PHASE.EXIT)
+      end
+    end
+    return
+  end
+  
+  if event == EVT_VIRTUAL_NEXT then
+    ctx.Refresh_Display=true
+    if (DEBUG_ON) then dsmLib.LOG_write("%s: EVT_VIRTUAL_NEXT\n",dsmLib.phase2String(ctx.Phase)) end
+    if ctx.isEditing() then  -- Editing a Line, need to inc the value
+      local line=ctx.MenuLines[ctx.EditLine]
+      dsmLib.Value_Add(line, editInc or GUI_RotEncVal(1))
+    else  -- not editing, move selected line to NEXT
+      dsmLib.MoveSelectionLine(1)
+    end
+    return
+  end
+
+  if event == EVT_VIRTUAL_PREV then
+    ctx.Refresh_Display=true
+    if (DEBUG_ON) then dsmLib.LOG_write("%s: EVT_VIRTUAL_PREV\n",dsmLib.phase2String(ctx.Phase)) end
+    if ctx.isEditing() then  -- Editiing a line, need to dec the value
+      local line=ctx.MenuLines[ctx.EditLine]
+      dsmLib.Value_Add(line, editInc or GUI_RotEncVal(-1))
+    else  -- not editing, move selected line to PREV
+      dsmLib.MoveSelectionLine(-1)
+    end
+    return
+  end
+
+  if event == EVT_VIRTUAL_ENTER_LONG then
+    ctx.Refresh_Display=true
+    if (DEBUG_ON) then dsmLib.LOG_write("%s: EVT_VIRTUAL_ENTER_LONG\n",dsmLib.phase2String(ctx.Phase)) end
+    if ctx.isEditing() then
+      -- reset the value to default
+      dsmLib.Value_Default(menuLines[ctx.EditLine])  -- Update value in RX if needed
+    end
+    return
+  end
+
+  if event == EVT_VIRTUAL_ENTER then
+    ctx.Refresh_Display=true
+    if (DEBUG_ON) then dsmLib.LOG_write("%s: EVT_VIRTUAL_ENTER,  SelLine=%d\n",dsmLib.phase2String(ctx.Phase), ctx.SelLine) end
+    if ctx.SelLine == dsmLib.BACK_BUTTON then -- Back
+      dsmLib.GotoMenu(menu.BackId,0)
+    elseif ctx.SelLine == dsmLib.NEXT_BUTTON then -- Next
+      dsmLib.GotoMenu(menu.NextId,0)
+    elseif ctx.SelLine == dsmLib.PREV_BUTTON then -- Prev
+      dsmLib.GotoMenu(menu.PrevId,0)
+    elseif menuLines[ctx.SelLine].ValId ~= 0 then  -- Menu or Value
+
+      if menuLines[ctx.SelLine].Type == LINE_TYPE.MENU then -- Navigate to Menu
+        if (SIMULATION_ON and menuLines[ctx.SelLine].ValId==0xFFFF) then
+          -- SPECIAL Simulation menu to Exit Simulation
+          GUI_SwitchSimulationOFF()
+        else
+          dsmLib.GotoMenu(menuLines[ctx.SelLine].ValId, ctx.SelLine)  -- ValId is the MenuId to navigate to
+        end
+      else -- Enter on a Value
+        if ctx.isEditing() then   -- already editing a Line???? 
+          ctx.EditLine = nil   -- Exit Edit Mode (By clearing the line editing)
+          dsmLib.ChangePhase(PHASE.VALUE_CHANGE_END) -- Request change the value on RX 
+        else    -- Edit the current value  
+          ctx.EditLine = ctx.SelLine
+          originalValue = menuLines[ctx.SelLine].Val
+        end
+      end
+    end
+  end
+end
+
+local function init_colors()
+  -- osName in OpenTX is nil, otherwise is EDGETX 
+  local ver, radio, maj, minor, rev, osname = getVersion()
+  IS_EDGETX = osname~=nil
+
+  if (IS_EDGETX and USE_SPECKTRUM_COLORS) then
+      -- SPECKTRUM COLORS (only works on EDGETX)
+      -- TOOL HEADER 
+      LCD_TOOL_HDR_COLOR      = MENU_TITLE_COLOR
+      LCD_TOOL_HDR_BGCOLOR    = TITLE_BGCOLOR
+      -- MENU HEADER
+      LCD_MENU_COLOR          = WHITE
+      LCD_MENU_BGCOLOR        = DARKGREY
+      -- LINE SELECTED 
+      LCD_SELECTED_COLOR      = WHITE
+      LCD_SELECTED_BGCOLOR    = ORANGE
+      LCD_EDIT_BGCOLOR        = RED  
+      -- NORMAL TEXT  
+      LCD_NORMAL_COLOR        = BLACK
+      LCD_DISABLE_COLOR       = LIGHTGREY
+      LCD_DEBUG_COLOR         = BLUE
+      -- NORMAL BOX FRAME COLOR 
+      LCD_BOX_COLOR           = LIGHTGREY  
+  end
+end
+
+------------------------------------------------------------------------------------------------------------
+-- Init
+local function DSM_Init()
+  init_colors()
+  dsmLib.Init(toolName)  -- Initialize Library 
+  return dsmLib.StartConnection()
+end
+
+------------------------------------------------------------------------------------------------------------
+-- Main
+local function DSM_Run(event,touchState)
+  local ctx = DSM_Context
+
+  if event == nil then
+    error("Cannot be run as a model script!")
+    dsmLib.LOG_close()
+    return 2
+  end
+
+  GUI_HandleEvent(event,touchState)
+
+  dsmLib.Send_Receive()  -- Handle Send and Receive DSM Forward Programming Messages
+
+  local refreshInterval =  REFRESH_GUI_MS
+
+  -- When using LCD BLINK attribute, we need faster refresh for BLINK to SHOW on LCD 
+  if (ctx.Phase == PHASE.RX_VERSION) then  -- Requesting RX Message Version usea BLINK?
+    ctx.Refresh_Display=true  
+    refreshInterval = 20 -- 200ms
+  end
+
+  -- Refresh display only if needed and no faster than 300ms, utilize more CPU to speedup DSM communications
+  if (ctx.Refresh_Display and (getTime()-lastRefresh) > refreshInterval) then --300ms from last refresh 
+    GUI_Display()
+    ctx.Refresh_Display=false
+    lastRefresh=getTime()
+  end
+  
+  if ctx.Phase == PHASE.EXIT_DONE then
+    dsmLib.LOG_close()
+    return 2
+  else
+    return 0
+  end
+end
+
+
+return { init=DSM_Init, run=DSM_Run }

Lua_scripts/DSMLIB/readme.txt

@@ -0,0 +1,49 @@
+This script library is a rewrite of the original DSM forward programming Lua 
+Script.  The goal is to make it easier to understand, mantain, and to  
+separate the GUI from the DSM Forward  programming engine/logic
+in this way, GUIs can evolve independent. OpenTX Gui, EdgeTx GUI, etc.
+
+Code is based on the code/work by: Pascal Langer (Author of the Multi-Module) 
+Rewrite/Enhancements By: Francisco Arzu 
+
+
+
+Deployment:
+/SCRIPTS/TOOLS/DsmFwdPrg_05_BaW.lua		-- OpenTX/EdgeTx version, no touch (black/white radios)
+/SCRIPTS/TOOLS/DsmFwdPrg_05_Color.lua		-- EdgeTX/OpenTx Color version, +touch
+/SCRIPTS/TOOLS/DSMLIB/				-- Libraries (ALL CAPITALS) to hide them from the Tools menu
+/SCRIPTS/TOOLS/DSMLIB/DsmFwPrgLib.lub		-- DSM Protocol Message and Menu engine
+/SCRIPTS/TOOLS/DSMLIB/DsmFwPrgSIMLib.lub	-- Simulation of AR631 for GUI Development in Companion
+
+/LOGS/dsm_log.txt				-- Readable log of the last RX session, usefull for debuging new RX
+
+
+Version 0.5
+- Make the code more readable and understadable
+- Separate the DSM Forwards Programing logic from the GUI
+- Log the comunnication 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 touchscreen color Radios
+- RX simulation for GUI development:  turn on SIMULATION_ON=true in the beginning of the lua file
+
+
+Some settings that can change (top of Lua file):
+	SIMULATION_ON = false   -- FALSE: use real communication to DSM RX (DEFAULT), TRUE: use a simulated version of RX 
+	DEBUG_ON = 1           -- 0=NO DEBUG, 1=HIGH LEVEL 2=LOW LEVEL   (Debug logged into the /LOGS/dsm_log.txt)
+	DEBUG_ON_LCD = false   -- Interactive Information on LCD of Menu data from RX 
+	USE_SPECKTRUM_COLORS = true -- true: Use spectrum colors, false: use theme colors (default on OpenTX, OpenTX handle colors different) 
+
+
+Known Problems:
+1. Some Menu List line types (LINE_TYPE.LIST_MENU1 or "L_m1" in logs), the range (min/max) seems to be incorrect, but cannot see in the data how to fix it
+	Some of the valid values are not even sequential, very spread apart. There has to be a list of valid options somewhere (in RX or config for each field).
+2. The RX return unknow lines when requesting the Lines for a menu. Realy don't understand what they are for.
+	in some menus, seems to stay stuck in the same return line or no response to the request, making the RX reset/close the connection.
+	Was able to hack it for AR631 "First Time Setup" and "First Time SAFE Setup", and "Servo Realm" (don't know if it works here)
+
+
+Version 0.2
+Original Version from Pascal Langer
+ 
+

Lua_scripts/Graupner HoTT Model Locator.lua

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

Lua_scripts/MultiChan.txt

@@ -6,6 +6,7 @@
 14,4,Bayang,DHD_D4,1,Flip,RTH,Pict,Video,HLess,Invert,Rates,TakeOf,EmStop
 14,5,Bayang,QX100,1,Flip,RTH,Pict,Video,HLess,Invert,Rates,TakeOf,EmStop
 59,0,BayangRX,RX,1,AnAux1,AnAux2,Flip,RTH,Pict,Video
+59,1,BayangRX,CPPM,1,AnAux1,AnAux2,Flip,RTH,Pict,Video
 41,0,Bugs,3-6-8,0,Arm,Angle,Flip,Pict,Video,LED
 42,0,BugsMini,Mini,0,Arm,Angle,Flip,Pict,Video,LED
 42,1,BugsMini,3H,0,Arm,Angle,Flip,Pict,Video,LED,AltHol
@@ -28,15 +29,16 @@
 7,3,Devo,6CH,0,CH5,CH6
 7,4,Devo,7CH,0,CH5,CH6,CH7
 33,0,DM022,Std,1,Flip,LED,Cam1,Cam2,HLess,RTH,RLow
-6,0,DSM,2_22,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,n-a,ThKill
-6,1,DSM,2_11,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,n-a,ThKill
-6,2,DSM,X_22,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,n-a,ThKill
-6,3,DSM,X_11,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,n-a,ThKill
+6,0,DSM,2_1F,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,n-a,ThKill
+6,1,DSM,2_2F,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,n-a,ThKill
+6,2,DSM,X_1F,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,n-a,ThKill
+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
 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
 45,1,E01X,E015,1,Arm,Flip,LED,HLess,RTH
-45,2,E01X,E016H,1,Stop,Flip,n-a,HLess,RTH
 16,0,ESKY,Std,0,Gyro,Pitch
 16,1,ESKY,ET4,0,Gyro,Pitch
 35,0,ESKY150,4CH,0
@@ -53,7 +55,10 @@
 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
 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
 53,1,Height,8ch,0,Gear,Gyro,Flap,Light
 25,0,FrSkyV,V8,0,CH5,CH6,CH7,CH8
@@ -79,7 +84,10 @@
 65,3,FrSkyR9,R9_968_8CH,0,CH5,CH6,CH7,CH8
 55,0,FrSkyRX,RX,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14,CH15,CH16
 55,1,FrSkyRX,CloneTX,0
-58,0,FX816,P38,1
+55,2,FrSkyRX,EraseTX,0
+55,3,FrSkyRX,CPPM,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14,CH15,CH16
+58,0,FX,816,1
+58,1,FX,620,1
 20,0,FY326,FY326,1,Flip,RTH,HLess,Expert,Calib
 20,1,FY326,FY319,1,Flip,RTH,HLess,Expert,Calib
 23,0,FY326,FY326,1,Flip,RTH,HLess,Expert
@@ -99,14 +107,16 @@
 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
-57,0,HoTT,Sync,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12
-57,1,HoTT,No_Sync,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12
+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
 2,1,Hubsan,H301,0,RTH,Light,Stab,Video
 2,2,Hubsan,H501,0,RTH,Light,Pict,Video,HLess,GPS_H,ALT_H,Flip,FModes
 22,0,J6Pro,Std,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12
-71,0,JJRC345,Std,1,Flip,HLess,RTH
-49,0,KF606,Std,1,Trim
+71,0,JJRC345,JJRC345,1,Flip,HLess,RTH,LED,UNK1,UNK2,UNK3
+71,1,JJRC345,SkyTmblr,1,Flip,HLess,RTH,LED,UNK1,UNK2,UNK3
+49,0,KF606,KF606,1,Trim
+49,1,KF606,MIG320,1,Trim,LED
 9,0,KN,WLToys,0,DRate,THold,IdleUp,Gyro,Ttrim,Atrim,Etrim
 9,1,KN,Feilun,0,DRate,THold,IdleUp,Gyro,Ttrim,Atrim,Etrim
 73,0,Kyosho,Std,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14
@@ -122,9 +132,14 @@
 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
 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
 60,1,Pelikan,LITE_V4,0,CH5,CH6,CH7,CH8
+60,2,Pelikan,SCX24,0
 51,0,Potensic,A20,1,TakLan,Emerg,Mode,HLess
 66,0,Propel,74-Z,1,LEDs,RollCW,RolCCW,Fire,Weapon,Calib,AltHol,TakeOf,Land,Train
 29,0,Q2x2,Q222,1,Flip,LED,Mod2,Mod1,HLess,RTH,XCal,YCal
@@ -135,11 +150,13 @@
 31,2,Q303,CX10D,1,Arm,Flip
 31,3,Q303,CX10WD,1,Arm,Flip
 72,0,Q90C,Std,0,FMode,VTX+
-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
 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
-21,0,SFHSS,Std,0,CH5,CH6,CH7,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
+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
 19,0,Shenqi,Cycle,1
 68,0,Skyartec,Std,0,CH5,CH6,CH7
 11,0,SLT,V1,0,Gear,Pitch
@@ -155,8 +172,9 @@
 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
-46,0,V911s,V911s,1,Calib
-46,1,V911s,E119,1,Calib
+48,2,V761,TOPRC,0,Gyro,Calib,Flip,RtnAct,Rtn
+46,0,V911s,V911s,1,Calib,Rate
+46,1,V911s,E119,1,Calib,Rate,6G_3D
 22,0,WFLY,WFR0xS,0,CH5,CH6,CH7,CH8,CH9
 30,0,WK2x01,WK2801,0,CH5,CH6,CH7,CH8
 30,1,WK2x01,WK2401,0
@@ -172,3 +190,19 @@
 8,3,YD717,XinXun,1,Flip,Light,Pict,Video,HLess
 8,4,YD717,NiHui,1,Flip,Light,Pict,Video,HLess
 52,0,ZSX,280,1,Light
+78,0,M-Link,Std,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14,CH15,CH16
+79,0,WFLY2,RF20x,0,CH5,CH6,CH7,CH8,CH9,CH10
+80,0,E016Hv2,E016Hv2,1,TakLan,EmStop,Flip,Calib,HLess,RTH
+81,0,E010r5,E010r5,1,Flip,LED,CALIB,HLess,RTH,GLIDE
+82,0,LOLI,Std,0,CH5,CH6,CH7,CH8,1SwSePpPw,2SwSePw,3SwSe,4SwSe,5SwSeSb,6SwSe,7SwSePw,8SwSe
+83,0,E129,E129,1,TakLan,EmStop,TrimA,TrimE,TrimR
+83,1,E129,C186,1,TakLan,EmStop,TrimA,TrimE,TrimR
+84,0,JOYSWAY,Std,0
+85,0,E016H,Std,1,Stop,Flip,n-a,HLess,RTH
+87,0,IKEA
+89,0,LOSI
+90,0,MouldKg,Analog,0
+90,1,MouldKg,Digit,0
+91,0,Xerall,Tank,0,FlTa,TakLan,Rate,HLess,Photo,Video,TrimR,TrimE,TrimA
+92,0,MT99xx2,PA18,0,MODE,FLIP,RTH
+93,0,Kyosho2,KT-17,0

Lua_scripts/MultiChannelsUpdater.lua

@@ -280,11 +280,27 @@ local function Multi_Init()
   end
  
   --Exceptions on first 4 channels...
-  if ( protocol == 73 or (protocol == 74 and sub_protocol == 0) ) then -- Kyosho or RadioLink Surface
+  if ( protocol == 73 or (protocol == 74 and sub_protocol == 0) or (protocol == 60 and sub_protocol == 2) or protocol == 89) then -- Kyosho or RadioLink Surface or Pelikan/SCX24 or Losi
     channel_names[1] = "ST"
     channel_names[2] = "THR"
     channel_names[3] = "CH3"
-    channel_names[4] = "CH4"
+    if(protocol == 60 and sub_protocol == 2) then
+      channel_names[4] = "n-a"
+    else
+      channel_names[4] = "CH4"
+    end
+  end
+  if ( protocol == 6 and sub_protocol == 5 ) then -- DSMR
+    channel_names[1] = "ST"
+    channel_names[2] = "THR"
+    channel_names[3] = "AUX1"
+    channel_names[4] = "AUX2"
+  end
+  if ( protocol == 90 ) then -- Mould King
+    channel_names[1] = "A"
+    channel_names[2] = "B"
+    channel_names[3] = "C"
+    channel_names[4] = "D"
   end
  
   --Check MultiChan.txt

Lua_scripts/MultiConfig.lua

@@ -0,0 +1,529 @@
+---- #########################################################################
+---- #                                                                       #
+---- # Copyright (C) OpenTX                                                  #
+-----#                                                                       #
+---- # License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html               #
+---- #                                                                       #
+---- # This program is free software; you can redistribute it and/or modify  #
+---- # it under the terms of the GNU General Public License version 2 as     #
+---- # published by the Free Software Foundation.                            #
+---- #                                                                       #
+---- # This program is distributed in the hope that it will be useful        #
+---- # but WITHOUT ANY WARRANTY; without even the implied warranty of        #
+---- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         #
+---- # GNU General Public License for more details.                          #
+---- #                                                                       #
+---- #########################################################################
+
+
+--###############################################################################
+-- Multi buffer for Config description
+-- To start operation:
+--   Write 0xFF at address 4 will request the buffer to be cleared
+--   Write "Conf" at address 0..3
+-- Read
+--   Read at address 12 gives the current config page
+--   Read at address 13..172 gives the current data of the page = 8 lines * 20 caracters
+-- Write
+--   Write at address 5..11 the command
+--   Write 0x01 at address 4 will send the command to the module
+-- !! Before exiting the script must write 0 at address 0 for normal operation !!
+--###############################################################################
+
+local Version = "v0.2"
+local Focus = -1
+local Page = 0
+local Edit = -1
+local Edit_pos = 1
+local Menu = { {text = "", field_type = 0, field_len = 0, field_value = {}, field_text = ""},
+               {text = "", field_type = 0, field_len = 0, field_value = {}, field_text = ""},
+               {text = "", field_type = 0, field_len = 0, field_value = {}, field_text = ""},
+               {text = "", field_type = 0, field_len = 0, field_value = {}, field_text = ""},
+               {text = "", field_type = 0, field_len = 0, field_value = {}, field_text = ""},
+               {text = "", field_type = 0, field_len = 0, field_value = {}, field_text = ""},
+               {text = "", field_type = 0, field_len = 0, field_value = {}, field_text = ""} }
+local Menu_value = {}
+local Blink = 0
+local ModuleNumber = 0
+local ModuleType = ""
+local Module = {}
+local InitialProtocol = 0
+local InitialSubProtocol = 0
+
+function bitand(a, b)
+    local result = 0
+    local bitval = 1
+    while a > 0 and b > 0 do
+      if a % 2 == 1 and b % 2 == 1 then -- test the rightmost bits
+          result = result + bitval      -- set the current bit
+      end
+      bitval = bitval * 2 -- shift left
+      a = math.floor(a/2) -- shift right
+      b = math.floor(b/2)
+    end
+    return result
+end
+
+local function Config_Send(page, line, value)
+  local i
+  i = (page*16) + line
+  multiBuffer( 5, i )
+  for i = 1 , 6 , 1 do
+    multiBuffer( 5+i, value[i] )
+  end
+  multiBuffer( 4, 1 )
+end
+
+local function Config_Release()
+  --Set the protocol back to what it was
+  Module.protocol = InitialProtocol
+  Module.subProtocol = InitialSubProtocol
+  model.setModule(ModuleNumber, Module)
+
+  --Stop requesting updates
+  local i
+  for i = 3 , 0 , -1 do
+    multiBuffer( i, 0 )
+  end
+end
+
+local function Config_Page( )
+  Config_Send(Page, 0, { 0, 0, 0, 0, 0, 0 })
+end
+
+local function Config_Draw_Edit( event )
+  local i
+  local text
+
+  if Menu[Focus].field_type == 0xD0 then
+  -- Editable Hex value
+    if Edit == -1 then
+    -- Init
+      Edit = 0
+      Edit_pos = 1
+      Blink = 0
+      for i = 1, Menu[Focus].field_len, 1 do
+        Menu_value[i] = Menu[Focus].field_value[i]
+      end
+    end
+    if Edit == 0 then
+    -- Not editing value
+      if event == EVT_VIRTUAL_ENTER then
+        if Edit_pos > Menu[Focus].field_len then
+        -- Save or Cancel
+          Edit = -1
+          if Edit_pos == Menu[Focus].field_len + 1 then
+          -- Save
+            Config_Send(Page, Focus, Menu_value)
+          end
+          return
+        else
+        -- Switch to edit mode
+          Edit = 1
+        end
+      elseif event == EVT_VIRTUAL_PREV and Edit_pos > 1 then
+      -- Move cursor
+        Edit_pos = Edit_pos - 1
+      elseif event == EVT_VIRTUAL_NEXT and Edit_pos < Menu[Focus].field_len + 2 then
+      -- Move cursor
+        Edit_pos = Edit_pos + 1
+      end
+    else
+    -- Editing value
+      if event == EVT_VIRTUAL_ENTER then
+      -- End edit
+        Edit = 0
+      elseif event == EVT_VIRTUAL_PREV then
+      -- Change value
+        Menu_value[Edit_pos] = Menu_value[Edit_pos] - 1
+      elseif event == EVT_VIRTUAL_NEXT then
+      -- Change value
+        Menu_value[Edit_pos] = Menu_value[Edit_pos] + 1
+      end
+      --Blink
+      Blink = Blink + 1
+      if Blink > 30 then
+        Blink = 0
+      end
+    end
+    --Display
+    if LCD_W == 480 then
+      lcd.drawRectangle(160-1, 100-1, 160+2, 55+2, TEXT_COLOR)
+      lcd.drawFilledRectangle(160, 100, 160, 55, TEXT_BGCOLOR)
+    else
+      lcd.clear()
+    end
+    for i = 1, Menu[Focus].field_len, 1 do
+      if i==Edit_pos and (Edit ~= 1 or Blink > 15) then
+        attrib = INVERS
+      else
+        attrib = 0
+      end
+      if LCD_W == 480 then
+        lcd.drawText(170+12*2*(i-1), 110, string.format('%02X', Menu_value[i]), attrib)
+      else
+        lcd.drawText(17+6*2*(i-1), 10, string.format('%02X', Menu_value[i]), attrib + SMLSIZE)
+      end
+    end
+    if Edit_pos == Menu[Focus].field_len + 1 then
+      attrib = INVERS
+    else
+      attrib = 0
+    end
+    if LCD_W == 480 then
+      lcd.drawText(170, 130, "Save", attrib)
+    else
+      lcd.drawText(17, 30, "Save", attrib + SMLSIZE)
+    end
+    if Edit_pos == Menu[Focus].field_len + 2 then
+      attrib = INVERS
+    else
+      attrib = 0
+    end
+    if LCD_W == 480 then
+      lcd.drawText(260, 130, "Cancel", attrib)
+    else
+      lcd.drawText(77, 30, "Cancel", attrib + SMLSIZE)
+    end
+
+  elseif Menu[Focus].field_type == 0x90 then
+  -- Action text
+    if Edit == -1 then
+    -- Init
+      Edit = 0
+      Edit_pos = 2
+    end
+    if event == EVT_VIRTUAL_ENTER then
+      -- Exit
+      Edit = -1
+      if Edit_pos == 1 then
+      -- Yes
+        Config_Send(Page, Focus, { 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA } )
+      end
+      return
+    elseif event == EVT_VIRTUAL_PREV and Edit_pos > 1 then
+    -- Switch to Yes
+      Edit_pos = Edit_pos - 1
+    elseif event == EVT_VIRTUAL_NEXT and Edit_pos < 2 then
+    -- Switch to No
+      Edit_pos = Edit_pos + 1
+    end
+    -- Display
+    if LCD_W == 480 then
+      lcd.drawRectangle(160-1, 100-1, 160+2, 55+2, TEXT_COLOR)
+      lcd.drawFilledRectangle(160, 100, 160, 55, TEXT_BGCOLOR)
+    else
+      lcd.clear()
+    end
+    if LCD_W == 480 then
+      lcd.drawText(170, 110, Menu[Focus].field_text .. "?")
+    else
+      lcd.drawText(17, 10, Menu[Focus].field_text .. "?", SMLSIZE)
+    end
+    if Edit_pos == 1 then
+      attrib = INVERS
+    else
+      attrib = 0
+    end
+    if LCD_W == 480 then
+      lcd.drawText(170, 130, "Yes", attrib)
+    else
+      lcd.drawText(17, 30, "Yes", attrib + SMLSIZE)
+    end
+    if Edit_pos == 2 then
+      attrib = INVERS
+    else
+      attrib = 0
+    end
+    if LCD_W == 480 then
+      lcd.drawText(260, 130, "No", attrib)
+    else
+      lcd.drawText(77, 30, "No", attrib)
+    end
+  end
+end
+
+local function Config_Next_Prev( event )
+-- Next Prev on main menu
+  local line
+  if event == EVT_VIRTUAL_PREV then
+    for line = Focus - 1, 1, -1 do
+      if Menu[line].field_type >= 0x80 and Menu[line].field_type ~= 0xA0 and Menu[line].field_type ~= 0xC0 then
+        Focus = line
+        break
+      end
+    end
+  elseif event == EVT_VIRTUAL_NEXT then
+    for line = Focus + 1, 7, 1 do
+      if Menu[line].field_type >= 0x80 and Menu[line].field_type ~= 0xA0 and Menu[line].field_type ~= 0xC0 then
+        Focus = line
+        break
+      end
+    end
+  end
+end
+
+local function Config_Draw_Menu()
+-- Main menu
+  local i
+  local value
+  local line
+  local length
+  local text
+  
+  lcd.clear()
+
+  if LCD_W == 480 then
+    --Draw title
+    lcd.drawFilledRectangle(0, 0, LCD_W, 30, TITLE_BGCOLOR)
+    lcd.drawText(1, 5, "Multi Config " .. Version, MENU_TITLE_COLOR)
+    if multiBuffer(13) == 0x00 then
+      lcd.drawText(10,50,"No Config telemetry...", BLINK)
+    end
+  else
+    --Draw on LCD_W=128
+    lcd.drawText(1, 0, "Multi Config " .. Version, SMLSIZE)
+    if multiBuffer(13) == 0x00 then
+      lcd.drawText(2,17,"No Config telemetry...",SMLSIZE)
+    end
+  end
+
+  if multiBuffer(13) ~= 0x00 then
+    if LCD_W == 480 then
+      --Draw firmware version and channels order
+      local ch_order = multiBuffer(17)
+      local channel_names = {}
+      channel_names[bitand(ch_order,3)+1] = "A"
+      ch_order = math.floor(ch_order/4)
+      channel_names[bitand(ch_order,3)+1] = "E"
+      ch_order = math.floor(ch_order/4)
+      channel_names[bitand(ch_order,3)+1] = "T"
+      ch_order = math.floor(ch_order/4)
+      channel_names[bitand(ch_order,3)+1] = "R"
+      lcd.drawText(150, 5, ModuleType.." v" .. multiBuffer(13) .. "." .. multiBuffer(14) .. "." .. multiBuffer(15) .. "." .. multiBuffer(16) .. " " .. channel_names[1] .. channel_names[2] .. channel_names[3] .. channel_names[4], MENU_TITLE_COLOR)
+    else
+      lcd.drawText(76, 0, "/Fw" .. multiBuffer(13) .. "." .. multiBuffer(14) .. "." .. multiBuffer(15) .. "." .. multiBuffer(16),SMLSIZE) -- .. " " .. channel_names[1] .. channel_names[2] .. channel_names[3] .. channel_names[4])
+    end
+
+    --Draw Menu
+    for line = 1, 7, 1 do
+      --Clear line info
+      Menu[line].text = ""
+      Menu[line].field_type = 0
+      Menu[line].field_len = 0
+      for i = 1, 7, 1 do
+        Menu[line].field_value[i] = 0
+      end
+      Menu[line].field_text = ""
+      length = 0
+      --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)
+          Menu[line].field_len = bitand(value, 0x0F)
+          length = Menu[line].field_len
+          if Menu[line].field_type ~= 0xA0 and Menu[line].field_type ~= 0xC0 and Focus == -1 then
+          -- First actionnable field if nothing was selected
+            Focus = line;
+          end
+        else
+          if Menu[line].field_type == 0 then
+          -- Text
+            Menu[line].text = Menu[line].text .. string.char(value)
+          else
+          -- Menu specific fields
+            length = length - 1
+            if Menu[line].field_type == 0x80 or Menu[line].field_type == 0x90 then
+              Menu[line].field_text = Menu[line].field_text .. string.char(value)
+            else
+              Menu[line].field_value[Menu[line].field_len-length] = value
+            end
+            if length == 0 then
+            -- End of fields
+              break
+            end
+          end
+        end
+      end
+      -- Display menu text
+      if Menu[line].text ~= "" then
+        if Menu[line].field_type == 0xA0 or Menu[line].field_type == 0xB0 or Menu[line].field_type == 0xC0 or Menu[line].field_type == 0xD0 then
+          Menu[line].text = Menu[line].text .. ":"
+        end
+        if LCD_W == 480 then
+          lcd.drawText(10,32+20*line,Menu[line].text )
+        else
+          lcd.drawText(2,1+8*line,Menu[line].text,SMLSIZE)
+        end
+      end
+      -- Display specific fields
+      if line == Focus then
+        attrib = INVERS
+      else
+        attrib = 0
+      end
+      if Menu[line].field_type == 0x80 or Menu[line].field_type == 0x90 then
+      -- Text
+        if LCD_W == 480 then
+          lcd.drawText(10+9*#Menu[line].text, 32+20*line, Menu[line].field_text, attrib)
+        else
+          lcd.drawText(2+5*#Menu[line].text, 1+8*line, Menu[line].field_text, SMLSIZE + attrib)
+        end
+      elseif Menu[line].field_type == 0xA0 or Menu[line].field_type == 0xB0 then
+      -- Decimal value
+        value = 0
+        for i = 1, Menu[line].field_len, 1 do
+          value = value*256 + value
+        end
+        if LCD_W == 480 then
+          lcd.drawText(10+9*#Menu[line].text, 32+20*line, value, attrib)
+        else
+          lcd.drawText(2+5*#Menu[line].text, 1+8*line, value, SMLSIZE + attrib)
+        end
+      elseif Menu[line].field_type == 0xC0 or Menu[line].field_type == 0xD0 then
+      -- Hex value
+        text=""
+        for i = 1, Menu[line].field_len, 1 do
+          text = text .. string.format('%02X ', Menu[line].field_value[i])
+        end
+        if LCD_W == 480 then
+          lcd.drawText(10+9*#Menu[line].text, 32+20*line, text, attrib)
+        else
+          lcd.drawText(2+5*#Menu[line].text, 1+8*line, text, SMLSIZE + attrib)
+        end
+      end
+    end
+  end
+end
+
+-- Init
+local function Config_Init()
+  --Find Multi module
+  Module_int = model.getModule(0)
+  Module_ext = model.getModule(1)
+  if Module_int["Type"] ~= 6 and Module_ext["Type"] ~= 6 then
+    error("No Multi module detected...")
+    return 2
+  end
+  if Module_int["Type"] == 6 and Module_ext["Type"] == 6 then
+    error("Two Multi modules detected, turn on only the one to be configured.")
+    return 2
+  end
+  if Module_int["Type"] == 6 then
+    ModuleNumber = 0
+    ModuleType = "Internal"
+  else
+    ModuleNumber = 1
+    ModuleType = "External"
+  end
+  --Get Module settings and set it to config protocol
+  Module = model.getModule(ModuleNumber)
+  InitialProtocol = Module.protocol
+  InitialSubProtocol = Module.subProtocol
+  Module.protocol = 86
+  Module.subProtocol = 0
+  model.setModule(ModuleNumber, Module)
+  --pause while waiting for the module to switch to config
+  for i = 0, 10, 1 do end
+
+  --Set protocol to talk to
+  multiBuffer( 0, string.byte('C') )
+  --test if value has been written
+  if multiBuffer( 0 ) ~=  string.byte('C') then
+    error("Not enough memory!")
+    return 2
+  end
+
+  --Request init of the buffer
+  multiBuffer( 4, 0xFF )
+  multiBuffer(13, 0x00 )
+
+  --Continue buffer init
+  multiBuffer( 1, string.byte('o') )
+  multiBuffer( 2, string.byte('n') )
+  multiBuffer( 3, string.byte('f') )
+
+  -- Test set
+  -- multiBuffer( 12, 0 )
+  -- multiBuffer( 13, 1 )
+  -- multiBuffer( 14, 3 )
+  -- multiBuffer( 15, 2 )
+  -- multiBuffer( 16, 62 )
+  -- multiBuffer( 17, 0 + 1*4 + 2*16 + 3*64)
+
+  -- multiBuffer( 33, string.byte('G') )
+  -- multiBuffer( 34, string.byte('l') )
+  -- multiBuffer( 35, string.byte('o') )
+  -- multiBuffer( 36, string.byte('b') )
+  -- multiBuffer( 37, string.byte('a') )
+  -- multiBuffer( 38, string.byte('l') )
+  -- multiBuffer( 39, string.byte(' ') )
+  -- multiBuffer( 40, string.byte('I') )
+  -- multiBuffer( 41, string.byte('D') )
+  -- multiBuffer( 42, 0xD0 + 4 )
+  -- multiBuffer( 43, 0x12 )
+  -- multiBuffer( 44, 0x34 )
+  -- multiBuffer( 45, 0x56 )
+  -- multiBuffer( 46, 0x78 )
+  -- multiBuffer( 47, 0x9A )
+  -- multiBuffer( 48, 0xBC )
+
+  -- multiBuffer( 53, 0x90 + 9 )
+  -- multiBuffer( 54, string.byte('R') )
+  -- multiBuffer( 55, string.byte('e') )
+  -- multiBuffer( 56, string.byte('s') )
+  -- multiBuffer( 57, string.byte('e') )
+  -- multiBuffer( 58, string.byte('t') )
+  -- multiBuffer( 59, string.byte(' ') )
+  -- multiBuffer( 60, string.byte('G') )
+  -- multiBuffer( 61, string.byte('I') )
+  -- multiBuffer( 62, string.byte('D') )
+  -- multiBuffer( 63, 0x00 )
+end
+
+-- Main
+local function Config_Run(event)
+  if event == nil then
+    error("Cannot be run as a model script!")
+    return 2
+  elseif event == EVT_VIRTUAL_EXIT then
+    Config_Release()
+    return 2
+  else
+    Config_Draw_Menu()
+    if ( event == EVT_VIRTUAL_PREV_PAGE or event == EVT_VIRTUAL_NEXT_PAGE ) and Edit < 1 then
+    -- Not editing, ok to change page
+      if event == EVT_VIRTUAL_PREV_PAGE then
+        killEvents(event)
+        if Page > 0 then
+          --Page = Page - 1
+          --Config_Page()
+        end
+      else
+        --Page = Page + 1
+        --Config_Page()
+      end
+    end
+    if Focus > 0 then
+    -- At least one line has an action
+      if Edit >= 0 then
+      -- Currently editing
+        Config_Draw_Edit( event )
+      elseif event == EVT_VIRTUAL_ENTER then
+      -- Switch to edit
+        Config_Draw_Edit( 0 )
+      elseif event == EVT_VIRTUAL_PREV or event == EVT_VIRTUAL_NEXT then
+      -- Main menu selection
+        Config_Next_Prev( event )
+      end
+    end
+    return 0
+  end
+end
+
+return { init=Config_Init, run=Config_Run }

Lua_scripts/MultiLOLI.lua

@@ -0,0 +1,221 @@
+
+local toolName = "TNS|Multi LOLI RX config|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 loli_nok = false
+local channels={ {  768, "PWM", 100,   102, "PPM",      50,  -768, "Servo",      0, -2048, "Switch", -100 }, -- CH1
+                 {  768, "PWM", 100,  -768, "Servo",      0, -2048, "Switch", -100 }, -- CH2
+                 { -768, "Servo",  0, -2048, "Switch", -100 }, -- CH3
+                 { -768, "Servo",  0, -2048, "Switch", -100 }, -- CH4
+                 {  102, "SBUS", 50,  -768, "Servo",      0, -2048, "Switch", -100 }, -- CH5
+                 { -768, "Servo",  0, -2048, "Switch", -100 }, -- CH6
+                 {  768, "PWM", 100,  -768, "Servo",      0, -2048, "Switch", -100 }, -- CH7
+                 { -768, "Servo",  0, -2048, "Switch", -100 } } -- CH8
+
+local sel = 1
+local edit = false
+
+local blink = 0
+local BLINK_SPEED = 15
+
+local function drawScreenTitle(title)
+    if LCD_W == 480 then
+        lcd.drawFilledRectangle(0, 0, LCD_W, 30, TITLE_BGCOLOR)
+        lcd.drawText(1, 5, title, MENU_TITLE_COLOR)
+    else
+        lcd.drawScreenTitle(title, 0, 0)
+    end
+end
+
+local function LOLI_Draw_LCD(event)
+  local line = 0
+
+  lcd.clear()
+
+  --Display settings
+  local lcd_opt = 0
+  if LCD_W == 480 then
+    drawScreenTitle("Multi - LOLI RX configuration tool")
+    x_pos = 152
+	x_inc = 90
+    y_pos = 40
+    y_inc = 20
+  else
+    x_pos = 5
+	x_inc = 30
+    y_pos = 1
+    y_inc = 8
+    lcd_opt = SMLSIZE
+  end
+
+  --Multi Module detection
+  if loli_nok then
+    if LCD_W == 480 then
+      lcd.drawText(10,50,"The LOLI protocol is not selected...", lcd_opt)
+    else
+      --Draw on LCD_W=128
+      lcd.drawText(2,17,"LOLI protocol not selected...",SMLSIZE)
+    end
+    return
+  end
+  
+  --Display current config
+  if LCD_W == 480 then
+	line = line + 1
+	lcd.drawText(x_pos, y_pos+y_inc*line -2, "Channel", lcd_opt)
+	lcd.drawText(x_pos+x_inc, y_pos+y_inc*line -2, "Function", lcd_opt)
+	lcd.drawRectangle(x_pos-4, y_pos+y_inc*line -4 , 2*x_inc +2, 188)
+	lcd.drawLine(x_pos-4, y_pos+y_inc*line +18, x_pos-4 +2*x_inc +1, y_pos+y_inc*line +18, SOLID, 0)
+	lcd.drawLine(x_pos+x_inc -5, y_pos+y_inc*line -4, x_pos+x_inc -5, y_pos+y_inc*line -5 +188, SOLID, 0)
+    line = line + 1
+  end
+  
+  local out
+  for i = 1, 8 do
+    out = getValue("ch"..(i+8))
+    lcd.drawText(x_pos, y_pos+y_inc*line, "CH"..i, lcd_opt)
+    for j = 1, #channels[i], 3 do
+      if out > channels[i][j] then
+        if sel == i then
+          invert = INVERS
+          if edit == true then
+            blink = blink + 1
+            if blink > BLINK_SPEED then
+              invert = 0
+              if blink > BLINK_SPEED * 2 then
+                blink = 0
+              end
+            end
+          end
+        else
+          invert = 0
+        end
+        lcd.drawText(x_pos+x_inc, y_pos+y_inc*line, channels[i][j+1], lcd_opt + invert)
+        break
+      end
+    end
+    line = line + 1
+  end
+end
+
+local function LOLI_Change_Value(dir)
+  local pos = 0
+  local out
+  --look for the current position
+  out = getValue("ch"..(sel+8))
+  for j = 1, #channels[sel], 3 do
+    if out > channels[sel][j] then
+	  pos = j
+	  break
+	end
+  end
+  
+  --decrement or increment
+  if dir < 0 and pos > 1 then
+    pos = pos - 3
+  elseif dir > 0 and pos + 3 < #channels[sel] then
+    pos = pos + 3
+  else
+    return
+  end
+  
+  --delete all mixers for the selected channel
+  local num_mix = model.getMixesCount(sel-1 +8)
+  for i = 1, num_mix do
+	model.deleteMix(sel-1 +8, 0);
+  end
+
+  --create new mixer
+  local source_max = getFieldInfo("cyc1")
+  
+  local val = { name = channels[sel][pos+1],
+				source = source_max.id - 1, -- MAX=100 on TX16S
+				weight = channels[sel][pos+2],
+				offset = 0,
+				switch = 0,
+				multiplex = 0,
+				curveType = 0,
+				curveValue = 0,
+				flightModes = 0,
+				carryTrim = false,
+				mixWarn = 0,
+				delayUp = 0,
+				delayDown = 0,
+				speedUp = 0,
+				speedDown = 0 }
+  model.insertMix(sel-1 +8, 0, val)
+end
+
+local function LOLI_Menu(event)
+  if event == EVT_VIRTUAL_NEXT then
+    if edit == false then
+      -- not changing a value
+      if sel < 8 then
+        sel = sel + 1
+      end
+    else
+      -- need to inc the value
+      LOLI_Change_Value(1)
+    end
+  elseif event == EVT_VIRTUAL_PREV then
+    if edit == false then
+      -- not changing a value
+      if sel > 1 then
+        sel = sel - 1
+      end
+    else
+      -- need to dec the value
+      LOLI_Change_Value(-1)
+    end
+  elseif event == EVT_VIRTUAL_ENTER then
+    if edit == false then
+      edit = true
+      blink = BLINK_SPEED
+    else
+      edit = false
+    end
+  end
+end
+
+-- Init
+local function LOLI_Init()
+  local module_conf = model.getModule(0)
+  if module_conf["Type"] ~= 6 or module_conf["protocol"] ~= 82 then
+    module_conf = model.getModule(1)
+    if module_conf["Type"] ~= 6 or module_conf["protocol"] ~= 82 then
+      loli_nok = true
+    end
+  end
+end
+
+-- Main
+local function LOLI_Run(event)
+  if event == nil then
+    error("Cannot be run as a model script!")
+    return 2
+  elseif event == EVT_VIRTUAL_EXIT then
+    return 2
+  else
+    LOLI_Menu(event)
+    LOLI_Draw_LCD(event)
+    return 0
+  end
+end
+
+return { init=LOLI_Init, run=LOLI_Run }

Lua_scripts/README.md

@@ -13,7 +13,20 @@ If you like this project and want to support further development please consider
   </tr>
 </table>
 
-## MultiChannelsUpdater.lua
+## MultiConfig
+
+Enables to modify on a Multi module the Global ID, Cyrf ID or format the EEPROM.
+
+Matching the ID of 2 Multi modules enable them to control the same receivers without rebinding. Be carefull the 2 modules should not be used at the same time unless you know what you are doing.
+
+Notes:
+- Supported from Multi v1.3.2.85 or above and OpenTX 2.3.12 or above
+- The Multi module to be configured must be active, if there is a second Multi module in the radio it must be off
+- Located on the radio SD card under \SCRIPTS\TOOLS
+
+[![MultiCconfig](https://img.youtube.com/vi/lGyCV2kpqHU/0.jpg)](https://www.youtube.com/watch?v=lGyCV2kpqHU)
+
+## MultiChannelsUpdater
 
 Automatically name the channels based on the loaded Multi protocol and sub protocol including the module channel order convention.
 
@@ -21,14 +34,42 @@ Need OpenTX 2.3.9 or above. Located on the radio SD card under \SCRIPTS\TOOLS. T
 
 [![MultiChannelsUpdater](https://img.youtube.com/vi/L58ayXuewyA/0.jpg)](https://www.youtube.com/watch?v=L58ayXuewyA)
 
-## Graupner HoTT.ua
+## MultiLOLI
+
+Script to set the channels function (switch, servo, pwm, ppm, sbus) on a [LOLI RX](https://github.com/pascallanger/DIY-Multiprotocol-TX-Module/blob/master/Protocols_Details.md#loli---82)
+
+[![MultiLOLIconfig](https://img.youtube.com/vi/e698pQxfv-A/0.jpg)](https://www.youtube.com/watch?v=e698pQxfv-A)
+
+## Graupner HoTT
 
 Enable text configuration of the HoTT RX and sensors: Vario, GPS, ESC, GAM and EAM.
 
 Need OpenTX 2.3.9 or above. Located on the radio SD card under \SCRIPTS\TOOLS.
 
 Notes:
-- Menu is used to cycle through the detected sensors.
+- Menu/MDL/Model is used to cycle through the detected sensors.
 - It's normal to lose the telemetry feed while using the text mode configuration. Telemetry will resume properly if the script is exited by doing a short press on the exit button.
 
 [![Text mode video](https://img.youtube.com/vi/81wd8NlF3Qw/0.jpg)](https://www.youtube.com/watch?v=81wd8NlF3Qw)
+
+## Graupner HoTT Model Locator
+
+This is the Graupner HoTT adapted version of the Model Locator script using RSSI.
+
+The OpenTX sensor "RSSI" is populated by the individual OpenTX telemetry protocol implementations and returns a value from 0..100 (percent) originating from the early FrSky implementation. It turns out that FrSky did not really provide a genuine signal strength indicator in units of dbm but a link quality indicator in 0..100%. With Graupner HoTT the link quality indicator is not a good basis for the model locator as it is very non-linear and doesn't change much with distance. Using the Graupner HoTT telemetry sensor "Rssi" which is a true signal strength indicator serves the purpose of locating a model much better as it varies much more with distance.
+
+## DSM Forward Programming
+
+This is a work in progress. It's available for color(+touch) and B&W screens.
+
+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.
+
+## DSM PID Flight log gain parameters for Blade micros
+
+Lua telemetry script from [feathering on RCGroups](https://www.rcgroups.com/forums/showpost.php?p=46033341&postcount=20728) to facilitate setting the Gain Parameters on the Blade 150S FBL. It doesn't use Forward Programming but instead it just reads telemetry data from the Multi-module and displays it on a telemetry display.
+
+It is very similar to the Telemetry Based Text Generator functionality on Spektrum transmitters where one doesn't need to rely on the angle of the swashplate to determine selection/value.

Lua_scripts/pidDsm.lua

@@ -0,0 +1,127 @@
+--
+-- This telemetry script displays the Flight Log Gain
+-- Parameters streamed from the Blade 150S Spektrum AR6335A
+-- Flybarless Controller.
+
+-- The script facilitates the setting of the FBL's
+-- Gain Parameters including PID  for both
+-- cyclic and tail.  It is similar to the Telemetry Based
+-- Text Generator available on Spektrum transmitters.
+
+-- Supporting similar Blade micros such as the Fusion 180
+-- would possibly require minor modifications to this script. 
+
+-- This script reads telemetry data from the Spektrum
+-- receiver and thus functionality relies on data being
+-- captured by the OpenTX transmitter.  A DSM
+-- telemetry-ready module is required.  Please see the
+-- MULTI-Module project at https://www.multi-module.org/.
+
+-- The only supported display is the Taranis'.  It may work
+-- with higher res screens.
+--
+
+
+-- Sensor names
+local PSensor = "FdeA"
+local ISensor = "FdeB"
+local DSensor = "FdeL"
+local RSensor = "FdeR"
+local ActiveParamSensor = "Hold"
+
+local tags = {"P", "I", "D"}
+
+
+local function getPage(iParam)
+  -- get page from 0-based index
+  -- {0,1,2,3}: cyclic (1), {4,5,6,7}: tail (2)
+  local res = (math.floor(iParam/4)==0) and 1 or 2
+  return res
+end
+
+function round(v)
+  -- round float
+  local factor = 100
+  return math.floor(v * factor + 0.5) / factor
+end
+
+
+local function readValue(sensor)
+  -- read from sensor, round and return
+  local v = getValue(sensor)
+  v = round(v)
+  return v
+end
+ 
+local function readActiveParamValue(sensor)
+  --  read and return a validated active parameter value
+  local v = getValue(sensor)
+  if (v<1 or v>8) then
+    return nil
+  end
+  return v
+end
+   
+local function readParameters()
+  -- read and return parameters
+  local p = readValue(PSensor)
+  local i = readValue(ISensor)
+  local d = readValue(DSensor)
+  local r = readValue(RSensor)
+  local a = readActiveParamValue(ActiveParamSensor)
+  return {p,i,d,r,a}
+end
+
+local function drawParameters()
+  -- draw labels and params on screen
+  local params = readParameters()
+  local activeParam = params[5]
+  
+  -- if active gain does not validate then assume
+  -- Gain Adjustment Mode is disabled
+  if not activeParam then
+    lcd.clear()
+    lcd.drawText(20,30,"Please enter Gain Adjustment Mode")
+    return
+  end
+  
+  local activePage = getPage(activeParam-1)
+  for iParam=0,7 do
+    -- highlight selected parameter
+    local attr = (activeParam==iParam+1) and 2 or 0
+    -- circular index (per page)
+    local perPageIndx = iParam % 4 + 1
+    -- check if displaying cyclic params.
+    local isCyclicPage = (getPage(iParam)==1)
+    -- set y draw coord
+    local y = perPageIndx*10+2
+    
+    -- labels
+    local x = isCyclicPage and 6 or 120
+    -- labels are P,I,D for both pages except for last param
+    local val = iParam==3 and "Response" or
+                  (iParam==7 and "Filtering" or tags[perPageIndx])
+    lcd.drawText (x, y, val, attr)
+    
+    -- gains
+    -- set all params for non-active page to '--' rather than 'last value'
+    val = (getPage(iParam)==activePage) and params[perPageIndx] or '--'
+    x = isCyclicPage and 70 or 180
+    lcd.drawText (x, y, val, attr)
+  end
+end
+
+
+local function run_func(event)
+  -- TODO: calling clear() on every function call redrawing all labels is not ideal
+  lcd.clear()
+  lcd.drawText (8, 2, "Cyclic (0...200)")
+  lcd.drawText (114, 2, "Tail (0...200)")
+  drawParameters()
+end
+
+local function init_func() end
+local function bg_func() end
+
+
+return { run=run_func, background=bg_func, init=init_func  }

Multiprotocol/A7105_SPI.ino

@@ -27,13 +27,16 @@ void A7105_WriteData(uint8_t len, uint8_t channel)
 	for (i = 0; i < len; i++)
 		SPI_Write(packet[i]);
 	A7105_CSN_on;
-	if(protocol!=PROTO_FLYSKY)
+	if(protocol!=PROTO_WFLY2)
 	{
-		A7105_Strobe(A7105_STANDBY);	//Force standby mode, ie cancel any TX or RX...
-		A7105_SetTxRxMode(TX_EN);		//Switch to PA
+		if(!(protocol==PROTO_FLYSKY || (protocol==PROTO_KYOSHO && sub_protocol==KYOSHO_HYPE)))
+		{
+			A7105_Strobe(A7105_STANDBY);	//Force standby mode, ie cancel any TX or RX...
+			A7105_SetTxRxMode(TX_EN);		//Switch to PA
+		}
+		A7105_WriteReg(A7105_0F_PLL_I, channel);
+		A7105_Strobe(A7105_TX);
 	}
-	A7105_WriteReg(A7105_0F_PLL_I, channel);
-	A7105_Strobe(A7105_TX);
 }
 
 void A7105_ReadData(uint8_t len)
@@ -107,7 +110,7 @@ void A7105_WriteID(uint32_t ida)
 {
 	A7105_CSN_off;
 	SPI_Write(A7105_06_ID_DATA);			//ex id=0x5475c52a ;txid3txid2txid1txid0
-	SPI_Write((ida>>24)&0xff);				//53 
+	SPI_Write((ida>>24)&0xff);				//54 
 	SPI_Write((ida>>16)&0xff);				//75
 	SPI_Write((ida>>8)&0xff);				//c5
 	SPI_Write((ida>>0)&0xff);				//2a
@@ -207,6 +210,16 @@ void A7105_AdjustLOBaseFreq(uint8_t cmd)
 					offset=(int16_t)FORCE_KYOSHO_TUNING;
 				#endif
 				break;
+			case PROTO_JOYSWAY:
+				#ifdef FORCE_JOYSWAY_TUNING
+					offset=(int16_t)FORCE_JOYSWAY_TUNING;
+				#endif
+				break;
+			case PROTO_WFLY2:
+				#ifdef FORCE_WFLY2_TUNING
+					offset=(int16_t)FORCE_WFLY2_TUNING;
+				#endif
+				break;
 			case PROTO_AFHDS2A:
 			case PROTO_AFHDS2A_RX:
 				#ifdef FORCE_AFHDS2A_TUNING
@@ -216,7 +229,7 @@ void A7105_AdjustLOBaseFreq(uint8_t cmd)
 		}
 	}
 	if(offset==1024)	// Use channel 15 as an input
-		offset=convert_channel_16b_nolimit(CH15,-300,300);
+		offset=convert_channel_16b_nolimit(CH15,-300,300,false);
 
 	if(old_offset==offset)	// offset is the same as before...
 			return;
@@ -318,6 +331,28 @@ const uint8_t PROGMEM KYOSHO_A7105_regs[] = {
 	0x1e, 0x00, 0x00, 0xff, 0x00, 0x00, 0x23, 0x70, 0x1F, 0x47, 0x80, 0x57, 0x01, 0x45, 0x19, 0x00,	// 20 - 2f
 	0x01, 0x0f // 30 - 31
 };
+const uint8_t PROGMEM KYOSHO_HYPE_A7105_regs[] = {
+	0xff, 0x42, 0x00, 0x10, 0xC0, 0xff, 0xff ,0x00, 0x00, 0x00, 0x00, 0x01, 0x09, 0x05, 0x01, 0x04,	// 00 - 0f
+	0x9e, 0x4b, 0x00, 0x02, 0x16, 0x2b, 0x12, 0x00, 0x62, 0x80, 0x80, 0x00, 0x0a, 0x96, 0xc2, 0x1f,	// 10 - 1f
+	0x12, 0x00, 0x00, 0xff, 0x00, 0x00, 0x3a, 0x00, 0x17, 0x47, 0x80, 0x03, 0x01, 0x45, 0x18, 0x00,	// 20 - 2f
+	0x01, 0x0f // 30 - 31
+};
+#endif
+#ifdef WFLY2_A7105_INO //A7106 values
+const uint8_t PROGMEM WFLY2_A7105_regs[] = {
+	0xff, 0x62, 0xff, 0x1F, 0x40, 0xff, 0xff ,0x00, 0x00, 0x00, 0x00, 0x33, 0x33, 0x05, 0x00, 0x64,	// 00 - 0f Changes: 0B:19->33, 0C:01,33
+	0x9e, 0x4b, 0x00, 0x02, 0x16, 0x2b, 0x12, 0x40, 0x62, 0x80, 0x80, 0x00, 0x0a, 0x32, 0x03, 0x0f,	// 10 - 1f 1C:4A->0A
+	0x12, 0x00, 0x00, 0xff, 0x00, 0x00, 0x23, 0x70, 0x15, 0x47, 0x80, 0x03, 0x01, 0x45, 0x18, 0x00,	// 20 - 2f 2B:77->03, 2E:19->18
+	0x01, 0x0f // 30 - 31
+};
+#endif
+#ifdef JOYSWAY_A7105_INO
+const uint8_t PROGMEM JOYSWAY_A7105_regs[] = {
+	0xff, 0x62, 0xff, 0x0F, 0x00, 0xff, 0xff ,0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0xF5, 0x00, 0x15,	// 00 - 0f
+	0x9E, 0x4B, 0x00, 0x03, 0x56, 0x2B, 0x12, 0x4A, 0x02, 0x80, 0x80, 0x00, 0x0E, 0x91, 0x03, 0x0F,	// 10 - 1f
+	0x16, 0x2A, 0x00, 0xff, 0xff, 0xff, 0x3A, 0x06, 0x1F, 0x47, 0x80, 0x01, 0x05, 0x45, 0x18, 0x00,	// 20 - 2f
+	0x01, 0x0f // 30 - 31
+};
 #endif
 
 #define ID_NORMAL 0x55201041
@@ -327,6 +362,20 @@ void A7105_Init(void)
 	uint8_t *A7105_Regs=0;
     uint8_t vco_calibration0, vco_calibration1;
 	
+	#ifdef JOYSWAY_A7105_INO
+		if(protocol==PROTO_JOYSWAY)
+		{
+			A7105_Regs=(uint8_t*)JOYSWAY_A7105_regs;
+		}
+		else
+	#endif
+	#ifdef WFLY2_A7105_INO
+		if(protocol==PROTO_WFLY2)
+		{
+			A7105_Regs=(uint8_t*)WFLY2_A7105_regs;
+		}
+		else
+	#endif
 	#ifdef HEIGHT_A7105_INO
 		if(protocol==PROTO_HEIGHT)
 		{
@@ -363,12 +412,17 @@ void A7105_Init(void)
 					A7105_Regs=(uint8_t*)FLYSKY_A7105_regs;
 			#endif
 			#if defined(AFHDS2A_A7105_INO) || defined(AFHDS2A_RX_A7105_INO)
-				if(protocol==PROTO_AFHDS2A)
+				if(protocol==PROTO_AFHDS2A || protocol==PROTO_AFHDS2A_RX)
 					A7105_Regs=(uint8_t*)AFHDS2A_A7105_regs;
 			#endif
 			#ifdef KYOSHO_A7105_INO
 				if(protocol==PROTO_KYOSHO)
-					A7105_Regs=(uint8_t*)KYOSHO_A7105_regs;
+				{
+					if(sub_protocol==KYOSHO_FHSS)
+						A7105_Regs=(uint8_t*)KYOSHO_A7105_regs;
+					else
+						A7105_Regs=(uint8_t*)KYOSHO_HYPE_A7105_regs;
+				}
 			#endif
 		}
 
@@ -387,12 +441,12 @@ void A7105_Init(void)
 			if(protocol==PROTO_HEIGHT && sub_protocol==HEIGHT_8CH)
 				if(i==0x03) val=0x0A;
 		#endif
-		if( val != 0xFF)
+		if( val != 0xff)
 			A7105_WriteReg(i, val);
 	}
 	A7105_Strobe(A7105_STANDBY);
 
-	if(protocol==PROTO_KYOSHO)
+	if(protocol==PROTO_KYOSHO && sub_protocol==KYOSHO_FHSS)
 	{//strange calibration...
 		//IF Filter Bank Calibration
 		A7105_WriteReg(A7105_02_CALC,0x0F);
@@ -431,7 +485,7 @@ void A7105_Init(void)
 		while(A7105_ReadReg(A7105_02_CALC));			// Wait for calibration to end
 		vco_calibration1 = A7105_ReadReg(A7105_25_VCO_SBCAL_I);
 
-		if(protocol==PROTO_BUGS)
+		if(protocol==PROTO_BUGS || protocol==PROTO_WFLY2)
 			A7105_SetVCOBand(vco_calibration0 & 0x07, vco_calibration1 & 0x07);	// Set calibration band value to best match
 		else
 			if(protocol!=PROTO_HUBSAN)
@@ -445,8 +499,17 @@ void A7105_Init(void)
 						vco_calibration1=0x02;
 						break;
 					case PROTO_PELIKAN:
+						if(sub_protocol == PELIKAN_SCX24)
+						{
+							vco_calibration1=0x0A;
+							break;
+						}
+					case PROTO_KYOSHO: //sub_protocol Hype
 						vco_calibration1=0x0C;
 						break;
+					case PROTO_JOYSWAY:
+						vco_calibration1=0x09;
+						break;
 					default:
 						vco_calibration1=0x0A;
 						break;

Multiprotocol/AFHDS2A_Rx_a7105.ino

@@ -24,10 +24,11 @@
 enum {
 	AFHDS2A_RX_BIND1,
 	AFHDS2A_RX_BIND2,
+	AFHDS2A_RX_BIND3,
 	AFHDS2A_RX_DATA
 };
 
-static void __attribute__((unused)) AFHDS2A_Rx_build_telemetry_packet()
+static void __attribute__((unused)) AFHDS2A_RX_build_telemetry_packet()
 {
 	uint32_t bits = 0;
 	uint8_t bitsavailable = 0;
@@ -39,7 +40,7 @@ static void __attribute__((unused)) AFHDS2A_Rx_build_telemetry_packet()
 	packet_in[idx++] = 14; // number of channels in packet
 	// pack channels
 	for (uint8_t i = 0; i < 14; i++) {
-		uint32_t val = packet[9+i*2] | ((packet[10+i*2] << 8)&0x0F);
+		uint32_t val = packet[9+i*2] | (((packet[10+i*2])&0x0F) << 8);
 		if (val < 860)
 			val = 860;
 		// convert ppm (860-2140) to Multi (0-2047)
@@ -55,13 +56,13 @@ static void __attribute__((unused)) AFHDS2A_Rx_build_telemetry_packet()
 	}
 }
 
-static uint8_t __attribute__((unused)) AFHDS2A_Rx_data_ready()
+static uint8_t __attribute__((unused)) AFHDS2A_RX_data_ready()
 {
 	// check if FECF+CRCF Ok
 	return !(A7105_ReadReg(A7105_00_MODE) & (1 << 5 | 1 << 6 | 1 << 0));
 }
 
-uint16_t initAFHDS2A_Rx()
+void AFHDS2A_RX_init()
 {
 	uint8_t i;
 	A7105_Init();
@@ -83,12 +84,11 @@ uint16_t initAFHDS2A_Rx()
 			hopping_frequency[i] = eeprom_read_byte((EE_ADDR)temp++);
 		phase = AFHDS2A_RX_DATA;
 	}
-	return 1000;
 }
 
 #define AFHDS2A_RX_WAIT_WRITE 0x80
 
-uint16_t AFHDS2A_Rx_callback()
+uint16_t AFHDS2A_RX_callback()
 {
 	static int8_t read_retry;
 	int16_t temp;
@@ -104,22 +104,33 @@ uint16_t AFHDS2A_Rx_callback()
 
 	switch(phase) {
 	case AFHDS2A_RX_BIND1:
-		if (AFHDS2A_Rx_data_ready()) {
+		if(IS_BIND_DONE)
+		{
+			AFHDS2A_RX_init();	// Abort bind
+			break;
+		}
+		debugln("bind p=%d", phase+1);
+		if (AFHDS2A_RX_data_ready()) {
 			A7105_ReadData(AFHDS2A_RX_TXPACKET_SIZE);
 			if ((packet[0] == 0xbb && packet[9] == 0x01) ||	(packet[0] == 0xbc && packet[9] <= 0x02)) {
 				memcpy(rx_id, &packet[1], 4); // TX id actually
 				memcpy(hopping_frequency, &packet[11], AFHDS2A_RX_NUMFREQ);
 				phase = AFHDS2A_RX_BIND2;
+				debugln("phase bind2");
 			}
 		}
 		A7105_WriteReg(A7105_0F_PLL_I, (packet_count++ & 1) ? 0x0D : 0x8C); // bind channels
-		A7105_SetTxRxMode(RX_EN);
 		A7105_Strobe(A7105_RX);
 		return 10000;
 
 	case AFHDS2A_RX_BIND2:
+		if(IS_BIND_DONE)
+		{
+			AFHDS2A_RX_init();	// Abort bind
+			break;
+		}
 		// got 2nd bind packet from tx ?
-		if (AFHDS2A_Rx_data_ready()) {
+		if (AFHDS2A_RX_data_ready()) {
 			A7105_ReadData(AFHDS2A_RX_TXPACKET_SIZE);
 			if ((packet[0] == 0xBC && packet[9] == 0x02 && packet[10] == 0x00) &&
 				(memcmp(rx_id, &packet[1], 4) == 0) &&
@@ -130,42 +141,58 @@ uint16_t AFHDS2A_Rx_callback()
 					eeprom_write_byte((EE_ADDR)temp++, rx_id[i]);
 				for (i = 0; i < AFHDS2A_RX_NUMFREQ; i++)
 					eeprom_write_byte((EE_ADDR)temp++, hopping_frequency[i]);
-				BIND_DONE;
-				phase = AFHDS2A_RX_DATA;
-				return 3850;
+				phase = AFHDS2A_RX_BIND3;
+				debugln("phase bind3");
+				packet_count = 0;
 			}
 		}
 
+	case AFHDS2A_RX_BIND3:
+		debugln("bind p=%d", phase+1);
 		// transmit response packet
 		packet[0] = 0xBC;
 		memcpy(&packet[1], rx_id, 4);
 		memcpy(&packet[5], rx_tx_addr, 4);
-		packet[9] = 0x01;
+		//packet[9] = 0x01;
 		packet[10] = 0x00;
 		memset(&packet[11], 0xFF, 26);
+		A7105_SetTxRxMode(TX_EN);
+		rx_disable_lna = !IS_POWER_FLAG_on;
 		A7105_WriteData(AFHDS2A_RX_RXPACKET_SIZE, packet_count++ & 1 ? 0x0D : 0x8C);
+		if(phase == AFHDS2A_RX_BIND3 && packet_count > 20)
+		{
+			debugln("done");
+			BIND_DONE;
+			AFHDS2A_RX_init();	// Restart protocol
+			break;
+		}
 		phase |= AFHDS2A_RX_WAIT_WRITE;
 		return 1700;
 	
 	case AFHDS2A_RX_BIND2 | AFHDS2A_RX_WAIT_WRITE:
 		//Wait for TX completion
 		pps_timer = micros();
-		while (micros() - pps_timer < 700) // Wait max 700µs, using serial+telemetry exit in about 120µs
+		while ((uint32_t)(micros() - pps_timer) < 700) // Wait max 700µs, using serial+telemetry exit in about 120µs
 			if (!(A7105_ReadReg(A7105_00_MODE) & 0x01))
 				break;
 		A7105_Strobe(A7105_RX);
+	case AFHDS2A_RX_BIND3 | AFHDS2A_RX_WAIT_WRITE:
 		phase &= ~AFHDS2A_RX_WAIT_WRITE;
 		return 10000;
 	
 	case AFHDS2A_RX_DATA:
-		if (AFHDS2A_Rx_data_ready()) {
+		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 == 0) { // standard packet, send channels to TX
+				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();
+					AFHDS2A_RX_build_telemetry_packet();
 					telemetry_link = 1;
+					#ifdef SEND_CPPM
+						if(sub_protocol>0)
+							telemetry_link |= 0x80;	// Disable telemetry output
+					#endif
 				}
 				rx_data_started = true;
 				read_retry = 10; // hop to next channel

Multiprotocol/AFHDS2A_a7105.ino

@@ -270,11 +270,18 @@ static void AFHDS2A_build_packet(uint8_t type)
 }
 
 #define AFHDS2A_WAIT_WRITE 0x80
-uint16_t ReadAFHDS2A()
+
+#ifdef STM32_BOARD
+	#define AFHDS2A_WRITE_TIME 1550
+#else
+	#define AFHDS2A_WRITE_TIME 1700
+#endif
+
+uint16_t AFHDS2A_callback()
 {
 	static uint8_t packet_type;
 	static uint16_t packet_counter;
-	uint8_t data_rx;
+	uint8_t data_rx=0;
 	uint16_t start;
 	#ifndef FORCE_AFHDS2A_TUNING
 		A7105_AdjustLOBaseFreq(1);
@@ -285,13 +292,20 @@ uint16_t ReadAFHDS2A()
 		case AFHDS2A_BIND2:
 		case AFHDS2A_BIND3:
 			AFHDS2A_build_bind_packet();
+			data_rx=A7105_ReadReg(A7105_00_MODE);			// Check if something has been received...
 			A7105_WriteData(AFHDS2A_TXPACKET_SIZE, packet_count%2 ? 0x0d : 0x8c);
-			if(!(A7105_ReadReg(A7105_00_MODE) & (1<<5 | 1<<6)))
-			{ // FECF+CRCF Ok
+			if(!(A7105_ReadReg(A7105_00_MODE) & (1<<5)) && !(data_rx & 1))	// removed FECF check due to issues with fs-x6b ->  & (1<<5 | 1<<6)
+			{ // RX+CRCF Ok
 				A7105_ReadData(AFHDS2A_RXPACKET_SIZE);
+				#if 0
+					debug("RX");
+					for(uint8_t i=0; i<AFHDS2A_RXPACKET_SIZE ; i++)
+						debug(" %02X", packet[i]);
+					debugln("");
+				#endif
 				if(packet[0] == 0xbc && packet[9] == 0x01)
 				{
-					uint8_t addr;
+					uint16_t addr;
 					if(RX_num<16)
 						addr=AFHDS2A_EEPROM_OFFSET+RX_num*4;
 					else
@@ -303,33 +317,33 @@ uint16_t ReadAFHDS2A()
 					}
 					phase = AFHDS2A_BIND4;
 					packet_count++;
-					return 3850;
+					break;
 				}
 			}
 			packet_count++;
 			if(IS_BIND_DONE)
 			{ // exit bind if asked to do so from the GUI
 				phase = AFHDS2A_BIND4;
-				return 3850;
+				break;
 			}
 			phase |= AFHDS2A_WAIT_WRITE;
-			return 1700;
+			return AFHDS2A_WRITE_TIME;
 		case AFHDS2A_BIND1|AFHDS2A_WAIT_WRITE:
 		case AFHDS2A_BIND2|AFHDS2A_WAIT_WRITE:
 		case AFHDS2A_BIND3|AFHDS2A_WAIT_WRITE:
 			//Wait for TX completion
 			start=micros();
-			while ((uint16_t)micros()-start < 700)			// Wait max 700µs, using serial+telemetry exit in about 120µs
+			while ((uint16_t)((uint16_t)micros()-start) < 700)			// Wait max 700µs, using serial+telemetry exit in about 120µs
 				if(!(A7105_ReadReg(A7105_00_MODE) & 0x01))
 					break;
 			A7105_SetPower();
-			A7105_SetTxRxMode(TXRX_OFF);					// Turn LNA off since we are in near range and we want to prevent swamping
+			A7105_SetTxRxMode((packet_count & 0x40) ? TXRX_OFF : RX_EN);	// Turn LNA off time to time since we are in near range and we want to prevent swamping
 			A7105_Strobe(A7105_RX);
 			phase &= ~AFHDS2A_WAIT_WRITE;
 			phase++;
 			if(phase > AFHDS2A_BIND3)
 				phase = AFHDS2A_BIND1;
-			return 2150;
+			return 3850-AFHDS2A_WRITE_TIME;
 		case AFHDS2A_BIND4:
 			AFHDS2A_build_bind_packet();
 			A7105_WriteData(AFHDS2A_TXPACKET_SIZE, packet_count%2 ? 0x0d : 0x8c);
@@ -341,7 +355,7 @@ uint16_t ReadAFHDS2A()
 				phase = AFHDS2A_DATA_INIT;
 				BIND_DONE;
 			}
-			return 3850;
+			break;
 		case AFHDS2A_DATA_INIT:
 			packet_counter=0;
 			packet_type = AFHDS2A_PACKET_STICKS;
@@ -351,10 +365,7 @@ uint16_t ReadAFHDS2A()
 				telemetry_set_input_sync(3850);
 			#endif
 			AFHDS2A_build_packet(packet_type);
-			if((A7105_ReadReg(A7105_00_MODE) & 0x01))		// Check if something has been received...
-				data_rx=0;
-			else
-				data_rx=1;									// Yes
+			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;
@@ -370,13 +381,13 @@ uint16_t ReadAFHDS2A()
 					}
 					else
 				#endif
-						packet_type = AFHDS2A_PACKET_STICKS;		// todo : check for settings changes
+						packet_type = AFHDS2A_PACKET_STICKS;	// todo : check for settings changes
 			}
-			if(!(A7105_ReadReg(A7105_00_MODE) & (1<<5 | 1<<6)) && data_rx==1)
-			{ // RX+FECF+CRCF Ok
+			if(!(A7105_ReadReg(A7105_00_MODE) & (1<<5)) && !(data_rx & 1))	// removed FECF check due to issues with fs-x6b ->  & (1<<5 | 1<<6)
+			{ // RX+CRCF Ok
 				A7105_ReadData(AFHDS2A_RXPACKET_SIZE);
 				if(packet[0] == 0xAA && packet[9] == 0xFC)
-					packet_type=AFHDS2A_PACKET_SETTINGS;	// RX is asking for settings
+					packet_type=AFHDS2A_PACKET_SETTINGS;		// RX is asking for settings
 				else
 					if((packet[0] == 0xAA && packet[9]!=0xFD) || packet[0] == 0xAC)
 					{// Normal telemetry packet, ignore packets which contain the RX configuration: AA FD FF 32 00 01 00 FF FF FF 05 DC 05 DE FA FF FF FF FF FF FF FF FF FF FF FF FF FF FF
@@ -399,23 +410,23 @@ uint16_t ReadAFHDS2A()
 			}
 			packet_counter++;
 			phase |= AFHDS2A_WAIT_WRITE;
-			return 1700;
+			return AFHDS2A_WRITE_TIME;
 		case AFHDS2A_DATA|AFHDS2A_WAIT_WRITE:
 			//Wait for TX completion
 			start=micros();
-			while ((uint16_t)micros()-start < 700)			// Wait max 700µs, using serial+telemetry exit in about 120µs
+			while ((uint16_t)((uint16_t)micros()-start) < 700)			// Wait max 700µs, using serial+telemetry exit in about 120µs
 				if(!(A7105_ReadReg(A7105_00_MODE) & 0x01))
 					break;
 			A7105_SetPower();
 			A7105_SetTxRxMode(RX_EN);
 			A7105_Strobe(A7105_RX);
 			phase &= ~AFHDS2A_WAIT_WRITE;
-			return 2150;
+			return 3850-AFHDS2A_WRITE_TIME;
 	}
-	return 3850; // never reached, please the compiler
+	return 3850;
 }
 
-uint16_t initAFHDS2A()
+void AFHDS2A_init()
 {
 	A7105_Init();
 
@@ -428,7 +439,7 @@ uint16_t initAFHDS2A()
 	{
 		phase = AFHDS2A_DATA_INIT;
 		//Read RX ID from EEPROM based on RX_num, RX_num must be uniq for each RX
-		uint8_t addr;
+		uint16_t addr;
 		if(RX_num<16)
 			addr=AFHDS2A_EEPROM_OFFSET+RX_num*4;
 		else
@@ -441,6 +452,5 @@ uint16_t initAFHDS2A()
 		num_ch=17;
 	else
 		num_ch=14;
-	return 50000;
 }
 #endif

Multiprotocol/ASSAN_nrf24l01.ino

@@ -33,19 +33,14 @@ enum {
     ASSAN_DATA5
 };
 
-void ASSAN_init()
+void ASSAN_RF_init()
 {
     NRF24L01_Initialize();
+	//Specifics to ASSAN
     NRF24L01_WriteReg(NRF24L01_03_SETUP_AW, 0x02);			// 4 bytes rx/tx address
-	NRF24L01_WriteRegisterMulti(NRF24L01_10_TX_ADDR, (uint8_t *)"\x80\x80\x80\xB8", ASSAN_ADDRESS_LENGTH);		// Bind address
+	NRF24L01_WriteRegisterMulti(NRF24L01_10_TX_ADDR,    (uint8_t *)"\x80\x80\x80\xB8", ASSAN_ADDRESS_LENGTH);	// Bind address
 	NRF24L01_WriteRegisterMulti(NRF24L01_0A_RX_ADDR_P0, (uint8_t *)"\x80\x80\x80\xB8", ASSAN_ADDRESS_LENGTH);	// Bind address
-	NRF24L01_FlushTx();
-	NRF24L01_FlushRx();
-    NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);			// Clear data ready, data sent, and retransmit
-    NRF24L01_WriteReg(NRF24L01_01_EN_AA, 0x00);				// No Auto Acknowldgement on all data pipes
-	NRF24L01_WriteReg(NRF24L01_02_EN_RXADDR, 0x01);			// Enable data pipe 0 only
 	NRF24L01_WriteReg(NRF24L01_11_RX_PW_P0, ASSAN_PACKET_SIZE);
-    NRF24L01_SetPower();
 }
 
 void ASSAN_send_packet()
@@ -169,17 +164,16 @@ static void __attribute__((unused)) ASSAN_initialize_txid()
 	hopping_frequency[1]=freq2;
 }
 
-uint16_t initASSAN()
+void ASSAN_init()
 {
 	ASSAN_initialize_txid();
-	ASSAN_init();
+	ASSAN_RF_init();
 	hopping_frequency_no = 0;
 
 	if(IS_BIND_IN_PROGRESS)
 		phase=ASSAN_BIND0;
 	else 
 		phase=ASSAN_DATA0;
-	return 1000;
 }
 
 #endif

Multiprotocol/Arduino.ino

@@ -115,7 +115,7 @@ void delayMilliseconds(unsigned long ms)
    uint16_t lms = ms ;
 
    while (lms > 0) {
-      if (((uint16_t)micros() - start) >= 1000) {
+      if ((uint16_t)((uint16_t)micros() - start) >= 1000) {
          lms--;
          start += 1000;
       }

Multiprotocol/BUGSMINI_nrf24l01.ino

@@ -16,7 +16,7 @@
 
 #if defined(BUGSMINI_NRF24L01_INO)
 
-#include "iface_nrf24l01.h"
+#include "iface_xn297.h"
 
 #define BUGSMINI_INITIAL_WAIT    500
 #define BUGSMINI_PACKET_INTERVAL 6840
@@ -57,22 +57,10 @@ enum {
 #define BUGSMINI_FLAG_ANGLE   0x02    // angle/acro mode (set is angle mode)
 #define BUGSMINI_FLAG_ALTHOLD 0x04    // angle/altitude hold mode (set is altitude mode)
 
-static void __attribute__((unused)) BUGSMINI_init()
+static void __attribute__((unused)) BUGSMINI_RF_init()
 {
-	NRF24L01_Initialize();
-	NRF24L01_SetTxRxMode(TX_EN);
-	NRF24L01_FlushTx();
-	NRF24L01_FlushRx();
-	NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);     // Clear data ready, data sent, and retransmit
-	NRF24L01_WriteReg(NRF24L01_01_EN_AA, 0x00);      // No Auto Acknowldgement on all data pipes
-	NRF24L01_WriteReg(NRF24L01_02_EN_RXADDR, 0x01);  // Enable data pipe 0 only
-	NRF24L01_WriteReg(NRF24L01_11_RX_PW_P0, BUGSMINI_RX_PAYLOAD_SIZE); // bytes of data payload for rx pipe 1
-	NRF24L01_WriteReg(NRF24L01_06_RF_SETUP, 0x07);
-	NRF24L01_SetBitrate(NRF24L01_BR_1M);
-	NRF24L01_SetPower();
-	NRF24L01_Activate(0x73);                          // Activate feature register
-	NRF24L01_WriteReg(NRF24L01_1C_DYNPD, 0x00);       // Disable dynamic payload length on all pipes
-	NRF24L01_WriteReg(NRF24L01_1D_FEATURE, 0x00);     // Set feature bits on
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
+	//XN297_HoppingCalib(BUGSMINI_NUM_RF_CHANNELS*2);
 }
 
 static void __attribute__((unused)) BUGSMINI_check_arming()
@@ -95,7 +83,7 @@ static void __attribute__((unused)) BUGSMINI_check_arming()
 	}
 }
 
-static void __attribute__((unused)) BUGSMINI_send_packet(uint8_t bind)
+static void __attribute__((unused)) BUGSMINI_send_packet()
 {
 	BUGSMINI_check_arming();  // sets globals arm_flags and armed
 
@@ -107,7 +95,7 @@ static void __attribute__((unused)) BUGSMINI_send_packet(uint8_t bind)
 	packet[1] = BUGSMINI_txid[0];
 	packet[2] = BUGSMINI_txid[1];
 	packet[3] = BUGSMINI_txid[2];
-	if(bind)
+	if(IS_BIND_IN_PROGRESS)
 	{
 		packet[4] = 0x00;
 		packet[5] = 0x7d;
@@ -159,15 +147,14 @@ static void __attribute__((unused)) BUGSMINI_send_packet(uint8_t bind)
 		hopping_frequency_no++;
 		if(hopping_frequency_no >= BUGSMINI_NUM_RF_CHANNELS)
 			hopping_frequency_no = 0;
-		NRF24L01_WriteReg(NRF24L01_05_RF_CH, bind ? hopping_frequency[hopping_frequency_no+BUGSMINI_NUM_RF_CHANNELS] : hopping_frequency[hopping_frequency_no]);
+		XN297_Hopping(IS_BIND_IN_PROGRESS ? hopping_frequency_no+BUGSMINI_NUM_RF_CHANNELS : hopping_frequency_no);
 	}
 
-	// Power on, TX mode, 2byte CRC
-	XN297_Configure(_BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO) | _BV(NRF24L01_00_PWR_UP));
-	NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);
-	NRF24L01_FlushTx();
+	// Send
+	XN297_SetPower();
+	XN297_SetTxRxMode(TXRX_OFF);
+	XN297_SetTxRxMode(TX_EN);
 	XN297_WritePayload(packet, BUGSMINI_TX_PAYLOAD_SIZE);
-	NRF24L01_SetPower();
 }
 
 // compute final address for the rxid received during bind
@@ -231,37 +218,37 @@ static void __attribute__((unused)) BUGSMINI_make_address()
     // Something wrong happened if we arrive here....
 }
 
+#if defined(BUGS_HUB_TELEMETRY)
 static void __attribute__((unused)) BUGSMINI_update_telemetry()
 {
-#if defined(BUGS_HUB_TELEMETRY)
 	uint8_t checksum = 0x6d;
 	for(uint8_t i=1; i<12; i++)
-		checksum += packet[i];
-	if(packet[0] == checksum)
+		checksum += packet_in[i];
+	if(packet_in[0] == checksum)
 	{
-		RX_RSSI = packet[3];
+		RX_RSSI = packet_in[3];
 		if(sub_protocol==BUGS3H)
 		{
-			if(packet[11] & 0x40)
+			if(packet_in[11] & 0x40)
 				v_lipo1 = 0x40; // Warning
-			else if(packet[11] & 0x80)
+			else if(packet_in[11] & 0x80)
 				v_lipo1 = 0x20; // Critical
 			else
 				v_lipo1 = 0x80; // Ok
 		}
 		else
 		{
-			if(packet[11] & 0x80)
+			if(packet_in[11] & 0x80)
 				v_lipo1 = 0x80; // Ok
-			else if(packet[11] & 0x40)
+			else if(packet_in[11] & 0x40)
 				v_lipo1 = 0x40; // Warning
 			else
 				v_lipo1 = 0x20; // Critical
 		}
 		telemetry_link=1;
 	}
-#endif
 }
+#endif
 
 uint16_t BUGSMINI_callback()
 {
@@ -269,58 +256,52 @@ uint16_t BUGSMINI_callback()
 	switch(phase)
 	{
 		case BUGSMINI_BIND1:
-			if( NRF24L01_ReadReg(NRF24L01_07_STATUS) & _BV(NRF24L01_07_RX_DR))
+			if( XN297_IsRX() )
 			{ // RX fifo data ready
-				XN297_ReadPayload(packet, BUGSMINI_RX_PAYLOAD_SIZE);
+				XN297_ReadPayload(packet, BUGSMINI_RX_PAYLOAD_SIZE);	// Not checking the CRC??
 				base_adr=BUGSMINI_EEPROM_OFFSET+(RX_num&0x0F)*2;
-				eeprom_write_byte((EE_ADDR)(base_adr+0),packet[1]);	// Save rxid in EEPROM
-				eeprom_write_byte((EE_ADDR)(base_adr+1),packet[2]);	// Save rxid in EEPROM
-				NRF24L01_SetTxRxMode(TXRX_OFF);
-				NRF24L01_SetTxRxMode(TX_EN);
+				eeprom_write_byte((EE_ADDR)(base_adr+0),packet[1]);		// Save rxid in EEPROM
+				eeprom_write_byte((EE_ADDR)(base_adr+1),packet[2]);		// Save rxid in EEPROM
 				BUGSMINI_make_address();
 				XN297_SetTXAddr(rx_tx_addr, 5);
-				XN297_SetRXAddr(rx_tx_addr, 5);
+				XN297_SetRXAddr(rx_tx_addr, BUGSMINI_RX_PAYLOAD_SIZE);
 				phase = BUGSMINI_DATA1;
 				BIND_DONE;
-				return BUGSMINI_PACKET_INTERVAL;
+				break;
 			}
-			NRF24L01_SetTxRxMode(TXRX_OFF);
-			NRF24L01_SetTxRxMode(TX_EN);
-			BUGSMINI_send_packet(1);
+			BUGSMINI_send_packet();
 			phase = BUGSMINI_BIND2;
 			return BUGSMINI_WRITE_WAIT;
 		case BUGSMINI_BIND2:
 			// switch to RX mode
-			NRF24L01_SetTxRxMode(TXRX_OFF);
-			NRF24L01_SetTxRxMode(RX_EN);
-			NRF24L01_FlushRx();
-			XN297_Configure(_BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO) 
-						  | _BV(NRF24L01_00_PWR_UP) | _BV(NRF24L01_00_PRIM_RX));
+			XN297_SetTxRxMode(TXRX_OFF);
+			XN297_SetTxRxMode(RX_EN);
 			phase = BUGSMINI_BIND1;
 			return BUGSMINI_PACKET_INTERVAL - BUGSMINI_WRITE_WAIT;
 		case BUGSMINI_DATA1:
 			#ifdef MULTI_SYNC
 				telemetry_set_input_sync(BUGSMINI_PACKET_INTERVAL);
 			#endif
-			if( NRF24L01_ReadReg(NRF24L01_07_STATUS) & _BV(NRF24L01_07_RX_DR))
-			{ // RX fifo data ready => read only 12 bytes to not overwrite channel change flag
-				XN297_ReadPayload(packet, 12);
-				BUGSMINI_update_telemetry();
-			}
-			NRF24L01_SetTxRxMode(TXRX_OFF);
-			NRF24L01_SetTxRxMode(TX_EN);
-			BUGSMINI_send_packet(0);
+			#if defined(BUGS_HUB_TELEMETRY)
+				if( XN297_IsRX() )
+				{
+					XN297_ReadPayload(packet_in, BUGSMINI_RX_PAYLOAD_SIZE);	// Not checking the CRC??
+					BUGSMINI_update_telemetry();
+				}
+			#endif
+			BUGSMINI_send_packet();
+	#if not defined(BUGS_HUB_TELEMETRY)
+			break;
+	#else
 			phase = BUGSMINI_DATA2;
 			return BUGSMINI_WRITE_WAIT;
 		case BUGSMINI_DATA2:
 			// switch to RX mode
-			NRF24L01_SetTxRxMode(TXRX_OFF);
-			NRF24L01_FlushRx();
-			NRF24L01_SetTxRxMode(RX_EN);
-			XN297_Configure(_BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO) 
-							| _BV(NRF24L01_00_PWR_UP) | _BV(NRF24L01_00_PRIM_RX));
+			XN297_SetTxRxMode(TXRX_OFF);
+			XN297_SetTxRxMode(RX_EN);
 			phase = BUGSMINI_DATA1;
 			return BUGSMINI_PACKET_INTERVAL - BUGSMINI_WRITE_WAIT;
+	#endif
 	}
 	return BUGSMINI_PACKET_INTERVAL;
 }
@@ -357,28 +338,27 @@ static void __attribute__((unused)) BUGSMINI_initialize_txid()
 	BUGSMINI_txhash = pgm_read_byte_near( &BUGSMINI_tx_hash[rx_tx_addr[3]%BUGSMINI_NUM_TX_RF_MAPS] );
 }
 
-uint16_t initBUGSMINI()
+void BUGSMINI_init()
 {
 	BUGSMINI_initialize_txid();
+	BUGSMINI_RF_init();
 	memset(packet, (uint8_t)0, BUGSMINI_TX_PAYLOAD_SIZE);
-	BUGSMINI_init();
 	if(IS_BIND_IN_PROGRESS)
 	{
 		XN297_SetTXAddr((const uint8_t*)"mjxRC", 5);
-		XN297_SetRXAddr((const uint8_t*)"mjxRC", 5);
+		XN297_SetRXAddr((const uint8_t*)"mjxRC", BUGSMINI_RX_PAYLOAD_SIZE);
 		phase = BUGSMINI_BIND1;
 	}
 	else
 	{
 		BUGSMINI_make_address();
 		XN297_SetTXAddr(rx_tx_addr, 5);
-		XN297_SetRXAddr(rx_tx_addr, 5);
+		XN297_SetRXAddr(rx_tx_addr, BUGSMINI_RX_PAYLOAD_SIZE);
 		phase = BUGSMINI_DATA1;
 	}
 	armed = 0;
 	arm_flags = BUGSMINI_FLAG_DISARM;    // initial value from captures
 	arm_channel_previous = BUGSMINI_CH_SW_ARM;
-	return BUGSMINI_INITIAL_WAIT;
 }
 
 #endif

Multiprotocol/Bayang_Rx_nrf24l01.ino

@@ -15,7 +15,7 @@ Multiprotocol is distributed in the hope that it will be useful,
 
 #if defined(BAYANG_RX_NRF24L01_INO)
 
-#include "iface_nrf24l01.h"
+#include "iface_xn297.h"
 
 #define BAYANG_RX_PACKET_SIZE		15
 #define BAYANG_RX_RF_NUM_CHANNELS	4
@@ -27,28 +27,15 @@ enum {
 	BAYANG_RX_DATA
 };
 
-static void __attribute__((unused)) Bayang_Rx_init_nrf24l01()
+static void __attribute__((unused)) Bayang_Rx_RF_init()
 {
 	const uint8_t bind_address[BAYANG_RX_ADDRESS_LENGTH] = { 0,0,0,0,0 };
-	NRF24L01_Initialize();
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
 	XN297_SetTXAddr(bind_address, BAYANG_RX_ADDRESS_LENGTH);
-	XN297_SetRXAddr(bind_address, BAYANG_RX_ADDRESS_LENGTH);
-	NRF24L01_FlushRx();
-	NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);     	// Clear data ready, data sent, and retransmit
-	NRF24L01_WriteReg(NRF24L01_01_EN_AA, 0x00);      	// No Auto Acknowldgement on all data pipes
-	NRF24L01_WriteReg(NRF24L01_02_EN_RXADDR, 0x01);  	// Enable data pipe 0 only
-	NRF24L01_WriteReg(NRF24L01_11_RX_PW_P0, BAYANG_RX_PACKET_SIZE + 2); // 2 extra bytes for xn297 crc
-	NRF24L01_WriteReg(NRF24L01_05_RF_CH, BAYANG_RX_RF_BIND_CHANNEL);
-	NRF24L01_SetBitrate(NRF24L01_BR_1M);             	// 1Mbps
-	NRF24L01_SetPower();
-	NRF24L01_Activate(0x73);							// Activate feature register
-	NRF24L01_WriteReg(NRF24L01_1C_DYNPD, 0x00);			// Disable dynamic payload length on all pipes
-	NRF24L01_WriteReg(NRF24L01_1D_FEATURE, 0x01);
-	NRF24L01_Activate(0x73);
-	NRF24L01_SetTxRxMode(TXRX_OFF);
-	NRF24L01_FlushRx();
-	NRF24L01_SetTxRxMode(RX_EN);
-	XN297_Configure(_BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO) | _BV(NRF24L01_00_PWR_UP) | _BV(NRF24L01_00_PRIM_RX));
+	XN297_SetRXAddr(bind_address, BAYANG_RX_PACKET_SIZE);
+	XN297_RFChannel(BAYANG_RX_RF_BIND_CHANNEL);
+	XN297_SetTxRxMode(TXRX_OFF);
+	XN297_SetTxRxMode(RX_EN);
 }
 
 static uint8_t __attribute__((unused)) Bayang_Rx_check_validity() {
@@ -98,10 +85,10 @@ static void __attribute__((unused)) Bayang_Rx_build_telemetry_packet()
 	}
 }
 
-uint16_t initBayang_Rx()
+void BAYANG_RX_init()
 {
 	uint8_t i;
-	Bayang_Rx_init_nrf24l01();
+	Bayang_Rx_RF_init();
 	hopping_frequency_no = 0;
 	rx_data_started = false;
 	rx_data_received = false;
@@ -115,89 +102,101 @@ uint16_t initBayang_Rx()
 			rx_tx_addr[i] = eeprom_read_byte((EE_ADDR)temp++);
 		for (i = 0; i < BAYANG_RX_RF_NUM_CHANNELS; i++)
 			hopping_frequency[i] = eeprom_read_byte((EE_ADDR)temp++);
+		//XN297_HoppingCalib(BAYANG_RX_RF_NUM_CHANNELS);
 		XN297_SetTXAddr(rx_tx_addr, BAYANG_RX_ADDRESS_LENGTH);
-		XN297_SetRXAddr(rx_tx_addr, BAYANG_RX_ADDRESS_LENGTH);
+		XN297_SetRXAddr(rx_tx_addr, BAYANG_RX_PACKET_SIZE);
 		phase = BAYANG_RX_DATA;
 	}
-	return 1000;
 }
 
-uint16_t Bayang_Rx_callback()
+uint16_t BAYANG_RX_callback()
 {
 	uint8_t i;
 	static int8_t read_retry;
 
-	switch (phase) {
-	case BAYANG_RX_BIND:
-		if (NRF24L01_ReadReg(NRF24L01_07_STATUS) & _BV(NRF24L01_07_RX_DR)) {
-			// data received from TX
-			if (XN297_ReadPayload(packet, BAYANG_RX_PACKET_SIZE) && ( packet[0] == 0xA4 || packet[0] == 0xA2 ) && Bayang_Rx_check_validity()) {
-				// store tx info into eeprom
-				uint16_t temp = BAYANG_RX_EEPROM_OFFSET;
-				for (i = 0; i < 5; i++) {
-					rx_tx_addr[i] = packet[i + 1];
-					eeprom_write_byte((EE_ADDR)temp++, rx_tx_addr[i]);
-				}
-				for (i = 0; i < 4; i++) {
-					hopping_frequency[i] = packet[i + 6];
-					eeprom_write_byte((EE_ADDR)temp++, hopping_frequency[i]);
-				}
-				XN297_SetTXAddr(rx_tx_addr, BAYANG_RX_ADDRESS_LENGTH);
-				XN297_SetRXAddr(rx_tx_addr, BAYANG_RX_ADDRESS_LENGTH);
-				BIND_DONE;
-				phase = BAYANG_RX_DATA;
-			}
-			NRF24L01_FlushRx();
-			NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);
-		}
-		break;
-	case BAYANG_RX_DATA:
-		if (NRF24L01_ReadReg(NRF24L01_07_STATUS) & _BV(NRF24L01_07_RX_DR)) {
-			if (XN297_ReadPayload(packet, BAYANG_RX_PACKET_SIZE) && packet[0] == 0xA5 && Bayang_Rx_check_validity()) {
-				if (telemetry_link == 0) {
-					Bayang_Rx_build_telemetry_packet();
-					telemetry_link = 1;
-				}
-				rx_data_started = true;
-				rx_data_received = true;
-				read_retry = 8;
-				pps_counter++;
-			}
-		}
-		// packets per second
-		if (millis() - pps_timer >= 1000) {
-			pps_timer = millis();
-			debugln("%d pps", pps_counter);
-			RX_LQI = pps_counter >> 1;
-			pps_counter = 0;
-		}
-		// frequency hopping
-		if (read_retry++ >= 8) {
-			hopping_frequency_no++;
-			if (hopping_frequency_no >= BAYANG_RX_RF_NUM_CHANNELS)
-				hopping_frequency_no = 0;
-			NRF24L01_WriteReg(NRF24L01_05_RF_CH, hopping_frequency[hopping_frequency_no]);
-			NRF24L01_FlushRx();
-			NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);
-			if (rx_data_started)
+	switch (phase)
+	{
+		case BAYANG_RX_BIND:
+			if(IS_BIND_DONE)
 			{
-				if(rx_data_received)
-				{ // In sync
-					rx_data_received = false;
-					read_retry = 5;
-					return 1500;
+				BAYANG_RX_init();	// Abort bind
+				break;
+			}
+			if ( XN297_IsRX() )
+			{
+				debugln("RX");
+				// data received from TX
+				if (XN297_ReadPayload(packet, BAYANG_RX_PACKET_SIZE) && ( packet[0] == 0xA4 || packet[0] == 0xA2 ) && Bayang_Rx_check_validity())
+				{
+					// store tx info into eeprom
+					uint16_t temp = BAYANG_RX_EEPROM_OFFSET;
+					for (i = 0; i < 5; i++) {
+						rx_tx_addr[i] = packet[i + 1];
+						eeprom_write_byte((EE_ADDR)temp++, rx_tx_addr[i]);
+					}
+					for (i = 0; i < 4; i++) {
+						hopping_frequency[i] = packet[i + 6];
+						eeprom_write_byte((EE_ADDR)temp++, hopping_frequency[i]);
+					}
+					//XN297_HoppingCalib(BAYANG_RX_RF_NUM_CHANNELS);
+					XN297_SetTXAddr(rx_tx_addr, BAYANG_RX_ADDRESS_LENGTH);
+					XN297_SetRXAddr(rx_tx_addr, BAYANG_RX_PACKET_SIZE);
+					BIND_DONE;
+					phase = BAYANG_RX_DATA;
+				}
+				XN297_SetTxRxMode(RX_EN);
+			}
+			break;
+		case BAYANG_RX_DATA:
+			if ( XN297_IsRX() ) {
+				if (XN297_ReadPayload(packet, BAYANG_RX_PACKET_SIZE) && packet[0] == 0xA5 && Bayang_Rx_check_validity()) {
+					if ((telemetry_link & 0x7F) == 0) {
+						Bayang_Rx_build_telemetry_packet();
+						telemetry_link = 1;
+						#ifdef SEND_CPPM
+							if(sub_protocol>0)
+								telemetry_link |= 0x80;	// Disable telemetry output
+						#endif
+					}
+					rx_data_started = true;
+					rx_data_received = true;
+					read_retry = 8;
+					pps_counter++;
+				}
+			}
+			// packets per second
+			if (millis() - pps_timer >= 1000) {
+				pps_timer = millis();
+				debugln("%d pps", pps_counter);
+				RX_LQI = pps_counter >> 1;
+				pps_counter = 0;
+			}
+			// frequency hopping
+			if (read_retry++ >= 8) {
+				hopping_frequency_no++;
+				if (hopping_frequency_no >= BAYANG_RX_RF_NUM_CHANNELS)
+					hopping_frequency_no = 0;
+				XN297_Hopping(hopping_frequency_no);
+				XN297_SetTxRxMode(RX_EN);
+				if (rx_data_started)
+				{
+					if(rx_data_received)
+					{ // In sync
+						rx_data_received = false;
+						read_retry = 5;
+						return 1500;
+					}
+					else
+					{ // packet lost
+						read_retry = 0;
+						if(RX_LQI==0)	// communication lost
+							rx_data_started=false;
+					}
 				}
 				else
-				{ // packet lost
-					read_retry = 0;
-					if(RX_LQI==0)	// communication lost
-						rx_data_started=false;
-				}
+					read_retry = -16; // retry longer until first packet is caught
 			}
-			else
-				read_retry = -16; // retry longer until first packet is caught
-		}
-		return 250;
+			return 250;
 	}
 	return 1000;
 }

Multiprotocol/Bayang_nrf24l01.ino

@@ -17,7 +17,7 @@ Multiprotocol is distributed in the hope that it will be useful,
 
 #if defined(BAYANG_NRF24L01_INO)
 
-#include "iface_nrf24l01.h"
+#include "iface_xn297.h"
 
 #define BAYANG_BIND_COUNT		1000
 #define BAYANG_PACKET_PERIOD	2000
@@ -97,6 +97,8 @@ static void __attribute__((unused)) BAYANG_send_packet()
 	}
 	else
 	{
+		XN297_Hopping(hopping_frequency_no++);
+		hopping_frequency_no%=BAYANG_RF_NUM_CHANNELS;
 		uint16_t val;
 		uint8_t dyntrim = 1;
 		switch (sub_protocol)
@@ -143,19 +145,19 @@ static void __attribute__((unused)) BAYANG_send_packet()
 		if(CH13_SW)
 			packet[3] |= BAYANG_FLAG_EMG_STOP;
 		//Aileron
-		val = convert_channel_10b(AILERON);
+		val = convert_channel_10b(AILERON, false);
 		packet[4] = (val>>8) + (dyntrim ? ((val>>2) & 0xFC) : 0x7C);
 		packet[5] = val & 0xFF;
 		//Elevator
-		val = convert_channel_10b(ELEVATOR);
+		val = convert_channel_10b(ELEVATOR, false);
 		packet[6] = (val>>8) + (dyntrim ? ((val>>2) & 0xFC) : 0x7C);
 		packet[7] = val & 0xFF;
 		//Throttle
-		val = convert_channel_10b(THROTTLE);
+		val = convert_channel_10b(THROTTLE, false);
 		packet[8] = (val>>8) + 0x7C;
 		packet[9] = val & 0xFF;
 		//Rudder
-		val = convert_channel_10b(RUDDER);
+		val = convert_channel_10b(RUDDER, false);
 		packet[10] = (val>>8) + (dyntrim ? ((val>>2) & 0xFC) : 0x7C);
 		packet[11] = val & 0xFF;
 	}
@@ -192,84 +194,61 @@ static void __attribute__((unused)) BAYANG_send_packet()
 	for (uint8_t i=0; i < BAYANG_PACKET_SIZE-1; i++)
 		packet[14] += packet[i];
 
-	NRF24L01_WriteReg(NRF24L01_05_RF_CH, IS_BIND_IN_PROGRESS ? rf_ch_num:hopping_frequency[hopping_frequency_no++]);
-	hopping_frequency_no%=BAYANG_RF_NUM_CHANNELS;
-
-	// Power on, TX mode, 2byte CRC
-	// Why CRC0? xn297 does not interpret it - either 16-bit CRC or nothing
-	NRF24L01_FlushTx();
-	NRF24L01_SetTxRxMode(TX_EN);
-	XN297_Configure(_BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO) | _BV(NRF24L01_00_PWR_UP));
+	// Send
+	XN297_SetPower();
+	XN297_SetTxRxMode(TX_EN);
 	XN297_WritePayload(packet, BAYANG_PACKET_SIZE);
-
-	NRF24L01_SetPower();	// Set tx_power
 }
 
 #ifdef BAYANG_HUB_TELEMETRY
 static void __attribute__((unused)) BAYANG_check_rx(void)
 {
-	if (NRF24L01_ReadReg(NRF24L01_07_STATUS) & _BV(NRF24L01_07_RX_DR))
+	if( XN297_IsRX() )
 	{ // data received from model
-		XN297_ReadPayload(packet, BAYANG_PACKET_SIZE);
-		NRF24L01_WriteReg(NRF24L01_07_STATUS, 255);
-
-		NRF24L01_FlushRx();
+		XN297_ReadPayload(packet, BAYANG_PACKET_SIZE);	// Strange can't test the CRC since it seems to be disabled on telemetry packets...
 		uint8_t check = packet[0];
 		for (uint8_t i=1; i < BAYANG_PACKET_SIZE-1; i++)
 			check += packet[i];
 		// decode data , check sum is ok as well, since there is no crc
-		if (packet[0] == 0x85 && packet[14] == check)
+		if (packet[0] == 0x85 && packet[14] == check && telemetry_link == 0)
 		{
 			// uncompensated battery volts*100/2
-			v_lipo1 = (packet[3]<<7) + (packet[4]>>2);
+			v_lipo1 = (packet[3]<<7) + (packet[4]>>1);
 			// compensated battery volts*100/2
-			v_lipo2 = (packet[5]<<7) + (packet[6]>>2);
+			v_lipo2 = (packet[5]<<7) + (packet[6]>>1);
 			// reception in packets / sec
 			RX_LQI = packet[7];
 			RX_RSSI = RX_LQI;
 			//Flags
 			//uint8_t flags = packet[3] >> 3;
 			// battery low: flags & 1
+			telemetry_link=1;
+			#if defined HUB_TELEMETRY
+				// Multiplexed P, I, D values in packet[8] and packet[9].
+				// The two most significant bits specify which term is sent.
+				// Remaining 14 bits represent the value: 0 .. 16383
+				frsky_send_user_frame(0x24+(packet[8]>>6), packet[9], packet[8] & 0x3F );	//0x24 = ACCEL_X_ID, so ACCEL_X_ID=P, ACCEL_Y_ID=I, ACCEL_Z_ID=D
+			#endif
 			telemetry_counter++;
-			if(telemetry_lost==0)
-				telemetry_link=1;
+			if(telemetry_lost)
+				telemetry_link=0;	// Don't send anything yet
 		}
 	}
-	NRF24L01_SetTxRxMode(TXRX_OFF);
+	XN297_SetTxRxMode(TXRX_OFF);
 }
 #endif
 
-static void __attribute__((unused)) BAYANG_init()
+static void __attribute__((unused)) BAYANG_RF_init()
 {
-	NRF24L01_Initialize();
-	NRF24L01_SetTxRxMode(TX_EN);
-
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
 	XN297_SetTXAddr((uint8_t *)"\x00\x00\x00\x00\x00", BAYANG_ADDRESS_LENGTH);
-
-	NRF24L01_FlushTx();
-	NRF24L01_FlushRx();
-	NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);     	// Clear data ready, data sent, and retransmit
-	NRF24L01_WriteReg(NRF24L01_01_EN_AA, 0x00);      	// No Auto Acknowldgement on all data pipes
-	NRF24L01_WriteReg(NRF24L01_02_EN_RXADDR, 0x01);  	// Enable data pipe 0 only
-	NRF24L01_WriteReg(NRF24L01_11_RX_PW_P0, BAYANG_PACKET_SIZE);
-	NRF24L01_SetBitrate(NRF24L01_BR_1M);             	// 1Mbps
-	NRF24L01_WriteReg(NRF24L01_04_SETUP_RETR, 0x00);	// No retransmits
-	NRF24L01_SetPower();
-	NRF24L01_Activate(0x73);							// Activate feature register
-	NRF24L01_WriteReg(NRF24L01_1C_DYNPD, 0x00);			// Disable dynamic payload length on all pipes
-	NRF24L01_WriteReg(NRF24L01_1D_FEATURE, 0x01);
-	NRF24L01_Activate(0x73);
+	//XN297_HoppingCalib(BAYANG_RF_NUM_CHANNELS);
 	
-	switch (sub_protocol)
-	{
-		case X16_AH:
-		case IRDRONE:
-			rf_ch_num = BAYANG_RF_BIND_CHANNEL_X16_AH;
-			break;
-		default:
-			rf_ch_num = BAYANG_RF_BIND_CHANNEL;
-			break;
-	}
+	//Set bind channel
+	uint8_t ch = BAYANG_RF_BIND_CHANNEL;
+	if(sub_protocol == X16_AH || sub_protocol == IRDRONE)
+		ch = BAYANG_RF_BIND_CHANNEL_X16_AH;
+	XN297_RFChannel(ch);
 }
 
 enum {
@@ -294,7 +273,7 @@ uint16_t BAYANG_callback()
 			{
 				XN297_SetTXAddr(rx_tx_addr, BAYANG_ADDRESS_LENGTH);
 				#ifdef BAYANG_HUB_TELEMETRY
-					XN297_SetRXAddr(rx_tx_addr, BAYANG_ADDRESS_LENGTH);
+					XN297_SetRXAddr(rx_tx_addr, BAYANG_PACKET_SIZE);
 				#endif
 				BIND_DONE;
 				phase++;	//WRITE
@@ -329,9 +308,9 @@ uint16_t BAYANG_callback()
 			// switch radio to rx as soon as packet is sent
 			start=(uint16_t)micros();
 			while ((uint16_t)((uint16_t)micros()-(uint16_t)start) < 1000)			// Wait max 1ms
-				if((NRF24L01_ReadReg(NRF24L01_07_STATUS) & _BV(NRF24L01_07_TX_DS)))
+				if(XN297_IsPacketSent())
 					break;
-			NRF24L01_WriteReg(NRF24L01_00_CONFIG, 0x03);
+			XN297_SetTxRxMode(RX_EN);
 			phase++;	// READ
 			return BAYANG_PACKET_TELEM_PERIOD - BAYANG_CHECK_DELAY - BAYANG_READ_DELAY;
 		case BAYANG_READ:
@@ -356,15 +335,14 @@ static void __attribute__((unused)) BAYANG_initialize_txid()
 	hopping_frequency_no=0;
 }
 
-uint16_t initBAYANG(void)
+void BAYANG_init(void)
 {
 	BIND_IN_PROGRESS;	// autobind protocol
 	phase=BAYANG_BIND;
     bind_counter = BAYANG_BIND_COUNT;
 	BAYANG_initialize_txid();
-	BAYANG_init();
+	BAYANG_RF_init();
 	packet_count=0;
-	return BAYANG_INITIAL_WAIT+BAYANG_PACKET_PERIOD;
 }
 
-#endif
+#endif

Multiprotocol/Binary_Signature.ino

@@ -48,6 +48,7 @@ Bit(s)  Bitmask    Option                  Comment
 11      0x400      MULTI_STATUS            Indicates if MULTI_STATUS is defined
 12      0x800      MULTI_TELEMETRY         Indicates if MULTI_TELEMETRY is defined
 13      0x1000     DEBUG_SERIAL            Indicates if DEBUG_SERIAL is defined
+14-16   0xE000     Module sub-type         Reads as a three-bit value indicating a number from 0-7 which maps to a module sub-type (right-shift 13 bits to read)
 
 The 8-byte version number is the version number zero-padded to a fixed width of two-bytes per segment and no separator.  
 E.g. 1.2.3.45 becomes 01020345.
@@ -60,9 +61,15 @@ OpenTX            2               10
 
 Module types are mapped to the following decimal / binary values:
 Module Type       Decimal Value   Binary Valsue
-AVR               0               00
-STM32             1               01
-OrangeRX          2               10
+AVR (Atmega328p)  0               00
+STM32 (F103)      1               01
+OrangeRX (Xmega)  2               10
+
+Module sub-type is currently used for STM32F103 only and is mapped as follows:
+Module Type       Sub Type        Decimal Value    Binary Value
+STM32 (F103)      STM32F103CB     0                000
+STM32 (F103)      STM32F103C8     1                001
+STM32 (F103)      T18 5in1        2                010
 
 Channel orders are mapped to the following decimal / binary values:
 Channel Order	  Decimal Value	  Binary Value
@@ -109,6 +116,17 @@ RTEA	          23	          10111
     bool firmwareFlag_DEBUG_SERIAL = true;
 #endif
 
+// STM32 Module sub-type flags
+#if defined (MCU_STM32F103CB)
+    bool firmwareFlag_MCU_STM32F103CB = true;
+#endif
+#if defined (MCU_STM32F103C8)
+    bool firmwareFlag_MCU_STM32F103C8 = true;
+#endif
+#if defined (MULTI_5IN1_INTERNAL)
+    bool firmwareFlag_MULTI_5IN1_INTERNAL = true;
+#endif
+
 // Channel order flags
 #if defined (AETR)
     bool firmwareFlag_ChannelOrder_AETR = true;

Multiprotocol/Bugs_a7105.ino

@@ -315,7 +315,7 @@ static void __attribute__((unused)) BUGS_increment_counts()
 // FIFO config is one less than desired value
 #define BUGS_FIFO_SIZE_RX      15
 #define BUGS_FIFO_SIZE_TX      21
-uint16_t ReadBUGS(void)
+uint16_t BUGS_callback(void)
 {
 	uint8_t mode, base_adr;
 	uint16_t rxid;
@@ -340,7 +340,7 @@ uint16_t ReadBUGS(void)
 		case BUGS_BIND_2:
 			//Wait for TX completion
 			start=micros();
-			while ((uint16_t)micros()-start < 500)			// Wait max 500µs, using serial+telemetry exit in about 60µs
+			while ((uint16_t)((uint16_t)micros()-start) < 500)			// Wait max 500µs, using serial+telemetry exit in about 60µs
 				if(!(A7105_ReadReg(A7105_00_MODE) & 0x01))
 					break;
 			A7105_SetTxRxMode(RX_EN);
@@ -399,7 +399,7 @@ uint16_t ReadBUGS(void)
 		case BUGS_DATA_2:
 			//Wait for TX completion
 			start=micros();
-			while ((uint16_t)micros()-start < 500)			// Wait max 500µs, using serial+telemetry exit in about 60µs
+			while ((uint16_t)((uint16_t)micros()-start) < 500)			// Wait max 500µs, using serial+telemetry exit in about 60µs
 				if(!(A7105_ReadReg(A7105_00_MODE) & 0x01))
 					break;
 			A7105_SetTxRxMode(RX_EN);
@@ -437,7 +437,7 @@ uint16_t ReadBUGS(void)
 	return packet_period;
 }
 
-uint16_t initBUGS(void)
+void BUGS_init(void)
 {
 	uint16_t rxid=0;
 	uint8_t base_adr=BUGS_EEPROM_OFFSET+(RX_num&0x0F)*2;
@@ -459,8 +459,6 @@ uint16_t initBUGS(void)
 	armed = 0;
 	arm_flags = BUGS_FLAG_DISARM;		// initial value from captures
 	arm_channel_previous = BUGS_CH_SW_ARM;
-
-	return 10000;
 }
 
 #endif

Multiprotocol/CABELL_nrf224l01.ino

@@ -190,7 +190,9 @@ static void __attribute__((unused)) CABELL_send_packet(uint8_t bindMode)
 		}
 		TxPacket.option = (bindMode) ? (option & (~CABELL_OPTION_MASK_CHANNEL_REDUCTION)) : option;		//remove channel reduction if in bind mode
 	}
-	TxPacket.reserved = 0;
+ 
+	rf_ch_num = CABELL_getNextChannel (hopping_frequency,CABELL_RADIO_CHANNELS, rf_ch_num);
+	TxPacket.reserved = rf_ch_num & 0x3F;
 	TxPacket.modelNum = RX_num;
 	uint16_t checkSum = TxPacket.modelNum + TxPacket.option + TxPacket.RxMode  + TxPacket.reserved;		// Start Calculate checksum
 
@@ -244,7 +246,6 @@ static void __attribute__((unused)) CABELL_send_packet(uint8_t bindMode)
 	TxPacket.checkSum_LSB = checkSum & 0x00FF;
 
 	// Set channel for next transmission
-	rf_ch_num = CABELL_getNextChannel (hopping_frequency,CABELL_RADIO_CHANNELS, rf_ch_num);
 	NRF24L01_WriteReg(NRF24L01_05_RF_CH,rf_ch_num); 
 
 	//NRF24L01_FlushTx();   //just in case things got hung up
@@ -255,7 +256,7 @@ static void __attribute__((unused)) CABELL_send_packet(uint8_t bindMode)
 	*p |= (packet_count++)<<7;   // This causes the 8th bit of the first byte to toggle with each xmit so consecutive payloads are not identical.
 	// This is a work around for a reported bug in clone NRF24L01 chips that mis-took this case for a re-transmit of the same packet.
 
-	CABELL_SetPower();
+	NRF24L01_SetPower();
 	NRF24L01_WritePayload((uint8_t*)&TxPacket, packetSize);
 
 	#if defined CABELL_HUB_TELEMETRY 
@@ -279,39 +280,44 @@ static void __attribute__((unused)) CABELL_send_packet(uint8_t bindMode)
 static void __attribute__((unused)) CABELL_getChannelSequence (uint8_t outArray[], uint8_t numChannels, uint64_t permutation)
 {
 	/* This procedure initializes an array with the sequence progression of channels.
-	* This is not the actual channels itself, but the sequence base to be used within bands of 
+	* This is not the actual channels itself, but the sequence base to be used within bands of
 	* channels.
-	* 
+	*
 	* There are numChannels! permutations for arranging the channels
 	* one of these permutations will be calculated based on the permutation input
 	* permutation should be between 1 and numChannels! but the routine will constrain it
 	* if these bounds are exceeded.  Typically the radio's unique TX ID should be used.
-	* 
+	*
 	* The maximum numChannels is 20.  Anything larger than this will cause the uint64_t
 	* variables to overflow, yielding unknown results (possibly infinite loop?).  Therefor
 	* this routine constrains the value.
-	*/  
+	*/
 	uint8_t i;   //iterator counts numChannels
-	uint64_t indexOfNextSequenceValue;
-	uint64_t numChannelsFactorial=1;
+	uint32_t indexOfNextSequenceValue;
+	uint32_t numChannelsFactorial=1;
+	uint32_t perm32 ;
 	uint8_t  sequenceValue;
 
-	numChannels = constrain(numChannels,1,20);
+	numChannels = constrain(numChannels,1,9);
 
 	for (i = 1; i <= numChannels;i++)
 	{
-		numChannelsFactorial *= i;      //  Calculate n!
-		outArray[i-1] = i-1;            //  Initialize array with the sequence
+		numChannelsFactorial *= i;					//  Calculate n!
+		outArray[i-1] = i-1;						//  Initialize array with the sequence
 	}
 
-	permutation = (permutation % numChannelsFactorial) + 1;    // permutation must be between 1 and n! or this algorithm will infinite loop
+	perm32 = permutation >> 8 ;						// Shift 40 bit input to 32 bit
+	perm32 = (perm32 % numChannelsFactorial);		// permutation must be between 1 and n! or this algorithm will infinite loop
+	perm32 <<= 8 ;									// Shift back 8 bits
+	perm32 += permutation & 0x00FF ;				// Tack on least 8 bits
+	perm32 = (perm32 % numChannelsFactorial) + 1;	// permutation must be between 1 and n! or this algorithm will infinite loop
 
 	//Rearrange the array elements based on the permutation selected
-	for (i=0, permutation--; i<numChannels; i++ )
+	for (i=0, perm32--; i<numChannels; i++ )
 	{
-		numChannelsFactorial /= ((uint64_t)numChannels)-i;
-		indexOfNextSequenceValue = i+(permutation/numChannelsFactorial);
-		permutation %= numChannelsFactorial;
+		numChannelsFactorial /= numChannels-i;
+		indexOfNextSequenceValue = i+(perm32/numChannelsFactorial);
+		perm32 %= numChannelsFactorial;
 
 		//Copy the value in the selected array position
 		sequenceValue = outArray[indexOfNextSequenceValue];
@@ -356,48 +362,18 @@ static void __attribute__((unused)) CABELL_setAddress()
 }
 
 //-----------------------------------------------------------------------------------------
-static void __attribute__((unused)) CABELL_init()
+static void __attribute__((unused)) CABELL_RF_init()
 {
 	NRF24L01_Initialize();
-	CABELL_SetPower();
+
 	NRF24L01_SetBitrate(NRF24L01_BR_250K);				// slower data rate gives better range/reliability
-	NRF24L01_WriteReg(NRF24L01_01_EN_AA, 0x00);			// No Auto Acknowledgment on all data pipes  
-	NRF24L01_SetTxRxMode(TX_EN);						//Power up and 16 bit CRC
-
 	CABELL_setAddress();
-
-	NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);
-	NRF24L01_FlushTx();
-	NRF24L01_FlushRx();
-	NRF24L01_WriteReg(NRF24L01_02_EN_RXADDR, 0x01);
 	NRF24L01_WriteReg(NRF24L01_11_RX_PW_P0, 0x20);		// 32 byte packet length
 	NRF24L01_WriteReg(NRF24L01_12_RX_PW_P1, 0x20);		// 32 byte packet length
-	NRF24L01_WriteReg(NRF24L01_03_SETUP_AW, 0x03);
-	NRF24L01_WriteReg(NRF24L01_04_SETUP_RETR, 0x5F);	// no retransmits
-	NRF24L01_Activate(0x73);							// Activate feature register
 	NRF24L01_WriteReg(NRF24L01_1C_DYNPD, 0x3F);			// Enable dynamic payload length on all pipes
 	NRF24L01_WriteReg(NRF24L01_1D_FEATURE, 0x04);		// Enable dynamic Payload Length
-	NRF24L01_Activate(0x73);
-	prev_power = NRF_POWER_0;
-}
 
-//-----------------------------------------------------------------------------------------
-static void CABELL_SetPower()    // This over-ride the standard Set Power to allow an flag in option to indicate max power setting
-                          // Note that on many modules max power may actually be worse than the normal high power setting
-                          // test and only use max if it helps the range
-{
-	if(IS_BIND_DONE && !IS_RANGE_FLAG_on && ((option & CABELL_OPTION_MASK_MAX_POWER_OVERRIDE) != 0))
-	{   // If we are not in range or bind mode and power setting override is in effect, then set max power, else standard power logic
-		if(prev_power != NRF_POWER_3)   // prev_power is global variable for NRF24L01; NRF_POWER_3 is max power
-		{
-			uint8_t rf_setup = NRF24L01_ReadReg(NRF24L01_06_RF_SETUP);
-			rf_setup = (rf_setup & 0xF9) | (NRF_POWER_3 << 1);
-			NRF24L01_WriteReg(NRF24L01_06_RF_SETUP, rf_setup);
-			prev_power=NRF_POWER_3;
-		}    
-	}
-	else
-		NRF24L01_SetPower();
+	NRF24L01_SetTxRxMode(TX_EN);						// Clear data ready, data sent, retransmit and enable CRC 16bits, ready for TX
 }
 
 //-----------------------------------------------------------------------------------------
@@ -414,7 +390,7 @@ uint16_t CABELL_callback()
 	else if (bind_counter == 0)
 	{
 		BIND_DONE;
-		CABELL_init();   // non-bind address 
+		CABELL_RF_init();   // non-bind address 
 	}
 	else
 	{
@@ -425,17 +401,15 @@ uint16_t CABELL_callback()
 }
 
 //-----------------------------------------------------------------------------------------
-uint16_t initCABELL(void)
+void CABELL_init(void)
 {
 	if (IS_BIND_DONE)
 		bind_counter = 0;
 	else  
 		bind_counter = CABELL_BIND_COUNT;
-	CABELL_init();
+	CABELL_RF_init();
 
 	packet_period = CABELL_PACKET_PERIOD;
-
-	return packet_period;
 }
 
 #endif

Multiprotocol/CC2500_SPI.ino

@@ -163,4 +163,128 @@ void CC2500_SetPower()
 		prev_power=power;
 	}
 }
+
+void __attribute__((unused)) CC2500_SetFreqOffset()
+{
+	if(prev_option != option)
+	{
+		prev_option = option;
+		CC2500_WriteReg(CC2500_0C_FSCTRL0, option);
+	}
+}
+
+void __attribute__((unused)) CC2500_250K_Init()
+{
+	CC2500_Strobe(CC2500_SIDLE);
+
+	// Address Config = No address check
+	// Base Frequency = 2400
+	// CRC Autoflush = false
+	// CRC Enable = false
+	// Channel Spacing = 333.251953
+	// Data Format = Normal mode
+	// Data Rate = 249.939
+	// Deviation = 126.953125
+	// Device Address = 0
+	// Manchester Enable = false
+	// Modulated = true
+	// Modulation Format = GFSK
+	// Packet Length Mode = Variable packet length mode. Packet length configured by the first byte after sync word
+	// RX Filter BW = 203.125000
+	// Sync Word Qualifier Mode = No preamble/sync
+	// TX Power = 0
+	// Whitening = false
+	// Fast Frequency Hopping - no PLL auto calibration
+/*	//Previous config
+	CC2500_WriteReg(CC2500_08_PKTCTRL0,	0x01);   // Packet Automation Control
+	CC2500_WriteReg(CC2500_0B_FSCTRL1,	0x0A);   // Frequency Synthesizer Control
+	CC2500_WriteReg(CC2500_0C_FSCTRL0, option);  // Frequency offset hack 
+	CC2500_WriteReg(CC2500_0D_FREQ2,	0x5C);   // Frequency Control Word, High Byte
+	CC2500_WriteReg(CC2500_0E_FREQ1,	0x4E);   // Frequency Control Word, Middle Byte
+	CC2500_WriteReg(CC2500_0F_FREQ0,	0xC3);   // Frequency Control Word, Low Byte
+	CC2500_WriteReg(CC2500_10_MDMCFG4,	0x8D);   // Modem Configuration
+	CC2500_WriteReg(CC2500_11_MDMCFG3,	0x3B);   // Modem Configuration
+	CC2500_WriteReg(CC2500_12_MDMCFG2,	0x10);   // Modem Configuration
+	CC2500_WriteReg(CC2500_13_MDMCFG1,	0x23);   // Modem Configuration
+	CC2500_WriteReg(CC2500_14_MDMCFG0,	0xA4);   // Modem Configuration
+	CC2500_WriteReg(CC2500_15_DEVIATN,	0x62);   // Modem Deviation Setting
+	CC2500_WriteReg(CC2500_18_MCSM0,	0x08);   // Main Radio Control State Machine Configuration
+	CC2500_WriteReg(CC2500_19_FOCCFG,	0x1D);   // Frequency Offset Compensation Configuration
+	CC2500_WriteReg(CC2500_1A_BSCFG,	0x1C);   // Bit Synchronization Configuration
+	CC2500_WriteReg(CC2500_1B_AGCCTRL2, 0xC7);   // AGC Control
+	CC2500_WriteReg(CC2500_1C_AGCCTRL1, 0x00);   // AGC Control
+	CC2500_WriteReg(CC2500_1D_AGCCTRL0, 0xB0);   // AGC Control
+	CC2500_WriteReg(CC2500_21_FREND1,	0xB6);   // Front End RX Configuration
+	CC2500_WriteReg(CC2500_23_FSCAL3,	0xEA);   // Frequency Synthesizer Calibration
+	CC2500_WriteReg(CC2500_25_FSCAL1,	0x00);   // Frequency Synthesizer Calibration
+	CC2500_WriteReg(CC2500_26_FSCAL0,	0x11);   // Frequency Synthesizer Calibration
+*/
+	CC2500_WriteReg(CC2500_07_PKTCTRL1, 0x05);   // Packet Automation Control, address check true auto append RSSI & LQI
+	CC2500_WriteReg(CC2500_08_PKTCTRL0, 0x00);   // Packet Automation Control, fixed packet len
+	CC2500_WriteReg(CC2500_0B_FSCTRL1,  0x0A);   // Frequency Synthesizer Control (IF Frequency)
+	CC2500_WriteReg(CC2500_0C_FSCTRL0,  0x00);   // Frequency Synthesizer Control
+	CC2500_WriteReg(CC2500_0D_FREQ2,    0x5C);   // Frequency Control Word, High Byte
+	CC2500_WriteReg(CC2500_0E_FREQ1,    0x4E);   // Frequency Control Word, Middle Byte
+	CC2500_WriteReg(CC2500_0F_FREQ0,    0xC5);   // Frequency Control Word, Low Byte
+	CC2500_WriteReg(CC2500_10_MDMCFG4,  0x3D);   // Modem Configuration  Set to 406kHz BW filter
+	CC2500_WriteReg(CC2500_11_MDMCFG3,  0x3B);   // Modem Configuration
+	CC2500_WriteReg(CC2500_12_MDMCFG2,	0x10);   // Modem Configuration, GFSK, no preambule and no sync word -> TX by default
+	CC2500_WriteReg(CC2500_13_MDMCFG1,  0x03);   // Modem Configuration, 2 bytes of preamble
+	CC2500_WriteReg(CC2500_14_MDMCFG0,  0xA4);   // Modem Configuration
+	CC2500_WriteReg(CC2500_15_DEVIATN,  0x62);   // Modem Deviation Setting
+	CC2500_WriteReg(CC2500_18_MCSM0,    0x08);   // Main Radio Control State Machine Configuration
+	CC2500_WriteReg(CC2500_19_FOCCFG,   0x1D);   // Frequency Offset Compensation Configuration
+	CC2500_WriteReg(CC2500_1A_BSCFG,    0x1C);   // Bit Synchronization Configuration
+	CC2500_WriteReg(CC2500_1B_AGCCTRL2, 0xC7);   // AGC Control
+	CC2500_WriteReg(CC2500_1C_AGCCTRL1, 0x00);   // AGC Control
+	CC2500_WriteReg(CC2500_1D_AGCCTRL0, 0xB0);   // AGC Control
+	CC2500_WriteReg(CC2500_21_FREND1,   0xB6);   // Front End RX Configuration
+	CC2500_WriteReg(CC2500_23_FSCAL3,   0xEA);   // Frequency Synthesizer Calibration
+	CC2500_WriteReg(CC2500_25_FSCAL1,   0x00);   // Frequency Synthesizer Calibration
+	CC2500_WriteReg(CC2500_26_FSCAL0,   0x11);   // Frequency Synthesizer Calibration
+	
+	//Prep RX
+	// Set first 3 bytes of rx addr in [0]->SYNC1, [1]->SYNC0 and [2]->ADDR
+	// CC2500_WriteReg(CC2500_04_SYNC1,    [0]);   // Sync word, high byte
+	// CC2500_WriteReg(CC2500_05_SYNC0,    [1]);   // Sync word, low byte
+	// CC2500_WriteReg(CC2500_09_ADDR,     [2]);   // Set addr
+	//RX
+	// CC2500_WriteReg(CC2500_12_MDMCFG2,  0x12);  // Modem Configuration, GFSK, 16/16 Sync Word TX&RX
+	//TX
+	// CC2500_WriteReg(CC2500_12_MDMCFG2,	0x10); // Modem Configuration, GFSK, no preambule and no sync word
+	// need to set packet length before sending/receiving
+	// CC2500_WriteReg(CC2500_06_PKTLEN,   cc2500_packet_len);  // Packet len, fix packet len
+
+	CC2500_SetTxRxMode(TX_EN);
+	CC2500_SetPower();
+}
+void __attribute__((unused)) CC2500_250K_HoppingCalib(uint8_t num_freq)
+{
+	for (uint8_t i = 0; i < num_freq; i++)
+	{
+		CC2500_Strobe(CC2500_SIDLE);
+		// spacing is 333.25 kHz, must multiply channel by 3
+		CC2500_WriteReg(CC2500_0A_CHANNR, hopping_frequency[i]*3);
+		// calibrate
+		CC2500_Strobe(CC2500_SCAL);
+		delayMicroseconds(900);
+		calData[i]=CC2500_ReadReg(CC2500_25_FSCAL1);
+	}
+}
+void __attribute__((unused)) CC2500_250K_Hopping(uint8_t index)
+{
+	// spacing is 333.25 kHz, must multiply channel by 3
+	CC2500_WriteReg(CC2500_0A_CHANNR, hopping_frequency[index] * 3);
+	// set PLL calibration
+	CC2500_WriteReg(CC2500_25_FSCAL1, calData[index]);
+}
+void __attribute__((unused)) CC2500_250K_RFChannel(uint8_t number)
+{
+	CC2500_Strobe(CC2500_SIDLE);
+	// spacing is 333.25 kHz, must multiply channel by 3
+	CC2500_WriteReg(CC2500_0A_CHANNR, number*3);
+	// calibrate
+	CC2500_Strobe(CC2500_SCAL);
+	delayMicroseconds(900);
+}
 #endif

Multiprotocol/CFlie_nrf24l01.ino

@@ -644,37 +644,24 @@ static uint8_t crtp_log_setup_state_machine()
     return state_machine_completed;
 }
 
-static int cflie_init()
+static void CFLIE_RF_init()
 {
     NRF24L01_Initialize();
 
     // CRC, radio on
-    NRF24L01_SetTxRxMode(TX_EN);
-    NRF24L01_WriteReg(NRF24L01_00_CONFIG, _BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO) | _BV(NRF24L01_00_PWR_UP)); 
     NRF24L01_WriteReg(NRF24L01_01_EN_AA, 0x01);              // Auto Acknowledgement for data pipe 0
-    NRF24L01_WriteReg(NRF24L01_02_EN_RXADDR, 0x01);          // Enable data pipe 0
-    NRF24L01_WriteReg(NRF24L01_03_SETUP_AW, TX_ADDR_SIZE-2); // 5-byte RX/TX address
     NRF24L01_WriteReg(NRF24L01_04_SETUP_RETR, 0x13);         // 3 retransmits, 500us delay
 
     NRF24L01_WriteReg(NRF24L01_05_RF_CH, rf_ch_num);        // Defined in initialize_rx_tx_addr
     NRF24L01_SetBitrate(data_rate);                          // Defined in initialize_rx_tx_addr
 
-    NRF24L01_SetPower();
-    NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);             // Clear data ready, data sent, and retransmit
-
     NRF24L01_WriteRegisterMulti(NRF24L01_0A_RX_ADDR_P0, rx_tx_addr, TX_ADDR_SIZE);
     NRF24L01_WriteRegisterMulti(NRF24L01_10_TX_ADDR, rx_tx_addr, TX_ADDR_SIZE);
 
-    // this sequence necessary for module from stock tx
-    NRF24L01_ReadReg(NRF24L01_1D_FEATURE);
-    NRF24L01_Activate(0x73);                          // Activate feature register
-    NRF24L01_ReadReg(NRF24L01_1D_FEATURE);
-
     NRF24L01_WriteReg(NRF24L01_1C_DYNPD, 0x01);       // Enable Dynamic Payload Length on pipe 0
     NRF24L01_WriteReg(NRF24L01_1D_FEATURE, 0x06);     // Enable Dynamic Payload Length, enable Payload with ACK
 
-    // 50ms delay in callback
-    return 50000;
+	NRF24L01_SetTxRxMode(TX_EN);						// Clear data ready, data sent, retransmit and enable CRC 16bits, ready for TX
 }
 
 // TODO: Fix telemetry
@@ -749,7 +736,7 @@ static int cflie_init()
 //     }
 // }
 
-static uint16_t cflie_callback()
+static uint16_t CFLIE_callback()
 {
     switch (phase) {
     case CFLIE_INIT_SEARCH:
@@ -799,7 +786,7 @@ static uint16_t cflie_callback()
 }
 
 // Generate address to use from TX id and manufacturer id (STM32 unique id)
-static uint8_t initialize_rx_tx_addr()
+static uint8_t CFLIE_initialize_rx_tx_addr()
 {
     rx_tx_addr[0] = 
     rx_tx_addr[1] = 
@@ -844,19 +831,15 @@ static uint8_t initialize_rx_tx_addr()
     return CFLIE_INIT_SEARCH;
 }
 
-uint16_t initCFlie(void)
+void CFLIE_init(void)
 {
 	BIND_IN_PROGRESS;	// autobind protocol
 
-    phase = initialize_rx_tx_addr();
+    phase = CFLIE_initialize_rx_tx_addr();
     crtp_log_setup_state = CFLIE_CRTP_LOG_SETUP_STATE_INIT;
     packet_count=0;
 
-    int delay = cflie_init();
-
-    // debugln("CFlie init!");
-
-	return delay;
+    CFLIE_RF_init();
 }
 
 #endif

Multiprotocol/CG023_nrf24l01.ino

@@ -16,7 +16,7 @@
 
 #if defined(CG023_NRF24L01_INO)
 
-#include "iface_nrf24l01.h"
+#include "iface_xn297.h"
 
 #define CG023_PACKET_PERIOD		8200 // Timeout for callback in uSec
 #define CG023_INITIAL_WAIT		500
@@ -49,7 +49,7 @@ enum YD829_FLAGS {
     YD829_FLAG_STILL    = 0x80,
 };
 
-static void __attribute__((unused)) CG023_send_packet(uint8_t bind)
+static void __attribute__((unused)) CG023_send_packet()
 {
 	// throttle : 0x00 - 0xFF
 	throttle=convert_channel_8b(THROTTLE);
@@ -62,10 +62,16 @@ static void __attribute__((unused)) CG023_send_packet(uint8_t bind)
 	// aileron : 0x43 - 0x7F - 0xBB
 	aileron = convert_channel_16b_limit(AILERON, 0x43, 0xBB); 
 	
-	if (bind)
+	if (IS_BIND_IN_PROGRESS)
+	{
 		packet[0]= 0xaa;
+		XN297_RFChannel(CG023_RF_BIND_CHANNEL);
+	}
 	else
+	{
 		packet[0]= 0x55;
+		XN297_RFChannel(hopping_frequency_no);
+	}
 	// transmitter id
 	packet[1] = rx_tx_addr[0]; 
 	packet[2] = rx_tx_addr[1];
@@ -85,7 +91,7 @@ static void __attribute__((unused)) CG023_send_packet(uint8_t bind)
 	if(sub_protocol==CG023)
 	{
 		// rate
-		packet[13] =					  CG023_FLAG_RATE_HIGH
+		packet[13] =				  CG023_FLAG_RATE_HIGH
 					| GET_FLAG(CH5_SW,CG023_FLAG_FLIP)
 					| GET_FLAG(CH6_SW,CG023_FLAG_LED_OFF)
 					| GET_FLAG(CH7_SW,CG023_FLAG_STILL)
@@ -95,7 +101,7 @@ static void __attribute__((unused)) CG023_send_packet(uint8_t bind)
 	else
 	{// YD829
 		// rate
-		packet[13] =					  YD829_FLAG_RATE_HIGH
+		packet[13] =				  YD829_FLAG_RATE_HIGH
 					| GET_FLAG(CH5_SW,YD829_FLAG_FLIP)
 					| GET_FLAG(CH7_SW,YD829_FLAG_STILL)
 					| GET_FLAG(CH8_SW,YD829_FLAG_VIDEO)
@@ -103,79 +109,52 @@ static void __attribute__((unused)) CG023_send_packet(uint8_t bind)
 	}
 	packet[14] = 0;
 	
-	// Power on, TX mode, 2byte CRC
-	// Why CRC0? xn297 does not interpret it - either 16-bit CRC or nothing
-	XN297_Configure(_BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO) | _BV(NRF24L01_00_PWR_UP));
-	if (bind)
-		NRF24L01_WriteReg(NRF24L01_05_RF_CH, CG023_RF_BIND_CHANNEL);
-	else
-		NRF24L01_WriteReg(NRF24L01_05_RF_CH, hopping_frequency_no);
-
-	// clear packet status bits and TX FIFO
-	NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);
-	NRF24L01_FlushTx();
+	// Send
+	XN297_SetTxRxMode(TX_EN);
+	XN297_SetPower();
 	XN297_WritePayload(packet, CG023_PACKET_SIZE);
-
-	NRF24L01_SetPower();	// Set tx_power
 }
 
-static void __attribute__((unused)) CG023_init()
+static void __attribute__((unused)) CG023_RF_init()
 {
-    NRF24L01_Initialize();
-    NRF24L01_SetTxRxMode(TX_EN);
-	XN297_SetTXAddr((uint8_t *)"\x26\xA8\x67\x35\xCC", 5);
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
 
-    NRF24L01_FlushTx();
-    NRF24L01_FlushRx();
-    NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);     // Clear data ready, data sent, and retransmit
-    NRF24L01_WriteReg(NRF24L01_01_EN_AA, 0x00);      // No Auto Acknowldgement on all data pipes
-    NRF24L01_WriteReg(NRF24L01_02_EN_RXADDR, 0x01);  // Enable data pipe 0 only
-    NRF24L01_WriteReg(NRF24L01_04_SETUP_RETR, 0x00); // no retransmits
-    NRF24L01_SetBitrate(NRF24L01_BR_1M);             // 1Mbps
-    NRF24L01_SetPower();
+	XN297_SetTXAddr((uint8_t *)"\x26\xA8\x67\x35\xCC", 5);
 }
 
 uint16_t CG023_callback()
 {
-	if(IS_BIND_DONE)
-	{
-		#ifdef MULTI_SYNC
-			telemetry_set_input_sync(packet_period);
-		#endif
-		CG023_send_packet(0);
-	}
-	else
+	#ifdef MULTI_SYNC
+		telemetry_set_input_sync(packet_period);
+	#endif
+	if(bind_counter)
 	{
+		bind_counter--;
 		if (bind_counter == 0)
 			BIND_DONE;
-		else
-		{
-			CG023_send_packet(1);
-			bind_counter--;
-		}
 	}
+	CG023_send_packet();
 	return	packet_period;
 }
 
 static void __attribute__((unused)) CG023_initialize_txid()
 {
 	rx_tx_addr[0]= 0x80 | (rx_tx_addr[0] % 0x40);
-	if( rx_tx_addr[0] == 0xAA)			// avoid using same freq for bind and data channel
+	if( rx_tx_addr[0] == 0xAA)						// avoid using same freq for bind and data channel
 		rx_tx_addr[0] ++;
 	hopping_frequency_no = rx_tx_addr[0] - 0x7D;	// rf channel for data packets
 }
 
-uint16_t initCG023(void)
+void CG023_init(void)
 {
 	BIND_IN_PROGRESS;	// autobind protocol
     bind_counter = CG023_BIND_COUNT;
 	CG023_initialize_txid();
-	CG023_init();
+	CG023_RF_init();
 	if(sub_protocol==CG023)
 		packet_period=CG023_PACKET_PERIOD;
 	else // YD829
 		packet_period=YD829_PACKET_PERIOD;
-	return	CG023_INITIAL_WAIT+YD829_PACKET_PERIOD;
 }
 
 #endif

Multiprotocol/CX10_nrf24l01.ino

@@ -17,19 +17,19 @@
 
 #if defined(CX10_NRF24L01_INO)
 
-#include "iface_nrf24l01.h"
+#include "iface_xn297.h"
 
-#define CX10_BIND_COUNT		4360   // 6 seconds
+#define CX10_BIND_COUNT		4360	// 6 seconds
 #define CX10_PACKET_SIZE	15
-#define CX10A_PACKET_SIZE	19       // CX10 blue board packets have 19-byte payload
+#define CX10A_PACKET_SIZE	19		// CX10 blue board packets have 19-byte payload
 #define Q2X2_PACKET_SIZE	21
-#define CX10_PACKET_PERIOD	1316  // Timeout for callback in uSec
+#define CX10_PACKET_PERIOD	1316	// Timeout for callback in uSec
 #define CX10A_PACKET_PERIOD	6000
 
 #define CX10_INITIAL_WAIT     500
 
 // flags
-#define CX10_FLAG_FLIP       0x10 // goes to rudder channel
+#define CX10_FLAG_FLIP       0x10	// goes to rudder channel
 #define CX10_FLAG_MODE_MASK  0x03
 #define CX10_FLAG_HEADLESS   0x04
 // flags2
@@ -46,12 +46,12 @@ enum {
     CX10_DATA
 };
 
-static void __attribute__((unused)) CX10_Write_Packet(uint8_t bind)
+static void __attribute__((unused)) CX10_Write_Packet()
 {
 	uint8_t offset = 0;
 	if(sub_protocol == CX10_BLUE)
 		offset = 4;
-	packet[0] = bind ? 0xAA : 0x55;
+	packet[0] = IS_BIND_IN_PROGRESS ? 0xAA : 0x55;
 	packet[1] = rx_tx_addr[0];
 	packet[2] = rx_tx_addr[1];
 	packet[3] = rx_tx_addr[2];
@@ -62,57 +62,57 @@ static void __attribute__((unused)) CX10_Write_Packet(uint8_t bind)
 	uint16_t throttle=convert_channel_16b_limit(THROTTLE,1000,2000);
 	uint16_t rudder=  convert_channel_16b_limit(RUDDER  ,2000,1000);
     // Channel 5 - flip flag
-	packet[12+offset] = GET_FLAG(CH5_SW,CX10_FLAG_FLIP); // flip flag applied on rudder
+	packet[12+offset] = GET_FLAG(CH5_SW,CX10_FLAG_FLIP); 	// flip flag applied on rudder
 
 	// Channel 6 - rate mode is 2 lsb of packet 13
-	if(CH6_SW)		// rate 3 / headless on CX-10A
+	if(CH6_SW)												// rate 3 / headless on CX-10A
 		flags = 0x02;
 	else
 		if(Channel_data[CH6] < CHANNEL_MIN_COMMAND)
-			flags = 0x00;			// rate 1
+			flags = 0x00;									// rate 1
 		else
-			flags = 0x01;			// rate 2
-	uint8_t flags2=0;	// packet 14
+			flags = 0x01;									// rate 2
+	uint8_t flags2=0;										// packet 14
 
 	uint8_t video_state=packet[14] & 0x21;
 	switch(sub_protocol)
 	{
 		case CX10_BLUE:
-			flags |= GET_FLAG(!CH7_SW, 0x10)	// Channel 7 - picture
-					|GET_FLAG( CH8_SW, 0x08);	// Channel 8 - video
+			flags |= GET_FLAG(!CH7_SW, 0x10)				// Channel 7 - picture
+					|GET_FLAG( CH8_SW, 0x08);				// Channel 8 - video
 			break;
 		case F_Q282:
 		case F_Q242:
 		case F_Q222:
 			memcpy(&packet[15], "\x10\x10\xaa\xaa\x00\x00", 6);
 			//FLIP|LED|PICTURE|VIDEO|HEADLESS|RTH|XCAL|YCAL
-			flags2 = GET_FLAG(CH5_SW, 0x80)		// Channel 5 - FLIP
-					|GET_FLAG(!CH6_SW, 0x40)	// Channel 6 - LED
-					|GET_FLAG(CH9_SW, 0x08)		// Channel 9 - HEADLESS
-					|GET_FLAG(CH11_SW, 0x04)		// Channel 11 - XCAL
-					|GET_FLAG(CH12_SW, 0x02);	// Channel 12 - YCAL or Start/Stop motors on JXD 509
+			flags2 = GET_FLAG(CH5_SW, 0x80)					// Channel 5 - FLIP
+					|GET_FLAG(!CH6_SW, 0x40)				// Channel 6 - LED
+					|GET_FLAG(CH9_SW, 0x08)					// Channel 9 - HEADLESS
+					|GET_FLAG(CH11_SW, 0x04)				// Channel 11 - XCAL
+					|GET_FLAG(CH12_SW, 0x02);				// Channel 12 - YCAL or Start/Stop motors on JXD 509
 	
 			if(sub_protocol==F_Q242)
 			{
 				flags=2;
-				flags2|= GET_FLAG(CH7_SW,0x01)	// Channel 7 - picture
-						|GET_FLAG(CH8_SW,0x10);	// Channel 8 - video
+				flags2|= GET_FLAG(CH7_SW,0x01)				// Channel 7 - picture
+						|GET_FLAG(CH8_SW,0x10);				// Channel 8 - video
 				packet[17]=0x00;
 				packet[18]=0x00;
 			}
 			else
 			{ // F_Q282 & F_Q222
-				flags=3;							// expert
-				if(CH8_SW)						// Channel 8 - F_Q282 video / F_Q222 Module 1
+				flags=3;									// expert
+				if(CH8_SW)									// Channel 8 - F_Q282 video / F_Q222 Module 1
 				{
 					if (!(video_state & 0x20)) video_state ^= 0x21;
 				}
 				else
 					if (video_state & 0x20) video_state &= 0x01;
 				flags2 |= video_state
-						|GET_FLAG(CH7_SW,0x10);	// Channel 7 - F_Q282 picture / F_Q222 Module 2
+						|GET_FLAG(CH7_SW,0x10);				// Channel 7 - F_Q282 picture / F_Q222 Module 2
 			}
-			if(CH10_SW)	flags |=0x80;			// Channel 10 - RTH
+			if(CH10_SW)	flags |=0x80;						// Channel 10 - RTH
 			break;
 		case DM007:
 			aileron = 3000 - aileron;
@@ -128,16 +128,16 @@ static void __attribute__((unused)) CX10_Write_Packet(uint8_t bind)
 			if(CH8_SW)	packet[12] &= ~CX10_FLAG_FLIP;
 		case JC3015_1:
 			//FLIP|MODE|PICTURE|VIDEO
-			flags2=	 GET_FLAG(CH7_SW,_BV(3))	// Channel 7
-					|GET_FLAG(CH8_SW,_BV(4));	// Channel 8
+			flags2=	 GET_FLAG(CH7_SW,_BV(3))				// Channel 7
+					|GET_FLAG(CH8_SW,_BV(4));				// Channel 8
 			break;
 		case MK33041:
 			elevator = 3000 - elevator;
 			//FLIP|MODE|PICTURE|VIDEO|HEADLESS|RTH
-			flags|=GET_FLAG(CH7_SW,_BV(7))	// Channel 7 - picture
-				  |GET_FLAG(CH10_SW,_BV(2));	// Channel 10 - rth
-			flags2=GET_FLAG(CH8_SW,_BV(0))	// Channel 8 - video
-				  |GET_FLAG(CH9_SW,_BV(5));	// Channel 9 - headless
+			flags|=GET_FLAG(CH7_SW,_BV(7))					// Channel 7 - picture
+				  |GET_FLAG(CH10_SW,_BV(2));				// Channel 10 - rth
+			flags2=GET_FLAG(CH8_SW,_BV(0))					// Channel 8 - video
+				  |GET_FLAG(CH9_SW,_BV(5));					// Channel 9 - headless
 			break;
 	}
 	packet[5+offset] = lowByte(aileron);
@@ -151,39 +151,23 @@ static void __attribute__((unused)) CX10_Write_Packet(uint8_t bind)
 	packet[13+offset]=flags;
 	packet[14+offset]=flags2;
 	
-	// Power on, TX mode, 2byte CRC
-	// Why CRC0? xn297 does not interpret it - either 16-bit CRC or nothing
-	XN297_Configure(_BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO) | _BV(NRF24L01_00_PWR_UP));
-	if (bind)
-		NRF24L01_WriteReg(NRF24L01_05_RF_CH, CX10_RF_BIND_CHANNEL);
-	else
+	// Send
+	if(IS_BIND_DONE)
 	{
-		NRF24L01_WriteReg(NRF24L01_05_RF_CH, hopping_frequency[hopping_frequency_no++]);
+		XN297_Hopping(hopping_frequency_no++);
 		hopping_frequency_no %= CX10_NUM_RF_CHANNELS;
 	}
-	// clear packet status bits and TX FIFO
-	NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);
-	NRF24L01_FlushTx();
-
+	XN297_SetPower();
+	XN297_SetTxRxMode(TX_EN);
 	XN297_WritePayload(packet, packet_length);
-	NRF24L01_SetPower();
 }
 
-static void __attribute__((unused)) CX10_init()
+static void __attribute__((unused)) CX10_RF_init()
 {
-	NRF24L01_Initialize();
-	NRF24L01_SetTxRxMode(TX_EN);
-	XN297_SetTXAddr((uint8_t *)"\xcc\xcc\xcc\xcc\xcc",5);
-	XN297_SetRXAddr((uint8_t *)"\xcc\xcc\xcc\xcc\xcc",5);
-	NRF24L01_FlushTx();
-	NRF24L01_FlushRx();
-	NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);			// Clear data ready, data sent, and retransmit
-	NRF24L01_WriteReg(NRF24L01_01_EN_AA, 0x00);				// No Auto Acknowledgment on all data pipes
-	NRF24L01_WriteReg(NRF24L01_02_EN_RXADDR, 0x01);			// Enable data pipe 0 only
-	NRF24L01_WriteReg(NRF24L01_11_RX_PW_P0, packet_length);	// rx pipe 0 (used only for blue board)
-    NRF24L01_WriteReg(NRF24L01_05_RF_CH, CX10_RF_BIND_CHANNEL);
-	NRF24L01_SetBitrate(NRF24L01_BR_1M);					// 1Mbps
-	NRF24L01_SetPower();
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
+	XN297_SetTXAddr((uint8_t *)"\xcc\xcc\xcc\xcc\xcc", 5);
+	XN297_SetRXAddr((uint8_t *)"\xcc\xcc\xcc\xcc\xcc", packet_length);
+	XN297_RFChannel(CX10_RF_BIND_CHANNEL);
 }
 
 uint16_t CX10_callback()
@@ -197,42 +181,39 @@ uint16_t CX10_callback()
 			}
 			else
 			{
-				CX10_Write_Packet(1);
+				CX10_Write_Packet();
 				bind_counter--;
 			}
 			break;
 		case CX10_BIND2:
-			if( NRF24L01_ReadReg(NRF24L01_07_STATUS) & _BV(NRF24L01_07_RX_DR))
+			// switch to TX mode
+			if( XN297_IsRX() )
 			{ // RX fifo data ready
-				XN297_ReadPayload(packet, packet_length);
-				NRF24L01_SetTxRxMode(TXRX_OFF);
-				NRF24L01_SetTxRxMode(TX_EN);
-				if(packet[9] == 1)
+				debugln("RX");
+				if(XN297_ReadPayload(packet, packet_length) && packet[9] == 1)
 				{
 					BIND_DONE;
+					XN297_SetTxRxMode(TXRX_OFF);
 					phase = CX10_DATA;
+					break;
 				}
 			}
 			else
 			{
-				// switch to TX mode
-				NRF24L01_SetTxRxMode(TXRX_OFF);
-				NRF24L01_FlushTx();
-				NRF24L01_SetTxRxMode(TX_EN);
-				CX10_Write_Packet(1);
-				delayMicroseconds(400);
-				// switch to RX mode
-				NRF24L01_SetTxRxMode(TXRX_OFF);
-				NRF24L01_FlushRx();
-				NRF24L01_SetTxRxMode(RX_EN);
-				XN297_Configure(_BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO) | _BV(NRF24L01_00_PWR_UP) | _BV(NRF24L01_00_PRIM_RX));
+				XN297_SetTxRxMode(TXRX_OFF);
+				CX10_Write_Packet();
+				// wait for packet to be sent
+				while( !XN297_IsPacketSent());					//delayMicroseconds(400);
 			}
+			// switch to RX mode
+			XN297_SetTxRxMode(TXRX_OFF);
+			XN297_SetTxRxMode(RX_EN);
 			break;
 		case CX10_DATA:
 			#ifdef MULTI_SYNC
 				telemetry_set_input_sync(packet_period);
 			#endif
-			CX10_Write_Packet(0);
+			CX10_Write_Packet();
 			break;
 	}
 	return packet_period;
@@ -260,9 +241,13 @@ static void __attribute__((unused)) CX10_initialize_txid()
 	}
 }
 
-uint16_t initCX10(void)
+void CX10_init(void)
 {
 	BIND_IN_PROGRESS;	// autobind protocol
+	
+	if(protocol == PROTO_Q2X2)
+		sub_protocol|=0x08;		// Increase the number of sub_protocols for CX-10
+	
 	if(sub_protocol==CX10_BLUE)
 	{
 		packet_length = CX10A_PACKET_SIZE;
@@ -285,8 +270,7 @@ uint16_t initCX10(void)
 		bind_counter = CX10_BIND_COUNT;
 	}
 	CX10_initialize_txid();
-	CX10_init();
-	return CX10_INITIAL_WAIT+packet_period;
+	CX10_RF_init();
 }
 
 #endif

Multiprotocol/CYRF6936_SPI.ino

@@ -79,13 +79,24 @@ uint8_t CYRF_Reset()
 void CYRF_GetMfgData(uint8_t data[])
 {
 #ifndef FORCE_CYRF_ID
-	/* Fuses power on */
-	CYRF_WriteRegister(CYRF_25_MFG_ID, 0xFF);
+	if(eeprom_read_byte((EE_ADDR)EEPROM_CID_INIT_OFFSET)==0xf0)
+	{//read Cyrf ID from EEPROM
+		for(uint8_t i=0;i<6;i++)
+			data[i] = eeprom_read_byte((EE_ADDR)EEPROM_CID_OFFSET+i);
+	}
+	else
+	{//read Cyrf ID and store it EEPROM
+		/* Fuses power on */
+		CYRF_WriteRegister(CYRF_25_MFG_ID, 0xFF);
 
-	CYRF_ReadRegisterMulti(CYRF_25_MFG_ID, data, 6);
+		CYRF_ReadRegisterMulti(CYRF_25_MFG_ID, data, 6);
+		for(uint8_t i=0;i<6;i++)
+			eeprom_write_byte((EE_ADDR)EEPROM_CID_OFFSET+i, data[i]);
+		eeprom_write_byte((EE_ADDR)EEPROM_CID_INIT_OFFSET, 0xf0);
 
-	/* Fuses power off */
-	CYRF_WriteRegister(CYRF_25_MFG_ID, 0x00); 
+		/* Fuses power off */
+		CYRF_WriteRegister(CYRF_25_MFG_ID, 0x00);
+	}
 #else
 	memcpy(data,FORCE_CYRF_ID,6);
 #endif
@@ -98,14 +109,14 @@ void CYRF_SetTxRxMode(uint8_t mode)
 {
 	if(mode==TXRX_OFF)
 	{
-		if(protocol!=PROTO_WFLY)
+		if( protocol!=PROTO_WFLY && protocol!=PROTO_MLINK )
 			CYRF_WriteRegister(CYRF_0F_XACT_CFG, 0x24); // 4=IDLE, 8=TX, C=RX
 		CYRF_WriteRegister(CYRF_0E_GPIO_CTRL,0x00); // XOUT=0 PACTL=0
 	}
 	else
 	{
 		//Set the post tx/rx state
-		if(protocol!=PROTO_WFLY)
+		if( protocol!=PROTO_WFLY && protocol!=PROTO_MLINK )
 			CYRF_WriteRegister(CYRF_0F_XACT_CFG, mode == TX_EN ? 0x28 : 0x2C); // 4=IDLE, 8=TX, C=RX
 		if(mode == TX_EN)
 #ifdef ORANGE_TX_BLUE
@@ -168,10 +179,10 @@ void CYRF_SetPower(uint8_t val)
 /*
 *
 */
-void CYRF_ConfigCRCSeed(uint16_t crc)
+void CYRF_ConfigCRCSeed(uint16_t crc_seed)
 {
-	CYRF_WriteRegister(CYRF_15_CRC_SEED_LSB,crc & 0xff);
-	CYRF_WriteRegister(CYRF_16_CRC_SEED_MSB,crc >> 8);
+	CYRF_WriteRegister(CYRF_15_CRC_SEED_LSB,crc_seed & 0xff);
+	CYRF_WriteRegister(CYRF_16_CRC_SEED_MSB,crc_seed >> 8);
 }
 /*
 * these are the recommended sop codes from Cyrpress
@@ -258,7 +269,7 @@ void CYRF_FindBestChannels(uint8_t *channels, uint8_t len, uint8_t minspace, uin
 	delayMilliseconds(1);
 	for(i = 0; i < NUM_FREQ; i++)
 	{
-		CYRF_ConfigRFChannel(i);
+		CYRF_ConfigRFChannel(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
@@ -321,4 +332,69 @@ static void __attribute__((unused)) CYRF_PROGMEM_ConfigSOPCode(const uint8_t *da
 		code[i]=pgm_read_byte_near(&data[i]);
 	CYRF_ConfigSOPCode(code);
 }
+
+//CYRF GFSK 1Mb functions
+const uint8_t PROGMEM CYRF_GFSK1M_init_vals[][2] = {
+	{CYRF_02_TX_CTRL, 0x00},		// transmit err & complete interrupts disabled
+	{CYRF_05_RX_CTRL, 0x00},		// receive err & complete interrupts disabled
+	{CYRF_28_CLK_EN, 0x02},			// Force Receive Clock Enable, MUST be set
+	{CYRF_32_AUTO_CAL_TIME, 0x3c},	// must be set to 3C
+	{CYRF_35_AUTOCAL_OFFSET, 0x14},	// must be  set to 14
+	{CYRF_06_RX_CFG, 0x48},			// LNA manual control, Rx Fast Turn Mode Enable
+	{CYRF_1B_TX_OFFSET_LSB, 0x00},	// Tx frequency offset LSB
+	{CYRF_1C_TX_OFFSET_MSB, 0x00},	// Tx frequency offset MSB
+	{CYRF_0F_XACT_CFG, 0x24},		// Force End State, transaction end state = idle
+	{CYRF_03_TX_CFG, 0x00},			// GFSK mode
+	{CYRF_12_DATA64_THOLD, 0x0a},	// 64 Chip Data PN Code Correlator Threshold = 10
+	{CYRF_0F_XACT_CFG, 0x04},		// Transaction End State = idle
+	{CYRF_39_ANALOG_CTRL, 0x01},	// synth setting time for all channels is the same as for slow channels
+	{CYRF_0F_XACT_CFG, 0x24},		//Force IDLE
+	{CYRF_29_RX_ABORT, 0x00},		//Clear RX abort
+	{CYRF_12_DATA64_THOLD, 0x0a},	//set pn correlation threshold
+	{CYRF_10_FRAMING_CFG, 0x4a},	//set sop len and threshold
+	{CYRF_29_RX_ABORT, 0x0f},		//Clear RX abort?
+	{CYRF_03_TX_CFG, 0x00},			// GFSK mode
+	{CYRF_10_FRAMING_CFG, 0x4a},	// 0b11000000 //set sop len and threshold
+	{CYRF_1F_TX_OVERRIDE, 0x04},	//disable tx CRC
+	{CYRF_1E_RX_OVERRIDE, 0x14},	//disable rx crc
+	{CYRF_14_EOP_CTRL, 0x00},		//set EOP sync == 0
+};
+static void __attribute__((unused)) CYRF_GFSK1M_Init(uint8_t payload_length, uint8_t preamble_len)
+{
+	for(uint8_t i = 0; i < sizeof(CYRF_GFSK1M_init_vals) / 2; i++)	
+		CYRF_WriteRegister(pgm_read_byte_near(&CYRF_GFSK1M_init_vals[i][0]), pgm_read_byte_near(&CYRF_GFSK1M_init_vals[i][1]));
+
+
+	CYRF_WriteRegister(CYRF_01_TX_LENGTH, payload_length);
+	
+	CYRF_WritePreamble(0xAAAA00 | preamble_len);
+
+	CYRF_SetPower(0x00);
+	
+	CYRF_SetTxRxMode(TX_EN);
+}
+static void __attribute__((unused)) CYRF_GFSK1M_SendPayload(uint8_t *buffer, uint8_t len)
+{
+	uint8_t send=len>16 ? 16 : len;
+	CYRF_WriteRegister(CYRF_02_TX_CTRL, 0x40);
+	CYRF_WriteRegisterMulti(CYRF_20_TX_BUFFER, buffer, send);			// Fill the buffer with 16 bytes max
+	CYRF_WriteRegister(CYRF_02_TX_CTRL, 0x80);							// Start send
+	buffer += send;
+	len -= send;
+
+	while(len>8)
+	{
+		while((CYRF_ReadRegister(CYRF_04_TX_IRQ_STATUS)&0x10) == 0);	// Wait that half of the buffer is empty
+		CYRF_WriteRegisterMulti(CYRF_20_TX_BUFFER, buffer, 8);			// Add 8 bytes to the buffer
+		buffer+=8;
+		len-=8;
+	}
+
+	if(len)
+	{
+		while((CYRF_ReadRegister(CYRF_04_TX_IRQ_STATUS)&0x10) == 0);	// Wait that half of the buffer is empty
+		CYRF_WriteRegisterMulti(CYRF_20_TX_BUFFER, buffer, len);		// Add the remaining bytes to the buffer
+	}
+}
+#define CYRF_GFSK1M_SetPower() CYRF_SetPower(0x00)
 #endif

Multiprotocol/Convert.ino

@@ -32,9 +32,15 @@ uint16_t convert_channel_ppm(uint8_t num)
 }
 
 // Channel value 100% is converted to 10bit values 0<->1023
-uint16_t convert_channel_10b(uint8_t num)
+uint16_t convert_channel_10b(uint8_t num, bool failsafe)
 {
-	uint16_t val=Channel_data[num];
+	uint16_t val;
+	#ifdef FAILSAFE_ENABLE
+	if(failsafe)
+		val=Failsafe_data[num];				// 0<->2047
+	else
+	#endif
+		val=Channel_data[num];
 	val=((val<<2)+val)>>3;
 	if(val<=128) return 0;
 	if(val>=1152) return 1023;
@@ -91,9 +97,15 @@ int16_t convert_channel_16b_limit(uint8_t num,int16_t min,int16_t max)
 }
 
 // Channel value -125%<->125% is scaled to 16bit value with no limit
-int16_t convert_channel_16b_nolimit(uint8_t num, int16_t min, int16_t max)
+int16_t convert_channel_16b_nolimit(uint8_t num, int16_t min, int16_t max, bool failsafe)
 {
-	int32_t val=Channel_data[num];				// 0<->2047
+	int32_t val;
+	#ifdef FAILSAFE_ENABLE
+	if(failsafe)
+		val=Failsafe_data[num];				// 0<->2047
+	else
+	#endif
+		val=Channel_data[num];				// 0<->2047
 	val=(val-CHANNEL_MIN_100)*(max-min)/(CHANNEL_MAX_100-CHANNEL_MIN_100)+min;
 	return (uint16_t)val;
 }
@@ -151,14 +163,14 @@ static uint16_t  __attribute__((unused)) FrSkyX_scaleForPXX( uint8_t i, uint8_t
 }
 
 #ifdef FAILSAFE_ENABLE
-static uint16_t  __attribute__((unused)) FrSkyX_scaleForPXX_FS( uint8_t i )
+static uint16_t  __attribute__((unused)) FrSkyX_scaleForPXX_FS( uint8_t i, uint8_t num_chan=8)
 {	//mapped 1,2046(125%) range to 64,1984(PXX values);
 	uint16_t chan_val=((Failsafe_data[i]*15)>>4)+64;
 	if(Failsafe_data[i]==FAILSAFE_CHANNEL_NOPULSES)
 		chan_val=FAILSAFE_CHANNEL_NOPULSES;
 	else if(Failsafe_data[i]==FAILSAFE_CHANNEL_HOLD)
 		chan_val=FAILSAFE_CHANNEL_HOLD;
-	if(i>7) chan_val|=2048;   // upper channels offset
+	if(i>=num_chan) chan_val|=2048;   // upper channels offset
 	return chan_val;
 }
 #endif

Multiprotocol/Corona_cc2500.ino

@@ -61,7 +61,6 @@ static void __attribute__((unused)) CORONA_rf_init()
 		CC2500_WriteReg(CC2500_15_DEVIATN, 0x50);
 	}
 	
-	prev_option = option;
 	CC2500_WriteReg(CC2500_0C_FSCTRL0, option);
 
 	//not sure what they are doing to the PATABLE since basically only the first byte is used and it's only 8 bytes long. So I think they end up filling the PATABLE fully with 0xFF
@@ -72,7 +71,7 @@ static void __attribute__((unused)) CORONA_rf_init()
 }
 
 // Generate id and hopping freq
-static void __attribute__((unused)) CORONA_init()
+static void __attribute__((unused)) CORONA_TXID_init()
 {
 	#ifdef CORONA_FORCE_ID
 		// Example of ID and channels taken from dumps
@@ -256,17 +255,13 @@ static uint16_t __attribute__((unused)) CORONA_build_packet()
 	return packet_period;
 }
 
-uint16_t ReadCORONA()
+uint16_t CORONA_callback()
 {
 	#ifdef MULTI_SYNC
 		telemetry_set_input_sync(22000);
 	#endif
 	// Tune frequency if it has been changed
-	if ( prev_option != option )
-	{
-		CC2500_WriteReg(CC2500_0C_FSCTRL0, option);
-		prev_option = option ;
-	}
+	CC2500_SetFreqOffset();
 
 	if(IS_BIND_IN_PROGRESS)
 	{
@@ -281,7 +276,7 @@ uint16_t ReadCORONA()
 	return packet_period;
 }
 
-uint16_t initCORONA()
+void CORONA_init()
 {
 	switch(sub_protocol)
 	{
@@ -298,9 +293,8 @@ uint16_t initCORONA()
 	state=400;					// Used by V2 to send RF channels + ID for 2.65s at startup
 	hopping_frequency_no=0;
 	fdv3_id_send = 0;
-	CORONA_init();
+	CORONA_TXID_init();
 	CORONA_rf_init();
-	return 10000;
 }
 
 #endif

Multiprotocol/DM002_nrf24l01.ino

@@ -16,7 +16,7 @@
 
 #if defined(DM002_NRF24L01_INO)
 
-#include "iface_nrf24l01.h"
+#include "iface_xn297.h"
 
 #define DM002_PACKET_PERIOD		6100 // Timeout for callback in uSec
 #define DM002_INITIAL_WAIT		500
@@ -24,7 +24,6 @@
 #define DM002_RF_BIND_CHANNEL	0x27
 #define DM002_BIND_COUNT		655  // 4 seconds
 
-
 enum DM002_FLAGS {
     // flags going to packet[9]
     DM002_FLAG_FLIP		= 0x01, 
@@ -37,10 +36,10 @@ enum DM002_FLAGS {
     DM002_FLAG_CAMERA2	= 0x80,
 };
 
-static void __attribute__((unused)) DM002_send_packet(uint8_t bind)
+static void __attribute__((unused)) DM002_send_packet()
 {
 	memcpy(packet+5,(uint8_t *)"\x00\x7F\x7F\x7F\x00\x00\x00",7);
-	if(bind)
+	if(IS_BIND_IN_PROGRESS)
 	{
 		packet[0] = 0xAA;
 		packet[1] = rx_tx_addr[0]; 
@@ -75,63 +74,40 @@ static void __attribute__((unused)) DM002_send_packet(uint8_t bind)
 		packet_count&=0x0F;
 		packet[10] = packet_count;
 		packet_count++;
+		XN297_Hopping(hopping_frequency_no);
 	}
 	//CRC
 	for(uint8_t i=0;i<DM002_PACKET_SIZE-1;i++)
 		packet[11]+=packet[i];
 	
-	// Power on, TX mode, 2byte CRC
-	// Why CRC0? xn297 does not interpret it - either 16-bit CRC or nothing
-	XN297_Configure(_BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO) | _BV(NRF24L01_00_PWR_UP));
-	if (bind)
-		NRF24L01_WriteReg(NRF24L01_05_RF_CH, DM002_RF_BIND_CHANNEL);
-	else
-		NRF24L01_WriteReg(NRF24L01_05_RF_CH, hopping_frequency[hopping_frequency_no]);
-	// clear packet status bits and TX FIFO
-	NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);
-	NRF24L01_FlushTx();
+	//Send
+	XN297_SetPower();
+	XN297_SetTxRxMode(TX_EN);
 	XN297_WritePayload(packet, DM002_PACKET_SIZE);
-
-	NRF24L01_SetPower();	// Set tx_power
 }
 
-static void __attribute__((unused)) DM002_init()
+static void __attribute__((unused)) DM002_RF_init()
 {
-    NRF24L01_Initialize();
-    NRF24L01_SetTxRxMode(TX_EN);
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
 	XN297_SetTXAddr((uint8_t *)"\x26\xA8\x67\x35\xCC", 5);
-
-    NRF24L01_FlushTx();
-    NRF24L01_FlushRx();
-    NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);     // Clear data ready, data sent, and retransmit
-    NRF24L01_WriteReg(NRF24L01_01_EN_AA, 0x00);      // No Auto Acknowldgement on all data pipes
-    NRF24L01_WriteReg(NRF24L01_02_EN_RXADDR, 0x01);  // Enable data pipe 0 only
-    NRF24L01_SetBitrate(NRF24L01_BR_1M);             // 1Mbps
-    NRF24L01_SetPower();
+	XN297_RFChannel(DM002_RF_BIND_CHANNEL);
 }
 
 uint16_t DM002_callback()
 {
-	if(IS_BIND_DONE)
-	{
-		#ifdef MULTI_SYNC
-			telemetry_set_input_sync(DM002_PACKET_PERIOD);
-		#endif
-		DM002_send_packet(0);
-	}
-	else
+	#ifdef MULTI_SYNC
+		telemetry_set_input_sync(DM002_PACKET_PERIOD);
+	#endif
+	if (bind_counter)
 	{
+		bind_counter--;
 		if (bind_counter == 0)
 		{
 			BIND_DONE;
 			XN297_SetTXAddr(rx_tx_addr, 5);
 		}
-		else
-		{
-			DM002_send_packet(1);
-			bind_counter--;
-		}
 	}
+	DM002_send_packet();
 	return	DM002_PACKET_PERIOD;
 }
 
@@ -155,13 +131,12 @@ static void __attribute__((unused)) DM002_initialize_txid()
 	}
 }
 
-uint16_t initDM002(void)
+void DM002_init(void)
 {
 	BIND_IN_PROGRESS;	// autobind protocol
     bind_counter = DM002_BIND_COUNT;
 	DM002_initialize_txid();
-	DM002_init();
-	return	DM002_INITIAL_WAIT;
+	DM002_RF_init();
 }
 
 #endif

Multiprotocol/DSM.ino

@@ -117,7 +117,9 @@ static void __attribute__((unused)) DSM_cyrf_configdata()
 
 static uint8_t __attribute__((unused)) DSM_get_pn_row(uint8_t channel, bool dsmx)
 {
-	return (dsmx ? (channel - 2) % 5 : channel % 5);	
+	if(protocol == PROTO_DSM && sub_protocol == DSMR)
+		return (channel + 2) % 5;
+	return (dsmx ? (channel - 2) % 5 : channel % 5);
 }
 
 static void __attribute__((unused)) DSM_set_sop_data_crc(bool ch2, bool dsmx)
@@ -127,10 +129,14 @@ static void __attribute__((unused)) DSM_set_sop_data_crc(bool ch2, bool dsmx)
 	if(ch2)
 		CYRF_ConfigCRCSeed(seed);	//CH2
 	else
-		CYRF_ConfigCRCSeed(~seed);	//CH1
+		CYRF_ConfigCRCSeed(~seed);	//CH1, DSMR only use CH1
 
 	uint8_t pn_row = DSM_get_pn_row(hopping_frequency[hopping_frequency_no], dsmx);
 	uint8_t code[16];
+	#if 0
+		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
 	CYRF_ConfigSOPCode(code);
 	DSM_read_code(code,pn_row,7 - sop_col,8);				// 7-sop_col between 0 and 6

Multiprotocol/DSM_Rx_cyrf6936.ino

@@ -4,7 +4,7 @@
  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,
+ 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.
@@ -31,7 +31,7 @@ enum {
 	DSM_RX_DATA_CH2,
 };
 
-static void __attribute__((unused)) DSM_Rx_init()
+static void __attribute__((unused)) DSM_RX_RF_init()
 {
 	DSM_cyrf_config();
 	rx_disable_lna = IS_POWER_FLAG_on;
@@ -63,7 +63,7 @@ uint16_t convert_channel_DSM_nolimit(int32_t val)
 	return (uint16_t)val;
 }
 
-static uint8_t __attribute__((unused)) DSM_Rx_check_packet()
+static uint8_t __attribute__((unused)) DSM_RX_check_packet()
 {
  	uint8_t rx_status=CYRF_ReadRegister(CYRF_07_RX_IRQ_STATUS);
 	if((rx_status & 0x03) == 0x02)  									// RXC=1, RXE=0 then 2nd check is required (debouncing)
@@ -99,7 +99,7 @@ static uint8_t __attribute__((unused)) DSM_Rx_check_packet()
 	return rx_status;												// Return error code
 }
 
-static void __attribute__((unused)) DSM_Rx_build_telemetry_packet()
+static void __attribute__((unused)) DSM_RX_build_telemetry_packet()
 {
 	uint8_t nbr_bits = 11;
 	if((DSM_rx_type&0xF0) == 0x00)
@@ -155,9 +155,13 @@ static void __attribute__((unused)) DSM_Rx_build_telemetry_packet()
 		packet_in[idx++] = bits & 0xff;
 	// Send telemetry
 	telemetry_link = 1;
+	#ifdef SEND_CPPM
+		if(sub_protocol>0)
+			telemetry_link |= 0x80;	// Disable telemetry output
+	#endif
 }
 
-static bool __attribute__((unused)) DSM_Rx_bind_check_validity()
+static bool __attribute__((unused)) DSM_RX_bind_check_validity()
 {
 	uint16_t sum = 384 - 0x10;//
 	for(uint8_t i = 0; i < 8; i++)
@@ -173,7 +177,7 @@ static bool __attribute__((unused)) DSM_Rx_bind_check_validity()
 	return true;
 }
 
-static void __attribute__((unused)) DSM_Rx_build_bind_packet()
+static void __attribute__((unused)) DSM_RX_build_bind_packet()
 {
 	uint16_t sum = 384 - 0x10;//
 	packet[0] = 0xff ^ cyrfmfg_id[0];								// ID
@@ -205,7 +209,7 @@ static void __attribute__((unused)) DSM_abort_channel_rx(uint8_t ch)
 	CYRF_WriteRegister(CYRF_05_RX_CTRL, 0x83);						// Prepare to receive
 }
 
-uint16_t DSM_Rx_callback()
+uint16_t DSM_RX_callback()
 {
 	uint8_t rx_status;
 	static uint8_t read_retry=0;
@@ -232,7 +236,7 @@ uint16_t DSM_Rx_callback()
 				if(len==16)
 				{
 					CYRF_ReadDataPacketLen(packet_in, 16);
-					if(DSM_Rx_bind_check_validity())
+					if(DSM_RX_bind_check_validity())
 					{
 						// store tx info into eeprom
 						uint16_t temp = DSM_RX_EEPROM_OFFSET;
@@ -243,10 +247,9 @@ uint16_t DSM_Rx_callback()
 							eeprom_write_byte((EE_ADDR)temp++, cyrfmfg_id[i]);
 							debug(" %02X", cyrfmfg_id[i]);
 						}
-						// check num_ch
+						// save num_ch
 						num_ch=packet_in[11];
-						if(num_ch>12) num_ch=12;
-						//check DSM_rx_type
+						// store DSM_rx_type
 						/*packet[12]     1 byte -> max DSM type allowed:
 							0x01 => 22ms 1024 DSM2 1 packet => number of channels is <8
 							0x02 => 22ms 1024 DSM2 2 packets => either a number of channel >7
@@ -257,29 +260,13 @@ uint16_t DSM_Rx_callback()
 							&0x80 => false=DSM2, true=DSMX
 							&0xF0 => false=1024, true=2048 */
 						DSM_rx_type=packet_in[12];
-						switch(DSM_rx_type)
-						{
-							case 0x01:
-								if(num_ch>7) DSM_rx_type = 0x02;	// Can't be 0x01 with this number of channels
-								break;
-							case 0xA2:
-								if(num_ch>7) DSM_rx_type = 0xB2;	// Can't be 0xA2 with this number of channels
-								break;
-							case 0x02:
-							case 0x12:
-							case 0xB2:
-								break;
-							default:								// Unknown type, default to DSMX 11ms
-								DSM_rx_type = 0xB2;
-								break;
-						}
-						eeprom_write_byte((EE_ADDR)temp, DSM_rx_type);
 						debugln(", num_ch=%d, type=%02X",num_ch, DSM_rx_type);
+						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_WriteRegister(CYRF_29_RX_ABORT, 0x00);	// Clear abort RX
-						DSM_Rx_build_bind_packet();
+						DSM_RX_build_bind_packet();
 						bind_counter=500;
 						phase++;									// DSM_RX_BIND2;
 						return 1000;
@@ -301,11 +288,11 @@ uint16_t DSM_Rx_callback()
 				if(read_retry==0)
 				{
 					packet_count=0;
-					hopping_frequency_no++;								// Change channel
+					hopping_frequency_no++;							// Change channel
 					hopping_frequency_no %= 0x50;
-					hopping_frequency_no |= 0x01;						// Odd channels only
+					hopping_frequency_no |= 0x01;					// Odd channels only
 					CYRF_ConfigRFChannel(hopping_frequency_no);
-					DSM_abort_channel_rx(0);							// Abort RX operation and receive
+					DSM_abort_channel_rx(0);						// Abort RX operation and receive
 				}
 			}
 			return 1000;
@@ -346,7 +333,7 @@ uint16_t DSM_Rx_callback()
 			break;
 		case DSM2_RX_SCAN:											// Scan for DSM2 frequencies
 			//Received something ?
-			rx_status = DSM_Rx_check_packet();
+			rx_status = DSM_RX_check_packet();
 			if(rx_status == 0x02)
 			{ // data received with no errors
 				debugln("CH%d:Found %d",rf_ch_num+1,hopping_frequency[rf_ch_num]);
@@ -401,13 +388,13 @@ uint16_t DSM_Rx_callback()
 				pps_counter = 0;
 			}
 			//Received something ?
-			rx_status = DSM_Rx_check_packet();
+			rx_status = DSM_RX_check_packet();
 			if(rx_status == 0x02)
 			{ // data received with no errors
 				#ifdef DSM_DEBUG_RF
 					debugln("CH1:RX");
 				#endif
-				DSM_Rx_build_telemetry_packet();
+				DSM_RX_build_telemetry_packet();
 				rx_data_started = true;
 				pps_counter++;
 				DSM_abort_channel_rx(2);							// Abort RX operation, set sop&data&seed&rf using CH2, DSM2/X and receive
@@ -452,13 +439,13 @@ uint16_t DSM_Rx_callback()
 			}
 			return 500;
 		case DSM_RX_DATA_CH2:
-			rx_status = DSM_Rx_check_packet();
+			rx_status = DSM_RX_check_packet();
 			if(rx_status == 0x02)
 			{ // data received with no errors
 				#ifdef DSM_DEBUG_RF
 					debugln("CH2:RX");
 				#endif
-				DSM_Rx_build_telemetry_packet();
+				DSM_RX_build_telemetry_packet();
 				pps_counter++;
 			}
 			#ifdef DSM_DEBUG_RF
@@ -476,9 +463,9 @@ uint16_t DSM_Rx_callback()
 	return 10000;
 }
 
-uint16_t initDSM_Rx()
+void DSM_RX_init()
 {
-	DSM_Rx_init();
+	DSM_RX_RF_init();
 	hopping_frequency_no = 0;
 	
 	if (IS_BIND_IN_PROGRESS)
@@ -499,7 +486,6 @@ uint16_t initDSM_Rx()
 		debugln(", type=%02X", DSM_rx_type);
 		phase = DSM_RX_DATA_PREP;
 	}
-	return 15000;
 }
 
 #endif

Multiprotocol/DSM_cyrf6936.ino

@@ -17,6 +17,8 @@
 
 #include "iface_cyrf6936.h"
 
+//#define DSM_DEBUG_FWD_PGM
+
 //#define DSM_GR300
 
 #define DSM_BIND_CHANNEL 0x0d //13 This can be any odd channel
@@ -84,21 +86,24 @@ static void __attribute__((unused)) DSM_build_bind_packet()
 	if(sub_protocol==DSM_AUTO)
 		packet[11] = 12;
 	else
-		packet[11] = num_ch;
+		packet[11] = num_ch;				// DX5 DSMR sends 0x48...
 
-	if (sub_protocol==DSM2_22)
-		packet[12]=num_ch<8?0x01:0x02;		// DSM2/1024 1 or 2 packets depending on the number of channels
-	else if(sub_protocol==DSM2_11)
-		packet[12]=0x12;					// DSM2/2048 2 packets
-	else if(sub_protocol==DSMX_22)
+	if (sub_protocol==DSMR)
+		packet[12] = 0xa2;
+	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)
+		packet[12] = 0x12;					// DSM2/2048 2 packets
+	else if(sub_protocol==DSMX_1F)
 		#if defined DSM_TELEMETRY
 			packet[12] = 0xb2;				// DSMX/2048 2 packets
 		#else
 			packet[12] = num_ch<8? 0xa2 : 0xb2;	// DSMX/2048 1 or 2 packets depending on the number of channels
 		#endif
-	else									// DSMX_11 && DSM_AUTO
-		packet[12]=0xb2;					// DSMX/2048 2 packets
+	else									// DSMX_2F && DSM_AUTO
+		packet[12] = 0xb2;					// DSMX/2048 2 packets
 	
+
 	packet[13] = 0x00;						//???
 	for(i = 8; i < 14; i++)
 		sum += packet[i];
@@ -124,6 +129,9 @@ 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
+
 	// Create channel map based on number of channels and refresh rate
 	uint8_t idx=num_ch-3;
 	if((option & 0x40) && num_ch>7 && num_ch<12)
@@ -139,18 +147,32 @@ static void __attribute__((unused)) DSM_build_data_packet(uint8_t upper)
 	if(prev_option!=option)
 		DSM_update_channels();
 
-	if (sub_protocol==DSMX_11 || sub_protocol==DSMX_22 )
+	if (sub_protocol==DSMX_2F || sub_protocol==DSMX_1F)
 	{//DSMX
 		packet[0] = cyrfmfg_id[2];
 		packet[1] = cyrfmfg_id[3];
 	}
 	else
-	{//DSM2
+	{//DSM2 && DSMR
 		packet[0] = (0xff ^ cyrfmfg_id[2]);
 		packet[1] = (0xff ^ cyrfmfg_id[3]);
-		if(sub_protocol==DSM2_22)
-			bits=10;								// Only DSM2_22 is using a resolution of 1024
+		if(sub_protocol==DSM2_1F)
+			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;
+		}
+		return;
+	}
+
 	#ifdef DSM_THROTTLE_KILL_CH
 		uint16_t kill_ch=Channel_data[DSM_THROTTLE_KILL_CH-1];
 	#endif
@@ -176,19 +198,36 @@ static void __attribute__((unused)) DSM_build_data_packet(uint8_t upper)
 				else
 			#endif
 				#ifdef DSM_MAX_THROW
-					value=Channel_data[CH_TAER[idx]];									// -100%..+100% => 1024..1976us and -125%..+125% => 904..2096us based on Redcon 6 channel DSM2 RX
+					value=Channel_data[CH_TAER[idx]];										// -100%..+100% => 1024..1976us and -125%..+125% => 904..2096us based on Redcon 6 channel DSM2 RX
 				#else
 					if(option & 0x80)
-						value=Channel_data[CH_TAER[idx]];								// -100%..+100% => 1024..1976us and -125%..+125% => 904..2096us based on Redcon 6 channel DSM2 RX
+						value=Channel_data[CH_TAER[idx]];									// -100%..+100% => 1024..1976us and -125%..+125% => 904..2096us based on Redcon 6 channel DSM2 RX
 					else
-						value=convert_channel_16b_nolimit(CH_TAER[idx],0x156,0x6AA);	// -100%..+100% => 1100..1900us and -125%..+125% => 1000..2000us based on a DX8 G2 dump
+						value=convert_channel_16b_nolimit(CH_TAER[idx],0x156,0x6AA,false);	// -100%..+100% => 1100..1900us and -125%..+125% => 1000..2000us based on a DX8 G2 dump
 				#endif
 			if(bits==10) value>>=1;
 			value |= (upper && i==0 ? 0x8000 : 0) | (idx << bits);
 		}	  
-		packet[i*2+2] = (value >> 8) & 0xff;
-		packet[i*2+3] = (value >> 0) & 0xff;
+		packet[i*2+2] = value >> 8;
+		packet[i*2+3] = value;
 	}
+	#ifdef DSM_FWD_PGM
+		if(upper==0 && DSM_SerialRX && (DSM_SerialRX_val[0]&0xF8)==0x70 )
+		{ // Send forward programming data if available
+			for(uint8_t i=0; i<(DSM_SerialRX_val[0]&0x07);i++)
+			{
+				packet[i*2+4]=0x70+i;
+				packet[i*2+5]=DSM_SerialRX_val[i+1];
+			}
+			DSM_SerialRX=false;
+			#ifdef DSM_DEBUG_FWD_PGM
+				debug("FWD=");
+				for(uint8_t i=4; i<16;i++)
+					debug(" %02X",packet[i]);
+				debugln("");
+			#endif
+		}
+	#endif
 }
 
 static uint8_t __attribute__((unused)) DSM_Check_RX_packet()
@@ -208,8 +247,12 @@ static uint8_t __attribute__((unused)) DSM_Check_RX_packet()
 	return result;
 }
 
-uint16_t ReadDsm()
+uint16_t DSM_callback()
 {
+	#if defined MULTI_EU
+		if(sub_protocol == DSM2_1F || sub_protocol == DSM2_2F)
+			return 11000;
+	#endif
 	#define DSM_CH1_CH2_DELAY	4010			// Time between write of channel 1 and channel 2
 	#ifdef STM32_BOARD
 		#define DSM_WRITE_DELAY		1600		// Time after write to verify write complete
@@ -299,25 +342,32 @@ uint16_t ReadDsm()
 			DSM_cyrf_configdata();
 			CYRF_SetTxRxMode(TX_EN);
 			hopping_frequency_no = 0;
-			phase = DSM_CH1_WRITE_A;						// in fact phase++
-			DSM_set_sop_data_crc(phase==DSM_CH1_CHECK_A||phase==DSM_CH1_CHECK_B, sub_protocol==DSMX_11||sub_protocol==DSMX_22);
+			phase = DSM_CH1_WRITE_A;							// in fact phase++
+			if(sub_protocol == DSMR)
+				DSM_set_sop_data_crc(false, true);
+			else
+				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
+				telemetry_set_input_sync(11000);				// Always request 11ms spacing even if we don't use half of it in 22ms mode
 			#endif
+			if(sub_protocol == DSMR)
+				CYRF_SetPower(0x08);							//Keep transmit power in sync
+			else
+				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:
-			DSM_build_data_packet(phase == DSM_CH1_WRITE_B||phase == DSM_CH2_WRITE_B);	// build lower or upper channels
-			CYRF_ReadRegister(CYRF_04_TX_IRQ_STATUS);		// clear IRQ flags
+			CYRF_ReadRegister(CYRF_04_TX_IRQ_STATUS);			// clear IRQ flags
 			CYRF_WriteDataPacket(packet);
 			#if 0
 				for(uint8_t i=0;i<16;i++)
 					debug(" %02X", packet[i]);
 				debugln("");
 			#endif
-			phase++;										// change from WRITE to CHECK mode
+			phase++;											// change from WRITE to CHECK mode
 			return DSM_WRITE_DELAY;
 		case DSM_CH1_CHECK_A:
 		case DSM_CH1_CHECK_B:
@@ -328,7 +378,7 @@ uint16_t ReadDsm()
 				if((CYRF_ReadRegister(CYRF_02_TX_CTRL) & 0x80) == 0x00)
 					break;
 			
-			if(phase==DSM_CH1_CHECK_A || phase==DSM_CH1_CHECK_B)
+			if((phase==DSM_CH1_CHECK_A || phase==DSM_CH1_CHECK_B) && sub_protocol!=DSMR)
 			{
 				#if defined DSM_TELEMETRY
 					// reset cyrf6936 if freezed after switching from TX to RX
@@ -340,16 +390,19 @@ uint16_t ReadDsm()
 						CYRF_SetTxRxMode(TX_EN);
 					}
 				#endif
-				DSM_set_sop_data_crc(phase==DSM_CH1_CHECK_A||phase==DSM_CH1_CHECK_B, sub_protocol==DSMX_11 || sub_protocol==DSMX_22);
-				phase++;										// change from CH1_CHECK to CH2_WRITE
+				DSM_set_sop_data_crc(true, sub_protocol==DSMX_2F||sub_protocol==DSMX_1F);	// prep CH2
+				phase++;									// change from CH1_CHECK to CH2_WRITE
 				return DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY;
 			}
-			if (phase == DSM_CH2_CHECK_A)
-				CYRF_SetPower(0x28);						//Keep transmit power in sync
 #if defined DSM_TELEMETRY
 			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;
@@ -368,11 +421,20 @@ uint16_t ReadDsm()
 				if(len>TELEMETRY_BUFFER_SIZE-2)
 					len=TELEMETRY_BUFFER_SIZE-2;
 				CYRF_ReadDataPacketLen(packet_in+1, len);
+				#ifdef DSM_DEBUG_FWD_PGM
+					//debug(" %02X", packet_in[1]);
+					if(packet_in[1]==9)
+					{
+						for(uint8_t i=0;i<len;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
 				telemetry_link=1;
 			}
 			CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x20);		// Abort RX operation
-			if (phase == DSM_CH2_READ_A && (sub_protocol==DSM2_22 || sub_protocol==DSMX_22) && num_ch < 8)	// 22ms mode
+			if (phase == DSM_CH2_READ_A && (sub_protocol==DSM2_1F || sub_protocol==DSMX_1F) && num_ch < 8)	// 22ms mode
 			{
 				CYRF_SetTxRxMode(RX_EN);					// Force end state read
 				CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x00);	// Clear abort RX operation
@@ -390,14 +452,14 @@ uint16_t ReadDsm()
 				phase = DSM_CH1_WRITE_A;					//Transmit lower
 			CYRF_SetTxRxMode(TX_EN);						//TX mode
 			CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x00);		//Clear abort RX operation
-			DSM_set_sop_data_crc(phase==DSM_CH1_CHECK_A||phase==DSM_CH1_CHECK_B, sub_protocol==DSMX_11||sub_protocol==DSMX_22);
+			DSM_set_sop_data_crc(false, sub_protocol==DSMX_2F||sub_protocol==DSMX_1F||sub_protocol==DSMR);
 			return DSM_READ_DELAY;
 #else
 			// No telemetry
-			DSM_set_sop_data_crc(phase==DSM_CH1_CHECK_A||phase==DSM_CH1_CHECK_B, sub_protocol==DSMX_11||sub_protocol==DSMX_22);
+			DSM_set_sop_data_crc(phase==DSM_CH1_CHECK_A||phase==DSM_CH1_CHECK_B, sub_protocol==DSMX_2F||sub_protocol==DSMX_1F);
 			if (phase == DSM_CH2_CHECK_A)
 			{
-				if(num_ch > 7 || sub_protocol==DSM2_11 || sub_protocol==DSMX_11)
+				if(num_ch > 7 || sub_protocol==DSM2_2F || sub_protocol==DSMX_2F)
 					phase = DSM_CH1_WRITE_B;				//11ms mode or upper to transmit change from CH2_CHECK_A to CH1_WRITE_A
 				else										
 				{											//Normal mode 22ms
@@ -421,25 +483,65 @@ uint16_t ReadDsm()
 	return 0;		
 }
 
-uint16_t initDsm()
+
+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 },
+	{ 0xfe, 0xff, 0xff, 0xff, 0x2a, 0x06, 0x22, 0x28, 0x16, 0x24, 0x38, 0x0e, 0x32, 0x2e, 0x14, 0x3a, 0x04, 0x44, 0x0c, 0x42, 0x1c, 0x4a, 0x10, 0x36, 0x3c, 0x48, 0x26 },
+	{ 0xff, 0xfe, 0xff, 0xff, 0x28, 0x34, 0x48, 0x46, 0x3a, 0x12, 0x18, 0x32, 0x14, 0x42, 0x16, 0x40, 0x22, 0x44, 0x1c, 0x0a, 0x36, 0x20, 0x10, 0x0c, 0x3c, 0x26, 0x2e },
+	{ 0xff, 0xff, 0xfe, 0xff, 0x3c, 0x16, 0x04, 0x48, 0x1e, 0x4a, 0x10, 0x18, 0x22, 0x28, 0x38, 0x40, 0x20, 0x06, 0x3e, 0x42, 0x30, 0x1a, 0x2c, 0x1c, 0x46, 0x14, 0x34 },
+	{ 0xff, 0xff, 0xff, 0xfe, 0x4d, 0x39, 0x1b, 0x13, 0x45, 0x2f, 0x0d, 0x3d, 0x0b, 0x11, 0x47, 0x2d, 0x19, 0x1d, 0x23, 0x35, 0x33, 0x3b, 0x21, 0x31, 0x17, 0x0f, 0x43 },
+	{ 0xff, 0xff, 0xff, 0xff, 0x14, 0x28, 0x2e, 0x32, 0x3e, 0x10, 0x38, 0x0e, 0x12, 0x06, 0x2c, 0x26, 0x30, 0x4c, 0x34, 0x16, 0x04, 0x3a, 0x42, 0x48, 0x36, 0x46, 0x1a },
+	{ 0x00, 0xff, 0xff, 0xff, 0x3e, 0x30, 0x42, 0x24, 0x06, 0x0e, 0x14, 0x1c, 0x08, 0x10, 0x20, 0x22, 0x04, 0x32, 0x0c, 0x44, 0x3c, 0x46, 0x4a, 0x26, 0x4c, 0x48, 0x1e },
+	{ 0xff, 0x00, 0xff, 0xff, 0x38, 0x0e, 0x22, 0x2a, 0x44, 0x3a, 0x4a, 0x3e, 0x16, 0x20, 0x36, 0x24, 0x46, 0x18, 0x1e, 0x12, 0x1c, 0x30, 0x2c, 0x14, 0x06, 0x0c, 0x40 },
+	{ 0x00, 0x00, 0xff, 0xff, 0x06, 0x4c, 0x26, 0x08, 0x46, 0x3e, 0x30, 0x12, 0x38, 0x1c, 0x04, 0x4a, 0x2c, 0x1a, 0x20, 0x3a, 0x18, 0x36, 0x28, 0x2e, 0x22, 0x40, 0x10 },
+	{ 0xff, 0xff, 0x00, 0xff, 0x12, 0x06, 0x3c, 0x2a, 0x22, 0x38, 0x48, 0x4c, 0x32, 0x44, 0x26, 0x16, 0x0c, 0x28, 0x2c, 0x36, 0x1c, 0x1a, 0x42, 0x10, 0x08, 0x4a, 0x34 },
+	{ 0x00, 0xff, 0x00, 0xff, 0x04, 0x4c, 0x4a, 0x28, 0x2a, 0x24, 0x14, 0x1e, 0x40, 0x48, 0x44, 0x2c, 0x2e, 0x1a, 0x12, 0x46, 0x3a, 0x0e, 0x18, 0x1c, 0x20, 0x10, 0x42 },
+	{ 0xff, 0x00, 0x00, 0xff, 0x06, 0x10, 0x14, 0x16, 0x48, 0x18, 0x44, 0x2c, 0x0a, 0x26, 0x24, 0x42, 0x36, 0x30, 0x38, 0x3e, 0x0c, 0x3c, 0x34, 0x46, 0x2a, 0x32, 0x0e },
+	{ 0x00, 0x00, 0x00, 0xff, 0x2c, 0x0a, 0x46, 0x28, 0x38, 0x24, 0x14, 0x06, 0x04, 0x10, 0x18, 0x30, 0x12, 0x20, 0x3a, 0x1a, 0x32, 0x3c, 0x3e, 0x4a, 0x1e, 0x44, 0x36 },
+	{ 0x00, 0x00, 0x00, 0x00, 0x45, 0x23, 0x07, 0x37, 0x4b, 0x13, 0x3d, 0x31, 0x19, 0x2b, 0x2f, 0x2d, 0x1f, 0x4d, 0x3f, 0x1b, 0x43, 0x27, 0x3b, 0x11, 0x05, 0x0d, 0x17 },
+	{ 0xff, 0xff, 0xff, 0x00, 0x0b, 0x4b, 0x1d, 0x39, 0x09, 0x0f, 0x49, 0x25, 0x07, 0x35, 0x3b, 0x05, 0x33, 0x17, 0x2d, 0x11, 0x2b, 0x29, 0x1f, 0x45, 0x1b, 0x41, 0x47 },
+	{ 0x00, 0xff, 0xff, 0x00, 0x41, 0x35, 0x11, 0x25, 0x29, 0x27, 0x33, 0x47, 0x4d, 0x31, 0x05, 0x37, 0x15, 0x1f, 0x23, 0x07, 0x1b, 0x0f, 0x3b, 0x49, 0x19, 0x3f, 0x0b },
+	{ 0xff, 0x00, 0xff, 0x00, 0x25, 0x47, 0x05, 0x0b, 0x45, 0x1f, 0x2b, 0x27, 0x2d, 0x09, 0x07, 0x43, 0x49, 0x29, 0x4d, 0x39, 0x33, 0x41, 0x17, 0x0f, 0x15, 0x19, 0x3b },
+	{ 0x00, 0x00, 0xff, 0x00, 0x3b, 0x05, 0x21, 0x0d, 0x1b, 0x43, 0x17, 0x2d, 0x1d, 0x25, 0x4b, 0x35, 0x4d, 0x3f, 0x07, 0x09, 0x37, 0x41, 0x15, 0x1f, 0x0f, 0x27, 0x29 },
+	{ 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 } };
+
+void DSM_init()
 { 
-	CYRF_GetMfgData(cyrfmfg_id);
-	//Model match
-	cyrfmfg_id[3]^=RX_num;
+	if(sub_protocol == DSMR)
+	{
+		uint8_t row = rx_tx_addr[3]%22;
+		for(uint8_t i=0; i< 4; i++)
+			cyrfmfg_id[i] = pgm_read_byte_near(&DSMR_ID_FREQ[row][i]);
+		for(uint8_t i=0; i< 23; i++)
+			hopping_frequency[i] = pgm_read_byte_near(&DSMR_ID_FREQ[row][i+4]);
+	}
+	else
+	{
+		CYRF_GetMfgData(cyrfmfg_id);
+		//Model match
+		cyrfmfg_id[3]^=RX_num;
+	}
+
 	//Calc sop_col
 	sop_col = (cyrfmfg_id[0] + cyrfmfg_id[1] + cyrfmfg_id[2] + 2) & 0x07;
+
 	//Fix for OrangeRX using wrong DSM_pncodes by preventing access to "Col 8"
-	if(sop_col==0)
+	if(sop_col==0 && sub_protocol != DSMR)
 	{
 	   cyrfmfg_id[rx_tx_addr[0]%3]^=0x01;					//Change a bit so sop_col will be different from 0
 	   sop_col = (cyrfmfg_id[0] + cyrfmfg_id[1] + cyrfmfg_id[2] + 2) & 0x07;
 	}
+
 	//Calc CRC seed
 	seed = (cyrfmfg_id[0] << 8) + cyrfmfg_id[1];
+
 	//Hopping frequencies
-	if (sub_protocol == DSMX_11 || sub_protocol == DSMX_22)
+	if (sub_protocol == DSMX_2F || sub_protocol == DSMX_1F)
 		DSM_calc_dsmx_channel();
-	else
+	else if(sub_protocol != DSMR)
 	{ 
 		uint8_t tmpch[10];
 		CYRF_FindBestChannels(tmpch, 10, 5, 3, 75);
@@ -454,6 +556,7 @@ uint16_t initDsm()
 		}
 		hopping_frequency[1] = tmpch[idx];
 	}
+
 	//
 	DSM_cyrf_config();
 	CYRF_SetTxRxMode(TX_EN);
@@ -468,7 +571,6 @@ uint16_t initDsm()
 	}
 	else
 		phase = DSM_CHANSEL;//
-	return 10000;
 }
 
 #endif

Multiprotocol/Devo_cyrf6936.ino

@@ -55,14 +55,14 @@ static void __attribute__((unused)) DEVO_add_pkt_suffix()
 {
     uint8_t bind_state;
 	#ifdef ENABLE_PPM
-	if(mode_select && option==0 && IS_BIND_DONE) 			//PPM mode and option not already set and bind is finished
+	if(mode_select && (option&0x01)==0 && IS_BIND_DONE) 			//PPM mode and option not already set and bind is finished
 	{
 		BIND_SET_INPUT;
 		BIND_SET_PULLUP;										// set pullup
 		if(IS_BIND_BUTTON_on)
 		{
 			eeprom_write_byte((EE_ADDR)(MODELMODE_EEPROM_OFFSET+RX_num),0x01);	// Set fixed id mode for the current model
-			option=1;
+			option |= 0x01;
 		}
 		BIND_SET_OUTPUT;
 	}
@@ -72,7 +72,7 @@ static void __attribute__((unused)) DEVO_add_pkt_suffix()
 		MProtocol_id = RX_num + MProtocol_id_master;
 		bind_counter=DEVO_BIND_COUNT;
 	}
-	if (option)
+	if (option&0x01)
 	{
         if (bind_counter > 0)
             bind_state = 0xc0;
@@ -146,7 +146,7 @@ static void __attribute__((unused)) DEVO_build_data_pkt()
 	uint8_t sign = 0x0b;
 	for (uint8_t i = 0; i < 4; i++)
 	{
-		int16_t value=convert_channel_16b_nolimit(CH_EATR[ch_idx * 4 + i],-1600,1600);//range -1600..+1600
+		int16_t value=convert_channel_16b_nolimit(CH_EATR[ch_idx * 4 + i],-1600,1600,false);//range -1600..+1600
 		if(value < 0)
 		{
 			value = -value;
@@ -163,29 +163,161 @@ static void __attribute__((unused)) DEVO_build_data_pkt()
 }
 
 #if defined DEVO_HUB_TELEMETRY
-static void __attribute__((unused)) DEVO_parse_telemetry_packet()
+static uint32_t __attribute__((unused)) DEVO_text_to_int(uint8_t *ptr, uint8_t len)
 {
+	uint32_t value = 0;
+	for(uint8_t i = 0; i < len; i++)
+		value = value * 10 + (ptr[i] - '0');
+	return value;
+}
+
+static void __attribute__((unused)) DEVO_float_to_ints(uint8_t *ptr, uint16_t *value, uint16_t *decimal)
+{
+	bool seen_decimal = false;
+	*value = 0;
+	*decimal = 0;
+	for(uint8_t i = 0; i < 7; i++)
+	{
+		if(ptr[i] == '.')
+		{
+			seen_decimal = true;
+			continue;
+		}
+		if(ptr[i] < '0' || ptr[i] > '9')
+		{
+			if(*value != 0 || seen_decimal)
+				return;
+		}
+		else
+		{
+			if(seen_decimal)
+				*decimal = *decimal * 10 + (ptr[i] - '0');
+			else
+				*value = *value * 10 + (ptr[i] - '0');
+		}
+	}
+}
+
+static void __attribute__((unused)) DEVO_parse_telemetry_packet()
+{ // Telemetry packets every 2.4ms
 	DEVO_scramble_pkt(); //This will unscramble the packet
 	
 	debugln("RX");
 	if ((((uint32_t)packet[15] << 16) | ((uint32_t)packet[14] << 8) | packet[13]) != (MProtocol_id & 0x00ffffff))
 		return;	// ID does not match
-	
-	//RSSI
-	TX_RSSI = CYRF_ReadRegister(CYRF_13_RSSI) & 0x1F;
-	TX_RSSI = (TX_RSSI << 1) + TX_RSSI;
-	RX_RSSI = TX_RSSI;
-	telemetry_link = 1;
-
-	//TODO: FW telemetry https://github.com/DeviationTX/deviation/blob/5efb6a28bea697af9a61b5a0ed2528cc8d203f90/src/protocol/devo_cyrf6936.c#L232
-
-	debug("P[0]=%02X",packet[0]);
-	
-	if (packet[0] == 0x30)	// Volt packet
+		
+	if((telemetry_link & 3) != 0)
 	{
-		v_lipo1 = packet[1] << 1;
-		v_lipo2 = packet[3] << 1;
+		debugln("S%d",telemetry_link);
+		return;	// Previous telemetry not sent yet...
 	}
+
+	//Debug telem RX
+	//for(uint8_t i=0;i<12;i++)
+	//	debug("%02X ",packet[i]);
+	//debugln("");
+	
+	#if defined HUB_TELEMETRY
+	//Telemetry https://github.com/DeviationTX/deviation/blob/5efb6a28bea697af9a61b5a0ed2528cc8d203f90/src/protocol/devo_cyrf6936.c#L232
+		uint16_t val, dec;
+		uint32_t val32;
+		switch(packet[0])
+		{
+			case 0x30:	// Volt and RPM packet
+				//RSSI and voltage
+				TX_RSSI = CYRF_ReadRegister(CYRF_13_RSSI) & 0x1F;
+				TX_RSSI = (TX_RSSI << 1) + TX_RSSI;
+				RX_RSSI = TX_RSSI;
+				telemetry_link |= 1;
+				v_lipo1 = packet[1] << 1;
+				v_lipo2 = packet[3] << 1;
+				//packet[5] = 127;																					// 12.7V
+				if(packet[5] != 0)
+				{
+					val  = (packet[5]*11)/21;																		// OpenTX strange transformation??
+					dec  = val;
+					val /= 10;
+					dec -= val*10;
+					frsky_send_user_frame(0x3A, val, 0x00);															// volt3
+					frsky_send_user_frame(0x3B, dec, 0x00);															// volt3
+				}
+				val = packet[7] * 120;																				// change to RPM
+				frsky_send_user_frame(0x03, val, val>>8);															// RPM
+				break;
+			case 0x31:	// Temperature packet
+				//memcpy(&packet[1],"\x29\x2A\x2B\x00\x00\x00\x00\x00\x00\x00\x00\x00",12);							// 21°, 22°, 23°
+				for(uint8_t i=0; i<2;i++)
+					if(packet[i+1]!=0xff)
+					{
+						val = packet[i+1];
+						val -= 20;
+						frsky_send_user_frame(0x02 + i*3, val, val>>8);												// temp 1 & 2
+					}
+				break;
+			// GPS Data
+			case 0x32: // Longitude
+				//memcpy(&packet[1],"\x30\x33\x30\x32\x30\x2e\x38\x32\x37\x30\x45\xfb",12);							// 030°20.8270E in ddmm.mmmm
+				//memcpy(&packet[1],"\x31\x31\x37\x31\x31\x2e\x35\x39\x34\x37\x57\xfb",12);							// RX705 sends 117°11.5947W which should be 11706.95685W in ddmm.mmmm
+				val = DEVO_text_to_int(&packet[1], 3)*100;															// dd00
+				val32 = DEVO_text_to_int(&packet[4], 2) * 10000 + DEVO_text_to_int(&packet[7], 4);					// mmmmmm
+				if(option&0x02)																						// if RX705 GPS format
+					val32 = (val32*3)/5;																			// then * 6/10 correction
+				dec = val32/10000;
+				val = val + dec;																					// dddmm
+				frsky_send_user_frame(0x12  , val, val>>8);
+				val = val32 - dec*10000;																			// .mmmm
+				frsky_send_user_frame(0x12+8, val, val>>8);
+				frsky_send_user_frame(0x1A+8, packet[11], 0x00);													// 'E'/'W'
+				break;
+			case 0x33: // Latitude
+				//memcpy(&packet[1],"\x35\x39\x35\x34\x2e\x37\x37\x37\x36\x4e\x07\x00",12);							// 59°54.776N in ddmm.mmmm
+				//memcpy(&packet[1],"\x31\x37\x31\x31\x2e\x35\x39\x34\x37\x4e\xfb\x00",12);							// RX705 sends 17°11.5947N which should be 1706.95685N in ddmm.mmmm
+				val = DEVO_text_to_int(&packet[1], 2)*100;															// dd00
+				val32 = DEVO_text_to_int(&packet[3], 2) * 10000 + DEVO_text_to_int(&packet[6], 4);					// mmmmmm
+				if(option&0x02)																						// if RX705 GPS format
+					val32 = (val32*3)/5;																			// then * 6/10 correction
+				dec = val32/10000;
+				val = val + dec;																					// dddmm
+				frsky_send_user_frame(0x13  , val, val>>8);
+				val = val32 - dec*10000;																			// .mmmm
+				frsky_send_user_frame(0x13+8, val, val>>8);
+				frsky_send_user_frame(0x1B+8, packet[10], 0x00);													// 'N'/'S'
+				break;
+			case 0x34: // Altitude
+				//memcpy(&packet[1],"\x31\x32\x2e\x38\x00\x00\x00\x4d\x4d\x4e\x45\xfb",12);							// 12.8 MMNE
+				DEVO_float_to_ints(&packet[1], &val, &dec);
+				frsky_send_user_frame(0x10, val, val>>8);
+				frsky_send_user_frame(0x21, dec, dec>>8);
+				break;
+			case 0x35: // Speed
+				//memcpy(&packet[1],"\x00\x00\x00\x00\x00\x00\x30\x2e\x30\x30\x00\x00",12);							// 0.0
+				DEVO_float_to_ints(&packet[1], &val, &dec);
+				frsky_send_user_frame(0x11  , val, val>>8);
+				frsky_send_user_frame(0x11+8, dec, dec>>8);
+				break;
+			case 0x36: // Time
+				//memcpy(&packet[1],"\x31\x38\x32\x35\x35\x32\x31\x35\x31\x30\x31\x32",12);							// "182552151012" = 2012-10-15 18:25:52 (UTC)
+				if(packet[1]!=0)
+				{
+					frsky_send_user_frame(0x15, DEVO_text_to_int(&packet[9], 2), DEVO_text_to_int(&packet[7], 2));	// month, day
+					val = 2000 + DEVO_text_to_int(&packet[11], 2);													// year
+					frsky_send_user_frame(0x16, val, val>>8);
+					frsky_send_user_frame(0x17, DEVO_text_to_int(&packet[1], 2), DEVO_text_to_int(&packet[3], 2));	// hour, min
+					frsky_send_user_frame(0x18, DEVO_text_to_int(&packet[5], 2), 0x00);								// second
+				}
+				break;
+		}
+	#else
+		if(packet[0] == 0x30)
+		{
+			TX_RSSI = CYRF_ReadRegister(CYRF_13_RSSI) & 0x1F;
+			TX_RSSI = (TX_RSSI << 1) + TX_RSSI;
+			RX_RSSI = TX_RSSI;
+			telemetry_link |= 1;
+			v_lipo1 = packet[1] << 1;
+			v_lipo2 = packet[3] << 1;
+		}
+	#endif
 }
 #endif
 
@@ -294,7 +426,7 @@ static void __attribute__((unused)) DEVO_BuildPacket()
 		packet_count = 0;
 }
 
-uint16_t devo_callback()
+uint16_t DEVO_callback()
 {
 	static uint8_t txState=0;
 	
@@ -404,8 +536,23 @@ uint16_t devo_callback()
 #endif
 }
 
-uint16_t DevoInit()
+void DEVO_init()
 {	
+	#ifdef ENABLE_PPM
+		if(mode_select) //PPM mode
+		{
+			if(IS_BIND_BUTTON_FLAG_on)
+			{
+				option &= 0xFE;
+				eeprom_write_byte((EE_ADDR)(MODELMODE_EEPROM_OFFSET+RX_num),option);	// reset to autobind mode for the current model
+			}
+			else
+			{	
+				option=eeprom_read_byte((EE_ADDR)(MODELMODE_EEPROM_OFFSET+RX_num));		// load previous mode: autobind or fixed id
+				if(option > 3) option = 0;												// if invalid then it should be autobind
+			}
+		}
+	#endif //ENABLE_PPM
 	switch(sub_protocol)
 	{
 		case 1:
@@ -436,8 +583,13 @@ uint16_t DevoInit()
 
 	packet_count = 0;
 
-	prev_option=option;
-	if(option==0)
+	if(option&0x01)
+	{
+		phase = DEVO_BOUND_1;
+		bind_counter = 0;
+		DEVO_cyrf_set_bound_sop_code();
+	}
+	else
 	{
 		MProtocol_id = ((uint32_t)(hopping_frequency[0] ^ cyrfmfg_id[0] ^ cyrfmfg_id[3]) << 16)
 					 | ((uint32_t)(hopping_frequency[1] ^ cyrfmfg_id[1] ^ cyrfmfg_id[4]) << 8)
@@ -447,13 +599,6 @@ uint16_t DevoInit()
 		phase = DEVO_BIND;
 		BIND_IN_PROGRESS;
 	}
-	else
-	{
-		phase = DEVO_BOUND_1;
-		bind_counter = 0;
-		DEVO_cyrf_set_bound_sop_code();
-	}  
-	return 2400;
 }
 
 #endif

Multiprotocol/E010R5_cyrf6936.ino

@@ -0,0 +1,151 @@
+/*
+ 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(E010R5_CYRF6936_INO)
+
+#include "iface_rf2500.h"
+
+#define E010R5_FORCE_ID
+
+#define E010R5_PAYLOAD_SIZE	14
+
+
+static void __attribute__((unused)) E010R5_build_data_packet()
+{
+	packet[ 0] = 0x0D;								// Packet length
+	packet[ 1] = convert_channel_8b(THROTTLE);
+	packet[ 2] = convert_channel_s8b(RUDDER);
+	packet[ 3] = convert_channel_s8b(ELEVATOR);
+	packet[ 4] = convert_channel_s8b(AILERON);
+	packet[ 5] = 0x20;								// Trim Rudder
+	packet[ 6] = 0x20;								// Trim Elevator
+	packet[ 7] = 0x20;								// Trim Aileron
+	packet[ 8] = 0x01								// Flags: high=0x01, low=0x00
+			| GET_FLAG(CH5_SW, 0x04)				//        flip=0x04
+			| GET_FLAG(CH6_SW, 0x08)				//        led=0x08
+			| GET_FLAG(CH8_SW, 0x10)				//		  headless=0x10
+			| GET_FLAG(CH9_SW, 0x20);				//		  one key return=0x20
+	packet[ 9] = IS_BIND_IN_PROGRESS ? 0x80 : 0x00	// Flags: bind=0x80
+			| GET_FLAG(CH7_SW, 0x20)				//        calib=0x20
+			| GET_FLAG(CH10_SW, 0x01);				//		  strange effect=0x01=long press on right button
+	packet[10] = rx_tx_addr[0];
+	packet[11] = rx_tx_addr[1];
+	packet[12] = rx_tx_addr[2];
+	packet[13] = 0x9D;								// Check
+	for(uint8_t i=0;i<13;i++)
+		packet[13] += packet[i];
+
+	RF2500_BuildPayload(packet);
+}
+
+uint16_t E010R5_callback()
+{
+	//Bind
+	if(bind_counter)
+		if(--bind_counter==0)
+			BIND_DONE;
+
+	//Send packet
+	RF2500_SendPayload();
+	
+	//Timing and hopping
+	packet_count++;
+	switch(packet_count)
+	{
+		case 1:
+		case 2:
+		case 4:
+		case 5:
+			return 1183;
+		default:
+			hopping_frequency_no++;
+			hopping_frequency_no &= 3;
+			if(IS_BIND_IN_PROGRESS)
+				rf_ch_num = 0x30 + (hopping_frequency_no<<3);
+			else
+				rf_ch_num = hopping_frequency[hopping_frequency_no];
+			RF2500_RFChannel(rf_ch_num);
+			RF2500_SetPower();
+			packet_count = 0;
+		case 3:
+			E010R5_build_data_packet();
+			return 3400;
+	}
+	return 0;
+}
+
+void E010R5_init()
+{
+	BIND_IN_PROGRESS;									// Autobind protocol
+	bind_counter = 2600;
+
+	//RF2500 emu init
+	RF2500_Init(E010R5_PAYLOAD_SIZE, false);			// 14 bytes, not scrambled
+	RF2500_SetTXAddr((uint8_t*)"\x0E\x54\x96\xEE");		// Same address for bind and normal packets
+	
+	rx_tx_addr[0]=0x00;
+	hopping_frequency[0]=0x35;	//53
+	#ifdef E010R5_FORCE_ID
+		switch(rx_tx_addr[3]%5)
+		{
+			case 0:
+				//TX1
+				//hopping_frequency[0]=0x35;	//53
+				hopping_frequency[1]=0x30;		//48
+				rx_tx_addr[1]=0x45;
+				rx_tx_addr[2]=0x46;
+				break;
+			case 1:
+				//TX2
+				//hopping_frequency[0]=0x35;	//53
+				hopping_frequency[1]=0x3C;		//60
+				rx_tx_addr[1]=0x1B;
+				rx_tx_addr[2]=0x9E;
+				break;
+			case 2:
+				//TX4
+				hopping_frequency[0]=0x30;		//48
+				hopping_frequency[1]=0x38;		//56
+				rx_tx_addr[1]=0x2E;
+				rx_tx_addr[2]=0xAE;
+				break;
+			case 3:
+				//TX5
+				//hopping_frequency[0]=0x35;	//53
+				hopping_frequency[1]=0x41;		//65
+				rx_tx_addr[0]=0x0D;
+				rx_tx_addr[1]=0xB9;
+				rx_tx_addr[2]=0xFC;
+				break;
+			default:
+				//TX3
+				hopping_frequency[0]=0x30;		//48
+				hopping_frequency[1]=0x38;		//56
+				rx_tx_addr[1]=0x17;
+				rx_tx_addr[2]=0x0D;
+				break;
+		}
+    #endif
+	// This is the same as the E010 v1...
+	hopping_frequency[2]=hopping_frequency[0]+0x10;
+	hopping_frequency[3]=hopping_frequency[1]+0x10;
+
+	E010R5_build_data_packet();
+	RF2500_RFChannel(hopping_frequency[0]);
+	hopping_frequency_no=0;
+	packet_count=0;
+}
+
+#endif

Multiprotocol/E016HV2_cc2500.ino

@@ -0,0 +1,157 @@
+/*
+ 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(E016HV2_CC2500_INO)
+
+#include "iface_cc2500.h"
+
+//#define FORCE_E016HV2_ORIGINAL_ID
+
+#define E016HV2_INITIAL_WAIT		500
+#define E016HV2_PACKET_PERIOD		10000
+#define E016HV2_RF_BIND_CHANNEL	5
+#define E016HV2_PAYLOAD_SIZE		11
+#define E016HV2_BIND_COUNT		300	//3sec
+
+static void __attribute__((unused)) E016HV2_send_packet()
+{
+	//payload length (after this byte)
+	packet[0 ] = 0x0A;
+	
+	//bind indicator
+	if(IS_BIND_IN_PROGRESS)
+	{
+		packet[1 ] = 0x02;
+		if(bind_counter)
+			bind_counter--;
+		else
+		{
+			BIND_DONE;
+			CC2500_250K_RFChannel(rf_ch_num);			// Set main channel
+		}
+	}
+	else
+		packet[1 ] = 0x20;
+	
+	//ID
+	packet[2 ] = rx_tx_addr[2];
+	packet[3 ] = rx_tx_addr[3];
+
+	//channels TREA
+	uint8_t channel;
+	if(IS_BIND_IN_PROGRESS)
+		channel=0x64;								// Throttle must be centered during bind
+	else
+		channel=convert_channel_8b_limit_deadband(THROTTLE,0x00,0x64,0xC8, 20);
+	packet[4 ]  = channel;
+	channel=convert_channel_16b_limit(RUDDER,0x00,0xC8);
+	packet[5 ]  = channel;
+	channel=convert_channel_16b_limit(ELEVATOR,0x00,0xC8);
+	packet[6 ]  = channel;
+	channel=convert_channel_16b_limit(AILERON,0x00,0xC8);
+	packet[7 ]  = channel;
+
+	//flags
+	if(CH8_SW && !phase) //toggle calib flag
+		flags ^= 0x40;
+	phase=CH8_SW;
+
+	packet[8 ] = GET_FLAG(CH7_SW,  0x01)			// 0x01=Flip
+			   | GET_FLAG(CH9_SW,  0x02)			// 0x02=Headless
+			   | GET_FLAG(CH10_SW, 0x04)			// 0x04=One Key Return
+			   | flags;								// 0x40=Calib
+
+	packet[9 ] = 0x02;								// Speed control 0x00:low, 0x01:medium, 0x02:high
+	
+	packet[10] = GET_FLAG(CH5_SW, 0x01)				// 0x01=TakeOff/Land  (momentary switch)
+			   | GET_FLAG(CH6_SW, 0x04);			// 0x04=Emergeny Stop (momentary switch)
+
+	CC2500_SetPower();								// Set tx_power
+	CC2500_SetFreqOffset();							// Set frequency offset
+
+	//Build real packet and send it
+	static uint8_t pid=0;
+	crc=0;
+	
+	// stop TX/RX
+	CC2500_Strobe(CC2500_SIDLE);
+	// flush tx FIFO
+	CC2500_Strobe(CC2500_SFTX);
+	// packet length
+	CC2500_WriteReg(CC2500_3F_TXFIFO, 6 + 4 + 1 + 11 + 2);	// preamble + address + packet_control + payload + crc
+
+	// preamble+address
+	CC2500_WriteRegisterMulti(CC2500_3F_TXFIFO, (uint8_t*)"\xAA\xAA\xAA\xAA\xAA\xAA\xE7\xE7\xE7\xE7", 10);
+
+	// packet control
+	CC2500_WriteReg(CC2500_3F_TXFIFO, 0x50+(pid<<2));
+	pid++;
+
+	// payload
+	//debug("P:")
+	for (uint8_t i = 0; i < E016HV2_PAYLOAD_SIZE; ++i)
+	{
+		uint8_t byte = (bit_reverse(packet[i])<<1) | (packet[i+1]&0x01);
+		//debug(" %02X",byte)
+		CC2500_WriteReg(CC2500_3F_TXFIFO,byte);
+		crc16_update(byte, 8);
+	}
+
+	// crc
+	CC2500_WriteReg(CC2500_3F_TXFIFO,crc >> 8);
+	CC2500_WriteReg(CC2500_3F_TXFIFO,crc);
+	//debugln(" %04X",crc)
+
+	// transmit
+	CC2500_Strobe(CC2500_STX);
+}
+
+uint16_t E016HV2_callback()
+{
+	E016HV2_send_packet();
+	return E016HV2_PACKET_PERIOD;
+}
+
+void E016HV2_init()
+{
+	//Config CC2500
+	CC2500_250K_Init();
+	CC2500_250K_RFChannel(E016HV2_RF_BIND_CHANNEL);		// Set bind channel
+
+	#ifdef FORCE_E016HV2_ORIGINAL_ID
+		rx_tx_addr[2]=0x27;
+		rx_tx_addr[3]=0x1B;
+		//rf_ch_num = 44;
+	#endif
+	//General ID
+	//3F1B -> 68,2C1B -> 49,2B1B -> 48,2A1B -> 47,291B -> 46,281B -> 45,271B -> 44,261B -> 43,251B -> 42
+	//241B -> no bind,231B -> no bind,221B -> 71,211B -> 70,201B -> 69,1F1B -> 68,1E1B -> 67,1D1B -> 66,1C1B -> 65,1B1B -> 64,1A1B -> 63,191B -> 62,181B -> 61,171B -> 60,161B -> 59
+	//0C1B -> 49,051B -> 42,041B -> no bind,031B -> no bind,021B -> 71,011B -> 70,001B -> no bind
+	if(rx_tx_addr[2]<3) rx_tx_addr[2]+=3;			// rx_tx_addr[2]=0 is invalid
+	if(rx_tx_addr[3]==0) rx_tx_addr[3]+=64;			// rx_tx_addr[3]=0 is invalid
+	rf_ch_num = (rx_tx_addr[2] + rx_tx_addr[3]) % 32 + 42;
+	if(rf_ch_num>71)								// channels 72 and 73 are invalid
+	{
+		rx_tx_addr[2]-=2;
+		rf_ch_num-=2;
+	}
+	
+	phase=CH8_SW;
+	flags=0;
+	bind_counter = E016HV2_BIND_COUNT;
+	BIND_IN_PROGRESS;								// Autobind protocol
+}
+
+#endif

Multiprotocol/E016H_nrf24l01.ino

@@ -0,0 +1,154 @@
+/*
+ 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 E016H
+
+#if defined(E016H_NRF24L01_INO)
+
+#include "iface_xn297.h"
+
+//Protocols constants
+#define E016H_BIND_COUNT		500
+#define E016H_ADDRESS_LENGTH	5
+
+#define E016H_PACKET_PERIOD		4080
+#define E016H_PACKET_SIZE		10
+#define E016H_BIND_CHANNEL		80
+#define E016H_NUM_CHANNELS		4
+
+//Channels
+#define E016H_STOP_SW			CH5_SW
+#define E016H_FLIP_SW			CH6_SW
+#define E016H_HEADLESS_SW		CH8_SW
+#define E016H_RTH_SW			CH9_SW
+
+// E016H flags packet[1]
+#define E016H_FLAG_CALIBRATE	0x80
+#define E016H_FLAG_STOP			0x20
+#define E016H_FLAG_FLIP			0x04
+// E016H flags packet[3]
+#define E016H_FLAG_HEADLESS		0x10
+#define E016H_FLAG_RTH			0x04
+// E016H flags packet[7]
+#define E016H_FLAG_TAKEOFF		0x80
+#define E016H_FLAG_HIGHRATE		0x08
+
+static void __attribute__((unused)) E016H_send_packet()
+{
+    uint8_t can_flip = 0, calibrate = 1;
+
+	if(IS_BIND_IN_PROGRESS)
+	{
+		memcpy(packet, &rx_tx_addr[1], 4);
+		memcpy(&packet[4], hopping_frequency, 4);
+		packet[8] = 0x23;
+	}
+	else
+	{
+		// trim commands
+		packet[0] = 0;
+		// aileron
+		uint16_t val = convert_channel_16b_limit(AILERON, 0, 0x3ff);
+		can_flip |= (val < 0x100) || (val > 0x300);
+		packet[1] = val >> 8;
+		packet[2] = val & 0xff;
+		if(val < 0x300) calibrate = 0;
+		// elevator
+		val = convert_channel_16b_limit(ELEVATOR, 0x3ff, 0);
+		can_flip |= (val < 0x100) || (val > 0x300);
+		packet[3] = val >> 8;
+		packet[4] = val & 0xff;
+		if(val < 0x300) calibrate = 0;
+		// throttle
+		val = convert_channel_16b_limit(THROTTLE, 0, 0x3ff);
+		packet[5] = val >> 8;
+		packet[6] = val & 0xff;
+		if(val > 0x100) calibrate = 0;
+		// rudder
+		val = convert_channel_16b_limit(RUDDER, 0, 0x3ff);
+		packet[7] = val >> 8;
+		packet[8] = val & 0xff;
+		if(val > 0x100) calibrate = 0;
+		// flags
+		packet[1] |= GET_FLAG(E016H_STOP_SW, E016H_FLAG_STOP)
+				  |  (can_flip ? GET_FLAG(E016H_FLIP_SW, E016H_FLAG_FLIP) : 0)
+				  |  (calibrate ? E016H_FLAG_CALIBRATE : 0);
+		packet[3] |= GET_FLAG(E016H_HEADLESS_SW, E016H_FLAG_HEADLESS)
+				  |  GET_FLAG(E016H_RTH_SW, E016H_FLAG_RTH);
+		packet[7] |= E016H_FLAG_HIGHRATE;
+		// frequency hopping
+		XN297_Hopping(hopping_frequency_no++ & 0x03);
+	}
+	// checksum
+	packet[9] = packet[0];
+	for (uint8_t i=1; i < E016H_PACKET_SIZE-1; i++)
+		packet[9] += packet[i];
+
+	// Send
+	XN297_SetPower();
+	XN297_SetTxRxMode(TX_EN);
+	XN297_WritePayload(packet, E016H_PACKET_SIZE);
+}
+
+static void __attribute__((unused)) E016H_RF_init()
+{
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
+	XN297_SetTXAddr((uint8_t *)"\x5a\x53\x46\x30\x31", 5);  // bind address
+	//XN297_HoppingCalib(E016H_NUM_CHANNELS);
+	XN297_RFChannel(E016H_BIND_CHANNEL);
+}
+
+uint16_t E016H_callback()
+{
+	#ifdef MULTI_SYNC
+		telemetry_set_input_sync(packet_period);
+	#endif
+	if(bind_counter)
+	{
+		bind_counter--;
+		if (bind_counter == 0)
+		{
+			XN297_SetTXAddr(rx_tx_addr, E016H_ADDRESS_LENGTH);
+			BIND_DONE;
+		}
+	}
+	E016H_send_packet();
+	return E016H_PACKET_PERIOD;
+}
+
+static void __attribute__((unused)) E016H_initialize_txid()
+{
+	// tx id
+    rx_tx_addr[0] = 0xa5;
+    rx_tx_addr[1] = 0x00;
+
+    // rf channels
+    uint32_t lfsr=random(0xfefefefe);
+    for(uint8_t i=0; i<E016H_NUM_CHANNELS; i++)
+    {
+		hopping_frequency[i] = (lfsr & 0xFF) % 80; 
+		lfsr>>=8;
+	}
+}
+
+void E016H_init()
+{
+	BIND_IN_PROGRESS;
+	E016H_initialize_txid();
+	E016H_RF_init();
+	bind_counter = E016H_BIND_COUNT;
+	hopping_frequency_no = 0;
+}
+
+#endif

Multiprotocol/E01X_cyrf6936.ino

@@ -0,0 +1,239 @@
+/*
+ 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 E012 and E015
+
+#if defined(E01X_CYRF6936_INO)
+
+#include "iface_hs6200.h"
+
+//Protocols constants
+#define E01X_BIND_COUNT			500
+#define E01X_INITIAL_WAIT		500
+#define E01X_ADDRESS_LENGTH		5
+
+#define E012_PACKET_PERIOD		4525
+#define E012_RF_BIND_CHANNEL	0x3c
+#define E012_NUM_RF_CHANNELS	4
+#define E012_PACKET_SIZE		15
+
+//#define E015_FORCE_ID
+#define E015_PACKET_PERIOD		9000
+#define E015_RF_CHANNEL			0x2d	// 2445 MHz
+#define E015_PACKET_SIZE		10
+#define E015_BIND_PACKET_SIZE	9
+
+//Channels
+#define E01X_ARM_SW			CH5_SW
+#define E016H_STOP_SW		CH5_SW
+#define E01X_FLIP_SW		CH6_SW
+#define E01X_LED_SW			CH7_SW
+#define E01X_HEADLESS_SW	CH8_SW
+#define E01X_RTH_SW			CH9_SW
+
+// E012 flags packet[1]
+#define E012_FLAG_FLIP		0x40
+#define E012_FLAG_HEADLESS	0x10
+#define E012_FLAG_RTH		0x04
+// E012 flags packet[7]
+#define E012_FLAG_EXPERT	0x02
+
+// E015 flags packet[6]
+#define E015_FLAG_DISARM	0x80
+#define E015_FLAG_ARM		0x40
+// E015 flags packet[7]
+#define E015_FLAG_FLIP		0x80
+#define E015_FLAG_HEADLESS	0x10
+#define E015_FLAG_RTH		0x08
+#define E015_FLAG_LED		0x04
+#define E015_FLAG_EXPERT	0x02
+#define E015_FLAG_INTERMEDIATE 0x01
+
+static void __attribute__((unused)) E015_check_arming()
+{
+	uint8_t arm_channel = E01X_ARM_SW;
+
+	if (arm_channel != arm_channel_previous)
+	{
+		arm_channel_previous = arm_channel;
+		if (arm_channel)
+		{
+			armed = 1;
+			arm_flags ^= E015_FLAG_ARM;
+		}
+		else
+		{
+			armed = 0;
+			arm_flags ^= E015_FLAG_DISARM;
+		}
+	}
+}
+
+static void __attribute__((unused)) E01X_send_packet()
+{
+	if(sub_protocol==E012)
+	{
+		packet_length=E012_PACKET_SIZE;
+		packet[0] = rx_tx_addr[1];
+		if(IS_BIND_IN_PROGRESS)
+		{
+			rf_ch_num = E012_RF_BIND_CHANNEL;
+			packet[1] = 0xaa;
+			memcpy(&packet[2], hopping_frequency, E012_NUM_RF_CHANNELS);
+			memcpy(&packet[6], rx_tx_addr, E01X_ADDRESS_LENGTH);
+		}
+		else
+		{
+			rf_ch_num = hopping_frequency[hopping_frequency_no++];
+			hopping_frequency_no %= E012_NUM_RF_CHANNELS;
+			packet[1] = 0x01
+				| GET_FLAG(E01X_RTH_SW,			E012_FLAG_RTH)
+				| GET_FLAG(E01X_HEADLESS_SW,	E012_FLAG_HEADLESS)
+				| GET_FLAG(E01X_FLIP_SW,		E012_FLAG_FLIP);
+			packet[2] = convert_channel_16b_limit(AILERON,  0xc8, 0x00); // aileron
+			packet[3] = convert_channel_16b_limit(ELEVATOR, 0x00, 0xc8); // elevator
+			packet[4] = convert_channel_16b_limit(RUDDER,   0xc8, 0x00); // rudder
+			packet[5] = convert_channel_16b_limit(THROTTLE, 0x00, 0xc8); // throttle
+			packet[6] = 0xaa;
+			packet[7] = E012_FLAG_EXPERT;	// rate (0-2)
+			packet[8] = 0x00;
+			packet[9] = 0x00;
+			packet[10]= 0x00;
+		}
+		packet[11] = 0x00;
+		packet[12] = 0x00;
+		packet[13] = 0x56; 
+		packet[14] = rx_tx_addr[2];
+	}
+	else
+	{ // E015
+		rf_ch_num = E015_RF_CHANNEL;
+		if(IS_BIND_IN_PROGRESS)
+		{
+			packet[0] = 0x18;
+			packet[1] = 0x04;
+			packet[2] = 0x06;
+			// data phase address
+			memcpy(&packet[3], rx_tx_addr, E01X_ADDRESS_LENGTH);
+			packet[8] = 0x63;	// unknown calculation
+			// checksum
+			//packet[8] = packet[3];
+			//for(uint8_t i=4; i<8; i++)
+			//	packet[8] += packet[i];
+			packet_length=E015_BIND_PACKET_SIZE;
+		}
+		else
+		{
+			E015_check_arming();
+			packet[0] = convert_channel_16b_limit(THROTTLE,	0, 225); // throttle
+			packet[1] = convert_channel_16b_limit(RUDDER,   225, 0); // rudder
+			packet[2] = convert_channel_16b_limit(AILERON,  0, 225); // aileron
+			packet[3] = convert_channel_16b_limit(ELEVATOR, 225, 0); // elevator
+			packet[4] = 0x20; // elevator trim
+			packet[5] = 0x20; // aileron trim
+			packet[6] = arm_flags;
+			packet[7] = E015_FLAG_EXPERT
+				| GET_FLAG(E01X_FLIP_SW,	E015_FLAG_FLIP)
+				| GET_FLAG(E01X_LED_SW,		E015_FLAG_LED)
+				| GET_FLAG(E01X_HEADLESS_SW,E015_FLAG_HEADLESS)
+				| GET_FLAG(E01X_RTH_SW,		E015_FLAG_RTH);
+			packet[8] = 0;
+			// checksum
+			packet[9] = packet[0];
+			for(uint8_t i=1; i<9; i++)
+				packet[9] += packet[i];
+			packet_length=E015_PACKET_SIZE;
+		}
+	}
+
+	HS6200_RFChannel(rf_ch_num);
+	HS6200_SetPower();
+	delayMicroseconds(270);		// Wait for RF channel to settle
+	HS6200_SendPayload(packet, packet_length);
+}
+
+static void __attribute__((unused)) E01X_RF_init()
+{
+	HS6200_Init(true);	// CRC enabled
+
+	if(sub_protocol==E012)
+		HS6200_SetTXAddr((uint8_t *)"\x55\x42\x9C\x8F\xC9", E01X_ADDRESS_LENGTH);
+	else //E015
+		HS6200_SetTXAddr((uint8_t *)"\x62\x54\x79\x38\x53", E01X_ADDRESS_LENGTH);
+}
+
+uint16_t E01X_callback()
+{
+	#ifdef MULTI_SYNC
+		telemetry_set_input_sync(packet_period);
+	#endif
+	if(bind_counter)
+	{
+		bind_counter--;
+		if (bind_counter == 0)
+		{
+			HS6200_SetTXAddr(rx_tx_addr,  E01X_ADDRESS_LENGTH);
+			BIND_DONE;
+		}
+	}
+	E01X_send_packet();
+	return packet_period;
+}
+
+static void __attribute__((unused)) E012_initialize_txid()
+{
+    // rf channels
+    uint32_t lfsr=random(0xfefefefe);
+    for(uint8_t i=0; i<E012_NUM_RF_CHANNELS; i++)
+    {
+		hopping_frequency[i] = 0x10 + ((lfsr & 0xff) % 0x32); 
+		lfsr>>=8;
+	}
+}
+
+void E01X_init()
+{
+	BIND_IN_PROGRESS;
+	if(sub_protocol==E012)
+	{
+		E012_initialize_txid();
+		packet_period=E012_PACKET_PERIOD;
+	}
+	else //E015
+	{
+		#ifdef E015_FORCE_ID
+			rx_tx_addr[0] = 0x06;
+			rx_tx_addr[1] = 0xC6;
+			rx_tx_addr[2] = 0xB7;
+			rx_tx_addr[3] = 0x56;
+			rx_tx_addr[4] = 0x8A;
+		#endif
+
+		//force the sum to give 0x63 since the id calculation is unknown
+		uint8_t sum=0x63;
+		for(uint8_t i=0; i < 4; i++)
+			sum -= rx_tx_addr[i];
+		rx_tx_addr[4] = sum;
+
+		packet_period=E015_PACKET_PERIOD;
+		armed = 0;
+		arm_flags = 0;
+		arm_channel_previous = E01X_ARM_SW;
+	}
+	E01X_RF_init();
+	bind_counter = E01X_BIND_COUNT;
+	hopping_frequency_no = 0;
+}
+
+#endif

Multiprotocol/E01X_nrf24l01.ino

@@ -1,352 +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 E012 and E015
-
-#if defined(E01X_NRF24L01_INO)
-
-#include "iface_nrf24l01.h"
-
-//Protocols constants
-#define E01X_BIND_COUNT			500
-#define E01X_INITIAL_WAIT		500
-#define E01X_ADDRESS_LENGTH		5
-
-#define E012_PACKET_PERIOD		4525
-#define E012_RF_BIND_CHANNEL	0x3c
-#define E012_NUM_RF_CHANNELS	4
-#define E012_PACKET_SIZE		15
-
-#define E015_PACKET_PERIOD		4500	// stock Tx=9000, but let's send more packets ...
-#define E015_RF_CHANNEL			0x2d	// 2445 MHz
-#define E015_PACKET_SIZE		10
-#define E015_BIND_PACKET_SIZE	9
-
-#define E016H_PACKET_PERIOD 4080
-#define E016H_PACKET_SIZE     10
-#define E016H_BIND_CHANNEL    80
-#define E016H_NUM_CHANNELS    4
-
-//Channels
-#define E01X_ARM_SW			CH5_SW
-#define E016H_STOP_SW		CH5_SW
-#define E01X_FLIP_SW		CH6_SW
-#define E01X_LED_SW			CH7_SW
-#define E01X_HEADLESS_SW	CH8_SW
-#define E01X_RTH_SW			CH9_SW
-
-// E012 flags packet[1]
-#define E012_FLAG_FLIP		0x40
-#define E012_FLAG_HEADLESS	0x10
-#define E012_FLAG_RTH		0x04
-// E012 flags packet[7]
-#define E012_FLAG_EXPERT	0x02
-
-// E015 flags packet[6]
-#define E015_FLAG_DISARM	0x80
-#define E015_FLAG_ARM		0x40
-// E015 flags packet[7]
-#define E015_FLAG_FLIP		0x80
-#define E015_FLAG_HEADLESS	0x10
-#define E015_FLAG_RTH		0x08
-#define E015_FLAG_LED		0x04
-#define E015_FLAG_EXPERT	0x02
-#define E015_FLAG_INTERMEDIATE 0x01
-
-// E016H flags packet[1]
-#define E016H_FLAG_CALIBRATE	0x80
-#define E016H_FLAG_STOP		0x20
-#define E016H_FLAG_FLIP		0x04
-// E016H flags packet[3]
-#define E016H_FLAG_HEADLESS	0x10
-#define E016H_FLAG_RTH		0x04
-// E016H flags packet[7]
-#define E016H_FLAG_TAKEOFF	0x80
-#define E016H_FLAG_HIGHRATE	0x08
-
-static void __attribute__((unused)) E015_check_arming()
-{
-	uint8_t arm_channel = E01X_ARM_SW;
-
-	if (arm_channel != arm_channel_previous)
-	{
-		arm_channel_previous = arm_channel;
-		if (arm_channel)
-		{
-			armed = 1;
-			arm_flags ^= E015_FLAG_ARM;
-		}
-		else
-		{
-			armed = 0;
-			arm_flags ^= E015_FLAG_DISARM;
-		}
-	}
-}
-
-static void __attribute__((unused)) E01X_send_packet(uint8_t bind)
-{
-    uint8_t can_flip = 0, calibrate = 1;
-	if(sub_protocol==E012)
-	{
-		packet_length=E012_PACKET_SIZE;
-		packet[0] = rx_tx_addr[1];
-		if(bind)
-		{
-			packet[1] = 0xaa;
-			memcpy(&packet[2], hopping_frequency, E012_NUM_RF_CHANNELS);
-			memcpy(&packet[6], rx_tx_addr, E01X_ADDRESS_LENGTH);
-			rf_ch_num=E012_RF_BIND_CHANNEL;
-		}
-		else
-		{
-			packet[1] = 0x01
-				| GET_FLAG(E01X_RTH_SW,			E012_FLAG_RTH)
-				| GET_FLAG(E01X_HEADLESS_SW,	E012_FLAG_HEADLESS)
-				| GET_FLAG(E01X_FLIP_SW,		E012_FLAG_FLIP);
-			packet[2] = convert_channel_16b_limit(AILERON,  0xc8, 0x00); // aileron
-			packet[3] = convert_channel_16b_limit(ELEVATOR, 0x00, 0xc8); // elevator
-			packet[4] = convert_channel_16b_limit(RUDDER,   0xc8, 0x00); // rudder
-			packet[5] = convert_channel_16b_limit(THROTTLE, 0x00, 0xc8); // throttle
-			packet[6] = 0xaa;
-			packet[7] = E012_FLAG_EXPERT;	// rate (0-2)
-			packet[8] = 0x00;
-			packet[9] = 0x00;
-			packet[10]= 0x00;
-			rf_ch_num=hopping_frequency[hopping_frequency_no++];
-			hopping_frequency_no %= E012_NUM_RF_CHANNELS;
-		}
-		packet[11] = 0x00;
-		packet[12] = 0x00;
-		packet[13] = 0x56; 
-		packet[14] = rx_tx_addr[2];
-	}
-	else if(sub_protocol==E015)
-	{ // E015
-		if(bind)
-		{
-			packet[0] = 0x18;
-			packet[1] = 0x04;
-			packet[2] = 0x06;
-			// data phase address
-			memcpy(&packet[3], rx_tx_addr, E01X_ADDRESS_LENGTH);
-			// checksum
-			packet[8] = packet[3];
-			for(uint8_t i=4; i<8; i++)
-				packet[8] += packet[i];
-			packet_length=E015_BIND_PACKET_SIZE;
-		}
-		else
-		{
-			E015_check_arming();
-			packet[0] = convert_channel_16b_limit(THROTTLE,	0, 225); // throttle
-			packet[1] = convert_channel_16b_limit(RUDDER,   225, 0); // rudder
-			packet[2] = convert_channel_16b_limit(AILERON,  0, 225); // aileron
-			packet[3] = convert_channel_16b_limit(ELEVATOR, 225, 0); // elevator
-			packet[4] = 0x20; // elevator trim
-			packet[5] = 0x20; // aileron trim
-			packet[6] = arm_flags;
-			packet[7] = E015_FLAG_EXPERT
-				| GET_FLAG(E01X_FLIP_SW,	E015_FLAG_FLIP)
-				| GET_FLAG(E01X_LED_SW,		E015_FLAG_LED)
-				| GET_FLAG(E01X_HEADLESS_SW,E015_FLAG_HEADLESS)
-				| GET_FLAG(E01X_RTH_SW,		E015_FLAG_RTH);
-			packet[8] = 0;
-			// checksum
-			packet[9] = packet[0];
-			for(uint8_t i=1; i<9; i++)
-				packet[9] += packet[i];
-			packet_length=E015_PACKET_SIZE;
-		}
-	}
-	else
-	{ // E016H
-		packet_length=E016H_PACKET_SIZE;
-		if(bind)
-		{
-			rf_ch_num=E016H_BIND_CHANNEL;
-			memcpy(packet, &rx_tx_addr[1], 4);
-			memcpy(&packet[4], hopping_frequency, 4);
-			packet[8] = 0x23;
-		}
-		else
-		{
-			// trim commands
-			packet[0] = 0;
-			// aileron
-			uint16_t val = convert_channel_16b_limit(AILERON, 0, 0x3ff);
-			can_flip |= (val < 0x100) || (val > 0x300);
-			packet[1] = val >> 8;
-			packet[2] = val & 0xff;
-			if(val < 0x300) calibrate = 0;
-			// elevator
-			val = convert_channel_16b_limit(ELEVATOR, 0x3ff, 0);
-			can_flip |= (val < 0x100) || (val > 0x300);
-			packet[3] = val >> 8;
-			packet[4] = val & 0xff;
-			if(val < 0x300) calibrate = 0;
-			// throttle
-			val = convert_channel_16b_limit(THROTTLE, 0, 0x3ff);
-			packet[5] = val >> 8;
-			packet[6] = val & 0xff;
-			if(val > 0x100) calibrate = 0;
-			// rudder
-			val = convert_channel_16b_limit(RUDDER, 0, 0x3ff);
-			packet[7] = val >> 8;
-			packet[8] = val & 0xff;
-			if(val > 0x100) calibrate = 0;
-			// flags
-			packet[1] |= GET_FLAG(E016H_STOP_SW, E016H_FLAG_STOP)
-					  |  (can_flip ? GET_FLAG(E01X_FLIP_SW, E016H_FLAG_FLIP) : 0)
-					  |  (calibrate ? E016H_FLAG_CALIBRATE : 0);
-			packet[3] |= GET_FLAG(E01X_HEADLESS_SW, E016H_FLAG_HEADLESS)
-					  |  GET_FLAG(E01X_RTH_SW, E016H_FLAG_RTH);
-			packet[7] |= E016H_FLAG_HIGHRATE;
-			// frequency hopping
-			rf_ch_num=hopping_frequency[hopping_frequency_no++ & 0x03];
-		}
-		// checksum
-		packet[9] = packet[0];
-		for (uint8_t i=1; i < E016H_PACKET_SIZE-1; i++)
-			packet[9] += packet[i];
-	}
-
-	// Power on, TX mode, CRC enabled
-	if(sub_protocol==E016H)
-		XN297_Configure( _BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO) | _BV(NRF24L01_00_PWR_UP));
-	else //E012 & E015
-		HS6200_Configure(_BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO) | _BV(NRF24L01_00_PWR_UP));
-	NRF24L01_WriteReg(NRF24L01_05_RF_CH, rf_ch_num);
-
-	NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);
-	NRF24L01_FlushTx();
-
-	if(sub_protocol==E016H)
-		XN297_WritePayload(packet, packet_length);
-	else
-		HS6200_WritePayload(packet, packet_length);
-
-	// Check and adjust transmission power. We do this after
-	// transmission to not bother with timeout after power
-	// settings change -  we have plenty of time until next
-	// packet.
-	NRF24L01_SetPower();
-}
-
-static void __attribute__((unused)) E01X_init()
-{
-	NRF24L01_Initialize();
-	NRF24L01_SetTxRxMode(TX_EN);
-	if(sub_protocol==E012)
-		HS6200_SetTXAddr((uint8_t *)"\x55\x42\x9C\x8F\xC9", E01X_ADDRESS_LENGTH);
-	else if(sub_protocol==E015)
-		HS6200_SetTXAddr((uint8_t *)"\x62\x54\x79\x38\x53", E01X_ADDRESS_LENGTH);
-	else //E016H
-		XN297_SetTXAddr((uint8_t *)"\x5a\x53\x46\x30\x31", 5);  // bind address
-	NRF24L01_FlushTx();
-	NRF24L01_FlushRx();
-	NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);     // Clear data ready, data sent, and retransmit
-	NRF24L01_WriteReg(NRF24L01_01_EN_AA, 0x00);      // No Auto Acknowldgement on all data pipes
-	NRF24L01_WriteReg(NRF24L01_03_SETUP_AW, 0x03);
-	NRF24L01_WriteReg(NRF24L01_04_SETUP_RETR, 0x00); // no retransmits
-	NRF24L01_SetBitrate(NRF24L01_BR_1M);             // 1 Mbps
-	NRF24L01_SetPower();
-	NRF24L01_Activate(0x73);                          // Activate feature register
-	NRF24L01_WriteReg(NRF24L01_1C_DYNPD, 0x00);       // Disable dynamic payload length on all pipes
-	NRF24L01_WriteReg(NRF24L01_1D_FEATURE, 0x01);     // Set feature bits on
-	NRF24L01_Activate(0x73);
-}
-
-uint16_t E01X_callback()
-{
-	if(IS_BIND_IN_PROGRESS)
-	{
-		if (bind_counter == 0)
-		{
-			if(sub_protocol==E016H)
-				XN297_SetTXAddr(rx_tx_addr, E01X_ADDRESS_LENGTH);
-			else
-				HS6200_SetTXAddr(rx_tx_addr,  E01X_ADDRESS_LENGTH);
-			BIND_DONE;
-		}
-		else
-		{
-			E01X_send_packet(1);
-			bind_counter--;
-		}
-	}
-	else
-	{
-		#ifdef MULTI_SYNC
-			telemetry_set_input_sync(packet_period);
-		#endif
-		E01X_send_packet(0);
-	}
-	return packet_period;
-}
-
-static void __attribute__((unused)) E012_initialize_txid()
-{
-    // rf channels
-    uint32_t lfsr=random(0xfefefefe);
-    for(uint8_t i=0; i<E012_NUM_RF_CHANNELS; i++)
-    {
-		hopping_frequency[i] = 0x10 + ((lfsr & 0xff) % 0x32); 
-		lfsr>>=8;
-	}
-}
-
-static void __attribute__((unused)) E016H_initialize_txid()
-{
-	// tx id
-    rx_tx_addr[0] = 0xa5;
-    rx_tx_addr[1] = 0x00;
-
-    // rf channels
-    uint32_t lfsr=random(0xfefefefe);
-    for(uint8_t i=0; i<E016H_NUM_CHANNELS; i++)
-    {
-		hopping_frequency[i] = (lfsr & 0xFF) % 80; 
-		lfsr>>=8;
-	}
-}
-
-uint16_t initE01X()
-{
-	BIND_IN_PROGRESS;
-	if(sub_protocol==E012)
-	{
-		E012_initialize_txid();
-		packet_period=E012_PACKET_PERIOD;
-	}
-	else if(sub_protocol==E015)
-	{
-		packet_period=E015_PACKET_PERIOD;
-		rf_ch_num=E015_RF_CHANNEL;
-		armed = 0;
-		arm_flags = 0;
-		arm_channel_previous = E01X_ARM_SW;
-	}
-	else
-	{ // E016H
-		E016H_initialize_txid();
-		packet_period=E016H_PACKET_PERIOD;
-	}
-	E01X_init();
-	bind_counter = E01X_BIND_COUNT;
-	hopping_frequency_no = 0;
-	return E01X_INITIAL_WAIT;
-}
-
-#endif

Multiprotocol/E129_cyrf6936.ino

@@ -0,0 +1,177 @@
+/*
+ This project is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Multiprotocol is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Multiprotocol.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#if defined(E129_CYRF6936_INO)
+
+#include "iface_rf2500.h"
+
+//#define E129_FORCE_ID
+//#define C186_FORCE_ID
+
+#define E129_BIND_CH		0x2D	//45
+#define E129_PAYLOAD_SIZE	16
+#define C186_PAYLOAD_SIZE	19
+
+static void __attribute__((unused)) E129_build_data_packet()
+{
+	//Build the packet
+	memset(packet,0,packet_length);
+	packet[ 0] = packet_length - 1;						// Packet length
+	if(IS_BIND_IN_PROGRESS)
+	{
+		packet[ 1] = 0xA4;
+		packet[ 2] = bit_reverse(rx_tx_addr[2]);
+		packet[ 3] = bit_reverse(rx_tx_addr[3]);
+		packet[ 4] = bit_reverse(rx_tx_addr[0]);
+		packet[ 5] = bit_reverse(rx_tx_addr[1]);
+		for(uint8_t i=0; i<4; i++)
+			packet[6+i]=hopping_frequency[i]-2;
+	}
+	else
+	{
+		packet[ 1] = 0xA6;
+		//Flags
+		if(sub_protocol == E129_E129)
+			packet[ 2] = 0xF7;							// High rate 0xF7, low 0xF4
+		else //C186
+		{
+			packet[ 2] = 0xFA;							// High rate 0xFA, medium 0xF7, low 0xF4
+			packet[13] = bit_reverse(rx_tx_addr[2]);
+			packet[14] = bit_reverse(rx_tx_addr[3]);
+			packet[15] = bit_reverse(rx_tx_addr[0]);
+			packet[16] = bit_reverse(rx_tx_addr[1]);
+		}
+		//packet[ 3] = 0x00;							// E129 Mode: short press=0x20->0x00->0x20->..., long press=0x10->0x30->0x10->... => C186 throttle trim is doing the same:up=short press and down=long press
+		packet[ 4] = GET_FLAG(CH5_SW, 0x20)				// Take off/Land 0x20
+				   | GET_FLAG(CH6_SW, 0x04);			// Emergency stop 0x04
+		//Channels and trims
+		uint16_t val = convert_channel_10b(AILERON,false);
+		uint8_t trim = convert_channel_8b(CH7) & 0xFC;
+		packet[ 5] = trim | (val >>8);					// Trim (0x00..0x1F..0x3E) << 2 | channel >> 8
+		packet[ 6] = val;								// channel (0x000...0x200...0x3FF)
+		val = convert_channel_10b(ELEVATOR,false);
+		trim = convert_channel_8b(CH8) & 0xFC;
+		packet[ 7] = trim | (val >>8);					// Trim (0x00..0x1F..0x3E) << 2 | channel >> 8
+		packet[ 8] = val;								// channel (0x000...0x200...0x3FF)
+		if(packet_count>200)
+			val = convert_channel_10b(THROTTLE,false);
+		else
+		{//Allow bind to complete with throttle not centered
+			packet_count++;
+			val=0x200;
+		}
+		packet[ 9] = (0x1F<<2) | (val >>8);				// Trim (0x00..0x1F..0x3E) << 2 | channel >> 8
+		packet[10] = val;								// channel (0x000...0x200...0x3FF)
+		val = convert_channel_10b(RUDDER,false);
+		trim = convert_channel_8b(CH9) & 0xFC;
+		packet[11] = trim | (val >>8);					// Trim (0x00..0x1F..0x3E) << 2 | channel >> 8
+		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++)
+		packet[packet_length-2] += packet[i];
+		
+	RF2500_BuildPayload(packet);
+}
+
+uint16_t E129_callback()
+{
+	//Set RF channel
+	if(phase==0)
+		RF2500_RFChannel(IS_BIND_IN_PROGRESS ? E129_BIND_CH : hopping_frequency[hopping_frequency_no]);
+
+	//Send packet
+	RF2500_SendPayload();
+	
+	//E129 sends twice on same channel, not the C186 but there is a bug somewhere if I don't send the packets back to back
+	if(phase==0)
+	{
+		phase++;
+		return 1260;
+	}
+
+	//Bind
+	if(bind_counter)
+		if(--bind_counter==0)
+		{
+			BIND_DONE;
+			RF2500_SetTXAddr(rx_tx_addr);	// 4 bytes of address
+		}
+
+	//Build packet
+	E129_build_data_packet();
+	
+	//Set power
+	RF2500_SetPower();
+	
+	//Hopp
+	hopping_frequency_no++;
+	hopping_frequency_no &= 3;
+
+	phase=0;
+	if(sub_protocol==E129_E129)
+		return 5200-1260;
+	return 5500-1260;						//E129_C186
+}
+
+void E129_init()
+{
+	BIND_IN_PROGRESS;						// Autobind protocol
+    bind_counter = 384;						// ~2sec
+
+	//RF2500 emu init
+	packet_length = sub_protocol == E129_E129?E129_PAYLOAD_SIZE:C186_PAYLOAD_SIZE;
+	RF2500_Init(packet_length, true);		// 16/19 bytes, Scrambled
+   
+	//Freq hopping
+	calc_fh_channels(4);
+	for(uint8_t i=0; i<4; i++)
+		if(hopping_frequency[i]==E129_BIND_CH)
+			hopping_frequency[i]++;
+	
+    #ifdef E129_FORCE_ID
+        rx_tx_addr[0]=0xC1;
+        rx_tx_addr[1]=0x22;
+        rx_tx_addr[2]=0x05;
+        rx_tx_addr[3]=0xA3;
+        hopping_frequency[0]=0x3C;			//60
+        hopping_frequency[1]=0x49;			//73
+        hopping_frequency[2]=0x4B;			//75
+        hopping_frequency[3]=0x41;			//65
+    #endif
+    #ifdef C186_FORCE_ID
+        rx_tx_addr[0]=0x91;
+        rx_tx_addr[1]=0x02;
+        rx_tx_addr[2]=0x5D;
+        rx_tx_addr[3]=0x33;
+        hopping_frequency[0]=0x44 + 2;
+        hopping_frequency[1]=0x41 + 2;
+        hopping_frequency[2]=0x43 + 2;
+        hopping_frequency[3]=0x49 + 2;
+    #endif
+
+	RF2500_SetTXAddr((uint8_t*)"\xE2\x32\xE0\xC8");	// 4 bytes of bind address
+
+	E129_build_data_packet();
+	hopping_frequency_no=0;
+	packet_count=0;
+	phase=0;
+}
+
+#endif

Multiprotocol/ESky150_nrf24l01.ino

@@ -23,7 +23,7 @@
 #define ESKY150_BINDING_PACKET_PERIOD	2000
 #define ESKY150_SENDING_PACKET_PERIOD	4800
 
-static void __attribute__((unused)) ESKY150_init()
+static void __attribute__((unused)) ESKY150_RF_init()
 {
 	//Original TX always sets for channelx 0x22 and 0x4a
 	// Use channels 2..79
@@ -31,25 +31,16 @@ static void __attribute__((unused)) ESKY150_init()
 	hopping_frequency[1] = hopping_frequency[0] + 40;
 
 	NRF24L01_Initialize();
-	NRF24L01_WriteReg(NRF24L01_00_CONFIG, (_BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO))); 
-	NRF24L01_WriteReg(NRF24L01_01_EN_AA, 0x00);      // No Auto Acknoledgement
-	NRF24L01_WriteReg(NRF24L01_02_EN_RXADDR, 0x01);  // Enable data pipe 0
 	NRF24L01_WriteReg(NRF24L01_03_SETUP_AW, 0x02);   // 4-byte RX/TX address
-	NRF24L01_WriteReg(NRF24L01_04_SETUP_RETR, 0);    // Disable retransmit
-	NRF24L01_SetPower();
 	NRF24L01_SetBitrate(NRF24L01_BR_2M);
-	NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);     // Clear data ready, data sent, and retransmit
 	NRF24L01_WriteReg(NRF24L01_11_RX_PW_P0, ESKY150_PAYLOADSIZE);   // bytes of data payload for pipe 0
 	NRF24L01_WriteRegisterMulti(NRF24L01_10_TX_ADDR, rx_tx_addr, ESKY150_TX_ADDRESS_SIZE);
 
-	NRF24L01_Activate(0x73);
 	NRF24L01_WriteReg(NRF24L01_1C_DYNPD, 1); // Dynamic payload for data pipe 0
 	// Enable: Dynamic Payload Length, Payload with ACK , W_TX_PAYLOAD_NOACK
 	NRF24L01_WriteReg(NRF24L01_1D_FEATURE, _BV(NRF2401_1D_EN_DPL) | _BV(NRF2401_1D_EN_ACK_PAY) | _BV(NRF2401_1D_EN_DYN_ACK));
-	NRF24L01_Activate(0x73);
-	NRF24L01_FlushTx();
-	// Turn radio power on
-	NRF24L01_SetTxRxMode(TX_EN);
+
+	NRF24L01_SetTxRxMode(TX_EN);						// Clear data ready, data sent, retransmit and enable CRC 16bits, ready for TX
 }
 
 static void __attribute__((unused)) ESKY150_bind_init()
@@ -171,16 +162,15 @@ uint16_t ESKY150_callback()
 	return ESKY150_SENDING_PACKET_PERIOD;
 }
 
-uint16_t initESKY150(void)
+void ESKY150_init(void)
 {
-	ESKY150_init();
+	ESKY150_RF_init();
 	if(IS_BIND_IN_PROGRESS)
 	{
 		bind_counter=3000;
 		ESKY150_bind_init();
 	}
 	hopping_frequency_no=0;
-	return 10000;
 }
 
 #endif

Multiprotocol/ESky150v2_cc2500.ino

@@ -52,17 +52,17 @@ static void __attribute__((unused)) ESKY150V2_set_freq(void)
 	hopping_frequency[ESKY150V2_NFREQCHANNELS]=ESKY150V2_BIND_CHANNEL;
 	
 	//Calib all channels
-	NRF250K_SetFreqOffset();	// Set frequency offset
-	NRF250K_HoppingCalib(ESKY150V2_NFREQCHANNELS+1);
+	CC2500_SetFreqOffset();	// Set frequency offset
+	CC2500_250K_HoppingCalib(ESKY150V2_NFREQCHANNELS+1);
 }
 
 static void __attribute__((unused)) ESKY150V2_send_packet()
 {
-	NRF250K_SetFreqOffset();	// Set frequency offset
-	NRF250K_Hopping(hopping_frequency_no);
+	CC2500_SetFreqOffset();	// Set frequency offset
+	CC2500_250K_Hopping(hopping_frequency_no);
 	if (++hopping_frequency_no >= ESKY150V2_NFREQCHANNELS)
 		hopping_frequency_no = 0;
-	NRF250K_SetPower();			//Set power level
+	CC2500_SetPower();			//Set power level
 
 	packet[0] = 0xFA;		// Unknown
 	packet[1] = 0x41;		// Unknown
@@ -79,7 +79,6 @@ static void __attribute__((unused)) ESKY150V2_send_packet()
 
 uint16_t ESKY150V2_callback()
 {
-	if(option==0) option=1; 	//Trick the RF component auto select system
 	if(IS_BIND_DONE)
 	{
 		#ifdef MULTI_SYNC
@@ -90,7 +89,7 @@ uint16_t ESKY150V2_callback()
 	else
 	{
 		BIND_DONE;					//Need full power for bind to work...
-		NRF250K_SetPower();			//Set power level
+		CC2500_SetPower();			//Set power level
 		BIND_IN_PROGRESS;
 		NRF250K_WritePayload(packet, ESKY150V2_BINDPAYLOADSIZE);
 		if (--bind_counter == 0)
@@ -105,10 +104,9 @@ uint16_t ESKY150V2_callback()
 	return ESKY150V2_PACKET_PERIOD;
 }
 
-uint16_t initESKY150V2()
+void ESKY150V2_init()
 {
-	if(option==0) option=1;		 // Trick the RF component auto select system
-	NRF250K_Init();
+	CC2500_250K_Init();
 	ESKY150V2_set_freq();
 	hopping_frequency_no = 0;
 
@@ -121,7 +119,7 @@ uint16_t initESKY150V2()
 	if(IS_BIND_IN_PROGRESS)
 	{
 		NRF250K_SetTXAddr((uint8_t *)"\x73\x73\x74\x63", ESKY150V2_TXID_SIZE);	//Bind address
-		NRF250K_Hopping(ESKY150V2_NFREQCHANNELS);	//Bind channel
+		CC2500_250K_Hopping(ESKY150V2_NFREQCHANNELS);	//Bind channel
 		memcpy(packet,"\x73\x73\x74\x63", ESKY150V2_TXID_SIZE);
 		memcpy(&packet[ESKY150V2_TXID_SIZE],rx_tx_addr, ESKY150V2_TXID_SIZE);
 		packet[8]=0x41;								//Unknown
@@ -135,7 +133,6 @@ uint16_t initESKY150V2()
 	}
 	else
 		NRF250K_SetTXAddr(rx_tx_addr, ESKY150V2_TXID_SIZE);
-	return 50000;
 }
 
 #endif

Multiprotocol/ESky_nrf24l01.ino

@@ -35,14 +35,10 @@ static void __attribute__((unused)) ESKY_set_data_address()
 	NRF24L01_WriteRegisterMulti(NRF24L01_10_TX_ADDR,    rx_tx_addr, 4);
 }
 
-static void __attribute__((unused)) ESKY_init()
+static void __attribute__((unused)) ESKY_RF_init()
 {
 	NRF24L01_Initialize();
 
-	// 2-bytes CRC, radio off
-	NRF24L01_WriteReg(NRF24L01_00_CONFIG, _BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO)); 
-	NRF24L01_WriteReg(NRF24L01_01_EN_AA, 0x00);            // No Auto Acknowledgement
-	NRF24L01_WriteReg(NRF24L01_02_EN_RXADDR, 0x01);        // Enable data pipe 0
 	if (IS_BIND_IN_PROGRESS)
 	{
 		NRF24L01_WriteReg(NRF24L01_03_SETUP_AW, 0x01);     // 3-byte RX/TX address for bind packets
@@ -51,11 +47,7 @@ static void __attribute__((unused)) ESKY_init()
 	}
 	else
 		ESKY_set_data_address();
-	NRF24L01_WriteReg(NRF24L01_04_SETUP_RETR, 0);          // No auto retransmission
 	NRF24L01_WriteReg(NRF24L01_05_RF_CH, 50);              // Channel 50 for bind packets
-	NRF24L01_SetBitrate(NRF24L01_BR_1M);                   // 1Mbps
-	NRF24L01_SetPower();
-	NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);           // Clear data ready, data sent, and retransmit
 	NRF24L01_WriteReg(NRF24L01_11_RX_PW_P0, ESKY_PAYLOAD_SIZE);  // bytes of data payload for pipe 0
 	NRF24L01_WriteReg(NRF24L01_12_RX_PW_P1, ESKY_PAYLOAD_SIZE);
 	NRF24L01_WriteReg(NRF24L01_13_RX_PW_P2, ESKY_PAYLOAD_SIZE);
@@ -65,7 +57,7 @@ static void __attribute__((unused)) ESKY_init()
 	NRF24L01_WriteReg(NRF24L01_17_FIFO_STATUS, 0x00);      // Just in case, no real bits to write here
 }
 
-static void __attribute__((unused)) ESKY_init2()
+static void __attribute__((unused)) ESKY_TXID_init()
 {
 	NRF24L01_FlushTx();
 	if(sub_protocol==ESKY_STD)
@@ -187,7 +179,7 @@ uint16_t ESKY_callback()
 	return ESKY_STD_PACKET_PERIOD;
 }
 
-uint16_t initESKY(void)
+void ESKY_init(void)
 {
 	bind_counter = ESKY_BIND_COUNT;
 	rx_tx_addr[2] = rx_tx_addr[3];	// Model match
@@ -200,10 +192,9 @@ uint16_t initESKY(void)
 	  }
 	#endif
 	rx_tx_addr[3] = 0xBB;
-	ESKY_init();
-	ESKY_init2();
+	ESKY_RF_init();
+	ESKY_TXID_init();
 	packet_count=0;
-	return 50000;
 }
 
 #endif

Multiprotocol/FQ777_nrf24l01.ino

@@ -52,24 +52,18 @@ static void __attribute__((unused)) ssv_pack_dpl(uint8_t addr[], uint8_t pid, ui
 	header[0] = (addr[4] >> 7);
 
 	// calculate the crc
-	union 
-	{
-		uint8_t bytes[2];
-		uint16_t val;
-	} crc;
-
-	crc.val=0x3c18;
+	crc=0x3c18;
 	for (i = 0; i < 7; ++i)
-		crc.val=crc16_update(crc.val,header[i],8);
+		crc16_update(header[i],8);
 	for (i = 0; i < *len; ++i)
-		crc.val=crc16_update(crc.val,payload[i],8);
+		crc16_update(payload[i],8);
 
 	// encode payload and crc
 	// xor with this:
 	for (i = 0; i < *len; ++i)
 		payload[i] ^= ssv_xor[i];
-	crc.bytes[1] ^= ssv_xor[i++];
-	crc.bytes[0] ^= ssv_xor[i++];
+	crc ^= ssv_xor[i++]<<8;
+	crc ^= ssv_xor[i++];
 
 	// pack the pcf, payload, and crc into packed_payload
 	packed_payload[0] = pcf >> 1;
@@ -78,20 +72,20 @@ static void __attribute__((unused)) ssv_pack_dpl(uint8_t addr[], uint8_t pid, ui
 	for (i = 0; i < *len - 1; ++i)
 		packed_payload[i+2] = (payload[i] << 7) | (payload[i+1] >> 1);
 
-	packed_payload[i+2] = (payload[i] << 7) | (crc.val >> 9);
+	packed_payload[i+2] = (payload[i] << 7) | (crc >> 9);
 	++i;
-	packed_payload[i+2] = (crc.val >> 1 & 0x80 ) | (crc.val >> 1 & 0x7F);
+	packed_payload[i+2] = (crc >> 1 & 0x80 ) | (crc >> 1 & 0x7F);
 	++i;
-	packed_payload[i+2] = (crc.val << 7);
+	packed_payload[i+2] = (crc << 7);
 
 	*len += 4;
 }
 
-static void __attribute__((unused)) FQ777_send_packet(uint8_t bind)
+static void __attribute__((unused)) FQ777_send_packet()
 {
 	uint8_t packet_len = FQ777_PACKET_SIZE;
 	uint8_t packet_ori[8];
-	if (bind)
+	if (IS_BIND_IN_PROGRESS)
 	{
 		// 4,5,6 = address fields
 		// last field is checksum of address fields
@@ -144,7 +138,7 @@ static void __attribute__((unused)) FQ777_send_packet(uint8_t bind)
 		packet_count++;
 	}
 
-	ssv_pack_dpl( (0 == bind) ? rx_tx_addr : FQ777_bind_addr, hopping_frequency_no, &packet_len, packet_ori, packet);
+	ssv_pack_dpl( IS_BIND_IN_PROGRESS ? FQ777_bind_addr : rx_tx_addr, hopping_frequency_no, &packet_len, packet_ori, packet);
 	
 	NRF24L01_WriteReg(NRF24L01_00_CONFIG,_BV(NRF24L01_00_PWR_UP));
 	NRF24L01_WriteReg(NRF24L01_05_RF_CH, hopping_frequency[hopping_frequency_no++]);
@@ -156,30 +150,21 @@ static void __attribute__((unused)) FQ777_send_packet(uint8_t bind)
 	NRF24L01_WritePayload(packet, packet_len);
 }
 
-static void __attribute__((unused)) FQ777_init()
+static void __attribute__((unused)) FQ777_RF_init()
 {
 	NRF24L01_Initialize();
-	NRF24L01_SetTxRxMode(TX_EN);
+
 	NRF24L01_WriteRegisterMulti(NRF24L01_10_TX_ADDR, FQ777_bind_addr, 5);
-	NRF24L01_FlushTx();
-	NRF24L01_FlushRx();
-	NRF24L01_WriteReg(NRF24L01_01_EN_AA, 0x00);      // No Auto Acknowledgement on all data pipes
-	NRF24L01_WriteReg(NRF24L01_02_EN_RXADDR, 0x00);
-	NRF24L01_WriteReg(NRF24L01_03_SETUP_AW, 0x03);
-	NRF24L01_WriteReg(NRF24L01_04_SETUP_RETR, 0x00); // no retransmits
 	NRF24L01_SetBitrate(NRF24L01_BR_250K);
-	NRF24L01_SetPower();
-    NRF24L01_Activate(0x73);                         // Activate feature register
-    NRF24L01_WriteReg(NRF24L01_1C_DYNPD, 0x00);      // Disable dynamic payload length on all pipes
-    NRF24L01_WriteReg(NRF24L01_1D_FEATURE, 0x01);
-    NRF24L01_Activate(0x73);
 }
 
 uint16_t FQ777_callback()
 {
-	if(bind_counter!=0)
+	#ifdef MULTI_SYNC
+		telemetry_set_input_sync(FQ777_PACKET_PERIOD);
+	#endif
+	if(bind_counter)
 	{
-		FQ777_send_packet(1);
 		bind_counter--;
 		if (bind_counter == 0)
 		{
@@ -187,17 +172,11 @@ uint16_t FQ777_callback()
 			BIND_DONE;
 		}
 	}
-	else
-	{
-		#ifdef MULTI_SYNC
-			telemetry_set_input_sync(FQ777_PACKET_PERIOD);
-		#endif
-		FQ777_send_packet(0);
-	}
+	FQ777_send_packet();
 	return FQ777_PACKET_PERIOD;
 }
 
-uint16_t initFQ777(void)
+void FQ777_init(void)
 {
 	BIND_IN_PROGRESS;	// autobind protocol
 	bind_counter = FQ777_BIND_COUNT;
@@ -210,8 +189,7 @@ uint16_t initFQ777(void)
 	rx_tx_addr[2] = 0x00;
 	rx_tx_addr[3] = 0xe7;
 	rx_tx_addr[4] = 0x67;
-	FQ777_init();
-	return	FQ777_INITIAL_WAIT;
+	FQ777_RF_init();
 }
 
 #endif

Multiprotocol/FX816_nrf24l01.ino

@@ -1,113 +0,0 @@
-/*
- This project is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
-Multiprotocol is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Multiprotocol.  If not, see <http://www.gnu.org/licenses/>.
- */
-// Compatible with FEI XIONG P38 plane.
-
-#if defined(FX816_NRF24L01_INO)
-
-#include "iface_nrf24l01.h"
-
-#define FX816_INITIAL_WAIT    500
-#define FX816_PACKET_PERIOD   10000
-#define FX816_RF_BIND_CHANNEL 0x28		//40
-#define FX816_RF_NUM_CHANNELS 4
-#define FX816_PAYLOAD_SIZE    6
-#define FX816_BIND_COUNT	  300		//3sec
-
-static void __attribute__((unused)) FX816_send_packet()
-{
-	packet[0] = IS_BIND_IN_PROGRESS?0x55:0xAA;
-	packet[1] = rx_tx_addr[0];
-	packet[2] = rx_tx_addr[1];
-	uint8_t val=convert_channel_8b(AILERON);
-	#define FX816_SWITCH 20
-	if(val>127+FX816_SWITCH)
-		packet[3] = 1;
-	else if(val<127-FX816_SWITCH)
-		packet[3] = 2;
-	else
-		packet[3] = 0;
-	packet[4] = convert_channel_16b_limit(THROTTLE,0,100);
-	val=0;
-	for(uint8_t i=0;i<FX816_PAYLOAD_SIZE-1;i++)
-		val+=packet[i];
-	packet[5]=val;
-
-	NRF24L01_WriteReg(NRF24L01_05_RF_CH, IS_BIND_IN_PROGRESS ? FX816_RF_BIND_CHANNEL:hopping_frequency[hopping_frequency_no++]);
-	hopping_frequency_no%=FX816_RF_NUM_CHANNELS;
-
-	// clear packet status bits and TX FIFO
-	NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);
-	NRF24L01_FlushTx();
-	XN297_WritePayload(packet, FX816_PAYLOAD_SIZE);
-
-	// Power on, TX mode, 2byte CRC
-	XN297_Configure(_BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO) | _BV(NRF24L01_00_PWR_UP));
-
-	NRF24L01_SetPower();	// Set tx_power
-}
-
-static void __attribute__((unused)) FX816_init()
-{
-	NRF24L01_Initialize();
-	NRF24L01_SetTxRxMode(TX_EN);
-	XN297_SetTXAddr((uint8_t *)"\xcc\xcc\xcc\xcc\xcc", 5);
-	NRF24L01_FlushTx();
-	NRF24L01_FlushRx();
-	NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);     	// Clear data ready, data sent, and retransmit
-	NRF24L01_WriteReg(NRF24L01_01_EN_AA, 0x00);      	// No Auto Acknowldgement on all data pipes
-	NRF24L01_WriteReg(NRF24L01_02_EN_RXADDR, 0x01);  	// Enable data pipe 0 only
-	NRF24L01_SetBitrate(NRF24L01_BR_1M);             	// 1Mbps
-	NRF24L01_WriteReg(NRF24L01_04_SETUP_RETR, 0x00);	// No retransmits
-	NRF24L01_SetPower();
-	NRF24L01_Activate(0x73);							// Activate feature register
-	NRF24L01_WriteReg(NRF24L01_1C_DYNPD, 0x00);			// Disable dynamic payload length on all pipes
-	NRF24L01_WriteReg(NRF24L01_1D_FEATURE, 0x01);
-	NRF24L01_Activate(0x73);
-}
-
-static void __attribute__((unused)) FX816_initialize_txid()
-{
-	//Only 8 IDs: the RX led does not indicate frame loss.
-	//I didn't open the plane to find out if I could connect there so this is the best I came up with with few trial and errors...
-	rx_tx_addr[0]=0x35+(rx_tx_addr[3]&0x07);							//Original dump=0x35
-	rx_tx_addr[1]=0x09;													//Original dump=0x09
-	memcpy(hopping_frequency,"\x09\x1B\x30\x42",FX816_RF_NUM_CHANNELS); //Original dump=9=0x09,27=0x1B,48=0x30,66=0x42
-	for(uint8_t i=0;i<FX816_RF_NUM_CHANNELS;i++)
-		hopping_frequency[i]+=rx_tx_addr[3]&0x07;
-}
-
-uint16_t FX816_callback()
-{
-	#ifdef MULTI_SYNC
-		telemetry_set_input_sync(FX816_PACKET_PERIOD);
-	#endif
-	if(IS_BIND_IN_PROGRESS)
-		if(--bind_counter==0)
-			BIND_DONE;
-	FX816_send_packet();
-	return FX816_PACKET_PERIOD;
-}
-
-uint16_t initFX816()
-{
-	BIND_IN_PROGRESS;	// autobind protocol
-	FX816_initialize_txid();
-	FX816_init();
-	hopping_frequency_no = 0;
-	bind_counter=FX816_BIND_COUNT;
-	return FX816_INITIAL_WAIT;
-}
-
-#endif

Multiprotocol/FX_nrf24l01.ino

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

Multiprotocol/FY326_nrf24l01.ino

@@ -88,34 +88,25 @@ static void __attribute__((unused)) FY326_send_packet(uint8_t bind)
 	NRF24L01_SetPower();	// Set tx_power
 }
 
-static void __attribute__((unused)) FY326_init()
+static void __attribute__((unused)) FY326_RF_init()
 {
 	NRF24L01_Initialize();
-	NRF24L01_SetTxRxMode(TX_EN);
+
 	if(sub_protocol==FY319)
 		NRF24L01_WriteReg(NRF24L01_03_SETUP_AW, 0x03);   // Five-byte rx/tx address
 	else
 		NRF24L01_WriteReg(NRF24L01_03_SETUP_AW, 0x01);   // Three-byte rx/tx address
 	NRF24L01_WriteRegisterMulti(NRF24L01_10_TX_ADDR,    (uint8_t *)"\x15\x59\x23\xc6\x29", 5);
 	NRF24L01_WriteRegisterMulti(NRF24L01_0A_RX_ADDR_P0, (uint8_t *)"\x15\x59\x23\xc6\x29", 5);
-    NRF24L01_FlushTx();
-    NRF24L01_FlushRx();
-    NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);     // Clear data ready, data sent, and retransmit
-    NRF24L01_WriteReg(NRF24L01_01_EN_AA, 0x00);      // No Auto Acknowledgement on all data pipes
-    NRF24L01_WriteReg(NRF24L01_02_EN_RXADDR, 0x01);  // Enable data pipe 0 only
     NRF24L01_WriteReg(NRF24L01_11_RX_PW_P0, FY326_PACKET_SIZE);
     NRF24L01_WriteReg(NRF24L01_05_RF_CH, FY326_RF_BIND_CHANNEL);
     NRF24L01_SetBitrate(NRF24L01_BR_250K);
-    NRF24L01_SetPower();
 
-	NRF24L01_Activate(0x73);
     NRF24L01_WriteReg(NRF24L01_1C_DYNPD, 0x3f);
     NRF24L01_WriteReg(NRF24L01_1D_FEATURE, 0x07);
-	NRF24L01_Activate(0x73);
 
 	//Switch to RX
 	NRF24L01_SetTxRxMode(TXRX_OFF);
-	NRF24L01_FlushRx();
 	NRF24L01_SetTxRxMode(RX_EN);
 }
 
@@ -209,20 +200,19 @@ static void __attribute__((unused)) FY326_initialize_txid()
 			hopping_frequency[i]=rx_tx_addr[0] & ~0x80;
 }
 
-uint16_t initFY326(void)
+void FY326_init(void)
 {
 	BIND_IN_PROGRESS;	// autobind protocol
     rxid = 0xAA;
 	bind_counter = FY326_BIND_COUNT;
 	FY326_initialize_txid();
-	FY326_init();
+	FY326_RF_init();
 	if(sub_protocol==FY319)
 	{
 		phase=FY319_BIND1;
 	}
 	else
 		phase=FY326_BIND1;
-	return	FY326_INITIAL_WAIT;
 }
 
 #endif

Multiprotocol/Fake_nrf24l01.ino

@@ -0,0 +1,108 @@
+/*
+ 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(FAKE_NRF24L01_INO)
+
+#include "iface_nrf250k.h"
+
+static void __attribute__((unused)) FAKE_send_packet()
+{
+	for(uint8_t i=0;i<5;i++)
+		packet[i]=i;
+	NRF24L01_WriteReg(NRF24L01_07_STATUS, (_BV(NRF24L01_07_RX_DR) | _BV(NRF24L01_07_TX_DS) | _BV(NRF24L01_07_MAX_RT)));
+	NRF24L01_FlushTx();
+	NRF24L01_WritePayload(packet, 5);
+}
+
+static void __attribute__((unused)) FAKE_init()
+{
+//	BIND_IN_PROGRESS;
+
+	//CC2500
+	option=1;
+	XN297L_Init();
+	CC2500_WriteReg(CC2500_07_PKTCTRL1,	0x01);   // Packet Automation Control
+	CC2500_WriteReg(CC2500_08_PKTCTRL0,	0x00);   // Packet Automation Control
+	CC2500_WriteReg(CC2500_12_MDMCFG2,	0x12);   // Modem Configuration
+	CC2500_WriteReg(CC2500_13_MDMCFG1,	0x13);   // Modem Configuration
+	CC2500_WriteReg(CC2500_04_SYNC1,	0x11);
+	CC2500_WriteReg(CC2500_05_SYNC0,	0x33);
+	CC2500_WriteReg(CC2500_09_ADDR,     0x99);
+	CC2500_WriteReg(CC2500_06_PKTLEN,	10);
+
+	CC2500_SetTxRxMode(RX_EN);
+	CC2500_Strobe(CC2500_SIDLE);
+	CC2500_Strobe(CC2500_SRX);
+	//CC2500_SetTxRxMode(TX_EN);
+	XN297L_RFChannel(0);
+
+	//NRF
+/*	option=0;
+	PE1_on;							//NRF24L01 antenna RF3 by default
+	PE2_off;						//NRF24L01 antenna RF3 by default
+	NRF24L01_Initialize();
+	NRF24L01_WriteReg(NRF24L01_00_CONFIG, 0x7f);
+	NRF24L01_WriteReg(NRF24L01_01_EN_AA, 0x00);//0x3f);       // AA on all pipes
+	NRF24L01_WriteReg(NRF24L01_02_EN_RXADDR, 0x3f);   // Enable all pipes
+	NRF24L01_WriteReg(NRF24L01_03_SETUP_AW, 0x03);    // 5-byte address
+	NRF24L01_WriteReg(NRF24L01_04_SETUP_RETR, 0x36);  // retransmit 1ms, 6 times
+	NRF24L01_SetBitrate(NRF24L01_BR_250K);              // 1Mbps
+	NRF24L01_SetPower();
+	NRF24L01_WriteRegisterMulti(NRF24L01_0A_RX_ADDR_P0, (uint8_t *)"\x99\x33\x11\xAA\xAA", 5);	//Bind address
+	NRF24L01_WriteRegisterMulti(NRF24L01_10_TX_ADDR,    (uint8_t *)"\x99\x33\x11\xAA\xAA", 5);	//Bind address
+	NRF24L01_WriteReg(NRF24L01_05_RF_CH, 0);
+	NRF24L01_Activate(0x73);                          // Activate feature register
+	NRF24L01_WriteReg(NRF24L01_1C_DYNPD, 0x3f);       // Enable dynamic payload length
+	NRF24L01_WriteReg(NRF24L01_1D_FEATURE, 0x07);     // Enable all features
+*/	
+	/*NRF24L01_FlushTx();
+    NRF24L01_SetTxRxMode(TX_EN);*/
+}
+
+uint16_t FAKE_callback()
+{
+	len = CC2500_ReadReg(CC2500_3B_RXBYTES | CC2500_READ_BURST) & 0x7F;
+	if(len) debug("L=%d, ",len);
+	if(len && len < sizeof(packet_in))
+	{
+		CC2500_ReadData(packet_in, len);
+		debug("P:");
+		for(uint8_t i=0;i<len;i++)
+			debug(" %02X", packet_in[i]);
+	}
+	if(len) debugln("");
+	CC2500_Strobe(CC2500_SFRX);
+	CC2500_Strobe(CC2500_SIDLE);
+	CC2500_Strobe(CC2500_SRX);
+
+	option=0;
+	//FAKE_send_packet();
+	
+	PE1_off;	//antenna RF2
+	PE2_on;
+	/*packet[0]=0x99;
+	for(uint8_t i=1;i<5;i++)
+		packet[i]=i;
+	CC2500_WriteData(packet, 5);*/
+	return 10000;
+}
+
+uint16_t initFAKE()
+{
+	FAKE_init();
+	return 5000;
+}
+
+#endif

Multiprotocol/FlySky_a7105.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/>.
  */
-// Last sync with hexfet new_protocols/flysky_a7105.c dated 2015-09-28
+// Last sync with hexfet new_protocols/FLYSKY_a7105.c dated 2015-09-28
 
 #if defined(FLYSKY_A7105_INO)
 
@@ -53,7 +53,7 @@ enum {
 const uint8_t PROGMEM V912_X17_SEQ[10] =  { 0x14, 0x31, 0x40, 0x49, 0x49,    // sometime first byte is 0x15 ?
 											0x49, 0x49, 0x49, 0x49, 0x49, }; 
 
-static void __attribute__((unused)) flysky_apply_extension_flags()
+static void __attribute__((unused)) FLYSKY_apply_extension_flags()
 {
 	switch(sub_protocol)
 	{
@@ -129,7 +129,7 @@ static void __attribute__((unused)) flysky_apply_extension_flags()
 	}
 }
 
-static void __attribute__((unused)) flysky_build_packet(uint8_t init)
+static void __attribute__((unused)) FLYSKY_send_packet()
 {
     uint8_t i;
 	//servodata timing range for flysky.
@@ -137,7 +137,7 @@ static void __attribute__((unused)) flysky_build_packet(uint8_t init)
 	//+100% =~ 0x07ca//=1994us(max)
 	//Center = 0x5d9//=1497us(center)
 	//channel order AIL;ELE;THR;RUD;CH5;CH6;CH7;CH8
-    packet[0] = init ? 0xaa : 0x55;
+    packet[0] = IS_BIND_IN_PROGRESS ? 0xaa : 0x55;
     packet[1] = rx_tx_addr[3];
     packet[2] = rx_tx_addr[2];
     packet[3] = rx_tx_addr[1];
@@ -150,36 +150,32 @@ static void __attribute__((unused)) flysky_build_packet(uint8_t init)
 		packet[5 + i*2]=temp&0xFF;		//low byte of servo timing(1000-2000us)
 		packet[6 + i*2]=(temp>>8)&0xFF;	//high byte of servo timing(1000-2000us)
 	}
-    flysky_apply_extension_flags();
+    FLYSKY_apply_extension_flags();
+
+	A7105_SetPower();
+	A7105_WriteData(21, IS_BIND_IN_PROGRESS ? 0x01:hopping_frequency[hopping_frequency_no & 0x0F]);
+	hopping_frequency_no++;
 }
 
-uint16_t ReadFlySky()
+uint16_t FLYSKY_callback()
 {
+	#ifdef MULTI_SYNC
+		telemetry_set_input_sync(packet_period);
+	#endif
 	#ifndef FORCE_FLYSKY_TUNING
 		A7105_AdjustLOBaseFreq(1);
 	#endif
-	if(IS_BIND_IN_PROGRESS)
+	if(bind_counter)
 	{
-		flysky_build_packet(1);
-		A7105_WriteData(21, 1);
 		bind_counter--;
 		if (bind_counter==0)
 			BIND_DONE;
 	}
-	else
-	{
-		#ifdef MULTI_SYNC
-			telemetry_set_input_sync(packet_period);
-		#endif
-		flysky_build_packet(0);
-		A7105_WriteData(21, hopping_frequency[hopping_frequency_no & 0x0F]);
-		A7105_SetPower();
-	}
-	hopping_frequency_no++;
+	FLYSKY_send_packet();
 	return packet_period;
 }
 
-const uint8_t PROGMEM tx_channels[8][4] = {
+const uint8_t PROGMEM FLYSKY_tx_channels[8][4] = {
 	{ 0x12, 0x34, 0x56, 0x78},
 	{ 0x18, 0x27, 0x36, 0x45},
 	{ 0x41, 0x82, 0x36, 0x57},
@@ -190,7 +186,7 @@ const uint8_t PROGMEM tx_channels[8][4] = {
 	{ 0x71, 0x86, 0x43, 0x52}
 };
 
-uint16_t initFlySky()
+void FLYSKY_init()
 {
 	uint8_t chanrow;
 	uint8_t chanoffset;
@@ -208,7 +204,7 @@ uint16_t initFlySky()
 	chanoffset=rx_tx_addr[3]/16;
 	for(uint8_t i=0;i<16;i++)
 	{
-		temp=pgm_read_byte_near(&tx_channels[chanrow>>1][i>>2]);
+		temp=pgm_read_byte_near(&FLYSKY_tx_channels[chanrow>>1][i>>2]);
 		if(i&0x02)
 			temp&=0x0F;
 		else
@@ -242,6 +238,5 @@ uint16_t initFlySky()
 		bind_counter = FLYSKY_BIND_COUNT;
 	else
 		bind_counter = 0;
-	return 2400;
 }
 #endif

Multiprotocol/FrSkyDVX_common.ino

@@ -375,7 +375,6 @@ void Frsky_init_clone(void)
 				val=option;
 			CC2500_WriteReg(reg,val);
 		}
-		prev_option = option ;		// Save option to monitor FSCTRL0 change
 		for(uint8_t i=0;i<17;i++)
 		{
 			uint8_t reg=pgm_read_byte_near(&FRSKY_common_end_cc2500_conf[i][0]);
@@ -406,7 +405,7 @@ void Frsky_init_clone(void)
 	{
 		for (uint8_t i=start+1;i<=end;i++)
 			packet[i]=0;
-		packet[start] = FrSkyX_RX_Seq << 4;									//TX=8 at startup
+		packet[start] = FrSkyX_RX_Seq << 4;
 		#ifdef SPORT_SEND
 			if (FrSkyX_TX_IN_Seq!=0xFF)
 			{//RX has replied at least once
@@ -509,7 +508,7 @@ static void __attribute__((unused)) FrSkyX_set_start(uint8_t ch )
 	CC2500_WriteReg(CC2500_0A_CHANNR, hopping_frequency[ch]);
 }		
 
-static void __attribute__((unused)) FrSkyX_init()
+static void __attribute__((unused)) FrSkyX_RF_init()
 {
 	if(protocol==PROTO_FRSKYL)
 		FRSKY_init_cc2500(FRSKYL_cc2500_conf);

Multiprotocol/FrSkyD_cc2500.ino

@@ -17,12 +17,12 @@
 
 #include "iface_cc2500.h"
 
-static void __attribute__((unused)) frsky2way_init(uint8_t bind)
+static void __attribute__((unused)) FRSKYD_RF_init()
 {
 	FRSKY_init_cc2500(FRSKYD_cc2500_conf);	
 
-	CC2500_WriteReg(CC2500_1B_AGCCTRL2, bind ? 0x43 : 0x03);
-	CC2500_WriteReg(CC2500_09_ADDR, bind ? 0x03 : rx_tx_addr[3]);
+	CC2500_WriteReg(CC2500_1B_AGCCTRL2, IS_BIND_IN_PROGRESS ? 0x43 : 0x03);
+	CC2500_WriteReg(CC2500_09_ADDR, IS_BIND_IN_PROGRESS ? 0x03 : rx_tx_addr[3]);
 	CC2500_WriteReg(CC2500_07_PKTCTRL1, 0x05);
 	CC2500_Strobe(CC2500_SIDLE);	// Go to idle...
 	//
@@ -32,7 +32,7 @@ static void __attribute__((unused)) frsky2way_init(uint8_t bind)
 	//#######END INIT########		
 }
 	
-static void __attribute__((unused)) frsky2way_build_bind_packet()
+static void __attribute__((unused)) FRSKYD_build_bind_packet()
 {
 	//11 03 01 d7 2d 00 00 1e 3c 5b 78 00 00 00 00 00 00 01
 	//11 03 01 19 3e 00 02 8e 2f bb 5c 00 00 00 00 00 00 01
@@ -57,7 +57,7 @@ static void __attribute__((unused)) frsky2way_build_bind_packet()
 	packet[17] = rx_tx_addr[1];
 }
 
-static void __attribute__((unused)) frsky2way_data_frame()
+static void __attribute__((unused)) FRSKYD_data_frame()
 {//pachet[4] is telemetry user frame counter(hub)
 	//11 d7 2d 22 00 01 c9 c9 ca ca 88 88 ca ca c9 ca 88 88
 	//11 57 12 00 00 01 f2 f2 f2 f2 06 06 ca ca ca ca 18 18
@@ -94,7 +94,7 @@ static void __attribute__((unused)) frsky2way_data_frame()
 	}
 } 
 
-uint16_t initFrSky_2way()
+void FRSKYD_init(void)
 {
 	//FrskyD init hop
 	if (sub_protocol==DCLONE)
@@ -116,21 +116,20 @@ uint16_t initFrSky_2way()
 	packet_count=0;
 	if(IS_BIND_IN_PROGRESS)
 	{
-		frsky2way_init(1);
+		FRSKYD_RF_init();
 		state = FRSKY_BIND;
 	}
 	else
 	{
 		state = FRSKY_BIND_DONE;
 	}
-	return 10000;
 }	
 		
-uint16_t ReadFrSky_2way()
+uint16_t FRSKYD_callback(void)
 { 
 	if (state < FRSKY_BIND_DONE)
 	{
-		frsky2way_build_bind_packet();
+		FRSKYD_build_bind_packet();
 		CC2500_Strobe(CC2500_SIDLE);
 		CC2500_WriteReg(CC2500_0A_CHANNR, 0x00);
 		CC2500_WriteReg(CC2500_23_FSCAL3, 0x89);		
@@ -144,10 +143,10 @@ uint16_t ReadFrSky_2way()
 	}
 	if (state == FRSKY_BIND_DONE)
 	{
-		state = FRSKY_DATA2;
-		frsky2way_init(0);
-		counter = 0;
 		BIND_DONE;
+		FRSKYD_RF_init();
+		counter = 0;
+		state = FRSKY_DATA2;
 	}
 	else
 		if (state == FRSKY_DATA5)
@@ -203,14 +202,10 @@ uint16_t ReadFrSky_2way()
 		}
 		CC2500_Strobe(CC2500_SIDLE);
 		CC2500_WriteReg(CC2500_0A_CHANNR, hopping_frequency[counter % 47]);
-		if ( prev_option != option )
-		{
-			CC2500_WriteReg(CC2500_0C_FSCTRL0,option);	// Frequency offset hack 
-			prev_option = option ;
-		}
+		CC2500_SetFreqOffset();
 		CC2500_WriteReg(CC2500_23_FSCAL3, 0x89);
 		CC2500_Strobe(CC2500_SFRX);        
-		frsky2way_data_frame();
+		FRSKYD_data_frame();
 		CC2500_WriteData(packet, packet[0]+1);
 		state++;
 	}				

Multiprotocol/FrSkyL_cc2500.ino

@@ -137,7 +137,7 @@ static void __attribute__((unused))  FrSkyL_encode_packet(bool type)
 	}
 }
 
-uint16_t ReadFrSkyL()
+uint16_t FRSKYL_callback()
 {
 	static uint8_t written=0, send=0;
 	switch(send)
@@ -200,11 +200,7 @@ uint16_t ReadFrSkyL()
 			break;
 
 		case FRSKY_DATA1:
-			if ( prev_option != option )
-			{
-				CC2500_WriteReg(CC2500_0C_FSCTRL0,option);				//Frequency offset hack 
-				prev_option = option ;
-			}
+			CC2500_SetFreqOffset();
 			FrSkyX_set_start(hopping_frequency_no);
 			FrSkyL_build_packet();
 			FrSkyL_encode_packet(true);
@@ -216,7 +212,7 @@ uint16_t ReadFrSkyL()
 	return 1;		
 }
 
-uint16_t initFrSkyL()
+void FRSKYL_init()
 {
 	set_rx_tx_addr(MProtocol_id_master);
 	rx_tx_addr[1]=0x02;		// ID related, hw version?
@@ -231,7 +227,7 @@ uint16_t initFrSkyL()
 	while(!FrSkyX_chanskip)
 		FrSkyX_chanskip=random(0xfefefefe)%47;
 
-	FrSkyX_init();
+	FrSkyX_RF_init();
 
 	//Prepare frame
 	memset(FrSkyL_buffer,0x00,FRSKYL_PACKET_LEN-3);
@@ -257,6 +253,5 @@ uint16_t initFrSkyL()
 		state = FRSKY_DATA1;
 		FrSkyX_initialize_data(0);
 	}
-	return 10000;
 }	
 #endif

Multiprotocol/FrSkyR9_sx1276.ino

@@ -157,7 +157,7 @@ static void __attribute__((unused)) FrSkyR9_build_EU_packet()
 	packet[13] = FrSkyR9_CRC8(packet, 13);
 }
 
-uint16_t initFrSkyR9()
+void FRSKYR9_init()
 {
 	//Check frequencies
 	#ifdef DISP_FREQ_TABLE
@@ -205,17 +205,24 @@ uint16_t initFrSkyR9()
 	SX1276_SetDetectionThreshold(SX1276_MODEM_DETECTION_THRESHOLD_SF6);
 	SX1276_SetLna(1, true);
 	SX1276_SetHopPeriod(0);										// 0 = disabled, we hop frequencies manually
-	SX1276_SetPaDac(true);
+	//RF Power
+	SX1276_SetPaDac(false);										// Disable 20dBm mode
+	#if MULTI_5IN1_INTERNAL == JP_T18
+		SX1276_SetPaConfig(true, 7, 0);							// Lowest power for the T18: 2dBm
+	#else
+		SX1276_SetPaConfig(true, 7, option);					// Use PA_HP on PA_BOOST, power=17-(15-option) dBm with option equal or lower to 15
+	#endif
+	SX1276_SetOcp(true,27);										// Set OCP to max 240mA
 	SX1276_SetTxRxMode(TX_EN);									// Set RF switch to TX
-
+	//Enable all IRQ flags
+	SX1276_WriteReg(SX1276_11_IRQFLAGSMASK,0x00);
 	FrSkyX_telem_init();
 	
 	hopping_frequency_no=0;
 	phase=FRSKYR9_FREQ;
-	return 20000;												// Start calling FrSkyR9_callback in 20 milliseconds
 }
 
-uint16_t FrSkyR9_callback()
+uint16_t FRSKYR9_callback()
 {
 	switch (phase)
 	{
@@ -226,8 +233,14 @@ uint16_t FrSkyR9_callback()
 			FrSkyR9_set_frequency(); 							// Set current center frequency
 			//Set power
 			// max power: 15dBm (10.8 + 0.6 * MaxPower [dBm])
-			// output_power: 2 dBm (17-(15-OutputPower) (if pa_boost_pin == true))
-			SX1276_SetPaConfig(true, 7, 0);						// Lowest power for the T18
+			// output_power: 2 dBm ( (if pa_boost_pin == true))
+			#if MULTI_5IN1_INTERNAL != JP_T18
+				if(option != prev_option)
+				{	// Set RF power if it has changed
+					SX1276_SetPaConfig(true, 7, option);		// Use PA_HP on PA_BOOST, power=17-(15-option) dBm with option equal or lower to 15
+					prev_option = option;
+				}
+			#endif
 			//Build packet
 			if( packet_length == 26 )
 				FrSkyR9_build_packet();
@@ -256,6 +269,8 @@ uint16_t FrSkyR9_callback()
 			SX1276_WriteReg(SX1276_0D_FIFOADDRPTR, 0x00);
 			//Set RF switch to RX
 			SX1276_SetTxRxMode(RX_EN);
+			//Clear all IRQ flags
+			SX1276_WriteReg(SX1276_12_REGIRQFLAGS,0xFF);
 			//Switch to RX
 			SX1276_WriteReg(SX1276_01_OPMODE, 0x85);
 			phase++;
@@ -294,8 +309,6 @@ uint16_t FrSkyR9_callback()
 				FrSkyX_telem_init();							// Reset telemetry
 			else
 				telemetry_link=1;								// Send telemetry out anyway
-			//Clear all flags
-			SX1276_WriteReg(SX1276_12_REGIRQFLAGS,0xFF);
 			phase=FRSKYR9_FREQ;
 			break;
 #endif

Multiprotocol/FrSkyV_cc2500.ino

@@ -113,7 +113,7 @@ static void __attribute__((unused)) FRSKYV_build_data_packet()
 	packet[14] = FRSKYV_crc8(crc8, packet, 14);
 }
 
-uint16_t ReadFRSKYV()
+uint16_t FRSKYV_callback(void)
 {
 	if(IS_BIND_DONE)
 	{	// Normal operation
@@ -122,11 +122,7 @@ uint16_t ReadFRSKYV()
 		#endif
 		uint8_t chan = FRSKYV_calc_channel();
 		CC2500_Strobe(CC2500_SIDLE);
-		if (option != prev_option)
-		{
-			CC2500_WriteReg(CC2500_0C_FSCTRL0, option);
-			prev_option=option;
-		}
+		CC2500_SetFreqOffset();
 		CC2500_WriteReg(CC2500_0A_CHANNR, chan * 5 + 6);
 		FRSKYV_build_data_packet();
 
@@ -152,7 +148,7 @@ uint16_t ReadFRSKYV()
 	return 53460;
 }
 
-uint16_t initFRSKYV()
+void FRSKYV_init(void)
 {
 	//ID is 15 bits. Using rx_tx_addr[2] and rx_tx_addr[3] since we want to use RX_Num for model match
 	rx_tx_addr[2]&=0x7F;
@@ -162,7 +158,6 @@ uint16_t initFRSKYV()
 	seed = 1;
 	binding_idx=0;
 	phase = FRSKYV_DATA1;
-	return 10000;
 }
 
 #endif

Multiprotocol/FrSkyX_cc2500.ino

@@ -19,17 +19,14 @@
 
 static void __attribute__((unused)) FrSkyX_build_bind_packet()
 {
-	uint8_t packet_size = 0x1D;
-	if(protocol==PROTO_FRSKYX && (FrSkyFormat & 2 ))
-		packet_size=0x20;				// FrSkyX V1 LBT
 	//Header
-	packet[0] = packet_size;			// Number of bytes in the packet (after this one)
-	packet[1] = 0x03;					// Bind packet
-	packet[2] = 0x01;					// Bind packet
+	packet[0] = packet_length;				// Number of bytes in the packet (after this one)
+	packet[1] = 0x03;						// Bind packet
+	packet[2] = 0x01;						// Bind packet
 
 	//ID
-	packet[3] = rx_tx_addr[3];			// ID
-	packet[4] = rx_tx_addr[2];			// ID
+	packet[3] = rx_tx_addr[3];				// ID
+	packet[4] = rx_tx_addr[2];				// ID
 
 	if(protocol==PROTO_FRSKYX)
 	{
@@ -40,10 +37,10 @@ static void __attribute__((unused)) FrSkyX_build_bind_packet()
 		packet[8] = hopping_frequency[idx++];
 		packet[9] = hopping_frequency[idx++];
 		packet[10] = hopping_frequency[idx++];
-		packet[11] = rx_tx_addr[1];		// Unknown but constant ID?
+		packet[11] = rx_tx_addr[1];			// ID
 		packet[12] = RX_num;
 		//
-		memset(&packet[13], 0, packet_size - 14);
+		memset(&packet[13], 0, packet_length - 14);
 		if(binding_idx&0x01)
 			memcpy(&packet[13],(void *)"\x55\xAA\x5A\xA5",4);	// Telem off
 		if(binding_idx&0x02)
@@ -52,30 +49,34 @@ static void __attribute__((unused)) FrSkyX_build_bind_packet()
 	else
 	{
 		//packet 1D 03 01 0E 1C 02 00 00 32 0B 00 00 A8 26 28 01 A1 00 00 00 3E F6 87 C7 00 00 00 00 C9 C9
-		packet[5] = rx_tx_addr[1];		// Unknown but constant ID?
+		//Unknown bytes
+		if(state & 0x01)
+			memcpy(&packet[7],"\x00\x18\x0A\x00\x00\xE0\x02\x0B\x01\xD3\x08\x00\x00\x4C\xFE\x87\xC7",17);
+		else
+			memcpy(&packet[7],"\x27\xAD\x02\x00\x00\x64\xC8\x46\x00\x64\x00\x00\x00\xFB\xF6\x87\xC7",17);
+		//ID
+		packet[5] = rx_tx_addr[1];			// ID
 		packet[6] = RX_num;
 		//Bind flags
-		packet[7]=0;
 		if(binding_idx&0x01)
 			packet[7] |= 0x40;				// Telem off
 		if(binding_idx&0x02)
 			packet[7] |= 0x80;				// CH9-16
-		//Unknown bytes
-		memcpy(&packet[8],"\x32\x0B\x00\x00\xA8\x26\x28\x01\xA1\x00\x00\x00\x3E\xF6\x87\xC7",16);
-		packet[20]^= 0x0E ^ rx_tx_addr[3];	// Update the ID
-		packet[21]^= 0x1C ^ rx_tx_addr[2];	// Update the ID
+		//Replace the ID
+		packet[20] ^= 0x0E ^ rx_tx_addr[3];	// Update the ID
+		packet[21] ^= 0x1C ^ rx_tx_addr[2];	// Update the ID
 		//Xor
-		for(uint8_t i=3; i<packet_size-1; i++)
+		for(uint8_t i=3; i<packet_length-1; i++)
 			packet[i] ^= 0xA7;
 	}
 	//CRC
-	uint16_t lcrc = FrSkyX_crc(&packet[3], packet_size-4);
-	packet[packet_size-1] = lcrc >> 8;
-	packet[packet_size] = lcrc;
+	uint16_t lcrc = FrSkyX_crc(&packet[3], packet_length-4);
+	packet[packet_length-1] = lcrc >> 8;
+	packet[packet_length]   = lcrc;
 
 	/*//Debug
 	debug("Bind:");
-	for(uint8_t i=0;i<=packet_size;i++)
+	for(uint8_t i=0;i<=packet_length;i++)
 		debug(" %02X",packet[i]);
 	debugln("");*/
 }
@@ -85,11 +86,8 @@ static void __attribute__((unused)) FrSkyX_build_packet()
 	//0x1D 0xB3 0xFD 0x02 0x56 0x07 0x15 0x00 0x00 0x00 0x04 0x40 0x00 0x04 0x40 0x00 0x04 0x40 0x00 0x04 0x40 0x08 0x00 0x00 0x00 0x00 0x00 0x00 0x96 0x12
     // data frames sent every 9ms; failsafe every 9 seconds
 	//
-	uint8_t packet_size = 0x1D;
-	if(protocol==PROTO_FRSKYX && (FrSkyFormat & 2 ))
-		packet_size=0x20;				// FrSkyX V1 LBT
 	//Header
-	packet[0] = packet_size;			// Number of bytes in the packet (after this one)
+	packet[0] = packet_length;			// Number of bytes in the packet (after this one)
 	packet[1] = rx_tx_addr[3];			// ID
 	packet[2] = rx_tx_addr[2];			// ID
 	packet[3] = rx_tx_addr[1];			// Unknown but constant ID?
@@ -102,21 +100,21 @@ static void __attribute__((unused)) FrSkyX_build_packet()
 	FrSkyX_channels(7);					// Set packet[7]=failsafe, packet[8]=0?? and packet[9..20]=channels data
 	
 	//Sequence and send SPort
-	FrSkyX_seq_sport(21,packet_size-2);	//21=RX|TXseq, 22=bytes count, 23..packet_size-2=data
+	FrSkyX_seq_sport(21,packet_length-2);	//21=RX|TXseq, 22=bytes count, 23..packet_length-2=data
 
 	//CRC
-	uint16_t lcrc = FrSkyX_crc(&packet[3], packet_size-4);
-	packet[packet_size-1] = lcrc >> 8;
-	packet[packet_size] = lcrc;
+	uint16_t lcrc = FrSkyX_crc(&packet[3], packet_length-4);
+	packet[packet_length-1] = lcrc >> 8;
+	packet[packet_length]   = lcrc;
 
 	/*//Debug
 	debug("Norm:");
-	for(uint8_t i=0;i<=packet_size;i++)
+	for(uint8_t i=0;i<=packet_length;i++)
 		debug(" %02X",packet[i]);
 	debugln("");*/
 }
 
-uint16_t ReadFrSkyX()
+uint16_t FRSKYX_callback()
 {
 	switch(state)
 	{	
@@ -132,7 +130,7 @@ uint16_t ReadFrSkyX()
 				state = FRSKY_BIND_DONE;
 			else
 				state++;
-			return 9000;
+			break;
 		case FRSKY_BIND_DONE:
 			FrSkyX_initialize_data(0);
 			hopping_frequency_no=0;
@@ -142,11 +140,7 @@ uint16_t ReadFrSkyX()
 
 		case FRSKY_DATA1:
 			CC2500_Strobe(CC2500_SIDLE);
-			if ( prev_option != option )
-			{
-				CC2500_WriteReg(CC2500_0C_FSCTRL0,option);					//Frequency offset hack 
-				prev_option = option ;
-			}
+			CC2500_SetFreqOffset();
 			FrSkyX_set_start(hopping_frequency_no);
 			FrSkyX_build_packet();
 			if(FrSkyFormat & 2)
@@ -242,49 +236,51 @@ uint16_t ReadFrSkyX()
 			state = FRSKY_DATA1;
 			return 400;	// FCC & LBT
 	}
-	return 1;		
+	return 9000;
 }
 
-uint16_t initFrSkyX()
+void FRSKYX_init()
 {
 	set_rx_tx_addr(MProtocol_id_master);
 	FrSkyFormat = sub_protocol;
 	
 	if (sub_protocol==XCLONE_16||sub_protocol==XCLONE_8)
 		Frsky_init_clone();
-	else if(protocol==PROTO_FRSKYX)
-	{
-		Frsky_init_hop();
-		rx_tx_addr[1]=0x02;		// ID related, hw version?
-	}
 	else
 	{
-		#ifdef FRSKYX2_FORCE_ID
-			rx_tx_addr[3]=0x0E;
-			rx_tx_addr[2]=0x1C;
-			FrSkyX_chanskip=18;
-		#endif
+		if(protocol==PROTO_FRSKYX)
+			Frsky_init_hop();
+		else
+		{
+			#ifdef FRSKYX2_FORCE_ID
+				rx_tx_addr[3]=0x0E;
+				rx_tx_addr[2]=0x1C;
+				FrSkyX_chanskip=18;
+			#endif
+			FrSkyX2_init_hop();
+		}
 		rx_tx_addr[1]=0x02;		// ID related, hw version?
-		FrSkyX2_init_hop();
 	}
 	
+	if(protocol==PROTO_FRSKYX && (FrSkyFormat & 2 ))
+		packet_length = 0x20;	// FrSkyX V1 LBT
+	else
+		packet_length = 0x1D;
+
 	packet_count=0;
 	while(!FrSkyX_chanskip)
 		FrSkyX_chanskip=random(0xfefefefe)%47;
 
-	FrSkyX_init();
+	FrSkyX_RF_init();
 
 	if(IS_BIND_IN_PROGRESS)
 	{	   
+		memset(packet, 0, packet_length);
 		state = FRSKY_BIND;
 		FrSkyX_initialize_data(1);
 	}
 	else
-	{
-		state = FRSKY_DATA1;
-		FrSkyX_initialize_data(0);
-	}
+		state = FRSKY_BIND_DONE;
 	FrSkyX_telem_init();
-	return 10000;
 }
 #endif

Multiprotocol/FrSky_Rx_cc2500.ino

@@ -40,7 +40,7 @@ enum {
 	FRSKY_RX_DATA,
 };
 
-const PROGMEM uint8_t frsky_rx_common_reg[][2] = {
+const PROGMEM uint8_t FRSKY_RX_common_reg[][2] = {
 	{CC2500_02_IOCFG0, 0x01},
 	{CC2500_18_MCSM0, 0x18},
 	{CC2500_07_PKTCTRL1, 0x05},
@@ -68,7 +68,7 @@ const PROGMEM uint8_t frsky_rx_common_reg[][2] = {
 	{CC2500_09_ADDR, 0x03},
 };
 
-const PROGMEM uint8_t frsky_rx_d16fcc_reg[][2] = {
+const PROGMEM uint8_t FRSKY_RX_d16fcc_reg[][2] = {
 	{CC2500_17_MCSM1, 0x0C},
 	{CC2500_0E_FREQ1, 0x76},
 	{CC2500_0F_FREQ0, 0x27},
@@ -81,7 +81,7 @@ const PROGMEM uint8_t frsky_rx_d16fcc_reg[][2] = {
 	{CC2500_15_DEVIATN, 0x51},
 };
 
-const PROGMEM uint8_t frsky_rx_d16lbt_reg[][2] = {
+const PROGMEM uint8_t FRSKY_RX_d16lbt_reg[][2] = {
 	{CC2500_17_MCSM1, 0x0E},
 	{CC2500_0E_FREQ1, 0x80},
 	{CC2500_0F_FREQ0, 0x00},
@@ -94,7 +94,7 @@ const PROGMEM uint8_t frsky_rx_d16lbt_reg[][2] = {
 	{CC2500_15_DEVIATN, 0x53},
 };
 
-const PROGMEM uint8_t frsky_rx_d8_reg[][2] = {
+const PROGMEM uint8_t FRSKY_RX_d8_reg[][2] = {
 	{CC2500_17_MCSM1,    0x0C},
 	{CC2500_0E_FREQ1,    0x76},
 	{CC2500_0F_FREQ0,    0x27},
@@ -107,32 +107,32 @@ const PROGMEM uint8_t frsky_rx_d8_reg[][2] = {
 	{CC2500_15_DEVIATN,  0x42},
 };
 
-static uint8_t frsky_rx_chanskip;
-static int8_t  frsky_rx_finetune;
-static uint8_t frsky_rx_format;
+static uint8_t FRSKY_RX_chanskip;
+static int8_t  FRSKY_RX_finetune;
+static uint8_t FRSKY_RX_format;
 
-static void __attribute__((unused)) frsky_rx_strobe_rx()
+static void __attribute__((unused)) FRSKY_RX_strobe_rx()
 {
 	 CC2500_Strobe(CC2500_SIDLE);
 	 CC2500_Strobe(CC2500_SFRX);
 	 CC2500_Strobe(CC2500_SRX);
 }
 
-static void __attribute__((unused)) frsky_rx_initialise_cc2500() {
-	const uint8_t frsky_rx_length[] = { FRSKY_RX_D8_LENGTH, FRSKY_RX_D16FCC_LENGTH, FRSKY_RX_D16LBT_LENGTH, FRSKY_RX_D16v2_LENGTH, FRSKY_RX_D16v2_LENGTH };
-	packet_length = frsky_rx_length[frsky_rx_format];
+static void __attribute__((unused)) FRSKY_RX_initialise_cc2500() {
+	const uint8_t FRSKY_RX_length[] = { FRSKY_RX_D8_LENGTH, FRSKY_RX_D16FCC_LENGTH, FRSKY_RX_D16LBT_LENGTH, FRSKY_RX_D16v2_LENGTH, FRSKY_RX_D16v2_LENGTH };
+	packet_length = FRSKY_RX_length[FRSKY_RX_format];
 	CC2500_Reset();
 	CC2500_Strobe(CC2500_SIDLE);
-	for (uint8_t i = 0; i < sizeof(frsky_rx_common_reg) / 2; i++)
-		CC2500_WriteReg(pgm_read_byte_near(&frsky_rx_common_reg[i][0]), pgm_read_byte_near(&frsky_rx_common_reg[i][1]));
+	for (uint8_t i = 0; i < sizeof(FRSKY_RX_common_reg) / 2; i++)
+		CC2500_WriteReg(pgm_read_byte_near(&FRSKY_RX_common_reg[i][0]), pgm_read_byte_near(&FRSKY_RX_common_reg[i][1]));
 
-	switch (frsky_rx_format)
+	switch (FRSKY_RX_format)
 	{
 		case FRSKY_RX_D16v2FCC:
 		case FRSKY_RX_D16FCC:
-			for (uint8_t i = 0; i < sizeof(frsky_rx_d16fcc_reg) / 2; i++)
-				CC2500_WriteReg(pgm_read_byte_near(&frsky_rx_d16fcc_reg[i][0]), pgm_read_byte_near(&frsky_rx_d16fcc_reg[i][1]));
-			if(frsky_rx_format==FRSKY_RX_D16v2FCC)
+			for (uint8_t i = 0; i < sizeof(FRSKY_RX_d16fcc_reg) / 2; i++)
+				CC2500_WriteReg(pgm_read_byte_near(&FRSKY_RX_d16fcc_reg[i][0]), pgm_read_byte_near(&FRSKY_RX_d16fcc_reg[i][1]));
+			if(FRSKY_RX_format==FRSKY_RX_D16v2FCC)
 			{
 				CC2500_WriteReg(CC2500_08_PKTCTRL0, 0x05);	// Enable CRC
 				CC2500_WriteReg(CC2500_17_MCSM1, 0x0E);		// Go/Stay in RX mode
@@ -141,36 +141,36 @@ static void __attribute__((unused)) frsky_rx_initialise_cc2500() {
 			break;
 		case FRSKY_RX_D16v2LBT:
 		case FRSKY_RX_D16LBT:
-			for (uint8_t i = 0; i < sizeof(frsky_rx_d16lbt_reg) / 2; i++)
-				CC2500_WriteReg(pgm_read_byte_near(&frsky_rx_d16lbt_reg[i][0]), pgm_read_byte_near(&frsky_rx_d16lbt_reg[i][1]));
-			if(frsky_rx_format==FRSKY_RX_D16v2LBT)
+			for (uint8_t i = 0; i < sizeof(FRSKY_RX_d16lbt_reg) / 2; i++)
+				CC2500_WriteReg(pgm_read_byte_near(&FRSKY_RX_d16lbt_reg[i][0]), pgm_read_byte_near(&FRSKY_RX_d16lbt_reg[i][1]));
+			if(FRSKY_RX_format==FRSKY_RX_D16v2LBT)
 				CC2500_WriteReg(CC2500_08_PKTCTRL0, 0x05);	// Enable CRC
 			break;
 		case FRSKY_RX_D8:
-			for (uint8_t i = 0; i < sizeof(frsky_rx_d8_reg) / 2; i++)
-				CC2500_WriteReg(pgm_read_byte_near(&frsky_rx_d8_reg[i][0]), pgm_read_byte_near(&frsky_rx_d8_reg[i][1]));
+			for (uint8_t i = 0; i < sizeof(FRSKY_RX_d8_reg) / 2; i++)
+				CC2500_WriteReg(pgm_read_byte_near(&FRSKY_RX_d8_reg[i][0]), pgm_read_byte_near(&FRSKY_RX_d8_reg[i][1]));
 			CC2500_WriteReg(CC2500_23_FSCAL3, 0x89);
 			break;
 	}
 	CC2500_WriteReg(CC2500_0A_CHANNR, 0);  // bind channel
 	rx_disable_lna = IS_POWER_FLAG_on;
 	CC2500_SetTxRxMode(rx_disable_lna ? TXRX_OFF : RX_EN); // lna disable / enable
-	frsky_rx_strobe_rx();
+	FRSKY_RX_strobe_rx();
 	delayMicroseconds(1000); // wait for RX to activate
 }
 
-static void __attribute__((unused)) frsky_rx_set_channel(uint8_t channel)
+static void __attribute__((unused)) FRSKY_RX_set_channel(uint8_t channel)
 {
 	CC2500_WriteReg(CC2500_0A_CHANNR, hopping_frequency[channel]);
-	if(frsky_rx_format == FRSKY_RX_D8)
+	if(FRSKY_RX_format == FRSKY_RX_D8)
 		CC2500_WriteReg(CC2500_23_FSCAL3, 0x89);
 	CC2500_WriteReg(CC2500_25_FSCAL1, calData[channel]);
-	frsky_rx_strobe_rx();
+	FRSKY_RX_strobe_rx();
 }
 
-static void __attribute__((unused)) frsky_rx_calibrate()
+static void __attribute__((unused)) FRSKY_RX_calibrate()
 {
-	frsky_rx_strobe_rx();
+	FRSKY_RX_strobe_rx();
 	for (unsigned c = 0; c < 47; c++)
 	{
 		CC2500_Strobe(CC2500_SIDLE);
@@ -193,7 +193,7 @@ static uint8_t __attribute__((unused)) frskyx_rx_check_crc_id(bool bind,bool ini
 	uint8_t offset=bind?3:1;
 	
 	// Check D8 checksum
-	if (frsky_rx_format == FRSKY_RX_D8)
+	if (FRSKY_RX_format == FRSKY_RX_D8)
 	{
 		if((packet[packet_length+1] & 0x80) != 0x80)	// Check CRC_OK flag in status byte 2
 			return false; 								// Bad CRC
@@ -210,7 +210,7 @@ static uint8_t __attribute__((unused)) frskyx_rx_check_crc_id(bool bind,bool ini
 	}
 
 	// Check D16v2 checksum
-	if (frsky_rx_format == FRSKY_RX_D16v2LBT || frsky_rx_format == FRSKY_RX_D16v2FCC)
+	if (FRSKY_RX_format == FRSKY_RX_D16v2LBT || FRSKY_RX_format == FRSKY_RX_D16v2FCC)
 		if((packet[packet_length+1] & 0x80) != 0x80)	// Check CRC_OK flag in status byte 2
 			return false;
 	//debugln("HW Checksum ok");
@@ -222,12 +222,12 @@ static uint8_t __attribute__((unused)) frskyx_rx_check_crc_id(bool bind,bool ini
 		return false; 									// Bad CRC
 	//debugln("Checksum ok");
 
-	if (bind && (frsky_rx_format == FRSKY_RX_D16v2LBT || frsky_rx_format == FRSKY_RX_D16v2FCC))
+	if (bind && (FRSKY_RX_format == FRSKY_RX_D16v2LBT || FRSKY_RX_format == FRSKY_RX_D16v2FCC))
 		for(uint8_t i=3; i<packet_length-2; i++)		//unXOR bind packet
 			packet[i] ^= 0xA7;
 	
 	uint8_t offset2=0;
-	if (bind && (frsky_rx_format == FRSKY_RX_D16LBT || frsky_rx_format == FRSKY_RX_D16FCC))
+	if (bind && (FRSKY_RX_format == FRSKY_RX_D16LBT || FRSKY_RX_format == FRSKY_RX_D16FCC))
 		offset2=6;
 	if(init)
 	{//Save TXID
@@ -248,7 +248,7 @@ static uint8_t __attribute__((unused)) frskyx_rx_check_crc_id(bool bind,bool ini
 	return true;										// Full match
 }
 
-static void __attribute__((unused)) frsky_rx_build_telemetry_packet()
+static void __attribute__((unused)) FRSKY_RX_build_telemetry_packet()
 {
 	uint16_t raw_channel[8];
 	uint32_t bits = 0;
@@ -256,7 +256,7 @@ static void __attribute__((unused)) frsky_rx_build_telemetry_packet()
 	uint8_t idx = 0;
 	uint8_t i;
 
-	if (frsky_rx_format == FRSKY_RX_D8)
+	if (FRSKY_RX_format == FRSKY_RX_D8)
 	{// decode D8 channels
 		raw_channel[0] = ((packet[10] & 0x0F) << 8 | packet[6]);
 		raw_channel[1] = ((packet[10] & 0xF0) << 4 | packet[7]);
@@ -299,7 +299,7 @@ static void __attribute__((unused)) frsky_rx_build_telemetry_packet()
 	packet_in[idx++] = RX_LQI;
 	packet_in[idx++] = RX_RSSI;
 	packet_in[idx++] = 0;  // start channel
-	packet_in[idx++] = frsky_rx_format == FRSKY_RX_D8 ? 8 : 16; // number of channels in packet
+	packet_in[idx++] = FRSKY_RX_format == FRSKY_RX_D8 ? 8 : 16; // number of channels in packet
 
 	// pack channels
 	for (i = 0; i < packet_in[3]; i++) {
@@ -313,29 +313,29 @@ static void __attribute__((unused)) frsky_rx_build_telemetry_packet()
 	}
 }
 
-static void __attribute__((unused)) frsky_rx_data()
+static void __attribute__((unused)) FRSKY_RX_data()
 {
 	uint16_t temp = FRSKY_RX_EEPROM_OFFSET;
-	frsky_rx_format = eeprom_read_byte((EE_ADDR)temp++) % FRSKY_RX_FORMATS;
+	FRSKY_RX_format = eeprom_read_byte((EE_ADDR)temp++) % FRSKY_RX_FORMATS;
 	rx_tx_addr[3] = eeprom_read_byte((EE_ADDR)temp++);
 	rx_tx_addr[2] = eeprom_read_byte((EE_ADDR)temp++);
 	rx_tx_addr[1] = eeprom_read_byte((EE_ADDR)temp++);
 	rx_tx_addr[0] = RX_num;
-	frsky_rx_finetune = eeprom_read_byte((EE_ADDR)temp++);
-	debug("format=%d, ", frsky_rx_format);
+	FRSKY_RX_finetune = eeprom_read_byte((EE_ADDR)temp++);
+	debug("format=%d, ", FRSKY_RX_format);
 	debug("addr[3]=%02X, ", rx_tx_addr[3]);
 	debug("addr[2]=%02X, ", rx_tx_addr[2]);
 	debug("addr[1]=%02X, ", rx_tx_addr[1]);
 	debug("rx_num=%02X, ",  rx_tx_addr[0]);
-	debugln("tune=%d", (int8_t)frsky_rx_finetune);
-	if(frsky_rx_format != FRSKY_RX_D16v2LBT && frsky_rx_format != FRSKY_RX_D16v2FCC)
+	debugln("tune=%d", (int8_t)FRSKY_RX_finetune);
+	if(FRSKY_RX_format != FRSKY_RX_D16v2LBT && FRSKY_RX_format != FRSKY_RX_D16v2FCC)
 	{//D8 & D16v1
 		for (uint8_t ch = 0; ch < 47; ch++)
 			hopping_frequency[ch] = eeprom_read_byte((EE_ADDR)temp++);
 	}
 	else
 	{
-		FrSkyFormat=frsky_rx_format == FRSKY_RX_D16v2FCC?0:2;
+		FrSkyFormat=FRSKY_RX_format == FRSKY_RX_D16v2FCC?0:2;
 		FrSkyX2_init_hop();
 	}
 	debug("ch:");
@@ -343,50 +343,74 @@ static void __attribute__((unused)) frsky_rx_data()
 		debug(" %02X", hopping_frequency[ch]);
 	debugln("");
 
-	frsky_rx_initialise_cc2500();
-	frsky_rx_calibrate();
+	FRSKY_RX_initialise_cc2500();
+	FRSKY_RX_calibrate();
 	CC2500_WriteReg(CC2500_18_MCSM0, 0x08); // FS_AUTOCAL = manual
 	CC2500_WriteReg(CC2500_09_ADDR, rx_tx_addr[3]); // set address
 	CC2500_WriteReg(CC2500_07_PKTCTRL1, 0x05); // check address
 	if (option == 0)
-		CC2500_WriteReg(CC2500_0C_FSCTRL0, frsky_rx_finetune);
+		CC2500_WriteReg(CC2500_0C_FSCTRL0, FRSKY_RX_finetune);
 	else
 		CC2500_WriteReg(CC2500_0C_FSCTRL0, option);
-	frsky_rx_set_channel(hopping_frequency_no);
+	FRSKY_RX_set_channel(hopping_frequency_no);
 	phase = FRSKY_RX_DATA;
 }
 
-uint16_t initFrSky_Rx()
+void FRSKY_RX_init()
 {
-	state = 0;
-	frsky_rx_chanskip = 1;
-	hopping_frequency_no = 0;
-	rx_data_started = false;
-	frsky_rx_finetune = 0;
-	telemetry_link = 0;
-	packet_count = 0;
-	if (IS_BIND_IN_PROGRESS)
+	if(sub_protocol == FRSKY_ERASE)
 	{
-		frsky_rx_format = FRSKY_RX_D8;
-		frsky_rx_initialise_cc2500();
-		phase = FRSKY_RX_TUNE_START;
-		debugln("FRSKY_RX_TUNE_START");
+		if(IS_BIND_IN_PROGRESS)
+		{// Clear all cloned addresses
+			uint16_t addr[]={ FRSKYD_CLONE_EEPROM_OFFSET+1, FRSKYX_CLONE_EEPROM_OFFSET+1, FRSKYX2_CLONE_EEPROM_OFFSET+1 };
+			for(uint8_t i=0; i<3;i++)
+				for(uint8_t j=0; j<3;j++)
+					eeprom_write_byte((EE_ADDR)(addr[i]+j), 0xFF);
+			packet_count = 100;
+		}			
 	}
 	else
-		frsky_rx_data();
-	return 1000;
+	{
+		FRSKY_RX_chanskip = 1;
+		hopping_frequency_no = 0;
+		rx_data_started = false;
+		FRSKY_RX_finetune = 0;
+		telemetry_link = 0;
+		packet_count = 0;
+		if (IS_BIND_IN_PROGRESS)
+		{
+			FRSKY_RX_format = FRSKY_RX_D8;
+			FRSKY_RX_initialise_cc2500();
+			phase = FRSKY_RX_TUNE_START;
+			debugln("FRSKY_RX_TUNE_START");
+		}
+		else
+			FRSKY_RX_data();
+	}
 }
 
-uint16_t FrSky_Rx_callback()
+uint16_t FRSKY_RX_callback()
 {
 	static int8_t read_retry = 0;
 	static int8_t tune_low, tune_high;
 	uint8_t len, ch;
 
+	if(sub_protocol == FRSKY_ERASE)
+	{
+		if(packet_count)
+			packet_count--;
+		else
+			BIND_DONE;
+		return 10000;	//  Nothing to do...
+	}
+
+	if(IS_BIND_DONE && phase != FRSKY_RX_DATA)
+		FRSKY_RX_init();	// Abort bind
+
 	if ((prev_option != option) && (phase >= FRSKY_RX_DATA))
 	{
 		if (option == 0)
-			CC2500_WriteReg(CC2500_0C_FSCTRL0, frsky_rx_finetune);
+			CC2500_WriteReg(CC2500_0C_FSCTRL0, FRSKY_RX_finetune);
 		else
 			CC2500_WriteReg(CC2500_0C_FSCTRL0, option);
 		prev_option = option;
@@ -407,19 +431,20 @@ uint16_t FrSky_Rx_callback()
 				CC2500_ReadData(packet, len);
 				if(frskyx_rx_check_crc_id(true,true))
 				{
-					frsky_rx_finetune = -127;
-					CC2500_WriteReg(CC2500_0C_FSCTRL0, frsky_rx_finetune);
+					FRSKY_RX_finetune = -127;
+					CC2500_WriteReg(CC2500_0C_FSCTRL0, FRSKY_RX_finetune);
 					phase = FRSKY_RX_TUNE_LOW;
 					debugln("FRSKY_RX_TUNE_LOW");
-					frsky_rx_strobe_rx();
+					FRSKY_RX_strobe_rx();
+					state = 0;
 					return 1000;
 				}
 			}
-			frsky_rx_format = (frsky_rx_format + 1) % FRSKY_RX_FORMATS; // switch to next format (D8, D16FCC, D16LBT, D16v2FCC, D16v2LBT)
-			frsky_rx_initialise_cc2500();
-			frsky_rx_finetune += 10;
-			CC2500_WriteReg(CC2500_0C_FSCTRL0, frsky_rx_finetune);
-			frsky_rx_strobe_rx();
+			FRSKY_RX_format = (FRSKY_RX_format + 1) % FRSKY_RX_FORMATS; // switch to next format (D8, D16FCC, D16LBT, D16v2FCC, D16v2LBT)
+			FRSKY_RX_initialise_cc2500();
+			FRSKY_RX_finetune += 10;
+			CC2500_WriteReg(CC2500_0C_FSCTRL0, FRSKY_RX_finetune);
+			FRSKY_RX_strobe_rx();
 			return 18000;
 
 		case FRSKY_RX_TUNE_LOW:
@@ -427,18 +452,18 @@ uint16_t FrSky_Rx_callback()
 			{
 				CC2500_ReadData(packet, len);
 				if(frskyx_rx_check_crc_id(true,false)) {
-					tune_low = frsky_rx_finetune;
-					frsky_rx_finetune = 127;
-					CC2500_WriteReg(CC2500_0C_FSCTRL0, frsky_rx_finetune);
+					tune_low = FRSKY_RX_finetune;
+					FRSKY_RX_finetune = 127;
+					CC2500_WriteReg(CC2500_0C_FSCTRL0, FRSKY_RX_finetune);
 					phase = FRSKY_RX_TUNE_HIGH;
 					debugln("FRSKY_RX_TUNE_HIGH");
-					frsky_rx_strobe_rx();
+					FRSKY_RX_strobe_rx();
 					return 1000;
 				}
 			}
-			frsky_rx_finetune += 1;
-			CC2500_WriteReg(CC2500_0C_FSCTRL0, frsky_rx_finetune);
-			frsky_rx_strobe_rx();
+			FRSKY_RX_finetune += 1;
+			CC2500_WriteReg(CC2500_0C_FSCTRL0, FRSKY_RX_finetune);
+			FRSKY_RX_strobe_rx();
 			return 18000;
 
 		case FRSKY_RX_TUNE_HIGH:
@@ -446,9 +471,9 @@ uint16_t FrSky_Rx_callback()
 			{
 				CC2500_ReadData(packet, len);
 				if(frskyx_rx_check_crc_id(true,false)) {
-					tune_high = frsky_rx_finetune;
-					frsky_rx_finetune = (tune_low + tune_high) / 2;
-					CC2500_WriteReg(CC2500_0C_FSCTRL0, (int8_t)frsky_rx_finetune);
+					tune_high = FRSKY_RX_finetune;
+					FRSKY_RX_finetune = (tune_low + tune_high) / 2;
+					CC2500_WriteReg(CC2500_0C_FSCTRL0, (int8_t)FRSKY_RX_finetune);
 					if(tune_low < tune_high)
 					{
 						phase = FRSKY_RX_BIND;
@@ -459,13 +484,13 @@ uint16_t FrSky_Rx_callback()
 						phase = FRSKY_RX_TUNE_START;
 						debugln("FRSKY_RX_TUNE_START");
 					}
-					frsky_rx_strobe_rx();
+					FRSKY_RX_strobe_rx();
 					return 1000;
 				}
 			}
-			frsky_rx_finetune -= 1;
-			CC2500_WriteReg(CC2500_0C_FSCTRL0, frsky_rx_finetune);
-			frsky_rx_strobe_rx();
+			FRSKY_RX_finetune -= 1;
+			CC2500_WriteReg(CC2500_0C_FSCTRL0, FRSKY_RX_finetune);
+			FRSKY_RX_strobe_rx();
 			return 18000;
 
 		case FRSKY_RX_BIND:
@@ -473,7 +498,7 @@ uint16_t FrSky_Rx_callback()
 			{
 				CC2500_ReadData(packet, len);
 				if(frskyx_rx_check_crc_id(true,false)) {
-					if(frsky_rx_format != FRSKY_RX_D16v2LBT && frsky_rx_format != FRSKY_RX_D16v2FCC)
+					if(FRSKY_RX_format != FRSKY_RX_D16v2LBT && FRSKY_RX_format != FRSKY_RX_D16v2FCC)
 					{// D8 & D16v1
 						if(packet[5] <= 0x2D)
 						{
@@ -483,7 +508,7 @@ uint16_t FrSky_Rx_callback()
 						}
 					}
 					else
-						state=0x3FF; //No hop table for D16v2
+						state = 0x3FF; //No hop table for D16v2
 					if (state == 0x3FF)
 					{
 						debugln("Bind complete");
@@ -492,27 +517,27 @@ uint16_t FrSky_Rx_callback()
 						uint16_t temp = FRSKY_RX_EEPROM_OFFSET;
 						if(sub_protocol==FRSKY_CLONE)
 						{
-							if(frsky_rx_format==FRSKY_RX_D8)
+							if(FRSKY_RX_format==FRSKY_RX_D8)
 								temp=FRSKYD_CLONE_EEPROM_OFFSET;
-							else if(frsky_rx_format == FRSKY_RX_D16FCC || frsky_rx_format == FRSKY_RX_D16LBT)
+							else if(FRSKY_RX_format == FRSKY_RX_D16FCC || FRSKY_RX_format == FRSKY_RX_D16LBT)
 								temp=FRSKYX_CLONE_EEPROM_OFFSET;
 							else
 								temp=FRSKYX2_CLONE_EEPROM_OFFSET;
 						}
-						eeprom_write_byte((EE_ADDR)temp++, frsky_rx_format);
+						eeprom_write_byte((EE_ADDR)temp++, FRSKY_RX_format);
 						eeprom_write_byte((EE_ADDR)temp++, rx_tx_addr[3]);
 						eeprom_write_byte((EE_ADDR)temp++, rx_tx_addr[2]);
 						eeprom_write_byte((EE_ADDR)temp++, rx_tx_addr[1]);
-						if(sub_protocol==FRSKY_RX)
-							eeprom_write_byte((EE_ADDR)temp++, frsky_rx_finetune);
-						if(frsky_rx_format != FRSKY_RX_D16v2FCC && frsky_rx_format != FRSKY_RX_D16v2LBT)
+						if(sub_protocol == FRSKY_RX || sub_protocol == FRSKY_CPPM)	// FRSKY_RX, FRSKY_CPPM
+							eeprom_write_byte((EE_ADDR)temp++, FRSKY_RX_finetune);
+						if(FRSKY_RX_format != FRSKY_RX_D16v2FCC && FRSKY_RX_format != FRSKY_RX_D16v2LBT)
 							for (ch = 0; ch < 47; ch++)
 								eeprom_write_byte((EE_ADDR)temp++, hopping_frequency[ch]);
-						frsky_rx_data();
+						FRSKY_RX_data();
 						debugln("FRSKY_RX_DATA");
 					}
 				}
-				frsky_rx_strobe_rx();
+				FRSKY_RX_strobe_rx();
 			}
 			return 1000;
 
@@ -529,31 +554,35 @@ uint16_t FrSky_Rx_callback()
 						RX_RSSI += 128;
 					bool chanskip_valid=true;
 					// hop to next channel
-					if (frsky_rx_format != FRSKY_RX_D8)
+					if (FRSKY_RX_format != FRSKY_RX_D8)
 					{//D16v1 & D16v2
 						if(rx_data_started)
 						{
-							if(frsky_rx_chanskip != (((packet[4] & 0xC0) >> 6) | ((packet[5] & 0x3F) << 2)))
+							if(FRSKY_RX_chanskip != (((packet[4] & 0xC0) >> 6) | ((packet[5] & 0x3F) << 2)))
 							{
 								chanskip_valid=false;	// chanskip value has changed which surely indicates a bad frame
 								packet_count++;
 								if(packet_count>5)		// the TX must have changed chanskip...
-									frsky_rx_chanskip = ((packet[4] & 0xC0) >> 6) | ((packet[5] & 0x3F) << 2);	// chanskip init
+									FRSKY_RX_chanskip = ((packet[4] & 0xC0) >> 6) | ((packet[5] & 0x3F) << 2);	// chanskip init
 							}
 							else
 								packet_count=0;
 						}
 						else
-							frsky_rx_chanskip = ((packet[4] & 0xC0) >> 6) | ((packet[5] & 0x3F) << 2);	// chanskip init
+							FRSKY_RX_chanskip = ((packet[4] & 0xC0) >> 6) | ((packet[5] & 0x3F) << 2);	// chanskip init
 					}
-					hopping_frequency_no = (hopping_frequency_no + frsky_rx_chanskip) % 47;
-					frsky_rx_set_channel(hopping_frequency_no);
+					hopping_frequency_no = (hopping_frequency_no + FRSKY_RX_chanskip) % 47;
+					FRSKY_RX_set_channel(hopping_frequency_no);
 					if(chanskip_valid)
 					{
-						if (telemetry_link == 0)
+						if ((telemetry_link & 0x7F) == 0)
 						{ // send channels to TX
-							frsky_rx_build_telemetry_packet();
+							FRSKY_RX_build_telemetry_packet();
 							telemetry_link = 1;
+							#ifdef SEND_CPPM
+								if(sub_protocol == FRSKY_CPPM)
+									telemetry_link |= 0x80;		// Disable telemetry output
+							#endif
 						}
 						pps_counter++;
 					}
@@ -577,8 +606,8 @@ uint16_t FrSky_Rx_callback()
 
 			// skip channel if no packet received in time
 			if (read_retry++ >= 9) {
-				hopping_frequency_no = (hopping_frequency_no + frsky_rx_chanskip) % 47;
-				frsky_rx_set_channel(hopping_frequency_no);
+				hopping_frequency_no = (hopping_frequency_no + FRSKY_RX_chanskip) % 47;
+				FRSKY_RX_set_channel(hopping_frequency_no);
 				if(rx_data_started)
 					read_retry = 0;
 				else

Multiprotocol/Futaba_cc2500.ino

@@ -14,10 +14,12 @@
  */
 // Last sync with main deviation/sfhss_cc2500.c dated 2016-03-23
 
-#if defined(SFHSS_CC2500_INO)
+#if defined(FUTABA_CC2500_INO)
 
 #include "iface_cc2500.h"
 
+//#define SFHSS_DEBUG_TIMING
+
 #define SFHSS_COARSE	0
 
 #define SFHSS_PACKET_LEN 13
@@ -79,7 +81,6 @@ static void __attribute__((unused)) SFHSS_rf_init()
 	for (uint8_t i = 0; i < 39; ++i)
 		CC2500_WriteReg(i, pgm_read_byte_near(&SFHSS_init_values[i]));
 
-	prev_option = option;
 	CC2500_WriteReg(CC2500_0C_FSCTRL0, option);
 	
 	CC2500_SetTxRxMode(TX_EN);
@@ -125,7 +126,7 @@ static void __attribute__((unused)) SFHSS_calc_next_chan()
 // Channel values are 12-bit values between 1020 and 2020, 1520 is the middle.
 // Futaba @140% is 2070...1520...970
 // Values grow down and to the right.
-static void __attribute__((unused)) SFHSS_build_data_packet()
+static void __attribute__((unused)) SFHSS_send_packet()
 {
 	uint16_t ch[4];
 	// command.bit0 is the packet number indicator: =0 -> SFHSS_DATA1, =1 -> SFHSS_DATA2
@@ -165,16 +166,14 @@ static void __attribute__((unused)) SFHSS_build_data_packet()
 			//    3584-4095 -> looks to be used for the throttle channel with values ranging from 880µs to 1520µs
 			for(uint8_t i=0;i<4;i++)
 			{
-				ch[i]=Failsafe_data[CH_AETR[ch_offset+i]];
-				if(ch[i]==FAILSAFE_CHANNEL_HOLD)
+				uint16_t val=Failsafe_data[CH_AETR[ch_offset+i]];
+				if(val==FAILSAFE_CHANNEL_HOLD)
 					ch[i]=1024;
-				else if(ch[i]==FAILSAFE_CHANNEL_NOPULSES)
+				else if(val==FAILSAFE_CHANNEL_NOPULSES)
 					ch[i]=0;
 				else
 				{ //Use channel value
-					ch[i]=(ch[i]>>1)+2560;
-					//if(IS_DISABLE_CH_MAP_off && ch_offset+i==CH3 && ch[i]<3072)		// Throttle
-					//	ch[i]+=1024;
+					ch[i] = convert_channel_16b_nolimit(CH_AETR[ch_offset+i],3571,2571,true); //3472,2672: not enough throw
 				}
 			}
 		}
@@ -182,7 +181,7 @@ static void __attribute__((unused)) SFHSS_build_data_packet()
 	#endif
 		{	//Normal data
 			for(uint8_t i=0;i<4;i++)
-				ch[i] = convert_channel_16b_nolimit(CH_AETR[ch_offset+i],2020,1020);
+				ch[i] = convert_channel_16b_nolimit(CH_AETR[ch_offset+i],2020,1020,false);
 		}
 
 	
@@ -203,15 +202,17 @@ static void __attribute__((unused)) SFHSS_build_data_packet()
 	packet[10] = (ch[2] << 7) | ((ch[3] >> 5) & 0x7F );
 	packet[11] = (ch[3] << 3) | ((fhss_code >> 2) & 0x07 );
 	packet[12] = (fhss_code << 6) | command;
-}
 
-static void __attribute__((unused)) SFHSS_send_packet()
-{
     CC2500_WriteData(packet, SFHSS_PACKET_LEN);
 }
 
-uint16_t ReadSFHSS()
+uint16_t SFHSS_callback()
 {
+#ifdef SFHSS_DEBUG_TIMING
+	static uint16_t prev_adjust_timing=1024;
+	uint16_t adjust_timing = (Channel_data[CH15]>>3) - (1024>>3);	// +-102 @ 100%
+#endif
+
 	switch(phase)
 	{
 		case SFHSS_START:
@@ -238,16 +239,27 @@ uint16_t ReadSFHSS()
 			#ifdef MULTI_SYNC
 				telemetry_set_input_sync(6800);
 			#endif
-			SFHSS_build_data_packet();
 			SFHSS_send_packet();
 			phase = SFHSS_DATA2;
+#ifdef SFHSS_DEBUG_TIMING
+			return SFHSS_DATA2_TIMING - adjust_timing;
+#else
 			return SFHSS_DATA2_TIMING;								// original 1650
+#endif
 		case SFHSS_DATA2:
-			SFHSS_build_data_packet();
 			SFHSS_send_packet();
 			SFHSS_calc_next_chan();
 			phase = SFHSS_TUNE;
-			return (SFHSS_PACKET_PERIOD -2000 -SFHSS_DATA2_TIMING);	// original 2000
+#ifdef SFHSS_DEBUG_TIMING
+			if(prev_adjust_timing != adjust_timing)
+			{
+				debugln("A:%d",(uint16_t)(SFHSS_DATA2_TIMING - adjust_timing));
+				prev_adjust_timing = adjust_timing;
+			}
+			return SFHSS_PACKET_PERIOD -2000 -(SFHSS_DATA2_TIMING - adjust_timing);
+#else
+			return SFHSS_PACKET_PERIOD -2000 -SFHSS_DATA2_TIMING;	// original 2000
+#endif
 		case SFHSS_TUNE:
 			phase = SFHSS_DATA1;
 			SFHSS_tune_freq();
@@ -288,7 +300,7 @@ static void __attribute__((unused)) SFHSS_get_tx_id()
 	rx_tx_addr[1] = fixed_id >> 0;
 }
 
-uint16_t initSFHSS()
+void SFHSS_init()
 {
 	BIND_DONE;	// Not a TX bind protocol
 	SFHSS_get_tx_id();
@@ -297,7 +309,6 @@ uint16_t initSFHSS()
 
 	SFHSS_rf_init();
 	phase = SFHSS_START;
-	return 10000;
 }
 
 #endif

Multiprotocol/GD00X_ccnrf.ino

@@ -14,9 +14,9 @@ Multiprotocol is distributed in the hope that it will be useful,
  */
 // Compatible with GD005 C-17 and GD006 DA62 planes.
 
-#if defined(GD00X_NRF24L01_INO)
+#if defined(GD00X_CCNRF_INO)
 
-#include "iface_nrf250k.h"
+#include "iface_xn297.h"
 
 //#define FORCE_GD00X_ORIGINAL_ID
 
@@ -113,7 +113,7 @@ static void __attribute__((unused)) GD00X_send_packet()
 
 	if(IS_BIND_DONE)
 	{
-		XN297L_Hopping(hopping_frequency_no);
+		XN297_Hopping(hopping_frequency_no);
 		if(sub_protocol==GD_V1)
 		{
 			hopping_frequency_no++;
@@ -121,21 +121,22 @@ static void __attribute__((unused)) GD00X_send_packet()
 		}
 	}
 
-	XN297L_WritePayload(packet, packet_length);
-
-	XN297L_SetPower();		// Set tx_power
-	XN297L_SetFreqOffset();	// Set frequency offset
+	// Send
+	XN297_SetFreqOffset();
+	XN297_SetPower();
+	XN297_SetTxRxMode(TX_EN);
+	XN297_WritePayload(packet, packet_length);
 }
 
-static void __attribute__((unused)) GD00X_init()
+static void __attribute__((unused)) GD00X_RF_init()
 {
-	XN297L_Init();
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_250K);
 	if(sub_protocol==GD_V1)
-		XN297L_SetTXAddr((uint8_t*)"\xcc\xcc\xcc\xcc\xcc", 5);
+		XN297_SetTXAddr((uint8_t*)"\xcc\xcc\xcc\xcc\xcc", 5);
 	else
-		XN297L_SetTXAddr((uint8_t*)"GDKNx", 5);
-	XN297L_HoppingCalib(sub_protocol==GD_V1?GD00X_RF_NUM_CHANNELS:GD00X_V2_RF_NUM_CHANNELS);	// Calibrate all channels
-	XN297L_RFChannel(sub_protocol==GD_V1?GD00X_RF_BIND_CHANNEL:GD00X_V2_RF_BIND_CHANNEL);		// Set bind channel
+		XN297_SetTXAddr((uint8_t*)"GDKNx", 5);
+	XN297_HoppingCalib(sub_protocol==GD_V1?GD00X_RF_NUM_CHANNELS:GD00X_V2_RF_NUM_CHANNELS);	// Calibrate all channels
+	XN297_RFChannel(sub_protocol==GD_V1?GD00X_RF_BIND_CHANNEL:GD00X_V2_RF_BIND_CHANNEL);		// Set bind channel
 }
 
 static void __attribute__((unused)) GD00X_initialize_txid()
@@ -204,28 +205,27 @@ static void __attribute__((unused)) GD00X_initialize_txid()
 
 uint16_t GD00X_callback()
 {
-	if(IS_BIND_IN_PROGRESS)
-		if(--bind_counter==0)
-			BIND_DONE;
-	GD00X_send_packet();
 	#ifdef MULTI_SYNC
 		telemetry_set_input_sync(packet_period);
 	#endif
+	if(bind_counter)
+		if(--bind_counter==0)
+			BIND_DONE;
+	GD00X_send_packet();
 	return packet_period;
 }
 
-uint16_t initGD00X()
+void GD00X_init()
 {
 	BIND_IN_PROGRESS;	// autobind protocol
 	GD00X_initialize_txid();
-	GD00X_init();
+	GD00X_RF_init();
 	hopping_frequency_no = 0;
 	bind_counter=GD00X_BIND_COUNT;
 	packet_period=sub_protocol==GD_V1?GD00X_PACKET_PERIOD:GD00X_V2_BIND_PACKET_PERIOD;
 	packet_length=sub_protocol==GD_V1?GD00X_PAYLOAD_SIZE:GD00X_V2_PAYLOAD_SIZE;
 	packet_count=0;
 	len=0;
-	return GD00X_INITIAL_WAIT;
 }
 
 #endif

Multiprotocol/GW008_nrf24l01.ino

@@ -19,7 +19,7 @@ Multiprotocol is distributed in the hope that it will be useful,
 
 #if defined(GW008_NRF24L01_INO)
 
-#include "iface_nrf24l01.h"
+#include "iface_xn297.h"
 
 #define GW008_INITIAL_WAIT    500
 #define GW008_PACKET_PERIOD   2400
@@ -32,10 +32,10 @@ enum {
 	GW008_DATA
 };
 
-static void __attribute__((unused)) GW008_send_packet(uint8_t bind)
+static void __attribute__((unused)) GW008_send_packet()
 {
 	packet[0] = rx_tx_addr[0];
-	if(bind)
+	if(IS_BIND_IN_PROGRESS)
 	{
 		packet[1] = 0x55;
 		packet[2] = hopping_frequency[0];
@@ -47,6 +47,9 @@ static void __attribute__((unused)) GW008_send_packet(uint8_t bind)
 	}
 	else
 	{
+		XN297_Hopping((hopping_frequency_no++)/2);
+		hopping_frequency_no %= 8;
+
 		packet[1] = 0x01 | GET_FLAG(CH5_SW, 0x40); // flip
 		packet[2] = convert_channel_16b_limit(AILERON , 200, 0); // aileron
 		packet[3] = convert_channel_16b_limit(ELEVATOR, 0, 200); // elevator
@@ -63,38 +66,21 @@ static void __attribute__((unused)) GW008_send_packet(uint8_t bind)
 	}
 	packet[14] = rx_tx_addr[1];
 
-	// Power on, TX mode, CRC enabled
-	XN297_Configure(_BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO) | _BV(NRF24L01_00_PWR_UP));
-	NRF24L01_WriteReg(NRF24L01_05_RF_CH, bind ? GW008_RF_BIND_CHANNEL : hopping_frequency[(hopping_frequency_no++)/2]);
-	hopping_frequency_no %= 8;
-
-	NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);
-	NRF24L01_FlushTx();
+	// Send
+	XN297_SetPower();
+	XN297_SetTxRxMode(TX_EN);
 	XN297_WriteEnhancedPayload(packet, GW008_PAYLOAD_SIZE, 0);
-
-	NRF24L01_SetPower();	// Set tx_power
 }
 
-static void __attribute__((unused)) GW008_init()
+static void __attribute__((unused)) GW008_RF_init()
 {
-	NRF24L01_Initialize();
-	NRF24L01_SetTxRxMode(TX_EN);
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
+	
 	XN297_SetTXAddr((uint8_t*)"\xcc\xcc\xcc\xcc\xcc", 5);
-	XN297_SetRXAddr((uint8_t*)"\xcc\xcc\xcc\xcc\xcc", 5);
-	NRF24L01_FlushTx();
-	NRF24L01_FlushRx();
-	NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);     // Clear data ready, data sent, and retransmit
-	NRF24L01_WriteReg(NRF24L01_01_EN_AA, 0x00);      // No Auto Acknowldgement on all data pipes
-	NRF24L01_WriteReg(NRF24L01_02_EN_RXADDR, 0x01);
-	NRF24L01_WriteReg(NRF24L01_11_RX_PW_P0, GW008_PAYLOAD_SIZE+2); // payload + 2 bytes for pcf
-	NRF24L01_WriteReg(NRF24L01_03_SETUP_AW, 0x03);
-	NRF24L01_WriteReg(NRF24L01_04_SETUP_RETR, 0x00); // no retransmits
-	NRF24L01_SetBitrate(NRF24L01_BR_1M);
-	NRF24L01_SetPower();
-	NRF24L01_Activate(0x73);                         // Activate feature register
-	NRF24L01_WriteReg(NRF24L01_1C_DYNPD, 0x00);      // Disable dynamic payload length on all pipes
-	NRF24L01_WriteReg(NRF24L01_1D_FEATURE, 0x01);    // Set feature bits on
-	NRF24L01_Activate(0x73);
+	XN297_SetRXAddr((uint8_t*)"\xcc\xcc\xcc\xcc\xcc", GW008_PAYLOAD_SIZE);
+
+	//XN297_HoppingCalib(8);
+	XN297_RFChannel(GW008_RF_BIND_CHANNEL);
 }
 
 static void __attribute__((unused)) GW008_initialize_txid()
@@ -109,53 +95,48 @@ uint16_t GW008_callback()
 	switch(phase)
 	{
 		case GW008_BIND1:
-			if((NRF24L01_ReadReg(NRF24L01_07_STATUS) & _BV(NRF24L01_07_RX_DR)) &&	// RX fifo data ready
+			if(XN297_IsRX() &&	// RX fifo data ready
 				XN297_ReadEnhancedPayload(packet, GW008_PAYLOAD_SIZE) == GW008_PAYLOAD_SIZE &&	// check payload size
 				packet[0] == rx_tx_addr[0] && packet[14] == rx_tx_addr[1])			// check tx id
 			{
-				NRF24L01_SetTxRxMode(TXRX_OFF);
-				NRF24L01_SetTxRxMode(TX_EN);
+				XN297_SetTxRxMode(TXRX_OFF);
+				XN297_SetTxRxMode(TX_EN);
 				rx_tx_addr[2] = packet[13];
 				BIND_DONE;
 				phase = GW008_DATA;
 			}
 			else
 			{
-				NRF24L01_SetTxRxMode(TXRX_OFF);
-				NRF24L01_SetTxRxMode(TX_EN);
-				GW008_send_packet(1);
+				XN297_SetTxRxMode(TXRX_OFF);
+				XN297_SetTxRxMode(TX_EN);
+				GW008_send_packet();
 				phase = GW008_BIND2;
 				return 850; // minimum value 750 for STM32
 			}
 			break;
 		case GW008_BIND2:
 			// switch to RX mode
-			NRF24L01_SetTxRxMode(TXRX_OFF);
-			NRF24L01_FlushRx();
-			NRF24L01_SetTxRxMode(RX_EN);
-			XN297_Configure(_BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO) 
-						| _BV(NRF24L01_00_PWR_UP) | _BV(NRF24L01_00_PRIM_RX)); 
+			XN297_SetTxRxMode(TXRX_OFF);
+			XN297_SetTxRxMode(RX_EN);
 			phase = GW008_BIND1;
 			return 5000;
-			break;
 		case GW008_DATA:
 			#ifdef MULTI_SYNC
 				telemetry_set_input_sync(GW008_PACKET_PERIOD);
 			#endif
-			GW008_send_packet(0);
+			GW008_send_packet();
 			break;
 	}
 	return GW008_PACKET_PERIOD;
 }
 
-uint16_t initGW008()
+void GW008_init()
 {
 	BIND_IN_PROGRESS;	// autobind protocol
 	GW008_initialize_txid();
 	phase = GW008_BIND1;
-	GW008_init();
+	GW008_RF_init();
 	hopping_frequency_no = 0;
-	return GW008_INITIAL_WAIT;
 }
 
 #endif

Multiprotocol/H8_3D_nrf24l01.ino

@@ -19,7 +19,7 @@
 
 #if defined(H8_3D_NRF24L01_INO)
 
-#include "iface_nrf24l01.h"
+#include "iface_xn297.h"
 
 #define H8_3D_PACKET_PERIOD		1800
 #define H20H_PACKET_PERIOD		9340
@@ -50,7 +50,7 @@ enum H8_3D_FLAGS_2 {
     H8_3D_FLAG_CAM_UP     = 0x04,
 };
 
-static void __attribute__((unused)) H8_3D_send_packet(uint8_t bind)
+static void __attribute__((unused)) H8_3D_send_packet()
 {
 	if(sub_protocol==H20H)
 		packet[0] = 0x14;
@@ -63,7 +63,7 @@ static void __attribute__((unused)) H8_3D_send_packet(uint8_t bind)
 	packet[4] = rx_tx_addr[3];
 	packet[8] = rx_tx_addr[0]+rx_tx_addr[1]+rx_tx_addr[2]+rx_tx_addr[3]; // txid checksum
 	memset(&packet[9], 0, 10);
-	if (bind)
+	if (IS_BIND_IN_PROGRESS)
 	{    
 		packet[5] = 0x00;
 		packet[6] = 0x00;
@@ -122,18 +122,16 @@ static void __attribute__((unused)) H8_3D_send_packet(uint8_t bind)
 		sum += packet[i];
 	packet[19] = sum; // data checksum
 	
-	// Power on, TX mode, 2byte CRC
-	// Why CRC0? xn297 does not interpret it - either 16-bit CRC or nothing
-	XN297_Configure(_BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO) | _BV(NRF24L01_00_PWR_UP));
+	// RF channel
 	if(sub_protocol!=H20H)
 	{ // H8_3D, H20MINI, H30MINI
-		NRF24L01_WriteReg(NRF24L01_05_RF_CH, bind ? hopping_frequency[0] : hopping_frequency[hopping_frequency_no++]);
+		XN297_RFChannel(IS_BIND_IN_PROGRESS ? hopping_frequency[0] : hopping_frequency[hopping_frequency_no++]);
 		hopping_frequency_no %= H8_3D_RF_NUM_CHANNELS;
 	}
 	else
-	{ //H20H
-		NRF24L01_WriteReg(NRF24L01_05_RF_CH, bind ? H20H_BIND_RF : hopping_frequency[packet_count>>3]);  
-		if(!bind)
+	{ // H20H
+		XN297_RFChannel(IS_BIND_IN_PROGRESS ? H20H_BIND_RF : hopping_frequency[packet_count>>3]);  
+		if(IS_BIND_DONE)
 		{
 			packet_count++;
 			if(packet_count>15)
@@ -147,55 +145,39 @@ static void __attribute__((unused)) H8_3D_send_packet(uint8_t bind)
 		}
 	}
 	
-	// clear packet status bits and TX FIFO
-	NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);
-	NRF24L01_FlushTx();
+	// Send
+	XN297_SetPower();
+	XN297_SetTxRxMode(TX_EN);
 	XN297_WritePayload(packet, H8_3D_PACKET_SIZE);
-
-	NRF24L01_SetPower();	// Set tx_power
 }
 
-static void __attribute__((unused)) H8_3D_init()
+static void __attribute__((unused)) H8_3D_RF_init()
 {
-    NRF24L01_Initialize();
-    NRF24L01_SetTxRxMode(TX_EN);
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
+
 	if(sub_protocol==H20H)
 		XN297_SetTXAddr((uint8_t *)"\xEE\xDD\xCC\xBB\x11", 5);
 	else // H8_3D, H20MINI, H30MINI
 		XN297_SetTXAddr((uint8_t *)"\xC4\x57\x09\x65\x21", 5);
-
-    NRF24L01_FlushTx();
-    NRF24L01_FlushRx();
-    NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);     // Clear data ready, data sent, and retransmit
-    NRF24L01_WriteReg(NRF24L01_01_EN_AA, 0x00);      // No Auto Acknowldgement on all data pipes
-    NRF24L01_WriteReg(NRF24L01_02_EN_RXADDR, 0x01);  // Enable data pipe 0 only
-    NRF24L01_WriteReg(NRF24L01_04_SETUP_RETR, 0x00); // no retransmits
-    NRF24L01_SetBitrate(NRF24L01_BR_1M);             // 1Mbps
-    NRF24L01_SetPower();
 }
 
 uint16_t H8_3D_callback()
 {
-	if(IS_BIND_DONE)
-	{
-		#ifdef MULTI_SYNC
-			telemetry_set_input_sync(packet_period);
-		#endif
-		H8_3D_send_packet(0);
-	}
-	else
+	if(bind_counter)
 	{
+		bind_counter--;
 		if (bind_counter == 0)
 		{
 			BIND_DONE;
 			packet_count=0;
 		}
-		else
-		{
-			H8_3D_send_packet(1);
-			bind_counter--;
-		}
 	}
+	#ifdef MULTI_SYNC
+	else
+		telemetry_set_input_sync(packet_period);
+	#endif
+
+	H8_3D_send_packet();
 	return	packet_period;
 }
 
@@ -238,12 +220,12 @@ static void __attribute__((unused)) H8_3D_initialize_txid()
 	}
 }
 
-uint16_t initH8_3D(void)
+void H8_3D_init(void)
 {
 	BIND_IN_PROGRESS;	// autobind protocol
     bind_counter = H8_3D_BIND_COUNT;
 	H8_3D_initialize_txid();
-	H8_3D_init();
+	H8_3D_RF_init();
 	switch(sub_protocol)
 	{
         case H8_3D:
@@ -257,7 +239,6 @@ uint16_t initH8_3D(void)
 			packet_period=H20MINI_PACKET_PERIOD;
 			break;
 	}
-	return	H8_3D_INITIAL_WAIT;
 }
 
 #endif

Multiprotocol/HOTT_cc2500.ino

@@ -86,7 +86,6 @@ static void __attribute__((unused)) HOTT_rf_init()
 	for (uint8_t i = 0; i < 39; ++i)
 		CC2500_WriteReg(i, pgm_read_byte_near(&HOTT_init_values[i]));
 
-	prev_option = option;
 	CC2500_WriteReg(CC2500_0C_FSCTRL0, option);
 	
 	CC2500_SetTxRxMode(TX_EN);
@@ -138,7 +137,7 @@ const uint8_t PROGMEM HOTT_hop[][HOTT_NUM_RF_CHANNELS]=
 		};
 const uint16_t PROGMEM HOTT_hop_val[] = { 0xC06B, 0xC34A, 0xDB24, 0x8E09, 0x272E, 0x217F, 0x155B, 0xEDE8, 0x1D31, 0x0986, 0x56F7, 0x6454, 0xC42D, 0x01D2, 0xC253, 0x1180 };
 
-static void __attribute__((unused)) HOTT_init()
+static void __attribute__((unused)) HOTT_TXID_init()
 {
 	packet[0] = pgm_read_word_near( &HOTT_hop_val[num_ch] );
 	packet[1] = pgm_read_word_near( &HOTT_hop_val[num_ch] )>>8;
@@ -159,7 +158,7 @@ static void __attribute__((unused)) HOTT_init()
 	else
 	{
 		memcpy(&packet[40],rx_tx_addr,5);
-		uint8_t addr=HOTT_EEPROM_OFFSET+RX_num*5;
+		uint16_t addr=HOTT_EEPROM_OFFSET+RX_num*5;
 		debug("RXID: ");
 		for(uint8_t i=0;i<5;i++)
 		{
@@ -170,58 +169,77 @@ static void __attribute__((unused)) HOTT_init()
 	}
 }
 
-static void __attribute__((unused)) HOTT_prep_data_packet()
-{
+static void __attribute__((unused)) HOTT_prep_data_packet() {
+	static uint8_t upper = 0;								// toggles between sending channels 1..8,9..12 and 1..8,13..16
+	
+	packet[2] = hopping_frequency_no;						// send next frequency to be used
+	packet[3] = upper;										// indicate upper or lower channels (only supporting 16 channels)										
 	
-	packet[2] = hopping_frequency_no;
-
-	packet[3] = 0x00;									// used for failsafe but may also be used for additional channels
 	#ifdef FAILSAFE_ENABLE
-		static uint8_t failsafe_count=0;
-		if(IS_FAILSAFE_VALUES_on && IS_BIND_DONE)
-		{
-			failsafe_count++;
-			if(failsafe_count>=3)
-			{
-				FAILSAFE_VALUES_off;
-				failsafe_count=0;
+		static uint8_t failsafe_count = 0;					// failsafe packet state machine (need to send two packets)
+
+		if(IS_FAILSAFE_VALUES_on && IS_BIND_DONE) {			// if TX wants to send failsafe data and RX is connected
+			failsafe_count++;								// prepare to send next packet
+
+			if(failsafe_count >= 3) {						// done sending two failsafe channel data packets
+				FAILSAFE_VALUES_off;					
+				failsafe_count = 0;
 			}
 		}
 		else
-			failsafe_count=0;
+			failsafe_count = 0;
 	#endif
 
 	// Channels value are PPM*2, -100%=1100µs, +100%=1900µs, order TAER
+	//
+	// Note: failsafe packets are differnt to normal operation packets
+	// normal operation toggles between sending channels 1..8,9..12 and 1..8,13..16 using bit0 as high/low indicator in packet[3]
+	// while failsafe packets send channels 1..12, 13..24 (and probably 25..32) using bit0 in packet[3] as packet type indicator
+	// packet[3] = 0x40 -> failsafe packet with data for channels 1..12
+	// packet[3] = 0x41 -> failsafe packet with data for channels 13..24
+	//
 	uint16_t val;
-	for(uint8_t i=4;i<28;i+=2)
-	{
-		val=Channel_data[(i-4)>>1];
-		val=(((val<<2)+val)>>2)+860*2;					// value range 860<->2140 *2 <-> -125%<->+125%
+	for(uint8_t i = 0 ; i < 12*2 ; i += 2) {				// working 12 channels (using 2 bytes per channel)
+		uint8_t chIndex = i >> 1 ;							// normal operation channel number
+		uint8_t fschIndex = chIndex;						// linear channel number for failsafe
+		
+		if(upper && chIndex >= 8) chIndex += 4;				// for normal operation toggle between channels 1..8,9..12 and 1..8,13..16
+		val = Channel_data[chIndex];						// get normal operation channel data
+		val = (((val << 2) + val) >> 2)+ 860*2;				// convert channel data 0..2047 to 1720..4278 <-> -125%<->+125%
+															// val = (val*5/4+860*2)
+
 		#ifdef FAILSAFE_ENABLE
-			if(failsafe_count==1)
-			{ // first failsafe packet
-				packet[3]=0x40;
-				uint16_t fs=Failsafe_data[(i-4)>>1];
-				if( fs == FAILSAFE_CHANNEL_HOLD || fs == FAILSAFE_CHANNEL_NOPULSES)
-					val|=0x8000;						// channel hold flag
-				else
-				{
-					val=(((fs<<2)+fs)>>2)+860*2;		// value range 860<->2140 *2 <-> -125%<->+125%
-					val|=0x4000;						// channel specific position flag
+			if(failsafe_count == 1 || failsafe_count == 2) {// failsafe data needs to be sent to RX
+				uint16_t fs = 0x8000;						// default failsafe mode is hold
+
+				if(failsafe_count == 1) {					// send fail safe packet containing channels 1..12
+					packet[3] = 0x40;						// indicate packet has failsafe values for channels 1..12
+					fs = Failsafe_data[fschIndex];			// get failsafe channel data
+				} else {									// send fail safe packet containing channels 13..24
+					packet[3] = 0x41;						// indicate packet has failsafe values for channels 13..24
+					if(fschIndex < 4)						// we only work 16 channels so send channels 13..16, rest default
+						fs = Failsafe_data[fschIndex+12];	// get failsafe channel data 13..16
+				  } 
+
+				if( fs == FAILSAFE_CHANNEL_HOLD ||			// treat HOLD and NOPULSES as channel hold 
+					fs == FAILSAFE_CHANNEL_NOPULSES)
+					val = 0x8000;							// set channel failsafe mode hold flag
+				else {
+					val = (((fs << 2) + fs) >> 2) +860*2; 	// convert channel data 0..2047 to 1720..4278 <-> -125%<->+125%
+					val |= 0x4000;							// set channel failsafe mode position flag					
 				}
-			}
-			else if(failsafe_count==2)
-			{ // second failsafe packet=timing?
-				packet[3]=0x50;
-				if(i==4)
-					val=2;
-				else
-					val=0;
-			}
+			} 
 		#endif
-		packet[i] = val;
-		packet[i+1] = val>>8;
+
+		packet[i + 4]   = val;								// first channel data at packet[4] and packet[5]
+		packet[i + 4+1] = val >> 8;
 	}
+
+	upper ^= 0x01;											// toggle to upper and lower channels
+
+	packet[28] = 0x80;										// no sensor
+	packet[29] = 0x02;										// 0x02 when bind starts then when RX replies cycle in sequence 0x1A/22/2A/0A/12, 0x02 during normal packets, 0x01->text config menu, 0x0A->no more RX telemetry
+
 	#ifdef HOTT_FW_TELEMETRY
 		if(IS_BIND_DONE)
 		{
@@ -239,25 +257,23 @@ static void __attribute__((unused)) HOTT_prep_data_packet()
 					}
 					else
 						packet[28] = HoTT_SerialRX_val | 0x0F;	// no button pressed
-					packet[29] = 0x01;							// 0x01->Text config menu
 				}
+				else
+					packet[28] = 0x0F;							// RX, no button pressed
+				if(sub_protocol == HOTT_SYNC)
+					packet[29] = ((HOTT_sensor_seq+1)<<3) | 1;	// Telemetry packet sequence
+				else
+					packet[29] = 0x01;							// 0x01->Text config menu
 			}
 			else
 			{
 				packet[28] = 0x89+HOTT_sensor_cur;				// 0x89/8A/8B/8C/8D/8E during normal packets
 				if(sub_protocol == HOTT_SYNC)
 					packet[29] = ((HOTT_sensor_seq+1)<<3) | 2;	// Telemetry packet sequence
-				else
-					packet[29] = 0x02;
-				//debugln("28=%02X,29=%02X",packet[28],packet[29]);
 			}
+			//debugln("28=%02X,29=%02X",packet[28],packet[29]);
 		}
-		else
 	#endif
-		{
-			packet[28] = 0x80;									// no sensor
-			packet[29] = 0x02;									// unknown 0x02 when bind starts then when RX replies cycle in sequence 0x1A/22/2A/0A/12, 0x02 during normal packets, 0x01->text config menu, 0x0A->no more RX telemetry
-		}
 
 	CC2500_WriteReg(CC2500_06_PKTLEN, HOTT_TX_PACKET_LEN);
 	CC2500_WriteRegisterMulti(CC2500_3F_TXFIFO, packet, HOTT_TX_PACKET_LEN);
@@ -272,7 +288,7 @@ static void __attribute__((unused)) HOTT_prep_data_packet()
 	rf_ch_num=hopping_frequency[hopping_frequency_no];
 }
 
-uint16_t ReadHOTT()
+uint16_t HOTT_callback()
 {
 	switch(phase)
 	{
@@ -345,7 +361,7 @@ uint16_t ReadHOTT()
 			CC2500_Strobe(CC2500_SFRX);
 			//RX
 			if(packet[29] & 0xF8)
-			{// binary telemetry
+			{// Sync telemetry
 				CC2500_WriteReg(CC2500_04_SYNC1, 0x2C);
 				CC2500_WriteReg(CC2500_05_SYNC0, 0x6E);
 			}
@@ -374,18 +390,18 @@ uint16_t ReadHOTT()
 						for(uint8_t i=0;i<HOTT_RX_PACKET_LEN;i++)
 							debug(" %02X", packet_in[i]);
 						debugln("");
-						uint8_t addr=HOTT_EEPROM_OFFSET+RX_num*5;
+						uint16_t addr=HOTT_EEPROM_OFFSET+RX_num*5;
 						for(uint8_t i=0; i<5; i++)
 							eeprom_write_byte((EE_ADDR)(addr+i),packet_in[5+i]);
 						BIND_DONE;
-						HOTT_init();
+						HOTT_TXID_init();
 					}
 					#ifdef HOTT_FW_TELEMETRY
 						else
 						{	//Telemetry
 							// [0..4] = TXID
 							// [5..9] = RXID
-							// [10] = 0x40 bind, 0x00 normal, 0x80 config menu
+							// [10] = holds warnings issued by hott devices
 							// [11] = telmetry pages. For sensors 0x00 to 0x04, for config mennu 0x00 to 0x12.
 							// Normal telem page 0 = 0x55, 0x32, 0x38, 0x55, 0x64, 0x32, 0xD0, 0x07, 0x00, 0x55
 							//   Page 0 [12] = [21] = [15]
@@ -395,7 +411,7 @@ uint16_t ReadHOTT()
 							//   Page 0 [16] = RX_LQI in %
 							//   Page 0 [17] = RX_Voltage Min*10 in V
 							//   Page 0 [18,19] = [19]<<8+[18]=max lost packet time in ms, max value seems 2s=0x7D0
-							//   Page 0 [20] = 0x00 ??
+							//   Page 0 [20] = rx events
 							//
 							// Config menu consists of the different telem pages put all together
 							//   Page X [12] = seems like all the telem pages with the same value are going together to make the full config menu text. Seen so far 'a', 'b', 'c', 'd' 
@@ -407,9 +423,12 @@ uint16_t ReadHOTT()
 							// Reduce telemetry to 14 bytes
 							packet_in[0]= packet_in[HOTT_RX_PACKET_LEN];
 							packet_in[1]= TX_LQI;
+							uint8_t hott_warnings = packet_in[10];						// save warnings from hott devices
 							bool send_telem=true;
-							if(packet[29]==1)
+							HOTT_sensor_seq++;											// Increment RX sequence counter
+							if(packet[29] & 1)
 							{ //Text mode
+								HOTT_sensor_seq %= 19;									// 19 pages in Text mode
 								HOTT_sensor_pages = 0;
 								HOTT_sensor_valid = false;
 								packet_in[10] = 0x80;									// Marking telem Text mode
@@ -419,7 +438,6 @@ uint16_t ReadHOTT()
 							}
 							else
 							{ //Binary sensor
-								HOTT_sensor_seq++;										// Increment RX sequence counter
 								HOTT_sensor_seq %= 5;									// 5 pages in binary mode per sensor
 								if(state==0 && HOTT_sensor_ok[0]==false && HOTT_sensor_ok[1]==false && HOTT_sensor_ok[2]==false && HOTT_sensor_ok[3]==false && HOTT_sensor_ok[4]==false && HOTT_sensor_ok[5]==false)
 									HOTT_sensor_seq=0;									// No sensors always ask page 0
@@ -458,6 +476,7 @@ uint16_t ReadHOTT()
 								packet_in[i-8]=packet_in[i];
 								debug(" %02X",packet_in[i]);
 							}
+							packet_in[14] = hott_warnings;								// restore saved warnings from hott devices
 							debugln("");
 							if(send_telem)
 								telemetry_link=2;
@@ -504,10 +523,10 @@ uint16_t ReadHOTT()
 	return 0;
 }
 
-uint16_t initHOTT()
+void HOTT_init()
 {
 	num_ch=random(0xfefefefe)%16;
-	HOTT_init();
+	HOTT_TXID_init();
 	HOTT_rf_init();
 	#ifdef HOTT_FW_TELEMETRY
 		HoTT_SerialRX_val=0;
@@ -522,7 +541,6 @@ uint16_t initHOTT()
 		state=HOTT_SENSOR_SEARCH_PERIOD;
 	#endif
 	phase = HOTT_START;
-	return 10000;
 }
 
 #endif

Multiprotocol/HS6200_EMU.ino

@@ -0,0 +1,112 @@
+/*
+ This project is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Multiprotocol is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Multiprotocol.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifdef CYRF6936_INSTALLED
+#include "iface_hs6200.h"
+
+static bool HS6200_crc;
+static uint16_t HS6200_crc_init;
+static uint8_t HS6200_address_length, HS6200_tx_addr[5];
+
+static void __attribute__((unused)) HS6200_Init(bool crc_en)
+{
+	CYRF_GFSK1M_Init(32, 1);	//Dummy number of bytes for now
+	HS6200_crc = crc_en;
+}
+
+static void __attribute__((unused)) HS6200_SetTXAddr(const uint8_t* addr, uint8_t addr_len)
+{
+	// precompute address crc
+	crc = 0xffff;
+	for(uint8_t i=0; i<addr_len; i++)
+		crc16_update(addr[addr_len-1-i], 8);
+	HS6200_crc_init=crc;
+	memcpy(HS6200_tx_addr, addr, addr_len);
+	HS6200_address_length = addr_len;
+}
+
+static uint16_t __attribute__((unused)) HS6200_calc_crc(uint8_t* msg, uint8_t len)
+{
+    uint8_t pos;
+    
+	crc = HS6200_crc_init;
+    // pcf + payload
+    for(pos=0; pos < len-1; pos++)
+        crc16_update(msg[pos], 8);
+    // last byte (1 bit only)
+    if(len > 0)
+        crc16_update(msg[pos+1], 1);
+    return crc;
+}
+
+static void __attribute__((unused)) HS6200_SendPayload(uint8_t* msg, uint8_t len)
+{
+	static const uint8_t HS6200_scramble[] = { 0x80,0xf5,0x3b,0x0d,0x6d,0x2a,0xf9,0xbc,0x51,0x8e,0x4c,0xfd,0xc1,0x65,0xd0 }; // todo: find all 32 bytes ...
+	uint8_t payload[32];
+	const uint8_t no_ack = 1; // never ask for an ack
+	static uint8_t pid;
+	uint8_t pos = 0;
+
+	if(len > sizeof(HS6200_scramble))
+		len = sizeof(HS6200_scramble);
+
+	// address
+	for(int8_t i=HS6200_address_length-1; i>=0; i--)
+		payload[pos++] = HS6200_tx_addr[i];
+
+	// guard bytes
+	payload[pos++] = HS6200_tx_addr[0];
+	payload[pos++] = HS6200_tx_addr[0];
+
+	// packet control field
+	payload[pos++] = ((len & 0x3f) << 2) | (pid & 0x03);
+	payload[pos] = (no_ack & 0x01) << 7;
+	pid++;
+
+	// scrambled payload
+	if(len > 0)
+	{
+		payload[pos++] |= (msg[0] ^ HS6200_scramble[0]) >> 1; 
+		for(uint8_t i=1; i<len; i++)
+			payload[pos++] = ((msg[i-1] ^ HS6200_scramble[i-1]) << 7) | ((msg[i] ^ HS6200_scramble[i]) >> 1);
+		payload[pos] = (msg[len-1] ^ HS6200_scramble[len-1]) << 7; 
+	}
+
+	// crc
+	if(HS6200_crc)
+	{
+		uint16_t crc = HS6200_calc_crc(&payload[HS6200_address_length+2], len+2);
+		uint8_t hcrc = crc >> 8;
+		uint8_t lcrc = crc & 0xff;
+		payload[pos++] |= (hcrc >> 1);
+		payload[pos++] = (hcrc << 7) | (lcrc >> 1);
+		payload[pos++] = lcrc << 7;
+	}
+
+	#if 0
+		debug("E:");
+		for(uint8_t i=0; i<pos; i++)
+			debug(" %02X",payload[i]);
+		debugln("");
+	#endif
+
+	//CYRF wants LSB first
+	for(uint8_t i=0; i<pos; i++)
+		payload[i]=bit_reverse(payload[i]);
+	//Send
+	CYRF_WriteRegister(CYRF_01_TX_LENGTH, pos);
+	CYRF_GFSK1M_SendPayload(payload, pos);
+}
+
+#endif

Multiprotocol/Height_a7105.ino

@@ -41,7 +41,7 @@ static void __attribute__((unused)) HEIGHT_build_packet()
 	}
 }
 
-uint16_t ReadHeight()
+uint16_t HEIGHT_callback()
 {
 	#ifndef FORCE_HEIGHT_TUNING
 		A7105_AdjustLOBaseFreq(1);
@@ -78,7 +78,7 @@ uint16_t ReadHeight()
 	return 1500;
 }
 
-uint16_t initHeight()
+void HEIGHT_init()
 {
 	A7105_Init();
 
@@ -94,7 +94,6 @@ uint16_t initHeight()
 	
 	phase=255;
 	bind_counter = HEIGHT_BIND_COUNT;
-	return 2400;
 }
 #endif
 // Normal packet is 8 bytes: 0xA5 0xAF 0x59 0x84 0x7A 0x00 0x80 0xFF

Multiprotocol/Hisky_nrf24l01.ino

@@ -24,44 +24,7 @@
 //
 uint8_t bind_buf_arry[4][10];
 
-// HiSky 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]
-static void __attribute__((unused)) calc_fh_channels()
-{
-	uint8_t idx = 0;
-	uint32_t rnd = MProtocol_id;
-
-	while (idx < HISKY_FREQUENCE_NUM)
-	{
-		uint8_t i;
-		uint8_t count_2_26 = 0, count_27_50 = 0, count_51_74 = 0;
-
-		rnd = rnd * 0x0019660D + 0x3C6EF35F; // Randomization
-		// Use least-significant byte. 73 is prime, so channels 76..77 are unused
-		uint8_t next_ch = ((rnd >> 8) % 73) + 2;
-		// Keep the distance 2 between the channels - either odd or even
-		if (((next_ch ^ (uint8_t)rx_tx_addr[3]) & 0x01 )== 0)
-			continue;
-		// Check that it's not duplicated and spread uniformly
-		for (i = 0; i < idx; i++) {
-			if(hopping_frequency[i] == next_ch)
-				break;
-			if(hopping_frequency[i] <= 26)
-				count_2_26++;
-			else if (hopping_frequency[i] <= 50)
-				count_27_50++;
-			else
-				count_51_74++;
-		}
-		if (i != idx)
-			continue;
-		if ( (next_ch <= 26 && count_2_26 < 8) || (next_ch >= 27 && next_ch <= 50 && count_27_50 < 8) || (next_ch >= 51 && count_51_74 < 8) )
-			hopping_frequency[idx++] = next_ch;//find hopping frequency
-	}
-}
-
-static void __attribute__((unused)) build_binding_packet(void)
+static void __attribute__((unused)) HISKY_build_binding_packet(void)
 {
 	uint8_t i;
 	uint16_t sum=0;
@@ -95,28 +58,21 @@ static void __attribute__((unused)) build_binding_packet(void)
 	}
 }
 
-static void __attribute__((unused)) hisky_init()
+static void __attribute__((unused)) HISKY_RF_init()
 {
 	NRF24L01_Initialize();
 
-	NRF24L01_WriteReg(NRF24L01_01_EN_AA, 0x00);			// No Auto Acknowledgement
-	NRF24L01_WriteReg(NRF24L01_02_EN_RXADDR, 0x01);		// Enable p0 rx
-	NRF24L01_WriteReg(NRF24L01_03_SETUP_AW, 0x03);		// 5-byte RX/TX address (byte -2)
 	NRF24L01_WriteReg(NRF24L01_05_RF_CH, 81);			// binding packet must be set in channel 81
 	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
 	if(sub_protocol==HK310)
-		NRF24L01_SetBitrate(NRF24L01_BR_250K);				// 250Kbps
-	else
-		NRF24L01_SetBitrate(NRF24L01_BR_1M);				// 1Mbps
-	NRF24L01_SetPower();								// Set power
-	NRF24L01_SetTxRxMode(TX_EN);						// TX mode, 2-bytes CRC, radio on
+		NRF24L01_SetBitrate(NRF24L01_BR_250K);			// 250Kbps
 }
 
 // HiSky channel sequence: AILE  ELEV  THRO  RUDD  GEAR  PITCH, channel data value is from 0 to 1000
 // Channel 7 - Gyro mode, 0 - 6 axis, 3 - 3 axis 
-static void __attribute__((unused)) build_ch_data()
+static void __attribute__((unused)) HISKY_build_ch_data()
 {
 	uint16_t temp;
 	uint8_t i,j;
@@ -133,7 +89,7 @@ static void __attribute__((unused)) build_ch_data()
 	}
 }
 
-uint16_t hisky_cb()
+uint16_t HISKY_callback()
 {
 	phase++;
 	if(sub_protocol==HK310)
@@ -223,7 +179,7 @@ uint16_t hisky_cb()
 			#ifdef MULTI_SYNC
 				telemetry_set_input_sync(9000);
 			#endif
-			build_ch_data();
+			HISKY_build_ch_data();
 			break;
 		case 8:
 			break;
@@ -236,7 +192,7 @@ uint16_t hisky_cb()
 	return 1000;  // send 1 binding packet and 1 data packet per 9ms	
 }
 
-static void __attribute__((unused)) initialize_tx_id()
+static void __attribute__((unused)) HISKY_initialize_tx_id()
 {
 	//Generate frequency hopping table	
 	if(sub_protocol==HK310)
@@ -248,14 +204,17 @@ static void __attribute__((unused)) initialize_tx_id()
 			hopping_frequency[i]=hopping_frequency_no++;	// Sequential order hop channels...
 	}
 	else
-		calc_fh_channels();
+		calc_fh_channels(HISKY_FREQUENCE_NUM);
+		// 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]
 }
 
-uint16_t initHiSky()
+void HISKY_init()
 {
-	initialize_tx_id();
-	build_binding_packet();
-	hisky_init();
+	HISKY_initialize_tx_id();
+	HISKY_build_binding_packet();
+	HISKY_RF_init();
 	phase = 0;
 	hopping_frequency_no = 0;
 	binding_idx = 0;
@@ -264,7 +223,6 @@ uint16_t initHiSky()
 		bind_counter = HISKY_BIND_COUNT;
 	else 
 		bind_counter = 0;
-	return 1000;
 }
 
 #endif

Multiprotocol/Hitec_cc2500.ino

@@ -54,9 +54,9 @@ static void __attribute__((unused)) HITEC_CC2500_init()
 	for (uint8_t i = 0; i < 39; ++i)
 		CC2500_WriteReg(i, pgm_read_byte_near(&HITEC_init_values[i]));
 
-	prev_option = option;
 	CC2500_WriteReg(CC2500_0C_FSCTRL0, option);
-	
+	prev_option = option;
+
 	CC2500_SetTxRxMode(TX_EN);
 	CC2500_SetPower();
 }
@@ -165,7 +165,7 @@ static void __attribute__((unused)) HITEC_build_packet()
 		packet[0] = 0x1A;		// 26 bytes to follow
 		for(uint8_t i=0;i<9;i++)
 		{
-			uint16_t ch = convert_channel_16b_nolimit(i,0x1B87,0x3905);
+			uint16_t ch = convert_channel_16b_nolimit(i,0x1B87,0x3905,false);
 			packet[4+2*i] = ch >> 8;
 			packet[5+2*i] = ch & 0xFF;
 		}
@@ -220,7 +220,7 @@ static void __attribute__((unused)) HITEC_send_packet()
 		packet[23] >>= 1;	// packet sequence
 }
 
-uint16_t ReadHITEC()
+uint16_t HITEC_callback()
 {
 	switch(phase)
 	{
@@ -390,7 +390,7 @@ uint16_t ReadHITEC()
 	return 0;
 }
 
-uint16_t initHITEC()
+void HITEC_init()
 {
 	HITEC_RF_channels();
 	#ifdef HITEC_FORCE_ID	// ID and channels taken from dump
@@ -400,7 +400,6 @@ uint16_t initHITEC()
 		memcpy((void *)hopping_frequency,(void *)"\x00\x3A\x4A\x32\x0C\x58\x2A\x10\x26\x20\x08\x60\x68\x70\x78\x80\x88\x56\x5E\x66\x6E",HITEC_NUM_FREQUENCE);
 	#endif
 	phase = HITEC_START;
-	return 10000;
 }
 
 /* Full telemetry 

Multiprotocol/Hontai_nrf24l01.ino

@@ -15,7 +15,7 @@
 
 #if defined(HONTAI_NRF24L01_INO)
 
-#include "iface_nrf24l01.h"
+#include "iface_xn297.h"	// mix of nrf and xn297 at 1Mb...
 
 #define HONTAI_BIND_COUNT 80
 #define HONTAI_PACKET_PERIOD    13500
@@ -34,40 +34,21 @@ enum{
     HONTAI_FLAG_CALIBRATE = 0x20,
 };
 
-// proudly swiped from http://www.drdobbs.com/implementing-the-ccitt-cyclical-redundan/199904926
-#define HONTAI_POLY 0x8408
-static void __attribute__((unused)) crc16(uint8_t *data_p, uint8_t length)
+static void __attribute__((unused)) HONTAI_send_packet()
 {
-	uint16_t crc = 0xffff;
-
-	length -= 2;
-	do
-	{
-		for (uint8_t i = 0, data = (uint8_t)*data_p++;
-		i < 8;
-		i++, data >>= 1)
-		{
-			if ((crc & 0x01) ^ (data & 0x01))
-				crc = (crc >> 1) ^ HONTAI_POLY;
-			else
-				crc >>= 1;
-		}
-	} while (--length);
-
-	crc = ~crc;
-	*data_p++ = crc & 0xff;
-	*data_p   = crc >> 8;
-}
-
-static void __attribute__((unused)) HONTAI_send_packet(uint8_t bind)
-{
-	if (bind)
+	if (IS_BIND_IN_PROGRESS)
 	{
 		memcpy(packet, rx_tx_addr, 5);
 		memset(&packet[5], 0, 3);
+		packet_length = HONTAI_BIND_PACKET_SIZE;
 	}
 	else
 	{
+		/*if(sub_protocol == JJRCX1)
+			NRF24L01_WriteReg(NRF24L01_05_RF_CH, hopping_frequency[hopping_frequency_no++]);
+		else*/
+			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
@@ -125,60 +106,56 @@ static void __attribute__((unused)) HONTAI_send_packet(uint8_t bind)
 				packet[6] |= GET_FLAG(CH9_SW, 0x40);				// Headless
 				break;
 		}
+		packet_length = HONTAI_PACKET_SIZE;
 	}
-	crc16(packet, bind ? HONTAI_BIND_PACKET_SIZE: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);
 
 	// Power on, TX mode, 2byte CRC
-	if(sub_protocol == JJRCX1)
+	/*if(sub_protocol == JJRCX1)
+	{
+		NRF24L01_SetPower();
 		NRF24L01_SetTxRxMode(TX_EN);
-	else
-		XN297_Configure(_BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO) | _BV(NRF24L01_00_PWR_UP));
-
-	NRF24L01_WriteReg(NRF24L01_05_RF_CH, bind ? HONTAI_RF_BIND_CHANNEL : hopping_frequency[hopping_frequency_no++]);
-	hopping_frequency_no %= 3;
-
-	NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);
-	NRF24L01_FlushTx();
+		NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);
+		NRF24L01_FlushTx();
+	}
+	else*/
+	{
+		XN297_SetPower();
+		XN297_SetTxRxMode(TX_EN);
+	}
 
 	if(sub_protocol == JJRCX1)
-		NRF24L01_WritePayload(packet, bind ? HONTAI_BIND_PACKET_SIZE:HONTAI_PACKET_SIZE);
+		NRF24L01_WritePayload(packet, packet_length);
 	else
-		XN297_WritePayload(packet, bind ? HONTAI_BIND_PACKET_SIZE:HONTAI_PACKET_SIZE);
-
-	NRF24L01_SetPower();
+		XN297_WritePayload(packet, packet_length);
 }
 
-static void __attribute__((unused)) HONTAI_init()
+static void __attribute__((unused)) HONTAI_RF_init()
 {
-	NRF24L01_Initialize();
 
-	NRF24L01_SetTxRxMode(TX_EN);
-
-	if(sub_protocol == JJRCX1)
-		NRF24L01_WriteRegisterMulti(NRF24L01_10_TX_ADDR, (uint8_t*)"\xd2\xb5\x99\xb3\x4a", 5);
-	else
-		XN297_SetTXAddr((const uint8_t*)"\xd2\xb5\x99\xb3\x4a", 5);
-
-	NRF24L01_FlushTx();
-	NRF24L01_FlushRx();
-	NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);			// Clear data ready, data sent, and retransmit
-	NRF24L01_WriteReg(NRF24L01_01_EN_AA, 0x00);				// No Auto Acknowldgement on all data pipes
-	NRF24L01_SetBitrate(NRF24L01_BR_1M);					// 1Mbps
-	NRF24L01_SetPower();
-	NRF24L01_Activate(0x73);								// Activate feature register
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);	// this will select the nrf and initialize it, therefore both sub protocols can use common instructions
 	if(sub_protocol == JJRCX1)
 	{
+		//NRF24L01_Initialize();
+		NRF24L01_WriteRegisterMulti(NRF24L01_10_TX_ADDR, (uint8_t*)"\xd2\xb5\x99\xb3\x4a", 5);
 		NRF24L01_WriteReg(NRF24L01_04_SETUP_RETR, 0xff);	// JJRC uses dynamic payload length
 		NRF24L01_WriteReg(NRF24L01_1C_DYNPD, 0x3f);			// match other stock settings even though AA disabled...
 		NRF24L01_WriteReg(NRF24L01_1D_FEATURE, 0x07);
+		//NRF24L01_WriteReg(NRF24L01_05_RF_CH, HONTAI_RF_BIND_CHANNEL);
 	}
 	else
 	{
-		NRF24L01_WriteReg(NRF24L01_04_SETUP_RETR, 0x00);	// no retransmits
-		NRF24L01_WriteReg(NRF24L01_1C_DYNPD, 0x00);			// Disable dynamic payload length on all pipes
-		NRF24L01_WriteReg(NRF24L01_1D_FEATURE, 0x00);
+		XN297_SetTXAddr((const uint8_t*)"\xd2\xb5\x99\xb3\x4a", 5);
+		//XN297_HoppingCalib(3);
 	}
-	NRF24L01_Activate(0x73);								// Deactivate feature register
+	XN297_RFChannel(HONTAI_RF_BIND_CHANNEL);
 }
 
 const uint8_t PROGMEM HONTAI_hopping_frequency_nonels[][3] = {
@@ -202,9 +179,9 @@ static void __attribute__((unused)) HONTAI_init2()
 	data_tx_addr[3] = pgm_read_byte_near( &HONTAI_addr_vals[3][(rx_tx_addr[4] >> 4) & 0x0f]);
 	data_tx_addr[4] = 0x24;
 	if(sub_protocol == JJRCX1)
-		NRF24L01_WriteRegisterMulti(NRF24L01_10_TX_ADDR, data_tx_addr, sizeof(data_tx_addr));
+		NRF24L01_WriteRegisterMulti(NRF24L01_10_TX_ADDR, data_tx_addr, 5);
 	else
-		XN297_SetTXAddr(data_tx_addr, sizeof(data_tx_addr));
+		XN297_SetTXAddr(data_tx_addr, 5);
 
 	//Hopping frequency table
 	for(uint8_t i=0;i<3;i++)
@@ -231,9 +208,11 @@ static void __attribute__((unused)) HONTAI_initialize_txid()
 
 uint16_t HONTAI_callback()
 {
-	if(bind_counter!=0)
+	#ifdef MULTI_SYNC
+		telemetry_set_input_sync(packet_period);
+	#endif
+	if(bind_counter)
 	{
-		HONTAI_send_packet(1);
 		bind_counter--;
 		if (bind_counter == 0)
 		{
@@ -241,24 +220,16 @@ uint16_t HONTAI_callback()
 			BIND_DONE;
 		}
 	}
-	else
-	{
-		#ifdef MULTI_SYNC
-			telemetry_set_input_sync(packet_period);
-		#endif
-		HONTAI_send_packet(0);
-	}
-
+	HONTAI_send_packet();
 	return packet_period;
 }
 
-uint16_t initHONTAI()
+void HONTAI_init()
 {
 	BIND_IN_PROGRESS;	// autobind protocol
 	bind_counter = HONTAI_BIND_COUNT;
 	HONTAI_initialize_txid();
-	HONTAI_init();
+	HONTAI_RF_init();
 	packet_period = sub_protocol == FQ777_951 ? FQ777_951_PACKET_PERIOD : HONTAI_PACKET_PERIOD;
-	return HONTAI_INITIAL_WAIT;
 }
 #endif

Multiprotocol/Hubsan_a7105.ino

@@ -285,7 +285,7 @@ static uint8_t __attribute__((unused)) hubsan_check_integrity()
 }
 #endif
 
-uint16_t ReadHubsan() 
+uint16_t HUBSAN_callback() 
 {
 #ifdef HUBSAN_HUB_TELEMETRY
 	static uint8_t rfMode=0;
@@ -446,7 +446,7 @@ uint16_t ReadHubsan()
 	return 0;
 }
 
-uint16_t initHubsan()
+void HUBSAN_init()
 {
 	const uint8_t allowed_ch[] = {0x14, 0x1e, 0x28, 0x32, 0x3c, 0x46, 0x50, 0x5a, 0x64, 0x6e, 0x78, 0x82};
 	A7105_Init();
@@ -467,7 +467,6 @@ uint16_t initHubsan()
 	}
 	packet_count=0;
 	bind_phase=0;
-	return 10000;
 }
 
 #endif

Multiprotocol/IKEA_Ansluta_cc2500.ino

@@ -0,0 +1,122 @@
+/*
+ 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/>.
+ */
+// This module makes it possible to bind to and control the IKEA "Ansluta" line
+// of remote-controlled lights.
+// To bind, first switch the receiver into binding mode, then the TX.
+// Once bound, the TX can send one of three commands:
+//   lights off, lights dimmed 50% and lights on.
+// Those are mapped to throttle ranges 0..0x55, 0x56..0xAA, 0xAB..0xFF.
+#if defined(IKEAANSLUTA_CC2500_INO)
+
+#include "iface_cc2500.h"
+
+#define IKEAANSLUTA_BIND_COUNT	30  // ~ 2sec autobind/65ms per loop = 30 binding packets
+
+// Commands
+#define IKEAANSLUTA_LIGHT_OFF 0x01
+#define IKEAANSLUTA_LIGHT_DIM 0x02  // 50% dimmed light
+#define IKEAANSLUTA_LIGHT_ON  0x03
+#define IKEAANSLUTA_PAIR 0xFF
+
+void IKEAANSLUTA_send_command(uint8_t command){
+      CC2500_Strobe(CC2500_SIDLE);
+      packet[4] = option;
+      packet[5] = command;
+      CC2500_WriteData(packet, 8);
+}
+
+uint16_t IKEAANSLUTA_callback(void)
+{
+    if (bind_counter) {
+        IKEAANSLUTA_send_command(IKEAANSLUTA_PAIR);
+        if(--bind_counter == 0) {
+            BIND_DONE;
+            CC2500_SetPower();
+        }
+    }
+    else {
+        uint8_t throttle = convert_channel_8b(THROTTLE);
+        uint8_t cmd = throttle <= 0x55 ? IKEAANSLUTA_LIGHT_OFF : 
+                      throttle <= 0xAA ? IKEAANSLUTA_LIGHT_DIM :
+                      IKEAANSLUTA_LIGHT_ON;
+        IKEAANSLUTA_send_command(cmd);
+    }
+    return 65535; // 65ms loop cycle is more than enough here (we could make it even longer if not for uint16_t)
+}
+
+// Register initialization values as a continuous memory block (to save on flash memory)
+const PROGMEM uint8_t IKEAANSLUTA_init_values[] = {
+  0xFF, // CC2500_06_PKTLEN
+  0x04, // CC2500_07_PKTCTRL1
+  0x05, // CC2500_08_PKTCTRL0
+  0x00, // CC2500_09_ADDR  (unused, default)
+  0x10, // CC2500_0A_CHANNR
+  0x09, // CC2500_0B_FSCTRL1
+  0x00, // CC2500_0C_FSCTRL0
+  0x5D, // CC2500_0D_FREQ2
+  0x93, // CC2500_0E_FREQ1
+  0xB1, // CC2500_0F_FREQ0
+  0x2D, // CC2500_10_MDMCFG4
+  0x3B, // CC2500_11_MDMCFG3
+  0x73, // CC2500_12_MDMCFG2
+  0xA2, // CC2500_13_MDMCFG1
+  0xF8, // CC2500_14_MDMCFG0
+  0x01, // CC2500_15_DEVIATN
+  0x07, // CC2500_16_MCSM2
+  0x30, // CC2500_17_MCSM1
+  0x18, // CC2500_18_MCSM0
+  0x1D, // CC2500_19_FOCCFG
+  0x1C, // CC2500_1A_BSCFG
+  0xC7, // CC2500_1B_AGCCTRL2
+  0x00, // CC2500_1C_AGCCTRL1
+  0xB2, // CC2500_1D_AGCCTRL0
+  0x87, // CC2500_1E_WOREVT1 (unused, default)
+  0x6b, // CC2500_1F_WOREVT0 (unused, default)
+  0xf8, // CC2500_20_WORCTRL (unused, default)
+  0xB6, // CC2500_21_FREND1
+  0x10, // CC2500_22_FREND0
+  0xEA, // CC2500_23_FSCAL3
+  0x0A, // CC2500_24_FSCAL2
+  0x00, // CC2500_25_FSCAL1
+  0x11, // CC2500_26_FSCAL0
+  0x41, // CC2500_27_RCCTRL1
+  0x00, // CC2500_28_RCCTRL0
+};
+
+void IKEAANSLUTA_init(void)
+{
+    if (IS_BIND_DONE) bind_counter = 0;
+    else bind_counter = IKEAANSLUTA_BIND_COUNT;
+
+    // All packets we send are the same
+    packet[0] = 0x06;
+    packet[1] = 0x55;
+    packet[2] = 0x01;
+    // Bytes 3&4 are the transmitter address (to which the RX binds)
+    // Byte 5 is the command.
+    packet[3] = rx_tx_addr[3];  // <pseudorandom tx-fixed value> + <rx_num>
+    // packet[4] = option;
+    // packet[5] = 0x00; // Command goes here
+    packet[6] = 0xAA;
+    packet[7] = 0xFF;
+
+    // Configure & initialize CC2500
+	for (uint8_t i = 0; i <= CC2500_28_RCCTRL0-CC2500_06_PKTLEN; ++i)
+		CC2500_WriteReg(CC2500_06_PKTLEN+i, pgm_read_byte_near(&IKEAANSLUTA_init_values[i]));    
+    CC2500_SetTxRxMode(TX_EN);
+    CC2500_SetPower();
+}
+
+#endif

Multiprotocol/J6Pro_cyrf6936.ino

@@ -59,7 +59,7 @@ static void __attribute__((unused)) j6pro_build_data_packet()
     packet[0] = 0xaa; //FIXME what is this?
     for (i = 0; i < 12; i++)
     {
-        value = convert_channel_10b(CH_AETR[i]);
+        value = convert_channel_10b(CH_AETR[i], false);
         packet[i+1] = value & 0xff;
         upperbits |= (value >> 8) << (i * 2);
     }
@@ -111,8 +111,8 @@ static void __attribute__((unused)) cyrf_datainit()
 {
     /* Use when already bound */
     uint8_t sop_idx = (0xff & (cyrfmfg_id[0] + cyrfmfg_id[1] + cyrfmfg_id[2] + cyrfmfg_id[3] - cyrfmfg_id[5])) % 19;
-    uint16_t crc =  (0xff & (cyrfmfg_id[1] - cyrfmfg_id[4] + cyrfmfg_id[5])) |
-                   ((0xff & (cyrfmfg_id[2] + cyrfmfg_id[3] - cyrfmfg_id[4] + cyrfmfg_id[5])) << 8);
+    crc =  (0xff & (cyrfmfg_id[1] - cyrfmfg_id[4] + cyrfmfg_id[5])) |
+           ((0xff & (cyrfmfg_id[2] + cyrfmfg_id[3] - cyrfmfg_id[4] + cyrfmfg_id[5])) << 8);
     //CYRF_WriteRegister(CYRF_0F_XACT_CFG, 0x24);
     CYRF_PROGMEM_ConfigSOPCode(DEVO_j6pro_sopcodes[sop_idx]);
     CYRF_ConfigCRCSeed(crc);
@@ -126,7 +126,7 @@ static void __attribute__((unused)) j6pro_set_radio_channels()
     hopping_frequency[3] = hopping_frequency[0];
 }
 
-uint16_t ReadJ6Pro()
+uint16_t J6PRO_callback()
 {
     uint16_t start;
 
@@ -226,7 +226,7 @@ uint16_t ReadJ6Pro()
     return 0;
 }
 
-uint16_t initJ6Pro()
+void J6PRO_init()
 {
     j6pro_cyrf_init();
 
@@ -234,7 +234,6 @@ uint16_t initJ6Pro()
         phase = J6PRO_BIND;
     else
         phase = J6PRO_CHANSEL;
-    return 2400;
 }
 
 #endif

Multiprotocol/JJRC345_nrf24l01.ino

@@ -16,7 +16,7 @@
 
 #if defined(JJRC345_NRF24L01_INO)
 
-#include "iface_nrf24l01.h"
+#include "iface_xn297.h"
 
 //#define JJRC345_FORCE_ID
 
@@ -24,6 +24,7 @@
 #define JJRC345_INITIAL_WAIT		500
 #define JJRC345_PACKET_SIZE			16
 #define JJRC345_RF_BIND_CHANNEL		5
+#define SKYTMBLR_RF_BIND_CHANNEL	40
 #define JJRC345_BIND_COUNT			500
 #define JJRC345_NUM_CHANNELS		4
 
@@ -32,6 +33,12 @@ enum JJRC345_FLAGS {
     // flags going to packet[8]
 	JJRC345_FLAG_HEADLESS	= 0x40,
 	JJRC345_FLAG_RTH		= 0x80,
+    // flags going to packet[9]
+	SKYTMBLR_FLAG_UNK1	    = 0x40,
+	SKYTMBLR_FLAG_UNK2	    = 0x80,
+    // flags going to packet[10]
+	SKYTMBLR_FLAG_LED	    = 0x40,
+	SKYTMBLR_FLAG_UNK3	    = 0x80,
 };
 
 static uint8_t __attribute__((unused)) JJRC345_convert_channel(uint8_t num)
@@ -55,7 +62,7 @@ static void __attribute__((unused)) JJRC345_send_packet()
 	packet[2] = 0x00;
 	if (IS_BIND_IN_PROGRESS)
 	{ //00 05 00 0A 46 4A 41 47 00 00 40 46 A5 4A F1 18
-		packet[1]  = JJRC345_RF_BIND_CHANNEL;
+		packet[1]  = (sub_protocol == JJRC345 ? JJRC345_RF_BIND_CHANNEL:SKYTMBLR_RF_BIND_CHANNEL);
 		packet[4]  = hopping_frequency[0];
 		packet[5]  = hopping_frequency[1];
 		packet[6]  = hopping_frequency[2];
@@ -64,7 +71,7 @@ static void __attribute__((unused)) JJRC345_send_packet()
 	}
 	else
 	{ //00 41 00 0A 00 80 80 80 00 00 40 46 00 49 F1 18
-		NRF24L01_WriteReg(NRF24L01_05_RF_CH, hopping_frequency[hopping_frequency_no]);
+		XN297_Hopping(hopping_frequency_no);
 		hopping_frequency_no++;
 		hopping_frequency_no %= JJRC345_NUM_CHANNELS;
 		packet[1]  = hopping_frequency[hopping_frequency_no];	// next packet will be sent on this channel
@@ -92,10 +99,14 @@ static void __attribute__((unused)) JJRC345_send_packet()
 	packet[3] = 0x00;											// Checksum upper bits
 
 	packet[8] = 0x00											// Rudder trim, 00 when not used, 01..1F when trimmed left, 20..3F
-				| GET_FLAG(CH6_SW,JJRC345_FLAG_HEADLESS)		// Headless mode: 00 normal, 40 headless
-				| GET_FLAG(CH7_SW,JJRC345_FLAG_RTH);			// RTH: 80 active
-	packet[9] = 0;												// Elevator trim, 00 when not used, 20..25 when trimmed up, 0..1F when trimmed down
-	packet[10] = 0x40;											// Aileron trim, 40 when not used, 40..5F when trimmed left, 61..7F when trimmed right
+				| GET_FLAG(CH6_SW ,JJRC345_FLAG_HEADLESS)		// 0x40 HeadLess
+				| GET_FLAG(CH7_SW ,JJRC345_FLAG_RTH);			// 0x80 RTH
+	packet[9] = 0x00												// Elevator trim, 00 when not used, 20..25 when trimmed up, 0..1F when trimmed down
+				| GET_FLAG(CH9_SW ,SKYTMBLR_FLAG_UNK1)			// 0x40 Unknown
+				| GET_FLAG(CH10_SW,SKYTMBLR_FLAG_UNK2);			// 0x80 Unknown
+	packet[10] = 0x00											// Aileron  trim, 00 when not used, 00..1F when trimmed left, 21..3F when trimmed right
+				| GET_FLAG(!CH8_SW,SKYTMBLR_FLAG_LED)			// 0x40 LED
+				| GET_FLAG(CH11_SW,SKYTMBLR_FLAG_UNK3);			// 0x80 Unknown
 
 	packet[11] = hopping_frequency[0];							// First hopping frequency
 
@@ -110,28 +121,18 @@ static void __attribute__((unused)) JJRC345_send_packet()
 	packet[14] = rx_tx_addr[2];
 	packet[15] = rx_tx_addr[3];
 
-	// Power on, TX mode
-	XN297_Configure(_BV(NRF24L01_00_EN_CRC) | _BV(NRF24L01_00_CRCO) | _BV(NRF24L01_00_PWR_UP));
-	NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);
-	NRF24L01_FlushTx();
+	// Send
+	XN297_SetPower();
+	XN297_SetTxRxMode(TX_EN);
 	XN297_WritePayload(packet, JJRC345_PACKET_SIZE);
-
-	NRF24L01_SetPower();	// Set tx_power
 }
 
-static void __attribute__((unused)) JJRC345_init()
+static void __attribute__((unused)) JJRC345_RF_init()
 {
-    NRF24L01_Initialize();
-    NRF24L01_SetTxRxMode(TX_EN);
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
     XN297_SetTXAddr((uint8_t*)"\xcc\xcc\xcc\xcc\xcc", 5);
-    NRF24L01_WriteReg(NRF24L01_05_RF_CH, JJRC345_RF_BIND_CHANNEL);	// Bind channel
-    NRF24L01_FlushTx();
-    NRF24L01_FlushRx();
-    NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);					// Clear data ready, data sent, and retransmit
-    NRF24L01_WriteReg(NRF24L01_01_EN_AA, 0x00);						// No Auto Acknowldgement on all data pipes
-    NRF24L01_WriteReg(NRF24L01_02_EN_RXADDR, 0x01);					// Enable data pipe 0 only
-    NRF24L01_SetBitrate(NRF24L01_BR_1M);							// 1 Mbps
-    NRF24L01_SetPower();
+	//XN297_HoppingCalib(JJRC345_NUM_CHANNELS);
+	XN297_RFChannel(sub_protocol == JJRC345 ? JJRC345_RF_BIND_CHANNEL:SKYTMBLR_RF_BIND_CHANNEL);	// Bind channel
 }
 
 uint16_t JJRC345_callback()
@@ -139,11 +140,10 @@ uint16_t JJRC345_callback()
 	#ifdef MULTI_SYNC
 		telemetry_set_input_sync(JJRC345_PACKET_PERIOD);
 	#endif
-	if(IS_BIND_IN_PROGRESS)
+	if(bind_counter)
 	{
-		if (bind_counter)
-			bind_counter--;
-		else
+		bind_counter--;
+		if (bind_counter==0)
 			BIND_DONE;
 	}
 	JJRC345_send_packet();
@@ -172,13 +172,12 @@ static void __attribute__((unused)) JJRC345_initialize_txid()
 	#endif
 }
 
-uint16_t initJJRC345(void)
+void JJRC345_init(void)
 {
 	BIND_IN_PROGRESS;	// autobind protocol
     bind_counter = JJRC345_BIND_COUNT;
 	JJRC345_initialize_txid();
-	JJRC345_init();
-	return	JJRC345_INITIAL_WAIT;
+	JJRC345_RF_init();
 }
 
 #endif