1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00

LP-364 remaining conflict fixes

This commit is contained in:
Vladimir Zidar 2016-07-20 13:13:26 +02:00 committed by Vladimir Zidar
parent 873950b071
commit b0dd2649bc

View File

@ -251,6 +251,7 @@ uint32_t pios_rcvr_group_map[MANUALCONTROLSETTINGS_CHANNELGROUPS_NONE];
#define PIOS_COM_MSP_TX_BUF_LEN 128
#define PIOS_COM_MSP_RX_BUF_LEN 64
#define PIOS_COM_MAVLINK_TX_BUF_LEN 128
#if defined(PIOS_INCLUDE_DEBUG_CONSOLE)