di0ib/tmk_keyboard_custom
Archived
1
0
Fork 0
Code Releases Activity

Change to match new repository structure

Browse Source
This commit is contained in:
Kai Ryu 2016-01-08 22:33:27 +09:00
parent 78b9d6baac
commit 1351643020
19 changed files with 119 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
keyboard/RedScarfII/Makefile.pjrc
View File

@ -42,7 +42,7 @@
TARGET = RedScarfII_pjrc TARGET = RedScarfII_pjrc
# Directory common source filess exist # Directory common source filess exist
TOP_DIR = ../.. TMK_DIR = ../../tmk_core_custom
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -52,7 +52,10 @@ SRC = keymap_common.c \
matrix.c \ matrix.c \
led.c \ led.c \
backlight.c \ backlight.c \
ledmap.c ledmap.c \
yc059.c \
rgb.c \
suspend.c
ifdef KEYMAP ifdef KEYMAP
SRC := keymap_$(KEYMAP).c $(SRC) 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) CONSOLE_ENABLE = yes # Console for debug(+400)
COMMAND_ENABLE = yes # Commands for debug and configuration COMMAND_ENABLE = yes # Commands for debug and configuration
#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend #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 #PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
KEYMAP_IN_EEPROM_ENABLE = yes # Read keymap from eeprom 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 # Search Path
VPATH += $(TARGET_DIR) VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR) VPATH += $(TMK_DIR)
include $(TOP_DIR)/protocol/pjrc.mk include $(TMK_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/common.mk include $(TMK_DIR)/common.mk
include $(TOP_DIR)/rules.mk include $(TMK_DIR)/rules.mk

15
keyboard/RedScarfIII/Makefile
View File

@ -42,7 +42,7 @@
TARGET = RedScarfIII_lufa TARGET = RedScarfIII_lufa
# Directory common source filess exist # Directory common source filess exist
TOP_DIR = ../.. TMK_DIR = ../../tmk_core_custom
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -54,8 +54,8 @@ SRC = keymap_common.c \
backlight.c \ backlight.c \
ledmap.c \ ledmap.c \
yc059.c \ yc059.c \
rgb.c \ rgb.c \
suspend.c suspend.c
ifdef KEYMAP ifdef KEYMAP
SRC := keymap_$(KEYMAP).c $(SRC) SRC := keymap_$(KEYMAP).c $(SRC)
@ -149,9 +149,8 @@ LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom
# Search Path # Search Path
VPATH += $(TARGET_DIR) VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR) VPATH += $(TMK_DIR)
include $(TOP_DIR)/protocol/lufa.mk include $(TMK_DIR)/protocol/lufa.mk
include $(TOP_DIR)/protocol.mk include $(TMK_DIR)/common.mk
include $(TOP_DIR)/common.mk include $(TMK_DIR)/rules.mk
include $(TOP_DIR)/rules.mk

17
keyboard/RedScarfIII/Makefile.pjrc
View File

