aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon John <git@the-jedi.co.uk>2015-10-27 21:41:49 +0000
committerSimon John <git@the-jedi.co.uk>2015-10-27 21:41:49 +0000
commit9afa0e787cbb1fb274f4fa58754612b534d61973 (patch)
tree40f6e509e314987924b77b6dcf30c1fe60abaa57
parent02a1811d454340a7b7ad1d5123bb96d623c805fb (diff)
parentfb2567e7fb3ae8c50eea79bbd1524609587b5b03 (diff)
Merge pull request #393 from zabereer/master
Better parsing of boards.txt file, thanks for the PR and good spotting!
-rw-r--r--Arduino.mk2
-rw-r--r--HISTORY.md1
2 files changed, 2 insertions, 1 deletions
diff --git a/Arduino.mk b/Arduino.mk
index eb94a3c..7b1342e 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -568,7 +568,7 @@ endif
ifndef PARSE_BOARD
# result = $(call READ_BOARD_TXT, 'boardname', 'parameter')
- PARSE_BOARD = $(shell grep -v '^\#' $(BOARDS_TXT) | grep $(1).$(2)= | cut -d = -f 2 )
+ PARSE_BOARD = $(shell grep -v '^\#' $(BOARDS_TXT) | grep "^[ \t]*$(1).$(2)=" | cut -d = -f 2)
endif
# If NO_CORE is set, then we don't have to parse boards.txt file
diff --git a/HISTORY.md b/HISTORY.md
index 4ccf650..62f74dc 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -11,6 +11,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
- New: Add option to split avrdude MCU from avr-gcc MCU (Issue #357) (https://github.com/hhgarnes)
- New: Add support for /dev/tty.wchusbserial* (comes with cheap clones - DCCduino) (https://github.com/biesiad)
- New: Add support for picocom as serial monitor (https://github.com/biesiad)
+- Tweak: Add support for Adafruit trinket3/trinket5/protrinket3/protrinket5 by improved BOARDS_TXT parsing (Issue #393) (https://github/com/zabereer)
- Tweak: Looks for submenu items first when parsing BOARDS_TXT (Issue #347) (https://github.com/sej7278)
- Tweak: Various spelling/grammar/typo fixes (https://github.com/dcousens)
- Tweak: Clarified some 1.5+ issues in docs (Issue #352) (https://github.com/sej7278)