aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabrielius Mickevicius <gabrielius.m@gmail.com>2014-12-29 19:34:45 +0200
committerGabrielius Mickevicius <gabrielius.m@gmail.com>2014-12-30 17:45:36 +0200
commit6d549c89aa941b2f3dd4e99de553d38223e6a06a (patch)
tree5bd39f1a85db87b007dedf301216ea3216095bd5
parent4b4592ac3e8c941ee45db40ff1d5b6ca3bc3683d (diff)
Tidy new arduino mk vars
Add CORE and FORCE_MONITOR_PORT to arduino-mk-vars.md and FORCE_MONITOR_PORT to config print.
-rw-r--r--Arduino.mk6
-rw-r--r--arduino-mk-vars.md42
-rw-r--r--examples/BlinkNetworkRPi/Makefile2
3 files changed, 49 insertions, 1 deletions
diff --git a/Arduino.mk b/Arduino.mk
index 825bc3e..8c878a4 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -1051,6 +1051,12 @@ else
$(call show_config_variable,DEVICE_PATH,[AUTODETECTED])
endif
+ifndef FORCE_MONITOR_PORT
+ $(call show_config_variable,FORCE_MONITOR_PORT,[DEFAULT])
+else
+ $(call show_config_variable,FORCE_MONITOR_PORT,[USER])
+endif
+
ifdef FORCE_MONITOR_PORT
# Skips the DEVICE_PATH existance check.
get_monitor_port = $(DEVICE_PATH)
diff --git a/arduino-mk-vars.md b/arduino-mk-vars.md
index 73bed78..4003a6c 100644
--- a/arduino-mk-vars.md
+++ b/arduino-mk-vars.md
@@ -316,6 +316,25 @@ MONITOR_PORT = com3
----
+### FORCE_MONITOR_PORT
+
+**Description:**
+
+Skip the MONITOR_PORT existance check.
+
+**Example:**
+
+```Makefile
+# Enable
+FORCE_MONITOR_PORT = true
+# Disable (default)
+undefine FORCE_MONITOR_PORT
+```
+
+**Requirement:** *Optional*
+
+----
+
### USER_LIB_PATH
**Description:**
@@ -392,6 +411,29 @@ ARDUINO_VAR_PATH = ~/sketchbook/hardware/arduino-tiny/cores/tiny
----
+### CORE
+
+**Description:**
+
+Name of the core *inside* the ALTERNATE_CORE or the standard core.
+
+Usually can be auto-detected as `build.core` from `boards.txt`.
+
+**Example:**
+
+```Makefile
+# standard Arduino core (undefine ALTERNATE_CORE)
+CORE = arduino
+# or
+CORE = robot
+# tiny core (ALTERNATE_CORE = arduino-tiny)
+CORE = tiny
+```
+
+**Requirement:** *Optional*
+
+----
+
### VARIANT
**Description:**
diff --git a/examples/BlinkNetworkRPi/Makefile b/examples/BlinkNetworkRPi/Makefile
index 02b7a2b..15e565e 100644
--- a/examples/BlinkNetworkRPi/Makefile
+++ b/examples/BlinkNetworkRPi/Makefile
@@ -13,7 +13,7 @@ BOARD_TAG = attiny85at8
AVRDUDE_CONF=/usr/local/etc/avrdude.conf
# Skip the monitor port existance check since it's not on our machine.
-FORCE_MONITOR_PORT=(defined)
+FORCE_MONITOR_PORT=true
MONITOR_PORT=/dev/spidev0.0
include ../../Arduino.mk