@ -42,7 +42,7 @@
TARGET = RedScarfIII_pjrc TARGET = RedScarfIII_pjrc
# Directory common source filess exist # Directory common source filess exist
TOP_DIR = ../.. TMK_DIR = ../../tmk_core_custom
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -54,8 +54,8 @@ SRC = keymap_common.c \
backlight.c \ backlight.c \
ledmap.c \ ledmap.c \
yc059.c \ yc059.c \
rgb.c \ rgb.c \
suspend.c suspend.c
ifdef KEYMAP ifdef KEYMAP
SRC := keymap_$(KEYMAP).c $(SRC) 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) CONSOLE_ENABLE = yes # Console for debug(+400)
COMMAND_ENABLE = yes # Commands for debug and configuration COMMAND_ENABLE = yes # Commands for debug and configuration
#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend #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 #PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
KEYMAP_IN_EEPROM_ENABLE = yes # Read keymap from eeprom 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 # Search Path
VPATH += $(TARGET_DIR) VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR) VPATH += $(TMK_DIR)
include $(TOP_DIR)/protocol/pjrc.mk include $(TMK_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/common.mk include $(TMK_DIR)/common.mk
include $(TOP_DIR)/rules.mk include $(TMK_DIR)/rules.mk

2
keyboard/gh60/Makefile
View File

@ -42,7 +42,7 @@
TARGET = gh60_lufa TARGET = gh60_lufa
# Directory common source filess exist # Directory common source filess exist
TMK_DIR = ../../tmk_core TMK_DIR = ../../tmk_core_custom
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .

14
keyboard/gh60/Makefile.pjrc
View File

@ -42,7 +42,7 @@
TARGET = gh60_pjrc TARGET = gh60_pjrc
# Directory common source filess exist # Directory common source filess exist
TMK_DIR = ../../tmk_core TMK_DIR = ../../tmk_core_custom
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -123,15 +123,3 @@ VPATH += $(TMK_DIR)
include $(TMK_DIR)/protocol/pjrc.mk include $(TMK_DIR)/protocol/pjrc.mk
include $(TMK_DIR)/common.mk include $(TMK_DIR)/common.mk
include $(TMK_DIR)/rules.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

10
keyboard/ghpad/Makefile
View File

@ -42,7 +42,7 @@
TARGET = ghpad_lufa TARGET = ghpad_lufa
# Directory common source filess exist # Directory common source filess exist
TOP_DIR = ../.. TMK_DIR = ../../tmk_core_custom
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -146,8 +146,8 @@ LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom
# Search Path # Search Path
VPATH += $(TARGET_DIR) VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR) VPATH += $(TMK_DIR)
include $(TOP_DIR)/protocol/lufa.mk include $(TMK_DIR)/protocol/lufa.mk
include $(TOP_DIR)/common.mk include $(TMK_DIR)/common.mk
include $(TOP_DIR)/rules.mk include $(TMK_DIR)/rules.mk

13
keyboard/ghpad/Makefile.pjrc
View File

@ -42,7 +42,7 @@
TARGET = ghpad_pjrc TARGET = ghpad_pjrc
# Directory common source filess exist # Directory common source filess exist
TOP_DIR = ../.. TMK_DIR = ../../tmk_core_custom
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -109,11 +109,8 @@ LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom
# Search Path # Search Path
VPATH += $(TARGET_DIR) VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR) VPATH += $(TMK_DIR)
include $(TOP_DIR)/protocol/pjrc.mk include $(TMK_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/common.mk include $(TMK_DIR)/common.mk
include $(TOP_DIR)/rules.mk include $(TMK_DIR)/rules.mk
plain: OPT_DEFS += -DKEYMAP_PLAIN
plain: all

10
keyboard/lr94/Makefile
View File

@ -42,7 +42,7 @@
TARGET = lr94_lufa TARGET = lr94_lufa
# Directory common source filess exist # Directory common source filess exist
TOP_DIR = ../.. TMK_DIR = ../../tmk_core_custom
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -145,8 +145,8 @@ LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom
# Search Path # Search Path
VPATH += $(TARGET_DIR) VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR) VPATH += $(TMK_DIR)
include $(TOP_DIR)/protocol/lufa.mk include $(TMK_DIR)/protocol/lufa.mk
include $(TOP_DIR)/common.mk include $(TMK_DIR)/common.mk
include $(TOP_DIR)/rules.mk include $(TMK_DIR)/rules.mk

10
keyboard/lr94/Makefile.pjrc
View File

