Compilation error
This commit is contained in:
@@ -83,5 +83,3 @@ void pushModelNotes()
|
||||
strcpy(buf, TEXT_EXT);
|
||||
pushMenuTextView(filename);
|
||||
}
|
||||
|
||||
Clipboard clipboard;
|
||||
|
||||
@@ -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_
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user