From 8b6792ef9e791142828cbe7f101f828ed7790dbc Mon Sep 17 00:00:00 2001 From: Michael Keller Date: Thu, 22 Oct 2020 05:03:12 +1300 Subject: [PATCH] Merge pull request #10290 from 4712/serial-4way-if_v20005 Update serial-4way-if to v20005 --- src/main/io/serial_4way.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/io/serial_4way.c b/src/main/io/serial_4way.c index 837d107bb..0648090ea 100644 --- a/src/main/io/serial_4way.c +++ b/src/main/io/serial_4way.c @@ -76,7 +76,7 @@ // *** change to adapt Revision #define SERIAL_4WAY_VER_MAIN 20 #define SERIAL_4WAY_VER_SUB_1 (uint8_t) 0 -#define SERIAL_4WAY_VER_SUB_2 (uint8_t) 04 +#define SERIAL_4WAY_VER_SUB_2 (uint8_t) 05 #define SERIAL_4WAY_PROTOCOL_VER 108 // *** end @@ -332,14 +332,13 @@ uint16_t _crc_xmodem_update (uint16_t crc, uint8_t data) { #define ATMEL_DEVICE_MATCH ((pDeviceInfo->words[0] == 0x9307) || (pDeviceInfo->words[0] == 0x930A) || \ (pDeviceInfo->words[0] == 0x930F) || (pDeviceInfo->words[0] == 0x940B)) -#define SILABS_DEVICE_MATCH ((pDeviceInfo->words[0] == 0xF310)||(pDeviceInfo->words[0] ==0xF330) || \ +#define SILABS_DEVICE_MATCH ((pDeviceInfo->words[0] == 0xF310) || (pDeviceInfo->words[0] == 0xF330) || \ (pDeviceInfo->words[0] == 0xF410) || (pDeviceInfo->words[0] == 0xF390) || \ (pDeviceInfo->words[0] == 0xF850) || (pDeviceInfo->words[0] == 0xE8B1) || \ (pDeviceInfo->words[0] == 0xE8B2)) -#define ARM_DEVICE_MATCH ((pDeviceInfo->words[0] == 0x1F06) || \ - (pDeviceInfo->words[0] == 0x3306) || (pDeviceInfo->words[0] == 0x3406) || (pDeviceInfo->words[0] == 0x3506) || \ - (pDeviceInfo->words[0] == 0x2B06) || (pDeviceInfo->words[0] == 0x4706)) +// BLHeli_32 MCU ID hi > 0x00 and < 0x90 / lo always = 0x06 +#define ARM_DEVICE_MATCH ((pDeviceInfo->bytes[1] > 0x00) && (pDeviceInfo->bytes[1] < 0x90) && (pDeviceInfo->bytes[0] == 0x06)) static uint8_t CurrentInterfaceMode; -- 2.11.4.GIT