@ -42,7 +42,7 @@
TARGET = lr94_pjrc TARGET = lr94_pjrc
# Directory common source filess exist # Directory common source filess exist
TOP_DIR = ../.. TMK_DIR = ../../tmk_core_custom
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -112,8 +112,8 @@ LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom
# Search Path # Search Path
VPATH += $(TARGET_DIR) VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR) VPATH += $(TMK_DIR)
include $(TOP_DIR)/protocol/pjrc.mk include $(TMK_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/common.mk include $(TMK_DIR)/common.mk
include $(TOP_DIR)/rules.mk include $(TMK_DIR)/rules.mk

12
keyboard/smart68/Makefile
View File

@ -42,7 +42,7 @@
TARGET = smart68_lufa TARGET = smart68_lufa
# Directory common source filess exist # Directory common source filess exist
TOP_DIR = ../.. TMK_DIR = ../../tmk_core_custom
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -52,7 +52,7 @@ SRC = keymap_common.c \
matrix.c \ matrix.c \
led.c \ led.c \
backlight.c \ backlight.c \
ledmap.c ledmap.c
ifdef KEYMAP ifdef KEYMAP
SRC := keymap_$(KEYMAP).c $(SRC) SRC := keymap_$(KEYMAP).c $(SRC)
@ -145,8 +145,8 @@ LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom
# Search Path # Search Path
VPATH += $(TARGET_DIR) VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR) VPATH += $(TMK_DIR)
include $(TOP_DIR)/protocol/lufa.mk include $(TMK_DIR)/protocol/lufa.mk
include $(TOP_DIR)/common.mk include $(TMK_DIR)/common.mk
include $(TOP_DIR)/rules.mk include $(TMK_DIR)/rules.mk

12
keyboard/smart68/Makefile.pjrc
View File

@ -42,7 +42,7 @@
TARGET = smart68_pjrc TARGET = smart68_pjrc
# Directory common source filess exist # Directory common source filess exist
TOP_DIR = ../.. TMK_DIR = ../../tmk_core_custom
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -52,7 +52,7 @@ SRC = keymap_common.c \
matrix.c \ matrix.c \
led.c \ led.c \
backlight.c \ backlight.c \
ledmap.c ledmap.c
ifdef KEYMAP ifdef KEYMAP
SRC := keymap_$(KEYMAP).c $(SRC) SRC := keymap_$(KEYMAP).c $(SRC)
@ -113,8 +113,8 @@ LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom
# Search Path # Search Path
VPATH += $(TARGET_DIR) VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR) VPATH += $(TMK_DIR)
include $(TOP_DIR)/protocol/pjrc.mk include $(TMK_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/common.mk include $(TMK_DIR)/common.mk
include $(TOP_DIR)/rules.mk include $(TMK_DIR)/rules.mk

15
keyboard/staryu/Makefile
View File

@ -42,7 +42,7 @@
TARGET = staryu_lufa TARGET = staryu_lufa
# Directory common source filess exist # Directory common source filess exist
TOP_DIR = ../.. TMK_DIR = ../../tmk_core_custom
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -53,8 +53,8 @@ SRC = keymap_common.c \
led.c \ led.c \
backlight.c \ backlight.c \
ledmap.c \ ledmap.c \
light_ws2812.c \ light_ws2812.c \
rgb.c rgb.c
ifdef KEYMAP ifdef KEYMAP
SRC := keymap_$(KEYMAP).c $(SRC) SRC := keymap_$(KEYMAP).c $(SRC)
@ -149,9 +149,8 @@ BREATHING_LED_ENABLE = yes # Enable breathing backlight
# Search Path # Search Path
VPATH += $(TARGET_DIR) VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR) VPATH += $(TMK_DIR)
include $(TOP_DIR)/protocol/lufa.mk include $(TMK_DIR)/protocol/lufa.mk
include $(TOP_DIR)/protocol.mk include $(TMK_DIR)/common.mk
include $(TOP_DIR)/common.mk include $(TMK_DIR)/rules.mk
include $(TOP_DIR)/rules.mk

18
keyboard/staryu/Makefile.pjrc
View File

