Merge remote-tracking branch 'tmk/master' into cub_layout
This commit is contained in:
commit
e93188021c
26 changed files with 636 additions and 546 deletions
|
|
@ -128,6 +128,8 @@ include $(TOP_DIR)/protocol/lufa.mk
|
|||
include $(TOP_DIR)/common.mk
|
||||
include $(TOP_DIR)/rules.mk
|
||||
|
||||
debug-on: EXTRAFLAGS += -DDEBUG
|
||||
#debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION
|
||||
debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION
|
||||
debug-on: all
|
||||
|
||||
debug-off: EXTRAFLAGS += -DNO_DEBUG -DNO_PRINT
|
||||
debug-off: all
|
||||
|
|
|
|||
|
|
@ -40,7 +40,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define TAPPING_TERM 300
|
||||
/* tap count needed for toggling a feature */
|
||||
#define TAPPING_TOGGLE 5
|
||||
|
||||
/* Oneshot timeout(ms) */
|
||||
#define ONESHOT_TIMEOUT 300
|
||||
|
||||
/* Boot Magic salt key: Space */
|
||||
#define BOOTMAGIC_KEY_SALT KC_FN6
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue