This commit is contained in:
bsongis
2014-11-16 22:18:37 +01:00
parent 35eb25d46e
commit 8eef4cd0bd
2 changed files with 4 additions and 2 deletions
+1 -1
View File
@@ -263,7 +263,7 @@ int16_t applyLimits(uint8_t channel, int32_t value)
// TODO same naming convention than the putsMixerSource // 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; if (i==MIXSRC_NONE) return 0;
+3 -1
View File
@@ -399,6 +399,7 @@ enum PotType {
#define get_tmr10ms() g_tmr10ms #define get_tmr10ms() g_tmr10ms
typedef int32_t rotenc_t; typedef int32_t rotenc_t;
typedef int32_t getvalue_t; typedef int32_t getvalue_t;
typedef uint32_t mixsrc_t;
#else #else
#define tmr10ms_t uint16_t #define tmr10ms_t uint16_t
extern volatile tmr10ms_t g_tmr10ms; extern volatile tmr10ms_t g_tmr10ms;
@@ -412,6 +413,7 @@ enum PotType {
} }
typedef int8_t rotenc_t; typedef int8_t rotenc_t;
typedef int16_t getvalue_t; typedef int16_t getvalue_t;
typedef uint8_t mixsrc_t;
void watchdogSetTimeout(uint32_t timeout); void watchdogSetTimeout(uint32_t timeout);
#endif #endif
@@ -717,7 +719,7 @@ void doMixerCalculations();
void perMain(); void perMain();
NOINLINE void per10ms(); NOINLINE void per10ms();
getvalue_t getValue(uint8_t i); getvalue_t getValue(mixsrc_t i);
#if defined(CPUARM) #if defined(CPUARM)
#define GETSWITCH_MIDPOS_DELAY 1 #define GETSWITCH_MIDPOS_DELAY 1