Satan refactor and Configurator support (#3305)

* Matrix refactor

* Keymap refactor

* Configurator support

* Readme cleanup
This commit is contained in:
noroadsleft
2018-07-04 18:02:01 -07:00
committed by Drashna Jaelre
parent 3bbf11d110
commit 876377e945
28 changed files with 584 additions and 519 deletions
+42 -43
View File
@@ -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, _______, _______, _______, _______
)
};
+11 -6
View File
@@ -6,6 +6,11 @@ This version is designed to have in its base layer letter 'Ñ' for Spanish writi
This keymap also supports control for a WS2812B RGB led strip connected to pin E2 of the microcontroller. If you want more functionalities, pls check RGB documentation at [QMK Docs]( https://docs.qmk.fm/feature_rgblight.html#rgb-lighting). This also goes for backlighting functionalities. If you want more control, check [QMK Docs](https://docs.qmk.fm/feature_backlight.html#backlighting) on that.
## Layout
The keymap is programmed in the `LAYOUT_60_iso_split_rshift` matrix, but the physical layout combines ISO Enter, ANSI left shift, 2u Backspace, split right shift, and a 7u space bar with two modifiers on either side.
Base Layer:
```
@@ -13,27 +18,27 @@ Base 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|
|------------------------------------------------------. |
|Ctrl | A| S| D| F| G| H| J| K| L| Ñ| ;| ' |urn |
|-----------------------------------------------------------|
|Shift | Z| X| C| V| B| N| M| ,| .| /|Shift | Fn|
|-----------------------------------------------------------|
| |Alt|LGUI | Space |RGUI |Alt| |
| |Alt|LGUI | Space |RGUI |Alt| |
`-----------------------------------------------------------'
```
Function Layer
```
,-----------------------------------------------------------.
| |F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|PSR| RESET|
| | 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 | | | |
| | | | PLY/PAU | | | |
`-----------------------------------------------------------'
```
@@ -1,21 +0,0 @@
#ifndef STUNNY_ISO_HHKB_H
#define STUNNY_ISO_HHKB_H
/* Satan ISO - HHKB matrix layout
* With 7u space bar, split right shift and 2u Backspace
* ,------------------------------------------------------------.
* | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d |
* |------------------------------------------------------------|
* | 10 | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c| |
* |------------------------------------------------------------|
* | 20 | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2c| 2d |
* |------------------------------------------------------------|
* | 30 | 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b| 3d | 3c |
* |------------------------------------------------------------|
* | | 41| 42 | 45 | 4a | 4b | | |
* `------------------------------------------------------------'
*/
#define KEYMAP_ISO_HHKB KEYMAP_ISO_SPLITRSHIFT
#endif