@ -42,7 +42,7 @@
TARGET = staryu_pjrc TARGET = staryu_pjrc
# Directory common source filess exist # Directory common source filess exist
TOP_DIR = ../.. TMK_DIR = ../../tmk_core_custom
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -52,7 +52,9 @@ SRC = keymap_common.c \
matrix.c \ matrix.c \
led.c \ led.c \
backlight.c \ backlight.c \
ledmap.c ledmap.c \
light_ws2812.c \
rgb.c
ifdef KEYMAP ifdef KEYMAP
SRC := keymap_$(KEYMAP).c $(SRC) 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 SOFTPWM_LED_ENABLE = yes # Enable SoftPWM to drive backlight
FADING_LED_ENABLE = yes # Enable fading backlight FADING_LED_ENABLE = yes # Enable fading backlight
BREATHING_LED_ENABLE = yes # Enable breathing backlight BREATHING_LED_ENABLE = yes # Enable breathing backlight
LEDMAP_ENABLE = yes # Enable LED mapping #LEDMAP_ENABLE = yes # Enable LED mapping
LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom #LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom
# Search Path # Search Path
VPATH += $(TARGET_DIR) VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR) VPATH += $(TMK_DIR)
include $(TOP_DIR)/protocol/pjrc.mk include $(TMK_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/common.mk include $(TMK_DIR)/common.mk
include $(TOP_DIR)/rules.mk include $(TMK_DIR)/rules.mk

15
keyboard/staryu/Makefile_lite
View File

@ -42,7 +42,7 @@
TARGET = staryu_lite_lufa TARGET = staryu_lite_lufa
# Directory common source filess exist # Directory common source filess exist
TOP_DIR = ../.. TMK_DIR = ../../tmk_core_custom
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -53,8 +53,8 @@ SRC = keymap_common.c \
led.c \ led.c \
backlight.c \ backlight.c \
ledmap.c \ ledmap.c \
light_ws2812.c \ light_ws2812.c \
rgb.c rgb.c
ifdef KEYMAP ifdef KEYMAP
SRC := keymap_$(KEYMAP).c $(SRC) SRC := keymap_$(KEYMAP).c $(SRC)
@ -149,9 +149,8 @@ BREATHING_LED_ENABLE = yes # Enable breathing backlight
# Search Path # Search Path
VPATH += $(TARGET_DIR) VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR) VPATH += $(TMK_DIR)
include $(TOP_DIR)/protocol/lufa.mk include $(TMK_DIR)/protocol/lufa.mk
include $(TOP_DIR)/protocol.mk include $(TMK_DIR)/common.mk
include $(TOP_DIR)/common.mk include $(TMK_DIR)/rules.mk
include $(TOP_DIR)/rules.mk

12
keyboard/tentapad/Makefile
View File

@ -42,7 +42,7 @@
TARGET = tentapad_lufa TARGET = tentapad_lufa
# Directory common source filess exist # Directory common source filess exist
TOP_DIR = ../.. TMK_DIR = ../../tmk_core_custom
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -150,9 +150,9 @@ BREATHING_LED_ENABLE = yes # Enable breathing backlight
# Search Path # Search Path
VPATH += $(TARGET_DIR) VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR) VPATH += $(TMK_DIR)
include $(TOP_DIR)/protocol/lufa.mk include $(TMK_DIR)/protocol/lufa.mk
include $(TOP_DIR)/protocol.mk include $(TMK_DIR)/protocol.mk
include $(TOP_DIR)/common.mk include $(TMK_DIR)/common.mk
include $(TOP_DIR)/rules.mk include $(TMK_DIR)/rules.mk

19
keyboard/tentapad/Makefile.pjrc
View File

