aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/satan/keymaps/isoHHKB/keymap.c
diff options
context:
space:
mode:
authorGravatar noroadsleft <18669334+noroadsleft@users.noreply.github.com>2018-07-04 18:02:01 -0700
committerGravatar Drashna Jaelre <drashna@live.com>2018-07-04 18:02:01 -0700
commit876377e945da294c887a1553f07f947d10da58ec (patch)
tree9e8ec5efe1f4098b1ea3d39fd223b88aa0f714da /keyboards/satan/keymaps/isoHHKB/keymap.c
parent3bbf11d11010bb908741f8b574a493b9057b1304 (diff)
downloadqmk_firmware-876377e945da294c887a1553f07f947d10da58ec.tar.gz
Satan refactor and Configurator support (#3305)
* Matrix refactor * Keymap refactor * Configurator support * Readme cleanup
Diffstat (limited to 'keyboards/satan/keymaps/isoHHKB/keymap.c')
-rw-r--r--keyboards/satan/keymaps/isoHHKB/keymap.c85
1 files changed, 42 insertions, 43 deletions
diff --git a/keyboards/satan/keymaps/isoHHKB/keymap.c b/keyboards/satan/keymaps/isoHHKB/keymap.c
index a14c5c39d..e1d93a1c3 100644
--- a/keyboards/satan/keymaps/isoHHKB/keymap.c
+++ b/keyboards/satan/keymaps/isoHHKB/keymap.c
@@ -1,5 +1,4 @@
-#include "satan.h"
-#include "stunny_iso_hhkb.h"
+#include QMK_KEYBOARD_H
// Used for SHIFT_ESC
#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
@@ -18,48 +17,48 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- /* Keymap _BL: (Base Layer) Default Layer
- * ,-----------------------------------------------------------.
- * |Esc~| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp |
- * |-----------------------------------------------------------|
- * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| Ret |
- * |-----------------------------------------------------------|
- * |Ctrl | A| S| D| F| G| H| J| K| L| Ñ| ;| ' |urn|
- * |-----------------------------------------------------------|
- * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift | Fn|
- * |-----------------------------------------------------------|
- * | |Alt|WinK | Space |WinK |Alt| |
- * `-----------------------------------------------------------'
- *
- */
+ /* Keymap _BL: (Base Layer) Default Layer
+ * ,-----------------------------------------------------------.
+ * |Esc~| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp |
+ * |-----------------------------------------------------------|
+ * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| Ret |
+ * |-------------------------------------------------------. |
+ * |Ctrl | A| S| D| F| G| H| J| K| L| Ñ| ;| ' |urn|
+ * |-----------------------------------------------------------|
+ * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift | Fn|
+ * |-----------------------------------------------------------|
+ * | |Alt|WinK | Space |WinK |Alt| |
+ * `-----------------------------------------------------------'
+ *
+ */
+ [_BL] = LAYOUT_60_iso_split_rshift( \
+ F(0), 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_BSPC,
+ 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_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENYE, KC_SCLN, KC_QUOT, KC_ENT,
+ OSM(MOD_LSFT), _______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM(MOD_RSFT), MO(_FL),
+ _______, KC_LGUI, KC_LALT, KC_SPC, _______, KC_RALT, KC_RGUI, _______
+ ),
- [_BL] = KEYMAP_ISO_HHKB( \
- F(0), 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_BSPC, \
- 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_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENYE,KC_SCLN,KC_QUOT,KC_ENT, \
- OSM(MOD_LSFT),_______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, OSM(MOD_RSFT), MO(_FL), \
- _______, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI,_______, _______),
-
- /* Keymap _FL: (Function Layer) Second Layer
- * ,-----------------------------------------------------------.
- * | |F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|PSR| RESET|
- * |-----------------------------------------------------------|
- * | | |VUP| | | | | | | | | | | |
- * |-----------------------------------------------------------|
- * |CapsLck|PRV|VDN|NXT| |RGB|FRW|BRT|VAI|VAD|INC|DEC| | |
- * |-----------------------------------------------------------|
- * | | | | Ç| |BTG| |MUT| | | | | |
- * |-----------------------------------------------------------|
- * | | | | PLY/PAU | | | |
- * `-----------------------------------------------------------'
- */
- [_FL] = KEYMAP_ISO_HHKB(\
-
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_PSCR, RESET, \
- _______,_______,KC_VOLU,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______, _______, \
- KC_CAPS,KC_MPRV,KC_VOLD,KC_MNXT,_______,_______,RGB_TOG,RGB_MOD,RGB_M_B,RGB_VAI,RGB_VAD,BL_INC, BL_DEC, _______, \
- _______,_______,_______,_______,KC_CEDL,_______,BL_TOGG,_______,KC_MUTE,_______,_______,_______,_______, _______, \
- _______,_______,_______, KC_MPLY, _______,_______,_______, _______)
+ /* Keymap _FL: (Function Layer) Second Layer
+ * ,-----------------------------------------------------------.
+ * | |F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|PSR| RESET|
+ * |-----------------------------------------------------------|
+ * | | |VUP| | | | | | | | | | | |
+ * |-------------------------------------------------------. |
+ * |CapsLck|PRV|VDN|NXT| |RGB|FRW|BRT|VAI|VAD|INC|DEC| | |
+ * |-----------------------------------------------------------|
+ * | | | | Ç| |BTG| |MUT| | | | | |
+ * |-----------------------------------------------------------|
+ * | | | | PLY/PAU | | | |
+ * `-----------------------------------------------------------'
+ */
+ [_FL] = LAYOUT_60_iso_split_rshift(\
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_PSCR, RESET,
+ _______, _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ KC_CAPS, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, RGB_TOG, RGB_MOD, RGB_M_B, RGB_VAI, RGB_VAD, BL_INC, BL_DEC, _______,
+ _______, _______, _______, _______, KC_CEDL, _______, BL_TOGG, _______, KC_MUTE, _______, _______, _______, _______, _______,
+ _______, _______, _______, KC_MPLY, _______, _______, _______, _______
+ )
};