x

Tools/autotest/test_build_options.py

@@ -338,15 +338,20 @@ def define_is_whitelisted_for_feature_in_code(self, target, define):
             feature_define_whitelist.add(r'AP_RPM_.*_ENABLED')
             # rangefinder init is not called:
             feature_define_whitelist.add(r'HAL_MSP_RANGEFINDER_ENABLED')
+            # these guys don't instantiate anything which uses sd-card storage:
+            feature_define_whitelist.add(r'AP_SDCARD_STORAGE_ENABLED')
 
         if target.lower() in ["blimp", "antennatracker", "sub"]:
             # no OSD on Sub/blimp/tracker
             feature_define_whitelist.add(r'OSD_ENABLED')
+            feature_define_whitelist.add(r'OSD_PARAM_ENABLED')
             # AP_OSD is not instantiated, , so no MSP backend:
             feature_define_whitelist.add(r'HAL_WITH_MSP_DISPLAYPORT')
             # camera instantiated in specific vehicles:
             feature_define_whitelist.add(r'AP_CAMERA_ENABLED')
             feature_define_whitelist.add(r'AP_CAMERA_.*_ENABLED')
+            # button update is not called in these vehicles
+            feature_define_whitelist.add(r'HAL_BUTTON_ENABLED')
 
         if target.lower() in ["antennatracker"]:
             # missing the init call to the relay library:

Tools/scripts/build_options.py

@@ -113,7 +113,7 @@ def __init__(self,
 
     Feature('OSD', 'OSD', 'OSD_ENABLED', 'Enable OSD', 0, None),
     Feature('OSD', 'PLUSCODE', 'HAL_PLUSCODE_ENABLE', 'Enable PlusCode', 0, 'OSD'),
-    Feature('OSD', 'OSD_PARAM', 'OSD_PARAM_ENABLED', 'Enable OSD param', 0, 'OSD'),
+    Feature('OSD', 'OSD_PARAM', 'OSD_PARAM_ENABLED', 'Enable OSD param', 0, None),
     Feature('OSD', 'OSD_SIDEBARS', 'HAL_OSD_SIDEBAR_ENABLE', 'Enable Scrolling Sidebars', 0, 'OSD'),
     Feature('OSD', 'OSD_EXTENDED_LINK_STATS', 'AP_OSD_LINK_STATS_EXTENSIONS_ENABLED', 'Enable OSD panels with extended link stats data', 0, "OSD,RC_CRSF,MSP"),  # noqa