From 1d98fb204e6a36deb9af679b5ddad78ff69e99bb Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 16 Dec 2019 14:43:45 +0100 Subject: [PATCH] Remove g_moduleidx --- radio/src/telemetry/multi.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/src/telemetry/multi.cpp b/radio/src/telemetry/multi.cpp index 07ab99392..674161729 100644 --- a/radio/src/telemetry/multi.cpp +++ b/radio/src/telemetry/multi.cpp @@ -171,10 +171,10 @@ static MultiBufferState guessProtocol(uint8_t module) return FrskyTelemetryFallback; } -static void processMultiScannerPacket(const uint8_t *data) +static void processMultiScannerPacket(const uint8_t moduleIdx, const uint8_t *data) { uint8_t cur_channel = data[0]; - if (moduleState[g_moduleIdx].mode == MODULE_MODE_SPECTRUM_ANALYSER) { + if (moduleState[moduleIdx].mode == MODULE_MODE_SPECTRUM_ANALYSER) { for (uint8_t channel = 0; channel <5; channel++) { uint8_t power = max(0,(data[channel+1] - 34) >> 1); // remove everything below -120dB @@ -400,7 +400,7 @@ static void processMultiTelemetryPaket(const uint8_t * packet, uint8_t module) #endif case SpectrumScannerPacket: if (len == 6) - processMultiScannerPacket(data); + processMultiScannerPacket(module, data); else TRACE("[MP] Received spectrum scanner len %d != 6", len); break;