Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
* 'master' of https://github.com/qmk/qmk_firmware:
  [Keyboard] adding keyboard: tkl30 (qmk#7979)
  Move Grave Escape, Lock and Leader keycodes into their own sect… (qmk#8093)
  Committing fix to info.json for wsk/jerkin (qmk#8110)
  Use function for KEYCODE2 routines instead of macro. (qmk#8101)
  [keyboard] adding keyboard: jerkin (qmk#7975)
  Ergosaurus Configurator support bugfix (qmk#8104)
  Xelus Dawn60: layout macro update and Configurator layout support (qmk#8102)
  VIA Support: 1upkeyboards 1up60rgb (qmk#8097)
  [Keymap] User keymap for AKB/Raine (qmk#8081)
  VIA Support: KBD67 mkii v1/v2 (qmk#8085)
  fixup keymap for 65_ansi_blocker (qmk#8099)
  [Keyboard] manta60 (qmk#8068)
  [Keyboard] add Infinity CE (qmk#8067)
  [Keyboard] Added Atreus Pro Micro variant (qmk#8059)
  Add Uni660 Keyboard (qmk#8018)
  • Loading branch information
Shinichi-Ohki committed Feb 7, 2020
2 parents 322b5bf + e43d143 commit 1bc1ccb
Show file tree
Hide file tree
Showing 71 changed files with 2,591 additions and 53 deletions.
33 changes: 24 additions & 9 deletions docs/keycodes.md
Original file line number Diff line number Diff line change
Expand Up @@ -208,14 +208,11 @@ This is a reference only. Each group of keys links to the page documenting their

## [Quantum Keycodes](quantum_keycodes.md#qmk-keycodes)

|Key |Aliases |Description |
|---------------|-----------|---------------------------------------------------------------------|
|`RESET` | |Put the keyboard into DFU mode for flashing |
|`DEBUG` | |Toggle debug mode |
|`EEPROM_RESET` |`EEP_RST` |Resets EEPROM state by reinitializing it |
|`KC_GESC` |`GRAVE_ESC`|Escape when tapped, <code>&#96;</code> when pressed with Shift or GUI|
|`KC_LEAD` | |The [Leader key](feature_leader_key.md) |
|`KC_LOCK` | |The [Lock key](feature_key_lock.md) |
|Key |Aliases |Description |
|--------------|---------|-------------------------------------------------------|
|`RESET` | |Put the keyboard into bootloader mode for flashing |
|`DEBUG` | |Toggle debug mode |
|`EEPROM_RESET`|`EEP_RST`|Reinitializes the keyboard's EEPROM (persistent memory)|

## [Audio Keys](feature_audio.md)

Expand Down Expand Up @@ -289,14 +286,26 @@ This is a reference only. Each group of keys links to the page documenting their

## [Dynamic Macros](feature_dynamic_macros.md)

|Key |Alias |Description |
|Key |Aliases |Description |
|-----------------|---------|--------------------------------------------------|
|`DYN_REC_START1` |`DM_REC1`|Start recording Macro 1 |
|`DYN_REC_START2` |`DM_REC2`|Start recording Macro 2 |
|`DYN_MACRO_PLAY1`|`DM_PLY1`|Replay Macro 1 |
|`DYN_MACRO_PLAY2`|`DM_PLY2`|Replay Macro 2 |
|`DYN_REC_STOP` |`DM_RSTP`|Finish the macro that is currently being recorded.|

## [Grave Escape](feature_grave_esc.md)

|Key |Aliases |Description |
|-----------|---------|------------------------------------------------------------------|
|`GRAVE_ESC`|`KC_GESC`|Escape when pressed, <code>&#96;</code> when Shift or GUI are held|

## [Key Lock](feature_key_lock.md)

|Key |Description |
|---------|--------------------------------------------------------------|
|`KC_LOCK`|Hold down the next key pressed, until the key is pressed again|

## [Layer Switching](feature_advanced_keycodes.md#switching-and-toggling-layers)

|Key |Description |
Expand All @@ -310,6 +319,12 @@ This is a reference only. Each group of keys links to the page documenting their
|`TO(layer)` |Turns on `layer` and turns off all other layers, except the default layer |
|`TT(layer)` |Normally acts like MO unless it's tapped multiple times, which toggles `layer` on |

## [Leader Key](feature_leader_key.md)

|Key |Description |
|---------|------------------------|
|`KC_LEAD`|Begins a leader sequence|

## [Mouse Keys](feature_mouse_keys.md)

|Key |Aliases |Description |
Expand Down
13 changes: 5 additions & 8 deletions docs/quantum_keycodes.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ On this page we have documented keycodes between `0x00FF` and `0xFFFF` which are

## QMK Keycodes

|Key |Aliases |Description |
|---------------|-----------|---------------------------------------------------------------------|
|`RESET` | |Put the keyboard into DFU mode for flashing |
|`DEBUG` | |Toggle debug mode |
|`EEPROM_RESET` |`EEP_RST` |Resets EEPROM state by reinitializing it |
|`KC_GESC` |`GRAVE_ESC`|Escape when tapped, <code>&#96;</code> when pressed with Shift or GUI|
|`KC_LEAD` | |The [Leader key](feature_leader_key.md) |
|`KC_LOCK` | |The [Lock key](feature_key_lock.md) |
|Key |Aliases |Description |
|--------------|---------|-------------------------------------------------------|
|`RESET` | |Put the keyboard into bootloader mode for flashing |
|`DEBUG` | |Toggle debug mode |
|`EEPROM_RESET`|`EEP_RST`|Reinitializes the keyboard's EEPROM (persistent memory)|
4 changes: 2 additions & 2 deletions keyboards/1upkeyboards/1up60rgb/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#include "config_common.h"

/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x6060
#define VENDOR_ID 0x6F75 // OU
#define PRODUCT_ID 0x7267 // RG
#define DEVICE_VER 0x0001
#define MANUFACTURER 1upkeyboards
#define PRODUCT 1UP RGB Underglow PCB
Expand Down
34 changes: 34 additions & 0 deletions keyboards/1upkeyboards/1up60rgb/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[0] = LAYOUT_all(
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_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_BSLS,
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_ENT, KC_ENT,
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL),

[1] = LAYOUT_all(
RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),

[2] = LAYOUT_all(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),

[3] = LAYOUT_all(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)

};

2 changes: 2 additions & 0 deletions keyboards/1upkeyboards/1up60rgb/keymaps/via/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
VIA_ENABLE = yes
LTO_ENABLE = yes
75 changes: 75 additions & 0 deletions keyboards/akb/raine/keymaps/mehadviceguy/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
/* Copyright 2019 Elliot Powell
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H

/*
BLANK
,----------------------------------------------------------------. ,--------------.
| | | | | | | | | | | | | | | | | |
|----------------------------------------------------------------| |--------------|
| | | | | | | | | | | | | | | | |
|------------------------------------------------------------ | |--------------|
| | | | | | | | | | | | | | | | |
|----------------------------------------------------------------' |--------------|
| | | | | | | | | | | | ,----. | | | |
|-----------------------------------------------------------' | | `--------------|
| | | | | | ,--------------. | | |
`------` '------------------------------` '-----' | | | | `---------'
`--------------'
*/

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT( /* Base
,----------------------------------------------------------------. ,--------------.
|Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | Bac| | / | * | + |
|----------------------------------------------------------------| |--------------|
| Tab | Q | W | E | R | T | Y | U | I | O | P | Enter| | 7 | 8 | 9 |
|------------------------------------------------------------ | |--------------|
|CapsLock | A | S | D | F | G | H | J | K | L | : | | | 4 | 5 | 6 |
|----------------------------------------------------------------' |--------------|
|Shift | \ | Z | X | C | V | B | N | M | , | . | ,----. | 1 | 2 | 3 |
|-----------------------------------------------------------' | Up | `--------------|
| Ctrl | | SPACE | |AltGr| ,--------------. | 0 | . |
`------` '------------------------------` '-----' |L/fn|Down|Rght| `---------'
`--------------'
*/
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_BSPC, KC_PSLS, KC_PAST, KC_PPLS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, _______, KC_P7, KC_P8, KC_P9,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, KC_P4, KC_P5, KC_P6,
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_UP, KC_P1, KC_P2, KC_P3,
KC_LCTL, _______, _______, _______, KC_SPC, _______, _______, KC_RALT, LT(1, KC_LEFT), KC_DOWN, KC_RGHT, KC_P0, KC_PDOT),

[1] = LAYOUT( /* Second
,----------------------------------------------------------------. ,--------------.
| GRV| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9| F10| F11| F12 | |Nlck|Pscr| = |
|----------------------------------------------------------------| |--------------|
| | | | | | | | | | | ? | DEL | |Home| Up |PgUp|
|------------------------------------------------------------ | |--------------|
| | | | | | | | | | | ' |DEL | |Left|ScrL|Rght|
|----------------------------------------------------------------' |--------------|
| | | | | | | | | | [ | ] | ,----. |End |Down|PgDn|
|-----------------------------------------------------------' | | `--------------|
| GUI | | | | | ,--------------. | |Rest|
`------` '------------------------------` '-----' | | | | `---------'
`--------------'
*/
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_NLCK, KC_PSCR, KC_EQUAL,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLSH, _______, KC_HOME, KC_UP, KC_PGUP,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_QUOT, KC_DEL, KC_LEFT, KC_SLCK, KC_RGHT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, KC_END, KC_DOWN, KC_PGDN,
KC_LGUI, _______, _______, _______, KC_LALT, _______, _______, _______, _______, _______, _______, _______, RESET),
};

68 changes: 68 additions & 0 deletions keyboards/akb/raine/keymaps/mehadviceguy/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# Eyecandy
![Eyecandy](https://i.imgur.com/gYWNDlF.png)

# MehAdviceGuy Raine layout

Welcome to one of the most useless layouts you will find this side of town!
The layout is born out of the need for AltGr to get to æø and å when you don't have a full bottom row.

## Base Layer (0)
The base layer borrows alot from the Default Raine layer in regards to the alphas, and the numpad. But deviates ever so slightly by putting the layer key on the Left arrow key, relacing it from its original location with AltGr. And putting , and . on what was normally ? and right shift.
```
,----------------------------------------------------------------. ,--------------.
|Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | Bac| | / | * | + |
|----------------------------------------------------------------| |--------------|
| Tab | Q | W | E | R | T | Y | U | I | O | P | Enter| | 7 | 8 | 9 |
|------------------------------------------------------------ | |--------------|
|CapsLock | A | S | D | F | G | H | J | K | L | : | | | 4 | 5 | 6 |
|----------------------------------------------------------------' |--------------|
|Shift | \ | Z | X | C | V | B | N | M | , | . | ,----. | 1 | 2 | 3 |
|-----------------------------------------------------------' | Up | `--------------|
| Ctrl | | SPACE | |AltGr| ,--------------. | 0 | . |
`------` '------------------------------` '-----' |L/fn|Down|Rght| `---------'
`--------------'
```

## Modifier Layer (1)
The Modifier layer also borrows a few things from the Default Raine layout, but changes a fair bit of things in it. These changes include:
* Moving Delete to Enter and completing the F-row
* Moving [ and ] to , and .
* Adding GUI to Left Ctrl
* Replacing insert with =
* Adding / to the P position
* Moving ' one to the left

```
,----------------------------------------------------------------. ,--------------.
| GRV| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9| F10| F11| F12 | |Nlck|Pscr| = |
|----------------------------------------------------------------| |--------------|
| | | | | | | | | | | ? | DEL | |Home| Up |PgUp|
|------------------------------------------------------------ | |--------------|
| | | | | | | | | | | ' |DEL | |Left|ScrL|Rght|
|----------------------------------------------------------------' |--------------|
| | | | | | | | | | [ | ] | ,----. |End |Down|PgDn|
|-----------------------------------------------------------' | | `--------------|
| GUI | | | | | ,--------------. | |Rest|
`------` '------------------------------` '-----' | | | | `---------'
`--------------'
```

### Blank ASKII version if anyone needs!
```
,----------------------------------------------------------------. ,--------------.
| | | | | | | | | | | | | | | | | |
|----------------------------------------------------------------| |--------------|
| | | | | | | | | | | | | | | | |
|------------------------------------------------------------ | |--------------|
| | | | | | | | | | | | | | | | |
|----------------------------------------------------------------' |--------------|
| | | | | | | | | | | | ,----. | | | |
|-----------------------------------------------------------' | | `--------------|
| | | | | | ,--------------. | | |
`------` '------------------------------` '-----' | | | | `---------'
`--------------'
```

### KLE
![KLE Layout](https://i.imgur.com/JDc1oM4.png)
![KLE Link](http://www.keyboard-layout-editor.com/##@@=Esc%0A%60&=!%0A1&=%2F@%0A2&=%23%0A3&=$%0A4&=%25%0A5&=%5E%0A6&=%2F&%0A7&=*%0A8&=(%0A9&=)%0A0&=%2F_%0A-&=+%0A%2F=&_x:0.25%3B&=%2F%2F&=*&=+%3B&@_w:1.5%3B&=Tab&=Q&=W&=E&=R&=T&=Y&=U&=I&=O&=P&_x:0.25&w:1.25&h:2&w2:1.5&h2:1&x2:-0.25%3B&=Enter&_x:0.25%3B&=7&=8&=9%3B&@_w:1.75%3B&=Caps%20Lock&=A&=S&=D&=F&=G&=H&=J&=K&=L&=%2F:%0A%2F%3B&_x:1.5%3B&=4&=5&=6%3B&@_w:1.25%3B&=Shift&=%7C%0A%5C&=Z&=X&=C&=V&=B&=N&=M&=%3C%0A,&_w:1.5%3B&=%3E%0A.&_x:1.5%3B&=1&=2&=3%3B&@_y:-0.75&x:12%3B&=%E2%86%91%3B&@_y:-0.25&w:1.25%3B&=Ctrl&_x:1&a:7&w:6.25%3B&=&_x:1&a:4&w:1.25%3B&=AltGr&_x:3.5%3B&=0&=.%3B&@_y:-0.75&x:11%3B&=%E2%86%90%0AFN&=%E2%86%93&=%E2%86%92%3B&@_y:0.25%3B&=%60&=F1&=F2&=F3&=F4&=F5&=F6&=F7&=F8&=F9&=F10&=F11&=F12&_x:0.25%3B&=NLock&=Print&=%2F=%3B&@_a:7&w:1.5%3B&=&=&=&=&=&=&=&=&=&=&_a:4%3B&=%2F%2F&_x:0.25&w:1.25&h:2&w2:1.5&h2:1&x2:-0.25%3B&=Del&_x:0.25%3B&=Home&=Up&=PgUp%3B&@_a:7&w:1.75%3B&=&=&=&=&=&=&=&=&=&=&_a:4%3B&='&_x:1.5%3B&=Left&=ScrLc&=Right%3B&@_a:7&w:1.25%3B&=&=&=&=&=&=&=&=&=&_a:4%3B&=%5B&_w:1.5%3B&=%5D&_x:1.5%3B&=End&=Down&=PgDn%3B&@_y:-0.75&x:12&a:7%3B&=%3B&@_y:-0.25&a:4&w:1.25%3B&=Win&_x:1&w:6.25%3B&=RAlt&_x:1&a:7&w:1.25%3B&=&_x:3.5%3B&=&_a:4%3B&=Rst%3B&@_y:-0.75&x:11&a:7%3B&=&=&=)
2 changes: 2 additions & 0 deletions keyboards/atreus/atreus.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
#include "astar_mirrored.h"
#elif KEYBOARD_atreus_teensy2
#include "teensy2.h"
#elif KEYBOARD_atreus_promicro
#include "promicro.h"
#endif

// This a shortcut to help you visually see your layout.
Expand Down
5 changes: 5 additions & 0 deletions keyboards/atreus/keymaps/ibnuda/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#pragma once

#define TAPPING_TERM 200
#define IGNORE_MOD_TAP_INTERRUPT
#define COMBO_COUNT 15
Loading

0 comments on commit 1bc1ccb

Please sign in to comment.