From 74882aa13ac27e53ba76bbe2f2cc67bd3974bd67 Mon Sep 17 00:00:00 2001 From: Ralf Doering Date: Tue, 25 Jun 2013 19:41:33 +0200 Subject: [PATCH 1/3] Add openSUSE perl package hints to README.md. Signed-off-by: Ralf Doering --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index a2e042c..5e9608a 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,11 @@ On Fedora: yum install perl-Device-SerialPort yum install perl-YAML +On openSUSE: + + zypper install perl-Device-SerialPort + zypper install perl-YAML + On Mac using MacPorts: sudo port install p5-device-serialport From 25a31afbd92f03a1df1b50e3620f40afedd2e67e Mon Sep 17 00:00:00 2001 From: Ralf Doering Date: Tue, 25 Jun 2013 20:04:11 +0200 Subject: [PATCH 2/3] Don't overwrite AVRDUDE_CONF if AVR_TOOLS_DIR is not set. If one likes to use avrdude from outside of Arduino together with Arduino-bundled gcc crosstolchain, the setting of AVRDUDE_CONF got overwritten. --- arduino-mk/Arduino.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index b217592..aaec9aa 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -306,10 +306,12 @@ ifndef AVR_TOOLS_DIR BUNDLED_AVR_TOOLS_DIR := $(call dir_if_exists,$(ARDUINO_DIR)/hardware/tools/avr) ifdef BUNDLED_AVR_TOOLS_DIR AVR_TOOLS_DIR = $(BUNDLED_AVR_TOOLS_DIR) - # The avrdude bundled with Arduino can't find it's config - AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf - $(call show_config_variable,AVR_TOOLS_DIR,[BUNDLED],(in Arduino distribution)) - + # if AVRDUDE_CONF is already defined, don't overwrite it + ifndef AVRDUDE_CONF + # The avrdude bundled with Arduino can't find it's config + AVRDUDE_CONF = $(AVR_TOOLS_DIR)/etc/avrdude.conf + $(call show_config_variable,AVR_TOOLS_DIR,[BUNDLED],(in Arduino distribution)) + endif else SYSTEMPATH_AVR_TOOLS_DIR := $(call dir_if_exists,$(abspath $(dir $(shell which avr-gcc))/..)) From d8b52bdd3424249d1b7a3d2928047efefa4d7b72 Mon Sep 17 00:00:00 2001 From: Ralf Doering Date: Tue, 25 Jun 2013 19:52:10 +0200 Subject: [PATCH 3/3] Mention AVRDUDE and AVRDUDE_CONF in README.md. --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 5e9608a..0de27c8 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,13 @@ standard location for custom libraries when using the Arduino IDE), you need to set the `ARDUINO_SKETCHBOOK` variable to point to this directory. By default it is set to `$HOME/sketchbook`. +## avrdude + +To upload compiled files, `avrdude` is used. This Makefile tries to find `avrdude` and it's config (`avrdude.conf`) below `ARDUINO_DIR`. If you like to use the one installed on your system instead of the one which came with Arduino, you can try to set the variables `AVRDUDE` and `AVRDUDE_CONF`. On a typical Linux system these could be set to + + AVRDDUDE = /usr/bin/avrdude + AVRDUDE_CONF = /etc/avrdude.conf + ## Versioning The current version of the makefile is `0.12.0`. You can find the full history in the [HISTORY.md](HISTORY.md) file