aboutsummaryrefslogtreecommitdiff
path: root/Arduino.mk
diff options
context:
space:
mode:
authorSimon John <git@the-jedi.co.uk>2017-06-01 19:22:28 +0100
committerSimon John <git@the-jedi.co.uk>2017-06-01 19:22:28 +0100
commitd1363592f2c6d65c41ae89bb14f55d05cdf02e5f (patch)
tree8ec24f5d10466f313430356eedb36a2c7455d448 /Arduino.mk
parent807cf65f71ace3710b5b69f2bd8d7422ba6bd0af (diff)
Fix autodetection of USB_PID on SparkFun's new ProMicro core
Remove use of tilde in documentation as ~ doesn't work, use $(HOME) instead
Diffstat (limited to 'Arduino.mk')
-rw-r--r--Arduino.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/Arduino.mk b/Arduino.mk
index 9554f35..5b0af0f 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -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