@ -42,17 +42,20 @@
TARGET = tentapad_pjrc TARGET = tentapad_pjrc
# Directory common source filess exist # Directory common source filess exist
TOP_DIR = ../.. TMK_DIR = ../../tmk_core_custom
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
# project specific files # project specific files
SRC = keymap_common.c \ SRC = keymap_common.c \
tentapad.c \
matrix.c \ matrix.c \
led.c \ led.c \
backlight.c \ backlight.c \
ledmap.c ledmap.c \
vibration.c \
buzzer.c
ifdef KEYMAP ifdef KEYMAP
SRC := keymap_$(KEYMAP).c $(SRC) SRC := keymap_$(KEYMAP).c $(SRC)
@ -100,7 +103,8 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
#NKRO_ENABLE = yes # USB Nkey Rollover #NKRO_ENABLE = yes # USB Nkey Rollover
#USB_6KRO_ENABLE = yes # USB 6key Rollover #USB_6KRO_ENABLE = yes # USB 6key Rollover
PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support 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 BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
KEYMAP_IN_EEPROM_ENABLE = yes # Read keymap from eeprom KEYMAP_IN_EEPROM_ENABLE = yes # Read keymap from eeprom
#KEYMAP_SECTION_ENABLE = yes # Fixed address keymap for keymap editor #KEYMAP_SECTION_ENABLE = yes # Fixed address keymap for keymap editor
@ -113,8 +117,9 @@ BREATHING_LED_ENABLE = yes # Enable breathing backlight
# Search Path # Search Path
VPATH += $(TARGET_DIR) VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR) VPATH += $(TMK_DIR)
include $(TOP_DIR)/protocol/pjrc.mk include $(TMK_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/common.mk include $(TMK_DIR)/protocol.mk
include $(TOP_DIR)/rules.mk include $(TMK_DIR)/common.mk
include $(TMK_DIR)/rules.mk

11
keyboard/tentapad/Makefile_gh60
View File

@ -42,7 +42,7 @@
TARGET = tentapad_lufa TARGET = tentapad_lufa
# Directory common source filess exist # Directory common source filess exist
TOP_DIR = ../.. TMK_DIR = ../../tmk_core_custom
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -151,9 +151,8 @@ OPT_DEFS += -DEXPERIMENTAL
# Search Path # Search Path
VPATH += $(TARGET_DIR) VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR) VPATH += $(TMK_DIR)
include $(TOP_DIR)/protocol/lufa.mk include $(TMK_DIR)/protocol/lufa.mk
include $(TOP_DIR)/protocol.mk include $(TMK_DIR)/common.mk
include $(TOP_DIR)/common.mk include $(TMK_DIR)/rules.mk
include $(TOP_DIR)/rules.mk

15
keyboard/tentapad/Makefile_gh60.pjrc
View File

@ -42,17 +42,20 @@
TARGET = tentapad_pjrc TARGET = tentapad_pjrc
# Directory common source filess exist # Directory common source filess exist
TOP_DIR = ../.. TMK_DIR = ../../tmk_core_custom
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
# project specific files # project specific files
SRC = keymap_common.c \ SRC = keymap_common.c \
tentapad.c \
matrix.c \ matrix.c \
led.c \ led.c \
backlight.c \ backlight.c \
ledmap.c ledmap.c \
vibration.c \
buzzer.c
ifdef KEYMAP ifdef KEYMAP
SRC := keymap_$(KEYMAP).c $(SRC) SRC := keymap_$(KEYMAP).c $(SRC)
@ -115,8 +118,8 @@ OPT_DEFS += -DEXPERIMENTAL
# Search Path # Search Path
VPATH += $(TARGET_DIR) VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR) VPATH += $(TMK_DIR)
include $(TOP_DIR)/protocol/pjrc.mk include $(TMK_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/common.mk include $(TMK_DIR)/common.mk
include $(TOP_DIR)/rules.mk include $(TMK_DIR)/rules.mk

4
keyboard/tentapad/keymap_common.c
View File

@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "keymap_in_eeprom.h" #include "keymap_in_eeprom.h"
#include "keymap_common.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; static uint8_t last_layer_number = 1;
void keymaps_cache_init(void) void keymaps_cache_init(void)
@ -52,7 +52,7 @@ uint8_t last_layer(void)
} }
/* translates key to keycode */ /* 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]; return keymaps_cache[layer][key.row][key.col];
} }