diff options
| author | Simon John <git@the-jedi.co.uk> | 2015-03-28 16:34:58 +0000 |
|---|---|---|
| committer | Simon John <git@the-jedi.co.uk> | 2015-03-28 16:34:58 +0000 |
| commit | cfe83bca2033cdefd9208c8db9bce1c225843ef7 (patch) | |
| tree | b54077a289f8c5db6955dfb9e9267702ac419455 | |
| parent | 861d2ff72f9597c5ca0e486437a7c73f3262cc69 (diff) | |
| parent | 47395782c39f6845736dcc78f2da8f1b902b75a7 (diff) | |
Merge pull request #336 from sej7278/master
Added support for VARIANT in submenu's
Also fixed sed issue on OSX (copyright symbol)
| -rw-r--r-- | Arduino.mk | 9 | ||||
| -rw-r--r-- | HISTORY.md | 3 | ||||
| -rw-r--r-- | arduino-mk-vars.md | 3 | ||||
| -rw-r--r-- | examples/BlinkInAVRC/blink.c | 2 |
4 files changed, 14 insertions, 3 deletions
@@ -577,7 +577,14 @@ ifeq ($(strip $(NO_CORE)),) # Which variant ? This affects the include path ifndef VARIANT - VARIANT = $(call PARSE_BOARD,$(BOARD_TAG),build.variant) + VARIANT := $(call PARSE_BOARD,$(BOARD_TAG),build.variant) + ifndef VARIANT + # might be a submenu + VARIANT := $(call PARSE_BOARD,$(BOARD_TAG),menu.cpu.$(BOARD_SUB).build.variant) + endif + $(call show_config_variable,VARIANT,[COMPUTED],(from build.variant)) + else + $(call show_config_variable,VARIANT,[USER]) endif # see if we are a caterina device like leonardo or micro @@ -31,6 +31,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it - Tweak: Integration instructions for CodeBlocks IDE (Issue #321) (https://github.com/fbielejec) - Tweak: Add BOARD_SUB to OBJDIR if defined in 1.5+ (https://github.com/sej7278) - Tweak: Add = to PARSE_BOARD regex to make it less greedy and not match vid.0, vid.1 and vid (https://github.com/sej7278) +- Tweak: Added note about clock submenu's being used as F_CPU (https://github.com/sej7278) - Fix: Improved Windows (Cygwin/MSYS) support (https://github.com/PeterMosmans) - Fix: Change "tinyladi" username to "ladislas" in HISTORY.md. (https://github.com/ladislas) @@ -49,6 +50,8 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it - Fix: Fixed PLATFORM_LIB support for 1.5+ and removed duplicate libs (https://github.com/sej7278) - Fix: Added ARCHITECTURE to ALTERNATE_CORE_PATH to support 1.5+ cores like arduino-tiny (https://github.com/sej7278) - Fix: Can now find IDE 1.5+ preferences.txt on Linux and Mac (https://github.com/sej7278) +- Fix: Added support for VARIANT being a submenu item in 1.6 cores like attiny (https://github.com/sej7278) +- Fix: Replaced copyright symbol causing sed problems on OSX (Issue #335). (https://github.com/sej7278) ### 1.3.4 (2014-07-12) - Tweak: Allow spaces in "Serial.begin (....)". (Issue #190) (https://github.com/pdav) diff --git a/arduino-mk-vars.md b/arduino-mk-vars.md index f961177..674a34f 100644 --- a/arduino-mk-vars.md +++ b/arduino-mk-vars.md @@ -520,7 +520,8 @@ USB_PID = 0x8039 CPU speed in Hz -Usually can be auto-detected as `build.f_cpu` from `boards.txt` +Usually can be auto-detected as `build.f_cpu` from `boards.txt`, except in +some 1.6 cores like attiny where there is a clock submenu. **Example:** diff --git a/examples/BlinkInAVRC/blink.c b/examples/BlinkInAVRC/blink.c index d8b7c8f..472a09c 100644 --- a/examples/BlinkInAVRC/blink.c +++ b/examples/BlinkInAVRC/blink.c @@ -1,5 +1,5 @@ /* - * © Anil Kumar Pugalia, 2010. Email: email@sarika-pugs.com + * (c) Anil Kumar Pugalia, 2010. Email: email@sarika-pugs.com * * ATmega48/88/168, ATmega16/32 * |