From b4e2d325f355a4d083106476393775e75e11f284 Mon Sep 17 00:00:00 2001 From: tmk Date: Thu, 9 Apr 2015 16:20:42 +0900 Subject: Change TOP_DIR to TMK_DIR in makefiles --- converter/next_usb/Makefile | 12 ++++++------ converter/next_usb/Makefile.pjrc | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'converter/next_usb') diff --git a/converter/next_usb/Makefile b/converter/next_usb/Makefile index fef539a147..719081f9b3 100644 --- a/converter/next_usb/Makefile +++ b/converter/next_usb/Makefile @@ -2,7 +2,7 @@ TARGET = next_usb # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../.. # Directory keyboard dependent files exist TARGET_DIR = . @@ -78,10 +78,10 @@ SRC += next_kbd.c # Search Path VPATH += $(TARGET_DIR) -VPATH += $(TOP_DIR) +VPATH += $(TMK_DIR) -include $(TOP_DIR)/protocol.mk -include $(TOP_DIR)/protocol/lufa.mk -include $(TOP_DIR)/common.mk -include $(TOP_DIR)/rules.mk +include $(TMK_DIR)/protocol.mk +include $(TMK_DIR)/protocol/lufa.mk +include $(TMK_DIR)/common.mk +include $(TMK_DIR)/rules.mk diff --git a/converter/next_usb/Makefile.pjrc b/converter/next_usb/Makefile.pjrc index 51d9de6b11..75ca13c9ee 100644 --- a/converter/next_usb/Makefile.pjrc +++ b/converter/next_usb/Makefile.pjrc @@ -2,7 +2,7 @@ TARGET = next_usb # Directory common source filess exist -TOP_DIR = ../.. +TMK_DIR = ../.. # Directory keyboard dependent files exist TARGET_DIR = . @@ -54,10 +54,10 @@ SRC += next_kbd.c # Search Path VPATH += $(TARGET_DIR) -VPATH += $(TOP_DIR) +VPATH += $(TMK_DIR) -include $(TOP_DIR)/protocol.mk -include $(TOP_DIR)/protocol/pjrc.mk -include $(TOP_DIR)/common.mk -include $(TOP_DIR)/rules.mk +include $(TMK_DIR)/protocol.mk +include $(TMK_DIR)/protocol/pjrc.mk +include $(TMK_DIR)/common.mk +include $(TMK_DIR)/rules.mk -- cgit v1.2.3 From 7860d09914dba5e7d2d6c1c25b62b49d1bbd2591 Mon Sep 17 00:00:00 2001 From: tmk Date: Fri, 10 Apr 2015 01:53:24 +0900 Subject: Change TMK_DIR setting --- converter/next_usb/Makefile | 2 +- converter/next_usb/Makefile.pjrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'converter/next_usb') diff --git a/converter/next_usb/Makefile b/converter/next_usb/Makefile index 719081f9b3..fe19e98ccb 100644 --- a/converter/next_usb/Makefile +++ b/converter/next_usb/Makefile @@ -2,7 +2,7 @@ TARGET = next_usb # Directory common source filess exist -TMK_DIR = ../.. +TMK_DIR = ../../tmk_core # Directory keyboard dependent files exist TARGET_DIR = . diff --git a/converter/next_usb/Makefile.pjrc b/converter/next_usb/Makefile.pjrc index 75ca13c9ee..5813c9d6d2 100644 --- a/converter/next_usb/Makefile.pjrc +++ b/converter/next_usb/Makefile.pjrc @@ -2,7 +2,7 @@ TARGET = next_usb # Directory common source filess exist -TMK_DIR = ../.. +TMK_DIR = ../../tmk_core # Directory keyboard dependent files exist TARGET_DIR = . -- cgit v1.2.3 From 276fc930165cebed4b8fde9ee6e0b3525e0032ca Mon Sep 17 00:00:00 2001 From: tmk Date: Sun, 20 Sep 2015 10:35:12 +0900 Subject: next_usb: Fix keymap --- converter/next_usb/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'converter/next_usb') diff --git a/converter/next_usb/keymap.c b/converter/next_usb/keymap.c index 3a51075483..0041df543f 100644 --- a/converter/next_usb/keymap.c +++ b/converter/next_usb/keymap.c @@ -159,7 +159,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TRNS,PAUS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PSCR,FN3, BSLS,TRNS, VOLD, PGDN, BTN1,MS_U,BTN2,WH_U, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, MS_L,MS_D,MS_R,WH_D, TRNS, FN4, FN5, FN6, FN7, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, TRNS, TRNS,TRNS,TRNS, - TRNS,RALT, TRNS, RGUI,TRNS, TRNS,TRNS,TRNS, TRNS, TRNS,TRNS + TRNS,TRNS, TRNS, TRNS,TRNS, TRNS,TRNS,TRNS, TRNS, TRNS,TRNS ) }; -- cgit v1.2.3 From 4fd703e9955356971d9610e05b734db860856382 Mon Sep 17 00:00:00 2001 From: tmk Date: Sun, 20 Sep 2015 10:41:54 +0900 Subject: next_usb: Change for TMK converter configuration --- converter/next_usb/Makefile | 4 ++-- converter/next_usb/config.h | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) (limited to 'converter/next_usb') diff --git a/converter/next_usb/Makefile b/converter/next_usb/Makefile index fe19e98ccb..7190f1eaf4 100644 --- a/converter/next_usb/Makefile +++ b/converter/next_usb/Makefile @@ -17,10 +17,10 @@ CONFIG_H = config.h # MCU name, you MUST set this to match the board you are using # type "make clean" after changing this, so all files will be rebuilt #MCU = at90usb162 # Teensy 1.0 -MCU = atmega32u4 # Teensy 2.0 +#MCU = atmega32u4 # Teensy 2.0 #MCU = at90usb646 # Teensy++ 1.0 #MCU = at90usb1286 # Teensy++ 2.0 -#MCU = atmega32u2 # TMK converter +MCU = atmega32u2 # TMK converter # Processor frequency. diff --git a/converter/next_usb/config.h b/converter/next_usb/config.h index cd80b5af1b..a06affc5e8 100644 --- a/converter/next_usb/config.h +++ b/converter/next_usb/config.h @@ -45,7 +45,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#define VENDOR_ID 0xBCBC +#define VENDOR_ID 0xFEED #define PRODUCT_ID 0xBCBC #define DEVICE_VER 0x0500 #define MANUFACTURER t.m.k. @@ -56,14 +56,15 @@ POSSIBILITY OF SUCH DAMAGE. #define MATRIX_ROWS 12 // keycode bit: 3-0 #define MATRIX_COLS 8 // keycode bit: 6-4 -//#define DEBUG_ON_INIT 1 +#define DEBUG_ON_INIT 1 //#define TEENSY_CONFIG 1 -#define PRO_MICRO_CONFIG 1 -//#define TMK_CONFIG 1 +//#define PRO_MICRO_CONFIG 1 +#define TMK_CONFIG 1 -// comment out if you don't want the keyboard's LEDs to flash upon initialization -#define NEXT_KBD_INIT_FLASH_LEDS +// comment out if you don't want the keyboard's LEDs to flash upon initialization or pressing shift +//#define NEXT_KBD_INIT_FLASH_LEDS +//#define NEXT_KBD_SHIFT_FLASH_LEDS //============= Start of Arduino Pro Micro Configuration ============== #ifdef PRO_MICRO_CONFIG @@ -183,6 +184,7 @@ POSSIBILITY OF SUCH DAMAGE. /* key combination for command */ #define IS_COMMAND() ( \ - (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))|| \ - (keyboard_report->mods == (MOD_BIT(KC_RALT) | MOD_BIT(KC_RCTL))) \ + (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) || \ + (keyboard_report->mods == (MOD_BIT(KC_RALT) | MOD_BIT(KC_RALT))) || \ + (keyboard_report->mods == (MOD_BIT(KC_RGUI) | MOD_BIT(KC_RGUI))) \ ) -- cgit v1.2.3 From c1f36042b4a09bf2357406b83d5c97a652d56bdb Mon Sep 17 00:00:00 2001 From: tmk Date: Sun, 20 Sep 2015 10:43:12 +0900 Subject: next_usb: Change LEDs usage for CapsLock status --- converter/next_usb/led.c | 7 ++++++- converter/next_usb/matrix.c | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'converter/next_usb') diff --git a/converter/next_usb/led.c b/converter/next_usb/led.c index 24db15e16a..2bd0ef6dd4 100644 --- a/converter/next_usb/led.c +++ b/converter/next_usb/led.c @@ -47,9 +47,14 @@ POSSIBILITY OF SUCH DAMAGE. #include "stdint.h" #include "led.h" +#include "next_kbd.h" void led_set(uint8_t usb_led) { - + if (usb_led & (1< Date: Sun, 20 Sep 2015 10:44:09 +0900 Subject: next_usb: Fix for mssing key event --- converter/next_usb/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'converter/next_usb') diff --git a/converter/next_usb/matrix.c b/converter/next_usb/matrix.c index 506378d904..d91cd25774 100644 --- a/converter/next_usb/matrix.c +++ b/converter/next_usb/matrix.c @@ -160,7 +160,7 @@ void matrix_init(void) /* scan all key states on matrix */ uint8_t matrix_scan(void) { - _delay_ms(20); + _delay_ms(5); //next_kbd_set_leds(false, false); NEXT_KBD_LED1_OFF; -- cgit v1.2.3