Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Xyverz 2017-01-19 06:54:18 -08:00
commit b8b2a55973
78 changed files with 3126 additions and 374 deletions

View file

@ -0,0 +1,5 @@
SUBPROJECT = rev3
ifndef QUANTUM_DIR
include ../../../../Makefile
endif

View file

@ -0,0 +1,2 @@
#include "../../config.h"
#define PREVENT_STUCK_MODIFIERS

View file

@ -0,0 +1,70 @@
#include "keymap.h"
#include "quantum.h"
#define QWERTY 0
#define LOWER 1
#define RAISE 2
// Alias to make layering more clear
#define _______ KC_TRNS
// In MacOS, switch between windows within an application
#define GUI_GRV LGUI(KC_GRV)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty
* ,-----------------------------------------------------------------------------------.
* | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp |
* |------+------+------+------+------+-------------+------+------+------+------+------|
* | Ctl | A | S | D | F | G | H | J | K | L | ; | " |
* |------+------+------+------+------+------|------+------+------+------+------+------|
* | Shift| Z | X | C | V | B | N | M | , | . | / |Enter |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | Esc | Del | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right |
* `-----------------------------------------------------------------------------------'
*/
[QWERTY] = {
{KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC},
{KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT},
{KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT(MOD_RSFT, KC_ENT) },
{KC_ESC, KC_DEL, KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT}
},
/* Lower
* ,-----------------------------------------------------------------------------------.
* | GUIGR| | | | | | | & | * | ( | ) | Del |
* |------+------+------+------+------+-------------+------+------+------+------+------|
* | Caps | | Mute | Vol- | Vol+ | | Bksp | $ | % | ^ | | | | |
* |------+------+------+------+------+------|------+------+------+------+------+------|
* | | | | | | | | ! | @ | # | \ |Enter |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | | | | | Enter | | | PgUp | PgUn | |
* `-----------------------------------------------------------------------------------'
*/
[LOWER] = {
{GUI_GRV, _______, _______, _______, _______, _______, _______, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL},
{KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_BSPC, KC_DLR, KC_PERC, KC_CIRC, KC_PIPE, KC_PIPE},
{_______, _______, _______, _______, _______, _______, _______, KC_EXLM, KC_AT, KC_HASH, KC_BSLS, KC_ENT},
{_______, _______, _______, _______, _______, KC_ENT, KC_ENT, _______, _______, KC_PGDN, KC_PGUP, _______}
},
/* Raise
* ,-----------------------------------------------------------------------------------.
* | ` | ` | ~ | ( | ) | | | 7 | 8 | 9 | 0 | |
* |------+------+------+------+------+-------------+------+------+------+------+------|
* | | [ | ] | { | } | | | 4 | 5 | 6 | | \ |
* |------+------+------+------+------+------|------+------+------+------+------+------|
* | | - | _ | = | + | | | 1 | 2 | 3 | |Enter |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | | | | | Enter | | | | | |
* `-----------------------------------------------------------------------------------'
*/
[RAISE] = {
{KC_GRV, KC_GRV, KC_TILD, KC_LPRN, KC_RPRN, _______, _______, KC_7, KC_8, KC_9, KC_0, _______},
{_______, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, _______, _______, KC_4, KC_5, KC_6, _______, KC_BSLS},
{_______, KC_MINS, KC_UNDS, KC_EQL, KC_PLUS, _______, _______, KC_1, KC_2, KC_3, _______, KC_ENT},
{_______, _______, _______, _______, _______, KC_ENT, KC_ENT, _______, _______, KC_PGDN, KC_PGUP, _______}
}
};

View file

@ -0,0 +1,26 @@
## Flashing Keyboard
1. Install `dfu` tools:
brew tap osx-cross/avr
brew install avr-libc
brew install dfu-programmer
2. Move to this directory.
3. Hit the reset button on the keyboard.
4. run `make dfu`.
## The Keymap
This keymap is designed for a rev3 Planck Keyboard.
The default layer is QWERTY. The raise layer has a ten key on the right
and common programming punctuation on the left. The lower layer provides the
rest of the symbols, mostly mapped with the ten key numbers.
The normal right shift key uses the `MT` macro to trigger Enter on tap and right
shift when held.
This keymap sets the `PREVENT_STUCK_MODIFIERS` flag to avoid the occasional WTF
moments when using a modifier keys and accidentally releasing them after moving
to a new layer.

View file

@ -1,6 +1,3 @@
# Please remove if no longer applicable
$(warning THIS FILE MAY BE TOO LARGE FOR YOUR KEYBOARD)
$(warning Please disable some options in the Makefile to resolve)
# Build Options
@ -10,7 +7,7 @@ $(warning Please disable some options in the Makefile to resolve)
BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE = yes # Console for debug(+400)
CONSOLE_ENABLE = no # Console for debug(+400)
COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality

View file

@ -81,6 +81,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* prevent the modifiers from being stuck, sacrificing some memory */
#define PREVENT_STUCK_MODIFIERS
/* A larger buffer for the dynamic macros as this keymap is not taking
* up that much memory.
*/
#define DYNAMIC_MACRO_SIZE 256
#ifdef SUBPROJECT_rev3
#include "rev3/config.h"
#endif

View file

@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_PPG] = { /* Pure Pro: Gaming */
{_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
{_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
{_______, _______, _______, _______, _______, _______, _______, _______, _______, DF(_RS), _______, _______},
{_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
{_______, _______, XXXXXXX, _______, KM_RS , _______, _______, KM_LW , _______, _______, _______, _______},
},
[_NM] = { /* Numeric */
@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
{_______, _______, KC_LGUI, KC_LALT, _______, _______, _______, _______, _______, _______, _______, _______}
},
[_DYN]= { /* special */
{_______, DYN_REC_START1, DYN_MACRO_PLAY1, _______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, KC_PAUS},
{_______, DYN_REC_START1, DYN_MACRO_PLAY1, _______, _______, _______, _______, KC_APP, KC_INS, _______, KC_PSCR, KC_PAUS},
{_______, DYN_REC_START2, DYN_MACRO_PLAY2, _______, _______, _______, _______, _______, _______, KC_CAPS, KC_SLCK, KC_NLCK},
{KM_SHLK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
{_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}