Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-21 15:25:17 +03:00
Code Issues Wiki Activity

Compilation error

Browse source
This commit is contained in:
bsongis 2015-01-21 21:33:48 +01:00
parent aca3d01adc
commit e05b74b05c
4 changed files with 33 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/gui/Taranis/menus.cpp
View file

@ -83,5 +83,3 @@ void pushModelNotes()
strcpy(buf, TEXT_EXT); strcpy(buf, TEXT_EXT);
pushMenuTextView(filename); pushMenuTextView(filename);
} }
Clipboard clipboard;

27
radio/src/gui/Taranis/menus.h
View file

@ -375,31 +375,4 @@ void menuChannelsView(uint8_t event);
typedef int16_t (*FnFuncP) (int16_t x); typedef int16_t (*FnFuncP) (int16_t x);
void DrawFunction(FnFuncP fn, uint8_t offset=0); 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_ #endif // _MENUS_H_

4
radio/src/opentx.cpp
View file

@ -50,6 +50,10 @@
EEGeneral g_eeGeneral; EEGeneral g_eeGeneral;
ModelData g_model; ModelData g_model;
#if defined(SDCARD)
Clipboard clipboard;
#endif
#if defined(PCBTARANIS) && defined(SDCARD) #if defined(PCBTARANIS) && defined(SDCARD)
uint8_t modelBitmap[MODEL_BITMAP_SIZE]; uint8_t modelBitmap[MODEL_BITMAP_SIZE];
void loadModelBitmap(char *name, uint8_t *bitmap) void loadModelBitmap(char *name, uint8_t *bitmap)

29
radio/src/opentx.h
View file

@ -1721,4 +1721,33 @@ void varioWakeup();
#include "lua_api.h" #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 #endif