piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Throttle idle trim handling for surface, enable MT12 tests (#4520)

Browse Source 
Co-authored-by: 3djc <3djc@gh.com>
Co-authored-by: raphaelcoeffic <1050031+raphaelcoeffic@users.noreply.github.com>
This commit is contained in:
3djc
2024-01-21 13:53:25 +10:00
committed by GitHub
co-authored by 3djc raphaelcoeffic
parent 4c2ea7a60a
commit dfaad73070
36 changed files with 596 additions and 1328 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/tests/lua.cpp
+22 -4
View File
@@ -27,6 +27,8 @@
#define SWAP_DEFINED
#include "opentx.h"
#define MIXSRC_THR (MIXSRC_FIRST_STICK + inputMappingGetThrottle())
#define MIXSRC_TRIMTHR (MIXSRC_FIRST_TRIM + inputMappingGetThrottle())
::testing::AssertionResult __luaExecStr(const char * str)
{
@@ -111,16 +113,24 @@ TEST(Lua, testModelInputs)
luaExecStr("if noInputs > 0 then error('getInputsCount()') end");
// add one line on Input4
#if defined(SURFACE_RADIO)
luaExecStr("model.insertInput(3, 0, {name='test1', source=MIXSRC_TH, weight=56, offset=3, switch=2})");
#else
luaExecStr("model.insertInput(3, 0, {name='test1', source=MIXSRC_Thr, weight=56, offset=3, switch=2})");
#endif
EXPECT_EQ(3, (int)g_model.expoData[0].chn);
EXPECT_STRNEQ("test1", g_model.expoData[0].name);
EXPECT_EQ(MIXSRC_Thr, g_model.expoData[0].srcRaw);
EXPECT_EQ(MIXSRC_THR, g_model.expoData[0].srcRaw);
EXPECT_EQ(56, g_model.expoData[0].weight);
EXPECT_EQ(3, g_model.expoData[0].offset);
EXPECT_EQ(2, g_model.expoData[0].swtch);
// add another one before existing line on Input4
#if defined(SURFACE_RADIO)
luaExecStr("model.insertInput(3, 0, {name='test2', source=MIXSRC_ST, weight=-56})");
#else
luaExecStr("model.insertInput(3, 0, {name='test2', source=MIXSRC_Rud, weight=-56})");
#endif
EXPECT_EQ(3, (int)g_model.expoData[0].chn);
EXPECT_STRNEQ("test2", g_model.expoData[0].name);
EXPECT_EQ(MIXSRC_FIRST_STICK, g_model.expoData[0].srcRaw);
@@ -130,13 +140,18 @@ TEST(Lua, testModelInputs)
EXPECT_EQ(3, (int)g_model.expoData[1].chn);
EXPECT_STRNEQ("test1", g_model.expoData[1].name);
EXPECT_EQ(MIXSRC_Thr, g_model.expoData[1].srcRaw);
EXPECT_EQ(MIXSRC_THR, g_model.expoData[1].srcRaw);
EXPECT_EQ(56, g_model.expoData[1].weight);
EXPECT_EQ(3, g_model.expoData[1].offset);
EXPECT_EQ(2, g_model.expoData[1].swtch);
// add another line after existing lines on Input4
#if defined(SURFACE_RADIO)
luaExecStr("model.insertInput(3, model.getInputsCount(3), {name='test3', source=MIXSRC_TH, weight=100})");
#else
luaExecStr("model.insertInput(3, model.getInputsCount(3), {name='test3', source=MIXSRC_Ail, weight=100})");
#endif
EXPECT_EQ(3, (int)g_model.expoData[0].chn);
EXPECT_STRNEQ("test2", g_model.expoData[0].name);
EXPECT_EQ(MIXSRC_FIRST_STICK, g_model.expoData[0].srcRaw);
@@ -146,14 +161,18 @@ TEST(Lua, testModelInputs)
EXPECT_EQ(3, (int)g_model.expoData[1].chn);
EXPECT_STRNEQ("test1", g_model.expoData[1].name);
EXPECT_EQ(MIXSRC_Thr, g_model.expoData[1].srcRaw);
EXPECT_EQ(MIXSRC_THR, g_model.expoData[1].srcRaw);
EXPECT_EQ(56, g_model.expoData[1].weight);
EXPECT_EQ(3, g_model.expoData[1].offset);
EXPECT_EQ(2, g_model.expoData[1].swtch);
EXPECT_EQ(3, (int)g_model.expoData[2].chn);
EXPECT_STRNEQ("test3", g_model.expoData[2].name);
#if defined(SURFACE_RADIO)
EXPECT_EQ(MIXSRC_THR, g_model.expoData[2].srcRaw);
#else
EXPECT_EQ(MIXSRC_LAST_STICK, g_model.expoData[2].srcRaw);
#endif
EXPECT_EQ(100, g_model.expoData[2].weight);
EXPECT_EQ(0, g_model.expoData[2].offset);
EXPECT_EQ(0, g_model.expoData[2].swtch);
@@ -161,7 +180,6 @@ TEST(Lua, testModelInputs)
// verify number of lines for Input4
luaExecStr("noInputs = model.getInputsCount(3)");
luaExecStr("if noInputs ~= 3 then error('getInputsCount()') end");
}
TEST(Lua, Switches)