From 0c40b669f01a3bc63545d271b1fb05cf820f02e5 Mon Sep 17 00:00:00 2001 From: jerryen Date: Sat, 27 Jun 2015 21:37:09 -0700 Subject: [PATCH 1/2] Add KEYBOARD_LOCK_ENABLE to makefile Allow keyboard lock to work --- tmk_core/common.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tmk_core/common.mk b/tmk_core/common.mk index d22adff5..04ba0d60 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk @@ -53,6 +53,10 @@ ifdef USB_6KRO_ENABLE OPT_DEFS += -DUSB_6KRO_ENABLE endif +ifdef KEYBOARD_LOCK_ENABLE + OPT_DEFS += -DKEYBOARD_LOCK_ENABLE +endif + ifdef SLEEP_LED_ENABLE SRC += $(COMMON_DIR)/sleep_led.c OPT_DEFS += -DSLEEP_LED_ENABLE From 5b820b9db890c7b82c78d2e29109ec521fdd0bc6 Mon Sep 17 00:00:00 2001 From: tmk Date: Sat, 16 Jan 2016 10:05:32 +0900 Subject: [PATCH 2/2] core: Add note about sudo and git --- tmk_core/doc/build.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tmk_core/doc/build.md b/tmk_core/doc/build.md index 0585d62d..57a36ac4 100644 --- a/tmk_core/doc/build.md +++ b/tmk_core/doc/build.md @@ -20,7 +20,7 @@ You can find firmware source at github: - -If you are familiar with `git` tools you are recommended to use it but you can also download zip archive from: +If you are familiar with [`git`][git] tools you are recommended to use it but you can also download zip archive from: - @@ -70,7 +70,7 @@ Or you can execute the command directly as the following. $ dfu-programmer flash $ dfu-programmer reset -`` part will be `atmega32u4` or `atmega32u2` in most cases. See manual of the command for the detail. +`` part will be `atmega32u4` or `atmega32u2` in most cases. See manual of the command for the detail. On Linux and Mac OSX you will need proper permission to program a controller and you can use `sudo` command for this purpose probably. On Linux you also can configure `udev` rules to set permission. #### FLIP GUI tutorial @@ -111,6 +111,7 @@ You may want to use other programmer like [`avrdude`][avrdude]. In that case you [dfu-prog]: http://dfu-programmer.sourceforge.net/ [teensy-loader]:http://www.pjrc.com/teensy/loader.html [avrdude]: http://savannah.nongnu.org/projects/avrdude/ +[git]: https://git-scm.com/