From 27c1c698522f2b29f52e5a3b91154cee8f062bdc Mon Sep 17 00:00:00 2001 From: dewagter Date: Sun, 27 Apr 2014 15:27:35 +0200 Subject: [PATCH] [radio_control] Workaround RADIO_CONTROL_NB_CHANNELS differs in driver and radio.h closes #700 --- sw/airborne/inter_mcu.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sw/airborne/inter_mcu.h b/sw/airborne/inter_mcu.h index f8f2eb04527..b26f6b7cf33 100644 --- a/sw/airborne/inter_mcu.h +++ b/sw/airborne/inter_mcu.h @@ -46,6 +46,10 @@ #include "firmwares/fixedwing/main_fbw.h" #ifndef SINGLE_MCU +// If radio_control defines +#ifdef RADIO_CONTROL_NB_CHANNEL +#undef RADIO_CONTROL_NB_CHANNEL +#endif #include "generated/radio.h" #define RADIO_CONTROL_NB_CHANNEL RADIO_CTL_NB #endif