mirror of
https://github.com/iNavFlight/inav.git
synced 2025-07-25 01:05:21 +03:00
Refactor handling of RC input data
- Remove globals rcData and rcRaw - Use accesor functions to retrieve RX input data - Refactor rx.c to use an array of structs instead of multiple arrays - Drop the RC Preview menu from CMS. Implementing this without globals requires significant flash and the usefulness of this menu is questionable. If we get complains, we can add it back later. Flash usage goes down ~250 bytes due to the removed menu. Final binary is mostly unaffected, since LTO is able to inline the new accessor functions in most cases.
This commit is contained in:
parent
fb62330722
commit
d524d8c8cc
19 changed files with 118 additions and 131 deletions
|
@ -38,49 +38,6 @@
|
|||
|
||||
#include "sensors/battery.h"
|
||||
|
||||
//
|
||||
// Misc
|
||||
//
|
||||
|
||||
static long cmsx_menuRcConfirmBack(const OSD_Entry *self)
|
||||
{
|
||||
if (self && self->type == OME_Back)
|
||||
return 0;
|
||||
else
|
||||
return -1;
|
||||
}
|
||||
|
||||
//
|
||||
// RC preview
|
||||
//
|
||||
static const OSD_Entry cmsx_menuRcEntries[] =
|
||||
{
|
||||
OSD_LABEL_ENTRY("-- RC PREV --"),
|
||||
|
||||
OSD_INT16_RO_ENTRY("ROLL", &rcData[ROLL]),
|
||||
OSD_INT16_RO_ENTRY("PITCH", &rcData[PITCH]),
|
||||
OSD_INT16_RO_ENTRY("THR", &rcData[THROTTLE]),
|
||||
OSD_INT16_RO_ENTRY("YAW", &rcData[YAW]),
|
||||
|
||||
OSD_INT16_RO_ENTRY("AUX1", &rcData[AUX1]),
|
||||
OSD_INT16_RO_ENTRY("AUX2", &rcData[AUX2]),
|
||||
OSD_INT16_RO_ENTRY("AUX3", &rcData[AUX3]),
|
||||
OSD_INT16_RO_ENTRY("AUX4", &rcData[AUX4]),
|
||||
|
||||
OSD_BACK_AND_END_ENTRY,
|
||||
};
|
||||
|
||||
static const CMS_Menu cmsx_menuRcPreview = {
|
||||
#ifdef CMS_MENU_DEBUG
|
||||
.GUARD_text = "XRCPREV",
|
||||
.GUARD_type = OME_MENU,
|
||||
#endif
|
||||
.onEnter = NULL,
|
||||
.onExit = cmsx_menuRcConfirmBack,
|
||||
.onGlobalExit = NULL,
|
||||
.entries = cmsx_menuRcEntries
|
||||
};
|
||||
|
||||
static const OSD_Entry menuMiscEntries[]=
|
||||
{
|
||||
OSD_LABEL_ENTRY("-- MISC --"),
|
||||
|
@ -91,8 +48,6 @@ static const OSD_Entry menuMiscEntries[]=
|
|||
OSD_SETTING_ENTRY("STATS ENERGY UNIT", SETTING_OSD_STATS_ENERGY_UNIT),
|
||||
#endif
|
||||
|
||||
OSD_SUBMENU_ENTRY("RC PREV", &cmsx_menuRcPreview),
|
||||
|
||||
OSD_BACK_AND_END_ENTRY,
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue