Browse Source

waf: added --osd-fonts configure option

allows for --osd without fonts
zr-v5.1
Andrew Tridgell 5 years ago
parent
commit
6f04b4a5ec
  1. 4
      Tools/ardupilotwaf/boards.py
  2. 4
      wscript

4
Tools/ardupilotwaf/boards.py

@ -311,8 +311,10 @@ class Board:
if cfg.options.disable_ekf3: if cfg.options.disable_ekf3:
env.CXXFLAGS += ['-DHAL_NAVEKF3_AVAILABLE=0'] env.CXXFLAGS += ['-DHAL_NAVEKF3_AVAILABLE=0']
if cfg.options.osd: if cfg.options.osd or cfg.options.osd_fonts:
env.CXXFLAGS += ['-DOSD_ENABLED=1'] env.CXXFLAGS += ['-DOSD_ENABLED=1']
if cfg.options.osd_fonts:
for f in os.listdir('libraries/AP_OSD/fonts'): for f in os.listdir('libraries/AP_OSD/fonts'):
if fnmatch.fnmatch(f, "font*bin"): if fnmatch.fnmatch(f, "font*bin"):
env.ROMFS_FILES += [(f,'libraries/AP_OSD/fonts/'+f)] env.ROMFS_FILES += [(f,'libraries/AP_OSD/fonts/'+f)]

4
wscript

@ -192,6 +192,10 @@ configuration in order to save typing.
default=False, default=False,
help="Enable OSD support") help="Enable OSD support")
g.add_option('--osd-fonts', action='store_true',
default=False,
help="Enable OSD support with fonts")
g.add_option('--sitl-osd', action='store_true', g.add_option('--sitl-osd', action='store_true',
default=False, default=False,
help="Enable SITL OSD") help="Enable SITL OSD")

Loading…
Cancel
Save