fix: Throttle idle trim handling for surface, enable MT12 tests (#4520)
Co-authored-by: 3djc <3djc@gh.com> Co-authored-by: raphaelcoeffic <1050031+raphaelcoeffic@users.noreply.github.com>
This commit is contained in:
co-authored by
3djc
raphaelcoeffic
parent
4c2ea7a60a
commit
dfaad73070
@@ -428,13 +428,6 @@ enum SwitchSources {
|
||||
SWSRC_FIRST_TRIM SKIP,
|
||||
SWSRC_LAST_TRIM SKIP = SWSRC_FIRST_TRIM + 2 * MAX_TRIMS - 1,
|
||||
|
||||
#if NUM_TRIMS > 6
|
||||
SWSRC_TrimT7Down,
|
||||
SWSRC_TrimT7Up,
|
||||
SWSRC_TrimT8Down,
|
||||
SWSRC_TrimT8Up,
|
||||
#endif
|
||||
|
||||
SWSRC_FIRST_LOGICAL_SWITCH SKIP,
|
||||
SWSRC_LAST_LOGICAL_SWITCH SKIP = SWSRC_FIRST_LOGICAL_SWITCH + MAX_LOGICAL_SWITCHES - 1,
|
||||
|
||||
@@ -482,7 +475,8 @@ enum MixSources {
|
||||
|
||||
#if defined(LUA_INPUTS)
|
||||
MIXSRC_FIRST_LUA SKIP,
|
||||
MIXSRC_LAST_LUA SKIP = MIXSRC_FIRST_LUA + (MAX_SCRIPTS * MAX_SCRIPT_OUTPUTS) - 1,
|
||||
MIXSRC_LAST_LUA SKIP =
|
||||
MIXSRC_FIRST_LUA + (MAX_SCRIPTS * MAX_SCRIPT_OUTPUTS) - 1,
|
||||
#endif
|
||||
|
||||
// Semantic sticks
|
||||
@@ -515,19 +509,7 @@ enum MixSources {
|
||||
MIXSRC_LAST_HELI SKIP = MIXSRC_FIRST_HELI + 2,
|
||||
|
||||
MIXSRC_FIRST_TRIM SKIP,
|
||||
MIXSRC_TrimRud = MIXSRC_FIRST_TRIM,
|
||||
MIXSRC_TrimEle,
|
||||
MIXSRC_TrimThr,
|
||||
MIXSRC_TrimAil,
|
||||
//#if defined(PCBHORUS)
|
||||
MIXSRC_TrimT5,
|
||||
MIXSRC_TrimT6,
|
||||
MIXSRC_TrimT7,
|
||||
MIXSRC_TrimT8,
|
||||
MIXSRC_LAST_TRIM SKIP = MIXSRC_TrimT8,
|
||||
//#else
|
||||
//MIXSRC_LAST_TRIM SKIP = MIXSRC_TrimAil,
|
||||
//#endif
|
||||
MIXSRC_LAST_TRIM SKIP = MIXSRC_FIRST_TRIM + MAX_TRIMS - 1,
|
||||
|
||||
MIXSRC_FIRST_SWITCH SKIP,
|
||||
MIXSRC_LAST_SWITCH SKIP = MIXSRC_FIRST_SWITCH + MAX_SWITCHES - 1,
|
||||
@@ -560,9 +542,6 @@ enum MixSources {
|
||||
#define INPUTSRC_FIRST MIXSRC_FIRST_STICK
|
||||
#define INPUTSRC_LAST MIXSRC_LAST_TELEM
|
||||
|
||||
// TODO: this won't work forever (what about ground radios?)
|
||||
#define MIXSRC_Thr (MIXSRC_FIRST_STICK + 2)
|
||||
|
||||
#if defined(FUNCTION_SWITCHES)
|
||||
#define MIXSRC_LAST_REGULAR_SWITCH (MIXSRC_FIRST_SWITCH + switchGetMaxSwitches() - 1)
|
||||
#define MIXSRC_FIRST_FS_SWITCH (MIXSRC_LAST_REGULAR_SWITCH + 1)
|
||||
|
||||
Reference in New Issue
Block a user