From 101eb91c8f804a749cb2b78e2f8a0286628b26d0 Mon Sep 17 00:00:00 2001
From: Andre Bernet <kilrah@andrebernet.ch>
Date: Sat, 4 Feb 2017 12:59:49 +0100
Subject: [PATCH] Hopefully fix broken PR...

---
 radio/src/telemetry/frsky.cpp     | 2 +-
 radio/src/telemetry/frsky.h       | 2 +-
 radio/src/telemetry/multi.cpp     | 4 ++--
 radio/src/telemetry/telemetry.cpp | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/radio/src/telemetry/frsky.cpp b/radio/src/telemetry/frsky.cpp
index 9894d8d7b..24d16fceb 100644
--- a/radio/src/telemetry/frsky.cpp
+++ b/radio/src/telemetry/frsky.cpp
@@ -48,7 +48,7 @@ enum FrSkyDataState {
 #endif
 };
 
-NOINLINE void processTelemetryData(uint8_t data)
+NOINLINE void processFrskyTelemetryData(uint8_t data)
 {
   static uint8_t dataState = STATE_DATA_IDLE;
 
diff --git a/radio/src/telemetry/frsky.h b/radio/src/telemetry/frsky.h
index 8aae9fbb4..e184b8dad 100644
--- a/radio/src/telemetry/frsky.h
+++ b/radio/src/telemetry/frsky.h
@@ -479,6 +479,6 @@ void frskySetCellVoltage(uint8_t battnumber, frskyCellVoltage_t cellVolts);
 void frskyUpdateCells();
 #endif
 
-void processTelemetryData(uint8_t data);
+void processFrskyTelemetryData(uint8_t data);
 
 #endif // _FRSKY_H_
diff --git a/radio/src/telemetry/multi.cpp b/radio/src/telemetry/multi.cpp
index f8ec936c4..2c9596de6 100644
--- a/radio/src/telemetry/multi.cpp
+++ b/radio/src/telemetry/multi.cpp
@@ -218,7 +218,7 @@ void processMultiTelemetryData(const uint8_t data)
       } else if (data == 0x55 || data == 0x7e) {
         multiTelemetryBufferState = guessProtocol();
         if (multiTelemetryBufferState == FrskyTelemetryFallbackFirstByte)
-          processTelemetryData(data);
+          processFrskyTelemetryData(data);
       } else {
         TRACE("[MP] invalid start byte 0x%02X", data);
       }
@@ -228,7 +228,7 @@ void processMultiTelemetryData(const uint8_t data)
       multiTelemetryBufferState = FrskyTelemetryFallbackNextBytes;
 
     case FrskyTelemetryFallbackNextBytes:
-      processTelemetryData(data);
+      processFrskyTelemetryData(data);
       if (data == 0x7e)
         // might start a new packet
         multiTelemetryBufferState = FrskyTelemetryFallbackFirstByte;
diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp
index a48898d57..0805e33ed 100644
--- a/radio/src/telemetry/telemetry.cpp
+++ b/radio/src/telemetry/telemetry.cpp
@@ -82,7 +82,7 @@ void processTelemetryData(uint8_t data)
     return;
   }
 #endif
-  processTelemetryData(data);
+  processFrskyTelemetryData(data);
 }
 #endif