Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update serial-4way-if to v20005 

Reservation of an MCU_ID area to simplificate adding of upcoming BLHeli_32 MCU.
This commit is contained in:
4712 2020-10-20 14:43:04 +02:00 committed by Andrew Tridgell
parent 6956abdb45
commit 38ea1296ca
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libraries/AP_BLHeli/AP_BLHeli.cpp
View File

@ -741,19 +741,16 @@ bool AP_BLHeli::BL_ConnectEx(void)
blheli.interface_mode[blheli.chan] = imSIL_BLB; blheli.interface_mode[blheli.chan] = imSIL_BLB;
debug("Interface type imSIL_BLB"); debug("Interface type imSIL_BLB");
break; break;
case 0x1F06:
case 0x3306:
case 0x3406:
case 0x3506:
case 0x2B06:
case 0x4706:
blheli.interface_mode[blheli.chan] = imARM_BLB;
debug("Interface type imARM_BLB");
break;
default: default:
blheli.ack = ACK_D_GENERAL_ERROR; // BLHeli_32 MCU ID hi > 0x00 and < 0x90 / lo always = 0x06
debug("Unknown interface type 0x%04x", *devword); if ((blheli.deviceInfo[blheli.chan][1] > 0x00) && (blheli.deviceInfo[blheli.chan][1] < 0x90) && (blheli.deviceInfo[blheli.chan][0] == 0x06)) {
break; blheli.interface_mode[blheli.chan] = imARM_BLB;
debug("Interface type imARM_BLB");
} else {
blheli.ack = ACK_D_GENERAL_ERROR;
debug("Unknown interface type 0x%04x", *devword);
break;
}
} }
blheli.deviceInfo[blheli.chan][3] = blheli.interface_mode[blheli.chan]; blheli.deviceInfo[blheli.chan][3] = blheli.interface_mode[blheli.chan];
if (blheli.interface_mode[blheli.chan] != 0) { if (blheli.interface_mode[blheli.chan] != 0) {

2
libraries/AP_BLHeli/blheli_4way_protocol.h
View File

@ -118,7 +118,7 @@
*/ */
#define SERIAL_4WAY_VER_MAIN 20 #define SERIAL_4WAY_VER_MAIN 20
#define SERIAL_4WAY_VER_SUB_1 (uint8_t) 0 #define SERIAL_4WAY_VER_SUB_1 (uint8_t) 0
#define SERIAL_4WAY_VER_SUB_2 (uint8_t) 03 #define SERIAL_4WAY_VER_SUB_2 (uint8_t) 05
#define SERIAL_4WAY_PROTOCOL_VER 107 #define SERIAL_4WAY_PROTOCOL_VER 107
// *** end // *** end