From b516bb8d20989ff920f61e1126954bfe28b0b9a1 Mon Sep 17 00:00:00 2001 From: Pascal Langer Date: Tue, 12 Jan 2021 14:02:13 +0100 Subject: [PATCH] Fix AFHDS2A RX --- Multiprotocol/A7105_SPI.ino | 2 +- Multiprotocol/AFHDS2A_Rx_a7105.ino | 3 --- Multiprotocol/Multiprotocol.h | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Multiprotocol/A7105_SPI.ino b/Multiprotocol/A7105_SPI.ino index 1d7face..2cc39ca 100644 --- a/Multiprotocol/A7105_SPI.ino +++ b/Multiprotocol/A7105_SPI.ino @@ -392,7 +392,7 @@ 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 diff --git a/Multiprotocol/AFHDS2A_Rx_a7105.ino b/Multiprotocol/AFHDS2A_Rx_a7105.ino index 86264b8..299092b 100644 --- a/Multiprotocol/AFHDS2A_Rx_a7105.ino +++ b/Multiprotocol/AFHDS2A_Rx_a7105.ino @@ -114,7 +114,6 @@ uint16_t AFHDS2A_Rx_callback() } } A7105_WriteReg(A7105_0F_PLL_I, (packet_count++ & 1) ? 0x0D : 0x8C); // bind channels - A7105_SetTxRxMode(RX_EN); A7105_Strobe(A7105_RX); return 10000; @@ -145,7 +144,6 @@ uint16_t AFHDS2A_Rx_callback() packet[9] = 0x01; packet[10] = 0x00; memset(&packet[11], 0xFF, 26); - A7105_SetTxRxMode(TX_EN); A7105_WriteData(AFHDS2A_RX_RXPACKET_SIZE, packet_count++ & 1 ? 0x0D : 0x8C); phase |= AFHDS2A_RX_WAIT_WRITE; return 1700; @@ -156,7 +154,6 @@ uint16_t AFHDS2A_Rx_callback() 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_SetTxRxMode(RX_EN); A7105_Strobe(A7105_RX); phase &= ~AFHDS2A_RX_WAIT_WRITE; return 10000; diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index e8ef6ff..9d9c964 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_REVISION 2 -#define VERSION_PATCH_LEVEL 1 +#define VERSION_PATCH_LEVEL 2 //****************** // Protocols