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

Fixes #1633

Browse source
This commit is contained in:
bsongis 2014-09-15 15:47:46 +02:00
parent 6c5d53194a
commit 74252f787b
24 changed files with 340 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

23
radio/src/opentx.h
View file

@ -1519,7 +1519,6 @@ enum AUDIO_SOUNDS {
void luaExec(const char *filename);
int luaGetMemUsed();
#define luaGetCpuUsed(idx) scriptInternalData[idx].instructions
bool isTelemetryScriptAvailable(uint8_t index);
#define LUA_LOAD_MODEL_SCRIPTS() luaState |= INTERPRETER_RELOAD_PERMANENT_SCRIPTS
#define LUA_LOAD_MODEL_SCRIPT(idx) luaState |= INTERPRETER_RELOAD_PERMANENT_SCRIPTS
@ -1693,23 +1692,27 @@ extern const pm_uint8_t bchunit_ar[];
#define FRSKY_MULTIPLIER_MAX 3
#endif
#define IS_BARS_SCREEN(screenIndex) (g_model.frsky.screensType & (1<<(screenIndex)))
#if defined(PCBTARANIS)
enum FrskyViews {
TELEMETRY_CUSTOM_SCREEN_1,
TELEMETRY_CUSTOM_SCREEN_2,
TELEMETRY_CUSTOM_SCREEN_3,
TELEMETRY_CUSTOM_SCREEN_4,
TELEMETRY_VOLTAGES_SCREEN, // TODO NOT IF LUA
TELEMETRY_AFTER_FLIGHT_SCREEN, // TODO NOT IF LUA
FRSKY_VIEW_MAX = TELEMETRY_AFTER_FLIGHT_SCREEN
};
#else
enum FrskyViews {
CASE_LUA(TELEMETRY_LUA_SCREEN_1)
CASE_LUA(TELEMETRY_LUA_SCREEN_2)
CASE_LUA(TELEMETRY_LUA_SCREEN_3)
CASE_LUA(TELEMETRY_LUA_SCREEN_4)
CASE_LUA(TELEMETRY_LUA_SCREEN_5)
CASE_LUA(TELEMETRY_LUA_SCREEN_6)
CASE_LUA(TELEMETRY_LUA_SCREEN_7)
TELEMETRY_CUSTOM_SCREEN_1,
TELEMETRY_CUSTOM_SCREEN_2,
CASE_CPUARM(TELEMETRY_CUSTOM_SCREEN_3)
CASE_CPUARM(TELEMETRY_CUSTOM_SCREEN_4)
TELEMETRY_VOLTAGES_SCREEN,
TELEMETRY_AFTER_FLIGHT_SCREEN,
FRSKY_VIEW_MAX = TELEMETRY_AFTER_FLIGHT_SCREEN
};
#endif
extern uint8_t s_frsky_view;