diff options
| author | tmk <hasu@tmk-kbd.com> | 2015-09-20 10:41:54 +0900 |
|---|---|---|
| committer | tmk <hasu@tmk-kbd.com> | 2015-09-20 10:41:54 +0900 |
| commit | 4fd703e9955356971d9610e05b734db860856382 (patch) | |
| tree | cb502de51278df73298c027f4adac9da58aff5b8 | |
| parent | 276fc930165cebed4b8fde9ee6e0b3525e0032ca (diff) | |
| download | qmk_firmware-4fd703e9955356971d9610e05b734db860856382.tar.gz qmk_firmware-4fd703e9955356971d9610e05b734db860856382.zip | |
next_usb: Change for TMK converter configuration
| -rw-r--r-- | converter/next_usb/Makefile | 4 | ||||
| -rw-r--r-- | converter/next_usb/config.h | 18 |
2 files changed, 12 insertions, 10 deletions
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))) \ ) |