diff options
| author | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2018-08-25 13:00:09 -0700 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-08-25 13:00:09 -0700 |
| commit | 1e7d08d2e3b621dd27bb2b709191b3f42488c9d8 (patch) | |
| tree | 654d2e05c97b013cbf8c133100f8ba0424e122e7 /keyboards/tokyo60/keymaps/default | |
| parent | b806cc9eea5d3ac46d071bbb06e055ef8e7c4cfb (diff) | |
| download | qmk_firmware-1e7d08d2e3b621dd27bb2b709191b3f42488c9d8.tar.gz qmk_firmware-1e7d08d2e3b621dd27bb2b709191b3f42488c9d8.zip | |
Keyboard: Tokyo60 Cleanup: QMK Configurator support (#3749)
* use LAYOUT_60_hhkb
* cleanups
* more minute clean ups
* fix some capitilization issues
* add configurator support
Diffstat (limited to 'keyboards/tokyo60/keymaps/default')
| -rw-r--r-- | keyboards/tokyo60/keymaps/default/config.h | 4 | ||||
| -rw-r--r-- | keyboards/tokyo60/keymaps/default/keymap.c | 19 |
2 files changed, 9 insertions, 14 deletions
diff --git a/keyboards/tokyo60/keymaps/default/config.h b/keyboards/tokyo60/keymaps/default/config.h index a5568e400d..271f48d001 100644 --- a/keyboards/tokyo60/keymaps/default/config.h +++ b/keyboards/tokyo60/keymaps/default/config.h @@ -1 +1,3 @@ -#include "../../config.h" +#pragma once + +// place overrides here diff --git a/keyboards/tokyo60/keymaps/default/keymap.c b/keyboards/tokyo60/keymaps/default/keymap.c index 64b49a7465..97380784ce 100644 --- a/keyboards/tokyo60/keymaps/default/keymap.c +++ b/keyboards/tokyo60/keymaps/default/keymap.c @@ -1,5 +1,7 @@ -#include "tokyo60.h" +#include QMK_KEYBOARD_H +#define BL 0 +#define FN 1 /* * Default HHKB Layout */ @@ -17,11 +19,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { │█████│ Gui │ Alt │█████│█████│Space│█████│█████│█████│█████│█████│ Alt │ Gui │█████│█████│ └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ */ - TOKYO_KEYMAP( +[BL] = LAYOUT_60_hhkb( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, \ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_FN0, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(FN), \ KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT ), /* 1: HHKB Fn layer ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ @@ -36,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { │█████│ │ │█████│█████│█████│ │█████│█████│█████│█████│ │ │█████│█████│ └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ */ - TOKYO_KEYMAP( +[FN]= LAYOUT_60_hhkb( 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, RGB_TOG, RGB_MOD, RGB_RMOD, BL_TOGG, BL_STEP, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, \ KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT, \ @@ -44,13 +46,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), }; -/*5 - * Fn action definition - */ -const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_MOMENTARY(1), -}; -void matrix_scan_user(void) { - -}; |