From cc2af73a057850cd0c379d5d6dd5bdb495dd2fb5 Mon Sep 17 00:00:00 2001 From: Pascal Langer Date: Fri, 23 Nov 2018 10:03:55 +0100 Subject: [PATCH] Bayang Visuo support, DSM TH_KILL improvement --- Multiprotocol/Bayang_nrf24l01.ino | 6 +++--- Multiprotocol/DSM_cyrf6936.ino | 4 ++-- Multiprotocol/Multiprotocol.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Multiprotocol/Bayang_nrf24l01.ino b/Multiprotocol/Bayang_nrf24l01.ino index e294da5..d1a42b5 100644 --- a/Multiprotocol/Bayang_nrf24l01.ino +++ b/Multiprotocol/Bayang_nrf24l01.ino @@ -36,9 +36,9 @@ enum BAYANG_FLAGS { BAYANG_FLAG_VIDEO = 0x10, BAYANG_FLAG_PICTURE = 0x20, // flags going to packet[3] - BAYANG_FLAG_INVERTED = 0x80, // inverted flight on Floureon H101 - BAYANG_FLAG_TAKE_OFF = 0x20, // take off / landing on X16 AH - BAYANG_FLAG_EMG_STOP = 0x04, + BAYANG_FLAG_INVERTED = 0x80, // inverted flight on Floureon H101 + BAYANG_FLAG_TAKE_OFF = 0x20, // take off / landing on X16 AH + BAYANG_FLAG_EMG_STOP = 0x04|0x08, // 0x08 for VISUO XS809H-W-HD-G }; static void __attribute__((unused)) BAYANG_send_packet(uint8_t bind) diff --git a/Multiprotocol/DSM_cyrf6936.ino b/Multiprotocol/DSM_cyrf6936.ino index 97b534c..fefb449 100644 --- a/Multiprotocol/DSM_cyrf6936.ino +++ b/Multiprotocol/DSM_cyrf6936.ino @@ -263,7 +263,7 @@ static void __attribute__((unused)) DSM_build_data_packet(uint8_t upper) bits=10; // Only DSM_22 is using a resolution of 1024 } #ifdef DSM_THROTTLE_KILL_CH - uint32_t kill_ch=Channel_data[DSM_THROTTLE_KILL_CH-1]; + uint16_t kill_ch=Channel_data[DSM_THROTTLE_KILL_CH-1]; #endif for (uint8_t i = 0; i < 7; i++) { @@ -280,7 +280,7 @@ static void __attribute__((unused)) DSM_build_data_packet(uint8_t upper) kill_ch=0; else kill_ch-=CHANNEL_MIN_100; - value=(uint16_t)((kill_ch*0x150)/400); // kill channel -100%->904us ... -50%->1100us + value=(kill_ch*21)/25; // kill channel -100%->904us ... -50%->1100us *0x150/400 } else #endif diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 3406712..c71469f 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 2 #define VERSION_REVISION 1 -#define VERSION_PATCH_LEVEL 20 +#define VERSION_PATCH_LEVEL 21 //****************** // Protocols