AP_Radio: remove HAL_BOARD_SUBTYPE_CHIBIOS_SKYVIPER_F412

... just use more-specific defines instead

Author: peterbarker

libraries/AP_Radio/AP_Radio.cpp

@@ -168,7 +168,7 @@ bool AP_Radio::init(void)
         driver = NEW_NOTHROW AP_Radio_beken(*this);
         break;
 #endif
-#if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_CHIBIOS_SKYVIPER_F412
+#if AP_RADIO_AUTO_ENABLED
     case RADIO_TYPE_AUTO:
         // auto-detect between cc2500 and beken radios
 #if AP_RADIO_CC2500_ENABLED
@@ -182,7 +182,7 @@ bool AP_Radio::init(void)
         }
 #endif
         break;
-#endif  // CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_CHIBIOS_SKYVIPER_F412
+#endif  // AP_RADIO_AUTO_ENABLED
     default:
         break;
     }

libraries/AP_Radio/AP_Radio_config.h

@@ -21,3 +21,8 @@
 #ifndef AP_RADIO_BK2425_ENABLED
 #define AP_RADIO_BK2425_ENABLED AP_RADIO_BACKEND_DEFAULT_ENABLED
 #endif
+
+// tries both CC2500 and BK2425 drivers:
+#ifndef AP_RADIO_AUTO_ENABLED
+#define AP_RADIO_AUTO_ENABLED 0
+#endif  // AP_RADIO_AUTO_ENABLED

libraries/AP_Radio/driver_bk2425.cpp

@@ -20,14 +20,13 @@ extern const AP_HAL::HAL& hal;
 #include <hal.h>
 #endif
 
-// This assumes we are using ChiBios instead of the pixhawk o/s for accessing GPIO
-#if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_CHIBIOS_SKYVIPER_F412
 #define BEKEN_SELECT()      (dev->set_chip_select(true))
 #define BEKEN_DESELECT()    (dev->set_chip_select(false))
 #define BEKEN_CE_HIGH()     (palSetLine(HAL_GPIO_PIN_RADIO_CE)) // (hal.gpio->write(HAL_CHIBIOS_GPIO_RADIO_CE, 1))
 #define BEKEN_CE_LOW()      (palClearLine(HAL_GPIO_PIN_RADIO_CE)) // (hal.gpio->write(HAL_CHIBIOS_GPIO_RADIO_CE, 0))
 #define BEKEN_PA_HIGH()     (palSetLine(HAL_GPIO_PIN_RADIO_PA_CTL)) // (hal.gpio->write(HAL_CHIBIOS_GPIO_RADIO_PA_CTL, 1))
 #define BEKEN_PA_LOW()      (palClearLine(HAL_GPIO_PIN_RADIO_PA_CTL)) // (hal.gpio->write(HAL_CHIBIOS_GPIO_RADIO_PA_CTL, 0))
+
 #if SUPPORT_BK_DEBUG_PINS
 #define DEBUG1_HIGH()       (palSetLine(HAL_GPIO_PIN_DEBUG1))
 #define DEBUG1_LOW()        (palClearLine(HAL_GPIO_PIN_DEBUG1))
@@ -39,9 +38,6 @@ extern const AP_HAL::HAL& hal;
 #define DEBUG2_HIGH()       do {} while (0)
 #define DEBUG2_LOW()        do {} while (0)
 #endif
-#else
-#error This configuration is not supported.
-#endif
 
 // --------------------------------------------------------------------
 // Radio initialisation tables