diff options
Diffstat (limited to 'keyboards/hhkb/jp')
| -rw-r--r-- | keyboards/hhkb/jp/config.h | 10 | ||||
| -rw-r--r-- | keyboards/hhkb/jp/info.json | 2 | ||||
| -rw-r--r-- | keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c | 22 | ||||
| -rw-r--r-- | keyboards/hhkb/jp/matrix.c | 4 | ||||
| -rw-r--r-- | keyboards/hhkb/jp/rules.mk | 6 |
5 files changed, 4 insertions, 40 deletions
diff --git a/keyboards/hhkb/jp/config.h b/keyboards/hhkb/jp/config.h index a3e7dbd3a6..0521d0694d 100644 --- a/keyboards/hhkb/jp/config.h +++ b/keyboards/hhkb/jp/config.h @@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 16 @@ -25,17 +24,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define TAPPING_TERM 200 -/* number of backlight levels */ #define BACKLIGHT_LEVELS 3 -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -//#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -//#define LOCKING_RESYNC_ENABLE - #ifdef HHKB_RN42_ENABLE // rn42 support -- acquired from the tmk repo. This is almost certainly not // integrated with qmk in the correct way. diff --git a/keyboards/hhkb/jp/info.json b/keyboards/hhkb/jp/info.json index dd1cfbc870..cc05d105bf 100644 --- a/keyboards/hhkb/jp/info.json +++ b/keyboards/hhkb/jp/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "1.0.4" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_jp": { "layout": [ diff --git a/keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c b/keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c index 1b8e41de0e..1852920345 100644 --- a/keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c +++ b/keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c @@ -42,25 +42,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PSCR, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_LEFT, KC_RGHT, _______, KC_PENT, _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)}; - -/*void matrix_scan_user(void) { - LEADER_DICTIONARY() { - leading = false; - leader_end(); - - SEQ_ONE_KEY(KC_RSFT) { - register_code(KC_S); - unregister_code(KC_S); - } - SEQ_TWO_KEYS(KC_A, KC_S) { - register_code(KC_H); - unregister_code(KC_H); - } - SEQ_THREE_KEYS(KC_A, KC_S, KC_D) { - register_code(KC_LGUI); - register_code(KC_S); - unregister_code(KC_S); - unregister_code(KC_LGUI); - } - } -}*/ diff --git a/keyboards/hhkb/jp/matrix.c b/keyboards/hhkb/jp/matrix.c index 9d04d62849..caedeef008 100644 --- a/keyboards/hhkb/jp/matrix.c +++ b/keyboards/hhkb/jp/matrix.c @@ -71,7 +71,7 @@ void matrix_init(void) matrix = _matrix0; matrix_prev = _matrix1; - matrix_init_quantum(); + matrix_init_kb(); } __attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); } @@ -159,7 +159,7 @@ uint8_t matrix_scan(void) suspend_power_down(); } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/hhkb/jp/rules.mk b/keyboards/hhkb/jp/rules.mk index ae0710e028..2979c855c7 100644 --- a/keyboards/hhkb/jp/rules.mk +++ b/keyboards/hhkb/jp/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |