Merge pull request #1501 from martinbudden/bf_rx_telem_split

Added fine-grained TELEMETRY build #defines as per iNav

src/main/target/common.h

@@ -51,6 +51,11 @@
 #define BLACKBOX
 #define GPS
 #define TELEMETRY
+#define TELEMETRY_FRSKY
+#define TELEMETRY_HOTT
+#define TELEMETRY_IBUS
+#define TELEMETRY_LTM
+#define TELEMETRY_SMARTPORT
 #define USE_SERVOS
 #endif
 
@@ -58,6 +63,7 @@
 #define CMS
 #define USE_DASHBOARD
 #define USE_MSP_DISPLAYPORT
+#define TELEMETRY_JETIEXBUS
 #define TELEMETRY_MAVLINK
 #else
 #define SKIP_CLI_COMMAND_HELP

src/main/telemetry/telemetry.c

@@ -23,6 +23,8 @@
 
 #ifdef TELEMETRY
 
+#include "common/utils.h"
+
 #include "drivers/timer.h"
 #include "drivers/serial.h"
 #include "drivers/serial_softserial.h"
@@ -42,7 +44,6 @@
 #include "telemetry/ltm.h"
 #include "telemetry/jetiexbus.h"
 #include "telemetry/mavlink.h"
-#include "rx/jetiexbus.h"
 
 static telemetryConfig_t *telemetryConfig;
 
@@ -53,13 +54,22 @@ void telemetryUseConfig(telemetryConfig_t *telemetryConfigToUse)
 
 void telemetryInit(void)
 {
+#ifdef TELEMETRY_FRSKY
     initFrSkyTelemetry(telemetryConfig);
+#endif
+#ifdef TELEMETRY_HOTT
     initHoTTTelemetry(telemetryConfig);
+#endif
+#ifdef TELEMETRY_SMARTPORT
     initSmartPortTelemetry(telemetryConfig);
+#endif
+#ifdef TELEMETRY_LTM
     initLtmTelemetry(telemetryConfig);
+#endif
+#ifdef TELEMETRY_JETIEXBUS
     initJetiExBusTelemetry(telemetryConfig);
-
+#endif
-#if defined(TELEMETRY_MAVLINK)
+#ifdef TELEMETRY_MAVLINK
     initMAVLinkTelemetry();
 #endif
 
@@ -89,26 +99,49 @@ serialPort_t *telemetrySharedPort = NULL;
 
 void telemetryCheckState(void)
 {
+#ifdef TELEMETRY_FRSKY
     checkFrSkyTelemetryState();
+#endif
+#ifdef TELEMETRY_HOTT
     checkHoTTTelemetryState();
+#endif
+#ifdef TELEMETRY_SMARTPORT
     checkSmartPortTelemetryState();
+#endif
+#ifdef TELEMETRY_LTM
     checkLtmTelemetryState();
+#endif
+#ifdef TELEMETRY_JETIEXBUS
     checkJetiExBusTelemetryState();
-
+#endif
-#if defined(TELEMETRY_MAVLINK)
+#ifdef TELEMETRY_MAVLINK
     checkMAVLinkTelemetryState();
 #endif
 }
 
 void telemetryProcess(uint32_t currentTime, rxConfig_t *rxConfig, uint16_t deadband3d_throttle)
 {
+#ifdef TELEMETRY_FRSKY
     handleFrSkyTelemetry(rxConfig, deadband3d_throttle);
+#else
+    UNUSED(rxConfig);
+    UNUSED(deadband3d_throttle);
+#endif
+#ifdef TELEMETRY_HOTT
     handleHoTTTelemetry(currentTime);
+#else
+    UNUSED(currentTime);
+#endif
+#ifdef TELEMETRY_SMARTPORT
     handleSmartPortTelemetry();
+#endif
+#ifdef TELEMETRY_LTM
     handleLtmTelemetry();
+#endif
+#ifdef TELEMETRY_JETIEXBUS
     handleJetiExBusTelemetry();
-
+#endif
-#if defined(TELEMETRY_MAVLINK)
+#ifdef TELEMETRY_MAVLINK
     handleMAVLinkTelemetry();
 #endif
 }