From 8eef4cd0bdf15ff9502b6b1aae405d03325665b3 Mon Sep 17 00:00:00 2001 From: bsongis Date: Sun, 16 Nov 2014 22:18:37 +0100 Subject: [PATCH] #1850 --- radio/src/mixer.cpp | 2 +- radio/src/opentx.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp index 9990aab5c..ebff34106 100755 --- a/radio/src/mixer.cpp +++ b/radio/src/mixer.cpp @@ -263,7 +263,7 @@ int16_t applyLimits(uint8_t channel, int32_t value) // TODO same naming convention than the putsMixerSource -getvalue_t getValue(uint8_t i) +getvalue_t getValue(mixsrc_t i) { if (i==MIXSRC_NONE) return 0; diff --git a/radio/src/opentx.h b/radio/src/opentx.h index f16de4763..14db1ced6 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -399,6 +399,7 @@ enum PotType { #define get_tmr10ms() g_tmr10ms typedef int32_t rotenc_t; typedef int32_t getvalue_t; + typedef uint32_t mixsrc_t; #else #define tmr10ms_t uint16_t extern volatile tmr10ms_t g_tmr10ms; @@ -412,6 +413,7 @@ enum PotType { } typedef int8_t rotenc_t; typedef int16_t getvalue_t; + typedef uint8_t mixsrc_t; void watchdogSetTimeout(uint32_t timeout); #endif @@ -717,7 +719,7 @@ void doMixerCalculations(); void perMain(); NOINLINE void per10ms(); -getvalue_t getValue(uint8_t i); +getvalue_t getValue(mixsrc_t i); #if defined(CPUARM) #define GETSWITCH_MIDPOS_DELAY 1