From 1239263896058b7b3d9614e61ab5e14cb92d3cc6 Mon Sep 17 00:00:00 2001 From: Simon John Date: Sun, 17 Aug 2014 19:29:43 +0200 Subject: [PATCH 1/2] Fix regex for "make show_boards" on 1.5 In 1.5.6 the Due board has an underscore, this regex tweak allows for: arduino_due_x_dbg Arduino Due (Programming Port) arduino_due_x Arduino Due (Native USB Port) --- Arduino.mk | 2 +- HISTORY.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Arduino.mk b/Arduino.mk index 60bec1c..f9819eb 100644 --- a/Arduino.mk +++ b/Arduino.mk @@ -1340,7 +1340,7 @@ size: $(TARGET_HEX) $(call avr_size,$(TARGET_ELF),$(TARGET_HEX)) show_boards: - @$(CAT) "$(BOARDS_TXT)" | grep -E "^[[:alnum:]]+.name" | sort -uf | sed 's/.name=/:/' | column -s: -t + @$(CAT) "$(BOARDS_TXT)" | grep -E "^[a-zA-Z0-9_]+.name" | sort -uf | sed 's/.name=/:/' | column -s: -t monitor: $(MONITOR_CMD) $(call get_monitor_port) $(MONITOR_BAUDRATE) diff --git a/HISTORY.md b/HISTORY.md index 072e695..173f495 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -16,6 +16,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it - Add: Add documentation about CFLAGS_STD and CXXFLAGS_STD (Issue #234) (https://github.com/ladislas) - Tweak: Update Malefile-example.mk with STD flags (https://github.com/ladislas) - Add: Allow "make clean" target to be extended (Issue #239). (https://github.com/sej7278) +- Fix: Update "make show_boards" regex to work with the Due in 1.5. (https://github.com/sej7278) ### 1.3.4 (2014-07-12) - Tweak: Allow spaces in "Serial.begin (....)". (Issue #190) (https://github.com/pdav) From 5420e920fbf86823e756a6c66c846e4f8eecad7e Mon Sep 17 00:00:00 2001 From: Joseivaldo Benito Junior Date: Thu, 28 Aug 2014 23:42:47 -0300 Subject: [PATCH 2/2] Small typo, can lead to copy and paste fails Signed-off-by: Joseivaldo Benito Junior --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 97cfdd4..50785b0 100644 --- a/README.md +++ b/README.md @@ -147,7 +147,7 @@ The makefile can autodetect the libraries that are included from your sketch and 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 = /usr/bin/avrdude AVRDUDE_CONF = /etc/avrdude.conf ## Versioning