Merge remote-tracking branch 'upstream/master' into develop
This commit is contained in:
		
						commit
						ae90b1d1e5
					
				
					 940 changed files with 0 additions and 85796 deletions
				
			
		| 
						 | 
				
			
			@ -1,73 +0,0 @@
 | 
			
		|||
 | 
			
		||||
#include QMK_KEYBOARD_H
 | 
			
		||||
 | 
			
		||||
enum layer_names {
 | 
			
		||||
    _QWERTY,
 | 
			
		||||
    _FNCAPS,
 | 
			
		||||
    _FNRIGHTSHIFT
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    /* Qwerty
 | 
			
		||||
     * ,-----------------------------------------------------------------------------------------.
 | 
			
		||||
     * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  |  `  |
 | 
			
		||||
     * |-----------------------------------------------------------------------------------------+
 | 
			
		||||
     * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  Bksp  |
 | 
			
		||||
     * |-----------------------------------------------------------------------------------------+
 | 
			
		||||
     * | Caps/FN1|  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
 | 
			
		||||
     * |-----------------------------------------------------------------------------------------+
 | 
			
		||||
     * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |     Up    | FN2 |
 | 
			
		||||
     * |-----------------------------------------------------------------------------------------+
 | 
			
		||||
     * | Ctrl  | Gui   | Alt   |               Space             | AltGr | Left  | Down  | Right |
 | 
			
		||||
     * `-----------------------------------------------------------------------------------------'
 | 
			
		||||
     */
 | 
			
