diff options
| author | Simon John <817564+sej7278@users.noreply.github.com> | 2020-10-20 09:13:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-20 09:13:50 +0100 |
| commit | e39a026014e1bd77cd82dd9d9e01d7807c59c9b9 (patch) | |
| tree | aa2a0a8d2ae36b14f547625c50e6cd96965f67d8 | |
| parent | c7eb909b849e354fdb7630d11405ea6de706f1ba (diff) | |
| parent | 01493f4e23a55e3117ee3e71b12cad35ecfa681d (diff) | |
Merge pull request #643 from soburi/define_board_macro
Add -DARDUINO_{build.board} and -DARDUINO_VARIANT for compile options
| -rw-r--r-- | Arduino.mk | 13 | ||||
| -rw-r--r-- | HISTORY.md | 1 | ||||
| -rw-r--r-- | arduino-mk-vars.md | 20 |
3 files changed, 33 insertions, 1 deletions
@@ -674,6 +674,16 @@ ifeq ($(strip $(NO_CORE)),) $(call show_config_variable,VARIANT,[USER]) endif + ifndef BOARD + BOARD := $(call PARSE_BOARD,$(BOARD_TAG),build.board) + ifndef BOARD + BOARD := $(shell echo $(ARCHITECTURE)_$(BOARD_TAG) | tr '[:lower:]' '[:upper:]') + endif + $(call show_config_variable,BOARD,[COMPUTED],(from build.board)) + else + $(call show_config_variable,BOARD,[USER]) + endif + # see if we are a caterina device like leonardo or micro CATERINA := $(findstring caterina,$(call PARSE_BOARD,$(BOARD_TAG),menu.(chip|cpu).$(BOARD_SUB).bootloader.file)) ifndef CATERINA @@ -1162,7 +1172,8 @@ else endif # Using += instead of =, so that CPPFLAGS can be set per sketch level -CPPFLAGS += -$(MCU_FLAG_NAME)=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERSION) $(ARDUINO_ARCH_FLAG) \ +CPPFLAGS += -$(MCU_FLAG_NAME)=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERSION) -DARDUINO_$(BOARD) $(ARDUINO_ARCH_FLAG) \ + "-DARDUINO_BOARD=\"$(BOARD)\"" "-DARDUINO_VARIANT=\"$(VARIANT)\"" \ -I$(ARDUINO_CORE_PATH) -I$(ARDUINO_CORE_PATH)/api -I$(ARDUINO_VAR_PATH)/$(VARIANT) \ $(SYS_INCLUDES) $(PLATFORM_INCLUDES) $(USER_INCLUDES) -Wall -ffunction-sections \ -fdata-sections @@ -35,6 +35,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it - New: Add support for Robotis OpenCR 1.0 boards. - New: Build the ArduinoCore API - New: Support for Python 3 and multi-os Python installation using new PYTHON_CMD variable. +- New: Add "ARDUINO_{build.board}" to be able to detect board type. ### 1.6.0 (2017-07-11) - Fix: Allowed for SparkFun's weird usb pid/vid submenu shenanigans (issue #499). (https://github.com/sej7278) diff --git a/arduino-mk-vars.md b/arduino-mk-vars.md index 7c42416..0907eb2 100644 --- a/arduino-mk-vars.md +++ b/arduino-mk-vars.md @@ -583,6 +583,26 @@ CORE = tiny ---- +### BOARD + +**Description:** + +Board identifier that passes to a compile option as -DARDUINO_$(BOARD). + +Usually can be auto-detected as `build.board` from `boards.txt`. + +If not found build.board entry, use upper-case converted "$(ARCHITECTURE)_$(BOARD_TAG)". + +**Example:** + +```Makefile +BOARD = AVR_LEONARD +``` + +**Requirement:** *Optional* + +---- + ### VARIANT **Description:** |