diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | README | 6 | ||||
| m--------- | lib/hardware/arduino/avr | 0 |
4 files changed, 8 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules index 2c630eb..6fdaaf1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "lib/hardware/keyboardio"] path = lib/hardware/keyboardio url = https://github.com/keyboardio/Kaleidoscope-Bundle-Keyboardio.git +[submodule "lib/hardware/arduino/avr"] + path = lib/hardware/arduino/avr + url = https://github.com/arduino/ArduinoCore-avr @@ -1,5 +1,5 @@ AVR_TOOLS_DIR = /usr -ARDUINO_DIR = /usr/local/arduino +ARDUINO_DIR = ./lib ARDMK_DIR = /usr/share/arduino ARDMK_VENDOR = arduino @@ -8,7 +8,7 @@ BOARD_TAG = model01 ALTERNATE_CORE = keyboardio ARDUINO_SKETCHBOOK = ./lib -ARDUINO_VERSION = $(shell tr "." "0" <$(ARDUINO_DIR)/lib/version.txt) +ARDUINO_VERSION = $(shell git --no-pager -C $(ARDUINO_DIR)/hardware/$(ARDMK_VENDOR)/$(ARCHITECTURE) tag --points-at HEAD | tr "." "0") SOURCEDIR = ./src OBJDIR = ./build @@ -19,13 +19,13 @@ On Debian systems, the following packages are required: Running `apt install arduino-mk` should pull in all required dependencies. Moreover Arduino 1.6.7 or newer is required. Unfortunately, as of 2019-06-25 the version found in Debian sid is too -Unfortunately, as of 2019-06-25 the version found in Debian sid is too -old (cf. #780706, #925578, #927329). Dowload a recent version at -https://www.arduino.cc and it unpack to /usr/local/arduino. +old (cf. #780706, #925578, #927329), so for now we add ArduinoCore-avr +as a submodule. Initialize (or update) submodules: ~$ git submodule update --init \ + lib/hardware/arduino/avr \ lib/hardware/keyboardio ~$ git -C lib/hardware/keyboardio submodule update --init --recursive \ diff --git a/lib/hardware/arduino/avr b/lib/hardware/arduino/avr new file mode 160000 +Subproject 2663be17272e19f00c55f3f2d8f1ebfac47158d |