From 70ce8e9a1f2a6c5c0412bad87a6b580b044fef74 Mon Sep 17 00:00:00 2001 From: pascallanger Date: Thu, 17 Oct 2019 16:56:15 +0200 Subject: [PATCH] Fix SLT inversion --- Multiprotocol/Multiprotocol.h | 2 +- Multiprotocol/SLT_nrf24l01.ino | 2 +- Multiprotocol/_Config.h | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 9f836dc..d8bba51 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_REVISION 0 -#define VERSION_PATCH_LEVEL 20 +#define VERSION_PATCH_LEVEL 21 //****************** // Protocols diff --git a/Multiprotocol/SLT_nrf24l01.ino b/Multiprotocol/SLT_nrf24l01.ino index aca37fc..693014a 100644 --- a/Multiprotocol/SLT_nrf24l01.ino +++ b/Multiprotocol/SLT_nrf24l01.ino @@ -141,7 +141,7 @@ static void __attribute__((unused)) SLT_build_packet() for (uint8_t i = 0; i < 4; ++i) { uint16_t v = convert_channel_10b(CH_AETR[i]); - if(sub_protocol>SLT_V2 && (i==CH1 || i==CH3) ) + if(sub_protocol>SLT_V2 && (i==CH2 || i==CH3) ) v=1023-v; // reverse throttle and elevator channels for Q100/Q200/MR100 protocols packet[i] = v; e = (e >> 2) | (uint8_t) ((v >> 2) & 0xC0); diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h index 4095850..2ede3f3 100644 --- a/Multiprotocol/_Config.h +++ b/Multiprotocol/_Config.h @@ -272,10 +272,11 @@ //Sends Multi status and allow OpenTX to autodetect the telemetry format. Comment to disable. //Supported by OpenTX version 2.2 RC9 and newer. NOT supported by er9x/erskyTX use MULTI_STATUS instead. #define MULTI_TELEMETRY -//Sync OpenTX frames with the current protocol timing. This feature is only available on the STM32 module. Comment to disable. -#define MULTI_SYNC //Send to OpenTX the current protocol and subprotocol names. Comment to disable. #define MULTI_NAMES +//WIP DO NOT ENABLE UNLESS YOU KNOW WHAT YOU ARE DOING +//Sync OpenTX frames with the current protocol timing. This feature is only available on the STM32 module. Comment to disable. +//#define MULTI_SYNC //Comment a line to disable a specific protocol telemetry #define DSM_TELEMETRY // Forward received telemetry packet directly to TX to be decoded by er9x, erskyTX and OpenTX