From 15dfe8ceadda5eb6e6e86cd87b34981b32fbac91 Mon Sep 17 00:00:00 2001 From: Pascal Langer Date: Wed, 9 Jan 2019 16:56:53 +0100 Subject: [PATCH] Fix E01X hang up when option=0 --- Multiprotocol/GD00X_nrf24l01.ino | 4 ++-- Multiprotocol/Multiprotocol.h | 2 +- Multiprotocol/NRF24l01_SPI.ino | 2 +- Multiprotocol/V911S_nrf24l01.ino | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Multiprotocol/GD00X_nrf24l01.ino b/Multiprotocol/GD00X_nrf24l01.ino index 7d2a955..38dec63 100644 --- a/Multiprotocol/GD00X_nrf24l01.ino +++ b/Multiprotocol/GD00X_nrf24l01.ino @@ -43,7 +43,7 @@ static void __attribute__((unused)) GD00X_send_packet() channel=convert_channel_ppm(CH5); // TRIM packet[9 ] = channel; packet[10] = channel>>8; - packet[11] = GD00X_FLAG_DR // Force high rate + packet[11] = GD00X_FLAG_DR // Force high rate | GET_FLAG(CH6_SW, GD00X_FLAG_LIGHT); packet[12] = 0x00; packet[13] = 0x00; @@ -54,7 +54,7 @@ static void __attribute__((unused)) GD00X_send_packet() if(IS_BIND_DONE) { NRF24L01_WriteReg(NRF24L01_05_RF_CH, hopping_frequency[hopping_frequency_no++]); - hopping_frequency_no &= 3; // 4 RF channels + hopping_frequency_no &= 3; // 4 RF channels } NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70); diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 3f42eec..dc7546e 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 23 +#define VERSION_PATCH_LEVEL 25 //****************** // Protocols diff --git a/Multiprotocol/NRF24l01_SPI.ino b/Multiprotocol/NRF24l01_SPI.ino index 40cb67e..0e3d12d 100644 --- a/Multiprotocol/NRF24l01_SPI.ino +++ b/Multiprotocol/NRF24l01_SPI.ino @@ -618,7 +618,7 @@ void HS6200_WritePayload(uint8_t* msg, uint8_t len) } NRF24L01_WritePayload(payload, pos); - delayMicroseconds(option); + delayMicroseconds(option+20); NRF24L01_WritePayload(payload, pos); } // diff --git a/Multiprotocol/V911S_nrf24l01.ino b/Multiprotocol/V911S_nrf24l01.ino index cda76aa..8e5c4a3 100644 --- a/Multiprotocol/V911S_nrf24l01.ino +++ b/Multiprotocol/V911S_nrf24l01.ino @@ -59,7 +59,7 @@ static void __attribute__((unused)) V911S_send_packet(uint8_t bind) packet[ 0]=(rf_ch_num<<3)|channel; packet[ 1]=V911S_FLAG_EXPERT; // short press on left button packet[ 2]=GET_FLAG(CH5_SW,V911S_FLAG_CALIB); // long press on right button - memset(packet+3,0x00,14); + memset(packet+3, 0x00, V911S_PACKET_SIZE - 3); //packet[3..6]=trims TAER signed uint16_t ch=convert_channel_16b_limit(THROTTLE ,0,0x7FF); packet[ 7] = ch;