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

Add Jumper t12 support by 3djc (#6451)

Browse source 
* Jumper T12 - companion part

* more work

* Add definitions

* fix libsimulator key handling

* Fix simu keys handling

* Cosmetics

* Continued

* Fix wrong regplace

* Fix wrong regplace

* Please travis

* Please travis

* Add T12 to Travis
Switch naming and display

* Cosmetics

* Work on modules

* Work on modules

* typo

* Fix navigation

* Cosmetics

* Introduce NAVIGATION_type

* Fix

* Make NAVIGATION_type more future proof

* Lots of cleanups and improvements

* Cosmetics

* Fix internal module menu

* Cosmetics

* Fix screen reversed

* Small fixes

* Fix navigation issue

* Please travis

* Fix LCD contrast

* Fix T12 switch layout

* Fix T12 keys screen and all radios keys translations

* Complete rework of SWITCHES screen for all radios

* comsetics

* VC++ compilation
This commit is contained in:
3djc 2019-05-26 19:51:17 +02:00 • committed by Andre Bernet
parent f0998ff52f
commit cd3c4ac654
80 changed files with 975 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

3
radio/src/lua/CMakeLists.txt
View file

@ -35,11 +35,12 @@ set(LUA_INCLUDES_STM32F4
if(PYTHONINTERP_FOUND)
add_lua_export_target(x9lite ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX9LITE -DPCBX9)
add_lua_export_target(x7 ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX7)
add_lua_export_target(x7 ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX7 -DRADIO_X7)
add_lua_export_target(xlite ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBXLITE)
add_lua_export_target(xlites ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBXLITES -DPCBXLITE -DGYRO)
add_lua_export_target(x9d ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX9D -DPCBX9)
add_lua_export_target(x9e ${LUA_INCLUDES_STM32F4} -DPCBTARANIS -DPCBX9E -DPCBX9 -DSTM32F40_41xxx)
add_lua_export_target(x10 ${LUA_INCLUDES_STM32F4} -DPCBHORUS -DPCBX10 -DSTM32F40_41xxx)
add_lua_export_target(x12s ${LUA_INCLUDES_STM32F4} -DPCBHORUS -DPCBX12S -DSTM32F40_41xxx)
add_lua_export_target(t12 ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX7 -DRADIO_T12)
endif()

24
radio/src/lua/api_general.cpp
View file

@ -31,8 +31,10 @@
#include "lua/lua_exports_x10.inc"
#elif defined(PCBX9E)
#include "lua/lua_exports_x9e.inc"
#elif defined(PCBX7)
#elif defined(RADIO_X7)
#include "lua/lua_exports_x7.inc"
#elif defined(RADIO_T12)
#include "lua/lua_exports_t12.inc"
#elif defined(PCBX9LITE)
#include "lua/lua_exports_x9lite.inc"
#elif defined(PCBXLITES)
@ -1528,6 +1530,26 @@ const luaR_value_entry opentxConstants[] = {
{ "FORCE", FORCE },
{ "ERASE", ERASE },
{ "ROUND", ROUND },
#elif defined(RADIO_T12)
{ "EVT_DOWN_FIRST", EVT_KEY_FIRST(KEY_DOWN) },
{ "EVT_UP_FIRST", EVT_KEY_FIRST(KEY_UP) },
{ "EVT_LEFT_FIRST", EVT_KEY_FIRST(KEY_LEFT) },
{ "EVT_RIGHT_FIRST", EVT_KEY_FIRST(KEY_RIGHT) },
{ "EVT_DOWN_BREAK", EVT_KEY_BREAK(KEY_DOWN) },
{ "EVT_UP_BREAK", EVT_KEY_BREAK(KEY_UP) },
{ "EVT_LEFT_BREAK", EVT_KEY_BREAK(KEY_LEFT) },
{ "EVT_RIGHT_BREAK", EVT_KEY_BREAK(KEY_RIGHT) },
{ "EVT_DOWN_LONG", EVT_KEY_LONG(KEY_DOWN) },
{ "EVT_UP_LONG", EVT_KEY_LONG(KEY_UP) },
{ "EVT_LEFT_LONG", EVT_KEY_LONG(KEY_LEFT) },
{ "EVT_RIGHT_LONG", EVT_KEY_LONG(KEY_RIGHT) },
{ "EVT_DOWN_REPT", EVT_KEY_REPT(KEY_DOWN) },
{ "EVT_UP_REPT", EVT_KEY_REPT(KEY_UP) },
{ "EVT_LEFT_REPT", EVT_KEY_REPT(KEY_LEFT) },
{ "EVT_RIGHT_REPT", EVT_KEY_REPT(KEY_RIGHT) },
{ "FORCE", FORCE },
{ "ERASE", ERASE },
{ "ROUND", ROUND },
#elif defined(PCBTARANIS)
{ "EVT_MENU_BREAK", EVT_KEY_BREAK(KEY_MENU) },
{ "EVT_MENU_LONG", EVT_KEY_LONG(KEY_MENU) },

4
radio/src/lua/interface.cpp
View file

@ -637,7 +637,7 @@ bool luaLoadFunctionScript(uint8_t index, uint8_t ref)
{
if ((ref >= SCRIPT_GFUNC_FIRST) && g_model.noGlobalFunctions)
return false;
CustomFunctionData & fn = (ref < SCRIPT_GFUNC_FIRST ? g_model.customFn[index] : g_eeGeneral.customFn[index]);
if (fn.func == FUNC_PLAY_SCRIPT && ZEXIST(fn.play.name)) {
@ -883,7 +883,7 @@ void luaDoOneRunStandalone(event_t evt)
standaloneScript.state = SCRIPT_NOFILE;
luaState = INTERPRETER_RELOAD_PERMANENT_SCRIPTS;
}
#if !defined(PCBHORUS) && !defined(PCBXLITE)
#if defined(KEYS_GPIO_REG_MENU)
// TODO find another key and add a #define
else if (evt == EVT_KEY_LONG(KEY_MENU)) {
killEvents(evt);

6
radio/src/lua/lua_api.h
View file

@ -155,11 +155,9 @@ extern uint16_t maxLuaInterval;
extern uint16_t maxLuaDuration;
extern uint8_t instructionsPercent;
#if defined(PCBXLITE)
#define IS_MASKABLE(key) ((key) != KEY_EXIT && (key) != KEY_ENTER)
#elif defined(PCBTARANIS)
#if defined(KEYS_GPIO_REG_PAGE)
#define IS_MASKABLE(key) ((key) != KEY_EXIT && (key) != KEY_ENTER && ((luaState & INTERPRETER_RUNNING_STANDALONE_SCRIPT) || (key) != KEY_PAGE))
#elif defined(PCBHORUS)
#else
#define IS_MASKABLE(key) ((key) != KEY_EXIT && (key) != KEY_ENTER)
#endif
struct LuaField {