Fixed missing conditional, incremented parameter group version, added
config reset.
This commit is contained in:
parent
09fce7f1fa
commit
f7134580f8
|
@ -4634,8 +4634,10 @@ static void printConfig(char *cmdline, bool doDiff)
|
|||
cliPrintHashLine("name");
|
||||
printName(dumpMask, &pilotConfig_Copy);
|
||||
|
||||
#ifdef USE_OSD
|
||||
cliPrintHashLine("display_name");
|
||||
printDisplayName(dumpMask, &pilotConfig_Copy);
|
||||
#endif
|
||||
|
||||
#ifdef USE_RESOURCE_MGMT
|
||||
cliPrintHashLine("resources");
|
||||
|
|
|
@ -132,11 +132,7 @@ OSD_Entry menuOsdActiveElemsEntries[] =
|
|||
{"STICK OVERLAY LEFT", OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_STICK_OVERLAY_LEFT], DYNAMIC},
|
||||
{"STICK OVERLAY RIGHT",OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_STICK_OVERLAY_RIGHT], DYNAMIC},
|
||||
#endif
|
||||
{"G-FORCE", OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_G_FORCE], 0},
|
||||
{"FLIP ARROW", OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_FLIP_ARROW], 0},
|
||||
#ifdef USE_OSD
|
||||
{"DISPLAY NAME", OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_DISPLAY_NAME], 0},
|
||||
#endif
|
||||
{"BACK", OME_Back, NULL, NULL, 0},
|
||||
{NULL, OME_END, NULL, NULL, 0}
|
||||
};
|
||||
|
|
|
@ -74,10 +74,11 @@ pidProfile_t *currentPidProfile;
|
|||
|
||||
#define DYNAMIC_FILTER_MAX_SUPPORTED_LOOP_TIME HZ_TO_INTERVAL_US(2000)
|
||||
|
||||
PG_REGISTER_WITH_RESET_TEMPLATE(pilotConfig_t, pilotConfig, PG_PILOT_CONFIG, 0);
|
||||
PG_REGISTER_WITH_RESET_TEMPLATE(pilotConfig_t, pilotConfig, PG_PILOT_CONFIG, 1);
|
||||
|
||||
PG_RESET_TEMPLATE(pilotConfig_t, pilotConfig,
|
||||
.name = { 0 }
|
||||
.name = { 0 },
|
||||
.displayName = { 0 },
|
||||
);
|
||||
|
||||
PG_REGISTER_WITH_RESET_TEMPLATE(systemConfig_t, systemConfig, PG_SYSTEM_CONFIG, 2);
|
||||
|
|
|
@ -124,12 +124,6 @@
|
|||
#undef USE_MSP_OVER_TELEMETRY
|
||||
#endif
|
||||
|
||||
#if !defined(USE_OSD)
|
||||
#undef USE_RX_LINK_QUALITY_INFO
|
||||
#undef USE_OSD_PROFILES
|
||||
#undef USE_OSD_STICK_OVERLAY
|
||||
#endif
|
||||
|
||||
/* If either VTX_CONTROL or VTX_COMMON is undefined then remove common code and device drivers */
|
||||
#if !defined(USE_VTX_COMMON) || !defined(USE_VTX_CONTROL)
|
||||
#undef USE_VTX_COMMON
|
||||
|
@ -187,6 +181,12 @@
|
|||
#define USE_OSD
|
||||
#endif
|
||||
|
||||
#if !defined(USE_OSD)
|
||||
#undef USE_RX_LINK_QUALITY_INFO
|
||||
#undef USE_OSD_PROFILES
|
||||
#undef USE_OSD_STICK_OVERLAY
|
||||
#endif
|
||||
|
||||
#if defined(USE_GPS_RESCUE)
|
||||
#define USE_GPS
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue