diff options
| author | Drashna Jaelre <drashna@live.com> | 2018-05-14 16:11:12 +0200 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-05-14 16:11:12 +0200 |
| commit | 678fae6ccef96ee1f7a722d4781e18c8314e3b29 (patch) | |
| tree | 32641bb9b1b7533085cb59b146adddfa5bba65c3 /keyboards/jj40/keymaps/fun40/keymap.c | |
| parent | 38f204db3031475aef2252e1ad11e4c87fb559f1 (diff) | |
| download | qmk_firmware-678fae6ccef96ee1f7a722d4781e18c8314e3b29.tar.gz qmk_firmware-678fae6ccef96ee1f7a722d4781e18c8314e3b29.tar.xz | |
Reformat 40% Ortho boards to work with Layouts feature (#2804)
* Reformat 40% Ortho boards to work with Layouts feature
* Fix krusli keymap to compile properly
* Fix mt40 compile errors
* Fix layouts
* fix RGB?
Diffstat (limited to 'keyboards/jj40/keymaps/fun40/keymap.c')
| -rw-r--r-- | keyboards/jj40/keymaps/fun40/keymap.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/keyboards/jj40/keymaps/fun40/keymap.c b/keyboards/jj40/keymaps/fun40/keymap.c index d6fcfe7c2..bbe6279e3 100644 --- a/keyboards/jj40/keymaps/fun40/keymap.c +++ b/keyboards/jj40/keymaps/fun40/keymap.c @@ -1,9 +1,4 @@ -#include "jj40.h" -#include "action_layer.h" -#include "eeconfig.h" -#ifdef BACKLIGHT_ENABLE - #include "backlight.h" -#endif +#include QMK_KEYBOARD_H #define _QWERTY 0 #define _LOWER 1 @@ -31,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | Ctrl | Del | Alt | GUI |Lower | Space|Space |Raise | Left | Down | Up |Right | * `-----------------------------------------------------------------------------------' */ -[_QWERTY] = KEYMAP( \ +[_QWERTY] = LAYOUT_ortho_4x12( \ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \ @@ -49,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | Ctrl | nkro | Alt | NKRO |Lower | PgDn | PgUp |Raise | Next | Vol- | Vol+ | Play | * `-----------------------------------------------------------------------------------' */ -[_LOWER] = KEYMAP( \ +[_LOWER] = LAYOUT_ortho_4x12( \ 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_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, \ KC_LSFT, KC_PSCR, S(KC_NUHS), S(KC_NUBS), _______, _______, _______, _______, _______, BL_ON, BL_STEP, KC_ENT, \ @@ -67,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | Ctrl | | Alt | |Lower | | |Raise | 0 | | Home | End | * `-----------------------------------------------------------------------------------' */ -[_RAISE] = KEYMAP( \ +[_RAISE] = LAYOUT_ortho_4x12( \ KC_CAPS, KC_MINS, KC_PLUS, KC_EQL, KC_LPRN, KC_RPRN, _______, KC_7, KC_8, KC_9, KC_BSPC, KC_DEL, \ KC_LOCK, KC_TILD, KC_UNDS, _______,KC_LBRC, KC_RBRC, _______, KC_4, KC_5, KC_6, _______, _______, \ KC_INS, KC_GRV, KC_BSLS, KC_PIPE, KC_LCBR, KC_RCBR, _______, KC_1, KC_2, KC_3, KC_DOT, _______, \ |