From a2c8fe51968cf6588217d3187a674d1c44d506f0 Mon Sep 17 00:00:00 2001 From: Simon John Date: Thu, 23 Oct 2014 23:44:14 +0100 Subject: [PATCH] Add's "avrispmkii" to the list of ISP's that don't have a port, defaults to reading communication_type from avrdude.conf, which is "usb" usually, rather than setting the -P flag which is the user override. --- Arduino.mk | 2 +- HISTORY.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Arduino.mk b/Arduino.mk index fb5db4f..40f4a01 100644 --- a/Arduino.mk +++ b/Arduino.mk @@ -1310,7 +1310,7 @@ endif AVRDUDE_ISP_OPTS = -c $(ISP_PROG) -b $(AVRDUDE_ISP_BAUDRATE) ifndef $(ISP_PORT) - ifneq ($(strip $(ISP_PROG)),$(filter $(ISP_PROG), usbasp usbtiny gpio)) + ifneq ($(strip $(ISP_PROG)),$(filter $(ISP_PROG), usbasp usbtiny gpio avrispmkii)) AVRDUDE_ISP_OPTS += -P $(call get_isp_port) endif else diff --git a/HISTORY.md b/HISTORY.md index 402fd35..e432658 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -28,6 +28,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it - Fix: Allow user libaries/sketches to have the same name as system libs. (Issue #244, #229). (https://github.com/sej7278) - Fix: Remove impact of travis-ci from regular users. (Issue #258). (https://github.com/sej7278) - Fix: objcopy quoting issue on Windows. (Issue #272). (https://github.com/sej7278) +- Fix: Add "avrispmkii" to the list of isp that don't have a port. (Issue #279). (https://github.com/sej7278) ### 1.3.4 (2014-07-12) - Tweak: Allow spaces in "Serial.begin (....)". (Issue #190) (https://github.com/pdav)