diff --git a/radio/src/gui/Taranis/menus.cpp b/radio/src/gui/Taranis/menus.cpp index 34b501811..2f5e0c059 100755 --- a/radio/src/gui/Taranis/menus.cpp +++ b/radio/src/gui/Taranis/menus.cpp @@ -83,5 +83,3 @@ void pushModelNotes() strcpy(buf, TEXT_EXT); pushMenuTextView(filename); } - -Clipboard clipboard; diff --git a/radio/src/gui/Taranis/menus.h b/radio/src/gui/Taranis/menus.h index 1af3b4501..8afd5a87d 100755 --- a/radio/src/gui/Taranis/menus.h +++ b/radio/src/gui/Taranis/menus.h @@ -375,31 +375,4 @@ void menuChannelsView(uint8_t event); typedef int16_t (*FnFuncP) (int16_t x); void DrawFunction(FnFuncP fn, uint8_t offset=0); -enum ClipboardType { - CLIPBOARD_TYPE_NONE, - CLIPBOARD_TYPE_CUSTOM_SWITCH, - CLIPBOARD_TYPE_CUSTOM_FUNCTION, - CLIPBOARD_TYPE_SD_FILE, -}; - -#if defined(SIMU) - #define CLIPBOARD_PATH_LEN 1024 -#else - #define CLIPBOARD_PATH_LEN 32 -#endif - -struct Clipboard { - ClipboardType type; - union { - LogicalSwitchData csw; - CustomFunctionData cfn; - struct { - char directory[CLIPBOARD_PATH_LEN]; - char filename[CLIPBOARD_PATH_LEN]; - } sd; - } data; -}; - -extern Clipboard clipboard; - #endif // _MENUS_H_ diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 72d21f001..d1e674aa9 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -50,6 +50,10 @@ EEGeneral g_eeGeneral; ModelData g_model; +#if defined(SDCARD) +Clipboard clipboard; +#endif + #if defined(PCBTARANIS) && defined(SDCARD) uint8_t modelBitmap[MODEL_BITMAP_SIZE]; void loadModelBitmap(char *name, uint8_t *bitmap) diff --git a/radio/src/opentx.h b/radio/src/opentx.h index afe1caea7..b361f0378 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -1721,4 +1721,33 @@ void varioWakeup(); #include "lua_api.h" +#if defined(SDCARD) +enum ClipboardType { + CLIPBOARD_TYPE_NONE, + CLIPBOARD_TYPE_CUSTOM_SWITCH, + CLIPBOARD_TYPE_CUSTOM_FUNCTION, + CLIPBOARD_TYPE_SD_FILE, +}; + +#if defined(SIMU) + #define CLIPBOARD_PATH_LEN 1024 +#else + #define CLIPBOARD_PATH_LEN 32 +#endif + +struct Clipboard { + ClipboardType type; + union { + LogicalSwitchData csw; + CustomFunctionData cfn; + struct { + char directory[CLIPBOARD_PATH_LEN]; + char filename[CLIPBOARD_PATH_LEN]; + } sd; + } data; +}; + +extern Clipboard clipboard; +#endif + #endif