Satan refactor and Configurator support (#3305)
* Matrix refactor * Keymap refactor * Configurator support * Readme cleanup
This commit is contained in:
		
							parent
							
								
									3bbf11d110
								
							
						
					
					
						commit
						876377e945
					
				
					 28 changed files with 584 additions and 519 deletions
				
			
		| 
						 | 
				
			
			@ -1,5 +1,6 @@
 | 
			
		|||
 | 
			
		||||
#include "satan.h"
 | 
			
		||||
#include QMK_KEYBOARD_H
 | 
			
		||||
 | 
			
		||||
// TODO: replace your ugly german brckets with #defines
 | 
			
		||||
 | 
			
		||||
// Each layer gets a name for readability, which is then used in the keymap matrix below.
 | 
			
		||||
| 
						 | 
				
			
			@ -31,7 +32,7 @@
 | 
			
		|||
#define GER_BRC_L RALT(KC_8)    // [
 | 
			
		||||
#define GER_BRC_R RALT(KC_9)    // ]
 | 
			
		||||
 | 
			
		||||
// increase readability 
 | 
			
		||||
// increase readability
 | 
			
		||||
#define _______ KC_TRNS
 | 
			
		||||
#define XXXXXXX KC_NO
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -46,12 +47,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
     * |-----------------------------------------------------------|
 | 
			
		||||
     * |Sft | < |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift |Fn2| RShift is UP
 | 
			
		||||
     * |-----------------------------------------------------------|
 | 
			
		||||
     * |Ctrl|Win |Alt |      Space/Fn0         |Alt |Win |Menu|RCtl| Gui Menu, RCtrl is 
 | 
			
		||||
     * |Ctrl|Win |Alt |      Space/Fn0         |Alt |Win |Menu|RCtl| Gui Menu, RCtrl is
 | 
			
		||||
     * `-----------------------------------------------------------'   LEFT DWN RIGHT
 | 
			
		||||
     */
 | 
			
		||||
    [_DEF] = KEYMAP_ISO_SPLITRSHIFT(
 | 
			
		||||
    [_DEF] = LAYOUT_60_iso_split_rshift(
 | 
			
		||||
        KC_GRV,   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,   \
 | 
			
		||||
        TABDUAL,  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_BSLS,   \
 | 
			
		||||
        TABDUAL,  KC_Q,    KC_W,    KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O,    KC_P,    KC_LBRC, KC_RBRC, \
 | 
			
		||||
        CAPSDUAL, KC_A,    KC_S,    KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, ENTERDUAL, \
 | 
			
		||||
        KC_LSFT,  KC_NUBS, KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, ARRUP,   TG(_SFX),      \
 | 
			
		||||
        KC_LCTL,  KC_LGUI, KC_LALT,             SPACEDUAL,                       KC_RALT, ARRLEFT, ARRDOWN, ARRRIGHT),
 | 
			
		||||
| 
						 | 
				
			
			@ -69,9 +70,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
     * |    |    |    |                        |Alt |Prev|Vol-|Next|
 | 
			
		||||
     * `-----------------------------------------------------------'
 | 
			
		||||
     */
 | 
			
		||||
    [_SPC] = KEYMAP_ISO_SPLITRSHIFT(
 | 
			
		||||
    [_SPC] = LAYOUT_60_iso_split_rshift(
 | 
			
		||||
        KC_PSCR, 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_DEL,  \
 | 
			
		||||
        _______, KC_PAUS, KC_UP,   GER_BRC_L, GER_BRC_R, _______,   _______,  GER_PAR_L, GER_PAR_R, _______, _______, _______, _______, _______, \
 | 
			
		||||
        _______, KC_PAUS, KC_UP,   GER_BRC_L, GER_BRC_R, _______,   _______,  GER_PAR_L, GER_PAR_R, _______, _______, _______, _______, \
 | 
			
		||||
        _______, KC_LEFT, KC_DOWN, KC_RIGHT,  _______,   _______,   KC_LEFT,  KC_DOWN,   KC_UP,     KC_RGHT, _______, _______, _______, KC_MPLY, \
 | 
			
		||||
        _______, _______, _______, _______,   GER_ANG_L, GER_ANG_R, KC_SPACE, M(0),      _______,   _______, _______, _______, KC_VOLU, _______, \
 | 
			
		||||
        _______, _______, _______,                                  _______,                                 _______, KC_MPRV, KC_VOLD, KC_MNXT),
 | 
			
		||||
| 
						 | 
				
			
			@ -89,9 +90,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
     * |    |    |    |                        |Alt |Pos1|PgDn|End |
 | 
			
		||||
     * `-----------------------------------------------------------'
 | 
			
		||||
     */
 | 
			
		||||
    [_TAB] = KEYMAP_ISO_SPLITRSHIFT(
 | 
			
		||||
    [_TAB] = LAYOUT_60_iso_split_rshift(
 | 
			
		||||
        KC_WAKE, _______, _______, _______, _______, _______, _______, _______,    _______,  _______, _______, _______, _______, KC_INS,  \
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, GER_CUR_L, GER_CUR_R, _______, _______, _______, _______, _______, \
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, GER_CUR_L, GER_CUR_R, _______, _______, _______, _______, \
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN,    KC_PGUP,  KC_END,  _______, _______, _______, KC_ENT,  \
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, M(1),       _______,  _______, _______, _______, KC_PGUP, _______, \
 | 
			
		||||
        _______, _______, _______,                            _______,                                _______, KC_HOME, KC_PGDN, KC_END),
 | 
			
		||||
| 
						 | 
				
			
			@ -109,9 +110,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
     * |Ctrl|Win |Alt |                        |Alt |Left|Down|Right|
 | 
			
		||||
     * `-----------------------------------------------------------'
 | 
			
		||||
     */
 | 
			
		||||
    [_SFX] = KEYMAP_ISO_SPLITRSHIFT(
 | 
			
		||||
    [_SFX] = LAYOUT_60_iso_split_rshift(
 | 
			
		||||
        RESET,   _______, _______, _______, _______, _______, _______, KC_7,    KC_8,    KC_9, _______, _______, _______, KC_BSPC, \
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, KC_4,    KC_5,    KC_6, _______, _______, _______, KC_BSLS, \
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, KC_4,    KC_5,    KC_6, _______, _______, _______, \
 | 
			
		||||
        _______, F(2),    F(3),    _______, _______, _______, _______, KC_1,    KC_2,    KC_3, _______, _______, XXXXXXX, KC_ENT,  \
 | 
			
		||||
        _______, F(4),    F(5),    F(6),    F(7),    F(8),    F(9),    _______, _______, KC_0, _______, KC_SLSH, KC_UP,   _______, \
 | 
			
		||||
        _______, _______, _______,                            _______,                         _______, KC_LEFT, KC_DOWN, KC_RGHT),
 | 
			
		||||
| 
						 | 
				
			
			@ -147,12 +148,12 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 | 
			
		|||
    // MACRODOWN only works in this function
 | 
			
		||||
    switch(id) {
 | 
			
		||||
        case 0:
 | 
			
		||||
            return (record->event.pressed ? 
 | 
			
		||||
            return (record->event.pressed ?
 | 
			
		||||
                    MACRO( D(RALT), T(SPC), U(RALT), END )
 | 
			
		||||
                    :MACRO( END ));
 | 
			
		||||
            break;
 | 
			
		||||
        case 1:
 | 
			
		||||
            return (record->event.pressed ? 
 | 
			
		||||
            return (record->event.pressed ?
 | 
			
		||||
                    MACRO( D(LALT), T(F2), U(LALT), END )
 | 
			
		||||
                    :MACRO( END ));
 | 
			
		||||
            break;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue