diff options
| author | dakkar <dakkar@thenautilus.net> | 2022-09-22 17:56:16 +0100 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2022-09-23 12:52:38 +0100 |
| commit | f72e0eea649b1bedcedc23959ea711821d60ad0c (patch) | |
| tree | ac42f33511f37cde75d671b046324f43a08d2112 | |
| parent | some docs / comments (diff) | |
| download | keyboardio-model01-f72e0eea649b1bedcedc23959ea711821d60ad0c.tar.gz keyboardio-model01-f72e0eea649b1bedcedc23959ea711821d60ad0c.tar.bz2 keyboardio-model01-f72e0eea649b1bedcedc23959ea711821d60ad0c.zip | |
preparing for Model100 & new Kaleidoscope
| -rw-r--r-- | Makefile | 17 | ||||
| -rw-r--r-- | Model01-dakkar-firmware.ino (renamed from Model01-Firmware.ino) | 0 | ||||
| -rw-r--r-- | sketch.json | 6 | ||||
| -rw-r--r-- | src/Model01-Firmware.h | 2 |
4 files changed, 9 insertions, 16 deletions
@@ -1,20 +1,9 @@ -UNAME_S := $(shell uname -s) - THISDIR := $(shell dirname $(lastword $(MAKEFILE_LIST))) -export SKETCHBOOK_DIR = $(shell readlink -f $(THISDIR)/..) - -export ARDUINO_PATH = $(SKETCHBOOK_DIR)/arduino-1.8.7 -export PACKAGE_DIR = $(SKETCHBOOK_DIR)/built -export LIB_PROPERTIES_PATH = $(THISDIR) - -KALEIDOSCOPE_BUILDER_DIR = $(SKETCHBOOK_DIR)/hardware/keyboardio/avr/libraries/Kaleidoscope/bin/ - -BOARD_HARDWARE_PATH = $(SKETCHBOOK_DIR)/hardware -KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR = keyboardio/avr/build-tools/makefiles/ +export KALEIDOSCOPE_DIR = $(shell readlink -f $(THISDIR)/../Kaleidoscope) -DAKKAR_VERSION := $(shell grep -E '^version=' $(THISDIR)/library.properties | cut -d= -f2)-$(shell git describe --dirty --always --tags --first-parent) +DAKKAR_VERSION := $(shell git describe --dirty --always --tags --first-parent) export LOCAL_CFLAGS = -DBUILD_INFORMATION="$(DAKKAR_VERSION)" -include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk +include $(KALEIDOSCOPE_DIR)/etc/makefiles/sketch.mk diff --git a/Model01-Firmware.ino b/Model01-dakkar-firmware.ino index c075ee0..c075ee0 100644 --- a/Model01-Firmware.ino +++ b/Model01-dakkar-firmware.ino diff --git a/sketch.json b/sketch.json new file mode 100644 index 0000000..e00344e --- /dev/null +++ b/sketch.json @@ -0,0 +1,6 @@ +{ + "cpu": { + "fqbn": "keyboardio:gd32:keyboardio_model_100", + "port": "" + } +} diff --git a/src/Model01-Firmware.h b/src/Model01-Firmware.h deleted file mode 100644 index 8a4dc34..0000000 --- a/src/Model01-Firmware.h +++ /dev/null @@ -1,2 +0,0 @@ -// Lets make cpplint happy! -#pragma once |