Skip to content

Commit 0b1aa8d

Browse files
committed
hard code ARCHITECTURE if not found in boards.txt, update history
1 parent 3830299 commit 0b1aa8d

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

HISTORY.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
1212
- Fix: ARDUINO_VERSION can cope with the longer 1.6.10 version string (issue #444) (https://github.com/sej7278)
1313
- Fix: Changed PARSE_BOARD to handle colons in e.g. CORE or VARIANT (issue #461) (https://github.com/sej7278)
1414
- Tweak: Documentation for Windows updated to include installation of PySerial (https://github.com/sovcik)
15+
- FIX: Changed Teensy.mk to support Arduino 1.6.12 and Teensyduino 1.30 (issues #383 , #431) (https://github.com/georgeharker)
1516

1617
### 1.5.1 (Debian version: 1.5-3) (2016-02-22)
1718

Teensy.mk

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,12 @@ ifndef PARSE_TEENSY
4646
PARSE_TEENSY = $(shell grep -v "^\#" "$(BOARDS_TXT)" | grep $(1).$(2) | cut -d = -f 2,3 )
4747
endif
4848

49+
# if boards.txt gets modified, look there, else hard code it
4950
ARCHITECTURE = $(call PARSE_TEENSY,$(BOARD_TAG),build.architecture)
51+
ifeq ($(strip $(MONITOR_PORT)),)
52+
ARCHITECTURE = arm
53+
endif
54+
5055
AVR_TOOLS_DIR = $(call dir_if_exists,$(ARDUINO_DIR)/hardware/tools/$(ARCHITECTURE))
5156

5257
# define plaform lib dir ignoring teensy's oversight on putting it all in avr

0 commit comments

Comments
 (0)