Fixes #1735

2014-09-19 20:19:55 +02:00
parent ef7bbea285
commit e4bb750c1f
2 changed files with 8 additions and 4 deletions
@@ -1246,10 +1246,7 @@ void message(const pm_char *title, const pm_char *t, const char *last MESSAGE_SO
 }

 #if defined(GVARS)
-  int8_t trimGvar[NUM_STICKS] = { -1, -1, -1, -1 };
-  #define TRIM_REUSED(idx) trimGvar[idx] >= 0
-#else
-  #define TRIM_REUSED(idx) 0
+int8_t trimGvar[NUM_STICKS] = { -1, -1, -1, -1 };
 #endif

 #if defined(CPUARM)
@@ -770,6 +770,13 @@ int8_t  getMovedSwitch();
  #define getTrimFlightPhase(phase, idx) (phase)
 #endif

+#if defined(GVARS)
+  extern int8_t trimGvar[NUM_STICKS];
+  #define TRIM_REUSED(idx) trimGvar[idx] >= 0
+#else
+  #define TRIM_REUSED(idx) 0
+#endif
+
 trim_t getRawTrimValue(uint8_t phase, uint8_t idx);
 int getTrimValue(uint8_t phase, uint8_t idx);