diff options
| author | Sudar <sudar@sudarmuthu.com> | 2013-10-06 18:14:58 +0530 |
|---|---|---|
| committer | Sudar <sudar@sudarmuthu.com> | 2013-10-06 18:14:58 +0530 |
| commit | 7961a862868210ceb6759a41d03d17c7793cfbec (patch) | |
| tree | f56d2e837f64de0da1a735d8135ca769d0f7738d /arduino-mk/Arduino.mk | |
| parent | a17cf2af96cea3234b4d41b7ad0f02a5d2915ba4 (diff) | |
In ISP mode, read baudrate and programmer from boards.txt
Arduino IDE also reads this from boards.txt file
Fix #125
Diffstat (limited to 'arduino-mk/Arduino.mk')
| -rw-r--r-- | arduino-mk/Arduino.mk | 12 |
1 files changed, 10 insertions, 2 deletions
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 |