Skip to content

Commit

Permalink
Automatically add -DUSB_MANUFACTURER with vendor's name // Resolve
Browse files Browse the repository at this point in the history
  • Loading branch information
ivankravets committed Apr 23, 2016
1 parent a821e5b commit db0dbe6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ PlatformIO 2.0
(`issue #604 <https://github.com/platformio/platformio/issues/604>`_)
* Updated native SDK for ESP8266 to 1.5
(`issue #366 <https://github.com/platformio/platformio/issues/366>`_)
* Automatically add ``-DUSB_MANUFACTURER`` with vendor's name
(`issue #631 <https://github.com/platformio/platformio/issues/631>`_)
* Automatically reboot Teensy board after upload when Teensy Loader GUI is used
(`issue #609 <https://github.com/platformio/platformio/issues/609>`_)
* Forced ``-std=gnu++11`` for Atmel SAM development platform
Expand All @@ -37,7 +39,7 @@ PlatformIO 2.0
* Updated Arduino Wiring-based framework to the latest version for
Atmel AVR/SAM development platforms
* Updated "Teensy Loader CLI" and fixed uploading of large .hex files
(`issue #568 <https://github.com/platformio/platformio/issues/568>`_)
(`issue #568 <https://github.com/platformio/platformio/issues/56 pf8>`_)
* Updated the support for Sanguino Boards
(`issue #586 <https://github.com/platformio/platformio/issues/586>`_)
* Better handling of used boards when re-initialize/update project
Expand Down
4 changes: 3 additions & 1 deletion platformio/builder/scripts/frameworks/arduino.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,9 @@
"USB_VID=${BOARD_OPTIONS['build']['vid']}",
"USB_PID=${BOARD_OPTIONS['build']['pid']}",
'USB_PRODUCT=\\"%s\\"' % (env.subst(
"${BOARD_OPTIONS['build']['usb_product']}").replace('"', ""))
"${BOARD_OPTIONS['build']['usb_product']}").replace('"', "")),
'USB_MANUFACTURER=\\"%s\\"' % (env.subst(
"${BOARD_OPTIONS['vendor']}").replace('"', ""))
]

if env.get("PLATFORM") == "teensy":
Expand Down

0 comments on commit db0dbe6

Please sign in to comment.