Skip to content

Commit a7ad83c

Browse files
projectguscmaglie
authored andcommitted
boards.txt: Refactor the default usb build flags into a generic property in platform.txt
1 parent 15e73e8 commit a7ad83c

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

hardware/arduino/avr/boards.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ leonardo.build.usb_product="Arduino Leonardo"
192192
leonardo.build.board=AVR_LEONARDO
193193
leonardo.build.core=arduino
194194
leonardo.build.variant=leonardo
195-
leonardo.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSB_MANUFACTURER={build.usb_manufacturer} -DUSB_PRODUCT={build.usb_product}
195+
leonardo.build.extra_flags={build.usb_flags}
196196

197197
##############################################################
198198

@@ -222,7 +222,7 @@ micro.build.usb_product=Arduino Micro
222222
micro.build.board=AVR_MICRO
223223
micro.build.core=arduino
224224
micro.build.variant=micro
225-
micro.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSB_MANUFACTURER={build.usb_manufacturer} -DUSB_PRODUCT={build.usb_product}
225+
micro.build.extra_flags={build.usb_flags}
226226

227227
##############################################################
228228

@@ -252,7 +252,7 @@ esplora.build.usb_product=Arduino Esplora
252252
esplora.build.board=AVR_ESPLORA
253253
esplora.build.core=arduino
254254
esplora.build.variant=leonardo
255-
esplora.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSB_MANUFACTURER={build.usb_manufacturer} -DUSB_PRODUCT={build.usb_product}
255+
esplora.build.extra_flags={build.usb_flags}
256256

257257
##############################################################
258258

@@ -418,7 +418,7 @@ LilyPadUSB.build.usb_product=LilyPad USB
418418
LilyPadUSB.build.board=AVR_LILYPAD_USB
419419
LilyPadUSB.build.core=arduino
420420
LilyPadUSB.build.variant=leonardo
421-
LilyPadUSB.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSB_MANUFACTURER={build.usb_manufacturer} -DUSB_PRODUCT={build.usb_product}
421+
LilyPadUSB.build.extra_flags={build.usb_flags}
422422

423423
##############################################################
424424

hardware/arduino/avr/platform.txt

+6
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,9 @@ tools.avrdude.bootloader.params.verbose=-v -v -v -v
8686
tools.avrdude.bootloader.params.quiet=-q -q
8787
tools.avrdude.bootloader.pattern="{cmd.path}" "-C{config.path}" {bootloader.verbose} -p{build.mcu} -c{protocol} {program.extra_params} "-Uflash:w:{runtime.ide.path}/hardware/arduino/avr/bootloaders/{bootloader.file}:i" -Ulock:w:{bootloader.lock_bits}:m
8888

89+
90+
# USB Default Flags
91+
# Default blank usb manufacturer will be filled it at compile time
92+
# - from numeric vendor ID, set to Unknown otherwise
93+
build.usb_manufacturer=
94+
build.usb_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSB_MANUFACTURER={build.usb_manufacturer} -DUSB_PRODUCT={build.usb_product}

0 commit comments

Comments
 (0)