diff options
Diffstat (limited to 'keyboards/hhkb/ansi/keymaps/shela')
| -rw-r--r-- | keyboards/hhkb/ansi/keymaps/shela/action_pseudo.c | 2 | ||||
| -rw-r--r-- | keyboards/hhkb/ansi/keymaps/shela/config.h | 6 | ||||
| -rw-r--r-- | keyboards/hhkb/ansi/keymaps/shela/keymap.c | 20 | ||||
| -rw-r--r-- | keyboards/hhkb/ansi/keymaps/shela/readme.md | 16 |
4 files changed, 21 insertions, 23 deletions
diff --git a/keyboards/hhkb/ansi/keymaps/shela/action_pseudo.c b/keyboards/hhkb/ansi/keymaps/shela/action_pseudo.c index 2ba8b3e503..9c2b6e8ca5 100644 --- a/keyboards/hhkb/ansi/keymaps/shela/action_pseudo.c +++ b/keyboards/hhkb/ansi/keymaps/shela/action_pseudo.c @@ -94,7 +94,7 @@ uint16_t convert_keycode(const uint16_t (*keymap)[2], uint16_t keycode, bool shi uint16_t pseudo_keycode = 0x00; /* default value */ switch (keycode) { - case KC_A ... KC_CAPSLOCK: + case KC_A ... KC_CAPS_LOCK: #if defined(__AVR__) if (shift_modded) { pseudo_keycode = pgm_read_word(&keymap[keycode][1]); diff --git a/keyboards/hhkb/ansi/keymaps/shela/config.h b/keyboards/hhkb/ansi/keymaps/shela/config.h index 25794900c3..db66659165 100644 --- a/keyboards/hhkb/ansi/keymaps/shela/config.h +++ b/keyboards/hhkb/ansi/keymaps/shela/config.h @@ -16,8 +16,6 @@ #pragma once -#include "../../config.h" - /* USB Device descriptor parameter */ #undef VENDOR_ID #define VENDOR_ID 0x0853 @@ -26,9 +24,9 @@ #undef DEVICE_VER #define DEVICE_VER 0x0102 #undef MANUFACTURER -#define MANUFACTURER Topre Corporation +#define MANUFACTURER "Topre Corporation" #undef PRODUCT -#define PRODUCT HHKB Professional +#define PRODUCT "HHKB Professional" #undef TAPPING_TERM #define TAPPING_TERM 210 diff --git a/keyboards/hhkb/ansi/keymaps/shela/keymap.c b/keyboards/hhkb/ansi/keymaps/shela/keymap.c index 68f9aa6726..bc901472f6 100644 --- a/keyboards/hhkb/ansi/keymaps/shela/keymap.c +++ b/keyboards/hhkb/ansi/keymaps/shela/keymap.c @@ -220,7 +220,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_HHKB] = LAYOUT( KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, - KC_CAPS, QWERTY, DVORAK, COLEMAK, PSEUDO, TENKEY, MOUSE, XXXXXXX, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, XXXXXXX, KC_NLCK, + KC_CAPS, QWERTY, DVORAK, COLEMAK, PSEUDO, TENKEY, MOUSE, XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, XXXXXXX, KC_NUM, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, XXXXXXX, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT, _______, DM_STA1, DM_PLY1, XXXXXXX, MACMODE, XXXXXXX, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______, _______, KC_SPC, _______, _______ @@ -241,7 +241,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_SPACE_FN] = LAYOUT( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, KC_DEL, - _______, KC_HOME, KC_UP, KC_END, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_END, XXXXXXX, KC_PSCR, KC_SLCK, KC_PAUS, KC_INS, + _______, KC_HOME, KC_UP, KC_END, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_END, XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, KC_INS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGUP, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX, KC_SPC, XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX, XXXXXXX, _______, XXXXXXX, _______, _______, _______, _______, _______ @@ -340,11 +340,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } else { if (TIMER_DIFF_16(record->event.time, l_time) < TAPPING_TERM) { if (mac_mode) { - register_code(KC_LANG2); - unregister_code(KC_LANG2); + register_code(KC_LNG2); + unregister_code(KC_LNG2); } else { - register_code(KC_MHEN); - unregister_code(KC_MHEN); + register_code(KC_INT5); + unregister_code(KC_INT5); } } else { register_code(l_inner); @@ -367,11 +367,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } else { if (TIMER_DIFF_16(record->event.time, r_time) < TAPPING_TERM) { if (mac_mode) { - register_code(KC_LANG1); - unregister_code(KC_LANG1); + register_code(KC_LNG1); + unregister_code(KC_LNG1); } else { - register_code(KC_KANA); - unregister_code(KC_KANA); + register_code(KC_INT2); + unregister_code(KC_INT2); } } else { register_code(r_inner); diff --git a/keyboards/hhkb/ansi/keymaps/shela/readme.md b/keyboards/hhkb/ansi/keymaps/shela/readme.md index ad0b627cb5..36e15c2c48 100644 --- a/keyboards/hhkb/ansi/keymaps/shela/readme.md +++ b/keyboards/hhkb/ansi/keymaps/shela/readme.md @@ -53,16 +53,16 @@ Mac mode: Disabled | Key | Keycode | Tap | Hold | | ----------- | ------- | ------- | ------- | -| Left Inner | L_INNER | KC_MHEN | KC_LALT | +| Left Inner | L_INNER | KC_INT5 | KC_LALT | | Left Outer | L_OUTER | KC_LGUI | KC_LGUI | -| Right Inner | R_INNER | KC_KANA | KC_RALT | +| Right Inner | R_INNER | KC_INT2 | KC_RALT | | Right Outer | R_OUTER | KC_RGUI | KC_RGUI | Mac mode: Enabled -| Key | Keycode | Tap | Hold | -| ----------- | ------- | -------- | ------- | -| Left Inner | L_INNER | KC_LANG2 | KC_LCMD | -| Left Outer | L_OUTER | KC_LOPT | KC_LOPT | -| Right Inner | R_INNER | KC_LANG1 | KC_RCMD | -| Right Outer | R_OUTER | KC_ROPT | KC_ROPT | +| Key | Keycode | Tap | Hold | +| ----------- | ------- | ------- | ------- | +| Left Inner | L_INNER | KC_LNG2 | KC_LCMD | +| Left Outer | L_OUTER | KC_LOPT | KC_LOPT | +| Right Inner | R_INNER | KC_LNG1 | KC_RCMD | +| Right Outer | R_OUTER | KC_ROPT | KC_ROPT | |