From 1351643020994762518e3da88bd15557ccdecb98 Mon Sep 17 00:00:00 2001 From: Kai Ryu Date: Fri, 8 Jan 2016 22:33:27 +0900 Subject: [PATCH] Change to match new repository structure --- keyboard/RedScarfII/Makefile.pjrc | 18 +++++++++++------- keyboard/RedScarfIII/Makefile | 15 +++++++-------- keyboard/RedScarfIII/Makefile.pjrc | 17 +++++++++-------- keyboard/gh60/Makefile | 2 +- keyboard/gh60/Makefile.pjrc | 14 +------------- keyboard/ghpad/Makefile | 10 +++++----- keyboard/ghpad/Makefile.pjrc | 13 +++++-------- keyboard/lr94/Makefile | 10 +++++----- keyboard/lr94/Makefile.pjrc | 10 +++++----- keyboard/smart68/Makefile | 12 ++++++------ keyboard/smart68/Makefile.pjrc | 12 ++++++------ keyboard/staryu/Makefile | 15 +++++++-------- keyboard/staryu/Makefile.pjrc | 18 ++++++++++-------- keyboard/staryu/Makefile_lite | 15 +++++++-------- keyboard/tentapad/Makefile | 12 ++++++------ keyboard/tentapad/Makefile.pjrc | 19 ++++++++++++------- keyboard/tentapad/Makefile_gh60 | 11 +++++------ keyboard/tentapad/Makefile_gh60.pjrc | 15 +++++++++------ keyboard/tentapad/keymap_common.c | 4 ++-- 19 files changed, 119 insertions(+), 123 deletions(-) diff --git a/keyboard/RedScarfII/Makefile.pjrc b/keyboard/RedScarfII/Makefile.pjrc index ba0137ec..0f3f4455 100644 --- a/keyboard/RedScarfII/Makefile.pjrc +++ b/keyboard/RedScarfII/Makefile.pjrc @@ -42,7 +42,7 @@ TARGET = RedScarfII_pjrc # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../../tmk_core_custom # Directory keyboard dependent files exist TARGET_DIR = . @@ -52,7 +52,10 @@ SRC = keymap_common.c \ matrix.c \ led.c \ backlight.c \ - ledmap.c + ledmap.c \ + yc059.c \ + rgb.c \ + suspend.c ifdef KEYMAP SRC := keymap_$(KEYMAP).c $(SRC) @@ -97,7 +100,8 @@ EXTRAKEY_ENABLE = yes # Audio control and System control(+450) CONSOLE_ENABLE = yes # Console for debug(+400) COMMAND_ENABLE = yes # Commands for debug and configuration #SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA +NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA +USB_6KRO_ENABLE = yes # USB 6key Rollover #PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality KEYMAP_IN_EEPROM_ENABLE = yes # Read keymap from eeprom @@ -111,8 +115,8 @@ LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom # Search Path VPATH += $(TARGET_DIR) -VPATH += $(TOP_DIR) +VPATH += $(TMK_DIR) -include $(TOP_DIR)/protocol/pjrc.mk -include $(TOP_DIR)/common.mk -include $(TOP_DIR)/rules.mk +include $(TMK_DIR)/protocol/pjrc.mk +include $(TMK_DIR)/common.mk +include $(TMK_DIR)/rules.mk diff --git a/keyboard/RedScarfIII/Makefile b/keyboard/RedScarfIII/Makefile index 307d03ce..e806ee9c 100644 --- a/keyboard/RedScarfIII/Makefile +++ b/keyboard/RedScarfIII/Makefile @@ -42,7 +42,7 @@ TARGET = RedScarfIII_lufa # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../../tmk_core_custom # Directory keyboard dependent files exist TARGET_DIR = . @@ -54,8 +54,8 @@ SRC = keymap_common.c \ backlight.c \ ledmap.c \ yc059.c \ - rgb.c \ - suspend.c + rgb.c \ + suspend.c ifdef KEYMAP SRC := keymap_$(KEYMAP).c $(SRC) @@ -149,9 +149,8 @@ LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom # Search Path VPATH += $(TARGET_DIR) -VPATH += $(TOP_DIR) +VPATH += $(TMK_DIR) -include $(TOP_DIR)/protocol/lufa.mk -include $(TOP_DIR)/protocol.mk -include $(TOP_DIR)/common.mk -include $(TOP_DIR)/rules.mk +include $(TMK_DIR)/protocol/lufa.mk +include $(TMK_DIR)/common.mk +include $(TMK_DIR)/rules.mk diff --git a/keyboard/RedScarfIII/Makefile.pjrc b/keyboard/RedScarfIII/Makefile.pjrc index 3d185a60..8865edfe 100644 --- a/keyboard/RedScarfIII/Makefile.pjrc +++ b/keyboard/RedScarfIII/Makefile.pjrc @@ -42,7 +42,7 @@ TARGET = RedScarfIII_pjrc # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../../tmk_core_custom # Directory keyboard dependent files exist TARGET_DIR = . @@ -54,8 +54,8 @@ SRC = keymap_common.c \ backlight.c \ ledmap.c \ yc059.c \ - rgb.c \ - suspend.c + rgb.c \ + suspend.c ifdef KEYMAP SRC := keymap_$(KEYMAP).c $(SRC) @@ -100,7 +100,8 @@ EXTRAKEY_ENABLE = yes # Audio control and System control(+450) CONSOLE_ENABLE = yes # Console for debug(+400) COMMAND_ENABLE = yes # Commands for debug and configuration #SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA +NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA +USB_6KRO_ENABLE = yes # USB 6key Rollover #PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality KEYMAP_IN_EEPROM_ENABLE = yes # Read keymap from eeprom @@ -114,8 +115,8 @@ LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom # Search Path VPATH += $(TARGET_DIR) -VPATH += $(TOP_DIR) +VPATH += $(TMK_DIR) -include $(TOP_DIR)/protocol/pjrc.mk -include $(TOP_DIR)/common.mk -include $(TOP_DIR)/rules.mk +include $(TMK_DIR)/protocol/pjrc.mk +include $(TMK_DIR)/common.mk +include $(TMK_DIR)/rules.mk diff --git a/keyboard/gh60/Makefile b/keyboard/gh60/Makefile index 123540a5..cf32751e 100644 --- a/keyboard/gh60/Makefile +++ b/keyboard/gh60/Makefile @@ -42,7 +42,7 @@ TARGET = gh60_lufa # Directory common source filess exist -TMK_DIR = ../../tmk_core +TMK_DIR = ../../tmk_core_custom # Directory keyboard dependent files exist TARGET_DIR = . diff --git a/keyboard/gh60/Makefile.pjrc b/keyboard/gh60/Makefile.pjrc index 398c37e3..a7fd121b 100644 --- a/keyboard/gh60/Makefile.pjrc +++ b/keyboard/gh60/Makefile.pjrc @@ -42,7 +42,7 @@ TARGET = gh60_pjrc # Directory common source filess exist -TMK_DIR = ../../tmk_core +TMK_DIR = ../../tmk_core_custom # Directory keyboard dependent files exist TARGET_DIR = . @@ -123,15 +123,3 @@ VPATH += $(TMK_DIR) include $(TMK_DIR)/protocol/pjrc.mk include $(TMK_DIR)/common.mk include $(TMK_DIR)/rules.mk - -plain: OPT_DEFS += -DKEYMAP_PLAIN -plain: all - -poker: OPT_DEFS += -DKEYMAP_POKER -poker: all - -poker_set: OPT_DEFS += -DKEYMAP_POKER_SET -poker_set: all - -poker_bit: OPT_DEFS += -DKEYMAP_POKER_BIT -poker_bit: all diff --git a/keyboard/ghpad/Makefile b/keyboard/ghpad/Makefile index 8298db26..4df92567 100644 --- a/keyboard/ghpad/Makefile +++ b/keyboard/ghpad/Makefile @@ -42,7 +42,7 @@ TARGET = ghpad_lufa # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../../tmk_core_custom # Directory keyboard dependent files exist TARGET_DIR = . @@ -146,8 +146,8 @@ LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom # Search Path VPATH += $(TARGET_DIR) -VPATH += $(TOP_DIR) +VPATH += $(TMK_DIR) -include $(TOP_DIR)/protocol/lufa.mk -include $(TOP_DIR)/common.mk -include $(TOP_DIR)/rules.mk +include $(TMK_DIR)/protocol/lufa.mk +include $(TMK_DIR)/common.mk +include $(TMK_DIR)/rules.mk diff --git a/keyboard/ghpad/Makefile.pjrc b/keyboard/ghpad/Makefile.pjrc index 25d6e45d..acb920e9 100644 --- a/keyboard/ghpad/Makefile.pjrc +++ b/keyboard/ghpad/Makefile.pjrc @@ -42,7 +42,7 @@ TARGET = ghpad_pjrc # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../../tmk_core_custom # Directory keyboard dependent files exist TARGET_DIR = . @@ -109,11 +109,8 @@ LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom # Search Path VPATH += $(TARGET_DIR) -VPATH += $(TOP_DIR) +VPATH += $(TMK_DIR) -include $(TOP_DIR)/protocol/pjrc.mk -include $(TOP_DIR)/common.mk -include $(TOP_DIR)/rules.mk - -plain: OPT_DEFS += -DKEYMAP_PLAIN -plain: all +include $(TMK_DIR)/protocol/pjrc.mk +include $(TMK_DIR)/common.mk +include $(TMK_DIR)/rules.mk diff --git a/keyboard/lr94/Makefile b/keyboard/lr94/Makefile index 4236bce1..26b336ff 100644 --- a/keyboard/lr94/Makefile +++ b/keyboard/lr94/Makefile @@ -42,7 +42,7 @@ TARGET = lr94_lufa # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../../tmk_core_custom # Directory keyboard dependent files exist TARGET_DIR = . @@ -145,8 +145,8 @@ LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom # Search Path VPATH += $(TARGET_DIR) -VPATH += $(TOP_DIR) +VPATH += $(TMK_DIR) -include $(TOP_DIR)/protocol/lufa.mk -include $(TOP_DIR)/common.mk -include $(TOP_DIR)/rules.mk +include $(TMK_DIR)/protocol/lufa.mk +include $(TMK_DIR)/common.mk +include $(TMK_DIR)/rules.mk diff --git a/keyboard/lr94/Makefile.pjrc b/keyboard/lr94/Makefile.pjrc index 8605134a..518be8b1 100644 --- a/keyboard/lr94/Makefile.pjrc +++ b/keyboard/lr94/Makefile.pjrc @@ -42,7 +42,7 @@ TARGET = lr94_pjrc # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../../tmk_core_custom # Directory keyboard dependent files exist TARGET_DIR = . @@ -112,8 +112,8 @@ LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom # Search Path VPATH += $(TARGET_DIR) -VPATH += $(TOP_DIR) +VPATH += $(TMK_DIR) -include $(TOP_DIR)/protocol/pjrc.mk -include $(TOP_DIR)/common.mk -include $(TOP_DIR)/rules.mk +include $(TMK_DIR)/protocol/pjrc.mk +include $(TMK_DIR)/common.mk +include $(TMK_DIR)/rules.mk diff --git a/keyboard/smart68/Makefile b/keyboard/smart68/Makefile index e4d8dc4e..170ccb8d 100644 --- a/keyboard/smart68/Makefile +++ b/keyboard/smart68/Makefile @@ -42,7 +42,7 @@ TARGET = smart68_lufa # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../../tmk_core_custom # Directory keyboard dependent files exist TARGET_DIR = . @@ -52,7 +52,7 @@ SRC = keymap_common.c \ matrix.c \ led.c \ backlight.c \ - ledmap.c + ledmap.c ifdef KEYMAP SRC := keymap_$(KEYMAP).c $(SRC) @@ -145,8 +145,8 @@ LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom # Search Path VPATH += $(TARGET_DIR) -VPATH += $(TOP_DIR) +VPATH += $(TMK_DIR) -include $(TOP_DIR)/protocol/lufa.mk -include $(TOP_DIR)/common.mk -include $(TOP_DIR)/rules.mk +include $(TMK_DIR)/protocol/lufa.mk +include $(TMK_DIR)/common.mk +include $(TMK_DIR)/rules.mk diff --git a/keyboard/smart68/Makefile.pjrc b/keyboard/smart68/Makefile.pjrc index 08797080..0eb4bc31 100644 --- a/keyboard/smart68/Makefile.pjrc +++ b/keyboard/smart68/Makefile.pjrc @@ -42,7 +42,7 @@ TARGET = smart68_pjrc # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../../tmk_core_custom # Directory keyboard dependent files exist TARGET_DIR = . @@ -52,7 +52,7 @@ SRC = keymap_common.c \ matrix.c \ led.c \ backlight.c \ - ledmap.c + ledmap.c ifdef KEYMAP SRC := keymap_$(KEYMAP).c $(SRC) @@ -113,8 +113,8 @@ LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom # Search Path VPATH += $(TARGET_DIR) -VPATH += $(TOP_DIR) +VPATH += $(TMK_DIR) -include $(TOP_DIR)/protocol/pjrc.mk -include $(TOP_DIR)/common.mk -include $(TOP_DIR)/rules.mk +include $(TMK_DIR)/protocol/pjrc.mk +include $(TMK_DIR)/common.mk +include $(TMK_DIR)/rules.mk diff --git a/keyboard/staryu/Makefile b/keyboard/staryu/Makefile index eafd04dc..238f51ac 100644 --- a/keyboard/staryu/Makefile +++ b/keyboard/staryu/Makefile @@ -42,7 +42,7 @@ TARGET = staryu_lufa # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../../tmk_core_custom # Directory keyboard dependent files exist TARGET_DIR = . @@ -53,8 +53,8 @@ SRC = keymap_common.c \ led.c \ backlight.c \ ledmap.c \ - light_ws2812.c \ - rgb.c + light_ws2812.c \ + rgb.c ifdef KEYMAP SRC := keymap_$(KEYMAP).c $(SRC) @@ -149,9 +149,8 @@ BREATHING_LED_ENABLE = yes # Enable breathing backlight # Search Path VPATH += $(TARGET_DIR) -VPATH += $(TOP_DIR) +VPATH += $(TMK_DIR) -include $(TOP_DIR)/protocol/lufa.mk -include $(TOP_DIR)/protocol.mk -include $(TOP_DIR)/common.mk -include $(TOP_DIR)/rules.mk +include $(TMK_DIR)/protocol/lufa.mk +include $(TMK_DIR)/common.mk +include $(TMK_DIR)/rules.mk diff --git a/keyboard/staryu/Makefile.pjrc b/keyboard/staryu/Makefile.pjrc index bb5433be..6ef7a11e 100644 --- a/keyboard/staryu/Makefile.pjrc +++ b/keyboard/staryu/Makefile.pjrc @@ -42,7 +42,7 @@ TARGET = staryu_pjrc # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../../tmk_core_custom # Directory keyboard dependent files exist TARGET_DIR = . @@ -52,7 +52,9 @@ SRC = keymap_common.c \ matrix.c \ led.c \ backlight.c \ - ledmap.c + ledmap.c \ + light_ws2812.c \ + rgb.c ifdef KEYMAP SRC := keymap_$(KEYMAP).c $(SRC) @@ -107,14 +109,14 @@ KEYMAP_IN_EEPROM_ENABLE = yes # Read keymap from eeprom SOFTPWM_LED_ENABLE = yes # Enable SoftPWM to drive backlight FADING_LED_ENABLE = yes # Enable fading backlight BREATHING_LED_ENABLE = yes # Enable breathing backlight -LEDMAP_ENABLE = yes # Enable LED mapping -LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom +#LEDMAP_ENABLE = yes # Enable LED mapping +#LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom # Search Path VPATH += $(TARGET_DIR) -VPATH += $(TOP_DIR) +VPATH += $(TMK_DIR) -include $(TOP_DIR)/protocol/pjrc.mk -include $(TOP_DIR)/common.mk -include $(TOP_DIR)/rules.mk +include $(TMK_DIR)/protocol/pjrc.mk +include $(TMK_DIR)/common.mk +include $(TMK_DIR)/rules.mk diff --git a/keyboard/staryu/Makefile_lite b/keyboard/staryu/Makefile_lite index bf817dd2..f4e0344d 100644 --- a/keyboard/staryu/Makefile_lite +++ b/keyboard/staryu/Makefile_lite @@ -42,7 +42,7 @@ TARGET = staryu_lite_lufa # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../../tmk_core_custom # Directory keyboard dependent files exist TARGET_DIR = . @@ -53,8 +53,8 @@ SRC = keymap_common.c \ led.c \ backlight.c \ ledmap.c \ - light_ws2812.c \ - rgb.c + light_ws2812.c \ + rgb.c ifdef KEYMAP SRC := keymap_$(KEYMAP).c $(SRC) @@ -149,9 +149,8 @@ BREATHING_LED_ENABLE = yes # Enable breathing backlight # Search Path VPATH += $(TARGET_DIR) -VPATH += $(TOP_DIR) +VPATH += $(TMK_DIR) -include $(TOP_DIR)/protocol/lufa.mk -include $(TOP_DIR)/protocol.mk -include $(TOP_DIR)/common.mk -include $(TOP_DIR)/rules.mk +include $(TMK_DIR)/protocol/lufa.mk +include $(TMK_DIR)/common.mk +include $(TMK_DIR)/rules.mk diff --git a/keyboard/tentapad/Makefile b/keyboard/tentapad/Makefile index a5fbf803..e93f6fc5 100644 --- a/keyboard/tentapad/Makefile +++ b/keyboard/tentapad/Makefile @@ -42,7 +42,7 @@ TARGET = tentapad_lufa # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../../tmk_core_custom # Directory keyboard dependent files exist TARGET_DIR = . @@ -150,9 +150,9 @@ BREATHING_LED_ENABLE = yes # Enable breathing backlight # Search Path VPATH += $(TARGET_DIR) -VPATH += $(TOP_DIR) +VPATH += $(TMK_DIR) -include $(TOP_DIR)/protocol/lufa.mk -include $(TOP_DIR)/protocol.mk -include $(TOP_DIR)/common.mk -include $(TOP_DIR)/rules.mk +include $(TMK_DIR)/protocol/lufa.mk +include $(TMK_DIR)/protocol.mk +include $(TMK_DIR)/common.mk +include $(TMK_DIR)/rules.mk diff --git a/keyboard/tentapad/Makefile.pjrc b/keyboard/tentapad/Makefile.pjrc index 9975a614..196e6b21 100644 --- a/keyboard/tentapad/Makefile.pjrc +++ b/keyboard/tentapad/Makefile.pjrc @@ -42,17 +42,20 @@ TARGET = tentapad_pjrc # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../../tmk_core_custom # Directory keyboard dependent files exist TARGET_DIR = . # project specific files SRC = keymap_common.c \ + tentapad.c \ matrix.c \ led.c \ backlight.c \ - ledmap.c + ledmap.c \ + vibration.c \ + buzzer.c ifdef KEYMAP SRC := keymap_$(KEYMAP).c $(SRC) @@ -100,7 +103,8 @@ COMMAND_ENABLE = yes # Commands for debug and configuration #NKRO_ENABLE = yes # USB Nkey Rollover #USB_6KRO_ENABLE = yes # USB 6key Rollover PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support -PS2_USE_BUSYWAIT = yes +PS2_USE_USART= yes +#PS2_USE_BUSYWAIT = yes BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality KEYMAP_IN_EEPROM_ENABLE = yes # Read keymap from eeprom #KEYMAP_SECTION_ENABLE = yes # Fixed address keymap for keymap editor @@ -113,8 +117,9 @@ BREATHING_LED_ENABLE = yes # Enable breathing backlight # Search Path VPATH += $(TARGET_DIR) -VPATH += $(TOP_DIR) +VPATH += $(TMK_DIR) -include $(TOP_DIR)/protocol/pjrc.mk -include $(TOP_DIR)/common.mk -include $(TOP_DIR)/rules.mk +include $(TMK_DIR)/protocol/pjrc.mk +include $(TMK_DIR)/protocol.mk +include $(TMK_DIR)/common.mk +include $(TMK_DIR)/rules.mk diff --git a/keyboard/tentapad/Makefile_gh60 b/keyboard/tentapad/Makefile_gh60 index 0fd4f25b..4816e58e 100644 --- a/keyboard/tentapad/Makefile_gh60 +++ b/keyboard/tentapad/Makefile_gh60 @@ -42,7 +42,7 @@ TARGET = tentapad_lufa # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../../tmk_core_custom # Directory keyboard dependent files exist TARGET_DIR = . @@ -151,9 +151,8 @@ OPT_DEFS += -DEXPERIMENTAL # Search Path VPATH += $(TARGET_DIR) -VPATH += $(TOP_DIR) +VPATH += $(TMK_DIR) -include $(TOP_DIR)/protocol/lufa.mk -include $(TOP_DIR)/protocol.mk -include $(TOP_DIR)/common.mk -include $(TOP_DIR)/rules.mk +include $(TMK_DIR)/protocol/lufa.mk +include $(TMK_DIR)/common.mk +include $(TMK_DIR)/rules.mk diff --git a/keyboard/tentapad/Makefile_gh60.pjrc b/keyboard/tentapad/Makefile_gh60.pjrc index dae1da9e..7d8eba2e 100644 --- a/keyboard/tentapad/Makefile_gh60.pjrc +++ b/keyboard/tentapad/Makefile_gh60.pjrc @@ -42,17 +42,20 @@ TARGET = tentapad_pjrc # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../../tmk_core_custom # Directory keyboard dependent files exist TARGET_DIR = . # project specific files SRC = keymap_common.c \ + tentapad.c \ matrix.c \ led.c \ backlight.c \ - ledmap.c + ledmap.c \ + vibration.c \ + buzzer.c ifdef KEYMAP SRC := keymap_$(KEYMAP).c $(SRC) @@ -115,8 +118,8 @@ OPT_DEFS += -DEXPERIMENTAL # Search Path VPATH += $(TARGET_DIR) -VPATH += $(TOP_DIR) +VPATH += $(TMK_DIR) -include $(TOP_DIR)/protocol/pjrc.mk -include $(TOP_DIR)/common.mk -include $(TOP_DIR)/rules.mk +include $(TMK_DIR)/protocol/pjrc.mk +include $(TMK_DIR)/common.mk +include $(TMK_DIR)/rules.mk diff --git a/keyboard/tentapad/keymap_common.c b/keyboard/tentapad/keymap_common.c index 2a8c7dd2..1196d118 100644 --- a/keyboard/tentapad/keymap_common.c +++ b/keyboard/tentapad/keymap_common.c @@ -21,7 +21,7 @@ along with this program. If not, see . #include "keymap_in_eeprom.h" #include "keymap_common.h" -static uint8_t keymaps_cache[KEYMAPS_COUNT][MATRIX_ROWS][MATRIX_COLS] = {0}; +static uint8_t keymaps_cache[KEYMAPS_COUNT][MATRIX_ROWS][MATRIX_COLS] = {{{0}}}; static uint8_t last_layer_number = 1; void keymaps_cache_init(void) @@ -52,7 +52,7 @@ uint8_t last_layer(void) } /* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) +uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) { return keymaps_cache[layer][key.row][key.col]; }