Cosmetics

radio/src/gui/9X/lcd.h

@@ -262,7 +262,6 @@ void lcdInit();
 #define lcdOff()
 
 void lcdRefresh();
-#define LCD_REFRESH_DONT_WAIT
 
 #if defined(BOOT)
   #define BLINK_ON_PHASE (0)

radio/src/gui/Taranis/lcd.h

@@ -233,10 +233,8 @@ void lcdOff();
 
 #if defined(REVPLUS) && !defined(SIMU)
   void lcdRefresh(bool wait=true);
-  #define LCD_REFRESH_DONT_WAIT false
 #else
   void lcdRefresh();
-  #define LCD_REFRESH_DONT_WAIT
 #endif
 
 const char *bmpLoad(uint8_t *dest, const char *filename, const unsigned int width, const unsigned int height);

radio/src/thirdparty/Lua/src/lauxlib.h

@@ -193,10 +193,6 @@ LUALIB_API char *(luaL_buffinitsize) (lua_State *L, luaL_Buffer *B, size_t sz);
 
 #define LUA_FILEHANDLE          "FILE*"
 
-#if defined(USE_FATFS)
-  #define FILE FIL
-#endif
-
 typedef struct luaL_Stream {
 #if defined(USE_FATFS)
   FIL f;

radio/src/thirdparty/Lua/src/liolib.c

@@ -15,6 +15,7 @@
 #endif
 
 
+
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
@@ -26,6 +27,9 @@
 #include "lauxlib.h"
 #include "lualib.h"
 
+#if defined(USE_FATFS)
+  #define FILE FIL
+#endif
 
 #if !defined(lua_checkmode)
 
@@ -724,3 +728,7 @@ LUAMOD_API int luaopen_io (lua_State *L) {
   // return 1;
   return 0;
 }
+
+#if defined(USE_FATFS)
+  #undef FILE
+#endif