From 7961a862868210ceb6759a41d03d17c7793cfbec Mon Sep 17 00:00:00 2001
From: Sudar <sudar@sudarmuthu.com>
Date: Sun, 6 Oct 2013 18:14:58 +0530
Subject: In ISP mode, read baudrate and programmer from boards.txt

Arduino IDE also reads this from boards.txt file

Fix #125
---
 arduino-mk/Arduino.mk | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'arduino-mk/Arduino.mk')

diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk
index d2b3e62..9c1b940 100644
--- a/arduino-mk/Arduino.mk
+++ b/arduino-mk/Arduino.mk
@@ -976,11 +976,19 @@ endif
 AVRDUDE_ARD_OPTS = -c $(AVRDUDE_ARD_PROGRAMMER) -b $(AVRDUDE_ARD_BAUDRATE) -P $(call get_monitor_port)
 
 ifndef ISP_PROG
-    ISP_PROG   = stk500v1
+    ifneq ($(strip $(AVRDUDE_ARD_PROGRAMMER)),)
+        ISP_PROG = $(AVRDUDE_ARD_PROGRAMMER)
+    else
+        ISP_PROG = stk500v1
+    endif
 endif
 
 ifndef AVRDUDE_ISP_BAUDRATE
-    AVRDUDE_ISP_BAUDRATE = 19200
+    ifneq ($(strip $(AVRDUDE_ARD_BAUDRATE)),)
+        AVRDUDE_ISP_BAUDRATE = $(AVRDUDE_ARD_BAUDRATE)
+    else
+        AVRDUDE_ISP_BAUDRATE = 19200
+    endif
 endif
 
 # Pre fuse settings
-- 
cgit v1.2.3