diff options
| author | Simon John <git@the-jedi.co.uk> | 2017-06-01 21:33:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-01 21:33:52 +0100 |
| commit | c41763851b63385e2706355ccfacf2bf0bff653d (patch) | |
| tree | 8ec24f5d10466f313430356eedb36a2c7455d448 /Arduino.mk | |
| parent | 807cf65f71ace3710b5b69f2bd8d7422ba6bd0af (diff) | |
| parent | d1363592f2c6d65c41ae89bb14f55d05cdf02e5f (diff) | |
Merge pull request #500 from sej7278/master
Fix autodetection of USB_PID on SparkFun's new ProMicro core
Remove use of tilde from documentation
Diffstat (limited to 'Arduino.mk')
| -rw-r--r-- | Arduino.mk | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -628,8 +628,12 @@ ifeq ($(strip $(NO_CORE)),) USB_VID = $(call PARSE_BOARD,$(BOARD_TAG),build.vid) endif + # coping with 2-3 methods sparkfun use for usb.pid ifndef USB_PID - USB_PID = $(call PARSE_BOARD,$(BOARD_TAG),build.pid) + USB_PID := $(call PARSE_BOARD,$(BOARD_TAG),build.pid) + ifndef USB_PID + USB_PID := $(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).build.pid) + endif endif endif |