		||||
    [0] = LAYOUT_all( /* Basic QWERTY */
 | 
			
		||||
        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,
 | 
			
		||||
        LT(_FNCAPS, KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NO,   KC_ENT,
 | 
			
		||||
        KC_LSFT,              KC_NO,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   MO(_FNRIGHTSHIFT),
 | 
			
		||||
        KC_LCTL,              KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT
 | 
			
		||||
    ),
 | 
			
		||||
 | 
			
		||||
    /* Layer 1
 | 
			
		||||
     * ,-----------------------------------------------------------------------------------------.
 | 
			
		||||
     * |     | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Ins | Del |
 | 
			
		||||
     * |-----------------------------------------------------------------------------------------+
 | 
			
		||||
     * |        |     |     |     |     |     |     |     |     |     |     |     |     |        |
 | 
			
		||||
     * |-----------------------------------------------------------------------------------------+
 | 
			
		||||
     * |         |     |     |     |     |     |     | Psc |     |     |     |     |             |
 | 
			
		||||
     * |-----------------------------------------------------------------------------------------+
 | 
			
		||||
     * |           | Led | Led+| Led-|     | Mute| Vol+| Vol-|     |     |     |    Play   |     |
 | 
			
		||||
     * |-----------------------------------------------------------------------------------------+
 | 
			
		||||
     * |       |       |       |                                 |       | Prev  | Stop  | Next  |
 | 
			
		||||
     * `-----------------------------------------------------------------------------------------'
 | 
			
		||||
     */
 | 
			
		||||
    [_FNCAPS] = LAYOUT_all( /* Layer 1 */
 | 
			
		||||
        _______, 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_PSCR, _______, _______, _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, BL_TOGG, BL_UP,   BL_DOWN, _______, KC_MUTE, KC_VOLU, KC_VOLD, _______, _______, _______, KC_MPLY, _______,
 | 
			
		||||
        _______, _______, _______,                   _______,                                     _______, KC_MPRV, KC_MSTP, KC_MNXT
 | 
			
		||||
    ),
 | 
			
		||||
 | 
			
		||||
    /* Layer 2
 | 
			
		||||
     * ,-----------------------------------------------------------------------------------------.
 | 
			
		||||
     * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
 | 
			
		||||
     * |-----------------------------------------------------------------------------------------+
 | 
			
		||||
     * |        |     |     |     |     |     |     |     |     |     |     |     |     |        |
 | 
			
		||||
     * |-----------------------------------------------------------------------------------------+
 | 
			
		||||
     * |         |     |     |     |     |     |     |     |     |     |     |     |             |
 | 
			
		||||
     * |-----------------------------------------------------------------------------------------+
 | 
			
		||||
     * |           |     |     |     |     |     |     |     |     |     |     |   PgUp    |     |
 | 
			
		||||
     * |-----------------------------------------------------------------------------------------+
 | 
			
		||||
     * |       |       |       |                                 |       | Home  | PgDown| End   |
 | 
			
		||||
     * `-----------------------------------------------------------------------------------------'
 | 
			
		||||
     */
 | 
			
		||||
    [_FNRIGHTSHIFT] = LAYOUT_all( /* Layer 2 */
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______,
 | 
			
		||||
        _______, _______, _______,                   _______,                                     _______, KC_HOME, KC_PGDN, KC_END
 | 
			
		||||
    ),
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			@ -1,11 +0,0 @@
 | 
			
		|||
# Dbroqua Layout
 | 
			
		||||
 | 
			
		||||
* Online keyboard layout editor: http://www.keyboard-layout-editor.com/#/gists/24fa7821d4955ec3c76037c8e159a199
 | 
			
		||||
* Online keyboard layout editor (caps layer): http://www.keyboard-layout-editor.com/#/gists/4136d4d1555d6f0d9403c21aaf50fd37
 | 
			
		||||
* Online keyboard layout editor (fn2 layer): http://www.keyboard-layout-editor.com/#/gists/cf4955f73f339020dbb41c15364e7e4f
 | 
			
		||||
 | 
			
		||||
# Programming Instructions:
 | 
			
		||||
Enter into programming mode and run the following command.
 | 
			
		||||
```
 | 
			
		||||
$ sudo KEYMAP=dbroqua make dfu
 | 
			
		||||
```
 | 
			
		||||
| 
						 | 
				
			
			@ -1,30 +0,0 @@
 | 
			
		|||
 | 
			
		||||
#include QMK_KEYBOARD_H
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    /*
 | 
			
		||||
     * Toggles between colemak and qwerty by tapping the bottom right key.
 | 
			
		||||
     * Holding capslock key gives a layer like the KBParadise v60.
 | 
			
		||||
     */
 | 
			
		||||
    [0] = LAYOUT_all( /* Basic Colemak */
 | 
			
		||||
        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_BSPC,  KC_NO,
 | 
			
		||||
        KC_TAB,   KC_Q,     KC_W,     KC_F,     KC_P,     KC_G,     KC_J,     KC_L,     KC_U,     KC_Y,     KC_SCLN,  KC_LBRC,  KC_RBRC,  KC_BSLS,
 | 
			
		||||
        MO(2),    KC_A,     KC_R,     KC_S,     KC_T,     KC_D,     KC_H,     KC_N,     KC_E,     KC_I,     KC_O,     KC_QUOT,  KC_NO,    KC_ENT,
 | 
			
		||||
        KC_LSFT,  KC_NO,    KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_K,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_NO,
 | 
			
		||||
        KC_LCTL,  KC_LALT,  KC_LGUI,                      KC_SPC,                                           KC_RGUI,  KC_RALT,  KC_RCTL,  DF(1)
 | 
			
		||||
    ),
 | 
			
		||||
    [1] = LAYOUT_all( /* Basic QWERTY */
 | 
			
		||||
        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_BSPC,  KC_NO,
 | 
			
		||||
        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_BSLS,
 | 
			
		||||
        MO(2),    KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NO,    KC_ENT,
 | 
			
		||||
        KC_LSFT,  KC_NO,    KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_NO,
 | 
			
		||||
        KC_LCTL,  KC_LALT,  KC_LGUI,                      KC_SPC,                                           KC_RGUI,  KC_RALT,  KC_RCTL,  DF(0)
 | 
			
		||||
    ),
 | 
			
		||||
    [2] = LAYOUT_all( /* KBP v60-like arrows, media keys, etc */
 | 
			
		||||
        KC_GRV,   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_NO,
 | 
			
		||||
        KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_UP,    BL_UP,    BL_DOWN,  BL_STEP,
 | 
			
		||||
        KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_NO,    KC_TRNS,
 | 
			
		||||
        KC_TRNS,  KC_NO,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_VOLD,  KC_VOLU,  KC_MUTE,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_NO,
 | 
			
		||||
        KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_SPC,                                           DB_TOGG,  QK_BOOT,  KC_TRNS,  KC_NO
 | 
			
		||||
    ),
 | 
			
		||||
};
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue