From c0f4dbb34baaa0b74c76522b8f55f40e9204d310 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 25 Mar 2019 13:22:42 -0700 Subject: [PATCH 001/429] Add brandonschlack userspace --- users/brandonschlack/brandonschlack.c | 20 ++++++++++++++++++++ users/brandonschlack/brandonschlack.h | 20 ++++++++++++++++++++ users/brandonschlack/rules.mk | 1 + 3 files changed, 41 insertions(+) create mode 100644 users/brandonschlack/brandonschlack.c create mode 100644 users/brandonschlack/brandonschlack.h create mode 100644 users/brandonschlack/rules.mk diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c new file mode 100644 index 000000000000..9ce4640561fa --- /dev/null +++ b/users/brandonschlack/brandonschlack.c @@ -0,0 +1,20 @@ +#include "brandonschlack.h" + +__attribute__ ((weak)) +bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { + return true; +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case LAUNCHPAD: // Launchpad: Sends as APP+F4, karabiner interprets as fn+F4 -> launchpad + if (record->event.pressed) { + register_code16(KC_APP); + tap_code16(KC_F4); + } else { + clear_keyboard(); + } + break; + } + return process_record_keymap(keycode, record); +} diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h new file mode 100644 index 000000000000..f539310814a6 --- /dev/null +++ b/users/brandonschlack/brandonschlack.h @@ -0,0 +1,20 @@ +#ifndef USERSPACE +#define USERSPACE + +#include "quantum.h" + +// Define layer names +#define BASE 0 +#define FUNCT 1 + +// Macros +enum macos_keycodes { + LAUNCHPAD = SAFE_RANGE, +}; + +// Useful Defines +#define FN_CAPS LT(FUNCT, KC_CAPS) +// MacOS +#define SLP_DSPLY LCTL(LSFT(KC_POWER)) + +#endif diff --git a/users/brandonschlack/rules.mk b/users/brandonschlack/rules.mk new file mode 100644 index 000000000000..0cc2c9f8cf99 --- /dev/null +++ b/users/brandonschlack/rules.mk @@ -0,0 +1 @@ +SRC += brandonschlack.c From d25a6d191c1e18497f69a0e9ac86d5ff6423958f Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 25 Mar 2019 13:23:02 -0700 Subject: [PATCH 002/429] Added brandonschlack whitefox layout --- .../whitefox/keymaps/brandonschlack/config.h | 3 + .../whitefox/keymaps/brandonschlack/keymap.c | 58 +++++++++++++++++++ .../whitefox/keymaps/brandonschlack/rules.mk | 8 +++ 3 files changed, 69 insertions(+) create mode 100644 keyboards/whitefox/keymaps/brandonschlack/config.h create mode 100644 keyboards/whitefox/keymaps/brandonschlack/keymap.c create mode 100644 keyboards/whitefox/keymaps/brandonschlack/rules.mk diff --git a/keyboards/whitefox/keymaps/brandonschlack/config.h b/keyboards/whitefox/keymaps/brandonschlack/config.h new file mode 100644 index 000000000000..a64261ba9d1a --- /dev/null +++ b/keyboards/whitefox/keymaps/brandonschlack/config.h @@ -0,0 +1,3 @@ +#pragma once + +#define TAPPING_TOGGLE 2 diff --git a/keyboards/whitefox/keymaps/brandonschlack/keymap.c b/keyboards/whitefox/keymaps/brandonschlack/keymap.c new file mode 100644 index 000000000000..c0b400dc931b --- /dev/null +++ b/keyboards/whitefox/keymaps/brandonschlack/keymap.c @@ -0,0 +1,58 @@ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Layer N: Blank Template + * ,---------------------------------------------------------------. + * | | | | | | | | | | | | | | | | | + * |---------------------------------------------------------------| + * | | | | | | | | | | | | | | | | + * |---------------------------------------------------------------| + * | | | | | | | | | | | | | | | + * |---------------------------------------------------------------| + * | | | | | | | | | | | | | | | + * |---------------------------------------------------------------| + * | | | | | | | | | | | + * `---------------------------------------------------------------' + */ + /* Keymap BASE: Base Layer + * ,---------------------------------------------------------------. + * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| `|Hom| + * |---------------------------------------------------------------| + * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]|Backs|End| + * |---------------------------------------------------------------| + * |FnCaps| A| S| D| F| G| H| J| K| L| ;| '|Enter |PgU| + * |---------------------------------------------------------------| + * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |PgD| + * |---------------------------------------------------------------| + * |Ctrl|Alt |Gui | Space |Gui |Fn | |Lef|Dow|Rig| + * `---------------------------------------------------------------' + */ + [BASE] = LAYOUT_truefox(\ + 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_GRV, KC_BSLS, KC_HOME,\ + 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, KC_END,\ + FN_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_PGUP,\ + 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_UP, KC_PGDN,\ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, TT(FUNCT), KC_LEFT, KC_DOWN, KC_RGHT\ + ), + /* Keymap FUNCT: Function Layer + * ,---------------------------------------------------------------. + * |RST| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|F13|F14|F15| + * |---------------------------------------------------------------| + * | | | | | | | | | | |Ply|Prv|Nxt| Del|Mut| + * |---------------------------------------------------------------| + * | | | | | | | | | |LHP| | | |VlU| + * |---------------------------------------------------------------| + * | | | | | | | | | | | | | |VlD| + * |---------------------------------------------------------------| + * | | | | SLP_DSPLY | | | | | | | + * `---------------------------------------------------------------' + */ + [FUNCT] = LAYOUT_truefox(\ + RESET, 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_F13, KC_F14, KC_F15,\ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MRWD, KC_MFFD, KC_DEL, KC__MUTE,\ + _______, _______, _______, _______, _______, _______, _______, _______, _______, LAUNCHPAD, _______, _______, _______, KC_VOLU,\ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD,\ + _______, _______, _______, SLP_DSPLY, _______, _______, _______, _______, _______\ + ), +}; diff --git a/keyboards/whitefox/keymaps/brandonschlack/rules.mk b/keyboards/whitefox/keymaps/brandonschlack/rules.mk new file mode 100644 index 000000000000..056859ef0c19 --- /dev/null +++ b/keyboards/whitefox/keymaps/brandonschlack/rules.mk @@ -0,0 +1,8 @@ +BOOTMAGIC_ENABLE = yes +COMMAND_ENABLE = yes # Commands for debug and configuration +CONSOLE_ENABLE = yes +EXTRAKEY_ENABLE = yes # Audio control and System control +MOUSEKEY_ENABLE = yes # Mouse keys +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # No backlights installed +VISUALIZER_ENABLE = no # No backlights installed From b58da8265133dea0c410dded302d4c1a44947aa1 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 25 Mar 2019 13:45:15 -0700 Subject: [PATCH 003/429] Move media keys, f13-f15, slp_dsply for whitefox --- keyboards/whitefox/keymaps/brandonschlack/keymap.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/keyboards/whitefox/keymaps/brandonschlack/keymap.c b/keyboards/whitefox/keymaps/brandonschlack/keymap.c index c0b400dc931b..b3a5a920ee29 100644 --- a/keyboards/whitefox/keymaps/brandonschlack/keymap.c +++ b/keyboards/whitefox/keymaps/brandonschlack/keymap.c @@ -37,22 +37,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Keymap FUNCT: Function Layer * ,---------------------------------------------------------------. - * |RST| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|F13|F14|F15| + * |RST| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| | |SLP| * |---------------------------------------------------------------| - * | | | | | | | | | | |Ply|Prv|Nxt| Del|Mut| + * | | | | | | | | | | |F13|F14|F15| Del|Mut| * |---------------------------------------------------------------| * | | | | | | | | | |LHP| | | |VlU| * |---------------------------------------------------------------| - * | | | | | | | | | | | | | |VlD| + * | | | | | | | | |Prv|Nxt|Ply| | |VlD| * |---------------------------------------------------------------| * | | | | SLP_DSPLY | | | | | | | * `---------------------------------------------------------------' */ [FUNCT] = LAYOUT_truefox(\ - RESET, 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_F13, KC_F14, KC_F15,\ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MRWD, KC_MFFD, KC_DEL, KC__MUTE,\ + RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, SLP_DSPLY,\ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, KC__MUTE,\ _______, _______, _______, _______, _______, _______, _______, _______, _______, LAUNCHPAD, _______, _______, _______, KC_VOLU,\ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD,\ - _______, _______, _______, SLP_DSPLY, _______, _______, _______, _______, _______\ + _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, _______, KC_VOLD,\ + _______, _______, _______, _______, _______, _______, _______, _______, _______\ ), }; From 0b9552d799d691bb5b244fba3e5d6bfab80b3fc7 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 26 Mar 2019 12:42:37 -0700 Subject: [PATCH 004/429] Refactor SLP_DSPLY to MC_SLPD --- keyboards/whitefox/keymaps/brandonschlack/keymap.c | 4 ++-- users/brandonschlack/brandonschlack.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/whitefox/keymaps/brandonschlack/keymap.c b/keyboards/whitefox/keymaps/brandonschlack/keymap.c index b3a5a920ee29..99d3ab700cf0 100644 --- a/keyboards/whitefox/keymaps/brandonschlack/keymap.c +++ b/keyboards/whitefox/keymaps/brandonschlack/keymap.c @@ -45,11 +45,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | | | | | |Prv|Nxt|Ply| | |VlD| * |---------------------------------------------------------------| - * | | | | SLP_DSPLY | | | | | | | + * | | | | | | | | | | | * `---------------------------------------------------------------' */ [FUNCT] = LAYOUT_truefox(\ - RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, SLP_DSPLY,\ + RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, MC_SLPD,\ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, KC__MUTE,\ _______, _______, _______, _______, _______, _______, _______, _______, _______, LAUNCHPAD, _______, _______, _______, KC_VOLU,\ _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, _______, KC_VOLD,\ diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index f539310814a6..92c12fc70b03 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -15,6 +15,6 @@ enum macos_keycodes { // Useful Defines #define FN_CAPS LT(FUNCT, KC_CAPS) // MacOS -#define SLP_DSPLY LCTL(LSFT(KC_POWER)) +#define MC_SLPD LCTL(LSFT(KC_POWER)) #endif From b25f0a49b13ae27aa6ac859e10175ec1dc4ff3f1 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 26 Mar 2019 13:42:46 -0700 Subject: [PATCH 005/429] Refactor LAUNCHPAD to KC_LHPD --- keyboards/whitefox/keymaps/brandonschlack/keymap.c | 2 +- users/brandonschlack/brandonschlack.c | 2 +- users/brandonschlack/brandonschlack.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/whitefox/keymaps/brandonschlack/keymap.c b/keyboards/whitefox/keymaps/brandonschlack/keymap.c index 99d3ab700cf0..6698a47294f5 100644 --- a/keyboards/whitefox/keymaps/brandonschlack/keymap.c +++ b/keyboards/whitefox/keymaps/brandonschlack/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [FUNCT] = LAYOUT_truefox(\ RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, MC_SLPD,\ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, KC__MUTE,\ - _______, _______, _______, _______, _______, _______, _______, _______, _______, LAUNCHPAD, _______, _______, _______, KC_VOLU,\ + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LHPD, _______, _______, _______, KC_VOLU,\ _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, _______, KC_VOLD,\ _______, _______, _______, _______, _______, _______, _______, _______, _______\ ), diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index 9ce4640561fa..4ffe95dd69b1 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -7,7 +7,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case LAUNCHPAD: // Launchpad: Sends as APP+F4, karabiner interprets as fn+F4 -> launchpad + case KC_LHPD: // Launchpad: Sends as APP+F4, karabiner interprets as fn+F4 -> launchpad if (record->event.pressed) { register_code16(KC_APP); tap_code16(KC_F4); diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 92c12fc70b03..81503d1938ca 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -9,7 +9,7 @@ // Macros enum macos_keycodes { - LAUNCHPAD = SAFE_RANGE, + KC_LHPD = SAFE_RANGE, }; // Useful Defines From 8c534edd67fa621d6022dacf846343d1aa94863c Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 26 Mar 2019 14:14:17 -0700 Subject: [PATCH 006/429] Added MC_LHPD for Launchpad, still needs karabiner --- keyboards/whitefox/keymaps/brandonschlack/keymap.c | 2 +- users/brandonschlack/brandonschlack.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/keyboards/whitefox/keymaps/brandonschlack/keymap.c b/keyboards/whitefox/keymaps/brandonschlack/keymap.c index 6698a47294f5..c17aad76247d 100644 --- a/keyboards/whitefox/keymaps/brandonschlack/keymap.c +++ b/keyboards/whitefox/keymaps/brandonschlack/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [FUNCT] = LAYOUT_truefox(\ RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, MC_SLPD,\ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, KC__MUTE,\ - _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LHPD, _______, _______, _______, KC_VOLU,\ + _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_LHPD, _______, _______, _______, KC_VOLU,\ _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, _______, KC_VOLD,\ _______, _______, _______, _______, _______, _______, _______, _______, _______\ ), diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 81503d1938ca..a03d427d564d 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -15,6 +15,7 @@ enum macos_keycodes { // Useful Defines #define FN_CAPS LT(FUNCT, KC_CAPS) // MacOS -#define MC_SLPD LCTL(LSFT(KC_POWER)) +#define MC_SLPD LCTL(LSFT(KC_POWER)) // Sleep Display +#define MC_LHPD HYPR(KC_F4) // Launchpad: Configure karabiner for HYPER -> fn #endif From 9b826e63652d8b2ff0ad7cf8f1f1dfc7ac6616f5 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 26 Mar 2019 14:16:09 -0700 Subject: [PATCH 007/429] Added initial massdrop/alt keymap, copied from mac --- .../alt/keymaps/brandonschlack/keymap.c | 215 ++++++++++++++++++ 1 file changed, 215 insertions(+) create mode 100644 keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c new file mode 100644 index 000000000000..fbf512ed952a --- /dev/null +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -0,0 +1,215 @@ +#include QMK_KEYBOARD_H + +enum alt_keycodes { + L_BRI = SAFE_RANGE, //LED Brightness Increase + L_BRD, //LED Brightness Decrease + L_PTN, //LED Pattern Select Next + L_PTP, //LED Pattern Select Previous + L_PSI, //LED Pattern Speed Increase + L_PSD, //LED Pattern Speed Decrease + L_T_MD, //LED Toggle Mode + L_T_ONF, //LED Toggle On / Off + L_ON, //LED On + L_OFF, //LED Off + L_T_BR, //LED Toggle Breath Effect + L_T_PTD, //LED Toggle Scrolling Pattern Direction + U_T_AUTO, //USB Extra Port Toggle Auto Detect / Always Active + U_T_AGCR, //USB Toggle Automatic GCR control + DBG_TOG, //DEBUG Toggle On / Off + DBG_MTRX, //DEBUG Toggle Matrix Prints + DBG_KBD, //DEBUG Toggle Keyboard Prints + DBG_MOU, //DEBUG Toggle Mouse Prints + MD_BOOT, //Restart into bootloader after hold timeout +}; + +#define TG_NKRO MAGIC_TOGGLE_NKRO //Toggle 6KRO / NKRO mode + +keymap_config_t keymap_config; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Layer 0: Base Layer + * ,---------------------------------------------------------------. + * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| Backs|Del| + * |---------------------------------------------------------------| + * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \|Hom| + * |---------------------------------------------------------------| + * |CapsL | A| S| D| F| G| H| J| K| L| ;| '|Enter |PgU| + * |---------------------------------------------------------------| + * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |PgD| + * |---------------------------------------------------------------| + * |Ctrl|Alt |Gui | Space |Gui |Fn1 | |Lef|Dow|Rig| + * `---------------------------------------------------------------' + */ + [0] = LAYOUT( + 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_DEL, \ + 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_HOME, \ + 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_PGUP, \ + 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_UP, KC_PGDN, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RGHT \ + ), + /* Layer 1: Function Layer + * ,---------------------------------------------------------------. + * | `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| |Mut| + * |---------------------------------------------------------------| + * |LBr |LS-|LB+|LS+| | | |UAT|GCR| |Prt|SLk|Brk| |End| + * |---------------------------------------------------------------| + * |LPD |LP-|LB-|LP+| | | | | | | | | |VlU| + * |---------------------------------------------------------------| + * | |LTM|LTO| | |DFU|KRO| | | | | |PgU|VlD| + * |---------------------------------------------------------------| + * | | | | | | | |Hom|PgD|End| + * `---------------------------------------------------------------' + */ + [1] = LAYOUT( + 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_TRNS, KC_MUTE, \ + L_T_BR, L_PSD, L_BRI, L_PSI, KC_TRNS, KC_TRNS, KC_TRNS, U_T_AUTO,U_T_AGCR,KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_END, \ + L_T_PTD, L_PTP, L_BRD, L_PTN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, \ + KC_TRNS, L_T_MD, L_T_ONF, KC_TRNS, KC_TRNS, MD_BOOT, TG_NKRO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_VOLD, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END \ + ), + /* + [X] = LAYOUT( + 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, KC_TRNS, KC_TRNS \ + ), + */ +}; + +// Runs just one time when the keyboard initializes. +void matrix_init_user(void) { +}; + +// Runs constantly in the background, in a loop. +void matrix_scan_user(void) { +}; + +#define MODS_SHIFT (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT)) +#define MODS_CTRL (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL)) +#define MODS_ALT (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT)) + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + static uint32_t key_timer; + + switch (keycode) { + case L_BRI: + if (record->event.pressed) { + if (LED_GCR_STEP > LED_GCR_MAX - gcr_desired) gcr_desired = LED_GCR_MAX; + else gcr_desired += LED_GCR_STEP; + if (led_animation_breathing) gcr_breathe = gcr_desired; + } + return false; + case L_BRD: + if (record->event.pressed) { + if (LED_GCR_STEP > gcr_desired) gcr_desired = 0; + else gcr_desired -= LED_GCR_STEP; + if (led_animation_breathing) gcr_breathe = gcr_desired; + } + return false; + case L_PTN: + if (record->event.pressed) { + if (led_animation_id == led_setups_count - 1) led_animation_id = 0; + else led_animation_id++; + } + return false; + case L_PTP: + if (record->event.pressed) { + if (led_animation_id == 0) led_animation_id = led_setups_count - 1; + else led_animation_id--; + } + return false; + case L_PSI: + if (record->event.pressed) { + led_animation_speed += ANIMATION_SPEED_STEP; + } + return false; + case L_PSD: + if (record->event.pressed) { + led_animation_speed -= ANIMATION_SPEED_STEP; + if (led_animation_speed < 0) led_animation_speed = 0; + } + return false; + case L_T_MD: + if (record->event.pressed) { + led_lighting_mode++; + if (led_lighting_mode > LED_MODE_MAX_INDEX) led_lighting_mode = LED_MODE_NORMAL; + } + return false; + case L_T_ONF: + if (record->event.pressed) { + led_enabled = !led_enabled; + I2C3733_Control_Set(led_enabled); + } + return false; + case L_ON: + if (record->event.pressed) { + led_enabled = 1; + I2C3733_Control_Set(led_enabled); + } + return false; + case L_OFF: + if (record->event.pressed) { + led_enabled = 0; + I2C3733_Control_Set(led_enabled); + } + return false; + case L_T_BR: + if (record->event.pressed) { + led_animation_breathing = !led_animation_breathing; + if (led_animation_breathing) { + gcr_breathe = gcr_desired; + led_animation_breathe_cur = BREATHE_MIN_STEP; + breathe_dir = 1; + } + } + return false; + case L_T_PTD: + if (record->event.pressed) { + led_animation_direction = !led_animation_direction; + } + return false; + case U_T_AUTO: + if (record->event.pressed && MODS_SHIFT && MODS_CTRL) { + TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode"); + } + return false; + case U_T_AGCR: + if (record->event.pressed && MODS_SHIFT && MODS_CTRL) { + TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode"); + } + return false; + case DBG_TOG: + if (record->event.pressed) { + TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode"); + } + return false; + case DBG_MTRX: + if (record->event.pressed) { + TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix"); + } + return false; + case DBG_KBD: + if (record->event.pressed) { + TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard"); + } + return false; + case DBG_MOU: + if (record->event.pressed) { + TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse"); + } + return false; + case MD_BOOT: + if (record->event.pressed) { + key_timer = timer_read32(); + } else { + if (timer_elapsed32(key_timer) >= 500) { + reset_keyboard(); + } + } + return false; + default: + return true; //Process all other keycodes normally + } +} From 4c0bad271b14603d5375a5281580ec99cf2f3229 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 26 Mar 2019 14:57:08 -0700 Subject: [PATCH 008/429] Added F13-F15 keys to layer 1 --- keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index fbf512ed952a..6364b6ce53bc 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,---------------------------------------------------------------. * | `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| |Mut| * |---------------------------------------------------------------| - * |LBr |LS-|LB+|LS+| | | |UAT|GCR| |Prt|SLk|Brk| |End| + * |LBr |LS-|LB+|LS+| | | |UAT|GCR| |F13|F14|F15| |End| * |---------------------------------------------------------------| * |LPD |LP-|LB-|LP+| | | | | | | | | |VlU| * |---------------------------------------------------------------| @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [1] = LAYOUT( 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_TRNS, KC_MUTE, \ - L_T_BR, L_PSD, L_BRI, L_PSI, KC_TRNS, KC_TRNS, KC_TRNS, U_T_AUTO,U_T_AGCR,KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_END, \ + L_T_BR, L_PSD, L_BRI, L_PSI, KC_TRNS, KC_TRNS, KC_TRNS, U_T_AUTO,U_T_AGCR,KC_TRNS, KC_F13, KC_F14, KC_F15, KC_TRNS, KC_END, \ L_T_PTD, L_PTP, L_BRD, L_PTN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, \ KC_TRNS, L_T_MD, L_T_ONF, KC_TRNS, KC_TRNS, MD_BOOT, TG_NKRO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_VOLD, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END \ From 06c87841b3242f29416ba0649b31549a365c4abe Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Tue, 26 Mar 2019 23:11:03 -0700 Subject: [PATCH 009/429] Use NEW_SAFE_RANGE, add userspace to massdrop/alt --- .../alt/keymaps/brandonschlack/keymap.c | 41 ++++++++++--------- users/brandonschlack/brandonschlack.h | 3 +- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index 6364b6ce53bc..19b914070d91 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -1,25 +1,26 @@ #include QMK_KEYBOARD_H +#include "brandonschlack.h" enum alt_keycodes { - L_BRI = SAFE_RANGE, //LED Brightness Increase - L_BRD, //LED Brightness Decrease - L_PTN, //LED Pattern Select Next - L_PTP, //LED Pattern Select Previous - L_PSI, //LED Pattern Speed Increase - L_PSD, //LED Pattern Speed Decrease - L_T_MD, //LED Toggle Mode - L_T_ONF, //LED Toggle On / Off - L_ON, //LED On - L_OFF, //LED Off - L_T_BR, //LED Toggle Breath Effect - L_T_PTD, //LED Toggle Scrolling Pattern Direction - U_T_AUTO, //USB Extra Port Toggle Auto Detect / Always Active - U_T_AGCR, //USB Toggle Automatic GCR control - DBG_TOG, //DEBUG Toggle On / Off - DBG_MTRX, //DEBUG Toggle Matrix Prints - DBG_KBD, //DEBUG Toggle Keyboard Prints - DBG_MOU, //DEBUG Toggle Mouse Prints - MD_BOOT, //Restart into bootloader after hold timeout + L_BRI = KEYMAP_SAFE_RANGE, //LED Brightness Increase + L_BRD, //LED Brightness Decrease + L_PTN, //LED Pattern Select Next + L_PTP, //LED Pattern Select Previous + L_PSI, //LED Pattern Speed Increase + L_PSD, //LED Pattern Speed Decrease + L_T_MD, //LED Toggle Mode + L_T_ONF, //LED Toggle On / Off + L_ON, //LED On + L_OFF, //LED Off + L_T_BR, //LED Toggle Breath Effect + L_T_PTD, //LED Toggle Scrolling Pattern Direction + U_T_AUTO, //USB Extra Port Toggle Auto Detect / Always Active + U_T_AGCR, //USB Toggle Automatic GCR control + DBG_TOG, //DEBUG Toggle On / Off + DBG_MTRX, //DEBUG Toggle Matrix Prints + DBG_KBD, //DEBUG Toggle Keyboard Prints + DBG_MOU, //DEBUG Toggle Mouse Prints + MD_BOOT, //Restart into bootloader after hold timeout }; #define TG_NKRO MAGIC_TOGGLE_NKRO //Toggle 6KRO / NKRO mode @@ -90,7 +91,7 @@ void matrix_scan_user(void) { #define MODS_CTRL (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL)) #define MODS_ALT (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT)) -bool process_record_user(uint16_t keycode, keyrecord_t *record) { +bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { static uint32_t key_timer; switch (keycode) { diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index a03d427d564d..278613d79895 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -8,8 +8,9 @@ #define FUNCT 1 // Macros -enum macos_keycodes { +enum custom_keycodes { KC_LHPD = SAFE_RANGE, + KEYMAP_SAFE_RANGE }; // Useful Defines From 9a6d7cde3d02c57a18f507bd62306a7218e3004b Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Tue, 26 Mar 2019 23:24:23 -0700 Subject: [PATCH 010/429] Added media, macOS keycodes to massdrop/alt --- .../massdrop/alt/keymaps/brandonschlack/keymap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index 19b914070d91..30bb62d9c811 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -50,22 +50,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Layer 1: Function Layer * ,---------------------------------------------------------------. - * | `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| |Mut| + * | `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| SLPD|Mut| * |---------------------------------------------------------------| - * |LBr |LS-|LB+|LS+| | | |UAT|GCR| |F13|F14|F15| |End| + * |LBr |LS-|LB+|LS+| | | |UAT|GCR| |F13|F14|F15| LHP|End| * |---------------------------------------------------------------| * |LPD |LP-|LB-|LP+| | | | | | | | | |VlU| * |---------------------------------------------------------------| - * | |LTM|LTO| | |DFU|KRO| | | | | |PgU|VlD| + * | |LTM|LTO| | |DFU|KRO| |Prv|Nxt|Ply| |PgU|VlD| * |---------------------------------------------------------------| * | | | | | | | |Hom|PgD|End| * `---------------------------------------------------------------' */ [1] = LAYOUT( - 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_TRNS, KC_MUTE, \ - L_T_BR, L_PSD, L_BRI, L_PSI, KC_TRNS, KC_TRNS, KC_TRNS, U_T_AUTO,U_T_AGCR,KC_TRNS, KC_F13, KC_F14, KC_F15, KC_TRNS, KC_END, \ + 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, MC_SLPD, KC_MUTE, \ + L_T_BR, L_PSD, L_BRI, L_PSI, KC_TRNS, KC_TRNS, KC_TRNS, U_T_AUTO,U_T_AGCR,KC_TRNS, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ L_T_PTD, L_PTP, L_BRD, L_PTN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, \ - KC_TRNS, L_T_MD, L_T_ONF, KC_TRNS, KC_TRNS, MD_BOOT, TG_NKRO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_VOLD, \ + KC_TRNS, L_T_MD, L_T_ONF, KC_TRNS, KC_TRNS, MD_BOOT, TG_NKRO, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_TRNS, KC_PGUP, KC_VOLD, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END \ ), /* From 7ba7d26920e316bb8da2e946e21d18e17afaa16f Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 28 Mar 2019 13:21:56 -0700 Subject: [PATCH 011/429] [User] Move config from whitefox keymap into user --- keyboards/whitefox/keymaps/brandonschlack/config.h | 3 --- users/brandonschlack/brandonschlack.h | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 keyboards/whitefox/keymaps/brandonschlack/config.h diff --git a/keyboards/whitefox/keymaps/brandonschlack/config.h b/keyboards/whitefox/keymaps/brandonschlack/config.h deleted file mode 100644 index a64261ba9d1a..000000000000 --- a/keyboards/whitefox/keymaps/brandonschlack/config.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#define TAPPING_TOGGLE 2 diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 278613d79895..a508fe535487 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -7,6 +7,10 @@ #define BASE 0 #define FUNCT 1 +// Config +#define TAPPING_TOGGLE 2 +#define PERMISSIVE_HOLD + // Macros enum custom_keycodes { KC_LHPD = SAFE_RANGE, From e7f24e520f2eb6e346d5418963b9db83cc6a6523 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 28 Mar 2019 13:22:53 -0700 Subject: [PATCH 012/429] [User] Add define for HY_CAPS (Hyper Caps Lock) --- users/brandonschlack/brandonschlack.h | 1 + 1 file changed, 1 insertion(+) diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index a508fe535487..05de983d6d45 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -19,6 +19,7 @@ enum custom_keycodes { // Useful Defines #define FN_CAPS LT(FUNCT, KC_CAPS) +#define HY_CAPS ALL_T(KC_CAPS) // MacOS #define MC_SLPD LCTL(LSFT(KC_POWER)) // Sleep Display #define MC_LHPD HYPR(KC_F4) // Launchpad: Configure karabiner for HYPER -> fn From 608ed2361f0ced62d14cfb5f2783ced014f072dc Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 28 Mar 2019 13:24:09 -0700 Subject: [PATCH 013/429] [Keymaps] Add custom led programs for massdrop/alt --- .../brandonschlack/led_programs_user.c | 115 ++++++++++++++++++ .../alt/keymaps/brandonschlack/rules.mk | 33 +++++ 2 files changed, 148 insertions(+) create mode 100644 keyboards/massdrop/alt/keymaps/brandonschlack/led_programs_user.c create mode 100644 keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/led_programs_user.c b/keyboards/massdrop/alt/keymaps/brandonschlack/led_programs_user.c new file mode 100644 index 000000000000..2a38e3afcb70 --- /dev/null +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/led_programs_user.c @@ -0,0 +1,115 @@ +/* +Copyright 2018 Massdrop Inc. + +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 . +*/ + +#include "alt.h" +#include "led_matrix.h" + +//GMK Laser +led_setup_t leds_gmk_laser[] = { + { .hs = 0, .he = 33, .rs = 148, .re = 148, .gs = 0, .ge = 0, .bs = 211, .be = 211, .ef = EF_NONE }, + { .hs = 33, .he = 66, .rs = 148, .re = 212, .gs = 0, .ge = 36, .bs = 211, .be = 80, .ef = EF_NONE }, + { .hs = 66, .he = 100, .rs = 212, .re = 212, .gs = 36, .ge = 36, .bs = 80, .be = 80, .ef = EF_NONE }, + { .end = 1 }, +}; + +//GMK Laser +led_setup_t leds_gmk_laser_scroll[] = { + { .hs = 0, .he = 100, .rs = 148, .re = 148, .gs = 0, .ge = 0, .bs = 211, .be = 211, .ef = EF_NONE }, + { .hs = 0, .he = 15, .rs = 148, .re = 212, .gs = 0, .ge = 36, .bs = 211, .be = 80, .ef = EF_OVER | EF_SCR_R }, + { .hs = 15, .he = 30, .rs = 212, .re = 148, .gs = 36, .ge = 0, .bs = 80, .be = 211, .ef = EF_OVER | EF_SCR_R }, + { .end = 1 }, +}; + +//White with moving red stripe +led_setup_t leds_white_with_red_stripe[] = { + { .hs = 0, .he = 100, .rs = 255, .re = 255, .gs = 255, .ge = 255, .bs = 255, .be = 255, .ef = EF_NONE }, + { .hs = 0, .he = 15, .rs = 0, .re = 0, .gs = 0, .ge = 255, .bs = 0, .be = 255, .ef = EF_SCR_R | EF_SUBTRACT }, + { .hs = 15, .he = 30, .rs = 0, .re = 0, .gs = 255, .ge = 0, .bs = 255, .be = 0, .ef = EF_SCR_R | EF_SUBTRACT }, + { .end = 1 }, +}; + +//Yellow +led_setup_t leds_yellow[] = { + { .hs = 0, .he = 100, .rs = 255, .re = 255, .gs = 255, .ge = 255, .bs = 0, .be = 0, .ef = EF_NONE }, + { .end = 1 }, +}; + +//Off +led_setup_t leds_off[] = { + { .hs = 0, .he = 100, .rs = 0, .re = 0, .gs = 0, .ge = 0, .bs = 0, .be = 0, .ef = EF_NONE }, + { .end = 1 }, +}; + +//Red +led_setup_t leds_red[] = { + { .hs = 0, .he = 100, .rs = 255, .re = 255, .gs = 0, .ge = 0, .bs = 0, .be = 0, .ef = EF_NONE }, + { .end = 1 }, +}; + +//Green +led_setup_t leds_green[] = { + { .hs = 0, .he = 100, .rs = 0, .re = 0, .gs = 255, .ge = 255, .bs = 0, .be = 0, .ef = EF_NONE }, + { .end = 1 }, +}; + +//Blue +led_setup_t leds_blue[] = { + { .hs = 0, .he = 100, .rs = 0, .re = 0, .gs = 0, .ge = 0, .bs = 255, .be = 255, .ef = EF_NONE }, + { .end = 1 }, +}; + +//Purple +led_setup_t leds_purple[] = { + { .hs = 0, .he = 100, .rs = 148, .re = 148, .gs = 0, .ge = 0, .bs = 211, .be = 211, .ef = EF_NONE }, + { .end = 1 }, +}; + +//White +led_setup_t leds_white[] = { + { .hs = 0, .he = 100, .rs = 255, .re = 255, .gs = 255, .ge = 255, .bs = 255, .be = 255, .ef = EF_NONE }, + { .end = 1 }, +}; + +//Black with moving purple stripe +led_setup_t leds_black_with_purple_stripe[] = { + { .hs = 0, .he = 15, .rs = 0, .re = 148, .gs = 0, .ge = 0, .bs = 0, .be = 211, .ef = EF_SCR_R }, + { .hs = 15, .he = 30, .rs = 148, .re = 0, .gs = 0, .ge = 0, .bs = 211, .be = 0, .ef = EF_SCR_R }, + { .end = 1 }, +}; + +//Black with moving red stripe +led_setup_t leds_black_with_red_stripe[] = { + { .hs = 0, .he = 15, .rs = 0, .re = 255, .gs = 0, .ge = 0, .bs = 0, .be = 0, .ef = EF_SCR_R }, + { .hs = 15, .he = 30, .rs = 255, .re = 0, .gs = 0, .ge = 0, .bs = 0, .be = 0, .ef = EF_SCR_R }, + { .end = 1 }, +}; + +//Add new LED animations here using one from above as example +//The last entry must be { .end = 1 } +//Add the new animation name to the list below following its format + +void *led_setups[] = { + leds_gmk_laser, + leds_gmk_laser_scroll, + leds_purple, + leds_white, + leds_black_with_purple_stripe, + leds_black_with_red_stripe, + leds_off +}; + +const uint8_t led_setups_count = sizeof(led_setups) / sizeof(led_setups[0]); diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk b/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk new file mode 100644 index 000000000000..583cb9c9fb2d --- /dev/null +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk @@ -0,0 +1,33 @@ +# project specific files +SRC = led_programs_user.c +SRC += matrix.c + +#For platform and packs +ARM_ATSAM = SAMD51J18A +MCU = cortex-m4 + +CUSTOM_MATRIX = yes + +# Build Options +# comment out to disable the options. +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = no # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400) +VIRTSER_ENABLE = no # USB Serial Driver +RAW_ENABLE = no # Raw device +AUTO_SHIFT_ENABLE = no # Auto Shift From 0568204376a68f4d025c4b0ef8d0a2898dc3a1b7 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 28 Mar 2019 13:25:13 -0700 Subject: [PATCH 014/429] [Keymaps] Add Hyper Caps Lock to massdrop/alt --- keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index 30bb62d9c811..7d3ed3425547 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \|Hom| * |---------------------------------------------------------------| - * |CapsL | A| S| D| F| G| H| J| K| L| ;| '|Enter |PgU| + * |HyCap | A| S| D| F| G| H| J| K| L| ;| '|Enter |PgU| * |---------------------------------------------------------------| * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |PgD| * |---------------------------------------------------------------| @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( 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_DEL, \ 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_HOME, \ - 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_PGUP, \ + HY_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_PGUP, \ 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_UP, KC_PGDN, \ KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RGHT \ ), From ed63b8e2c900d561a978536479cf056934e7d67e Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 3 Apr 2019 10:39:35 -0700 Subject: [PATCH 015/429] [User] Add macOS Mission Control define --- users/brandonschlack/brandonschlack.h | 1 + 1 file changed, 1 insertion(+) diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 05de983d6d45..ec4011548ab3 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -22,6 +22,7 @@ enum custom_keycodes { #define HY_CAPS ALL_T(KC_CAPS) // MacOS #define MC_SLPD LCTL(LSFT(KC_POWER)) // Sleep Display +#define MC_MSSN HYPR(KC_F3) // Mission Control: Configure karabiner for HYPER -> fn #define MC_LHPD HYPR(KC_F4) // Launchpad: Configure karabiner for HYPER -> fn #endif From f1f0e4cfd9dd1de190441715167087075a504c9e Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 3 Apr 2019 10:40:43 -0700 Subject: [PATCH 016/429] [Keymap] Add kbd67/hotswap keymap --- .../hotswap/keymaps/brandonschlack/config.h | 19 ++++++++ .../hotswap/keymaps/brandonschlack/keymap.c | 45 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/config.h create mode 100644 keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/config.h b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/config.h new file mode 100644 index 000000000000..26c6d6ade101 --- /dev/null +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/config.h @@ -0,0 +1,19 @@ +/* Copyright 2019 MechMerlin + * + * 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 . + */ + +#pragma once + +// place overrides here diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c new file mode 100644 index 000000000000..21928571c15b --- /dev/null +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -0,0 +1,45 @@ +/* Copyright 2019 MechMerlin + * + * 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 . + */ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT( + 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_GRV, KC_BSLS, KC_HOME, \ + 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, KC_END, \ + HY_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_PGUP, \ + 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_UP, KC_PGDN, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RGHT), + +[1] = LAYOUT( + RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F13, KC_F14, KC_F15, KC_DEL, KC__MUTE, \ + 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__VOLUP, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_PGUP, KC__VOLDOWN, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END ), +}; + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +void led_set_user(uint8_t usb_led) { + +} From b76411eeca2d93e6ede84fc762c8685bb8a663a0 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 3 Apr 2019 11:19:31 -0700 Subject: [PATCH 017/429] [Keymap] Update whitefox keymap --- .../whitefox/keymaps/brandonschlack/keymap.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/keyboards/whitefox/keymaps/brandonschlack/keymap.c b/keyboards/whitefox/keymaps/brandonschlack/keymap.c index c17aad76247d..7d0bea08e2c6 100644 --- a/keyboards/whitefox/keymaps/brandonschlack/keymap.c +++ b/keyboards/whitefox/keymaps/brandonschlack/keymap.c @@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]|Backs|End| * |---------------------------------------------------------------| - * |FnCaps| A| S| D| F| G| H| J| K| L| ;| '|Enter |PgU| + * |HyCaps| A| S| D| F| G| H| J| K| L| ;| '|Enter |PgU| * |---------------------------------------------------------------| * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |PgD| * |---------------------------------------------------------------| @@ -31,27 +31,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [BASE] = LAYOUT_truefox(\ 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_GRV, KC_BSLS, KC_HOME,\ 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, KC_END,\ - FN_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_PGUP,\ + HY_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_PGUP,\ 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_UP, KC_PGDN,\ KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, TT(FUNCT), KC_LEFT, KC_DOWN, KC_RGHT\ ), /* Keymap FUNCT: Function Layer * ,---------------------------------------------------------------. - * |RST| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| | |SLP| + * |RST| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|MSN|LHP|SLP| * |---------------------------------------------------------------| * | | | | | | | | | | |F13|F14|F15| Del|Mut| * |---------------------------------------------------------------| - * | | | | | | | | | |LHP| | | |VlU| + * | | | | | | | | | | | | | |VlU| * |---------------------------------------------------------------| - * | | | | | | | | |Prv|Nxt|Ply| | |VlD| + * | | | | | | | | |Prv|Nxt|Ply| |PgU|VlD| * |---------------------------------------------------------------| - * | | | | | | | | | | | + * | | | | | | | |Hom|PgD|End| * `---------------------------------------------------------------' */ [FUNCT] = LAYOUT_truefox(\ - RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, MC_SLPD,\ + RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD,\ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, KC__MUTE,\ - _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_LHPD, _______, _______, _______, KC_VOLU,\ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,\ _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, _______, KC_VOLD,\ _______, _______, _______, _______, _______, _______, _______, _______, _______\ ), From 5320522d44c9e4bf5472f5d365682243641120e3 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 3 Apr 2019 11:32:43 -0700 Subject: [PATCH 018/429] [User] Add macOS audio aliases --- .../kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c | 6 +++--- keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c | 6 +++--- keyboards/whitefox/keymaps/brandonschlack/keymap.c | 6 +++--- users/brandonschlack/brandonschlack.h | 4 ++++ 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index 21928571c15b..30ca2f026602 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -26,9 +26,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F13, KC_F14, KC_F15, KC_DEL, KC__MUTE, \ - 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__VOLUP, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_PGUP, KC__VOLDOWN, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F13, KC_F14, KC_F15, KC_DEL, MC_MUTE, \ + 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, MC_VOLU, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_PGUP, MC_VOLD, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END ), }; diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index 7d3ed3425547..7ed6e677f041 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -62,10 +62,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `---------------------------------------------------------------' */ [1] = LAYOUT( - 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, MC_SLPD, KC_MUTE, \ + 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, MC_SLPD, MC_MUTE, \ L_T_BR, L_PSD, L_BRI, L_PSI, KC_TRNS, KC_TRNS, KC_TRNS, U_T_AUTO,U_T_AGCR,KC_TRNS, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ - L_T_PTD, L_PTP, L_BRD, L_PTN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, \ - KC_TRNS, L_T_MD, L_T_ONF, KC_TRNS, KC_TRNS, MD_BOOT, TG_NKRO, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_TRNS, KC_PGUP, KC_VOLD, \ + L_T_PTD, L_PTP, L_BRD, L_PTN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MC_VOLU, \ + KC_TRNS, L_T_MD, L_T_ONF, KC_TRNS, KC_TRNS, MD_BOOT, TG_NKRO, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_TRNS, KC_PGUP, MC_VOLD, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END \ ), /* diff --git a/keyboards/whitefox/keymaps/brandonschlack/keymap.c b/keyboards/whitefox/keymaps/brandonschlack/keymap.c index 7d0bea08e2c6..a9e4ff7cde2a 100644 --- a/keyboards/whitefox/keymaps/brandonschlack/keymap.c +++ b/keyboards/whitefox/keymaps/brandonschlack/keymap.c @@ -50,9 +50,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [FUNCT] = LAYOUT_truefox(\ RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD,\ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, KC__MUTE,\ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,\ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, _______, KC_VOLD,\ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, MC_MUTE,\ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_VOLU,\ + _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, _______, MC_VOLD,\ _______, _______, _______, _______, _______, _______, _______, _______, _______\ ), }; diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index ec4011548ab3..95ddeb5c1c9c 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -24,5 +24,9 @@ enum custom_keycodes { #define MC_SLPD LCTL(LSFT(KC_POWER)) // Sleep Display #define MC_MSSN HYPR(KC_F3) // Mission Control: Configure karabiner for HYPER -> fn #define MC_LHPD HYPR(KC_F4) // Launchpad: Configure karabiner for HYPER -> fn +// MacOS Media Alias +#define MC_MUTE KC__MUTE +#define MC_VOLD KC__VOLDOWN +#define MC_VOLU KC__VOLUP #endif From 9a3f0ed1eb7df8aadd7733743948fa6b2d1883f8 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 3 Apr 2019 11:41:15 -0700 Subject: [PATCH 019/429] [Userspace] Change layer names --- .../kbd67/hotswap/keymaps/brandonschlack/keymap.c | 6 +++--- keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c | 6 +++--- keyboards/whitefox/keymaps/brandonschlack/keymap.c | 10 +++++----- users/brandonschlack/brandonschlack.h | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index 30ca2f026602..a2ef01fc9167 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -17,14 +17,14 @@ #include "brandonschlack.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT( +[BL] = LAYOUT( 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_GRV, KC_BSLS, KC_HOME, \ 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, KC_END, \ HY_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_PGUP, \ 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_UP, KC_PGDN, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RGHT), + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(FL), KC_LEFT, KC_DOWN, KC_RGHT), -[1] = LAYOUT( +[FL] = LAYOUT( RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F13, KC_F14, KC_F15, KC_DEL, MC_MUTE, \ 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, MC_VOLU, \ diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index 7ed6e677f041..266373009752 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -41,12 +41,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |Ctrl|Alt |Gui | Space |Gui |Fn1 | |Lef|Dow|Rig| * `---------------------------------------------------------------' */ - [0] = LAYOUT( + [BL] = LAYOUT( 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_DEL, \ 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_HOME, \ HY_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_PGUP, \ 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_UP, KC_PGDN, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(FL), KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Layer 1: Function Layer * ,---------------------------------------------------------------. @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | |Hom|PgD|End| * `---------------------------------------------------------------' */ - [1] = LAYOUT( + [FL] = LAYOUT( 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, MC_SLPD, MC_MUTE, \ L_T_BR, L_PSD, L_BRI, L_PSI, KC_TRNS, KC_TRNS, KC_TRNS, U_T_AUTO,U_T_AGCR,KC_TRNS, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ L_T_PTD, L_PTP, L_BRD, L_PTN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MC_VOLU, \ diff --git a/keyboards/whitefox/keymaps/brandonschlack/keymap.c b/keyboards/whitefox/keymaps/brandonschlack/keymap.c index a9e4ff7cde2a..b063f6e3e2c1 100644 --- a/keyboards/whitefox/keymaps/brandonschlack/keymap.c +++ b/keyboards/whitefox/keymaps/brandonschlack/keymap.c @@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | | | | * `---------------------------------------------------------------' */ - /* Keymap BASE: Base Layer + /* Keymap BL: Base Layer * ,---------------------------------------------------------------. * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| `|Hom| * |---------------------------------------------------------------| @@ -28,14 +28,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |Ctrl|Alt |Gui | Space |Gui |Fn | |Lef|Dow|Rig| * `---------------------------------------------------------------' */ - [BASE] = LAYOUT_truefox(\ + [BL] = LAYOUT_truefox(\ 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_GRV, KC_BSLS, KC_HOME,\ 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, KC_END,\ HY_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_PGUP,\ 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_UP, KC_PGDN,\ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, TT(FUNCT), KC_LEFT, KC_DOWN, KC_RGHT\ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, TT(FL), KC_LEFT, KC_DOWN, KC_RGHT\ ), - /* Keymap FUNCT: Function Layer + /* Keymap FL: Function Layer * ,---------------------------------------------------------------. * |RST| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|MSN|LHP|SLP| * |---------------------------------------------------------------| @@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | |Hom|PgD|End| * `---------------------------------------------------------------' */ - [FUNCT] = LAYOUT_truefox(\ + [FL] = LAYOUT_truefox(\ RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD,\ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, MC_MUTE,\ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_VOLU,\ diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 95ddeb5c1c9c..0a551f9222ef 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -4,8 +4,8 @@ #include "quantum.h" // Define layer names -#define BASE 0 -#define FUNCT 1 +#define BL 0 +#define FL 1 // Config #define TAPPING_TOGGLE 2 @@ -18,7 +18,7 @@ enum custom_keycodes { }; // Useful Defines -#define FN_CAPS LT(FUNCT, KC_CAPS) +#define FN_CAPS LT(FL, KC_CAPS) #define HY_CAPS ALL_T(KC_CAPS) // MacOS #define MC_SLPD LCTL(LSFT(KC_POWER)) // Sleep Display From 1c0c1746b64937c9d0eb66e1b41f22ed84b6dbad Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 3 Apr 2019 11:46:09 -0700 Subject: [PATCH 020/429] [Keymap] Fix kbd67/hotswap user keymap --- keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index a2ef01fc9167..3730cf76f84f 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F13, KC_F14, KC_F15, KC_DEL, MC_MUTE, \ 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, MC_VOLU, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_PGUP, MC_VOLD, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_TRNS, KC_PGUP, MC_VOLD, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END ), }; From dca16f4829e078536c877c42306acd283e532e9f Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 5 Apr 2019 16:31:31 -0700 Subject: [PATCH 021/429] [User] Remove KC_LHPD, Add KC_MAKE Remove Mac Launchpad macro, add Make/Flash macro --- users/brandonschlack/brandonschlack.c | 39 +++++++++++++++++++++------ users/brandonschlack/brandonschlack.h | 2 +- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index 4ffe95dd69b1..3b8f561733c6 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -7,14 +7,37 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case KC_LHPD: // Launchpad: Sends as APP+F4, karabiner interprets as fn+F4 -> launchpad - if (record->event.pressed) { - register_code16(KC_APP); - tap_code16(KC_F4); - } else { - clear_keyboard(); - } - break; + case KC_MAKE: // Compiles the firmware, and adds the flash command based on keyboard bootloader + if (!record->event.pressed) { + uint8_t temp_mod = get_mods(); + uint8_t temp_osm = get_oneshot_mods(); + clear_mods(); clear_oneshot_mods(); + SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP); + #ifndef FLASH_BOOTLOADER + if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT ) + #endif + { // + #if defined(__arm__) // only run for ARM boards + SEND_STRING(":dfu-util"); + #elif defined(BOOTLOADER_DFU) // only run for DFU boards + SEND_STRING(":dfu"); + #elif defined(BOOTLOADER_HALFKAY) // only run for teensy boards + SEND_STRING(":teensy"); + #elif defined(BOOTLOADER_CATERINA) // only run for Pro Micros + SEND_STRING(":avrdude"); + #endif // bootloader options + } + if ( (temp_mod | temp_osm) & MOD_MASK_CTRL) { + SEND_STRING(" -j8 --output-sync"); + } + SEND_STRING(SS_TAP(X_ENTER)); + if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT) { + reset_keyboard(); + } + set_mods(temp_mod); + } + break; + } return process_record_keymap(keycode, record); } diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 0a551f9222ef..964e4f562d8a 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -13,7 +13,7 @@ // Macros enum custom_keycodes { - KC_LHPD = SAFE_RANGE, + KC_MAKE = SAFE_RANGE, KEYMAP_SAFE_RANGE }; From 9aae5c7e003e65c4a7ec4edd4618cdf5e19b0b0a Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 5 Apr 2019 16:32:38 -0700 Subject: [PATCH 022/429] [Keymap] Add KC_MAKE to kbd67 keymap --- .../kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index 3730cf76f84f..1e5fc5abea3f 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -25,11 +25,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(FL), KC_LEFT, KC_DOWN, KC_RGHT), [FL] = LAYOUT( - RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ + KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F13, KC_F14, KC_F15, KC_DEL, MC_MUTE, \ 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, MC_VOLU, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_TRNS, KC_PGUP, MC_VOLD, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END ), + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END ), }; void matrix_init_user(void) { From a53f1587f71fb9ac94ccefe5dfb54b5465e69717 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 10 Apr 2019 12:00:19 -0700 Subject: [PATCH 023/429] [User] Add Magic Layer for Bootmagic and LED --- users/brandonschlack/brandonschlack.h | 1 + 1 file changed, 1 insertion(+) diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 964e4f562d8a..623f35710b2c 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -6,6 +6,7 @@ // Define layer names #define BL 0 #define FL 1 +#define ML 2 // Config #define TAPPING_TOGGLE 2 From bdde985e07d2f7d4c8b488de82d5de61ae2d9033 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 10 Apr 2019 12:56:29 -0700 Subject: [PATCH 024/429] [Keymap] Refactor Massdrop Alt keymap to updated RGB code --- .../alt/keymaps/brandonschlack/keymap.c | 86 +++++++++---- .../brandonschlack/led_programs_user.c | 115 ------------------ .../alt/keymaps/brandonschlack/rules.mk | 35 +----- 3 files changed, 62 insertions(+), 174 deletions(-) delete mode 100644 keyboards/massdrop/alt/keymaps/brandonschlack/led_programs_user.c diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index 266373009752..e8a4ae1e3c66 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -2,25 +2,24 @@ #include "brandonschlack.h" enum alt_keycodes { - L_BRI = KEYMAP_SAFE_RANGE, //LED Brightness Increase - L_BRD, //LED Brightness Decrease - L_PTN, //LED Pattern Select Next - L_PTP, //LED Pattern Select Previous - L_PSI, //LED Pattern Speed Increase - L_PSD, //LED Pattern Speed Decrease - L_T_MD, //LED Toggle Mode - L_T_ONF, //LED Toggle On / Off - L_ON, //LED On - L_OFF, //LED Off - L_T_BR, //LED Toggle Breath Effect - L_T_PTD, //LED Toggle Scrolling Pattern Direction - U_T_AUTO, //USB Extra Port Toggle Auto Detect / Always Active - U_T_AGCR, //USB Toggle Automatic GCR control - DBG_TOG, //DEBUG Toggle On / Off - DBG_MTRX, //DEBUG Toggle Matrix Prints - DBG_KBD, //DEBUG Toggle Keyboard Prints - DBG_MOU, //DEBUG Toggle Mouse Prints - MD_BOOT, //Restart into bootloader after hold timeout + L_BRI = SAFE_RANGE, //LED Brightness Increase //Working + L_BRD, //LED Brightness Decrease //Working + L_PTN, //LED Pattern Select Next //Working + L_PTP, //LED Pattern Select Previous //Working + L_PSI, //LED Pattern Speed Increase //Working + L_PSD, //LED Pattern Speed Decrease //Working + L_T_MD, //LED Toggle Mode //Working + L_T_ONF, //LED Toggle On / Off //Broken + L_ON, //LED On //Broken + L_OFF, //LED Off //Broken + L_T_BR, //LED Toggle Breath Effect //Working + L_T_PTD, //LED Toggle Scrolling Pattern Direction //Working + U_T_AGCR, //USB Toggle Automatic GCR control //Working + DBG_TOG, //DEBUG Toggle On / Off // + DBG_MTRX, //DEBUG Toggle Matrix Prints // + DBG_KBD, //DEBUG Toggle Keyboard Prints // + DBG_MOU, //DEBUG Toggle Mouse Prints // + MD_BOOT //Restart into bootloader after hold timeout //Working }; #define TG_NKRO MAGIC_TOGGLE_NKRO //Toggle 6KRO / NKRO mode @@ -52,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,---------------------------------------------------------------. * | `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| SLPD|Mut| * |---------------------------------------------------------------| - * |LBr |LS-|LB+|LS+| | | |UAT|GCR| |F13|F14|F15| LHP|End| + * |LBr |LS-|LB+|LS+| | | | |GCR| |F13|F14|F15| LHP|End| * |---------------------------------------------------------------| * |LPD |LP-|LB-|LP+| | | | | | | | | |VlU| * |---------------------------------------------------------------| @@ -63,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [FL] = LAYOUT( 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, MC_SLPD, MC_MUTE, \ - L_T_BR, L_PSD, L_BRI, L_PSI, KC_TRNS, KC_TRNS, KC_TRNS, U_T_AUTO,U_T_AGCR,KC_TRNS, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ + L_T_BR, L_PSD, L_BRI, L_PSI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, U_T_AGCR,KC_TRNS, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ L_T_PTD, L_PTP, L_BRD, L_PTN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MC_VOLU, \ KC_TRNS, L_T_MD, L_T_ONF, KC_TRNS, KC_TRNS, MD_BOOT, TG_NKRO, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_TRNS, KC_PGUP, MC_VOLD, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END \ @@ -171,11 +170,6 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { led_animation_direction = !led_animation_direction; } return false; - case U_T_AUTO: - if (record->event.pressed && MODS_SHIFT && MODS_CTRL) { - TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode"); - } - return false; case U_T_AGCR: if (record->event.pressed && MODS_SHIFT && MODS_CTRL) { TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode"); @@ -214,3 +208,43 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true; //Process all other keycodes normally } } + +led_instruction_t led_instructions[] = { + //LEDs are normally inactive, no processing is performed on them + //Flags are used in matching criteria for an LED to be active and indicate how to color it + //Flags can be found in tmk_core/protocol/arm_atsam/led_matrix.h (prefixed with LED_FLAG_) + //LED IDs can be found in config_led.h in the keyboard's directory + //Examples are below + + //All LEDs use the user's selected pattern (this is the factory default) + { .flags = LED_FLAG_USE_ROTATE_PATTERN }, + + //Specific LEDs use the user's selected pattern while all others are off + // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_ROTATE_PATTERN, .id0 = 0xFFFFFFFF, .id1 = 0xAAAAAAAA, .id2 = 0x55555555, .id3 = 0x11111111 }, + + //Specific LEDs use specified RGB values while all others are off + // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0xFF, .id1 = 0x00FF, .id2 = 0x0000FF00, .id3 = 0xFF000000, .r = 75, .g = 150, .b = 225 }, + + //All LEDs use the user's selected pattern + //On layer 1, all key LEDs (except the top row which keeps active pattern) are red while all edge LEDs are green + //When layer 1 is active, key LEDs use red (id0 32 - 16: 1111 1111 1111 1111 1000 0000 0000 0000 = 0xFFFF8000) (except top row 15 - 1) + //When layer 1 is active, key LEDs use red (id1 64 - 33: 1111 1111 1111 1111 1111 1111 1111 1111 = 0xFFFFFFFF) + //When layer 1 is active, key LEDs use red (id2 67 - 65: 0000 0000 0000 0000 0000 0000 0000 0111 = 0x00000007) + //When layer 1 is active, edge LEDs use green (id2 95 - 68: 1111 1111 1111 1111 1111 1111 1111 1000 = 0xFFFFFFF8) + //When layer 1 is active, edge LEDs use green (id3 105 - 96: 0000 0000 0000 0000 0000 0011 1111 1111 = 0x000003FF) + // { .flags = LED_FLAG_USE_ROTATE_PATTERN }, + // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id0 = 0xFFFF8000, .id1 = 0xFFFFFFFF, .id2 = 0x00000007, .r = 255, .layer = 1 }, + // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id2 = 0xFFFFFFF8, .id3 = 0x000003FF, .g = 127, .layer = 1 }, + + //All key LEDs use red while edge LEDs use the active pattern + //All key LEDs use red (id0 32 - 1: 1111 1111 1111 1111 1111 1111 1111 1111 = 0xFFFFFFFF) + //All key LEDs use red (id1 64 - 33: 1111 1111 1111 1111 1111 1111 1111 1111 = 0xFFFFFFFF) + //All key LEDs use red (id2 67 - 65: 0000 0000 0000 0000 0000 0000 0000 0111 = 0x00000007) + //Edge uses active pattern (id2 95 - 68: 1111 1111 1111 1111 1111 1111 1111 1000 = 0xFFFFFFF8) + //Edge uses active pattern (id3 105 - 96: 0000 0000 0000 0000 0000 0011 1111 1111 = 0x000003FF) + // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0x00000007, .r = 255 }, + // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_ROTATE_PATTERN , .id2 = 0xFFFFFFF8, .id3 = 0x000003FF }, + + //end must be set to 1 to indicate end of instruction set + { .end = 1 } +}; diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/led_programs_user.c b/keyboards/massdrop/alt/keymaps/brandonschlack/led_programs_user.c deleted file mode 100644 index 2a38e3afcb70..000000000000 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/led_programs_user.c +++ /dev/null @@ -1,115 +0,0 @@ -/* -Copyright 2018 Massdrop Inc. - -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 . -*/ - -#include "alt.h" -#include "led_matrix.h" - -//GMK Laser -led_setup_t leds_gmk_laser[] = { - { .hs = 0, .he = 33, .rs = 148, .re = 148, .gs = 0, .ge = 0, .bs = 211, .be = 211, .ef = EF_NONE }, - { .hs = 33, .he = 66, .rs = 148, .re = 212, .gs = 0, .ge = 36, .bs = 211, .be = 80, .ef = EF_NONE }, - { .hs = 66, .he = 100, .rs = 212, .re = 212, .gs = 36, .ge = 36, .bs = 80, .be = 80, .ef = EF_NONE }, - { .end = 1 }, -}; - -//GMK Laser -led_setup_t leds_gmk_laser_scroll[] = { - { .hs = 0, .he = 100, .rs = 148, .re = 148, .gs = 0, .ge = 0, .bs = 211, .be = 211, .ef = EF_NONE }, - { .hs = 0, .he = 15, .rs = 148, .re = 212, .gs = 0, .ge = 36, .bs = 211, .be = 80, .ef = EF_OVER | EF_SCR_R }, - { .hs = 15, .he = 30, .rs = 212, .re = 148, .gs = 36, .ge = 0, .bs = 80, .be = 211, .ef = EF_OVER | EF_SCR_R }, - { .end = 1 }, -}; - -//White with moving red stripe -led_setup_t leds_white_with_red_stripe[] = { - { .hs = 0, .he = 100, .rs = 255, .re = 255, .gs = 255, .ge = 255, .bs = 255, .be = 255, .ef = EF_NONE }, - { .hs = 0, .he = 15, .rs = 0, .re = 0, .gs = 0, .ge = 255, .bs = 0, .be = 255, .ef = EF_SCR_R | EF_SUBTRACT }, - { .hs = 15, .he = 30, .rs = 0, .re = 0, .gs = 255, .ge = 0, .bs = 255, .be = 0, .ef = EF_SCR_R | EF_SUBTRACT }, - { .end = 1 }, -}; - -//Yellow -led_setup_t leds_yellow[] = { - { .hs = 0, .he = 100, .rs = 255, .re = 255, .gs = 255, .ge = 255, .bs = 0, .be = 0, .ef = EF_NONE }, - { .end = 1 }, -}; - -//Off -led_setup_t leds_off[] = { - { .hs = 0, .he = 100, .rs = 0, .re = 0, .gs = 0, .ge = 0, .bs = 0, .be = 0, .ef = EF_NONE }, - { .end = 1 }, -}; - -//Red -led_setup_t leds_red[] = { - { .hs = 0, .he = 100, .rs = 255, .re = 255, .gs = 0, .ge = 0, .bs = 0, .be = 0, .ef = EF_NONE }, - { .end = 1 }, -}; - -//Green -led_setup_t leds_green[] = { - { .hs = 0, .he = 100, .rs = 0, .re = 0, .gs = 255, .ge = 255, .bs = 0, .be = 0, .ef = EF_NONE }, - { .end = 1 }, -}; - -//Blue -led_setup_t leds_blue[] = { - { .hs = 0, .he = 100, .rs = 0, .re = 0, .gs = 0, .ge = 0, .bs = 255, .be = 255, .ef = EF_NONE }, - { .end = 1 }, -}; - -//Purple -led_setup_t leds_purple[] = { - { .hs = 0, .he = 100, .rs = 148, .re = 148, .gs = 0, .ge = 0, .bs = 211, .be = 211, .ef = EF_NONE }, - { .end = 1 }, -}; - -//White -led_setup_t leds_white[] = { - { .hs = 0, .he = 100, .rs = 255, .re = 255, .gs = 255, .ge = 255, .bs = 255, .be = 255, .ef = EF_NONE }, - { .end = 1 }, -}; - -//Black with moving purple stripe -led_setup_t leds_black_with_purple_stripe[] = { - { .hs = 0, .he = 15, .rs = 0, .re = 148, .gs = 0, .ge = 0, .bs = 0, .be = 211, .ef = EF_SCR_R }, - { .hs = 15, .he = 30, .rs = 148, .re = 0, .gs = 0, .ge = 0, .bs = 211, .be = 0, .ef = EF_SCR_R }, - { .end = 1 }, -}; - -//Black with moving red stripe -led_setup_t leds_black_with_red_stripe[] = { - { .hs = 0, .he = 15, .rs = 0, .re = 255, .gs = 0, .ge = 0, .bs = 0, .be = 0, .ef = EF_SCR_R }, - { .hs = 15, .he = 30, .rs = 255, .re = 0, .gs = 0, .ge = 0, .bs = 0, .be = 0, .ef = EF_SCR_R }, - { .end = 1 }, -}; - -//Add new LED animations here using one from above as example -//The last entry must be { .end = 1 } -//Add the new animation name to the list below following its format - -void *led_setups[] = { - leds_gmk_laser, - leds_gmk_laser_scroll, - leds_purple, - leds_white, - leds_black_with_purple_stripe, - leds_black_with_red_stripe, - leds_off -}; - -const uint8_t led_setups_count = sizeof(led_setups) / sizeof(led_setups[0]); diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk b/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk index 583cb9c9fb2d..18a38676a64d 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk @@ -1,33 +1,2 @@ -# project specific files -SRC = led_programs_user.c -SRC += matrix.c - -#For platform and packs -ARM_ATSAM = SAMD51J18A -MCU = cortex-m4 - -CUSTOM_MATRIX = yes - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = no # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = no # Console for debug(+400) -COMMAND_ENABLE = no # Commands for debug and configuration -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE = no # Audio output on port C6 -FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches -HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400) -VIRTSER_ENABLE = no # USB Serial Driver -RAW_ENABLE = no # Raw device -AUTO_SHIFT_ENABLE = no # Auto Shift +# Use Massdrop Configurator support +OPT_DEFS += -DUSE_MASSDROP_CONFIGURATOR From fedc1ab9f50adf3693bad0e4cc4b509360325492 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 10 Apr 2019 13:02:48 -0700 Subject: [PATCH 025/429] [Keymap] Move LED controls to Magic layer for Massdrop/Alt --- .../alt/keymaps/brandonschlack/keymap.c | 36 ++++++++++++++----- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index e8a4ae1e3c66..e7cb987871e8 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -45,27 +45,47 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_HOME, \ HY_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_PGUP, \ 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_UP, KC_PGDN, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(FL), KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(FL), KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Layer 1: Function Layer * ,---------------------------------------------------------------. * | `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| SLPD|Mut| * |---------------------------------------------------------------| - * |LBr |LS-|LB+|LS+| | | | |GCR| |F13|F14|F15| LHP|End| + * | | | | |DFU| | | | | |F13|F14|F15| LHP|End| * |---------------------------------------------------------------| - * |LPD |LP-|LB-|LP+| | | | | | | | | |VlU| + * | | | | | | | | | | | | | |VlU| * |---------------------------------------------------------------| - * | |LTM|LTO| | |DFU|KRO| |Prv|Nxt|Ply| |PgU|VlD| + * | | | | | | ML| | |Prv|Nxt|Ply| |PgU|VlD| * |---------------------------------------------------------------| * | | | | | | | |Hom|PgD|End| * `---------------------------------------------------------------' */ [FL] = LAYOUT( 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, MC_SLPD, MC_MUTE, \ - L_T_BR, L_PSD, L_BRI, L_PSI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, U_T_AGCR,KC_TRNS, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ - L_T_PTD, L_PTP, L_BRD, L_PTN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MC_VOLU, \ - KC_TRNS, L_T_MD, L_T_ONF, KC_TRNS, KC_TRNS, MD_BOOT, TG_NKRO, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_TRNS, KC_PGUP, MC_VOLD, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MD_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ + 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, MC_VOLU, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DF(ML), KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_TRNS, KC_PGUP, MC_VOLD, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END \ + ), + /* Layer 2: Magic Layer + * ,---------------------------------------------------------------. + * | BL| | | | | | | | | | | | | | | + * |---------------------------------------------------------------| + * |LBr |LS-|LB+|LS+| | | | |GCR| | | | | | | + * |---------------------------------------------------------------| + * |LPD |LP-|LB-|LP+| | | | | | | | | | | + * |---------------------------------------------------------------| + * | |LTM|LTO| | | |KRO| | | | | | | | + * |---------------------------------------------------------------| + * | | | | | | | | | | | + * `---------------------------------------------------------------' + */ + [ML] = LAYOUT( + DF(BL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + L_T_BR, L_PSD, L_BRI, L_PSI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, U_T_AGCR,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + L_T_PTD, L_PTP, L_BRD, L_PTN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, L_T_MD, L_T_ONF, XXXXXXX, XXXXXXX, XXXXXXX, TG_NKRO, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), /* [X] = LAYOUT( From 7230f98f770738da4a9a85e40ed3c8b7dbc13236 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 10 Apr 2019 13:07:27 -0700 Subject: [PATCH 026/429] [Keymap] Add LED instructions from MD Configurator --- .../alt/keymaps/brandonschlack/keymap.c | 42 +++++-------------- 1 file changed, 10 insertions(+), 32 deletions(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index e7cb987871e8..7760110c7be8 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -230,40 +230,18 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { } led_instruction_t led_instructions[] = { - //LEDs are normally inactive, no processing is performed on them - //Flags are used in matching criteria for an LED to be active and indicate how to color it - //Flags can be found in tmk_core/protocol/arm_atsam/led_matrix.h (prefixed with LED_FLAG_) - //LED IDs can be found in config_led.h in the keyboard's directory - //Examples are below + //Please see ../default_md/keymap.c for examples //All LEDs use the user's selected pattern (this is the factory default) - { .flags = LED_FLAG_USE_ROTATE_PATTERN }, - - //Specific LEDs use the user's selected pattern while all others are off - // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_ROTATE_PATTERN, .id0 = 0xFFFFFFFF, .id1 = 0xAAAAAAAA, .id2 = 0x55555555, .id3 = 0x11111111 }, - - //Specific LEDs use specified RGB values while all others are off - // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0xFF, .id1 = 0x00FF, .id2 = 0x0000FF00, .id3 = 0xFF000000, .r = 75, .g = 150, .b = 225 }, - - //All LEDs use the user's selected pattern - //On layer 1, all key LEDs (except the top row which keeps active pattern) are red while all edge LEDs are green - //When layer 1 is active, key LEDs use red (id0 32 - 16: 1111 1111 1111 1111 1000 0000 0000 0000 = 0xFFFF8000) (except top row 15 - 1) - //When layer 1 is active, key LEDs use red (id1 64 - 33: 1111 1111 1111 1111 1111 1111 1111 1111 = 0xFFFFFFFF) - //When layer 1 is active, key LEDs use red (id2 67 - 65: 0000 0000 0000 0000 0000 0000 0000 0111 = 0x00000007) - //When layer 1 is active, edge LEDs use green (id2 95 - 68: 1111 1111 1111 1111 1111 1111 1111 1000 = 0xFFFFFFF8) - //When layer 1 is active, edge LEDs use green (id3 105 - 96: 0000 0000 0000 0000 0000 0011 1111 1111 = 0x000003FF) - // { .flags = LED_FLAG_USE_ROTATE_PATTERN }, - // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id0 = 0xFFFF8000, .id1 = 0xFFFFFFFF, .id2 = 0x00000007, .r = 255, .layer = 1 }, - // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id2 = 0xFFFFFFF8, .id3 = 0x000003FF, .g = 127, .layer = 1 }, - - //All key LEDs use red while edge LEDs use the active pattern - //All key LEDs use red (id0 32 - 1: 1111 1111 1111 1111 1111 1111 1111 1111 = 0xFFFFFFFF) - //All key LEDs use red (id1 64 - 33: 1111 1111 1111 1111 1111 1111 1111 1111 = 0xFFFFFFFF) - //All key LEDs use red (id2 67 - 65: 0000 0000 0000 0000 0000 0000 0000 0111 = 0x00000007) - //Edge uses active pattern (id2 95 - 68: 1111 1111 1111 1111 1111 1111 1111 1000 = 0xFFFFFFF8) - //Edge uses active pattern (id3 105 - 96: 0000 0000 0000 0000 0000 0011 1111 1111 = 0x000003FF) - // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0x00000007, .r = 255 }, - // { .flags = LED_FLAG_MATCH_ID | LED_FLAG_USE_ROTATE_PATTERN , .id2 = 0xFFFFFFF8, .id3 = 0x000003FF }, + // { .flags = LED_FLAG_USE_ROTATE_PATTERN }, + + // MiTo Laser Lighting + // On Base Layer, all LEDs use purple + // On Function Layer, all LEDS use pink + // On Function Layer, all LEDS use white + { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0xFFFFFFFF, .id3 = 0x000003FF, .r = 148, .b = 211, .layer = 0 }, + { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0xFFFFFFFF, .id3 = 0x000003FF, .r = 212, .g = 36, .b = 80, .layer = 1 }, + { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0xFFFFFFFF, .id3 = 0x000003FF, .r = 255, .g = 255, .b = 255, .layer = 2 }, //end must be set to 1 to indicate end of instruction set { .end = 1 } From 62b49b790492cca52904a5e1d4823c6a09f70e22 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 10 Apr 2019 13:08:13 -0700 Subject: [PATCH 027/429] [Keymap] Set default LED Mode to indicators only --- keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index 7760110c7be8..d378f0dfd0e2 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -100,6 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Runs just one time when the keyboard initializes. void matrix_init_user(void) { + led_lighting_mode = LED_MODE_INDICATORS_ONLY; }; // Runs constantly in the background, in a loop. From cee226ece22671684369707391fc4ea8e6158b56 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Fri, 12 Apr 2019 10:52:59 -0700 Subject: [PATCH 028/429] [Keymap] Change Magic Layer to toggle --- keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index d378f0dfd0e2..409e7e382b50 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, MC_SLPD, MC_MUTE, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MD_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ 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, MC_VOLU, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DF(ML), KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_TRNS, KC_PGUP, MC_VOLD, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(ML), KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_TRNS, KC_PGUP, MC_VOLD, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END \ ), /* Layer 2: Magic Layer @@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `---------------------------------------------------------------' */ [ML] = LAYOUT( - DF(BL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + TG(ML), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ L_T_BR, L_PSD, L_BRI, L_PSI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, U_T_AGCR,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ L_T_PTD, L_PTP, L_BRD, L_PTN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, L_T_MD, L_T_ONF, XXXXXXX, XXXXXXX, XXXXXXX, TG_NKRO, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ From ee5413ad987236ec0159d5318362f1b4744f1685 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Fri, 12 Apr 2019 10:53:35 -0700 Subject: [PATCH 029/429] [Keymap] Spacing format --- .../hotswap/keymaps/brandonschlack/keymap.c | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index 1e5fc5abea3f..1902200c7613 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -18,18 +18,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [BL] = LAYOUT( - 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_GRV, KC_BSLS, KC_HOME, \ - 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, KC_END, \ - HY_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_PGUP, \ - 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_UP, KC_PGDN, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(FL), KC_LEFT, KC_DOWN, KC_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_EQL, KC_GRV, KC_BSLS, KC_HOME, \ + 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, KC_END, \ + HY_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_PGUP, \ + 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_UP, KC_PGDN, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(FL), KC_LEFT, KC_DOWN, KC_RGHT), [FL] = LAYOUT( - KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F13, KC_F14, KC_F15, KC_DEL, MC_MUTE, \ - 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, MC_VOLU, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_TRNS, KC_PGUP, MC_VOLD, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END ), + KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F13, KC_F14, KC_F15, KC_DEL, MC_MUTE, \ + 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, MC_VOLU, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_TRNS, KC_PGUP, MC_VOLD, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END ), }; void matrix_init_user(void) { From f7befec1340f650a4bd4b9572d9e0032ca57f8cd Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Fri, 12 Apr 2019 10:54:33 -0700 Subject: [PATCH 030/429] [Keymap] Update whitefox with kbd67/hotswap keymap --- .../whitefox/keymaps/brandonschlack/keymap.c | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/keyboards/whitefox/keymaps/brandonschlack/keymap.c b/keyboards/whitefox/keymaps/brandonschlack/keymap.c index b063f6e3e2c1..7be0ba2a70d9 100644 --- a/keyboards/whitefox/keymaps/brandonschlack/keymap.c +++ b/keyboards/whitefox/keymaps/brandonschlack/keymap.c @@ -29,17 +29,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `---------------------------------------------------------------' */ [BL] = LAYOUT_truefox(\ - 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_GRV, KC_BSLS, KC_HOME,\ - 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, KC_END,\ - HY_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_PGUP,\ - 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_UP, KC_PGDN,\ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, TT(FL), KC_LEFT, KC_DOWN, KC_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_EQL, KC_GRV, KC_BSLS, KC_HOME, \ + 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, KC_END, \ + HY_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_PGUP, \ + 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_UP, KC_PGDN, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(FL), KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Keymap FL: Function Layer * ,---------------------------------------------------------------. - * |RST| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|MSN|LHP|SLP| + * |MKE| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|MSN|LHP|SLP| * |---------------------------------------------------------------| - * | | | | | | | | | | |F13|F14|F15| Del|Mut| + * | | | | |RST| | | | | |F13|F14|F15| Del|Mut| * |---------------------------------------------------------------| * | | | | | | | | | | | | | |VlU| * |---------------------------------------------------------------| @@ -49,10 +49,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `---------------------------------------------------------------' */ [FL] = LAYOUT_truefox(\ - RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD,\ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, MC_MUTE,\ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_VOLU,\ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, _______, MC_VOLD,\ - _______, _______, _______, _______, _______, _______, _______, _______, _______\ + KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F13, KC_F14, KC_F15, KC_DEL, MC_MUTE, \ + 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, MC_VOLU, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_TRNS, KC_PGUP, MC_VOLD, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END \ ), }; From 5dbba2b7966798fc279ecac63c6a1d5f8097fcc9 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Fri, 12 Apr 2019 11:00:02 -0700 Subject: [PATCH 031/429] [Keymap] Use alias for KC_TRNS for readability --- .../hotswap/keymaps/brandonschlack/keymap.c | 8 ++++---- .../alt/keymaps/brandonschlack/keymap.c | 18 +++++++++--------- .../whitefox/keymaps/brandonschlack/keymap.c | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index 1902200c7613..970ee0e7eca3 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -26,10 +26,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [FL] = LAYOUT( KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F13, KC_F14, KC_F15, KC_DEL, MC_MUTE, \ - 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, MC_VOLU, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_TRNS, KC_PGUP, MC_VOLD, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END ), + _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, MC_MUTE, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_VOLU, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, KC_PGUP, MC_VOLD, \ + _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), }; void matrix_init_user(void) { diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index 409e7e382b50..c4a92fcdb1f9 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -62,10 +62,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [FL] = LAYOUT( 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, MC_SLPD, MC_MUTE, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MD_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ - 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, MC_VOLU, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(ML), KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_TRNS, KC_PGUP, MC_VOLD, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END \ + _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_VOLU, \ + _______, _______, _______, _______, _______, TG(ML), _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, KC_PGUP, MC_VOLD, \ + _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), /* Layer 2: Magic Layer * ,---------------------------------------------------------------. @@ -89,11 +89,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* [X] = LAYOUT( - 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, KC_TRNS, KC_TRNS \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), */ }; diff --git a/keyboards/whitefox/keymaps/brandonschlack/keymap.c b/keyboards/whitefox/keymaps/brandonschlack/keymap.c index 7be0ba2a70d9..a1301b5b481e 100644 --- a/keyboards/whitefox/keymaps/brandonschlack/keymap.c +++ b/keyboards/whitefox/keymaps/brandonschlack/keymap.c @@ -50,9 +50,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [FL] = LAYOUT_truefox(\ KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F13, KC_F14, KC_F15, KC_DEL, MC_MUTE, \ - 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, MC_VOLU, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_TRNS, KC_PGUP, MC_VOLD, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END \ + _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, MC_MUTE, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_VOLU, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, KC_PGUP, MC_VOLD, \ + _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), }; From f61fb3c94dbc1d9d82e2d5ea42750cf34ccfe603 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 17 Apr 2019 10:27:33 -0700 Subject: [PATCH 032/429] [User] Update userspace with pragma once --- users/brandonschlack/brandonschlack.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 623f35710b2c..81b92d5aa147 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -1,5 +1,4 @@ -#ifndef USERSPACE -#define USERSPACE +#pragma once #include "quantum.h" @@ -29,5 +28,3 @@ enum custom_keycodes { #define MC_MUTE KC__MUTE #define MC_VOLD KC__VOLDOWN #define MC_VOLU KC__VOLUP - -#endif From 57cf1132ae77e3458b1aa157cedfb0f7cfddf66f Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 17 Apr 2019 11:36:04 -0700 Subject: [PATCH 033/429] [User] Add Media Mod-Tap for left modifiers --- .../kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c | 4 ++-- keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c | 8 ++++---- keyboards/whitefox/keymaps/brandonschlack/keymap.c | 8 ++++---- users/brandonschlack/brandonschlack.h | 4 ++++ 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index 970ee0e7eca3..acf1e534e006 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -22,13 +22,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, KC_END, \ HY_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_PGUP, \ 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_UP, KC_PGDN, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(FL), KC_LEFT, KC_DOWN, KC_RGHT), + MM_LCTL, MM_LALT, MM_LGUI, KC_SPC, KC_RGUI, MO(FL), KC_LEFT, KC_DOWN, KC_RGHT), [FL] = LAYOUT( KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, MC_MUTE, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_VOLU, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, KC_PGUP, MC_VOLD, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, MC_VOLD, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), }; diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index c4a92fcdb1f9..386584206f5f 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |PgD| * |---------------------------------------------------------------| - * |Ctrl|Alt |Gui | Space |Gui |Fn1 | |Lef|Dow|Rig| + * |MCtl|MAlt|MGui| Space |Gui |Fn1 | |Lef|Dow|Rig| * `---------------------------------------------------------------' */ [BL] = LAYOUT( @@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_HOME, \ HY_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_PGUP, \ 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_UP, KC_PGDN, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(FL), KC_LEFT, KC_DOWN, KC_RGHT \ + MM_LCTL, MM_LALT, MM_LGUI, KC_SPC, KC_RGUI, MO(FL), KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Layer 1: Function Layer * ,---------------------------------------------------------------. @@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | | | | | | | | | | |VlU| * |---------------------------------------------------------------| - * | | | | | | ML| | |Prv|Nxt|Ply| |PgU|VlD| + * | | | | | | ML| | | | | | |PgU|VlD| * |---------------------------------------------------------------| * | | | | | | | |Hom|PgD|End| * `---------------------------------------------------------------' @@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, MC_SLPD, MC_MUTE, \ _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_VOLU, \ - _______, _______, _______, _______, _______, TG(ML), _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, KC_PGUP, MC_VOLD, \ + _______, _______, _______, _______, _______, TG(ML), _______, _______, _______, _______, _______, _______, KC_PGUP, MC_VOLD, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), /* Layer 2: Magic Layer diff --git a/keyboards/whitefox/keymaps/brandonschlack/keymap.c b/keyboards/whitefox/keymaps/brandonschlack/keymap.c index a1301b5b481e..1297db718535 100644 --- a/keyboards/whitefox/keymaps/brandonschlack/keymap.c +++ b/keyboards/whitefox/keymaps/brandonschlack/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |PgD| * |---------------------------------------------------------------| - * |Ctrl|Alt |Gui | Space |Gui |Fn | |Lef|Dow|Rig| + * |MCtl|MAlt|MGui| Space |Gui |Fn | |Lef|Dow|Rig| * `---------------------------------------------------------------' */ [BL] = LAYOUT_truefox(\ @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, KC_END, \ HY_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_PGUP, \ 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_UP, KC_PGDN, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(FL), KC_LEFT, KC_DOWN, KC_RGHT \ + MM_LCTL, MM_LALT, MM_LGUI, KC_SPC, KC_RGUI, MO(FL), KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Keymap FL: Function Layer * ,---------------------------------------------------------------. @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | | | | | | | | | | |VlU| * |---------------------------------------------------------------| - * | | | | | | | | |Prv|Nxt|Ply| |PgU|VlD| + * | | | | | | | | | | | | |PgU|VlD| * |---------------------------------------------------------------| * | | | | | | | |Hom|PgD|End| * `---------------------------------------------------------------' @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, MC_MUTE, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_VOLU, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, KC_PGUP, MC_VOLD, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, MC_VOLD, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), }; diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 81b92d5aa147..bffff4fcf60a 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -20,6 +20,10 @@ enum custom_keycodes { // Useful Defines #define FN_CAPS LT(FL, KC_CAPS) #define HY_CAPS ALL_T(KC_CAPS) +// Media Mod-Tap +#define MM_LCTL LCTL_T(KC_MRWD) +#define MM_LALT LALT_T(KC_MPLY) +#define MM_LGUI LGUI_T(KC_MFFD) // MacOS #define MC_SLPD LCTL(LSFT(KC_POWER)) // Sleep Display #define MC_MSSN HYPR(KC_F3) // Mission Control: Configure karabiner for HYPER -> fn From dbf4ba8122b06e1cab20f281f8808491782bd3ba Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 17 Apr 2019 14:22:01 -0700 Subject: [PATCH 034/429] [User] Move Media controls to arrow cluster --- .../hotswap/keymaps/brandonschlack/keymap.c | 10 ++++----- .../alt/keymaps/brandonschlack/keymap.c | 20 ++++++++--------- .../whitefox/keymaps/brandonschlack/keymap.c | 22 +++++++++---------- users/brandonschlack/brandonschlack.h | 2 ++ 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index acf1e534e006..fcc2995ff0cf 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -22,14 +22,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, KC_END, \ HY_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_PGUP, \ 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_UP, KC_PGDN, \ - MM_LCTL, MM_LALT, MM_LGUI, KC_SPC, KC_RGUI, MO(FL), KC_LEFT, KC_DOWN, KC_RGHT), + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FN, KC_LEFT, KC_DOWN, KC_RGHT), [FL] = LAYOUT( KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ - _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, MC_MUTE, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_VOLU, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, MC_VOLD, \ - _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), + _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, MC_VOLU, _______, \ + _______, _______, _______, _______, _______, _______, KC_MRWD, MC_VOLD, KC_MFFD), }; void matrix_init_user(void) { diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index 386584206f5f..c027465e8845 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |PgD| * |---------------------------------------------------------------| - * |MCtl|MAlt|MGui| Space |Gui |Fn1 | |Lef|Dow|Rig| + * |Ctl |Alt |Gui | Space |Gui |FnPy| |Lef|Dow|Rig| * `---------------------------------------------------------------' */ [BL] = LAYOUT( @@ -45,27 +45,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_HOME, \ HY_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_PGUP, \ 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_UP, KC_PGDN, \ - MM_LCTL, MM_LALT, MM_LGUI, KC_SPC, KC_RGUI, MO(FL), KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FN, KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Layer 1: Function Layer * ,---------------------------------------------------------------. - * | `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| SLPD|Mut| + * | `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| Del|SLP| * |---------------------------------------------------------------| * | | | | |DFU| | | | | |F13|F14|F15| LHP|End| * |---------------------------------------------------------------| - * | | | | | | | | | | | | | |VlU| + * | | | | | | | | | | | | | | | * |---------------------------------------------------------------| - * | | | | | | ML| | | | | | |PgU|VlD| + * | | | | | | ML| | | | | |MutSft|VlU| | * |---------------------------------------------------------------| - * | | | | | | | |Hom|PgD|End| + * | | | | | | | |Prv|VlD|Nxt| * `---------------------------------------------------------------' */ [FL] = LAYOUT( - 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, MC_SLPD, MC_MUTE, \ + 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, MC_SLPD, \ _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_VOLU, \ - _______, _______, _______, _______, _______, TG(ML), _______, _______, _______, _______, _______, _______, KC_PGUP, MC_VOLD, \ - _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, TG(ML), _______, _______, _______, _______, _______, MM_RSFT, MC_VOLU, _______, \ + _______, _______, _______, _______, _______, _______, KC_MRWD, MC_VOLD, KC_MFFD \ ), /* Layer 2: Magic Layer * ,---------------------------------------------------------------. diff --git a/keyboards/whitefox/keymaps/brandonschlack/keymap.c b/keyboards/whitefox/keymaps/brandonschlack/keymap.c index 1297db718535..bf78e21ad45a 100644 --- a/keyboards/whitefox/keymaps/brandonschlack/keymap.c +++ b/keyboards/whitefox/keymaps/brandonschlack/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |PgD| * |---------------------------------------------------------------| - * |MCtl|MAlt|MGui| Space |Gui |Fn | |Lef|Dow|Rig| + * |Ctl |Alt |Gui | Space |Gui |FnPy| |Lef|Dow|Rig| * `---------------------------------------------------------------' */ [BL] = LAYOUT_truefox(\ @@ -33,26 +33,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, KC_END, \ HY_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_PGUP, \ 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_UP, KC_PGDN, \ - MM_LCTL, MM_LALT, MM_LGUI, KC_SPC, KC_RGUI, MO(FL), KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FN, KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Keymap FL: Function Layer * ,---------------------------------------------------------------. * |MKE| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|MSN|LHP|SLP| * |---------------------------------------------------------------| - * | | | | |RST| | | | | |F13|F14|F15| Del|Mut| + * | | | | |RST| | | | | |F13|F14|F15| Del| | * |---------------------------------------------------------------| - * | | | | | | | | | | | | | |VlU| + * | | | | | | | | | | | | | | | * |---------------------------------------------------------------| - * | | | | | | | | | | | | |PgU|VlD| + * | | | | | | | | | | | |MutSft|VlU| | * |---------------------------------------------------------------| - * | | | | | | | |Hom|PgD|End| + * | | | | | | | |Prv|VlD|Nxt| * `---------------------------------------------------------------' */ [FL] = LAYOUT_truefox(\ KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ - _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, MC_MUTE, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_VOLU, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, MC_VOLD, \ - _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ - ), + _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, MC_VOLU, _______, \ + _______, _______, _______, _______, _______, _______, KC_MRWD, MC_VOLD, KC_MFFD \ + ) }; diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index bffff4fcf60a..9de710b93921 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -24,6 +24,8 @@ enum custom_keycodes { #define MM_LCTL LCTL_T(KC_MRWD) #define MM_LALT LALT_T(KC_MPLY) #define MM_LGUI LGUI_T(KC_MFFD) +#define MM_FN LT(FL, KC_MPLY) +#define MM_RSFT RSFT_T(KC_MUTE) // MacOS #define MC_SLPD LCTL(LSFT(KC_POWER)) // Sleep Display #define MC_MSSN HYPR(KC_F3) // Mission Control: Configure karabiner for HYPER -> fn From 921ca8573212210ac49e918613f92006c4bd0fd4 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 17 Apr 2019 14:25:09 -0700 Subject: [PATCH 035/429] [Keymap] Add KEYMAP_SAFE_RANGE for massdrop/alt --- .../alt/keymaps/brandonschlack/keymap.c | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index c027465e8845..c45b17caa3a9 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -2,24 +2,24 @@ #include "brandonschlack.h" enum alt_keycodes { - L_BRI = SAFE_RANGE, //LED Brightness Increase //Working - L_BRD, //LED Brightness Decrease //Working - L_PTN, //LED Pattern Select Next //Working - L_PTP, //LED Pattern Select Previous //Working - L_PSI, //LED Pattern Speed Increase //Working - L_PSD, //LED Pattern Speed Decrease //Working - L_T_MD, //LED Toggle Mode //Working - L_T_ONF, //LED Toggle On / Off //Broken - L_ON, //LED On //Broken - L_OFF, //LED Off //Broken - L_T_BR, //LED Toggle Breath Effect //Working - L_T_PTD, //LED Toggle Scrolling Pattern Direction //Working - U_T_AGCR, //USB Toggle Automatic GCR control //Working - DBG_TOG, //DEBUG Toggle On / Off // - DBG_MTRX, //DEBUG Toggle Matrix Prints // - DBG_KBD, //DEBUG Toggle Keyboard Prints // - DBG_MOU, //DEBUG Toggle Mouse Prints // - MD_BOOT //Restart into bootloader after hold timeout //Working + L_BRI = KEYMAP_SAFE_RANGE, //LED Brightness Increase //Working + L_BRD, //LED Brightness Decrease //Working + L_PTN, //LED Pattern Select Next //Working + L_PTP, //LED Pattern Select Previous //Working + L_PSI, //LED Pattern Speed Increase //Working + L_PSD, //LED Pattern Speed Decrease //Working + L_T_MD, //LED Toggle Mode //Working + L_T_ONF, //LED Toggle On / Off //Broken + L_ON, //LED On //Broken + L_OFF, //LED Off //Broken + L_T_BR, //LED Toggle Breath Effect //Working + L_T_PTD, //LED Toggle Scrolling Pattern Direction //Working + U_T_AGCR, //USB Toggle Automatic GCR control //Working + DBG_TOG, //DEBUG Toggle On / Off // + DBG_MTRX, //DEBUG Toggle Matrix Prints // + DBG_KBD, //DEBUG Toggle Keyboard Prints // + DBG_MOU, //DEBUG Toggle Mouse Prints // + MD_BOOT //Restart into bootloader after hold timeout //Working }; #define TG_NKRO MAGIC_TOGGLE_NKRO //Toggle 6KRO / NKRO mode From 3723ed555536430bc750fd95cf690fa310663745 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Fri, 19 Apr 2019 10:52:04 -0700 Subject: [PATCH 036/429] [Keymap] Add MD_MAKE, a KC_MAKE for Massdrop --- .../alt/keymaps/brandonschlack/keymap.c | 4 ++-- users/brandonschlack/brandonschlack.c | 19 +++++++++++++++++++ users/brandonschlack/brandonschlack.h | 1 + 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index c45b17caa3a9..4251313c9a96 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -63,8 +63,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [FL] = LAYOUT( 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, MC_SLPD, \ _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, TG(ML), _______, _______, _______, _______, _______, MM_RSFT, MC_VOLU, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG(ML), _______, \ + _______, _______, _______, _______, _______, _______, _______, MD_MAKE, _______, _______, _______, MM_RSFT, MC_VOLU, _______, \ _______, _______, _______, _______, _______, _______, KC_MRWD, MC_VOLD, KC_MFFD \ ), /* Layer 2: Magic Layer diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index 3b8f561733c6..00e46285e625 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -37,6 +37,25 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { set_mods(temp_mod); } break; + case MD_MAKE: // Compiles the firmware, and adds custom flash command for Massdrop + if (!record->event.pressed) { + uint8_t temp_mod = get_mods(); + uint8_t temp_osm = get_oneshot_mods(); + clear_mods(); clear_oneshot_mods(); + SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP); + #ifndef FLASH_BOOTLOADER + if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT ) + #endif + { // + SEND_STRING(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP); + } + SEND_STRING(SS_TAP(X_ENTER)); + if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT) { + reset_keyboard(); + } + set_mods(temp_mod); + } + break; } return process_record_keymap(keycode, record); diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 9de710b93921..ae45919a9519 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -14,6 +14,7 @@ // Macros enum custom_keycodes { KC_MAKE = SAFE_RANGE, + MD_MAKE, KEYMAP_SAFE_RANGE }; From 290cf77d351c0bc292696af5ac2851d7b5a17fe7 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Fri, 19 Apr 2019 13:16:58 -0700 Subject: [PATCH 037/429] [Keymap] Move Magic Layer toggle --- keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index 4251313c9a96..4d06be03d0a3 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | | | | | | | | | | | | * |---------------------------------------------------------------| - * | | | | | | ML| | | | | |MutSft|VlU| | + * | |LTM| | | | ML| | | | | |MutSft|VlU| | * |---------------------------------------------------------------| * | | | | | | | |Prv|VlD|Nxt| * `---------------------------------------------------------------' @@ -64,8 +64,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, MC_SLPD, \ _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG(ML), _______, \ - _______, _______, _______, _______, _______, _______, _______, MD_MAKE, _______, _______, _______, MM_RSFT, MC_VOLU, _______, \ - _______, _______, _______, _______, _______, _______, KC_MRWD, MC_VOLD, KC_MFFD \ + _______, L_T_MD, _______, _______, _______, _______, _______, MD_MAKE, _______, _______, _______, MM_RSFT, KC_VOLU, _______, \ + _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_MFFD \ ), /* Layer 2: Magic Layer * ,---------------------------------------------------------------. From f09b30008a6c3d69f62c5e2017140fe4f1df6fc2 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Fri, 19 Apr 2019 15:18:21 -0700 Subject: [PATCH 038/429] [Keymap] Update KBD67 user keymap * Add full Bootmagic to KBD67 * Add visual layout to keymap --- .../hotswap/keymaps/brandonschlack/keymap.c | 40 ++++++++++++++++++- .../hotswap/keymaps/brandonschlack/rules.mk | 2 + 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/rules.mk diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index fcc2995ff0cf..463494ea3794 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -17,13 +17,51 @@ #include "brandonschlack.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Layer N: Blank Template + * ,---------------------------------------------------------------. + * | | | | | | | | | | | | | | | | | + * |---------------------------------------------------------------| + * | | | | | | | | | | | | | | | | + * |---------------------------------------------------------------| + * | | | | | | | | | | | | | | | + * |---------------------------------------------------------------| + * | | | | | | | | | | | | | | | + * |---------------------------------------------------------------| + * | | | | | | | | | | | + * `---------------------------------------------------------------' + */ +/* Keymap BL: Base Layer + * ,---------------------------------------------------------------. + * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| `|Hom| + * |---------------------------------------------------------------| + * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]|Backs|End| + * |---------------------------------------------------------------| + * |HyCaps| A| S| D| F| G| H| J| K| L| ;| '|Enter |PgU| + * |---------------------------------------------------------------| + * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |PgD| + * |---------------------------------------------------------------| + * |Ctl |Alt |Gui | Space |Gui |FnPy| |Lef|Dow|Rig| + * `---------------------------------------------------------------' + */ [BL] = LAYOUT( 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_GRV, KC_BSLS, KC_HOME, \ 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, KC_END, \ HY_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_PGUP, \ 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_UP, KC_PGDN, \ KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FN, KC_LEFT, KC_DOWN, KC_RGHT), - +/* Keymap FL: Function Layer + * ,---------------------------------------------------------------. + * |MKE| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|MSN|LHP|SLP| + * |---------------------------------------------------------------| + * | | | | |RST| | | | | |F13|F14|F15| Del| | + * |---------------------------------------------------------------| + * | | | | | | | | | | | | | | | + * |---------------------------------------------------------------| + * | | | | | | | | | | | |MutSft|VlU| | + * |---------------------------------------------------------------| + * | | | | | | | |Prv|VlD|Nxt| + * `---------------------------------------------------------------' + */ [FL] = LAYOUT( KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, _______, \ diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/rules.mk b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/rules.mk new file mode 100644 index 000000000000..f2424644980a --- /dev/null +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/rules.mk @@ -0,0 +1,2 @@ +# Build Options +BOOTMAGIC_ENABLE = full # Use full Bootmagic From 5f496bc2a1f3badae0cba9dde6d5510bd580f9e7 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 22 Apr 2019 14:47:10 -0700 Subject: [PATCH 039/429] [User] Implement OS switch using layers --- .../hotswap/keymaps/brandonschlack/keymap.c | 91 +++++++++-- .../alt/keymaps/brandonschlack/keymap.c | 145 ++++++++++++------ users/brandonschlack/brandonschlack.c | 9 ++ users/brandonschlack/brandonschlack.h | 21 ++- 4 files changed, 203 insertions(+), 63 deletions(-) diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index 463494ea3794..dbc05a87ac76 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -17,7 +17,7 @@ #include "brandonschlack.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* Layer N: Blank Template +/* N Layer: Blank Template * ,---------------------------------------------------------------. * | | | | | | | | | | | | | | | | | * |---------------------------------------------------------------| @@ -30,7 +30,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | | | | * `---------------------------------------------------------------' */ -/* Keymap BL: Base Layer + +/*********** + * MacOS * + ***********/ +/* Base Layer: Mac * ,---------------------------------------------------------------. * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| `|Hom| * |---------------------------------------------------------------| @@ -43,31 +47,96 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |Ctl |Alt |Gui | Space |Gui |FnPy| |Lef|Dow|Rig| * `---------------------------------------------------------------' */ -[BL] = LAYOUT( +[LB_MAC] = LAYOUT( 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_GRV, KC_BSLS, KC_HOME, \ 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, KC_END, \ HY_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_PGUP, \ - 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_UP, KC_PGDN, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FN, KC_LEFT, KC_DOWN, KC_RGHT), -/* Keymap FL: Function Layer + 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_UP, KC_PGDN, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FN_M, KC_LEFT, KC_DOWN, KC_RGHT), +/* Function Layer: Mac * ,---------------------------------------------------------------. * |MKE| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|MSN|LHP|SLP| * |---------------------------------------------------------------| * | | | | |RST| | | | | |F13|F14|F15| Del| | * |---------------------------------------------------------------| - * | | | | | | | | | | | | | | | + * | | | | | | | | | | | | | TgMagic| | * |---------------------------------------------------------------| * | | | | | | | | | | | |MutSft|VlU| | * |---------------------------------------------------------------| * | | | | | | | |Prv|VlD|Nxt| * `---------------------------------------------------------------' */ -[FL] = LAYOUT( +[LF_MAC] = LAYOUT( KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, MC_VOLU, _______, \ - _______, _______, _______, _______, _______, _______, KC_MRWD, MC_VOLD, KC_MFFD), + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, KC_VOLU, _______, \ + _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_MFFD), + +/*********** + * Windows * + ***********/ +/* Base Layer: Windows + * ,---------------------------------------------------------------. + * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| `|Hom| + * |---------------------------------------------------------------| + * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]|Backs|End| + * |---------------------------------------------------------------| + * |HyCaps| A| S| D| F| G| H| J| K| L| ;| '|Enter |PgU| + * |---------------------------------------------------------------| + * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |PgD| + * |---------------------------------------------------------------| + * |Ctl |Alt |Gui | Space |Gui |FnPy| |Lef|Dow|Rig| + * `---------------------------------------------------------------' + */ +[LB_WIN] = LAYOUT( + 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_GRV, KC_BSLS, KC_HOME, \ + 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, KC_END, \ + HY_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_PGUP, \ + 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_UP, KC_PGDN, \ + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MM_FN_W, KC_LEFT, KC_DOWN, KC_RGHT), +/* Function Layer: Windows + * ,---------------------------------------------------------------. + * |MKE| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| | | | + * |---------------------------------------------------------------| + * | | | | |RST| | | | | |F13|F14|F15| Del| | + * |---------------------------------------------------------------| + * | | | | | | | | | | | | | TgMagic| | + * |---------------------------------------------------------------| + * | | | | | | | | | | | |MutSft|VlU| | + * |---------------------------------------------------------------| + * | | | | | | | |Prv|VlD|Nxt| + * `---------------------------------------------------------------' + */ +[LF_WIN] = LAYOUT( + KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, \ + _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_DEL, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, KC_VOLU, _______, \ + _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT), + +/*********** + * Magic * + ***********/ +/* Keyboard Layer: Magic + * ,---------------------------------------------------------------. + * | | | | | | | | | | | | | | | | | + * |---------------------------------------------------------------| + * | | | |EEP|RST| | | | | | | | | | | + * |---------------------------------------------------------------| + * | | | | | | | | | | | | | TgMagic| | + * |---------------------------------------------------------------| + * | | | | | | | | | | | | | | | + * |---------------------------------------------------------------| + * | | | | | | | | | | | + * `---------------------------------------------------------------' + */ +[LK_MGC] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, OS_MAC, OS_WIN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX), }; void matrix_init_user(void) { diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index 4d06be03d0a3..fa989d6f134d 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -27,64 +27,115 @@ enum alt_keycodes { keymap_config_t keymap_config; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Layer 0: Base Layer - * ,---------------------------------------------------------------. - * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| Backs|Del| - * |---------------------------------------------------------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \|Hom| - * |---------------------------------------------------------------| - * |HyCap | A| S| D| F| G| H| J| K| L| ;| '|Enter |PgU| - * |---------------------------------------------------------------| - * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |PgD| - * |---------------------------------------------------------------| - * |Ctl |Alt |Gui | Space |Gui |FnPy| |Lef|Dow|Rig| - * `---------------------------------------------------------------' - */ - [BL] = LAYOUT( + /*********** + * MacOS * + ***********/ + /* Base Layer: Mac + * ,---------------------------------------------------------------. + * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| Backs|Del| + * |---------------------------------------------------------------| + * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \|Hom| + * |---------------------------------------------------------------| + * |HyCap | A| S| D| F| G| H| J| K| L| ;| '|Enter |PgU| + * |---------------------------------------------------------------| + * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |PgD| + * |---------------------------------------------------------------| + * |Ctl |Alt |Gui | Space |Gui |FnPy| |Lef|Dow|Rig| + * `---------------------------------------------------------------' + */ + [LB_MAC] = LAYOUT( 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_DEL, \ 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_HOME, \ HY_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_PGUP, \ 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_UP, KC_PGDN, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FN, KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FN_M, KC_LEFT, KC_DOWN, KC_RGHT \ ), - /* Layer 1: Function Layer - * ,---------------------------------------------------------------. - * | `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| Del|SLP| - * |---------------------------------------------------------------| - * | | | | |DFU| | | | | |F13|F14|F15| LHP|End| - * |---------------------------------------------------------------| - * | | | | | | | | | | | | | | | - * |---------------------------------------------------------------| - * | |LTM| | | | ML| | | | | |MutSft|VlU| | - * |---------------------------------------------------------------| - * | | | | | | | |Prv|VlD|Nxt| - * `---------------------------------------------------------------' - */ - [FL] = LAYOUT( + /* Function Layer: Mac + * ,---------------------------------------------------------------. + * | `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| Del|SLP| + * |---------------------------------------------------------------| + * | | | | |DFU| | | | | |F13|F14|F15| LHP|End| + * |---------------------------------------------------------------| + * | | | | | | | | | | | | | TgMagic| | + * |---------------------------------------------------------------| + * | |LTM| | | | | | | | | |MutSft|VlU| | + * |---------------------------------------------------------------| + * | | | | | | | |Prv|VlD|Nxt| + * `---------------------------------------------------------------' + */ + [LF_MAC] = LAYOUT( 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, MC_SLPD, \ _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG(ML), _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, _______, \ _______, L_T_MD, _______, _______, _______, _______, _______, MD_MAKE, _______, _______, _______, MM_RSFT, KC_VOLU, _______, \ _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_MFFD \ ), - /* Layer 2: Magic Layer - * ,---------------------------------------------------------------. - * | BL| | | | | | | | | | | | | | | - * |---------------------------------------------------------------| - * |LBr |LS-|LB+|LS+| | | | |GCR| | | | | | | - * |---------------------------------------------------------------| - * |LPD |LP-|LB-|LP+| | | | | | | | | | | - * |---------------------------------------------------------------| - * | |LTM|LTO| | | |KRO| | | | | | | | - * |---------------------------------------------------------------| - * | | | | | | | | | | | - * `---------------------------------------------------------------' - */ - [ML] = LAYOUT( - TG(ML), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + + /*********** + * Windows * + ***********/ + /* Base Layer: Windows + * ,---------------------------------------------------------------. + * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| Backs|Del| + * |---------------------------------------------------------------| + * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \|Hom| + * |---------------------------------------------------------------| + * |HyCap | A| S| D| F| G| H| J| K| L| ;| '|Enter |PgU| + * |---------------------------------------------------------------| + * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |PgD| + * |---------------------------------------------------------------| + * |Ctl |Alt |Gui | Space |Gui |FnPy| |Lef|Dow|Rig| + * `---------------------------------------------------------------' + */ + [LB_WIN] = LAYOUT( + 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_DEL, \ + 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_HOME, \ + HY_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_PGUP, \ + 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_UP, KC_PGDN, \ + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MM_FN_W, KC_LEFT, KC_DOWN, KC_RGHT \ + ), + /* Function Layer: Windows + * ,---------------------------------------------------------------. + * | `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| Del|SLP| + * |---------------------------------------------------------------| + * | | | | |DFU| | | | | |F13|F14|F15| LHP|End| + * |---------------------------------------------------------------| + * | | | | | | | | | | | | | TgMagic| | + * |---------------------------------------------------------------| + * | |LTM| | | | | | | | | |MutSft|VlU| | + * |---------------------------------------------------------------| + * | | | | | | | |Prv|VlD|Nxt| + * `---------------------------------------------------------------' + */ + [LF_WIN] = LAYOUT( + 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, _______, \ + _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, _______, \ + _______, L_T_MD, _______, _______, _______, _______, _______, MD_MAKE, _______, _______, _______, MM_RSFT, KC_VOLU, _______, \ + _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT \ + ), + + /*********** + * Magic * + ***********/ + /* Keyboard Layer: Magic + * ,---------------------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |---------------------------------------------------------------| + * |LBr |LS-|LB+|LS+| | | | |GCR| | | | | | | + * |---------------------------------------------------------------| + * |LPD |LP-|LB-|LP+| | | | | | | | | | | + * |---------------------------------------------------------------| + * | |LTM|LTO| | | |KRO| | | | | | | | + * |---------------------------------------------------------------| + * | | | | | | | | | | | + * `---------------------------------------------------------------' + */ + [LK_MGC] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ L_T_BR, L_PSD, L_BRI, L_PSI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, U_T_AGCR,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - L_T_PTD, L_PTP, L_BRD, L_PTN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, L_T_MD, L_T_ONF, XXXXXXX, XXXXXXX, XXXXXXX, TG_NKRO, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + L_T_PTD, L_PTP, L_BRD, L_PTN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, \ + XXXXXXX, L_T_MD, L_T_ONF, XXXXXXX, XXXXXXX, XXXXXXX, TG_NKRO, XXXXXXX, OS_MAC, OS_WIN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), /* diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index 00e46285e625..3b92b01f0a6d 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -56,6 +56,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { set_mods(temp_mod); } break; + case OS_MAC: + set_single_persistent_default_layer(LB_MAC); + break; + case OS_WIN: + set_single_persistent_default_layer(LB_WIN); + break; + case OS_NIX: + set_single_persistent_default_layer(LB_NIX); + break; } return process_record_keymap(keycode, record); diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index ae45919a9519..cd056f587c6f 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -3,9 +3,15 @@ #include "quantum.h" // Define layer names -#define BL 0 -#define FL 1 -#define ML 2 +enum layer_names { + LB_MAC = 0, + LF_MAC, + LB_WIN, + LF_WIN, + LB_NIX, + LF_NIX, + LK_MGC, +}; // Config #define TAPPING_TOGGLE 2 @@ -15,17 +21,22 @@ enum custom_keycodes { KC_MAKE = SAFE_RANGE, MD_MAKE, + OS_MAC, + OS_WIN, + OS_NIX, KEYMAP_SAFE_RANGE }; // Useful Defines -#define FN_CAPS LT(FL, KC_CAPS) #define HY_CAPS ALL_T(KC_CAPS) +#define TG_MAGC TG(LK_MGC) // Media Mod-Tap #define MM_LCTL LCTL_T(KC_MRWD) #define MM_LALT LALT_T(KC_MPLY) #define MM_LGUI LGUI_T(KC_MFFD) -#define MM_FN LT(FL, KC_MPLY) +#define MM_FN_M LT(LF_MAC, KC_MPLY) +#define MM_FN_W LT(LF_WIN, KC_MPLY) +#define MM_FN_X LT(LF_NIX, KC_MPLY) #define MM_RSFT RSFT_T(KC_MUTE) // MacOS #define MC_SLPD LCTL(LSFT(KC_POWER)) // Sleep Display From 2177491d30b8ac4dc9c8b6c38351eea3e7549b8d Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 30 Apr 2019 12:05:08 -0700 Subject: [PATCH 040/429] [User] Add Windows macros, Remove Mac media define --- users/brandonschlack/brandonschlack.c | 4 ++++ users/brandonschlack/brandonschlack.h | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index 3b92b01f0a6d..08b3ddb6729c 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -65,6 +65,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case OS_NIX: set_single_persistent_default_layer(LB_NIX); break; + case WN_SLPD: + tap_code16(G(KC_L)); + tap_code(KC_SYSTEM_POWER); + break; } return process_record_keymap(keycode, record); diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index cd056f587c6f..2f961394b108 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -24,6 +24,7 @@ enum custom_keycodes { OS_MAC, OS_WIN, OS_NIX, + WN_SLPD, KEYMAP_SAFE_RANGE }; @@ -42,7 +43,6 @@ enum custom_keycodes { #define MC_SLPD LCTL(LSFT(KC_POWER)) // Sleep Display #define MC_MSSN HYPR(KC_F3) // Mission Control: Configure karabiner for HYPER -> fn #define MC_LHPD HYPR(KC_F4) // Launchpad: Configure karabiner for HYPER -> fn -// MacOS Media Alias -#define MC_MUTE KC__MUTE -#define MC_VOLD KC__VOLDOWN -#define MC_VOLU KC__VOLUP +// Windows +#define WN_LOCK LGUI(KC_L) // Lock Computer +#define WN_TSKM LCTL(LALT(KC_DEL)) // Task Manager (Ctrl+Alt+Del) From 00c102c30e8692d1ca626192eda533aee0c69f80 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 30 Apr 2019 12:06:25 -0700 Subject: [PATCH 041/429] [Keymap] Add brightness control to KBD67 --- .../kbd67/hotswap/keymaps/brandonschlack/keymap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index dbc05a87ac76..235580eeddd5 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -69,8 +69,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [LF_MAC] = LAYOUT( KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, KC_VOLU, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_BRMU, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, KC_VOLU, KC_BRMD, \ _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_MFFD), /*********** @@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,---------------------------------------------------------------. * |MKE| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| | | | * |---------------------------------------------------------------| - * | | | | |RST| | | | | |F13|F14|F15| Del| | + * | | | | |RST| | | | | |PtS|SLk|Pau| Del| | * |---------------------------------------------------------------| * | | | | | | | | | | | | | TgMagic| | * |---------------------------------------------------------------| @@ -111,8 +111,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [LF_WIN] = LAYOUT( KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, \ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_DEL, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, KC_VOLU, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_BRIU, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, KC_VOLU, KC_BRID, \ _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT), /*********** @@ -126,7 +126,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | | | | | | | | | | TgMagic| | * |---------------------------------------------------------------| - * | | | | | | | | | | | | | | | + * | | | | | | | | |Mac|Win| | | | | * |---------------------------------------------------------------| * | | | | | | | | | | | * `---------------------------------------------------------------' From 4bb0d9a879dc997c4c9a92a21d44be69949a6028 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 30 Apr 2019 12:07:32 -0700 Subject: [PATCH 042/429] [Keymap] Add brightness control to Massdrop ALT --- .../alt/keymaps/brandonschlack/keymap.c | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index fa989d6f134d..db08879807f4 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -56,9 +56,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | |DFU| | | | | |F13|F14|F15| LHP|End| * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgMagic| | + * | | | | | | | | | | | | | TgMagic|BrU| * |---------------------------------------------------------------| - * | |LTM| | | | | | | | | |MutSft|VlU| | + * | |LTM| | | | | |MKE| | | |MutSft|VlU|BrD| * |---------------------------------------------------------------| * | | | | | | | |Prv|VlD|Nxt| * `---------------------------------------------------------------' @@ -66,8 +66,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [LF_MAC] = LAYOUT( 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, MC_SLPD, \ _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, _______, \ - _______, L_T_MD, _______, _______, _______, _______, _______, MD_MAKE, _______, _______, _______, MM_RSFT, KC_VOLU, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_BRMU, \ + _______, L_T_MD, _______, _______, _______, _______, _______, MD_MAKE, _______, _______, _______, MM_RSFT, KC_VOLU, KC_BRMD, \ _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_MFFD \ ), @@ -96,13 +96,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Function Layer: Windows * ,---------------------------------------------------------------. - * | `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| Del|SLP| + * | `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| Del| | * |---------------------------------------------------------------| - * | | | | |DFU| | | | | |F13|F14|F15| LHP|End| + * | | | | |DFU| | | | | |PtS|SLk|Pau| |End| * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgMagic| | + * | | | | | | | | | | | | | TgMagic|BrU| * |---------------------------------------------------------------| - * | |LTM| | | | | | | | | |MutSft|VlU| | + * | |LTM| | | | | |MKE| | | |MutSft|VlU|BrD| * |---------------------------------------------------------------| * | | | | | | | |Prv|VlD|Nxt| * `---------------------------------------------------------------' @@ -110,8 +110,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [LF_WIN] = LAYOUT( 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, _______, \ _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, _______, \ - _______, L_T_MD, _______, _______, _______, _______, _______, MD_MAKE, _______, _______, _______, MM_RSFT, KC_VOLU, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_BRIU, \ + _______, L_T_MD, _______, _______, _______, _______, _______, MD_MAKE, _______, _______, _______, MM_RSFT, KC_VOLU, KC_BRID, \ _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT \ ), @@ -124,9 +124,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * |LBr |LS-|LB+|LS+| | | | |GCR| | | | | | | * |---------------------------------------------------------------| - * |LPD |LP-|LB-|LP+| | | | | | | | | | | + * |LPD |LP-|LB-|LP+| | | | | | | | | TgMagic| | * |---------------------------------------------------------------| - * | |LTM|LTO| | | |KRO| | | | | | | | + * | |LTM|LTO| | | |KRO| |Mac|Win| | | | | * |---------------------------------------------------------------| * | | | | | | | | | | | * `---------------------------------------------------------------' From 50732ca5d376fd0911217943f690742d6a76c0d5 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 1 May 2019 11:07:43 -0700 Subject: [PATCH 043/429] [User] Change macOS defines --- users/brandonschlack/brandonschlack.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 2f961394b108..35c5d03a30da 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -41,8 +41,8 @@ enum custom_keycodes { #define MM_RSFT RSFT_T(KC_MUTE) // MacOS #define MC_SLPD LCTL(LSFT(KC_POWER)) // Sleep Display -#define MC_MSSN HYPR(KC_F3) // Mission Control: Configure karabiner for HYPER -> fn -#define MC_LHPD HYPR(KC_F4) // Launchpad: Configure karabiner for HYPER -> fn +#define MC_MSSN LCTL(KC_UP) // Mission Control +#define MC_LHPD KC_F13 // Launchpad: Configure karabiner for F13 -> Launchpad // Windows #define WN_LOCK LGUI(KC_L) // Lock Computer #define WN_TSKM LCTL(LALT(KC_DEL)) // Task Manager (Ctrl+Alt+Del) From 0f39233ceff2d1c5285c67a231d977dd1c677ce8 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 1 May 2019 11:49:59 -0700 Subject: [PATCH 044/429] [Keymap] Add Display Brightness keys to preview --- .../kbd67/hotswap/keymaps/brandonschlack/keymap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index 235580eeddd5..02dd37d0204a 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -59,16 +59,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | |RST| | | | | |F13|F14|F15| Del| | * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgMagic| | + * | | | | | | | | | | | | | TgMagic|BrU| * |---------------------------------------------------------------| - * | | | | | | | | | | | |MutSft|VlU| | + * | | | | | | | | | | | |MutSft|VlU|BrD| * |---------------------------------------------------------------| * | | | | | | | |Prv|VlD|Nxt| * `---------------------------------------------------------------' */ [LF_MAC] = LAYOUT( - KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ - _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, _______, \ + KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ + _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_BRMU, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, KC_VOLU, KC_BRMD, \ _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_MFFD), @@ -101,9 +101,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | |RST| | | | | |PtS|SLk|Pau| Del| | * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgMagic| | + * | | | | | | | | | | | | | TgMagic|BrU| * |---------------------------------------------------------------| - * | | | | | | | | | | | |MutSft|VlU| | + * | | | | | | | | | | | |MutSft|VlU|BrD| * |---------------------------------------------------------------| * | | | | | | | |Prv|VlD|Nxt| * `---------------------------------------------------------------' From fba7e153a19c8f4417aac38722918c319544eb15 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 1 May 2019 11:51:12 -0700 Subject: [PATCH 045/429] [Keymap] Add Windows defines to keymaps --- .../kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c | 4 ++-- keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index 02dd37d0204a..02db5b69ee5b 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MM_FN_W, KC_LEFT, KC_DOWN, KC_RGHT), /* Function Layer: Windows * ,---------------------------------------------------------------. - * |MKE| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| | | | + * |MKE| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| |TSK|LCK| * |---------------------------------------------------------------| * | | | | |RST| | | | | |PtS|SLk|Pau| Del| | * |---------------------------------------------------------------| @@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `---------------------------------------------------------------' */ [LF_WIN] = LAYOUT( - KC_MAKE, 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_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, WN_TSKM, WN_LOCK, \ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_DEL, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_BRIU, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, KC_VOLU, KC_BRID, \ diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index db08879807f4..e0b161130ea7 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -96,9 +96,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Function Layer: Windows * ,---------------------------------------------------------------. - * | `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| Del| | + * | `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| Del|LCK| * |---------------------------------------------------------------| - * | | | | |DFU| | | | | |PtS|SLk|Pau| |End| + * | | | | |DFU| | | | | |PtS|SLk|Pau| TSK|End| * |---------------------------------------------------------------| * | | | | | | | | | | | | | TgMagic|BrU| * |---------------------------------------------------------------| @@ -108,8 +108,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `---------------------------------------------------------------' */ [LF_WIN] = LAYOUT( - 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, _______, \ - _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END, \ + 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, WN_LOCK, \ + _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, WN_TSKM, KC_END, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_BRIU, \ _______, L_T_MD, _______, _______, _______, _______, _______, MD_MAKE, _______, _______, _______, MM_RSFT, KC_VOLU, KC_BRID, \ _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT \ From abe659dad641bc3c2c4aec43375c64598f8e7477 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Sun, 5 May 2019 12:16:58 -0700 Subject: [PATCH 046/429] [Keymap] Update colors for massdrop alt --- keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index e0b161130ea7..1f69f17db171 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -291,9 +291,11 @@ led_instruction_t led_instructions[] = { // On Base Layer, all LEDs use purple // On Function Layer, all LEDS use pink // On Function Layer, all LEDS use white - { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0xFFFFFFFF, .id3 = 0x000003FF, .r = 148, .b = 211, .layer = 0 }, - { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0xFFFFFFFF, .id3 = 0x000003FF, .r = 212, .g = 36, .b = 80, .layer = 1 }, - { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0xFFFFFFFF, .id3 = 0x000003FF, .r = 255, .g = 255, .b = 255, .layer = 2 }, + { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0xFFFFFFFF, .id3 = 0x000003FF, .r = 60, .g = 22, .b = 140, .layer = LB_MAC }, + { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0xFFFFFFFF, .id3 = 0x000003FF, .r = 242, .g = 27, .b = 127, .layer = LF_MAC }, + { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0xFFFFFFFF, .id3 = 0x000003FF, .r = 35, .g = 27, .b = 89, .layer = LB_WIN }, + { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0xFFFFFFFF, .id3 = 0x000003FF, .r = 47, .g = 193, .b = 225, .layer = LF_WIN }, + { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0xFFFFFFFF, .id3 = 0x000003FF, .r = 255, .g = 255, .b = 255, .layer = LK_MGC }, //end must be set to 1 to indicate end of instruction set { .end = 1 } From 23be8cd63b0b7dda8c5995b30cea535c42b6e8f4 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Fri, 10 May 2019 14:08:14 -0700 Subject: [PATCH 047/429] [Keymap] Move media controls --- .../hotswap/keymaps/brandonschlack/keymap.c | 24 ++++++++-------- .../alt/keymaps/brandonschlack/keymap.c | 28 +++++++++---------- users/brandonschlack/brandonschlack.h | 2 ++ 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index 02db5b69ee5b..a4af5bf8cf8e 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -59,19 +59,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | |RST| | | | | |F13|F14|F15| Del| | * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgMagic|BrU| + * | | | | | | | | | | | | | TgMagic|VlU| * |---------------------------------------------------------------| - * | | | | | | | | | | | |MutSft|VlU|BrD| + * | | | | | | | | |Prv|Nxt|Plr|MutSft|PgU|VlD| * |---------------------------------------------------------------| - * | | | | | | | |Prv|VlD|Nxt| + * | | | | | | | |Hom|PgD|End| * `---------------------------------------------------------------' */ [LF_MAC] = LAYOUT( KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_BRMU, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, KC_VOLU, KC_BRMD, \ - _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_MFFD), + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLU, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, MC_PLYR, MM_RSFT, KC_PGUP, KC_VOLD, \ + _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), /*********** * Windows * @@ -101,19 +101,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | |RST| | | | | |PtS|SLk|Pau| Del| | * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgMagic|BrU| + * | | | | | | | | | | | | | TgMagic|VlU| * |---------------------------------------------------------------| - * | | | | | | | | | | | |MutSft|VlU|BrD| + * | | | | | | | | |Prv|Nxt|Stp|MutSft|PgU|VlD| * |---------------------------------------------------------------| - * | | | | | | | |Prv|VlD|Nxt| + * | | | | | | | |Hom|PgD|End| * `---------------------------------------------------------------' */ [LF_WIN] = LAYOUT( KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, WN_TSKM, WN_LOCK, \ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_DEL, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_BRIU, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, KC_VOLU, KC_BRID, \ - _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT), + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLU, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MSTP, MM_RSFT, KC_PGUP, KC_VOLD, \ + _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), /*********** * Magic * diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index 1f69f17db171..ace7f3cd2477 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ***********/ /* Base Layer: Mac * ,---------------------------------------------------------------. - * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| Backs|Del| + * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| Backs|Pwr| * |---------------------------------------------------------------| * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \|Hom| * |---------------------------------------------------------------| @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `---------------------------------------------------------------' */ [LB_MAC] = LAYOUT( - 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_DEL, \ + 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, MC_POWR, \ 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_HOME, \ HY_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_PGUP, \ 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_UP, KC_PGDN, \ @@ -56,19 +56,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | |DFU| | | | | |F13|F14|F15| LHP|End| * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgMagic|BrU| + * | | | | | | | | | | | | | TgMagic|VlU| * |---------------------------------------------------------------| - * | |LTM| | | | | |MKE| | | |MutSft|VlU|BrD| + * | |LTM| | | | | |MKE|Prv|Nxt|Plr|MutSft|PgU|VlD| * |---------------------------------------------------------------| - * | | | | | | | |Prv|VlD|Nxt| + * | | | | | | | |Hom|PgD|End| * `---------------------------------------------------------------' */ [LF_MAC] = LAYOUT( 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, MC_SLPD, \ _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_BRMU, \ - _______, L_T_MD, _______, _______, _______, _______, _______, MD_MAKE, _______, _______, _______, MM_RSFT, KC_VOLU, KC_BRMD, \ - _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_MFFD \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLU, \ + _______, L_T_MD, _______, _______, _______, _______, _______, MD_MAKE, KC_MRWD, KC_MFFD, MC_PLYR, MM_RSFT, KC_PGUP, KC_VOLD, \ + _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), /*********** @@ -100,19 +100,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | |DFU| | | | | |PtS|SLk|Pau| TSK|End| * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgMagic|BrU| + * | | | | | | | | | | | | | TgMagic|VlU| * |---------------------------------------------------------------| - * | |LTM| | | | | |MKE| | | |MutSft|VlU|BrD| + * | |LTM| | | | | |MKE|Prv|Nxt|Stp|MutSft|PgU|VlD| * |---------------------------------------------------------------| - * | | | | | | | |Prv|VlD|Nxt| + * | | | | | | | |Hom|PgD|End| * `---------------------------------------------------------------' */ [LF_WIN] = LAYOUT( 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, WN_LOCK, \ _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, WN_TSKM, KC_END, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_BRIU, \ - _______, L_T_MD, _______, _______, _______, _______, _______, MD_MAKE, _______, _______, _______, MM_RSFT, KC_VOLU, KC_BRID, \ - _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLU, \ + _______, L_T_MD, _______, _______, _______, _______, _______, MD_MAKE, KC_MPRV, KC_MNXT, KC_MSTP, MM_RSFT, KC_PGUP, KC_VOLD, \ + _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), /*********** diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 35c5d03a30da..95b73e1890c9 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -40,9 +40,11 @@ enum custom_keycodes { #define MM_FN_X LT(LF_NIX, KC_MPLY) #define MM_RSFT RSFT_T(KC_MUTE) // MacOS +#define MC_POWR KC_POWER // Mac Power alias #define MC_SLPD LCTL(LSFT(KC_POWER)) // Sleep Display #define MC_MSSN LCTL(KC_UP) // Mission Control #define MC_LHPD KC_F13 // Launchpad: Configure karabiner for F13 -> Launchpad +#define MC_PLYR LGUI(KC_F8) // Focuses current Media Player // Windows #define WN_LOCK LGUI(KC_L) // Lock Computer #define WN_TSKM LCTL(LALT(KC_DEL)) // Task Manager (Ctrl+Alt+Del) From e232704c14fcce1df8bf21d979e9921c5a482b28 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 15 May 2019 10:11:30 -0700 Subject: [PATCH 048/429] [Keymap] Update keymap, move pg_up/dn --- .../hotswap/keymaps/brandonschlack/keymap.c | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index a4af5bf8cf8e..4f2468dc4c2e 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -38,39 +38,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,---------------------------------------------------------------. * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| `|Hom| * |---------------------------------------------------------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]|Backs|End| + * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]|Backs|PgU| * |---------------------------------------------------------------| - * |HyCaps| A| S| D| F| G| H| J| K| L| ;| '|Enter |PgU| + * |HyCaps| A| S| D| F| G| H| J| K| L| ;| '|Enter |PgD| * |---------------------------------------------------------------| - * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |PgD| + * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |End| * |---------------------------------------------------------------| * |Ctl |Alt |Gui | Space |Gui |FnPy| |Lef|Dow|Rig| * `---------------------------------------------------------------' */ [LB_MAC] = LAYOUT( 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_GRV, KC_BSLS, KC_HOME, \ - 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, KC_END, \ - HY_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_PGUP, \ - 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_UP, KC_PGDN, \ + 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, KC_PGUP, \ + HY_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_PGDN, \ + 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_UP, KC_END, \ KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FN_M, KC_LEFT, KC_DOWN, KC_RGHT), /* Function Layer: Mac * ,---------------------------------------------------------------. * |MKE| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|MSN|LHP|SLP| * |---------------------------------------------------------------| - * | | | | |RST| | | | | |F13|F14|F15| Del| | + * | | | | |RST| | | | | |F13|F14|F15| Del|VlU| * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgMagic|VlU| + * | | | | | | | | | | | | | TgMagic|VlD| * |---------------------------------------------------------------| - * | | | | | | | | |Prv|Nxt|Plr|MutSft|PgU|VlD| + * | | | | | | | | |Prv|Nxt|Plr|MutSft|PgU| | * |---------------------------------------------------------------| * | | | | | | | |Hom|PgD|End| * `---------------------------------------------------------------' */ [LF_MAC] = LAYOUT( KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ - _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLU, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, MC_PLYR, MM_RSFT, KC_PGUP, KC_VOLD, \ + _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, KC_VOLU, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLD, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, MC_PLYR, MM_RSFT, KC_PGUP, _______, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), /*********** @@ -80,39 +80,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,---------------------------------------------------------------. * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| `|Hom| * |---------------------------------------------------------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]|Backs|End| + * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]|Backs|PgU| * |---------------------------------------------------------------| - * |HyCaps| A| S| D| F| G| H| J| K| L| ;| '|Enter |PgU| + * |HyCaps| A| S| D| F| G| H| J| K| L| ;| '|Enter |PgD| * |---------------------------------------------------------------| - * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |PgD| + * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |End| * |---------------------------------------------------------------| * |Ctl |Alt |Gui | Space |Gui |FnPy| |Lef|Dow|Rig| * `---------------------------------------------------------------' */ [LB_WIN] = LAYOUT( 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_GRV, KC_BSLS, KC_HOME, \ - 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, KC_END, \ - HY_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_PGUP, \ - 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_UP, KC_PGDN, \ + 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, KC_PGUP, \ + HY_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_PGDN, \ + 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_UP, KC_END, \ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MM_FN_W, KC_LEFT, KC_DOWN, KC_RGHT), /* Function Layer: Windows * ,---------------------------------------------------------------. * |MKE| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| |TSK|LCK| * |---------------------------------------------------------------| - * | | | | |RST| | | | | |PtS|SLk|Pau| Del| | + * | | | | |RST| | | | | |PtS|SLk|Pau| Del|VlU| * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgMagic|VlU| + * | | | | | | | | | | | | | TgMagic|VlD| * |---------------------------------------------------------------| - * | | | | | | | | |Prv|Nxt|Stp|MutSft|PgU|VlD| + * | | | | | | | | |Prv|Nxt|Stp|MutSft|PgU| | * |---------------------------------------------------------------| * | | | | | | | |Hom|PgD|End| * `---------------------------------------------------------------' */ [LF_WIN] = LAYOUT( KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, WN_TSKM, WN_LOCK, \ - _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_DEL, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLU, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MSTP, MM_RSFT, KC_PGUP, KC_VOLD, \ + _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_DEL, KC_VOLU, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLD, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MSTP, MM_RSFT, KC_PGUP, _______, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), /*********** From 7b53ae159a3ac9809c2ea64e3d179efe1881d6f7 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Tue, 14 May 2019 19:03:10 -0700 Subject: [PATCH 049/429] [Keymap] Update layer colors --- keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index ace7f3cd2477..aec84e45f7b0 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -291,7 +291,7 @@ led_instruction_t led_instructions[] = { // On Base Layer, all LEDs use purple // On Function Layer, all LEDS use pink // On Function Layer, all LEDS use white - { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0xFFFFFFFF, .id3 = 0x000003FF, .r = 60, .g = 22, .b = 140, .layer = LB_MAC }, + { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0xFFFFFFFF, .id3 = 0x000003FF, .r = 62, .b = 128, .layer = LB_MAC }, { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0xFFFFFFFF, .id3 = 0x000003FF, .r = 242, .g = 27, .b = 127, .layer = LF_MAC }, { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0xFFFFFFFF, .id3 = 0x000003FF, .r = 35, .g = 27, .b = 89, .layer = LB_WIN }, { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0xFFFFFFFF, .id3 = 0x000003FF, .r = 47, .g = 193, .b = 225, .layer = LF_WIN }, From 038839c27d0abf061bdf4297539d5749894204b3 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 21 May 2019 18:07:34 -0700 Subject: [PATCH 050/429] [User] Add KC_FLSH macro --- users/brandonschlack/brandonschlack.c | 23 +++++++++++++++++++++++ users/brandonschlack/brandonschlack.h | 1 + 2 files changed, 24 insertions(+) diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index 08b3ddb6729c..55915d7dbb91 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -37,6 +37,29 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { set_mods(temp_mod); } break; + case KC_FLSH: // Compiles the firmware, and adds the flash command based on keyboard bootloader + if (!record->event.pressed) { + uint8_t temp_mod = get_mods(); + uint8_t temp_osm = get_oneshot_mods(); + clear_mods(); clear_oneshot_mods(); + SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP); + #if defined(__arm__) // only run for ARM boards + SEND_STRING(":dfu-util"); + #elif defined(BOOTLOADER_DFU) // only run for DFU boards + SEND_STRING(":dfu"); + #elif defined(BOOTLOADER_HALFKAY) // only run for teensy boards + SEND_STRING(":teensy"); + #elif defined(BOOTLOADER_CATERINA) // only run for Pro Micros + SEND_STRING(":avrdude"); + #endif // bootloader options + if ( (temp_mod | temp_osm) & MOD_MASK_CTRL) { + SEND_STRING(" -j8 --output-sync"); + } + SEND_STRING(SS_TAP(X_ENTER)); + reset_keyboard(); + set_mods(temp_mod); + } + break; case MD_MAKE: // Compiles the firmware, and adds custom flash command for Massdrop if (!record->event.pressed) { uint8_t temp_mod = get_mods(); diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 95b73e1890c9..9d6d49a03727 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -20,6 +20,7 @@ enum layer_names { // Macros enum custom_keycodes { KC_MAKE = SAFE_RANGE, + KC_FLSH, MD_MAKE, OS_MAC, OS_WIN, From e766ad0c4f73dbcddfd98fd0a8aecfe2b88c4d21 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 21 May 2019 18:08:18 -0700 Subject: [PATCH 051/429] [Keymap] Add keymap for BDN9 --- .../bdn9/keymaps/brandonschlack/config.h | 4 + .../bdn9/keymaps/brandonschlack/keymap.c | 168 ++++++++++++++++++ .../bdn9/keymaps/brandonschlack/rules.mk | 7 + 3 files changed, 179 insertions(+) create mode 100644 keyboards/keebio/bdn9/keymaps/brandonschlack/config.h create mode 100644 keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c create mode 100644 keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h new file mode 100644 index 000000000000..93c1d26b8038 --- /dev/null +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h @@ -0,0 +1,4 @@ +#pragma once + +#define COMBO_COUNT 1 +#define COMBO_TERM 200 diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c new file mode 100644 index 000000000000..44ece4b1f1f0 --- /dev/null +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -0,0 +1,168 @@ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +enum bdn9_layers { + LR_NAV, + LR_EDIT, + LR_REVW, + BD_FUNC +}; + +enum bdn9_keycodes { + TG_NAV = KEYMAP_SAFE_RANGE, + TG_EDIT, + TG_REVW, + MC_UNDO, + MC_REDO +}; + +#define MC_UNDO LGUI(KC_Z) +#define MC_REDO LSFT(LGUI(KC_Z)) + +enum bdn9_combos { + TG_BDN9, +}; + +const uint16_t PROGMEM func_combo[] = {KC_LEFT, KC_RGHT, COMBO_END}; + +combo_t key_combos[COMBO_COUNT] = { + [TG_BDN9] = COMBO_ACTION(func_combo), +}; + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + Layer: Navigation + | Knob 1: =/- | | Knob 2: Page Dn/Up | + | Press: Review | J | Press: Edit | + | Home | Up | End | + | Left | Down | Right | + */ + [LR_NAV] = LAYOUT( + TG_REVW, KC_J, TG_EDIT, + KC_HOME, KC_UP, KC_END, + KC_LEFT, KC_DOWN, KC_RGHT + ), + /* + Layer: Edit/Develop + | Knob 1: ./, | | Knob 2: =/- | + | Press: Review | \ | Press: Nav | + | X | Undo | P | + | Left | Redo | Right | + */ + [LR_EDIT] = LAYOUT( + TG_REVW, KC_BSLS, TG_NAV, + KC_X, MC_UNDO, KC_P, + KC_LEFT, MC_REDO, KC_RGHT + ), + /* + Layer: Review/Rate + | Knob 1: ]/[ | | Knob 2: G(Up)/G(Dn) | + | Press: Nav | 7 | Press: Edit | + | 0 | 8 | U | + | Left | 9 | Right | + */ + [LR_REVW] = LAYOUT( + TG_NAV, KC_7, TG_EDIT, + KC_0, KC_8, RGB_MOD, + KC_LEFT, KC_6, KC_RGHT + ), + /* + Layer: Review/Rate + | XXX | RST | XXX | + | MAKE | XXX | Flash | + | Review | Nav | Edit | + */ + [BD_FUNC] = LAYOUT( + XXXXXXX, RESET, XXXXXXX, + KC_MAKE, XXXXXXX, KC_FLSH, + TG_REVW, TG_NAV, TG_EDIT + ), +}; + +void encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { + switch (biton32(layer_state)) { + case LR_NAV: + if (!clockwise) { + tap_code(KC_EQL); + } else { + tap_code(KC_MINS); + } + break; + case LR_EDIT: + if (!clockwise) { + tap_code(KC_DOT); + } else { + tap_code(KC_COMM); + } + break; + case LR_REVW: + if (!clockwise) { + tap_code(KC_RBRC); + } else { + tap_code(KC_LBRC); + } + break; + } + } + else if (index == 1) { + switch (biton32(layer_state)) { + case LR_NAV: + if (!clockwise) { + tap_code(KC_EQL); + } else { + tap_code(KC_MINS); + } + break; + case LR_EDIT: + if (!clockwise) { + tap_code(KC_EQL); + } else { + tap_code(KC_MINS); + } + break; + case LR_REVW: + if (!clockwise) { + tap_code16(G(KC_UP)); + } else { + tap_code16(G(KC_DOWN)); + } + break; + } + } +} + +bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case TG_NAV: + if (!record->event.pressed) { + tap_code(KC_G); + layer_move(LR_NAV); + } + break; + case TG_EDIT: + if (!record->event.pressed) { + tap_code(KC_D); + layer_move(LR_EDIT); + } + break; + case TG_REVW: + if (!record->event.pressed) { + tap_code(KC_E); + layer_move(LR_REVW); + } + break; + } + return true; +} + +void process_combo_event(uint8_t combo_index, bool pressed) { + switch (combo_index) { + case TG_BDN9: + if (pressed) { + layer_move(BD_FUNC); + } + break; + } +} diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk new file mode 100644 index 000000000000..70e5beedddd9 --- /dev/null +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk @@ -0,0 +1,7 @@ +# Use dfu bootloader for Elite-C +BOOTLOADER = qmk-dfu + +# Build Options +COMBO_ENABLE = yes # Enable Combo feature +BACKLIGHT_ENABLE = no # No backlights installed +RGBLIGHT_ENABLE = no # No RGBs installed From 109d21ae867e3dd97d8ed7c94665f3a2bcc8c609 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 22 May 2019 11:36:43 -0700 Subject: [PATCH 052/429] [Keymap] Add readme to BDN9 layout --- .../bdn9/keymaps/brandonschlack/keymap.c | 2 +- .../bdn9/keymaps/brandonschlack/readme.md | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 44ece4b1f1f0..e6ba919efd43 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LEFT, KC_6, KC_RGHT ), /* - Layer: Review/Rate + Layer: BDN9 | XXX | RST | XXX | | MAKE | XXX | Flash | | Review | Nav | Edit | diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md new file mode 100644 index 000000000000..ddbf6fe7e155 --- /dev/null +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md @@ -0,0 +1,40 @@ +# brandonschlack's Lightroom layout for BDN9 +##### 2 encoders required +I built this pad to match my Lightroom photo editing workflow using +[Lightroom Classic Keyboard shortcuts](https://helpx.adobe.com/lightroom-classic/help/keyboard-shortcuts.html) + + +## Navigation Layer +This layer is used for navigating Grid View in the Library Module. +| | | | +|:-:|:-:|:-:| +| Inc/Dec Thumbnail Size
**Review** Layer | Cycle Grid View options | Scroll Up/Dn Grid Thumbnails
**Edit** Layer | +| Start of Grid View | Up | End of Grid View | +| Left | Down | Right| +--- + +## Review Layer +This layer is used for Reviewing, Rating, and Culling images with the Loupe View in the Library Module. +| | | | +|:-:|:-:|:-:| +| Inc/Dec Star Rating
**Navigation** Layer | Yellow Label | Inc/Dec Flag Status
**Edit** Layer | +| Remove Star Rating | Green Label | Unflag Photo | +| Left | Blue Label | Right| +--- + +## Edit Layer +This layer is used for editing photos in the Develop Module +| | | | +|:-:|:-:|:-:| +| Cycle Basic Panel Settings
**Review** Layer | Toggle Before View | Inc/Dec Selected Slider
**Navigation** Layer | +| Flag Rejected | Undo | Flag Picked | +| Left | Redo | Right| +--- + +## BDN9 Layer +This layer is used as a meta layer for the pad. This layer is accessed with a [Combo](https://docs.qmk.fm/#/feature_combo) of Left+Right Arrows +| | | | +|:-:|:-:|:-:| +| | RESET | | +| MAKE | | FLASH | +| **Review** Layer | **Navigation** Layer | **Edit** Layer | From 7d35025310cd8d9200700c28d0a0dded54051e72 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 22 May 2019 11:39:19 -0700 Subject: [PATCH 053/429] [Keymap] Swap Grave,Backslash --- .../hotswap/keymaps/brandonschlack/keymap.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index 4f2468dc4c2e..99572b098c00 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ***********/ /* Base Layer: Mac * ,---------------------------------------------------------------. - * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| `|Hom| + * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| `| \|Hom| * |---------------------------------------------------------------| * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]|Backs|PgU| * |---------------------------------------------------------------| @@ -48,14 +48,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `---------------------------------------------------------------' */ [LB_MAC] = LAYOUT( - 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_GRV, KC_BSLS, KC_HOME, \ + 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_HOME, \ 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, KC_PGUP, \ HY_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_PGDN, \ 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_UP, KC_END, \ KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FN_M, KC_LEFT, KC_DOWN, KC_RGHT), /* Function Layer: Mac * ,---------------------------------------------------------------. - * |MKE| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|MSN|LHP|SLP| + * |MKE| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|LHP|MSN|SLP| * |---------------------------------------------------------------| * | | | | |RST| | | | | |F13|F14|F15| Del|VlU| * |---------------------------------------------------------------| @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `---------------------------------------------------------------' */ [LF_MAC] = LAYOUT( - KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ + KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_MSSN, MC_SLPD, \ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, KC_VOLU, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLD, \ _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, MC_PLYR, MM_RSFT, KC_PGUP, _______, \ @@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ***********/ /* Base Layer: Windows * ,---------------------------------------------------------------. - * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| `|Hom| + * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| `| \|Hom| * |---------------------------------------------------------------| * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]|Backs|PgU| * |---------------------------------------------------------------| @@ -90,14 +90,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `---------------------------------------------------------------' */ [LB_WIN] = LAYOUT( - 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_GRV, KC_BSLS, KC_HOME, \ + 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_HOME, \ 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, KC_PGUP, \ HY_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_PGDN, \ 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_UP, KC_END, \ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MM_FN_W, KC_LEFT, KC_DOWN, KC_RGHT), /* Function Layer: Windows * ,---------------------------------------------------------------. - * |MKE| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| |TSK|LCK| + * |MKE| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|TSK| |LCK| * |---------------------------------------------------------------| * | | | | |RST| | | | | |PtS|SLk|Pau| Del|VlU| * |---------------------------------------------------------------| @@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `---------------------------------------------------------------' */ [LF_WIN] = LAYOUT( - KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, WN_TSKM, WN_LOCK, \ + KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, WN_TSKM, _______, WN_LOCK, \ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_DEL, KC_VOLU, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLD, \ _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MSTP, MM_RSFT, KC_PGUP, _______, \ From 21c463527f876a15cfd9c0f36fe3e9fa2bf000cc Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Fri, 24 May 2019 11:49:13 -0700 Subject: [PATCH 054/429] [Keymap] Refactor Massdrop Alt to RGB Matrix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Based on RGB code from MatthewRobo’s CTRL keymap --- .../alt/keymaps/brandonschlack/config.h | 55 +++++ .../alt/keymaps/brandonschlack/keymap.c | 197 +++++++----------- .../alt/keymaps/brandonschlack/rules.mk | 2 - users/brandonschlack/brandonschlack.h | 7 + 4 files changed, 140 insertions(+), 121 deletions(-) create mode 100644 keyboards/massdrop/alt/keymaps/brandonschlack/config.h delete mode 100644 keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/config.h b/keyboards/massdrop/alt/keymaps/brandonschlack/config.h new file mode 100644 index 000000000000..f11590b077ec --- /dev/null +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/config.h @@ -0,0 +1,55 @@ +#pragma once + +// Disable RGB Effects +#define DISABLE_RGB_MATRIX_ALPHAS_MODS +// #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN +// #define DISABLE_RGB_MATRIX_BREATHING +#define DISABLE_RGB_MATRIX_BAND_SAT +#define DISABLE_RGB_MATRIX_BAND_VAL +#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +#define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT +#define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL +#define DISABLE_RGB_MATRIX_CYCLE_ALL +#define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +#define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN +#define DISABLE_RGB_MATRIX_CYCLE_OUT_IN +#define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +#define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +#define DISABLE_RGB_MATRIX_DUAL_BEACON +#define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL +#define DISABLE_RGB_MATRIX_CYCLE_SPIRAL +#define DISABLE_RGB_MATRIX_RAINBOW_BEACON +#define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS +#define DISABLE_RGB_MATRIX_RAINDROPS +#define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +#define DISABLE_RGB_MATRIX_TYPING_HEATMAP +#define DISABLE_RGB_MATRIX_DIGITAL_RAIN +#define DISABLE_RGB_MATRIX_SOLID_REACTIVE +// #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +#define DISABLE_RGB_MATRIX_SPLASH +#define DISABLE_RGB_MATRIX_MULTISPLASH +#define DISABLE_RGB_MATRIX_SOLID_SPLASH +#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH + +#define QMK_KEYS_PER_SCAN 4 + +// #define RGB_MATRIX_KEYRELEASES + + +// Speed +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION + +#ifndef NO_DEBUG +#define NO_DEBUG +#endif // !NO_DEBUG +#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE) +#define NO_PRINT +#endif // !NO_PRINT diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index aec84e45f7b0..c49e2a68cbe4 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -2,24 +2,13 @@ #include "brandonschlack.h" enum alt_keycodes { - L_BRI = KEYMAP_SAFE_RANGE, //LED Brightness Increase //Working - L_BRD, //LED Brightness Decrease //Working - L_PTN, //LED Pattern Select Next //Working - L_PTP, //LED Pattern Select Previous //Working - L_PSI, //LED Pattern Speed Increase //Working - L_PSD, //LED Pattern Speed Decrease //Working - L_T_MD, //LED Toggle Mode //Working - L_T_ONF, //LED Toggle On / Off //Broken - L_ON, //LED On //Broken - L_OFF, //LED Off //Broken - L_T_BR, //LED Toggle Breath Effect //Working - L_T_PTD, //LED Toggle Scrolling Pattern Direction //Working - U_T_AGCR, //USB Toggle Automatic GCR control //Working - DBG_TOG, //DEBUG Toggle On / Off // - DBG_MTRX, //DEBUG Toggle Matrix Prints // - DBG_KBD, //DEBUG Toggle Keyboard Prints // - DBG_MOU, //DEBUG Toggle Mouse Prints // - MD_BOOT //Restart into bootloader after hold timeout //Working + U_T_AUTO = KEYMAP_SAFE_RANGE, //USB Extra Port Toggle Auto Detect / Always Active + U_T_AGCR, //USB Toggle Automatic GCR control + DBG_TOG, //DEBUG Toggle On / Off + DBG_MTRX, //DEBUG Toggle Matrix Prints + DBG_KBD, //DEBUG Toggle Keyboard Prints + DBG_MOU, //DEBUG Toggle Mouse Prints + MD_BOOT, //Restart into bootloader after hold timeout }; #define TG_NKRO MAGIC_TOGGLE_NKRO //Toggle 6KRO / NKRO mode @@ -58,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | | | | | | | | | | TgMagic|VlU| * |---------------------------------------------------------------| - * | |LTM| | | | | |MKE|Prv|Nxt|Plr|MutSft|PgU|VlD| + * | |RTO| | | | | |MKE|Prv|Nxt|Plr|MutSft|PgU|VlD| * |---------------------------------------------------------------| * | | | | | | | |Hom|PgD|End| * `---------------------------------------------------------------' @@ -67,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, MC_SLPD, \ _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLU, \ - _______, L_T_MD, _______, _______, _______, _______, _______, MD_MAKE, KC_MRWD, KC_MFFD, MC_PLYR, MM_RSFT, KC_PGUP, KC_VOLD, \ + _______, RGB_TOG, _______, _______, _______, _______, _______, MD_MAKE, KC_MRWD, KC_MFFD, MC_PLYR, MM_RSFT, KC_PGUP, KC_VOLD, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), @@ -102,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | | | | | | | | | | TgMagic|VlU| * |---------------------------------------------------------------| - * | |LTM| | | | | |MKE|Prv|Nxt|Stp|MutSft|PgU|VlD| + * | |RTO| | | | | |MKE|Prv|Nxt|Stp|MutSft|PgU|VlD| * |---------------------------------------------------------------| * | | | | | | | |Hom|PgD|End| * `---------------------------------------------------------------' @@ -111,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, WN_LOCK, \ _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, WN_TSKM, KC_END, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLU, \ - _______, L_T_MD, _______, _______, _______, _______, _______, MD_MAKE, KC_MPRV, KC_MNXT, KC_MSTP, MM_RSFT, KC_PGUP, KC_VOLD, \ + _______, RGB_TOG, _______, _______, _______, _______, _______, MD_MAKE, KC_MPRV, KC_MNXT, KC_MSTP, MM_RSFT, KC_PGUP, KC_VOLD, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), @@ -122,20 +111,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,---------------------------------------------------------------. * | | | | | | | | | | | | | | | | * |---------------------------------------------------------------| - * |LBr |LS-|LB+|LS+| | | | |GCR| | | | | | | + * | |RS-|RB+|RS+|RH+|RS+| |UAD|GCR| | | | | | | * |---------------------------------------------------------------| - * |LPD |LP-|LB-|LP+| | | | | | | | | TgMagic| | + * | |RM-|RB-|RM+|RH-|RS-| | | | | | | TgMagic| | * |---------------------------------------------------------------| - * | |LTM|LTO| | | |KRO| |Mac|Win| | | | | + * | |RTO| | | | |KRO| |Mac|Win| | | | | * |---------------------------------------------------------------| * | | | | | | | | | | | * `---------------------------------------------------------------' */ [LK_MGC] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - L_T_BR, L_PSD, L_BRI, L_PSI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, U_T_AGCR,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - L_T_PTD, L_PTP, L_BRD, L_PTN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, \ - XXXXXXX, L_T_MD, L_T_ONF, XXXXXXX, XXXXXXX, XXXXXXX, TG_NKRO, XXXXXXX, OS_MAC, OS_WIN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, XXXXXXX, U_T_AUTO,U_T_AGCR,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, \ + XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_NKRO, XXXXXXX, OS_MAC, OS_WIN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), /* @@ -151,7 +140,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Runs just one time when the keyboard initializes. void matrix_init_user(void) { - led_lighting_mode = LED_MODE_INDICATORS_ONLY; + rgb_matrix_sethsv(HSV_PURPLE); + rgb_matrix_mode(RGB_MATRIX_SOLID_COLOR); }; // Runs constantly in the background, in a loop. @@ -166,80 +156,9 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { static uint32_t key_timer; switch (keycode) { - case L_BRI: - if (record->event.pressed) { - if (LED_GCR_STEP > LED_GCR_MAX - gcr_desired) gcr_desired = LED_GCR_MAX; - else gcr_desired += LED_GCR_STEP; - if (led_animation_breathing) gcr_breathe = gcr_desired; - } - return false; - case L_BRD: - if (record->event.pressed) { - if (LED_GCR_STEP > gcr_desired) gcr_desired = 0; - else gcr_desired -= LED_GCR_STEP; - if (led_animation_breathing) gcr_breathe = gcr_desired; - } - return false; - case L_PTN: - if (record->event.pressed) { - if (led_animation_id == led_setups_count - 1) led_animation_id = 0; - else led_animation_id++; - } - return false; - case L_PTP: - if (record->event.pressed) { - if (led_animation_id == 0) led_animation_id = led_setups_count - 1; - else led_animation_id--; - } - return false; - case L_PSI: - if (record->event.pressed) { - led_animation_speed += ANIMATION_SPEED_STEP; - } - return false; - case L_PSD: - if (record->event.pressed) { - led_animation_speed -= ANIMATION_SPEED_STEP; - if (led_animation_speed < 0) led_animation_speed = 0; - } - return false; - case L_T_MD: - if (record->event.pressed) { - led_lighting_mode++; - if (led_lighting_mode > LED_MODE_MAX_INDEX) led_lighting_mode = LED_MODE_NORMAL; - } - return false; - case L_T_ONF: - if (record->event.pressed) { - led_enabled = !led_enabled; - I2C3733_Control_Set(led_enabled); - } - return false; - case L_ON: - if (record->event.pressed) { - led_enabled = 1; - I2C3733_Control_Set(led_enabled); - } - return false; - case L_OFF: - if (record->event.pressed) { - led_enabled = 0; - I2C3733_Control_Set(led_enabled); - } - return false; - case L_T_BR: - if (record->event.pressed) { - led_animation_breathing = !led_animation_breathing; - if (led_animation_breathing) { - gcr_breathe = gcr_desired; - led_animation_breathe_cur = BREATHE_MIN_STEP; - breathe_dir = 1; - } - } - return false; - case L_T_PTD: - if (record->event.pressed) { - led_animation_direction = !led_animation_direction; + case U_T_AUTO: + if (record->event.pressed && MODS_SHIFT && MODS_CTRL) { + TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode"); } return false; case U_T_AGCR: @@ -276,27 +195,67 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { } } return false; + case RGB_TOG: + if (record->event.pressed) { + switch (rgb_matrix_get_flags()) { + case LED_FLAG_ALL: { + rgb_matrix_set_flags(LED_FLAG_KEYLIGHT); + rgb_matrix_set_color_all(0, 0, 0); + } + break; + case LED_FLAG_KEYLIGHT: { + rgb_matrix_set_flags(LED_FLAG_UNDERGLOW); + rgb_matrix_set_color_all(0, 0, 0); + } + break; + case LED_FLAG_UNDERGLOW: { + rgb_matrix_set_flags(LED_FLAG_MODIFIER); + rgb_matrix_set_color_all(0, 0, 0); + } + break; + default: { + rgb_matrix_set_flags(LED_FLAG_ALL); + rgb_matrix_enable_noeeprom(); + } + break; + } + } + return false; default: return true; //Process all other keycodes normally } } -led_instruction_t led_instructions[] = { - //Please see ../default_md/keymap.c for examples +void rgb_matrix_hsv_layer (uint8_t hue, uint8_t sat, uint8_t val) { + rgb_matrix_sethsv_noeeprom(hue, sat, val); + if (rgb_matrix_get_flags() == LED_FLAG_MODIFIER) { + rgb_matrix_set_color(30, 0, 0, 0); + } +} - //All LEDs use the user's selected pattern (this is the factory default) - // { .flags = LED_FLAG_USE_ROTATE_PATTERN }, +void rgb_matrix_indicators_user(void) { + uint8_t this_led = host_keyboard_leds(); - // MiTo Laser Lighting - // On Base Layer, all LEDs use purple - // On Function Layer, all LEDS use pink - // On Function Layer, all LEDS use white - { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0xFFFFFFFF, .id3 = 0x000003FF, .r = 62, .b = 128, .layer = LB_MAC }, - { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0xFFFFFFFF, .id3 = 0x000003FF, .r = 242, .g = 27, .b = 127, .layer = LF_MAC }, - { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0xFFFFFFFF, .id3 = 0x000003FF, .r = 35, .g = 27, .b = 89, .layer = LB_WIN }, - { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0xFFFFFFFF, .id3 = 0x000003FF, .r = 47, .g = 193, .b = 225, .layer = LF_WIN }, - { .flags = LED_FLAG_MATCH_ID | LED_FLAG_MATCH_LAYER | LED_FLAG_USE_RGB, .id0 = 0xFFFFFFFF, .id1 = 0xFFFFFFFF, .id2 = 0xFFFFFFFF, .id3 = 0x000003FF, .r = 255, .g = 255, .b = 255, .layer = LK_MGC }, + if (!g_suspend_state && rgb_matrix_config.enable) { + switch (biton32(layer_state)) { + case LB_MAC: + rgb_matrix_hsv_layer(HSV_PURPLE); + break; + case LF_MAC: + rgb_matrix_hsv_layer(HSV_PINK); + break; + case LB_WIN: + rgb_matrix_hsv_layer(HSV_MAGENTA); + break; + case LF_WIN: + rgb_matrix_hsv_layer(HSV_CYAN); + break; + default: + rgb_matrix_hsv_layer(HSV_WHITE); + } - //end must be set to 1 to indicate end of instruction set - { .end = 1 } -}; + if ( this_led & (1< Date: Fri, 24 May 2019 12:06:53 -0700 Subject: [PATCH 055/429] [Keymap] Reorder bdn9 layers for readibility --- .../bdn9/keymaps/brandonschlack/keymap.c | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index e6ba919efd43..bf3be460711b 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -3,15 +3,15 @@ enum bdn9_layers { LR_NAV, - LR_EDIT, LR_REVW, + LR_EDIT, BD_FUNC }; enum bdn9_keycodes { TG_NAV = KEYMAP_SAFE_RANGE, - TG_EDIT, TG_REVW, + TG_EDIT, MC_UNDO, MC_REDO }; @@ -43,18 +43,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_HOME, KC_UP, KC_END, KC_LEFT, KC_DOWN, KC_RGHT ), - /* - Layer: Edit/Develop - | Knob 1: ./, | | Knob 2: =/- | - | Press: Review | \ | Press: Nav | - | X | Undo | P | - | Left | Redo | Right | - */ - [LR_EDIT] = LAYOUT( - TG_REVW, KC_BSLS, TG_NAV, - KC_X, MC_UNDO, KC_P, - KC_LEFT, MC_REDO, KC_RGHT - ), /* Layer: Review/Rate | Knob 1: ]/[ | | Knob 2: G(Up)/G(Dn) | @@ -67,6 +55,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_0, KC_8, RGB_MOD, KC_LEFT, KC_6, KC_RGHT ), + /* + Layer: Edit/Develop + | Knob 1: ./, | | Knob 2: =/- | + | Press: Review | \ | Press: Nav | + | X | Undo | P | + | Left | Redo | Right | + */ + [LR_EDIT] = LAYOUT( + TG_REVW, KC_BSLS, TG_NAV, + KC_X, MC_UNDO, KC_P, + KC_LEFT, MC_REDO, KC_RGHT + ), /* Layer: BDN9 | XXX | RST | XXX | @@ -90,18 +90,18 @@ void encoder_update_user(uint8_t index, bool clockwise) { tap_code(KC_MINS); } break; - case LR_EDIT: + case LR_REVW: if (!clockwise) { - tap_code(KC_DOT); + tap_code(KC_RBRC); } else { - tap_code(KC_COMM); + tap_code(KC_LBRC); } break; - case LR_REVW: + case LR_EDIT: if (!clockwise) { - tap_code(KC_RBRC); + tap_code(KC_DOT); } else { - tap_code(KC_LBRC); + tap_code(KC_COMM); } break; } @@ -115,18 +115,18 @@ void encoder_update_user(uint8_t index, bool clockwise) { tap_code(KC_MINS); } break; - case LR_EDIT: + case LR_REVW: if (!clockwise) { - tap_code(KC_EQL); + tap_code16(G(KC_UP)); } else { - tap_code(KC_MINS); + tap_code16(G(KC_DOWN)); } break; - case LR_REVW: + case LR_EDIT: if (!clockwise) { - tap_code16(G(KC_UP)); + tap_code(KC_EQL); } else { - tap_code16(G(KC_DOWN)); + tap_code(KC_MINS); } break; } @@ -141,18 +141,18 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { layer_move(LR_NAV); } break; - case TG_EDIT: - if (!record->event.pressed) { - tap_code(KC_D); - layer_move(LR_EDIT); - } - break; case TG_REVW: if (!record->event.pressed) { tap_code(KC_E); layer_move(LR_REVW); } break; + case TG_EDIT: + if (!record->event.pressed) { + tap_code(KC_D); + layer_move(LR_EDIT); + } + break; } return true; } From ec105b4b8e0c3197d6e6517a0c86517a381196ca Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Fri, 24 May 2019 12:46:34 -0700 Subject: [PATCH 056/429] [Keymap] Use shift for layer toggle, not combo --- .../bdn9/keymaps/brandonschlack/config.h | 3 - .../bdn9/keymaps/brandonschlack/keymap.c | 74 +++++++++---------- .../bdn9/keymaps/brandonschlack/readme.md | 1 + .../bdn9/keymaps/brandonschlack/rules.mk | 1 - 4 files changed, 34 insertions(+), 45 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h index 93c1d26b8038..6f70f09beec2 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h @@ -1,4 +1 @@ #pragma once - -#define COMBO_COUNT 1 -#define COMBO_TERM 200 diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index bf3be460711b..eb60c6ab6a08 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -19,52 +19,41 @@ enum bdn9_keycodes { #define MC_UNDO LGUI(KC_Z) #define MC_REDO LSFT(LGUI(KC_Z)) -enum bdn9_combos { - TG_BDN9, -}; - -const uint16_t PROGMEM func_combo[] = {KC_LEFT, KC_RGHT, COMBO_END}; - -combo_t key_combos[COMBO_COUNT] = { - [TG_BDN9] = COMBO_ACTION(func_combo), -}; - - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Layer: Navigation | Knob 1: =/- | | Knob 2: Page Dn/Up | | Press: Review | J | Press: Edit | - | Home | Up | End | + | Home, Hold: Shift | Up | End | | Left | Down | Right | */ [LR_NAV] = LAYOUT( - TG_REVW, KC_J, TG_EDIT, - KC_HOME, KC_UP, KC_END, + TG_REVW, KC_J, TG_EDIT, + LSFT_T(KC_HOME), KC_UP, KC_END, KC_LEFT, KC_DOWN, KC_RGHT ), /* Layer: Review/Rate | Knob 1: ]/[ | | Knob 2: G(Up)/G(Dn) | | Press: Nav | 7 | Press: Edit | - | 0 | 8 | U | + | 0, Hold: Shift | 8 | U | | Left | 9 | Right | */ [LR_REVW] = LAYOUT( - TG_NAV, KC_7, TG_EDIT, - KC_0, KC_8, RGB_MOD, - KC_LEFT, KC_6, KC_RGHT + TG_NAV, KC_7, TG_EDIT, + LSFT_T(KC_0), KC_8, KC_U, + KC_LEFT, KC_6, KC_RGHT ), /* Layer: Edit/Develop | Knob 1: ./, | | Knob 2: =/- | | Press: Review | \ | Press: Nav | - | X | Undo | P | + | X, Hold: Shift | Undo | P | | Left | Redo | Right | */ [LR_EDIT] = LAYOUT( TG_REVW, KC_BSLS, TG_NAV, - KC_X, MC_UNDO, KC_P, + LSFT_T(KC_X), MC_UNDO, KC_P, KC_LEFT, MC_REDO, KC_RGHT ), /* @@ -110,9 +99,9 @@ void encoder_update_user(uint8_t index, bool clockwise) { switch (biton32(layer_state)) { case LR_NAV: if (!clockwise) { - tap_code(KC_EQL); + tap_code(KC_PGUP); } else { - tap_code(KC_MINS); + tap_code(KC_PGDN); } break; case LR_REVW: @@ -133,36 +122,39 @@ void encoder_update_user(uint8_t index, bool clockwise) { } } +#define MODS_SHIFT (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case TG_NAV: - if (!record->event.pressed) { - tap_code(KC_G); - layer_move(LR_NAV); + if (record->event.pressed) { + if (MODS_SHIFT) { + layer_move(BD_FUNC); + } else { + tap_code(KC_G); + layer_move(LR_NAV); + } } break; case TG_REVW: - if (!record->event.pressed) { - tap_code(KC_E); - layer_move(LR_REVW); + if (record->event.pressed) { + if (MODS_SHIFT) { + layer_move(BD_FUNC); + } else { + tap_code(KC_E); + layer_move(LR_REVW); + } } break; case TG_EDIT: - if (!record->event.pressed) { - tap_code(KC_D); - layer_move(LR_EDIT); + if (record->event.pressed) { + if (MODS_SHIFT) { + layer_move(BD_FUNC); + } else { + tap_code(KC_D); + layer_move(LR_EDIT); + } } break; } return true; } - -void process_combo_event(uint8_t combo_index, bool pressed) { - switch (combo_index) { - case TG_BDN9: - if (pressed) { - layer_move(BD_FUNC); - } - break; - } -} diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md index ddbf6fe7e155..1f820d118c9c 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md @@ -33,6 +33,7 @@ This layer is used for editing photos in the Develop Module ## BDN9 Layer This layer is used as a meta layer for the pad. This layer is accessed with a [Combo](https://docs.qmk.fm/#/feature_combo) of Left+Right Arrows +This layer is used as a meta layer for the pad. This layer is accessed by holding key in Row 1, Col 0, and pressing an encoder | | | | |:-:|:-:|:-:| | | RESET | | diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk index 70e5beedddd9..216740f8d2e8 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk @@ -2,6 +2,5 @@ BOOTLOADER = qmk-dfu # Build Options -COMBO_ENABLE = yes # Enable Combo feature BACKLIGHT_ENABLE = no # No backlights installed RGBLIGHT_ENABLE = no # No RGBs installed From da1f98780a1ddad83699b7238935928152190916 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Fri, 24 May 2019 13:11:33 -0700 Subject: [PATCH 057/429] [Keymap] Add default keypad layer --- .../bdn9/keymaps/brandonschlack/keymap.c | 80 ++++++++++++------- .../bdn9/keymaps/brandonschlack/readme.md | 16 +++- 2 files changed, 62 insertions(+), 34 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index eb60c6ab6a08..7ddb7bc11a73 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -2,6 +2,7 @@ #include "brandonschlack.h" enum bdn9_layers { + BD_KYPD, LR_NAV, LR_REVW, LR_EDIT, @@ -9,7 +10,8 @@ enum bdn9_layers { }; enum bdn9_keycodes { - TG_NAV = KEYMAP_SAFE_RANGE, + TG_KYPD = KEYMAP_SAFE_RANGE, + TG_NAV, TG_REVW, TG_EDIT, MC_UNDO, @@ -20,51 +22,63 @@ enum bdn9_keycodes { #define MC_REDO LSFT(LGUI(KC_Z)) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + Layer: Keypad/Karabiner + | Knob 1: +/- | | Knob 2: =/. | + | Press: 1 | 2 | 3 | + | 4, Hold: BD Layer | 5 | 6 | + | 7 | 8 | 9 | + */ + [BD_KYPD] = LAYOUT( + KC_P1, KC_P2, KC_P3, + LT(BD_FUNC, KC_P4), KC_P5, KC_P6, + KC_P7, KC_P8, KC_P9 + ), /* Layer: Navigation | Knob 1: =/- | | Knob 2: Page Dn/Up | | Press: Review | J | Press: Edit | - | Home, Hold: Shift | Up | End | + | Home, Hold: BD Layer | Up | End | | Left | Down | Right | */ [LR_NAV] = LAYOUT( TG_REVW, KC_J, TG_EDIT, - LSFT_T(KC_HOME), KC_UP, KC_END, + LT(BD_FUNC, KC_HOME), KC_UP, KC_END, KC_LEFT, KC_DOWN, KC_RGHT ), /* Layer: Review/Rate | Knob 1: ]/[ | | Knob 2: G(Up)/G(Dn) | | Press: Nav | 7 | Press: Edit | - | 0, Hold: Shift | 8 | U | + | 0, Hold: BD Layer | 8 | U | | Left | 9 | Right | */ [LR_REVW] = LAYOUT( TG_NAV, KC_7, TG_EDIT, - LSFT_T(KC_0), KC_8, KC_U, + LT(BD_FUNC, KC_0), KC_8, KC_U, KC_LEFT, KC_6, KC_RGHT ), /* Layer: Edit/Develop | Knob 1: ./, | | Knob 2: =/- | | Press: Review | \ | Press: Nav | - | X, Hold: Shift | Undo | P | + | X, Hold: BD Layer | Undo | P | | Left | Redo | Right | */ [LR_EDIT] = LAYOUT( TG_REVW, KC_BSLS, TG_NAV, - LSFT_T(KC_X), MC_UNDO, KC_P, + LT(BD_FUNC, KC_X), MC_UNDO, KC_P, KC_LEFT, MC_REDO, KC_RGHT ), /* Layer: BDN9 - | XXX | RST | XXX | - | MAKE | XXX | Flash | + | RST | FSH | MAKE | + | ___ | Kyp | XXX | | Review | Nav | Edit | */ [BD_FUNC] = LAYOUT( - XXXXXXX, RESET, XXXXXXX, - KC_MAKE, XXXXXXX, KC_FLSH, + RESET, KC_FLSH, KC_MAKE, + _______, TG_KYPD, XXXXXXX, TG_REVW, TG_NAV, TG_EDIT ), }; @@ -72,6 +86,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { void encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { switch (biton32(layer_state)) { + case BD_KYPD: + if (!clockwise) { + tap_code(KC_PPLS); + } else { + tap_code(KC_PMNS); + } + break; case LR_NAV: if (!clockwise) { tap_code(KC_EQL); @@ -97,6 +118,13 @@ void encoder_update_user(uint8_t index, bool clockwise) { } else if (index == 1) { switch (biton32(layer_state)) { + case BD_KYPD: + if (!clockwise) { + tap_code(KC_PEQL); + } else { + tap_code(KC_PDOT); + } + break; case LR_NAV: if (!clockwise) { tap_code(KC_PGUP); @@ -122,37 +150,29 @@ void encoder_update_user(uint8_t index, bool clockwise) { } } -#define MODS_SHIFT (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { switch (keycode) { + case TG_KYPD: + if (record->event.pressed) { + layer_move(BD_KYPD); + } + break; case TG_NAV: if (record->event.pressed) { - if (MODS_SHIFT) { - layer_move(BD_FUNC); - } else { - tap_code(KC_G); - layer_move(LR_NAV); - } + tap_code(KC_G); + layer_move(LR_NAV); } break; case TG_REVW: if (record->event.pressed) { - if (MODS_SHIFT) { - layer_move(BD_FUNC); - } else { - tap_code(KC_E); - layer_move(LR_REVW); - } + tap_code(KC_E); + layer_move(LR_REVW); } break; case TG_EDIT: if (record->event.pressed) { - if (MODS_SHIFT) { - layer_move(BD_FUNC); - } else { - tap_code(KC_D); - layer_move(LR_EDIT); - } + tap_code(KC_D); + layer_move(LR_EDIT); } break; } diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md index 1f820d118c9c..f26cb66f95a7 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md @@ -4,6 +4,15 @@ I built this pad to match my Lightroom photo editing workflow using [Lightroom Classic Keyboard shortcuts](https://helpx.adobe.com/lightroom-classic/help/keyboard-shortcuts.html) +## Keypad Layer +This layer is used to send keypad keys, meant to be remapped based on current app with Karabiner +| | | | +|:-:|:-:|:-:| +| +/-
**1** | 2 | =/.
**3** | +| 4 | 5 | 6 | +| 7 | 8 | 9 | +--- + ## Navigation Layer This layer is used for navigating Grid View in the Library Module. | | | | @@ -32,10 +41,9 @@ This layer is used for editing photos in the Develop Module --- ## BDN9 Layer -This layer is used as a meta layer for the pad. This layer is accessed with a [Combo](https://docs.qmk.fm/#/feature_combo) of Left+Right Arrows -This layer is used as a meta layer for the pad. This layer is accessed by holding key in Row 1, Col 0, and pressing an encoder +This layer is used as a meta layer for the pad. This layer is accessed by holding key in Row 1, Col 0 | | | | |:-:|:-:|:-:| -| | RESET | | -| MAKE | | FLASH | +| RESET | FLASH | MAKE | +| ___ | **Keypad** Layer | | | **Review** Layer | **Navigation** Layer | **Edit** Layer | From 8c05ae6bc65f0f2df4af88b5fe28d00a6444fc77 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Fri, 24 May 2019 13:17:19 -0700 Subject: [PATCH 058/429] [Keymap] Refactor layer names --- .../bdn9/keymaps/brandonschlack/keymap.c | 52 +++++++++---------- .../bdn9/keymaps/brandonschlack/readme.md | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 7ddb7bc11a73..2430ea50458e 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -2,11 +2,11 @@ #include "brandonschlack.h" enum bdn9_layers { - BD_KYPD, - LR_NAV, - LR_REVW, - LR_EDIT, - BD_FUNC + _KEYPAD, + _LR_NAV, + _LR_REVIEW, + _LR_EDIT, + _ADJUST }; enum bdn9_keycodes { @@ -29,9 +29,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 4, Hold: BD Layer | 5 | 6 | | 7 | 8 | 9 | */ - [BD_KYPD] = LAYOUT( + [_KEYPAD] = LAYOUT( KC_P1, KC_P2, KC_P3, - LT(BD_FUNC, KC_P4), KC_P5, KC_P6, + LT(_ADJUST, KC_P4), KC_P5, KC_P6, KC_P7, KC_P8, KC_P9 ), /* @@ -41,9 +41,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | Home, Hold: BD Layer | Up | End | | Left | Down | Right | */ - [LR_NAV] = LAYOUT( + [_LR_NAV] = LAYOUT( TG_REVW, KC_J, TG_EDIT, - LT(BD_FUNC, KC_HOME), KC_UP, KC_END, + LT(_ADJUST, KC_HOME), KC_UP, KC_END, KC_LEFT, KC_DOWN, KC_RGHT ), /* @@ -53,9 +53,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 0, Hold: BD Layer | 8 | U | | Left | 9 | Right | */ - [LR_REVW] = LAYOUT( + [_LR_REVIEW] = LAYOUT( TG_NAV, KC_7, TG_EDIT, - LT(BD_FUNC, KC_0), KC_8, KC_U, + LT(_ADJUST, KC_0), KC_8, KC_U, KC_LEFT, KC_6, KC_RGHT ), /* @@ -65,9 +65,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | X, Hold: BD Layer | Undo | P | | Left | Redo | Right | */ - [LR_EDIT] = LAYOUT( + [_LR_EDIT] = LAYOUT( TG_REVW, KC_BSLS, TG_NAV, - LT(BD_FUNC, KC_X), MC_UNDO, KC_P, + LT(_ADJUST, KC_X), MC_UNDO, KC_P, KC_LEFT, MC_REDO, KC_RGHT ), /* @@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ___ | Kyp | XXX | | Review | Nav | Edit | */ - [BD_FUNC] = LAYOUT( + [_ADJUST] = LAYOUT( RESET, KC_FLSH, KC_MAKE, _______, TG_KYPD, XXXXXXX, TG_REVW, TG_NAV, TG_EDIT @@ -86,28 +86,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { void encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { switch (biton32(layer_state)) { - case BD_KYPD: + case _KEYPAD: if (!clockwise) { tap_code(KC_PPLS); } else { tap_code(KC_PMNS); } break; - case LR_NAV: + case _LR_NAV: if (!clockwise) { tap_code(KC_EQL); } else { tap_code(KC_MINS); } break; - case LR_REVW: + case _LR_REVIEW: if (!clockwise) { tap_code(KC_RBRC); } else { tap_code(KC_LBRC); } break; - case LR_EDIT: + case _LR_EDIT: if (!clockwise) { tap_code(KC_DOT); } else { @@ -118,28 +118,28 @@ void encoder_update_user(uint8_t index, bool clockwise) { } else if (index == 1) { switch (biton32(layer_state)) { - case BD_KYPD: + case _KEYPAD: if (!clockwise) { tap_code(KC_PEQL); } else { tap_code(KC_PDOT); } break; - case LR_NAV: + case _LR_NAV: if (!clockwise) { tap_code(KC_PGUP); } else { tap_code(KC_PGDN); } break; - case LR_REVW: + case _LR_REVIEW: if (!clockwise) { tap_code16(G(KC_UP)); } else { tap_code16(G(KC_DOWN)); } break; - case LR_EDIT: + case _LR_EDIT: if (!clockwise) { tap_code(KC_EQL); } else { @@ -154,25 +154,25 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case TG_KYPD: if (record->event.pressed) { - layer_move(BD_KYPD); + layer_move(_KEYPAD); } break; case TG_NAV: if (record->event.pressed) { tap_code(KC_G); - layer_move(LR_NAV); + layer_move(_LR_NAV); } break; case TG_REVW: if (record->event.pressed) { tap_code(KC_E); - layer_move(LR_REVW); + layer_move(_LR_REVIEW); } break; case TG_EDIT: if (record->event.pressed) { tap_code(KC_D); - layer_move(LR_EDIT); + layer_move(_LR_EDIT); } break; } diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md index f26cb66f95a7..1d162f52bf08 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md @@ -40,7 +40,7 @@ This layer is used for editing photos in the Develop Module | Left | Redo | Right| --- -## BDN9 Layer +## Adjust Layer This layer is used as a meta layer for the pad. This layer is accessed by holding key in Row 1, Col 0 | | | | |:-:|:-:|:-:| From 28638a61fd63c12548b68a0e229019b42f1647ed Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Fri, 24 May 2019 13:20:29 -0700 Subject: [PATCH 059/429] [Keymap] Fix Caps Lock indicator for alt --- keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index c49e2a68cbe4..ccf2ae453e31 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -256,6 +256,8 @@ void rgb_matrix_indicators_user(void) { if ( this_led & (1< Date: Tue, 28 May 2019 10:41:07 -0700 Subject: [PATCH 060/429] [Keymap] Remove whitefox keymap --- .../whitefox/keymaps/brandonschlack/keymap.c | 58 ------------------- .../whitefox/keymaps/brandonschlack/rules.mk | 8 --- 2 files changed, 66 deletions(-) delete mode 100644 keyboards/whitefox/keymaps/brandonschlack/keymap.c delete mode 100644 keyboards/whitefox/keymaps/brandonschlack/rules.mk diff --git a/keyboards/whitefox/keymaps/brandonschlack/keymap.c b/keyboards/whitefox/keymaps/brandonschlack/keymap.c deleted file mode 100644 index bf78e21ad45a..000000000000 --- a/keyboards/whitefox/keymaps/brandonschlack/keymap.c +++ /dev/null @@ -1,58 +0,0 @@ -#include QMK_KEYBOARD_H -#include "brandonschlack.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Layer N: Blank Template - * ,---------------------------------------------------------------. - * | | | | | | | | | | | | | | | | | - * |---------------------------------------------------------------| - * | | | | | | | | | | | | | | | | - * |---------------------------------------------------------------| - * | | | | | | | | | | | | | | | - * |---------------------------------------------------------------| - * | | | | | | | | | | | | | | | - * |---------------------------------------------------------------| - * | | | | | | | | | | | - * `---------------------------------------------------------------' - */ - /* Keymap BL: Base Layer - * ,---------------------------------------------------------------. - * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| `|Hom| - * |---------------------------------------------------------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]|Backs|End| - * |---------------------------------------------------------------| - * |HyCaps| A| S| D| F| G| H| J| K| L| ;| '|Enter |PgU| - * |---------------------------------------------------------------| - * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |PgD| - * |---------------------------------------------------------------| - * |Ctl |Alt |Gui | Space |Gui |FnPy| |Lef|Dow|Rig| - * `---------------------------------------------------------------' - */ - [BL] = LAYOUT_truefox(\ - 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_GRV, KC_BSLS, KC_HOME, \ - 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, KC_END, \ - HY_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_PGUP, \ - 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_UP, KC_PGDN, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FN, KC_LEFT, KC_DOWN, KC_RGHT \ - ), - /* Keymap FL: Function Layer - * ,---------------------------------------------------------------. - * |MKE| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|MSN|LHP|SLP| - * |---------------------------------------------------------------| - * | | | | |RST| | | | | |F13|F14|F15| Del| | - * |---------------------------------------------------------------| - * | | | | | | | | | | | | | | | - * |---------------------------------------------------------------| - * | | | | | | | | | | | |MutSft|VlU| | - * |---------------------------------------------------------------| - * | | | | | | | |Prv|VlD|Nxt| - * `---------------------------------------------------------------' - */ - [FL] = LAYOUT_truefox(\ - KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_MSSN, MC_LHPD, MC_SLPD, \ - _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, MC_VOLU, _______, \ - _______, _______, _______, _______, _______, _______, KC_MRWD, MC_VOLD, KC_MFFD \ - ) -}; diff --git a/keyboards/whitefox/keymaps/brandonschlack/rules.mk b/keyboards/whitefox/keymaps/brandonschlack/rules.mk deleted file mode 100644 index 056859ef0c19..000000000000 --- a/keyboards/whitefox/keymaps/brandonschlack/rules.mk +++ /dev/null @@ -1,8 +0,0 @@ -BOOTMAGIC_ENABLE = yes -COMMAND_ENABLE = yes # Commands for debug and configuration -CONSOLE_ENABLE = yes -EXTRAKEY_ENABLE = yes # Audio control and System control -MOUSEKEY_ENABLE = yes # Mouse keys -NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # No backlights installed -VISUALIZER_ENABLE = no # No backlights installed From f40870e102e6e4410e1b5acf4b16374f8cfe7cb7 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 28 May 2019 12:09:34 -0700 Subject: [PATCH 061/429] [User] Refactor layer names --- .../hotswap/keymaps/brandonschlack/keymap.c | 22 +++++++------- .../alt/keymaps/brandonschlack/keymap.c | 30 +++++++++---------- users/brandonschlack/brandonschlack.c | 6 ++-- users/brandonschlack/brandonschlack.h | 24 +++++++-------- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index 99572b098c00..bdf22962dfc4 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |Ctl |Alt |Gui | Space |Gui |FnPy| |Lef|Dow|Rig| * `---------------------------------------------------------------' */ -[LB_MAC] = LAYOUT( +[_MAC] = LAYOUT( 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_HOME, \ 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, KC_PGUP, \ HY_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_PGDN, \ @@ -59,17 +59,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | |RST| | | | | |F13|F14|F15| Del|VlU| * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgMagic|VlD| + * | | | | | | | | | | | | | TgAdjst|VlD| * |---------------------------------------------------------------| * | | | | | | | | |Prv|Nxt|Plr|MutSft|PgU| | * |---------------------------------------------------------------| * | | | | | | | |Hom|PgD|End| * `---------------------------------------------------------------' */ -[LF_MAC] = LAYOUT( +[_MACFN] = LAYOUT( KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_MSSN, MC_SLPD, \ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, KC_VOLU, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLD, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, KC_VOLD, \ _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, MC_PLYR, MM_RSFT, KC_PGUP, _______, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), @@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |Ctl |Alt |Gui | Space |Gui |FnPy| |Lef|Dow|Rig| * `---------------------------------------------------------------' */ -[LB_WIN] = LAYOUT( +[_WIN] = LAYOUT( 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_HOME, \ 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, KC_PGUP, \ HY_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_PGDN, \ @@ -101,17 +101,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | |RST| | | | | |PtS|SLk|Pau| Del|VlU| * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgMagic|VlD| + * | | | | | | | | | | | | | TgAdjst|VlD| * |---------------------------------------------------------------| * | | | | | | | | |Prv|Nxt|Stp|MutSft|PgU| | * |---------------------------------------------------------------| * | | | | | | | |Hom|PgD|End| * `---------------------------------------------------------------' */ -[LF_WIN] = LAYOUT( +[_WINFN] = LAYOUT( KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, WN_TSKM, _______, WN_LOCK, \ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_DEL, KC_VOLU, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLD, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, KC_VOLD, \ _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MSTP, MM_RSFT, KC_PGUP, _______, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), @@ -124,17 +124,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | |EEP|RST| | | | | | | | | | | * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgMagic| | + * | | | | | | | | | | | | | TgAdjst| | * |---------------------------------------------------------------| * | | | | | | | | |Mac|Win| | | | | * |---------------------------------------------------------------| * | | | | | | | | | | | * `---------------------------------------------------------------' */ -[LK_MGC] = LAYOUT( +[_ADJUST] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_ADJT, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, OS_MAC, OS_WIN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX), }; diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index ccf2ae453e31..05d828f2ca21 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |Ctl |Alt |Gui | Space |Gui |FnPy| |Lef|Dow|Rig| * `---------------------------------------------------------------' */ - [LB_MAC] = LAYOUT( + [_MAC] = LAYOUT( 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, MC_POWR, \ 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_HOME, \ HY_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_PGUP, \ @@ -45,17 +45,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | |DFU| | | | | |F13|F14|F15| LHP|End| * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgMagic|VlU| + * | | | | | | | | | | | | | TgAdjst|VlU| * |---------------------------------------------------------------| * | |RTO| | | | | |MKE|Prv|Nxt|Plr|MutSft|PgU|VlD| * |---------------------------------------------------------------| * | | | | | | | |Hom|PgD|End| * `---------------------------------------------------------------' */ - [LF_MAC] = LAYOUT( + [_MACFN] = LAYOUT( 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, MC_SLPD, \ _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLU, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, KC_VOLU, \ _______, RGB_TOG, _______, _______, _______, _______, _______, MD_MAKE, KC_MRWD, KC_MFFD, MC_PLYR, MM_RSFT, KC_PGUP, KC_VOLD, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), @@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |Ctl |Alt |Gui | Space |Gui |FnPy| |Lef|Dow|Rig| * `---------------------------------------------------------------' */ - [LB_WIN] = LAYOUT( + [_WIN] = LAYOUT( 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_DEL, \ 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_HOME, \ HY_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_PGUP, \ @@ -89,17 +89,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | |DFU| | | | | |PtS|SLk|Pau| TSK|End| * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgMagic|VlU| + * | | | | | | | | | | | | | TgAdjst|VlU| * |---------------------------------------------------------------| * | |RTO| | | | | |MKE|Prv|Nxt|Stp|MutSft|PgU|VlD| * |---------------------------------------------------------------| * | | | | | | | |Hom|PgD|End| * `---------------------------------------------------------------' */ - [LF_WIN] = LAYOUT( + [_WINFN] = LAYOUT( 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, WN_LOCK, \ _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, WN_TSKM, KC_END, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLU, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, KC_VOLU, \ _______, RGB_TOG, _______, _______, _______, _______, _______, MD_MAKE, KC_MPRV, KC_MNXT, KC_MSTP, MM_RSFT, KC_PGUP, KC_VOLD, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), @@ -113,17 +113,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | |RS-|RB+|RS+|RH+|RS+| |UAD|GCR| | | | | | | * |---------------------------------------------------------------| - * | |RM-|RB-|RM+|RH-|RS-| | | | | | | TgMagic| | + * | |RM-|RB-|RM+|RH-|RS-| | | | | | | TgAdjst| | * |---------------------------------------------------------------| * | |RTO| | | | |KRO| |Mac|Win| | | | | * |---------------------------------------------------------------| * | | | | | | | | | | | * `---------------------------------------------------------------' */ - [LK_MGC] = LAYOUT( + [_ADJUST] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, XXXXXXX, U_T_AUTO,U_T_AGCR,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, \ + XXXXXXX, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_ADJT, XXXXXXX, \ XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_NKRO, XXXXXXX, OS_MAC, OS_WIN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), @@ -238,16 +238,16 @@ void rgb_matrix_indicators_user(void) { if (!g_suspend_state && rgb_matrix_config.enable) { switch (biton32(layer_state)) { - case LB_MAC: + case _MAC: rgb_matrix_hsv_layer(HSV_PURPLE); break; - case LF_MAC: + case _MACFN: rgb_matrix_hsv_layer(HSV_PINK); break; - case LB_WIN: + case _WIN: rgb_matrix_hsv_layer(HSV_MAGENTA); break; - case LF_WIN: + case _WINFN: rgb_matrix_hsv_layer(HSV_CYAN); break; default: diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index 55915d7dbb91..e789abc4b8d9 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -80,13 +80,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } break; case OS_MAC: - set_single_persistent_default_layer(LB_MAC); + set_single_persistent_default_layer(_MAC); break; case OS_WIN: - set_single_persistent_default_layer(LB_WIN); + set_single_persistent_default_layer(_WIN); break; case OS_NIX: - set_single_persistent_default_layer(LB_NIX); + set_single_persistent_default_layer(_NIX); break; case WN_SLPD: tap_code16(G(KC_L)); diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index f9f92ea88390..1729bd660c7b 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -3,14 +3,14 @@ #include "quantum.h" // Define layer names -enum layer_names { - LB_MAC = 0, - LF_MAC, - LB_WIN, - LF_WIN, - LB_NIX, - LF_NIX, - LK_MGC, +enum bs_layers { + _MAC = 0, + _MACFN, + _WIN, + _WINFN, + _NIX, + _NIXFN, + _ADJUST, }; // Config @@ -31,14 +31,14 @@ enum custom_keycodes { // Useful Defines #define HY_CAPS ALL_T(KC_CAPS) -#define TG_MAGC TG(LK_MGC) +#define TG_ADJT TG(_ADJUST) // Media Mod-Tap #define MM_LCTL LCTL_T(KC_MRWD) #define MM_LALT LALT_T(KC_MPLY) #define MM_LGUI LGUI_T(KC_MFFD) -#define MM_FN_M LT(LF_MAC, KC_MPLY) -#define MM_FN_W LT(LF_WIN, KC_MPLY) -#define MM_FN_X LT(LF_NIX, KC_MPLY) +#define MM_FN_M LT(_MACFN, KC_MPLY) +#define MM_FN_W LT(_WINFN, KC_MPLY) +#define MM_FN_X LT(_NIXFN, KC_MPLY) #define MM_RSFT RSFT_T(KC_MUTE) // MacOS #define MC_POWR KC_POWER // Mac Power alias From a22610666f4dfa38948729f9f61cd3b16926ec78 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 28 May 2019 12:41:43 -0700 Subject: [PATCH 062/429] [Keymap] Add Media layer to bdn9 --- .../bdn9/keymaps/brandonschlack/keymap.c | 41 +++++++++++++++++-- .../bdn9/keymaps/brandonschlack/readme.md | 15 +++++-- 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 2430ea50458e..68ca44319b0a 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -3,6 +3,7 @@ enum bdn9_layers { _KEYPAD, + _MEDIA, _LR_NAV, _LR_REVIEW, _LR_EDIT, @@ -11,6 +12,7 @@ enum bdn9_layers { enum bdn9_keycodes { TG_KYPD = KEYMAP_SAFE_RANGE, + TG_MEDA, TG_NAV, TG_REVW, TG_EDIT, @@ -34,6 +36,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LT(_ADJUST, KC_P4), KC_P5, KC_P6, KC_P7, KC_P8, KC_P9 ), + /* + Layer: Media + | Knob 1: Vol +/- | | Knob 2: Track Prv/Nxt | + | Press: Mute | Plyr | Press: Play/Pause | + | Home, Hold: BD Layer | Up | End | + | Left | Down | Right | + */ + [_MEDIA] = LAYOUT( + KC_MUTE, MC_PLYR, KC_MPLY, + LT(_ADJUST, KC_HOME), KC_UP, KC_END, + KC_LEFT, KC_DOWN, KC_RGHT + ), /* Layer: Navigation | Knob 1: =/- | | Knob 2: Page Dn/Up | @@ -72,13 +86,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Layer: BDN9 - | RST | FSH | MAKE | - | ___ | Kyp | XXX | + | FLASH | XXX | MAKE | + | ___ | Kyp | Media | | Review | Nav | Edit | */ [_ADJUST] = LAYOUT( - RESET, KC_FLSH, KC_MAKE, - _______, TG_KYPD, XXXXXXX, + KC_FLSH, XXXXXXX, KC_MAKE, + _______, TG_KYPD, TG_MEDA, TG_REVW, TG_NAV, TG_EDIT ), }; @@ -93,6 +107,13 @@ void encoder_update_user(uint8_t index, bool clockwise) { tap_code(KC_PMNS); } break; + case _MEDIA: + if (!clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + break; case _LR_NAV: if (!clockwise) { tap_code(KC_EQL); @@ -125,6 +146,13 @@ void encoder_update_user(uint8_t index, bool clockwise) { tap_code(KC_PDOT); } break; + case _MEDIA: + if (!clockwise) { + tap_code(KC_MFFD); + } else { + tap_code(KC_MRWD); + } + break; case _LR_NAV: if (!clockwise) { tap_code(KC_PGUP); @@ -157,6 +185,11 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { layer_move(_KEYPAD); } break; + case TG_MEDA: + if (record->event.pressed) { + layer_move(_MEDIA); + } + break; case TG_NAV: if (record->event.pressed) { tap_code(KC_G); diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md index 1d162f52bf08..39483878aeaf 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md @@ -5,7 +5,7 @@ I built this pad to match my Lightroom photo editing workflow using ## Keypad Layer -This layer is used to send keypad keys, meant to be remapped based on current app with Karabiner +This layer is used to send keypad keys, meant to be remapped based on current app with [Karabiner](https://pqrs.org/osx/karabiner/) | | | | |:-:|:-:|:-:| | +/-
**1** | 2 | =/.
**3** | @@ -13,6 +13,15 @@ This layer is used to send keypad keys, meant to be remapped based on current ap | 7 | 8 | 9 | --- +## Media Layer +This layer is used for media controls. Player button is a hotkey to focus the current media player with [BeardedSpice](https://beardedspice.github.io/) +| | | | +|:-:|:-:|:-:| +| Volume Up/Down
**Mute** | Current Player | Next/Prev Track
**Play/Pause** | +| Home | Up | End | +| Left | Down | Right| +--- + ## Navigation Layer This layer is used for navigating Grid View in the Library Module. | | | | @@ -44,6 +53,6 @@ This layer is used for editing photos in the Develop Module This layer is used as a meta layer for the pad. This layer is accessed by holding key in Row 1, Col 0 | | | | |:-:|:-:|:-:| -| RESET | FLASH | MAKE | -| ___ | **Keypad** Layer | | +| FLASH | | MAKE | +| ___ | **Keypad** Layer | **Media** Layer | | **Review** Layer | **Navigation** Layer | **Edit** Layer | From d68a98c7c207dde6ed8c31d0f03388b3a8815508 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Tue, 28 May 2019 22:48:00 -0700 Subject: [PATCH 063/429] [Keymap] Change function layer for BDN9 keymap --- .../keebio/bdn9/keymaps/brandonschlack/keymap.c | 14 +++++++------- .../keebio/bdn9/keymaps/brandonschlack/readme.md | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 68ca44319b0a..d113c6a8a931 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -7,7 +7,7 @@ enum bdn9_layers { _LR_NAV, _LR_REVIEW, _LR_EDIT, - _ADJUST + _FUNC }; enum bdn9_keycodes { @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_KEYPAD] = LAYOUT( KC_P1, KC_P2, KC_P3, - LT(_ADJUST, KC_P4), KC_P5, KC_P6, + LT(_FUNC, KC_P4), KC_P5, KC_P6, KC_P7, KC_P8, KC_P9 ), /* @@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_MEDIA] = LAYOUT( KC_MUTE, MC_PLYR, KC_MPLY, - LT(_ADJUST, KC_HOME), KC_UP, KC_END, + LT(_FUNC, KC_HOME), KC_UP, KC_END, KC_LEFT, KC_DOWN, KC_RGHT ), /* @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LR_NAV] = LAYOUT( TG_REVW, KC_J, TG_EDIT, - LT(_ADJUST, KC_HOME), KC_UP, KC_END, + LT(_FUNC, KC_HOME), KC_UP, KC_END, KC_LEFT, KC_DOWN, KC_RGHT ), /* @@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LR_REVIEW] = LAYOUT( TG_NAV, KC_7, TG_EDIT, - LT(_ADJUST, KC_0), KC_8, KC_U, + LT(_FUNC, KC_0), KC_8, KC_U, KC_LEFT, KC_6, KC_RGHT ), /* @@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LR_EDIT] = LAYOUT( TG_REVW, KC_BSLS, TG_NAV, - LT(_ADJUST, KC_X), MC_UNDO, KC_P, + LT(_FUNC, KC_X), MC_UNDO, KC_P, KC_LEFT, MC_REDO, KC_RGHT ), /* @@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ___ | Kyp | Media | | Review | Nav | Edit | */ - [_ADJUST] = LAYOUT( + [_FUNC] = LAYOUT( KC_FLSH, XXXXXXX, KC_MAKE, _______, TG_KYPD, TG_MEDA, TG_REVW, TG_NAV, TG_EDIT diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md index 39483878aeaf..3025cc1195b1 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md @@ -49,7 +49,7 @@ This layer is used for editing photos in the Develop Module | Left | Redo | Right| --- -## Adjust Layer +## Function Layer This layer is used as a meta layer for the pad. This layer is accessed by holding key in Row 1, Col 0 | | | | |:-:|:-:|:-:| From bdf686ef8598b6b5e922d924e77cbf773c5de326 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 29 May 2019 10:36:13 -0700 Subject: [PATCH 064/429] [User] Refactor _ADJUST back to _MAGIC --- .../hotswap/keymaps/brandonschlack/keymap.c | 14 +++++++------- .../keebio/bdn9/keymaps/brandonschlack/keymap.c | 17 ++++++++--------- .../bdn9/keymaps/brandonschlack/readme.md | 2 +- .../alt/keymaps/brandonschlack/keymap.c | 14 +++++++------- users/brandonschlack/brandonschlack.h | 4 ++-- 5 files changed, 25 insertions(+), 26 deletions(-) diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index bdf22962dfc4..76a6cbd3a4a7 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | |RST| | | | | |F13|F14|F15| Del|VlU| * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgAdjst|VlD| + * | | | | | | | | | | | | | TgMagic|VlD| * |---------------------------------------------------------------| * | | | | | | | | |Prv|Nxt|Plr|MutSft|PgU| | * |---------------------------------------------------------------| @@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_MACFN] = LAYOUT( KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_MSSN, MC_SLPD, \ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, KC_VOLU, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, KC_VOLD, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLD, \ _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, MC_PLYR, MM_RSFT, KC_PGUP, _______, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), @@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | |RST| | | | | |PtS|SLk|Pau| Del|VlU| * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgAdjst|VlD| + * | | | | | | | | | | | | | TgMagic|VlD| * |---------------------------------------------------------------| * | | | | | | | | |Prv|Nxt|Stp|MutSft|PgU| | * |---------------------------------------------------------------| @@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_WINFN] = LAYOUT( KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, WN_TSKM, _______, WN_LOCK, \ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_DEL, KC_VOLU, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, KC_VOLD, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLD, \ _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MSTP, MM_RSFT, KC_PGUP, _______, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), @@ -124,17 +124,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | |EEP|RST| | | | | | | | | | | * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgAdjst| | + * | | | | | | | | | | | | | TgMagic| | * |---------------------------------------------------------------| * | | | | | | | | |Mac|Win| | | | | * |---------------------------------------------------------------| * | | | | | | | | | | | * `---------------------------------------------------------------' */ -[_ADJUST] = LAYOUT( +[_MAGIC] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_ADJT, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, OS_MAC, OS_WIN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX), }; diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index d113c6a8a931..1395caf451c9 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -6,8 +6,7 @@ enum bdn9_layers { _MEDIA, _LR_NAV, _LR_REVIEW, - _LR_EDIT, - _FUNC + _LR_EDIT }; enum bdn9_keycodes { @@ -33,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_KEYPAD] = LAYOUT( KC_P1, KC_P2, KC_P3, - LT(_FUNC, KC_P4), KC_P5, KC_P6, + LT(_MAGIC, KC_P4), KC_P5, KC_P6, KC_P7, KC_P8, KC_P9 ), /* @@ -45,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_MEDIA] = LAYOUT( KC_MUTE, MC_PLYR, KC_MPLY, - LT(_FUNC, KC_HOME), KC_UP, KC_END, + LT(_MAGIC, KC_HOME), KC_UP, KC_END, KC_LEFT, KC_DOWN, KC_RGHT ), /* @@ -57,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LR_NAV] = LAYOUT( TG_REVW, KC_J, TG_EDIT, - LT(_FUNC, KC_HOME), KC_UP, KC_END, + LT(_MAGIC, KC_HOME), KC_UP, KC_END, KC_LEFT, KC_DOWN, KC_RGHT ), /* @@ -69,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LR_REVIEW] = LAYOUT( TG_NAV, KC_7, TG_EDIT, - LT(_FUNC, KC_0), KC_8, KC_U, + LT(_MAGIC, KC_0), KC_8, KC_U, KC_LEFT, KC_6, KC_RGHT ), /* @@ -81,16 +80,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LR_EDIT] = LAYOUT( TG_REVW, KC_BSLS, TG_NAV, - LT(_FUNC, KC_X), MC_UNDO, KC_P, + LT(_MAGIC, KC_X), MC_UNDO, KC_P, KC_LEFT, MC_REDO, KC_RGHT ), /* - Layer: BDN9 + Layer: Magic | FLASH | XXX | MAKE | | ___ | Kyp | Media | | Review | Nav | Edit | */ - [_FUNC] = LAYOUT( + [_MAGIC] = LAYOUT( KC_FLSH, XXXXXXX, KC_MAKE, _______, TG_KYPD, TG_MEDA, TG_REVW, TG_NAV, TG_EDIT diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md index 3025cc1195b1..cf62b2419dc9 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md @@ -49,7 +49,7 @@ This layer is used for editing photos in the Develop Module | Left | Redo | Right| --- -## Function Layer +## Magic Layer This layer is used as a meta layer for the pad. This layer is accessed by holding key in Row 1, Col 0 | | | | |:-:|:-:|:-:| diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index 05d828f2ca21..873f6e47f15f 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | |DFU| | | | | |F13|F14|F15| LHP|End| * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgAdjst|VlU| + * | | | | | | | | | | | | | TgMagic|VlU| * |---------------------------------------------------------------| * | |RTO| | | | | |MKE|Prv|Nxt|Plr|MutSft|PgU|VlD| * |---------------------------------------------------------------| @@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_MACFN] = LAYOUT( 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, MC_SLPD, \ _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, KC_VOLU, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLU, \ _______, RGB_TOG, _______, _______, _______, _______, _______, MD_MAKE, KC_MRWD, KC_MFFD, MC_PLYR, MM_RSFT, KC_PGUP, KC_VOLD, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), @@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | |DFU| | | | | |PtS|SLk|Pau| TSK|End| * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgAdjst|VlU| + * | | | | | | | | | | | | | TgMagic|VlU| * |---------------------------------------------------------------| * | |RTO| | | | | |MKE|Prv|Nxt|Stp|MutSft|PgU|VlD| * |---------------------------------------------------------------| @@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_WINFN] = LAYOUT( 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, WN_LOCK, \ _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, WN_TSKM, KC_END, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, KC_VOLU, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLU, \ _______, RGB_TOG, _______, _______, _______, _______, _______, MD_MAKE, KC_MPRV, KC_MNXT, KC_MSTP, MM_RSFT, KC_PGUP, KC_VOLD, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), @@ -113,17 +113,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | |RS-|RB+|RS+|RH+|RS+| |UAD|GCR| | | | | | | * |---------------------------------------------------------------| - * | |RM-|RB-|RM+|RH-|RS-| | | | | | | TgAdjst| | + * | |RM-|RB-|RM+|RH-|RS-| | | | | | | TgMagic| | * |---------------------------------------------------------------| * | |RTO| | | | |KRO| |Mac|Win| | | | | * |---------------------------------------------------------------| * | | | | | | | | | | | * `---------------------------------------------------------------' */ - [_ADJUST] = LAYOUT( + [_MAGIC] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, XXXXXXX, U_T_AUTO,U_T_AGCR,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_ADJT, XXXXXXX, \ + XXXXXXX, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, \ XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_NKRO, XXXXXXX, OS_MAC, OS_WIN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 1729bd660c7b..56aaf281f136 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -10,7 +10,7 @@ enum bs_layers { _WINFN, _NIX, _NIXFN, - _ADJUST, + _MAGIC = 15, }; // Config @@ -31,7 +31,7 @@ enum custom_keycodes { // Useful Defines #define HY_CAPS ALL_T(KC_CAPS) -#define TG_ADJT TG(_ADJUST) +#define TG_MAGC TG(_MAGIC) // Media Mod-Tap #define MM_LCTL LCTL_T(KC_MRWD) #define MM_LALT LALT_T(KC_MPLY) From db3f6058bb5c75168fdc701f13e5eb7cda0248be Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Fri, 31 May 2019 13:46:18 -0700 Subject: [PATCH 065/429] [Keymap] Fixes for bdn9 keymap * Sets layer toggle keycodes on keyup * Sets bootloader as atmel-dfu for Elite-C --- keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c | 10 +++++----- keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 1395caf451c9..d7f3db04a8b4 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -180,29 +180,29 @@ void encoder_update_user(uint8_t index, bool clockwise) { bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case TG_KYPD: - if (record->event.pressed) { + if (!record->event.pressed) { layer_move(_KEYPAD); } break; case TG_MEDA: - if (record->event.pressed) { + if (!record->event.pressed) { layer_move(_MEDIA); } break; case TG_NAV: - if (record->event.pressed) { + if (!record->event.pressed) { tap_code(KC_G); layer_move(_LR_NAV); } break; case TG_REVW: - if (record->event.pressed) { + if (!record->event.pressed) { tap_code(KC_E); layer_move(_LR_REVIEW); } break; case TG_EDIT: - if (record->event.pressed) { + if (!record->event.pressed) { tap_code(KC_D); layer_move(_LR_EDIT); } diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk index 216740f8d2e8..d59da40f30aa 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk @@ -1,5 +1,5 @@ # Use dfu bootloader for Elite-C -BOOTLOADER = qmk-dfu +BOOTLOADER = atmel-dfu # Build Options BACKLIGHT_ENABLE = no # No backlights installed From 38f5f28943c79557b3eb21b001f703d286896547 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Fri, 31 May 2019 14:40:24 -0700 Subject: [PATCH 066/429] [User] Break out RGB userconfig --- users/brandonschlack/brandonschlack.h | 10 +++------- users/brandonschlack/rgb_bs.c | 14 ++++++++++++++ users/brandonschlack/rgb_bs.h | 18 ++++++++++++++++++ users/brandonschlack/rules.mk | 9 +++++++++ 4 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 users/brandonschlack/rgb_bs.c create mode 100644 users/brandonschlack/rgb_bs.h diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 56aaf281f136..37e1eccfe366 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -1,6 +1,9 @@ #pragma once #include "quantum.h" +#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) +# include "rgb_bs.h" +#endif // Define layer names enum bs_layers { @@ -49,10 +52,3 @@ enum custom_keycodes { // Windows #define WN_LOCK LGUI(KC_L) // Lock Computer #define WN_TSKM LCTL(LALT(KC_DEL)) // Task Manager (Ctrl+Alt+Del) - -// RGB Colors -#define RGB_LSR_PURPLE 0x3C, 0x16, 0x8C -#define RGB_LSR_PINK 0xF2, 0x1B, 0x7F -#define RGB_LSR_INDIGO 0x23, 0x1B, 0x59 -#define RGB_LSR_CYAN 0x2F, 0xC1, 0xE1 -#define RGB_LSR_VIOLET 0x53, 0x36, 0xBF diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c new file mode 100644 index 000000000000..9efd2db2f3c6 --- /dev/null +++ b/users/brandonschlack/rgb_bs.c @@ -0,0 +1,14 @@ +#include "brandonschlack.h" +#include "rgb_bs.h" + +#ifdef RGB_MATRIX_ENABLE + +extern led_config_t g_led_config; +void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, uint8_t led_type) { + for (int i = 0; i < DRIVER_LED_TOTAL; i++) { + if (HAS_FLAGS(g_led_config.flags[i], led_type)) { + rgb_matrix_set_color( i, red, green, blue ); + } + } +} +#endif diff --git a/users/brandonschlack/rgb_bs.h b/users/brandonschlack/rgb_bs.h new file mode 100644 index 000000000000..f9ddec159276 --- /dev/null +++ b/users/brandonschlack/rgb_bs.h @@ -0,0 +1,18 @@ +#pragma once +#include "quantum.h" +#ifdef RGB_MATRIX_ENABLE + #include "rgb_matrix.h" +#endif + +// RGB Colors +#define RGB_LSR_PURPLE 0x3C, 0x16, 0x8C +#define RGB_LSR_PINK 0xF2, 0x1B, 0x7F +#define RGB_LSR_INDIGO 0x23, 0x1B, 0x59 +#define RGB_LSR_CYAN 0x2F, 0xC1, 0xE1 +#define RGB_LSR_VIOLET 0x53, 0x36, 0xBF + +// layer_state_t layer_state_set_rgb(layer_state_t state); +// layer_state_t default_layer_state_set_rgb(layer_state_t state); + +// void rgb_matrix_hsv_layer (uint8_t hue, uint8_t sat, uint8_t val); +void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, uint8_t led_type); diff --git a/users/brandonschlack/rules.mk b/users/brandonschlack/rules.mk index 0cc2c9f8cf99..2cc870e384ca 100644 --- a/users/brandonschlack/rules.mk +++ b/users/brandonschlack/rules.mk @@ -1 +1,10 @@ SRC += brandonschlack.c + +ifeq ($(strip $(RGBLIGHT_ENABLE)), yes) + SRC += rgb_bs.c +endif + +RGB_MATRIX_ENABLE ?= no +ifneq ($(strip $(RGB_MATRIX_ENABLE)), no) + SRC += rgb_bs.c +endif From 8e290b91d195907cf52fdaed3416a4890c82dd19 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Fri, 31 May 2019 15:08:19 -0700 Subject: [PATCH 067/429] [Keymap] Small fixes for massdrop alt keymap --- keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index 873f6e47f15f..0cc7da511349 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -250,14 +250,15 @@ void rgb_matrix_indicators_user(void) { case _WINFN: rgb_matrix_hsv_layer(HSV_CYAN); break; - default: + case _MAGIC: rgb_matrix_hsv_layer(HSV_WHITE); + break; } if ( this_led & (1< Date: Fri, 31 May 2019 15:09:11 -0700 Subject: [PATCH 068/429] [Keymap] Add launchpad keymap --- .../launchpad/keymaps/brandonschlack/keymap.c | 92 +++++++++++++++++++ .../keymaps/brandonschlack/readme.md | 31 +++++++ .../launchpad/keymaps/brandonschlack/rules.mk | 2 + 3 files changed, 125 insertions(+) create mode 100644 keyboards/launchpad/keymaps/brandonschlack/keymap.c create mode 100644 keyboards/launchpad/keymaps/brandonschlack/readme.md create mode 100644 keyboards/launchpad/keymaps/brandonschlack/rules.mk diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c new file mode 100644 index 000000000000..a089bc23b0b0 --- /dev/null +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -0,0 +1,92 @@ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +extern keymap_config_t keymap_config; + +enum launchpad_layers { + _MEDIA, + _KEYPAD +}; + +enum bdn9_keycodes { + TG_MEDA = KEYMAP_SAFE_RANGE, + TG_KYPD +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Media + * ,-------------. + * | Mute | PlPs | + * |------+------| + * | VolU | TrkN | + * |------+------| + * | VolD | TrkP | + * |------+------| + * | | Plyr | + * `-------------' + */ +[_MEDIA] = LAYOUT( \ + KC_MUTE, KC_MPLY, \ + KC_VOLU, KC_MFFD, \ + KC_VOLD, KC_MRWD, \ + MO(_MAGIC), MC_PLYR \ +), + +/* Keypad + * ,-------------. + * | 1 | 2 | + * |------+------| + * | 3 | 4 | + * |------+------| + * | 5 | 6 | + * |------+------| + * | 7 | 8 | + * `-------------' + */ +[_KEYPAD] = LAYOUT( \ + KC_P1, KC_P2, \ + KC_P3, KC_P4, \ + KC_P5, KC_P6, \ + LT(_MAGIC, KC_P7), KC_P8 \ +), + +/* Magic + * ,-------------. + * | Flsh | Rset | + * |------+------| + * | Mdia | Kypd | + * |------+------| + * | XXXX | XXXX | + * |------+------| + * | | XXXX | + * `-------------' + */ +[_MAGIC] = LAYOUT( \ + KC_FLSH, RESET, \ + TG_MEDA, TG_KYPD, \ + XXXXXXX, XXXXXXX, \ + _______, XXXXXXX \ +) + +}; + +void matrix_init_user(void) { + +} + +bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case TG_MEDA: + if (!record->event.pressed) { + layer_move(_MEDIA); + } + break; + case TG_KYPD: + if (!record->event.pressed) { + layer_move(_KEYPAD); + } + break; + } + return true; +} diff --git a/keyboards/launchpad/keymaps/brandonschlack/readme.md b/keyboards/launchpad/keymaps/brandonschlack/readme.md new file mode 100644 index 000000000000..60edd031148c --- /dev/null +++ b/keyboards/launchpad/keymaps/brandonschlack/readme.md @@ -0,0 +1,31 @@ +# brandonschlack's layout for Launchpad +Fun little macropad build, with an awesome case from [StrataKB](https://stratakb.com/store/cases/launchpad-v2-full-case). + +## Media Layer +This layer is used for media controls. Player button is a hotkey to focus the current media player with [BeardedSpice](https://beardedspice.github.io/) +| | | +|:-:|:-:| +| Mute | Play/Pause | +| Vol + | Next Track | +| Vol - | Prev Track | +| | Current Player | +--- + +## Keypad Layer +This layer is used to send keypad keys, meant to be remapped based on current app with [Karabiner](https://pqrs.org/osx/karabiner/) +| | | +|:-:|:-:| +| 1 | 2 | +| 3 | 4 | +| 5 | 6 | +| 7 | 8 | +--- + +## Magic Layer +This layer is used as a meta layer for the pad. This layer is accessed by holding key in Row 3, Col 0 +| | | +|:-:|:-:| +| FLASH | RESET | +| **Media** Layer | **Keypad** Layer| +| XXX | XXX | +| ___ | XXX | diff --git a/keyboards/launchpad/keymaps/brandonschlack/rules.mk b/keyboards/launchpad/keymaps/brandonschlack/rules.mk new file mode 100644 index 000000000000..45dad0c6b7b6 --- /dev/null +++ b/keyboards/launchpad/keymaps/brandonschlack/rules.mk @@ -0,0 +1,2 @@ +# Use dfu bootloader for Elite-C +BOOTLOADER = atmel-dfu From f9d6c77e87dc07fbacc0b541d91b7a01432a121f Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Sun, 2 Jun 2019 15:42:12 -0700 Subject: [PATCH 069/429] [Keymap] Add Navigation, Reeder layers to bdn9 --- .../bdn9/keymaps/brandonschlack/keymap.c | 124 ++++++++++++++---- .../bdn9/keymaps/brandonschlack/readme.md | 43 ++++-- .../bdn9/keymaps/brandonschlack/rules.mk | 1 + 3 files changed, 126 insertions(+), 42 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index d7f3db04a8b4..4813610c7f8f 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -2,17 +2,21 @@ #include "brandonschlack.h" enum bdn9_layers { - _KEYPAD, + _NAVIGATION, + _REEDER, _MEDIA, + _KEYPAD, _LR_NAV, _LR_REVIEW, _LR_EDIT }; enum bdn9_keycodes { - TG_KYPD = KEYMAP_SAFE_RANGE, + TG_NAV = KEYMAP_SAFE_RANGE, + TG_REDR, TG_MEDA, - TG_NAV, + TG_KYPD, + TG_LNAV, TG_REVW, TG_EDIT, MC_UNDO, @@ -24,16 +28,28 @@ enum bdn9_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* - Layer: Keypad/Karabiner - | Knob 1: +/- | | Knob 2: =/. | - | Press: 1 | 2 | 3 | - | 4, Hold: BD Layer | 5 | 6 | - | 7 | 8 | 9 | + Layer: Navigation + | Knob 1: Scroll Up/Dn | | Knob 2: Shft+Cmd ]/[ | + | Press: XXX | CmTb | Cmd+W | + | PgDn, Hold: BD Layer | Up | PgUp | + | Left | Down | Right | */ - [_KEYPAD] = LAYOUT( - KC_P1, KC_P2, KC_P3, - LT(_MAGIC, KC_P4), KC_P5, KC_P6, - KC_P7, KC_P8, KC_P9 + [_NAVIGATION] = LAYOUT( + XXXXXXX, G(KC_TAB), G(KC_W), + LT(_MAGIC, KC_PGDN), KC_UP, KC_P6, + KC_LEFT, KC_DOWN, KC_RGHT + ), + /* + Layer: Reeder + | Knob 1: j/k | | Knob 2: n/p | + | Press: H | S | R | + | Cmd+Tab Hold: BD Layer| M | L | + | Cmd+1 | Cmd+2| Cmd+3 | + */ + [_REEDER] = LAYOUT( + KC_H, KC_S, KC_R, + LT(_MAGIC, G(KC_TAB)), KC_M, KC_L, + G(KC_1), G(KC_2), G(KC_3) ), /* Layer: Media @@ -47,6 +63,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LT(_MAGIC, KC_HOME), KC_UP, KC_END, KC_LEFT, KC_DOWN, KC_RGHT ), + /* + Layer: Keypad/Karabiner + | Knob 1: +/- | | Knob 2: =/. | + | Press: 1 | 2 | 3 | + | 4, Hold: BD Layer | 5 | 6 | + | 7 | 8 | 9 | + */ + [_KEYPAD] = LAYOUT( + KC_P1, KC_P2, KC_P3, + LT(_MAGIC, KC_P4), KC_P5, KC_P6, + KC_P7, KC_P8, KC_P9 + ), /* Layer: Navigation | Knob 1: =/- | | Knob 2: Page Dn/Up | @@ -67,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | Left | 9 | Right | */ [_LR_REVIEW] = LAYOUT( - TG_NAV, KC_7, TG_EDIT, + TG_LNAV, KC_7, TG_EDIT, LT(_MAGIC, KC_0), KC_8, KC_U, KC_LEFT, KC_6, KC_RGHT ), @@ -79,31 +107,38 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | Left | Redo | Right | */ [_LR_EDIT] = LAYOUT( - TG_REVW, KC_BSLS, TG_NAV, + TG_REVW, KC_BSLS, TG_LNAV, LT(_MAGIC, KC_X), MC_UNDO, KC_P, KC_LEFT, MC_REDO, KC_RGHT ), /* Layer: Magic - | FLASH | XXX | MAKE | - | ___ | Kyp | Media | - | Review | Nav | Edit | + | FLASH | Nav | MAKE | + | ___ | Redr | Media | + | Review | LNav | Edit | */ [_MAGIC] = LAYOUT( - KC_FLSH, XXXXXXX, KC_MAKE, - _______, TG_KYPD, TG_MEDA, - TG_REVW, TG_NAV, TG_EDIT + KC_FLSH, TG_NAV, KC_MAKE, + _______, TG_REDR, TG_MEDA, + TG_REVW, TG_LNAV, TG_EDIT ), }; void encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { switch (biton32(layer_state)) { - case _KEYPAD: + case _NAVIGATION: if (!clockwise) { - tap_code(KC_PPLS); + tap_code(KC_WH_U); } else { - tap_code(KC_PMNS); + tap_code(KC_WH_D); + } + break; + case _REEDER: + if (!clockwise) { + tap_code(KC_J); + } else { + tap_code(KC_K); } break; case _MEDIA: @@ -113,6 +148,13 @@ void encoder_update_user(uint8_t index, bool clockwise) { tap_code(KC_VOLD); } break; + case _KEYPAD: + if (!clockwise) { + tap_code(KC_PPLS); + } else { + tap_code(KC_PMNS); + } + break; case _LR_NAV: if (!clockwise) { tap_code(KC_EQL); @@ -138,11 +180,18 @@ void encoder_update_user(uint8_t index, bool clockwise) { } else if (index == 1) { switch (biton32(layer_state)) { - case _KEYPAD: + case _NAVIGATION: if (!clockwise) { - tap_code(KC_PEQL); + tap_code16(S(G(KC_RBRC))); } else { - tap_code(KC_PDOT); + tap_code16(S(G(KC_LBRC))); + } + break; + case _REEDER: + if (!clockwise) { + tap_code(KC_J); + } else { + tap_code(KC_K); } break; case _MEDIA: @@ -152,6 +201,13 @@ void encoder_update_user(uint8_t index, bool clockwise) { tap_code(KC_MRWD); } break; + case _KEYPAD: + if (!clockwise) { + tap_code(KC_PEQL); + } else { + tap_code(KC_PDOT); + } + break; case _LR_NAV: if (!clockwise) { tap_code(KC_PGUP); @@ -179,9 +235,14 @@ void encoder_update_user(uint8_t index, bool clockwise) { bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case TG_KYPD: + case TG_NAV: if (!record->event.pressed) { - layer_move(_KEYPAD); + layer_move(_NAVIGATION); + } + break; + case TG_REDR: + if (!record->event.pressed) { + layer_move(_REEDER); } break; case TG_MEDA: @@ -189,7 +250,12 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { layer_move(_MEDIA); } break; - case TG_NAV: + case TG_KYPD: + if (!record->event.pressed) { + layer_move(_KEYPAD); + } + break; + case TG_LNAV: if (!record->event.pressed) { tap_code(KC_G); layer_move(_LR_NAV); diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md index cf62b2419dc9..93699f58a5e3 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md @@ -1,16 +1,24 @@ -# brandonschlack's Lightroom layout for BDN9 +# brandonschlack's Macropad/Lightroom layout for BDN9 ##### 2 encoders required I built this pad to match my Lightroom photo editing workflow using -[Lightroom Classic Keyboard shortcuts](https://helpx.adobe.com/lightroom-classic/help/keyboard-shortcuts.html) +[Lightroom Classic Keyboard shortcuts](https://helpx.adobe.com/lightroom-classic/help/keyboard-shortcuts.html), and added on general macropad layers along the way. +## Navigation Layer +This layer is used for general window navigation around macOS +| | | | +|:-:|:-:|:-:| +| Scroll Up/Down
**NA** | Command+Tab | Next/Prev Tab
**Close Tab** | +| Page Down | Up | Page Up | +| Left | Down | Right| +--- -## Keypad Layer -This layer is used to send keypad keys, meant to be remapped based on current app with [Karabiner](https://pqrs.org/osx/karabiner/) +## Reeder Layer +This layer is used for browsing [Reeder](https://reederapp.com/), and awesome RSS reader for Mac | | | | |:-:|:-:|:-:| -| +/-
**1** | 2 | =/.
**3** | -| 4 | 5 | 6 | -| 7 | 8 | 9 | +| Next/Prev Item
**Open Item in Browser** | Star Item/Save for Later | Next/Prev Subscription
**Sync** | +| Command+Tab | Toggle Read Status | Clear Read Items | +| Starred Items | Unread Items | All Items | --- ## Media Layer @@ -22,7 +30,16 @@ This layer is used for media controls. Player button is a hotkey to focus the cu | Left | Down | Right| --- -## Navigation Layer +## Keypad Layer +This layer is used to send keypad keys, meant to be remapped based on current app with [Karabiner](https://pqrs.org/osx/karabiner/) +| | | | +|:-:|:-:|:-:| +| +/-
**1** | 2 | =/.
**3** | +| 4 | 5 | 6 | +| 7 | 8 | 9 | +--- + +## Ligthroom Navigation Layer This layer is used for navigating Grid View in the Library Module. | | | | |:-:|:-:|:-:| @@ -31,7 +48,7 @@ This layer is used for navigating Grid View in the Library Module. | Left | Down | Right| --- -## Review Layer +## Lightroom Review Layer This layer is used for Reviewing, Rating, and Culling images with the Loupe View in the Library Module. | | | | |:-:|:-:|:-:| @@ -40,7 +57,7 @@ This layer is used for Reviewing, Rating, and Culling images with the Loupe View | Left | Blue Label | Right| --- -## Edit Layer +## Lightroom Edit Layer This layer is used for editing photos in the Develop Module | | | | |:-:|:-:|:-:| @@ -53,6 +70,6 @@ This layer is used for editing photos in the Develop Module This layer is used as a meta layer for the pad. This layer is accessed by holding key in Row 1, Col 0 | | | | |:-:|:-:|:-:| -| FLASH | | MAKE | -| ___ | **Keypad** Layer | **Media** Layer | -| **Review** Layer | **Navigation** Layer | **Edit** Layer | +| FLASH | **Navigation** Layer | MAKE | +| ___ | **Reeder** Layer | **Media** Layer | +| **Lightroom Review** Layer | **Lightroom Navigation** Layer | **Lightroom Edit** Layer | diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk index d59da40f30aa..29fcb4f62a88 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk @@ -2,5 +2,6 @@ BOOTLOADER = atmel-dfu # Build Options +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) BACKLIGHT_ENABLE = no # No backlights installed RGBLIGHT_ENABLE = no # No RGBs installed From cd4cedd4651a54659dc0454c0fc43d7e4c5daf4c Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 3 Jun 2019 09:55:03 -0700 Subject: [PATCH 070/429] [User] Remove Unix OS layers --- users/brandonschlack/brandonschlack.c | 3 --- users/brandonschlack/brandonschlack.h | 4 ---- 2 files changed, 7 deletions(-) diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index e789abc4b8d9..4b18da2477f4 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -85,9 +85,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case OS_WIN: set_single_persistent_default_layer(_WIN); break; - case OS_NIX: - set_single_persistent_default_layer(_NIX); - break; case WN_SLPD: tap_code16(G(KC_L)); tap_code(KC_SYSTEM_POWER); diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 37e1eccfe366..bdd62adb6c12 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -11,8 +11,6 @@ enum bs_layers { _MACFN, _WIN, _WINFN, - _NIX, - _NIXFN, _MAGIC = 15, }; @@ -27,7 +25,6 @@ enum custom_keycodes { MD_MAKE, OS_MAC, OS_WIN, - OS_NIX, WN_SLPD, KEYMAP_SAFE_RANGE }; @@ -41,7 +38,6 @@ enum custom_keycodes { #define MM_LGUI LGUI_T(KC_MFFD) #define MM_FN_M LT(_MACFN, KC_MPLY) #define MM_FN_W LT(_WINFN, KC_MPLY) -#define MM_FN_X LT(_NIXFN, KC_MPLY) #define MM_RSFT RSFT_T(KC_MUTE) // MacOS #define MC_POWR KC_POWER // Mac Power alias From 5de4de3fee3671ab11e355946112732b6a3f7ee0 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 3 Jun 2019 10:54:25 -0700 Subject: [PATCH 071/429] =?UTF-8?q?[User]=20Add=20Super=20CMD=E2=86=AFTAB?= =?UTF-8?q?=20to=20userspace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hotswap/keymaps/brandonschlack/keymap.c | 2 +- .../alt/keymaps/brandonschlack/keymap.c | 2 +- users/brandonschlack/brandonschlack.c | 30 ++++++++++++++++++- users/brandonschlack/brandonschlack.h | 1 + 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index 76a6cbd3a4a7..14a370e2be71 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -143,7 +143,7 @@ void matrix_init_user(void) { } -void matrix_scan_user(void) { +void matrix_scan_keymap(void) { } diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index 0cc7da511349..e13c99219419 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -145,7 +145,7 @@ void matrix_init_user(void) { }; // Runs constantly in the background, in a loop. -void matrix_scan_user(void) { +void matrix_scan_keymap(void) { }; #define MODS_SHIFT (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT)) diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index 4b18da2477f4..4fec47582438 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -1,5 +1,9 @@ #include "brandonschlack.h" +// Super CMD↯TAB +bool is_cmd_tab_active = false; +uint16_t cmd_tab_timer = 0; + __attribute__ ((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true; @@ -85,11 +89,35 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case OS_WIN: set_single_persistent_default_layer(_WIN); break; + case CMD_TAB: + if (record->event.pressed) { + if (!is_cmd_tab_active) { + is_cmd_tab_active = true; + register_code(KC_LGUI); + } + cmd_tab_timer = timer_read(); + register_code(KC_TAB); + } else { + unregister_code(KC_TAB); + } + break; case WN_SLPD: tap_code16(G(KC_L)); tap_code(KC_SYSTEM_POWER); break; - } return process_record_keymap(keycode, record); } + +__attribute__ ((weak)) +void matrix_scan_keymap(void) {} + +void matrix_scan_user(void) { + if (is_cmd_tab_active) { + if (timer_elapsed(cmd_tab_timer) > 1000) { + unregister_code(KC_LGUI); + is_cmd_tab_active = false; + } + } + matrix_scan_keymap(); +} diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index bdd62adb6c12..ad42166afe40 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -25,6 +25,7 @@ enum custom_keycodes { MD_MAKE, OS_MAC, OS_WIN, + CMD_TAB, WN_SLPD, KEYMAP_SAFE_RANGE }; From e21bfd5055caf5de69238536f48f73d140123b59 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 3 Jun 2019 11:25:05 -0700 Subject: [PATCH 072/429] [Keymap] Use tap dance for magic layer on bdn9 --- .../bdn9/keymaps/brandonschlack/keymap.c | 124 +++++++++++++----- .../bdn9/keymaps/brandonschlack/readme.md | 4 +- .../bdn9/keymaps/brandonschlack/rules.mk | 1 + users/brandonschlack/brandonschlack.h | 1 + 4 files changed, 96 insertions(+), 34 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 4813610c7f8f..24a89bf95abe 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -2,7 +2,7 @@ #include "brandonschlack.h" enum bdn9_layers { - _NAVIGATION, + _NAVI, _REEDER, _MEDIA, _KEYPAD, @@ -12,7 +12,7 @@ enum bdn9_layers { }; enum bdn9_keycodes { - TG_NAV = KEYMAP_SAFE_RANGE, + TG_NAVI = KEYMAP_SAFE_RANGE, TG_REDR, TG_MEDA, TG_KYPD, @@ -23,6 +23,10 @@ enum bdn9_keycodes { MC_REDO }; +enum bdn9_dances { + TD_MAGC = 0 +}; + #define MC_UNDO LGUI(KC_Z) #define MC_REDO LSFT(LGUI(KC_Z)) @@ -31,49 +35,49 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { Layer: Navigation | Knob 1: Scroll Up/Dn | | Knob 2: Shft+Cmd ]/[ | | Press: XXX | CmTb | Cmd+W | - | PgDn, Hold: BD Layer | Up | PgUp | + | PgDn | Up | PgUp | | Left | Down | Right | */ - [_NAVIGATION] = LAYOUT( + [_NAVI] = LAYOUT( XXXXXXX, G(KC_TAB), G(KC_W), - LT(_MAGIC, KC_PGDN), KC_UP, KC_P6, - KC_LEFT, KC_DOWN, KC_RGHT + KC_PGDN, KC_UP, KC_P6, + KC_LEFT, KC_DOWN, TD(TD_MAGC) ), /* Layer: Reeder | Knob 1: j/k | | Knob 2: n/p | | Press: H | S | R | - | Cmd+Tab Hold: BD Layer| M | L | + | Cmd+Tab | M | L | | Cmd+1 | Cmd+2| Cmd+3 | */ [_REEDER] = LAYOUT( KC_H, KC_S, KC_R, - LT(_MAGIC, G(KC_TAB)), KC_M, KC_L, - G(KC_1), G(KC_2), G(KC_3) + G(KC_TAB), KC_M, KC_L, + G(KC_1), G(KC_2), TD(TD_MAGC) ), /* Layer: Media | Knob 1: Vol +/- | | Knob 2: Track Prv/Nxt | | Press: Mute | Plyr | Press: Play/Pause | - | Home, Hold: BD Layer | Up | End | + | Home | Up | End | | Left | Down | Right | */ [_MEDIA] = LAYOUT( KC_MUTE, MC_PLYR, KC_MPLY, - LT(_MAGIC, KC_HOME), KC_UP, KC_END, - KC_LEFT, KC_DOWN, KC_RGHT + KC_HOME, KC_UP, KC_END, + KC_LEFT, KC_DOWN, TD(TD_MAGC) ), /* Layer: Keypad/Karabiner | Knob 1: +/- | | Knob 2: =/. | | Press: 1 | 2 | 3 | - | 4, Hold: BD Layer | 5 | 6 | + | 4 | 5 | 6 | | 7 | 8 | 9 | */ [_KEYPAD] = LAYOUT( KC_P1, KC_P2, KC_P3, - LT(_MAGIC, KC_P4), KC_P5, KC_P6, - KC_P7, KC_P8, KC_P9 + KC_P4, KC_P5, KC_P6, + KC_P7, KC_P8, TD(TD_MAGC) ), /* Layer: Navigation @@ -84,50 +88,53 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LR_NAV] = LAYOUT( TG_REVW, KC_J, TG_EDIT, - LT(_MAGIC, KC_HOME), KC_UP, KC_END, - KC_LEFT, KC_DOWN, KC_RGHT + KC_HOME, KC_UP, KC_END, + KC_LEFT, KC_DOWN, TD(TD_MAGC) ), /* Layer: Review/Rate | Knob 1: ]/[ | | Knob 2: G(Up)/G(Dn) | | Press: Nav | 7 | Press: Edit | - | 0, Hold: BD Layer | 8 | U | + | 0 | 8 | U | | Left | 9 | Right | */ [_LR_REVIEW] = LAYOUT( TG_LNAV, KC_7, TG_EDIT, - LT(_MAGIC, KC_0), KC_8, KC_U, - KC_LEFT, KC_6, KC_RGHT + KC_0, KC_8, KC_U, + KC_LEFT, KC_6, TD(TD_MAGC) ), /* Layer: Edit/Develop | Knob 1: ./, | | Knob 2: =/- | | Press: Review | \ | Press: Nav | - | X, Hold: BD Layer | Undo | P | + | X | Undo | P | | Left | Redo | Right | */ [_LR_EDIT] = LAYOUT( TG_REVW, KC_BSLS, TG_LNAV, - LT(_MAGIC, KC_X), MC_UNDO, KC_P, - KC_LEFT, MC_REDO, KC_RGHT + KC_X, MC_UNDO, KC_P, + KC_LEFT, MC_REDO, TD(TD_MAGC) ), /* Layer: Magic | FLASH | Nav | MAKE | - | ___ | Redr | Media | + | Reeder | Meda | Keypad | | Review | LNav | Edit | */ [_MAGIC] = LAYOUT( - KC_FLSH, TG_NAV, KC_MAKE, - _______, TG_REDR, TG_MEDA, + KC_FLSH, TG_NAVI, KC_MAKE, + TG_REDR, TG_MEDA, TG_KYPD, TG_REVW, TG_LNAV, TG_EDIT ), }; +/** + * Encoder + */ void encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { switch (biton32(layer_state)) { - case _NAVIGATION: + case _NAVI: if (!clockwise) { tap_code(KC_WH_U); } else { @@ -180,7 +187,7 @@ void encoder_update_user(uint8_t index, bool clockwise) { } else if (index == 1) { switch (biton32(layer_state)) { - case _NAVIGATION: + case _NAVI: if (!clockwise) { tap_code16(S(G(KC_RBRC))); } else { @@ -189,9 +196,9 @@ void encoder_update_user(uint8_t index, bool clockwise) { break; case _REEDER: if (!clockwise) { - tap_code(KC_J); + tap_code(KC_N); } else { - tap_code(KC_K); + tap_code(KC_P); } break; case _MEDIA: @@ -233,11 +240,14 @@ void encoder_update_user(uint8_t index, bool clockwise) { } } +/** + * Keycodes + */ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case TG_NAV: + case TG_NAVI: if (!record->event.pressed) { - layer_move(_NAVIGATION); + layer_move(_NAVI); } break; case TG_REDR: @@ -276,3 +286,53 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { } return true; } + +/** + * Tap Dances + */ +void dance_magc_finished (qk_tap_dance_state_t *state, void *user_data) { + if (state->count == 2) { + layer_on(_MAGIC); + } else { + switch (biton32(layer_state)) { + case _NAVI: + case _MEDIA: + case _LR_NAV: + case _LR_REVIEW: + case _LR_EDIT: + register_code(KC_RGHT); + break; + case _REEDER: + register_code16(G(KC_3)); + break; + case _KEYPAD: + register_code(KC_P9); + break; + } + } +} + +void dance_magc_reset (qk_tap_dance_state_t *state, void *user_data) { + if (state->count == 2) { + } else { + switch (biton32(layer_state)) { + case _NAVI: + case _MEDIA: + case _LR_NAV: + case _LR_REVIEW: + case _LR_EDIT: + unregister_code(KC_RGHT); + break; + case _REEDER: + unregister_code16(G(KC_3)); + break; + case _KEYPAD: + unregister_code(KC_P9); + break; + } + } +} + +qk_tap_dance_action_t tap_dance_actions[] = { + [TD_MAGC] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_magc_finished, dance_magc_reset) +}; diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md index 93699f58a5e3..28816c6cfa5d 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md @@ -67,9 +67,9 @@ This layer is used for editing photos in the Develop Module --- ## Magic Layer -This layer is used as a meta layer for the pad. This layer is accessed by holding key in Row 1, Col 0 +This layer is used as a meta layer for the pad. This layer is accessed with a double tap of the bottom right key via [tap dance](https://docs.qmk.fm/#/feature_tap_dance). | | | | |:-:|:-:|:-:| | FLASH | **Navigation** Layer | MAKE | -| ___ | **Reeder** Layer | **Media** Layer | +| **Reeder** Layer | **Media** Layer | **Keypad** Layer | | **Lightroom Review** Layer | **Lightroom Navigation** Layer | **Lightroom Edit** Layer | diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk index 29fcb4f62a88..f77c45dcb1d5 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk @@ -5,3 +5,4 @@ BOOTLOADER = atmel-dfu MOUSEKEY_ENABLE = yes # Mouse keys(+4700) BACKLIGHT_ENABLE = no # No backlights installed RGBLIGHT_ENABLE = no # No RGBs installed +TAP_DANCE_ENABLE = yes # Use tap dance diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index ad42166afe40..76151d7579e8 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -16,6 +16,7 @@ enum bs_layers { // Config #define TAPPING_TOGGLE 2 +#define TAPPING_TERM 200 #define PERMISSIVE_HOLD // Macros From 8d782169ecfde2ced995f411094938355c284499 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 5 Jun 2019 14:34:57 -0700 Subject: [PATCH 073/429] [Keymap] Move RGB into keyboard_post_init_user --- keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index e13c99219419..800f5803ea2c 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -140,8 +140,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Runs just one time when the keyboard initializes. void matrix_init_user(void) { - rgb_matrix_sethsv(HSV_PURPLE); - rgb_matrix_mode(RGB_MATRIX_SOLID_COLOR); +}; + +// Runs once after keyboard initializes +void keyboard_post_init_user(void) { + rgb_matrix_sethsv_noeeprom(HSV_PURPLE); + rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR); }; // Runs constantly in the background, in a loop. From 847c22b641a2880cbd27484f22856e4ef998428d Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 5 Jun 2019 14:45:09 -0700 Subject: [PATCH 074/429] [User] Improve KC_MAKE for Massdrop, Macropads * Custom flash command for massdrop boards. https://gist.github.com/brandonschlack/aacca75f772a5a987cfa18f116897db3 * Add FLASH_BOOTLOADER to macropads * Remove now redundant KC_FLSH, MC_MAKE macros --- .../bdn9/keymaps/brandonschlack/keymap.c | 4 +- .../bdn9/keymaps/brandonschlack/readme.md | 2 +- .../bdn9/keymaps/brandonschlack/rules.mk | 3 ++ .../launchpad/keymaps/brandonschlack/keymap.c | 4 +- .../keymaps/brandonschlack/readme.md | 2 +- .../launchpad/keymaps/brandonschlack/rules.mk | 3 ++ .../alt/keymaps/brandonschlack/keymap.c | 4 +- .../alt/keymaps/brandonschlack/rules.mk | 2 + users/brandonschlack/brandonschlack.c | 45 ++----------------- users/brandonschlack/brandonschlack.h | 2 - users/brandonschlack/rules.mk | 4 ++ 11 files changed, 24 insertions(+), 51 deletions(-) create mode 100644 keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 24a89bf95abe..dc398f6789ff 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -117,12 +117,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Layer: Magic - | FLASH | Nav | MAKE | + | MAKE | Nav | RESET | | Reeder | Meda | Keypad | | Review | LNav | Edit | */ [_MAGIC] = LAYOUT( - KC_FLSH, TG_NAVI, KC_MAKE, + KC_MAKE, TG_NAVI, RESET, TG_REDR, TG_MEDA, TG_KYPD, TG_REVW, TG_LNAV, TG_EDIT ), diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md index 28816c6cfa5d..b3faaa2952c3 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md @@ -70,6 +70,6 @@ This layer is used for editing photos in the Develop Module This layer is used as a meta layer for the pad. This layer is accessed with a double tap of the bottom right key via [tap dance](https://docs.qmk.fm/#/feature_tap_dance). | | | | |:-:|:-:|:-:| -| FLASH | **Navigation** Layer | MAKE | +| MAKE | **Navigation** Layer | RESET | | **Reeder** Layer | **Media** Layer | **Keypad** Layer | | **Lightroom Review** Layer | **Lightroom Navigation** Layer | **Lightroom Edit** Layer | diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk index f77c45dcb1d5..04d0fab1ea18 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk @@ -1,6 +1,9 @@ # Use dfu bootloader for Elite-C BOOTLOADER = atmel-dfu +# Flash Bootloader with KC_MAKE +FLASH_BOOTLOADER = yes + # Build Options MOUSEKEY_ENABLE = yes # Mouse keys(+4700) BACKLIGHT_ENABLE = no # No backlights installed diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index a089bc23b0b0..4b2882873512 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Magic * ,-------------. - * | Flsh | Rset | + * | Make | Rset | * |------+------| * | Mdia | Kypd | * |------+------| @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-------------' */ [_MAGIC] = LAYOUT( \ - KC_FLSH, RESET, \ + KC_MAKE, RESET, \ TG_MEDA, TG_KYPD, \ XXXXXXX, XXXXXXX, \ _______, XXXXXXX \ diff --git a/keyboards/launchpad/keymaps/brandonschlack/readme.md b/keyboards/launchpad/keymaps/brandonschlack/readme.md index 60edd031148c..a91a1b80ac73 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/readme.md +++ b/keyboards/launchpad/keymaps/brandonschlack/readme.md @@ -25,7 +25,7 @@ This layer is used to send keypad keys, meant to be remapped based on current ap This layer is used as a meta layer for the pad. This layer is accessed by holding key in Row 3, Col 0 | | | |:-:|:-:| -| FLASH | RESET | +| MAKE | RESET | | **Media** Layer | **Keypad** Layer| | XXX | XXX | | ___ | XXX | diff --git a/keyboards/launchpad/keymaps/brandonschlack/rules.mk b/keyboards/launchpad/keymaps/brandonschlack/rules.mk index 45dad0c6b7b6..127ae75967b6 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/rules.mk +++ b/keyboards/launchpad/keymaps/brandonschlack/rules.mk @@ -1,2 +1,5 @@ # Use dfu bootloader for Elite-C BOOTLOADER = atmel-dfu + +# Flash Bootloader with KC_MAKE +FLASH_BOOTLOADER = yes diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index 800f5803ea2c..cc874df85f53 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, MC_SLPD, \ _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLU, \ - _______, RGB_TOG, _______, _______, _______, _______, _______, MD_MAKE, KC_MRWD, KC_MFFD, MC_PLYR, MM_RSFT, KC_PGUP, KC_VOLD, \ + _______, RGB_TOG, _______, _______, _______, _______, _______, KC_MAKE, KC_MRWD, KC_MFFD, MC_PLYR, MM_RSFT, KC_PGUP, KC_VOLD, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), @@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, WN_LOCK, \ _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, WN_TSKM, KC_END, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLU, \ - _______, RGB_TOG, _______, _______, _______, _______, _______, MD_MAKE, KC_MPRV, KC_MNXT, KC_MSTP, MM_RSFT, KC_PGUP, KC_VOLD, \ + _______, RGB_TOG, _______, _______, _______, _______, _______, KC_MAKE, KC_MPRV, KC_MNXT, KC_MSTP, MM_RSFT, KC_PGUP, KC_VOLD, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk b/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk new file mode 100644 index 000000000000..cf2ae6bb403f --- /dev/null +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk @@ -0,0 +1,2 @@ +# Use mdloader for flashing +OPT_DEFS += -DBOOTLOADER_MDLOADER diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index 4fec47582438..a709d88b05cd 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -21,7 +21,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT ) #endif { // - #if defined(__arm__) // only run for ARM boards + #if defined(BOOTLOADER_MDLOADER) // only run for Massdrop boards + SEND_STRING(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP); + #elif defined(__arm__) // only run for ARM boards SEND_STRING(":dfu-util"); #elif defined(BOOTLOADER_DFU) // only run for DFU boards SEND_STRING(":dfu"); @@ -35,49 +37,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { SEND_STRING(" -j8 --output-sync"); } SEND_STRING(SS_TAP(X_ENTER)); - if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT) { - reset_keyboard(); - } - set_mods(temp_mod); - } - break; - case KC_FLSH: // Compiles the firmware, and adds the flash command based on keyboard bootloader - if (!record->event.pressed) { - uint8_t temp_mod = get_mods(); - uint8_t temp_osm = get_oneshot_mods(); - clear_mods(); clear_oneshot_mods(); - SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP); - #if defined(__arm__) // only run for ARM boards - SEND_STRING(":dfu-util"); - #elif defined(BOOTLOADER_DFU) // only run for DFU boards - SEND_STRING(":dfu"); - #elif defined(BOOTLOADER_HALFKAY) // only run for teensy boards - SEND_STRING(":teensy"); - #elif defined(BOOTLOADER_CATERINA) // only run for Pro Micros - SEND_STRING(":avrdude"); - #endif // bootloader options - if ( (temp_mod | temp_osm) & MOD_MASK_CTRL) { - SEND_STRING(" -j8 --output-sync"); - } - SEND_STRING(SS_TAP(X_ENTER)); - reset_keyboard(); - set_mods(temp_mod); - } - break; - case MD_MAKE: // Compiles the firmware, and adds custom flash command for Massdrop - if (!record->event.pressed) { - uint8_t temp_mod = get_mods(); - uint8_t temp_osm = get_oneshot_mods(); - clear_mods(); clear_oneshot_mods(); - SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP); #ifndef FLASH_BOOTLOADER if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT ) #endif - { // - SEND_STRING(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP); - } - SEND_STRING(SS_TAP(X_ENTER)); - if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT) { + { reset_keyboard(); } set_mods(temp_mod); diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 76151d7579e8..f25da7049fb6 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -22,8 +22,6 @@ enum bs_layers { // Macros enum custom_keycodes { KC_MAKE = SAFE_RANGE, - KC_FLSH, - MD_MAKE, OS_MAC, OS_WIN, CMD_TAB, diff --git a/users/brandonschlack/rules.mk b/users/brandonschlack/rules.mk index 2cc870e384ca..0db1c3f85070 100644 --- a/users/brandonschlack/rules.mk +++ b/users/brandonschlack/rules.mk @@ -8,3 +8,7 @@ RGB_MATRIX_ENABLE ?= no ifneq ($(strip $(RGB_MATRIX_ENABLE)), no) SRC += rgb_bs.c endif + +ifeq ($(strip $(FLASH_BOOTLOADER)), yes) + OPT_DEFS += -DFLASH_BOOTLOADER +endif From 26276526b0b0b58ff48e553ac778b3b8df79a147 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 7 Jun 2019 15:14:11 -0700 Subject: [PATCH 075/429] [User] Add _LIGHT layer name --- users/brandonschlack/brandonschlack.h | 1 + 1 file changed, 1 insertion(+) diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index f25da7049fb6..125981a602a4 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -11,6 +11,7 @@ enum bs_layers { _MACFN, _WIN, _WINFN, + _LIGHT = 14, _MAGIC = 15, }; From f6af5ac208c655f20529a3bd4e30360d68e932d6 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 7 Jun 2019 15:16:25 -0700 Subject: [PATCH 076/429] [Keymap] Add RGB to launchpad keymap --- keyboards/launchpad/keymaps/brandonschlack/config.h | 9 +++++++++ keyboards/launchpad/keymaps/brandonschlack/rules.mk | 2 ++ 2 files changed, 11 insertions(+) create mode 100644 keyboards/launchpad/keymaps/brandonschlack/config.h diff --git a/keyboards/launchpad/keymaps/brandonschlack/config.h b/keyboards/launchpad/keymaps/brandonschlack/config.h new file mode 100644 index 000000000000..cae1450c15bb --- /dev/null +++ b/keyboards/launchpad/keymaps/brandonschlack/config.h @@ -0,0 +1,9 @@ +#pragma once + +/* Underlight Configuration */ +#define RGB_DI_PIN F4 +#define RGBLIGHT_ANIMATIONS +#define RGBLED_NUM 2 // Number of LEDs +#define RGBLIGHT_HUE_STEP 10 +#define RGBLIGHT_SAT_STEP 17 +#define RGBLIGHT_VAL_STEP 17 \ No newline at end of file diff --git a/keyboards/launchpad/keymaps/brandonschlack/rules.mk b/keyboards/launchpad/keymaps/brandonschlack/rules.mk index 127ae75967b6..b5854fcd40e5 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/rules.mk +++ b/keyboards/launchpad/keymaps/brandonschlack/rules.mk @@ -3,3 +3,5 @@ BOOTLOADER = atmel-dfu # Flash Bootloader with KC_MAKE FLASH_BOOTLOADER = yes +# Build Options +RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. From 1e7a4ff70c5c81264b8a76ffc5018a1cd1c2fdc1 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 7 Jun 2019 15:21:57 -0700 Subject: [PATCH 077/429] [Keymap] Finish first usage build of launchpad * Added _REEDER layer * Added _LIGHT layer for RGBs * Enabled Tap Dance for _LIGHT and _MAGIC --- .../launchpad/keymaps/brandonschlack/keymap.c | 171 ++++++++++++++++-- .../launchpad/keymaps/brandonschlack/rules.mk | 1 + 2 files changed, 161 insertions(+), 11 deletions(-) diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index 4b2882873512..5620ad9122ab 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -4,17 +4,43 @@ extern keymap_config_t keymap_config; enum launchpad_layers { + _REEDER, _MEDIA, _KEYPAD }; -enum bdn9_keycodes { - TG_MEDA = KEYMAP_SAFE_RANGE, +enum launchpad_keycodes { + TG_REDR = KEYMAP_SAFE_RANGE, + TG_MEDA, TG_KYPD }; +enum launchpad_dances { + TD_LGHT = 0, + TD_MAGC, + TD_CMTB +}; + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Reeder + * ,-------------. + * |CMDTAB| H | + * |------+------| + * | P | K | + * |------+------| + * | N | J | + * |------+------| + * | L | S | + * `-------------' + */ +[_REEDER] = LAYOUT( \ + TD(TD_CMTB), KC_H, \ + KC_P, KC_K, \ + KC_N, KC_J, \ + TD(TD_LGHT), TD(TD_MAGC) \ +), + /* Media * ,-------------. * | Mute | PlPs | @@ -23,14 +49,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------| * | VolD | TrkP | * |------+------| - * | | Plyr | + * | Spc | Plyr | * `-------------' */ [_MEDIA] = LAYOUT( \ KC_MUTE, KC_MPLY, \ KC_VOLU, KC_MFFD, \ KC_VOLD, KC_MRWD, \ - MO(_MAGIC), MC_PLYR \ + TD(TD_LGHT), TD(TD_MAGC) \ ), /* Keypad @@ -48,25 +74,43 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P1, KC_P2, \ KC_P3, KC_P4, \ KC_P5, KC_P6, \ - LT(_MAGIC, KC_P7), KC_P8 \ + TD(TD_LGHT), TD(TD_MAGC) \ +), + +/* Lights + * ,-------------. + * | Mode-| Mode+| + * |------+------| + * | HUE- | HUE+ | + * |------+------| + * | SAT- | SAT+ | + * |------+------| + * | Magc |RGBTOG| + * `-------------' + */ +[_LIGHT] = LAYOUT( \ + RGB_RMOD, RGB_MOD, \ + RGB_HUD, RGB_HUI, \ + RGB_SAD, RGB_SAI, \ + TG(_MAGIC), RGB_TOG \ ), /* Magic * ,-------------. * | Make | Rset | * |------+------| - * | Mdia | Kypd | + * | Redr | Meda | * |------+------| - * | XXXX | XXXX | + * | Kypd | XXXX | * |------+------| - * | | XXXX | + * | Lght | XXXX | * `-------------' */ [_MAGIC] = LAYOUT( \ KC_MAKE, RESET, \ - TG_MEDA, TG_KYPD, \ - XXXXXXX, XXXXXXX, \ - _______, XXXXXXX \ + TG_REDR, TG_MEDA, \ + TG_KYPD, XXXXXXX, \ + TG(_LIGHT), XXXXXXX \ ) }; @@ -77,6 +121,11 @@ void matrix_init_user(void) { bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { switch (keycode) { + case TG_REDR: + if (!record->event.pressed) { + layer_move(_REEDER); + } + break; case TG_MEDA: if (!record->event.pressed) { layer_move(_MEDIA); @@ -90,3 +139,103 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { } return true; } + +/** + * Tap Dances + */ +void dance_light_layer_finished (qk_tap_dance_state_t *state, void *user_data) { + if (state->count == 2) { + layer_on(_LIGHT); + } else { + switch (biton32(layer_state)) { + case _REEDER: + register_code(KC_L); + break; + case _MEDIA: + register_code(KC_SPC); + break; + case _KEYPAD: + register_code(KC_P7); + break; + } + } +} +void dance_light_layer_reset (qk_tap_dance_state_t *state, void *user_data) { + if (state->count == 2) { + } else { + switch (biton32(layer_state)) { + case _REEDER: + unregister_code(KC_L); + break; + case _MEDIA: + unregister_code(KC_SPC); + break; + case _KEYPAD: + unregister_code(KC_P7); + break; + } + } +} + +void dance_magic_layer_finished (qk_tap_dance_state_t *state, void *user_data) { + if (state->count == 2) { + layer_on(_MAGIC); + } else { + switch (biton32(layer_state)) { + case _REEDER: + register_code(KC_S); + break; + case _MEDIA: + register_code16(G(KC_F8)); + break; + case _KEYPAD: + register_code(KC_P8); + break; + } + } +} +void dance_magic_layer_reset (qk_tap_dance_state_t *state, void *user_data) { + if (state->count == 2) { + } else { + switch (biton32(layer_state)) { + case _REEDER: + unregister_code(KC_S); + break; + case _MEDIA: + unregister_code16(G(KC_F8)); + break; + case _KEYPAD: + unregister_code(KC_P8); + break; + } + } +} + +void dance_command_tab_finished (qk_tap_dance_state_t *state, void *user_data) { + if (state->count == 2) { + register_code(KC_R); + } else { + switch (biton32(layer_state)) { + case _REEDER: + register_code16(G(KC_TAB)); + break; + } + } +} +void dance_command_tab_reset (qk_tap_dance_state_t *state, void *user_data) { + if (state->count == 2) { + unregister_code(KC_R); + } else { + switch (biton32(layer_state)) { + case _REEDER: + unregister_code16(G(KC_TAB)); + break; + } + } +} + +qk_tap_dance_action_t tap_dance_actions[] = { + [TD_LGHT] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_light_layer_finished, dance_light_layer_reset), + [TD_MAGC] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_magic_layer_finished, dance_magic_layer_reset), + [TD_CMTB] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_command_tab_finished, dance_command_tab_reset) +}; diff --git a/keyboards/launchpad/keymaps/brandonschlack/rules.mk b/keyboards/launchpad/keymaps/brandonschlack/rules.mk index b5854fcd40e5..9e38ce0ba07e 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/rules.mk +++ b/keyboards/launchpad/keymaps/brandonschlack/rules.mk @@ -5,3 +5,4 @@ BOOTLOADER = atmel-dfu FLASH_BOOTLOADER = yes # Build Options RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. +TAP_DANCE_ENABLE = yes # Use tap dance From 6c9bad1290f9b029c5af015311c38391fbdf831e Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 10 Jun 2019 12:28:05 -0700 Subject: [PATCH 078/429] [Keymap] Add _NAVI navigation layer to launchpad --- .../launchpad/keymaps/brandonschlack/keymap.c | 47 +++++++++++++++++-- 1 file changed, 42 insertions(+), 5 deletions(-) diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index 5620ad9122ab..098f21abe7ef 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -4,13 +4,15 @@ extern keymap_config_t keymap_config; enum launchpad_layers { + _NAVI, _REEDER, _MEDIA, _KEYPAD }; enum launchpad_keycodes { - TG_REDR = KEYMAP_SAFE_RANGE, + TG_NAVI = KEYMAP_SAFE_RANGE, + TG_REDR, TG_MEDA, TG_KYPD }; @@ -23,6 +25,24 @@ enum launchpad_dances { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Navigation + * ,-------------. + * | PTab | NTab | + * |------+------| + * | Left | Up | + * |------+------| + * | Rght | Dn | + * |------+------| + * | PgUp | PgDn | + * `-------------' + */ +[_NAVI] = LAYOUT( \ + S(G(KC_LBRC)), S(G(KC_RBRC)), \ + KC_P, KC_K, \ + KC_N, KC_J, \ + TD(TD_LGHT), TD(TD_MAGC) \ +), + /* Reeder * ,-------------. * |CMDTAB| H | @@ -99,17 +119,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-------------. * | Make | Rset | * |------+------| - * | Redr | Meda | + * | Navi | Redr | * |------+------| - * | Kypd | XXXX | + * | Meda | Kypd | * |------+------| * | Lght | XXXX | * `-------------' */ [_MAGIC] = LAYOUT( \ KC_MAKE, RESET, \ - TG_REDR, TG_MEDA, \ - TG_KYPD, XXXXXXX, \ + TG_NAVI, TG_REDR, \ + TG_MEDA, TG_KYPD, \ TG(_LIGHT), XXXXXXX \ ) @@ -121,6 +141,11 @@ void matrix_init_user(void) { bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { switch (keycode) { + case TG_NAVI: + if (!record->event.pressed) { + layer_move(_NAVI); + } + break; case TG_REDR: if (!record->event.pressed) { layer_move(_REEDER); @@ -148,6 +173,9 @@ void dance_light_layer_finished (qk_tap_dance_state_t *state, void *user_data) { layer_on(_LIGHT); } else { switch (biton32(layer_state)) { + case _NAVI: + register_code(KC_PGDN); + break; case _REEDER: register_code(KC_L); break; @@ -164,6 +192,9 @@ void dance_light_layer_reset (qk_tap_dance_state_t *state, void *user_data) { if (state->count == 2) { } else { switch (biton32(layer_state)) { + case _NAVI: + unregister_code(KC_PGDN); + break; case _REEDER: unregister_code(KC_L); break; @@ -182,6 +213,9 @@ void dance_magic_layer_finished (qk_tap_dance_state_t *state, void *user_data) { layer_on(_MAGIC); } else { switch (biton32(layer_state)) { + case _NAVI: + register_code(KC_PGUP); + break; case _REEDER: register_code(KC_S); break; @@ -198,6 +232,9 @@ void dance_magic_layer_reset (qk_tap_dance_state_t *state, void *user_data) { if (state->count == 2) { } else { switch (biton32(layer_state)) { + case _NAVI: + register_code(KC_PGUP); + break; case _REEDER: unregister_code(KC_S); break; From b56718c151b712e518892cf1d26e248a5692a590 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 10 Jun 2019 12:29:20 -0700 Subject: [PATCH 079/429] [User] Change HSV color defines for Laser theme --- users/brandonschlack/rgb_bs.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/users/brandonschlack/rgb_bs.h b/users/brandonschlack/rgb_bs.h index f9ddec159276..2a13e7cf5d78 100644 --- a/users/brandonschlack/rgb_bs.h +++ b/users/brandonschlack/rgb_bs.h @@ -1,5 +1,6 @@ #pragma once #include "quantum.h" +#include "rgblight_list.h" #ifdef RGB_MATRIX_ENABLE #include "rgb_matrix.h" #endif @@ -11,6 +12,13 @@ #define RGB_LSR_CYAN 0x2F, 0xC1, 0xE1 #define RGB_LSR_VIOLET 0x53, 0x36, 0xBF +// HSV Colors +#define HSV_LSR_PURPLE HSV_PURPLE +#define HSV_LSR_PINK HSV_PINK +#define HSV_LSR_BLUE HSV_BLUE +#define HSV_LSR_CYAN HSV_CYAN +#define HSV_LSR_MAGENTA HSV_MAGENTA + // layer_state_t layer_state_set_rgb(layer_state_t state); // layer_state_t default_layer_state_set_rgb(layer_state_t state); From cf20b40fc6f8ba976bd9fcd2b175e4c6c01f4f20 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 10 Jun 2019 12:30:36 -0700 Subject: [PATCH 080/429] [Keymap] Add RGB layer indication to launchpad --- .../launchpad/keymaps/brandonschlack/keymap.c | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index 098f21abe7ef..f31cbf4d01c7 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -139,6 +139,12 @@ void matrix_init_user(void) { } +// Runs once after keyboard initializes +void keyboard_post_init_user(void) { + rgblight_sethsv(HSV_LSR_PURPLE); +}; + + bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case TG_NAVI: @@ -165,6 +171,27 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true; } +uint32_t layer_state_set_user(uint32_t state) { + switch (biton32(state)) { + case _REEDER: + rgblight_sethsv_noeeprom(HSV_LSR_PINK); + break; + case _MEDIA: + rgblight_sethsv_noeeprom(HSV_LSR_BLUE); + break; + case _KEYPAD: + rgblight_sethsv_noeeprom(HSV_LSR_CYAN); + break; + case _MAGIC: + rgblight_sethsv_noeeprom(HSV_GREEN); + break; + default: // for any other layers, or the default layer + rgblight_sethsv_noeeprom(HSV_LSR_PURPLE); + break; + } + return state; +} + /** * Tap Dances */ From e9e99b46edf1100bf06959a8d76ddf115ec2c94d Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 10 Jun 2019 13:49:08 -0700 Subject: [PATCH 081/429] [Keymap] Use mouse wheel scroll for _NAVI layer --- .../launchpad/keymaps/brandonschlack/keymap.c | 18 +++++++++--------- .../launchpad/keymaps/brandonschlack/rules.mk | 1 + users/brandonschlack/brandonschlack.h | 5 +++++ 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index f31cbf4d01c7..b4b22ef50f46 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -29,17 +29,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-------------. * | PTab | NTab | * |------+------| - * | Left | Up | + * | SclL | SclU | * |------+------| - * | Rght | Dn | + * | SclR | SclD | * |------+------| - * | PgUp | PgDn | + * |LstTab|ClsTab| * `-------------' */ [_NAVI] = LAYOUT( \ S(G(KC_LBRC)), S(G(KC_RBRC)), \ - KC_P, KC_K, \ - KC_N, KC_J, \ + MC_WH_L, MC_WH_U, \ + MC_WH_R, MC_WH_D, \ TD(TD_LGHT), TD(TD_MAGC) \ ), @@ -201,7 +201,7 @@ void dance_light_layer_finished (qk_tap_dance_state_t *state, void *user_data) { } else { switch (biton32(layer_state)) { case _NAVI: - register_code(KC_PGDN); + register_code16(S(G(KC_T))); break; case _REEDER: register_code(KC_L); @@ -220,7 +220,7 @@ void dance_light_layer_reset (qk_tap_dance_state_t *state, void *user_data) { } else { switch (biton32(layer_state)) { case _NAVI: - unregister_code(KC_PGDN); + unregister_code16(S(G(KC_T))); break; case _REEDER: unregister_code(KC_L); @@ -241,7 +241,7 @@ void dance_magic_layer_finished (qk_tap_dance_state_t *state, void *user_data) { } else { switch (biton32(layer_state)) { case _NAVI: - register_code(KC_PGUP); + register_code16(G(KC_W)); break; case _REEDER: register_code(KC_S); @@ -260,7 +260,7 @@ void dance_magic_layer_reset (qk_tap_dance_state_t *state, void *user_data) { } else { switch (biton32(layer_state)) { case _NAVI: - register_code(KC_PGUP); + unregister_code16(G(KC_W)); break; case _REEDER: unregister_code(KC_S); diff --git a/keyboards/launchpad/keymaps/brandonschlack/rules.mk b/keyboards/launchpad/keymaps/brandonschlack/rules.mk index 9e38ce0ba07e..1d3265477fe3 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/rules.mk +++ b/keyboards/launchpad/keymaps/brandonschlack/rules.mk @@ -5,4 +5,5 @@ BOOTLOADER = atmel-dfu FLASH_BOOTLOADER = yes # Build Options RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. +MOUSEKEY_ENABLE = yes # Use mouse keys for scrolling. TAP_DANCE_ENABLE = yes # Use tap dance diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 125981a602a4..cbac01db2944 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -46,6 +46,11 @@ enum custom_keycodes { #define MC_MSSN LCTL(KC_UP) // Mission Control #define MC_LHPD KC_F13 // Launchpad: Configure karabiner for F13 -> Launchpad #define MC_PLYR LGUI(KC_F8) // Focuses current Media Player +// Reverse scrolling for using with macOS Natural Scrolling. +#define MC_WH_U KC_WH_D +#define MC_WH_D KC_WH_U +#define MC_WH_L KC_WH_R +#define MC_WH_R KC_WH_L // Windows #define WN_LOCK LGUI(KC_L) // Lock Computer #define WN_TSKM LCTL(LALT(KC_DEL)) // Task Manager (Ctrl+Alt+Del) From b4eb6e738e6dd2b25b055ea96433b8af50480963 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 10 Jun 2019 14:53:56 -0700 Subject: [PATCH 082/429] [Keymap] Change _MAGIC tap dance to single hold --- .../launchpad/keymaps/brandonschlack/keymap.c | 208 +++++++++++------- 1 file changed, 127 insertions(+), 81 deletions(-) diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index b4b22ef50f46..3a6b76afa544 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -23,6 +23,15 @@ enum launchpad_dances { TD_CMTB }; +typedef enum { + SINGLE_TAP, + SINGLE_HOLD, + DOUBLE_SINGLE_TAP +} td_state_t; +static td_state_t td_state; + +int cur_dance (qk_tap_dance_state_t *state); + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Navigation @@ -195,106 +204,143 @@ uint32_t layer_state_set_user(uint32_t state) { /** * Tap Dances */ -void dance_light_layer_finished (qk_tap_dance_state_t *state, void *user_data) { +int cur_dance (qk_tap_dance_state_t *state) { + if (state->count == 1) { + if (state->interrupted || !state->pressed) { + return SINGLE_TAP; + } else { + return SINGLE_HOLD; + } + } if (state->count == 2) { - layer_on(_LIGHT); + return DOUBLE_SINGLE_TAP; } else { - switch (biton32(layer_state)) { - case _NAVI: - register_code16(S(G(KC_T))); - break; - case _REEDER: - register_code(KC_L); - break; - case _MEDIA: - register_code(KC_SPC); - break; - case _KEYPAD: - register_code(KC_P7); - break; - } + return 3; + } +} + +void dance_light_layer_finished (qk_tap_dance_state_t *state, void *user_data) { + td_state = cur_dance(state); + switch (td_state) { + case DOUBLE_SINGLE_TAP: + layer_on(_LIGHT); + break; + default: + switch (biton32(layer_state)) { + case _NAVI: + register_code16(S(G(KC_T))); + break; + case _REEDER: + register_code(KC_L); + break; + case _MEDIA: + register_code(KC_SPC); + break; + case _KEYPAD: + register_code(KC_P7); + break; + } + break; } } void dance_light_layer_reset (qk_tap_dance_state_t *state, void *user_data) { - if (state->count == 2) { - } else { - switch (biton32(layer_state)) { - case _NAVI: - unregister_code16(S(G(KC_T))); - break; - case _REEDER: - unregister_code(KC_L); - break; - case _MEDIA: - unregister_code(KC_SPC); - break; - case _KEYPAD: - unregister_code(KC_P7); - break; - } + switch (td_state) { + case DOUBLE_SINGLE_TAP: + break; + default: + switch (biton32(layer_state)) { + case _NAVI: + unregister_code16(S(G(KC_T))); + break; + case _REEDER: + unregister_code(KC_L); + break; + case _MEDIA: + unregister_code(KC_SPC); + break; + case _KEYPAD: + unregister_code(KC_P7); + break; + } + break; } } void dance_magic_layer_finished (qk_tap_dance_state_t *state, void *user_data) { - if (state->count == 2) { - layer_on(_MAGIC); - } else { - switch (biton32(layer_state)) { - case _NAVI: - register_code16(G(KC_W)); - break; - case _REEDER: - register_code(KC_S); - break; - case _MEDIA: - register_code16(G(KC_F8)); - break; - case _KEYPAD: - register_code(KC_P8); - break; - } + td_state = cur_dance(state); + switch (td_state) { + case SINGLE_HOLD: + layer_on(_MAGIC); + break; + default: + switch (biton32(layer_state)) { + case _NAVI: + register_code16(G(KC_W)); + break; + case _REEDER: + register_code(KC_S); + break; + case _MEDIA: + register_code16(MC_PLYR); + break; + case _KEYPAD: + register_code(KC_P8); + break; + } + break; } } void dance_magic_layer_reset (qk_tap_dance_state_t *state, void *user_data) { - if (state->count == 2) { - } else { - switch (biton32(layer_state)) { - case _NAVI: - unregister_code16(G(KC_W)); - break; - case _REEDER: - unregister_code(KC_S); - break; - case _MEDIA: - unregister_code16(G(KC_F8)); - break; - case _KEYPAD: - unregister_code(KC_P8); - break; - } + switch (td_state) { + case SINGLE_HOLD: + layer_off(_MAGIC); + break; + default: + switch (biton32(layer_state)) { + case _NAVI: + unregister_code16(G(KC_W)); + break; + case _REEDER: + unregister_code(KC_S); + break; + case _MEDIA: + unregister_code16(MC_PLYR); + break; + case _KEYPAD: + unregister_code(KC_P8); + break; + } + break; } } void dance_command_tab_finished (qk_tap_dance_state_t *state, void *user_data) { - if (state->count == 2) { - register_code(KC_R); - } else { - switch (biton32(layer_state)) { - case _REEDER: - register_code16(G(KC_TAB)); - break; - } + td_state = cur_dance(state); + switch (td_state) { + case DOUBLE_SINGLE_TAP: + register_code(KC_R); + break; + default: + switch (biton32(layer_state)) { + case _REEDER: + register_code16(G(KC_TAB)); + break; + } + break; } } void dance_command_tab_reset (qk_tap_dance_state_t *state, void *user_data) { - if (state->count == 2) { - unregister_code(KC_R); - } else { - switch (biton32(layer_state)) { - case _REEDER: - unregister_code16(G(KC_TAB)); - break; - } + switch (td_state) { + case DOUBLE_SINGLE_TAP: + unregister_code(KC_R); + break; + default: + switch (biton32(layer_state)) { + case _REEDER: + unregister_code16(G(KC_TAB)); + break; + } + break; } } From b6d88c3d1409819f8b1ce4f45c7e781882594a9f Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 10 Jun 2019 15:26:27 -0700 Subject: [PATCH 083/429] [User] Add macropad build option to userspace --- .../bdn9/keymaps/brandonschlack/rules.mk | 6 +- .../launchpad/keymaps/brandonschlack/rules.mk | 5 +- users/brandonschlack/brandonschlack.c | 117 +++++++++--------- users/brandonschlack/rules.mk | 4 + 4 files changed, 69 insertions(+), 63 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk index 04d0fab1ea18..cce0620a1bea 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk @@ -1,9 +1,9 @@ +# Use macropad-specific defines, layers, functions. Flash bootloader with KC_MAKE +IS_MACROPAD = yes + # Use dfu bootloader for Elite-C BOOTLOADER = atmel-dfu -# Flash Bootloader with KC_MAKE -FLASH_BOOTLOADER = yes - # Build Options MOUSEKEY_ENABLE = yes # Mouse keys(+4700) BACKLIGHT_ENABLE = no # No backlights installed diff --git a/keyboards/launchpad/keymaps/brandonschlack/rules.mk b/keyboards/launchpad/keymaps/brandonschlack/rules.mk index 1d3265477fe3..048c3d9997f8 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/rules.mk +++ b/keyboards/launchpad/keymaps/brandonschlack/rules.mk @@ -1,8 +1,9 @@ +# Use macropad-specific defines, layers, functions. Flash bootloader with KC_MAKE +IS_MACROPAD = yes + # Use dfu bootloader for Elite-C BOOTLOADER = atmel-dfu -# Flash Bootloader with KC_MAKE -FLASH_BOOTLOADER = yes # Build Options RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. MOUSEKEY_ENABLE = yes # Use mouse keys for scrolling. diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index a709d88b05cd..77cec402f9ae 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -6,70 +6,71 @@ uint16_t cmd_tab_timer = 0; __attribute__ ((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { - return true; + return true; } bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case KC_MAKE: // Compiles the firmware, and adds the flash command based on keyboard bootloader + switch (keycode) { + case KC_MAKE: // Compiles the firmware, and adds the flash command based on keyboard bootloader if (!record->event.pressed) { - uint8_t temp_mod = get_mods(); - uint8_t temp_osm = get_oneshot_mods(); - clear_mods(); clear_oneshot_mods(); - SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP); - #ifndef FLASH_BOOTLOADER - if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT ) - #endif - { // - #if defined(BOOTLOADER_MDLOADER) // only run for Massdrop boards - SEND_STRING(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP); - #elif defined(__arm__) // only run for ARM boards - SEND_STRING(":dfu-util"); - #elif defined(BOOTLOADER_DFU) // only run for DFU boards - SEND_STRING(":dfu"); - #elif defined(BOOTLOADER_HALFKAY) // only run for teensy boards - SEND_STRING(":teensy"); - #elif defined(BOOTLOADER_CATERINA) // only run for Pro Micros - SEND_STRING(":avrdude"); - #endif // bootloader options - } - if ( (temp_mod | temp_osm) & MOD_MASK_CTRL) { - SEND_STRING(" -j8 --output-sync"); - } - SEND_STRING(SS_TAP(X_ENTER)); - #ifndef FLASH_BOOTLOADER - if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT ) - #endif - { - reset_keyboard(); + uint8_t temp_mod = get_mods(); + uint8_t temp_osm = get_oneshot_mods(); + clear_mods(); clear_oneshot_mods(); + SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP); + + #if !defined(FLASH_BOOTLOADER) || !defined(IS_MACROPAD) + if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT ) + #endif + { // + #if defined(BOOTLOADER_MDLOADER) // only run for Massdrop boards + SEND_STRING(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP); + #elif defined(__arm__) // only run for ARM boards + SEND_STRING(":dfu-util"); + #elif defined(BOOTLOADER_DFU) // only run for DFU boards + SEND_STRING(":dfu"); + #elif defined(BOOTLOADER_HALFKAY) // only run for teensy boards + SEND_STRING(":teensy"); + #elif defined(BOOTLOADER_CATERINA) // only run for Pro Micros + SEND_STRING(":avrdude"); + #endif // bootloader options + } + if ( (temp_mod | temp_osm) & MOD_MASK_CTRL) { + SEND_STRING(" -j8 --output-sync"); + } + SEND_STRING(SS_TAP(X_ENTER)); + #if !defined(FLASH_BOOTLOADER) || !defined(IS_MACROPAD) + if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT ) + #endif + { + reset_keyboard(); + } + set_mods(temp_mod); } - set_mods(temp_mod); - } - break; - case OS_MAC: - set_single_persistent_default_layer(_MAC); - break; - case OS_WIN: - set_single_persistent_default_layer(_WIN); - break; - case CMD_TAB: - if (record->event.pressed) { - if (!is_cmd_tab_active) { - is_cmd_tab_active = true; - register_code(KC_LGUI); + break; + case OS_MAC: + set_single_persistent_default_layer(_MAC); + break; + case OS_WIN: + set_single_persistent_default_layer(_WIN); + break; + case CMD_TAB: + if (record->event.pressed) { + if (!is_cmd_tab_active) { + is_cmd_tab_active = true; + register_code(KC_LGUI); + } + cmd_tab_timer = timer_read(); + register_code(KC_TAB); + } else { + unregister_code(KC_TAB); } - cmd_tab_timer = timer_read(); - register_code(KC_TAB); - } else { - unregister_code(KC_TAB); - } - break; - case WN_SLPD: - tap_code16(G(KC_L)); - tap_code(KC_SYSTEM_POWER); - break; - } - return process_record_keymap(keycode, record); + break; + case WN_SLPD: + tap_code16(G(KC_L)); + tap_code(KC_SYSTEM_POWER); + break; + } + return process_record_keymap(keycode, record); } __attribute__ ((weak)) diff --git a/users/brandonschlack/rules.mk b/users/brandonschlack/rules.mk index 0db1c3f85070..54b636e1d388 100644 --- a/users/brandonschlack/rules.mk +++ b/users/brandonschlack/rules.mk @@ -12,3 +12,7 @@ endif ifeq ($(strip $(FLASH_BOOTLOADER)), yes) OPT_DEFS += -DFLASH_BOOTLOADER endif + +ifeq ($(strip $(IS_MACROPAD)), yes) + OPT_DEFS += -DIS_MACROPAD +endif From 7be400e632ec92008a1af1c4b5ece55a98ab10dd Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 11 Jun 2019 12:47:21 -0700 Subject: [PATCH 084/429] [User] Fix macropad build option logic --- users/brandonschlack/brandonschlack.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index 77cec402f9ae..70477bd4ccd5 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -18,7 +18,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { clear_mods(); clear_oneshot_mods(); SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP); - #if !defined(FLASH_BOOTLOADER) || !defined(IS_MACROPAD) + #if !defined(FLASH_BOOTLOADER) && !defined(IS_MACROPAD) if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT ) #endif { // @@ -38,7 +38,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { SEND_STRING(" -j8 --output-sync"); } SEND_STRING(SS_TAP(X_ENTER)); - #if !defined(FLASH_BOOTLOADER) || !defined(IS_MACROPAD) + #if !defined(FLASH_BOOTLOADER) && !defined(IS_MACROPAD) if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT ) #endif { From ad1e6bbe190dce7365d1ee8d1ece096d0c2a431f Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 11 Jun 2019 12:48:36 -0700 Subject: [PATCH 085/429] [Keymap] Add launchpad mouse key config --- keyboards/launchpad/keymaps/brandonschlack/config.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/keyboards/launchpad/keymaps/brandonschlack/config.h b/keyboards/launchpad/keymaps/brandonschlack/config.h index cae1450c15bb..f42a7bffab23 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/config.h +++ b/keyboards/launchpad/keymaps/brandonschlack/config.h @@ -6,4 +6,9 @@ #define RGBLED_NUM 2 // Number of LEDs #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 -#define RGBLIGHT_VAL_STEP 17 \ No newline at end of file +#define RGBLIGHT_VAL_STEP 17 + +/* Mouse Keys Configuration */ +#define MOUSEKEY_INTERVAL 16 +#define MOUSEKEY_WHEEL_MAX_SPEED 1 +#define MOUSEKEY_WHEEL_TIME_TO_MAX 0 From 7670e366fd2037b09dd9cc657f706198e4b2de57 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 11 Jun 2019 14:03:14 -0700 Subject: [PATCH 086/429] [User] Userspace refactor * Break out process_records * Break out config options * Move shared macropad code to userspace --- .../bdn9/keymaps/brandonschlack/keymap.c | 32 +----- .../launchpad/keymaps/brandonschlack/keymap.c | 41 +------ users/brandonschlack/brandonschlack.c | 80 +------------ users/brandonschlack/brandonschlack.h | 55 +++------ users/brandonschlack/config.h | 5 + users/brandonschlack/process_records.c | 106 ++++++++++++++++++ users/brandonschlack/process_records.h | 44 ++++++++ users/brandonschlack/rgb_bs.h | 3 + users/brandonschlack/rules.mk | 3 +- 9 files changed, 178 insertions(+), 191 deletions(-) create mode 100644 users/brandonschlack/config.h create mode 100644 users/brandonschlack/process_records.c create mode 100644 users/brandonschlack/process_records.h diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index dc398f6789ff..8bf6325c4599 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -2,21 +2,13 @@ #include "brandonschlack.h" enum bdn9_layers { - _NAVI, - _REEDER, - _MEDIA, - _KEYPAD, - _LR_NAV, + _LR_NAV = KEYMAP_LAYERS, _LR_REVIEW, _LR_EDIT }; enum bdn9_keycodes { - TG_NAVI = KEYMAP_SAFE_RANGE, - TG_REDR, - TG_MEDA, - TG_KYPD, - TG_LNAV, + TG_LNAV = KEYMAP_SAFE_RANGE, TG_REVW, TG_EDIT, MC_UNDO, @@ -245,26 +237,6 @@ void encoder_update_user(uint8_t index, bool clockwise) { */ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case TG_NAVI: - if (!record->event.pressed) { - layer_move(_NAVI); - } - break; - case TG_REDR: - if (!record->event.pressed) { - layer_move(_REEDER); - } - break; - case TG_MEDA: - if (!record->event.pressed) { - layer_move(_MEDIA); - } - break; - case TG_KYPD: - if (!record->event.pressed) { - layer_move(_KEYPAD); - } - break; case TG_LNAV: if (!record->event.pressed) { tap_code(KC_G); diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index 3a6b76afa544..e37728e2c47a 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -3,19 +3,7 @@ extern keymap_config_t keymap_config; -enum launchpad_layers { - _NAVI, - _REEDER, - _MEDIA, - _KEYPAD -}; - -enum launchpad_keycodes { - TG_NAVI = KEYMAP_SAFE_RANGE, - TG_REDR, - TG_MEDA, - TG_KYPD -}; +// Layers defined in brandonschlack.h enum launchpad_dances { TD_LGHT = 0, @@ -153,33 +141,6 @@ void keyboard_post_init_user(void) { rgblight_sethsv(HSV_LSR_PURPLE); }; - -bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case TG_NAVI: - if (!record->event.pressed) { - layer_move(_NAVI); - } - break; - case TG_REDR: - if (!record->event.pressed) { - layer_move(_REEDER); - } - break; - case TG_MEDA: - if (!record->event.pressed) { - layer_move(_MEDIA); - } - break; - case TG_KYPD: - if (!record->event.pressed) { - layer_move(_KEYPAD); - } - break; - } - return true; -} - uint32_t layer_state_set_user(uint32_t state) { switch (biton32(state)) { case _REEDER: diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index 70477bd4ccd5..9e70bfb479aa 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -1,87 +1,9 @@ #include "brandonschlack.h" -// Super CMD↯TAB -bool is_cmd_tab_active = false; -uint16_t cmd_tab_timer = 0; - -__attribute__ ((weak)) -bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { - return true; -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case KC_MAKE: // Compiles the firmware, and adds the flash command based on keyboard bootloader - if (!record->event.pressed) { - uint8_t temp_mod = get_mods(); - uint8_t temp_osm = get_oneshot_mods(); - clear_mods(); clear_oneshot_mods(); - SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP); - - #if !defined(FLASH_BOOTLOADER) && !defined(IS_MACROPAD) - if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT ) - #endif - { // - #if defined(BOOTLOADER_MDLOADER) // only run for Massdrop boards - SEND_STRING(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP); - #elif defined(__arm__) // only run for ARM boards - SEND_STRING(":dfu-util"); - #elif defined(BOOTLOADER_DFU) // only run for DFU boards - SEND_STRING(":dfu"); - #elif defined(BOOTLOADER_HALFKAY) // only run for teensy boards - SEND_STRING(":teensy"); - #elif defined(BOOTLOADER_CATERINA) // only run for Pro Micros - SEND_STRING(":avrdude"); - #endif // bootloader options - } - if ( (temp_mod | temp_osm) & MOD_MASK_CTRL) { - SEND_STRING(" -j8 --output-sync"); - } - SEND_STRING(SS_TAP(X_ENTER)); - #if !defined(FLASH_BOOTLOADER) && !defined(IS_MACROPAD) - if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT ) - #endif - { - reset_keyboard(); - } - set_mods(temp_mod); - } - break; - case OS_MAC: - set_single_persistent_default_layer(_MAC); - break; - case OS_WIN: - set_single_persistent_default_layer(_WIN); - break; - case CMD_TAB: - if (record->event.pressed) { - if (!is_cmd_tab_active) { - is_cmd_tab_active = true; - register_code(KC_LGUI); - } - cmd_tab_timer = timer_read(); - register_code(KC_TAB); - } else { - unregister_code(KC_TAB); - } - break; - case WN_SLPD: - tap_code16(G(KC_L)); - tap_code(KC_SYSTEM_POWER); - break; - } - return process_record_keymap(keycode, record); -} - __attribute__ ((weak)) void matrix_scan_keymap(void) {} void matrix_scan_user(void) { - if (is_cmd_tab_active) { - if (timer_elapsed(cmd_tab_timer) > 1000) { - unregister_code(KC_LGUI); - is_cmd_tab_active = false; - } - } + matrix_scan_cmd_tab(); matrix_scan_keymap(); } diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index cbac01db2944..01261e247544 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -1,56 +1,29 @@ #pragma once #include "quantum.h" +#include "eeprom.h" +#include "process_records.h" #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) # include "rgb_bs.h" #endif // Define layer names +#ifndef IS_MACROPAD enum bs_layers { _MAC = 0, _MACFN, _WIN, - _WINFN, - _LIGHT = 14, - _MAGIC = 15, + _WINFN }; - -// Config -#define TAPPING_TOGGLE 2 -#define TAPPING_TERM 200 -#define PERMISSIVE_HOLD - -// Macros -enum custom_keycodes { - KC_MAKE = SAFE_RANGE, - OS_MAC, - OS_WIN, - CMD_TAB, - WN_SLPD, - KEYMAP_SAFE_RANGE +#else +enum macropad_layers { + _NAVI = 0, + _REEDER, + _MEDIA, + _KEYPAD, + KEYMAP_LAYERS }; +#endif +#define _MAGIC 15 -// Useful Defines -#define HY_CAPS ALL_T(KC_CAPS) -#define TG_MAGC TG(_MAGIC) -// Media Mod-Tap -#define MM_LCTL LCTL_T(KC_MRWD) -#define MM_LALT LALT_T(KC_MPLY) -#define MM_LGUI LGUI_T(KC_MFFD) -#define MM_FN_M LT(_MACFN, KC_MPLY) -#define MM_FN_W LT(_WINFN, KC_MPLY) -#define MM_RSFT RSFT_T(KC_MUTE) -// MacOS -#define MC_POWR KC_POWER // Mac Power alias -#define MC_SLPD LCTL(LSFT(KC_POWER)) // Sleep Display -#define MC_MSSN LCTL(KC_UP) // Mission Control -#define MC_LHPD KC_F13 // Launchpad: Configure karabiner for F13 -> Launchpad -#define MC_PLYR LGUI(KC_F8) // Focuses current Media Player -// Reverse scrolling for using with macOS Natural Scrolling. -#define MC_WH_U KC_WH_D -#define MC_WH_D KC_WH_U -#define MC_WH_L KC_WH_R -#define MC_WH_R KC_WH_L -// Windows -#define WN_LOCK LGUI(KC_L) // Lock Computer -#define WN_TSKM LCTL(LALT(KC_DEL)) // Task Manager (Ctrl+Alt+Del) +void matrix_scan_keymap(void); diff --git a/users/brandonschlack/config.h b/users/brandonschlack/config.h new file mode 100644 index 000000000000..e9f3ef475dc0 --- /dev/null +++ b/users/brandonschlack/config.h @@ -0,0 +1,5 @@ +#pragma once + +#define TAPPING_TOGGLE 2 +#define TAPPING_TERM 200 +#define PERMISSIVE_HOLD diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c new file mode 100644 index 000000000000..665628db1326 --- /dev/null +++ b/users/brandonschlack/process_records.c @@ -0,0 +1,106 @@ +#include "brandonschlack.h" + +// Super CMD↯TAB +bool is_cmd_tab_active = false; +uint16_t cmd_tab_timer = 0; + +__attribute__ ((weak)) +bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { + return true; +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case KC_MAKE: // Compiles the firmware, and adds the flash command based on keyboard bootloader + if (!record->event.pressed) { + uint8_t temp_mod = get_mods(); + uint8_t temp_osm = get_oneshot_mods(); + clear_mods(); clear_oneshot_mods(); + SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP); + + #if !defined(FLASH_BOOTLOADER) && !defined(IS_MACROPAD) + if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT ) + #endif + { // + #if defined(BOOTLOADER_MDLOADER) // only run for Massdrop boards + SEND_STRING(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP); + #elif defined(__arm__) // only run for ARM boards + SEND_STRING(":dfu-util"); + #elif defined(BOOTLOADER_DFU) // only run for DFU boards + SEND_STRING(":dfu"); + #elif defined(BOOTLOADER_HALFKAY) // only run for teensy boards + SEND_STRING(":teensy"); + #elif defined(BOOTLOADER_CATERINA) // only run for Pro Micros + SEND_STRING(":avrdude"); + #endif // bootloader options + } + if ( (temp_mod | temp_osm) & MOD_MASK_CTRL) { + SEND_STRING(" -j8 --output-sync"); + } + SEND_STRING(SS_TAP(X_ENTER)); + #if !defined(FLASH_BOOTLOADER) && !defined(IS_MACROPAD) + if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT ) + #endif + { + reset_keyboard(); + } + set_mods(temp_mod); + } + break; + case CMD_TAB: + if (record->event.pressed) { + if (!is_cmd_tab_active) { + is_cmd_tab_active = true; + register_code(KC_LGUI); + } + cmd_tab_timer = timer_read(); + register_code(KC_TAB); + } else { + unregister_code(KC_TAB); + } + break; + case WN_SLPD: + tap_code16(G(KC_L)); + tap_code(KC_SYSTEM_POWER); + break; + #ifndef IS_MACROPAD + case OS_MAC: + set_single_persistent_default_layer(_MAC); + break; + case OS_WIN: + set_single_persistent_default_layer(_WIN); + break; + #else + case TG_NAVI: + if (!record->event.pressed) { + layer_move(_NAVI); + } + break; + case TG_REDR: + if (!record->event.pressed) { + layer_move(_REEDER); + } + break; + case TG_MEDA: + if (!record->event.pressed) { + layer_move(_MEDIA); + } + break; + case TG_KYPD: + if (!record->event.pressed) { + layer_move(_KEYPAD); + } + break; + #endif // IS_MACROPAD + } + return process_record_keymap(keycode, record); +} + +void matrix_scan_cmd_tab(void) { + if (is_cmd_tab_active) { + if (timer_elapsed(cmd_tab_timer) > 1000) { + unregister_code(KC_LGUI); + is_cmd_tab_active = false; + } + } +} diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h new file mode 100644 index 000000000000..ceb616c84c8c --- /dev/null +++ b/users/brandonschlack/process_records.h @@ -0,0 +1,44 @@ +#pragma once +#include "brandonschlack.h" + +// Macros +enum custom_keycodes { + KC_MAKE = SAFE_RANGE, + CMD_TAB, + WN_SLPD, + OS_MAC, + OS_WIN, + TG_NAVI, + TG_REDR, + TG_MEDA, + TG_KYPD, + KEYMAP_SAFE_RANGE +}; + +bool process_record_keymap(uint16_t keycode, keyrecord_t *record); +void matrix_scan_cmd_tab(void); + +// Useful Defines +#define HY_CAPS ALL_T(KC_CAPS) +#define TG_MAGC TG(_MAGIC) +// Media Mod-Tap +#define MM_LCTL LCTL_T(KC_MRWD) +#define MM_LALT LALT_T(KC_MPLY) +#define MM_LGUI LGUI_T(KC_MFFD) +#define MM_FN_M LT(_MACFN, KC_MPLY) +#define MM_FN_W LT(_WINFN, KC_MPLY) +#define MM_RSFT RSFT_T(KC_MUTE) +// MacOS +#define MC_POWR KC_POWER // Mac Power alias +#define MC_SLPD LCTL(LSFT(KC_POWER)) // Sleep Display +#define MC_MSSN LCTL(KC_UP) // Mission Control +#define MC_LHPD KC_F13 // Launchpad: Configure karabiner for F13 -> Launchpad +#define MC_PLYR LGUI(KC_F8) // Focuses current Media Player +// Reverse scrolling for using with macOS Natural Scrolling. +#define MC_WH_U KC_WH_D +#define MC_WH_D KC_WH_U +#define MC_WH_L KC_WH_R +#define MC_WH_R KC_WH_L +// Windows +#define WN_LOCK LGUI(KC_L) // Lock Computer +#define WN_TSKM LCTL(LALT(KC_DEL)) // Task Manager (Ctrl+Alt+Del) diff --git a/users/brandonschlack/rgb_bs.h b/users/brandonschlack/rgb_bs.h index 2a13e7cf5d78..95a10df35256 100644 --- a/users/brandonschlack/rgb_bs.h +++ b/users/brandonschlack/rgb_bs.h @@ -5,6 +5,9 @@ #include "rgb_matrix.h" #endif +// Define Layer for Lighting functions +#define _LIGHT 14 + // RGB Colors #define RGB_LSR_PURPLE 0x3C, 0x16, 0x8C #define RGB_LSR_PINK 0xF2, 0x1B, 0x7F diff --git a/users/brandonschlack/rules.mk b/users/brandonschlack/rules.mk index 54b636e1d388..87a0e56a9ebf 100644 --- a/users/brandonschlack/rules.mk +++ b/users/brandonschlack/rules.mk @@ -1,4 +1,5 @@ -SRC += brandonschlack.c +SRC += brandonschlack.c \ + process_records.c ifeq ($(strip $(RGBLIGHT_ENABLE)), yes) SRC += rgb_bs.c From f7af0bb4b3f94a1bd12daaf9b84c17b516522ffe Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 11 Jun 2019 17:01:23 -0700 Subject: [PATCH 087/429] [Keymap] Disable COMMAND if MOUSEKEYS set to constant --- keyboards/keebio/bdn9/keymaps/brandonschlack/config.h | 4 ++++ keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk | 1 + keyboards/launchpad/keymaps/brandonschlack/config.h | 5 ++--- keyboards/launchpad/keymaps/brandonschlack/rules.mk | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h index 6f70f09beec2..243733673ed7 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h @@ -1 +1,5 @@ #pragma once + +/* Mouse Keys Configuration */ +#define MK_3_SPEED +#define MK_W_INTERVAL_UNMOD 20 diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk index cce0620a1bea..c5a3af865f73 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk @@ -6,6 +6,7 @@ BOOTLOADER = atmel-dfu # Build Options MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +COMMAND_ENABLE = no # Disable Command, breaks with Mouse Keys set to constant. BACKLIGHT_ENABLE = no # No backlights installed RGBLIGHT_ENABLE = no # No RGBs installed TAP_DANCE_ENABLE = yes # Use tap dance diff --git a/keyboards/launchpad/keymaps/brandonschlack/config.h b/keyboards/launchpad/keymaps/brandonschlack/config.h index f42a7bffab23..3a16cf5b4ae4 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/config.h +++ b/keyboards/launchpad/keymaps/brandonschlack/config.h @@ -9,6 +9,5 @@ #define RGBLIGHT_VAL_STEP 17 /* Mouse Keys Configuration */ -#define MOUSEKEY_INTERVAL 16 -#define MOUSEKEY_WHEEL_MAX_SPEED 1 -#define MOUSEKEY_WHEEL_TIME_TO_MAX 0 +#define MK_3_SPEED +#define MK_W_INTERVAL_UNMOD 20 diff --git a/keyboards/launchpad/keymaps/brandonschlack/rules.mk b/keyboards/launchpad/keymaps/brandonschlack/rules.mk index 048c3d9997f8..4a811340b967 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/rules.mk +++ b/keyboards/launchpad/keymaps/brandonschlack/rules.mk @@ -7,4 +7,5 @@ BOOTLOADER = atmel-dfu # Build Options RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. MOUSEKEY_ENABLE = yes # Use mouse keys for scrolling. +COMMAND_ENABLE = no # Disable Command, breaks with Mouse Keys set to constant. TAP_DANCE_ENABLE = yes # Use tap dance From 4b50221cb53ee91ad163cae34f2bf0ed947d8dee Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 13 Jun 2019 19:40:24 -0700 Subject: [PATCH 088/429] [User] Enable LINK_TIME_OPTIMIZATION --- .../massdrop/alt/keymaps/brandonschlack/rules.mk | 2 +- users/brandonschlack/rules.mk | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk b/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk index cf2ae6bb403f..c12d998b005e 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk @@ -1,2 +1,2 @@ # Use mdloader for flashing -OPT_DEFS += -DBOOTLOADER_MDLOADER +BOOTLOADER = mdloader diff --git a/users/brandonschlack/rules.mk b/users/brandonschlack/rules.mk index 87a0e56a9ebf..e4ef2b8f962b 100644 --- a/users/brandonschlack/rules.mk +++ b/users/brandonschlack/rules.mk @@ -1,6 +1,18 @@ SRC += brandonschlack.c \ process_records.c +ifeq ($(strip $(BOOTLOADER)), mdloader) + OPT_DEFS += -DBOOTLOADER_MDLOADER + DISABLE_LTO = yes +endif + +ifneq ($(strip $(DISABLE_LTO)), yes) + EXTRAFLAGS += -flto + OPT_DEFS += -DLINK_TIME_OPTIMIZATION_ENABLE + OPT_DEFS += -DNO_ACTION_MACRO + OPT_DEFS += -DNO_ACTION_FUNCTION +endif + ifeq ($(strip $(RGBLIGHT_ENABLE)), yes) SRC += rgb_bs.c endif From b473e1109307390ae700569ec8482a3ba4e01597 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 13 Jun 2019 19:42:47 -0700 Subject: [PATCH 089/429] [User] Initial move of rgb code into userspace * Working with Massdrop ALT * Needs testing with Launchpad and soon KBD75 --- .../alt/keymaps/brandonschlack/config.h | 4 + .../alt/keymaps/brandonschlack/keymap.c | 62 ++------------- users/brandonschlack/brandonschlack.c | 14 ++++ users/brandonschlack/brandonschlack.h | 11 +++ users/brandonschlack/rgb_bs.c | 78 ++++++++++++++++++- users/brandonschlack/rgb_bs.h | 15 ++-- 6 files changed, 121 insertions(+), 63 deletions(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/config.h b/keyboards/massdrop/alt/keymaps/brandonschlack/config.h index f11590b077ec..73534dbb7d0a 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/config.h +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/config.h @@ -42,6 +42,10 @@ // #define RGB_MATRIX_KEYRELEASES +// Use RGB Indicators over LED +#undef USB_LED_INDICATOR_ENABLE +#define USB_LED_CAPS_LOCK_SCANCODE 30 + // Speed #define NO_ACTION_MACRO diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index cc874df85f53..bafa8890805b 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -201,28 +201,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return false; case RGB_TOG: if (record->event.pressed) { - switch (rgb_matrix_get_flags()) { - case LED_FLAG_ALL: { - rgb_matrix_set_flags(LED_FLAG_KEYLIGHT); - rgb_matrix_set_color_all(0, 0, 0); - } - break; - case LED_FLAG_KEYLIGHT: { - rgb_matrix_set_flags(LED_FLAG_UNDERGLOW); - rgb_matrix_set_color_all(0, 0, 0); - } - break; - case LED_FLAG_UNDERGLOW: { - rgb_matrix_set_flags(LED_FLAG_MODIFIER); - rgb_matrix_set_color_all(0, 0, 0); - } - break; - default: { - rgb_matrix_set_flags(LED_FLAG_ALL); - rgb_matrix_enable_noeeprom(); - } - break; - } + rgb_matrix_cycle_flag(); } return false; default: @@ -230,39 +209,10 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { } } -void rgb_matrix_hsv_layer (uint8_t hue, uint8_t sat, uint8_t val) { - rgb_matrix_sethsv_noeeprom(hue, sat, val); - if (rgb_matrix_get_flags() == LED_FLAG_MODIFIER) { - rgb_matrix_set_color(30, 0, 0, 0); - } -} - void rgb_matrix_indicators_user(void) { - uint8_t this_led = host_keyboard_leds(); - - if (!g_suspend_state && rgb_matrix_config.enable) { - switch (biton32(layer_state)) { - case _MAC: - rgb_matrix_hsv_layer(HSV_PURPLE); - break; - case _MACFN: - rgb_matrix_hsv_layer(HSV_PINK); - break; - case _WIN: - rgb_matrix_hsv_layer(HSV_MAGENTA); - break; - case _WINFN: - rgb_matrix_hsv_layer(HSV_CYAN); - break; - case _MAGIC: - rgb_matrix_hsv_layer(HSV_WHITE); - break; - } - - if ( this_led & (1< Date: Fri, 14 Jun 2019 15:56:46 -0700 Subject: [PATCH 090/429] [User] Move post_init, add shutdown to userspace * Move keyboard_post_init to userspace * Add shutdown, suspend code to userspace --- .../launchpad/keymaps/brandonschlack/keymap.c | 24 +--------- .../alt/keymaps/brandonschlack/keymap.c | 4 +- users/brandonschlack/brandonschlack.c | 45 +++++++++++++++++++ users/brandonschlack/brandonschlack.h | 5 ++- users/brandonschlack/rgb_bs.c | 44 ++++++++++++------ users/brandonschlack/rgb_bs.h | 1 + 6 files changed, 82 insertions(+), 41 deletions(-) diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index e37728e2c47a..4a9218119983 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -137,31 +137,9 @@ void matrix_init_user(void) { } // Runs once after keyboard initializes -void keyboard_post_init_user(void) { - rgblight_sethsv(HSV_LSR_PURPLE); +void keyboard_post_init_keymap(void) { }; -uint32_t layer_state_set_user(uint32_t state) { - switch (biton32(state)) { - case _REEDER: - rgblight_sethsv_noeeprom(HSV_LSR_PINK); - break; - case _MEDIA: - rgblight_sethsv_noeeprom(HSV_LSR_BLUE); - break; - case _KEYPAD: - rgblight_sethsv_noeeprom(HSV_LSR_CYAN); - break; - case _MAGIC: - rgblight_sethsv_noeeprom(HSV_GREEN); - break; - default: // for any other layers, or the default layer - rgblight_sethsv_noeeprom(HSV_LSR_PURPLE); - break; - } - return state; -} - /** * Tap Dances */ diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index bafa8890805b..97e733905604 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -143,9 +143,7 @@ void matrix_init_user(void) { }; // Runs once after keyboard initializes -void keyboard_post_init_user(void) { - rgb_matrix_sethsv_noeeprom(HSV_PURPLE); - rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR); +void keyboard_post_init_keymap(void) { }; // Runs constantly in the background, in a loop. diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index 36c7d7ade108..b0ef11521f35 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -1,5 +1,50 @@ #include "brandonschlack.h" +__attribute__((weak)) +void keyboard_post_init_keymap(void){ } + +void keyboard_post_init_user(void){ +#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) + keyboard_post_init_rgb(); +#endif + keyboard_post_init_keymap(); +} + +__attribute__ ((weak)) +void shutdown_keymap(void) {} + +void shutdown_user (void) { + #ifdef RGBLIGHT_ENABLE + rgblight_enable_noeeprom(); + rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); + rgblight_sethsv_noeeprom(0, 255, 127); + #endif // RGBLIGHT_ENABLE + #ifdef RGB_MATRIX_ENABLE + rgb_matrix_set_color_all( 0xFF, 0x00, 0x00 ); + #endif //RGB_MATRIX_ENABLE + shutdown_keymap(); +} + +__attribute__ ((weak)) +void suspend_power_down_keymap(void) {} + +void suspend_power_down_user(void) { + #ifdef RGB_MATRIX_ENABLE + rgb_matrix_set_suspend_state(true); + #endif //RGB_MATRIX_ENABLE + suspend_power_down_keymap(); +} + +__attribute__ ((weak)) +void suspend_wakeup_init_keymap(void) {} + +void suspend_wakeup_init_user(void) { + #ifdef RGB_MATRIX_ENABLE + rgb_matrix_set_suspend_state(false); + #endif //RGB_MATRIX_ENABLE + suspend_wakeup_init_keymap(); +} + __attribute__ ((weak)) void matrix_scan_keymap(void) {} diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 0ed9b60002b9..be6a721e1c41 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -26,9 +26,12 @@ enum macropad_layers { #endif #define _MAGIC 15 +void keyboard_post_init_keymap(void); +void shutdown_keymap(void); +void suspend_power_down_keymap(void); +void suspend_wakeup_init_keymap(void); void matrix_scan_keymap(void); layer_state_t layer_state_set_keymap (layer_state_t state); -// layer_state_t default_layer_state_set_keymap (layer_state_t state); // typedef union { // uint32_t raw; diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index 7ece6cdef81e..9e93aa01f99c 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -3,13 +3,22 @@ #if defined(RGBLIGHT_ENABLE) extern rgblight_config_t rgblight_config; -#endif - -#ifdef RGB_MATRIX_ENABLE +#elif defined(RGB_MATRIX_ENABLE) extern rgb_config_t rgb_matrix_config; extern bool g_suspend_state; extern led_config_t g_led_config; +#endif +void keyboard_post_init_rgb(void) { + layer_state_set_user(layer_state); +#if defined(RGBLIGHT_ENABLE) + rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); +#elif defined(RGB_MATRIX_ENABLE) + rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR); +#endif +} + +#ifdef RGB_MATRIX_ENABLE void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, uint8_t led_type) { for (int i = 0; i < DRIVER_LED_TOTAL; i++) { if (!HAS_ANY_FLAGS(g_led_config.flags[i], led_type)) { @@ -40,8 +49,8 @@ void rgb_matrix_cycle_flag (void) { } #endif -#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) void rgb_layer_helper(uint8_t hue, uint8_t sat, uint8_t val) { +#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) rgblight_sethsv_noeeprom(hue, sat, val); #ifdef RGB_MATRIX_ENABLE rgb_matrix_layer_helper(0, 0, 0, rgb_matrix_get_flags()); @@ -53,22 +62,13 @@ layer_state_t layer_state_set_rgb(layer_state_t state) { #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) switch (biton32(state)) { #ifndef IS_MACROPAD - case _MAC: - rgb_layer_helper(HSV_PURPLE); - break; case _MACFN: rgb_layer_helper(HSV_PINK); break; - case _WIN: - rgb_layer_helper(HSV_BLUE); - break; case _WINFN: rgb_layer_helper(HSV_CYAN); break; #else - case _NAVI: - rgb_layer_helper(HSV_PURPLE); - break; case _REEDER: rgb_layer_helper(HSV_PINK); break; @@ -80,7 +80,23 @@ layer_state_t layer_state_set_rgb(layer_state_t state) { break; #endif case _MAGIC: - rgb_layer_helper(HSV_WHITE); + rgb_layer_helper(HSV_GREEN); + break; + default: + switch (biton32(default_layer_state)) { + #ifndef IS_MACROPAD + case _MAC: + rgb_layer_helper(HSV_PURPLE); + break; + case _WIN: + rgb_layer_helper(HSV_BLUE); + break; + #else + case _NAVI: + rgb_layer_helper(HSV_PURPLE); + break; + #endif + } break; } #endif // RGBLIGHT_ENABLE diff --git a/users/brandonschlack/rgb_bs.h b/users/brandonschlack/rgb_bs.h index a3ee150ff82a..b211693bad9b 100644 --- a/users/brandonschlack/rgb_bs.h +++ b/users/brandonschlack/rgb_bs.h @@ -28,6 +28,7 @@ void rgb_matrix_layer_helper(uint8_t red, uint8_t green, uint8_t blue, uint8_t l void rgb_matrix_cycle_flag(void); #endif +void keyboard_post_init_rgb(void); void rgb_layer_helper(uint8_t hue, uint8_t sat, uint8_t val); layer_state_t layer_state_set_rgb(layer_state_t state); From 1953cfcc7e2d2ebb1b52ac924cd14a68665cd6ec Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Mon, 17 Jun 2019 14:25:18 -0700 Subject: [PATCH 091/429] [User] Add Media Mod-Tap for RGUI,RALT --- users/brandonschlack/process_records.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index ceb616c84c8c..897e7684b3dc 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -25,6 +25,8 @@ void matrix_scan_cmd_tab(void); #define MM_LCTL LCTL_T(KC_MRWD) #define MM_LALT LALT_T(KC_MPLY) #define MM_LGUI LGUI_T(KC_MFFD) +#define MM_RGUI RGUI_T(KC_MRWD) +#define MM_RALT RALT_T(KC_MFFD) #define MM_FN_M LT(_MACFN, KC_MPLY) #define MM_FN_W LT(_WINFN, KC_MPLY) #define MM_RSFT RSFT_T(KC_MUTE) From dda4c791484d8aa5d8b5fac69a571937a90e180d Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Mon, 17 Jun 2019 14:25:38 -0700 Subject: [PATCH 092/429] [Keymap] Add kbdfans/kbd75 keymap --- .../kbd75/keymaps/brandonschlack/keymap.c | 62 +++++++++++++++++++ .../kbd75/keymaps/brandonschlack/rules.mk | 5 ++ 2 files changed, 67 insertions(+) create mode 100644 keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c create mode 100644 keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c new file mode 100644 index 000000000000..e9a97f65d2c0 --- /dev/null +++ b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c @@ -0,0 +1,62 @@ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* LAYOUT + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ 2.0U │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │1.5U │ │ │ │ │ │ │ │ │ │ │ │ │1.5U │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │1.75U │ │ │ │ │ │ │ │ │ │ │ │2.25U │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │2.25U │ │ │ │ │ │ │ │ │ │ │1.75U │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ + * │1.25│1.25│1.25│6.25U │1U │1U │1U │1U │1U │1U │ + * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ + */ + + /* Base Layer: Mac + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Esc│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│F13│F14│F15│ + * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ + * │~ `│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│Hom│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│| \│PgU│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│PgD│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│End│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ + * │Ctrl│ Opt│ Cmd│ Space │Cmd│Opt│Fn │Lef│Dow│Rig│ + * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ + */ + [_MAC] = LAYOUT( + KC_ESC, 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_MUTE, KC_VOLD, KC_VOLU, + 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, XXXXXXX, KC_BSPC, KC_HOME, + 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_PGUP, + HY_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_PGDN, + KC_LSFT, XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, KC_SPC, XXXXXXX, MM_RGUI, MM_RALT, MM_FN_M, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [_MACFN] = LAYOUT( + KC_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MRWD, KC_MFFD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, MC_SLPD, + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, MC_LHPD, _______, + _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, _______, + _______, _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, KC_PGUP, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END + ), + + [_MAGIC] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, + XXXXXXX, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + ), +}; diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk new file mode 100644 index 000000000000..7702b0140ea9 --- /dev/null +++ b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk @@ -0,0 +1,5 @@ +# Build Options +# comment out to disable the options. +# +MOUSEKEY_ENABLE = no # Don't need Mouse Keys +BACKLIGHT_ENABLE = no # No backlights installed From 3ff96522d92fe7c50656465849338cdd6cbae817 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 18 Jun 2019 11:07:12 -0700 Subject: [PATCH 093/429] [Keymap] Add layout preview to kbd75 keymap --- .../kbd75/keymaps/brandonschlack/keymap.c | 32 +++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c index e9a97f65d2c0..92e0c1e86f85 100644 --- a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c @@ -41,7 +41,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, KC_SPC, XXXXXXX, MM_RGUI, MM_RALT, MM_FN_M, KC_LEFT, KC_DOWN, KC_RGHT ), - + /* Function Layer: Mac + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Mke│BrD│BrU│Msn│LHP│ │ │ │ │ │ │ │ │Ply│Prv│Nxt│ + * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ Del │SlD│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │RMod │Hu+│St+│Vl+│RST│ │ │ │ │ │ │ │ │1.5U │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ │Hu-│St-│Vl-│ │ │ │ │ │ │ │ │Magic │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ │RTg│ │ │ │ │ │ │ │ │ │MteSft│PgU│ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ + * │ │ │ │ │ │ │ │Hom│PgD│End│ + * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ + */ [_MACFN] = LAYOUT( KC_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MRWD, KC_MFFD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, MC_SLPD, @@ -50,7 +64,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), - + /* Function Layer: Mac + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │RMod │Hu+│St+│Vl+│RST│ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ │Hu-│St-│Vl-│ │ │ │ │ │ │ │ │Magic │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ │RTg│ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ + */ [_MAGIC] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, From 39e0faea520368de9146729f00f3da4af6743012 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 18 Jun 2019 17:25:22 -0700 Subject: [PATCH 094/429] [User] Move color defines into seperate file --- users/brandonschlack/colors_bs.h | 15 +++++++++++++++ users/brandonschlack/rgb_bs.h | 17 ++--------------- 2 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 users/brandonschlack/colors_bs.h diff --git a/users/brandonschlack/colors_bs.h b/users/brandonschlack/colors_bs.h new file mode 100644 index 000000000000..1fbd031ae7b9 --- /dev/null +++ b/users/brandonschlack/colors_bs.h @@ -0,0 +1,15 @@ +#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) +// RGB Colors +#define RGB_LSR_PURPLE 0x3C, 0x16, 0x8C +#define RGB_LSR_PINK 0xF2, 0x1B, 0x7F +#define RGB_LSR_INDIGO 0x23, 0x1B, 0x59 +#define RGB_LSR_CYAN 0x2F, 0xC1, 0xE1 +#define RGB_LSR_VIOLET 0x53, 0x36, 0xBF + +// HSV Colors +#define HSV_LSR_PURPLE HSV_PURPLE +#define HSV_LSR_PINK HSV_PINK +#define HSV_LSR_BLUE HSV_BLUE +#define HSV_LSR_CYAN HSV_CYAN +#define HSV_LSR_MAGENTA HSV_MAGENTA +#endif diff --git a/users/brandonschlack/rgb_bs.h b/users/brandonschlack/rgb_bs.h index b211693bad9b..9fa9f33e7824 100644 --- a/users/brandonschlack/rgb_bs.h +++ b/users/brandonschlack/rgb_bs.h @@ -1,26 +1,13 @@ #pragma once #include "quantum.h" +#include "colors_bs.h" #ifdef RGB_MATRIX_ENABLE - #include "rgb_matrix.h" +# include "rgb_matrix.h" #endif // Define Layer for Lighting functions #define _LIGHT 14 -// RGB Colors -#define RGB_LSR_PURPLE 0x3C, 0x16, 0x8C -#define RGB_LSR_PINK 0xF2, 0x1B, 0x7F -#define RGB_LSR_INDIGO 0x23, 0x1B, 0x59 -#define RGB_LSR_CYAN 0x2F, 0xC1, 0xE1 -#define RGB_LSR_VIOLET 0x53, 0x36, 0xBF - -// HSV Colors -#define HSV_LSR_PURPLE HSV_PURPLE -#define HSV_LSR_PINK HSV_PINK -#define HSV_LSR_BLUE HSV_BLUE -#define HSV_LSR_CYAN HSV_CYAN -#define HSV_LSR_MAGENTA HSV_MAGENTA - #ifdef RGB_MATRIX_ENABLE #define LED_FLAG_ALL_KEYS 0x05 From ed6153a21bdf7aa7e7417a9f3069d4f82aa1f07f Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 18 Jun 2019 17:26:30 -0700 Subject: [PATCH 095/429] [User] Move tap dances to userspace --- .../bdn9/keymaps/brandonschlack/keymap.c | 85 +++------ .../launchpad/keymaps/brandonschlack/keymap.c | 176 +++--------------- users/brandonschlack/brandonschlack.h | 3 + users/brandonschlack/rules.mk | 4 + users/brandonschlack/tap_dances.c | 75 ++++++++ users/brandonschlack/tap_dances.h | 25 +++ 6 files changed, 167 insertions(+), 201 deletions(-) create mode 100644 users/brandonschlack/tap_dances.c create mode 100644 users/brandonschlack/tap_dances.h diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 8bf6325c4599..53bea918433d 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -15,10 +15,6 @@ enum bdn9_keycodes { MC_REDO }; -enum bdn9_dances { - TD_MAGC = 0 -}; - #define MC_UNDO LGUI(KC_Z) #define MC_REDO LSFT(LGUI(KC_Z)) @@ -31,9 +27,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | Left | Down | Right | */ [_NAVI] = LAYOUT( - XXXXXXX, G(KC_TAB), G(KC_W), + XXXXXXX, CMD_TAB, G(KC_W), KC_PGDN, KC_UP, KC_P6, - KC_LEFT, KC_DOWN, TD(TD_MAGC) + KC_LEFT, KC_DOWN, TD(TD_DTAP_MAGC) ), /* Layer: Reeder @@ -45,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_REEDER] = LAYOUT( KC_H, KC_S, KC_R, G(KC_TAB), KC_M, KC_L, - G(KC_1), G(KC_2), TD(TD_MAGC) + G(KC_1), G(KC_2), TD(TD_DTAP_MAGC) ), /* Layer: Media @@ -57,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_MEDIA] = LAYOUT( KC_MUTE, MC_PLYR, KC_MPLY, KC_HOME, KC_UP, KC_END, - KC_LEFT, KC_DOWN, TD(TD_MAGC) + KC_LEFT, KC_DOWN, TD(TD_DTAP_MAGC) ), /* Layer: Keypad/Karabiner @@ -69,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_KEYPAD] = LAYOUT( KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, - KC_P7, KC_P8, TD(TD_MAGC) + KC_P7, KC_P8, TD(TD_DTAP_MAGC) ), /* Layer: Navigation @@ -81,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LR_NAV] = LAYOUT( TG_REVW, KC_J, TG_EDIT, KC_HOME, KC_UP, KC_END, - KC_LEFT, KC_DOWN, TD(TD_MAGC) + KC_LEFT, KC_DOWN, TD(TD_DTAP_MAGC) ), /* Layer: Review/Rate @@ -93,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LR_REVIEW] = LAYOUT( TG_LNAV, KC_7, TG_EDIT, KC_0, KC_8, KC_U, - KC_LEFT, KC_6, TD(TD_MAGC) + KC_LEFT, KC_6, TD(TD_DTAP_MAGC) ), /* Layer: Edit/Develop @@ -105,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LR_EDIT] = LAYOUT( TG_REVW, KC_BSLS, TG_LNAV, KC_X, MC_UNDO, KC_P, - KC_LEFT, MC_REDO, TD(TD_MAGC) + KC_LEFT, MC_REDO, TD(TD_DTAP_MAGC) ), /* Layer: Magic @@ -262,49 +258,30 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { /** * Tap Dances */ -void dance_magc_finished (qk_tap_dance_state_t *state, void *user_data) { - if (state->count == 2) { - layer_on(_MAGIC); - } else { - switch (biton32(layer_state)) { - case _NAVI: - case _MEDIA: - case _LR_NAV: - case _LR_REVIEW: - case _LR_EDIT: - register_code(KC_RGHT); - break; - case _REEDER: - register_code16(G(KC_3)); - break; - case _KEYPAD: - register_code(KC_P9); - break; - } +void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { + uint16_t keycode = 0; + switch (toggle_layer) { + case _MAGIC: + switch (biton32(layer_state)) { + case _NAVI: + case _MEDIA: + case _LR_NAV: + case _LR_REVIEW: + case _LR_EDIT: + keycode = KC_RGHT; + break; + case _REEDER: + keycode = G(KC_3); + break; + case _KEYPAD: + keycode = KC_P9; + break; + } + break; } -} - -void dance_magc_reset (qk_tap_dance_state_t *state, void *user_data) { - if (state->count == 2) { + if (!reset) { + register_code16(keycode); } else { - switch (biton32(layer_state)) { - case _NAVI: - case _MEDIA: - case _LR_NAV: - case _LR_REVIEW: - case _LR_EDIT: - unregister_code(KC_RGHT); - break; - case _REEDER: - unregister_code16(G(KC_3)); - break; - case _KEYPAD: - unregister_code(KC_P9); - break; - } + unregister_code16(keycode); } } - -qk_tap_dance_action_t tap_dance_actions[] = { - [TD_MAGC] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_magc_finished, dance_magc_reset) -}; diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index 4a9218119983..3ebe12810f07 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -5,21 +5,6 @@ extern keymap_config_t keymap_config; // Layers defined in brandonschlack.h -enum launchpad_dances { - TD_LGHT = 0, - TD_MAGC, - TD_CMTB -}; - -typedef enum { - SINGLE_TAP, - SINGLE_HOLD, - DOUBLE_SINGLE_TAP -} td_state_t; -static td_state_t td_state; - -int cur_dance (qk_tap_dance_state_t *state); - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Navigation @@ -37,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { S(G(KC_LBRC)), S(G(KC_RBRC)), \ MC_WH_L, MC_WH_U, \ MC_WH_R, MC_WH_D, \ - TD(TD_LGHT), TD(TD_MAGC) \ + TD(TD_SHLD_LGHT), TD(TD_SHLD_MAGC) \ ), /* Reeder @@ -52,10 +37,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-------------' */ [_REEDER] = LAYOUT( \ - TD(TD_CMTB), KC_H, \ + CMD_TAB, TD(TD_REDR_H), \ KC_P, KC_K, \ KC_N, KC_J, \ - TD(TD_LGHT), TD(TD_MAGC) \ + TD(TD_SHLD_LGHT), TD(TD_SHLD_MAGC) \ ), /* Media @@ -73,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MUTE, KC_MPLY, \ KC_VOLU, KC_MFFD, \ KC_VOLD, KC_MRWD, \ - TD(TD_LGHT), TD(TD_MAGC) \ + TD(TD_SHLD_LGHT), TD(TD_SHLD_MAGC) \ ), /* Keypad @@ -91,25 +76,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P1, KC_P2, \ KC_P3, KC_P4, \ KC_P5, KC_P6, \ - TD(TD_LGHT), TD(TD_MAGC) \ + TD(TD_SHLD_LGHT), TD(TD_SHLD_MAGC) \ ), /* Lights * ,-------------. - * | Mode-| Mode+| - * |------+------| * | HUE- | HUE+ | * |------+------| * | SAT- | SAT+ | * |------+------| - * | Magc |RGBTOG| + * | VAL- | VAL+ | + * |------+------| + * | XXXX | Mode+| * `-------------' */ [_LIGHT] = LAYOUT( \ - RGB_RMOD, RGB_MOD, \ - RGB_HUD, RGB_HUI, \ - RGB_SAD, RGB_SAI, \ - TG(_MAGIC), RGB_TOG \ + RGB_HUD, RGB_HUI, \ + RGB_SAD, RGB_SAI, \ + RGB_VAD, RGB_VAI, \ + XXXXXXX, RGB_MOD \ ), /* Magic @@ -143,148 +128,45 @@ void keyboard_post_init_keymap(void) { /** * Tap Dances */ -int cur_dance (qk_tap_dance_state_t *state) { - if (state->count == 1) { - if (state->interrupted || !state->pressed) { - return SINGLE_TAP; - } else { - return SINGLE_HOLD; - } - } - if (state->count == 2) { - return DOUBLE_SINGLE_TAP; - } else { - return 3; - } -} - -void dance_light_layer_finished (qk_tap_dance_state_t *state, void *user_data) { - td_state = cur_dance(state); - switch (td_state) { - case DOUBLE_SINGLE_TAP: - layer_on(_LIGHT); - break; - default: - switch (biton32(layer_state)) { - case _NAVI: - register_code16(S(G(KC_T))); - break; - case _REEDER: - register_code(KC_L); - break; - case _MEDIA: - register_code(KC_SPC); - break; - case _KEYPAD: - register_code(KC_P7); - break; - } - break; - } -} -void dance_light_layer_reset (qk_tap_dance_state_t *state, void *user_data) { - switch (td_state) { - case DOUBLE_SINGLE_TAP: - break; - default: +void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { + uint16_t keycode = 0; + switch (toggle_layer) { + case _LIGHT: switch (biton32(layer_state)) { case _NAVI: - unregister_code16(S(G(KC_T))); + keycode = S(G(KC_T)); break; case _REEDER: - unregister_code(KC_L); + keycode = KC_L; break; case _MEDIA: - unregister_code(KC_SPC); + keycode = KC_SPC; break; case _KEYPAD: - unregister_code(KC_P7); + keycode = KC_P7; break; } break; - } -} - -void dance_magic_layer_finished (qk_tap_dance_state_t *state, void *user_data) { - td_state = cur_dance(state); - switch (td_state) { - case SINGLE_HOLD: - layer_on(_MAGIC); - break; - default: + case _MAGIC: switch (biton32(layer_state)) { case _NAVI: - register_code16(G(KC_W)); + keycode = G(KC_W); break; case _REEDER: - register_code(KC_S); + keycode = KC_S; break; case _MEDIA: - register_code16(MC_PLYR); + keycode = MC_PLYR; break; case _KEYPAD: - register_code(KC_P8); + keycode = KC_P8; break; } break; } -} -void dance_magic_layer_reset (qk_tap_dance_state_t *state, void *user_data) { - switch (td_state) { - case SINGLE_HOLD: - layer_off(_MAGIC); - break; - default: - switch (biton32(layer_state)) { - case _NAVI: - unregister_code16(G(KC_W)); - break; - case _REEDER: - unregister_code(KC_S); - break; - case _MEDIA: - unregister_code16(MC_PLYR); - break; - case _KEYPAD: - unregister_code(KC_P8); - break; - } - break; - } -} - -void dance_command_tab_finished (qk_tap_dance_state_t *state, void *user_data) { - td_state = cur_dance(state); - switch (td_state) { - case DOUBLE_SINGLE_TAP: - register_code(KC_R); - break; - default: - switch (biton32(layer_state)) { - case _REEDER: - register_code16(G(KC_TAB)); - break; - } - break; - } -} -void dance_command_tab_reset (qk_tap_dance_state_t *state, void *user_data) { - switch (td_state) { - case DOUBLE_SINGLE_TAP: - unregister_code(KC_R); - break; - default: - switch (biton32(layer_state)) { - case _REEDER: - unregister_code16(G(KC_TAB)); - break; - } - break; + if (!reset) { + register_code16(keycode); + } else { + unregister_code16(keycode); } } - -qk_tap_dance_action_t tap_dance_actions[] = { - [TD_LGHT] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_light_layer_finished, dance_light_layer_reset), - [TD_MAGC] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_magic_layer_finished, dance_magic_layer_reset), - [TD_CMTB] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_command_tab_finished, dance_command_tab_reset) -}; diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index be6a721e1c41..a0375e24d6fa 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -3,6 +3,9 @@ #include "quantum.h" #include "eeprom.h" #include "process_records.h" +#ifdef TAP_DANCE_ENABLE +# include "tap_dances.h" +#endif // TAP_DANCE_ENABLE #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) # include "rgb_bs.h" #endif diff --git a/users/brandonschlack/rules.mk b/users/brandonschlack/rules.mk index e4ef2b8f962b..cea1e900bf24 100644 --- a/users/brandonschlack/rules.mk +++ b/users/brandonschlack/rules.mk @@ -1,6 +1,10 @@ SRC += brandonschlack.c \ process_records.c +ifeq ($(strip $(TAP_DANCE_ENABLE)), yes) + SRC += tap_dances.c +endif + ifeq ($(strip $(BOOTLOADER)), mdloader) OPT_DEFS += -DBOOTLOADER_MDLOADER DISABLE_LTO = yes diff --git a/users/brandonschlack/tap_dances.c b/users/brandonschlack/tap_dances.c new file mode 100644 index 000000000000..332b63026322 --- /dev/null +++ b/users/brandonschlack/tap_dances.c @@ -0,0 +1,75 @@ +#include "tap_dances.h" +#include "process_keycode/process_tap_dance.h" + +int cur_dance (qk_tap_dance_state_t *state) { + if (state->count == 1) { + if (state->interrupted || !state->pressed) return SINGLE_TAP; + else return SINGLE_HOLD; + } else if (state->count == 2) { + if (state->interrupted) return DOUBLE_SINGLE_TAP; + else if (state->pressed) return DOUBLE_HOLD; + else return DOUBLE_TAP; + } + if (state->count == 3) { + if (state->interrupted || !state->pressed) return TRIPLE_TAP; + else return TRIPLE_HOLD; + } + else return 8; +} + +__attribute__ ((weak)) +void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { }; + +#define ACTION_TAP_DANCE_TRIGGER_LAYER(trigger, layer) { \ + .fn = { NULL, td_trigger_layer_finished, td_trigger_layer_reset }, \ + .user_data = (void *)&((qk_tap_dance_trigger_layer_t) { trigger, layer, 0 }), \ +} + +typedef struct { + uint8_t trigger; + uint8_t layer; + uint8_t state; +} qk_tap_dance_trigger_layer_t; + +void td_trigger_layer_finished (qk_tap_dance_state_t *state, void *user_data) { + qk_tap_dance_trigger_layer_t *data = (qk_tap_dance_trigger_layer_t *)user_data; + data->state = cur_dance(state); + +#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) + if ((data->layer == _LIGHT) && ((data->trigger == SINGLE_HOLD && data->state == DOUBLE_TAP) || (data->trigger == DOUBLE_TAP && data->state == TRIPLE_TAP))) { + rgblight_toggle(); + } else if (data->state == data->trigger) { +#else + if (data->state == data->trigger) { +#endif + layer_on(data->layer); + } else { + process_tap_dance_keycode(false, data->layer); + } + +} +void td_trigger_layer_reset (qk_tap_dance_state_t *state, void *user_data) { + qk_tap_dance_trigger_layer_t *data = (qk_tap_dance_trigger_layer_t *)user_data; + if (data->state == data->trigger) { + switch (data->trigger) { + case SINGLE_HOLD: + case DOUBLE_HOLD: + case TRIPLE_HOLD: + layer_off(data->layer); + break; + } + } else { + process_tap_dance_keycode(true, data->layer); + } + data->state = 0; +} + +qk_tap_dance_action_t tap_dance_actions[] = { +#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) + [TD_SHLD_LGHT] = ACTION_TAP_DANCE_TRIGGER_LAYER(SINGLE_HOLD, _LIGHT), +#endif + [TD_SHLD_MAGC] = ACTION_TAP_DANCE_TRIGGER_LAYER(SINGLE_HOLD, _MAGIC), + [TD_DTAP_MAGC] = ACTION_TAP_DANCE_TRIGGER_LAYER(DOUBLE_TAP, _MAGIC), + [TD_REDR_H] = ACTION_TAP_DANCE_DOUBLE(KC_H, KC_R) +}; + diff --git a/users/brandonschlack/tap_dances.h b/users/brandonschlack/tap_dances.h new file mode 100644 index 000000000000..53db365a0522 --- /dev/null +++ b/users/brandonschlack/tap_dances.h @@ -0,0 +1,25 @@ +#pragma once +#include "brandonschlack.h" +#ifdef TAP_DANCE_ENABLE +# include "process_keycode/process_tap_dance.h" +#endif + +enum bs_dances { + TD_SHLD_LGHT, + TD_SHLD_MAGC, + TD_DTAP_MAGC, + TD_REDR_H +}; + +enum tap_dance_states { + SINGLE_TAP = 1, + SINGLE_HOLD = 2, + DOUBLE_TAP = 3, + DOUBLE_HOLD = 4, + DOUBLE_SINGLE_TAP = 5, + TRIPLE_TAP = 6, + TRIPLE_HOLD = 7 +}; + +int cur_dance (qk_tap_dance_state_t *state); +void process_tap_dance_keycode (bool reset, uint8_t toggle_layer); From c0ee60d0fc5bd91dfa4f48473f5c79ad37f38361 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 19 Jun 2019 11:15:10 -0700 Subject: [PATCH 096/429] [User] Add some macOS window keycode defines --- users/brandonschlack/process_records.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 897e7684b3dc..0b2adf108e3c 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -22,9 +22,6 @@ void matrix_scan_cmd_tab(void); #define HY_CAPS ALL_T(KC_CAPS) #define TG_MAGC TG(_MAGIC) // Media Mod-Tap -#define MM_LCTL LCTL_T(KC_MRWD) -#define MM_LALT LALT_T(KC_MPLY) -#define MM_LGUI LGUI_T(KC_MFFD) #define MM_RGUI RGUI_T(KC_MRWD) #define MM_RALT RALT_T(KC_MFFD) #define MM_FN_M LT(_MACFN, KC_MPLY) @@ -35,6 +32,11 @@ void matrix_scan_cmd_tab(void); #define MC_SLPD LCTL(LSFT(KC_POWER)) // Sleep Display #define MC_MSSN LCTL(KC_UP) // Mission Control #define MC_LHPD KC_F13 // Launchpad: Configure karabiner for F13 -> Launchpad +#define MC_CMTB LGUI(KC_TAB) // Basic CMD+TAB +#define CLS_TAB LGUI(KC_W) // Cmd+W: Closes Tab +#define REO_TAB LGUI(LSFT(KC_W)) // Shift+Cmd+T: Reopen Last Tab +#define NXT_TAB LCTL(KC_TAB) // Control+Tab: Next Tab +#define PRV_TAB LCTL(LSFT(KC_TAB)) // Shift+Control+Tab: Previous Tab #define MC_PLYR LGUI(KC_F8) // Focuses current Media Player // Reverse scrolling for using with macOS Natural Scrolling. #define MC_WH_U KC_WH_D From 5197deb74a31194f3feadae4f21eacfe20da96c4 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 19 Jun 2019 11:15:55 -0700 Subject: [PATCH 097/429] [Keymap] Remove unused animations from launchpad --- keyboards/launchpad/keymaps/brandonschlack/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/launchpad/keymaps/brandonschlack/config.h b/keyboards/launchpad/keymaps/brandonschlack/config.h index 3a16cf5b4ae4..3b19c178f316 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/config.h +++ b/keyboards/launchpad/keymaps/brandonschlack/config.h @@ -2,7 +2,7 @@ /* Underlight Configuration */ #define RGB_DI_PIN F4 -#define RGBLIGHT_ANIMATIONS +#define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation #define RGBLED_NUM 2 // Number of LEDs #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 From 0de5bc01b1b2ecc5a65447bf178fffba06e5d0b4 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 19 Jun 2019 11:16:20 -0700 Subject: [PATCH 098/429] [Keymap] Update to launchpad keymap --- keyboards/launchpad/keymaps/brandonschlack/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index 3ebe12810f07..9c75362c76e9 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-------------' */ [_NAVI] = LAYOUT( \ - S(G(KC_LBRC)), S(G(KC_RBRC)), \ + PRV_TAB, NXT_TAB, \ MC_WH_L, MC_WH_U, \ MC_WH_R, MC_WH_D, \ TD(TD_SHLD_LGHT), TD(TD_SHLD_MAGC) \ @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-------------' */ [_REEDER] = LAYOUT( \ - CMD_TAB, TD(TD_REDR_H), \ + MC_CMTB, TD(TD_REDR_H), \ KC_P, KC_K, \ KC_N, KC_J, \ TD(TD_SHLD_LGHT), TD(TD_SHLD_MAGC) \ @@ -134,7 +134,7 @@ void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { case _LIGHT: switch (biton32(layer_state)) { case _NAVI: - keycode = S(G(KC_T)); + keycode = REO_TAB; break; case _REEDER: keycode = KC_L; @@ -150,7 +150,7 @@ void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { case _MAGIC: switch (biton32(layer_state)) { case _NAVI: - keycode = G(KC_W); + keycode = CLS_TAB; break; case _REEDER: keycode = KC_S; From e9285d716b8755745000f48ec761e58a4c98ad49 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 19 Jun 2019 14:44:31 -0700 Subject: [PATCH 099/429] [User] Add RGBLIGHT_SLEEP to config --- users/brandonschlack/config.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/users/brandonschlack/config.h b/users/brandonschlack/config.h index e9f3ef475dc0..8e1515233aed 100644 --- a/users/brandonschlack/config.h +++ b/users/brandonschlack/config.h @@ -3,3 +3,7 @@ #define TAPPING_TOGGLE 2 #define TAPPING_TERM 200 #define PERMISSIVE_HOLD + +#ifdef RGBLIGHT_ENABLE +# define RGBLIGHT_SLEEP +#endif From 56e2718723d1dd0a2deb3b6eddaea66f7254a468 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 19 Jun 2019 18:02:52 -0700 Subject: [PATCH 100/429] [User] Fix REO_TAB define --- users/brandonschlack/process_records.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 0b2adf108e3c..e393c74bd351 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -34,7 +34,7 @@ void matrix_scan_cmd_tab(void); #define MC_LHPD KC_F13 // Launchpad: Configure karabiner for F13 -> Launchpad #define MC_CMTB LGUI(KC_TAB) // Basic CMD+TAB #define CLS_TAB LGUI(KC_W) // Cmd+W: Closes Tab -#define REO_TAB LGUI(LSFT(KC_W)) // Shift+Cmd+T: Reopen Last Tab +#define REO_TAB LSFT(LGUI(KC_T)) // Shift+Cmd+T: Reopen Last Tab #define NXT_TAB LCTL(KC_TAB) // Control+Tab: Next Tab #define PRV_TAB LCTL(LSFT(KC_TAB)) // Shift+Control+Tab: Previous Tab #define MC_PLYR LGUI(KC_F8) // Focuses current Media Player From 35142fe4a492a83e7fd3d437d72b353307008919 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 19 Jun 2019 18:05:42 -0700 Subject: [PATCH 101/429] [User] Move MC_UNDO, MC_REDO defines to userspace --- keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c | 7 +------ users/brandonschlack/process_records.h | 4 +++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 53bea918433d..70dbc03fb2ee 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -10,14 +10,9 @@ enum bdn9_layers { enum bdn9_keycodes { TG_LNAV = KEYMAP_SAFE_RANGE, TG_REVW, - TG_EDIT, - MC_UNDO, - MC_REDO + TG_EDIT }; -#define MC_UNDO LGUI(KC_Z) -#define MC_REDO LSFT(LGUI(KC_Z)) - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Layer: Navigation diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index e393c74bd351..784ac2e6a356 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -36,8 +36,10 @@ void matrix_scan_cmd_tab(void); #define CLS_TAB LGUI(KC_W) // Cmd+W: Closes Tab #define REO_TAB LSFT(LGUI(KC_T)) // Shift+Cmd+T: Reopen Last Tab #define NXT_TAB LCTL(KC_TAB) // Control+Tab: Next Tab -#define PRV_TAB LCTL(LSFT(KC_TAB)) // Shift+Control+Tab: Previous Tab +#define PRV_TAB LSFT(LCTL(KC_TAB)) // Shift+Control+Tab: Previous Tab #define MC_PLYR LGUI(KC_F8) // Focuses current Media Player +#define MC_UNDO LGUI(KC_Z) // Undo +#define MC_REDO LSFT(LGUI(KC_Z)) // Redo // Reverse scrolling for using with macOS Natural Scrolling. #define MC_WH_U KC_WH_D #define MC_WH_D KC_WH_U From b8a2e23f8826970c05c35ff10fb907f302e5b553 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 19 Jun 2019 18:06:53 -0700 Subject: [PATCH 102/429] [User] Shorten CMD+TAB timer --- keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c | 2 +- keyboards/launchpad/keymaps/brandonschlack/keymap.c | 2 +- users/brandonschlack/process_records.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 70dbc03fb2ee..5d50ad0e41f3 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_REEDER] = LAYOUT( KC_H, KC_S, KC_R, - G(KC_TAB), KC_M, KC_L, + CMD_TAB, KC_M, KC_L, G(KC_1), G(KC_2), TD(TD_DTAP_MAGC) ), /* diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index 9c75362c76e9..1fa242e24a80 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-------------' */ [_REEDER] = LAYOUT( \ - MC_CMTB, TD(TD_REDR_H), \ + CMD_TAB, TD(TD_REDR_H), \ KC_P, KC_K, \ KC_N, KC_J, \ TD(TD_SHLD_LGHT), TD(TD_SHLD_MAGC) \ diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index 665628db1326..852d34f717d7 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -98,7 +98,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { void matrix_scan_cmd_tab(void) { if (is_cmd_tab_active) { - if (timer_elapsed(cmd_tab_timer) > 1000) { + if (timer_elapsed(cmd_tab_timer) > 500) { unregister_code(KC_LGUI); is_cmd_tab_active = false; } From 6ee9959329c05e0a46863c7ad41f6b2304f9e63e Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 19 Jun 2019 18:12:25 -0700 Subject: [PATCH 103/429] [Keymap] Update BDN9 keymap --- .../bdn9/keymaps/brandonschlack/keymap.c | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 5d50ad0e41f3..5bc1378ee2ef 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -16,21 +16,21 @@ enum bdn9_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Layer: Navigation - | Knob 1: Scroll Up/Dn | | Knob 2: Shft+Cmd ]/[ | - | Press: XXX | CmTb | Cmd+W | + | Knob 1: Scroll Up/Dn | | Knob 2: Tab Prv/Nxt | + | Press: Reopen Tab | CmTb | Close Tab | | PgDn | Up | PgUp | | Left | Down | Right | */ [_NAVI] = LAYOUT( - XXXXXXX, CMD_TAB, G(KC_W), - KC_PGDN, KC_UP, KC_P6, + REO_TAB, CMD_TAB, CLS_TAB, + KC_PGDN, KC_UP, KC_PGUP, KC_LEFT, KC_DOWN, TD(TD_DTAP_MAGC) ), /* Layer: Reeder | Knob 1: j/k | | Knob 2: n/p | | Press: H | S | R | - | Cmd+Tab | M | L | + | CMD+TAB | M | L | | Cmd+1 | Cmd+2| Cmd+3 | */ [_REEDER] = LAYOUT( @@ -42,13 +42,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { Layer: Media | Knob 1: Vol +/- | | Knob 2: Track Prv/Nxt | | Press: Mute | Plyr | Press: Play/Pause | - | Home | Up | End | - | Left | Down | Right | + | J | K | L | + | Left | Spce | Right | */ [_MEDIA] = LAYOUT( KC_MUTE, MC_PLYR, KC_MPLY, - KC_HOME, KC_UP, KC_END, - KC_LEFT, KC_DOWN, TD(TD_DTAP_MAGC) + KC_J, KC_K, KC_L, + KC_LEFT, KC_SPC, TD(TD_DTAP_MAGC) ), /* Layer: Keypad/Karabiner @@ -119,9 +119,9 @@ void encoder_update_user(uint8_t index, bool clockwise) { switch (biton32(layer_state)) { case _NAVI: if (!clockwise) { - tap_code(KC_WH_U); + tap_code(MC_WH_D); } else { - tap_code(KC_WH_D); + tap_code(MC_WH_U); } break; case _REEDER: @@ -172,9 +172,9 @@ void encoder_update_user(uint8_t index, bool clockwise) { switch (biton32(layer_state)) { case _NAVI: if (!clockwise) { - tap_code16(S(G(KC_RBRC))); + tap_code16(NXT_TAB); } else { - tap_code16(S(G(KC_LBRC))); + tap_code16(PRV_TAB); } break; case _REEDER: From 2e3b8759fb07602b6ea7d9eb5470959d6df53ef1 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 20 Jun 2019 10:15:02 -0700 Subject: [PATCH 104/429] [Keymap] Add bootloader def to kbd75 for KC_MAKE --- keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk index 7702b0140ea9..890b397a9fe9 100644 --- a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk +++ b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk @@ -1,3 +1,6 @@ +# Add Bootloader define for KC_MAKE command +BOOTLOADER = atmel-dfu + # Build Options # comment out to disable the options. # From 1eae8960b60da4c88d8c2330bc802fedc0ce9077 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 20 Jun 2019 10:19:12 -0700 Subject: [PATCH 105/429] [User] Remove Windows layer from userspace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * I don’t work on any Windows computers, so maintaining OS switching isn’t worth it. --- .../hotswap/keymaps/brandonschlack/keymap.c | 53 ++---------------- .../kbd75/keymaps/brandonschlack/keymap.c | 4 +- .../alt/keymaps/brandonschlack/keymap.c | 54 ++----------------- users/brandonschlack/brandonschlack.h | 11 ---- users/brandonschlack/process_records.c | 13 +---- users/brandonschlack/process_records.h | 9 +--- users/brandonschlack/rgb_bs.c | 6 --- 7 files changed, 11 insertions(+), 139 deletions(-) diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index 14a370e2be71..af8cf86d16fd 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -31,12 +31,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `---------------------------------------------------------------' */ -/*********** - * MacOS * - ***********/ /* Base Layer: Mac * ,---------------------------------------------------------------. - * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| `| \|Hom| + * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| `|Hom| * |---------------------------------------------------------------| * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]|Backs|PgU| * |---------------------------------------------------------------| @@ -52,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, KC_PGUP, \ HY_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_PGDN, \ 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_UP, KC_END, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FN_M, KC_LEFT, KC_DOWN, KC_RGHT), + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT), /* Function Layer: Mac * ,---------------------------------------------------------------. * |MKE| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|LHP|MSN|SLP| @@ -73,48 +70,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, MC_PLYR, MM_RSFT, KC_PGUP, _______, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), -/*********** - * Windows * - ***********/ -/* Base Layer: Windows - * ,---------------------------------------------------------------. - * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| `| \|Hom| - * |---------------------------------------------------------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]|Backs|PgU| - * |---------------------------------------------------------------| - * |HyCaps| A| S| D| F| G| H| J| K| L| ;| '|Enter |PgD| - * |---------------------------------------------------------------| - * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |End| - * |---------------------------------------------------------------| - * |Ctl |Alt |Gui | Space |Gui |FnPy| |Lef|Dow|Rig| - * `---------------------------------------------------------------' - */ -[_WIN] = LAYOUT( - 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_HOME, \ - 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, KC_PGUP, \ - HY_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_PGDN, \ - 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_UP, KC_END, \ - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MM_FN_W, KC_LEFT, KC_DOWN, KC_RGHT), -/* Function Layer: Windows - * ,---------------------------------------------------------------. - * |MKE| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|TSK| |LCK| - * |---------------------------------------------------------------| - * | | | | |RST| | | | | |PtS|SLk|Pau| Del|VlU| - * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgMagic|VlD| - * |---------------------------------------------------------------| - * | | | | | | | | |Prv|Nxt|Stp|MutSft|PgU| | - * |---------------------------------------------------------------| - * | | | | | | | |Hom|PgD|End| - * `---------------------------------------------------------------' - */ -[_WINFN] = LAYOUT( - KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, WN_TSKM, _______, WN_LOCK, \ - _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_DEL, KC_VOLU, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLD, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MSTP, MM_RSFT, KC_PGUP, _______, \ - _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), - /*********** * Magic * ***********/ @@ -126,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | | | | | | | | | | TgMagic| | * |---------------------------------------------------------------| - * | | | | | | | | |Mac|Win| | | | | + * | | | | | | | | | | | | | | | * |---------------------------------------------------------------| * | | | | | | | | | | | * `---------------------------------------------------------------' @@ -135,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, OS_MAC, OS_WIN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX), }; diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c index 92e0c1e86f85..81086433b9fd 100644 --- a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_PGUP, HY_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_PGDN, KC_LSFT, XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, KC_SPC, XXXXXXX, MM_RGUI, MM_RALT, MM_FN_M, KC_LEFT, KC_DOWN, KC_RGHT + KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, KC_SPC, XXXXXXX, MM_RGUI, MM_RALT, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT ), /* Function Layer: Mac * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ @@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), - /* Function Layer: Mac + /* Keyboard Layer: Magic * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index 97e733905604..ee52d133e95e 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -16,9 +16,6 @@ enum alt_keycodes { keymap_config_t keymap_config; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /*********** - * MacOS * - ***********/ /* Base Layer: Mac * ,---------------------------------------------------------------. * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| Backs|Pwr| @@ -37,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_HOME, \ HY_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_PGUP, \ 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_UP, KC_PGDN, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FN_M, KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Function Layer: Mac * ,---------------------------------------------------------------. @@ -59,51 +56,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, RGB_TOG, _______, _______, _______, _______, _______, KC_MAKE, KC_MRWD, KC_MFFD, MC_PLYR, MM_RSFT, KC_PGUP, KC_VOLD, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), - - /*********** - * Windows * - ***********/ - /* Base Layer: Windows - * ,---------------------------------------------------------------. - * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| Backs|Del| - * |---------------------------------------------------------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \|Hom| - * |---------------------------------------------------------------| - * |HyCap | A| S| D| F| G| H| J| K| L| ;| '|Enter |PgU| - * |---------------------------------------------------------------| - * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |PgD| - * |---------------------------------------------------------------| - * |Ctl |Alt |Gui | Space |Gui |FnPy| |Lef|Dow|Rig| - * `---------------------------------------------------------------' - */ - [_WIN] = LAYOUT( - 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_DEL, \ - 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_HOME, \ - HY_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_PGUP, \ - 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_UP, KC_PGDN, \ - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MM_FN_W, KC_LEFT, KC_DOWN, KC_RGHT \ - ), - /* Function Layer: Windows - * ,---------------------------------------------------------------. - * | `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| Del|LCK| - * |---------------------------------------------------------------| - * | | | | |DFU| | | | | |PtS|SLk|Pau| TSK|End| - * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgMagic|VlU| - * |---------------------------------------------------------------| - * | |RTO| | | | | |MKE|Prv|Nxt|Stp|MutSft|PgU|VlD| - * |---------------------------------------------------------------| - * | | | | | | | |Hom|PgD|End| - * `---------------------------------------------------------------' - */ - [_WINFN] = LAYOUT( - 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, WN_LOCK, \ - _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, WN_TSKM, KC_END, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLU, \ - _______, RGB_TOG, _______, _______, _______, _______, _______, KC_MAKE, KC_MPRV, KC_MNXT, KC_MSTP, MM_RSFT, KC_PGUP, KC_VOLD, \ - _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ - ), - /*********** * Magic * ***********/ @@ -115,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | |RM-|RB-|RM+|RH-|RS-| | | | | | | TgMagic| | * |---------------------------------------------------------------| - * | |RTO| | | | |KRO| |Mac|Win| | | | | + * | |RTO| | | | |KRO| | | | | | | | * |---------------------------------------------------------------| * | | | | | | | | | | | * `---------------------------------------------------------------' @@ -124,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, XXXXXXX, U_T_AUTO,U_T_AGCR,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, \ - XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_NKRO, XXXXXXX, OS_MAC, OS_WIN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_NKRO, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), /* diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index a0375e24d6fa..09e03016e12f 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -15,8 +15,6 @@ enum bs_layers { _MAC = 0, _MACFN, - _WIN, - _WINFN }; #else enum macropad_layers { @@ -35,12 +33,3 @@ void suspend_power_down_keymap(void); void suspend_wakeup_init_keymap(void); void matrix_scan_keymap(void); layer_state_t layer_state_set_keymap (layer_state_t state); - -// typedef union { -// uint32_t raw; -// struct { -// uint8_t os_mode :4; -// }; -// } userspace_config_t; - -// extern userspace_config_t userspace_config; diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index 852d34f717d7..723d7c5078a8 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -59,18 +59,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { unregister_code(KC_TAB); } break; - case WN_SLPD: - tap_code16(G(KC_L)); - tap_code(KC_SYSTEM_POWER); - break; - #ifndef IS_MACROPAD - case OS_MAC: - set_single_persistent_default_layer(_MAC); - break; - case OS_WIN: - set_single_persistent_default_layer(_WIN); - break; - #else + #ifdef IS_MACROPAD case TG_NAVI: if (!record->event.pressed) { layer_move(_NAVI); diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 784ac2e6a356..2af9fb24b047 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -5,9 +5,6 @@ enum custom_keycodes { KC_MAKE = SAFE_RANGE, CMD_TAB, - WN_SLPD, - OS_MAC, - OS_WIN, TG_NAVI, TG_REDR, TG_MEDA, @@ -24,8 +21,7 @@ void matrix_scan_cmd_tab(void); // Media Mod-Tap #define MM_RGUI RGUI_T(KC_MRWD) #define MM_RALT RALT_T(KC_MFFD) -#define MM_FN_M LT(_MACFN, KC_MPLY) -#define MM_FN_W LT(_WINFN, KC_MPLY) +#define MM_FNPY LT(_MACFN, KC_MPLY) #define MM_RSFT RSFT_T(KC_MUTE) // MacOS #define MC_POWR KC_POWER // Mac Power alias @@ -45,6 +41,3 @@ void matrix_scan_cmd_tab(void); #define MC_WH_D KC_WH_U #define MC_WH_L KC_WH_R #define MC_WH_R KC_WH_L -// Windows -#define WN_LOCK LGUI(KC_L) // Lock Computer -#define WN_TSKM LCTL(LALT(KC_DEL)) // Task Manager (Ctrl+Alt+Del) diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index 9e93aa01f99c..a12a10ac4550 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -65,9 +65,6 @@ layer_state_t layer_state_set_rgb(layer_state_t state) { case _MACFN: rgb_layer_helper(HSV_PINK); break; - case _WINFN: - rgb_layer_helper(HSV_CYAN); - break; #else case _REEDER: rgb_layer_helper(HSV_PINK); @@ -88,9 +85,6 @@ layer_state_t layer_state_set_rgb(layer_state_t state) { case _MAC: rgb_layer_helper(HSV_PURPLE); break; - case _WIN: - rgb_layer_helper(HSV_BLUE); - break; #else case _NAVI: rgb_layer_helper(HSV_PURPLE); From 98185bfd92b29b5a95a07d6dbe926620deecded4 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 20 Jun 2019 14:46:25 -0700 Subject: [PATCH 106/429] [User] Add tap dances for RGB toggle, layer --- users/brandonschlack/tap_dances.c | 50 +++++++++++++++++++++++++++++++ users/brandonschlack/tap_dances.h | 7 +++++ 2 files changed, 57 insertions(+) diff --git a/users/brandonschlack/tap_dances.c b/users/brandonschlack/tap_dances.c index 332b63026322..11aadc606750 100644 --- a/users/brandonschlack/tap_dances.c +++ b/users/brandonschlack/tap_dances.c @@ -64,8 +64,58 @@ void td_trigger_layer_reset (qk_tap_dance_state_t *state, void *user_data) { data->state = 0; } +/* Tap Dance: Layer Mod. Toggles Layer when tapped, Mod when held. */ + +#define ACTION_TAP_DANCE_LAYER_MOD(layer, mod) { \ + .fn = { td_layer_mod_each, td_layer_mod_finished, td_layer_mod_reset }, \ + .user_data = (void *)&((qk_tap_dance_dual_role_t) { mod, layer }), \ +} + +void td_layer_mod_each(qk_tap_dance_state_t *state, void *user_data) { + qk_tap_dance_dual_role_t *data = (qk_tap_dance_dual_role_t *)user_data; + + // Single tap → toggle layer, Single hold → mod + if (state->pressed) { + register_code(data->kc); + } else if (state->count == 1) { + state->finished = true; + } +} + +void td_layer_mod_finished(qk_tap_dance_state_t *state, void *user_data) { + qk_tap_dance_dual_role_t *data = (qk_tap_dance_dual_role_t *)user_data; + + if (state->count == 1 && !state->pressed) { + layer_invert(data->layer); + } +} + +void td_layer_mod_reset(qk_tap_dance_state_t *state, void *user_data) { + qk_tap_dance_dual_role_t *data = (qk_tap_dance_dual_role_t *)user_data; + + if (state->count == 1) { + unregister_code(data->kc); + } +} + +/* Tap Dance: Esc,RGB. Single tap for Esc, Double Tap for RGB toggle. */ +void td_esc_rgb_switch(qk_tap_dance_state_t *state, void *user_data) { + switch (state->count) { + case 1: + tap_code(KC_ESC); + break; + case 2: + rgblight_toggle(); + break; + } + reset_tap_dance(state); +} + +/* Define Tap Dances */ qk_tap_dance_action_t tap_dance_actions[] = { #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) + [TD_LGHT_LSFT] = ACTION_TAP_DANCE_LAYER_MOD(_LIGHT, KC_LSFT), + [TD_ESC_RGBTG] = ACTION_TAP_DANCE_FN(td_esc_rgb_switch), [TD_SHLD_LGHT] = ACTION_TAP_DANCE_TRIGGER_LAYER(SINGLE_HOLD, _LIGHT), #endif [TD_SHLD_MAGC] = ACTION_TAP_DANCE_TRIGGER_LAYER(SINGLE_HOLD, _MAGIC), diff --git a/users/brandonschlack/tap_dances.h b/users/brandonschlack/tap_dances.h index 53db365a0522..f9a11b415fab 100644 --- a/users/brandonschlack/tap_dances.h +++ b/users/brandonschlack/tap_dances.h @@ -5,6 +5,8 @@ #endif enum bs_dances { + TD_LGHT_LSFT, + TD_ESC_RGBTG, TD_SHLD_LGHT, TD_SHLD_MAGC, TD_DTAP_MAGC, @@ -21,5 +23,10 @@ enum tap_dance_states { TRIPLE_HOLD = 7 }; +#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) +# define SFT_LGT TD(TD_LGHT_LSFT) +# define ESC_RTG TD(TD_ESC_RGBTG) +#endif + int cur_dance (qk_tap_dance_state_t *state); void process_tap_dance_keycode (bool reset, uint8_t toggle_layer); From fc2c4dd3c84a12ce478ffbe04da0633b460b8393 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 20 Jun 2019 14:54:31 -0700 Subject: [PATCH 107/429] [Keymap] Make modifiers trns on Magic layer --- .../kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c | 4 ++-- keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c | 4 ++-- keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index af8cf86d16fd..05a07e703719 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -90,8 +90,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX), + _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, \ + _______, _______, _______, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX), }; void matrix_init_user(void) { diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c index 81086433b9fd..74fde668b1dc 100644 --- a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c @@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, - XXXXXXX, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + _______, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, + _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX ), }; diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index ee52d133e95e..d58e5ad7a47f 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -76,8 +76,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, XXXXXXX, U_T_AUTO,U_T_AGCR,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, \ - XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_NKRO, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + _______, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_NKRO, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, \ + _______, _______, _______, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX \ ), /* [X] = LAYOUT( From 43845fc20537ec3a5dbd3e2eb1f09126dda4d606 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 20 Jun 2019 15:37:35 -0700 Subject: [PATCH 108/429] [User] Move KC_MAKE to function --- users/brandonschlack/process_records.c | 63 +++++++++++++++----------- users/brandonschlack/process_records.h | 2 + 2 files changed, 38 insertions(+), 27 deletions(-) diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index 723d7c5078a8..5acd7333a867 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -11,40 +11,24 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case KC_MAKE: // Compiles the firmware, and adds the flash command based on keyboard bootloader + case KC_MAKE: if (!record->event.pressed) { + bool flash = false; + + #if !defined(FLASH_BOOTLOADER) && !defined(IS_MACROPAD) uint8_t temp_mod = get_mods(); uint8_t temp_osm = get_oneshot_mods(); - clear_mods(); clear_oneshot_mods(); - SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP); - - #if !defined(FLASH_BOOTLOADER) && !defined(IS_MACROPAD) - if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT ) - #endif - { // - #if defined(BOOTLOADER_MDLOADER) // only run for Massdrop boards - SEND_STRING(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP); - #elif defined(__arm__) // only run for ARM boards - SEND_STRING(":dfu-util"); - #elif defined(BOOTLOADER_DFU) // only run for DFU boards - SEND_STRING(":dfu"); - #elif defined(BOOTLOADER_HALFKAY) // only run for teensy boards - SEND_STRING(":teensy"); - #elif defined(BOOTLOADER_CATERINA) // only run for Pro Micros - SEND_STRING(":avrdude"); - #endif // bootloader options - } - if ( (temp_mod | temp_osm) & MOD_MASK_CTRL) { - SEND_STRING(" -j8 --output-sync"); - } - SEND_STRING(SS_TAP(X_ENTER)); - #if !defined(FLASH_BOOTLOADER) && !defined(IS_MACROPAD) + clear_mods(); + clear_oneshot_mods(); if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT ) - #endif + #endif { - reset_keyboard(); + flash = true; } + send_make_command(flash); + #if !defined(FLASH_BOOTLOADER) && !defined(IS_MACROPAD) set_mods(temp_mod); + #endif } break; case CMD_TAB: @@ -93,3 +77,28 @@ void matrix_scan_cmd_tab(void) { } } } + +/** Send Make Command + * adds flash target and resets keyboard if flash_bootloader + * set to true + */ +void send_make_command(bool flash_bootloader) { + SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP); + if (flash_bootloader) { +#if defined(BOOTLOADER_MDLOADER) // only run for Massdrop boards + SEND_STRING(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP); +#elif defined(__arm__) // only run for ARM boards + SEND_STRING(":dfu-util"); +#elif defined(BOOTLOADER_DFU) // only run for DFU boards + SEND_STRING(":dfu"); +#elif defined(BOOTLOADER_HALFKAY) // only run for teensy boards + SEND_STRING(":teensy"); +#elif defined(BOOTLOADER_CATERINA) // only run for Pro Micros + SEND_STRING(":avrdude"); +#endif // bootloader options + } + SEND_STRING(SS_TAP(X_ENTER)); + if (flash_bootloader) { + reset_keyboard(); + } +} diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 2af9fb24b047..e0bb069b3719 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -41,3 +41,5 @@ void matrix_scan_cmd_tab(void); #define MC_WH_D KC_WH_U #define MC_WH_L KC_WH_R #define MC_WH_R KC_WH_L + +void send_make_command(bool flash_bootloader); From f1305846f3d2650e2ff88998ae7ba772b0127e81 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 20 Jun 2019 16:19:30 -0700 Subject: [PATCH 109/429] [User] Add Mac Sleep define --- users/brandonschlack/process_records.h | 1 + 1 file changed, 1 insertion(+) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index e0bb069b3719..9872fcf78718 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -25,6 +25,7 @@ void matrix_scan_cmd_tab(void); #define MM_RSFT RSFT_T(KC_MUTE) // MacOS #define MC_POWR KC_POWER // Mac Power alias +#define MC_SLEP LALT(LGUI(KC_POWER)) // Mac Sleep #define MC_SLPD LCTL(LSFT(KC_POWER)) // Sleep Display #define MC_MSSN LCTL(KC_UP) // Mission Control #define MC_LHPD KC_F13 // Launchpad: Configure karabiner for F13 -> Launchpad From fdc5b00ed38e6e6863fe7291fda41ca5c6b0ccea Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 21 Jun 2019 11:50:22 -0700 Subject: [PATCH 110/429] [User] Add check for rgb enable for tap dance esc --- users/brandonschlack/tap_dances.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/users/brandonschlack/tap_dances.c b/users/brandonschlack/tap_dances.c index 11aadc606750..58b230f495fe 100644 --- a/users/brandonschlack/tap_dances.c +++ b/users/brandonschlack/tap_dances.c @@ -98,6 +98,7 @@ void td_layer_mod_reset(qk_tap_dance_state_t *state, void *user_data) { } } +#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) /* Tap Dance: Esc,RGB. Single tap for Esc, Double Tap for RGB toggle. */ void td_esc_rgb_switch(qk_tap_dance_state_t *state, void *user_data) { switch (state->count) { @@ -110,6 +111,7 @@ void td_esc_rgb_switch(qk_tap_dance_state_t *state, void *user_data) { } reset_tap_dance(state); } +#endif /* Define Tap Dances */ qk_tap_dance_action_t tap_dance_actions[] = { From 69b12ee8931d8daf1f72f2267036c94e6bdcca56 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 21 Jun 2019 13:52:41 -0700 Subject: [PATCH 111/429] [User] Implement rgb themes in userspace * Create definitions for theme colors around Laser and Granite keysets * Define theme used in keymap rules.mk --- .../kbd75/keymaps/brandonschlack/rules.mk | 3 ++ .../launchpad/keymaps/brandonschlack/rules.mk | 3 ++ .../alt/keymaps/brandonschlack/rules.mk | 3 ++ users/brandonschlack/colors_bs.h | 15 ------ users/brandonschlack/rgb_bs.c | 14 +++--- users/brandonschlack/rgb_bs.h | 2 +- users/brandonschlack/rgb_theme.h | 48 +++++++++++++++++++ users/brandonschlack/rules.mk | 8 ++++ 8 files changed, 73 insertions(+), 23 deletions(-) delete mode 100644 users/brandonschlack/colors_bs.h create mode 100644 users/brandonschlack/rgb_theme.h diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk index 890b397a9fe9..06183dccec2e 100644 --- a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk +++ b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk @@ -6,3 +6,6 @@ BOOTLOADER = atmel-dfu # MOUSEKEY_ENABLE = no # Don't need Mouse Keys BACKLIGHT_ENABLE = no # No backlights installed + +# Userspace Options +RGB_THEME = granite # Set RGB colors to Granite Theme diff --git a/keyboards/launchpad/keymaps/brandonschlack/rules.mk b/keyboards/launchpad/keymaps/brandonschlack/rules.mk index 4a811340b967..113802891a24 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/rules.mk +++ b/keyboards/launchpad/keymaps/brandonschlack/rules.mk @@ -9,3 +9,6 @@ RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. MOUSEKEY_ENABLE = yes # Use mouse keys for scrolling. COMMAND_ENABLE = no # Disable Command, breaks with Mouse Keys set to constant. TAP_DANCE_ENABLE = yes # Use tap dance + +# Userspace Options +RGB_THEME = granite # Set RGB colors to Granite Theme diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk b/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk index c12d998b005e..3abb9b657897 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk @@ -1,2 +1,5 @@ # Use mdloader for flashing BOOTLOADER = mdloader + +# Userspace Options +RGB_THEME = laser # Set RGB colors to Laser theme diff --git a/users/brandonschlack/colors_bs.h b/users/brandonschlack/colors_bs.h deleted file mode 100644 index 1fbd031ae7b9..000000000000 --- a/users/brandonschlack/colors_bs.h +++ /dev/null @@ -1,15 +0,0 @@ -#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) -// RGB Colors -#define RGB_LSR_PURPLE 0x3C, 0x16, 0x8C -#define RGB_LSR_PINK 0xF2, 0x1B, 0x7F -#define RGB_LSR_INDIGO 0x23, 0x1B, 0x59 -#define RGB_LSR_CYAN 0x2F, 0xC1, 0xE1 -#define RGB_LSR_VIOLET 0x53, 0x36, 0xBF - -// HSV Colors -#define HSV_LSR_PURPLE HSV_PURPLE -#define HSV_LSR_PINK HSV_PINK -#define HSV_LSR_BLUE HSV_BLUE -#define HSV_LSR_CYAN HSV_CYAN -#define HSV_LSR_MAGENTA HSV_MAGENTA -#endif diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index a12a10ac4550..7fb262c36315 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -63,31 +63,31 @@ layer_state_t layer_state_set_rgb(layer_state_t state) { switch (biton32(state)) { #ifndef IS_MACROPAD case _MACFN: - rgb_layer_helper(HSV_PINK); + rgb_layer_helper(HSV_THEME_1); break; #else case _REEDER: - rgb_layer_helper(HSV_PINK); + rgb_layer_helper(HSV_THEME_1); break; case _MEDIA: - rgb_layer_helper(HSV_BLUE); + rgb_layer_helper(HSV_THEME_2); break; case _KEYPAD: - rgb_layer_helper(HSV_CYAN); + rgb_layer_helper(HSV_THEME_3); break; #endif case _MAGIC: - rgb_layer_helper(HSV_GREEN); + rgb_layer_helper(HSV_THEME_M); break; default: switch (biton32(default_layer_state)) { #ifndef IS_MACROPAD case _MAC: - rgb_layer_helper(HSV_PURPLE); + rgb_layer_helper(HSV_THEME_0); break; #else case _NAVI: - rgb_layer_helper(HSV_PURPLE); + rgb_layer_helper(HSV_THEME_0); break; #endif } diff --git a/users/brandonschlack/rgb_bs.h b/users/brandonschlack/rgb_bs.h index 9fa9f33e7824..2e70bee0caea 100644 --- a/users/brandonschlack/rgb_bs.h +++ b/users/brandonschlack/rgb_bs.h @@ -1,6 +1,6 @@ #pragma once #include "quantum.h" -#include "colors_bs.h" +#include "rgb_theme.h" #ifdef RGB_MATRIX_ENABLE # include "rgb_matrix.h" #endif diff --git a/users/brandonschlack/rgb_theme.h b/users/brandonschlack/rgb_theme.h new file mode 100644 index 000000000000..dfbc817a12eb --- /dev/null +++ b/users/brandonschlack/rgb_theme.h @@ -0,0 +1,48 @@ +#include "color.h" +#include "rgblight_list.h" + +#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) + +// Laser Colors +#define HSV_LSR_PURPLE HSV_PURPLE +#define HSV_LSR_PINK HSV_PINK +#define HSV_LSR_BLUE HSV_BLUE +#define HSV_LSR_CYAN HSV_CYAN +#define HSV_LSR_MAGENTA HSV_MAGENTA + +// Granite Colors +#define HSV_GNT_BLUE HSV_BLUE +#define HSV_GNT_RED HSV_RED +#define HSV_GNT_GREEN HSV_GREEN +#define HSV_GNT_YELLOW HSV_YELLOW +#define HSV_GNT_WHITE HSV_WHITE + +// Theme Colors +#if defined(THEME_LASER) +# define HSV_THEME_0 HSV_LSR_PURPLE +# define HSV_THEME_1 HSV_LSR_PINK +# define HSV_THEME_2 HSV_LSR_BLUE +# define HSV_THEME_3 HSV_LSR_CYAN +#elif defined(THEME_GRANITE) +# define HSV_THEME_0 HSV_GNT_WHITE +# define HSV_THEME_1 HSV_GNT_BLUE +# define HSV_THEME_2 HSV_GNT_RED +# define HSV_THEME_3 HSV_GNT_YELLOW +#else +# define HSV_THEME_0 HSV_LSR_PURPLE +# define HSV_THEME_1 HSV_LSR_PINK +# define HSV_THEME_2 HSV_LSR_BLUE +# define HSV_THEME_3 HSV_LSR_CYAN +#endif + +// Set Color for Light Layer +#if !defined(HSV_THEME_L) && defined(HSV_THEME_0) +# define HSV_THEME_L HSV_THEME_0 +#else +# define HSV_THEME_L HSV_CORAL +#endif +// Set Color for Magic Layer +#if !defined(HSV_THEME_M) +# define HSV_THEME_M HSV_SPRINGGREEN +#endif +#endif diff --git a/users/brandonschlack/rules.mk b/users/brandonschlack/rules.mk index cea1e900bf24..2f735e3c2613 100644 --- a/users/brandonschlack/rules.mk +++ b/users/brandonschlack/rules.mk @@ -26,6 +26,14 @@ ifneq ($(strip $(RGB_MATRIX_ENABLE)), no) SRC += rgb_bs.c endif +ifdef RGB_THEME + ifeq ($(strip $(RGB_THEME)), laser) + OPT_DEFS += -DTHEME_LASER + else ifeq ($(strip $(RGB_THEME)), granite) + OPT_DEFS += -DTHEME_GRANITE + endif +endif + ifeq ($(strip $(FLASH_BOOTLOADER)), yes) OPT_DEFS += -DFLASH_BOOTLOADER endif From c608fe97a0094b2611fdf1a6b49a9145d1efb250 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 21 Jun 2019 14:16:04 -0700 Subject: [PATCH 112/429] [User] Correctly enable LTO in userspace --- .../alt/keymaps/brandonschlack/config.h | 4 ---- users/brandonschlack/rules.mk | 19 +++++++------------ 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/config.h b/keyboards/massdrop/alt/keymaps/brandonschlack/config.h index 73534dbb7d0a..72d4120640be 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/config.h +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/config.h @@ -47,10 +47,6 @@ #define USB_LED_CAPS_LOCK_SCANCODE 30 -// Speed -#define NO_ACTION_MACRO -#define NO_ACTION_FUNCTION - #ifndef NO_DEBUG #define NO_DEBUG #endif // !NO_DEBUG diff --git a/users/brandonschlack/rules.mk b/users/brandonschlack/rules.mk index 2f735e3c2613..59ae1966d5ed 100644 --- a/users/brandonschlack/rules.mk +++ b/users/brandonschlack/rules.mk @@ -1,20 +1,14 @@ SRC += brandonschlack.c \ process_records.c -ifeq ($(strip $(TAP_DANCE_ENABLE)), yes) - SRC += tap_dances.c -endif +LINK_TIME_OPTIMIZATION_ENABLE = yes ifeq ($(strip $(BOOTLOADER)), mdloader) OPT_DEFS += -DBOOTLOADER_MDLOADER - DISABLE_LTO = yes endif -ifneq ($(strip $(DISABLE_LTO)), yes) - EXTRAFLAGS += -flto - OPT_DEFS += -DLINK_TIME_OPTIMIZATION_ENABLE - OPT_DEFS += -DNO_ACTION_MACRO - OPT_DEFS += -DNO_ACTION_FUNCTION +ifeq ($(strip $(IS_MACROPAD)), yes) + OPT_DEFS += -DIS_MACROPAD endif ifeq ($(strip $(RGBLIGHT_ENABLE)), yes) @@ -34,10 +28,11 @@ ifdef RGB_THEME endif endif +ifeq ($(strip $(TAP_DANCE_ENABLE)), yes) + SRC += tap_dances.c +endif + ifeq ($(strip $(FLASH_BOOTLOADER)), yes) OPT_DEFS += -DFLASH_BOOTLOADER endif -ifeq ($(strip $(IS_MACROPAD)), yes) - OPT_DEFS += -DIS_MACROPAD -endif From 858bdb9704f9cd4419bcdc5fa5305cd88f2b21fb Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Mon, 24 Jun 2019 10:26:05 -0700 Subject: [PATCH 113/429] [User] Fix user LTO Enable for Massdrop ALT again --- keyboards/massdrop/alt/keymaps/brandonschlack/config.h | 2 ++ users/brandonschlack/rules.mk | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/config.h b/keyboards/massdrop/alt/keymaps/brandonschlack/config.h index 72d4120640be..7bf0d8b7c79a 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/config.h +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/config.h @@ -46,6 +46,8 @@ #undef USB_LED_INDICATOR_ENABLE #define USB_LED_CAPS_LOCK_SCANCODE 30 +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION #ifndef NO_DEBUG #define NO_DEBUG diff --git a/users/brandonschlack/rules.mk b/users/brandonschlack/rules.mk index 59ae1966d5ed..bbf213f40d41 100644 --- a/users/brandonschlack/rules.mk +++ b/users/brandonschlack/rules.mk @@ -1,10 +1,10 @@ SRC += brandonschlack.c \ process_records.c -LINK_TIME_OPTIMIZATION_ENABLE = yes - ifeq ($(strip $(BOOTLOADER)), mdloader) OPT_DEFS += -DBOOTLOADER_MDLOADER +else + LINK_TIME_OPTIMIZATION_ENABLE = yes endif ifeq ($(strip $(IS_MACROPAD)), yes) From de2fd01f65866d2823aa32c0387e222c3a11ccce Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 24 Jun 2019 11:55:39 -0700 Subject: [PATCH 114/429] [User] Add DTAP_LIGHT tap dance to userspace --- users/brandonschlack/tap_dances.c | 1 + users/brandonschlack/tap_dances.h | 3 +++ 2 files changed, 4 insertions(+) diff --git a/users/brandonschlack/tap_dances.c b/users/brandonschlack/tap_dances.c index 58b230f495fe..72985dcfe94e 100644 --- a/users/brandonschlack/tap_dances.c +++ b/users/brandonschlack/tap_dances.c @@ -118,6 +118,7 @@ qk_tap_dance_action_t tap_dance_actions[] = { #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) [TD_LGHT_LSFT] = ACTION_TAP_DANCE_LAYER_MOD(_LIGHT, KC_LSFT), [TD_ESC_RGBTG] = ACTION_TAP_DANCE_FN(td_esc_rgb_switch), + [TD_DTAP_LGHT] = ACTION_TAP_DANCE_TRIGGER_LAYER(DOUBLE_TAP, _LIGHT), [TD_SHLD_LGHT] = ACTION_TAP_DANCE_TRIGGER_LAYER(SINGLE_HOLD, _LIGHT), #endif [TD_SHLD_MAGC] = ACTION_TAP_DANCE_TRIGGER_LAYER(SINGLE_HOLD, _MAGIC), diff --git a/users/brandonschlack/tap_dances.h b/users/brandonschlack/tap_dances.h index f9a11b415fab..ff04316709db 100644 --- a/users/brandonschlack/tap_dances.h +++ b/users/brandonschlack/tap_dances.h @@ -8,6 +8,7 @@ enum bs_dances { TD_LGHT_LSFT, TD_ESC_RGBTG, TD_SHLD_LGHT, + TD_DTAP_LGHT, TD_SHLD_MAGC, TD_DTAP_MAGC, TD_REDR_H @@ -24,9 +25,11 @@ enum tap_dance_states { }; #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) +# define DTP_LGT TD(TD_DTAP_LGHT) # define SFT_LGT TD(TD_LGHT_LSFT) # define ESC_RTG TD(TD_ESC_RGBTG) #endif +#define DTP_MGC TD(TD_DTAP_MAGC) int cur_dance (qk_tap_dance_state_t *state); void process_tap_dance_keycode (bool reset, uint8_t toggle_layer); From dab11972d32946f6ad21e10ad5bb7b7dcd68e409 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 24 Jun 2019 11:55:59 -0700 Subject: [PATCH 115/429] [Keymap] Add RGBLIGHT to bdn9 keymap --- .../bdn9/keymaps/brandonschlack/config.h | 3 + .../bdn9/keymaps/brandonschlack/keymap.c | 83 +++++++++++++++---- .../bdn9/keymaps/brandonschlack/rules.mk | 1 - 3 files changed, 70 insertions(+), 17 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h index 243733673ed7..843d55b64944 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h @@ -1,5 +1,8 @@ #pragma once +#undef RGBLIGHT_ANIMATIONS +#define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation + /* Mouse Keys Configuration */ #define MK_3_SPEED #define MK_W_INTERVAL_UNMOD 20 diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 5bc1378ee2ef..eac035e8111b 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -10,7 +10,8 @@ enum bdn9_layers { enum bdn9_keycodes { TG_LNAV = KEYMAP_SAFE_RANGE, TG_REVW, - TG_EDIT + TG_EDIT, + TG_LGHT }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -23,8 +24,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_NAVI] = LAYOUT( REO_TAB, CMD_TAB, CLS_TAB, - KC_PGDN, KC_UP, KC_PGUP, - KC_LEFT, KC_DOWN, TD(TD_DTAP_MAGC) + KC_PGDN, KC_UP, DTP_LGT, + KC_LEFT, KC_DOWN, DTP_MGC ), /* Layer: Reeder @@ -35,8 +36,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_REEDER] = LAYOUT( KC_H, KC_S, KC_R, - CMD_TAB, KC_M, KC_L, - G(KC_1), G(KC_2), TD(TD_DTAP_MAGC) + CMD_TAB, KC_M, DTP_LGT, + G(KC_1), G(KC_2), DTP_MGC ), /* Layer: Media @@ -47,8 +48,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_MEDIA] = LAYOUT( KC_MUTE, MC_PLYR, KC_MPLY, - KC_J, KC_K, KC_L, - KC_LEFT, KC_SPC, TD(TD_DTAP_MAGC) + KC_J, KC_K, DTP_LGT, + KC_LEFT, KC_SPC, DTP_MGC ), /* Layer: Keypad/Karabiner @@ -59,8 +60,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_KEYPAD] = LAYOUT( KC_P1, KC_P2, KC_P3, - KC_P4, KC_P5, KC_P6, - KC_P7, KC_P8, TD(TD_DTAP_MAGC) + KC_P4, KC_P5, DTP_LGT, + KC_P7, KC_P8, DTP_MGC ), /* Layer: Navigation @@ -71,8 +72,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LR_NAV] = LAYOUT( TG_REVW, KC_J, TG_EDIT, - KC_HOME, KC_UP, KC_END, - KC_LEFT, KC_DOWN, TD(TD_DTAP_MAGC) + KC_HOME, KC_UP, DTP_LGT, + KC_LEFT, KC_DOWN, DTP_MGC ), /* Layer: Review/Rate @@ -83,8 +84,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LR_REVIEW] = LAYOUT( TG_LNAV, KC_7, TG_EDIT, - KC_0, KC_8, KC_U, - KC_LEFT, KC_6, TD(TD_DTAP_MAGC) + KC_0, KC_8, DTP_LGT, + KC_LEFT, KC_6, DTP_MGC ), /* Layer: Edit/Develop @@ -95,8 +96,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LR_EDIT] = LAYOUT( TG_REVW, KC_BSLS, TG_LNAV, - KC_X, MC_UNDO, KC_P, - KC_LEFT, MC_REDO, TD(TD_DTAP_MAGC) + KC_X, MC_UNDO, DTP_LGT, + KC_LEFT, MC_REDO, DTP_MGC + ), + /* + Layer: Light + | RGB Toggle | Nav | RESET | + | Reeder | Meda | Keypad | + | Review | LNav | Edit | + */ + [_LIGHT] = LAYOUT( + RGB_TOG, RGB_VAI, TG_LGHT, + RGB_RMOD,RGB_VAD, RGB_MOD, + RGB_M_P, RGB_M_B, XXXXXXX ), /* Layer: Magic @@ -105,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | Review | LNav | Edit | */ [_MAGIC] = LAYOUT( - KC_MAKE, TG_NAVI, RESET, + KC_MAKE, TG_NAVI, TG_LGHT, TG_REDR, TG_MEDA, TG_KYPD, TG_REVW, TG_LNAV, TG_EDIT ), @@ -166,6 +178,13 @@ void encoder_update_user(uint8_t index, bool clockwise) { tap_code(KC_COMM); } break; + case _LIGHT: + if (!clockwise) { + rgblight_increase_hue(); + } else { + rgblight_decrease_hue(); + } + break; } } else if (index == 1) { @@ -219,6 +238,13 @@ void encoder_update_user(uint8_t index, bool clockwise) { tap_code(KC_MINS); } break; + case _LIGHT: + if (!clockwise) { + rgblight_increase_sat(); + } else { + rgblight_decrease_sat(); + } + break; } } } @@ -246,6 +272,11 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { layer_move(_LR_EDIT); } break; + case TG_LGHT: + if (!record->event.pressed) { + layer_invert(_LIGHT); + } + break; } return true; } @@ -256,6 +287,26 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { uint16_t keycode = 0; switch (toggle_layer) { + case _LIGHT: + switch (biton32(layer_state)) { + case _NAVI: + keycode = KC_PGUP; + case _REEDER: + case _MEDIA: + keycode = KC_L; + break; + case _KEYPAD: + keycode = KC_P6; + break; + case _LR_NAV: + keycode = KC_END; + case _LR_REVIEW: + keycode = KC_U; + case _LR_EDIT: + keycode = KC_P; + break; + } + break; case _MAGIC: switch (biton32(layer_state)) { case _NAVI: diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk index c5a3af865f73..666348d18208 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk @@ -8,5 +8,4 @@ BOOTLOADER = atmel-dfu MOUSEKEY_ENABLE = yes # Mouse keys(+4700) COMMAND_ENABLE = no # Disable Command, breaks with Mouse Keys set to constant. BACKLIGHT_ENABLE = no # No backlights installed -RGBLIGHT_ENABLE = no # No RGBs installed TAP_DANCE_ENABLE = yes # Use tap dance From 877c755f6c29dad3d118684ad0b93f73d88e8697 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 24 Jun 2019 12:17:11 -0700 Subject: [PATCH 116/429] [Keymap] Add colors for LR layers on BDN9 --- .../keebio/bdn9/keymaps/brandonschlack/keymap.c | 17 +++++++++++++++++ .../keebio/bdn9/keymaps/brandonschlack/rules.mk | 3 +++ 2 files changed, 20 insertions(+) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index eac035e8111b..340de39b2c5e 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -281,6 +281,23 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true; } +/** + * Layer Switch + */ +layer_state_t layer_state_set_keymap (layer_state_t state) { + switch (biton32(state)) { + case _LR_NAV: + rgb_layer_helper(HSV_TEAL); + break; + case _LR_REVIEW: + rgb_layer_helper(HSV_CYAN); + break; + case _LR_EDIT: + rgb_layer_helper(HSV_AZURE); + break; + } +} + /** * Tap Dances */ diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk index 666348d18208..79971a83eb87 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk @@ -9,3 +9,6 @@ MOUSEKEY_ENABLE = yes # Mouse keys(+4700) COMMAND_ENABLE = no # Disable Command, breaks with Mouse Keys set to constant. BACKLIGHT_ENABLE = no # No backlights installed TAP_DANCE_ENABLE = yes # Use tap dance + +# Userspace Options +RGB_THEME = granite # Set RGB colors to Granite Theme From 0ba90388b6b98a3c1ad939e6b12391e8f24a5252 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 24 Jun 2019 17:55:10 -0700 Subject: [PATCH 117/429] [User] Change mission control define --- users/brandonschlack/process_records.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 9872fcf78718..97dce7860c39 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -27,7 +27,7 @@ void matrix_scan_cmd_tab(void); #define MC_POWR KC_POWER // Mac Power alias #define MC_SLEP LALT(LGUI(KC_POWER)) // Mac Sleep #define MC_SLPD LCTL(LSFT(KC_POWER)) // Sleep Display -#define MC_MSSN LCTL(KC_UP) // Mission Control +#define MC_MSSN KC_F16 // Mission Control: Configure karabiner for F16 -> mission_control #define MC_LHPD KC_F13 // Launchpad: Configure karabiner for F13 -> Launchpad #define MC_CMTB LGUI(KC_TAB) // Basic CMD+TAB #define CLS_TAB LGUI(KC_W) // Cmd+W: Closes Tab From 8cf172047b893c8478cce6b4e111159400caba3d Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Tue, 25 Jun 2019 09:58:36 -0700 Subject: [PATCH 118/429] [Keymap] Fix layer_state_set_keymap --- keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 340de39b2c5e..58b0512a4c9f 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -296,6 +296,7 @@ layer_state_t layer_state_set_keymap (layer_state_t state) { rgb_layer_helper(HSV_AZURE); break; } + return state; } /** From 5329ff941fd87d01d13b15d34f8f911d3676c057 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 25 Jul 2019 12:08:57 -0700 Subject: [PATCH 119/429] [Keymap] Update BDN9 readme * Fix typo in BDN9 keymap. * Update and format readme --- .../bdn9/keymaps/brandonschlack/keymap.c | 16 +++-- .../bdn9/keymaps/brandonschlack/readme.md | 65 +++++++++++-------- 2 files changed, 48 insertions(+), 33 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 58b0512a4c9f..a144ea7c45d5 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -17,7 +17,7 @@ enum bdn9_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Layer: Navigation - | Knob 1: Scroll Up/Dn | | Knob 2: Tab Prv/Nxt | + | Knob 1: Scroll Dn/Up | | Knob 2: Tab Nxt/Prv | | Press: Reopen Tab | CmTb | Close Tab | | PgDn | Up | PgUp | | Left | Down | Right | @@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Layer: Media - | Knob 1: Vol +/- | | Knob 2: Track Prv/Nxt | + | Knob 1: Vol +/- | | Knob 2: Track Nxt/Prv | | Press: Mute | Plyr | Press: Play/Pause | | J | K | L | | Left | Spce | Right | @@ -64,8 +64,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P7, KC_P8, DTP_MGC ), /* - Layer: Navigation - | Knob 1: =/- | | Knob 2: Page Dn/Up | + Layer: Lightroom Navigation + | Knob 1: =/- | | Knob 2: Page Up/Dn | | Press: Review | J | Press: Edit | | Home, Hold: BD Layer | Up | End | | Left | Down | Right | @@ -101,9 +101,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Layer: Light - | RGB Toggle | Nav | RESET | - | Reeder | Meda | Keypad | - | Review | LNav | Edit | + | Knob 1: Hue +/- | | Knob 2: Sat +/- | + | RGB Toggle | Val+ | Toggle Layer | + | RGB Mode Prev | Val- | RGB Mode Next | + | RGB Plain | Brth | XXX | */ [_LIGHT] = LAYOUT( RGB_TOG, RGB_VAI, TG_LGHT, @@ -309,6 +310,7 @@ void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { switch (biton32(layer_state)) { case _NAVI: keycode = KC_PGUP; + break; case _REEDER: case _MEDIA: keycode = KC_L; diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md index b3faaa2952c3..9405da466abd 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md @@ -1,75 +1,88 @@ # brandonschlack's Macropad/Lightroom layout for BDN9 ##### 2 encoders required + +![brandonschlack BDN9](https://i.imgur.com/pai9M0m.jpg) + I built this pad to match my Lightroom photo editing workflow using [Lightroom Classic Keyboard shortcuts](https://helpx.adobe.com/lightroom-classic/help/keyboard-shortcuts.html), and added on general macropad layers along the way. +I use macOS, so shortcuts and macros are configured as such. Encoder functionality is in the header of the tables, as clockwise/counterclockwise. + ## Navigation Layer This layer is used for general window navigation around macOS -| | | | -|:-:|:-:|:-:| -| Scroll Up/Down
**NA** | Command+Tab | Next/Prev Tab
**Close Tab** | +| Scroll Up/Down | **Knobs** | Next/Prev Tab | +| --- | --- | --- | +| Reopen Tab | Cmd+Tab | Close Tab | | Page Down | Up | Page Up | | Left | Down | Right| --- ## Reeder Layer -This layer is used for browsing [Reeder](https://reederapp.com/), and awesome RSS reader for Mac -| | | | -|:-:|:-:|:-:| -| Next/Prev Item
**Open Item in Browser** | Star Item/Save for Later | Next/Prev Subscription
**Sync** | +This layer is used for browsing [Reeder](https://reederapp.com/), an awesome RSS reader for Mac +| Prev/Next Item | **Knobs** | Prev/Next Subscription | +| --- | --- | --- | +| Open Item in Browser | Star Item/Save for Later | Sync | | Command+Tab | Toggle Read Status | Clear Read Items | | Starred Items | Unread Items | All Items | --- ## Media Layer This layer is used for media controls. Player button is a hotkey to focus the current media player with [BeardedSpice](https://beardedspice.github.io/) -| | | | -|:-:|:-:|:-:| -| Volume Up/Down
**Mute** | Current Player | Next/Prev Track
**Play/Pause** | -| Home | Up | End | -| Left | Down | Right| +| Volume Down/Up | **Knobs** | Prev/Next Track | +| --- | --- | --- | +| Mute | Current Player | Play/Pause | +| YouTube Rewind 10s (J) | YouTube Play/Pause (K) | YouTube Forward 10s (L) | +| Left | Space | Right| --- ## Keypad Layer This layer is used to send keypad keys, meant to be remapped based on current app with [Karabiner](https://pqrs.org/osx/karabiner/) -| | | | -|:-:|:-:|:-:| +| -/+ | **Knobs** | =/.
**3** | +| --- | --- | --- | | +/-
**1** | 2 | =/.
**3** | | 4 | 5 | 6 | | 7 | 8 | 9 | --- -## Ligthroom Navigation Layer +## LR Navigation Layer This layer is used for navigating Grid View in the Library Module. -| | | | -|:-:|:-:|:-:| -| Inc/Dec Thumbnail Size
**Review** Layer | Cycle Grid View options | Scroll Up/Dn Grid Thumbnails
**Edit** Layer | +| Inc/Dec Thumbnail Size | **Knobs** | Scroll Up/Dn Grid Thumbnails | +| --- | --- | --- | +| Review Layer | Cycle Grid View options | Edit Layer | | Start of Grid View | Up | End of Grid View | | Left | Down | Right| --- ## Lightroom Review Layer This layer is used for Reviewing, Rating, and Culling images with the Loupe View in the Library Module. -| | | | -|:-:|:-:|:-:| -| Inc/Dec Star Rating
**Navigation** Layer | Yellow Label | Inc/Dec Flag Status
**Edit** Layer | +| Inc/Dec Star Rating | **Knobs** | Inc/Dec Flag Status | +| --- | --- | --- | +| LR Navigation Layer | Yellow Label | Edit Layer | | Remove Star Rating | Green Label | Unflag Photo | | Left | Blue Label | Right| --- ## Lightroom Edit Layer This layer is used for editing photos in the Develop Module -| | | | -|:-:|:-:|:-:| -| Cycle Basic Panel Settings
**Review** Layer | Toggle Before View | Inc/Dec Selected Slider
**Navigation** Layer | +| Next/Prev Basic Panel Settings | **Knobs** | Inc/Dec Selected Slider | +| --- | --- | --- | +| Review Layer | Toggle Before View | LR Navigation Layer | | Flag Rejected | Undo | Flag Picked | | Left | Redo | Right| --- +## Light Layer +This layer is used to control lighting for the pad. Currently nothing is saved in EEPROM, so it will reset after power loss. Also currently my userspace layer colors take priority until I build out that feature. This layer is accessed with a double tap of the middle right key via [tap dance](https://docs.qmk.fm/#/feature_tap_dance). A triple tap of the middle right key will also toggle lights on/off. +| Inc/Dec RGB Hue | **Knobs** | Inc/Dec RGB Saturation | +| --- | --- | --- | +| RGB Toggle | RGB Value Increase | Toggle Layer Off | +| RGB Mode Prev | RGB Value Decrease | RGB Mode Next | +| RGB Mode Plain | RGB Mode Breathing | XXX | + ## Magic Layer This layer is used as a meta layer for the pad. This layer is accessed with a double tap of the bottom right key via [tap dance](https://docs.qmk.fm/#/feature_tap_dance). -| | | | -|:-:|:-:|:-:| +| XXX | **Knobs** | XXX | +| --- | --- | --- | | MAKE | **Navigation** Layer | RESET | | **Reeder** Layer | **Media** Layer | **Keypad** Layer | | **Lightroom Review** Layer | **Lightroom Navigation** Layer | **Lightroom Edit** Layer | From 9dcdeb6158cd2581de9d02ed2b8657d785656503 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 25 Jul 2019 13:07:20 -0700 Subject: [PATCH 120/429] [Keymap] Fix readme formatting --- .../bdn9/keymaps/brandonschlack/readme.md | 65 ++++++++++++------- 1 file changed, 42 insertions(+), 23 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md index 9405da466abd..cd5765bf92b5 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md @@ -8,81 +8,100 @@ I built this pad to match my Lightroom photo editing workflow using I use macOS, so shortcuts and macros are configured as such. Encoder functionality is in the header of the tables, as clockwise/counterclockwise. -## Navigation Layer +--- + +## Macropad Layers + +### Navigation Layer This layer is used for general window navigation around macOS + | Scroll Up/Down | **Knobs** | Next/Prev Tab | | --- | --- | --- | | Reopen Tab | Cmd+Tab | Close Tab | | Page Down | Up | Page Up | -| Left | Down | Right| ---- +| Left | Down | Right | + -## Reeder Layer +### Reeder Layer This layer is used for browsing [Reeder](https://reederapp.com/), an awesome RSS reader for Mac + | Prev/Next Item | **Knobs** | Prev/Next Subscription | | --- | --- | --- | | Open Item in Browser | Star Item/Save for Later | Sync | | Command+Tab | Toggle Read Status | Clear Read Items | | Starred Items | Unread Items | All Items | ---- -## Media Layer + +### Media Layer This layer is used for media controls. Player button is a hotkey to focus the current media player with [BeardedSpice](https://beardedspice.github.io/) + | Volume Down/Up | **Knobs** | Prev/Next Track | | --- | --- | --- | | Mute | Current Player | Play/Pause | | YouTube Rewind 10s (J) | YouTube Play/Pause (K) | YouTube Forward 10s (L) | -| Left | Space | Right| ---- +| Left | Space | Right | + -## Keypad Layer +### Keypad Layer This layer is used to send keypad keys, meant to be remapped based on current app with [Karabiner](https://pqrs.org/osx/karabiner/) -| -/+ | **Knobs** | =/.
**3** | + +| +/- | **Knobs** | =/. | | --- | --- | --- | -| +/-
**1** | 2 | =/.
**3** | +| 1 | 2 | 3 | | 4 | 5 | 6 | | 7 | 8 | 9 | ---- -## LR Navigation Layer + +## Lightroom Layers + +### LR Navigation Layer This layer is used for navigating Grid View in the Library Module. + | Inc/Dec Thumbnail Size | **Knobs** | Scroll Up/Dn Grid Thumbnails | | --- | --- | --- | | Review Layer | Cycle Grid View options | Edit Layer | | Start of Grid View | Up | End of Grid View | -| Left | Down | Right| ---- +| Left | Down | Right | + -## Lightroom Review Layer +### Lightroom Review Layer This layer is used for Reviewing, Rating, and Culling images with the Loupe View in the Library Module. + | Inc/Dec Star Rating | **Knobs** | Inc/Dec Flag Status | | --- | --- | --- | | LR Navigation Layer | Yellow Label | Edit Layer | | Remove Star Rating | Green Label | Unflag Photo | -| Left | Blue Label | Right| ---- +| Left | Blue Label | Right | -## Lightroom Edit Layer + +### Lightroom Edit Layer This layer is used for editing photos in the Develop Module + | Next/Prev Basic Panel Settings | **Knobs** | Inc/Dec Selected Slider | | --- | --- | --- | | Review Layer | Toggle Before View | LR Navigation Layer | | Flag Rejected | Undo | Flag Picked | -| Left | Redo | Right| ---- +| Left | Redo | Right | + -## Light Layer +## Meta Layers + +### Light Layer This layer is used to control lighting for the pad. Currently nothing is saved in EEPROM, so it will reset after power loss. Also currently my userspace layer colors take priority until I build out that feature. This layer is accessed with a double tap of the middle right key via [tap dance](https://docs.qmk.fm/#/feature_tap_dance). A triple tap of the middle right key will also toggle lights on/off. + | Inc/Dec RGB Hue | **Knobs** | Inc/Dec RGB Saturation | | --- | --- | --- | | RGB Toggle | RGB Value Increase | Toggle Layer Off | | RGB Mode Prev | RGB Value Decrease | RGB Mode Next | | RGB Mode Plain | RGB Mode Breathing | XXX | -## Magic Layer + +### Magic Layer This layer is used as a meta layer for the pad. This layer is accessed with a double tap of the bottom right key via [tap dance](https://docs.qmk.fm/#/feature_tap_dance). + | XXX | **Knobs** | XXX | | --- | --- | --- | | MAKE | **Navigation** Layer | RESET | | **Reeder** Layer | **Media** Layer | **Keypad** Layer | | **Lightroom Review** Layer | **Lightroom Navigation** Layer | **Lightroom Edit** Layer | + From 9005d8a501a1504a8444ac1d19f92dc53952d321 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 25 Jul 2019 14:01:50 -0700 Subject: [PATCH 121/429] [Keymap] Add initial romac keymap --- .../romac/keymaps/brandonschlack/keymap.c | 38 +++++++++++++++++++ .../romac/keymaps/brandonschlack/rules.mk | 8 ++++ 2 files changed, 46 insertions(+) create mode 100644 keyboards/romac/keymaps/brandonschlack/keymap.c create mode 100644 keyboards/romac/keymaps/brandonschlack/rules.mk diff --git a/keyboards/romac/keymaps/brandonschlack/keymap.c b/keyboards/romac/keymaps/brandonschlack/keymap.c new file mode 100644 index 000000000000..2ce576e11917 --- /dev/null +++ b/keyboards/romac/keymaps/brandonschlack/keymap.c @@ -0,0 +1,38 @@ +/* Copyright 2018 Jack Humbert + * + * 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 . + */ + +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +#define _BASE 0 +#define _FN1 1 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_BASE] = LAYOUT( + KC_P7, KC_P8, KC_P9, \ + KC_P4, KC_P5, KC_P6, \ + KC_P1, KC_P2, KC_P3, \ + LT(_FN1, KC_NLCK), KC_P0, KC_PENT \ + ), + + [_FN1] = LAYOUT( + KC_TRNS, KC_HOME, KC_PGUP, \ + KC_TRNS, KC_END, KC_PGDN, \ + KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_PDOT \ + ) +}; diff --git a/keyboards/romac/keymaps/brandonschlack/rules.mk b/keyboards/romac/keymaps/brandonschlack/rules.mk new file mode 100644 index 000000000000..1b677fb218d6 --- /dev/null +++ b/keyboards/romac/keymaps/brandonschlack/rules.mk @@ -0,0 +1,8 @@ +# Use macropad-specific defines, layers, functions. Flash bootloader with KC_MAKE +IS_MACROPAD = yes + +# Use dfu bootloader for Elite-C +BOOTLOADER = atmel-dfu + +# Build Options +# TAP_DANCE_ENABLE = yes # Use tap dance From 712b9009534630c34d7616cf75a3a76584359cea Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 30 Jul 2019 11:47:43 -0700 Subject: [PATCH 122/429] [User] Change Launchpad, Mssn Ctrl key defines --- users/brandonschlack/process_records.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 97dce7860c39..a7209c741485 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -27,8 +27,8 @@ void matrix_scan_cmd_tab(void); #define MC_POWR KC_POWER // Mac Power alias #define MC_SLEP LALT(LGUI(KC_POWER)) // Mac Sleep #define MC_SLPD LCTL(LSFT(KC_POWER)) // Sleep Display -#define MC_MSSN KC_F16 // Mission Control: Configure karabiner for F16 -> mission_control -#define MC_LHPD KC_F13 // Launchpad: Configure karabiner for F13 -> Launchpad +#define MC_MSSN KC_FIND // Mission Control: Configure karabiner for find -> mission_control +#define MC_LHPD KC_MENU // Launchpad: Configure karabiner for menu -> Launchpad #define MC_CMTB LGUI(KC_TAB) // Basic CMD+TAB #define CLS_TAB LGUI(KC_W) // Cmd+W: Closes Tab #define REO_TAB LSFT(LGUI(KC_T)) // Shift+Cmd+T: Reopen Last Tab From 1bd4bf2047d3f664b2b085b8478f5b0a57b13531 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 30 Jul 2019 11:49:22 -0700 Subject: [PATCH 123/429] [Keymap] Update kbd75 keymap preview --- keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c index 74fde668b1dc..b36183ab7cf6 100644 --- a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base Layer: Mac * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │Esc│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│F13│F14│F15│ + * │Esc│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│Mte│VlD│VlU│ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ * │~ `│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│Hom│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ Del │SlD│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │RMod │Hu+│St+│Vl+│RST│ │ │ │ │ │ │ │ │1.5U │ │ + * │RMod │Hu+│St+│Vl+│RST│ │ │ │ │ │ │ │ │ │ │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ * │ │Hu-│St-│Vl-│ │ │ │ │ │ │ │ │Magic │ │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ From e69402f53b96e6b50bb7c0c2f4cf506a99fd4b40 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 30 Jul 2019 11:50:46 -0700 Subject: [PATCH 124/429] [Keymap] Change MC_PLYR to KC_MPLY on 65% boards --- .../kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c | 4 ++-- keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index 05a07e703719..1a816af3c4d9 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | | | | | | | | | | TgMagic|VlD| * |---------------------------------------------------------------| - * | | | | | | | | |Prv|Nxt|Plr|MutSft|PgU| | + * | | | | | | | | |Prv|Nxt|Ply|MutSft|PgU| | * |---------------------------------------------------------------| * | | | | | | | |Hom|PgD|End| * `---------------------------------------------------------------' @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_MSSN, MC_SLPD, \ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, KC_VOLU, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLD, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, MC_PLYR, MM_RSFT, KC_PGUP, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, MM_RSFT, KC_PGUP, _______, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), /*********** diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index d58e5ad7a47f..e49e705a3a30 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | | | | | | | | | | | | | TgMagic|VlU| * |---------------------------------------------------------------| - * | |RTO| | | | | |MKE|Prv|Nxt|Plr|MutSft|PgU|VlD| + * | |RTO| | | | | |MKE|Prv|Nxt|Ply|MutSft|PgU|VlD| * |---------------------------------------------------------------| * | | | | | | | |Hom|PgD|End| * `---------------------------------------------------------------' @@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, MC_SLPD, \ _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLU, \ - _______, RGB_TOG, _______, _______, _______, _______, _______, KC_MAKE, KC_MRWD, KC_MFFD, MC_PLYR, MM_RSFT, KC_PGUP, KC_VOLD, \ + _______, RGB_TOG, _______, _______, _______, _______, _______, KC_MAKE, KC_MRWD, KC_MFFD, KC_MPLY, MM_RSFT, KC_PGUP, KC_VOLD, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), /*********** From b54064df374e85746ac4efa9c450cc8248bf4534 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 5 Aug 2019 12:24:07 -0700 Subject: [PATCH 125/429] [Keymap] Initial RoMac keymap layer setup --- .../romac/keymaps/brandonschlack/keymap.c | 41 +++++++++++++++---- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/keyboards/romac/keymaps/brandonschlack/keymap.c b/keyboards/romac/keymaps/brandonschlack/keymap.c index 2ce576e11917..b372a757948a 100644 --- a/keyboards/romac/keymaps/brandonschlack/keymap.c +++ b/keyboards/romac/keymaps/brandonschlack/keymap.c @@ -17,22 +17,45 @@ #include QMK_KEYBOARD_H #include "brandonschlack.h" -#define _BASE 0 -#define _FN1 1 +#define _NUMPAD 0 +#define _FN 1 +#define _NUMLOCK 2 +#define _MACRO 3 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT( + [_NUMPAD] = LAYOUT( KC_P7, KC_P8, KC_P9, \ KC_P4, KC_P5, KC_P6, \ KC_P1, KC_P2, KC_P3, \ - LT(_FN1, KC_NLCK), KC_P0, KC_PENT \ + OSL(_FN), KC_P0, KC_PDOT \ ), - [_FN1] = LAYOUT( - KC_TRNS, KC_HOME, KC_PGUP, \ - KC_TRNS, KC_END, KC_PGDN, \ - KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_PDOT \ + [_FN] = LAYOUT( + KC_PSLS, KC_PAST, KC_BSPC, \ + KC_TRNS, KC_TRNS, KC_PMNS, \ + TG(_NUMLOCK), DF(_MACRO), KC_PPLS, \ + KC_TRNS, DF(_MAGIC), KC_PENT \ + ), + + [_NUMLOCK] = LAYOUT( + KC_HOME, KC_UP, KC_PGUP, \ + KC_LEFT, CMD_TAB, KC_RGHT, \ + KC_END, KC_DOWN, KC_PGDN, \ + DF(_NUMPAD), KC_INS, KC_DEL \ + ), + + [_MACRO] = LAYOUT( + KC_F13, KC_F14, KC_F15, \ + KC_F16, KC_F17, KC_F18, \ + KC_F19, KC_F20, KC_F21, \ + LT(_MAGIC,KC_F22), KC_F23, KC_F24 \ + ), + + [_MAGIC] = LAYOUT( + KC_MAKE, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, \ + DF(_NUMPAD), DF(_NUMLOCK), DF(_MACRO), \ + KC_TRNS, XXXXXXX, XXXXXXX \ ) }; From b1217e67eaccd601c398644dbf7ef5e3bb92504f Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 5 Aug 2019 12:45:13 -0700 Subject: [PATCH 126/429] [Keymap] Initial commit for gingham keymap --- .../gingham/keymaps/brandonschlack/keymap.c | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 keyboards/gingham/keymaps/brandonschlack/keymap.c diff --git a/keyboards/gingham/keymaps/brandonschlack/keymap.c b/keyboards/gingham/keymaps/brandonschlack/keymap.c new file mode 100644 index 000000000000..b0735f738942 --- /dev/null +++ b/keyboards/gingham/keymaps/brandonschlack/keymap.c @@ -0,0 +1,54 @@ +/* Copyright 2018 Yiancar + * + * 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 . + */ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +//This is the ANSI version of the PCB + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[_MAC] = LAYOUT_60_ansi_split_bs_rshift( /* Base */ + 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, + HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(2), + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MM_RGUI, MM_RALT, MM_FNPY, KC_RCTL), + +[_MACFN] = LAYOUT_60_ansi_split_bs_rshift( /* FN */ + KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, + KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, 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_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + +[2] = LAYOUT_60_ansi_split_bs_rshift( /* Empty for dynamic keymaps */ + 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), +}; + +void matrix_init_keymap(void) { + //user initialization +} + +void matrix_scan_keymap(void) { + //user matrix +} + +bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { + return true; +} From 2f8012bafb03de51d2f943b70657b54fe73874a8 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 6 Aug 2019 15:49:40 -0700 Subject: [PATCH 127/429] [Keymap] Fix romac layer toggles --- .../romac/keymaps/brandonschlack/keymap.c | 55 ++++++++++++++++--- 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/keyboards/romac/keymaps/brandonschlack/keymap.c b/keyboards/romac/keymaps/brandonschlack/keymap.c index b372a757948a..7533f676ebdd 100644 --- a/keyboards/romac/keymaps/brandonschlack/keymap.c +++ b/keyboards/romac/keymaps/brandonschlack/keymap.c @@ -17,10 +17,19 @@ #include QMK_KEYBOARD_H #include "brandonschlack.h" -#define _NUMPAD 0 -#define _FN 1 -#define _NUMLOCK 2 -#define _MACRO 3 +enum romac_layers { + _NUMPAD = 0, + _FN, + _NUMLOCK, + _MACRO +}; + +enum romac_keycodes { + DF_NMPD = KEYMAP_SAFE_RANGE, + DF_NMLK, + DF_MCRO, + DF_MAGC +}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -34,15 +43,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT( KC_PSLS, KC_PAST, KC_BSPC, \ KC_TRNS, KC_TRNS, KC_PMNS, \ - TG(_NUMLOCK), DF(_MACRO), KC_PPLS, \ - KC_TRNS, DF(_MAGIC), KC_PENT \ + DF_NMLK, DF_MCRO, KC_PPLS, \ + KC_TRNS, DF_MAGC, KC_PENT \ ), [_NUMLOCK] = LAYOUT( KC_HOME, KC_UP, KC_PGUP, \ KC_LEFT, CMD_TAB, KC_RGHT, \ KC_END, KC_DOWN, KC_PGDN, \ - DF(_NUMPAD), KC_INS, KC_DEL \ + DF_NMPD, KC_INS, KC_DEL \ ), [_MACRO] = LAYOUT( @@ -55,7 +64,37 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_MAGIC] = LAYOUT( KC_MAKE, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, \ - DF(_NUMPAD), DF(_NUMLOCK), DF(_MACRO), \ + DF_NMPD, DF_NMLK, DF_MCRO, \ KC_TRNS, XXXXXXX, XXXXXXX \ ) }; + +bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case DF_NMPD: + if (!record->event.pressed) { + default_layer_set(_NUMPAD); + layer_move(default_layer_state); + } + break; + case DF_NMLK: + if (!record->event.pressed) { + default_layer_set(_NUMLOCK); + layer_move(default_layer_state); + } + break; + case DF_MCRO: + if (!record->event.pressed) { + default_layer_set(_MACRO); + layer_move(default_layer_state); + } + break; + case DF_MAGC: + if (!record->event.pressed) { + default_layer_set(_MAGIC); + layer_move(default_layer_state); + } + break; + } + return true; +} From 690d3fdce2ffc58ba6e60cf30c4369d75b32ffa1 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 7 Aug 2019 17:38:03 -0700 Subject: [PATCH 128/429] [User] Add defines for Arrow & Nav Mod-Tap for 60% --- users/brandonschlack/process_records.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index a7209c741485..8ec3d1d38ec3 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -23,6 +23,17 @@ void matrix_scan_cmd_tab(void); #define MM_RALT RALT_T(KC_MFFD) #define MM_FNPY LT(_MACFN, KC_MPLY) #define MM_RSFT RSFT_T(KC_MUTE) +// Arrow Mod-Tap +#define MT_RSUP RSFT_T(KC_UP) +#define MT_RALT RALT_T(KC_LEFT) +#define MT_RFDN LT(_MACFN, KC_DOWN) +#define MT_RCRT RCTL_T(KC_RGHT) +// Nav Mod-Tap +#define MT_RSPU RSFT_T(KC_PGUP) +#define MT_RAHM RALT_T(KC_HOME) +#define MT_RFPD LT(_MACFN, KC_PGDN) +#define MT_RCED RCTL_T(KC_END) + // MacOS #define MC_POWR KC_POWER // Mac Power alias #define MC_SLEP LALT(LGUI(KC_POWER)) // Mac Sleep From 588f16e98be22eb045a198e3738733c293be6104 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 7 Aug 2019 17:38:46 -0700 Subject: [PATCH 129/429] [Keymap] Update gingham keymap after inital use --- .../gingham/keymaps/brandonschlack/keymap.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/keyboards/gingham/keymaps/brandonschlack/keymap.c b/keyboards/gingham/keymaps/brandonschlack/keymap.c index b0735f738942..d58a6433f7e2 100644 --- a/keyboards/gingham/keymaps/brandonschlack/keymap.c +++ b/keyboards/gingham/keymaps/brandonschlack/keymap.c @@ -16,29 +16,28 @@ #include QMK_KEYBOARD_H #include "brandonschlack.h" -//This is the ANSI version of the PCB const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_MAC] = LAYOUT_60_ansi_split_bs_rshift( /* Base */ 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, HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(2), - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MM_RGUI, MM_RALT, MM_FNPY, KC_RCTL), + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT_RSUP, MO(2), + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MT_RALT, MT_RFDN, MT_RCRT), [_MACFN] = LAYOUT_60_ansi_split_bs_rshift( /* FN */ KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, - KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, - KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, 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_VOLU, KC_VOLD, KC_MUTE, 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_UP, KC_TRNS, KC_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_RGHT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [2] = LAYOUT_60_ansi_split_bs_rshift( /* Empty for dynamic keymaps */ 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, MT_RSPU, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MT_RAHM, MT_RFPD, MT_RCED), }; void matrix_init_keymap(void) { From df4599deb15e4b5c0af45e84366d47f37638ad8c Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 8 Aug 2019 17:10:47 -0700 Subject: [PATCH 130/429] [User] Add USBasp to KC_MAKE --- users/brandonschlack/process_records.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index 5acd7333a867..ee3c6e760da5 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -95,6 +95,8 @@ void send_make_command(bool flash_bootloader) { SEND_STRING(":teensy"); #elif defined(BOOTLOADER_CATERINA) // only run for Pro Micros SEND_STRING(":avrdude"); +#elif defined(BOOTLOADER_USBASP) // Run for custom Program CMD + SEND_STRING(":program"); #endif // bootloader options } SEND_STRING(SS_TAP(X_ENTER)); From 20a20a42af61bd80a391bdb6532b1a276db289ea Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 8 Aug 2019 17:11:14 -0700 Subject: [PATCH 131/429] [Keymap] Add keymap preview to gingham --- .../gingham/keymaps/brandonschlack/keymap.c | 45 +++++++++++++++++-- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/keyboards/gingham/keymaps/brandonschlack/keymap.c b/keyboards/gingham/keymaps/brandonschlack/keymap.c index d58a6433f7e2..a87cdbc21ad6 100644 --- a/keyboards/gingham/keymaps/brandonschlack/keymap.c +++ b/keyboards/gingham/keymaps/brandonschlack/keymap.c @@ -18,6 +18,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Base layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │ ` │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │Bspc │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + * │ LShift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │↑ Shft│Fn2│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ + * │LCtl│LAlt│LGui│ Space │RGui│←Alt│↓Fn1│→Ctl│ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ [_MAC] = LAYOUT_60_ansi_split_bs_rshift( /* Base */ 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, @@ -25,13 +38,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT_RSUP, MO(2), KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MT_RALT, MT_RFDN, MT_RCRT), +/* Fn layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │MKE│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│LHP│SLP│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ ↑ │MNC│ Del │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │VlD│VlU│Mte│ │ │ │ │Hme│PgU│ ← │ → │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + * │ │Prv│Nxt│Ply│ │ │ │ │End│PgD│ ↓ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ [_MACFN] = LAYOUT_60_ansi_split_bs_rshift( /* FN */ KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_DEL, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_RGHT, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, 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_UP, MC_MSSN, KC_DEL, + KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, + KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), +/* Empty layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ │ │ │ │ │ │ │VlD│VlU│Mte│ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + * │ │ │ │ │ │ │ │ │Prv│Nxt│Ply│ PgU │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ + * │ │ │ │ │ │Home│PgDn│End │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ [2] = LAYOUT_60_ansi_split_bs_rshift( /* Empty for dynamic keymaps */ 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, From 75f26567635f928e0a1a52e2b1108d41a571c1b3 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 9 Aug 2019 16:01:16 -0700 Subject: [PATCH 132/429] [Keymap] Update keymap previews --- .../bdn9/keymaps/brandonschlack/keymap.c | 125 +++++++++++++----- .../launchpad/keymaps/brandonschlack/keymap.c | 110 +++++++-------- .../launchpad/keymaps/brandonschlack/rules.mk | 1 + 3 files changed, 146 insertions(+), 90 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index a144ea7c45d5..902dcf89c43b 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -17,10 +17,16 @@ enum bdn9_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Layer: Navigation - | Knob 1: Scroll Dn/Up | | Knob 2: Tab Nxt/Prv | - | Press: Reopen Tab | CmTb | Close Tab | - | PgDn | Up | PgUp | - | Left | Down | Right | + ┌───────────┐ ┌───────────┐ + │ Scroll │ │ Tab │ + │ Up Dn │ │ Prv Nxt │ + ├────────┬──┴──┴──┬────────┤ + │ ReOTab │ CmdTab │ ClsTab │ + ├────────┼────────┼────────┤ + │ PgDn │ Up │ PgUp │ + ├────────┼────────┼────────┤ + │ Left │ Down │ Rght │ + └────────┴────────┴────────┘ */ [_NAVI] = LAYOUT( REO_TAB, CMD_TAB, CLS_TAB, @@ -29,10 +35,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Layer: Reeder - | Knob 1: j/k | | Knob 2: n/p | - | Press: H | S | R | - | CMD+TAB | M | L | - | Cmd+1 | Cmd+2| Cmd+3 | + ┌───────────┐ ┌───────────┐ + │ Items │ │ Subs │ + │ Prv Nxt │ │ Prv Nxt │ + ├────────┬──┴──┴──┬────────┤ + │ VwBrsw │ Star │ Sync │ + ├────────┼────────┼────────┤ + │ CmdTab │ TgRead │ Clear │ + ├────────┼────────┼────────┤ + │ VwStard│ VwUnrd │ VwAll │ + └────────┴────────┴────────┘ */ [_REEDER] = LAYOUT( KC_H, KC_S, KC_R, @@ -41,10 +53,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Layer: Media - | Knob 1: Vol +/- | | Knob 2: Track Nxt/Prv | - | Press: Mute | Plyr | Press: Play/Pause | - | J | K | L | - | Left | Spce | Right | + ┌───────────┐ ┌───────────┐ + │ Vol │ │ Track │ + │ Prv Nxt │ │ Prv Nxt │ + ├────────┬──┴──┴──┬────────┤ + │ Mute │ Player │ Sync │ + ├────────┼────────┼────────┤ + │ YT<10s │ YT Ply │ YT>10s │ + ├────────┼────────┼────────┤ + │ Left │ Spce │ Rght │ + └────────┴────────┴────────┘ */ [_MEDIA] = LAYOUT( KC_MUTE, MC_PLYR, KC_MPLY, @@ -53,10 +71,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Layer: Keypad/Karabiner - | Knob 1: +/- | | Knob 2: =/. | - | Press: 1 | 2 | 3 | - | 4 | 5 | 6 | - | 7 | 8 | 9 | + ┌───────────┐ ┌───────────┐ + │ │ │ │ + │ - + │ │ . = │ + ├────────┬──┴──┴──┬────────┤ + │ 1 │ 2 │ 3 │ + ├────────┼────────┼────────┤ + │ 4 │ 5 │ 6 │ + ├────────┼────────┼────────┤ + │ 7 │ 8 │ 9 │ + └────────┴────────┴────────┘ */ [_KEYPAD] = LAYOUT( KC_P1, KC_P2, KC_P3, @@ -65,10 +89,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Layer: Lightroom Navigation - | Knob 1: =/- | | Knob 2: Page Up/Dn | - | Press: Review | J | Press: Edit | - | Home, Hold: BD Layer | Up | End | - | Left | Down | Right | + ┌───────────┐ ┌───────────┐ + │ Thumbnail │ │ Scrl Grid │ + │ Dec Inc │ │ Up Dn │ + ├────────┬──┴──┴──┬────────┤ + │ TgRevw │CylGrdVw│ TgEdit │ + ├────────┼────────┼────────┤ + │ Start │ Up │ End │ + ├────────┼────────┼────────┤ + │ Left │ Down │ Rght │ + └────────┴────────┴────────┘ */ [_LR_NAV] = LAYOUT( TG_REVW, KC_J, TG_EDIT, @@ -77,10 +107,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Layer: Review/Rate - | Knob 1: ]/[ | | Knob 2: G(Up)/G(Dn) | - | Press: Nav | 7 | Press: Edit | - | 0 | 8 | U | - | Left | 9 | Right | + ┌───────────┐ ┌───────────┐ + │ Stars │ │ Flag │ + │ Dec Inc │ │ Dec Inc │ + ├────────┬──┴──┴──┬────────┤ + │ TgLNav │ Yellow │ TgEdit │ + ├────────┼────────┼────────┤ + │ NoStar │ Green │ UnFlag │ + ├────────┼────────┼────────┤ + │ Left │ Blue │ Rght │ + └────────┴────────┴────────┘ */ [_LR_REVIEW] = LAYOUT( TG_LNAV, KC_7, TG_EDIT, @@ -89,10 +125,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Layer: Edit/Develop - | Knob 1: ./, | | Knob 2: =/- | - | Press: Review | \ | Press: Nav | - | X | Undo | P | - | Left | Redo | Right | + ┌───────────┐ ┌───────────┐ + │ Sliders │ │ Value │ + │ Prv Nxt │ │ Dec Inc │ + ├────────┬──┴──┴──┬────────┤ + │ TgRevw │ Bf/Aft │ TgLNav │ + ├────────┼────────┼────────┤ + │ FlgRjt │ Undo │ FlgPkd │ + ├────────┼────────┼────────┤ + │ Left │ Redo │ Rght │ + └────────┴────────┴────────┘ */ [_LR_EDIT] = LAYOUT( TG_REVW, KC_BSLS, TG_LNAV, @@ -101,10 +143,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Layer: Light - | Knob 1: Hue +/- | | Knob 2: Sat +/- | - | RGB Toggle | Val+ | Toggle Layer | - | RGB Mode Prev | Val- | RGB Mode Next | - | RGB Plain | Brth | XXX | + ┌───────────┐ ┌───────────┐ + │ RGB Hue │ │ RGB Sat │ + │ Prv Nxt │ │ Dec Inc │ + ├────────┬──┴──┴──┬────────┤ + │ RGBTgl │ Val+ │ TgLNav │ + ├────────┼────────┼────────┤ + │ Mode- │ Val- │ Mode+ │ + ├────────┼────────┼────────┤ + │ Plain │ Breath │ XXXX │ + └────────┴────────┴────────┘ */ [_LIGHT] = LAYOUT( RGB_TOG, RGB_VAI, TG_LGHT, @@ -113,9 +161,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Layer: Magic - | MAKE | Nav | RESET | - | Reeder | Meda | Keypad | - | Review | LNav | Edit | + ┌───────────┐ ┌───────────┐ + │ XXXX │ │ XXXX │ + │ │ │ │ + ├────────┬──┴──┴──┬────────┤ + │ MAKE │ Navi │ RESET │ + ├────────┼────────┼────────┤ + │ Reeder │ Media │ Keypad │ + ├────────┼────────┼────────┤ + │ LR Rvw │ LR Nav │ LR Edt │ + └────────┴────────┴────────┘ */ [_MAGIC] = LAYOUT( KC_MAKE, TG_NAVI, TG_LGHT, diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index 1fa242e24a80..078a4e6c500b 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -8,15 +8,15 @@ extern keymap_config_t keymap_config; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Navigation - * ,-------------. - * | PTab | NTab | - * |------+------| - * | SclL | SclU | - * |------+------| - * | SclR | SclD | - * |------+------| - * |LstTab|ClsTab| - * `-------------' + * ┌──────┬──────┐ + * │ PTab │ NTab │ + * ├──────┼──────┤ + * │ SclL │ SclU │ + * ├──────┼──────┤ + * │ SclR │ SclD │ + * ├──────┼──────┤ + * │LstTab│ClsTab│ + * └──────┴──────┘ */ [_NAVI] = LAYOUT( \ PRV_TAB, NXT_TAB, \ @@ -26,15 +26,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Reeder - * ,-------------. - * |CMDTAB| H | - * |------+------| - * | P | K | - * |------+------| - * | N | J | - * |------+------| - * | L | S | - * `-------------' + * ┌──────┬──────┐ + * │CmdTab│ View │ + * ├──────┼──────┤ + * │PrvSub│PrvItm│ + * ├──────┼──────┤ + * │NxtSub│NxtItm│ + * ├──────┼──────┤ + * │ Clr │ Sync │ + * └──────┴──────┘ */ [_REEDER] = LAYOUT( \ CMD_TAB, TD(TD_REDR_H), \ @@ -44,15 +44,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Media - * ,-------------. - * | Mute | PlPs | - * |------+------| - * | VolU | TrkN | - * |------+------| - * | VolD | TrkP | - * |------+------| - * | Spc | Plyr | - * `-------------' + * ┌──────┬──────┐ + * │ Mute │ Play │ + * ├──────┼──────┤ + * │ Vol+ │PrvTrk│ + * ├──────┼──────┤ + * │ Vol- │NxtTrk│ + * ├──────┼──────┤ + * │ Spce │ Plyr │ + * └──────┴──────┘ */ [_MEDIA] = LAYOUT( \ KC_MUTE, KC_MPLY, \ @@ -62,15 +62,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Keypad - * ,-------------. - * | 1 | 2 | - * |------+------| - * | 3 | 4 | - * |------+------| - * | 5 | 6 | - * |------+------| - * | 7 | 8 | - * `-------------' + * ┌──────┬──────┐ + * │ 1 │ 2 │ + * ├──────┼──────┤ + * │ 3 │ 4 │ + * ├──────┼──────┤ + * │ 5 │ 6 │ + * ├──────┼──────┤ + * │ 7 │ 8 │ + * └──────┴──────┘ */ [_KEYPAD] = LAYOUT( \ KC_P1, KC_P2, \ @@ -80,15 +80,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Lights - * ,-------------. - * | HUE- | HUE+ | - * |------+------| - * | SAT- | SAT+ | - * |------+------| - * | VAL- | VAL+ | - * |------+------| - * | XXXX | Mode+| - * `-------------' + * ┌──────┬──────┐ + * │ HUE- │ HUE+ │ + * ├──────┼──────┤ + * │ SAT- │ SAT+ │ + * ├──────┼──────┤ + * │ VAL- │ VAL+ │ + * ├──────┼──────┤ + * │ XXXX │ Mde+ │ + * └──────┴──────┘ */ [_LIGHT] = LAYOUT( \ RGB_HUD, RGB_HUI, \ @@ -98,15 +98,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Magic - * ,-------------. - * | Make | Rset | - * |------+------| - * | Navi | Redr | - * |------+------| - * | Meda | Kypd | - * |------+------| - * | Lght | XXXX | - * `-------------' + * ┌──────┬──────┐ + * │ Make │ Rset │ + * ├──────┼──────┤ + * │ Navi │ Redr │ + * ├──────┼──────┤ + * │ Meda │ Kypd │ + * ├──────┼──────┤ + * │ Lght │ XXXX │ + * └──────┴──────┘ */ [_MAGIC] = LAYOUT( \ KC_MAKE, RESET, \ @@ -153,7 +153,7 @@ void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { keycode = CLS_TAB; break; case _REEDER: - keycode = KC_S; + keycode = KC_R; break; case _MEDIA: keycode = MC_PLYR; diff --git a/keyboards/launchpad/keymaps/brandonschlack/rules.mk b/keyboards/launchpad/keymaps/brandonschlack/rules.mk index 113802891a24..b11bbdb01ce1 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/rules.mk +++ b/keyboards/launchpad/keymaps/brandonschlack/rules.mk @@ -6,6 +6,7 @@ BOOTLOADER = atmel-dfu # Build Options RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. +CONSOLE_ENABLE = yes # Console for debug(+400) MOUSEKEY_ENABLE = yes # Use mouse keys for scrolling. COMMAND_ENABLE = no # Disable Command, breaks with Mouse Keys set to constant. TAP_DANCE_ENABLE = yes # Use tap dance From f16a5819568359224c6066adaef9a759dc47be32 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 9 Aug 2019 16:45:41 -0700 Subject: [PATCH 133/429] [User] Clean up userspace tap dances. * Remove unused tap dances * Move tap dances to keymaps since not really shared * Keep tap dance functionality in shared userspace. --- .../bdn9/keymaps/brandonschlack/keymap.c | 14 ++++++ .../launchpad/keymaps/brandonschlack/keymap.c | 13 ++++++ users/brandonschlack/tap_dances.c | 46 ------------------- users/brandonschlack/tap_dances.h | 36 ++++++++------- 4 files changed, 46 insertions(+), 63 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 902dcf89c43b..1e6021e81381 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -14,6 +14,20 @@ enum bdn9_keycodes { TG_LGHT }; +// Tap Dances +enum bdn9_dances { + TD_DTAP_LGHT = 0, + TD_DTAP_MAGC +}; +//Tap Dance Definitions +qk_tap_dance_action_t tap_dance_actions[] = { + [TD_DTAP_LGHT] = ACTION_TAP_DANCE_TRIGGER_LAYER(DOUBLE_TAP, _LIGHT), + [TD_DTAP_MAGC] = ACTION_TAP_DANCE_TRIGGER_LAYER(DOUBLE_TAP, _MAGIC), +}; +// Tap Dance Aliases +#define DTP_LGT TD(TD_DTAP_LGHT) +#define DTP_MGC TD(TD_DTAP_MAGC) + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Layer: Navigation diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index 078a4e6c500b..efa1c6291438 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -5,6 +5,19 @@ extern keymap_config_t keymap_config; // Layers defined in brandonschlack.h +// Tap Dances +enum launchpad_dances { + TD_SHLD_LGHT = 0, + TD_SHLD_MAGC, + TD_REDR_H +}; +//Tap Dance Definitions +qk_tap_dance_action_t tap_dance_actions[] = { + [TD_SHLD_LGHT] = ACTION_TAP_DANCE_TRIGGER_LAYER(SINGLE_HOLD, _LIGHT), + [TD_SHLD_MAGC] = ACTION_TAP_DANCE_TRIGGER_LAYER(SINGLE_HOLD, _MAGIC), + [TD_REDR_H] = ACTION_TAP_DANCE_DOUBLE(KC_H, KC_R) +}; + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Navigation diff --git a/users/brandonschlack/tap_dances.c b/users/brandonschlack/tap_dances.c index 72985dcfe94e..7cc44bc7ae81 100644 --- a/users/brandonschlack/tap_dances.c +++ b/users/brandonschlack/tap_dances.c @@ -20,17 +20,6 @@ int cur_dance (qk_tap_dance_state_t *state) { __attribute__ ((weak)) void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { }; -#define ACTION_TAP_DANCE_TRIGGER_LAYER(trigger, layer) { \ - .fn = { NULL, td_trigger_layer_finished, td_trigger_layer_reset }, \ - .user_data = (void *)&((qk_tap_dance_trigger_layer_t) { trigger, layer, 0 }), \ -} - -typedef struct { - uint8_t trigger; - uint8_t layer; - uint8_t state; -} qk_tap_dance_trigger_layer_t; - void td_trigger_layer_finished (qk_tap_dance_state_t *state, void *user_data) { qk_tap_dance_trigger_layer_t *data = (qk_tap_dance_trigger_layer_t *)user_data; data->state = cur_dance(state); @@ -65,12 +54,6 @@ void td_trigger_layer_reset (qk_tap_dance_state_t *state, void *user_data) { } /* Tap Dance: Layer Mod. Toggles Layer when tapped, Mod when held. */ - -#define ACTION_TAP_DANCE_LAYER_MOD(layer, mod) { \ - .fn = { td_layer_mod_each, td_layer_mod_finished, td_layer_mod_reset }, \ - .user_data = (void *)&((qk_tap_dance_dual_role_t) { mod, layer }), \ -} - void td_layer_mod_each(qk_tap_dance_state_t *state, void *user_data) { qk_tap_dance_dual_role_t *data = (qk_tap_dance_dual_role_t *)user_data; @@ -97,32 +80,3 @@ void td_layer_mod_reset(qk_tap_dance_state_t *state, void *user_data) { unregister_code(data->kc); } } - -#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) -/* Tap Dance: Esc,RGB. Single tap for Esc, Double Tap for RGB toggle. */ -void td_esc_rgb_switch(qk_tap_dance_state_t *state, void *user_data) { - switch (state->count) { - case 1: - tap_code(KC_ESC); - break; - case 2: - rgblight_toggle(); - break; - } - reset_tap_dance(state); -} -#endif - -/* Define Tap Dances */ -qk_tap_dance_action_t tap_dance_actions[] = { -#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) - [TD_LGHT_LSFT] = ACTION_TAP_DANCE_LAYER_MOD(_LIGHT, KC_LSFT), - [TD_ESC_RGBTG] = ACTION_TAP_DANCE_FN(td_esc_rgb_switch), - [TD_DTAP_LGHT] = ACTION_TAP_DANCE_TRIGGER_LAYER(DOUBLE_TAP, _LIGHT), - [TD_SHLD_LGHT] = ACTION_TAP_DANCE_TRIGGER_LAYER(SINGLE_HOLD, _LIGHT), -#endif - [TD_SHLD_MAGC] = ACTION_TAP_DANCE_TRIGGER_LAYER(SINGLE_HOLD, _MAGIC), - [TD_DTAP_MAGC] = ACTION_TAP_DANCE_TRIGGER_LAYER(DOUBLE_TAP, _MAGIC), - [TD_REDR_H] = ACTION_TAP_DANCE_DOUBLE(KC_H, KC_R) -}; - diff --git a/users/brandonschlack/tap_dances.h b/users/brandonschlack/tap_dances.h index ff04316709db..7fa349600ef7 100644 --- a/users/brandonschlack/tap_dances.h +++ b/users/brandonschlack/tap_dances.h @@ -4,16 +4,6 @@ # include "process_keycode/process_tap_dance.h" #endif -enum bs_dances { - TD_LGHT_LSFT, - TD_ESC_RGBTG, - TD_SHLD_LGHT, - TD_DTAP_LGHT, - TD_SHLD_MAGC, - TD_DTAP_MAGC, - TD_REDR_H -}; - enum tap_dance_states { SINGLE_TAP = 1, SINGLE_HOLD = 2, @@ -24,12 +14,24 @@ enum tap_dance_states { TRIPLE_HOLD = 7 }; -#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) -# define DTP_LGT TD(TD_DTAP_LGHT) -# define SFT_LGT TD(TD_LGHT_LSFT) -# define ESC_RTG TD(TD_ESC_RGBTG) -#endif -#define DTP_MGC TD(TD_DTAP_MAGC) - int cur_dance (qk_tap_dance_state_t *state); void process_tap_dance_keycode (bool reset, uint8_t toggle_layer); + +/* Tap Dance: Trigger Layer + * + * Toggles Layer based on given trigger (Single Hold, Double Tap, Double Hold, etc). + * Uses process_tap_dance_keycode() to allow keycode defines based on layer + */ +typedef struct { + uint8_t trigger; + uint8_t layer; + uint8_t state; +} qk_tap_dance_trigger_layer_t; + +#define ACTION_TAP_DANCE_TRIGGER_LAYER(trigger, layer) { \ + .fn = { NULL, td_trigger_layer_finished, td_trigger_layer_reset }, \ + .user_data = (void *)&((qk_tap_dance_trigger_layer_t) { trigger, layer, 0 }), \ +} + +void td_trigger_layer_finished (qk_tap_dance_state_t *state, void *user_data); +void td_trigger_layer_reset (qk_tap_dance_state_t *state, void *user_data); From 5196f98f833f1f2e1754c766e05607b43d6c51ec Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 13 Aug 2019 10:44:09 -0700 Subject: [PATCH 134/429] [Keymap] Add console for debug to kbd75 --- keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk index 06183dccec2e..5cf300c2d232 100644 --- a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk +++ b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk @@ -4,6 +4,7 @@ BOOTLOADER = atmel-dfu # Build Options # comment out to disable the options. # +CONSOLE_ENABLE = yes # Console for Debug (+400) MOUSEKEY_ENABLE = no # Don't need Mouse Keys BACKLIGHT_ENABLE = no # No backlights installed From 08e5865b784c93efd2e0b4b5b2b3018b2c4a210b Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 13 Aug 2019 10:56:34 -0700 Subject: [PATCH 135/429] [User] Initial rgb_theme test --- users/brandonschlack/rgb_bs.c | 128 +++++++++++++++++++++++-------- users/brandonschlack/rgb_bs.h | 1 + users/brandonschlack/rgb_theme.h | 34 ++++++++ 3 files changed, 130 insertions(+), 33 deletions(-) diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index 7fb262c36315..07283626f0e8 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -10,6 +10,7 @@ extern led_config_t g_led_config; #endif void keyboard_post_init_rgb(void) { + set_rgb_theme(rgb_granite); layer_state_set_user(layer_state); #if defined(RGBLIGHT_ENABLE) rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); @@ -18,6 +19,10 @@ void keyboard_post_init_rgb(void) { #endif } +void set_rgb_theme(rgb_theme_t theme) { + user_rgb_theme = theme; +} + #ifdef RGB_MATRIX_ENABLE void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, uint8_t led_type) { for (int i = 0; i < DRIVER_LED_TOTAL; i++) { @@ -58,41 +63,98 @@ void rgb_layer_helper(uint8_t hue, uint8_t sat, uint8_t val) { } #endif +HSV get_rgb_theme_color(uint8_t index, rgb_theme_t theme) { + // uint8_t MAX = sizeof(theme.colors)/sizeof(theme.colors[0]); + // if (index < MAX) { + // rgb_theme_color_t color = theme.colors[index]; + // return color; + // } + rgb_theme_color_t color = theme.colors[index]; + return color; +}; + +void rgb_theme_layer(layer_state_t state, rgb_theme_t rgb_theme) { + uint8_t rgb_color_index = biton32(state); + // uint8_t MAX = sizeof(rgb_theme.colors)/sizeof(rgb_theme.colors[0]); + HSV color = get_rgb_theme_color(rgb_color_index, rgb_theme); + + // if (index < MAX) { + // color = *(rgb_theme.colors[index]); + // } else if (rgb_color_index == _MAGIC) { + // color = { HSV_THEME_M }; + // } + rgb_layer_helper( color.h, color.s, color.v ); +// switch (biton32(state)) { +// #ifndef IS_MACROPAD +// case _MACFN: +// rgb_layer_helper(HSV_THEME_1); +// break; +// #else +// case _REEDER: +// rgb_layer_helper(HSV_THEME_1); +// break; +// case _MEDIA: +// rgb_layer_helper(HSV_THEME_2); +// break; +// case _KEYPAD: +// rgb_layer_helper(HSV_THEME_3); +// break; +// #endif +// case _MAGIC: +// rgb_layer_helper(HSV_THEME_M); +// break; +// default: +// switch (biton32(default_layer_state)) { +// #ifndef IS_MACROPAD +// case _MAC: +// rgb_layer_helper(HSV_THEME_0); +// break; +// #else +// case _NAVI: +// rgb_layer_helper(HSV_THEME_0); +// break; +// #endif +// } +// break; +// } +} + layer_state_t layer_state_set_rgb(layer_state_t state) { #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) - switch (biton32(state)) { -#ifndef IS_MACROPAD - case _MACFN: - rgb_layer_helper(HSV_THEME_1); - break; -#else - case _REEDER: - rgb_layer_helper(HSV_THEME_1); - break; - case _MEDIA: - rgb_layer_helper(HSV_THEME_2); - break; - case _KEYPAD: - rgb_layer_helper(HSV_THEME_3); - break; -#endif - case _MAGIC: - rgb_layer_helper(HSV_THEME_M); - break; - default: - switch (biton32(default_layer_state)) { - #ifndef IS_MACROPAD - case _MAC: - rgb_layer_helper(HSV_THEME_0); - break; - #else - case _NAVI: - rgb_layer_helper(HSV_THEME_0); - break; - #endif - } - break; - } +// switch (biton32(state)) { +// #ifndef IS_MACROPAD +// case _MACFN: +// rgb_layer_helper(HSV_THEME_1); +// break; +// #else +// case _REEDER: +// rgb_layer_helper(HSV_THEME_1); +// break; +// case _MEDIA: +// rgb_layer_helper(HSV_THEME_2); +// break; +// case _KEYPAD: +// rgb_layer_helper(HSV_THEME_3); +// break; +// #endif +// case _MAGIC: +// rgb_layer_helper(HSV_THEME_M); +// break; +// default: +// switch (biton32(default_layer_state)) { +// #ifndef IS_MACROPAD +// case _MAC: +// rgb_layer_helper(HSV_THEME_0); +// break; +// #else +// case _NAVI: +// rgb_layer_helper(HSV_THEME_0); +// break; +// #endif +// } +// break; +// } + rgb_theme_layer(state, user_rgb_theme); #endif // RGBLIGHT_ENABLE return state; } diff --git a/users/brandonschlack/rgb_bs.h b/users/brandonschlack/rgb_bs.h index 2e70bee0caea..f89607f4b3d5 100644 --- a/users/brandonschlack/rgb_bs.h +++ b/users/brandonschlack/rgb_bs.h @@ -17,6 +17,7 @@ void rgb_matrix_cycle_flag(void); void keyboard_post_init_rgb(void); void rgb_layer_helper(uint8_t hue, uint8_t sat, uint8_t val); +void rgb_theme_layer(layer_state_t state, rgb_theme_t rgb_theme); layer_state_t layer_state_set_rgb(layer_state_t state); // layer_state_t default_layer_state_set_rgb(layer_state_t state); diff --git a/users/brandonschlack/rgb_theme.h b/users/brandonschlack/rgb_theme.h index dfbc817a12eb..8852b0c20cb5 100644 --- a/users/brandonschlack/rgb_theme.h +++ b/users/brandonschlack/rgb_theme.h @@ -45,4 +45,38 @@ #if !defined(HSV_THEME_M) # define HSV_THEME_M HSV_SPRINGGREEN #endif + + +typedef enum { + LASER = 0, + GRANITE +} rgb_theme_name_t; + +typedef HSV rgb_theme_color_t; + +typedef struct { + rgb_theme_name_t theme; + rgb_theme_color_t colors[]; +} rgb_theme_t; + +rgb_theme_t user_rgb_theme; + +static const HSV laser_purple = { HSV_LSR_PURPLE }; +static const HSV laser_pink = { HSV_LSR_PINK }; +static const HSV laser_blue = { HSV_LSR_BLUE }; +static const HSV laser_cyan = { HSV_LSR_CYAN }; +static const HSV laser_magenta = { HSV_LSR_MAGENTA }; +static const rgb_theme_t rgb_laser = { LASER, { laser_purple, laser_pink, laser_blue, laser_cyan, laser_magenta } }; + +static const HSV granite_white = { HSV_GNT_WHITE }; +static const HSV granite_blue = { HSV_GNT_BLUE }; +static const HSV granite_red = { HSV_GNT_RED }; +static const HSV granite_green = { HSV_GNT_GREEN }; +static const HSV granite_yellow = { HSV_GNT_YELLOW }; +static const rgb_theme_t rgb_granite = { GRANITE, { granite_white, granite_blue, granite_red, granite_green, granite_yellow } }; + +void set_rgb_theme(rgb_theme_t theme); +rgb_theme_t get_rgb_theme(void); + +HSV get_rgb_theme_color(uint8_t index, rgb_theme_t theme); #endif From ef8b0a05affd19c60dc5504d4347d309e60fcb22 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 13 Aug 2019 15:34:20 -0700 Subject: [PATCH 136/429] [User] Basic working rgb_theme. Needs clean up. --- .../hotswap/keymaps/brandonschlack/keymap.c | 2 +- .../kbd75/keymaps/brandonschlack/keymap.c | 4 ++ .../bdn9/keymaps/brandonschlack/keymap.c | 4 ++ .../launchpad/keymaps/brandonschlack/keymap.c | 2 +- .../alt/keymaps/brandonschlack/keymap.c | 2 +- users/brandonschlack/brandonschlack.c | 16 ++++++ users/brandonschlack/brandonschlack.h | 11 ++++ users/brandonschlack/rgb_bs.c | 54 ++++++++++++++----- users/brandonschlack/rgb_bs.h | 2 +- users/brandonschlack/rgb_theme.h | 36 ++++++------- 10 files changed, 97 insertions(+), 36 deletions(-) diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index 1a816af3c4d9..7fa8f8fdd671 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX), }; -void matrix_init_user(void) { +void matrix_init_keymap(void) { } diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c index b36183ab7cf6..ffd836220c3c 100644 --- a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c @@ -88,3 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX ), }; + +void matrix_init_keymap(void) { + set_rgb_theme(GRANITE); +} diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 1e6021e81381..94083271d5ac 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -193,6 +193,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; +void matrix_init_keymap(void) { + set_rgb_theme(GRANITE); +} + /** * Encoder */ diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index efa1c6291438..685d5dcb9c27 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -130,7 +130,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -void matrix_init_user(void) { +void matrix_init_keymap(void) { } diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index e49e705a3a30..dd3896807cd0 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; // Runs just one time when the keyboard initializes. -void matrix_init_user(void) { +void matrix_init_keymap(void) { }; // Runs once after keyboard initializes diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index b0ef11521f35..d8a1182f0fbb 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -1,9 +1,25 @@ #include "brandonschlack.h" +user_config_t user_config; + +void eeconfig_init_user(void) { // EEPROM is getting reset! + user_config.raw = 0; + user_config.rgb_layer_change = true; + eeconfig_update_user(user_config.raw); +} +__attribute__((weak)) +void matrix_init_keymap(void){ } + +void matrix_init_user(void) { + matrix_init_keymap(); +} + __attribute__((weak)) void keyboard_post_init_keymap(void){ } void keyboard_post_init_user(void){ + // Read the user config from EEPROM + user_config.raw = eeconfig_read_user(); #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) keyboard_post_init_rgb(); #endif diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 09e03016e12f..36ceb9601f72 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -27,6 +27,17 @@ enum macropad_layers { #endif #define _MAGIC 15 +typedef union { + uint32_t raw; + struct { + bool rgb_layer_change :1; + uint8_t rgb_theme :2; + }; +} user_config_t; + +extern user_config_t user_config; + +void matrix_init_keymap(void); void keyboard_post_init_keymap(void); void shutdown_keymap(void); void suspend_power_down_keymap(void); diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index 07283626f0e8..4edc57123fb7 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -9,8 +9,25 @@ extern bool g_suspend_state; extern led_config_t g_led_config; #endif +const HSV default_magic = { HSV_SPRINGGREEN }; + +const HSV laser_purple = { HSV_LSR_PURPLE }; +const HSV laser_pink = { HSV_LSR_PINK }; +const HSV laser_blue = { HSV_LSR_BLUE }; +const HSV laser_cyan = { HSV_LSR_CYAN }; +const HSV laser_magenta = { HSV_LSR_MAGENTA }; +const rgb_theme_t rgb_laser = { LASER, { laser_purple, laser_pink, laser_blue, laser_cyan, laser_magenta } }; + +const HSV granite_white = { HSV_GNT_WHITE }; +const HSV granite_blue = { HSV_GNT_BLUE }; +const HSV granite_red = { HSV_GNT_RED }; +const HSV granite_green = { HSV_GNT_GREEN }; +const HSV granite_yellow = { HSV_GNT_YELLOW }; +const rgb_theme_t rgb_granite = { GRANITE, { granite_white, granite_blue, granite_red, granite_green, granite_yellow } }; + +const rgb_theme_t *themes[] = { &rgb_laser, &rgb_granite }; + void keyboard_post_init_rgb(void) { - set_rgb_theme(rgb_granite); layer_state_set_user(layer_state); #if defined(RGBLIGHT_ENABLE) rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); @@ -19,8 +36,16 @@ void keyboard_post_init_rgb(void) { #endif } -void set_rgb_theme(rgb_theme_t theme) { - user_rgb_theme = theme; +void set_rgb_theme(rgb_theme_name_t theme_name) { + if (!user_config.rgb_layer_change) { + user_config.rgb_layer_change = true; + } + user_config.rgb_theme = theme_name; + eeconfig_update_user(user_config.raw); +} + +rgb_theme_t get_rgb_theme(void) { + return *themes[user_config.rgb_theme]; } #ifdef RGB_MATRIX_ENABLE @@ -63,20 +88,21 @@ void rgb_layer_helper(uint8_t hue, uint8_t sat, uint8_t val) { } #endif -HSV get_rgb_theme_color(uint8_t index, rgb_theme_t theme) { - // uint8_t MAX = sizeof(theme.colors)/sizeof(theme.colors[0]); - // if (index < MAX) { - // rgb_theme_color_t color = theme.colors[index]; - // return color; - // } - rgb_theme_color_t color = theme.colors[index]; +HSV get_rgb_theme_color(uint8_t index) { + rgb_theme_t theme = get_rgb_theme(); + size_t rgb_theme_color_max = sizeof theme.colors / sizeof theme.colors[0]; + HSV color; + + if (index < rgb_theme_color_max) + color = theme.colors[index]; + else + color = default_magic; return color; }; -void rgb_theme_layer(layer_state_t state, rgb_theme_t rgb_theme) { +void rgb_theme_layer(layer_state_t state) { uint8_t rgb_color_index = biton32(state); - // uint8_t MAX = sizeof(rgb_theme.colors)/sizeof(rgb_theme.colors[0]); - HSV color = get_rgb_theme_color(rgb_color_index, rgb_theme); + HSV color = get_rgb_theme_color(rgb_color_index); // if (index < MAX) { // color = *(rgb_theme.colors[index]); @@ -154,7 +180,7 @@ layer_state_t layer_state_set_rgb(layer_state_t state) { // } // break; // } - rgb_theme_layer(state, user_rgb_theme); + rgb_theme_layer(state); #endif // RGBLIGHT_ENABLE return state; } diff --git a/users/brandonschlack/rgb_bs.h b/users/brandonschlack/rgb_bs.h index f89607f4b3d5..1e19ef95dee9 100644 --- a/users/brandonschlack/rgb_bs.h +++ b/users/brandonschlack/rgb_bs.h @@ -17,7 +17,7 @@ void rgb_matrix_cycle_flag(void); void keyboard_post_init_rgb(void); void rgb_layer_helper(uint8_t hue, uint8_t sat, uint8_t val); -void rgb_theme_layer(layer_state_t state, rgb_theme_t rgb_theme); +void rgb_theme_layer(layer_state_t state); layer_state_t layer_state_set_rgb(layer_state_t state); // layer_state_t default_layer_state_set_rgb(layer_state_t state); diff --git a/users/brandonschlack/rgb_theme.h b/users/brandonschlack/rgb_theme.h index 8852b0c20cb5..51ec15a47b9e 100644 --- a/users/brandonschlack/rgb_theme.h +++ b/users/brandonschlack/rgb_theme.h @@ -52,31 +52,31 @@ typedef enum { GRANITE } rgb_theme_name_t; -typedef HSV rgb_theme_color_t; - typedef struct { rgb_theme_name_t theme; - rgb_theme_color_t colors[]; + HSV colors[5]; } rgb_theme_t; -rgb_theme_t user_rgb_theme; +extern const HSV laser_purple; +extern const HSV laser_pink; +extern const HSV laser_blue; +extern const HSV laser_cyan; +extern const HSV laser_magenta; +extern const rgb_theme_t rgb_laser; + +extern const HSV granite_white; +extern const HSV granite_blue; +extern const HSV granite_red; +extern const HSV granite_green; +extern const HSV granite_yellow; +extern const rgb_theme_t rgb_granite; -static const HSV laser_purple = { HSV_LSR_PURPLE }; -static const HSV laser_pink = { HSV_LSR_PINK }; -static const HSV laser_blue = { HSV_LSR_BLUE }; -static const HSV laser_cyan = { HSV_LSR_CYAN }; -static const HSV laser_magenta = { HSV_LSR_MAGENTA }; -static const rgb_theme_t rgb_laser = { LASER, { laser_purple, laser_pink, laser_blue, laser_cyan, laser_magenta } }; +extern const HSV default_magic; -static const HSV granite_white = { HSV_GNT_WHITE }; -static const HSV granite_blue = { HSV_GNT_BLUE }; -static const HSV granite_red = { HSV_GNT_RED }; -static const HSV granite_green = { HSV_GNT_GREEN }; -static const HSV granite_yellow = { HSV_GNT_YELLOW }; -static const rgb_theme_t rgb_granite = { GRANITE, { granite_white, granite_blue, granite_red, granite_green, granite_yellow } }; +extern const rgb_theme_t *themes[]; -void set_rgb_theme(rgb_theme_t theme); +void set_rgb_theme(rgb_theme_name_t theme_name); rgb_theme_t get_rgb_theme(void); -HSV get_rgb_theme_color(uint8_t index, rgb_theme_t theme); +HSV get_rgb_theme_color(uint8_t index); #endif From a3199af20c4110fd3519e4fb596b396ed09a16f7 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 13 Aug 2019 18:43:41 -0700 Subject: [PATCH 137/429] [Keymap] Add light layer to kbd75 --- .../kbd75/keymaps/brandonschlack/keymap.c | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c index ffd836220c3c..9666fbe070a3 100644 --- a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c @@ -62,7 +62,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, MC_LHPD, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, _______, _______, _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, KC_PGUP, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END + _______, _______, _______, _______, TG(_LIGHT), _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END + ), + /* Keyboard Layer: Light + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │RMod │Hu+│St+│Vl+│RST│ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ │Hu-│St-│Vl-│ │ │ │ │ │ │ │ │Magic │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ │RTg│ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ + */ + [_LIGHT] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, + _______, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, + _______, _______, _______, XXXXXXX, TG(_LIGHT), XXXXXXX, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX ), /* Keyboard Layer: Magic * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ From 16c730bf5e40f8549cf81dc17412f07bcf37b6b9 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 13 Aug 2019 18:44:30 -0700 Subject: [PATCH 138/429] [User] Default to rgb eeconfig color in rgb_theme --- users/brandonschlack/rgb_bs.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index 4edc57123fb7..dfea75b115ed 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -9,7 +9,7 @@ extern bool g_suspend_state; extern led_config_t g_led_config; #endif -const HSV default_magic = { HSV_SPRINGGREEN }; +const HSV default_magic = { HSV_SPRINGGREEN }; const HSV laser_purple = { HSV_LSR_PURPLE }; const HSV laser_pink = { HSV_LSR_PINK }; @@ -93,10 +93,18 @@ HSV get_rgb_theme_color(uint8_t index) { size_t rgb_theme_color_max = sizeof theme.colors / sizeof theme.colors[0]; HSV color; - if (index < rgb_theme_color_max) + if (index < rgb_theme_color_max) { color = theme.colors[index]; - else + } else if (index == _MAGIC) { color = default_magic; + } else { +#if defined(RGBLIGHT_ENABLE) + rgblight_config.raw = eeconfig_read_rgblight(); + color = (HSV){ rgblight_config.hue, rgblight_config.sat, rgblight_config.val }; +#elif defined(RGB_MATRIX_ENABLE) + color = (HSV){ rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v }; +#endif + } return color; }; From 67d18e02d1a44a9cac1b3d6e83d9c2a99f7d415c Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 13 Aug 2019 19:12:32 -0700 Subject: [PATCH 139/429] [User] Add Oblique theme --- .../kbd75/keymaps/brandonschlack/keymap.c | 2 +- .../bdn9/keymaps/brandonschlack/keymap.c | 2 +- users/brandonschlack/rgb_bs.c | 9 ++++++++- users/brandonschlack/rgb_theme.h | 18 +++++++++++++++++- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c index 9666fbe070a3..9afc5efd7363 100644 --- a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c @@ -113,5 +113,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; void matrix_init_keymap(void) { - set_rgb_theme(GRANITE); + set_rgb_theme(OBLIQUE); } diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 94083271d5ac..642d814fae8c 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -194,7 +194,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; void matrix_init_keymap(void) { - set_rgb_theme(GRANITE); + set_rgb_theme(OBLIQUE); } /** diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index dfea75b115ed..82b1bc62a16e 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -25,7 +25,14 @@ const HSV granite_green = { HSV_GNT_GREEN }; const HSV granite_yellow = { HSV_GNT_YELLOW }; const rgb_theme_t rgb_granite = { GRANITE, { granite_white, granite_blue, granite_red, granite_green, granite_yellow } }; -const rgb_theme_t *themes[] = { &rgb_laser, &rgb_granite }; +const HSV oblique_white = { HSV_OBQ_WHITE }; +const HSV oblique_purple = { HSV_OBQ_PURPLE }; +const HSV oblique_red = { HSV_OBQ_RED }; +const HSV oblique_orange = { HSV_OBQ_ORANGE }; +const HSV oblique_green = { HSV_OBQ_GREEN }; +const rgb_theme_t rgb_oblique = { OBLIQUE, { oblique_white, oblique_purple, oblique_red, oblique_orange, oblique_green } }; + +const rgb_theme_t *themes[] = { &rgb_laser, &rgb_granite, &rgb_oblique }; void keyboard_post_init_rgb(void) { layer_state_set_user(layer_state); diff --git a/users/brandonschlack/rgb_theme.h b/users/brandonschlack/rgb_theme.h index 51ec15a47b9e..bce57184476a 100644 --- a/users/brandonschlack/rgb_theme.h +++ b/users/brandonschlack/rgb_theme.h @@ -17,6 +17,14 @@ #define HSV_GNT_YELLOW HSV_YELLOW #define HSV_GNT_WHITE HSV_WHITE +// Oblique Colors +#define HSV_OBQ_BLUE 130, 215, 255 +#define HSV_OBQ_RED 10, 200, 255 +#define HSV_OBQ_GREEN 58, 199, 255 +#define HSV_OBQ_ORANGE 26, 215, 255 +#define HSV_OBQ_PURPLE 186, 143, 255 +#define HSV_OBQ_WHITE HSV_WHITE + // Theme Colors #if defined(THEME_LASER) # define HSV_THEME_0 HSV_LSR_PURPLE @@ -49,7 +57,8 @@ typedef enum { LASER = 0, - GRANITE + GRANITE, + OBLIQUE } rgb_theme_name_t; typedef struct { @@ -71,6 +80,13 @@ extern const HSV granite_green; extern const HSV granite_yellow; extern const rgb_theme_t rgb_granite; +extern const HSV oblique_white; +extern const HSV oblique_purple; +extern const HSV oblique_red; +extern const HSV oblique_orange; +extern const HSV oblique_green; +extern const rgb_theme_t rgb_oblique; + extern const HSV default_magic; extern const rgb_theme_t *themes[]; From b146fcb6478275edb26cb9f186b49158db56b255 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Wed, 14 Aug 2019 22:53:11 -0700 Subject: [PATCH 140/429] [User] Refactor rgb_theme for Massdrop --- .../alt/keymaps/brandonschlack/keymap.c | 1 + users/brandonschlack/rgb_bs.c | 45 ++++++++++--------- users/brandonschlack/rgb_theme.h | 30 ++----------- 3 files changed, 28 insertions(+), 48 deletions(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index dd3896807cd0..90ad9b0e9bfc 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -92,6 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Runs just one time when the keyboard initializes. void matrix_init_keymap(void) { + set_rgb_theme(LASER); }; // Runs once after keyboard initializes diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index 82b1bc62a16e..8d921e384ee0 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -1,4 +1,5 @@ #include "brandonschlack.h" +#include "rgb_theme.h" #include "rgb_bs.h" #if defined(RGBLIGHT_ENABLE) @@ -9,30 +10,30 @@ extern bool g_suspend_state; extern led_config_t g_led_config; #endif -const HSV default_magic = { HSV_SPRINGGREEN }; +static const HSV default_magic = { HSV_SPRINGGREEN }; -const HSV laser_purple = { HSV_LSR_PURPLE }; -const HSV laser_pink = { HSV_LSR_PINK }; -const HSV laser_blue = { HSV_LSR_BLUE }; -const HSV laser_cyan = { HSV_LSR_CYAN }; -const HSV laser_magenta = { HSV_LSR_MAGENTA }; -const rgb_theme_t rgb_laser = { LASER, { laser_purple, laser_pink, laser_blue, laser_cyan, laser_magenta } }; +static const HSV laser_purple = { HSV_LSR_PURPLE }; +static const HSV laser_pink = { HSV_LSR_PINK }; +static const HSV laser_blue = { HSV_LSR_BLUE }; +static const HSV laser_cyan = { HSV_LSR_CYAN }; +static const HSV laser_magenta = { HSV_LSR_MAGENTA }; +static const rgb_theme_t rgb_laser = { LASER, { &laser_purple, &laser_pink, &laser_blue, &laser_cyan, &laser_magenta } }; -const HSV granite_white = { HSV_GNT_WHITE }; -const HSV granite_blue = { HSV_GNT_BLUE }; -const HSV granite_red = { HSV_GNT_RED }; -const HSV granite_green = { HSV_GNT_GREEN }; -const HSV granite_yellow = { HSV_GNT_YELLOW }; -const rgb_theme_t rgb_granite = { GRANITE, { granite_white, granite_blue, granite_red, granite_green, granite_yellow } }; +static const HSV granite_white = { HSV_GNT_WHITE }; +static const HSV granite_blue = { HSV_GNT_BLUE }; +static const HSV granite_red = { HSV_GNT_RED }; +static const HSV granite_green = { HSV_GNT_GREEN }; +static const HSV granite_yellow = { HSV_GNT_YELLOW }; +static const rgb_theme_t rgb_granite = { GRANITE, { &granite_white, &granite_blue, &granite_red, &granite_green, &granite_yellow } }; -const HSV oblique_white = { HSV_OBQ_WHITE }; -const HSV oblique_purple = { HSV_OBQ_PURPLE }; -const HSV oblique_red = { HSV_OBQ_RED }; -const HSV oblique_orange = { HSV_OBQ_ORANGE }; -const HSV oblique_green = { HSV_OBQ_GREEN }; -const rgb_theme_t rgb_oblique = { OBLIQUE, { oblique_white, oblique_purple, oblique_red, oblique_orange, oblique_green } }; +static const HSV oblique_white = { HSV_OBQ_WHITE }; +static const HSV oblique_purple = { HSV_OBQ_PURPLE }; +static const HSV oblique_red = { HSV_OBQ_RED }; +static const HSV oblique_orange = { HSV_OBQ_ORANGE }; +static const HSV oblique_green = { HSV_OBQ_GREEN }; +static const rgb_theme_t rgb_oblique = { OBLIQUE, { &oblique_white, &oblique_purple, &oblique_red, &oblique_orange, &oblique_green } }; -const rgb_theme_t *themes[] = { &rgb_laser, &rgb_granite, &rgb_oblique }; +static const rgb_theme_t *themes[] = { &rgb_laser, &rgb_granite, &rgb_oblique }; void keyboard_post_init_rgb(void) { layer_state_set_user(layer_state); @@ -97,11 +98,11 @@ void rgb_layer_helper(uint8_t hue, uint8_t sat, uint8_t val) { HSV get_rgb_theme_color(uint8_t index) { rgb_theme_t theme = get_rgb_theme(); - size_t rgb_theme_color_max = sizeof theme.colors / sizeof theme.colors[0]; + size_t rgb_theme_color_max = sizeof theme.colors / sizeof *theme.colors; HSV color; if (index < rgb_theme_color_max) { - color = theme.colors[index]; + color = *theme.colors[index]; } else if (index == _MAGIC) { color = default_magic; } else { diff --git a/users/brandonschlack/rgb_theme.h b/users/brandonschlack/rgb_theme.h index bce57184476a..ee3322309a69 100644 --- a/users/brandonschlack/rgb_theme.h +++ b/users/brandonschlack/rgb_theme.h @@ -1,3 +1,6 @@ +#pragma once + +#include "brandonschlack.h" #include "color.h" #include "rgblight_list.h" @@ -63,34 +66,9 @@ typedef enum { typedef struct { rgb_theme_name_t theme; - HSV colors[5]; + const HSV *colors[5]; } rgb_theme_t; -extern const HSV laser_purple; -extern const HSV laser_pink; -extern const HSV laser_blue; -extern const HSV laser_cyan; -extern const HSV laser_magenta; -extern const rgb_theme_t rgb_laser; - -extern const HSV granite_white; -extern const HSV granite_blue; -extern const HSV granite_red; -extern const HSV granite_green; -extern const HSV granite_yellow; -extern const rgb_theme_t rgb_granite; - -extern const HSV oblique_white; -extern const HSV oblique_purple; -extern const HSV oblique_red; -extern const HSV oblique_orange; -extern const HSV oblique_green; -extern const rgb_theme_t rgb_oblique; - -extern const HSV default_magic; - -extern const rgb_theme_t *themes[]; - void set_rgb_theme(rgb_theme_name_t theme_name); rgb_theme_t get_rgb_theme(void); From 0bea1c43537489458904f8fda1bb19a45ade8716 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 15 Aug 2019 13:14:26 -0700 Subject: [PATCH 141/429] [User] Add rgb_theme controls --- .../kbd75/keymaps/brandonschlack/keymap.c | 4 --- .../bdn9/keymaps/brandonschlack/keymap.c | 8 ++--- .../alt/keymaps/brandonschlack/keymap.c | 1 - users/brandonschlack/brandonschlack.c | 1 + users/brandonschlack/process_records.c | 31 +++++++++++++++++ users/brandonschlack/process_records.h | 7 ++++ users/brandonschlack/rgb_bs.c | 13 ++++++++ users/brandonschlack/rgb_theme.h | 33 ++----------------- 8 files changed, 57 insertions(+), 41 deletions(-) diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c index 9afc5efd7363..a382b43706ca 100644 --- a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c @@ -111,7 +111,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX ), }; - -void matrix_init_keymap(void) { - set_rgb_theme(OBLIQUE); -} diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 642d814fae8c..f076f5b60b48 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -165,13 +165,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ├────────┼────────┼────────┤ │ Mode- │ Val- │ Mode+ │ ├────────┼────────┼────────┤ - │ Plain │ Breath │ XXXX │ + │ LyrTgl │ NxtThm │ XXXX │ └────────┴────────┴────────┘ */ [_LIGHT] = LAYOUT( RGB_TOG, RGB_VAI, TG_LGHT, RGB_RMOD,RGB_VAD, RGB_MOD, - RGB_M_P, RGB_M_B, XXXXXXX + RGB_LYR, RGB_THM, XXXXXXX ), /* Layer: Magic @@ -193,10 +193,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -void matrix_init_keymap(void) { - set_rgb_theme(OBLIQUE); -} - /** * Encoder */ diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index 90ad9b0e9bfc..dd3896807cd0 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -92,7 +92,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Runs just one time when the keyboard initializes. void matrix_init_keymap(void) { - set_rgb_theme(LASER); }; // Runs once after keyboard initializes diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index d8a1182f0fbb..e4aad6e04efa 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -5,6 +5,7 @@ user_config_t user_config; void eeconfig_init_user(void) { // EEPROM is getting reset! user_config.raw = 0; user_config.rgb_layer_change = true; + user_config.rgb_theme = 0; eeconfig_update_user(user_config.raw); } __attribute__((weak)) diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index ee3c6e760da5..5111e7693d85 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -65,6 +65,37 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } break; #endif // IS_MACROPAD + #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) + case RGB_LYR: + if (record->event.pressed) { + user_config.rgb_layer_change ^= 1; + eeconfig_update_user(user_config.raw); + if (user_config.rgb_layer_change) { // if layer state indication is enabled, + layer_state_set(layer_state); // then immediately update the layer color + } + } + break; + case RGB_THEME_FORWARD: + if (record->event.pressed) { + uint8_t shifted = get_mods() & (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)); + if(shifted) { + rgb_theme_step_reverse(); + } else { + rgb_theme_step(); + } + } + break; + case RGB_THEME_REVERSE: + if (record->event.pressed) { + uint8_t shifted = get_mods() & (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)); + if(shifted) { + rgb_theme_step(); + } else { + rgb_theme_step_reverse(); + } + } + break; + #endif } return process_record_keymap(keycode, record); } diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 8ec3d1d38ec3..63f51983757e 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -9,6 +9,9 @@ enum custom_keycodes { TG_REDR, TG_MEDA, TG_KYPD, + RGB_LYR, + RGB_THEME_FORWARD, + RGB_THEME_REVERSE, KEYMAP_SAFE_RANGE }; @@ -54,4 +57,8 @@ void matrix_scan_cmd_tab(void); #define MC_WH_L KC_WH_R #define MC_WH_R KC_WH_L +// RGB Theme +#define RGB_THM RGB_THEME_FORWARD +#define RGB_RTHM RGB_THEME_REVERSE + void send_make_command(bool flash_bootloader); diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index 8d921e384ee0..e8931e3c1e37 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -34,6 +34,7 @@ static const HSV oblique_green = { HSV_OBQ_GREEN }; static const rgb_theme_t rgb_oblique = { OBLIQUE, { &oblique_white, &oblique_purple, &oblique_red, &oblique_orange, &oblique_green } }; static const rgb_theme_t *themes[] = { &rgb_laser, &rgb_granite, &rgb_oblique }; +static const size_t rgb_theme_max = (sizeof themes / sizeof *themes); void keyboard_post_init_rgb(void) { layer_state_set_user(layer_state); @@ -56,6 +57,18 @@ rgb_theme_t get_rgb_theme(void) { return *themes[user_config.rgb_theme]; } +void rgb_theme_step(void) { + rgb_theme_name_t current = user_config.rgb_theme; + current = (current + 1) % rgb_theme_max; + set_rgb_theme(current); +} + +void rgb_theme_step_reverse(void) { + rgb_theme_name_t current = user_config.rgb_theme; + current = (current - 1) % rgb_theme_max; + set_rgb_theme(current); +} + #ifdef RGB_MATRIX_ENABLE void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, uint8_t led_type) { for (int i = 0; i < DRIVER_LED_TOTAL; i++) { diff --git a/users/brandonschlack/rgb_theme.h b/users/brandonschlack/rgb_theme.h index ee3322309a69..f9b90aac2fcd 100644 --- a/users/brandonschlack/rgb_theme.h +++ b/users/brandonschlack/rgb_theme.h @@ -28,36 +28,6 @@ #define HSV_OBQ_PURPLE 186, 143, 255 #define HSV_OBQ_WHITE HSV_WHITE -// Theme Colors -#if defined(THEME_LASER) -# define HSV_THEME_0 HSV_LSR_PURPLE -# define HSV_THEME_1 HSV_LSR_PINK -# define HSV_THEME_2 HSV_LSR_BLUE -# define HSV_THEME_3 HSV_LSR_CYAN -#elif defined(THEME_GRANITE) -# define HSV_THEME_0 HSV_GNT_WHITE -# define HSV_THEME_1 HSV_GNT_BLUE -# define HSV_THEME_2 HSV_GNT_RED -# define HSV_THEME_3 HSV_GNT_YELLOW -#else -# define HSV_THEME_0 HSV_LSR_PURPLE -# define HSV_THEME_1 HSV_LSR_PINK -# define HSV_THEME_2 HSV_LSR_BLUE -# define HSV_THEME_3 HSV_LSR_CYAN -#endif - -// Set Color for Light Layer -#if !defined(HSV_THEME_L) && defined(HSV_THEME_0) -# define HSV_THEME_L HSV_THEME_0 -#else -# define HSV_THEME_L HSV_CORAL -#endif -// Set Color for Magic Layer -#if !defined(HSV_THEME_M) -# define HSV_THEME_M HSV_SPRINGGREEN -#endif - - typedef enum { LASER = 0, GRANITE, @@ -72,5 +42,8 @@ typedef struct { void set_rgb_theme(rgb_theme_name_t theme_name); rgb_theme_t get_rgb_theme(void); +void rgb_theme_step(void); +void rgb_theme_step_reverse(void); + HSV get_rgb_theme_color(uint8_t index); #endif From 7a722f7df9f4b7a4d100d47a291f45d747e9c922 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 15 Aug 2019 16:10:36 -0700 Subject: [PATCH 142/429] [User] RGB Theme clean up --- .../kbd75/keymaps/brandonschlack/rules.mk | 3 - .../bdn9/keymaps/brandonschlack/rules.mk | 3 - .../launchpad/keymaps/brandonschlack/rules.mk | 3 - .../alt/keymaps/brandonschlack/rules.mk | 3 - users/brandonschlack/rgb_bs.c | 88 +------------------ users/brandonschlack/rules.mk | 8 -- 6 files changed, 4 insertions(+), 104 deletions(-) diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk index 5cf300c2d232..fcf5af061d89 100644 --- a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk +++ b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk @@ -7,6 +7,3 @@ BOOTLOADER = atmel-dfu CONSOLE_ENABLE = yes # Console for Debug (+400) MOUSEKEY_ENABLE = no # Don't need Mouse Keys BACKLIGHT_ENABLE = no # No backlights installed - -# Userspace Options -RGB_THEME = granite # Set RGB colors to Granite Theme diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk index 79971a83eb87..666348d18208 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk @@ -9,6 +9,3 @@ MOUSEKEY_ENABLE = yes # Mouse keys(+4700) COMMAND_ENABLE = no # Disable Command, breaks with Mouse Keys set to constant. BACKLIGHT_ENABLE = no # No backlights installed TAP_DANCE_ENABLE = yes # Use tap dance - -# Userspace Options -RGB_THEME = granite # Set RGB colors to Granite Theme diff --git a/keyboards/launchpad/keymaps/brandonschlack/rules.mk b/keyboards/launchpad/keymaps/brandonschlack/rules.mk index b11bbdb01ce1..6362c6fb5638 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/rules.mk +++ b/keyboards/launchpad/keymaps/brandonschlack/rules.mk @@ -10,6 +10,3 @@ CONSOLE_ENABLE = yes # Console for debug(+400) MOUSEKEY_ENABLE = yes # Use mouse keys for scrolling. COMMAND_ENABLE = no # Disable Command, breaks with Mouse Keys set to constant. TAP_DANCE_ENABLE = yes # Use tap dance - -# Userspace Options -RGB_THEME = granite # Set RGB colors to Granite Theme diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk b/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk index 3abb9b657897..c12d998b005e 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk @@ -1,5 +1,2 @@ # Use mdloader for flashing BOOTLOADER = mdloader - -# Userspace Options -RGB_THEME = laser # Set RGB colors to Laser theme diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index e8931e3c1e37..3cd1decf7b1d 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -112,103 +112,23 @@ void rgb_layer_helper(uint8_t hue, uint8_t sat, uint8_t val) { HSV get_rgb_theme_color(uint8_t index) { rgb_theme_t theme = get_rgb_theme(); size_t rgb_theme_color_max = sizeof theme.colors / sizeof *theme.colors; - HSV color; - if (index < rgb_theme_color_max) { - color = *theme.colors[index]; - } else if (index == _MAGIC) { - color = default_magic; + if (index == _MAGIC) { + return default_magic; } else { -#if defined(RGBLIGHT_ENABLE) - rgblight_config.raw = eeconfig_read_rgblight(); - color = (HSV){ rgblight_config.hue, rgblight_config.sat, rgblight_config.val }; -#elif defined(RGB_MATRIX_ENABLE) - color = (HSV){ rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v }; -#endif + return **(theme.colors + (index % rgb_theme_color_max)); } - return color; }; void rgb_theme_layer(layer_state_t state) { uint8_t rgb_color_index = biton32(state); HSV color = get_rgb_theme_color(rgb_color_index); - // if (index < MAX) { - // color = *(rgb_theme.colors[index]); - // } else if (rgb_color_index == _MAGIC) { - // color = { HSV_THEME_M }; - // } rgb_layer_helper( color.h, color.s, color.v ); -// switch (biton32(state)) { -// #ifndef IS_MACROPAD -// case _MACFN: -// rgb_layer_helper(HSV_THEME_1); -// break; -// #else -// case _REEDER: -// rgb_layer_helper(HSV_THEME_1); -// break; -// case _MEDIA: -// rgb_layer_helper(HSV_THEME_2); -// break; -// case _KEYPAD: -// rgb_layer_helper(HSV_THEME_3); -// break; -// #endif -// case _MAGIC: -// rgb_layer_helper(HSV_THEME_M); -// break; -// default: -// switch (biton32(default_layer_state)) { -// #ifndef IS_MACROPAD -// case _MAC: -// rgb_layer_helper(HSV_THEME_0); -// break; -// #else -// case _NAVI: -// rgb_layer_helper(HSV_THEME_0); -// break; -// #endif -// } -// break; -// } } layer_state_t layer_state_set_rgb(layer_state_t state) { - #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) -// switch (biton32(state)) { -// #ifndef IS_MACROPAD -// case _MACFN: -// rgb_layer_helper(HSV_THEME_1); -// break; -// #else -// case _REEDER: -// rgb_layer_helper(HSV_THEME_1); -// break; -// case _MEDIA: -// rgb_layer_helper(HSV_THEME_2); -// break; -// case _KEYPAD: -// rgb_layer_helper(HSV_THEME_3); -// break; -// #endif -// case _MAGIC: -// rgb_layer_helper(HSV_THEME_M); -// break; -// default: -// switch (biton32(default_layer_state)) { -// #ifndef IS_MACROPAD -// case _MAC: -// rgb_layer_helper(HSV_THEME_0); -// break; -// #else -// case _NAVI: -// rgb_layer_helper(HSV_THEME_0); -// break; -// #endif -// } -// break; -// } +#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) rgb_theme_layer(state); #endif // RGBLIGHT_ENABLE return state; diff --git a/users/brandonschlack/rules.mk b/users/brandonschlack/rules.mk index bbf213f40d41..7de73c024e2a 100644 --- a/users/brandonschlack/rules.mk +++ b/users/brandonschlack/rules.mk @@ -20,14 +20,6 @@ ifneq ($(strip $(RGB_MATRIX_ENABLE)), no) SRC += rgb_bs.c endif -ifdef RGB_THEME - ifeq ($(strip $(RGB_THEME)), laser) - OPT_DEFS += -DTHEME_LASER - else ifeq ($(strip $(RGB_THEME)), granite) - OPT_DEFS += -DTHEME_GRANITE - endif -endif - ifeq ($(strip $(TAP_DANCE_ENABLE)), yes) SRC += tap_dances.c endif From 3bebd41afa66ecd046303621d34014861954a540 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 15 Aug 2019 16:12:32 -0700 Subject: [PATCH 143/429] [Keymap] Implement RGB Theme in keymaps --- keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c | 4 ++-- keyboards/launchpad/keymaps/brandonschlack/keymap.c | 4 ++-- keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c | 4 ++-- users/brandonschlack/process_records.c | 7 +++++++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c index a382b43706ca..5afb3c8b5d14 100644 --- a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ * │ │Hu-│St-│Vl-│ │ │ │ │ │ │ │ │Magic │ │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │ │RTg│ │ │ │ │ │ │ │ │ │MteSft│PgU│ │ + * │ │RTg│LYR│Thm│ │ │ │ │ │ │ │MteSft│PgU│ │ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ * │ │ │ │ │ │ │ │Hom│PgD│End│ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, MC_SLPD, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, MC_LHPD, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, _______, - _______, _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, KC_PGUP, _______, + _______, _______, RGB_TOG, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, KC_PGUP, _______, _______, _______, _______, _______, TG(_LIGHT), _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), /* Keyboard Layer: Light diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index 685d5dcb9c27..caae93066ffb 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Lights * ┌──────┬──────┐ - * │ HUE- │ HUE+ │ + * │ THM+ │ HUE+ │ * ├──────┼──────┤ * │ SAT- │ SAT+ │ * ├──────┼──────┤ @@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └──────┴──────┘ */ [_LIGHT] = LAYOUT( \ - RGB_HUD, RGB_HUI, \ + RGB_THM, RGB_HUI, \ RGB_SAD, RGB_SAI, \ RGB_VAD, RGB_VAI, \ XXXXXXX, RGB_MOD \ diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index dd3896807cd0..c1dedcfe008a 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------| * | |RM-|RB-|RM+|RH-|RS-| | | | | | | TgMagic| | * |---------------------------------------------------------------| - * | |RTO| | | | |KRO| | | | | | | | + * | |RTO|LYR|Thm| | |KRO| | | | | | | | * |---------------------------------------------------------------| * | | | | | | | | | | | * `---------------------------------------------------------------' @@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, XXXXXXX, U_T_AUTO,U_T_AGCR,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, \ - _______, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_NKRO, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, \ + _______, RGB_TOG, RGB_LYR, RGB_THM, XXXXXXX, XXXXXXX, TG_NKRO, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, \ _______, _______, _______, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX \ ), /* diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index 5111e7693d85..9f4261cfd52a 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -75,6 +75,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } } break; + case RGB_HUI ... RGB_VAD: + if (record->event.pressed) { + if (user_config.rgb_layer_change) { // only if this is enabled + user_config.rgb_layer_change = false; // disable it, and + eeconfig_update_user(user_config.raw); // write the setings to EEPROM + } + } case RGB_THEME_FORWARD: if (record->event.pressed) { uint8_t shifted = get_mods() & (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)); From 6eb049963a5cf0277eddb8bd23e93cff2d3ee90b Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Fri, 16 Aug 2019 10:27:10 -0700 Subject: [PATCH 144/429] [User] Add layer_state_set call when change theme --- users/brandonschlack/process_records.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index 9f4261cfd52a..410763d512f2 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -70,16 +70,16 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { user_config.rgb_layer_change ^= 1; eeconfig_update_user(user_config.raw); - if (user_config.rgb_layer_change) { // if layer state indication is enabled, - layer_state_set(layer_state); // then immediately update the layer color + if (user_config.rgb_layer_change) { + layer_state_set(layer_state); } } break; case RGB_HUI ... RGB_VAD: if (record->event.pressed) { - if (user_config.rgb_layer_change) { // only if this is enabled - user_config.rgb_layer_change = false; // disable it, and - eeconfig_update_user(user_config.raw); // write the setings to EEPROM + if (user_config.rgb_layer_change) { + user_config.rgb_layer_change = false; + eeconfig_update_user(user_config.raw); } } case RGB_THEME_FORWARD: @@ -90,6 +90,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } else { rgb_theme_step(); } + layer_state_set(layer_state); } break; case RGB_THEME_REVERSE: @@ -100,6 +101,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } else { rgb_theme_step_reverse(); } + layer_state_set(layer_state); } break; #endif From 100cb5660105fbb19f62a1c86e92c64396d5f3b0 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 16 Aug 2019 11:54:39 -0700 Subject: [PATCH 145/429] [Keymap] Update keymap cosmetics --- .../alt/keymaps/brandonschlack/keymap.c | 85 +++++++++++-------- 1 file changed, 48 insertions(+), 37 deletions(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index c1dedcfe008a..a3a0c0fc4100 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -17,60 +17,60 @@ keymap_config_t keymap_config; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base Layer: Mac - * ,---------------------------------------------------------------. - * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| Backs|Pwr| - * |---------------------------------------------------------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \|Hom| - * |---------------------------------------------------------------| - * |HyCap | A| S| D| F| G| H| J| K| L| ;| '|Enter |PgU| - * |---------------------------------------------------------------| - * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |PgD| - * |---------------------------------------------------------------| - * |Ctl |Alt |Gui | Space |Gui |FnPy| |Lef|Dow|Rig| - * `---------------------------------------------------------------' + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│~ `│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│| \│Hom│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│PgU│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│PgD│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * │Ctrl│ Opt│ Cmd│ Space │Cmd │FnPy│ │Lef│Dow│Rig│ + * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ [_MAC] = LAYOUT( - 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, MC_POWR, \ + 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_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_BSLS, KC_HOME, \ HY_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_PGUP, \ 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_UP, KC_PGDN, \ KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Function Layer: Mac - * ,---------------------------------------------------------------. - * | `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| Del|SLP| - * |---------------------------------------------------------------| - * | | | | |DFU| | | | | |F13|F14|F15| LHP|End| - * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgMagic|VlU| - * |---------------------------------------------------------------| - * | |RTO| | | | | |MKE|Prv|Nxt|Ply|MutSft|PgU|VlD| - * |---------------------------------------------------------------| - * | | | | | | | |Hom|PgD|End| - * `---------------------------------------------------------------' + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │Mke│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ Del │SlD│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │ │ │ │ │DFU│ │ │ │ │ │F13│F14│F15│ LHP │End│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ Magic │VlU│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ │RTg│ │ │ │ │ │ │Prv│Nxt│Ply│MteSft│PgU│VlD│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * │ │ │ │ │ │ │ │Hom│PgD│End│ + * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ [_MACFN] = LAYOUT( - 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, MC_SLPD, \ + KC_MAKE, 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, MC_SLPD, \ _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLU, \ - _______, RGB_TOG, _______, _______, _______, _______, _______, KC_MAKE, KC_MRWD, KC_MFFD, KC_MPLY, MM_RSFT, KC_PGUP, KC_VOLD, \ + _______, RGB_TOG, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, MM_RSFT, KC_PGUP, KC_VOLD, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), /*********** * Magic * ***********/ /* Keyboard Layer: Magic - * ,---------------------------------------------------------------. - * | | | | | | | | | | | | | | | | - * |---------------------------------------------------------------| - * | |RS-|RB+|RS+|RH+|RS+| |UAD|GCR| | | | | | | - * |---------------------------------------------------------------| - * | |RM-|RB-|RM+|RH-|RS-| | | | | | | TgMagic| | - * |---------------------------------------------------------------| - * | |RTO|LYR|Thm| | |KRO| | | | | | | | - * |---------------------------------------------------------------| - * | | | | | | | | | | | - * `---------------------------------------------------------------' + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │ │RS-│RB+│RS+│RH+│RS+│ │UAD│GCR│ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ │RM-│RB-│RM+│RH-│RS-│ │ │ │ │ │ │ Magic │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ │RTO│LYR│Thm│ │ │KRO│ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ [_MAGIC] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ @@ -79,7 +79,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, RGB_TOG, RGB_LYR, RGB_THM, XXXXXXX, XXXXXXX, TG_NKRO, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, \ _______, _______, _______, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX \ ), - /* + /* Blank Layout + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ [X] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ From df878b03673b10b0e4e59d81a130e752e24a633e Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 16 Aug 2019 15:57:58 -0700 Subject: [PATCH 146/429] [Keymap] Update BDN9 keymap readme for theme. --- keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md index cd5765bf92b5..c0be2bd041d7 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md @@ -93,7 +93,7 @@ This layer is used to control lighting for the pad. Currently nothing is saved i | --- | --- | --- | | RGB Toggle | RGB Value Increase | Toggle Layer Off | | RGB Mode Prev | RGB Value Decrease | RGB Mode Next | -| RGB Mode Plain | RGB Mode Breathing | XXX | +| RGB Layer Indication | Cycle RGB Themes | XXX | ### Magic Layer From 0411b55828452a132b8220b73150806606cc7f0a Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 16 Aug 2019 17:23:22 -0700 Subject: [PATCH 147/429] [User] RGB theme comments and some cleanup --- users/brandonschlack/rgb_bs.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index 3cd1decf7b1d..c4ec174a873f 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -12,6 +12,7 @@ extern led_config_t g_led_config; static const HSV default_magic = { HSV_SPRINGGREEN }; +// Laser Color Constants static const HSV laser_purple = { HSV_LSR_PURPLE }; static const HSV laser_pink = { HSV_LSR_PINK }; static const HSV laser_blue = { HSV_LSR_BLUE }; @@ -19,6 +20,7 @@ static const HSV laser_cyan = { HSV_LSR_CYAN }; static const HSV laser_magenta = { HSV_LSR_MAGENTA }; static const rgb_theme_t rgb_laser = { LASER, { &laser_purple, &laser_pink, &laser_blue, &laser_cyan, &laser_magenta } }; +// Granite Color Constants static const HSV granite_white = { HSV_GNT_WHITE }; static const HSV granite_blue = { HSV_GNT_BLUE }; static const HSV granite_red = { HSV_GNT_RED }; @@ -26,13 +28,14 @@ static const HSV granite_green = { HSV_GNT_GREEN }; static const HSV granite_yellow = { HSV_GNT_YELLOW }; static const rgb_theme_t rgb_granite = { GRANITE, { &granite_white, &granite_blue, &granite_red, &granite_green, &granite_yellow } }; +// Oblique Color Constants static const HSV oblique_white = { HSV_OBQ_WHITE }; static const HSV oblique_purple = { HSV_OBQ_PURPLE }; static const HSV oblique_red = { HSV_OBQ_RED }; static const HSV oblique_orange = { HSV_OBQ_ORANGE }; static const HSV oblique_green = { HSV_OBQ_GREEN }; static const rgb_theme_t rgb_oblique = { OBLIQUE, { &oblique_white, &oblique_purple, &oblique_red, &oblique_orange, &oblique_green } }; - +// Set themes to be included static const rgb_theme_t *themes[] = { &rgb_laser, &rgb_granite, &rgb_oblique }; static const size_t rgb_theme_max = (sizeof themes / sizeof *themes); @@ -129,7 +132,9 @@ void rgb_theme_layer(layer_state_t state) { layer_state_t layer_state_set_rgb(layer_state_t state) { #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) - rgb_theme_layer(state); + if (user_config.rgb_layer_change) { + rgb_theme_layer(state); + } #endif // RGBLIGHT_ENABLE return state; } From ac26328af2d82e242d228dba2cd8432fe79f6d97 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 16 Aug 2019 18:51:04 -0700 Subject: [PATCH 148/429] [User] Initial user readme --- users/brandonschlack/readme.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 users/brandonschlack/readme.md diff --git a/users/brandonschlack/readme.md b/users/brandonschlack/readme.md new file mode 100644 index 000000000000..2409e25e12c5 --- /dev/null +++ b/users/brandonschlack/readme.md @@ -0,0 +1,6 @@ +# Overview + +My QMK home. I feel as though I stand on the shoulders of giants, for a lot of my code here is borrowed and adapted from so many contributors here (namely Drashna and Konstantin), and that I hope my here helps can others. + +## brandonschlack.c + From 53536fe5d6620741391c217476f1410da5cdadf1 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Mon, 19 Aug 2019 17:11:30 -0700 Subject: [PATCH 149/429] [Keymap] Try adding suspend to Massdrop ALT map --- .../massdrop/alt/keymaps/brandonschlack/keymap.c | 12 ++++++++++++ users/brandonschlack/brandonschlack.c | 4 ++++ 2 files changed, 16 insertions(+) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index a3a0c0fc4100..3204a52e1bd2 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -177,3 +177,15 @@ void rgb_matrix_indicators_user(void) { rgb_matrix_set_color(USB_LED_CAPS_LOCK_SCANCODE, 0, 0, 0); } } + +// Add suspend functionality +void suspend_power_down_kb(void) { + rgb_matrix_set_suspend_state(true); + suspend_power_down_user(); +} + +// Add wakeup functionality +void suspend_wakeup_init_kb(void) { + rgb_matrix_set_suspend_state(false); + suspend_wakeup_init_user(); +} diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index e4aad6e04efa..9b366e3d1f36 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -47,7 +47,9 @@ void suspend_power_down_keymap(void) {} void suspend_power_down_user(void) { #ifdef RGB_MATRIX_ENABLE + if (!g_suspend_state) { rgb_matrix_set_suspend_state(true); + } #endif //RGB_MATRIX_ENABLE suspend_power_down_keymap(); } @@ -57,7 +59,9 @@ void suspend_wakeup_init_keymap(void) {} void suspend_wakeup_init_user(void) { #ifdef RGB_MATRIX_ENABLE + if (g_suspend_state) { rgb_matrix_set_suspend_state(false); + } #endif //RGB_MATRIX_ENABLE suspend_wakeup_init_keymap(); } From d8fb1748e922c548dd90d1b7880ddef604b1adc5 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Mon, 19 Aug 2019 17:55:12 -0700 Subject: [PATCH 150/429] [User] RGB Theme respects brightness level --- users/brandonschlack/process_records.c | 2 +- users/brandonschlack/rgb_bs.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index 410763d512f2..cf65ca8d558b 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -75,7 +75,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } } break; - case RGB_HUI ... RGB_VAD: + case RGB_HUI ... RGB_SAD: if (record->event.pressed) { if (user_config.rgb_layer_change) { user_config.rgb_layer_change = false; diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index c4ec174a873f..315c6c35fd94 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -126,7 +126,11 @@ HSV get_rgb_theme_color(uint8_t index) { void rgb_theme_layer(layer_state_t state) { uint8_t rgb_color_index = biton32(state); HSV color = get_rgb_theme_color(rgb_color_index); - +#if defined(RGBLIGHT_ENABLE) + color.v = rgblight_config.val; +#elif defined(RGB_MATRIX_ENABLE) + color.v = rgb_matrix_config.hsv.v; +#endif rgb_layer_helper( color.h, color.s, color.v ); } From 30e67691f039f9b22ff744a4a546bfdf9f8f5b3d Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 20 Aug 2019 10:41:53 -0700 Subject: [PATCH 151/429] [User] Add define for RGBLIGHT || RGB_MATRIX --- users/brandonschlack/brandonschlack.c | 4 ++-- users/brandonschlack/brandonschlack.h | 8 ++++++-- users/brandonschlack/process_records.c | 2 +- users/brandonschlack/rgb_bs.c | 4 ++-- users/brandonschlack/rgb_theme.h | 2 +- users/brandonschlack/tap_dances.c | 2 +- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index 9b366e3d1f36..a9892fa36b0a 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -21,7 +21,7 @@ void keyboard_post_init_keymap(void){ } void keyboard_post_init_user(void){ // Read the user config from EEPROM user_config.raw = eeconfig_read_user(); -#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) +#if RGB_ENABLE keyboard_post_init_rgb(); #endif keyboard_post_init_keymap(); @@ -82,7 +82,7 @@ layer_state_t layer_state_set_keymap (layer_state_t state) { // on layer change, no matter where the change was initiated // Then runs keymap's layer change check layer_state_t layer_state_set_user(layer_state_t state) { -#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) +#if RGB_ENABLE state = layer_state_set_rgb(state); #endif // RGBLIGHT_ENABLE return layer_state_set_keymap (state); diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 36ceb9601f72..2d28fb8fff9b 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -10,7 +10,10 @@ # include "rgb_bs.h" #endif -// Define layer names +// Useful Defines +#define RGB_ENABLE (defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)) + +// Layer Names #ifndef IS_MACROPAD enum bs_layers { _MAC = 0, @@ -27,6 +30,7 @@ enum macropad_layers { #endif #define _MAGIC 15 +// User Config typedef union { uint32_t raw; struct { @@ -34,9 +38,9 @@ typedef union { uint8_t rgb_theme :2; }; } user_config_t; - extern user_config_t user_config; +// Function Handlers for Keymaps void matrix_init_keymap(void); void keyboard_post_init_keymap(void); void shutdown_keymap(void); diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index cf65ca8d558b..d22b9732af0f 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -65,7 +65,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } break; #endif // IS_MACROPAD - #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) + #if RGB_ENABLE case RGB_LYR: if (record->event.pressed) { user_config.rgb_layer_change ^= 1; diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index 315c6c35fd94..3e5f04f7e417 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -104,7 +104,7 @@ void rgb_matrix_cycle_flag (void) { #endif void rgb_layer_helper(uint8_t hue, uint8_t sat, uint8_t val) { -#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) +#if RGB_ENABLE rgblight_sethsv_noeeprom(hue, sat, val); #ifdef RGB_MATRIX_ENABLE rgb_matrix_layer_helper(0, 0, 0, rgb_matrix_get_flags()); @@ -135,7 +135,7 @@ void rgb_theme_layer(layer_state_t state) { } layer_state_t layer_state_set_rgb(layer_state_t state) { -#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) +#if RGB_ENABLE if (user_config.rgb_layer_change) { rgb_theme_layer(state); } diff --git a/users/brandonschlack/rgb_theme.h b/users/brandonschlack/rgb_theme.h index f9b90aac2fcd..bbb8efb4f8c3 100644 --- a/users/brandonschlack/rgb_theme.h +++ b/users/brandonschlack/rgb_theme.h @@ -4,7 +4,7 @@ #include "color.h" #include "rgblight_list.h" -#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) +#if RGB_ENABLE // Laser Colors #define HSV_LSR_PURPLE HSV_PURPLE diff --git a/users/brandonschlack/tap_dances.c b/users/brandonschlack/tap_dances.c index 7cc44bc7ae81..1150029b12ac 100644 --- a/users/brandonschlack/tap_dances.c +++ b/users/brandonschlack/tap_dances.c @@ -24,7 +24,7 @@ void td_trigger_layer_finished (qk_tap_dance_state_t *state, void *user_data) { qk_tap_dance_trigger_layer_t *data = (qk_tap_dance_trigger_layer_t *)user_data; data->state = cur_dance(state); -#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) +#if RGB_ENABLE if ((data->layer == _LIGHT) && ((data->trigger == SINGLE_HOLD && data->state == DOUBLE_TAP) || (data->trigger == DOUBLE_TAP && data->state == TRIPLE_TAP))) { rgblight_toggle(); } else if (data->state == data->trigger) { From c29ff1ca4862382367a70d29a0c9f6ac51966737 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 20 Aug 2019 10:52:32 -0700 Subject: [PATCH 152/429] [User] Add TG_LGHT define for TG(_LIGHT) --- .../kbdfans/kbd75/keymaps/brandonschlack/keymap.c | 10 +++++----- keyboards/launchpad/keymaps/brandonschlack/keymap.c | 2 +- users/brandonschlack/process_records.h | 3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c index 5afb3c8b5d14..5ee01368adf2 100644 --- a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c @@ -59,10 +59,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_MACFN] = LAYOUT( KC_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MRWD, KC_MFFD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, MC_SLPD, - RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, MC_LHPD, _______, + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, TG_LGHT, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, _______, _______, _______, RGB_TOG, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, KC_PGUP, _______, - _______, _______, _______, _______, TG(_LIGHT), _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), /* Keyboard Layer: Light * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ @@ -82,10 +82,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LIGHT] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_LGHT, XXXXXXX, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, _______, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, - _______, _______, _______, XXXXXXX, TG(_LIGHT), XXXXXXX, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX + _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX ), /* Keyboard Layer: Magic * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ @@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_MAGIC] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_LGHT, XXXXXXX, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, _______, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index caae93066ffb..04793c93ee8f 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -125,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MAKE, RESET, \ TG_NAVI, TG_REDR, \ TG_MEDA, TG_KYPD, \ - TG(_LIGHT), XXXXXXX \ + TG_LGHT, XXXXXXX \ ) }; diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 63f51983757e..38cc8d9d64cf 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -21,6 +21,9 @@ void matrix_scan_cmd_tab(void); // Useful Defines #define HY_CAPS ALL_T(KC_CAPS) #define TG_MAGC TG(_MAGIC) +#if RGB_ENABLE +#define TG_LGHT TG(_LIGHT) +#endif // Media Mod-Tap #define MM_RGUI RGUI_T(KC_MRWD) #define MM_RALT RALT_T(KC_MFFD) From a16e121afb8144e32bcd02c119a6b57fd20f4452 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 20 Aug 2019 12:16:53 -0700 Subject: [PATCH 153/429] [User] Revert define for RGBLIGHT || RGB_MATRIX This reverts commit 30e67691f039f9b22ff744a4a546bfdf9f8f5b3d. --- users/brandonschlack/brandonschlack.c | 4 ++-- users/brandonschlack/brandonschlack.h | 8 ++------ users/brandonschlack/process_records.c | 2 +- users/brandonschlack/process_records.h | 2 +- users/brandonschlack/rgb_bs.c | 4 ++-- users/brandonschlack/rgb_theme.h | 2 +- users/brandonschlack/tap_dances.c | 2 +- 7 files changed, 10 insertions(+), 14 deletions(-) diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index a9892fa36b0a..9b366e3d1f36 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -21,7 +21,7 @@ void keyboard_post_init_keymap(void){ } void keyboard_post_init_user(void){ // Read the user config from EEPROM user_config.raw = eeconfig_read_user(); -#if RGB_ENABLE +#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) keyboard_post_init_rgb(); #endif keyboard_post_init_keymap(); @@ -82,7 +82,7 @@ layer_state_t layer_state_set_keymap (layer_state_t state) { // on layer change, no matter where the change was initiated // Then runs keymap's layer change check layer_state_t layer_state_set_user(layer_state_t state) { -#if RGB_ENABLE +#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) state = layer_state_set_rgb(state); #endif // RGBLIGHT_ENABLE return layer_state_set_keymap (state); diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 2d28fb8fff9b..36ceb9601f72 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -10,10 +10,7 @@ # include "rgb_bs.h" #endif -// Useful Defines -#define RGB_ENABLE (defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)) - -// Layer Names +// Define layer names #ifndef IS_MACROPAD enum bs_layers { _MAC = 0, @@ -30,7 +27,6 @@ enum macropad_layers { #endif #define _MAGIC 15 -// User Config typedef union { uint32_t raw; struct { @@ -38,9 +34,9 @@ typedef union { uint8_t rgb_theme :2; }; } user_config_t; + extern user_config_t user_config; -// Function Handlers for Keymaps void matrix_init_keymap(void); void keyboard_post_init_keymap(void); void shutdown_keymap(void); diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index d22b9732af0f..cf65ca8d558b 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -65,7 +65,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } break; #endif // IS_MACROPAD - #if RGB_ENABLE + #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) case RGB_LYR: if (record->event.pressed) { user_config.rgb_layer_change ^= 1; diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 38cc8d9d64cf..600ae1272f7f 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -21,7 +21,7 @@ void matrix_scan_cmd_tab(void); // Useful Defines #define HY_CAPS ALL_T(KC_CAPS) #define TG_MAGC TG(_MAGIC) -#if RGB_ENABLE +#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) #define TG_LGHT TG(_LIGHT) #endif // Media Mod-Tap diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index 3e5f04f7e417..315c6c35fd94 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -104,7 +104,7 @@ void rgb_matrix_cycle_flag (void) { #endif void rgb_layer_helper(uint8_t hue, uint8_t sat, uint8_t val) { -#if RGB_ENABLE +#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) rgblight_sethsv_noeeprom(hue, sat, val); #ifdef RGB_MATRIX_ENABLE rgb_matrix_layer_helper(0, 0, 0, rgb_matrix_get_flags()); @@ -135,7 +135,7 @@ void rgb_theme_layer(layer_state_t state) { } layer_state_t layer_state_set_rgb(layer_state_t state) { -#if RGB_ENABLE +#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) if (user_config.rgb_layer_change) { rgb_theme_layer(state); } diff --git a/users/brandonschlack/rgb_theme.h b/users/brandonschlack/rgb_theme.h index bbb8efb4f8c3..f9b90aac2fcd 100644 --- a/users/brandonschlack/rgb_theme.h +++ b/users/brandonschlack/rgb_theme.h @@ -4,7 +4,7 @@ #include "color.h" #include "rgblight_list.h" -#if RGB_ENABLE +#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) // Laser Colors #define HSV_LSR_PURPLE HSV_PURPLE diff --git a/users/brandonschlack/tap_dances.c b/users/brandonschlack/tap_dances.c index 1150029b12ac..7cc44bc7ae81 100644 --- a/users/brandonschlack/tap_dances.c +++ b/users/brandonschlack/tap_dances.c @@ -24,7 +24,7 @@ void td_trigger_layer_finished (qk_tap_dance_state_t *state, void *user_data) { qk_tap_dance_trigger_layer_t *data = (qk_tap_dance_trigger_layer_t *)user_data; data->state = cur_dance(state); -#if RGB_ENABLE +#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) if ((data->layer == _LIGHT) && ((data->trigger == SINGLE_HOLD && data->state == DOUBLE_TAP) || (data->trigger == DOUBLE_TAP && data->state == TRIPLE_TAP))) { rgblight_toggle(); } else if (data->state == data->trigger) { From 90349d7f4a87afca92660cb3a94d4622b47d4405 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 20 Aug 2019 13:01:06 -0700 Subject: [PATCH 154/429] [User] Make RGB_THEME optional * Set RGB_THEME as a config option set on as default with RGBLIGHT or RGB_MATRIX. * RGB_THEME can be excluded to reduce memory by including #undef RGB_THEME in keymap. --- users/brandonschlack/config.h | 4 +++ users/brandonschlack/process_records.c | 2 +- users/brandonschlack/rgb_bs.c | 50 ++++++++++++++------------ users/brandonschlack/rgb_bs.h | 6 ++-- users/brandonschlack/rgb_theme.h | 4 +-- 5 files changed, 36 insertions(+), 30 deletions(-) diff --git a/users/brandonschlack/config.h b/users/brandonschlack/config.h index 8e1515233aed..383ae5c69dad 100644 --- a/users/brandonschlack/config.h +++ b/users/brandonschlack/config.h @@ -7,3 +7,7 @@ #ifdef RGBLIGHT_ENABLE # define RGBLIGHT_SLEEP #endif + +#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) +# define RGB_THEME +#endif diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index cf65ca8d558b..1a0f601a10ed 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -65,7 +65,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } break; #endif // IS_MACROPAD - #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) + #if defined(RGB_THEME) case RGB_LYR: if (record->event.pressed) { user_config.rgb_layer_change ^= 1; diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index 315c6c35fd94..029808556227 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -10,6 +10,7 @@ extern bool g_suspend_state; extern led_config_t g_led_config; #endif +#if defined(RGB_THEME) static const HSV default_magic = { HSV_SPRINGGREEN }; // Laser Color Constants @@ -38,6 +39,7 @@ static const rgb_theme_t rgb_oblique = { OBLIQUE, { &oblique_white, &oblique_pur // Set themes to be included static const rgb_theme_t *themes[] = { &rgb_laser, &rgb_granite, &rgb_oblique }; static const size_t rgb_theme_max = (sizeof themes / sizeof *themes); +#endif void keyboard_post_init_rgb(void) { layer_state_set_user(layer_state); @@ -48,6 +50,7 @@ void keyboard_post_init_rgb(void) { #endif } +#if defined(RGB_THEME) void set_rgb_theme(rgb_theme_name_t theme_name) { if (!user_config.rgb_layer_change) { user_config.rgb_layer_change = true; @@ -72,6 +75,29 @@ void rgb_theme_step_reverse(void) { set_rgb_theme(current); } +HSV get_rgb_theme_color(uint8_t index) { + rgb_theme_t theme = get_rgb_theme(); + size_t rgb_theme_color_max = sizeof theme.colors / sizeof *theme.colors; + + if (index == _MAGIC) { + return default_magic; + } else { + return **(theme.colors + (index % rgb_theme_color_max)); + } +}; + +void rgb_theme_layer(layer_state_t state) { + uint8_t rgb_color_index = biton32(state); + HSV color = get_rgb_theme_color(rgb_color_index); +#if defined(RGBLIGHT_ENABLE) + color.v = rgblight_config.val; +#elif defined(RGB_MATRIX_ENABLE) + color.v = rgb_matrix_config.hsv.v; +#endif + rgb_layer_helper( color.h, color.s, color.v ); +} +#endif + #ifdef RGB_MATRIX_ENABLE void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, uint8_t led_type) { for (int i = 0; i < DRIVER_LED_TOTAL; i++) { @@ -112,30 +138,8 @@ void rgb_layer_helper(uint8_t hue, uint8_t sat, uint8_t val) { } #endif -HSV get_rgb_theme_color(uint8_t index) { - rgb_theme_t theme = get_rgb_theme(); - size_t rgb_theme_color_max = sizeof theme.colors / sizeof *theme.colors; - - if (index == _MAGIC) { - return default_magic; - } else { - return **(theme.colors + (index % rgb_theme_color_max)); - } -}; - -void rgb_theme_layer(layer_state_t state) { - uint8_t rgb_color_index = biton32(state); - HSV color = get_rgb_theme_color(rgb_color_index); -#if defined(RGBLIGHT_ENABLE) - color.v = rgblight_config.val; -#elif defined(RGB_MATRIX_ENABLE) - color.v = rgb_matrix_config.hsv.v; -#endif - rgb_layer_helper( color.h, color.s, color.v ); -} - layer_state_t layer_state_set_rgb(layer_state_t state) { -#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) +#if defined(RGB_THEME) if (user_config.rgb_layer_change) { rgb_theme_layer(state); } diff --git a/users/brandonschlack/rgb_bs.h b/users/brandonschlack/rgb_bs.h index 1e19ef95dee9..50b16f31834a 100644 --- a/users/brandonschlack/rgb_bs.h +++ b/users/brandonschlack/rgb_bs.h @@ -1,6 +1,8 @@ #pragma once #include "quantum.h" -#include "rgb_theme.h" +#ifdef RGB_THEME +# include "rgb_theme.h" +#endif #ifdef RGB_MATRIX_ENABLE # include "rgb_matrix.h" #endif @@ -17,7 +19,5 @@ void rgb_matrix_cycle_flag(void); void keyboard_post_init_rgb(void); void rgb_layer_helper(uint8_t hue, uint8_t sat, uint8_t val); -void rgb_theme_layer(layer_state_t state); layer_state_t layer_state_set_rgb(layer_state_t state); -// layer_state_t default_layer_state_set_rgb(layer_state_t state); diff --git a/users/brandonschlack/rgb_theme.h b/users/brandonschlack/rgb_theme.h index f9b90aac2fcd..1384e39860c6 100644 --- a/users/brandonschlack/rgb_theme.h +++ b/users/brandonschlack/rgb_theme.h @@ -4,8 +4,6 @@ #include "color.h" #include "rgblight_list.h" -#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) - // Laser Colors #define HSV_LSR_PURPLE HSV_PURPLE #define HSV_LSR_PINK HSV_PINK @@ -46,4 +44,4 @@ void rgb_theme_step(void); void rgb_theme_step_reverse(void); HSV get_rgb_theme_color(uint8_t index); -#endif +void rgb_theme_layer(layer_state_t state); From d571751677424441b08a22b1e5d880b614e2a043 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 20 Aug 2019 13:04:17 -0700 Subject: [PATCH 155/429] [Keymap] Add Debug Toggle to ALT keymap --- .../kbd75/keymaps/brandonschlack/keymap.c | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c index 5ee01368adf2..9a8adebd870d 100644 --- a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base Layer: Mac * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │Esc│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│Mte│VlD│VlU│ + * │Esc│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│F13│F14│F15│ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ * │~ `│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│Hom│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ */ [_MAC] = LAYOUT( - KC_ESC, 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_MUTE, KC_VOLD, KC_VOLU, + KC_ESC, 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_F13, KC_F14, KC_F15, 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, XXXXXXX, KC_BSPC, KC_HOME, 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_PGUP, HY_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_PGDN, @@ -43,25 +43,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Function Layer: Mac * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │Mke│BrD│BrU│Msn│LHP│ │ │ │ │ │ │ │ │Ply│Prv│Nxt│ + * │Mke│BrD│BrU│Msn│LHP│RV-│RV+│ │ │ │ │ │ │Prv│Nxt│Ply│ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ Del │SlD│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │RMod │Hu+│St+│Vl+│RST│ │ │ │ │ │ │ │ │ │ │ + * │RMod │RH+│RS+│RV+│RST│ │ │ │ │ │ │ │ │ Lgt │VlU│ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ │Hu-│St-│Vl-│ │ │ │ │ │ │ │ │Magic │ │ + * │ │RH-│RS-│RV-│ │ │ │ │ │ │ │ │Magic │VlD│ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │ │RTg│LYR│Thm│ │ │ │ │ │ │ │MteSft│PgU│ │ + * │ │RTg│RLy│RTh│ │ │ │ │ │ │ │ │PgU│Mte│ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ * │ │ │ │ │ │ │ │Hom│PgD│End│ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ */ [_MACFN] = LAYOUT( - KC_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MRWD, KC_MFFD, + KC_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, MC_SLPD, - RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, TG_LGHT, _______, - _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, _______, - _______, _______, RGB_TOG, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, KC_PGUP, _______, + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, TG_LGHT, KC_VOLU, + _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLD, + _______, _______, RGB_TOG, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), /* Keyboard Layer: Light @@ -70,11 +70,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │RMod │Hu+│St+│Vl+│RST│ │ │ │ │ │ │ │ │ │ │ + * │RMod │RH+│RS+│RV+│ │ │ │ │ │ │ │ │ │ Lgt │ │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ │Hu-│St-│Vl-│ │ │ │ │ │ │ │ │Magic │ │ + * │ │RH-│RS-│RV-│ │ │ │ │ │ │ │ │Magic │ │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │ │RTg│ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │RTg│RLy│RTh│ │ │ │ │ │ │ │ │ │ │ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ * │ │ │ │ │ │ │ │ │ │ │ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ @@ -82,20 +82,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LIGHT] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_LGHT, XXXXXXX, + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_LGHT, XXXXXXX, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, - _______, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, + _______, XXXXXXX, RGB_TOG, RGB_LYR, RGB_THM, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX ), /* Keyboard Layer: Magic * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │Mke│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │RMod │Hu+│St+│Vl+│RST│ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │EEP│RST│ │ │ │ │ │ │ │ │ Lgt │ │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ │Hu-│St-│Vl-│ │ │ │ │ │ │ │ │Magic │ │ + * │ │ │ │DBG│ │ │ │ │ │ │ │ │Magic │ │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ * │ │RTg│ │ │ │ │ │ │ │ │ │ │ │ │ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ @@ -103,10 +103,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ */ [_MAGIC] = LAYOUT( + KC_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_LGHT, XXXXXXX, - XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_LGHT, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, DEBUG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, _______, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX ), From 9f3bc9816b297659c2c5270690d78600b6ae1a76 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 20 Aug 2019 13:06:01 -0700 Subject: [PATCH 156/429] [Keymap] Seperate _Light, _Magic layers for KBD75 --- keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index 3204a52e1bd2..1e5ead237272 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ * │ │RM-│RB-│RM+│RH-│RS-│ │ │ │ │ │ │ Magic │ │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │ │RTO│LYR│Thm│ │ │KRO│ │ │ │ │ │ │ │ + * │ │RTO│LYR│Thm│ │DFU│KRO│DBG│ │ │ │ │ │ │ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ * │ │ │ │ │ │ │ │ │ │ │ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ @@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, XXXXXXX, U_T_AUTO,U_T_AGCR,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, \ - _______, RGB_TOG, RGB_LYR, RGB_THM, XXXXXXX, XXXXXXX, TG_NKRO, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, \ + _______, RGB_TOG, RGB_LYR, RGB_THM, XXXXXXX, MD_BOOT, TG_NKRO, DBG_TOG, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, \ _______, _______, _______, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX \ ), /* Blank Layout From a9ecd3164aa20ad81ce5592ee3ba3c626d3c761f Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 20 Aug 2019 13:49:20 -0700 Subject: [PATCH 157/429] [Keymap] Remove extra TG_LGHT define --- keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index f076f5b60b48..4d4fd378955e 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -10,8 +10,7 @@ enum bdn9_layers { enum bdn9_keycodes { TG_LNAV = KEYMAP_SAFE_RANGE, TG_REVW, - TG_EDIT, - TG_LGHT + TG_EDIT }; // Tap Dances @@ -342,11 +341,6 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { layer_move(_LR_EDIT); } break; - case TG_LGHT: - if (!record->event.pressed) { - layer_invert(_LIGHT); - } - break; } return true; } From 7a7e2a7753a11bbe39617c865e5e4e96771c71aa Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 21 Aug 2019 14:40:23 -0700 Subject: [PATCH 158/429] [User] Refactor userspace layer names * Consolidate layer names to bs_layers in brandonschlack.h * Change _KEYPAD to _MACRO * _ for userspace layers, ___ for keymap layers --- .../bdn9/keymaps/brandonschlack/keymap.c | 60 +++++++++---------- .../bdn9/keymaps/brandonschlack/readme.md | 4 +- .../launchpad/keymaps/brandonschlack/keymap.c | 8 +-- .../romac/keymaps/brandonschlack/keymap.c | 22 +++---- users/brandonschlack/brandonschlack.h | 16 ++--- users/brandonschlack/process_records.c | 2 +- users/brandonschlack/rgb_bs.h | 3 - 7 files changed, 57 insertions(+), 58 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 4d4fd378955e..84e3295bbe8d 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -2,9 +2,9 @@ #include "brandonschlack.h" enum bdn9_layers { - _LR_NAV = KEYMAP_LAYERS, - _LR_REVIEW, - _LR_EDIT + __LR_NAV = KEYMAP_LAYERS, + __LR_REVIEW, + __LR_EDIT }; enum bdn9_keycodes { @@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LEFT, KC_SPC, DTP_MGC ), /* - Layer: Keypad/Karabiner + Layer: Macro/Karabiner ┌───────────┐ ┌───────────┐ │ │ │ │ │ - + │ │ . = │ @@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { │ 7 │ 8 │ 9 │ └────────┴────────┴────────┘ */ - [_KEYPAD] = LAYOUT( + [_MACRO] = LAYOUT( KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, DTP_LGT, KC_P7, KC_P8, DTP_MGC @@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { │ Left │ Down │ Rght │ └────────┴────────┴────────┘ */ - [_LR_NAV] = LAYOUT( + [__LR_NAV] = LAYOUT( TG_REVW, KC_J, TG_EDIT, KC_HOME, KC_UP, DTP_LGT, KC_LEFT, KC_DOWN, DTP_MGC @@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { │ Left │ Blue │ Rght │ └────────┴────────┴────────┘ */ - [_LR_REVIEW] = LAYOUT( + [__LR_REVIEW] = LAYOUT( TG_LNAV, KC_7, TG_EDIT, KC_0, KC_8, DTP_LGT, KC_LEFT, KC_6, DTP_MGC @@ -149,7 +149,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { │ Left │ Redo │ Rght │ └────────┴────────┴────────┘ */ - [_LR_EDIT] = LAYOUT( + [__LR_EDIT] = LAYOUT( TG_REVW, KC_BSLS, TG_LNAV, KC_X, MC_UNDO, DTP_LGT, KC_LEFT, MC_REDO, DTP_MGC @@ -219,28 +219,28 @@ void encoder_update_user(uint8_t index, bool clockwise) { tap_code(KC_VOLD); } break; - case _KEYPAD: + case _MACRO: if (!clockwise) { tap_code(KC_PPLS); } else { tap_code(KC_PMNS); } break; - case _LR_NAV: + case __LR_NAV: if (!clockwise) { tap_code(KC_EQL); } else { tap_code(KC_MINS); } break; - case _LR_REVIEW: + case __LR_REVIEW: if (!clockwise) { tap_code(KC_RBRC); } else { tap_code(KC_LBRC); } break; - case _LR_EDIT: + case __LR_EDIT: if (!clockwise) { tap_code(KC_DOT); } else { @@ -279,28 +279,28 @@ void encoder_update_user(uint8_t index, bool clockwise) { tap_code(KC_MRWD); } break; - case _KEYPAD: + case _MACRO: if (!clockwise) { tap_code(KC_PEQL); } else { tap_code(KC_PDOT); } break; - case _LR_NAV: + case __LR_NAV: if (!clockwise) { tap_code(KC_PGUP); } else { tap_code(KC_PGDN); } break; - case _LR_REVIEW: + case __LR_REVIEW: if (!clockwise) { tap_code16(G(KC_UP)); } else { tap_code16(G(KC_DOWN)); } break; - case _LR_EDIT: + case __LR_EDIT: if (!clockwise) { tap_code(KC_EQL); } else { @@ -326,19 +326,19 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { case TG_LNAV: if (!record->event.pressed) { tap_code(KC_G); - layer_move(_LR_NAV); + layer_move(__LR_NAV); } break; case TG_REVW: if (!record->event.pressed) { tap_code(KC_E); - layer_move(_LR_REVIEW); + layer_move(__LR_REVIEW); } break; case TG_EDIT: if (!record->event.pressed) { tap_code(KC_D); - layer_move(_LR_EDIT); + layer_move(__LR_EDIT); } break; } @@ -350,13 +350,13 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { */ layer_state_t layer_state_set_keymap (layer_state_t state) { switch (biton32(state)) { - case _LR_NAV: + case __LR_NAV: rgb_layer_helper(HSV_TEAL); break; - case _LR_REVIEW: + case __LR_REVIEW: rgb_layer_helper(HSV_CYAN); break; - case _LR_EDIT: + case __LR_EDIT: rgb_layer_helper(HSV_AZURE); break; } @@ -378,14 +378,14 @@ void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { case _MEDIA: keycode = KC_L; break; - case _KEYPAD: + case _MACRO: keycode = KC_P6; break; - case _LR_NAV: + case __LR_NAV: keycode = KC_END; - case _LR_REVIEW: + case __LR_REVIEW: keycode = KC_U; - case _LR_EDIT: + case __LR_EDIT: keycode = KC_P; break; } @@ -394,15 +394,15 @@ void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { switch (biton32(layer_state)) { case _NAVI: case _MEDIA: - case _LR_NAV: - case _LR_REVIEW: - case _LR_EDIT: + case __LR_NAV: + case __LR_REVIEW: + case __LR_EDIT: keycode = KC_RGHT; break; case _REEDER: keycode = G(KC_3); break; - case _KEYPAD: + case _MACRO: keycode = KC_P9; break; } diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md index c0be2bd041d7..8aa72be09745 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md @@ -42,8 +42,8 @@ This layer is used for media controls. Player button is a hotkey to focus the cu | Left | Space | Right | -### Keypad Layer -This layer is used to send keypad keys, meant to be remapped based on current app with [Karabiner](https://pqrs.org/osx/karabiner/) +### Macro Layer +This layer is used to send generic macro keys, meant to be remapped based on current app with [Karabiner](https://pqrs.org/osx/karabiner/) | +/- | **Knobs** | =/. | | --- | --- | --- | diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index 04793c93ee8f..206af8e4fee7 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TD(TD_SHLD_LGHT), TD(TD_SHLD_MAGC) \ ), -/* Keypad +/* Macro * ┌──────┬──────┐ * │ 1 │ 2 │ * ├──────┼──────┤ @@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ 7 │ 8 │ * └──────┴──────┘ */ -[_KEYPAD] = LAYOUT( \ +[_MACRO] = LAYOUT( \ KC_P1, KC_P2, \ KC_P3, KC_P4, \ KC_P5, KC_P6, \ @@ -155,7 +155,7 @@ void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { case _MEDIA: keycode = KC_SPC; break; - case _KEYPAD: + case _MACRO: keycode = KC_P7; break; } @@ -171,7 +171,7 @@ void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { case _MEDIA: keycode = MC_PLYR; break; - case _KEYPAD: + case _MACRO: keycode = KC_P8; break; } diff --git a/keyboards/romac/keymaps/brandonschlack/keymap.c b/keyboards/romac/keymaps/brandonschlack/keymap.c index 7533f676ebdd..b91e6a56d9e7 100644 --- a/keyboards/romac/keymaps/brandonschlack/keymap.c +++ b/keyboards/romac/keymaps/brandonschlack/keymap.c @@ -18,10 +18,10 @@ #include "brandonschlack.h" enum romac_layers { - _NUMPAD = 0, - _FN, - _NUMLOCK, - _MACRO + __NUMPAD = 0, + __FN, + __NUMLOCK, + __MACRO }; enum romac_keycodes { @@ -33,28 +33,28 @@ enum romac_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_NUMPAD] = LAYOUT( + [__NUMPAD] = LAYOUT( KC_P7, KC_P8, KC_P9, \ KC_P4, KC_P5, KC_P6, \ KC_P1, KC_P2, KC_P3, \ OSL(_FN), KC_P0, KC_PDOT \ ), - [_FN] = LAYOUT( + [__FN] = LAYOUT( KC_PSLS, KC_PAST, KC_BSPC, \ KC_TRNS, KC_TRNS, KC_PMNS, \ DF_NMLK, DF_MCRO, KC_PPLS, \ KC_TRNS, DF_MAGC, KC_PENT \ ), - [_NUMLOCK] = LAYOUT( + [__NUMLOCK] = LAYOUT( KC_HOME, KC_UP, KC_PGUP, \ KC_LEFT, CMD_TAB, KC_RGHT, \ KC_END, KC_DOWN, KC_PGDN, \ DF_NMPD, KC_INS, KC_DEL \ ), - [_MACRO] = LAYOUT( + [__MACRO] = LAYOUT( KC_F13, KC_F14, KC_F15, \ KC_F16, KC_F17, KC_F18, \ KC_F19, KC_F20, KC_F21, \ @@ -73,19 +73,19 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case DF_NMPD: if (!record->event.pressed) { - default_layer_set(_NUMPAD); + default_layer_set(__NUMPAD); layer_move(default_layer_state); } break; case DF_NMLK: if (!record->event.pressed) { - default_layer_set(_NUMLOCK); + default_layer_set(__NUMLOCK); layer_move(default_layer_state); } break; case DF_MCRO: if (!record->event.pressed) { - default_layer_set(_MACRO); + default_layer_set(__MACRO); layer_move(default_layer_state); } break; diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 36ceb9601f72..b24d2c8723b7 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -11,21 +11,23 @@ #endif // Define layer names -#ifndef IS_MACROPAD enum bs_layers { _MAC = 0, _MACFN, -}; +#if !defined(IS_MACROPAD) + _NAVI, #else -enum macropad_layers { _NAVI = 0, _REEDER, _MEDIA, - _KEYPAD, - KEYMAP_LAYERS -}; + _MACRO, #endif -#define _MAGIC 15 + KEYMAP_LAYERS, +#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) + _LIGHT = 14, +#endif + _MAGIC = 15 +}; typedef union { uint32_t raw; diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index 1a0f601a10ed..df426b339e79 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -61,7 +61,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { break; case TG_KYPD: if (!record->event.pressed) { - layer_move(_KEYPAD); + layer_move(_MACRO); } break; #endif // IS_MACROPAD diff --git a/users/brandonschlack/rgb_bs.h b/users/brandonschlack/rgb_bs.h index 50b16f31834a..4b2d5b4ec193 100644 --- a/users/brandonschlack/rgb_bs.h +++ b/users/brandonschlack/rgb_bs.h @@ -7,9 +7,6 @@ # include "rgb_matrix.h" #endif -// Define Layer for Lighting functions -#define _LIGHT 14 - #ifdef RGB_MATRIX_ENABLE #define LED_FLAG_ALL_KEYS 0x05 From ed15dc36f5c205e02b003da5d732fd6348495ca1 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 21 Aug 2019 14:46:29 -0700 Subject: [PATCH 159/429] [Keymap] Update gingham keymap --- .../gingham/keymaps/brandonschlack/keymap.c | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/keyboards/gingham/keymaps/brandonschlack/keymap.c b/keyboards/gingham/keymaps/brandonschlack/keymap.c index a87cdbc21ad6..be341603a67c 100644 --- a/keyboards/gingham/keymaps/brandonschlack/keymap.c +++ b/keyboards/gingham/keymaps/brandonschlack/keymap.c @@ -16,6 +16,7 @@ #include QMK_KEYBOARD_H #include "brandonschlack.h" +#define TT_NAVI TT(_NAVI) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base layer @@ -26,67 +27,67 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - * │ LShift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │↑ Shft│Fn2│ + * │ LShift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │↑ Shft│Nav│ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ * │LCtl│LAlt│LGui│ Space │RGui│←Alt│↓Fn1│→Ctl│ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ */ -[_MAC] = LAYOUT_60_ansi_split_bs_rshift( /* Base */ +[_MAC] = LAYOUT_60_ansi_split_bs_rshift( 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, HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT_RSUP, MO(2), + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT_RSUP, TT_NAVI, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MT_RALT, MT_RFDN, MT_RCRT), /* Fn layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ * │MKE│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│LHP│SLP│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ ↑ │MNC│ Del │ + * │ │ │ │ │ │ │ │ │ │ │ │ │MNC│ Del │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │VlD│VlU│Mte│ │ │ │ │Hme│PgU│ ← │ → │ │ + * │ │ │ │ │ │ │ │ │ │VlD│VlU│Mte│ │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - * │ │Prv│Nxt│Ply│ │ │ │ │End│PgD│ ↓ │ │ │ + * │ │ │ │ │ │ │ │ │Prv│Nxt│Ply│ │ │ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ * │ │ │ │ │ │ │ │ │ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ */ -[_MACFN] = LAYOUT_60_ansi_split_bs_rshift( /* FN */ +[_MACFN] = LAYOUT_60_ansi_split_bs_rshift( KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, MC_MSSN, KC_DEL, - KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, - KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, 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, MC_MSSN, KC_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), -/* Empty layer +/* Navigation Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ ↑ │ │ │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │VlD│VlU│Mte│ │ + * │ │ │ │ │ │ │ │ │ │ │ ← │ → │ │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - * │ │ │ │ │ │ │ │ │Prv│Nxt│Ply│ PgU │ │ + * │ │ │ │ │ │ │ │ │ │ │ ↓ │ PgU │ │ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ * │ │ │ │ │ │Home│PgDn│End │ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ */ -[2] = LAYOUT_60_ansi_split_bs_rshift( /* Empty for dynamic keymaps */ +[_NAVI] = LAYOUT_60_ansi_split_bs_rshift( 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_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, MT_RSPU, 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_UP, 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_LEFT, KC_RGHT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, MT_RSPU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MT_RAHM, MT_RFPD, MT_RCED), }; void matrix_init_keymap(void) { - //user initialization + //user initialization } void matrix_scan_keymap(void) { - //user matrix + //user matrix } bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { - return true; + return true; } From 659388d7a5be9596ed0ddef8028dff0615d56b64 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 22 Aug 2019 11:28:40 -0700 Subject: [PATCH 160/429] [User] Refactor layer code to follow latest docs * Replace biton32 with get_highest_layer in userspace --- keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c | 10 +++++----- keyboards/launchpad/keymaps/brandonschlack/keymap.c | 4 ++-- users/brandonschlack/rgb_bs.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 84e3295bbe8d..c7131604bb03 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -197,7 +197,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ void encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { - switch (biton32(layer_state)) { + switch (get_highest_layer(layer_state)) { case _NAVI: if (!clockwise) { tap_code(MC_WH_D); @@ -257,7 +257,7 @@ void encoder_update_user(uint8_t index, bool clockwise) { } } else if (index == 1) { - switch (biton32(layer_state)) { + switch (get_highest_layer(layer_state)) { case _NAVI: if (!clockwise) { tap_code16(NXT_TAB); @@ -349,7 +349,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { * Layer Switch */ layer_state_t layer_state_set_keymap (layer_state_t state) { - switch (biton32(state)) { + switch (get_highest_layer(state)) { case __LR_NAV: rgb_layer_helper(HSV_TEAL); break; @@ -370,7 +370,7 @@ void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { uint16_t keycode = 0; switch (toggle_layer) { case _LIGHT: - switch (biton32(layer_state)) { + switch (get_highest_layer(layer_state)) { case _NAVI: keycode = KC_PGUP; break; @@ -391,7 +391,7 @@ void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { } break; case _MAGIC: - switch (biton32(layer_state)) { + switch (get_highest_layer(layer_state)) { case _NAVI: case _MEDIA: case __LR_NAV: diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index 206af8e4fee7..e64dce0af8b2 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -145,7 +145,7 @@ void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { uint16_t keycode = 0; switch (toggle_layer) { case _LIGHT: - switch (biton32(layer_state)) { + switch (get_highest_layer(layer_state)) { case _NAVI: keycode = REO_TAB; break; @@ -161,7 +161,7 @@ void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { } break; case _MAGIC: - switch (biton32(layer_state)) { + switch (get_highest_layer(layer_state)) { case _NAVI: keycode = CLS_TAB; break; diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index 029808556227..c88d5d415ee3 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -87,7 +87,7 @@ HSV get_rgb_theme_color(uint8_t index) { }; void rgb_theme_layer(layer_state_t state) { - uint8_t rgb_color_index = biton32(state); + uint8_t rgb_color_index = get_highest_layer(state); HSV color = get_rgb_theme_color(rgb_color_index); #if defined(RGBLIGHT_ENABLE) color.v = rgblight_config.val; From e2e1892256dff621d011726e6c365e43d2a75931 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 22 Aug 2019 11:38:46 -0700 Subject: [PATCH 161/429] [User] Update rgb matrix flag for readability --- users/brandonschlack/rgb_bs.c | 2 +- users/brandonschlack/rgb_bs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index c88d5d415ee3..ebf0e8ba27d2 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -113,7 +113,7 @@ void rgb_matrix_cycle_flag (void) { rgb_matrix_set_flags(LED_FLAG_ALL_KEYS); rgb_matrix_set_color_all(0, 0, 0); break; - case LED_FLAG_ALL_KEYS: + case LED_FLAG_KEYS: rgb_matrix_set_flags(LED_FLAG_UNDERGLOW); rgb_matrix_set_color_all(0, 0, 0); break; diff --git a/users/brandonschlack/rgb_bs.h b/users/brandonschlack/rgb_bs.h index 4b2d5b4ec193..406f47d98ad8 100644 --- a/users/brandonschlack/rgb_bs.h +++ b/users/brandonschlack/rgb_bs.h @@ -8,7 +8,7 @@ #endif #ifdef RGB_MATRIX_ENABLE -#define LED_FLAG_ALL_KEYS 0x05 +#define LED_FLAG_KEYS (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER) void rgb_matrix_layer_helper(uint8_t red, uint8_t green, uint8_t blue, uint8_t led_type); void rgb_matrix_cycle_flag(void); From 46164aa614a5d9f34fee146b1019bb120411385e Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 22 Aug 2019 16:36:05 -0700 Subject: [PATCH 162/429] [User] Use new :flash in KC_MAKE --- users/brandonschlack/process_records.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index df426b339e79..0db2edbb5a48 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -127,16 +127,8 @@ void send_make_command(bool flash_bootloader) { if (flash_bootloader) { #if defined(BOOTLOADER_MDLOADER) // only run for Massdrop boards SEND_STRING(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP); -#elif defined(__arm__) // only run for ARM boards - SEND_STRING(":dfu-util"); -#elif defined(BOOTLOADER_DFU) // only run for DFU boards - SEND_STRING(":dfu"); -#elif defined(BOOTLOADER_HALFKAY) // only run for teensy boards - SEND_STRING(":teensy"); -#elif defined(BOOTLOADER_CATERINA) // only run for Pro Micros - SEND_STRING(":avrdude"); -#elif defined(BOOTLOADER_USBASP) // Run for custom Program CMD - SEND_STRING(":program"); +#else + SEND_STRING(":flash"); #endif // bootloader options } SEND_STRING(SS_TAP(X_ENTER)); From d7553c182364841924b330e98bb3258791eb6b4f Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 22 Aug 2019 16:39:10 -0700 Subject: [PATCH 163/429] [Keymap] Add Bootmagic Lite to BDN9 keymap --- keyboards/keebio/bdn9/keymaps/brandonschlack/config.h | 4 ++++ keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk | 1 + 2 files changed, 5 insertions(+) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h index 843d55b64944..aca84dfb0743 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h @@ -6,3 +6,7 @@ /* Mouse Keys Configuration */ #define MK_3_SPEED #define MK_W_INTERVAL_UNMOD 20 + +/* Bootmagic to Top-Middle Key */ +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 1 diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk index 666348d18208..108899b584e9 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk @@ -5,6 +5,7 @@ IS_MACROPAD = yes BOOTLOADER = atmel-dfu # Build Options +BOOTMAGIC_ENABLE = lite MOUSEKEY_ENABLE = yes # Mouse keys(+4700) COMMAND_ENABLE = no # Disable Command, breaks with Mouse Keys set to constant. BACKLIGHT_ENABLE = no # No backlights installed From f6c9bfbbca3b34063e13980c94e84d0efa1e0771 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 22 Aug 2019 16:42:20 -0700 Subject: [PATCH 164/429] [Keymap] Remove CONSOLE_ENABLE from KBD75 --- keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk index fcf5af061d89..890b397a9fe9 100644 --- a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk +++ b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk @@ -4,6 +4,5 @@ BOOTLOADER = atmel-dfu # Build Options # comment out to disable the options. # -CONSOLE_ENABLE = yes # Console for Debug (+400) MOUSEKEY_ENABLE = no # Don't need Mouse Keys BACKLIGHT_ENABLE = no # No backlights installed From 53f44bc20941d5f0fd2c70a4c58a2b63e3e3d99c Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 22 Aug 2019 16:50:48 -0700 Subject: [PATCH 165/429] [Keymap] Add Bootmagic Lite to launchpad --- keyboards/launchpad/keymaps/brandonschlack/rules.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/launchpad/keymaps/brandonschlack/rules.mk b/keyboards/launchpad/keymaps/brandonschlack/rules.mk index 6362c6fb5638..b7c7d7f1ea3b 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/rules.mk +++ b/keyboards/launchpad/keymaps/brandonschlack/rules.mk @@ -5,6 +5,7 @@ IS_MACROPAD = yes BOOTLOADER = atmel-dfu # Build Options +BOOTMAGIC_ENABLE = lite RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. CONSOLE_ENABLE = yes # Console for debug(+400) MOUSEKEY_ENABLE = yes # Use mouse keys for scrolling. From 5ecc58db83ed8d13efdd26a0c15ace8505662a5c Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 22 Aug 2019 17:32:52 -0700 Subject: [PATCH 166/429] [Keymap] Add EEP_RST to romac --- keyboards/romac/keymaps/brandonschlack/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/romac/keymaps/brandonschlack/keymap.c b/keyboards/romac/keymaps/brandonschlack/keymap.c index b91e6a56d9e7..e3a5e5339ce3 100644 --- a/keyboards/romac/keymaps/brandonschlack/keymap.c +++ b/keyboards/romac/keymaps/brandonschlack/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P7, KC_P8, KC_P9, \ KC_P4, KC_P5, KC_P6, \ KC_P1, KC_P2, KC_P3, \ - OSL(_FN), KC_P0, KC_PDOT \ + OSL(__FN), KC_P0, KC_PDOT \ ), [__FN] = LAYOUT( @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_MAGIC] = LAYOUT( - KC_MAKE, XXXXXXX, XXXXXXX, \ + KC_MAKE, EEP_RST, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, \ DF_NMPD, DF_NMLK, DF_MCRO, \ KC_TRNS, XXXXXXX, XXXXXXX \ From 9b5d9d3c8628c1f19c6ba8a65ded0136952d72c4 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 23 Aug 2019 18:52:02 -0700 Subject: [PATCH 167/429] [User] Userspace refactor: Tri Layers * Refactor userspace for tri-layers names, and macropad layers * Need to update gingham keymap for tri layers --- .../gingham/keymaps/brandonschlack/keymap.c | 1 + .../hotswap/keymaps/brandonschlack/keymap.c | 22 +- .../kbd75/keymaps/brandonschlack/keymap.c | 51 ++--- .../bdn9/keymaps/brandonschlack/keymap.c | 198 +++++++++--------- .../bdn9/keymaps/brandonschlack/readme.md | 26 +-- .../launchpad/keymaps/brandonschlack/keymap.c | 73 ++++--- .../alt/keymaps/brandonschlack/keymap.c | 23 +- .../romac/keymaps/brandonschlack/keymap.c | 64 ++---- users/brandonschlack/brandonschlack.c | 26 ++- users/brandonschlack/brandonschlack.h | 22 +- users/brandonschlack/process_records.c | 34 +-- users/brandonschlack/process_records.h | 22 +- users/brandonschlack/rgb_bs.c | 6 +- 13 files changed, 259 insertions(+), 309 deletions(-) diff --git a/keyboards/gingham/keymaps/brandonschlack/keymap.c b/keyboards/gingham/keymaps/brandonschlack/keymap.c index be341603a67c..a7ba486f1660 100644 --- a/keyboards/gingham/keymaps/brandonschlack/keymap.c +++ b/keyboards/gingham/keymaps/brandonschlack/keymap.c @@ -16,6 +16,7 @@ #include QMK_KEYBOARD_H #include "brandonschlack.h" +// FIXME: Refactor for _LOWER, _RAISE #define TT_NAVI TT(_NAVI) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index 7fa8f8fdd671..67235a074943 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `---------------------------------------------------------------' */ -/* Base Layer: Mac +/* Base Layer * ,---------------------------------------------------------------. * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| `|Hom| * |---------------------------------------------------------------| @@ -44,52 +44,48 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |Ctl |Alt |Gui | Space |Gui |FnPy| |Lef|Dow|Rig| * `---------------------------------------------------------------' */ -[_MAC] = LAYOUT( +[_BASE] = LAYOUT( 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_HOME, \ 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, KC_PGUP, \ HY_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_PGDN, \ 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_UP, KC_END, \ KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT), -/* Function Layer: Mac +/* Function Layer * ,---------------------------------------------------------------. * |MKE| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|LHP|MSN|SLP| * |---------------------------------------------------------------| * | | | | |RST| | | | | |F13|F14|F15| Del|VlU| * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgMagic|VlD| + * | | | | | | | | | | | | | Adjust |VlD| * |---------------------------------------------------------------| * | | | | | | | | |Prv|Nxt|Ply|MutSft|PgU| | * |---------------------------------------------------------------| * | | | | | | | |Hom|PgD|End| * `---------------------------------------------------------------' */ -[_MACFN] = LAYOUT( +[_FN] = LAYOUT( KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_MSSN, MC_SLPD, \ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, KC_VOLU, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLD, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, KC_VOLD, \ _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, MM_RSFT, KC_PGUP, _______, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), - -/*********** - * Magic * - ***********/ /* Keyboard Layer: Magic * ,---------------------------------------------------------------. * | | | | | | | | | | | | | | | | | * |---------------------------------------------------------------| * | | | |EEP|RST| | | | | | | | | | | * |---------------------------------------------------------------| - * | | | | | | | | | | | | | TgMagic| | + * | | | | | | | | | | | | | Adjust | | * |---------------------------------------------------------------| * | | | | | | | | | | | | | | | * |---------------------------------------------------------------| * | | | | | | | | | | | * `---------------------------------------------------------------' */ -[_MAGIC] = LAYOUT( +[_ADJUST] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_ADJT, XXXXXXX, \ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, \ _______, _______, _______, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX), }; diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c index 9a8adebd870d..ee44b18e52ee 100644 --- a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ */ - /* Base Layer: Mac + /* Base Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ * │Esc│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│F13│F14│F15│ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │Ctrl│ Opt│ Cmd│ Space │Cmd│Opt│Fn │Lef│Dow│Rig│ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ */ - [_MAC] = LAYOUT( + [_BASE] = LAYOUT( KC_ESC, 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_F13, KC_F14, KC_F15, 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, XXXXXXX, KC_BSPC, KC_HOME, 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_PGUP, @@ -41,72 +41,49 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, KC_SPC, XXXXXXX, MM_RGUI, MM_RALT, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT ), - /* Function Layer: Mac + /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ * │Mke│BrD│BrU│Msn│LHP│RV-│RV+│ │ │ │ │ │ │Prv│Nxt│Ply│ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ Del │SlD│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │RMod │RH+│RS+│RV+│RST│ │ │ │ │ │ │ │ │ Lgt │VlU│ + * │RMod │RH+│RS+│RV+│RST│ │ │ │ │ │ │ │ │ │VlU│ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ │RH-│RS-│RV-│ │ │ │ │ │ │ │ │Magic │VlD│ + * │ │RH-│RS-│RV-│ │ │ │ │ │ │ │ │ Adjust │VlD│ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ * │ │RTg│RLy│RTh│ │ │ │ │ │ │ │ │PgU│Mte│ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ * │ │ │ │ │ │ │ │Hom│PgD│End│ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ */ - [_MACFN] = LAYOUT( + [_FN] = LAYOUT( KC_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, MC_SLPD, - RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, TG_LGHT, KC_VOLU, - _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLD, + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, + _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, KC_VOLD, _______, _______, RGB_TOG, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), - /* Keyboard Layer: Light - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │RMod │RH+│RS+│RV+│ │ │ │ │ │ │ │ │ │ Lgt │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ │RH-│RS-│RV-│ │ │ │ │ │ │ │ │Magic │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │ │RTg│RLy│RTh│ │ │ │ │ │ │ │ │ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ - */ - [_LIGHT] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_LGHT, XXXXXXX, - XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, - _______, XXXXXXX, RGB_TOG, RGB_LYR, RGB_THM, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, - _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX - ), - /* Keyboard Layer: Magic + /* Adjust Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ * │Mke│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │ │ │ │EEP│RST│ │ │ │ │ │ │ │ │ Lgt │ │ + * │ │ │ │EEP│RST│ │ │ │ │ │ │ │ │ │ │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ │ │ │DBG│ │ │ │ │ │ │ │ │Magic │ │ + * │ │ │ │DBG│ │ │ │ │ │ │ │ │ Adjust │ │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ * │ │RTg│ │ │ │ │ │ │ │ │ │ │ │ │ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ * │ │ │ │ │ │ │ │ │ │ │ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ */ - [_MAGIC] = LAYOUT( + [_ADJUST] = LAYOUT( KC_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_LGHT, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, DEBUG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, DEBUG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_ADJT, XXXXXXX, _______, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX ), diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index c7131604bb03..2e0ba7553aed 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -2,9 +2,9 @@ #include "brandonschlack.h" enum bdn9_layers { - __LR_NAV = KEYMAP_LAYERS, - __LR_REVIEW, - __LR_EDIT + LR_NAV = KEYMAP_LAYERS, + LR_REVIEW, + LR_EDIT }; enum bdn9_keycodes { @@ -16,36 +16,18 @@ enum bdn9_keycodes { // Tap Dances enum bdn9_dances { TD_DTAP_LGHT = 0, - TD_DTAP_MAGC + TD_DTAP_ADJT }; //Tap Dance Definitions qk_tap_dance_action_t tap_dance_actions[] = { [TD_DTAP_LGHT] = ACTION_TAP_DANCE_TRIGGER_LAYER(DOUBLE_TAP, _LIGHT), - [TD_DTAP_MAGC] = ACTION_TAP_DANCE_TRIGGER_LAYER(DOUBLE_TAP, _MAGIC), + [TD_DTAP_ADJT] = ACTION_TAP_DANCE_TRIGGER_LAYER(DOUBLE_TAP, _ADJUST), }; // Tap Dance Aliases #define DTP_LGT TD(TD_DTAP_LGHT) -#define DTP_MGC TD(TD_DTAP_MAGC) +#define DTP_ADJ TD(TD_DTAP_ADJT) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* - Layer: Navigation - ┌───────────┐ ┌───────────┐ - │ Scroll │ │ Tab │ - │ Up Dn │ │ Prv Nxt │ - ├────────┬──┴──┴──┬────────┤ - │ ReOTab │ CmdTab │ ClsTab │ - ├────────┼────────┼────────┤ - │ PgDn │ Up │ PgUp │ - ├────────┼────────┼────────┤ - │ Left │ Down │ Rght │ - └────────┴────────┴────────┘ - */ - [_NAVI] = LAYOUT( - REO_TAB, CMD_TAB, CLS_TAB, - KC_PGDN, KC_UP, DTP_LGT, - KC_LEFT, KC_DOWN, DTP_MGC - ), /* Layer: Reeder ┌───────────┐ ┌───────────┐ @@ -62,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_REEDER] = LAYOUT( KC_H, KC_S, KC_R, CMD_TAB, KC_M, DTP_LGT, - G(KC_1), G(KC_2), DTP_MGC + G(KC_1), G(KC_2), DTP_ADJ ), /* Layer: Media @@ -80,7 +62,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_MEDIA] = LAYOUT( KC_MUTE, MC_PLYR, KC_MPLY, KC_J, KC_K, DTP_LGT, - KC_LEFT, KC_SPC, DTP_MGC + KC_LEFT, KC_SPC, DTP_ADJ + ), + /* + Layer: Navigation + ┌───────────┐ ┌───────────┐ + │ Scroll │ │ Tab │ + │ Up Dn │ │ Prv Nxt │ + ├────────┬──┴──┴──┬────────┤ + │ ReOTab │ CmdTab │ ClsTab │ + ├────────┼────────┼────────┤ + │ PgDn │ Up │ PgUp │ + ├────────┼────────┼────────┤ + │ Left │ Down │ Rght │ + └────────┴────────┴────────┘ + */ + [_NAVI] = LAYOUT( + REO_TAB, CMD_TAB, CLS_TAB, + KC_PGDN, KC_UP, DTP_LGT, + KC_LEFT, KC_DOWN, DTP_ADJ ), /* Layer: Macro/Karabiner @@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_MACRO] = LAYOUT( KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, DTP_LGT, - KC_P7, KC_P8, DTP_MGC + KC_P7, KC_P8, DTP_ADJ ), /* Layer: Lightroom Navigation @@ -113,10 +113,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { │ Left │ Down │ Rght │ └────────┴────────┴────────┘ */ - [__LR_NAV] = LAYOUT( - TG_REVW, KC_J, TG_EDIT, - KC_HOME, KC_UP, DTP_LGT, - KC_LEFT, KC_DOWN, DTP_MGC + [LR_NAV] = LAYOUT( + TG_REVW, KC_J, TG_EDIT, + KC_HOME, KC_UP, DTP_LGT, + KC_LEFT, KC_DOWN, DTP_ADJ ), /* Layer: Review/Rate @@ -131,10 +131,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { │ Left │ Blue │ Rght │ └────────┴────────┴────────┘ */ - [__LR_REVIEW] = LAYOUT( - TG_LNAV, KC_7, TG_EDIT, - KC_0, KC_8, DTP_LGT, - KC_LEFT, KC_6, DTP_MGC + [LR_REVIEW] = LAYOUT( + TG_LNAV, KC_7, TG_EDIT, + KC_0, KC_8, DTP_LGT, + KC_LEFT, KC_6, DTP_ADJ ), /* Layer: Edit/Develop @@ -149,10 +149,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { │ Left │ Redo │ Rght │ └────────┴────────┴────────┘ */ - [__LR_EDIT] = LAYOUT( + [LR_EDIT] = LAYOUT( TG_REVW, KC_BSLS, TG_LNAV, - KC_X, MC_UNDO, DTP_LGT, - KC_LEFT, MC_REDO, DTP_MGC + KC_X, MC_UNDO, DTP_LGT, + KC_LEFT, MC_REDO, DTP_ADJ ), /* Layer: Light @@ -173,21 +173,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_LYR, RGB_THM, XXXXXXX ), /* - Layer: Magic + Layer: ADJUST ┌───────────┐ ┌───────────┐ │ XXXX │ │ XXXX │ │ │ │ │ ├────────┬──┴──┴──┬────────┤ - │ MAKE │ Navi │ RESET │ + │ MAKE │ Reeder │ Light │ ├────────┼────────┼────────┤ - │ Reeder │ Media │ Keypad │ + │ Media │ Navi │ Macro │ ├────────┼────────┼────────┤ │ LR Rvw │ LR Nav │ LR Edt │ └────────┴────────┴────────┘ */ - [_MAGIC] = LAYOUT( - KC_MAKE, TG_NAVI, TG_LGHT, - TG_REDR, TG_MEDA, TG_KYPD, + [_ADJUST] = LAYOUT( + KC_MAKE, DF_REDR, TG_LGHT, + DF_MEDA, DF_NAVI, DF_MCRO, TG_REVW, TG_LNAV, TG_EDIT ), }; @@ -195,60 +195,60 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /** * Encoder */ -void encoder_update_user(uint8_t index, bool clockwise) { +void encoder_update_keymap(uint8_t index, bool clockwise) { if (index == 0) { switch (get_highest_layer(layer_state)) { - case _NAVI: - if (!clockwise) { - tap_code(MC_WH_D); - } else { - tap_code(MC_WH_U); - } - break; case _REEDER: - if (!clockwise) { + if (clockwise) { tap_code(KC_J); } else { tap_code(KC_K); } break; case _MEDIA: - if (!clockwise) { + if (clockwise) { tap_code(KC_VOLU); } else { tap_code(KC_VOLD); } break; + case _NAVI: + if (clockwise) { + tap_code(MC_WH_D); + } else { + tap_code(MC_WH_U); + } + break; case _MACRO: - if (!clockwise) { + if (clockwise) { tap_code(KC_PPLS); } else { tap_code(KC_PMNS); } break; - case __LR_NAV: - if (!clockwise) { + case LR_NAV: + if (clockwise) { tap_code(KC_EQL); } else { tap_code(KC_MINS); } break; - case __LR_REVIEW: - if (!clockwise) { + case LR_REVIEW: + if (clockwise) { tap_code(KC_RBRC); } else { tap_code(KC_LBRC); } break; - case __LR_EDIT: - if (!clockwise) { + case LR_EDIT: + if (clockwise) { tap_code(KC_DOT); } else { tap_code(KC_COMM); } break; case _LIGHT: - if (!clockwise) { + if (clockwise) { rgblight_increase_hue(); } else { rgblight_decrease_hue(); @@ -258,57 +258,57 @@ void encoder_update_user(uint8_t index, bool clockwise) { } else if (index == 1) { switch (get_highest_layer(layer_state)) { - case _NAVI: - if (!clockwise) { - tap_code16(NXT_TAB); - } else { - tap_code16(PRV_TAB); - } - break; case _REEDER: - if (!clockwise) { + if (clockwise) { tap_code(KC_N); } else { tap_code(KC_P); } break; case _MEDIA: - if (!clockwise) { + if (clockwise) { tap_code(KC_MFFD); } else { tap_code(KC_MRWD); } break; + case _NAVI: + if (clockwise) { + tap_code16(NXT_TAB); + } else { + tap_code16(PRV_TAB); + } + break; case _MACRO: - if (!clockwise) { + if (clockwise) { tap_code(KC_PEQL); } else { tap_code(KC_PDOT); } break; - case __LR_NAV: - if (!clockwise) { + case LR_NAV: + if (clockwise) { tap_code(KC_PGUP); } else { tap_code(KC_PGDN); } break; - case __LR_REVIEW: - if (!clockwise) { + case LR_REVIEW: + if (clockwise) { tap_code16(G(KC_UP)); } else { tap_code16(G(KC_DOWN)); } break; - case __LR_EDIT: - if (!clockwise) { + case LR_EDIT: + if (clockwise) { tap_code(KC_EQL); } else { tap_code(KC_MINS); } break; case _LIGHT: - if (!clockwise) { + if (clockwise) { rgblight_increase_sat(); } else { rgblight_decrease_sat(); @@ -326,19 +326,19 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { case TG_LNAV: if (!record->event.pressed) { tap_code(KC_G); - layer_move(__LR_NAV); + layer_move(LR_NAV); } break; case TG_REVW: if (!record->event.pressed) { tap_code(KC_E); - layer_move(__LR_REVIEW); + layer_move(LR_REVIEW); } break; case TG_EDIT: if (!record->event.pressed) { tap_code(KC_D); - layer_move(__LR_EDIT); + layer_move(LR_EDIT); } break; } @@ -350,13 +350,13 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { */ layer_state_t layer_state_set_keymap (layer_state_t state) { switch (get_highest_layer(state)) { - case __LR_NAV: + case LR_NAV: rgb_layer_helper(HSV_TEAL); break; - case __LR_REVIEW: + case LR_REVIEW: rgb_layer_helper(HSV_CYAN); break; - case __LR_EDIT: + case LR_EDIT: rgb_layer_helper(HSV_AZURE); break; } @@ -371,40 +371,40 @@ void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { switch (toggle_layer) { case _LIGHT: switch (get_highest_layer(layer_state)) { - case _NAVI: - keycode = KC_PGUP; - break; case _REEDER: case _MEDIA: keycode = KC_L; break; + case _NAVI: + keycode = KC_PGUP; + break; case _MACRO: keycode = KC_P6; break; - case __LR_NAV: + case LR_NAV: keycode = KC_END; - case __LR_REVIEW: + case LR_REVIEW: keycode = KC_U; - case __LR_EDIT: + case LR_EDIT: keycode = KC_P; break; } break; - case _MAGIC: + case _ADJUST: switch (get_highest_layer(layer_state)) { - case _NAVI: - case _MEDIA: - case __LR_NAV: - case __LR_REVIEW: - case __LR_EDIT: - keycode = KC_RGHT; - break; case _REEDER: keycode = G(KC_3); break; case _MACRO: keycode = KC_P9; break; + case _MEDIA: + case _NAVI: + case LR_NAV: + case LR_REVIEW: + case LR_EDIT: + keycode = KC_RGHT; + break; } break; } diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md index 8aa72be09745..54e460c2d901 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md @@ -12,16 +12,6 @@ I use macOS, so shortcuts and macros are configured as such. Encoder functionali ## Macropad Layers -### Navigation Layer -This layer is used for general window navigation around macOS - -| Scroll Up/Down | **Knobs** | Next/Prev Tab | -| --- | --- | --- | -| Reopen Tab | Cmd+Tab | Close Tab | -| Page Down | Up | Page Up | -| Left | Down | Right | - - ### Reeder Layer This layer is used for browsing [Reeder](https://reederapp.com/), an awesome RSS reader for Mac @@ -42,6 +32,16 @@ This layer is used for media controls. Player button is a hotkey to focus the cu | Left | Space | Right | +### Navigation Layer +This layer is used for general window navigation around macOS + +| Scroll Up/Down | **Knobs** | Next/Prev Tab | +| --- | --- | --- | +| Reopen Tab | Cmd+Tab | Close Tab | +| Page Down | Up | Page Up | +| Left | Down | Right | + + ### Macro Layer This layer is used to send generic macro keys, meant to be remapped based on current app with [Karabiner](https://pqrs.org/osx/karabiner/) @@ -96,12 +96,12 @@ This layer is used to control lighting for the pad. Currently nothing is saved i | RGB Layer Indication | Cycle RGB Themes | XXX | -### Magic Layer +### Adjust Layer This layer is used as a meta layer for the pad. This layer is accessed with a double tap of the bottom right key via [tap dance](https://docs.qmk.fm/#/feature_tap_dance). | XXX | **Knobs** | XXX | | --- | --- | --- | -| MAKE | **Navigation** Layer | RESET | -| **Reeder** Layer | **Media** Layer | **Keypad** Layer | +| MAKE | **Reeder** Layer | **Light** Layer | +| **Media** Layer | **Navigation** Layer | **Keypad** Layer | | **Lightroom Review** Layer | **Lightroom Navigation** Layer | **Lightroom Edit** Layer | diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index e64dce0af8b2..6696a6b7f77a 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -8,36 +8,18 @@ extern keymap_config_t keymap_config; // Tap Dances enum launchpad_dances { TD_SHLD_LGHT = 0, - TD_SHLD_MAGC, + TD_SHLD_ADJT, TD_REDR_H }; //Tap Dance Definitions qk_tap_dance_action_t tap_dance_actions[] = { [TD_SHLD_LGHT] = ACTION_TAP_DANCE_TRIGGER_LAYER(SINGLE_HOLD, _LIGHT), - [TD_SHLD_MAGC] = ACTION_TAP_DANCE_TRIGGER_LAYER(SINGLE_HOLD, _MAGIC), + [TD_SHLD_ADJT] = ACTION_TAP_DANCE_TRIGGER_LAYER(SINGLE_HOLD, _ADJUST), [TD_REDR_H] = ACTION_TAP_DANCE_DOUBLE(KC_H, KC_R) }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* Navigation - * ┌──────┬──────┐ - * │ PTab │ NTab │ - * ├──────┼──────┤ - * │ SclL │ SclU │ - * ├──────┼──────┤ - * │ SclR │ SclD │ - * ├──────┼──────┤ - * │LstTab│ClsTab│ - * └──────┴──────┘ - */ -[_NAVI] = LAYOUT( \ - PRV_TAB, NXT_TAB, \ - MC_WH_L, MC_WH_U, \ - MC_WH_R, MC_WH_D, \ - TD(TD_SHLD_LGHT), TD(TD_SHLD_MAGC) \ -), - /* Reeder * ┌──────┬──────┐ * │CmdTab│ View │ @@ -53,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { CMD_TAB, TD(TD_REDR_H), \ KC_P, KC_K, \ KC_N, KC_J, \ - TD(TD_SHLD_LGHT), TD(TD_SHLD_MAGC) \ + TD(TD_SHLD_LGHT), TD(TD_SHLD_ADJT) \ ), /* Media @@ -71,7 +53,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MUTE, KC_MPLY, \ KC_VOLU, KC_MFFD, \ KC_VOLD, KC_MRWD, \ - TD(TD_SHLD_LGHT), TD(TD_SHLD_MAGC) \ + TD(TD_SHLD_LGHT), TD(TD_SHLD_ADJT) \ +), + +/* Navigation + * ┌──────┬──────┐ + * │ PTab │ NTab │ + * ├──────┼──────┤ + * │ SclL │ SclU │ + * ├──────┼──────┤ + * │ SclR │ SclD │ + * ├──────┼──────┤ + * │LstTab│ClsTab│ + * └──────┴──────┘ + */ +[_NAVI] = LAYOUT( \ + PRV_TAB, NXT_TAB, \ + MC_WH_L, MC_WH_U, \ + MC_WH_R, MC_WH_D, \ + TD(TD_SHLD_LGHT), TD(TD_SHLD_ADJT) \ ), /* Macro @@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P1, KC_P2, \ KC_P3, KC_P4, \ KC_P5, KC_P6, \ - TD(TD_SHLD_LGHT), TD(TD_SHLD_MAGC) \ + TD(TD_SHLD_LGHT), TD(TD_SHLD_ADJT) \ ), /* Lights @@ -110,28 +110,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, RGB_MOD \ ), -/* Magic +/* Adjust * ┌──────┬──────┐ * │ Make │ Rset │ * ├──────┼──────┤ - * │ Navi │ Redr │ + * │ Redr │ Meda │ * ├──────┼──────┤ - * │ Meda │ Kypd │ + * │ Navi │ Mcro │ * ├──────┼──────┤ * │ Lght │ XXXX │ * └──────┴──────┘ */ -[_MAGIC] = LAYOUT( \ +[_ADJUST] = LAYOUT( \ KC_MAKE, RESET, \ - TG_NAVI, TG_REDR, \ - TG_MEDA, TG_KYPD, \ + DF_REDR, DF_MEDA, \ + DF_NAVI, DF_MCRO, \ TG_LGHT, XXXXXXX \ ) }; void matrix_init_keymap(void) { - } // Runs once after keyboard initializes @@ -146,31 +145,31 @@ void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { switch (toggle_layer) { case _LIGHT: switch (get_highest_layer(layer_state)) { - case _NAVI: - keycode = REO_TAB; - break; case _REEDER: keycode = KC_L; break; case _MEDIA: keycode = KC_SPC; break; + case _NAVI: + keycode = REO_TAB; + break; case _MACRO: keycode = KC_P7; break; } break; - case _MAGIC: + case _ADJUST: switch (get_highest_layer(layer_state)) { - case _NAVI: - keycode = CLS_TAB; - break; case _REEDER: keycode = KC_R; break; case _MEDIA: keycode = MC_PLYR; break; + case _NAVI: + keycode = CLS_TAB; + break; case _MACRO: keycode = KC_P8; break; diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index 1e5ead237272..559801e12a0a 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -16,7 +16,7 @@ enum alt_keycodes { keymap_config_t keymap_config; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Base Layer: Mac + /* Base Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│~ `│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ @@ -29,53 +29,50 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │Ctrl│ Opt│ Cmd│ Space │Cmd │FnPy│ │Lef│Dow│Rig│ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ - [_MAC] = LAYOUT( + [_BASE] = LAYOUT( 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_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_BSLS, KC_HOME, \ HY_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_PGUP, \ 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_UP, KC_PGDN, \ KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT \ ), - /* Function Layer: Mac + /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ * │Mke│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ Del │SlD│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ * │ │ │ │ │DFU│ │ │ │ │ │F13│F14│F15│ LHP │End│ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ Magic │VlU│ + * │ │ │ │ │ │ │ │ │ │ │ │ │ Adjust │VlU│ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ * │ │RTg│ │ │ │ │ │ │Prv│Nxt│Ply│MteSft│PgU│VlD│ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ * │ │ │ │ │ │ │ │Hom│PgD│End│ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ - [_MACFN] = LAYOUT( + [_FN] = LAYOUT( KC_MAKE, 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, MC_SLPD, \ _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_MAGC, KC_VOLU, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, KC_VOLU, \ _______, RGB_TOG, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, MM_RSFT, KC_PGUP, KC_VOLD, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), - /*********** - * Magic * - ***********/ - /* Keyboard Layer: Magic + /* Adjust Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ * │ │RS-│RB+│RS+│RH+│RS+│ │UAD│GCR│ │ │ │ │ │ │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ │RM-│RB-│RM+│RH-│RS-│ │ │ │ │ │ │ Magic │ │ + * │ │RM-│RB-│RM+│RH-│RS-│ │ │ │ │ │ │ Adjust │ │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ * │ │RTO│LYR│Thm│ │DFU│KRO│DBG│ │ │ │ │ │ │ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ * │ │ │ │ │ │ │ │ │ │ │ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ - [_MAGIC] = LAYOUT( + [_ADJUST] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, XXXXXXX, U_T_AUTO,U_T_AGCR,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_MAGC, XXXXXXX, \ + XXXXXXX, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_ADJT, XXXXXXX, \ _______, RGB_TOG, RGB_LYR, RGB_THM, XXXXXXX, MD_BOOT, TG_NKRO, DBG_TOG, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, \ _______, _______, _______, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX \ ), diff --git a/keyboards/romac/keymaps/brandonschlack/keymap.c b/keyboards/romac/keymaps/brandonschlack/keymap.c index e3a5e5339ce3..ef880c42d2b1 100644 --- a/keyboards/romac/keymaps/brandonschlack/keymap.c +++ b/keyboards/romac/keymaps/brandonschlack/keymap.c @@ -18,83 +18,51 @@ #include "brandonschlack.h" enum romac_layers { - __NUMPAD = 0, - __FN, - __NUMLOCK, - __MACRO + NUMPAD = 0, + FN, + NUMLOCK, + MACRO }; -enum romac_keycodes { - DF_NMPD = KEYMAP_SAFE_RANGE, - DF_NMLK, - DF_MCRO, - DF_MAGC -}; +#define DF_NMPD DF(NUMPAD) +#define DF_NMLK DF(NUMLOCK) +#undef DF_MCRO +#define DF_MCRO DF(MACRO) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [__NUMPAD] = LAYOUT( + [NUMPAD] = LAYOUT( KC_P7, KC_P8, KC_P9, \ KC_P4, KC_P5, KC_P6, \ KC_P1, KC_P2, KC_P3, \ - OSL(__FN), KC_P0, KC_PDOT \ + OSL(FN), KC_P0, KC_PDOT \ ), - [__FN] = LAYOUT( + [FN] = LAYOUT( KC_PSLS, KC_PAST, KC_BSPC, \ KC_TRNS, KC_TRNS, KC_PMNS, \ DF_NMLK, DF_MCRO, KC_PPLS, \ - KC_TRNS, DF_MAGC, KC_PENT \ + KC_TRNS, TG_ADJT, KC_PENT \ ), - [__NUMLOCK] = LAYOUT( + [NUMLOCK] = LAYOUT( KC_HOME, KC_UP, KC_PGUP, \ KC_LEFT, CMD_TAB, KC_RGHT, \ KC_END, KC_DOWN, KC_PGDN, \ DF_NMPD, KC_INS, KC_DEL \ ), - [__MACRO] = LAYOUT( + [MACRO] = LAYOUT( KC_F13, KC_F14, KC_F15, \ KC_F16, KC_F17, KC_F18, \ KC_F19, KC_F20, KC_F21, \ - LT(_MAGIC,KC_F22), KC_F23, KC_F24 \ + LT(_ADJUST,KC_F22), KC_F23, KC_F24 \ ), - [_MAGIC] = LAYOUT( + [_ADJUST] = LAYOUT( KC_MAKE, EEP_RST, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, \ DF_NMPD, DF_NMLK, DF_MCRO, \ KC_TRNS, XXXXXXX, XXXXXXX \ ) }; - -bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case DF_NMPD: - if (!record->event.pressed) { - default_layer_set(__NUMPAD); - layer_move(default_layer_state); - } - break; - case DF_NMLK: - if (!record->event.pressed) { - default_layer_set(__NUMLOCK); - layer_move(default_layer_state); - } - break; - case DF_MCRO: - if (!record->event.pressed) { - default_layer_set(__MACRO); - layer_move(default_layer_state); - } - break; - case DF_MAGC: - if (!record->event.pressed) { - default_layer_set(_MAGIC); - layer_move(default_layer_state); - } - break; - } - return true; -} diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index 9b366e3d1f36..3ec16f571960 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -75,7 +75,19 @@ void matrix_scan_user(void) { } __attribute__ ((weak)) -layer_state_t layer_state_set_keymap (layer_state_t state) { +layer_state_t default_layer_state_set_keymap(layer_state_t state) { + return state; +} + +layer_state_t default_layer_state_set_user(layer_state_t state) { +#if defined(IS_MACROPAD) + layer_move(get_highest_layer(state)); +#endif + return default_layer_state_set_keymap(state); +} + +__attribute__ ((weak)) +layer_state_t layer_state_set_keymap(layer_state_t state) { return state; } @@ -85,5 +97,15 @@ layer_state_t layer_state_set_user(layer_state_t state) { #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) state = layer_state_set_rgb(state); #endif // RGBLIGHT_ENABLE - return layer_state_set_keymap (state); + return layer_state_set_keymap(state); +} + +#if defined(ENCODER_ENABLE) +__attribute__ ((weak)) +void encoder_update_keymap(uint8_t index, bool clockwise) { } + +// Encoders might be reveresed with macOS natural scrolling. +void encoder_update_user(uint8_t index, bool clockwise) { + encoder_update_keymap(index, !clockwise); } +#endif diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index b24d2c8723b7..cb98170ff52a 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -12,21 +12,22 @@ // Define layer names enum bs_layers { - _MAC = 0, - _MACFN, #if !defined(IS_MACROPAD) - _NAVI, + _BASE = 0, + _FN = 1, + _LOWER = 1, + _RAISE, #else - _NAVI = 0, - _REEDER, + _REEDER = 0, _MEDIA, + _NAVI, _MACRO, #endif KEYMAP_LAYERS, -#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) +#if defined(IS_MACROPAD) && (defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)) _LIGHT = 14, #endif - _MAGIC = 15 + _ADJUST = 15 }; typedef union { @@ -45,4 +46,9 @@ void shutdown_keymap(void); void suspend_power_down_keymap(void); void suspend_wakeup_init_keymap(void); void matrix_scan_keymap(void); -layer_state_t layer_state_set_keymap (layer_state_t state); +layer_state_t default_layer_state_set_keymap(layer_state_t state); +layer_state_t layer_state_set_keymap(layer_state_t state); + +#if defined(ENCODER_ENABLE) +void encoder_update_keymap(uint8_t index, bool clockwise); +#endif diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index 0db2edbb5a48..d98c84c6d08e 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -43,28 +43,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { unregister_code(KC_TAB); } break; - #ifdef IS_MACROPAD - case TG_NAVI: - if (!record->event.pressed) { - layer_move(_NAVI); - } - break; - case TG_REDR: - if (!record->event.pressed) { - layer_move(_REEDER); - } - break; - case TG_MEDA: - if (!record->event.pressed) { - layer_move(_MEDIA); - } - break; - case TG_KYPD: - if (!record->event.pressed) { - layer_move(_MACRO); - } - break; - #endif // IS_MACROPAD #if defined(RGB_THEME) case RGB_LYR: if (record->event.pressed) { @@ -123,15 +101,15 @@ void matrix_scan_cmd_tab(void) { * set to true */ void send_make_command(bool flash_bootloader) { - SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP); + send_string_with_delay_P(PSTR("make " QMK_KEYBOARD ":" QMK_KEYMAP), 10); if (flash_bootloader) { #if defined(BOOTLOADER_MDLOADER) // only run for Massdrop boards - SEND_STRING(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP); -#else - SEND_STRING(":flash"); -#endif // bootloader options + send_string_with_delay_P(PSTR(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP), 10); +#else // use universal flash command + send_string_with_delay_P(PSTR(":flash"), 10); +#endif } - SEND_STRING(SS_TAP(X_ENTER)); + send_string_with_delay_P(PSTR(SS_TAP(X_ENTER)), 10); if (flash_bootloader) { reset_keyboard(); } diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 600ae1272f7f..24f74696fe7b 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -5,10 +5,6 @@ enum custom_keycodes { KC_MAKE = SAFE_RANGE, CMD_TAB, - TG_NAVI, - TG_REDR, - TG_MEDA, - TG_KYPD, RGB_LYR, RGB_THEME_FORWARD, RGB_THEME_REVERSE, @@ -20,30 +16,31 @@ void matrix_scan_cmd_tab(void); // Useful Defines #define HY_CAPS ALL_T(KC_CAPS) -#define TG_MAGC TG(_MAGIC) +#define TG_ADJT TG(_ADJUST) #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) #define TG_LGHT TG(_LIGHT) #endif // Media Mod-Tap #define MM_RGUI RGUI_T(KC_MRWD) #define MM_RALT RALT_T(KC_MFFD) -#define MM_FNPY LT(_MACFN, KC_MPLY) +#define MM_FNPY LT(1, KC_MPLY) #define MM_RSFT RSFT_T(KC_MUTE) // Arrow Mod-Tap #define MT_RSUP RSFT_T(KC_UP) #define MT_RALT RALT_T(KC_LEFT) -#define MT_RFDN LT(_MACFN, KC_DOWN) +#define MT_RFDN LT(1, KC_DOWN) #define MT_RCRT RCTL_T(KC_RGHT) // Nav Mod-Tap #define MT_RSPU RSFT_T(KC_PGUP) #define MT_RAHM RALT_T(KC_HOME) -#define MT_RFPD LT(_MACFN, KC_PGDN) +#define MT_RFPD LT(1, KC_PGDN) #define MT_RCED RCTL_T(KC_END) // MacOS #define MC_POWR KC_POWER // Mac Power alias #define MC_SLEP LALT(LGUI(KC_POWER)) // Mac Sleep #define MC_SLPD LCTL(LSFT(KC_POWER)) // Sleep Display +#define MC_LOCK LCTL(LGUI(KC_Q)) // Lock Screen #define MC_MSSN KC_FIND // Mission Control: Configure karabiner for find -> mission_control #define MC_LHPD KC_MENU // Launchpad: Configure karabiner for menu -> Launchpad #define MC_CMTB LGUI(KC_TAB) // Basic CMD+TAB @@ -60,6 +57,15 @@ void matrix_scan_cmd_tab(void); #define MC_WH_L KC_WH_R #define MC_WH_R KC_WH_L +// Macropad Defines +#if defined(IS_MACROPAD) +// Macropad Default Layer keycodes +#define DF_REDR DF(_REEDER) +#define DF_MEDA DF(_MEDIA) +#define DF_NAVI DF(_NAVI) +#define DF_MCRO DF(_MACRO) +#endif + // RGB Theme #define RGB_THM RGB_THEME_FORWARD #define RGB_RTHM RGB_THEME_REVERSE diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index ebf0e8ba27d2..2816af03c239 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -11,7 +11,7 @@ extern led_config_t g_led_config; #endif #if defined(RGB_THEME) -static const HSV default_magic = { HSV_SPRINGGREEN }; +static const HSV default_adjust = { HSV_SPRINGGREEN }; // Laser Color Constants static const HSV laser_purple = { HSV_LSR_PURPLE }; @@ -79,8 +79,8 @@ HSV get_rgb_theme_color(uint8_t index) { rgb_theme_t theme = get_rgb_theme(); size_t rgb_theme_color_max = sizeof theme.colors / sizeof *theme.colors; - if (index == _MAGIC) { - return default_magic; + if (index == _ADJUST) { + return default_adjust; } else { return **(theme.colors + (index % rgb_theme_color_max)); } From 5657b564a19e84bebfb20df527626133ab314146 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Sun, 25 Aug 2019 10:10:12 -0700 Subject: [PATCH 168/429] [User] Missed some LED_FLAG_ALL_KEYS refs --- keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c | 2 +- users/brandonschlack/rgb_bs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index 559801e12a0a..525c0563d30e 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -170,7 +170,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { void rgb_matrix_indicators_user(void) { if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) { rgb_matrix_set_color(USB_LED_CAPS_LOCK_SCANCODE, RGB_GREEN); - } else if (!HAS_ANY_FLAGS(rgb_matrix_get_flags(), LED_FLAG_ALL_KEYS)){ + } else if (!HAS_ANY_FLAGS(rgb_matrix_get_flags(), LED_FLAG_KEYS)){ rgb_matrix_set_color(USB_LED_CAPS_LOCK_SCANCODE, 0, 0, 0); } } diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index 2816af03c239..4ba81cb8da14 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -110,7 +110,7 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, uint8_t void rgb_matrix_cycle_flag (void) { switch (rgb_matrix_get_flags()) { case LED_FLAG_ALL: - rgb_matrix_set_flags(LED_FLAG_ALL_KEYS); + rgb_matrix_set_flags(LED_FLAG_KEYS); rgb_matrix_set_color_all(0, 0, 0); break; case LED_FLAG_KEYS: From fc70a6382faa422b74d0b12d6937af94df440f80 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 26 Aug 2019 10:35:44 -0700 Subject: [PATCH 169/429] [Keymap] Update for KBD67 Hotswap keymap * Better visual preview. --- .../hotswap/keymaps/brandonschlack/keymap.c | 109 ++++++++++-------- 1 file changed, 60 insertions(+), 49 deletions(-) diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index 67235a074943..910c7f3e2632 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -17,32 +17,18 @@ #include "brandonschlack.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* N Layer: Blank Template - * ,---------------------------------------------------------------. - * | | | | | | | | | | | | | | | | | - * |---------------------------------------------------------------| - * | | | | | | | | | | | | | | | | - * |---------------------------------------------------------------| - * | | | | | | | | | | | | | | | - * |---------------------------------------------------------------| - * | | | | | | | | | | | | | | | - * |---------------------------------------------------------------| - * | | | | | | | | | | | - * `---------------------------------------------------------------' - */ - /* Base Layer - * ,---------------------------------------------------------------. - * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| `|Hom| - * |---------------------------------------------------------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]|Backs|PgU| - * |---------------------------------------------------------------| - * |HyCaps| A| S| D| F| G| H| J| K| L| ;| '|Enter |PgD| - * |---------------------------------------------------------------| - * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Up |End| - * |---------------------------------------------------------------| - * |Ctl |Alt |Gui | Space |Gui |FnPy| |Lef|Dow|Rig| - * `---------------------------------------------------------------' + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│Hom│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ + * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│ Bspc│PgU│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│PgD│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│End│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * │Ctrl│ Opt│ Cmd│ Space │Cmd │FnPy│ │Lef│Dow│Rig│ + * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ [_BASE] = LAYOUT( 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_HOME, \ @@ -50,37 +36,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { HY_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_PGDN, \ 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_UP, KC_END, \ KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT), + /* Function Layer - * ,---------------------------------------------------------------. - * |MKE| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|LHP|MSN|SLP| - * |---------------------------------------------------------------| - * | | | | |RST| | | | | |F13|F14|F15| Del|VlU| - * |---------------------------------------------------------------| - * | | | | | | | | | | | | | Adjust |VlD| - * |---------------------------------------------------------------| - * | | | | | | | | |Prv|Nxt|Ply|MutSft|PgU| | - * |---------------------------------------------------------------| - * | | | | | | | |Hom|PgD|End| - * `---------------------------------------------------------------' + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │MKE│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│LHP│MSN│SLP│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ + * │ │ │ │ │RST│ │ │ │ │ │F13│F14│F15│ Del│VlU│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ Adjust │VlD│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ │ │ │ │ │ │ │ │Prv│Nxt│Ply│ │PgU│Mut│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * │ │ │ │ │ │ │ │Hom│PgD│End│ + * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ [_FN] = LAYOUT( KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_MSSN, MC_SLPD, \ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, KC_VOLU, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, KC_VOLD, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, MM_RSFT, KC_PGUP, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, KC_PGUP, KC_MUTE, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), -/* Keyboard Layer: Magic - * ,---------------------------------------------------------------. - * | | | | | | | | | | | | | | | | | - * |---------------------------------------------------------------| - * | | | |EEP|RST| | | | | | | | | | | - * |---------------------------------------------------------------| - * | | | | | | | | | | | | | Adjust | | - * |---------------------------------------------------------------| - * | | | | | | | | | | | | | | | - * |---------------------------------------------------------------| - * | | | | | | | | | | | - * `---------------------------------------------------------------' + +/* Adjust Layer Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ + * │ │ │ │EEP│RST│ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ Adjust │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ [_ADJUST] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ @@ -90,6 +78,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX), }; +/* Blank Template + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ + */ +/* +[_BLANK] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; +*/ + void matrix_init_keymap(void) { } From cc1a0fb4e18b72f6990b625405053673ebb4d393 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 26 Aug 2019 13:30:00 -0700 Subject: [PATCH 170/429] [Keymap] Refactor gingham keymap --- .../gingham/keymaps/brandonschlack/keymap.c | 47 +++++-------------- 1 file changed, 12 insertions(+), 35 deletions(-) diff --git a/keyboards/gingham/keymaps/brandonschlack/keymap.c b/keyboards/gingham/keymaps/brandonschlack/keymap.c index a7ba486f1660..b01ffff43576 100644 --- a/keyboards/gingham/keymaps/brandonschlack/keymap.c +++ b/keyboards/gingham/keymaps/brandonschlack/keymap.c @@ -16,9 +16,6 @@ #include QMK_KEYBOARD_H #include "brandonschlack.h" -// FIXME: Refactor for _LOWER, _RAISE -#define TT_NAVI TT(_NAVI) - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ @@ -28,57 +25,37 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - * │ LShift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │↑ Shft│Nav│ + * │ LShift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │↑ Shft│FnP│ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ - * │LCtl│LAlt│LGui│ Space │RGui│←Alt│↓Fn1│→Ctl│ + * │LCtl│LAlt│LGui│ Space │RGui│←Alt│↓ Fn│→Ctl│ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ */ -[_MAC] = LAYOUT_60_ansi_split_bs_rshift( +[_BASE] = LAYOUT_60_ansi_split_bs_rshift( 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, HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT_RSUP, TT_NAVI, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT_RSUP, MM_FNPY, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MT_RALT, MT_RFDN, MT_RCRT), -/* Fn layer +/* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ * │MKE│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│LHP│SLP│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │MNC│ Del │ + * │ │Mte│VlD│VlU│ │ │ │ │F13│F14│F15│ ↑ │MNC│ Del │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │VlD│VlU│Mte│ │ + * │ │Ply│Prv│Nxt│ │ │ │ │Hom│PgU│ ← │ → │ │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - * │ │ │ │ │ │ │ │ │Prv│Nxt│Ply│ │ │ + * │ │ │ │ │ │ │ │ │End│PgD│ ↓ │ │ │ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ * │ │ │ │ │ │ │ │ │ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ */ -[_MACFN] = LAYOUT_60_ansi_split_bs_rshift( +[_FN] = LAYOUT_60_ansi_split_bs_rshift( KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MC_MSSN, KC_DEL, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_MFFD, KC_MPLY, KC_TRNS, KC_TRNS, + KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F13, KC_F14, KC_F15, KC_UP, MC_MSSN, KC_DEL, + KC_TRNS, KC_MPLY, KC_MRWD, KC_MFFD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - -/* Navigation Layer - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ ↑ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │ │ ← │ → │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - * │ │ │ │ │ │ │ │ │ │ │ ↓ │ PgU │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ - * │ │ │ │ │ │Home│PgDn│End │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -[_NAVI] = LAYOUT_60_ansi_split_bs_rshift( - 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_UP, 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_LEFT, KC_RGHT, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, MT_RSPU, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MT_RAHM, MT_RFPD, MT_RCED), }; void matrix_init_keymap(void) { From d1b0b3c84f7fcc449a9942ff77bb622b72487914 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 27 Aug 2019 15:16:38 -0700 Subject: [PATCH 171/429] [User] Add some doc comments to .c --- users/brandonschlack/brandonschlack.c | 40 +++++++++++++++++++++++--- users/brandonschlack/brandonschlack.h | 10 +++---- users/brandonschlack/process_records.c | 14 ++++++--- users/brandonschlack/readme.md | 2 +- 4 files changed, 52 insertions(+), 14 deletions(-) diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index 3ec16f571960..cd0aedb668a0 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -2,12 +2,18 @@ user_config_t user_config; -void eeconfig_init_user(void) { // EEPROM is getting reset! +/** + * Resets user config in EEPROM + * + * Default is use rgb for layer indication + */ +void eeconfig_init_user(void) { user_config.raw = 0; user_config.rgb_layer_change = true; user_config.rgb_theme = 0; eeconfig_update_user(user_config.raw); } + __attribute__((weak)) void matrix_init_keymap(void){ } @@ -18,9 +24,14 @@ void matrix_init_user(void) { __attribute__((weak)) void keyboard_post_init_keymap(void){ } +/** + * Reads user config from EEPROM, + * calls RGB init if RGBs enabled + */ void keyboard_post_init_user(void){ // Read the user config from EEPROM user_config.raw = eeconfig_read_user(); + // Do RGB things if RGBs enabled #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) keyboard_post_init_rgb(); #endif @@ -30,6 +41,11 @@ void keyboard_post_init_user(void){ __attribute__ ((weak)) void shutdown_keymap(void) {} +/** + * On shutdown, + * If RGBs enabled, + * then set RGB color to Red + */ void shutdown_user (void) { #ifdef RGBLIGHT_ENABLE rgblight_enable_noeeprom(); @@ -45,6 +61,9 @@ void shutdown_user (void) { __attribute__ ((weak)) void suspend_power_down_keymap(void) {} +/** + * Set rgb_matrix suspend state to true if not already + */ void suspend_power_down_user(void) { #ifdef RGB_MATRIX_ENABLE if (!g_suspend_state) { @@ -57,6 +76,9 @@ void suspend_power_down_user(void) { __attribute__ ((weak)) void suspend_wakeup_init_keymap(void) {} +/** + * Set rgb_matrix suspend state to false if not already + */ void suspend_wakeup_init_user(void) { #ifdef RGB_MATRIX_ENABLE if (g_suspend_state) { @@ -69,6 +91,9 @@ void suspend_wakeup_init_user(void) { __attribute__ ((weak)) void matrix_scan_keymap(void) {} +/** + * Checks for Super CMD↯TAB + */ void matrix_scan_user(void) { matrix_scan_cmd_tab(); matrix_scan_keymap(); @@ -79,6 +104,10 @@ layer_state_t default_layer_state_set_keymap(layer_state_t state) { return state; } +/** + * For macropads, if a new default layer is set from DF() + * then automatically set that layer with layer_move() + */ layer_state_t default_layer_state_set_user(layer_state_t state) { #if defined(IS_MACROPAD) layer_move(get_highest_layer(state)); @@ -91,8 +120,9 @@ layer_state_t layer_state_set_keymap(layer_state_t state) { return state; } -// on layer change, no matter where the change was initiated -// Then runs keymap's layer change check +/** + * Do RGB things (like layer indication) on layer change + */ layer_state_t layer_state_set_user(layer_state_t state) { #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) state = layer_state_set_rgb(state); @@ -104,7 +134,9 @@ layer_state_t layer_state_set_user(layer_state_t state) { __attribute__ ((weak)) void encoder_update_keymap(uint8_t index, bool clockwise) { } -// Encoders might be reveresed with macOS natural scrolling. +/** + * Encoders might be reveresed with macOS natural scrolling. + */ void encoder_update_user(uint8_t index, bool clockwise) { encoder_update_keymap(index, !clockwise); } diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index cb98170ff52a..bf5f059f1317 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -12,22 +12,22 @@ // Define layer names enum bs_layers { -#if !defined(IS_MACROPAD) +#if !defined(IS_MACROPAD) // Keyboard Layers _BASE = 0, _FN = 1, _LOWER = 1, _RAISE, -#else +#else // Macropad Layers _REEDER = 0, _MEDIA, _NAVI, _MACRO, #endif - KEYMAP_LAYERS, + KEYMAP_LAYERS, // Add more layers in keymaps #if defined(IS_MACROPAD) && (defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)) - _LIGHT = 14, + _LIGHT = 14, // Layer for BLight/RGB controls on macropads #endif - _ADJUST = 15 + _ADJUST = 15 // Change keyboard settings }; typedef union { diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index d98c84c6d08e..d2406f61d545 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -9,12 +9,14 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true; } +// Consolidated Macros bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case KC_MAKE: if (!record->event.pressed) { bool flash = false; - + // If is a keyboard and auto-flash is not set in rules.mk, + // then Shift will trigger the :flash target #if !defined(FLASH_BOOTLOADER) && !defined(IS_MACROPAD) uint8_t temp_mod = get_mods(); uint8_t temp_osm = get_oneshot_mods(); @@ -87,6 +89,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return process_record_keymap(keycode, record); } +// Super CMD↯TAB void matrix_scan_cmd_tab(void) { if (is_cmd_tab_active) { if (timer_elapsed(cmd_tab_timer) > 500) { @@ -96,9 +99,12 @@ void matrix_scan_cmd_tab(void) { } } -/** Send Make Command - * adds flash target and resets keyboard if flash_bootloader - * set to true +/** + * Send Make Command + * + * Sends 'make keyboard:keymap command to compile firmware + * Adds :flash target and resets keyboard, + * if flash_bootloader set to true */ void send_make_command(bool flash_bootloader) { send_string_with_delay_P(PSTR("make " QMK_KEYBOARD ":" QMK_KEYMAP), 10); diff --git a/users/brandonschlack/readme.md b/users/brandonschlack/readme.md index 2409e25e12c5..6bd8f571f01a 100644 --- a/users/brandonschlack/readme.md +++ b/users/brandonschlack/readme.md @@ -1,6 +1,6 @@ # Overview -My QMK home. I feel as though I stand on the shoulders of giants, for a lot of my code here is borrowed and adapted from so many contributors here (namely Drashna and Konstantin), and that I hope my here helps can others. +My QMK home. I feel as though I stand on the shoulders of giants, for a lot of my code here is borrowed and adapted from so many contributors here (namely Drashna and Konstantin), and that I hope my code here can help or inspire others. ## brandonschlack.c From 6fd6b8441b87ecc0cf7540a43de28ccf6e1d6ba9 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 27 Aug 2019 15:49:26 -0700 Subject: [PATCH 172/429] [User] Update userspace LTO --- keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk | 4 ++-- users/brandonschlack/process_records.c | 2 +- users/brandonschlack/rules.mk | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk b/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk index c12d998b005e..13fe13846799 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk @@ -1,2 +1,2 @@ -# Use mdloader for flashing -BOOTLOADER = mdloader +# Disable LTO, breaks with it enabled. +DISABLE_LTO = yes diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index d98c84c6d08e..1dc3ae30195b 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -103,7 +103,7 @@ void matrix_scan_cmd_tab(void) { void send_make_command(bool flash_bootloader) { send_string_with_delay_P(PSTR("make " QMK_KEYBOARD ":" QMK_KEYMAP), 10); if (flash_bootloader) { -#if defined(BOOTLOADER_MDLOADER) // only run for Massdrop boards +#if defined(MD_BOOTLOADER) // only run for Massdrop boards send_string_with_delay_P(PSTR(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP), 10); #else // use universal flash command send_string_with_delay_P(PSTR(":flash"), 10); diff --git a/users/brandonschlack/rules.mk b/users/brandonschlack/rules.mk index 7de73c024e2a..5a2a63ba2839 100644 --- a/users/brandonschlack/rules.mk +++ b/users/brandonschlack/rules.mk @@ -1,10 +1,10 @@ SRC += brandonschlack.c \ process_records.c -ifeq ($(strip $(BOOTLOADER)), mdloader) - OPT_DEFS += -DBOOTLOADER_MDLOADER -else - LINK_TIME_OPTIMIZATION_ENABLE = yes +ifneq ($(strip $(DISABLE_LTO)), yes) + EXTRAFLAGS += -flto + OPT_DEFS += -DNO_ACTION_MACRO + OPT_DEFS += -DNO_ACTION_FUNCTION endif ifeq ($(strip $(IS_MACROPAD)), yes) From ff9cd9bf62cf9c23622f1b79210e441662b13eb3 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 28 Aug 2019 16:02:43 -0700 Subject: [PATCH 173/429] [User] Change RGB_THEME to RGB_THEME_ENABLE --- users/brandonschlack/config.h | 2 +- users/brandonschlack/process_records.c | 2 +- users/brandonschlack/rgb_bs.c | 6 +++--- users/brandonschlack/rgb_bs.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/users/brandonschlack/config.h b/users/brandonschlack/config.h index 383ae5c69dad..e621f49d5ac0 100644 --- a/users/brandonschlack/config.h +++ b/users/brandonschlack/config.h @@ -9,5 +9,5 @@ #endif #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) -# define RGB_THEME +# define RGB_THEME_ENABLE #endif diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index 1f7268b7b5e7..41e75f2a6f85 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -45,7 +45,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { unregister_code(KC_TAB); } break; - #if defined(RGB_THEME) + #if defined(RGB_THEME_ENABLE) case RGB_LYR: if (record->event.pressed) { user_config.rgb_layer_change ^= 1; diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index 4ba81cb8da14..553d6b1ca6b1 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -10,7 +10,7 @@ extern bool g_suspend_state; extern led_config_t g_led_config; #endif -#if defined(RGB_THEME) +#if defined(RGB_THEME_ENABLE) static const HSV default_adjust = { HSV_SPRINGGREEN }; // Laser Color Constants @@ -50,7 +50,7 @@ void keyboard_post_init_rgb(void) { #endif } -#if defined(RGB_THEME) +#if defined(RGB_THEME_ENABLE) void set_rgb_theme(rgb_theme_name_t theme_name) { if (!user_config.rgb_layer_change) { user_config.rgb_layer_change = true; @@ -139,7 +139,7 @@ void rgb_layer_helper(uint8_t hue, uint8_t sat, uint8_t val) { #endif layer_state_t layer_state_set_rgb(layer_state_t state) { -#if defined(RGB_THEME) +#if defined(RGB_THEME_ENABLE) if (user_config.rgb_layer_change) { rgb_theme_layer(state); } diff --git a/users/brandonschlack/rgb_bs.h b/users/brandonschlack/rgb_bs.h index 406f47d98ad8..17e9505f5d2c 100644 --- a/users/brandonschlack/rgb_bs.h +++ b/users/brandonschlack/rgb_bs.h @@ -1,6 +1,6 @@ #pragma once #include "quantum.h" -#ifdef RGB_THEME +#ifdef RGB_THEME_ENABLE # include "rgb_theme.h" #endif #ifdef RGB_MATRIX_ENABLE From d803beae7ea966f2bc156b2806bdf5c26812deb8 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 28 Aug 2019 16:20:04 -0700 Subject: [PATCH 174/429] [User] Add define for max colors in RGB_THEME --- users/brandonschlack/rgb_bs.c | 45 ++++++++++++++++++++++++++------ users/brandonschlack/rgb_theme.h | 37 +++++--------------------- 2 files changed, 44 insertions(+), 38 deletions(-) diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index 553d6b1ca6b1..ffccecf0b1a8 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -14,30 +14,59 @@ extern led_config_t g_led_config; static const HSV default_adjust = { HSV_SPRINGGREEN }; // Laser Color Constants +// Laser Colors +#define HSV_LSR_PURPLE HSV_PURPLE +#define HSV_LSR_PINK HSV_PINK +#define HSV_LSR_BLUE HSV_BLUE +#define HSV_LSR_CYAN HSV_CYAN +#define HSV_LSR_MAGENTA HSV_MAGENTA static const HSV laser_purple = { HSV_LSR_PURPLE }; static const HSV laser_pink = { HSV_LSR_PINK }; static const HSV laser_blue = { HSV_LSR_BLUE }; static const HSV laser_cyan = { HSV_LSR_CYAN }; static const HSV laser_magenta = { HSV_LSR_MAGENTA }; -static const rgb_theme_t rgb_laser = { LASER, { &laser_purple, &laser_pink, &laser_blue, &laser_cyan, &laser_magenta } }; +static const rgb_theme_t rgb_laser = { { &laser_purple, &laser_pink, &laser_blue, &laser_cyan, &laser_magenta } }; // Granite Color Constants +// Granite Colors +#define HSV_GNT_BLUE HSV_BLUE +#define HSV_GNT_RED HSV_RED +#define HSV_GNT_GREEN HSV_GREEN +#define HSV_GNT_YELLOW HSV_YELLOW +#define HSV_GNT_WHITE HSV_WHITE static const HSV granite_white = { HSV_GNT_WHITE }; static const HSV granite_blue = { HSV_GNT_BLUE }; static const HSV granite_red = { HSV_GNT_RED }; static const HSV granite_green = { HSV_GNT_GREEN }; static const HSV granite_yellow = { HSV_GNT_YELLOW }; -static const rgb_theme_t rgb_granite = { GRANITE, { &granite_white, &granite_blue, &granite_red, &granite_green, &granite_yellow } }; +static const rgb_theme_t rgb_granite = { { &granite_white, &granite_blue, &granite_red, &granite_green, &granite_yellow } }; // Oblique Color Constants +// Oblique Colors +#define HSV_OBQ_BLUE 130, 215, 255 +#define HSV_OBQ_RED 10, 200, 255 +#define HSV_OBQ_GREEN 58, 199, 255 +#define HSV_OBQ_ORANGE 26, 215, 255 +#define HSV_OBQ_PURPLE 186, 143, 255 +#define HSV_OBQ_WHITE HSV_WHITE static const HSV oblique_white = { HSV_OBQ_WHITE }; static const HSV oblique_purple = { HSV_OBQ_PURPLE }; static const HSV oblique_red = { HSV_OBQ_RED }; static const HSV oblique_orange = { HSV_OBQ_ORANGE }; static const HSV oblique_green = { HSV_OBQ_GREEN }; -static const rgb_theme_t rgb_oblique = { OBLIQUE, { &oblique_white, &oblique_purple, &oblique_red, &oblique_orange, &oblique_green } }; +static const rgb_theme_t rgb_oblique = { { &oblique_white, &oblique_purple, &oblique_red, &oblique_orange, &oblique_green } }; + // Set themes to be included -static const rgb_theme_t *themes[] = { &rgb_laser, &rgb_granite, &rgb_oblique }; +enum rgb_themes { + LASER = 0, + GRANITE, + OBLIQUE +}; +const rgb_theme_t *themes[] = { \ + [LASER] = &rgb_laser, \ + [GRANITE] = &rgb_granite, \ + [OBLIQUE] = &rgb_oblique, \ +}; static const size_t rgb_theme_max = (sizeof themes / sizeof *themes); #endif @@ -51,11 +80,11 @@ void keyboard_post_init_rgb(void) { } #if defined(RGB_THEME_ENABLE) -void set_rgb_theme(rgb_theme_name_t theme_name) { +void set_rgb_theme(uint8_t index) { if (!user_config.rgb_layer_change) { user_config.rgb_layer_change = true; } - user_config.rgb_theme = theme_name; + user_config.rgb_theme = index; eeconfig_update_user(user_config.raw); } @@ -64,13 +93,13 @@ rgb_theme_t get_rgb_theme(void) { } void rgb_theme_step(void) { - rgb_theme_name_t current = user_config.rgb_theme; + uint8_t current = user_config.rgb_theme; current = (current + 1) % rgb_theme_max; set_rgb_theme(current); } void rgb_theme_step_reverse(void) { - rgb_theme_name_t current = user_config.rgb_theme; + uint8_t current = user_config.rgb_theme; current = (current - 1) % rgb_theme_max; set_rgb_theme(current); } diff --git a/users/brandonschlack/rgb_theme.h b/users/brandonschlack/rgb_theme.h index 1384e39860c6..fe292c5307fd 100644 --- a/users/brandonschlack/rgb_theme.h +++ b/users/brandonschlack/rgb_theme.h @@ -4,40 +4,17 @@ #include "color.h" #include "rgblight_list.h" -// Laser Colors -#define HSV_LSR_PURPLE HSV_PURPLE -#define HSV_LSR_PINK HSV_PINK -#define HSV_LSR_BLUE HSV_BLUE -#define HSV_LSR_CYAN HSV_CYAN -#define HSV_LSR_MAGENTA HSV_MAGENTA - -// Granite Colors -#define HSV_GNT_BLUE HSV_BLUE -#define HSV_GNT_RED HSV_RED -#define HSV_GNT_GREEN HSV_GREEN -#define HSV_GNT_YELLOW HSV_YELLOW -#define HSV_GNT_WHITE HSV_WHITE - -// Oblique Colors -#define HSV_OBQ_BLUE 130, 215, 255 -#define HSV_OBQ_RED 10, 200, 255 -#define HSV_OBQ_GREEN 58, 199, 255 -#define HSV_OBQ_ORANGE 26, 215, 255 -#define HSV_OBQ_PURPLE 186, 143, 255 -#define HSV_OBQ_WHITE HSV_WHITE - -typedef enum { - LASER = 0, - GRANITE, - OBLIQUE -} rgb_theme_name_t; +#ifndef RGB_THEME_COLORS_MAX +#define RGB_THEME_COLORS_MAX 5 +#endif typedef struct { - rgb_theme_name_t theme; - const HSV *colors[5]; + const HSV *colors[RGB_THEME_COLORS_MAX]; } rgb_theme_t; -void set_rgb_theme(rgb_theme_name_t theme_name); +extern const rgb_theme_t *themes[]; + +void set_rgb_theme(uint8_t index); rgb_theme_t get_rgb_theme(void); void rgb_theme_step(void); From 54899f5fdc06e7efc98071941cf2b038e9e2dc10 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 29 Aug 2019 16:44:56 -0700 Subject: [PATCH 175/429] [User] Make RGB Theme more configurable --- users/brandonschlack/rgb_bs.c | 76 ++++++------------------- users/brandonschlack/rgb_theme.h | 18 +++++- users/brandonschlack/rgb_theme_user.inc | 38 +++++++++++++ 3 files changed, 71 insertions(+), 61 deletions(-) create mode 100644 users/brandonschlack/rgb_theme_user.inc diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index ffccecf0b1a8..cbe2559d8645 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -11,63 +11,21 @@ extern led_config_t g_led_config; #endif #if defined(RGB_THEME_ENABLE) -static const HSV default_adjust = { HSV_SPRINGGREEN }; - -// Laser Color Constants -// Laser Colors -#define HSV_LSR_PURPLE HSV_PURPLE -#define HSV_LSR_PINK HSV_PINK -#define HSV_LSR_BLUE HSV_BLUE -#define HSV_LSR_CYAN HSV_CYAN -#define HSV_LSR_MAGENTA HSV_MAGENTA -static const HSV laser_purple = { HSV_LSR_PURPLE }; -static const HSV laser_pink = { HSV_LSR_PINK }; -static const HSV laser_blue = { HSV_LSR_BLUE }; -static const HSV laser_cyan = { HSV_LSR_CYAN }; -static const HSV laser_magenta = { HSV_LSR_MAGENTA }; -static const rgb_theme_t rgb_laser = { { &laser_purple, &laser_pink, &laser_blue, &laser_cyan, &laser_magenta } }; - -// Granite Color Constants -// Granite Colors -#define HSV_GNT_BLUE HSV_BLUE -#define HSV_GNT_RED HSV_RED -#define HSV_GNT_GREEN HSV_GREEN -#define HSV_GNT_YELLOW HSV_YELLOW -#define HSV_GNT_WHITE HSV_WHITE -static const HSV granite_white = { HSV_GNT_WHITE }; -static const HSV granite_blue = { HSV_GNT_BLUE }; -static const HSV granite_red = { HSV_GNT_RED }; -static const HSV granite_green = { HSV_GNT_GREEN }; -static const HSV granite_yellow = { HSV_GNT_YELLOW }; -static const rgb_theme_t rgb_granite = { { &granite_white, &granite_blue, &granite_red, &granite_green, &granite_yellow } }; - -// Oblique Color Constants -// Oblique Colors -#define HSV_OBQ_BLUE 130, 215, 255 -#define HSV_OBQ_RED 10, 200, 255 -#define HSV_OBQ_GREEN 58, 199, 255 -#define HSV_OBQ_ORANGE 26, 215, 255 -#define HSV_OBQ_PURPLE 186, 143, 255 -#define HSV_OBQ_WHITE HSV_WHITE -static const HSV oblique_white = { HSV_OBQ_WHITE }; -static const HSV oblique_purple = { HSV_OBQ_PURPLE }; -static const HSV oblique_red = { HSV_OBQ_RED }; -static const HSV oblique_orange = { HSV_OBQ_ORANGE }; -static const HSV oblique_green = { HSV_OBQ_GREEN }; -static const rgb_theme_t rgb_oblique = { { &oblique_white, &oblique_purple, &oblique_red, &oblique_orange, &oblique_green } }; - -// Set themes to be included -enum rgb_themes { - LASER = 0, - GRANITE, - OBLIQUE +// Should be rgb_theme.c +#define RGB_THEME(name) const rgb_theme_t RGB_##name +#define RGB_THEME_IMPLS +#include "rgb_theme_user.inc" +#undef RGB_THEME_IMPLS +#undef RGB_THEME + +#define RGB_THEME(name) [RGB_THEME_##name] = &RGB_##name, +const rgb_theme_t *themes[] = { + #include "rgb_theme_user.inc" }; -const rgb_theme_t *themes[] = { \ - [LASER] = &rgb_laser, \ - [GRANITE] = &rgb_granite, \ - [OBLIQUE] = &rgb_oblique, \ -}; -static const size_t rgb_theme_max = (sizeof themes / sizeof *themes); +#undef RGB_THEME + +// Userspace loose colors +rgb_theme_color_t default_adjust = { HSV_SPRINGGREEN }; #endif void keyboard_post_init_rgb(void) { @@ -94,17 +52,17 @@ rgb_theme_t get_rgb_theme(void) { void rgb_theme_step(void) { uint8_t current = user_config.rgb_theme; - current = (current + 1) % rgb_theme_max; + current = (current + 1) % RGB_THEME_MAX; set_rgb_theme(current); } void rgb_theme_step_reverse(void) { uint8_t current = user_config.rgb_theme; - current = (current - 1) % rgb_theme_max; + current = (current - 1) % RGB_THEME_MAX; set_rgb_theme(current); } -HSV get_rgb_theme_color(uint8_t index) { +rgb_theme_color_t get_rgb_theme_color(uint8_t index) { rgb_theme_t theme = get_rgb_theme(); size_t rgb_theme_color_max = sizeof theme.colors / sizeof *theme.colors; diff --git a/users/brandonschlack/rgb_theme.h b/users/brandonschlack/rgb_theme.h index fe292c5307fd..c7f772c37b75 100644 --- a/users/brandonschlack/rgb_theme.h +++ b/users/brandonschlack/rgb_theme.h @@ -4,14 +4,28 @@ #include "color.h" #include "rgblight_list.h" +/** + * Portable rgb_theme.h + */ #ifndef RGB_THEME_COLORS_MAX #define RGB_THEME_COLORS_MAX 5 #endif +enum rgb_themes { +#define RGB_THEME(name) RGB_THEME_##name, + #include "rgb_theme_user.inc" +#undef RGB_THEME + RGB_THEME_MAX +}; + +// RGB Theme Color +typedef const HSV rgb_theme_color_t; +#define RGB_THEME_COLOR(tname, tcolor,...) rgb_theme_color_t tname ## _ ## tcolor = { __VA_ARGS__ } + +// RGB Theme typedef struct { const HSV *colors[RGB_THEME_COLORS_MAX]; } rgb_theme_t; - extern const rgb_theme_t *themes[]; void set_rgb_theme(uint8_t index); @@ -20,5 +34,5 @@ rgb_theme_t get_rgb_theme(void); void rgb_theme_step(void); void rgb_theme_step_reverse(void); -HSV get_rgb_theme_color(uint8_t index); +rgb_theme_color_t get_rgb_theme_color(uint8_t index); void rgb_theme_layer(layer_state_t state); diff --git a/users/brandonschlack/rgb_theme_user.inc b/users/brandonschlack/rgb_theme_user.inc new file mode 100644 index 000000000000..8ffe307db519 --- /dev/null +++ b/users/brandonschlack/rgb_theme_user.inc @@ -0,0 +1,38 @@ +// Laser Theme +#ifndef DISABLE_RGB_THEME_LASER +RGB_THEME(LASER) +#ifdef RGB_THEME_IMPLS +RGB_THEME_COLOR(LASER, PURPLE, HSV_PURPLE); +RGB_THEME_COLOR(LASER, PINK, HSV_PINK); +RGB_THEME_COLOR(LASER, BLUE, HSV_BLUE); +RGB_THEME_COLOR(LASER, CYAN, HSV_CYAN); +RGB_THEME_COLOR(LASER, MAGENTA, HSV_MAGENTA); +RGB_THEME(LASER) = { { &LASER_PURPLE, &LASER_PINK, &LASER_BLUE, &LASER_CYAN, &LASER_MAGENTA } }; +#endif // RGB_THEME_IMPLS +#endif // DISABLE_RGB_THEME_LASER + +// Granite Theme +#ifndef DISABLE_RGB_THEME_GRANITE +RGB_THEME(GRANITE) +#ifdef RGB_THEME_IMPLS +RGB_THEME_COLOR(GRANITE, WHITE, HSV_WHITE); +RGB_THEME_COLOR(GRANITE, BLUE, HSV_BLUE); +RGB_THEME_COLOR(GRANITE, RED, HSV_RED); +RGB_THEME_COLOR(GRANITE, GREEN, HSV_GREEN); +RGB_THEME_COLOR(GRANITE, YELLOW, HSV_YELLOW); +RGB_THEME(GRANITE) = { { &GRANITE_WHITE, &GRANITE_BLUE, &GRANITE_RED, &GRANITE_GREEN, &GRANITE_YELLOW } }; +#endif // RGB_THEME_IMPLS +#endif // DISABLE_RGB_THEME_GRANITE + +// Oblique Theme +#ifndef DISABLE_RGB_THEME_OBLIQUE +RGB_THEME(OBLIQUE) +#ifdef RGB_THEME_IMPLS +RGB_THEME_COLOR(OBLIQUE, WHITE, HSV_WHITE); +RGB_THEME_COLOR(OBLIQUE, PURPLE, 186, 143, 255); +RGB_THEME_COLOR(OBLIQUE, RED, 10, 200, 255); +RGB_THEME_COLOR(OBLIQUE, ORANGE, 26, 215, 255); +RGB_THEME_COLOR(OBLIQUE, GREEN, 58, 199, 255); +RGB_THEME(OBLIQUE) = { { &OBLIQUE_WHITE, &OBLIQUE_PURPLE, &OBLIQUE_RED, &OBLIQUE_ORANGE, &OBLIQUE_GREEN } }; +#endif // RGB_THEME_IMPLS +#endif // DISABLE_RGB_THEME_OBLIQUE From 18d07259bd0900ac7e3f89991f858082cdfe42f3 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 29 Aug 2019 16:59:22 -0700 Subject: [PATCH 176/429] [User] Fix ifdef in rgb_theme_user --- users/brandonschlack/rgb_theme_user.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/users/brandonschlack/rgb_theme_user.inc b/users/brandonschlack/rgb_theme_user.inc index 8ffe307db519..a6e732126b8b 100644 --- a/users/brandonschlack/rgb_theme_user.inc +++ b/users/brandonschlack/rgb_theme_user.inc @@ -1,7 +1,8 @@ // Laser Theme #ifndef DISABLE_RGB_THEME_LASER +#ifndef RGB_THEME_IMPLS RGB_THEME(LASER) -#ifdef RGB_THEME_IMPLS +#else RGB_THEME_COLOR(LASER, PURPLE, HSV_PURPLE); RGB_THEME_COLOR(LASER, PINK, HSV_PINK); RGB_THEME_COLOR(LASER, BLUE, HSV_BLUE); @@ -13,8 +14,9 @@ RGB_THEME(LASER) = { { &LASER_PURPLE, &LASER_PINK, &LASER_BLUE, &LASER_CYAN, &LA // Granite Theme #ifndef DISABLE_RGB_THEME_GRANITE +#ifndef RGB_THEME_IMPLS RGB_THEME(GRANITE) -#ifdef RGB_THEME_IMPLS +#else RGB_THEME_COLOR(GRANITE, WHITE, HSV_WHITE); RGB_THEME_COLOR(GRANITE, BLUE, HSV_BLUE); RGB_THEME_COLOR(GRANITE, RED, HSV_RED); @@ -26,8 +28,9 @@ RGB_THEME(GRANITE) = { { &GRANITE_WHITE, &GRANITE_BLUE, &GRANITE_RED, &GRANITE_G // Oblique Theme #ifndef DISABLE_RGB_THEME_OBLIQUE +#ifndef RGB_THEME_IMPLS RGB_THEME(OBLIQUE) -#ifdef RGB_THEME_IMPLS +#else RGB_THEME_COLOR(OBLIQUE, WHITE, HSV_WHITE); RGB_THEME_COLOR(OBLIQUE, PURPLE, 186, 143, 255); RGB_THEME_COLOR(OBLIQUE, RED, 10, 200, 255); From 57fadd18cd1ae5d1447d80645d1c801f44157280 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 30 Aug 2019 12:04:48 -0700 Subject: [PATCH 177/429] [User] Add QM_ macros to userspace * Refactor KC_MAKE to QM_MAKE * Add QM_VRSN to print build info * Add QM_KYBD to print keyboard path * Add QM_KYMP to print keymap path --- .../gingham/keymaps/brandonschlack/keymap.c | 2 +- .../hotswap/keymaps/brandonschlack/keymap.c | 10 +++---- .../kbd75/keymaps/brandonschlack/keymap.c | 4 +-- .../kbd75/keymaps/brandonschlack/rules.mk | 2 +- .../bdn9/keymaps/brandonschlack/keymap.c | 2 +- .../bdn9/keymaps/brandonschlack/rules.mk | 2 +- .../launchpad/keymaps/brandonschlack/keymap.c | 2 +- .../launchpad/keymaps/brandonschlack/rules.mk | 2 +- .../alt/keymaps/brandonschlack/keymap.c | 2 +- .../romac/keymaps/brandonschlack/keymap.c | 2 +- .../romac/keymaps/brandonschlack/rules.mk | 2 +- users/brandonschlack/brandonschlack.h | 1 + users/brandonschlack/config.h | 10 +++++++ users/brandonschlack/process_records.c | 30 +++++++++++++------ users/brandonschlack/process_records.h | 5 +++- 15 files changed, 52 insertions(+), 26 deletions(-) diff --git a/keyboards/gingham/keymaps/brandonschlack/keymap.c b/keyboards/gingham/keymaps/brandonschlack/keymap.c index b01ffff43576..67b6cbc5ff89 100644 --- a/keyboards/gingham/keymaps/brandonschlack/keymap.c +++ b/keyboards/gingham/keymaps/brandonschlack/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ */ [_FN] = LAYOUT_60_ansi_split_bs_rshift( - KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, + QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F13, KC_F14, KC_F15, KC_UP, MC_MSSN, KC_DEL, KC_TRNS, KC_MPLY, KC_MRWD, KC_MFFD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index 910c7f3e2632..eb86a2cfc616 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -43,18 +43,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ * │ │ │ │ │RST│ │ │ │ │ │F13│F14│F15│ Del│VlU│ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ Adjust │VlD│ + * │ │ │ │ │ │ │ │ │KMP│ │ │ │ Adjust │VlD│ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │ │ │ │ │ │ │ │ │Prv│Nxt│Ply│ │PgU│Mut│ + * │ │ │ │ │VRN│ │ │ │Prv│Nxt│Ply│ │PgU│Mut│ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ * │ │ │ │ │ │ │ │Hom│PgD│End│ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ [_FN] = LAYOUT( - KC_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_MSSN, MC_SLPD, \ + QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_MSSN, MC_SLPD, \ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, KC_VOLU, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, KC_VOLD, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, KC_PGUP, KC_MUTE, \ + _______, _______, _______, _______, _______, _______, _______, _______, QM_KYMP, _______, _______, _______, TG_ADJT, KC_VOLD, \ + _______, _______, _______, _______, QM_VRSN, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, KC_PGUP, KC_MUTE, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), /* Adjust Layer Layer diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c index ee44b18e52ee..2aa413b7849c 100644 --- a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ */ [_FN] = LAYOUT( - KC_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, + QM_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, MC_SLPD, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, KC_VOLD, @@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ */ [_ADJUST] = LAYOUT( - KC_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + QM_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DEBUG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_ADJT, XXXXXXX, diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk index 890b397a9fe9..a557b1cd8d17 100644 --- a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk +++ b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk @@ -1,4 +1,4 @@ -# Add Bootloader define for KC_MAKE command +# Add Bootloader define for QM_MAKE command BOOTLOADER = atmel-dfu # Build Options diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 2e0ba7553aed..edb62045459e 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -186,7 +186,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { └────────┴────────┴────────┘ */ [_ADJUST] = LAYOUT( - KC_MAKE, DF_REDR, TG_LGHT, + QM_MAKE, DF_REDR, TG_LGHT, DF_MEDA, DF_NAVI, DF_MCRO, TG_REVW, TG_LNAV, TG_EDIT ), diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk index 108899b584e9..578ddcb35342 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk @@ -1,4 +1,4 @@ -# Use macropad-specific defines, layers, functions. Flash bootloader with KC_MAKE +# Use macropad-specific defines, layers, functions. Flash bootloader with QM_MAKE IS_MACROPAD = yes # Use dfu bootloader for Elite-C diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index 6696a6b7f77a..058db28a17d1 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └──────┴──────┘ */ [_ADJUST] = LAYOUT( \ - KC_MAKE, RESET, \ + QM_MAKE, RESET, \ DF_REDR, DF_MEDA, \ DF_NAVI, DF_MCRO, \ TG_LGHT, XXXXXXX \ diff --git a/keyboards/launchpad/keymaps/brandonschlack/rules.mk b/keyboards/launchpad/keymaps/brandonschlack/rules.mk index b7c7d7f1ea3b..ac92af928e9c 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/rules.mk +++ b/keyboards/launchpad/keymaps/brandonschlack/rules.mk @@ -1,4 +1,4 @@ -# Use macropad-specific defines, layers, functions. Flash bootloader with KC_MAKE +# Use macropad-specific defines, layers, functions. Flash bootloader with QM_MAKE IS_MACROPAD = yes # Use dfu bootloader for Elite-C diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index 525c0563d30e..285bdc92c886 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ [_FN] = LAYOUT( - KC_MAKE, 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, MC_SLPD, \ + QM_MAKE, 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, MC_SLPD, \ _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, KC_VOLU, \ _______, RGB_TOG, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, MM_RSFT, KC_PGUP, KC_VOLD, \ diff --git a/keyboards/romac/keymaps/brandonschlack/keymap.c b/keyboards/romac/keymaps/brandonschlack/keymap.c index ef880c42d2b1..113119e60fb6 100644 --- a/keyboards/romac/keymaps/brandonschlack/keymap.c +++ b/keyboards/romac/keymaps/brandonschlack/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_ADJUST] = LAYOUT( - KC_MAKE, EEP_RST, XXXXXXX, \ + QM_MAKE, EEP_RST, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, \ DF_NMPD, DF_NMLK, DF_MCRO, \ KC_TRNS, XXXXXXX, XXXXXXX \ diff --git a/keyboards/romac/keymaps/brandonschlack/rules.mk b/keyboards/romac/keymaps/brandonschlack/rules.mk index 1b677fb218d6..719dbee401f1 100644 --- a/keyboards/romac/keymaps/brandonschlack/rules.mk +++ b/keyboards/romac/keymaps/brandonschlack/rules.mk @@ -1,4 +1,4 @@ -# Use macropad-specific defines, layers, functions. Flash bootloader with KC_MAKE +# Use macropad-specific defines, layers, functions. Flash bootloader with QM_MAKE IS_MACROPAD = yes # Use dfu bootloader for Elite-C diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index bf5f059f1317..a9e703a06579 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -1,6 +1,7 @@ #pragma once #include "quantum.h" +#include "version.h" #include "eeprom.h" #include "process_records.h" #ifdef TAP_DANCE_ENABLE diff --git a/users/brandonschlack/config.h b/users/brandonschlack/config.h index e621f49d5ac0..0e2a19059cb3 100644 --- a/users/brandonschlack/config.h +++ b/users/brandonschlack/config.h @@ -11,3 +11,13 @@ #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) # define RGB_THEME_ENABLE #endif + +#define TAP_CODE_DELAY 5 + +/* Disable unused and unneeded features to reduce on firmware size */ +#ifdef LOCKING_SUPPORT_ENABLE +# undef LOCKING_SUPPORT_ENABLE +#endif +#ifdef LOCKING_RESYNC_ENABLE +# undef LOCKING_RESYNC_ENABLE +#endif diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index 41e75f2a6f85..7ea276564463 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -12,7 +12,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { // Consolidated Macros bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case KC_MAKE: + case QM_MAKE: // if (!record->event.pressed) { bool flash = false; // If is a keyboard and auto-flash is not set in rules.mk, @@ -28,12 +28,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { flash = true; } send_make_command(flash); - #if !defined(FLASH_BOOTLOADER) && !defined(IS_MACROPAD) - set_mods(temp_mod); - #endif } break; - case CMD_TAB: + case QM_VRSN: // Prints firmware version + if (record->event.pressed) { + send_string_with_delay_P(PSTR(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE), TAP_CODE_DELAY); + } + break; + case QM_KYBD: // Prints keyboard path + if (record->event.pressed) { + send_string_with_delay_P(PSTR("keyboards/" QMK_KEYBOARD "/"), TAP_CODE_DELAY); + } + break; + case QM_KYMP: // Prints keymap path + if (record->event.pressed) { + send_string_with_delay_P(PSTR("keyboards/" QMK_KEYBOARD "/keymaps/" QMK_KEYMAP "/keymap.c"), TAP_CODE_DELAY); + } + break; + case CMD_TAB: // Super CMD↯TAB if (record->event.pressed) { if (!is_cmd_tab_active) { is_cmd_tab_active = true; @@ -107,15 +119,15 @@ void matrix_scan_cmd_tab(void) { * if flash_bootloader set to true */ void send_make_command(bool flash_bootloader) { - send_string_with_delay_P(PSTR("make " QMK_KEYBOARD ":" QMK_KEYMAP), 10); + send_string_with_delay_P(PSTR("make " QMK_KEYBOARD ":" QMK_KEYMAP), TAP_CODE_DELAY); if (flash_bootloader) { #if defined(MD_BOOTLOADER) // only run for Massdrop boards - send_string_with_delay_P(PSTR(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP), 10); + send_string_with_delay_P(PSTR(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP), TAP_CODE_DELAY); #else // use universal flash command - send_string_with_delay_P(PSTR(":flash"), 10); + send_string_with_delay_P(PSTR(":flash"), TAP_CODE_DELAY); #endif } - send_string_with_delay_P(PSTR(SS_TAP(X_ENTER)), 10); + send_string_with_delay_P(PSTR(SS_TAP(X_ENTER)), TAP_CODE_DELAY); if (flash_bootloader) { reset_keyboard(); } diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 24f74696fe7b..726efddc0799 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -3,7 +3,10 @@ // Macros enum custom_keycodes { - KC_MAKE = SAFE_RANGE, + QM_MAKE = SAFE_RANGE, + QM_VRSN, + QM_KYBD, + QM_KYMP, CMD_TAB, RGB_LYR, RGB_THEME_FORWARD, From 1245bf0002a5ea4e5af00dbd1eba412a39d7f36f Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Wed, 4 Sep 2019 08:10:48 -0700 Subject: [PATCH 178/429] [Keymap] Add discipline keymap --- .../keymaps/brandonschlack/keymap.c | 58 +++++++++++++++++++ users/brandonschlack/process_records.c | 2 + 2 files changed, 60 insertions(+) create mode 100644 keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c diff --git a/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c new file mode 100644 index 000000000000..2ba88487102f --- /dev/null +++ b/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c @@ -0,0 +1,58 @@ +/* Copyright 2019 COSEYFANNITUTTI + * + * 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 . + */ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Base Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│Hom│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│| \│PgU│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│PgD│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│End│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ + * │Ctrl│ Opt│ Cmd│ Space │Cmd│Opt│Fn │Lef│Dow│Rig│ + * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ + */ + [_BASE] = LAYOUT_65_ansi( + 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_HOME, + 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_PGUP, + HY_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_PGDN, + 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_UP, KC_END, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MM_RGUI, MM_RALT, MM_FNPY, KC_LEFT, KC_DOWN, KC_RIGHT), + /* Function Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │~ `│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ Del │SlD│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │ │ │ │ │ │ │ │ │ │ │F13│F14│F15│ LHP │VlU│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │VlD│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ │ │ │ │ │ │ │Mke│ │ │ │ │PgU│Mte│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ + * │ │ │ │ │ │ │ │Hom│PgD│End│ + * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ + */ + [_FN] = LAYOUT_65_ansi( + 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, MC_SLPD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_VOLU, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, + _______, _______, _______, _______, _______, _______, _______, QM_MAKE, _______, _______, _______, _______, KC_PGUP, KC_MUTE, + _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END) +}; diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index 7ea276564463..815cf274c566 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -123,6 +123,8 @@ void send_make_command(bool flash_bootloader) { if (flash_bootloader) { #if defined(MD_BOOTLOADER) // only run for Massdrop boards send_string_with_delay_P(PSTR(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP), TAP_CODE_DELAY); +#elif defined(KEYBOARD_coseyfannitutti_discipline) // only run for Discipline 65 + send_string_with_delay_P(PSTR(":program"), TAP_CODE_DELAY); #else // use universal flash command send_string_with_delay_P(PSTR(":flash"), TAP_CODE_DELAY); #endif From 671d43ca6072e73ee8a845231fd7d05929562271 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 9 Sep 2019 18:29:44 -0700 Subject: [PATCH 179/429] [User] User readme update --- users/brandonschlack/brandonschlack.h | 2 +- users/brandonschlack/readme.md | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index a9e703a06579..2e300e2d8ca9 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -31,6 +31,7 @@ enum bs_layers { _ADJUST = 15 // Change keyboard settings }; +// EEPROM User Config typedef union { uint32_t raw; struct { @@ -38,7 +39,6 @@ typedef union { uint8_t rgb_theme :2; }; } user_config_t; - extern user_config_t user_config; void matrix_init_keymap(void); diff --git a/users/brandonschlack/readme.md b/users/brandonschlack/readme.md index 6bd8f571f01a..6e05af39b118 100644 --- a/users/brandonschlack/readme.md +++ b/users/brandonschlack/readme.md @@ -2,5 +2,18 @@ My QMK home. I feel as though I stand on the shoulders of giants, for a lot of my code here is borrowed and adapted from so many contributors here (namely Drashna and Konstantin), and that I hope my code here can help or inspire others. -## brandonschlack.c +## Layers, Keycodes, and Handlers +### Layers +I have predefined layer names for keyboards: +* **_BASE**: Default Layer +* **_FN**: Function Layer for 60% and above +* **_LOWER** and **_RAISE**: Function layers for 40% + +and macropads: +* **_REEDER**: Shortcuts for [Reeder.app](https://reederapp.com/), my RSS feed reader +* **_MEDIA**: Media controls +* **_NAVI**: Navigation macros, for changing tabs and scrolling +* **_MACRO**: Generic macro keys, meant to be customized per app with [Karabiner](https://pqrs.org/osx/karabiner/) + +### EEPROM User Config From 2e46b3a001429f37c818ebade839c12eee04ad46 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Wed, 11 Sep 2019 11:18:28 -0700 Subject: [PATCH 180/429] [User] Readme update --- users/brandonschlack/readme.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/users/brandonschlack/readme.md b/users/brandonschlack/readme.md index 6e05af39b118..ee8f546d5d16 100644 --- a/users/brandonschlack/readme.md +++ b/users/brandonschlack/readme.md @@ -2,7 +2,7 @@ My QMK home. I feel as though I stand on the shoulders of giants, for a lot of my code here is borrowed and adapted from so many contributors here (namely Drashna and Konstantin), and that I hope my code here can help or inspire others. -## Layers, Keycodes, and Handlers +## Layers, Handlers, and Macros ### Layers I have predefined layer names for keyboards: @@ -17,3 +17,19 @@ and macropads: * **_MACRO**: Generic macro keys, meant to be customized per app with [Karabiner](https://pqrs.org/osx/karabiner/) ### EEPROM User Config + +I have a custom userspace config implemented to save + +### Process Handlers + +### Keycode Aliases + +### Macros + + +## Tap Dances + +### Tap Dance Trigger Layer + +## RGB +### RGB Theme From f53665734cd5aac1af14e419e094738e997a0cac Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Wed, 11 Sep 2019 11:18:56 -0700 Subject: [PATCH 181/429] [WIP] Add plaid keymap --- .../plaid/keymaps/brandonschlack/config.h | 19 + .../plaid/keymaps/brandonschlack/keymap.c | 352 ++++++++++++++++++ .../plaid/keymaps/brandonschlack/readme.md | 35 ++ 3 files changed, 406 insertions(+) create mode 100644 keyboards/plaid/keymaps/brandonschlack/config.h create mode 100644 keyboards/plaid/keymaps/brandonschlack/keymap.c create mode 100644 keyboards/plaid/keymaps/brandonschlack/readme.md diff --git a/keyboards/plaid/keymaps/brandonschlack/config.h b/keyboards/plaid/keymaps/brandonschlack/config.h new file mode 100644 index 000000000000..5733b9e4b046 --- /dev/null +++ b/keyboards/plaid/keymaps/brandonschlack/config.h @@ -0,0 +1,19 @@ +/* Copyright 2019 Takuya Urakawa (dm9records.com) + * + * 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 . + */ + +#pragma once + +// place overrides here diff --git a/keyboards/plaid/keymaps/brandonschlack/keymap.c b/keyboards/plaid/keymaps/brandonschlack/keymap.c new file mode 100644 index 000000000000..357971e820e3 --- /dev/null +++ b/keyboards/plaid/keymaps/brandonschlack/keymap.c @@ -0,0 +1,352 @@ +/* Copyright 2019 Takuya Urakawa (dm9records.com) + * + * 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 . + */ + +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +extern keymap_config_t keymap_config; + +enum plaid_layers { + _QWERTY, + _COLEMAK, + _DVORAK, + _LOWER, + _RAISE, + _PLOVER, + _ADJUST +}; + +enum plaid_keycodes { + LED_1 = KEYMAP_SAFE_RANGE, + LED_2, + LED_3, + LED_4, + LED_5, + LED_6, + LED_7, + LED_8, + LED_9, + LED_0 +}; + +#define LOWER MO(_LOWER) +#define RAISE MO(_RAISE) + +// array of keys considered modifiers for led purposes +const uint16_t modifiers[] = { + KC_LCTL, + KC_RCTL, + KC_LALT, + KC_RALT, + KC_LSFT, + KC_RSFT, + KC_LGUI, + KC_RGUI, + LOWER, + RAISE +}; + +//Setup consts for LED modes +#define LEDMODE_ON 1 //always on +#define LEDMODE_OFF 0 //always off +#define LEDMODE_MODS 2 //On with modifiers +#define LEDMODE_BLINKIN 3 //blinkinlights - % chance toggle on keypress +#define LEDMODE_KEY 4 //On with any keypress, off with key release +#define LEDMODE_ENTER 5 // On with enter key + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Qwerty + * ,-----------------------------------------------------------------------------------. + * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | S | D | F | G | H | J | K | L | ; | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Hypr | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_QWERTY] = LAYOUT_plaid_grid( + 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_ESC, 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, KC_ENT , + KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT +), + +/* Lower + * ,-----------------------------------------------------------------------------------. + * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | Home | End | Play | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | Prev | Vol- | Vol+ | Next | + * `-----------------------------------------------------------------------------------' + */ +[_LOWER] = LAYOUT_plaid_grid( + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, KC_MPLY, + _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_VOLU, KC_MFFD +), + +/* Raise + * ,-----------------------------------------------------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / |Pg Up |Pg Dn | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | Next | Vol- | Vol+ | Play | + * `-----------------------------------------------------------------------------------' + */ +[_RAISE] = LAYOUT_plaid_grid( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_VOLU, KC_MFFD +), + +/* Adjust (Lower + Raise) + * ,-----------------------------------------------------------------------------------. + * |Reset | | | | | | | | | | | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | | | | |AGnorm|AGswap| | | | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[_ADJUST] = LAYOUT_plaid_grid( + QM_MAKE, LED_1, LED_2, LED_3, LED_4, LED_5, LED_6, LED_7, LED_8, LED_9, LED_0, KC_DELT, + RESET, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ +) + + +}; + +//Setup config struct for LED +typedef union { + uint32_t raw; + struct { + uint8_t red_mode :8; + uint8_t green_mode :8; + }; +} led_config_t; +led_config_t led_config; + +//Set leds to saved state during powerup +void keyboard_post_init_user(void) { + // Call the post init code. + led_config.raw = eeconfig_read_user(); + + if(led_config.red_mode == LEDMODE_ON) { + writePinHigh(LED_RED); + } + + if(led_config.green_mode == LEDMODE_ON) { + writePinHigh(LED_GREEN); + } +} + +void eeconfig_init_user(void) { // EEPROM is getting reset! + led_config.raw = 0; + led_config.red_mode = LEDMODE_ON; + led_config.green_mode = LEDMODE_MODS; + eeconfig_update_user(led_config.raw); + eeconfig_update_user(led_config.raw); +} + +uint32_t layer_state_set_user(uint32_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); +} + +void led_keypress_update(uint8_t led, uint8_t led_mode, uint16_t keycode, keyrecord_t *record) { + switch (led_mode) { + case LEDMODE_MODS: + for (int i=0;ievent.pressed) { + writePinHigh(led); + } + else { + writePinLow(led); + } + } + } + break; + case LEDMODE_BLINKIN: + if (record->event.pressed) { + if(rand() % 2 == 1) { + if(rand() % 2 == 0) { + writePinLow(led); + } + else { + writePinHigh(led); + } + } + } + break; + case LEDMODE_KEY: + if (record->event.pressed) { + writePinHigh(led); + return; + } + else { + writePinLow(led); + return; + } + break; + case LEDMODE_ENTER: + if (keycode==KC_ENT) { + writePinHigh(led); + } + else { + writePinLow(led); + } + break; + + } +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + /* If the either led mode is keypressed based, call the led updater + then let it fall through the keypress handlers. Just to keep + the logic out of this procedure */ + if (led_config.red_mode >= LEDMODE_MODS && led_config.red_mode <= LEDMODE_ENTER) { + led_keypress_update(LED_RED, led_config.red_mode, keycode, record); + } + if (led_config.green_mode >= LEDMODE_MODS && led_config.green_mode <= LEDMODE_ENTER) { + led_keypress_update(LED_GREEN, led_config.green_mode, keycode, record); + } + switch (keycode) { + case QWERTY: + if (record->event.pressed) { + print("mode just switched to qwerty and this is a huge string\n"); + set_single_persistent_default_layer(_QWERTY); + } + return false; + break; + case COLEMAK: + if (record->event.pressed) { + set_single_persistent_default_layer(_COLEMAK); + } + return false; + break; + case DVORAK: + if (record->event.pressed) { + set_single_persistent_default_layer(_DVORAK); + } + return false; + break; + case PLOVER: + if (record->event.pressed) { + layer_off(_RAISE); + layer_off(_LOWER); + layer_off(_ADJUST); + layer_on(_PLOVER); + if (!eeconfig_is_enabled()) { + eeconfig_init(); + } + keymap_config.raw = eeconfig_read_keymap(); + keymap_config.nkro = 1; + eeconfig_update_keymap(keymap_config.raw); + } + return false; + break; + case EXT_PLV: + if (record->event.pressed) { + layer_off(_PLOVER); + } + return false; + break; + case LED_1: + if (record->event.pressed) { + if (led_config.red_mode==LEDMODE_ON) { + led_config.red_mode=LEDMODE_OFF; + writePinLow(LED_RED); + } + else { + led_config.red_mode=LEDMODE_ON; + writePinHigh(LED_RED); + } + } + eeconfig_update_user(led_config.raw); + return false; + break; + case LED_2: + if (record->event.pressed) { + if (led_config.green_mode==LEDMODE_ON) { + led_config.green_mode=LEDMODE_OFF; + writePinLow(LED_GREEN); + } + else { + led_config.green_mode=LEDMODE_ON; + writePinHigh(LED_GREEN); + } + } + eeconfig_update_user(led_config.raw); + return false; + break; + case LED_3: + led_config.red_mode=LEDMODE_MODS; + eeconfig_update_user(led_config.raw); + return false; + break; + case LED_4: + led_config.green_mode=LEDMODE_MODS; + eeconfig_update_user(led_config.raw); + return false; + break; + case LED_5: + led_config.red_mode=LEDMODE_BLINKIN; + eeconfig_update_user(led_config.raw); + return false; + break; + case LED_6: + led_config.green_mode=LEDMODE_BLINKIN; + eeconfig_update_user(led_config.raw); + return false; + break; + case LED_7: + led_config.red_mode=LEDMODE_KEY; + eeconfig_update_user(led_config.raw); + return false; + break; + case LED_8: + led_config.green_mode=LEDMODE_KEY; + eeconfig_update_user(led_config.raw); + return false; + break; + case LED_9: + led_config.red_mode=LEDMODE_ENTER; + eeconfig_update_user(led_config.raw); + return false; + break; + case LED_0: + led_config.green_mode=LEDMODE_ENTER; + eeconfig_update_user(led_config.raw); + return false; + break; + } + return true; +} diff --git a/keyboards/plaid/keymaps/brandonschlack/readme.md b/keyboards/plaid/keymaps/brandonschlack/readme.md new file mode 100644 index 000000000000..5a08a1fff3ff --- /dev/null +++ b/keyboards/plaid/keymaps/brandonschlack/readme.md @@ -0,0 +1,35 @@ +# The default keymap for plaid +Original copyright 2019 Takuya Urakawa (dm9records.com) +LED Support added by Richard Sutherland (rich@brickbots.com) + +This layout is based on the Planck layout, and includes an adjust layer (6) +accessible by holding the lower and raise modifiers (MO3 and MO4) together. +The adjustment layer is used to set the behavior of the two LEDs: + +**Modifier Mode:** +Activates when any modifier (shift, alt, os, MO) key is held +down. LED turns off when key is release + +**Blinkinlights Mode:** +Random chance of state change on each keystroke. + +**Keypress Mode:** +On for any keypress as long as the key is pressed + +**Carriage Mode:** +Turns on when enter is pressed, turns off when any next key is pressed + +To set the behavior of an LED, and save it to eeprom, hold the +raise/lower keys together to access the adjust layer, then use +the keys indicated below to set the behaviors + +* q = Toggle Red LED state, deactivates any other modes +* w = Toggle Green LED state, deactivates any other modes +* e = Set RED LED to modifier mode +* r = Set GREEN LED to modifier mode +* t = Set RED LED to Blinkinlights mode +* y = set GREEN LED to Blinkinlights mode +* u = set RED LED to Keypress mode +* i = set GREEN LED to Keypress mode +* o = set RED LED to Carriage mode +* p = set GREEN LED to Carriage mode From 700cdb66160818a6f262530dfaf93273e18091a1 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 12 Sep 2019 17:52:14 -0700 Subject: [PATCH 182/429] [User] Revert encoder_user --- .../bdn9/keymaps/brandonschlack/keymap.c | 34 +++++++++---------- users/brandonschlack/brandonschlack.c | 12 ------- users/brandonschlack/brandonschlack.h | 4 --- 3 files changed, 17 insertions(+), 33 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index edb62045459e..7f36d78c5fa1 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -195,60 +195,60 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /** * Encoder */ -void encoder_update_keymap(uint8_t index, bool clockwise) { +void encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { switch (get_highest_layer(layer_state)) { case _REEDER: - if (clockwise) { + if (!clockwise) { tap_code(KC_J); } else { tap_code(KC_K); } break; case _MEDIA: - if (clockwise) { + if (!clockwise) { tap_code(KC_VOLU); } else { tap_code(KC_VOLD); } break; case _NAVI: - if (clockwise) { + if (!clockwise) { tap_code(MC_WH_D); } else { tap_code(MC_WH_U); } break; case _MACRO: - if (clockwise) { + if (!clockwise) { tap_code(KC_PPLS); } else { tap_code(KC_PMNS); } break; case LR_NAV: - if (clockwise) { + if (!clockwise) { tap_code(KC_EQL); } else { tap_code(KC_MINS); } break; case LR_REVIEW: - if (clockwise) { + if (!clockwise) { tap_code(KC_RBRC); } else { tap_code(KC_LBRC); } break; case LR_EDIT: - if (clockwise) { + if (!clockwise) { tap_code(KC_DOT); } else { tap_code(KC_COMM); } break; case _LIGHT: - if (clockwise) { + if (!clockwise) { rgblight_increase_hue(); } else { rgblight_decrease_hue(); @@ -259,56 +259,56 @@ void encoder_update_keymap(uint8_t index, bool clockwise) { else if (index == 1) { switch (get_highest_layer(layer_state)) { case _REEDER: - if (clockwise) { + if (!clockwise) { tap_code(KC_N); } else { tap_code(KC_P); } break; case _MEDIA: - if (clockwise) { + if (!clockwise) { tap_code(KC_MFFD); } else { tap_code(KC_MRWD); } break; case _NAVI: - if (clockwise) { + if (!clockwise) { tap_code16(NXT_TAB); } else { tap_code16(PRV_TAB); } break; case _MACRO: - if (clockwise) { + if (!clockwise) { tap_code(KC_PEQL); } else { tap_code(KC_PDOT); } break; case LR_NAV: - if (clockwise) { + if (!clockwise) { tap_code(KC_PGUP); } else { tap_code(KC_PGDN); } break; case LR_REVIEW: - if (clockwise) { + if (!clockwise) { tap_code16(G(KC_UP)); } else { tap_code16(G(KC_DOWN)); } break; case LR_EDIT: - if (clockwise) { + if (!clockwise) { tap_code(KC_EQL); } else { tap_code(KC_MINS); } break; case _LIGHT: - if (clockwise) { + if (!clockwise) { rgblight_increase_sat(); } else { rgblight_decrease_sat(); diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index cd0aedb668a0..a3c29a47c466 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -129,15 +129,3 @@ layer_state_t layer_state_set_user(layer_state_t state) { #endif // RGBLIGHT_ENABLE return layer_state_set_keymap(state); } - -#if defined(ENCODER_ENABLE) -__attribute__ ((weak)) -void encoder_update_keymap(uint8_t index, bool clockwise) { } - -/** - * Encoders might be reveresed with macOS natural scrolling. - */ -void encoder_update_user(uint8_t index, bool clockwise) { - encoder_update_keymap(index, !clockwise); -} -#endif diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 2e300e2d8ca9..a4daad44ccf0 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -49,7 +49,3 @@ void suspend_wakeup_init_keymap(void); void matrix_scan_keymap(void); layer_state_t default_layer_state_set_keymap(layer_state_t state); layer_state_t layer_state_set_keymap(layer_state_t state); - -#if defined(ENCODER_ENABLE) -void encoder_update_keymap(uint8_t index, bool clockwise); -#endif From c45ee607831259df87b3b739887161c88b27cf3f Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Thu, 12 Sep 2019 21:38:10 -0700 Subject: [PATCH 183/429] [User] Fix QM_MAKE for massdrop alt --- users/brandonschlack/process_records.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index 815cf274c566..e4a10333d76b 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -121,7 +121,7 @@ void matrix_scan_cmd_tab(void) { void send_make_command(bool flash_bootloader) { send_string_with_delay_P(PSTR("make " QMK_KEYBOARD ":" QMK_KEYMAP), TAP_CODE_DELAY); if (flash_bootloader) { -#if defined(MD_BOOTLOADER) // only run for Massdrop boards +#if defined(KEYBOARD_massdrop_alt) // only run for Massdrop ALT send_string_with_delay_P(PSTR(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP), TAP_CODE_DELAY); #elif defined(KEYBOARD_coseyfannitutti_discipline) // only run for Discipline 65 send_string_with_delay_P(PSTR(":program"), TAP_CODE_DELAY); From cee8f8e49ce03a536f1dbc8bc997118376030278 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 13 Sep 2019 16:41:36 -0700 Subject: [PATCH 184/429] [Keymap] Initial plaid keymap --- .../plaid/keymaps/brandonschlack/keymap.c | 289 ++---------------- .../plaid/keymaps/brandonschlack/rules.mk | 2 + users/brandonschlack/process_records.h | 3 + 3 files changed, 37 insertions(+), 257 deletions(-) create mode 100644 keyboards/plaid/keymaps/brandonschlack/rules.mk diff --git a/keyboards/plaid/keymaps/brandonschlack/keymap.c b/keyboards/plaid/keymaps/brandonschlack/keymap.c index 357971e820e3..3a0c02f3455a 100644 --- a/keyboards/plaid/keymaps/brandonschlack/keymap.c +++ b/keyboards/plaid/keymaps/brandonschlack/keymap.c @@ -19,54 +19,6 @@ extern keymap_config_t keymap_config; -enum plaid_layers { - _QWERTY, - _COLEMAK, - _DVORAK, - _LOWER, - _RAISE, - _PLOVER, - _ADJUST -}; - -enum plaid_keycodes { - LED_1 = KEYMAP_SAFE_RANGE, - LED_2, - LED_3, - LED_4, - LED_5, - LED_6, - LED_7, - LED_8, - LED_9, - LED_0 -}; - -#define LOWER MO(_LOWER) -#define RAISE MO(_RAISE) - -// array of keys considered modifiers for led purposes -const uint16_t modifiers[] = { - KC_LCTL, - KC_RCTL, - KC_LALT, - KC_RALT, - KC_LSFT, - KC_RSFT, - KC_LGUI, - KC_RGUI, - LOWER, - RAISE -}; - -//Setup consts for LED modes -#define LEDMODE_ON 1 //always on -#define LEDMODE_OFF 0 //always off -#define LEDMODE_MODS 2 //On with modifiers -#define LEDMODE_BLINKIN 3 //blinkinlights - % chance toggle on keypress -#define LEDMODE_KEY 4 //On with any keypress, off with key release -#define LEDMODE_ENTER 5 // On with enter key - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty @@ -80,11 +32,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | Hypr | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | * `-----------------------------------------------------------------------------------' */ -[_QWERTY] = LAYOUT_plaid_grid( +[_BASE] = LAYOUT_plaid_grid( 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_ESC, 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, KC_ENT , - KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LWR_MUT, KC_SPC, KC_SPC, RAI_PLY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), /* Lower @@ -93,16 +45,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+-------------+------+------+------+------+------| * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | Home | End | Play | + * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | | | Home | End | | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | Prev | Vol- | Vol+ | Next | * `-----------------------------------------------------------------------------------' */ [_LOWER] = LAYOUT_plaid_grid( - KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, - KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, - _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, KC_MPLY, - _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_VOLU, KC_MFFD + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, KC_END, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_VOLU, KC_MFFD ), /* Raise @@ -111,23 +63,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+-------------+------+------+------+------+------| * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / |Pg Up |Pg Dn | | + * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | | |Pg Up |Pg Dn | | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | Next | Vol- | Vol+ | Play | + * | | | | | | | | Prev | Vol- | Vol+ | Next | * `-----------------------------------------------------------------------------------' */ [_RAISE] = LAYOUT_plaid_grid( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, - _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, + SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_VOLU, KC_MFFD ), /* Adjust (Lower + Raise) * ,-----------------------------------------------------------------------------------. - * |Reset | | | | | | | | | | | Del | + * | Make | | | | | | | | | | | | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | | | |AGnorm|AGswap| | | | | | + * |Reset | | | | |AGnorm|AGswap| | | | | | * |------+------+------+------+------+------|------+------+------+------+------+------| * | | | | | | | | | | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| @@ -135,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_plaid_grid( - QM_MAKE, LED_1, LED_2, LED_3, LED_4, LED_5, LED_6, LED_7, LED_8, LED_9, LED_0, KC_DELT, + QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ @@ -144,209 +96,32 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -//Setup config struct for LED -typedef union { - uint32_t raw; - struct { - uint8_t red_mode :8; - uint8_t green_mode :8; - }; -} led_config_t; -led_config_t led_config; - -//Set leds to saved state during powerup -void keyboard_post_init_user(void) { - // Call the post init code. - led_config.raw = eeconfig_read_user(); - - if(led_config.red_mode == LEDMODE_ON) { - writePinHigh(LED_RED); - } - - if(led_config.green_mode == LEDMODE_ON) { - writePinHigh(LED_GREEN); - } +void keyboard_post_init_keymap(void) { + writePinHigh(LED_RED); } -void eeconfig_init_user(void) { // EEPROM is getting reset! - led_config.raw = 0; - led_config.red_mode = LEDMODE_ON; - led_config.green_mode = LEDMODE_MODS; - eeconfig_update_user(led_config.raw); - eeconfig_update_user(led_config.raw); +// Use Green LED for Caps Lock +void led_set_user(uint8_t usb_led) { + if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) { + writePinLow(LED_GREEN); + } else { + writePinHigh(LED_GREEN); + } } -uint32_t layer_state_set_user(uint32_t state) { - return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); +void suspend_power_down_keymap(void) { + writePinLow(LED_RED); + writePinLow(LED_GREEN); } -void led_keypress_update(uint8_t led, uint8_t led_mode, uint16_t keycode, keyrecord_t *record) { - switch (led_mode) { - case LEDMODE_MODS: - for (int i=0;ievent.pressed) { - writePinHigh(led); - } - else { - writePinLow(led); - } - } - } - break; - case LEDMODE_BLINKIN: - if (record->event.pressed) { - if(rand() % 2 == 1) { - if(rand() % 2 == 0) { - writePinLow(led); - } - else { - writePinHigh(led); - } - } - } - break; - case LEDMODE_KEY: - if (record->event.pressed) { - writePinHigh(led); - return; - } - else { - writePinLow(led); - return; - } - break; - case LEDMODE_ENTER: - if (keycode==KC_ENT) { - writePinHigh(led); - } - else { - writePinLow(led); - } - break; - +void suspend_wakeup_init_keymap(void) { + writePinHigh(LED_RED); + if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) { + writePinHigh(LED_GREEN); } } -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - /* If the either led mode is keypressed based, call the led updater - then let it fall through the keypress handlers. Just to keep - the logic out of this procedure */ - if (led_config.red_mode >= LEDMODE_MODS && led_config.red_mode <= LEDMODE_ENTER) { - led_keypress_update(LED_RED, led_config.red_mode, keycode, record); - } - if (led_config.green_mode >= LEDMODE_MODS && led_config.green_mode <= LEDMODE_ENTER) { - led_keypress_update(LED_GREEN, led_config.green_mode, keycode, record); - } - switch (keycode) { - case QWERTY: - if (record->event.pressed) { - print("mode just switched to qwerty and this is a huge string\n"); - set_single_persistent_default_layer(_QWERTY); - } - return false; - break; - case COLEMAK: - if (record->event.pressed) { - set_single_persistent_default_layer(_COLEMAK); - } - return false; - break; - case DVORAK: - if (record->event.pressed) { - set_single_persistent_default_layer(_DVORAK); - } - return false; - break; - case PLOVER: - if (record->event.pressed) { - layer_off(_RAISE); - layer_off(_LOWER); - layer_off(_ADJUST); - layer_on(_PLOVER); - if (!eeconfig_is_enabled()) { - eeconfig_init(); - } - keymap_config.raw = eeconfig_read_keymap(); - keymap_config.nkro = 1; - eeconfig_update_keymap(keymap_config.raw); - } - return false; - break; - case EXT_PLV: - if (record->event.pressed) { - layer_off(_PLOVER); - } - return false; - break; - case LED_1: - if (record->event.pressed) { - if (led_config.red_mode==LEDMODE_ON) { - led_config.red_mode=LEDMODE_OFF; - writePinLow(LED_RED); - } - else { - led_config.red_mode=LEDMODE_ON; - writePinHigh(LED_RED); - } - } - eeconfig_update_user(led_config.raw); - return false; - break; - case LED_2: - if (record->event.pressed) { - if (led_config.green_mode==LEDMODE_ON) { - led_config.green_mode=LEDMODE_OFF; - writePinLow(LED_GREEN); - } - else { - led_config.green_mode=LEDMODE_ON; - writePinHigh(LED_GREEN); - } - } - eeconfig_update_user(led_config.raw); - return false; - break; - case LED_3: - led_config.red_mode=LEDMODE_MODS; - eeconfig_update_user(led_config.raw); - return false; - break; - case LED_4: - led_config.green_mode=LEDMODE_MODS; - eeconfig_update_user(led_config.raw); - return false; - break; - case LED_5: - led_config.red_mode=LEDMODE_BLINKIN; - eeconfig_update_user(led_config.raw); - return false; - break; - case LED_6: - led_config.green_mode=LEDMODE_BLINKIN; - eeconfig_update_user(led_config.raw); - return false; - break; - case LED_7: - led_config.red_mode=LEDMODE_KEY; - eeconfig_update_user(led_config.raw); - return false; - break; - case LED_8: - led_config.green_mode=LEDMODE_KEY; - eeconfig_update_user(led_config.raw); - return false; - break; - case LED_9: - led_config.red_mode=LEDMODE_ENTER; - eeconfig_update_user(led_config.raw); - return false; - break; - case LED_0: - led_config.green_mode=LEDMODE_ENTER; - eeconfig_update_user(led_config.raw); - return false; - break; - } - return true; +layer_state_t layer_state_set_keymap(layer_state_t state) { + state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); + return state; } diff --git a/keyboards/plaid/keymaps/brandonschlack/rules.mk b/keyboards/plaid/keymaps/brandonschlack/rules.mk new file mode 100644 index 000000000000..c4141c199c0c --- /dev/null +++ b/keyboards/plaid/keymaps/brandonschlack/rules.mk @@ -0,0 +1,2 @@ +# Bootloader selection +BOOTLOADER = USBasp diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 726efddc0799..c0b5f54ef4ec 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -19,6 +19,7 @@ void matrix_scan_cmd_tab(void); // Useful Defines #define HY_CAPS ALL_T(KC_CAPS) +#define SF_CAPS LSFT_T(KC_CAPS) #define TG_ADJT TG(_ADJUST) #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) #define TG_LGHT TG(_LIGHT) @@ -28,6 +29,8 @@ void matrix_scan_cmd_tab(void); #define MM_RALT RALT_T(KC_MFFD) #define MM_FNPY LT(1, KC_MPLY) #define MM_RSFT RSFT_T(KC_MUTE) +#define LWR_MUT LT(_LOWER, KC_MUTE) +#define RAI_PLY LT(_RAISE, KC_MPLY) // Arrow Mod-Tap #define MT_RSUP RSFT_T(KC_UP) #define MT_RALT RALT_T(KC_LEFT) From aca6e88c876f461dfbecaa31708d843e078074bf Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 13 Sep 2019 17:02:17 -0700 Subject: [PATCH 185/429] [Keymap] Fix LED toggle --- keyboards/plaid/keymaps/brandonschlack/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/plaid/keymaps/brandonschlack/keymap.c b/keyboards/plaid/keymaps/brandonschlack/keymap.c index 3a0c02f3455a..3c8ad34c1e93 100644 --- a/keyboards/plaid/keymaps/brandonschlack/keymap.c +++ b/keyboards/plaid/keymaps/brandonschlack/keymap.c @@ -102,7 +102,7 @@ void keyboard_post_init_keymap(void) { // Use Green LED for Caps Lock void led_set_user(uint8_t usb_led) { - if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) { + if (IS_LED_OFF(usb_led, USB_LED_CAPS_LOCK)) { writePinLow(LED_GREEN); } else { writePinHigh(LED_GREEN); From 54f5231d94db7af419773495ea28a471b91f8ac2 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 13 Sep 2019 18:09:26 -0700 Subject: [PATCH 186/429] [Keymap] Add MC_SLPD to plaid keymap --- keyboards/plaid/keymaps/brandonschlack/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/plaid/keymaps/brandonschlack/keymap.c b/keyboards/plaid/keymaps/brandonschlack/keymap.c index 3c8ad34c1e93..b94b7e763a36 100644 --- a/keyboards/plaid/keymaps/brandonschlack/keymap.c +++ b/keyboards/plaid/keymaps/brandonschlack/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Raise * ,-----------------------------------------------------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 |SlpDsp| * |------+------+------+------+------+-------------+------+------+------+------+------| * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | * |------+------+------+------+------+------|------+------+------+------+------+------| @@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_RAISE] = LAYOUT_plaid_grid( - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, MC_SLPD, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_VOLU, KC_MFFD From b960bdc9f20424fb210a3ba846a65e1bb70e7e8a Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 16 Sep 2019 19:10:37 -0700 Subject: [PATCH 187/429] [User] Add SEND_STRING_DELAY --- users/brandonschlack/process_records.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index e4a10333d76b..b640c49b5af0 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -1,5 +1,11 @@ #include "brandonschlack.h" +#if defined(TAP_CODE_DELAY) + #define SEND_STRING_DELAY TAP_CODE_DELAY +#else + #define SEND_STRING_DELAY 5 +#endif + // Super CMD↯TAB bool is_cmd_tab_active = false; uint16_t cmd_tab_timer = 0; @@ -32,17 +38,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { break; case QM_VRSN: // Prints firmware version if (record->event.pressed) { - send_string_with_delay_P(PSTR(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE), TAP_CODE_DELAY); + send_string_with_delay_P(PSTR(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE), SEND_STRING_DELAY); } break; case QM_KYBD: // Prints keyboard path if (record->event.pressed) { - send_string_with_delay_P(PSTR("keyboards/" QMK_KEYBOARD "/"), TAP_CODE_DELAY); + send_string_with_delay_P(PSTR("keyboards/" QMK_KEYBOARD "/"), SEND_STRING_DELAY); } break; case QM_KYMP: // Prints keymap path if (record->event.pressed) { - send_string_with_delay_P(PSTR("keyboards/" QMK_KEYBOARD "/keymaps/" QMK_KEYMAP "/keymap.c"), TAP_CODE_DELAY); + send_string_with_delay_P(PSTR("keyboards/" QMK_KEYBOARD "/keymaps/" QMK_KEYMAP "/keymap.c"), SEND_STRING_DELAY); } break; case CMD_TAB: // Super CMD↯TAB @@ -119,17 +125,17 @@ void matrix_scan_cmd_tab(void) { * if flash_bootloader set to true */ void send_make_command(bool flash_bootloader) { - send_string_with_delay_P(PSTR("make " QMK_KEYBOARD ":" QMK_KEYMAP), TAP_CODE_DELAY); + send_string_with_delay_P(PSTR("make " QMK_KEYBOARD ":" QMK_KEYMAP), SEND_STRING_DELAY); if (flash_bootloader) { #if defined(KEYBOARD_massdrop_alt) // only run for Massdrop ALT - send_string_with_delay_P(PSTR(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP), TAP_CODE_DELAY); + send_string_with_delay_P(PSTR(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP), SEND_STRING_DELAY); #elif defined(KEYBOARD_coseyfannitutti_discipline) // only run for Discipline 65 - send_string_with_delay_P(PSTR(":program"), TAP_CODE_DELAY); + send_string_with_delay_P(PSTR(":program"), SEND_STRING_DELAY); #else // use universal flash command - send_string_with_delay_P(PSTR(":flash"), TAP_CODE_DELAY); + send_string_with_delay_P(PSTR(":flash"), SEND_STRING_DELAY); #endif } - send_string_with_delay_P(PSTR(SS_TAP(X_ENTER)), TAP_CODE_DELAY); + send_string_with_delay_P(PSTR(SS_TAP(X_ENTER)), SEND_STRING_DELAY); if (flash_bootloader) { reset_keyboard(); } From 953ac16f14b9f4fd6b84ca0fad41192bdf7e148e Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 16 Sep 2019 19:11:52 -0700 Subject: [PATCH 188/429] [Keymap] Move MC_SLPD to _ADJUST layer --- keyboards/plaid/keymaps/brandonschlack/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/plaid/keymaps/brandonschlack/keymap.c b/keyboards/plaid/keymaps/brandonschlack/keymap.c index b94b7e763a36..f7fe9f332ae4 100644 --- a/keyboards/plaid/keymaps/brandonschlack/keymap.c +++ b/keyboards/plaid/keymaps/brandonschlack/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Raise * ,-----------------------------------------------------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 |SlpDsp| + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | * |------+------+------+------+------+-------------+------+------+------+------+------| * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | * |------+------+------+------+------+------|------+------+------+------+------+------| @@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_RAISE] = LAYOUT_plaid_grid( - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, MC_SLPD, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_VOLU, KC_MFFD @@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Adjust (Lower + Raise) * ,-----------------------------------------------------------------------------------. - * | Make | | | | | | | | | | | | + * | Make | | | | | | | | | | |SlpDsp| * |------+------+------+------+------+-------------+------+------+------+------+------| * |Reset | | | | |AGnorm|AGswap| | | | | | * |------+------+------+------+------+------|------+------+------+------+------+------| @@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_plaid_grid( - QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_SLPD, RESET, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ From 34413eecca1d8c811aceee8bd27143e13978f9a6 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 16 Sep 2019 19:12:36 -0700 Subject: [PATCH 189/429] [Keymap] BDN9 encoder refactor WIP --- .../bdn9/keymaps/brandonschlack/config.h | 7 +- .../bdn9/keymaps/brandonschlack/keymap.c | 252 ++++++++++-------- 2 files changed, 149 insertions(+), 110 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h index aca84dfb0743..53272d1305a6 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h @@ -1,11 +1,14 @@ #pragma once +#undef TAP_CODE_DELAY +#define ENCODER_RESOLUTION 4 + #undef RGBLIGHT_ANIMATIONS #define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation /* Mouse Keys Configuration */ -#define MK_3_SPEED -#define MK_W_INTERVAL_UNMOD 20 +// #define MK_3_SPEED +// #define MK_W_INTERVAL_UNMOD 20 /* Bootmagic to Top-Middle Key */ #define BOOTMAGIC_LITE_ROW 0 diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 7f36d78c5fa1..2eb3f31f50f5 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -195,129 +195,165 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /** * Encoder */ +const uint16_t PROGMEM encoders[][2][2] = { + [_REEDER] = {{ KC_J, KC_K }, { KC_N, KC_P }}, + [_MEDIA] = {{ KC_VOLU, KC_VOLD }, { KC_MFFD, KC_MRWD }}, + [_NAVI] = {{ MC_WH_D, MC_WH_U }, { NXT_TAB, PRV_TAB }}, + [_MACRO] = {{ KC_PPLS, KC_PMNS }, { KC_PEQL, KC_PDOT }}, + [LR_NAV] = {{ KC_EQL, KC_MINS }, { KC_PGUP, KC_PGDN }}, + [LR_REVIEW] = {{ KC_RBRC, KC_LBRC }, { G(KC_UP), G(KC_DOWN) }}, + [LR_EDIT] = {{ KC_DOT, KC_COMM }, { KC_EQL, KC_MINS }}, +}; + void encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { - switch (get_highest_layer(layer_state)) { - case _REEDER: - if (!clockwise) { - tap_code(KC_J); - } else { - tap_code(KC_K); - } - break; - case _MEDIA: - if (!clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - break; - case _NAVI: - if (!clockwise) { - tap_code(MC_WH_D); - } else { - tap_code(MC_WH_U); - } - break; - case _MACRO: - if (!clockwise) { - tap_code(KC_PPLS); - } else { - tap_code(KC_PMNS); - } - break; - case LR_NAV: - if (!clockwise) { - tap_code(KC_EQL); - } else { - tap_code(KC_MINS); - } - break; - case LR_REVIEW: - if (!clockwise) { - tap_code(KC_RBRC); - } else { - tap_code(KC_LBRC); - } - break; - case LR_EDIT: - if (!clockwise) { - tap_code(KC_DOT); - } else { - tap_code(KC_COMM); - } - break; - case _LIGHT: - if (!clockwise) { + uint8_t layer = get_highest_layer(layer_state); + + if (layer == _LIGHT) { + switch (index) { + case 0: + if (clockwise) { rgblight_increase_hue(); } else { rgblight_decrease_hue(); } break; - } - } - else if (index == 1) { - switch (get_highest_layer(layer_state)) { - case _REEDER: - if (!clockwise) { - tap_code(KC_N); - } else { - tap_code(KC_P); - } - break; - case _MEDIA: - if (!clockwise) { - tap_code(KC_MFFD); - } else { - tap_code(KC_MRWD); - } - break; - case _NAVI: - if (!clockwise) { - tap_code16(NXT_TAB); - } else { - tap_code16(PRV_TAB); - } - break; - case _MACRO: - if (!clockwise) { - tap_code(KC_PEQL); - } else { - tap_code(KC_PDOT); - } - break; - case LR_NAV: - if (!clockwise) { - tap_code(KC_PGUP); - } else { - tap_code(KC_PGDN); - } - break; - case LR_REVIEW: - if (!clockwise) { - tap_code16(G(KC_UP)); - } else { - tap_code16(G(KC_DOWN)); - } - break; - case LR_EDIT: - if (!clockwise) { - tap_code(KC_EQL); - } else { - tap_code(KC_MINS); - } - break; - case _LIGHT: - if (!clockwise) { + case 1: + if (clockwise) { rgblight_increase_sat(); } else { rgblight_decrease_sat(); } break; } + } else { + tap_code16(pgm_read_word(&encoders[layer][index][clockwise])); } } +// void encoder_update_user(uint8_t index, bool clockwise) { +// uint8_t layer = get_highest_layer(layer_state); +// if (index == 0) { +// switch (layer) { +// case _REEDER: +// if (!clockwise) { +// tap_code(KC_J); +// } else { +// tap_code(KC_K); +// } +// break; +// case _MEDIA: +// if (!clockwise) { +// tap_code(KC_VOLU); +// } else { +// tap_code(KC_VOLD); +// } +// break; +// case _NAVI: +// if (!clockwise) { +// tap_code(MC_WH_D); +// } else { +// tap_code(MC_WH_U); +// } +// break; +// case _MACRO: +// if (!clockwise) { +// tap_code(KC_PPLS); +// } else { +// tap_code(KC_PMNS); +// } +// break; +// case LR_NAV: +// if (!clockwise) { +// tap_code(KC_EQL); +// } else { +// tap_code(KC_MINS); +// } +// break; +// case LR_REVIEW: +// if (!clockwise) { +// tap_code(KC_RBRC); +// } else { +// tap_code(KC_LBRC); +// } +// break; +// case LR_EDIT: +// if (!clockwise) { +// tap_code(KC_DOT); +// } else { +// tap_code(KC_COMM); +// } +// break; +// case _LIGHT: +// if (!clockwise) { +// rgblight_increase_hue(); +// } else { +// rgblight_decrease_hue(); +// } +// break; +// } +// } +// else if (index == 1) { +// switch (get_highest_layer(layer_state)) { +// case _REEDER: +// if (!clockwise) { +// tap_code(KC_N); +// } else { +// tap_code(KC_P); +// } +// break; +// case _MEDIA: +// if (!clockwise) { +// tap_code(KC_MFFD); +// } else { +// tap_code(KC_MRWD); +// } +// break; +// case _NAVI: +// if (!clockwise) { +// tap_code16(NXT_TAB); +// } else { +// tap_code16(PRV_TAB); +// } +// break; +// case _MACRO: +// if (!clockwise) { +// tap_code(KC_PEQL); +// } else { +// tap_code(KC_PDOT); +// } +// break; +// case LR_NAV: +// if (!clockwise) { +// tap_code(KC_PGUP); +// } else { +// tap_code(KC_PGDN); +// } +// break; +// case LR_REVIEW: +// if (!clockwise) { +// tap_code16(G(KC_UP)); +// } else { +// tap_code16(G(KC_DOWN)); +// } +// break; +// case LR_EDIT: +// if (!clockwise) { +// tap_code(KC_EQL); +// } else { +// tap_code(KC_MINS); +// } +// break; +// case _LIGHT: +// if (!clockwise) { +// rgblight_increase_sat(); +// } else { +// rgblight_decrease_sat(); +// } +// break; +// } +// } +// } + /** * Keycodes */ From e4089a4e43de646395f9e991878f571851f8e4c0 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Tue, 17 Sep 2019 21:06:53 -0700 Subject: [PATCH 190/429] [Keymap] Refactor kbd75 keymap for 75_ansi layout --- .../kbd75/keymaps/brandonschlack/keymap.c | 42 +++++++++---------- .../kbd75/keymaps/brandonschlack/rules.mk | 3 -- 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c index 2aa413b7849c..e6e4ee2f9992 100644 --- a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c @@ -33,13 +33,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │Ctrl│ Opt│ Cmd│ Space │Cmd│Opt│Fn │Lef│Dow│Rig│ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ */ - [_BASE] = LAYOUT( - KC_ESC, 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_F13, KC_F14, KC_F15, - 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, XXXXXXX, KC_BSPC, KC_HOME, - 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_PGUP, - HY_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_PGDN, - KC_LSFT, XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, KC_SPC, XXXXXXX, MM_RGUI, MM_RALT, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT + [_BASE] = LAYOUT_75_ansi( \ + KC_ESC, 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_F13, KC_F14, KC_F15, \ + 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, KC_HOME, \ + 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_PGUP, \ + HY_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_PGDN, \ + 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_UP, KC_END, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MM_RGUI, MM_RALT, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ @@ -56,13 +56,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ │ │ │ │ │ │Hom│PgD│End│ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ */ - [_FN] = LAYOUT( - QM_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, MC_SLPD, - RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, - _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, KC_VOLD, - _______, _______, RGB_TOG, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_MUTE, - _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END + [_FN] = LAYOUT_75_ansi( \ + QM_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELT, MC_SLPD, \ + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, \ + _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, KC_VOLD, \ + _______, RGB_TOG, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_MUTE, \ + _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), /* Adjust Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ @@ -79,12 +79,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ │ │ │ │ │ │ │ │ │ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ */ - [_ADJUST] = LAYOUT( - QM_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, DEBUG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_ADJT, XXXXXXX, - _______, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, - _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX + [_ADJUST] = LAYOUT_75_ansi( \ + QM_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, DEBUG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_ADJT, XXXXXXX, \ + XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), }; diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk index a557b1cd8d17..7702b0140ea9 100644 --- a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk +++ b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk @@ -1,6 +1,3 @@ -# Add Bootloader define for QM_MAKE command -BOOTLOADER = atmel-dfu - # Build Options # comment out to disable the options. # From 9ac9d75e079315af5e45cf23ab74f46e5fff4efa Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 18 Sep 2019 18:46:30 -0700 Subject: [PATCH 191/429] [Keymap] Update plaid keymap * Swap Esc and Tab * Use plaid mit layout --- .../plaid/keymaps/brandonschlack/keymap.c | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/keyboards/plaid/keymaps/brandonschlack/keymap.c b/keyboards/plaid/keymaps/brandonschlack/keymap.c index f7fe9f332ae4..3494a4fe0b12 100644 --- a/keyboards/plaid/keymaps/brandonschlack/keymap.c +++ b/keyboards/plaid/keymaps/brandonschlack/keymap.c @@ -23,20 +23,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty * ,-----------------------------------------------------------------------------------. - * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * | Esc | Q | W | E | R | T | Y | U | I | O | P | Bksp | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Esc | A | S | D | F | G | H | J | K | L | ; | " | + * | Tab | A | S | D | F | G | H | J | K | L | ; | " | * |------+------+------+------+------+------|------+------+------+------+------+------| * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| * | Hypr | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | * `-----------------------------------------------------------------------------------' */ -[_BASE] = LAYOUT_plaid_grid( - 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_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, +[_BASE] = LAYOUT_planck_mit( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, 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, KC_ENT , - KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LWR_MUT, KC_SPC, KC_SPC, RAI_PLY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LWR_MUT, KC_SPC, RAI_PLY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), /* Lower @@ -50,11 +50,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | Prev | Vol- | Vol+ | Next | * `-----------------------------------------------------------------------------------' */ -[_LOWER] = LAYOUT_plaid_grid( +[_LOWER] = LAYOUT_planck_mit( KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, - KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + KC_DELT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, KC_END, _______, - _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_VOLU, KC_MFFD + _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_VOLU, KC_MFFD ), /* Raise @@ -68,34 +68,35 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | Prev | Vol- | Vol+ | Next | * `-----------------------------------------------------------------------------------' */ -[_RAISE] = LAYOUT_plaid_grid( +[_RAISE] = LAYOUT_planck_mit( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, - KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + KC_DELT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PGUP, KC_PGDN, _______, - _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_VOLU, KC_MFFD + _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_VOLU, KC_MFFD ), /* Adjust (Lower + Raise) * ,-----------------------------------------------------------------------------------. * | Make | | | | | | | | | | |SlpDsp| * |------+------+------+------+------+-------------+------+------+------+------+------| - * |Reset | | | | |AGnorm|AGswap| | | | | | + * | | | | | |AGnorm|AGswap| | | | | | * |------+------+------+------+------+------|------+------+------+------+------+------| * | | | | | | | | | | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | | | | | * `-----------------------------------------------------------------------------------' */ -[_ADJUST] = LAYOUT_plaid_grid( +[_ADJUST] = LAYOUT_planck_mit( QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_SLPD, - RESET, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; +// Turn on Red LED when initialized void keyboard_post_init_keymap(void) { writePinHigh(LED_RED); } @@ -109,12 +110,12 @@ void led_set_user(uint8_t usb_led) { } } -void suspend_power_down_keymap(void) { +void suspend_power_down_kb(void) { writePinLow(LED_RED); writePinLow(LED_GREEN); } -void suspend_wakeup_init_keymap(void) { +void suspend_wakeup_init_kb(void) { writePinHigh(LED_RED); if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) { writePinHigh(LED_GREEN); From a0a80f6a1f73e6ef2e0f86109b2e9dc4390bd0e4 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 30 Sep 2019 15:36:43 -0700 Subject: [PATCH 192/429] [User] Update TAP_CODE_DELAY for encoders --- users/brandonschlack/config.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/users/brandonschlack/config.h b/users/brandonschlack/config.h index 0e2a19059cb3..95b5fe50e8a1 100644 --- a/users/brandonschlack/config.h +++ b/users/brandonschlack/config.h @@ -12,7 +12,11 @@ # define RGB_THEME_ENABLE #endif -#define TAP_CODE_DELAY 5 +#ifdef ENCODER_ENABLE +# define TAP_CODE_DELAY 10 +#else +# define TAP_CODE_DELAY 5 +#endif /* Disable unused and unneeded features to reduce on firmware size */ #ifdef LOCKING_SUPPORT_ENABLE From 0bef9e835628b6fa09310dacf551a1b1f3e79751 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 3 Oct 2019 13:49:38 -0700 Subject: [PATCH 193/429] [Keymap] Update plaid keymap --- keyboards/plaid/keymaps/brandonschlack/keymap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/plaid/keymaps/brandonschlack/keymap.c b/keyboards/plaid/keymaps/brandonschlack/keymap.c index 3494a4fe0b12..1e2452237321 100644 --- a/keyboards/plaid/keymaps/brandonschlack/keymap.c +++ b/keyboards/plaid/keymaps/brandonschlack/keymap.c @@ -23,9 +23,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty * ,-----------------------------------------------------------------------------------. - * | Esc | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Tab | A | S | D | F | G | H | J | K | L | ; | " | + * | Esc | A | S | D | F | G | H | J | K | L | ; | " | * |------+------+------+------+------+------|------+------+------+------+------+------| * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| @@ -33,9 +33,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_BASE] = LAYOUT_planck_mit( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_TAB, 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, KC_ENT , + 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_ESC, 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, KC_ENT, KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LWR_MUT, KC_SPC, RAI_PLY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), From 0131327f659a9345519fa7096b4ba900f4011173 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 4 Oct 2019 16:08:10 -0700 Subject: [PATCH 194/429] [Keymap] Add KBD8X MKII keymap --- .../kbd8x_mk2/keymaps/brandonschlack/config.h | 1 + .../kbd8x_mk2/keymaps/brandonschlack/keymap.c | 102 ++++++++++++++++++ .../keymaps/brandonschlack/readme.md | 55 ++++++++++ .../kbd8x_mk2/keymaps/brandonschlack/rules.mk | 3 + 4 files changed, 161 insertions(+) create mode 100644 keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/config.h create mode 100644 keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/keymap.c create mode 100644 keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/readme.md create mode 100644 keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/rules.mk diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/config.h b/keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/config.h new file mode 100644 index 000000000000..bd25511851d9 --- /dev/null +++ b/keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/config.h @@ -0,0 +1 @@ +# pragma once diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/keymap.c new file mode 100644 index 000000000000..4622ba926c1f --- /dev/null +++ b/keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/keymap.c @@ -0,0 +1,102 @@ +/* Copyright 2019 Ryota Goto + * + * 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 . + */ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Base Layer + * ┌───┬───┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┐ + * │Esc│ │ F1│ F2│ F3│ F4│ │ F5│ F6│ F7│ F8│ │ F9│F10│F11│F12│ │F13│F14│F15│ + * ├───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┤ + * ├───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┤ + * │~ `│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│ │Ins│Hom│PgU│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ + * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│| \│ │Del│End│PgD│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┤ + * │Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐ │ + * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ │ Up│ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┤ + * │Ctrl│ Opt│ Cmd│ Space │Cmd │Opt │Fn │Ctrl│ │Lef│Dow│Rig│ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┴─┴───┴───┴───┘ + */ + [_BASE] = LAYOUT( + KC_ESC, 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_F13, KC_F14, KC_F15, \ + 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, KC_NO, KC_INS, KC_HOME, KC_PGUP, \ + 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_DEL, KC_END, KC_PGDN, \ + HY_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_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_UP, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MM_RGUI, MM_RALT, MM_FNPY, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ + ), + /* Function Layer + * ┌───┬───┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┐ + * │Mke│ │BrD│BrU│Msn│LHP│ │RV-│RV+│ │ │ │ │ │ │ │ │ │ │Mut│ + * ├───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┤ + * ├───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ Del │ │Ply│Slp│VlU│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ + * │RMod │RH+│RS+│RV+│RST│ │ │ │ │ │ │ │ │ │ │Prv│Nxt│VlD│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┤ + * │ │RH-│RS-│RV-│ │ │ │ │ │ │ │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐ │ + * │ │RTg│RLy│RTh│ │ │ │ │ │ │ │ │ │PgU│ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┤ + * │ │ │ │ │ │ │ │ │ │Hom│PgD│End│ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┴─┴───┴───┴───┘ + */ + [_FN] = LAYOUT( + QM_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, KC_MPLY, MC_SLPD, KC_VOLU, \ + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_VOLD, \ + _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, RGB_TOG, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ + ) + /* Blank Template + * ┌───┬───┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┤ + * ├───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┴─┴───┴───┴───┘ + */ + /* + [BLANK] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ) + */ +}; + +bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { + return true; +} + +void led_set_user(uint8_t usb_led) { + +} diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/readme.md b/keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/readme.md new file mode 100644 index 000000000000..24a9fe0571ae --- /dev/null +++ b/keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/readme.md @@ -0,0 +1,55 @@ +# The brandonschlack keymap for KBD8X MKII + +A mostly typical Mac setup, with some personal QMK touches. + +## Base Layer + +The base layer has a standard macOS modifier layout, with **F13-F15** in the F row, in place of **Print Screen**, **Scroll Lock**, and **Pause/Break**. + +### [Mod-Taps](https://docs.qmk.fm/#/feature_advanced_keycodes?id=mod-tap) + +* Hyper Caps Lock + * Hold **Caps Lock** for '**Hyper**' (**Shift**+**Control**+**Option**+**Command**). I use it for mapping global shortcuts for apps. + * Tapping **Caps Lock** functions normally +* Media controls mapped to Right Modifiers + * **Right Command** for **Prev Track** + * **Right Option** for **Next Track** + * **Fn** for **Play/Pause** + +## Function Layer + +The Function layer is a mix of [Apple's *Fn* shortcuts](https://support.apple.com/en-us/HT201236), [WASD Keyboard's Media shortcuts](https://codekeyboards.com/#multimedia), and some QMK functionality. + +### [Apple's *Fn* shortcuts](https://support.apple.com/en-us/HT201236) + +* **Home/Page Down/Page Up/End** as **Fn+Left/Down/Up/Right** +* **Foward Delete** as **Fn+Backspace** +* **Display Brightness Down/Up** as **Fn+F1/F2** +* **Misson Control** (*KC_FIND, but use [Karabiner-Elements](https://pqrs.org/osx/karabiner/index.html) as find -> mission_control*) as **Fn+F3** +* **Launchpad** (*KC_MENU, but use [Karabiner-Elements](https://pqrs.org/osx/karabiner/index.html) as menu -> launchpad*) as **Fn+F4** +* Keyboard Illumination Down/Up used as **RGB Underglow Value Decrease/Increase** on **Fn+F5/F6** + +### [WASD Keyboard's Media shortcuts](https://codekeyboards.com/#multimedia) + +* **Play/Pause** as **Fn+Insert** +* **Prev/Next Track** as **Fn+Delete/End** +* **Volume Up/Down** as **Fn+Page Up/Page Down** +* **Volume Mute** as **Fn+F15** + +### Personal & QMK shortcuts + +* **Sleep Display** (Shift+Control+Power) as **Fn+Home**. +* **QMK Make** as **Fn+Esc**. Sends make command to command line. Holding **Shift** will also append `:flash` target and put keyboard into bootloader. +* **Reset** as **Fn+R** + +### RGB Controls + +* **RGB Toggle** as **Fn+Z** +* **RGB Hue Increase/Decrease** as **Fn+Q/A** +* **RGB Saturation Increase/Decrease** as **Fn+W/S** +* **RGB Value Increase/Decrease** as **Fn+E/D** +* **RGB Mode Next/Previous** as **Fn+Tab/Shift+Tab** +* **RGB Toggle Layer Indication** as **Fn+X** + * Changes RGB Color with Layer change (*uses custom RGB_THEME*). +* **RGB Cycle Next Theme** as **Fn+C** + diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/rules.mk b/keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/rules.mk new file mode 100644 index 000000000000..5d135db7a847 --- /dev/null +++ b/keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/rules.mk @@ -0,0 +1,3 @@ +# Build Options +MOUSEKEY_ENABLE = no # Don't need Mouse Keys +BACKLIGHT_ENABLE = no # Backlights not installed From 12e515d1fe7eef54f7f726158dd5b1ba9566ec0d Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Sun, 6 Oct 2019 13:48:22 -0700 Subject: [PATCH 195/429] [User] Update Laser theme colors --- users/brandonschlack/rgb_theme_user.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/users/brandonschlack/rgb_theme_user.inc b/users/brandonschlack/rgb_theme_user.inc index a6e732126b8b..49935d52a37d 100644 --- a/users/brandonschlack/rgb_theme_user.inc +++ b/users/brandonschlack/rgb_theme_user.inc @@ -3,11 +3,11 @@ #ifndef RGB_THEME_IMPLS RGB_THEME(LASER) #else -RGB_THEME_COLOR(LASER, PURPLE, HSV_PURPLE); -RGB_THEME_COLOR(LASER, PINK, HSV_PINK); -RGB_THEME_COLOR(LASER, BLUE, HSV_BLUE); -RGB_THEME_COLOR(LASER, CYAN, HSV_CYAN); -RGB_THEME_COLOR(LASER, MAGENTA, HSV_MAGENTA); +RGB_THEME_COLOR(LASER, PURPLE, 191, 255, 255); +RGB_THEME_COLOR(LASER, PINK, 237, 255, 255); +RGB_THEME_COLOR(LASER, BLUE, 165, 255, 255); +RGB_THEME_COLOR(LASER, CYAN, 133, 255, 255); +RGB_THEME_COLOR(LASER, MAGENTA, 213, 255, 255); RGB_THEME(LASER) = { { &LASER_PURPLE, &LASER_PINK, &LASER_BLUE, &LASER_CYAN, &LASER_MAGENTA } }; #endif // RGB_THEME_IMPLS #endif // DISABLE_RGB_THEME_LASER From 90685c8a8915011990a06c7ed46bd634dafb6b56 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 9 Oct 2019 11:31:44 -0700 Subject: [PATCH 196/429] [Keymap] Move romac keymap --- keyboards/{ => kingly_keys}/romac/keymaps/brandonschlack/keymap.c | 0 keyboards/{ => kingly_keys}/romac/keymaps/brandonschlack/rules.mk | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/{ => kingly_keys}/romac/keymaps/brandonschlack/keymap.c (100%) rename keyboards/{ => kingly_keys}/romac/keymaps/brandonschlack/rules.mk (100%) diff --git a/keyboards/romac/keymaps/brandonschlack/keymap.c b/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c similarity index 100% rename from keyboards/romac/keymaps/brandonschlack/keymap.c rename to keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c diff --git a/keyboards/romac/keymaps/brandonschlack/rules.mk b/keyboards/kingly_keys/romac/keymaps/brandonschlack/rules.mk similarity index 100% rename from keyboards/romac/keymaps/brandonschlack/rules.mk rename to keyboards/kingly_keys/romac/keymaps/brandonschlack/rules.mk From 64e104e6fb9d6b7164057f07db77c90968506ef0 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 17 Oct 2019 11:41:15 -0700 Subject: [PATCH 197/429] [Keymap] BDN9 Cleanup --- .../bdn9/keymaps/brandonschlack/config.h | 1 - .../bdn9/keymaps/brandonschlack/keymap.c | 124 ------------------ 2 files changed, 125 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h index 53272d1305a6..9ec8933ae061 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h @@ -1,6 +1,5 @@ #pragma once -#undef TAP_CODE_DELAY #define ENCODER_RESOLUTION 4 #undef RGBLIGHT_ANIMATIONS diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 2eb3f31f50f5..2006bfd96f7e 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -230,130 +230,6 @@ void encoder_update_user(uint8_t index, bool clockwise) { } } -// void encoder_update_user(uint8_t index, bool clockwise) { -// uint8_t layer = get_highest_layer(layer_state); -// if (index == 0) { -// switch (layer) { -// case _REEDER: -// if (!clockwise) { -// tap_code(KC_J); -// } else { -// tap_code(KC_K); -// } -// break; -// case _MEDIA: -// if (!clockwise) { -// tap_code(KC_VOLU); -// } else { -// tap_code(KC_VOLD); -// } -// break; -// case _NAVI: -// if (!clockwise) { -// tap_code(MC_WH_D); -// } else { -// tap_code(MC_WH_U); -// } -// break; -// case _MACRO: -// if (!clockwise) { -// tap_code(KC_PPLS); -// } else { -// tap_code(KC_PMNS); -// } -// break; -// case LR_NAV: -// if (!clockwise) { -// tap_code(KC_EQL); -// } else { -// tap_code(KC_MINS); -// } -// break; -// case LR_REVIEW: -// if (!clockwise) { -// tap_code(KC_RBRC); -// } else { -// tap_code(KC_LBRC); -// } -// break; -// case LR_EDIT: -// if (!clockwise) { -// tap_code(KC_DOT); -// } else { -// tap_code(KC_COMM); -// } -// break; -// case _LIGHT: -// if (!clockwise) { -// rgblight_increase_hue(); -// } else { -// rgblight_decrease_hue(); -// } -// break; -// } -// } -// else if (index == 1) { -// switch (get_highest_layer(layer_state)) { -// case _REEDER: -// if (!clockwise) { -// tap_code(KC_N); -// } else { -// tap_code(KC_P); -// } -// break; -// case _MEDIA: -// if (!clockwise) { -// tap_code(KC_MFFD); -// } else { -// tap_code(KC_MRWD); -// } -// break; -// case _NAVI: -// if (!clockwise) { -// tap_code16(NXT_TAB); -// } else { -// tap_code16(PRV_TAB); -// } -// break; -// case _MACRO: -// if (!clockwise) { -// tap_code(KC_PEQL); -// } else { -// tap_code(KC_PDOT); -// } -// break; -// case LR_NAV: -// if (!clockwise) { -// tap_code(KC_PGUP); -// } else { -// tap_code(KC_PGDN); -// } -// break; -// case LR_REVIEW: -// if (!clockwise) { -// tap_code16(G(KC_UP)); -// } else { -// tap_code16(G(KC_DOWN)); -// } -// break; -// case LR_EDIT: -// if (!clockwise) { -// tap_code(KC_EQL); -// } else { -// tap_code(KC_MINS); -// } -// break; -// case _LIGHT: -// if (!clockwise) { -// rgblight_increase_sat(); -// } else { -// rgblight_decrease_sat(); -// } -// break; -// } -// } -// } - /** * Keycodes */ From 18644d5b9fb1267ebbdb8e24cc38af2844f7e1ba Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 17 Oct 2019 11:42:40 -0700 Subject: [PATCH 198/429] [User] Include layer def for rgb, add AUDIO layer --- users/brandonschlack/brandonschlack.h | 5 ++--- users/brandonschlack/process_records.h | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index a4daad44ccf0..c4da1addbfa1 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -25,9 +25,8 @@ enum bs_layers { _MACRO, #endif KEYMAP_LAYERS, // Add more layers in keymaps -#if defined(IS_MACROPAD) && (defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)) - _LIGHT = 14, // Layer for BLight/RGB controls on macropads -#endif + _AUDIO = 13, // Layer for Audio controls + _LIGHT = 14, // Layer for BLight/RGB controls _ADJUST = 15 // Change keyboard settings }; diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index c0b5f54ef4ec..f8ed076f58c9 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -21,9 +21,7 @@ void matrix_scan_cmd_tab(void); #define HY_CAPS ALL_T(KC_CAPS) #define SF_CAPS LSFT_T(KC_CAPS) #define TG_ADJT TG(_ADJUST) -#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) #define TG_LGHT TG(_LIGHT) -#endif // Media Mod-Tap #define MM_RGUI RGUI_T(KC_MRWD) #define MM_RALT RALT_T(KC_MFFD) From afaa604e78627d19dd34fe334a92f552ff986cd4 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 17 Oct 2019 11:43:43 -0700 Subject: [PATCH 199/429] [Keymap] Basic split of RGB & Audio for BDN9 --- .../bdn9/keymaps/brandonschlack/keymap.c | 79 ++++++++++++------- 1 file changed, 51 insertions(+), 28 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 2006bfd96f7e..bfc738c7c77b 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -15,16 +15,22 @@ enum bdn9_keycodes { // Tap Dances enum bdn9_dances { - TD_DTAP_LGHT = 0, + TD_DTAP_ADIO = 0, + TD_DTAP_LGHT, TD_DTAP_ADJT }; //Tap Dance Definitions qk_tap_dance_action_t tap_dance_actions[] = { + [TD_DTAP_ADIO] = ACTION_TAP_DANCE_TRIGGER_LAYER(DOUBLE_TAP, _AUDIO), [TD_DTAP_LGHT] = ACTION_TAP_DANCE_TRIGGER_LAYER(DOUBLE_TAP, _LIGHT), [TD_DTAP_ADJT] = ACTION_TAP_DANCE_TRIGGER_LAYER(DOUBLE_TAP, _ADJUST), }; // Tap Dance Aliases -#define DTP_LGT TD(TD_DTAP_LGHT) +#if defined(RGBLIGHT_ENABLE) +#define DTP_AVC TD(TD_DTAP_LGHT) +#elif defined(AUDIO_ENABLE) +#define DTP_AVC TD(TD_DTAP_ADIO) +#endif #define DTP_ADJ TD(TD_DTAP_ADJT) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -43,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_REEDER] = LAYOUT( KC_H, KC_S, KC_R, - CMD_TAB, KC_M, DTP_LGT, + CMD_TAB, KC_M, DTP_AVC, G(KC_1), G(KC_2), DTP_ADJ ), /* @@ -61,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_MEDIA] = LAYOUT( KC_MUTE, MC_PLYR, KC_MPLY, - KC_J, KC_K, DTP_LGT, + KC_J, KC_K, DTP_AVC, KC_LEFT, KC_SPC, DTP_ADJ ), /* @@ -79,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_NAVI] = LAYOUT( REO_TAB, CMD_TAB, CLS_TAB, - KC_PGDN, KC_UP, DTP_LGT, + KC_PGDN, KC_UP, DTP_AVC, KC_LEFT, KC_DOWN, DTP_ADJ ), /* @@ -97,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_MACRO] = LAYOUT( KC_P1, KC_P2, KC_P3, - KC_P4, KC_P5, DTP_LGT, + KC_P4, KC_P5, DTP_AVC, KC_P7, KC_P8, DTP_ADJ ), /* @@ -115,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [LR_NAV] = LAYOUT( TG_REVW, KC_J, TG_EDIT, - KC_HOME, KC_UP, DTP_LGT, + KC_HOME, KC_UP, DTP_AVC, KC_LEFT, KC_DOWN, DTP_ADJ ), /* @@ -133,7 +139,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [LR_REVIEW] = LAYOUT( TG_LNAV, KC_7, TG_EDIT, - KC_0, KC_8, DTP_LGT, + KC_0, KC_8, DTP_AVC, KC_LEFT, KC_6, DTP_ADJ ), /* @@ -151,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [LR_EDIT] = LAYOUT( TG_REVW, KC_BSLS, TG_LNAV, - KC_X, MC_UNDO, DTP_LGT, + KC_X, MC_UNDO, DTP_AVC, KC_LEFT, MC_REDO, DTP_ADJ ), /* @@ -208,25 +214,34 @@ const uint16_t PROGMEM encoders[][2][2] = { void encoder_update_user(uint8_t index, bool clockwise) { uint8_t layer = get_highest_layer(layer_state); - if (layer == _LIGHT) { - switch (index) { - case 0: - if (clockwise) { - rgblight_increase_hue(); - } else { - rgblight_decrease_hue(); - } - break; - case 1: - if (clockwise) { - rgblight_increase_sat(); - } else { - rgblight_decrease_sat(); - } - break; - } - } else { - tap_code16(pgm_read_word(&encoders[layer][index][clockwise])); + switch (layer) { + case _AUDIO: + #ifdef AUDIO_ENABLE + #endif + break; + case _LIGHT: + #ifdef RGBLIGHT_ENABLE + switch (index) { + case 0: + if (clockwise) { + rgblight_increase_hue(); + } else { + rgblight_decrease_hue(); + } + break; + case 1: + if (clockwise) { + rgblight_increase_sat(); + } else { + rgblight_decrease_sat(); + } + break; + } + #endif + break; + default: + tap_code16(pgm_read_word(&encoders[layer][index][clockwise])); + break; } } @@ -263,13 +278,21 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { layer_state_t layer_state_set_keymap (layer_state_t state) { switch (get_highest_layer(state)) { case LR_NAV: + #if defined(RGBLIGHT_ENABLE) rgb_layer_helper(HSV_TEAL); + #endif break; case LR_REVIEW: + #if defined(RGBLIGHT_ENABLE) rgb_layer_helper(HSV_CYAN); + #endif break; case LR_EDIT: + #if defined(RGBLIGHT_ENABLE) rgb_layer_helper(HSV_AZURE); + #endif + break; + default: break; } return state; From 48901d9ad248bd5d1e81441e9875a60904821e34 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Mon, 21 Oct 2019 09:44:39 -0700 Subject: [PATCH 200/429] [Keymap] Only include RGB Breathing Animation --- keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/config.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/config.h b/keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/config.h index bd25511851d9..289d1a8da15e 100644 --- a/keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/config.h +++ b/keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/config.h @@ -1 +1,5 @@ # pragma once + +// Explicit RGB Animation Mode Include +#undef RGBLIGHT_ANIMATIONS +#define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation From 4aed751ffb13b4e1a5f3b943472b91a4f3ce2b72 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 21 Oct 2019 10:05:53 -0700 Subject: [PATCH 201/429] [User] Change Granite RGB Theme to Canvas --- users/brandonschlack/rgb_theme_user.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/users/brandonschlack/rgb_theme_user.inc b/users/brandonschlack/rgb_theme_user.inc index 49935d52a37d..de2c858a31ab 100644 --- a/users/brandonschlack/rgb_theme_user.inc +++ b/users/brandonschlack/rgb_theme_user.inc @@ -12,19 +12,19 @@ RGB_THEME(LASER) = { { &LASER_PURPLE, &LASER_PINK, &LASER_BLUE, &LASER_CYAN, &LA #endif // RGB_THEME_IMPLS #endif // DISABLE_RGB_THEME_LASER -// Granite Theme -#ifndef DISABLE_RGB_THEME_GRANITE +// Canvas Theme +#ifndef DISABLE_RGB_THEME_CANVAS #ifndef RGB_THEME_IMPLS -RGB_THEME(GRANITE) +RGB_THEME(CANVAS) #else -RGB_THEME_COLOR(GRANITE, WHITE, HSV_WHITE); -RGB_THEME_COLOR(GRANITE, BLUE, HSV_BLUE); -RGB_THEME_COLOR(GRANITE, RED, HSV_RED); -RGB_THEME_COLOR(GRANITE, GREEN, HSV_GREEN); -RGB_THEME_COLOR(GRANITE, YELLOW, HSV_YELLOW); -RGB_THEME(GRANITE) = { { &GRANITE_WHITE, &GRANITE_BLUE, &GRANITE_RED, &GRANITE_GREEN, &GRANITE_YELLOW } }; +RGB_THEME_COLOR(CANVAS, WHITE, HSV_WHITE); +RGB_THEME_COLOR(CANVAS, ORANGE, 10, 255, 255); +RGB_THEME_COLOR(CANVAS, RED, 0, 231, 255); +RGB_THEME_COLOR(CANVAS, GREEN, 74, 207, 255); +RGB_THEME_COLOR(CANVAS, BLUE, 170, 135, 255); +RGB_THEME(CANVAS) = { { &CANVAS_WHITE, &CANVAS_ORANGE, &CANVAS_RED, &CANVAS_GREEN, &CANVAS_BLUE } }; #endif // RGB_THEME_IMPLS -#endif // DISABLE_RGB_THEME_GRANITE +#endif // DISABLE_RGB_THEME_CANVAS // Oblique Theme #ifndef DISABLE_RGB_THEME_OBLIQUE From 96865f29d9dce2f96f1b7f5b3c294cd49696dec8 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 21 Oct 2019 10:47:35 -0700 Subject: [PATCH 202/429] [Keymap] Add KBD67/rev2 keymap --- .../rev2/keymaps/brandonschlack/config.h | 17 +++ .../rev2/keymaps/brandonschlack/keymap.c | 114 ++++++++++++++++++ .../rev2/keymaps/brandonschlack/rules.mk | 3 + 3 files changed, 134 insertions(+) create mode 100644 keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/config.h create mode 100644 keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c create mode 100644 keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/rules.mk diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/config.h b/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/config.h new file mode 100644 index 000000000000..a37375a2b27f --- /dev/null +++ b/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/config.h @@ -0,0 +1,17 @@ +/* Copyright 2019 Brandon Schlack + * + * 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 . + */ + +#pragma once diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c new file mode 100644 index 000000000000..69f108d6a461 --- /dev/null +++ b/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c @@ -0,0 +1,114 @@ +/* Copyright 2019 MechMerlin + * + * 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 . + */ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Base Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│Hom│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ + * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│ Bspc│PgU│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│PgD│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│End│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * │Ctrl│ Opt│ Cmd│ Space │Cmd │FnPy│ │Lef│Dow│Rig│ + * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ + */ +[_BASE] = 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_BSLS, KC_GRV, KC_HOME, \ + 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, KC_PGUP, \ + HY_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_PGDN, \ + KC_LSFT, XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, \ + KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, KC_SPC, XXXXXXX, KC_RGUI, MM_FNPY, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT), + +/* Function Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │MKE│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│LHP│MSN│SLP│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ + * │RMod │RH+│RS+│RV+│RST│ │ │ │ │ │F13│F14│F15│ Del│VlU│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ │RH-│RS-│RV-│ │ │ │ │KMP│ │ │ │ Adjust │VlD│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ │RTg│RLy│RTh│VRN│ │ │ │Prv│Nxt│Ply│ │PgU│Mut│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * │ │ │ │ │ │ │ │Hom│PgD│End│ + * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ + */ +[_FN] = LAYOUT_all( + QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_MSSN, MC_SLPD, \ + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, KC_VOLU, \ + _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, QM_KYMP, _______, _______, _______, TG_ADJT, KC_VOLD, \ + _______, XXXXXXX, RGB_TOG, RGB_LYR, RGB_THM, QM_VRSN, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, KC_PGUP, KC_MUTE, \ + _______, _______, _______, XXXXXXX, _______, XXXXXXX, _______, _______, XXXXXXX, KC_HOME, KC_PGDN, KC_END ), + +/* Adjust Layer Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ + * │ │ │ │EEP│RST│ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ Adjust │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ + */ +[_ADJUST] = LAYOUT_all( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_ADJT, XXXXXXX, \ + _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, \ + _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX), +}; + +/* Blank Template + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ + */ +/* +[_BLANK] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; +*/ + +void matrix_init_keymap(void) { + +} + +void matrix_scan_keymap(void) { + +} + +void led_set_user(uint8_t usb_led) { + +} diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/rules.mk b/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/rules.mk new file mode 100644 index 000000000000..348eeaee3d63 --- /dev/null +++ b/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/rules.mk @@ -0,0 +1,3 @@ +# Build Options +MOUSEKEY_ENABLE = no # Don't need mouse keys +BACKLIGHT_ENABLE = no # Backlights not installed From 510b4a9a5bb42a9bd160819585a0bb8c77d78d4e Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 22 Oct 2019 13:42:20 -0700 Subject: [PATCH 203/429] [User] Change layer name definitions --- users/brandonschlack/brandonschlack.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index c4da1addbfa1..286e732a07b6 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -16,7 +16,7 @@ enum bs_layers { #if !defined(IS_MACROPAD) // Keyboard Layers _BASE = 0, _FN = 1, - _LOWER = 1, + _LOWER, _RAISE, #else // Macropad Layers _REEDER = 0, @@ -25,9 +25,10 @@ enum bs_layers { _MACRO, #endif KEYMAP_LAYERS, // Add more layers in keymaps - _AUDIO = 13, // Layer for Audio controls - _LIGHT = 14, // Layer for BLight/RGB controls - _ADJUST = 15 // Change keyboard settings + /* Protected Layer */ + _AUDIO = 13, // 13: Audio controls + _LIGHT = 14, // 14: BLight/RGB controls + _ADJUST = 15 // 15: Change keyboard settings }; // EEPROM User Config From 411e3dc5f0aa171e0bb99e78a82aa0ff998dc924 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 22 Oct 2019 13:48:53 -0700 Subject: [PATCH 204/429] [Keymap] Update plaid keymap * Use ortho_4x12 layout * Add RESET and DEBUG keycodes * Remove suspend_kb calls * Add readme --- .../plaid/keymaps/brandonschlack/keymap.c | 50 +++++++------------ .../plaid/keymaps/brandonschlack/readme.md | 37 +++----------- 2 files changed, 25 insertions(+), 62 deletions(-) diff --git a/keyboards/plaid/keymaps/brandonschlack/keymap.c b/keyboards/plaid/keymaps/brandonschlack/keymap.c index 1e2452237321..e74a648d6bf6 100644 --- a/keyboards/plaid/keymaps/brandonschlack/keymap.c +++ b/keyboards/plaid/keymaps/brandonschlack/keymap.c @@ -24,73 +24,73 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty * ,-----------------------------------------------------------------------------------. * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| + * |------+------+------+------+------+------+------+------+------+------+------+------| * | Esc | A | S | D | F | G | H | J | K | L | ; | " | - * |------+------+------+------+------+------|------+------+------+------+------+------| + * |------+------+------+------+------+------+------+------+------+------+------+------| * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Hypr | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * | Hypr | Ctrl | Alt | GUI |LwrMut| Space |RsePly| Left | Down | Up |Right | * `-----------------------------------------------------------------------------------' */ -[_BASE] = LAYOUT_planck_mit( +[_BASE] = LAYOUT_ortho_4x12( 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_ESC, 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, KC_ENT, - KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LWR_MUT, KC_SPC, RAI_PLY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LWR_MUT, KC_SPC, KC_SPC, RAI_PLY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), /* Lower * ,-----------------------------------------------------------------------------------. * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| + * |------+------+------+------+------+------+------+------+------+------+------+------| * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | - * |------+------+------+------+------+------|------+------+------+------+------+------| + * |------+------+------+------+------+------+------+------+------+------+------+------| * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | | | Home | End | | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | Prev | Vol- | Vol+ | Next | * `-----------------------------------------------------------------------------------' */ -[_LOWER] = LAYOUT_planck_mit( +[_LOWER] = LAYOUT_ortho_4x12( KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_DELT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, KC_END, _______, - _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_VOLU, KC_MFFD + _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_VOLU, KC_MFFD ), /* Raise * ,-----------------------------------------------------------------------------------. * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| + * |------+------+------+------+------+------+------+------+------+------+------+------| * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | - * |------+------+------+------+------+------|------+------+------+------+------+------| + * |------+------+------+------+------+------+------+------+------+------+------+------| * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | | |Pg Up |Pg Dn | | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | Prev | Vol- | Vol+ | Next | * `-----------------------------------------------------------------------------------' */ -[_RAISE] = LAYOUT_planck_mit( +[_RAISE] = LAYOUT_ortho_4x12( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_DELT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PGUP, KC_PGDN, _______, - _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_VOLU, KC_MFFD + _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_VOLU, KC_MFFD ), /* Adjust (Lower + Raise) * ,-----------------------------------------------------------------------------------. - * | Make | | | | | | | | | | |SlpDsp| - * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Make | Reset| Debug| | | | | | | | |SlpDsp| + * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | |AGnorm|AGswap| | | | | | - * |------+------+------+------+------+------|------+------+------+------+------+------| + * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | | | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | | | | | * `-----------------------------------------------------------------------------------' */ -[_ADJUST] = LAYOUT_planck_mit( - QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_SLPD, +[_ADJUST] = LAYOUT_ortho_4x12( + QM_MAKE, RESET, DEBUG, _______, _______, _______, _______, _______, _______, _______, _______, MC_SLPD, _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) @@ -110,18 +110,6 @@ void led_set_user(uint8_t usb_led) { } } -void suspend_power_down_kb(void) { - writePinLow(LED_RED); - writePinLow(LED_GREEN); -} - -void suspend_wakeup_init_kb(void) { - writePinHigh(LED_RED); - if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) { - writePinHigh(LED_GREEN); - } -} - layer_state_t layer_state_set_keymap(layer_state_t state) { state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); return state; diff --git a/keyboards/plaid/keymaps/brandonschlack/readme.md b/keyboards/plaid/keymaps/brandonschlack/readme.md index 5a08a1fff3ff..166545cbdc9c 100644 --- a/keyboards/plaid/keymaps/brandonschlack/readme.md +++ b/keyboards/plaid/keymaps/brandonschlack/readme.md @@ -1,35 +1,10 @@ -# The default keymap for plaid +# brandonschlack's plaid keymap Original copyright 2019 Takuya Urakawa (dm9records.com) LED Support added by Richard Sutherland (rich@brickbots.com) -This layout is based on the Planck layout, and includes an adjust layer (6) -accessible by holding the lower and raise modifiers (MO3 and MO4) together. -The adjustment layer is used to set the behavior of the two LEDs: +This layout is based on the Planck layout. It is macOS-centric, with Colemak and DVORAK removed as I don't use them. +Features include: -**Modifier Mode:** -Activates when any modifier (shift, alt, os, MO) key is held -down. LED turns off when key is release - -**Blinkinlights Mode:** -Random chance of state change on each keystroke. - -**Keypress Mode:** -On for any keypress as long as the key is pressed - -**Carriage Mode:** -Turns on when enter is pressed, turns off when any next key is pressed - -To set the behavior of an LED, and save it to eeprom, hold the -raise/lower keys together to access the adjust layer, then use -the keys indicated below to set the behaviors - -* q = Toggle Red LED state, deactivates any other modes -* w = Toggle Green LED state, deactivates any other modes -* e = Set RED LED to modifier mode -* r = Set GREEN LED to modifier mode -* t = Set RED LED to Blinkinlights mode -* y = set GREEN LED to Blinkinlights mode -* u = set RED LED to Keypress mode -* i = set GREEN LED to Keypress mode -* o = set RED LED to Carriage mode -* p = set GREEN LED to Carriage mode +* LOWER and RAISE keys are Layer-Taps, so tapping LOWER will mute, and tapping RAISE will Play/Pause. +* On either LOWER or RAISE layers, tapping Left Shift will toggle Caps Lock, hold for Shift. +* The Green LED acts as a Caps Lock indicator. From b38e1ccafcbb01bd217a68b45173e2d4b1cd5668 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 22 Oct 2019 20:02:32 -0700 Subject: [PATCH 205/429] [Keymap] Add jnao keymap --- .../jnao/keymaps/brandonschlack/keymap.c | 94 +++++++++++++++++++ .../jnao/keymaps/brandonschlack/rules.mk | 4 + 2 files changed, 98 insertions(+) create mode 100644 keyboards/jnao/keymaps/brandonschlack/keymap.c create mode 100644 keyboards/jnao/keymaps/brandonschlack/rules.mk diff --git a/keyboards/jnao/keymaps/brandonschlack/keymap.c b/keyboards/jnao/keymaps/brandonschlack/keymap.c new file mode 100644 index 000000000000..45df2b9a0fdd --- /dev/null +++ b/keyboards/jnao/keymaps/brandonschlack/keymap.c @@ -0,0 +1,94 @@ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Qwerty + * ,-----------------------------------------------------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | \ | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | S | D | F | G | H | J | K | L | ; | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Hypr | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_BASE] = LAYOUT_ortho_5x12( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, \ + 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_ESC, 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, KC_ENT, \ + KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LWR_MUT, KC_SPC, KC_SPC, RAI_PLY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ +), + +/* Lower + * ,-----------------------------------------------------------------------------------. + * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Esc | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | | | Home | End | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | Prev | Vol- | Vol+ | Next | + * `-----------------------------------------------------------------------------------' + */ +[_LOWER] = LAYOUT_ortho_5x12( \ + 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_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DELT, \ + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, \ + SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, KC_END, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ +), + +/* Raise + * ,-----------------------------------------------------------------------------------. + * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | | |Pg Up |Pg Dn | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | Prev | Vol- | Vol+ | Next | + * `-----------------------------------------------------------------------------------' + */ +[_RAISE] = LAYOUT_ortho_5x12( \ + KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DELT, \ + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, \ + SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PGUP, KC_PGDN, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ +), + +/* Adjust (Lower + Raise) + * ,-----------------------------------------------------------------------------------. + * | Esc | DBr- | DBr+ | Mssn | Lhpd | | | | | | |SlpDsp| + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Make | Reset| | | | | | | | | | | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | | | | |AGnorm|AGswap| | | | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[_ADJUST] = LAYOUT_ortho_5x12( \ + KC_ESC, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, MC_SLPD, \ + QM_MAKE, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +) +}; + +layer_state_t layer_state_set_keymap(layer_state_t state) { + state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); + return state; +} diff --git a/keyboards/jnao/keymaps/brandonschlack/rules.mk b/keyboards/jnao/keymaps/brandonschlack/rules.mk new file mode 100644 index 000000000000..0380da045dfb --- /dev/null +++ b/keyboards/jnao/keymaps/brandonschlack/rules.mk @@ -0,0 +1,4 @@ +# Build Options +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration(+1000) +COMMAND_ENABLE = no # Don't need Command +BACKLIGHT_ENABLE = no # No backlights installed From b19f384949e0547b2a3237e3b3989076c983492e Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 22 Oct 2019 20:02:42 -0700 Subject: [PATCH 206/429] [Keymap] Add preonic keymap --- .../preonic/keymaps/brandonschlack/config.h | 37 ++++ .../preonic/keymaps/brandonschlack/keymap.c | 192 ++++++++++++++++++ .../preonic/keymaps/brandonschlack/readme.md | 1 + .../preonic/keymaps/brandonschlack/rules.mk | 1 + 4 files changed, 231 insertions(+) create mode 100644 keyboards/preonic/keymaps/brandonschlack/config.h create mode 100644 keyboards/preonic/keymaps/brandonschlack/keymap.c create mode 100644 keyboards/preonic/keymaps/brandonschlack/readme.md create mode 100644 keyboards/preonic/keymaps/brandonschlack/rules.mk diff --git a/keyboards/preonic/keymaps/brandonschlack/config.h b/keyboards/preonic/keymaps/brandonschlack/config.h new file mode 100644 index 000000000000..40a9524b469d --- /dev/null +++ b/keyboards/preonic/keymaps/brandonschlack/config.h @@ -0,0 +1,37 @@ +#pragma once + +#ifdef AUDIO_ENABLE + #define STARTUP_SONG SONG(PREONIC_SOUND) + // #define STARTUP_SONG SONG(NO_SOUND) + + #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ + SONG(COLEMAK_SOUND), \ + SONG(DVORAK_SOUND) \ + } +#endif + +#define MUSIC_MASK (keycode != KC_NO) + +/* + * MIDI options + */ + +/* Prevent use of disabled MIDI features in the keymap */ +//#define MIDI_ENABLE_STRICT 1 + +/* enable basic MIDI features: + - MIDI notes can be sent when in Music mode is on +*/ + +#define MIDI_BASIC + +/* enable advanced MIDI features: + - MIDI notes can be added to the keymap + - Octave shift and transpose + - Virtual sustain, portamento, and modulation wheel + - etc. +*/ +//#define MIDI_ADVANCED + +/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ +//#define MIDI_TONE_KEYCODE_OCTAVES 2 diff --git a/keyboards/preonic/keymaps/brandonschlack/keymap.c b/keyboards/preonic/keymaps/brandonschlack/keymap.c new file mode 100644 index 000000000000..c7eed1120c09 --- /dev/null +++ b/keyboards/preonic/keymaps/brandonschlack/keymap.c @@ -0,0 +1,192 @@ +/* Copyright 2015-2017 Jack Humbert + * + * 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 . + */ + +#include QMK_KEYBOARD_H +#include "muse.h" +#include "brandonschlack.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Qwerty + * ,-----------------------------------------------------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | \ | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | S | D | F | G | H | J | K | L | ; | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Hypr | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_BASE] = LAYOUT_ortho_5x12( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, \ + 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_ESC, 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, KC_ENT, \ + KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LWR_MUT, KC_SPC, KC_SPC, RAI_PLY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ +), + +/* Lower + * ,-----------------------------------------------------------------------------------. + * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Esc | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | | | Home | End | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | Prev | Vol- | Vol+ | Next | + * `-----------------------------------------------------------------------------------' + */ +[_LOWER] = LAYOUT_ortho_5x12( \ + 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_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DELT, \ + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, \ + SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, KC_END, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ +), + +/* Raise + * ,-----------------------------------------------------------------------------------. + * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | | |Pg Up |Pg Dn | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | Prev | Vol- | Vol+ | Next | + * `-----------------------------------------------------------------------------------' + */ +[_RAISE] = LAYOUT_ortho_5x12( \ + KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DELT, \ + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, \ + SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PGUP, KC_PGDN, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ +), + +/* Adjust (Lower + Raise) + * ,-----------------------------------------------------------------------------------. + * | Esc | DBr- | DBr+ | Mssn | Lhpd | | | | | | |SlpDsp| + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Make | Reset| Debug| | | | | | | | | | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | | |Aud on|AudOff|AGnorm|AGswap| | | | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff| | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[_ADJUST] = LAYOUT_ortho_5x12( \ + KC_ESC, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, MC_SLPD, \ + QM_MAKE, RESET, DEBUG, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \ + _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +) + + +}; + +layer_state_t layer_state_set_keymap(layer_state_t state) { + state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); + return state; +} + +bool muse_mode = false; +uint8_t last_muse_note = 0; +uint16_t muse_counter = 0; +uint8_t muse_offset = 70; +uint16_t muse_tempo = 50; + +void encoder_update_user(uint8_t index, bool clockwise) { + if (muse_mode) { + if (IS_LAYER_ON(_RAISE)) { + if (clockwise) { + muse_offset++; + } else { + muse_offset--; + } + } else { + if (clockwise) { + muse_tempo+=1; + } else { + muse_tempo-=1; + } + } + } else { + if (clockwise) { + register_code(KC_PGDN); + unregister_code(KC_PGDN); + } else { + register_code(KC_PGUP); + unregister_code(KC_PGUP); + } + } +} + +void dip_switch_update_user(uint8_t index, bool active) { + switch (index) { + case 0: + if (active) { + layer_on(_ADJUST); + } else { + layer_off(_ADJUST); + } + break; + case 1: + if (active) { + muse_mode = true; + } else { + muse_mode = false; + } + } +} + + +void matrix_scan_keymap(void) { +#ifdef AUDIO_ENABLE + if (muse_mode) { + if (muse_counter == 0) { + uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()]; + if (muse_note != last_muse_note) { + stop_note(compute_freq_for_midi_note(last_muse_note)); + play_note(compute_freq_for_midi_note(muse_note), 0xF); + last_muse_note = muse_note; + } + } + muse_counter = (muse_counter + 1) % muse_tempo; + } else { + if (muse_counter) { + stop_all_notes(); + muse_counter = 0; + } + } +#endif +} + +bool music_mask_user(uint16_t keycode) { + switch (keycode) { + default: + return true; + } +} diff --git a/keyboards/preonic/keymaps/brandonschlack/readme.md b/keyboards/preonic/keymaps/brandonschlack/readme.md new file mode 100644 index 000000000000..e911968dd964 --- /dev/null +++ b/keyboards/preonic/keymaps/brandonschlack/readme.md @@ -0,0 +1 @@ +# The default Preonic layout - largely based on the Planck's \ No newline at end of file diff --git a/keyboards/preonic/keymaps/brandonschlack/rules.mk b/keyboards/preonic/keymaps/brandonschlack/rules.mk new file mode 100644 index 000000000000..dcf16bef3994 --- /dev/null +++ b/keyboards/preonic/keymaps/brandonschlack/rules.mk @@ -0,0 +1 @@ +SRC += muse.c From 94acb2c46f07a0336bcb4551d41241ebedc79a10 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 24 Oct 2019 12:14:01 -0700 Subject: [PATCH 207/429] [User] Add QM_FLSH for make with :flash --- users/brandonschlack/process_records.c | 5 +++++ users/brandonschlack/process_records.h | 1 + 2 files changed, 6 insertions(+) diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index b640c49b5af0..7183e11ab40f 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -36,6 +36,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { send_make_command(flash); } break; + case QM_FLSH: // Sends Make command with :flash target + if (record->event.pressed) { + send_make_command(true); + } + break; case QM_VRSN: // Prints firmware version if (record->event.pressed) { send_string_with_delay_P(PSTR(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE), SEND_STRING_DELAY); diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index f8ed076f58c9..357d1a70fefd 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -4,6 +4,7 @@ // Macros enum custom_keycodes { QM_MAKE = SAFE_RANGE, + QM_FLSH, QM_VRSN, QM_KYBD, QM_KYMP, From 1b40ae2bde50df519806d2040c45e2866d6a0089 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 24 Oct 2019 12:14:42 -0700 Subject: [PATCH 208/429] [User] Add HY_ESC for Hyper Esc --- users/brandonschlack/process_records.h | 1 + 1 file changed, 1 insertion(+) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 357d1a70fefd..b2903117a0db 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -20,6 +20,7 @@ void matrix_scan_cmd_tab(void); // Useful Defines #define HY_CAPS ALL_T(KC_CAPS) +#define HY_ESC ALL_T(KC_ESC) #define SF_CAPS LSFT_T(KC_CAPS) #define TG_ADJT TG(_ADJUST) #define TG_LGHT TG(_LIGHT) From 05d84e61111e4efc38a5d24cfd60bcf5a5b5777d Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 24 Oct 2019 12:54:44 -0700 Subject: [PATCH 209/429] [Keymap] Updates to plaid keymap * Add Hyper Esc to BASE Layer * Consolidate Nav keys, on both RAISE/LOWER * Remove RESET, DEBUG keys from ADJUST Layer * Add Mission Control, Launchpad macros to ADJUST Layer * Add QM_FLSH to ADJUST Layer * Add documentation to readme --- .../plaid/keymaps/brandonschlack/keymap.c | 18 +++++++++--------- .../plaid/keymaps/brandonschlack/readme.md | 12 +++++++++--- .../plaid/keymaps/brandonschlack/rules.mk | 4 ++-- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/keyboards/plaid/keymaps/brandonschlack/keymap.c b/keyboards/plaid/keymaps/brandonschlack/keymap.c index e74a648d6bf6..862b08a2a79d 100644 --- a/keyboards/plaid/keymaps/brandonschlack/keymap.c +++ b/keyboards/plaid/keymaps/brandonschlack/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-----------------------------------------------------------------------------------. * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Esc | A | S | D | F | G | H | J | K | L | ; | " | + * | HyEsc| A | S | D | F | G | H | J | K | L | ; | " | * |------+------+------+------+------+------+------+------+------+------+------+------| * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_BASE] = LAYOUT_ortho_4x12( 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_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + HY_ESC, 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, KC_ENT, KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LWR_MUT, KC_SPC, KC_SPC, RAI_PLY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), @@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------+------+------+------+------+------+------| * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | * |------+------+------+------+------+------+------+------+------+------+------+------| - * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | | | Home | End | | + * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | Home | PgUp | PgDn | End | | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | Prev | Vol- | Vol+ | Next | * `-----------------------------------------------------------------------------------' @@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT_ortho_4x12( KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_DELT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, - SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, KC_END, _______, + SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_PGUP, KC_PGDN, KC_END, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_VOLU, KC_MFFD ), @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------+------+------+------+------+------+------| * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | * |------+------+------+------+------+------+------+------+------+------+------+------| - * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | | |Pg Up |Pg Dn | | + * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | Home | PgUp | PgDn | End | | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | Prev | Vol- | Vol+ | Next | * `-----------------------------------------------------------------------------------' @@ -71,13 +71,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_RAISE] = LAYOUT_ortho_4x12( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_DELT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, - SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PGUP, KC_PGDN, _______, + SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_PGUP, KC_PGDN, KC_END, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_VOLU, KC_MFFD ), /* Adjust (Lower + Raise) * ,-----------------------------------------------------------------------------------. - * | Make | Reset| Debug| | | | | | | | |SlpDsp| + * | Make | | | | | | | | | Mssn | Lhpd |SlpDsp| * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | |AGnorm|AGswap| | | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| @@ -87,8 +87,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_ortho_4x12( - QM_MAKE, RESET, DEBUG, _______, _______, _______, _______, _______, _______, _______, _______, MC_SLPD, - _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, + QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, MC_MSSN, MC_LHPD, MC_SLPD, + QM_FLSH, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/plaid/keymaps/brandonschlack/readme.md b/keyboards/plaid/keymaps/brandonschlack/readme.md index 166545cbdc9c..5d0b0b088e5b 100644 --- a/keyboards/plaid/keymaps/brandonschlack/readme.md +++ b/keyboards/plaid/keymaps/brandonschlack/readme.md @@ -5,6 +5,12 @@ LED Support added by Richard Sutherland (rich@brickbots.com) This layout is based on the Planck layout. It is macOS-centric, with Colemak and DVORAK removed as I don't use them. Features include: -* LOWER and RAISE keys are Layer-Taps, so tapping LOWER will mute, and tapping RAISE will Play/Pause. -* On either LOWER or RAISE layers, tapping Left Shift will toggle Caps Lock, hold for Shift. -* The Green LED acts as a Caps Lock indicator. +* **LOWER** and **RAISE** keys are Layer-Taps, so tapping **LOWER** will *Mute*, and tapping **RAISE** will *Play/Pause*. +* On either **LOWER** or **RAISE** layers, tapping *Shift* will toggle *Caps Lock*, hold for Shift. + * The Green LED acts as a Caps Lock indicator. +* Bottom left key is *Hyper* (Shift+Control+Option+Command) which I use to map global shortcuts in macOS. + * Holding *Esc* will also act as Hyper. +* **ADJUST** Layer + * Make command for compiling keyboard firmmware, a Reset key, and Debug toggle. + * Mission Control, Launchpad, and Sleep Display macOS macros + * Alt-Gui swapping diff --git a/keyboards/plaid/keymaps/brandonschlack/rules.mk b/keyboards/plaid/keymaps/brandonschlack/rules.mk index c4141c199c0c..fb7a87c72c53 100644 --- a/keyboards/plaid/keymaps/brandonschlack/rules.mk +++ b/keyboards/plaid/keymaps/brandonschlack/rules.mk @@ -1,2 +1,2 @@ -# Bootloader selection -BOOTLOADER = USBasp +# Build options + From 54ebffd893818c8910ed4dc9924a260c316e5dc1 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 24 Oct 2019 12:59:18 -0700 Subject: [PATCH 210/429] [Keymap] Update preonic, jnao keymaps * Add changes from plaid keymap --- .../jnao/keymaps/brandonschlack/keymap.c | 32 ++++---- .../preonic/keymaps/brandonschlack/keymap.c | 82 +++++++++---------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/keyboards/jnao/keymaps/brandonschlack/keymap.c b/keyboards/jnao/keymaps/brandonschlack/keymap.c index 45df2b9a0fdd..238c04797492 100644 --- a/keyboards/jnao/keymaps/brandonschlack/keymap.c +++ b/keyboards/jnao/keymaps/brandonschlack/keymap.c @@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------+------+------+------+------+------+------| * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Esc | A | S | D | F | G | H | J | K | L | ; | " | + * | HyEsc| A | S | D | F | G | H | J | K | L | ; | " | * |------+------+------+------+------+------|------+------+------+------+------+------| * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| @@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_ortho_5x12( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, \ 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_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ + HY_ESC, 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, KC_ENT, \ KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LWR_MUT, KC_SPC, KC_SPC, RAI_PLY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ ), @@ -32,17 +32,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+-------------+------+------+------+------+------| * | | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | * |------+------+------+------+------+------|------+------+------+------+------+------| - * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | | | Home | End | | + * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | Home | PgDn | PgUp | End | | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | Prev | Vol- | Vol+ | Next | * `-----------------------------------------------------------------------------------' */ [_LOWER] = LAYOUT_ortho_5x12( \ - 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_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DELT, \ - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, \ - SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, KC_END, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ + 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_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DELT, \ + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, \ + SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ ), /* Raise @@ -53,17 +53,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+-------------+------+------+------+------+------| * | | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | | * |------+------+------+------+------+------|------+------+------+------+------+------| - * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | | |Pg Up |Pg Dn | | + * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | Home | PgDn | PgUp | End | | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | Prev | Vol- | Vol+ | Next | * `-----------------------------------------------------------------------------------' */ [_RAISE] = LAYOUT_ortho_5x12( \ - KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \ - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DELT, \ - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, \ - SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PGUP, KC_PGDN, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ + KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DELT, \ + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, \ + SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ ), /* Adjust (Lower + Raise) @@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------+------+------+------+------+------+------| * | Make | Reset| | | | | | | | | | | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | | | |AGnorm|AGswap| | | | | | + * | Flash| | | | |AGnorm|AGswap| | | | | | * |------+------+------+------+------+------|------+------+------+------+------+------| * | | | | | | | | | | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| @@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_ortho_5x12( \ KC_ESC, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, MC_SLPD, \ QM_MAKE, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \ + QM_FLSH, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ) diff --git a/keyboards/preonic/keymaps/brandonschlack/keymap.c b/keyboards/preonic/keymaps/brandonschlack/keymap.c index c7eed1120c09..77a87de3a574 100644 --- a/keyboards/preonic/keymaps/brandonschlack/keymap.c +++ b/keyboards/preonic/keymaps/brandonschlack/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------+------+------+------+------+------+------| * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Esc | A | S | D | F | G | H | J | K | L | ; | " | + * | HyEsc| A | S | D | F | G | H | J | K | L | ; | " | * |------+------+------+------+------+------|------+------+------+------+------+------| * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_ortho_5x12( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, \ 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_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ + HY_ESC, 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, KC_ENT, \ KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LWR_MUT, KC_SPC, KC_SPC, RAI_PLY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ ), @@ -49,17 +49,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+-------------+------+------+------+------+------| * | | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | * |------+------+------+------+------+------|------+------+------+------+------+------| - * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | | | Home | End | | + * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | Home | PgDn | PgUp | End | | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | Prev | Vol- | Vol+ | Next | * `-----------------------------------------------------------------------------------' */ [_LOWER] = LAYOUT_ortho_5x12( \ - 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_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DELT, \ - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, \ - SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, KC_END, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ + 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_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DELT, \ + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, \ + SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ ), /* Raise @@ -70,17 +70,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+-------------+------+------+------+------+------| * | | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | | * |------+------+------+------+------+------|------+------+------+------+------+------| - * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | | |Pg Up |Pg Dn | | + * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | Home | PgDn | PgUp | End | | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | Prev | Vol- | Vol+ | Next | * `-----------------------------------------------------------------------------------' */ [_RAISE] = LAYOUT_ortho_5x12( \ - KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \ - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DELT, \ - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, \ - SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PGUP, KC_PGDN, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ + KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DELT, \ + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, \ + SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ ), /* Adjust (Lower + Raise) @@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------+------+------+------+------+------+------| * | Make | Reset| Debug| | | | | | | | | | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | |Aud on|AudOff|AGnorm|AGswap| | | | | | + * | Flash| | |Aud on|AudOff|AGnorm|AGswap| | | | | | * |------+------+------+------+------+------|------+------+------+------+------+------| * | |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff| | | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| @@ -97,11 +97,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_ortho_5x12( \ - KC_ESC, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, MC_SLPD, \ - QM_MAKE, RESET, DEBUG, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \ - _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + KC_ESC, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, MC_SLPD, \ + QM_MAKE, RESET, DEBUG, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + QM_FLSH, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \ + _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ) @@ -119,29 +119,29 @@ uint8_t muse_offset = 70; uint16_t muse_tempo = 50; void encoder_update_user(uint8_t index, bool clockwise) { - if (muse_mode) { - if (IS_LAYER_ON(_RAISE)) { - if (clockwise) { - muse_offset++; - } else { - muse_offset--; - } - } else { - if (clockwise) { - muse_tempo+=1; - } else { - muse_tempo-=1; - } - } - } else { - if (clockwise) { - register_code(KC_PGDN); - unregister_code(KC_PGDN); + if (muse_mode) { + if (IS_LAYER_ON(_RAISE)) { + if (clockwise) { + muse_offset++; + } else { + muse_offset--; + } + } else { + if (clockwise) { + muse_tempo+=1; + } else { + muse_tempo-=1; + } + } } else { - register_code(KC_PGUP); - unregister_code(KC_PGUP); + if (clockwise) { + register_code(KC_PGDN); + unregister_code(KC_PGDN); + } else { + register_code(KC_PGUP); + unregister_code(KC_PGUP); + } } - } } void dip_switch_update_user(uint8_t index, bool active) { From 52fa825e945329795e219b848a1bd2fea8d035ba Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 24 Oct 2019 17:52:23 -0700 Subject: [PATCH 211/429] [User] Add SFT_ENT define --- users/brandonschlack/process_records.h | 1 + 1 file changed, 1 insertion(+) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index b2903117a0db..7edf19bdbb50 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -22,6 +22,7 @@ void matrix_scan_cmd_tab(void); #define HY_CAPS ALL_T(KC_CAPS) #define HY_ESC ALL_T(KC_ESC) #define SF_CAPS LSFT_T(KC_CAPS) +#define SFT_ENT KC_SFTENT #define TG_ADJT TG(_ADJUST) #define TG_LGHT TG(_LIGHT) // Media Mod-Tap From 52e00dd0602ed1a5c672f6edde7f70dab2d09a56 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 24 Oct 2019 17:54:15 -0700 Subject: [PATCH 212/429] [Keymap] Add SFT_ENT to plaid, preonic, jnao --- keyboards/jnao/keymaps/brandonschlack/keymap.c | 2 +- keyboards/plaid/keymaps/brandonschlack/keymap.c | 2 +- keyboards/preonic/keymaps/brandonschlack/keymap.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/jnao/keymaps/brandonschlack/keymap.c b/keyboards/jnao/keymaps/brandonschlack/keymap.c index 238c04797492..cf91f3e4ab42 100644 --- a/keyboards/jnao/keymaps/brandonschlack/keymap.c +++ b/keyboards/jnao/keymaps/brandonschlack/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, \ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ HY_ESC, 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, KC_ENT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT, \ KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LWR_MUT, KC_SPC, KC_SPC, RAI_PLY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ ), diff --git a/keyboards/plaid/keymaps/brandonschlack/keymap.c b/keyboards/plaid/keymaps/brandonschlack/keymap.c index 862b08a2a79d..c3a9036dc308 100644 --- a/keyboards/plaid/keymaps/brandonschlack/keymap.c +++ b/keyboards/plaid/keymaps/brandonschlack/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_ortho_4x12( KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, HY_ESC, 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, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT, KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LWR_MUT, KC_SPC, KC_SPC, RAI_PLY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), diff --git a/keyboards/preonic/keymaps/brandonschlack/keymap.c b/keyboards/preonic/keymaps/brandonschlack/keymap.c index 77a87de3a574..d0efd634cd1d 100644 --- a/keyboards/preonic/keymaps/brandonschlack/keymap.c +++ b/keyboards/preonic/keymaps/brandonschlack/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, \ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ HY_ESC, 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, KC_ENT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT, \ KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LWR_MUT, KC_SPC, KC_SPC, RAI_PLY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ ), From bda18dac1896f9280ac45abd0208921515799687 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 24 Oct 2019 18:05:57 -0700 Subject: [PATCH 213/429] [User] TAP DELAY updates * Remove PERMISSIVE_HOLD * Add TAP_HOLD_CAPS_DELAY * Set TAP_CODE_DELAY only for USBasp boards --- users/brandonschlack/config.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/users/brandonschlack/config.h b/users/brandonschlack/config.h index 95b5fe50e8a1..c609fa15a882 100644 --- a/users/brandonschlack/config.h +++ b/users/brandonschlack/config.h @@ -2,7 +2,7 @@ #define TAPPING_TOGGLE 2 #define TAPPING_TERM 200 -#define PERMISSIVE_HOLD +#define TAP_HOLD_CAPS_DELAY 200 #ifdef RGBLIGHT_ENABLE # define RGBLIGHT_SLEEP @@ -12,9 +12,7 @@ # define RGB_THEME_ENABLE #endif -#ifdef ENCODER_ENABLE -# define TAP_CODE_DELAY 10 -#else +#ifdef BOOTLOADER_USBASP # define TAP_CODE_DELAY 5 #endif From bcd8149e4a0576d12259b3f5ca49cdfd25f0369d Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 24 Oct 2019 18:07:03 -0700 Subject: [PATCH 214/429] [User] Fix mods bug in QM_FLSH --- users/brandonschlack/process_records.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index 7183e11ab40f..e8241e7b6f93 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -19,7 +19,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QM_MAKE: // - if (!record->event.pressed) { + if (record->event.pressed) { bool flash = false; // If is a keyboard and auto-flash is not set in rules.mk, // then Shift will trigger the :flash target @@ -38,6 +38,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { break; case QM_FLSH: // Sends Make command with :flash target if (record->event.pressed) { + clear_mods(); + clear_oneshot_mods(); send_make_command(true); } break; From 624d494de61d6ecf9298b77cd4d1ef277b2c52bf Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 24 Oct 2019 19:11:26 -0700 Subject: [PATCH 215/429] [User] Revert userspace config changes * Nevermind I need this stuff --- users/brandonschlack/config.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/users/brandonschlack/config.h b/users/brandonschlack/config.h index c609fa15a882..b9e09323c75d 100644 --- a/users/brandonschlack/config.h +++ b/users/brandonschlack/config.h @@ -2,6 +2,7 @@ #define TAPPING_TOGGLE 2 #define TAPPING_TERM 200 +#define PERMISSIVE_HOLD #define TAP_HOLD_CAPS_DELAY 200 #ifdef RGBLIGHT_ENABLE @@ -12,7 +13,9 @@ # define RGB_THEME_ENABLE #endif -#ifdef BOOTLOADER_USBASP +#ifdef ENCODER_ENABLE +# define TAP_CODE_DELAY 10 +#else # define TAP_CODE_DELAY 5 #endif From 2f9ed65c0a7e1e8e353d3cebcf5efb19f956617c Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 24 Oct 2019 19:12:13 -0700 Subject: [PATCH 216/429] [User] Change SFT_ENT define --- users/brandonschlack/process_records.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 7edf19bdbb50..9db928a7954e 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -22,7 +22,7 @@ void matrix_scan_cmd_tab(void); #define HY_CAPS ALL_T(KC_CAPS) #define HY_ESC ALL_T(KC_ESC) #define SF_CAPS LSFT_T(KC_CAPS) -#define SFT_ENT KC_SFTENT +#define SFT_ENT RSFT_T(KC_ENT) #define TG_ADJT TG(_ADJUST) #define TG_LGHT TG(_LIGHT) // Media Mod-Tap From a631ee405aa516fe108df47768b8de7a26c5a2d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?= Date: Fri, 25 Oct 2019 08:27:43 +0200 Subject: [PATCH 217/429] [Keyboard] Add SharkPCB rev Alpha support (#7090) * Add SharkPCB rev Alpha support * Solve PWM pin assignment - Solve PWM pin configuration for the SharkPCB rev.Alpha, which backlight pin is B0 * Update shark.c copyright name * Update shark.h copyright section * Apply suggestions from code review Suggestions from @zvecr and @drashna were accepted and applied for neater code. Also fixed typos and removed unused comments. See [pull request](https://github.com/qmk/qmk_firmware/pull/7090/files#diff-70c0a1f44287ae5810170b4180cdaa5d) for more information. Co-Authored-By: Joel Challis Co-Authored-By: Drashna Jaelre * Update PRODUCT_ID into config.h * Update metadata info.json Fields "keyboard_name", "keyboard_folder", "url", "maintainer" were updated --- keyboards/acheron/shark/README.md | 17 ++ keyboards/acheron/shark/config.h | 261 ++++++++++++++++++ keyboards/acheron/shark/info.json | 63 +++++ .../acheron/shark/keymaps/default/keymap.c | 105 +++++++ keyboards/acheron/shark/rules.mk | 25 ++ keyboards/acheron/shark/shark.c | 51 ++++ keyboards/acheron/shark/shark.h | 39 +++ 7 files changed, 561 insertions(+) create mode 100644 keyboards/acheron/shark/README.md create mode 100644 keyboards/acheron/shark/config.h create mode 100644 keyboards/acheron/shark/info.json create mode 100644 keyboards/acheron/shark/keymaps/default/keymap.c create mode 100644 keyboards/acheron/shark/rules.mk create mode 100644 keyboards/acheron/shark/shark.c create mode 100644 keyboards/acheron/shark/shark.h diff --git a/keyboards/acheron/shark/README.md b/keyboards/acheron/shark/README.md new file mode 100644 index 000000000000..fbe9429f1252 --- /dev/null +++ b/keyboards/acheron/shark/README.md @@ -0,0 +1,17 @@ +# Acheron Aχξρων 40-SM-O-MX-TH-WI (Codename "SharkPCB") QMK firmware + +

+ +

+ +This is the QMK firmware repository for the Shark, updated until [revision Alpha](https://github.com/Gondolindrim/SharkPCB/releases/tag/Alpha). + +The SharkPCB is an Open-Hardware guidelines compliant PCB which files can be found at [this link](https://github.com/Gondolindrim/SharkPCB). Its designer and maintainer is [Gondolindrim](https://github.com/Gondolindrim). + +See the [AcheronDocs](https://gondolindrim.github.io/AcheronDocs/shark/intro.html) page for the SharkPCB full documentation. + +Make example for this keyboard (after setting up your build environment): + + make acheron/shark:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/acheron/shark/config.h b/keyboards/acheron/shark/config.h new file mode 100644 index 000000000000..5a46ac5b79e1 --- /dev/null +++ b/keyboards/acheron/shark/config.h @@ -0,0 +1,261 @@ +/* +Copyright 2019 Alvaro Volpato and Steve + +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 . +*/ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0xAC11 +#define DEVICE_VER 0x0001 +#define MANUFACTURER AcheronProject +#define PRODUCT SharkPCB +#define DESCRIPTION Ortho 40 PCB + +/* key matrix size */ +#define MATRIX_ROWS 4 +#define MATRIX_COLS 12 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * +*/ +#define MATRIX_ROW_PINS {B4, A15, B10, B2} +#define MATRIX_COL_PINS {B1, B12, A1, A7, A5, A4, A3, A2, A0, C15, C14, C13} +//{C13, C14, C15, A0,A2,A3,A4,A5,A6, A1,B12,B1} +/* Unused pins, in the default layout, are: +EncA (B6) because it is not used in the default PCB +All Extra pins (A8, B15, B14, B13, B3, B5, B8, B9) , for the same reason; +B0, which is unconnected on the PCB +*/ +//#define UNUSED_PINS { B0, B6, B13, B14, B15, B8, B9, B5, B3 } + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +#define BACKLIGHT_PIN B0 +#define BACKLIGHT_PWM_DRIVER PWMD3 +#define BACKLIGHT_PWM_CHANNEL 3 + +/* + * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. + */ +//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 + +// #define BACKLIGHT_PIN B7 +// #define BACKLIGHT_BREATHING +// #define BACKLIGHT_LEVELS 3 + +// #define RGB_DI_PIN E2 +// #ifdef RGB_DI_PIN +// #define RGBLED_NUM 16 +// #define RGBLIGHT_HUE_STEP 8 +// #define RGBLIGHT_SAT_STEP 8 +// #define RGBLIGHT_VAL_STEP 8 +// #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ +// #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +// /*== all animations enable ==*/ +// #define RGBLIGHT_ANIMATIONS +// /*== or choose animations ==*/ +// #define RGBLIGHT_EFFECT_BREATHING +// #define RGBLIGHT_EFFECT_RAINBOW_MOOD +// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL +// #define RGBLIGHT_EFFECT_SNAKE +// #define RGBLIGHT_EFFECT_KNIGHT +// #define RGBLIGHT_EFFECT_CHRISTMAS +// #define RGBLIGHT_EFFECT_STATIC_GRADIENT +// #define RGBLIGHT_EFFECT_RGB_TEST +// #define RGBLIGHT_EFFECT_ALTERNATING +// /*== customize breathing effect ==*/ +// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ +// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 +// /*==== use exp() and sin() ====*/ +// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 +// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +// #endif + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* number of backlight levels */ + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. + * This is userful for the Windows task manager shortcut (ctrl+shift+esc). + */ +// #define GRAVE_ESC_CTRL_OVERRIDE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Magic Key Options + * + * Magic keys are hotkey commands that allow control over firmware functions of + * the keyboard. They are best used in combination with the HID Listen program, + * found here: https://www.pjrc.com/teensy/hid_listen.html + * + * The options below allow the magic key functionality to be changed. This is + * useful if your keyboard/keypad is missing keys and you want magic key support. + * + */ + +/* key combination for magic key command */ +/* defined by default; to change, uncomment and set to the combination you want */ +// #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) + +/* control how magic key switches layers */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false + +/* override magic key keymap */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM +//#define MAGIC_KEY_HELP H +//#define MAGIC_KEY_HELP_ALT SLASH +//#define MAGIC_KEY_DEBUG D +//#define MAGIC_KEY_DEBUG_MATRIX X +//#define MAGIC_KEY_DEBUG_KBD K +//#define MAGIC_KEY_DEBUG_MOUSE M +//#define MAGIC_KEY_VERSION V +//#define MAGIC_KEY_STATUS S +//#define MAGIC_KEY_CONSOLE C +//#define MAGIC_KEY_LAYER0 0 +//#define MAGIC_KEY_LAYER0_ALT GRAVE +//#define MAGIC_KEY_LAYER1 1 +//#define MAGIC_KEY_LAYER2 2 +//#define MAGIC_KEY_LAYER3 3 +//#define MAGIC_KEY_LAYER4 4 +//#define MAGIC_KEY_LAYER5 5 +//#define MAGIC_KEY_LAYER6 6 +//#define MAGIC_KEY_LAYER7 7 +//#define MAGIC_KEY_LAYER8 8 +//#define MAGIC_KEY_LAYER9 9 +//#define MAGIC_KEY_BOOTLOADER B +//#define MAGIC_KEY_BOOTLOADER_ALT ESC +//#define MAGIC_KEY_LOCK CAPS +//#define MAGIC_KEY_EEPROM E +//#define MAGIC_KEY_EEPROM_CLEAR BSPACE +//#define MAGIC_KEY_NKRO N +//#define MAGIC_KEY_SLEEP_LED Z + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION + +/* + * MIDI options + */ + +/* Prevent use of disabled MIDI features in the keymap */ +//#define MIDI_ENABLE_STRICT 1 + +/* enable basic MIDI features: + - MIDI notes can be sent when in Music mode is on +*/ +//#define MIDI_BASIC + +/* enable advanced MIDI features: + - MIDI notes can be added to the keymap + - Octave shift and transpose + - Virtual sustain, portamento, and modulation wheel + - etc. +*/ +//#define MIDI_ADVANCED + +/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ +//#define MIDI_TONE_KEYCODE_OCTAVES 1 + +/* + * HD44780 LCD Display Configuration + */ +/* +#define LCD_LINES 2 //< number of visible lines of the display +#define LCD_DISP_LENGTH 16 //< visibles characters per line of the display + +#define LCD_IO_MODE 1 //< 0: memory mapped mode, 1: IO port mode + +#if LCD_IO_MODE +#define LCD_PORT PORTB //< port for the LCD lines +#define LCD_DATA0_PORT LCD_PORT //< port for 4bit data bit 0 +#define LCD_DATA1_PORT LCD_PORT //< port for 4bit data bit 1 +#define LCD_DATA2_PORT LCD_PORT //< port for 4bit data bit 2 +#define LCD_DATA3_PORT LCD_PORT //< port for 4bit data bit 3 +#define LCD_DATA0_PIN 4 //< pin for 4bit data bit 0 +#define LCD_DATA1_PIN 5 //< pin for 4bit data bit 1 +#define LCD_DATA2_PIN 6 //< pin for 4bit data bit 2 +#define LCD_DATA3_PIN 7 //< pin for 4bit data bit 3 +#define LCD_RS_PORT LCD_PORT //< port for RS line +#define LCD_RS_PIN 3 //< pin for RS line +#define LCD_RW_PORT LCD_PORT //< port for RW line +#define LCD_RW_PIN 2 //< pin for RW line +#define LCD_E_PORT LCD_PORT //< port for Enable line +#define LCD_E_PIN 1 //< pin for Enable line +#endif +*/ + +/* Bootmagic Lite key configuration */ +// #define BOOTMAGIC_LITE_ROW 0 +// #define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/acheron/shark/info.json b/keyboards/acheron/shark/info.json new file mode 100644 index 000000000000..a2ea784d96f7 --- /dev/null +++ b/keyboards/acheron/shark/info.json @@ -0,0 +1,63 @@ +{ + "keyboard_name": "SharkPCB", + "keyboard_folder": "acheron/shark", + "url": "https://gondolindrim.github.io/AcheronDocs/shark/intro.html", + "maintainer": "Gondolindrim", + "width": 12, + "height": 4, + "layouts": { + "LAYOUT_ortho_4x12": { + "key_count": 48, + "layout": [ + { "x": 0, "y": 0 }, + { "x": 1, "y": 0 }, + { "x": 2, "y": 0 }, + { "x": 3, "y": 0 }, + { "x": 4, "y": 0 }, + { "x": 5, "y": 0 }, + { "x": 6, "y": 0 }, + { "x": 7, "y": 0 }, + { "x": 8, "y": 0 }, + { "x": 9, "y": 0 }, + { "x": 10, "y": 0 }, + { "x": 11, "y": 0 }, + { "x": 0, "y": 1 }, + { "x": 1, "y": 1 }, + { "x": 2, "y": 1 }, + { "x": 3, "y": 1 }, + { "x": 4, "y": 1 }, + { "x": 5, "y": 1 }, + { "x": 6, "y": 1 }, + { "x": 7, "y": 1 }, + { "x": 8, "y": 1 }, + { "x": 9, "y": 1 }, + { "x": 10, "y": 1 }, + { "x": 11, "y": 1 }, + { "x": 0, "y": 2 }, + { "x": 1, "y": 2 }, + { "x": 2, "y": 2 }, + { "x": 3, "y": 2 }, + { "x": 4, "y": 2 }, + { "x": 5, "y": 2 }, + { "x": 6, "y": 2 }, + { "x": 7, "y": 2 }, + { "x": 8, "y": 2 }, + { "x": 9, "y": 2 }, + { "x": 10, "y": 2 }, + { "x": 11, "y": 2 }, + { "x": 0, "y": 3 }, + { "x": 1, "y": 3 }, + { "x": 2, "y": 3 }, + { "x": 3, "y": 3 }, + { "x": 4, "y": 3 }, + { "x": 5, "y": 3 }, + { "x": 6, "y": 3 }, + { "x": 7, "y": 3 }, + { "x": 8, "y": 3 }, + { "x": 9, "y": 3 }, + { "x": 10, "y": 3 }, + { "x": 11, "y": 3 } + ] + } + } +} diff --git a/keyboards/acheron/shark/keymaps/default/keymap.c b/keyboards/acheron/shark/keymaps/default/keymap.c new file mode 100644 index 000000000000..a661b835b10a --- /dev/null +++ b/keyboards/acheron/shark/keymaps/default/keymap.c @@ -0,0 +1,105 @@ +/* Copyright 2019 + * + * 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 . + */ +#include QMK_KEYBOARD_H + +enum layers { + _QWERTY = 0, + _LOWER, + _RAISE, + _ADJUST, +}; + +#define LOWER MO(_LOWER) +#define RAISE MO(_RAISE) +#define ADJUST MO(_ADJUST) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Qwerty + * ,-----------------------------------------------------------------------------------. + * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | S | D | F | G | H | J | K | L | ; | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Ctrl | Alt | GUI | |Lower | Space| Space|Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_QWERTY] = LAYOUT_ortho_4x12( \ + 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_ESC, 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, KC_ENT , \ + KC_LCTL, KC_LALT, KC_LGUI, _______, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ +), + +/* Lower + * ,-----------------------------------------------------------------------------------. + * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | | \ | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | | |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | Next | Vol- | Vol+ | Play | + * `-----------------------------------------------------------------------------------' + */ +[_LOWER] = LAYOUT_ortho_4x12( \ + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, BL_TOGG, BL_INC , BL_DEC , _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ +), + +/* Raise + * ,-----------------------------------------------------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | | |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | Next | Vol- | Vol+ | Play | + * `-----------------------------------------------------------------------------------' + */ +[_RAISE] = LAYOUT_ortho_4x12( \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ +), + +/* Adjust (Lower + Raise) + * ,-----------------------------------------------------------------------------------. + * | | Reset| | | | | | | | | | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | | | | | | | | | | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[_ADJUST] = LAYOUT_ortho_4x12( \ + _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ + _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______,\ + _______, BL_TOGG, BL_INC, BL_DEC , _______, _______, _______, _______, _______, _______, _______, _______ \ +) +}; + +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); +} diff --git a/keyboards/acheron/shark/rules.mk b/keyboards/acheron/shark/rules.mk new file mode 100644 index 000000000000..30c4593db226 --- /dev/null +++ b/keyboards/acheron/shark/rules.mk @@ -0,0 +1,25 @@ +# MCU name +MCU = STM32F303 + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs + +LAYOUTS = ortho_4x12 diff --git a/keyboards/acheron/shark/shark.c b/keyboards/acheron/shark/shark.c new file mode 100644 index 000000000000..b15c8a270e67 --- /dev/null +++ b/keyboards/acheron/shark/shark.c @@ -0,0 +1,51 @@ +/* Copyright 2019 Álvaro "Gondolindrim" Volpato + * + * 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 . + */ +#include "shark.h" + +// Optional override functions below. +// You can leave any or all of these undefined. +// These are only required if you want to perform custom actions. + +/* + +void matrix_init_kb(void) { + // put your keyboard start-up code here + // runs once when the firmware starts up + + matrix_init_user(); +} + +void matrix_scan_kb(void) { + // put your looping keyboard code here + // runs every cycle (a lot) + + matrix_scan_user(); +} + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + // put your per-action keyboard code here + // runs for every action, just before processing by the firmware + + return process_record_user(keycode, record); +} + +void led_set_kb(uint8_t usb_led) { + // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here + + led_set_user(usb_led); +} + +*/ diff --git a/keyboards/acheron/shark/shark.h b/keyboards/acheron/shark/shark.h new file mode 100644 index 000000000000..d58b72548aa6 --- /dev/null +++ b/keyboards/acheron/shark/shark.h @@ -0,0 +1,39 @@ +/* Copyright 2019 Álvaro "Gondolindrim" Volpato + * + * 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 . + */ +#pragma once + +#include "quantum.h" + +/* This a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define LAYOUT_ortho_4x12( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B \ +) \ +{ \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B } \ +} From a868c075fe4bb25106118c9df3673f92a1442870 Mon Sep 17 00:00:00 2001 From: QMK Bot Date: Fri, 25 Oct 2019 06:31:02 +0000 Subject: [PATCH 218/429] format code according to conventions [skip ci] --- keyboards/acheron/shark/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/acheron/shark/README.md b/keyboards/acheron/shark/README.md index fbe9429f1252..962a73c6d127 100644 --- a/keyboards/acheron/shark/README.md +++ b/keyboards/acheron/shark/README.md @@ -1,4 +1,4 @@ -# Acheron Aχξρων 40-SM-O-MX-TH-WI (Codename "SharkPCB") QMK firmware +# Acheron Aχξρων 40-SM-O-MX-TH-WI (Codename "SharkPCB") QMK firmware

From f019911a2bd87d7318efb309264424916c6a3c1e Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 25 Oct 2019 14:34:54 +0100 Subject: [PATCH 219/429] Initial actions/labeler config (#7091) * Initial actions/labeler config * Initial actions/labeler config - add extra from review --- .github/labeler.yml | 18 ++++++++++++++++++ .github/workflows/labeler.yml | 11 +++++++++++ 2 files changed, 29 insertions(+) create mode 100644 .github/labeler.yml create mode 100644 .github/workflows/labeler.yml diff --git a/.github/labeler.yml b/.github/labeler.yml new file mode 100644 index 000000000000..f4b07765c516 --- /dev/null +++ b/.github/labeler.yml @@ -0,0 +1,18 @@ +core: + - quantum/**/* + - tmk_core/**/* + - drivers/**/* + - tests/**/* + - util/**/* +keymap: + - users/**/* + - layouts/**/* + - keyboards/**/keymap/**/* +cli: + - bin/qmk + - requirements.txt + - lib/python/**/* +python: + - '**/*.py' +documentation: + - docs/**/* diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml new file mode 100644 index 000000000000..dcafb97dc984 --- /dev/null +++ b/.github/workflows/labeler.yml @@ -0,0 +1,11 @@ +name: "Pull Request Labeler" +on: +- pull_request + +jobs: + triage: + runs-on: ubuntu-latest + steps: + - uses: actions/labeler@v2 + with: + repo-token: "${{ secrets.GITHUB_TOKEN }}" From d74bd1e3891420aba4e44a161beec19bcf384a85 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Tue, 29 Oct 2019 15:02:33 -0700 Subject: [PATCH 220/429] [Keymap] Remove Bootmagic Lite from BDN9 keymap * Seems to be an issue with have Bootmagic Lite and encoder_update_user --- keyboards/keebio/bdn9/keymaps/brandonschlack/config.h | 4 ---- keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk | 1 - 2 files changed, 5 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h index 9ec8933ae061..17839c3d0d03 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h @@ -8,7 +8,3 @@ /* Mouse Keys Configuration */ // #define MK_3_SPEED // #define MK_W_INTERVAL_UNMOD 20 - -/* Bootmagic to Top-Middle Key */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 1 diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk index 578ddcb35342..847ef9d368f6 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk @@ -5,7 +5,6 @@ IS_MACROPAD = yes BOOTLOADER = atmel-dfu # Build Options -BOOTMAGIC_ENABLE = lite MOUSEKEY_ENABLE = yes # Mouse keys(+4700) COMMAND_ENABLE = no # Disable Command, breaks with Mouse Keys set to constant. BACKLIGHT_ENABLE = no # No backlights installed From ef0737928cf19038af2be47a07e1213d6482900b Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Tue, 29 Oct 2019 21:08:18 -0700 Subject: [PATCH 221/429] [Keymap] Update ortho keymaps * Remove Media Layer-Taps for Lower/Raise * Raise+Space to Play/Pause * Lower+Space to Mute --- .../jnao/keymaps/brandonschlack/keymap.c | 12 +++++------ .../plaid/keymaps/brandonschlack/keymap.c | 12 +++++------ .../plaid/keymaps/brandonschlack/readme.md | 2 +- .../preonic/keymaps/brandonschlack/keymap.c | 21 +++++++++++-------- users/brandonschlack/process_records.h | 2 ++ 5 files changed, 27 insertions(+), 22 deletions(-) diff --git a/keyboards/jnao/keymaps/brandonschlack/keymap.c b/keyboards/jnao/keymaps/brandonschlack/keymap.c index cf91f3e4ab42..eeefbaea5b70 100644 --- a/keyboards/jnao/keymaps/brandonschlack/keymap.c +++ b/keyboards/jnao/keymaps/brandonschlack/keymap.c @@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------|------+------+------+------+------+------| * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Hypr | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * | Hypr | Ctrl | Alt | GUI | Lower| Space | Raise| Left | Down | Up |Right | * `-----------------------------------------------------------------------------------' */ [_BASE] = LAYOUT_ortho_5x12( @@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ HY_ESC, 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, SFT_ENT, \ - KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LWR_MUT, KC_SPC, KC_SPC, RAI_PLY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ + KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ ), /* Lower @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------|------+------+------+------+------+------| * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | Home | PgDn | PgUp | End | | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | Prev | Vol- | Vol+ | Next | + * | | | | | | Mute | | Prev | Vol- | Vol+ | Next | * `-----------------------------------------------------------------------------------' */ [_LOWER] = LAYOUT_ortho_5x12( \ @@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DELT, \ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, \ SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT \ ), /* Raise @@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------|------+------+------+------+------+------| * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | Home | PgDn | PgUp | End | | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | Prev | Vol- | Vol+ | Next | + * | | | | | | Play/Pause | | Prev | Vol- | Vol+ | Next | * `-----------------------------------------------------------------------------------' */ [_RAISE] = LAYOUT_ortho_5x12( \ @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DELT, \ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, \ SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ + _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT \ ), /* Adjust (Lower + Raise) diff --git a/keyboards/plaid/keymaps/brandonschlack/keymap.c b/keyboards/plaid/keymaps/brandonschlack/keymap.c index c3a9036dc308..1631caecde27 100644 --- a/keyboards/plaid/keymaps/brandonschlack/keymap.c +++ b/keyboards/plaid/keymaps/brandonschlack/keymap.c @@ -29,14 +29,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------+------+------+------+------+------+------| * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Hypr | Ctrl | Alt | GUI |LwrMut| Space |RsePly| Left | Down | Up |Right | + * | Hypr | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | * `-----------------------------------------------------------------------------------' */ [_BASE] = LAYOUT_ortho_4x12( KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, HY_ESC, 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, SFT_ENT, - KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LWR_MUT, KC_SPC, KC_SPC, RAI_PLY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), /* Lower @@ -47,14 +47,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------+------+------+------+------+------+------| * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | Home | PgUp | PgDn | End | | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | Prev | Vol- | Vol+ | Next | + * | | | | | | Mute | | Prev | Vol- | Vol+ | Next | * `-----------------------------------------------------------------------------------' */ [_LOWER] = LAYOUT_ortho_4x12( KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_DELT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_PGUP, KC_PGDN, KC_END, _______, - _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_VOLU, KC_MFFD + _______, _______, _______, _______, _______, KC_MUTE, KC_MUTE, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT ), /* Raise @@ -65,14 +65,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------+------+------+------+------+------+------| * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | Home | PgUp | PgDn | End | | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | Prev | Vol- | Vol+ | Next | + * | | | | | | Play/Pause | | Prev | Vol- | Vol+ | Next | * `-----------------------------------------------------------------------------------' */ [_RAISE] = LAYOUT_ortho_4x12( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_DELT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_PGUP, KC_PGDN, KC_END, _______, - _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_VOLU, KC_MFFD + _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT ), /* Adjust (Lower + Raise) diff --git a/keyboards/plaid/keymaps/brandonschlack/readme.md b/keyboards/plaid/keymaps/brandonschlack/readme.md index 5d0b0b088e5b..d3246423a72c 100644 --- a/keyboards/plaid/keymaps/brandonschlack/readme.md +++ b/keyboards/plaid/keymaps/brandonschlack/readme.md @@ -5,7 +5,7 @@ LED Support added by Richard Sutherland (rich@brickbots.com) This layout is based on the Planck layout. It is macOS-centric, with Colemak and DVORAK removed as I don't use them. Features include: -* **LOWER** and **RAISE** keys are Layer-Taps, so tapping **LOWER** will *Mute*, and tapping **RAISE** will *Play/Pause*. +* *Enter* acts as *Right Shift* when held * On either **LOWER** or **RAISE** layers, tapping *Shift* will toggle *Caps Lock*, hold for Shift. * The Green LED acts as a Caps Lock indicator. * Bottom left key is *Hyper* (Shift+Control+Option+Command) which I use to map global shortcuts in macOS. diff --git a/keyboards/preonic/keymaps/brandonschlack/keymap.c b/keyboards/preonic/keymaps/brandonschlack/keymap.c index d0efd634cd1d..fc51631e7ec1 100644 --- a/keyboards/preonic/keymaps/brandonschlack/keymap.c +++ b/keyboards/preonic/keymaps/brandonschlack/keymap.c @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ HY_ESC, 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, SFT_ENT, \ - KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LWR_MUT, KC_SPC, KC_SPC, RAI_PLY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ + KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ ), /* Lower @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------|------+------+------+------+------+------| * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | Home | PgDn | PgUp | End | | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | Prev | Vol- | Vol+ | Next | + * | | | | | | Mute | | Prev | Vol- | Vol+ | Next | * `-----------------------------------------------------------------------------------' */ [_LOWER] = LAYOUT_ortho_5x12( \ @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DELT, \ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, \ SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ + _______, _______, _______, _______, _______, KC_MUTE, KC_MUTE, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT \ ), /* Raise @@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------|------+------+------+------+------+------| * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | Home | PgDn | PgUp | End | | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | Prev | Vol- | Vol+ | Next | + * | | | | | | Play/Pause | | Prev | Vol- | Vol+ | Next | * `-----------------------------------------------------------------------------------' */ [_RAISE] = LAYOUT_ortho_5x12( \ @@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DELT, \ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, \ SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ + _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT \ ), /* Adjust (Lower + Raise) @@ -185,8 +185,11 @@ void matrix_scan_keymap(void) { } bool music_mask_user(uint16_t keycode) { - switch (keycode) { - default: - return true; - } + switch (keycode) { + case RAISE: + case LOWER: + return false; + default: + return true; + } } diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 9db928a7954e..30a70ad2aed2 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -23,6 +23,8 @@ void matrix_scan_cmd_tab(void); #define HY_ESC ALL_T(KC_ESC) #define SF_CAPS LSFT_T(KC_CAPS) #define SFT_ENT RSFT_T(KC_ENT) +#define LOWER MO(_LOWER) +#define RAISE MO(_RAISE) #define TG_ADJT TG(_ADJUST) #define TG_LGHT TG(_LIGHT) // Media Mod-Tap From a77959091d3e39795ded4237f33148bf5908020f Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 30 Oct 2019 15:26:07 -0700 Subject: [PATCH 222/429] [User] Refactor LOWER, RAISE keycodes --- .../jnao/keymaps/brandonschlack/keymap.c | 5 ----- .../plaid/keymaps/brandonschlack/keymap.c | 5 ----- .../preonic/keymaps/brandonschlack/keymap.c | 5 ----- users/brandonschlack/process_records.c | 20 +++++++++++++++++++ users/brandonschlack/process_records.h | 4 ++-- 5 files changed, 22 insertions(+), 17 deletions(-) diff --git a/keyboards/jnao/keymaps/brandonschlack/keymap.c b/keyboards/jnao/keymaps/brandonschlack/keymap.c index eeefbaea5b70..3805d0c809cd 100644 --- a/keyboards/jnao/keymaps/brandonschlack/keymap.c +++ b/keyboards/jnao/keymaps/brandonschlack/keymap.c @@ -87,8 +87,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ) }; - -layer_state_t layer_state_set_keymap(layer_state_t state) { - state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); - return state; -} diff --git a/keyboards/plaid/keymaps/brandonschlack/keymap.c b/keyboards/plaid/keymaps/brandonschlack/keymap.c index 1631caecde27..450689ac65a9 100644 --- a/keyboards/plaid/keymaps/brandonschlack/keymap.c +++ b/keyboards/plaid/keymaps/brandonschlack/keymap.c @@ -109,8 +109,3 @@ void led_set_user(uint8_t usb_led) { writePinHigh(LED_GREEN); } } - -layer_state_t layer_state_set_keymap(layer_state_t state) { - state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); - return state; -} diff --git a/keyboards/preonic/keymaps/brandonschlack/keymap.c b/keyboards/preonic/keymaps/brandonschlack/keymap.c index fc51631e7ec1..126dff1f7d5f 100644 --- a/keyboards/preonic/keymaps/brandonschlack/keymap.c +++ b/keyboards/preonic/keymaps/brandonschlack/keymap.c @@ -107,11 +107,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -layer_state_t layer_state_set_keymap(layer_state_t state) { - state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); - return state; -} - bool muse_mode = false; uint8_t last_muse_note = 0; uint16_t muse_counter = 0; diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index e8241e7b6f93..f150a2289046 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -58,6 +58,26 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { send_string_with_delay_P(PSTR("keyboards/" QMK_KEYBOARD "/keymaps/" QMK_KEYMAP "/keymap.c"), SEND_STRING_DELAY); } break; + case LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case RAISE: + if (record->event.pressed) { + layer_on(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; case CMD_TAB: // Super CMD↯TAB if (record->event.pressed) { if (!is_cmd_tab_active) { diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 30a70ad2aed2..290e46414aae 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -8,6 +8,8 @@ enum custom_keycodes { QM_VRSN, QM_KYBD, QM_KYMP, + LOWER, + RAISE, CMD_TAB, RGB_LYR, RGB_THEME_FORWARD, @@ -23,8 +25,6 @@ void matrix_scan_cmd_tab(void); #define HY_ESC ALL_T(KC_ESC) #define SF_CAPS LSFT_T(KC_CAPS) #define SFT_ENT RSFT_T(KC_ENT) -#define LOWER MO(_LOWER) -#define RAISE MO(_RAISE) #define TG_ADJT TG(_ADJUST) #define TG_LGHT TG(_LIGHT) // Media Mod-Tap From 797cb85f22096523bdb5c732c818fa8f1eb0ca3e Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 30 Oct 2019 15:27:13 -0700 Subject: [PATCH 223/429] [Keymap] Update preonic encoder --- keyboards/preonic/keymaps/brandonschlack/keymap.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/keyboards/preonic/keymaps/brandonschlack/keymap.c b/keyboards/preonic/keymaps/brandonschlack/keymap.c index 126dff1f7d5f..979303b80304 100644 --- a/keyboards/preonic/keymaps/brandonschlack/keymap.c +++ b/keyboards/preonic/keymaps/brandonschlack/keymap.c @@ -130,11 +130,9 @@ void encoder_update_user(uint8_t index, bool clockwise) { } } else { if (clockwise) { - register_code(KC_PGDN); - unregister_code(KC_PGDN); + tap_code(KC_VOLU); } else { - register_code(KC_PGUP); - unregister_code(KC_PGUP); + tap_code(KC_VOLD); } } } From 1e7aa8a04240bb2ee7b8edb7fd3268fa654ad1a3 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 30 Oct 2019 15:29:16 -0700 Subject: [PATCH 224/429] [Keymap] Update jnao features * Add Mouse Keys * Set Command to default (enabled) --- keyboards/jnao/keymaps/brandonschlack/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/jnao/keymaps/brandonschlack/rules.mk b/keyboards/jnao/keymaps/brandonschlack/rules.mk index 0380da045dfb..372a9ba3c83c 100644 --- a/keyboards/jnao/keymaps/brandonschlack/rules.mk +++ b/keyboards/jnao/keymaps/brandonschlack/rules.mk @@ -1,4 +1,4 @@ # Build Options BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration(+1000) -COMMAND_ENABLE = no # Don't need Command +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) BACKLIGHT_ENABLE = no # No backlights installed From ffeee8d2d784c02811f3cbdf2d927a88b1f51ac2 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 30 Oct 2019 19:26:46 -0700 Subject: [PATCH 225/429] [User] Revert LOWER, RAISE keycode back to #define --- users/brandonschlack/process_records.c | 20 -------------------- users/brandonschlack/process_records.h | 4 ++-- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index f150a2289046..e8241e7b6f93 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -58,26 +58,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { send_string_with_delay_P(PSTR("keyboards/" QMK_KEYBOARD "/keymaps/" QMK_KEYMAP "/keymap.c"), SEND_STRING_DELAY); } break; - case LOWER: - if (record->event.pressed) { - layer_on(_LOWER); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } else { - layer_off(_LOWER); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } - return false; - break; - case RAISE: - if (record->event.pressed) { - layer_on(_RAISE); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } else { - layer_off(_RAISE); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } - return false; - break; case CMD_TAB: // Super CMD↯TAB if (record->event.pressed) { if (!is_cmd_tab_active) { diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 290e46414aae..30a70ad2aed2 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -8,8 +8,6 @@ enum custom_keycodes { QM_VRSN, QM_KYBD, QM_KYMP, - LOWER, - RAISE, CMD_TAB, RGB_LYR, RGB_THEME_FORWARD, @@ -25,6 +23,8 @@ void matrix_scan_cmd_tab(void); #define HY_ESC ALL_T(KC_ESC) #define SF_CAPS LSFT_T(KC_CAPS) #define SFT_ENT RSFT_T(KC_ENT) +#define LOWER MO(_LOWER) +#define RAISE MO(_RAISE) #define TG_ADJT TG(_ADJUST) #define TG_LGHT TG(_LIGHT) // Media Mod-Tap From 52a77c4b59c1d009d662f4d8fc32025c8fe88966 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 30 Oct 2019 19:28:01 -0700 Subject: [PATCH 226/429] [User] Add macOS Prev/Next Window aliases --- users/brandonschlack/process_records.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 30a70ad2aed2..892f74e95c96 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -57,6 +57,8 @@ void matrix_scan_cmd_tab(void); #define REO_TAB LSFT(LGUI(KC_T)) // Shift+Cmd+T: Reopen Last Tab #define NXT_TAB LCTL(KC_TAB) // Control+Tab: Next Tab #define PRV_TAB LSFT(LCTL(KC_TAB)) // Shift+Control+Tab: Previous Tab +#define NXT_WIN LCTL(KC_GRV) // Control+Grave: Next Window +#define PRV_WIN LCTL(KC_TILD) // Shift+Control+Grave: Previous Window #define MC_PLYR LGUI(KC_F8) // Focuses current Media Player #define MC_UNDO LGUI(KC_Z) // Undo #define MC_REDO LSFT(LGUI(KC_Z)) // Redo From 4a4b87e4c11b771fc593f83fb1e1c9b3728f9a68 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 30 Oct 2019 19:30:43 -0700 Subject: [PATCH 227/429] [User] Move ortho keymaps to community layouts * Moves preonic, jnao, and plaid keymaps to ortho_5x12 and ortho_4x12 layouts --- .../plaid/keymaps/brandonschlack/config.h | 19 -- .../plaid/keymaps/brandonschlack/keymap.c | 111 -------- .../plaid/keymaps/brandonschlack/rules.mk | 2 - .../ortho_4x12/brandonschlack/config.h | 40 +++ .../ortho_4x12/brandonschlack/keymap.c | 242 ++++++++++++++++++ .../ortho_4x12}/brandonschlack/readme.md | 5 +- .../ortho_4x12}/brandonschlack/rules.mk | 6 +- .../ortho_5x12/brandonschlack/config.h | 40 +++ .../ortho_5x12}/brandonschlack/keymap.c | 175 ++++++++++++- .../ortho_5x12/brandonschlack/readme.md | 13 + .../ortho_5x12/brandonschlack/rules.mk | 6 + 11 files changed, 511 insertions(+), 148 deletions(-) delete mode 100644 keyboards/plaid/keymaps/brandonschlack/config.h delete mode 100644 keyboards/plaid/keymaps/brandonschlack/keymap.c delete mode 100644 keyboards/plaid/keymaps/brandonschlack/rules.mk create mode 100644 layouts/community/ortho_4x12/brandonschlack/config.h create mode 100644 layouts/community/ortho_4x12/brandonschlack/keymap.c rename {keyboards/plaid/keymaps => layouts/community/ortho_4x12}/brandonschlack/readme.md (75%) rename {keyboards/jnao/keymaps => layouts/community/ortho_4x12}/brandonschlack/rules.mk (54%) create mode 100644 layouts/community/ortho_5x12/brandonschlack/config.h rename {keyboards/jnao/keymaps => layouts/community/ortho_5x12}/brandonschlack/keymap.c (52%) create mode 100644 layouts/community/ortho_5x12/brandonschlack/readme.md create mode 100644 layouts/community/ortho_5x12/brandonschlack/rules.mk diff --git a/keyboards/plaid/keymaps/brandonschlack/config.h b/keyboards/plaid/keymaps/brandonschlack/config.h deleted file mode 100644 index 5733b9e4b046..000000000000 --- a/keyboards/plaid/keymaps/brandonschlack/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2019 Takuya Urakawa (dm9records.com) - * - * 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 . - */ - -#pragma once - -// place overrides here diff --git a/keyboards/plaid/keymaps/brandonschlack/keymap.c b/keyboards/plaid/keymaps/brandonschlack/keymap.c deleted file mode 100644 index 450689ac65a9..000000000000 --- a/keyboards/plaid/keymaps/brandonschlack/keymap.c +++ /dev/null @@ -1,111 +0,0 @@ -/* Copyright 2019 Takuya Urakawa (dm9records.com) - * - * 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 . - */ - -#include QMK_KEYBOARD_H -#include "brandonschlack.h" - -extern keymap_config_t keymap_config; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -/* Qwerty - * ,-----------------------------------------------------------------------------------. - * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | HyEsc| A | S | D | F | G | H | J | K | L | ; | " | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Hypr | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | - * `-----------------------------------------------------------------------------------' - */ -[_BASE] = LAYOUT_ortho_4x12( - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - HY_ESC, 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, SFT_ENT, - KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT -), - -/* Lower - * ,-----------------------------------------------------------------------------------. - * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | Home | PgUp | PgDn | End | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | Mute | | Prev | Vol- | Vol+ | Next | - * `-----------------------------------------------------------------------------------' - */ -[_LOWER] = LAYOUT_ortho_4x12( - KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, - KC_DELT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, - SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_PGUP, KC_PGDN, KC_END, _______, - _______, _______, _______, _______, _______, KC_MUTE, KC_MUTE, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT -), - -/* Raise - * ,-----------------------------------------------------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | Home | PgUp | PgDn | End | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | Play/Pause | | Prev | Vol- | Vol+ | Next | - * `-----------------------------------------------------------------------------------' - */ -[_RAISE] = LAYOUT_ortho_4x12( - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, - KC_DELT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, - SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_PGUP, KC_PGDN, KC_END, _______, - _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT -), - -/* Adjust (Lower + Raise) - * ,-----------------------------------------------------------------------------------. - * | Make | | | | | | | | | Mssn | Lhpd |SlpDsp| - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | |AGnorm|AGswap| | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' - */ -[_ADJUST] = LAYOUT_ortho_4x12( - QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, MC_MSSN, MC_LHPD, MC_SLPD, - QM_FLSH, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ -) - - -}; - -// Turn on Red LED when initialized -void keyboard_post_init_keymap(void) { - writePinHigh(LED_RED); -} - -// Use Green LED for Caps Lock -void led_set_user(uint8_t usb_led) { - if (IS_LED_OFF(usb_led, USB_LED_CAPS_LOCK)) { - writePinLow(LED_GREEN); - } else { - writePinHigh(LED_GREEN); - } -} diff --git a/keyboards/plaid/keymaps/brandonschlack/rules.mk b/keyboards/plaid/keymaps/brandonschlack/rules.mk deleted file mode 100644 index fb7a87c72c53..000000000000 --- a/keyboards/plaid/keymaps/brandonschlack/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -# Build options - diff --git a/layouts/community/ortho_4x12/brandonschlack/config.h b/layouts/community/ortho_4x12/brandonschlack/config.h new file mode 100644 index 000000000000..496494111051 --- /dev/null +++ b/layouts/community/ortho_4x12/brandonschlack/config.h @@ -0,0 +1,40 @@ +#pragma once + +#ifdef KEYBOARD_planck_rev6 +#ifdef AUDIO_ENABLE + #define STARTUP_SONG SONG(PLANCK_SOUND) + // #define STARTUP_SONG SONG(NO_SOUND) + + #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND) \ + } +#endif + +#define MUSIC_MASK (keycode != KC_NO) + +/* + * MIDI options + */ + +/* Prevent use of disabled MIDI features in the keymap */ +//#define MIDI_ENABLE_STRICT 1 + +/* enable basic MIDI features: + - MIDI notes can be sent when in Music mode is on +*/ + +#define MIDI_BASIC + +/* enable advanced MIDI features: + - MIDI notes can be added to the keymap + - Octave shift and transpose + - Virtual sustain, portamento, and modulation wheel + - etc. +*/ +//#define MIDI_ADVANCED + +/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ +//#define MIDI_TONE_KEYCODE_OCTAVES 2 + +// Most tactile encoders have detents every 4 stages +#define ENCODER_RESOLUTION 4 +#endif diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c new file mode 100644 index 000000000000..a85e60058985 --- /dev/null +++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c @@ -0,0 +1,242 @@ +/* Copyright 2019 Brandon Schlack + * + * 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 . + */ + +#include QMK_KEYBOARD_H +#ifdef KEYBOARD_planck_rev6 + #include "muse.h" +#endif +#include "brandonschlack.h" + +#ifdef KEYBOARD_plaid +extern keymap_config_t keymap_config; +#endif + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Qwerty + * ,-----------------------------------------------------------------------------------. + * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | HyEsc| A | S | D | F | G | H | J | K | L | ; | " | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Ctrl | Fn | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_BASE] = LAYOUT_ortho_4x12( \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ + HY_ESC, 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, SFT_ENT, \ + KC_LCTL, MO(_FN), KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ +), + +/* Function + * ,-----------------------------------------------------------------------------------. + * | | | | | | | | DBr- | DBr+ | Mssn | Lhpd |SlpDsp| + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | PTab | NTab | PWin | NWin | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[_FN] = LAYOUT_ortho_4x12( \ + _______, _______, _______, _______, _______, _______, _______, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, MC_SLPD, \ + _______, _______, _______, _______, _______, _______, _______, PRV_TAB, NXT_TAB, PRV_WIN, NXT_WIN, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +), + +/* Lower + * ,-----------------------------------------------------------------------------------. + * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | Home | PgUp | PgDn | End | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | Mute | | Prev | Vol- | Vol+ | Next | + * `-----------------------------------------------------------------------------------' + */ +[_LOWER] = LAYOUT_ortho_4x12( \ + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ + KC_DELT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ + SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_PGUP, KC_PGDN, KC_END, _______, \ + _______, _______, _______, _______, _______, KC_MUTE, KC_MUTE, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT \ +), + +/* Raise + * ,-----------------------------------------------------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | Home | PgUp | PgDn | End | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | Play/Pause | | Prev | Vol- | Vol+ | Next | + * `-----------------------------------------------------------------------------------' + */ +[_RAISE] = LAYOUT_ortho_4x12( \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ + KC_DELT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ + SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_PGUP, KC_PGDN, KC_END, _______, \ + _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT \ +), + +/* Adjust (Lower + Raise) + * ,-----------------------------------------------------------------------------------. + * | Make | Reset| Debug| RGB |RGBMOD| HUE+ | HUE- | SAT+ | SAT- | VAL+ | VAL- |SlpDsp| + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Flash| | |Aud on|AudOff|AGnorm|AGswap| | | | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff| | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[_ADJUST] = LAYOUT_ortho_4x12( \ + QM_MAKE, RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, MC_SLPD, \ + QM_FLSH, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \ + _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +) + +}; + +layer_state_t layer_state_set_keymap(layer_state_t state) { + state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); + return state; +} + +#ifdef KEYBOARD_plaid +// Turn on Red LED when initialized +void keyboard_post_init_keymap(void) { + writePinHigh(LED_RED); +} + +// Use Green LED for Caps Lock +void led_set_user(uint8_t usb_led) { + if (IS_LED_OFF(usb_led, USB_LED_CAPS_LOCK)) { + writePinLow(LED_GREEN); + } else { + writePinHigh(LED_GREEN); + } +} +#endif + +#ifdef KEYBOARD_planck_rev6 +bool muse_mode = false; +uint8_t last_muse_note = 0; +uint16_t muse_counter = 0; +uint8_t muse_offset = 70; +uint16_t muse_tempo = 50; + +void encoder_update_user(uint8_t index, bool clockwise) { + if (muse_mode) { + if (IS_LAYER_ON(_RAISE)) { + if (clockwise) { + muse_offset++; + } else { + muse_offset--; + } + } else { + if (clockwise) { + muse_tempo+=1; + } else { + muse_tempo-=1; + } + } + } else { + if (clockwise) { + #ifdef MOUSEKEY_ENABLE + tap_code(MC_WH_U); + #else + tap_code(KC_VOLU); + #endif + } else { + #ifdef MOUSEKEY_ENABLE + tap_code(MC_WH_D); + #else + tap_code(KC_VOLD); + #endif + } + } +} + +void dip_switch_update_user(uint8_t index, bool active) { + switch (index) { + case 0: { +#ifdef AUDIO_ENABLE + static bool play_sound = false; +#endif + if (active) { +#ifdef AUDIO_ENABLE + if (play_sound) { PLAY_SONG(plover_song); } +#endif + layer_on(_ADJUST); + } else { +#ifdef AUDIO_ENABLE + if (play_sound) { PLAY_SONG(plover_gb_song); } +#endif + layer_off(_ADJUST); + } +#ifdef AUDIO_ENABLE + play_sound = true; +#endif + break; + } + case 1: + if (active) { + muse_mode = true; + } else { + muse_mode = false; + } + } +} + +void matrix_scan_keymap(void) { +#ifdef AUDIO_ENABLE + if (muse_mode) { + if (muse_counter == 0) { + uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()]; + if (muse_note != last_muse_note) { + stop_note(compute_freq_for_midi_note(last_muse_note)); + play_note(compute_freq_for_midi_note(muse_note), 0xF); + last_muse_note = muse_note; + } + } + muse_counter = (muse_counter + 1) % muse_tempo; + } else { + if (muse_counter) { + stop_all_notes(); + muse_counter = 0; + } + } +#endif +} + +bool music_mask_user(uint16_t keycode) { + switch (keycode) { + case RAISE: + case LOWER: + return false; + default: + return true; + } +} +#endif diff --git a/keyboards/plaid/keymaps/brandonschlack/readme.md b/layouts/community/ortho_4x12/brandonschlack/readme.md similarity index 75% rename from keyboards/plaid/keymaps/brandonschlack/readme.md rename to layouts/community/ortho_4x12/brandonschlack/readme.md index d3246423a72c..8d881501b5ca 100644 --- a/keyboards/plaid/keymaps/brandonschlack/readme.md +++ b/layouts/community/ortho_4x12/brandonschlack/readme.md @@ -1,13 +1,10 @@ -# brandonschlack's plaid keymap -Original copyright 2019 Takuya Urakawa (dm9records.com) -LED Support added by Richard Sutherland (rich@brickbots.com) +# brandonschlack's 4x12 Ortho Keymap This layout is based on the Planck layout. It is macOS-centric, with Colemak and DVORAK removed as I don't use them. Features include: * *Enter* acts as *Right Shift* when held * On either **LOWER** or **RAISE** layers, tapping *Shift* will toggle *Caps Lock*, hold for Shift. - * The Green LED acts as a Caps Lock indicator. * Bottom left key is *Hyper* (Shift+Control+Option+Command) which I use to map global shortcuts in macOS. * Holding *Esc* will also act as Hyper. * **ADJUST** Layer diff --git a/keyboards/jnao/keymaps/brandonschlack/rules.mk b/layouts/community/ortho_4x12/brandonschlack/rules.mk similarity index 54% rename from keyboards/jnao/keymaps/brandonschlack/rules.mk rename to layouts/community/ortho_4x12/brandonschlack/rules.mk index 372a9ba3c83c..936618e38895 100644 --- a/keyboards/jnao/keymaps/brandonschlack/rules.mk +++ b/layouts/community/ortho_4x12/brandonschlack/rules.mk @@ -1,4 +1,6 @@ -# Build Options -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration(+1000) MOUSEKEY_ENABLE = yes # Mouse keys(+4700) BACKLIGHT_ENABLE = no # No backlights installed + +ifeq ($(strip $(KEYBOARD)), jnao) + BOOTMAGIC_ENABLE = lite +endif diff --git a/layouts/community/ortho_5x12/brandonschlack/config.h b/layouts/community/ortho_5x12/brandonschlack/config.h new file mode 100644 index 000000000000..a9df4255178f --- /dev/null +++ b/layouts/community/ortho_5x12/brandonschlack/config.h @@ -0,0 +1,40 @@ +#pragma once + +#ifdef KEYBOARD_preonic_rev3 +#ifdef AUDIO_ENABLE + #define STARTUP_SONG SONG(PREONIC_SOUND) + // #define STARTUP_SONG SONG(NO_SOUND) + + #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND) \ + } +#endif + +#define MUSIC_MASK (keycode != KC_NO) + +/* + * MIDI options + */ + +/* Prevent use of disabled MIDI features in the keymap */ +//#define MIDI_ENABLE_STRICT 1 + +/* enable basic MIDI features: + - MIDI notes can be sent when in Music mode is on +*/ + +#define MIDI_BASIC + +/* enable advanced MIDI features: + - MIDI notes can be added to the keymap + - Octave shift and transpose + - Virtual sustain, portamento, and modulation wheel + - etc. +*/ +//#define MIDI_ADVANCED + +/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ +//#define MIDI_TONE_KEYCODE_OCTAVES 2 + +// Most tactile encoders have detents every 4 stages +#define ENCODER_RESOLUTION 4 +#endif diff --git a/keyboards/jnao/keymaps/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c similarity index 52% rename from keyboards/jnao/keymaps/brandonschlack/keymap.c rename to layouts/community/ortho_5x12/brandonschlack/keymap.c index 3805d0c809cd..700a17deea5e 100644 --- a/keyboards/jnao/keymaps/brandonschlack/keymap.c +++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c @@ -1,4 +1,23 @@ +/* Copyright 2019 Brandon Schlack + * + * 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 . + */ + #include QMK_KEYBOARD_H +#ifdef KEYBOARD_preonic_rev3 + #include "muse.h" +#endif #include "brandonschlack.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -13,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------|------+------+------+------+------+------| * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Hypr | Ctrl | Alt | GUI | Lower| Space | Raise| Left | Down | Up |Right | + * | Ctrl | Fn | Alt | GUI | Lower| Space |Raise | Left | Down | Up |Right | * `-----------------------------------------------------------------------------------' */ [_BASE] = LAYOUT_ortho_5x12( @@ -21,7 +40,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ HY_ESC, 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, SFT_ENT, \ - KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ + KC_LCTL, MO(_FN), KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ +), + +/* Function + * ,-----------------------------------------------------------------------------------. + * | | | | | | | | DBr- | DBr+ | Mssn | Lhpd |SlpDsp| + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | PTab | NTab | PWin | NWin | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[_FN] = LAYOUT_ortho_5x12( \ + _______, _______, _______, _______, _______, _______, _______, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, MC_SLPD, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, PRV_TAB, NXT_TAB, PRV_WIN, NXT_WIN, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), /* Lower @@ -42,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DELT, \ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, \ SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT \ + _______, _______, _______, _______, _______, KC_MUTE, KC_MUTE, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT \ ), /* Raise @@ -70,20 +110,135 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-----------------------------------------------------------------------------------. * | Esc | DBr- | DBr+ | Mssn | Lhpd | | | | | | |SlpDsp| * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Make | Reset| | | | | | | | | | | + * | Make | Reset| Debug| | | | | | | | | | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Flash| | | | |AGnorm|AGswap| | | | | | + * | Flash| | |Aud on|AudOff|AGnorm|AGswap| | | | | | * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | | | | | + * | |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff| | | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | | | | | * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_ortho_5x12( \ - KC_ESC, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, MC_SLPD, \ - QM_MAKE, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - QM_FLSH, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_SLPD, \ + QM_MAKE, RESET, DEBUG, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + QM_FLSH, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \ + _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ) + + }; + +layer_state_t layer_state_set_keymap(layer_state_t state) { + state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); + return state; +} + +#ifdef KEYBOARD_preonic_rev3 +#ifdef AUDIO_ENABLE + float plover_song[][2] = SONG(PLOVER_SOUND); + float plover_gb_song[][2] = SONG(PLOVER_GOODBYE_SOUND); +#endif + +bool muse_mode = false; +uint8_t last_muse_note = 0; +uint16_t muse_counter = 0; +uint8_t muse_offset = 70; +uint16_t muse_tempo = 50; + +void encoder_update_user(uint8_t index, bool clockwise) { + if (muse_mode) { + if (IS_LAYER_ON(_RAISE)) { + if (clockwise) { + muse_offset++; + } else { + muse_offset--; + } + } else { + if (clockwise) { + muse_tempo+=1; + } else { + muse_tempo-=1; + } + } + } else { + if (clockwise) { + #ifdef MOUSEKEY_ENABLE + tap_code(MC_WH_U); + #else + tap_code(KC_VOLU); + #endif + } else { + #ifdef MOUSEKEY_ENABLE + tap_code(MC_WH_D); + #else + tap_code(KC_VOLD); + #endif + } + } +} + +void dip_switch_update_user(uint8_t index, bool active) { + switch (index) { + case 0: { +#ifdef AUDIO_ENABLE + static bool play_sound = false; +#endif + if (active) { +#ifdef AUDIO_ENABLE + if (play_sound) { PLAY_SONG(plover_song); } +#endif + layer_on(_ADJUST); + } else { +#ifdef AUDIO_ENABLE + if (play_sound) { PLAY_SONG(plover_gb_song); } +#endif + layer_off(_ADJUST); + } +#ifdef AUDIO_ENABLE + play_sound = true; +#endif + break; + } + case 1: + if (active) { + muse_mode = true; + } else { + muse_mode = false; + } + } +} + + +void matrix_scan_keymap(void) { +#ifdef AUDIO_ENABLE + if (muse_mode) { + if (muse_counter == 0) { + uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()]; + if (muse_note != last_muse_note) { + stop_note(compute_freq_for_midi_note(last_muse_note)); + play_note(compute_freq_for_midi_note(muse_note), 0xF); + last_muse_note = muse_note; + } + } + muse_counter = (muse_counter + 1) % muse_tempo; + } else { + if (muse_counter) { + stop_all_notes(); + muse_counter = 0; + } + } +#endif +} + +bool music_mask_user(uint16_t keycode) { + switch (keycode) { + case RAISE: + case LOWER: + return false; + default: + return true; + } +} +#endif diff --git a/layouts/community/ortho_5x12/brandonschlack/readme.md b/layouts/community/ortho_5x12/brandonschlack/readme.md new file mode 100644 index 000000000000..1ab5a36b80fe --- /dev/null +++ b/layouts/community/ortho_5x12/brandonschlack/readme.md @@ -0,0 +1,13 @@ +# brandonschlack's 5x12 Ortho Keymap + +This layout takes inspiration from the Preonic and JNAO. It is macOS-centric, with Colemak and DVORAK removed as I don't use them. +Features include: + +* *Enter* acts as *Right Shift* when held +* On either **LOWER** or **RAISE** layers, tapping *Shift* will toggle *Caps Lock*, hold for Shift. +* Bottom left key is *Hyper* (Shift+Control+Option+Command) which I use to map global shortcuts in macOS. + * Holding *Esc* will also act as Hyper. +* **ADJUST** Layer + * Make command for compiling keyboard firmmware, a Reset key, and Debug toggle. + * Mission Control, Launchpad, and Sleep Display macOS macros + * Alt-Gui swapping diff --git a/layouts/community/ortho_5x12/brandonschlack/rules.mk b/layouts/community/ortho_5x12/brandonschlack/rules.mk new file mode 100644 index 000000000000..936618e38895 --- /dev/null +++ b/layouts/community/ortho_5x12/brandonschlack/rules.mk @@ -0,0 +1,6 @@ +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +BACKLIGHT_ENABLE = no # No backlights installed + +ifeq ($(strip $(KEYBOARD)), jnao) + BOOTMAGIC_ENABLE = lite +endif From 9b4d2cf4791dbe629c9dce75ff47d8803f45d9dd Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 30 Oct 2019 19:32:43 -0700 Subject: [PATCH 228/429] [User] Add FORCE_LAYOUT support to QM_MAKE --- users/brandonschlack/process_records.c | 3 +++ users/brandonschlack/rules.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index e8241e7b6f93..a925317852d3 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -140,6 +140,9 @@ void send_make_command(bool flash_bootloader) { send_string_with_delay_P(PSTR(":program"), SEND_STRING_DELAY); #else // use universal flash command send_string_with_delay_P(PSTR(":flash"), SEND_STRING_DELAY); +#endif +#if defined(FORCE_LAYOUT) + send_string_with_delay_P(PSTR(" FORCE_LAYOUT=" FORCE_LAYOUT), SEND_STRING_DELAY); #endif } send_string_with_delay_P(PSTR(SS_TAP(X_ENTER)), SEND_STRING_DELAY); diff --git a/users/brandonschlack/rules.mk b/users/brandonschlack/rules.mk index 5a2a63ba2839..aab44ee93d3f 100644 --- a/users/brandonschlack/rules.mk +++ b/users/brandonschlack/rules.mk @@ -28,3 +28,6 @@ ifeq ($(strip $(FLASH_BOOTLOADER)), yes) OPT_DEFS += -DFLASH_BOOTLOADER endif +ifneq ($(FORCE_LAYOUT),) + OPT_DEFS += -DFORCE_LAYOUT=\"$(FORCE_LAYOUT)\" +endif From 19824e5b5f6521aac6000dc7d308f6ce9ddcff1b Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Wed, 30 Oct 2019 22:26:34 -0700 Subject: [PATCH 229/429] [Keymap] Remove preonic keymap, use ortho_5x12 --- .../preonic/keymaps/brandonschlack/config.h | 37 ---- .../preonic/keymaps/brandonschlack/keymap.c | 188 ------------------ .../preonic/keymaps/brandonschlack/readme.md | 1 - .../preonic/keymaps/brandonschlack/rules.mk | 1 - .../ortho_4x12/brandonschlack/rules.mk | 4 + .../ortho_5x12/brandonschlack/rules.mk | 4 + 6 files changed, 8 insertions(+), 227 deletions(-) delete mode 100644 keyboards/preonic/keymaps/brandonschlack/config.h delete mode 100644 keyboards/preonic/keymaps/brandonschlack/keymap.c delete mode 100644 keyboards/preonic/keymaps/brandonschlack/readme.md delete mode 100644 keyboards/preonic/keymaps/brandonschlack/rules.mk diff --git a/keyboards/preonic/keymaps/brandonschlack/config.h b/keyboards/preonic/keymaps/brandonschlack/config.h deleted file mode 100644 index 40a9524b469d..000000000000 --- a/keyboards/preonic/keymaps/brandonschlack/config.h +++ /dev/null @@ -1,37 +0,0 @@ -#pragma once - -#ifdef AUDIO_ENABLE - #define STARTUP_SONG SONG(PREONIC_SOUND) - // #define STARTUP_SONG SONG(NO_SOUND) - - #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ - SONG(COLEMAK_SOUND), \ - SONG(DVORAK_SOUND) \ - } -#endif - -#define MUSIC_MASK (keycode != KC_NO) - -/* - * MIDI options - */ - -/* Prevent use of disabled MIDI features in the keymap */ -//#define MIDI_ENABLE_STRICT 1 - -/* enable basic MIDI features: - - MIDI notes can be sent when in Music mode is on -*/ - -#define MIDI_BASIC - -/* enable advanced MIDI features: - - MIDI notes can be added to the keymap - - Octave shift and transpose - - Virtual sustain, portamento, and modulation wheel - - etc. -*/ -//#define MIDI_ADVANCED - -/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ -//#define MIDI_TONE_KEYCODE_OCTAVES 2 diff --git a/keyboards/preonic/keymaps/brandonschlack/keymap.c b/keyboards/preonic/keymaps/brandonschlack/keymap.c deleted file mode 100644 index 979303b80304..000000000000 --- a/keyboards/preonic/keymaps/brandonschlack/keymap.c +++ /dev/null @@ -1,188 +0,0 @@ -/* Copyright 2015-2017 Jack Humbert - * - * 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 . - */ - -#include QMK_KEYBOARD_H -#include "muse.h" -#include "brandonschlack.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -/* Qwerty - * ,-----------------------------------------------------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | \ | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | HyEsc| A | S | D | F | G | H | J | K | L | ; | " | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Hypr | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | - * `-----------------------------------------------------------------------------------' - */ -[_BASE] = LAYOUT_ortho_5x12( - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ - HY_ESC, 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, SFT_ENT, \ - KC_HYPR, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ -), - -/* Lower - * ,-----------------------------------------------------------------------------------. - * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Esc | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | Home | PgDn | PgUp | End | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | Mute | | Prev | Vol- | Vol+ | Next | - * `-----------------------------------------------------------------------------------' - */ -[_LOWER] = LAYOUT_ortho_5x12( \ - 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_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DELT, \ - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, \ - SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, \ - _______, _______, _______, _______, _______, KC_MUTE, KC_MUTE, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT \ -), - -/* Raise - * ,-----------------------------------------------------------------------------------. - * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Del | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | Home | PgDn | PgUp | End | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | Play/Pause | | Prev | Vol- | Vol+ | Next | - * `-----------------------------------------------------------------------------------' - */ -[_RAISE] = LAYOUT_ortho_5x12( \ - KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \ - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DELT, \ - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, \ - SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, \ - _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT \ -), - -/* Adjust (Lower + Raise) - * ,-----------------------------------------------------------------------------------. - * | Esc | DBr- | DBr+ | Mssn | Lhpd | | | | | | |SlpDsp| - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Make | Reset| Debug| | | | | | | | | | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Flash| | |Aud on|AudOff|AGnorm|AGswap| | | | | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff| | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' - */ -[_ADJUST] = LAYOUT_ortho_5x12( \ - KC_ESC, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, MC_SLPD, \ - QM_MAKE, RESET, DEBUG, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - QM_FLSH, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \ - _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ -) - - -}; - -bool muse_mode = false; -uint8_t last_muse_note = 0; -uint16_t muse_counter = 0; -uint8_t muse_offset = 70; -uint16_t muse_tempo = 50; - -void encoder_update_user(uint8_t index, bool clockwise) { - if (muse_mode) { - if (IS_LAYER_ON(_RAISE)) { - if (clockwise) { - muse_offset++; - } else { - muse_offset--; - } - } else { - if (clockwise) { - muse_tempo+=1; - } else { - muse_tempo-=1; - } - } - } else { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - } -} - -void dip_switch_update_user(uint8_t index, bool active) { - switch (index) { - case 0: - if (active) { - layer_on(_ADJUST); - } else { - layer_off(_ADJUST); - } - break; - case 1: - if (active) { - muse_mode = true; - } else { - muse_mode = false; - } - } -} - - -void matrix_scan_keymap(void) { -#ifdef AUDIO_ENABLE - if (muse_mode) { - if (muse_counter == 0) { - uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()]; - if (muse_note != last_muse_note) { - stop_note(compute_freq_for_midi_note(last_muse_note)); - play_note(compute_freq_for_midi_note(muse_note), 0xF); - last_muse_note = muse_note; - } - } - muse_counter = (muse_counter + 1) % muse_tempo; - } else { - if (muse_counter) { - stop_all_notes(); - muse_counter = 0; - } - } -#endif -} - -bool music_mask_user(uint16_t keycode) { - switch (keycode) { - case RAISE: - case LOWER: - return false; - default: - return true; - } -} diff --git a/keyboards/preonic/keymaps/brandonschlack/readme.md b/keyboards/preonic/keymaps/brandonschlack/readme.md deleted file mode 100644 index e911968dd964..000000000000 --- a/keyboards/preonic/keymaps/brandonschlack/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default Preonic layout - largely based on the Planck's \ No newline at end of file diff --git a/keyboards/preonic/keymaps/brandonschlack/rules.mk b/keyboards/preonic/keymaps/brandonschlack/rules.mk deleted file mode 100644 index dcf16bef3994..000000000000 --- a/keyboards/preonic/keymaps/brandonschlack/rules.mk +++ /dev/null @@ -1 +0,0 @@ -SRC += muse.c diff --git a/layouts/community/ortho_4x12/brandonschlack/rules.mk b/layouts/community/ortho_4x12/brandonschlack/rules.mk index 936618e38895..e36b073d22b4 100644 --- a/layouts/community/ortho_4x12/brandonschlack/rules.mk +++ b/layouts/community/ortho_4x12/brandonschlack/rules.mk @@ -1,3 +1,7 @@ +ifeq ($(strip $(KEYBOARD)), planck/rev6) + SRC += muse.c +endif + MOUSEKEY_ENABLE = yes # Mouse keys(+4700) BACKLIGHT_ENABLE = no # No backlights installed diff --git a/layouts/community/ortho_5x12/brandonschlack/rules.mk b/layouts/community/ortho_5x12/brandonschlack/rules.mk index 936618e38895..dacfc28b2306 100644 --- a/layouts/community/ortho_5x12/brandonschlack/rules.mk +++ b/layouts/community/ortho_5x12/brandonschlack/rules.mk @@ -1,3 +1,7 @@ +ifeq ($(strip $(KEYBOARD)), preonic/rev3) + SRC += muse.c +endif + MOUSEKEY_ENABLE = yes # Mouse keys(+4700) BACKLIGHT_ENABLE = no # No backlights installed From 9d53f25840b375b22f170ccceb78af98e96956f2 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 1 Nov 2019 18:20:19 -0700 Subject: [PATCH 230/429] [Keymap] Update discipline keymap --- .../keymaps/brandonschlack/keymap.c | 78 ++++++++++--------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c index 2ba88487102f..eb084bb84c7c 100644 --- a/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c +++ b/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c @@ -17,42 +17,44 @@ #include "brandonschlack.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Base Layer - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│Hom│ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│| \│PgU│ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│PgD│ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│End│ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ - * │Ctrl│ Opt│ Cmd│ Space │Cmd│Opt│Fn │Lef│Dow│Rig│ - * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ - */ - [_BASE] = LAYOUT_65_ansi( - 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_HOME, - 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_PGUP, - HY_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_PGDN, - 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_UP, KC_END, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MM_RGUI, MM_RALT, MM_FNPY, KC_LEFT, KC_DOWN, KC_RIGHT), - /* Function Layer - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │~ `│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ Del │SlD│ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │ │ │ │ │ │ │ │ │ │ │F13│F14│F15│ LHP │VlU│ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │VlD│ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │ │ │ │ │ │ │ │Mke│ │ │ │ │PgU│Mte│ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ - * │ │ │ │ │ │ │ │Hom│PgD│End│ - * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ - */ - [_FN] = LAYOUT_65_ansi( - 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, MC_SLPD, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_VOLU, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, - _______, _______, _______, _______, _______, _______, _______, QM_MAKE, _______, _______, _______, _______, KC_PGUP, KC_MUTE, - _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END) +/* Base Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│~ `│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│| \│Hom│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│PgU│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│PgD│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ + * │Ctrl│ Opt│ Cmd│ Space │Cmd│Opt│Fn │Lef│Dow│Rig│ + * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ + */ +[_BASE] = LAYOUT_65_ansi( \ + 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_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_BSLS, KC_HOME, \ + HY_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_PGUP, \ + 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_UP, KC_PGDN, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MM_RGUI, MM_RALT, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT \ +), +/* Function Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │Mke│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ Del │SlD│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │ │ │ │ │ │ │ │ │ │ │F13│F14│F15│ LHP │End│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │VlU│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │MteSft│PgU│VlD│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ + * │ │ │ │ │ │ │ │Hom│PgD│End│ + * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ + */ +[_FN] = LAYOUT_65_ansi( + QM_MAKE, 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_DELT, MC_SLPD, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, KC_PGUP, KC_VOLD, \ + _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ +) }; From c64c09679a3c792e87805d416f54d6bf25f8c391 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 1 Nov 2019 18:21:14 -0700 Subject: [PATCH 231/429] [Keymap] Update formatting of Massdrop ALT keymap --- .../alt/keymaps/brandonschlack/keymap.c | 160 +++++++++--------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c index 285bdc92c886..593b86903254 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c @@ -16,86 +16,86 @@ enum alt_keycodes { keymap_config_t keymap_config; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Base Layer - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│~ `│ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│| \│Hom│ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│PgU│ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│PgD│ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ - * │Ctrl│ Opt│ Cmd│ Space │Cmd │FnPy│ │Lef│Dow│Rig│ - * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ - */ - [_BASE] = LAYOUT( - 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_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_BSLS, KC_HOME, \ - HY_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_PGUP, \ - 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_UP, KC_PGDN, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT \ - ), - /* Function Layer - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │Mke│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ Del │SlD│ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │ │ │ │ │DFU│ │ │ │ │ │F13│F14│F15│ LHP │End│ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ Adjust │VlU│ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │ │RTg│ │ │ │ │ │ │Prv│Nxt│Ply│MteSft│PgU│VlD│ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ - * │ │ │ │ │ │ │ │Hom│PgD│End│ - * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ - */ - [_FN] = LAYOUT( - QM_MAKE, 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, MC_SLPD, \ - _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, KC_VOLU, \ - _______, RGB_TOG, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, MM_RSFT, KC_PGUP, KC_VOLD, \ - _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ - ), - /* Adjust Layer - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │ │RS-│RB+│RS+│RH+│RS+│ │UAD│GCR│ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ │RM-│RB-│RM+│RH-│RS-│ │ │ │ │ │ │ Adjust │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │ │RTO│LYR│Thm│ │DFU│KRO│DBG│ │ │ │ │ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ - */ - [_ADJUST] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, XXXXXXX, U_T_AUTO,U_T_AGCR,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_ADJT, XXXXXXX, \ - _______, RGB_TOG, RGB_LYR, RGB_THM, XXXXXXX, MD_BOOT, TG_NKRO, DBG_TOG, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, \ - _______, _______, _______, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX \ - ), - /* Blank Layout - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ - [X] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______ \ - ), - */ +/* Base Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│~ `│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│| \│Hom│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│PgU│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│PgD│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * │Ctrl│ Opt│ Cmd│ Space │Cmd │FnPy│ │Lef│Dow│Rig│ + * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ + */ +[_BASE] = LAYOUT( + 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_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_BSLS, KC_HOME, \ + HY_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_PGUP, \ + 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_UP, KC_PGDN, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT \ +), +/* Function Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │Mke│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ Del │SlD│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │ │ │ │ │DFU│ │ │ │ │ │F13│F14│F15│ LHP │End│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ Adjust │VlU│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ │RTg│ │ │ │ │ │ │Prv│Nxt│Ply│MteSft│PgU│VlD│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * │ │ │ │ │ │ │ │Hom│PgD│End│ + * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ + */ +[_FN] = LAYOUT( + QM_MAKE, 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, MC_SLPD, \ + _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, KC_VOLU, \ + _______, RGB_TOG, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, MM_RSFT, KC_PGUP, KC_VOLD, \ + _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ +), +/* Adjust Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │ │RS-│RB+│RS+│RH+│RS+│ │UAD│GCR│ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ │RM-│RB-│RM+│RH-│RS-│ │ │ │ │ │ │ Adjust │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ │RTO│LYR│Thm│ │DFU│KRO│DBG│ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ + */ +[_ADJUST] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, XXXXXXX, U_T_AUTO,U_T_AGCR,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_ADJT, XXXXXXX, \ + _______, RGB_TOG, RGB_LYR, RGB_THM, XXXXXXX, MD_BOOT, TG_NKRO, DBG_TOG, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, \ + _______, _______, _______, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX \ +), +/* Blank Layout + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ +[X] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +), +*/ }; // Runs just one time when the keyboard initializes. From af2f0a71fb9f6c39b7c9ba419e7b141360cf69f7 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 1 Nov 2019 18:21:54 -0700 Subject: [PATCH 232/429] [User] Userspace documentation update --- users/brandonschlack/process_records.h | 60 ++++++++++++++++---------- users/brandonschlack/readme.md | 2 + 2 files changed, 40 insertions(+), 22 deletions(-) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 892f74e95c96..6c3abbab0626 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -18,7 +18,11 @@ enum custom_keycodes { bool process_record_keymap(uint16_t keycode, keyrecord_t *record); void matrix_scan_cmd_tab(void); -// Useful Defines +/** + * QMK Defines + * Some meta aliases for QMK features such as Mod-Taps + * and for cleaner looking Layer Toggles + */ #define HY_CAPS ALL_T(KC_CAPS) #define HY_ESC ALL_T(KC_ESC) #define SF_CAPS LSFT_T(KC_CAPS) @@ -27,23 +31,35 @@ void matrix_scan_cmd_tab(void); #define RAISE MO(_RAISE) #define TG_ADJT TG(_ADJUST) #define TG_LGHT TG(_LIGHT) -// Media Mod-Tap -#define MM_RGUI RGUI_T(KC_MRWD) -#define MM_RALT RALT_T(KC_MFFD) -#define MM_FNPY LT(1, KC_MPLY) -#define MM_RSFT RSFT_T(KC_MUTE) -#define LWR_MUT LT(_LOWER, KC_MUTE) -#define RAI_PLY LT(_RAISE, KC_MPLY) -// Arrow Mod-Tap -#define MT_RSUP RSFT_T(KC_UP) -#define MT_RALT RALT_T(KC_LEFT) -#define MT_RFDN LT(1, KC_DOWN) -#define MT_RCRT RCTL_T(KC_RGHT) -// Nav Mod-Tap -#define MT_RSPU RSFT_T(KC_PGUP) -#define MT_RAHM RALT_T(KC_HOME) -#define MT_RFPD LT(1, KC_PGDN) -#define MT_RCED RCTL_T(KC_END) +/** + * Media Mod-Tap + * Use the Mod-Tap feature for easy media controls + * Used with >=65% layouts + */ +#define MM_RGUI RGUI_T(KC_MRWD) // Tap Right GUI for Prev Track +#define MM_RALT RALT_T(KC_MFFD) // Tap Right Alt for Next Track +#define MM_FNPY LT(1, KC_MPLY) // Tap Fn for Play/Pause +#define MM_RSFT RSFT_T(KC_MUTE) // Tap Right Shift for Mute +#define LWR_MUT LT(_LOWER, KC_MUTE) // Tap Lower for Mute +#define RAI_PLY LT(_RAISE, KC_MPLY) // Tap Raise for Play/Pause +/** + * Arrow Mod-Tap + * Use the Mod-Tap feature for arrow keys + * Mostly used for 60% layouts + */ +#define MT_RSUP RSFT_T(KC_UP) // Tap Right Shift for Up +#define MT_RALT RALT_T(KC_LEFT) // Tap Right Alt for Left +#define MT_RFDN LT(1, KC_DOWN) // Tap Fn for Down +#define MT_RCRT RCTL_T(KC_RGHT) // Tap Right Ctrl for Right +/** + * Nav Mod-Tap + * Use the Mod-Tap feature for nav keys (Home/End, Page Up/Down) + * Mostly used for 60% layouts, on a function layer + */ +#define MT_RSPU RSFT_T(KC_PGUP) // Tap Right Shift for Page Up +#define MT_RAHM RALT_T(KC_HOME) // Tap Right Alt for Home +#define MT_RFPD LT(1, KC_PGDN) // Tap Fn for Page Down +#define MT_RCED RCTL_T(KC_END) // Tap Right Ctrl for End // MacOS #define MC_POWR KC_POWER // Mac Power alias @@ -63,10 +79,10 @@ void matrix_scan_cmd_tab(void); #define MC_UNDO LGUI(KC_Z) // Undo #define MC_REDO LSFT(LGUI(KC_Z)) // Redo // Reverse scrolling for using with macOS Natural Scrolling. -#define MC_WH_U KC_WH_D -#define MC_WH_D KC_WH_U -#define MC_WH_L KC_WH_R -#define MC_WH_R KC_WH_L +#define MC_WH_U KC_WH_D // Mouse Wheel Up +#define MC_WH_D KC_WH_U // Mouse Wheel Down +#define MC_WH_L KC_WH_R // Mouse Wheel Left +#define MC_WH_R KC_WH_L // Mouse Wheel Right // Macropad Defines #if defined(IS_MACROPAD) diff --git a/users/brandonschlack/readme.md b/users/brandonschlack/readme.md index ee8f546d5d16..26427286be40 100644 --- a/users/brandonschlack/readme.md +++ b/users/brandonschlack/readme.md @@ -24,6 +24,8 @@ I have a custom userspace config implemented to save ### Keycode Aliases +I am a macOS user and so a lot of my aliases + ### Macros From ea279f528b479c5268f574cd113f8e4a63f60c44 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 6 Nov 2019 11:15:28 -0800 Subject: [PATCH 233/429] [User] Fix macOS Prev/Next Win defines --- users/brandonschlack/process_records.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 6c3abbab0626..da26d56e0079 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -73,8 +73,8 @@ void matrix_scan_cmd_tab(void); #define REO_TAB LSFT(LGUI(KC_T)) // Shift+Cmd+T: Reopen Last Tab #define NXT_TAB LCTL(KC_TAB) // Control+Tab: Next Tab #define PRV_TAB LSFT(LCTL(KC_TAB)) // Shift+Control+Tab: Previous Tab -#define NXT_WIN LCTL(KC_GRV) // Control+Grave: Next Window -#define PRV_WIN LCTL(KC_TILD) // Shift+Control+Grave: Previous Window +#define NXT_WIN LGUI(KC_GRV) // Control+Grave: Next Window +#define PRV_WIN LGUI(KC_TILD) // Shift+Control+Grave: Previous Window #define MC_PLYR LGUI(KC_F8) // Focuses current Media Player #define MC_UNDO LGUI(KC_Z) // Undo #define MC_REDO LSFT(LGUI(KC_Z)) // Redo From f6c59d1c6cc36223c4a76e0af8bdad6b30ba90ec Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 6 Nov 2019 11:21:25 -0800 Subject: [PATCH 234/429] [User] Add macOS Back/Forward defines --- users/brandonschlack/process_records.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index da26d56e0079..1d7b49368123 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -69,6 +69,8 @@ void matrix_scan_cmd_tab(void); #define MC_MSSN KC_FIND // Mission Control: Configure karabiner for find -> mission_control #define MC_LHPD KC_MENU // Launchpad: Configure karabiner for menu -> Launchpad #define MC_CMTB LGUI(KC_TAB) // Basic CMD+TAB +#define MC_BACK LGUI(KC_LBRC) // Cmd+[: Back +#define MC_FWRD LGUI(KC_RBRC) // Cmd+]: Forward #define CLS_TAB LGUI(KC_W) // Cmd+W: Closes Tab #define REO_TAB LSFT(LGUI(KC_T)) // Shift+Cmd+T: Reopen Last Tab #define NXT_TAB LCTL(KC_TAB) // Control+Tab: Next Tab From 14ee6cb6d5fd4344be6431d9bcc69422caab37dd Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 6 Nov 2019 11:23:51 -0800 Subject: [PATCH 235/429] [Keymap] Update Fn layer for ortho_5x12 * Add Back/Forward shortcuts * Move Prev/Next Tab & Next Window --- layouts/community/ortho_5x12/brandonschlack/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c index 700a17deea5e..b62ef2c27bb5 100644 --- a/layouts/community/ortho_5x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c @@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | | | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | PTab | NTab | PWin | NWin | | + * | | | | | | | | Back | Fwrd | PTab | NTab | NWin | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | | | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_ortho_5x12( \ _______, _______, _______, _______, _______, _______, _______, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, MC_SLPD, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, PRV_TAB, NXT_TAB, PRV_WIN, NXT_WIN, _______, \ + _______, _______, _______, _______, _______, _______, _______, MC_BACK, MC_FWRD, PRV_TAB, NXT_TAB, NXT_WIN, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), From 06e65cea940cb878984075c813e41622f0e3aa1b Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 8 Nov 2019 10:50:15 -0800 Subject: [PATCH 236/429] [User] Documentation Update --- users/brandonschlack/process_records.c | 4 +-- users/brandonschlack/process_records.h | 38 ++++++++++++++------------ 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index a925317852d3..757c765df804 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -128,8 +128,8 @@ void matrix_scan_cmd_tab(void) { * Send Make Command * * Sends 'make keyboard:keymap command to compile firmware - * Adds :flash target and resets keyboard, - * if flash_bootloader set to true + * Adds :flash target and resets keyboard, if flash_bootloader set to true + * Sends FORCE_LAYOUT parameter if built with FORCE_LAYOUT */ void send_make_command(bool flash_bootloader) { send_string_with_delay_P(PSTR("make " QMK_KEYBOARD ":" QMK_KEYMAP), SEND_STRING_DELAY); diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 1d7b49368123..2ec64d6ea8bc 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -61,25 +61,29 @@ void matrix_scan_cmd_tab(void); #define MT_RFPD LT(1, KC_PGDN) // Tap Fn for Page Down #define MT_RCED RCTL_T(KC_END) // Tap Right Ctrl for End -// MacOS -#define MC_POWR KC_POWER // Mac Power alias -#define MC_SLEP LALT(LGUI(KC_POWER)) // Mac Sleep -#define MC_SLPD LCTL(LSFT(KC_POWER)) // Sleep Display -#define MC_LOCK LCTL(LGUI(KC_Q)) // Lock Screen +/** + * MacOS + * Common shortcuts used in macOS + * Reference: https://support.apple.com/en-us/HT201236 + */ +#define MC_POWR KC_POWER // Power (KC_POWER) +#define MC_SLEP LALT(LGUI(KC_POWER)) // Sleep (Option-Command-Power) +#define MC_SLPD LCTL(LSFT(KC_POWER)) // Sleep Display (Control-Shift-Power) +#define MC_LOCK LCTL(LGUI(KC_Q)) // Lock Screen (Control-Command-Q) #define MC_MSSN KC_FIND // Mission Control: Configure karabiner for find -> mission_control -#define MC_LHPD KC_MENU // Launchpad: Configure karabiner for menu -> Launchpad -#define MC_CMTB LGUI(KC_TAB) // Basic CMD+TAB -#define MC_BACK LGUI(KC_LBRC) // Cmd+[: Back -#define MC_FWRD LGUI(KC_RBRC) // Cmd+]: Forward -#define CLS_TAB LGUI(KC_W) // Cmd+W: Closes Tab -#define REO_TAB LSFT(LGUI(KC_T)) // Shift+Cmd+T: Reopen Last Tab -#define NXT_TAB LCTL(KC_TAB) // Control+Tab: Next Tab -#define PRV_TAB LSFT(LCTL(KC_TAB)) // Shift+Control+Tab: Previous Tab -#define NXT_WIN LGUI(KC_GRV) // Control+Grave: Next Window -#define PRV_WIN LGUI(KC_TILD) // Shift+Control+Grave: Previous Window +#define MC_LHPD KC_MENU // Launchpad: Configure karabiner for menu -> launchpad +#define MC_CMTB LGUI(KC_TAB) // Command-Tab +#define MC_BACK LGUI(KC_LBRC) // Back (Command–Left Bracket) +#define MC_FWRD LGUI(KC_RBRC) // Forward (Command–Right Bracket) +#define CLS_TAB LGUI(KC_W) // Close Tab (Command–W) +#define REO_TAB LSFT(LGUI(KC_T)) // Reopen Last Tab (Shift-Command-T) +#define NXT_TAB LCTL(KC_TAB) // Next Tab (Control-Tab) +#define PRV_TAB LSFT(LCTL(KC_TAB)) // Previous Tab (Shift-Control-Tab) +#define NXT_WIN LGUI(KC_GRV) // Next Window (Control-Grave) +#define PRV_WIN LGUI(KC_TILD) // Previous Window (Shift-Control-Grave) #define MC_PLYR LGUI(KC_F8) // Focuses current Media Player -#define MC_UNDO LGUI(KC_Z) // Undo -#define MC_REDO LSFT(LGUI(KC_Z)) // Redo +#define MC_UNDO LGUI(KC_Z) // Undo (Command-Z) +#define MC_REDO LSFT(LGUI(KC_Z)) // Redo (Shift-Command-Z) // Reverse scrolling for using with macOS Natural Scrolling. #define MC_WH_U KC_WH_D // Mouse Wheel Up #define MC_WH_D KC_WH_U // Mouse Wheel Down From 82d27aff2aa4c6cc5aafcdb594b7c592a3ea6fa6 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 8 Nov 2019 10:53:18 -0800 Subject: [PATCH 237/429] [User] Add Basic, Jamon to RGB_THEME --- users/brandonschlack/rgb_theme_user.inc | 27 +++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/users/brandonschlack/rgb_theme_user.inc b/users/brandonschlack/rgb_theme_user.inc index de2c858a31ab..4143669e3ac8 100644 --- a/users/brandonschlack/rgb_theme_user.inc +++ b/users/brandonschlack/rgb_theme_user.inc @@ -1,3 +1,17 @@ +// Basic Theme +#ifndef DISABLE_RGB_THEME_BASIC +#ifndef RGB_THEME_IMPLS +RGB_THEME(BASIC) +#else +RGB_THEME_COLOR(BASIC, WHITE, HSV_WHITE); +RGB_THEME_COLOR(BASIC, BLUE, HSV_BLUE); +RGB_THEME_COLOR(BASIC, RED, HSV_RED); +RGB_THEME_COLOR(BASIC, GREEN, HSV_GREEN); +RGB_THEME_COLOR(BASIC, YELLOW, HSV_YELLOW); +RGB_THEME(BASIC) = { { &BASIC_WHITE, &BASIC_BLUE, &BASIC_RED, &BASIC_GREEN, &BASIC_YELLOW } }; +#endif // RGB_THEME_IMPLS +#endif // DISABLE_RGB_THEME_BASIC + // Laser Theme #ifndef DISABLE_RGB_THEME_LASER #ifndef RGB_THEME_IMPLS @@ -26,6 +40,19 @@ RGB_THEME(CANVAS) = { { &CANVAS_WHITE, &CANVAS_ORANGE, &CANVAS_RED, &CANVAS_GREE #endif // RGB_THEME_IMPLS #endif // DISABLE_RGB_THEME_CANVAS +// Jamon Theme +#ifndef DISABLE_RGB_THEME_CANVAS +#ifndef RGB_THEME_IMPLS +RGB_THEME(JAMON) +#else +RGB_THEME_COLOR(JAMON, RED, HSV_RED); +RGB_THEME_COLOR(JAMON, LIGHTRED, 4, 255, 255); +RGB_THEME_COLOR(JAMON, WHITE, HSV_WHITE); +RGB_THEME_COLOR(JAMON, YELLOW, HSV_GOLD); +RGB_THEME(JAMON) = { { &JAMON_RED, &JAMON_LIGHTRED, &JAMON_WHITE, &JAMON_YELLOW } }; +#endif // RGB_THEME_IMPLS +#endif // DISABLE_RGB_THEME_JAMON + // Oblique Theme #ifndef DISABLE_RGB_THEME_OBLIQUE #ifndef RGB_THEME_IMPLS From 94a12cb715184280fe4dd0900d96bc6414046ddd Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 8 Nov 2019 11:20:02 -0800 Subject: [PATCH 238/429] [Keymap] Add AN-C keymap --- .../an_c/keymaps/brandonschlack/keymap.c | 89 +++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 keyboards/cannonkeys/an_c/keymaps/brandonschlack/keymap.c diff --git a/keyboards/cannonkeys/an_c/keymaps/brandonschlack/keymap.c b/keyboards/cannonkeys/an_c/keymaps/brandonschlack/keymap.c new file mode 100644 index 000000000000..5270604d132d --- /dev/null +++ b/keyboards/cannonkeys/an_c/keymaps/brandonschlack/keymap.c @@ -0,0 +1,89 @@ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Base layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │ ` │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │Bspc │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + * │ LShift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │↑ Shft│FnP│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ + * │LCtl│LAlt│LGui│ Space │RGui│←Alt│↓ Fn│→Ctl│ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ +[_BASE] = 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_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, \ + HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT_RSUP, MM_FNPY, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MT_RALT, MT_RFDN, MT_RCRT \ +), + +/* Function Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │MKE│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│LHP│SLP│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │ │Mte│VlD│VlU│ │ │ │ │F13│F14│F15│ ↑ │MNC│ Del │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │Ply│Prv│Nxt│ │ │ │ │Hom│PgU│ ← │ → │ Adjust │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + * │ │RTg│ │ │ │ │ │ │End│PgD│ ↓ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ +[_FN] = LAYOUT_all( \ + QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, \ + _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_UP, MC_MSSN, KC_DELT, \ + _______, KC_MPLY, KC_MRWD, KC_MFFD, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, TG_ADJT, \ + _______, RGB_TOG, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______ \ +), + +/* Adjust Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │MKE│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │RMod │RH+│RS+│RV+│RST│ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │RH-│RS-│RV-│ │ │ │ │ │ │ │ │ Adjust │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + * │ │RTg│RLy│RTh│ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ +[_ADJUST] = LAYOUT_all( \ + QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, \ + _______, RGB_TOG, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______ \ +) +/* Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ +/* +[BLANK] = LAYOUT_all( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______ \ +) +*/ +}; From 0e04270f7ff1dee862b79ff18940d15c61ffeb08 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 11 Nov 2019 14:11:13 -0800 Subject: [PATCH 239/429] [User] Add Striker to RGB_THEME --- users/brandonschlack/rgb_theme_user.inc | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/users/brandonschlack/rgb_theme_user.inc b/users/brandonschlack/rgb_theme_user.inc index 4143669e3ac8..ddac00e93bde 100644 --- a/users/brandonschlack/rgb_theme_user.inc +++ b/users/brandonschlack/rgb_theme_user.inc @@ -53,6 +53,19 @@ RGB_THEME(JAMON) = { { &JAMON_RED, &JAMON_LIGHTRED, &JAMON_WHITE, &JAMON_YELLOW #endif // RGB_THEME_IMPLS #endif // DISABLE_RGB_THEME_JAMON +// Striker Theme +#ifndef DISABLE_RGB_THEME_CANVAS +#ifndef RGB_THEME_IMPLS +RGB_THEME(STRIKER) +#else +RGB_THEME_COLOR(STRIKER, BLUE, HSV_BLUE); +RGB_THEME_COLOR(STRIKER, AZURE, HSV_AZURE); +RGB_THEME_COLOR(STRIKER, WHITE, HSV_WHITE); +RGB_THEME_COLOR(STRIKER, RED, HSV_RED); +RGB_THEME(STRIKER) = { { &STRIKER_BLUE, &STRIKER_AZURE, &STRIKER_WHITE, &STRIKER_RED } }; +#endif // RGB_THEME_IMPLS +#endif // DISABLE_RGB_THEME_STRIKER + // Oblique Theme #ifndef DISABLE_RGB_THEME_OBLIQUE #ifndef RGB_THEME_IMPLS From 331d2e9dfb3d6ac20a9e631ac27c9e511a103773 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 13 Nov 2019 10:59:56 -0800 Subject: [PATCH 240/429] [User] Add FN_LYR define --- layouts/community/ortho_4x12/brandonschlack/keymap.c | 3 ++- layouts/community/ortho_5x12/brandonschlack/keymap.c | 3 ++- users/brandonschlack/process_records.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c index a85e60058985..f3cebe93f920 100644 --- a/layouts/community/ortho_4x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c @@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ HY_ESC, 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, SFT_ENT, \ - KC_LCTL, MO(_FN), KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ + KC_LCTL, FN_LYR, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ ), /* Function @@ -234,6 +234,7 @@ bool music_mask_user(uint16_t keycode) { switch (keycode) { case RAISE: case LOWER: + case FN_LYR: return false; default: return true; diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c index b62ef2c27bb5..7e7b9a42f915 100644 --- a/layouts/community/ortho_5x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ HY_ESC, 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, SFT_ENT, \ - KC_LCTL, MO(_FN), KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ + KC_LCTL, FN_LYR, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ ), /* Function @@ -236,6 +236,7 @@ bool music_mask_user(uint16_t keycode) { switch (keycode) { case RAISE: case LOWER: + case FN_LYR: return false; default: return true; diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 2ec64d6ea8bc..6d73539675b9 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -27,6 +27,7 @@ void matrix_scan_cmd_tab(void); #define HY_ESC ALL_T(KC_ESC) #define SF_CAPS LSFT_T(KC_CAPS) #define SFT_ENT RSFT_T(KC_ENT) +#define FN_LYR MO(_FN) #define LOWER MO(_LOWER) #define RAISE MO(_RAISE) #define TG_ADJT TG(_ADJUST) From 99421714bf28a97e3d3b6b8905eb34bc4e2b8a5f Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 13 Nov 2019 11:05:05 -0800 Subject: [PATCH 241/429] [Keymap] Update 4x12 layout function layer --- layouts/community/ortho_4x12/brandonschlack/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c index f3cebe93f920..110a258c582e 100644 --- a/layouts/community/ortho_4x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c @@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-----------------------------------------------------------------------------------. * | | | | | | | | DBr- | DBr+ | Mssn | Lhpd |SlpDsp| * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | PTab | NTab | PWin | NWin | | + * | | | | | | | | Back | Fwrd | PTab | NTab | NWin | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | | | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FN] = LAYOUT_ortho_4x12( \ _______, _______, _______, _______, _______, _______, _______, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, MC_SLPD, \ - _______, _______, _______, _______, _______, _______, _______, PRV_TAB, NXT_TAB, PRV_WIN, NXT_WIN, _______, \ + _______, _______, _______, _______, _______, _______, _______, MC_BACK, MC_FWRD, PRV_TAB, NXT_TAB, NXT_WIN, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), From d0ac0259eae979265f79b774ae2cd808f69e6759 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 13 Nov 2019 12:24:32 -0800 Subject: [PATCH 242/429] [Keymap] Change keymap preview format --- .../ortho_4x12/brandonschlack/keymap.c | 85 ++++++--------- .../ortho_5x12/brandonschlack/keymap.c | 102 +++++++----------- 2 files changed, 66 insertions(+), 121 deletions(-) diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c index 110a258c582e..8c8e92dd40c0 100644 --- a/layouts/community/ortho_4x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c @@ -26,94 +26,69 @@ extern keymap_config_t keymap_config; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* Qwerty - * ,-----------------------------------------------------------------------------------. - * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | HyEsc| A | S | D | F | G | H | J | K | L | ; | " | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Ctrl | Fn | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | - * `-----------------------------------------------------------------------------------' - */ +/* Qwerty */ [_BASE] = LAYOUT_ortho_4x12( \ +// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ HY_ESC, 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, SFT_ENT, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ KC_LCTL, FN_LYR, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ +// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ), -/* Function - * ,-----------------------------------------------------------------------------------. - * | | | | | | | | DBr- | DBr+ | Mssn | Lhpd |SlpDsp| - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | Back | Fwrd | PTab | NTab | NWin | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' - */ +/* Function */ [_FN] = LAYOUT_ortho_4x12( \ +// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ _______, _______, _______, _______, _______, _______, _______, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, MC_SLPD, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, MC_BACK, MC_FWRD, PRV_TAB, NXT_TAB, NXT_WIN, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ), -/* Lower - * ,-----------------------------------------------------------------------------------. - * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | Home | PgUp | PgDn | End | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | Mute | | Prev | Vol- | Vol+ | Next | - * `-----------------------------------------------------------------------------------' - */ +/* Lower */ [_LOWER] = LAYOUT_ortho_4x12( \ +// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ KC_DELT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_PGUP, KC_PGDN, KC_END, _______, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, KC_MUTE, KC_MUTE, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT \ +// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ), -/* Raise - * ,-----------------------------------------------------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | Home | PgUp | PgDn | End | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | Play/Pause | | Prev | Vol- | Vol+ | Next | - * `-----------------------------------------------------------------------------------' - */ +/* Raise */ [_RAISE] = LAYOUT_ortho_4x12( \ +// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ KC_DELT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_PGUP, KC_PGDN, KC_END, _______, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT \ +// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ), -/* Adjust (Lower + Raise) - * ,-----------------------------------------------------------------------------------. - * | Make | Reset| Debug| RGB |RGBMOD| HUE+ | HUE- | SAT+ | SAT- | VAL+ | VAL- |SlpDsp| - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Flash| | |Aud on|AudOff|AGnorm|AGswap| | | | | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff| | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' - */ +/* Adjust (Lower + Raise) */ [_ADJUST] = LAYOUT_ortho_4x12( \ +// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ QM_MAKE, RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, MC_SLPD, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ QM_FLSH, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ) }; diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c index 7e7b9a42f915..657a0b90520d 100644 --- a/layouts/community/ortho_5x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c @@ -22,109 +22,79 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* Qwerty - * ,-----------------------------------------------------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | \ | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | HyEsc| A | S | D | F | G | H | J | K | L | ; | " | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Ctrl | Fn | Alt | GUI | Lower| Space |Raise | Left | Down | Up |Right | - * `-----------------------------------------------------------------------------------' - */ -[_BASE] = LAYOUT_ortho_5x12( +/* Qwerty */ +[_BASE] = LAYOUT_ortho_5x12( \ +// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ HY_ESC, 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, SFT_ENT, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ KC_LCTL, FN_LYR, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ +// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ), -/* Function - * ,-----------------------------------------------------------------------------------. - * | | | | | | | | DBr- | DBr+ | Mssn | Lhpd |SlpDsp| - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | Back | Fwrd | PTab | NTab | NWin | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' - */ +/* Function */ [_FN] = LAYOUT_ortho_5x12( \ +// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ _______, _______, _______, _______, _______, _______, _______, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, MC_SLPD, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, MC_BACK, MC_FWRD, PRV_TAB, NXT_TAB, NXT_WIN, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ), -/* Lower - * ,-----------------------------------------------------------------------------------. - * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Esc | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | Home | PgDn | PgUp | End | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | Mute | | Prev | Vol- | Vol+ | Next | - * `-----------------------------------------------------------------------------------' - */ +/* Lower */ [_LOWER] = LAYOUT_ortho_5x12( \ +// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ 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_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DELT, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, KC_MUTE, KC_MUTE, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT \ +// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ), -/* Raise - * ,-----------------------------------------------------------------------------------. - * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Del | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * |SftCap| F7 | F8 | F9 | F10 | F11 | F12 | Home | PgDn | PgUp | End | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | Play/Pause | | Prev | Vol- | Vol+ | Next | - * `-----------------------------------------------------------------------------------' - */ +/* Raise */ [_RAISE] = LAYOUT_ortho_5x12( \ +// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DELT, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ SF_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT \ +// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ), -/* Adjust (Lower + Raise) - * ,-----------------------------------------------------------------------------------. - * | Esc | DBr- | DBr+ | Mssn | Lhpd | | | | | | |SlpDsp| - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Make | Reset| Debug| | | | | | | | | | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Flash| | |Aud on|AudOff|AGnorm|AGswap| | | | | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff| | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' - */ +/* Adjust (Lower + Raise) */ [_ADJUST] = LAYOUT_ortho_5x12( \ +// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_SLPD, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ QM_MAKE, RESET, DEBUG, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ QM_FLSH, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ) From 33d2eae3e899757d08d8bf4beac2aaa9ba7b9300 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 13 Nov 2019 12:25:58 -0800 Subject: [PATCH 243/429] [Keymap] Add RGB controls to 5x12 layout --- layouts/community/ortho_5x12/brandonschlack/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c index 657a0b90520d..564e3c0ebe6e 100644 --- a/layouts/community/ortho_5x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c @@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_SLPD, \ // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - QM_MAKE, RESET, DEBUG, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + QM_MAKE, RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, \ // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ QM_FLSH, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \ // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ From 75026cef7fb53403fbed36dcf341cb74ff8017df Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Thu, 14 Nov 2019 22:41:57 -0800 Subject: [PATCH 244/429] [User] Fix compile error for ortho_4x12 keymap --- layouts/community/ortho_4x12/brandonschlack/keymap.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c index 8c8e92dd40c0..0c3f89fb6c97 100644 --- a/layouts/community/ortho_4x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c @@ -115,6 +115,11 @@ void led_set_user(uint8_t usb_led) { #endif #ifdef KEYBOARD_planck_rev6 +#ifdef AUDIO_ENABLE + float plover_song[][2] = SONG(PLOVER_SOUND); + float plover_gb_song[][2] = SONG(PLOVER_GOODBYE_SOUND); +#endif + bool muse_mode = false; uint8_t last_muse_note = 0; uint16_t muse_counter = 0; From 108c5a2ab4e07cdf8f10fcf3d54605424ce614d3 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Thu, 14 Nov 2019 23:44:57 -0800 Subject: [PATCH 245/429] [Keymap] Add RGB Theme Forward to ortho keymaps --- layouts/community/ortho_4x12/brandonschlack/keymap.c | 2 +- layouts/community/ortho_5x12/brandonschlack/keymap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c index 0c3f89fb6c97..58751a792fd7 100644 --- a/layouts/community/ortho_4x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c @@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ QM_MAKE, RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, MC_SLPD, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ - QM_FLSH, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \ + QM_FLSH, RGB_THM, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c index 564e3c0ebe6e..1ec2165529db 100644 --- a/layouts/community/ortho_5x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c @@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_SLPD, \ // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - QM_MAKE, RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, \ + QM_MAKE, RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_THM, \ // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ QM_FLSH, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \ // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ From 457f88a75fbb38c508dab230b73e184397d83f59 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 15 Nov 2019 16:17:13 -0800 Subject: [PATCH 246/429] [User] Documentation update --- users/brandonschlack/brandonschlack.h | 2 +- users/brandonschlack/process_records.h | 30 +++++++++++++------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 286e732a07b6..c1984fef2fc3 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -27,7 +27,7 @@ enum bs_layers { KEYMAP_LAYERS, // Add more layers in keymaps /* Protected Layer */ _AUDIO = 13, // 13: Audio controls - _LIGHT = 14, // 14: BLight/RGB controls + _LIGHT = 14, // 14: Backlight/RGB controls _ADJUST = 15 // 15: Change keyboard settings }; diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 6d73539675b9..985357ccf134 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -23,15 +23,15 @@ void matrix_scan_cmd_tab(void); * Some meta aliases for QMK features such as Mod-Taps * and for cleaner looking Layer Toggles */ -#define HY_CAPS ALL_T(KC_CAPS) -#define HY_ESC ALL_T(KC_ESC) -#define SF_CAPS LSFT_T(KC_CAPS) -#define SFT_ENT RSFT_T(KC_ENT) -#define FN_LYR MO(_FN) -#define LOWER MO(_LOWER) -#define RAISE MO(_RAISE) -#define TG_ADJT TG(_ADJUST) -#define TG_LGHT TG(_LIGHT) +#define HY_CAPS ALL_T(KC_CAPS) // Hold Caps Lock for Hyper (Shift-Control-Option-Command) +#define HY_ESC ALL_T(KC_ESC) // Hold Escape for Hyper (Shift-Control-Option-Command) +#define SF_CAPS LSFT_T(KC_CAPS) // Hold Caps Lock for Left Shift +#define SFT_ENT RSFT_T(KC_ENT) // Hold Enter for Right Shift +#define FN_LYR MO(_FN) // Hold for FN Layer +#define LOWER MO(_LOWER) // Hold for LOWER Layer +#define RAISE MO(_RAISE) // Hold for RAISE Layer +#define TG_ADJT TG(_ADJUST) // Toggle ADJUST Layer +#define TG_LGHT TG(_LIGHT) // Toggle LIGHT Layer /** * Media Mod-Tap * Use the Mod-Tap feature for easy media controls @@ -94,14 +94,14 @@ void matrix_scan_cmd_tab(void); // Macropad Defines #if defined(IS_MACROPAD) // Macropad Default Layer keycodes -#define DF_REDR DF(_REEDER) -#define DF_MEDA DF(_MEDIA) -#define DF_NAVI DF(_NAVI) -#define DF_MCRO DF(_MACRO) +#define DF_REDR DF(_REEDER) // Set Default Layer to Reeder shortcuts +#define DF_MEDA DF(_MEDIA) // Set Default Layer to Media controls +#define DF_NAVI DF(_NAVI) // Set Default Layer to Navigation shortcuts +#define DF_MCRO DF(_MACRO) // Set Default Layer to Basic Macro keys #endif // RGB Theme -#define RGB_THM RGB_THEME_FORWARD -#define RGB_RTHM RGB_THEME_REVERSE +#define RGB_THM RGB_THEME_FORWARD // Cycle next RGB_THEME +#define RGB_RTHM RGB_THEME_REVERSE // Cycle previous RGB_THEME void send_make_command(bool flash_bootloader); From 5977b013cff1ee34c8d1f904672d45556522fec9 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Mon, 18 Nov 2019 09:02:42 -0800 Subject: [PATCH 247/429] [Keymap] Encoder reversed again --- keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index bfc738c7c77b..033d6903195c 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -213,6 +213,7 @@ const uint16_t PROGMEM encoders[][2][2] = { void encoder_update_user(uint8_t index, bool clockwise) { uint8_t layer = get_highest_layer(layer_state); + clockwise = !clockwise; // Clockwise is reversed (again) switch (layer) { case _AUDIO: From eb60838ce116c12ed7b9ca33549dc428b9627b9b Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Mon, 18 Nov 2019 14:00:21 -0800 Subject: [PATCH 248/429] [Keymap] Move RGB_Theme controls on ortho layouts --- layouts/community/ortho_4x12/brandonschlack/keymap.c | 4 ++-- layouts/community/ortho_5x12/brandonschlack/keymap.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c index 58751a792fd7..2cf4119fc2a6 100644 --- a/layouts/community/ortho_4x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c @@ -83,9 +83,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ QM_MAKE, RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, MC_SLPD, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ - QM_FLSH, RGB_THM, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \ + QM_FLSH, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ - _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, \ + _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, RGB_RTHM,RGB_THM, _______, _______, _______, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ // └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c index 1ec2165529db..8c3c42db0963 100644 --- a/layouts/community/ortho_5x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c @@ -87,11 +87,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_SLPD, \ // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - QM_MAKE, RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_THM, \ + QM_MAKE, RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, \ // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ QM_FLSH, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \ // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, \ + _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, RGB_RTHM,RGB_THM, _______, _______, _______, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ // └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ From 9ea0fc7a04509fa891f6ea562ec9b14f57a641b1 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 19 Nov 2019 11:31:11 -0800 Subject: [PATCH 249/429] [User] Add REVERSE_ENCODER config option --- .../keebio/bdn9/keymaps/brandonschlack/config.h | 2 +- .../keebio/bdn9/keymaps/brandonschlack/keymap.c | 3 +-- .../community/ortho_4x12/brandonschlack/keymap.c | 2 +- .../community/ortho_5x12/brandonschlack/keymap.c | 2 +- users/brandonschlack/brandonschlack.c | 15 +++++++++++++++ users/brandonschlack/brandonschlack.h | 4 ++++ 6 files changed, 23 insertions(+), 5 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h index 17839c3d0d03..e86e9ca0a771 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h @@ -1,6 +1,6 @@ #pragma once -#define ENCODER_RESOLUTION 4 +#define REVERSE_ENCODER // Encoder seems to be reversed #undef RGBLIGHT_ANIMATIONS #define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 033d6903195c..eb94d263b7b6 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -211,9 +211,8 @@ const uint16_t PROGMEM encoders[][2][2] = { [LR_EDIT] = {{ KC_DOT, KC_COMM }, { KC_EQL, KC_MINS }}, }; -void encoder_update_user(uint8_t index, bool clockwise) { +void encoder_update_keymap(uint8_t index, bool clockwise) { uint8_t layer = get_highest_layer(layer_state); - clockwise = !clockwise; // Clockwise is reversed (again) switch (layer) { case _AUDIO: diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c index 2cf4119fc2a6..22788befdc8e 100644 --- a/layouts/community/ortho_4x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c @@ -126,7 +126,7 @@ uint16_t muse_counter = 0; uint8_t muse_offset = 70; uint16_t muse_tempo = 50; -void encoder_update_user(uint8_t index, bool clockwise) { +void encoder_update_keymap(uint8_t index, bool clockwise) { if (muse_mode) { if (IS_LAYER_ON(_RAISE)) { if (clockwise) { diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c index 8c3c42db0963..e7128c62e315 100644 --- a/layouts/community/ortho_5x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c @@ -117,7 +117,7 @@ uint16_t muse_counter = 0; uint8_t muse_offset = 70; uint16_t muse_tempo = 50; -void encoder_update_user(uint8_t index, bool clockwise) { +void encoder_update_keymap(uint8_t index, bool clockwise) { if (muse_mode) { if (IS_LAYER_ON(_RAISE)) { if (clockwise) { diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index a3c29a47c466..263701b9d1ec 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -129,3 +129,18 @@ layer_state_t layer_state_set_user(layer_state_t state) { #endif // RGBLIGHT_ENABLE return layer_state_set_keymap(state); } + +#ifdef ENCODER_ENABLE +__attribute__ ((weak)) +void encoder_update_keymap(uint8_t index, bool clockwise) { } + +/** + * If REVERSE_ENCODER defined, then toggle clockwise + */ +void encoder_update_user(uint8_t index, bool clockwise) { +#ifdef REVERSE_ENCODER + clockwise = !clockwise; +#endif + encoder_update_keymap(index, clockwise); +} +#endif diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index c1984fef2fc3..e74c9960a552 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -49,3 +49,7 @@ void suspend_wakeup_init_keymap(void); void matrix_scan_keymap(void); layer_state_t default_layer_state_set_keymap(layer_state_t state); layer_state_t layer_state_set_keymap(layer_state_t state); + +#ifdef ENCODER_ENABLE +void encoder_update_keymap(uint8_t index, bool clockwise); +#endif From 6474c98d7f867898cef71b47fa0d113c287272fa Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 19 Nov 2019 11:31:57 -0800 Subject: [PATCH 250/429] [User] Some documentation TODOs --- users/brandonschlack/brandonschlack.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index e74c9960a552..4b1c96195681 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -11,7 +11,7 @@ # include "rgb_bs.h" #endif -// Define layer names +/* TODO Layer Names */ enum bs_layers { #if !defined(IS_MACROPAD) // Keyboard Layers _BASE = 0, @@ -31,7 +31,7 @@ enum bs_layers { _ADJUST = 15 // 15: Change keyboard settings }; -// EEPROM User Config +/* TODO User EECONFIG */ typedef union { uint32_t raw; struct { From d560bad0f2938fa1538d88a27684fa6ad823e79b Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 20 Nov 2019 14:25:19 -0800 Subject: [PATCH 251/429] [User] Documentation update --- users/brandonschlack/readme.md | 23 +++++++++++++++++------ users/brandonschlack/rgb_theme.h | 4 +--- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/users/brandonschlack/readme.md b/users/brandonschlack/readme.md index 26427286be40..7da55a4bd6e8 100644 --- a/users/brandonschlack/readme.md +++ b/users/brandonschlack/readme.md @@ -1,13 +1,13 @@ # Overview -My QMK home. I feel as though I stand on the shoulders of giants, for a lot of my code here is borrowed and adapted from so many contributors here (namely Drashna and Konstantin), and that I hope my code here can help or inspire others. +My QMK home. I feel as though I stand on the shoulders of giants, for a lot of my code here is borrowed and adapted from so many contributors here, and that I hope my code here can help or inspire others. ## Layers, Handlers, and Macros ### Layers -I have predefined layer names for keyboards: -* **_BASE**: Default Layer -* **_FN**: Function Layer for 60% and above +I have some predefined layer names for keyboards: +* **_BASE**: Default Layer, QWERTY layout. +* **_FN**: Function Layer for 60% and above, and additional macros and shortcuts on 50% and below. * **_LOWER** and **_RAISE**: Function layers for 40% and macropads: @@ -16,15 +16,26 @@ and macropads: * **_NAVI**: Navigation macros, for changing tabs and scrolling * **_MACRO**: Generic macro keys, meant to be customized per app with [Karabiner](https://pqrs.org/osx/karabiner/) +#### Protected Layers +I have some named "protected" layers, meant to be at the end of the layer list for changing keyboard settings and features. + +* **KEYMAP_LAYERS**: Add additional layers in keymap. +* **_AUDIO**: Audio feature controls. +* **_LIGHT**: RGB Light/Matrix feature controls. +* **_ADJUST**: General keyboard settings and toggles. Can also contain RGB and Audio controls on larger boards that don't need and extra layer for those controls. + ### EEPROM User Config -I have a custom userspace config implemented to save +I have a custom userspace config implemented to save settings on the board to persist across shutdowns. I currently store: + +* rgb_layer_change - a toggle for using RGB themes for layer indication +* rgb_theme - a pointer to the currently set RGB Theme ### Process Handlers ### Keycode Aliases -I am a macOS user and so a lot of my aliases +I am a macOS user and so a lot of my aliases are ### Macros diff --git a/users/brandonschlack/rgb_theme.h b/users/brandonschlack/rgb_theme.h index c7f772c37b75..eee41b1ea0e6 100644 --- a/users/brandonschlack/rgb_theme.h +++ b/users/brandonschlack/rgb_theme.h @@ -4,9 +4,7 @@ #include "color.h" #include "rgblight_list.h" -/** - * Portable rgb_theme.h - */ +/*TODO Update as RGBLIGHT Mode */ #ifndef RGB_THEME_COLORS_MAX #define RGB_THEME_COLORS_MAX 5 #endif From 2e79014bf379dc4701aac5b22ba527d8dc81886a Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 20 Nov 2019 15:59:38 -0800 Subject: [PATCH 252/429] [Keymap] Remove keymap_config extern --- keyboards/launchpad/keymaps/brandonschlack/keymap.c | 2 -- layouts/community/ortho_4x12/brandonschlack/keymap.c | 4 ---- 2 files changed, 6 deletions(-) diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index 058db28a17d1..0a733a8540be 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -1,8 +1,6 @@ #include QMK_KEYBOARD_H #include "brandonschlack.h" -extern keymap_config_t keymap_config; - // Layers defined in brandonschlack.h // Tap Dances diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c index 22788befdc8e..a81af17e4a9f 100644 --- a/layouts/community/ortho_4x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c @@ -20,10 +20,6 @@ #endif #include "brandonschlack.h" -#ifdef KEYBOARD_plaid -extern keymap_config_t keymap_config; -#endif - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty */ From a3fa695e99642ad563c99cefe9f746560b8328a8 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 21 Nov 2019 10:18:10 -0800 Subject: [PATCH 253/429] [Keymap] Move FN_LYR key on ortho layouts --- layouts/community/ortho_4x12/brandonschlack/keymap.c | 2 +- layouts/community/ortho_5x12/brandonschlack/keymap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c index a81af17e4a9f..d15b39053d57 100644 --- a/layouts/community/ortho_4x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ - KC_LCTL, FN_LYR, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ + KC_LCTL, KC_LALT, KC_LGUI, FN_LYR, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ // └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ), diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c index e7128c62e315..7983a042f60c 100644 --- a/layouts/community/ortho_5x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ - KC_LCTL, FN_LYR, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ + KC_LCTL, KC_LALT, KC_LGUI, FN_LYR, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ // └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ), From 23f2b5926dd29b732009846398695e5f867eb7c2 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 21 Nov 2019 10:20:25 -0800 Subject: [PATCH 254/429] [User] Update readme for layouts - Adds Keyboards Using Layout section to readme --- layouts/community/ortho_4x12/brandonschlack/readme.md | 9 ++++++++- layouts/community/ortho_5x12/brandonschlack/readme.md | 8 +++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/layouts/community/ortho_4x12/brandonschlack/readme.md b/layouts/community/ortho_4x12/brandonschlack/readme.md index 8d881501b5ca..847851329f09 100644 --- a/layouts/community/ortho_4x12/brandonschlack/readme.md +++ b/layouts/community/ortho_4x12/brandonschlack/readme.md @@ -1,7 +1,14 @@ # brandonschlack's 4x12 Ortho Keymap This layout is based on the Planck layout. It is macOS-centric, with Colemak and DVORAK removed as I don't use them. -Features include: + +## Keyboards Using This Layout + +* [Planck](https://github.com/qmk/qmk_firmware/tree/master/keyboards/planck) +* [Plaid](https://github.com/qmk/qmk_firmware/tree/master/keyboards/plaid) +* [JNAO](https://github.com/qmk/qmk_firmware/tree/master/keyboards/planck) (FORCE_LAYOUT=ortho_4x12) + +## Features * *Enter* acts as *Right Shift* when held * On either **LOWER** or **RAISE** layers, tapping *Shift* will toggle *Caps Lock*, hold for Shift. diff --git a/layouts/community/ortho_5x12/brandonschlack/readme.md b/layouts/community/ortho_5x12/brandonschlack/readme.md index 1ab5a36b80fe..787fbb82072e 100644 --- a/layouts/community/ortho_5x12/brandonschlack/readme.md +++ b/layouts/community/ortho_5x12/brandonschlack/readme.md @@ -1,7 +1,13 @@ # brandonschlack's 5x12 Ortho Keymap This layout takes inspiration from the Preonic and JNAO. It is macOS-centric, with Colemak and DVORAK removed as I don't use them. -Features include: + +## Keyboards Using This Layout + +* [Preonic](https://github.com/qmk/qmk_firmware/tree/master/keyboards/planck) +* [JNAO](https://github.com/qmk/qmk_firmware/tree/master/keyboards/planck) (FORCE_LAYOUT=ortho_5x12) + +## Features * *Enter* acts as *Right Shift* when held * On either **LOWER** or **RAISE** layers, tapping *Shift* will toggle *Caps Lock*, hold for Shift. From 29e2537b1a1e9fcf68d54effa4b94d998a7fe7c6 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 21 Nov 2019 11:00:24 -0800 Subject: [PATCH 255/429] [Keymap] Move FN_LYR key on ortho layouts - Move Fn to bottom-left --- layouts/community/ortho_4x12/brandonschlack/keymap.c | 2 +- layouts/community/ortho_5x12/brandonschlack/keymap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c index d15b39053d57..da755f57c33e 100644 --- a/layouts/community/ortho_4x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ - KC_LCTL, KC_LALT, KC_LGUI, FN_LYR, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ + FN_LYR, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ // └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ), diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c index 7983a042f60c..17c35a218d82 100644 --- a/layouts/community/ortho_5x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ - KC_LCTL, KC_LALT, KC_LGUI, FN_LYR, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ + FN_LYR, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ // └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ), From 58803cd7ff952786642957b14c8ce51d42452902 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Wed, 27 Nov 2019 09:46:03 -0800 Subject: [PATCH 256/429] [User] SS_DELAY for send string delay --- users/brandonschlack/process_records.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index 757c765df804..d6e03cfd8094 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -1,9 +1,9 @@ #include "brandonschlack.h" #if defined(TAP_CODE_DELAY) - #define SEND_STRING_DELAY TAP_CODE_DELAY + #define SS_DELAY TAP_CODE_DELAY #else - #define SEND_STRING_DELAY 5 + #define SS_DELAY 5 #endif // Super CMD↯TAB @@ -45,17 +45,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { break; case QM_VRSN: // Prints firmware version if (record->event.pressed) { - send_string_with_delay_P(PSTR(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE), SEND_STRING_DELAY); + send_string_with_delay_P(PSTR(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE), SS_DELAY); } break; case QM_KYBD: // Prints keyboard path if (record->event.pressed) { - send_string_with_delay_P(PSTR("keyboards/" QMK_KEYBOARD "/"), SEND_STRING_DELAY); + send_string_with_delay_P(PSTR("keyboards/" QMK_KEYBOARD "/"), SS_DELAY); } break; case QM_KYMP: // Prints keymap path if (record->event.pressed) { - send_string_with_delay_P(PSTR("keyboards/" QMK_KEYBOARD "/keymaps/" QMK_KEYMAP "/keymap.c"), SEND_STRING_DELAY); + send_string_with_delay_P(PSTR("keyboards/" QMK_KEYBOARD "/keymaps/" QMK_KEYMAP "/keymap.c"), SS_DELAY); } break; case CMD_TAB: // Super CMD↯TAB @@ -132,20 +132,20 @@ void matrix_scan_cmd_tab(void) { * Sends FORCE_LAYOUT parameter if built with FORCE_LAYOUT */ void send_make_command(bool flash_bootloader) { - send_string_with_delay_P(PSTR("make " QMK_KEYBOARD ":" QMK_KEYMAP), SEND_STRING_DELAY); + send_string_with_delay_P(PSTR("make " QMK_KEYBOARD ":" QMK_KEYMAP), SS_DELAY); if (flash_bootloader) { #if defined(KEYBOARD_massdrop_alt) // only run for Massdrop ALT - send_string_with_delay_P(PSTR(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP), SEND_STRING_DELAY); + send_string_with_delay_P(PSTR(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP), SS_DELAY); #elif defined(KEYBOARD_coseyfannitutti_discipline) // only run for Discipline 65 - send_string_with_delay_P(PSTR(":program"), SEND_STRING_DELAY); + send_string_with_delay_P(PSTR(":program"), SS_DELAY); #else // use universal flash command - send_string_with_delay_P(PSTR(":flash"), SEND_STRING_DELAY); + send_string_with_delay_P(PSTR(":flash"), SS_DELAY); #endif #if defined(FORCE_LAYOUT) - send_string_with_delay_P(PSTR(" FORCE_LAYOUT=" FORCE_LAYOUT), SEND_STRING_DELAY); + send_string_with_delay_P(PSTR(" FORCE_LAYOUT=" FORCE_LAYOUT), SS_DELAY); #endif } - send_string_with_delay_P(PSTR(SS_TAP(X_ENTER)), SEND_STRING_DELAY); + send_string_with_delay_P(PSTR(SS_TAP(X_ENTER)), SS_DELAY); if (flash_bootloader) { reset_keyboard(); } From 049c675904b3e7d19a1f8fe785a323d3fb1d7592 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Wed, 27 Nov 2019 13:01:24 -0800 Subject: [PATCH 257/429] [User] Move deprecated feature excludes to config --- users/brandonschlack/config.h | 3 +++ users/brandonschlack/rules.mk | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/users/brandonschlack/config.h b/users/brandonschlack/config.h index b9e09323c75d..076e5e170c16 100644 --- a/users/brandonschlack/config.h +++ b/users/brandonschlack/config.h @@ -20,6 +20,9 @@ #endif /* Disable unused and unneeded features to reduce on firmware size */ +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION + #ifdef LOCKING_SUPPORT_ENABLE # undef LOCKING_SUPPORT_ENABLE #endif diff --git a/users/brandonschlack/rules.mk b/users/brandonschlack/rules.mk index aab44ee93d3f..3ca2c0d3a2e2 100644 --- a/users/brandonschlack/rules.mk +++ b/users/brandonschlack/rules.mk @@ -3,8 +3,6 @@ SRC += brandonschlack.c \ ifneq ($(strip $(DISABLE_LTO)), yes) EXTRAFLAGS += -flto - OPT_DEFS += -DNO_ACTION_MACRO - OPT_DEFS += -DNO_ACTION_FUNCTION endif ifeq ($(strip $(IS_MACROPAD)), yes) From 7a45804332e1a2f11a1fe1f2efb5613fb1b99364 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Wed, 27 Nov 2019 13:02:28 -0800 Subject: [PATCH 258/429] [Keymap] Move ALT keymap to 65_ansi_blocker --- .../alt/keymaps/brandonschlack/rules.mk | 2 - .../65_ansi_blocker}/brandonschlack/config.h | 19 +-- .../65_ansi_blocker}/brandonschlack/keymap.c | 155 ++++++------------ .../65_ansi_blocker/brandonschlack/readme.md | 10 ++ .../65_ansi_blocker/brandonschlack/rules.mk | 4 + 5 files changed, 72 insertions(+), 118 deletions(-) delete mode 100644 keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk rename {keyboards/massdrop/alt/keymaps => layouts/community/65_ansi_blocker}/brandonschlack/config.h (86%) rename {keyboards/massdrop/alt/keymaps => layouts/community/65_ansi_blocker}/brandonschlack/keymap.c (64%) create mode 100644 layouts/community/65_ansi_blocker/brandonschlack/readme.md create mode 100644 layouts/community/65_ansi_blocker/brandonschlack/rules.mk diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk b/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk deleted file mode 100644 index 13fe13846799..000000000000 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -# Disable LTO, breaks with it enabled. -DISABLE_LTO = yes diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/config.h b/layouts/community/65_ansi_blocker/brandonschlack/config.h similarity index 86% rename from keyboards/massdrop/alt/keymaps/brandonschlack/config.h rename to layouts/community/65_ansi_blocker/brandonschlack/config.h index 7bf0d8b7c79a..d01ebb52009e 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/config.h +++ b/layouts/community/65_ansi_blocker/brandonschlack/config.h @@ -1,5 +1,6 @@ -#pragma once +#define GRAVE_ESC_ALT_OVERRIDE +#ifdef RGB_MATRIX_ENABLE // Disable RGB Effects #define DISABLE_RGB_MATRIX_ALPHAS_MODS // #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN @@ -39,19 +40,9 @@ #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH #define QMK_KEYS_PER_SCAN 4 +#endif -// #define RGB_MATRIX_KEYRELEASES - -// Use RGB Indicators over LED +#ifdef KEYBOARD_massdrop_alt #undef USB_LED_INDICATOR_ENABLE #define USB_LED_CAPS_LOCK_SCANCODE 30 - -#define NO_ACTION_MACRO -#define NO_ACTION_FUNCTION - -#ifndef NO_DEBUG -#define NO_DEBUG -#endif // !NO_DEBUG -#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE) -#define NO_PRINT -#endif // !NO_PRINT +#endif diff --git a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c similarity index 64% rename from keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c rename to layouts/community/65_ansi_blocker/brandonschlack/keymap.c index 593b86903254..54eab6455cd0 100644 --- a/keyboards/massdrop/alt/keymaps/brandonschlack/keymap.c +++ b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c @@ -1,80 +1,81 @@ +/* Copyright 2019 MechMerlin + * + * 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 . + */ #include QMK_KEYBOARD_H #include "brandonschlack.h" -enum alt_keycodes { - U_T_AUTO = KEYMAP_SAFE_RANGE, //USB Extra Port Toggle Auto Detect / Always Active - U_T_AGCR, //USB Toggle Automatic GCR control - DBG_TOG, //DEBUG Toggle On / Off - DBG_MTRX, //DEBUG Toggle Matrix Prints - DBG_KBD, //DEBUG Toggle Keyboard Prints - DBG_MOU, //DEBUG Toggle Mouse Prints - MD_BOOT, //Restart into bootloader after hold timeout -}; - -#define TG_NKRO MAGIC_TOGGLE_NKRO //Toggle 6KRO / NKRO mode - -keymap_config_t keymap_config; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│~ `│ + * │Es`│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│Hom│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│| \│Hom│ + * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│| \│PgU│ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│PgU│ + * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│PgD│ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│PgD│ + * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│End│ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ * │Ctrl│ Opt│ Cmd│ Space │Cmd │FnPy│ │Lef│Dow│Rig│ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ -[_BASE] = LAYOUT( - 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_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_BSLS, KC_HOME, \ - HY_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_PGUP, \ - 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_UP, KC_PGDN, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT \ +[_BASE] = LAYOUT_65_ansi_blocker( \ + KC_GESC, 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_HOME, \ + 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_PGUP, \ + HY_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_PGDN, \ + 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_UP, KC_END, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ * │Mke│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ Del │SlD│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │ │ │ │ │DFU│ │ │ │ │ │F13│F14│F15│ LHP │End│ + * │ │ │ │ │RST│ │ │ │ │ │F13│F14│F15│ LHP │VlU│ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ Adjust │VlU│ + * │ │ │ │ │ │ │ │ │ │ │ │ │ Adjust │VlD│ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │ │RTg│ │ │ │ │ │ │Prv│Nxt│Ply│MteSft│PgU│VlD│ + * │ │RTO│ │ │ │ │ │ │ │ │ │ │PgU│Mut│ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ * │ │ │ │ │ │ │ │Hom│PgD│End│ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ -[_FN] = LAYOUT( - QM_MAKE, 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, MC_SLPD, \ - _______, _______, _______, _______, MD_BOOT, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, KC_VOLU, \ - _______, RGB_TOG, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, MM_RSFT, KC_PGUP, KC_VOLD, \ - _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ +[_FN] = LAYOUT_65_ansi_blocker( \ + QM_MAKE, 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_DELT, MC_SLPD, \ + _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_VOLU, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, KC_VOLD, \ + _______, RGB_TOG, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, KC_PGUP, KC_MUTE, \ + _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), /* Adjust Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │RST│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │ │RS-│RB+│RS+│RH+│RS+│ │UAD│GCR│ │ │ │ │ │ │ + * │RMod │RH+│RS+│RV+│AS+│ │ │ │ │ │ │ │ │ │ │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ │RM-│RB-│RM+│RH-│RS-│ │ │ │ │ │ │ Adjust │ │ + * │ │RH-│RS-│RV-│AS-│ │ │ │ │ │ │ │ Adjust │ │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │ │RTO│LYR│Thm│ │DFU│KRO│DBG│ │ │ │ │ │ │ + * │ │RTO│LYR│Thm│ │ │ │ │ │ │ │ │ │ │ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ * │ │ │ │ │ │ │ │ │ │ │ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ -[_ADJUST] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, XXXXXXX, U_T_AUTO,U_T_AGCR,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_ADJT, XXXXXXX, \ - _______, RGB_TOG, RGB_LYR, RGB_THM, XXXXXXX, MD_BOOT, TG_NKRO, DBG_TOG, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, \ - _______, _______, _______, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX \ +[_ADJUST] = LAYOUT_65_ansi_blocker( \ + RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_ADJT, XXXXXXX, \ + _______, RGB_TOG, RGB_LYR, RGB_THM, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, \ + _______, _______, _______, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX \ ), /* Blank Layout * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ @@ -88,12 +89,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ * │ │ │ │ │ │ │ │ │ │ │ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ -[X] = LAYOUT( +[X] = LAYOUT_65_ansi_blocker( \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), */ }; @@ -110,79 +111,29 @@ void keyboard_post_init_keymap(void) { void matrix_scan_keymap(void) { }; -#define MODS_SHIFT (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT)) -#define MODS_CTRL (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL)) -#define MODS_ALT (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT)) - bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { - static uint32_t key_timer; - switch (keycode) { - case U_T_AUTO: - if (record->event.pressed && MODS_SHIFT && MODS_CTRL) { - TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode"); - } - return false; - case U_T_AGCR: - if (record->event.pressed && MODS_SHIFT && MODS_CTRL) { - TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode"); - } - return false; - case DBG_TOG: - if (record->event.pressed) { - TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode"); - } - return false; - case DBG_MTRX: - if (record->event.pressed) { - TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix"); - } - return false; - case DBG_KBD: - if (record->event.pressed) { - TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard"); - } - return false; - case DBG_MOU: - if (record->event.pressed) { - TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse"); - } - return false; - case MD_BOOT: - if (record->event.pressed) { - key_timer = timer_read32(); - } else { - if (timer_elapsed32(key_timer) >= 500) { - reset_keyboard(); - } - } - return false; + #ifdef KEYBOARD_massdrop case RGB_TOG: if (record->event.pressed) { rgb_matrix_cycle_flag(); } return false; + #endif default: return true; //Process all other keycodes normally } } +#ifdef RGB_MATRIX_ENABLE void rgb_matrix_indicators_user(void) { + #ifdef KEYBOARD_massdrop if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) { rgb_matrix_set_color(USB_LED_CAPS_LOCK_SCANCODE, RGB_GREEN); } else if (!HAS_ANY_FLAGS(rgb_matrix_get_flags(), LED_FLAG_KEYS)){ rgb_matrix_set_color(USB_LED_CAPS_LOCK_SCANCODE, 0, 0, 0); } + #endif } +#endif -// Add suspend functionality -void suspend_power_down_kb(void) { - rgb_matrix_set_suspend_state(true); - suspend_power_down_user(); -} - -// Add wakeup functionality -void suspend_wakeup_init_kb(void) { - rgb_matrix_set_suspend_state(false); - suspend_wakeup_init_user(); -} diff --git a/layouts/community/65_ansi_blocker/brandonschlack/readme.md b/layouts/community/65_ansi_blocker/brandonschlack/readme.md new file mode 100644 index 000000000000..9e179386cf07 --- /dev/null +++ b/layouts/community/65_ansi_blocker/brandonschlack/readme.md @@ -0,0 +1,10 @@ +# brandonschlack's 65_ansi_blocker layout + +This is the 65% layout used by u/brandonschlack. + +It is used on his +[Massdrop ALT](https://github.com/qmk/qmk_firmware/tree/master/keyboards/massdrop/alt) +[KBD67 mkii](https://github.com/qmk/qmk_firmware/tree/master/keyboards/kbdfans/kbd67/mkiirgb) + +### Build +To build the firmware file associated with this keymap, simply run `make your_keyboard:brandonschlack`. diff --git a/layouts/community/65_ansi_blocker/brandonschlack/rules.mk b/layouts/community/65_ansi_blocker/brandonschlack/rules.mk new file mode 100644 index 000000000000..5072e41bf2e8 --- /dev/null +++ b/layouts/community/65_ansi_blocker/brandonschlack/rules.mk @@ -0,0 +1,4 @@ +ifeq ($(findstring massdrop,$(KEYBOARD)), massdrop) + # Disable LTO for Massdrop boards, breaks with it enabled. + DISABLE_LTO = yes +endif From 51fb12ea0fb952e137c634ffd192a00e53e23a96 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Wed, 27 Nov 2019 13:13:57 -0800 Subject: [PATCH 259/429] {Keymap] Forgot pragma once, copyright --- layouts/community/65_ansi_blocker/brandonschlack/config.h | 2 ++ layouts/community/65_ansi_blocker/brandonschlack/keymap.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/layouts/community/65_ansi_blocker/brandonschlack/config.h b/layouts/community/65_ansi_blocker/brandonschlack/config.h index d01ebb52009e..bc70f2a4d4cd 100644 --- a/layouts/community/65_ansi_blocker/brandonschlack/config.h +++ b/layouts/community/65_ansi_blocker/brandonschlack/config.h @@ -1,3 +1,5 @@ +#pragma once + #define GRAVE_ESC_ALT_OVERRIDE #ifdef RGB_MATRIX_ENABLE diff --git a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c index 54eab6455cd0..3d903cf49f14 100644 --- a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c +++ b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2019 MechMerlin +/* Copyright 2019 Brandon Schlack * * 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 From 94bbaaa523ac243911c5819794f4d4a7e6297117 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Wed, 27 Nov 2019 13:33:12 -0800 Subject: [PATCH 260/429] [Keymap] Update discipline keymap --- .../keymaps/brandonschlack/keymap.c | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c index eb084bb84c7c..0639fe9749f1 100644 --- a/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c +++ b/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2019 COSEYFANNITUTTI +/* Copyright 2019 Brandon Schlack * * 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 @@ -19,42 +19,42 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│~ `│ + * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│Hom│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│| \│Hom│ + * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│| \│PgU│ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│PgU│ + * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│PgD│ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│PgD│ + * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│End│ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ * │Ctrl│ Opt│ Cmd│ Space │Cmd│Opt│Fn │Lef│Dow│Rig│ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ */ [_BASE] = LAYOUT_65_ansi( \ - 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_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_BSLS, KC_HOME, \ - HY_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_PGUP, \ - 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_UP, KC_PGDN, \ + KC_GESC, 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_HOME, \ + 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_PGUP, \ + HY_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_PGDN, \ + 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_UP, KC_END, \ KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MM_RGUI, MM_RALT, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ * │Mke│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ Del │SlD│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │ │ │ │ │ │ │ │ │ │ │F13│F14│F15│ LHP │End│ + * │ │ │ │ │ │ │ │ │ │ │F13│F14│F15│ LHP │VlU│ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │VlU│ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │VlD│ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │MteSft│PgU│VlD│ + * │ │ │ │ │ │ │ │ │ │ │ │ │PgU│Mut│ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ * │ │ │ │ │ │ │ │Hom│PgD│End│ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ */ [_FN] = LAYOUT_65_ansi( QM_MAKE, 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_DELT, MC_SLPD, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_END, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MM_RSFT, KC_PGUP, KC_VOLD, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_VOLU, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_MUTE, \ _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ) }; From 516ddaec4a191e5632a1ccd0149daf5b75837cdc Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Wed, 27 Nov 2019 13:34:02 -0800 Subject: [PATCH 261/429] [User] Move Grave Esc Override to userspace --- layouts/community/65_ansi_blocker/brandonschlack/config.h | 2 -- users/brandonschlack/config.h | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/layouts/community/65_ansi_blocker/brandonschlack/config.h b/layouts/community/65_ansi_blocker/brandonschlack/config.h index bc70f2a4d4cd..74868d57c702 100644 --- a/layouts/community/65_ansi_blocker/brandonschlack/config.h +++ b/layouts/community/65_ansi_blocker/brandonschlack/config.h @@ -1,7 +1,5 @@ #pragma once -#define GRAVE_ESC_ALT_OVERRIDE - #ifdef RGB_MATRIX_ENABLE // Disable RGB Effects #define DISABLE_RGB_MATRIX_ALPHAS_MODS diff --git a/users/brandonschlack/config.h b/users/brandonschlack/config.h index 076e5e170c16..630abb2690f8 100644 --- a/users/brandonschlack/config.h +++ b/users/brandonschlack/config.h @@ -4,6 +4,7 @@ #define TAPPING_TERM 200 #define PERMISSIVE_HOLD #define TAP_HOLD_CAPS_DELAY 200 +#define GRAVE_ESC_ALT_OVERRIDE #ifdef RGBLIGHT_ENABLE # define RGBLIGHT_SLEEP From 779aece4843bcc76551c68c95ba7f9c954cc39d9 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 2 Dec 2019 11:39:51 -0800 Subject: [PATCH 262/429] [Keymap] Remove REVERSE_ENCODER flag --- keyboards/keebio/bdn9/keymaps/brandonschlack/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h index e86e9ca0a771..9ff479fc4d85 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h @@ -1,7 +1,5 @@ #pragma once -#define REVERSE_ENCODER // Encoder seems to be reversed - #undef RGBLIGHT_ANIMATIONS #define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation From 4adce6c1b4a4d06596220b78c306e01018027dee Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 2 Dec 2019 12:25:27 -0800 Subject: [PATCH 263/429] [User] Fix NO_ACTION_MACRO/FUNCTION in userspace --- users/brandonschlack/config.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/users/brandonschlack/config.h b/users/brandonschlack/config.h index 630abb2690f8..27b355e28b29 100644 --- a/users/brandonschlack/config.h +++ b/users/brandonschlack/config.h @@ -21,8 +21,12 @@ #endif /* Disable unused and unneeded features to reduce on firmware size */ -#define NO_ACTION_MACRO -#define NO_ACTION_FUNCTION +#ifndef NO_ACTION_MACRO +# define NO_ACTION_MACRO +#endif +#ifndef NO_ACTION_FUNCTION +# define NO_ACTION_FUNCTION +#endif #ifdef LOCKING_SUPPORT_ENABLE # undef LOCKING_SUPPORT_ENABLE From 5c797548e43592b35a25eb5c1dfaa6d5416d831d Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 2 Dec 2019 16:21:39 -0800 Subject: [PATCH 264/429] [Keymap] Remove ADJUST Layer on 65_ansi_blocker --- .../65_ansi_blocker/brandonschlack/keymap.c | 36 +++++-------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c index 3d903cf49f14..7901b31a27da 100644 --- a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c +++ b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c @@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │Es`│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│Hom│ + * │`Es│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│Hom│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│| \│PgU│ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ @@ -39,44 +39,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │Mke│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ Del │SlD│ + * │Mke│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ Delete│SlD│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │ │ │ │ │RST│ │ │ │ │ │F13│F14│F15│ LHP │VlU│ + * │RMod │RH+│RS+│RV+│AS+│ │ │ │ │ │F13│F14│F15│ LHP │VlU│ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ Adjust │VlD│ + * │RTgl │RH-│RS-│RV-│AS-│ │ │ │ │ │ │ │ │VlD│ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │ │RTO│ │ │ │ │ │ │ │ │ │ │PgU│Mut│ + * │ │LYR│Thm│ │ │RST│ │ │Prv│Nxt│Ply│ │PgU│Mut│ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ * │ │ │ │ │ │ │ │Hom│PgD│End│ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ [_FN] = LAYOUT_65_ansi_blocker( \ QM_MAKE, 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_DELT, MC_SLPD, \ - _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_VOLU, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, KC_VOLD, \ - _______, RGB_TOG, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, KC_PGUP, KC_MUTE, \ + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_VOLU, \ + RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, \ + _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, KC_PGUP, KC_MUTE, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), -/* Adjust Layer - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │RST│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │RMod │RH+│RS+│RV+│AS+│ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ │RH-│RS-│RV-│AS-│ │ │ │ │ │ │ │ Adjust │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │ │RTO│LYR│Thm│ │ │ │ │ │ │ │ │ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ - */ -[_ADJUST] = LAYOUT_65_ansi_blocker( \ - RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_ADJT, XXXXXXX, \ - _______, RGB_TOG, RGB_LYR, RGB_THM, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, \ - _______, _______, _______, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX \ -), /* Blank Layout * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ From 6f40a90238d41962aab84223180645352499b47d Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 2 Dec 2019 17:09:35 -0800 Subject: [PATCH 265/429] [Keymap] Add think6.5 keymap --- .../solder/keymaps/brandonschlack/config.h | 19 +++++ .../solder/keymaps/brandonschlack/keymap.c | 80 +++++++++++++++++++ .../solder/keymaps/brandonschlack/readme.md | 9 +++ .../solder/keymaps/brandonschlack/rules.mk | 2 + 4 files changed, 110 insertions(+) create mode 100644 keyboards/gray_studio/think65/solder/keymaps/brandonschlack/config.h create mode 100644 keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c create mode 100644 keyboards/gray_studio/think65/solder/keymaps/brandonschlack/readme.md create mode 100644 keyboards/gray_studio/think65/solder/keymaps/brandonschlack/rules.mk diff --git a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/config.h b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/config.h new file mode 100644 index 000000000000..26c6d6ade101 --- /dev/null +++ b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/config.h @@ -0,0 +1,19 @@ +/* Copyright 2019 MechMerlin + * + * 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 . + */ + +#pragma once + +// place overrides here diff --git a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c new file mode 100644 index 000000000000..fbb293340872 --- /dev/null +++ b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c @@ -0,0 +1,80 @@ +/* Copyright 2019 Brandon Schlack + * + * 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 . + */ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Base Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │`Es│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│PgU│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│| \│PgD│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ │ + * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * │Ctrl│ Opt│ Cmd│ Space │Cmd │FnPy│ │Lef│Dow│Rig│ + * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ + */ +[_BASE] = LAYOUT_65_ansi_blocker( \ + KC_GESC, 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_PGUP, \ + 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_PGDN, \ + HY_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, XXXXXXX, \ + 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_UP, XXXXXXX, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT \ +), +/* Function Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │Mke│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ Delete│VlU│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │RMod │RH+│RS+│RV+│ │ │ │ │ │ │F13│F14│F15│ SlpD│VlD│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │RTgl │RH-│RS-│RV-│ │ │ │ │ │ │MNC│LHP│ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ │ + * │ │LYR│Thm│ │ │RST│ │ │Prv│Nxt│Ply│MteSft│PgU│ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * │ │ │ │ │ │ │ │Hom│PgD│End│ + * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ + */ +[_FN] = LAYOUT_65_ansi_blocker( \ + QM_MAKE, 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_DELT, KC_VOLU, \ + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_SLPD, KC_VOLD, \ + RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, MC_MSSN, MC_LHPD, _______, XXXXXXX, \ + _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, MM_RSFT, KC_PGUP, XXXXXXX, \ + _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ +), +/* Blank Layout + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ +[X] = LAYOUT_65_ansi_blocker( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +), +*/ +}; diff --git a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/readme.md b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/readme.md new file mode 100644 index 000000000000..d7de5c1bebd3 --- /dev/null +++ b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/readme.md @@ -0,0 +1,9 @@ +# brandonschlack's Think6.5 keymap + +My keymap for the Think6.5. Using the `LAYOUT_65_ansi_blocker` LAYOUT and based on my keyboard-agnostic layout, some small changes for the navigation keys not present due to the badge. + +## Base Layer +![Base Layer](https://i.imgur.com/TRcV2KD.jpg) + +## Function Layer +![Function Layer](https://i.imgur.com/CeRJdAS.jpg) diff --git a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/rules.mk b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/rules.mk new file mode 100644 index 000000000000..4ce80104ef53 --- /dev/null +++ b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/rules.mk @@ -0,0 +1,2 @@ +# Build Options +MOUSEKEY_ENABLE = no # Don't need mouse keys From 4d4210555cd1ccfef0a618dddef41a26f701f295 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 3 Dec 2019 14:54:11 -0800 Subject: [PATCH 266/429] [User] Update LTO define in userspace --- .../65_ansi_blocker/brandonschlack/readme.md | 11 +++++------ .../community/65_ansi_blocker/brandonschlack/rules.mk | 5 +---- users/brandonschlack/rules.mk | 7 +++++-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/layouts/community/65_ansi_blocker/brandonschlack/readme.md b/layouts/community/65_ansi_blocker/brandonschlack/readme.md index 9e179386cf07..bdee3467ad77 100644 --- a/layouts/community/65_ansi_blocker/brandonschlack/readme.md +++ b/layouts/community/65_ansi_blocker/brandonschlack/readme.md @@ -1,10 +1,9 @@ # brandonschlack's 65_ansi_blocker layout -This is the 65% layout used by u/brandonschlack. +This is my preferred 65% layout. -It is used on his -[Massdrop ALT](https://github.com/qmk/qmk_firmware/tree/master/keyboards/massdrop/alt) -[KBD67 mkii](https://github.com/qmk/qmk_firmware/tree/master/keyboards/kbdfans/kbd67/mkiirgb) +It is used on: + +* [Massdrop ALT](https://github.com/qmk/qmk_firmware/tree/master/keyboards/massdrop/alt) +* [KBD67 mkii](https://github.com/qmk/qmk_firmware/tree/master/keyboards/kbdfans/kbd67/mkiirgb) -### Build -To build the firmware file associated with this keymap, simply run `make your_keyboard:brandonschlack`. diff --git a/layouts/community/65_ansi_blocker/brandonschlack/rules.mk b/layouts/community/65_ansi_blocker/brandonschlack/rules.mk index 5072e41bf2e8..7307f9f9e79a 100644 --- a/layouts/community/65_ansi_blocker/brandonschlack/rules.mk +++ b/layouts/community/65_ansi_blocker/brandonschlack/rules.mk @@ -1,4 +1 @@ -ifeq ($(findstring massdrop,$(KEYBOARD)), massdrop) - # Disable LTO for Massdrop boards, breaks with it enabled. - DISABLE_LTO = yes -endif +# Build Options diff --git a/users/brandonschlack/rules.mk b/users/brandonschlack/rules.mk index 3ca2c0d3a2e2..296fd8701fa6 100644 --- a/users/brandonschlack/rules.mk +++ b/users/brandonschlack/rules.mk @@ -1,8 +1,11 @@ SRC += brandonschlack.c \ process_records.c -ifneq ($(strip $(DISABLE_LTO)), yes) - EXTRAFLAGS += -flto +SPACE_CADET_ENABLE = no + +# Use LTO except for Massdrop boards +ifeq (, $(findstring massdrop, $(KEYBOARD))) + LTO_ENABLE = yes endif ifeq ($(strip $(IS_MACROPAD)), yes) From cea3552e0c4c59139a6b062b85ee76fa7016b89f Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 3 Dec 2019 14:55:10 -0800 Subject: [PATCH 267/429] [Keymap] Move kbd75 keymap to 75_ansi layout --- .../kbd75/keymaps/brandonschlack/keymap.c | 90 ------------------- .../kbd75/keymaps/brandonschlack/rules.mk | 5 -- .../community/75_ansi/brandonschlack/keymap.c | 90 +++++++++++++++++++ .../75_ansi/brandonschlack/readme.md | 7 ++ .../community/75_ansi/brandonschlack/rules.mk | 5 ++ 5 files changed, 102 insertions(+), 95 deletions(-) delete mode 100644 keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c delete mode 100644 keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk create mode 100644 layouts/community/75_ansi/brandonschlack/keymap.c create mode 100644 layouts/community/75_ansi/brandonschlack/readme.md create mode 100644 layouts/community/75_ansi/brandonschlack/rules.mk diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c deleted file mode 100644 index e6e4ee2f9992..000000000000 --- a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/keymap.c +++ /dev/null @@ -1,90 +0,0 @@ -#include QMK_KEYBOARD_H -#include "brandonschlack.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* LAYOUT - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ 2.0U │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │1.5U │ │ │ │ │ │ │ │ │ │ │ │ │1.5U │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │1.75U │ │ │ │ │ │ │ │ │ │ │ │2.25U │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │2.25U │ │ │ │ │ │ │ │ │ │ │1.75U │ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ - * │1.25│1.25│1.25│6.25U │1U │1U │1U │1U │1U │1U │ - * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ - */ - - /* Base Layer - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │Esc│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│F13│F14│F15│ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ - * │~ `│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│Hom│ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│| \│PgU│ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│PgD│ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│End│ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ - * │Ctrl│ Opt│ Cmd│ Space │Cmd│Opt│Fn │Lef│Dow│Rig│ - * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ - */ - [_BASE] = LAYOUT_75_ansi( \ - KC_ESC, 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_F13, KC_F14, KC_F15, \ - 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, KC_HOME, \ - 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_PGUP, \ - HY_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_PGDN, \ - 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_UP, KC_END, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MM_RGUI, MM_RALT, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT \ - ), - /* Function Layer - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │Mke│BrD│BrU│Msn│LHP│RV-│RV+│ │ │ │ │ │ │Prv│Nxt│Ply│ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ Del │SlD│ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │RMod │RH+│RS+│RV+│RST│ │ │ │ │ │ │ │ │ │VlU│ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ │RH-│RS-│RV-│ │ │ │ │ │ │ │ │ Adjust │VlD│ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │ │RTg│RLy│RTh│ │ │ │ │ │ │ │ │PgU│Mte│ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ - * │ │ │ │ │ │ │ │Hom│PgD│End│ - * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ - */ - [_FN] = LAYOUT_75_ansi( \ - QM_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELT, MC_SLPD, \ - RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, \ - _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, KC_VOLD, \ - _______, RGB_TOG, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_MUTE, \ - _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ - ), - /* Adjust Layer - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │Mke│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │ │ │ │EEP│RST│ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ │ │ │DBG│ │ │ │ │ │ │ │ │ Adjust │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │ │RTg│ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ - */ - [_ADJUST] = LAYOUT_75_ansi( \ - QM_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, DEBUG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_ADJT, XXXXXXX, \ - XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ - ), -}; diff --git a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk b/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk deleted file mode 100644 index 7702b0140ea9..000000000000 --- a/keyboards/kbdfans/kbd75/keymaps/brandonschlack/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -# Build Options -# comment out to disable the options. -# -MOUSEKEY_ENABLE = no # Don't need Mouse Keys -BACKLIGHT_ENABLE = no # No backlights installed diff --git a/layouts/community/75_ansi/brandonschlack/keymap.c b/layouts/community/75_ansi/brandonschlack/keymap.c new file mode 100644 index 000000000000..947590a54060 --- /dev/null +++ b/layouts/community/75_ansi/brandonschlack/keymap.c @@ -0,0 +1,90 @@ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* LAYOUT + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ 2.0U │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │1.5U │ │ │ │ │ │ │ │ │ │ │ │ │1.5U │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │1.75U │ │ │ │ │ │ │ │ │ │ │ │2.25U │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │2.25U │ │ │ │ │ │ │ │ │ │ │1.75U │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ + * │1.25│1.25│1.25│6.25U │1U │1U │1U │1U │1U │1U │ + * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ + */ + + /* Base Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Esc│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│F13│F14│F15│ + * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ + * │~ `│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│Hom│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│| \│PgU│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│PgD│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│End│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ + * │Ctrl│ Opt│ Cmd│ Space │Cmd│Opt│Fn │Lef│Dow│Rig│ + * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ + */ +[_BASE] = LAYOUT_75_ansi( \ + KC_ESC, 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_F13, KC_F14, KC_F15, \ + 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, KC_HOME, \ + 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_PGUP, \ + HY_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_PGDN, \ + 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_UP, KC_END, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MM_RGUI, MM_RALT, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT \ +), +/* Function Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Mke│BrD│BrU│Msn│LHP│RV-│RV+│ │ │ │ │ │ │Prv│Nxt│Ply│ + * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ Del │SlD│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │RMod │RH+│RS+│RV+│AS+│ │ │ │ │ │ │ │ │ │VlU│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │RTgl │RH-│RS-│RV-│AS-│ │ │ │ │ │ │ │ │VlD│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ │LYR│Thm│ │ │RST│ │ │ │ │ │ │PgU│Mte│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ + * │ │ │ │ │ │ │ │Hom│PgD│End│ + * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ + */ +[_FN] = LAYOUT_75_ansi( \ + QM_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELT, MC_SLPD, \ + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, \ + RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, \ + _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_MUTE, \ + _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ +), +/* Blank Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ +[X] = LAYOUT_75_ansi( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +), +*/ +}; diff --git a/layouts/community/75_ansi/brandonschlack/readme.md b/layouts/community/75_ansi/brandonschlack/readme.md new file mode 100644 index 000000000000..0dfb081ba792 --- /dev/null +++ b/layouts/community/75_ansi/brandonschlack/readme.md @@ -0,0 +1,7 @@ +# brandonschlack's 75_ansi layout + +This is my preferred 75% layout. + +It is currently used on: + +* [KBD75](https://github.com/qmk/qmk_firmware/tree/master/keyboards/kbdfans/kbd75) diff --git a/layouts/community/75_ansi/brandonschlack/rules.mk b/layouts/community/75_ansi/brandonschlack/rules.mk new file mode 100644 index 000000000000..104063ed444a --- /dev/null +++ b/layouts/community/75_ansi/brandonschlack/rules.mk @@ -0,0 +1,5 @@ +# Build Options +ifneq (, $(findstring kbd75, $(KEYBOARD))) + MOUSEKEY_ENABLE = no +endif +BACKLIGHT_ENABLE = no # No backlights installed From a4749fa091c2838cbe07fc8c59264a22a192dc41 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 3 Dec 2019 14:55:47 -0800 Subject: [PATCH 268/429] [Keymap] Move kbd8x_mk2 keymap to tkl_ansi layout --- .../kbd8x_mk2/keymaps/brandonschlack/keymap.c | 102 ------------------ .../tkl_ansi}/brandonschlack/config.h | 0 .../tkl_ansi/brandonschlack/keymap.c | 102 ++++++++++++++++++ .../tkl_ansi}/brandonschlack/readme.md | 10 +- .../tkl_ansi}/brandonschlack/rules.mk | 0 5 files changed, 107 insertions(+), 107 deletions(-) delete mode 100644 keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/keymap.c rename {keyboards/kbdfans/kbd8x_mk2/keymaps => layouts/community/tkl_ansi}/brandonschlack/config.h (100%) create mode 100644 layouts/community/tkl_ansi/brandonschlack/keymap.c rename {keyboards/kbdfans/kbd8x_mk2/keymaps => layouts/community/tkl_ansi}/brandonschlack/readme.md (92%) rename {keyboards/kbdfans/kbd8x_mk2/keymaps => layouts/community/tkl_ansi}/brandonschlack/rules.mk (100%) diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/keymap.c deleted file mode 100644 index 4622ba926c1f..000000000000 --- a/keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/keymap.c +++ /dev/null @@ -1,102 +0,0 @@ -/* Copyright 2019 Ryota Goto - * - * 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 . - */ -#include QMK_KEYBOARD_H -#include "brandonschlack.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Base Layer - * ┌───┬───┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┐ - * │Esc│ │ F1│ F2│ F3│ F4│ │ F5│ F6│ F7│ F8│ │ F9│F10│F11│F12│ │F13│F14│F15│ - * ├───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┤ - * ├───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┤ - * │~ `│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│ │Ins│Hom│PgU│ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ - * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│| \│ │Del│End│PgD│ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┤ - * │Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐ │ - * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ │ Up│ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┤ - * │Ctrl│ Opt│ Cmd│ Space │Cmd │Opt │Fn │Ctrl│ │Lef│Dow│Rig│ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┴─┴───┴───┴───┘ - */ - [_BASE] = LAYOUT( - KC_ESC, 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_F13, KC_F14, KC_F15, \ - 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, KC_NO, KC_INS, KC_HOME, KC_PGUP, \ - 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_DEL, KC_END, KC_PGDN, \ - HY_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_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_UP, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MM_RGUI, MM_RALT, MM_FNPY, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ - ), - /* Function Layer - * ┌───┬───┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┐ - * │Mke│ │BrD│BrU│Msn│LHP│ │RV-│RV+│ │ │ │ │ │ │ │ │ │ │Mut│ - * ├───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┤ - * ├───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ Del │ │Ply│Slp│VlU│ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ - * │RMod │RH+│RS+│RV+│RST│ │ │ │ │ │ │ │ │ │ │Prv│Nxt│VlD│ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┤ - * │ │RH-│RS-│RV-│ │ │ │ │ │ │ │ │ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐ │ - * │ │RTg│RLy│RTh│ │ │ │ │ │ │ │ │ │PgU│ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┤ - * │ │ │ │ │ │ │ │ │ │Hom│PgD│End│ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┴─┴───┴───┴───┘ - */ - [_FN] = LAYOUT( - QM_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, KC_MPLY, MC_SLPD, KC_VOLU, \ - RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_VOLD, \ - _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, RGB_TOG, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ - ) - /* Blank Template - * ┌───┬───┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┐ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┤ - * ├───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┴─┴───┴───┴───┘ - */ - /* - [BLANK] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ - ) - */ -}; - -bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { - return true; -} - -void led_set_user(uint8_t usb_led) { - -} diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/config.h b/layouts/community/tkl_ansi/brandonschlack/config.h similarity index 100% rename from keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/config.h rename to layouts/community/tkl_ansi/brandonschlack/config.h diff --git a/layouts/community/tkl_ansi/brandonschlack/keymap.c b/layouts/community/tkl_ansi/brandonschlack/keymap.c new file mode 100644 index 000000000000..68f2476ebf59 --- /dev/null +++ b/layouts/community/tkl_ansi/brandonschlack/keymap.c @@ -0,0 +1,102 @@ +/* Copyright 2019 Brandon Schlack + * + * 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 . + */ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Base Layer + * ┌───┬───┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┐ + * │Esc│ │ F1│ F2│ F3│ F4│ │ F5│ F6│ F7│ F8│ │ F9│F10│F11│F12│ │F13│F14│F15│ + * ├───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┤ + * ├───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┤ + * │~ `│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│ │Ins│Hom│PgU│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ + * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│| \│ │Del│End│PgD│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┤ + * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐ │ + * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ │ Up│ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┤ + * │Ctrl│ Opt│ Cmd│ Space │Cmd │Opt │Fn │Ctrl│ │Lef│Dow│Rig│ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┴─┴───┴───┴───┘ + */ +[_BASE] = LAYOUT_tkl_ansi( \ + KC_ESC, 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_F13, KC_F14, KC_F15, \ + 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, KC_INS, KC_HOME, KC_PGUP, \ + 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_DEL, KC_END, KC_PGDN, \ + HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MM_RGUI, MM_RALT, MM_FNPY, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ +), +/* Function Layer + * ┌───┬───┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┐ + * │Mke│ │BrD│BrU│Msn│LHP│ │RV-│RV+│ │ │ │ │ │ │ │ │ │ │Mut│ + * ├───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┤ + * ├───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ Del │ │Ply│Slp│VlU│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ + * │RMod │RH+│RS+│RV+│AS+│ │ │ │ │ │ │ │ │ │ │Prv│Nxt│VlD│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┤ + * │RTgl │RH-│RS-│RV-│AS-│ │ │ │ │ │ │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐ │ + * │ │LYR│Thm│ │ │RST│ │ │ │ │ │ │ │PgU│ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┤ + * │ │ │ │ │ │ │ │ │ │Hom│PgD│End│ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┴─┴───┴───┴───┘ + */ +[_FN] = LAYOUT_tkl_ansi( \ + QM_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELT, KC_MPLY, MC_SLPD, KC_VOLU, \ + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_VOLD, \ + RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, _______, _______, _______, _______, _______, KC_PGUP, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ +) +/* Blank Template + * ┌───┬───┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┤ + * ├───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┴─┴───┴───┴───┘ + */ +/* +[BLANK] = LAYOUT_tkl_ansi( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +) +*/ +}; + +bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { + return true; +} + +void led_set_user(uint8_t usb_led) { + +} diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/readme.md b/layouts/community/tkl_ansi/brandonschlack/readme.md similarity index 92% rename from keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/readme.md rename to layouts/community/tkl_ansi/brandonschlack/readme.md index 24a9fe0571ae..e8885a13cace 100644 --- a/keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/readme.md +++ b/layouts/community/tkl_ansi/brandonschlack/readme.md @@ -1,4 +1,4 @@ -# The brandonschlack keymap for KBD8X MKII +# brandonschlack's TKL ANSI layout A mostly typical Mac setup, with some personal QMK touches. @@ -40,16 +40,16 @@ The Function layer is a mix of [Apple's *Fn* shortcuts](https://support.apple.co * **Sleep Display** (Shift+Control+Power) as **Fn+Home**. * **QMK Make** as **Fn+Esc**. Sends make command to command line. Holding **Shift** will also append `:flash` target and put keyboard into bootloader. -* **Reset** as **Fn+R** +* **Reset** as **Fn+B** ### RGB Controls -* **RGB Toggle** as **Fn+Z** +* **RGB Toggle** as **Fn+Caps Lock** * **RGB Hue Increase/Decrease** as **Fn+Q/A** * **RGB Saturation Increase/Decrease** as **Fn+W/S** * **RGB Value Increase/Decrease** as **Fn+E/D** * **RGB Mode Next/Previous** as **Fn+Tab/Shift+Tab** -* **RGB Toggle Layer Indication** as **Fn+X** +* **RGB Toggle Layer Indication** as **Fn+Z** * Changes RGB Color with Layer change (*uses custom RGB_THEME*). -* **RGB Cycle Next Theme** as **Fn+C** +* **RGB Cycle Next Theme** as **Fn+X** diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/rules.mk b/layouts/community/tkl_ansi/brandonschlack/rules.mk similarity index 100% rename from keyboards/kbdfans/kbd8x_mk2/keymaps/brandonschlack/rules.mk rename to layouts/community/tkl_ansi/brandonschlack/rules.mk From 08c99f9b0c1f33f39c4c0ac93e538105af0dc6a5 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 4 Dec 2019 11:44:31 -0800 Subject: [PATCH 269/429] [Keymap] Add Debug by default on BDN9 --- keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index eb94d263b7b6..e5b33ed15dcd 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -198,6 +198,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; +void keyboard_post_init_keymap(void){ + // Debug to Console by default + debug_enable = true; +} + /** * Encoder */ From 4955635b7c9341b9b59878768e16f8258c2d089c Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 4 Dec 2019 11:45:11 -0800 Subject: [PATCH 270/429] [Keymap] Add CONSOLE_ENABLE to tkl rules --- layouts/community/tkl_ansi/brandonschlack/rules.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/layouts/community/tkl_ansi/brandonschlack/rules.mk b/layouts/community/tkl_ansi/brandonschlack/rules.mk index 5d135db7a847..5ce3c8ee4349 100644 --- a/layouts/community/tkl_ansi/brandonschlack/rules.mk +++ b/layouts/community/tkl_ansi/brandonschlack/rules.mk @@ -1,3 +1,4 @@ # Build Options +CONSOLE_ENABLE = yes # Enable Console for Debugging MOUSEKEY_ENABLE = no # Don't need Mouse Keys BACKLIGHT_ENABLE = no # Backlights not installed From 60c4c6aac01389c5b3365c2cc1f49ad705eef6dd Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 4 Dec 2019 11:46:11 -0800 Subject: [PATCH 271/429] [User] Fix DISABLE_RGB_THEME_ flags --- users/brandonschlack/rgb_theme_user.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/users/brandonschlack/rgb_theme_user.inc b/users/brandonschlack/rgb_theme_user.inc index ddac00e93bde..9f0d7e710dd2 100644 --- a/users/brandonschlack/rgb_theme_user.inc +++ b/users/brandonschlack/rgb_theme_user.inc @@ -41,7 +41,7 @@ RGB_THEME(CANVAS) = { { &CANVAS_WHITE, &CANVAS_ORANGE, &CANVAS_RED, &CANVAS_GREE #endif // DISABLE_RGB_THEME_CANVAS // Jamon Theme -#ifndef DISABLE_RGB_THEME_CANVAS +#ifndef DISABLE_RGB_THEME_JAMON #ifndef RGB_THEME_IMPLS RGB_THEME(JAMON) #else @@ -54,7 +54,7 @@ RGB_THEME(JAMON) = { { &JAMON_RED, &JAMON_LIGHTRED, &JAMON_WHITE, &JAMON_YELLOW #endif // DISABLE_RGB_THEME_JAMON // Striker Theme -#ifndef DISABLE_RGB_THEME_CANVAS +#ifndef DISABLE_RGB_THEME_STRIKER #ifndef RGB_THEME_IMPLS RGB_THEME(STRIKER) #else From a2092deb33f1b2d7c070a90d503626ad57d0021c Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 4 Dec 2019 11:46:48 -0800 Subject: [PATCH 272/429] [User] Disable unused themes --- users/brandonschlack/config.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/users/brandonschlack/config.h b/users/brandonschlack/config.h index 27b355e28b29..9a411199e199 100644 --- a/users/brandonschlack/config.h +++ b/users/brandonschlack/config.h @@ -14,6 +14,11 @@ # define RGB_THEME_ENABLE #endif +#ifdef RGB_THEME_ENABLE +# define DISABLE_RGB_THEME_STRIKER +# define DISABLE_RGB_THEME_OBLIQUE +#endif + #ifdef ENCODER_ENABLE # define TAP_CODE_DELAY 10 #else From f5dcab515483910bc5ca467f877e2c8d5d4c92f7 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 4 Dec 2019 11:48:08 -0800 Subject: [PATCH 273/429] [User] Add Metropolis RGB_THEME --- users/brandonschlack/rgb_theme_user.inc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/users/brandonschlack/rgb_theme_user.inc b/users/brandonschlack/rgb_theme_user.inc index 9f0d7e710dd2..a07e62b7896a 100644 --- a/users/brandonschlack/rgb_theme_user.inc +++ b/users/brandonschlack/rgb_theme_user.inc @@ -26,6 +26,20 @@ RGB_THEME(LASER) = { { &LASER_PURPLE, &LASER_PINK, &LASER_BLUE, &LASER_CYAN, &LA #endif // RGB_THEME_IMPLS #endif // DISABLE_RGB_THEME_LASER +// Metropolis Theme +#ifndef DISABLE_RGB_THEME_METROPOLIS +#ifndef RGB_THEME_IMPLS +RGB_THEME(METROPOLIS) +#else +RGB_THEME_COLOR(METROPOLIS, TEAL, 96, 207, 255); +RGB_THEME_COLOR(METROPOLIS, RED, HSV_RED); +RGB_THEME_COLOR(METROPOLIS, YELLOW, 24, 255, 255); +RGB_THEME_COLOR(METROPOLIS, BLUE, 168, 255, 255); +RGB_THEME_COLOR(METROPOLIS, WHITE, HSV_WHITE); +RGB_THEME(METROPOLIS) = { { &METROPOLIS_TEAL, &METROPOLIS_RED, &METROPOLIS_YELLOW, &METROPOLIS_BLUE, &METROPOLIS_WHITE } }; +#endif // RGB_THEME_IMPLS +#endif // DISABLE_RGB_THEME_METROPOLIS + // Canvas Theme #ifndef DISABLE_RGB_THEME_CANVAS #ifndef RGB_THEME_IMPLS From 83df3b3338479510e53b9b32184c5487d03a73df Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 9 Dec 2019 13:53:54 -0800 Subject: [PATCH 274/429] [User] Change REVERSE_ENCODER to ENCODER_FLIP --- users/brandonschlack/brandonschlack.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index 263701b9d1ec..ccf06f6309f8 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -135,10 +135,10 @@ __attribute__ ((weak)) void encoder_update_keymap(uint8_t index, bool clockwise) { } /** - * If REVERSE_ENCODER defined, then toggle clockwise + * If ENCODER_FLIP defined, then toggle clockwise */ void encoder_update_user(uint8_t index, bool clockwise) { -#ifdef REVERSE_ENCODER +#ifdef ENCODER_FLIP clockwise = !clockwise; #endif encoder_update_keymap(index, clockwise); From 789e3f74e572d52f96a33cc373d872a406078c90 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 9 Dec 2019 13:54:21 -0800 Subject: [PATCH 275/429] [Keymap] Flip encoder direction for BDN9 --- keyboards/keebio/bdn9/keymaps/brandonschlack/config.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h index 9ff479fc4d85..3955f2036f43 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h @@ -1,5 +1,7 @@ #pragma once +#define ENCODER_FLIP + #undef RGBLIGHT_ANIMATIONS #define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation From b223f0699a2c9936f3bdaa39b852d016413d3cdf Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 9 Dec 2019 16:17:35 -0800 Subject: [PATCH 276/429] [User] Add Right GUI/PlayPause Mod-Tap --- users/brandonschlack/process_records.h | 1 + 1 file changed, 1 insertion(+) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 985357ccf134..faa8b5912d8b 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -38,6 +38,7 @@ void matrix_scan_cmd_tab(void); * Used with >=65% layouts */ #define MM_RGUI RGUI_T(KC_MRWD) // Tap Right GUI for Prev Track +#define MM_RGPY RGUI_T(KC_MPLY) // Tap Right GUI for Play/Pause #define MM_RALT RALT_T(KC_MFFD) // Tap Right Alt for Next Track #define MM_FNPY LT(1, KC_MPLY) // Tap Fn for Play/Pause #define MM_RSFT RSFT_T(KC_MUTE) // Tap Right Shift for Mute From 0a2494e47a4174939635a55b00b2a9e40ca3a20f Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 9 Dec 2019 16:18:23 -0800 Subject: [PATCH 277/429] [Keymap] Move AN-C keymap to 60_ansi layout --- .../an_c/keymaps/brandonschlack/keymap.c | 89 ------------------- .../60_ansi/brandonschlack-ansi/keymap.c | 80 +++++++++++++++++ .../60_ansi/brandonschlack-ansi/rules.mk | 1 + 3 files changed, 81 insertions(+), 89 deletions(-) delete mode 100644 keyboards/cannonkeys/an_c/keymaps/brandonschlack/keymap.c create mode 100644 layouts/community/60_ansi/brandonschlack-ansi/keymap.c create mode 100644 layouts/community/60_ansi/brandonschlack-ansi/rules.mk diff --git a/keyboards/cannonkeys/an_c/keymaps/brandonschlack/keymap.c b/keyboards/cannonkeys/an_c/keymaps/brandonschlack/keymap.c deleted file mode 100644 index 5270604d132d..000000000000 --- a/keyboards/cannonkeys/an_c/keymaps/brandonschlack/keymap.c +++ /dev/null @@ -1,89 +0,0 @@ -#include QMK_KEYBOARD_H -#include "brandonschlack.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* Base layer - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │ ` │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │Bspc │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - * │ LShift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │↑ Shft│FnP│ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ - * │LCtl│LAlt│LGui│ Space │RGui│←Alt│↓ Fn│→Ctl│ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -[_BASE] = 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_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, \ - HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT_RSUP, MM_FNPY, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MT_RALT, MT_RFDN, MT_RCRT \ -), - -/* Function Layer - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │MKE│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│LHP│SLP│ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │ │Mte│VlD│VlU│ │ │ │ │F13│F14│F15│ ↑ │MNC│ Del │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │Ply│Prv│Nxt│ │ │ │ │Hom│PgU│ ← │ → │ Adjust │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - * │ │RTg│ │ │ │ │ │ │End│PgD│ ↓ │ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -[_FN] = LAYOUT_all( \ - QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, \ - _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_UP, MC_MSSN, KC_DELT, \ - _______, KC_MPLY, KC_MRWD, KC_MFFD, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, TG_ADJT, \ - _______, RGB_TOG, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______ \ -), - -/* Adjust Layer - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │MKE│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │RMod │RH+│RS+│RV+│RST│ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │RH-│RS-│RV-│ │ │ │ │ │ │ │ │ Adjust │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - * │ │RTg│RLy│RTh│ │ │ │ │ │ │ │ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -[_ADJUST] = LAYOUT_all( \ - QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, TG_ADJT, \ - _______, RGB_TOG, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______ \ -) -/* Layer - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -/* -[BLANK] = LAYOUT_all( \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______ \ -) -*/ -}; diff --git a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c new file mode 100644 index 000000000000..069ef8d6d2d0 --- /dev/null +++ b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c @@ -0,0 +1,80 @@ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Base layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │`Es│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│| \│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ ↑ Shift│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │Ctrl│ Opt│ Cmd│ Space │CmdP│←Alt│↓ Fn│→Ctl│ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ +[_BASE] = LAYOUT_60_ansi( \ + KC_GESC, 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_BSLS, \ + HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT_RSUP, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MT_RALT, MT_RFDN, MT_RCRT \ +), + +/* Function Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │MKE│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ Del │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │RMod │RH+│RS+│RV+│AS+│ │ │ │F13│F14│F15│PgU│LHP│ SLP │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │RTgl │RH-│RS-│RV-│AS-│ │ │ │VlD│VlU│Hom│End│ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │LYR│Thm│ │ │RST│ │Mte│Prv│Nxt│PgD│ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ +[_FN] = LAYOUT_60_ansi( \ + QM_MAKE, 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_DELT, \ + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_PGUP, MC_LHPD, MC_SLPD, \ + RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_HOME, KC_PGUP, KC_HOME, KC_END, _______, \ + _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, KC_MUTE, KC_MRWD, KC_MFFD, KC_PGDN, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______ \ +), +/* Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ +/* +[BLANK] = LAYOUT_60_ansi( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______ \ +) +*/ +}; + +void matrix_init_keymap(void) { + //user initialization +} + +void matrix_scan_keymap(void) { + //user matrix +} + +bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { + return true; +} diff --git a/layouts/community/60_ansi/brandonschlack-ansi/rules.mk b/layouts/community/60_ansi/brandonschlack-ansi/rules.mk new file mode 100644 index 000000000000..7aaf727ad220 --- /dev/null +++ b/layouts/community/60_ansi/brandonschlack-ansi/rules.mk @@ -0,0 +1 @@ +USER_NAME := brandonschlack From f9ed10f24888d1125b339149b6d319ed7f2d4a2f Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 11 Dec 2019 11:09:49 -0800 Subject: [PATCH 278/429] [User] Remove Grave Escape for personal keymaps --- .../discipline/keymaps/brandonschlack/keymap.c | 8 ++++---- .../think65/solder/keymaps/brandonschlack/keymap.c | 12 ++++++------ .../65_ansi_blocker/brandonschlack/keymap.c | 12 ++++++------ users/brandonschlack/config.h | 1 - 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c index 0639fe9749f1..de03817f69e9 100644 --- a/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c +++ b/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ */ [_BASE] = LAYOUT_65_ansi( \ - KC_GESC, 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_HOME, \ + 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_HOME, \ 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_PGUP, \ HY_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_PGDN, \ 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_UP, KC_END, \ @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │Mke│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ Del │SlD│ + * │` ~│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ Del │SlD│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ * │ │ │ │ │ │ │ │ │ │ │F13│F14│F15│ LHP │VlU│ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ @@ -51,10 +51,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ */ [_FN] = LAYOUT_65_ansi( - QM_MAKE, 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_DELT, MC_SLPD, \ + 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_DELT, MC_SLPD, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_VOLU, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_MUTE, \ + _______, _______, _______, _______, _______, _______, _______, QM_MAKE, _______, _______, _______, _______, KC_PGUP, KC_MUTE, \ _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ) }; diff --git a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c index fbb293340872..72bc405ea226 100644 --- a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c +++ b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c @@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │`Es│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│PgU│ + * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│PgU│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│| \│PgD│ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ [_BASE] = LAYOUT_65_ansi_blocker( \ - KC_GESC, 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_PGUP, \ + 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_PGUP, \ 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_PGDN, \ HY_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, XXXXXXX, \ 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_UP, XXXXXXX, \ @@ -39,22 +39,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │Mke│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ Delete│VlU│ + * │` ~│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ Delete│VlU│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ * │RMod │RH+│RS+│RV+│ │ │ │ │ │ │F13│F14│F15│ SlpD│VlD│ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ * │RTgl │RH-│RS-│RV-│ │ │ │ │ │ │MNC│LHP│ │ │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ │ - * │ │LYR│Thm│ │ │RST│ │ │Prv│Nxt│Ply│MteSft│PgU│ │ + * │ │LYR│Thm│ │ │RST│ │Mke│Prv│Nxt│Ply│MteSft│PgU│ │ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ * │ │ │ │ │ │ │ │Hom│PgD│End│ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ [_FN] = LAYOUT_65_ansi_blocker( \ - QM_MAKE, 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_DELT, KC_VOLU, \ + 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_DELT, KC_VOLU, \ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_SLPD, KC_VOLD, \ RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, MC_MSSN, MC_LHPD, _______, XXXXXXX, \ - _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, MM_RSFT, KC_PGUP, XXXXXXX, \ + _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, QM_MAKE, KC_MRWD, KC_MFFD, KC_MPLY, MM_RSFT, KC_PGUP, XXXXXXX, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), /* Blank Layout diff --git a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c index 7901b31a27da..3ea4d8e39dbb 100644 --- a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c +++ b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c @@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │`Es│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│Hom│ + * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│Hom│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│| \│PgU│ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ [_BASE] = LAYOUT_65_ansi_blocker( \ - KC_GESC, 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_HOME, \ + 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_HOME, \ 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_PGUP, \ HY_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_PGDN, \ 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_UP, KC_END, \ @@ -39,22 +39,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │Mke│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ Delete│SlD│ + * │` ~│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ Delete│SlD│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ * │RMod │RH+│RS+│RV+│AS+│ │ │ │ │ │F13│F14│F15│ LHP │VlU│ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ * │RTgl │RH-│RS-│RV-│AS-│ │ │ │ │ │ │ │ │VlD│ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │ │LYR│Thm│ │ │RST│ │ │Prv│Nxt│Ply│ │PgU│Mut│ + * │ │LYR│Thm│ │ │RST│ │Mke│Prv│Nxt│Ply│ │PgU│Mut│ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ * │ │ │ │ │ │ │ │Hom│PgD│End│ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ [_FN] = LAYOUT_65_ansi_blocker( \ - QM_MAKE, 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_DELT, MC_SLPD, \ + 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_DELT, MC_SLPD, \ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_VOLU, \ RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, \ - _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, KC_PGUP, KC_MUTE, \ + _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, QM_MAKE, KC_MRWD, KC_MFFD, KC_MPLY, _______, KC_PGUP, KC_MUTE, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), /* Blank Layout diff --git a/users/brandonschlack/config.h b/users/brandonschlack/config.h index 9a411199e199..de0d33509013 100644 --- a/users/brandonschlack/config.h +++ b/users/brandonschlack/config.h @@ -4,7 +4,6 @@ #define TAPPING_TERM 200 #define PERMISSIVE_HOLD #define TAP_HOLD_CAPS_DELAY 200 -#define GRAVE_ESC_ALT_OVERRIDE #ifdef RGBLIGHT_ENABLE # define RGBLIGHT_SLEEP From 4e55b4b8bdcf300c918d77811576d63cc77b2c02 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 11 Dec 2019 11:58:20 -0800 Subject: [PATCH 279/429] [Keymap] Remove Grave Escape from 60-ansi keymap --- layouts/community/60_ansi/brandonschlack-ansi/keymap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c index 069ef8d6d2d0..d43bad9fcf48 100644 --- a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c +++ b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c @@ -4,7 +4,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │`Es│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│ + * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│| \│ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ @@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ */ [_BASE] = LAYOUT_60_ansi( \ - KC_GESC, 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_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_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, \ HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT_RSUP, \ @@ -31,16 +31,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ * │RTgl │RH-│RS-│RV-│AS-│ │ │ │VlD│VlU│Hom│End│ │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │LYR│Thm│ │ │RST│ │Mte│Prv│Nxt│PgD│ │ + * │ │LYR│Thm│ │ │RST│ │Mte│Prv│Nxt│PgD│ MteSft │ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ * │ │ │ │ │ │ │ │ │ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ */ [_FN] = LAYOUT_60_ansi( \ - QM_MAKE, 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_DELT, \ + 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_DELT, \ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_PGUP, MC_LHPD, MC_SLPD, \ RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_HOME, KC_PGUP, KC_HOME, KC_END, _______, \ - _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, KC_MUTE, KC_MRWD, KC_MFFD, KC_PGDN, _______, \ + _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, QM_MAKE, KC_MRWD, KC_MFFD, KC_PGDN, MM_RSFT, \ _______, _______, _______, _______, _______, _______, _______, _______ \ ), /* Layer From e209bdc5b3fc855de22bbe9d0015fee028f20879 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 11 Dec 2019 11:59:42 -0800 Subject: [PATCH 280/429] [Keymap] Only enable RGBLIGHT Breathing on think65 --- .../gray_studio/think65/solder/keymaps/brandonschlack/config.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/config.h b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/config.h index 26c6d6ade101..309eb91979d7 100644 --- a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/config.h +++ b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/config.h @@ -16,4 +16,5 @@ #pragma once -// place overrides here +#undef RGBLIGHT_ANIMATIONS +#define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation From a8ea4ec261b7f95e2b38d0e9b38ab894732554d2 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 11 Dec 2019 13:53:02 -0800 Subject: [PATCH 281/429] =?UTF-8?q?[Keymap]=20Update=20keymap=20readme?= =?UTF-8?q?=E2=80=99s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../think65/solder/keymaps/brandonschlack/readme.md | 8 ++++---- .../community/65_ansi_blocker/brandonschlack/readme.md | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/readme.md b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/readme.md index d7de5c1bebd3..76174061a98e 100644 --- a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/readme.md +++ b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/readme.md @@ -2,8 +2,8 @@ My keymap for the Think6.5. Using the `LAYOUT_65_ansi_blocker` LAYOUT and based on my keyboard-agnostic layout, some small changes for the navigation keys not present due to the badge. -## Base Layer -![Base Layer](https://i.imgur.com/TRcV2KD.jpg) +## [Base Layer](http://www.keyboard-layout-editor.com/#/gists/b396fee9f49d6e9493876e82a8ee99ac) +![Base Layer](https://i.imgur.com/AZYVuZS.jpg) -## Function Layer -![Function Layer](https://i.imgur.com/CeRJdAS.jpg) +## [Function Layer](http://www.keyboard-layout-editor.com/#/gists/06e684133399bb63d8b72ac6982e0e68) +![Function Layer](https://i.imgur.com/GbOOxME.jpg) diff --git a/layouts/community/65_ansi_blocker/brandonschlack/readme.md b/layouts/community/65_ansi_blocker/brandonschlack/readme.md index bdee3467ad77..effb00846536 100644 --- a/layouts/community/65_ansi_blocker/brandonschlack/readme.md +++ b/layouts/community/65_ansi_blocker/brandonschlack/readme.md @@ -5,5 +5,11 @@ This is my preferred 65% layout. It is used on: * [Massdrop ALT](https://github.com/qmk/qmk_firmware/tree/master/keyboards/massdrop/alt) -* [KBD67 mkii](https://github.com/qmk/qmk_firmware/tree/master/keyboards/kbdfans/kbd67/mkiirgb) +* [KBD67 MKII](https://github.com/qmk/qmk_firmware/tree/master/keyboards/kbdfans/kbd67/mkiirgb) + +## [Base Layer](http://www.keyboard-layout-editor.com/#/gists/a820c8629394f8f4c3943e6ee518d9a8) +![Base Layer](https://i.imgur.com/gPxDZl7.jpg) + +## [Function Layer](http://www.keyboard-layout-editor.com/#/gists/8ca73a6d3bec8ce736f5db60edf31dcf) +![Function Layer](https://i.imgur.com/gNKHgWa.jpg) From 7ec2d3227e540d834858e1328873479fb0b3e64e Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Wed, 11 Dec 2019 22:52:51 -0800 Subject: [PATCH 282/429] [Keymap] Use LAYOUT_all for think65 keymap --- .../solder/keymaps/brandonschlack/keymap.c | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c index 72bc405ea226..91def7a403c5 100644 --- a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c +++ b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c @@ -30,12 +30,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │Ctrl│ Opt│ Cmd│ Space │Cmd │FnPy│ │Lef│Dow│Rig│ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ -[_BASE] = LAYOUT_65_ansi_blocker( \ - 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_PGUP, \ - 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_PGDN, \ - HY_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, XXXXXXX, \ - 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_UP, XXXXXXX, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT \ +[_BASE] = 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, XXXXXXX, KC_PGUP, \ + 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_PGDN, \ + HY_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, XXXXXXX, \ + KC_LSFT, XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, XXXXXXX, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ @@ -50,12 +50,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ │ │ │ │ │ │Hom│PgD│End│ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ -[_FN] = LAYOUT_65_ansi_blocker( \ - 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_DELT, KC_VOLU, \ - RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_SLPD, KC_VOLD, \ - RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, MC_MSSN, MC_LHPD, _______, XXXXXXX, \ - _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, QM_MAKE, KC_MRWD, KC_MFFD, KC_MPLY, MM_RSFT, KC_PGUP, XXXXXXX, \ - _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ +[_FN] = LAYOUT_all( \ + 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_DELT, XXXXXXX, KC_VOLU, \ + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_SLPD, KC_VOLD, \ + RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, MC_MSSN, MC_LHPD, _______, XXXXXXX, \ + _______, XXXXXXX, RGB_LYR, RGB_THM, _______, _______, RESET, _______, QM_MAKE, KC_MRWD, KC_MFFD, KC_MPLY, MM_RSFT, KC_PGUP, XXXXXXX, \ + _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), /* Blank Layout * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ @@ -69,12 +69,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ * │ │ │ │ │ │ │ │ │ │ │ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ -[X] = LAYOUT_65_ansi_blocker( \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +[X] = LAYOUT_all( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), */ }; From e5e2b365dec8ffa17cb91405fd4a3382f02d9b62 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 12 Dec 2019 12:13:50 -0800 Subject: [PATCH 283/429] [User] Remove explicit RGB mode in keyboard init --- users/brandonschlack/rgb_bs.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index cbe2559d8645..9762e54e6a85 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -30,11 +30,6 @@ rgb_theme_color_t default_adjust = { HSV_SPRINGGREEN }; void keyboard_post_init_rgb(void) { layer_state_set_user(layer_state); -#if defined(RGBLIGHT_ENABLE) - rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); -#elif defined(RGB_MATRIX_ENABLE) - rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR); -#endif } #if defined(RGB_THEME_ENABLE) From bff02f3a25643043fc8f705eafb0a7a2c3f395a4 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 16 Dec 2019 16:00:39 -0800 Subject: [PATCH 284/429] [User] Add PW_ATFL shortcut macro * Add shortcut for Password Autofill, used on 40/50% boards --- layouts/community/ortho_4x12/brandonschlack/keymap.c | 2 +- layouts/community/ortho_5x12/brandonschlack/keymap.c | 2 +- users/brandonschlack/process_records.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c index da755f57c33e..4ed5dd444142 100644 --- a/layouts/community/ortho_4x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c @@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, MC_BACK, MC_FWRD, PRV_TAB, NXT_TAB, NXT_WIN, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, PW_ATFL, _______, _______, _______, _______, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ // └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c index 17c35a218d82..abc5553c88fa 100644 --- a/layouts/community/ortho_5x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, MC_BACK, MC_FWRD, PRV_TAB, NXT_TAB, NXT_WIN, \ // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, PW_ATFL, _______, _______, _______, _______, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ // └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index faa8b5912d8b..708f0e2aa325 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -86,6 +86,7 @@ void matrix_scan_cmd_tab(void); #define MC_PLYR LGUI(KC_F8) // Focuses current Media Player #define MC_UNDO LGUI(KC_Z) // Undo (Command-Z) #define MC_REDO LSFT(LGUI(KC_Z)) // Redo (Shift-Command-Z) +#define PW_ATFL HYPR(KC_BSLS) // Password Autofill (Shift-Control-Option-Command-\) // Reverse scrolling for using with macOS Natural Scrolling. #define MC_WH_U KC_WH_D // Mouse Wheel Up #define MC_WH_D KC_WH_U // Mouse Wheel Down From fb25437bacc80977554623f5165494692c002e22 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 26 Dec 2019 11:54:35 -0800 Subject: [PATCH 285/429] [User] Add CTPC to make command --- users/brandonschlack/process_records.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index d6e03cfd8094..1faf69d38c94 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -141,8 +141,11 @@ void send_make_command(bool flash_bootloader) { #else // use universal flash command send_string_with_delay_P(PSTR(":flash"), SS_DELAY); #endif -#if defined(FORCE_LAYOUT) +#if defined(FORCE_LAYOUT) // Add layout string if built with FORCE_LAYOUT send_string_with_delay_P(PSTR(" FORCE_LAYOUT=" FORCE_LAYOUT), SS_DELAY); +#endif +#if defined(CONVERT_TO_PROTON_C) // Add CTPC if built with CONVERT_TO_PROTON_C + send_string_with_delay_P(PSTR(" CTPC=" CONVERT_TO_PROTON_C), SS_DELAY); #endif } send_string_with_delay_P(PSTR(SS_TAP(X_ENTER)), SS_DELAY); From d5cd9a5e4238b42e062cc289e4bc2700dbdade5b Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 27 Dec 2019 11:13:36 -0800 Subject: [PATCH 286/429] [User] Increase eeprom padding for theme index --- users/brandonschlack/brandonschlack.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 4b1c96195681..6b862c77a896 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -36,7 +36,7 @@ typedef union { uint32_t raw; struct { bool rgb_layer_change :1; - uint8_t rgb_theme :2; + uint8_t rgb_theme :4; }; } user_config_t; extern user_config_t user_config; From 169abea908f6df00b780b20072a923329749625f Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 8 Jan 2020 13:43:11 -0800 Subject: [PATCH 287/429] [Keymap] Add space65 options to 65_ansi_blocker --- layouts/community/65_ansi_blocker/brandonschlack/rules.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/layouts/community/65_ansi_blocker/brandonschlack/rules.mk b/layouts/community/65_ansi_blocker/brandonschlack/rules.mk index 7307f9f9e79a..858496707618 100644 --- a/layouts/community/65_ansi_blocker/brandonschlack/rules.mk +++ b/layouts/community/65_ansi_blocker/brandonschlack/rules.mk @@ -1 +1,7 @@ # Build Options +ifeq ($(strip $(KEYBOARD)), gray_studio/space65) + MOUSEKEY_ENABLE = no + BACKLIGHT_ENABLE = no + CONSOLE_ENABLE = yes + COMMAND_ENABLE = yes +endif From a80f883a64f2dec6ba8322bbccfba0aef67b2ceb Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 8 Jan 2020 14:31:04 -0800 Subject: [PATCH 288/429] [User] Move eeconfig_read_user to pre_init --- users/brandonschlack/brandonschlack.c | 10 ++++++++-- users/brandonschlack/brandonschlack.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index ccf06f6309f8..ce1e91b9067e 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -14,6 +14,14 @@ void eeconfig_init_user(void) { eeconfig_update_user(user_config.raw); } +__attribute__((weak)) void keyboard_pre_init_keymap(void) {} + +void keyboard_pre_init_user(void) { + // Read the user config from EEPROM + user_config.raw = eeconfig_read_user(); + keyboard_pre_init_keymap(); +} + __attribute__((weak)) void matrix_init_keymap(void){ } @@ -29,8 +37,6 @@ void keyboard_post_init_keymap(void){ } * calls RGB init if RGBs enabled */ void keyboard_post_init_user(void){ - // Read the user config from EEPROM - user_config.raw = eeconfig_read_user(); // Do RGB things if RGBs enabled #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) keyboard_post_init_rgb(); diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 6b862c77a896..23ba0dfe91d6 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -41,6 +41,7 @@ typedef union { } user_config_t; extern user_config_t user_config; +void keyboard_pre_init_keymap(void); void matrix_init_keymap(void); void keyboard_post_init_keymap(void); void shutdown_keymap(void); From b3625d68d080222bff32cbecf155701c0def049b Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 8 Jan 2020 14:32:22 -0800 Subject: [PATCH 289/429] [User] Add debug messages for RGB_THEME --- users/brandonschlack/process_records.c | 2 ++ users/brandonschlack/rgb_bs.c | 1 + 2 files changed, 3 insertions(+) diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index 1faf69d38c94..d3d0c806db86 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -74,6 +74,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case RGB_LYR: if (record->event.pressed) { user_config.rgb_layer_change ^= 1; + dprintf("rgb layer change [EEPROM]: %u\n", user_config.rgb_layer_change); eeconfig_update_user(user_config.raw); if (user_config.rgb_layer_change) { layer_state_set(layer_state); @@ -84,6 +85,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { if (user_config.rgb_layer_change) { user_config.rgb_layer_change = false; + dprintf("rgb layer change [EEPROM]: %u\n", user_config.rgb_layer_change); eeconfig_update_user(user_config.raw); } } diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index 9762e54e6a85..d09035a662a7 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -38,6 +38,7 @@ void set_rgb_theme(uint8_t index) { user_config.rgb_layer_change = true; } user_config.rgb_theme = index; + dprintf("rgb theme [EEPROM]: %u\n", user_config.rgb_theme); eeconfig_update_user(user_config.raw); } From 32e33d47f8bcff4c24bb14bf78a8df5374845b4d Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 8 Jan 2020 14:34:24 -0800 Subject: [PATCH 290/429] [User] Fix RGB keycodes with RGB_THEME --- users/brandonschlack/process_records.c | 1 + 1 file changed, 1 insertion(+) diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index d3d0c806db86..52efce648d28 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -89,6 +89,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { eeconfig_update_user(user_config.raw); } } + break; case RGB_THEME_FORWARD: if (record->event.pressed) { uint8_t shifted = get_mods() & (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)); From 569cc80a0221972784ba61fc9d8a40c298c826b6 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 13 Jan 2020 13:34:46 -0800 Subject: [PATCH 291/429] [Keymap] Add Constant Mouse Keys to BDN9 keymap --- keyboards/keebio/bdn9/keymaps/brandonschlack/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h index 3955f2036f43..5a0e76c6a483 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h @@ -6,5 +6,5 @@ #define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation /* Mouse Keys Configuration */ -// #define MK_3_SPEED -// #define MK_W_INTERVAL_UNMOD 20 +#define MK_3_SPEED +#define MK_W_INTERVAL_UNMOD 20 From b2aa9b109d19041f019ff7716c1bb1cc0d3db78d Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 13 Jan 2020 18:15:31 -0800 Subject: [PATCH 292/429] [Keymap] Fix 60_ansi layout * Add Media Mod Tap for RCmd --- layouts/community/60_ansi/brandonschlack-ansi/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c index d43bad9fcf48..0fc4f19483da 100644 --- a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c +++ b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, \ HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT_RSUP, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MT_RALT, MT_RFDN, MT_RCRT \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MM_RGPY, MT_RALT, MT_RFDN, MT_RCRT \ ), /* Function Layer From e79a66e83cc6a92e7aa180fad8206ce60cdb1925 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 15 Jan 2020 11:56:48 -0800 Subject: [PATCH 293/429] [Keymap] Update preview to match keymap --- layouts/community/60_ansi/brandonschlack-ansi/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c index 0fc4f19483da..aa11cd464c0e 100644 --- a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c +++ b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c @@ -25,13 +25,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │MKE│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ Del │ + * │~ `│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ Del │ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ * │RMod │RH+│RS+│RV+│AS+│ │ │ │F13│F14│F15│PgU│LHP│ SLP │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ * │RTgl │RH-│RS-│RV-│AS-│ │ │ │VlD│VlU│Hom│End│ │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │LYR│Thm│ │ │RST│ │Mte│Prv│Nxt│PgD│ MteSft │ + * │ │LYR│Thm│ │ │RST│ │MKE│Prv│Nxt│PgD│ MteSft │ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ * │ │ │ │ │ │ │ │ │ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ From 7a6aa194fa25ac44b3c79f332615564567965be5 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 15 Jan 2020 15:43:01 -0800 Subject: [PATCH 294/429] [Keymap] Move gingham to 60_ansi_split_bs_rshift --- .../gingham/keymaps/brandonschlack/keymap.c | 71 -------------- .../brandonschlack-split/keymap.c | 94 +++++++++++++++++++ .../brandonschlack-split/rules.mk | 1 + 3 files changed, 95 insertions(+), 71 deletions(-) delete mode 100644 keyboards/gingham/keymaps/brandonschlack/keymap.c create mode 100644 layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c create mode 100644 layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/rules.mk diff --git a/keyboards/gingham/keymaps/brandonschlack/keymap.c b/keyboards/gingham/keymaps/brandonschlack/keymap.c deleted file mode 100644 index 67b6cbc5ff89..000000000000 --- a/keyboards/gingham/keymaps/brandonschlack/keymap.c +++ /dev/null @@ -1,71 +0,0 @@ -/* Copyright 2018 Yiancar - * - * 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 . - */ -#include QMK_KEYBOARD_H -#include "brandonschlack.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* Base layer - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │ ` │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │Bspc │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - * │ LShift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │↑ Shft│FnP│ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ - * │LCtl│LAlt│LGui│ Space │RGui│←Alt│↓ Fn│→Ctl│ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -[_BASE] = LAYOUT_60_ansi_split_bs_rshift( - 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, - HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT_RSUP, MM_FNPY, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MT_RALT, MT_RFDN, MT_RCRT), - -/* Function Layer - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │MKE│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│LHP│SLP│ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │ │Mte│VlD│VlU│ │ │ │ │F13│F14│F15│ ↑ │MNC│ Del │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │Ply│Prv│Nxt│ │ │ │ │Hom│PgU│ ← │ → │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - * │ │ │ │ │ │ │ │ │End│PgD│ ↓ │ │ │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ - * │ │ │ │ │ │ │ │ │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ - */ -[_FN] = LAYOUT_60_ansi_split_bs_rshift( - QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, - KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F13, KC_F14, KC_F15, KC_UP, MC_MSSN, KC_DEL, - KC_TRNS, KC_MPLY, KC_MRWD, KC_MFFD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), -}; - -void matrix_init_keymap(void) { - //user initialization -} - -void matrix_scan_keymap(void) { - //user matrix -} - -bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { - return true; -} diff --git a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c new file mode 100644 index 000000000000..f91c9e7c86ce --- /dev/null +++ b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c @@ -0,0 +1,94 @@ +/* Copyright 2018 Yiancar + * + * 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 . + */ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Base layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│Bspc │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + * │ LShift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │↑ Shft│FnP│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ + * │LCtl│LAlt│LGui│ Space │RGui│←Alt│↓ Fn│→Ctl│ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ +[_BASE] = LAYOUT_60_ansi_split_bs_rshift( \ + 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, \ + HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT_RSUP, MM_FNPY, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MT_RALT, MT_RFDN, MT_RCRT \ +), + +/* Function Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │MKE│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│LHP│SLP│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │RMod │RH+│RS+│RV+│AS+│ │ │ │F13│F14│F15│PgU│MNC│ Del │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │RTgl │RH-│RS-│RV-│AS-│ │ │ │VlD│VlU│Hom│End│ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + * │ │LYR│Thm│ │ │RST│ │Mte│Prv│Nxt│PgD│ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ +[_FN] = LAYOUT_60_ansi_split_bs_rshift( \ + QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, \ + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_PGUP, MC_MSSN, KC_DELT, \ + RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_VOLD, KC_VOLU, KC_HOME, KC_END, _______, \ + _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, KC_MUTE, KC_MRWD, KC_MFFD, KC_PGDN, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______ \ +), +/* Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ + * │ │ │ │ │ │ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ +/* +[BLANK] = LAYOUT_60_ansi_split_bs_rshift( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______ \ +) +*/ + +void matrix_init_keymap(void) { + //user initialization +} + +void matrix_scan_keymap(void) { + //user matrix +} + +bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { + return true; +} diff --git a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/rules.mk b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/rules.mk new file mode 100644 index 000000000000..7aaf727ad220 --- /dev/null +++ b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/rules.mk @@ -0,0 +1 @@ +USER_NAME := brandonschlack From 24578a4079d7f187b24366836f1e900c6d1668c5 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 15 Jan 2020 15:43:22 -0800 Subject: [PATCH 295/429] [Keymap] Update 60_ansi layout --- layouts/community/60_ansi/brandonschlack-ansi/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c index aa11cd464c0e..cabd121661a9 100644 --- a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c +++ b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c @@ -38,8 +38,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FN] = LAYOUT_60_ansi( \ 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_DELT, \ - RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_PGUP, MC_LHPD, MC_SLPD, \ - RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_HOME, KC_PGUP, KC_HOME, KC_END, _______, \ + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_PGUP, MC_MSSN, MC_SLPD, \ + RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_VOLD, KC_VOLU, KC_HOME, KC_END, _______, \ _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, QM_MAKE, KC_MRWD, KC_MFFD, KC_PGDN, MM_RSFT, \ _______, _______, _______, _______, _______, _______, _______, _______ \ ), From 54f0134bf123a3dbe48be41579d804dd5e058093 Mon Sep 17 00:00:00 2001 From: Maarten Dekkers Date: Thu, 16 Jan 2020 00:53:09 +0100 Subject: [PATCH 296/429] [Keyboard] Add Eon40 keyboard (#7885) * Add Eon40 files * Make required changes * Add missing comma * Update rules.mk --- keyboards/maartenwut/eon40/config.h | 254 ++++++++++++++++++ keyboards/maartenwut/eon40/eon40.c | 16 ++ keyboards/maartenwut/eon40/eon40.h | 67 +++++ keyboards/maartenwut/eon40/info.json | 18 ++ .../maartenwut/eon40/keymaps/default/keymap.c | 46 ++++ .../eon40/keymaps/default/readme.md | 1 + keyboards/maartenwut/eon40/readme.md | 21 ++ keyboards/maartenwut/eon40/rules.mk | 37 +++ 8 files changed, 460 insertions(+) create mode 100644 keyboards/maartenwut/eon40/config.h create mode 100644 keyboards/maartenwut/eon40/eon40.c create mode 100644 keyboards/maartenwut/eon40/eon40.h create mode 100644 keyboards/maartenwut/eon40/info.json create mode 100644 keyboards/maartenwut/eon40/keymaps/default/keymap.c create mode 100644 keyboards/maartenwut/eon40/keymaps/default/readme.md create mode 100644 keyboards/maartenwut/eon40/readme.md create mode 100644 keyboards/maartenwut/eon40/rules.mk diff --git a/keyboards/maartenwut/eon40/config.h b/keyboards/maartenwut/eon40/config.h new file mode 100644 index 000000000000..e786255ffb70 --- /dev/null +++ b/keyboards/maartenwut/eon40/config.h @@ -0,0 +1,254 @@ +/* Copyright 2019 Maarten Dekkers + * + * 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 . + */ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x4705 +#define PRODUCT_ID 0x0140 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Maartenwut +#define PRODUCT Eon40 +#define DESCRIPTION A 40% ortholinear PCB + +/* key matrix size */ +#define MATRIX_ROWS 4 +#define MATRIX_COLS 12 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * +*/ +#define MATRIX_ROW_PINS {B7,D5,F5,F6} +#define MATRIX_COL_PINS {F0,F1,F4,D3,D4,D6,D7,B4,B5,B6,C6,C7} +#define UNUSED_PINS {B1,B2,B3} + +#define ENCODERS_PAD_A { E6, B0, D1 } +#define ENCODERS_PAD_B { F7, D0, D2 } + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +/* + * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. + */ +// #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 + +// #define BACKLIGHT_PIN B7 +// #define BACKLIGHT_BREATHING +// #define BACKLIGHT_LEVELS 3 + +// #define RGB_DI_PIN E2 +// #ifdef RGB_DI_PIN +// #define RGBLED_NUM 16 +// #define RGBLIGHT_HUE_STEP 8 +// #define RGBLIGHT_SAT_STEP 8 +// #define RGBLIGHT_VAL_STEP 8 +// #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ +// #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +// /*== all animations enable ==*/ +// #define RGBLIGHT_ANIMATIONS +// /*== or choose animations ==*/ +// #define RGBLIGHT_EFFECT_BREATHING +// #define RGBLIGHT_EFFECT_RAINBOW_MOOD +// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL +// #define RGBLIGHT_EFFECT_SNAKE +// #define RGBLIGHT_EFFECT_KNIGHT +// #define RGBLIGHT_EFFECT_CHRISTMAS +// #define RGBLIGHT_EFFECT_STATIC_GRADIENT +// #define RGBLIGHT_EFFECT_RGB_TEST +// #define RGBLIGHT_EFFECT_ALTERNATING +// /*== customize breathing effect ==*/ +// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ +// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 +// /*==== use exp() and sin() ====*/ +// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 +// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +// #endif + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. + * This is userful for the Windows task manager shortcut (ctrl+shift+esc). + */ +// #define GRAVE_ESC_CTRL_OVERRIDE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Magic Key Options + * + * Magic keys are hotkey commands that allow control over firmware functions of + * the keyboard. They are best used in combination with the HID Listen program, + * found here: https://www.pjrc.com/teensy/hid_listen.html + * + * The options below allow the magic key functionality to be changed. This is + * useful if your keyboard/keypad is missing keys and you want magic key support. + * + */ + +/* key combination for magic key command */ +/* defined by default; to change, uncomment and set to the combination you want */ +// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT) + +/* control how magic key switches layers */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false + +/* override magic key keymap */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM +//#define MAGIC_KEY_HELP H +//#define MAGIC_KEY_HELP_ALT SLASH +//#define MAGIC_KEY_DEBUG D +//#define MAGIC_KEY_DEBUG_MATRIX X +//#define MAGIC_KEY_DEBUG_KBD K +//#define MAGIC_KEY_DEBUG_MOUSE M +//#define MAGIC_KEY_VERSION V +//#define MAGIC_KEY_STATUS S +//#define MAGIC_KEY_CONSOLE C +//#define MAGIC_KEY_LAYER0 0 +//#define MAGIC_KEY_LAYER0_ALT GRAVE +//#define MAGIC_KEY_LAYER1 1 +//#define MAGIC_KEY_LAYER2 2 +//#define MAGIC_KEY_LAYER3 3 +//#define MAGIC_KEY_LAYER4 4 +//#define MAGIC_KEY_LAYER5 5 +//#define MAGIC_KEY_LAYER6 6 +//#define MAGIC_KEY_LAYER7 7 +//#define MAGIC_KEY_LAYER8 8 +//#define MAGIC_KEY_LAYER9 9 +//#define MAGIC_KEY_BOOTLOADER B +//#define MAGIC_KEY_BOOTLOADER_ALT ESC +//#define MAGIC_KEY_LOCK CAPS +//#define MAGIC_KEY_EEPROM E +//#define MAGIC_KEY_EEPROM_CLEAR BSPACE +//#define MAGIC_KEY_NKRO N +//#define MAGIC_KEY_SLEEP_LED Z + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION + +/* + * MIDI options + */ + +/* Prevent use of disabled MIDI features in the keymap */ +//#define MIDI_ENABLE_STRICT 1 + +/* enable basic MIDI features: + - MIDI notes can be sent when in Music mode is on +*/ +//#define MIDI_BASIC + +/* enable advanced MIDI features: + - MIDI notes can be added to the keymap + - Octave shift and transpose + - Virtual sustain, portamento, and modulation wheel + - etc. +*/ +//#define MIDI_ADVANCED + +/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ +//#define MIDI_TONE_KEYCODE_OCTAVES 1 + +/* + * HD44780 LCD Display Configuration + */ +/* +#define LCD_LINES 2 //< number of visible lines of the display +#define LCD_DISP_LENGTH 16 //< visibles characters per line of the display + +#define LCD_IO_MODE 1 //< 0: memory mapped mode, 1: IO port mode + +#if LCD_IO_MODE +#define LCD_PORT PORTB //< port for the LCD lines +#define LCD_DATA0_PORT LCD_PORT //< port for 4bit data bit 0 +#define LCD_DATA1_PORT LCD_PORT //< port for 4bit data bit 1 +#define LCD_DATA2_PORT LCD_PORT //< port for 4bit data bit 2 +#define LCD_DATA3_PORT LCD_PORT //< port for 4bit data bit 3 +#define LCD_DATA0_PIN 4 //< pin for 4bit data bit 0 +#define LCD_DATA1_PIN 5 //< pin for 4bit data bit 1 +#define LCD_DATA2_PIN 6 //< pin for 4bit data bit 2 +#define LCD_DATA3_PIN 7 //< pin for 4bit data bit 3 +#define LCD_RS_PORT LCD_PORT //< port for RS line +#define LCD_RS_PIN 3 //< pin for RS line +#define LCD_RW_PORT LCD_PORT //< port for RW line +#define LCD_RW_PIN 2 //< pin for RW line +#define LCD_E_PORT LCD_PORT //< port for Enable line +#define LCD_E_PIN 1 //< pin for Enable line +#endif +*/ + +/* Bootmagic Lite key configuration */ +// #define BOOTMAGIC_LITE_ROW 0 +// #define BOOTMAGIC_LITE_COLUMN 0 + +#define QMK_ESC_OUTPUT F0 // usually COL +#define QMK_ESC_INPUT B7 // usually ROW diff --git a/keyboards/maartenwut/eon40/eon40.c b/keyboards/maartenwut/eon40/eon40.c new file mode 100644 index 000000000000..5a6fe4b20414 --- /dev/null +++ b/keyboards/maartenwut/eon40/eon40.c @@ -0,0 +1,16 @@ +/* Copyright 2019 Maarten Dekkers + * + * 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 . + */ +#include "eon40.h" diff --git a/keyboards/maartenwut/eon40/eon40.h b/keyboards/maartenwut/eon40/eon40.h new file mode 100644 index 000000000000..194e470327d5 --- /dev/null +++ b/keyboards/maartenwut/eon40/eon40.h @@ -0,0 +1,67 @@ +/* Copyright 2019 Maarten Dekkers + * + * 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 . + */ +#pragma once + +#include "quantum.h" +#define XXX KC_NO + +/* This a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ + +#define LAYOUT_ortho_4x12( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \ +} + +#define LAYOUT_planck_mit( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ + k30, k31, k32, k33, k34, k35, k37, k38, k39, k3a, k3b \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ + { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b } \ +} + +#define LAYOUT_ortho_4x12_2x2u( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ + k30, k31, k32, k33, k34, k37, k38, k39, k3a, k3b \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ + { k30, k31, k32, k33, k34, XXX, XXX, k37, k38, k39, k3a, k3b } \ +} diff --git a/keyboards/maartenwut/eon40/info.json b/keyboards/maartenwut/eon40/info.json new file mode 100644 index 000000000000..056be65d0da8 --- /dev/null +++ b/keyboards/maartenwut/eon40/info.json @@ -0,0 +1,18 @@ +{ + "keyboard_name": "Eon40", + "url": "https://maartenwut.com/product/eon40/", + "maintainer": "qmk", + "width": 12, + "height": 4, + "layouts": { + "LAYOUT_ortho_4x12": { + "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] + }, + "LAYOUT_planck_mit": { + "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3, "w":2}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] + }, + "LAYOUT_ortho_4x12_2x2u": { + "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3, "w":2}, {"x":6, "y":3, "w":2}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] + } + } +} diff --git a/keyboards/maartenwut/eon40/keymaps/default/keymap.c b/keyboards/maartenwut/eon40/keymaps/default/keymap.c new file mode 100644 index 000000000000..e9b364230793 --- /dev/null +++ b/keyboards/maartenwut/eon40/keymaps/default/keymap.c @@ -0,0 +1,46 @@ +/* Copyright 2019 Maarten Dekkers + * + * 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 . + */ +#include QMK_KEYBOARD_H + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. + +#define _MA 0 //Main layer +#define _LO 1 //Low +#define _HI 2 //High + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[_MA] = LAYOUT_ortho_4x12( + KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, + 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_LCTL, KC_LGUI, KC_LALT, KC_RALT, MO(_LO), KC_SPC, KC_BSPC, MO(_HI), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT), + +[_LO] = LAYOUT_ortho_4x12( + 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_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, + _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), _______, _______, KC_QUOT, KC_LBRC, KC_RBRC, KC_BSLS, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET), + +[_HI] = LAYOUT_ortho_4x12( + _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP, KC_PGDN, _______, _______, + KC_CAPS, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MPLY, KC_PSCR, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + +}; \ No newline at end of file diff --git a/keyboards/maartenwut/eon40/keymaps/default/readme.md b/keyboards/maartenwut/eon40/keymaps/default/readme.md new file mode 100644 index 000000000000..7185afb0e0a1 --- /dev/null +++ b/keyboards/maartenwut/eon40/keymaps/default/readme.md @@ -0,0 +1 @@ +This is the default keymap for the Eon40. diff --git a/keyboards/maartenwut/eon40/readme.md b/keyboards/maartenwut/eon40/readme.md new file mode 100644 index 000000000000..05dffd7afade --- /dev/null +++ b/keyboards/maartenwut/eon40/readme.md @@ -0,0 +1,21 @@ +# Eon40 + +## Support +* Keyboard Maintainer: [Maarten Dekkers](https://github.com/maartenwut) +* Hardware Supported: Eon40 +* Hardware Availability: [maartenwut.com](https://maartenwut.com) + + +## Features +- QMK Firmware +- 19mm switch spacing +- USB-C Connector +- Up to three rotary encoders +- No leds + +## Build +Make example for this keyboard (after setting up your build environment): + + make maartenwut/eon40:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). \ No newline at end of file diff --git a/keyboards/maartenwut/eon40/rules.mk b/keyboards/maartenwut/eon40/rules.mk new file mode 100644 index 000000000000..5161f8d071c1 --- /dev/null +++ b/keyboards/maartenwut/eon40/rules.mk @@ -0,0 +1,37 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = qmk-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs +ENCODER_ENABLE = yes + +LAYOUTS = ortho_4x12 planck_mit +LAYOUTS_HAS_RGB = no From f5ae740cbf42f0b87524f28b0e6702329898c3da Mon Sep 17 00:00:00 2001 From: fauxpark Date: Fri, 17 Jan 2020 00:32:09 +1100 Subject: [PATCH 297/429] Remove `KEYMAP_SECTION_ENABLE` (#7882) --- keyboards/ergodone/rules.mk | 7 - keyboards/hotdox/rules.mk | 1 - show_options.mk | 5 - tmk_core/common.mk | 12 -- tmk_core/common/command.c | 3 - tmk_core/ldscript_keymap_avr35.x | 268 ------------------------------- tmk_core/ldscript_keymap_avr5.x | 268 ------------------------------- 7 files changed, 564 deletions(-) delete mode 100644 tmk_core/ldscript_keymap_avr35.x delete mode 100644 tmk_core/ldscript_keymap_avr5.x diff --git a/keyboards/ergodone/rules.mk b/keyboards/ergodone/rules.mk index 4c2fcf159531..aaeedb4311e9 100644 --- a/keyboards/ergodone/rules.mk +++ b/keyboards/ergodone/rules.mk @@ -25,13 +25,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA USB_6KRO_ENABLE = no # USB 6key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -KEYMAP_IN_EEPROM_ENABLE = no # External keymap in eeprom -KEYMAP_SECTION_ENABLE = no # Fixed address keymap for keymap editor -SOFTPWM_LED_ENABLE = no # Enable SoftPWM to drive backlight -FADING_LED_ENABLE = no # Enable fading backlight -BREATHING_LED_ENABLE = no # Enable breathing backlight -LEDMAP_ENABLE = no # Enable LED mapping -LEDMAP_IN_EEPROM_ENABLE = no # Read LED mapping from eeprom SWAP_HANDS_ENABLE = no # Disable Onehand RGBLIGHT_ENABLE = no MIDI_ENABLE = no diff --git a/keyboards/hotdox/rules.mk b/keyboards/hotdox/rules.mk index be21552055cc..b5b1483c724b 100644 --- a/keyboards/hotdox/rules.mk +++ b/keyboards/hotdox/rules.mk @@ -25,7 +25,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA USB_6KRO_ENABLE = no # USB 6key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -KEYMAP_SECTION_ENABLE = no # Fixed address keymap for keymap editor SWAP_HANDS_ENABLE = no # Disable Onehand RGBLIGHT_ENABLE = no MIDI_ENABLE = no diff --git a/show_options.mk b/show_options.mk index 003169d4cb65..b79653d5c3ff 100644 --- a/show_options.mk +++ b/show_options.mk @@ -68,16 +68,11 @@ OTHER_OPTION_NAMES = \ ISSI_ENABLE \ KEYBOARD_LOCK_ENABLE \ KEYLOGGER_ENABLE \ - KEYMAP_IN_EEPROM_ENABLE \ - KEYMAP_SECTION_ENABLE \ LCD_BACKLIGHT_ENABLE \ - LEDMAP_ENABLE \ - LEDMAP_IN_EEPROM_ENABLE \ MACROS_ENABLED \ ONEHAND_ENABLE \ PS2_MOUSE_ENABLE \ RAW_ENABLE \ - SOFTPWM_LED_ENABLE \ SWAP_HANDS_ENABLE \ USB_6KRO_ENABLE \ WATCHDOG_ENABLE \ diff --git a/tmk_core/common.mk b/tmk_core/common.mk index d43950299b1b..8f355da1233a 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk @@ -187,18 +187,6 @@ ifeq ($(strip $(NO_USB_STARTUP_CHECK)), yes) TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK endif -ifeq ($(strip $(KEYMAP_SECTION_ENABLE)), yes) - TMK_COMMON_DEFS += -DKEYMAP_SECTION_ENABLE - - ifeq ($(strip $(MCU)),atmega32u2) - TMK_COMMON_LDFLAGS = -Wl,-L$(TMK_DIR),-Tldscript_keymap_avr35.x - else ifeq ($(strip $(MCU)),atmega32u4) - TMK_COMMON_LDFLAGS = -Wl,-L$(TMK_DIR),-Tldscript_keymap_avr5.x - else - TMK_COMMON_LDFLAGS = $(error no ldscript for keymap section) - endif -endif - ifeq ($(strip $(SHARED_EP_ENABLE)), yes) TMK_COMMON_DEFS += -DSHARED_EP_ENABLE endif diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c index 82cd80609134..0d6661d6035d 100644 --- a/tmk_core/common/command.c +++ b/tmk_core/common/command.c @@ -192,9 +192,6 @@ static void print_version(void) { #ifdef NKRO_ENABLE " NKRO" #endif -#ifdef KEYMAP_SECTION_ENABLE - " KEYMAP_SECTION" -#endif " " STR(BOOTLOADER_SIZE) "\n"); diff --git a/tmk_core/ldscript_keymap_avr35.x b/tmk_core/ldscript_keymap_avr35.x deleted file mode 100644 index 6665020af9b3..000000000000 --- a/tmk_core/ldscript_keymap_avr35.x +++ /dev/null @@ -1,268 +0,0 @@ -/* - * linker script for configurable keymap - * - * This adds keymap section which places keymap at fixed address and - * is based on binutils-avr ldscripts(/usr/lib/ldscripts/avr5.x). - */ -OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr") -OUTPUT_ARCH(avr:35) -MEMORY -{ - /* With keymap section - * - * Flash Map of ATMega32U4(32KB) - * +------------+ 0x0000 - * | .vectors | - * | .progmem | - * | .init0-9 | > text region - * | .text | - * | .fini9-0 | - * | | - * |------------| _etext - * | .data | - * | .bss | > data region - * | .noinit | - * | | - * |------------| 0x6800 - * | .keymap | > keymap region(2KB) - * |------------| 0x7000 - * | bootloader | 4KB - * +------------+ 0x7FFF - */ - text (rx) : ORIGIN = 0, LENGTH = 64K - keymap (rw!x) : ORIGIN = 0x6800, LENGTH = 2K - data (rw!x) : ORIGIN = 0x800060, LENGTH = 0xffa0 - eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 64K - fuse (rw!x) : ORIGIN = 0x820000, LENGTH = 1K - lock (rw!x) : ORIGIN = 0x830000, LENGTH = 1K - signature (rw!x) : ORIGIN = 0x840000, LENGTH = 1K -} -SECTIONS -{ - /* Read-only sections, merged into text segment: */ - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .gnu.version : { *(.gnu.version) } - .gnu.version_d : { *(.gnu.version_d) } - .gnu.version_r : { *(.gnu.version_r) } - .rel.init : { *(.rel.init) } - .rela.init : { *(.rela.init) } - .rel.text : - { - *(.rel.text) - *(.rel.text.*) - *(.rel.gnu.linkonce.t*) - } - .rela.text : - { - *(.rela.text) - *(.rela.text.*) - *(.rela.gnu.linkonce.t*) - } - .rel.fini : { *(.rel.fini) } - .rela.fini : { *(.rela.fini) } - .rel.rodata : - { - *(.rel.rodata) - *(.rel.rodata.*) - *(.rel.gnu.linkonce.r*) - } - .rela.rodata : - { - *(.rela.rodata) - *(.rela.rodata.*) - *(.rela.gnu.linkonce.r*) - } - .rel.data : - { - *(.rel.data) - *(.rel.data.*) - *(.rel.gnu.linkonce.d*) - } - .rela.data : - { - *(.rela.data) - *(.rela.data.*) - *(.rela.gnu.linkonce.d*) - } - .rel.ctors : { *(.rel.ctors) } - .rela.ctors : { *(.rela.ctors) } - .rel.dtors : { *(.rel.dtors) } - .rela.dtors : { *(.rela.dtors) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rel.bss : { *(.rel.bss) } - .rela.bss : { *(.rela.bss) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } - /* Internal text space or external memory. */ - .text : - { - *(.vectors) - KEEP(*(.vectors)) - /* For data that needs to reside in the lower 64k of progmem. */ - *(.progmem.gcc*) - *(.progmem*) - . = ALIGN(2); - __trampolines_start = . ; - /* The jump trampolines for the 16-bit limited relocs will reside here. */ - *(.trampolines) - *(.trampolines*) - __trampolines_end = . ; - /* For future tablejump instruction arrays for 3 byte pc devices. - We don't relax jump/call instructions within these sections. */ - *(.jumptables) - *(.jumptables*) - /* For code that needs to reside in the lower 128k progmem. */ - *(.lowtext) - *(.lowtext*) - __ctors_start = . ; - *(.ctors) - __ctors_end = . ; - __dtors_start = . ; - *(.dtors) - __dtors_end = . ; - KEEP(SORT(*)(.ctors)) - KEEP(SORT(*)(.dtors)) - /* From this point on, we don't bother about wether the insns are - below or above the 16 bits boundary. */ - *(.init0) /* Start here after reset. */ - KEEP (*(.init0)) - *(.init1) - KEEP (*(.init1)) - *(.init2) /* Clear __zero_reg__, set up stack pointer. */ - KEEP (*(.init2)) - *(.init3) - KEEP (*(.init3)) - *(.init4) /* Initialize data and BSS. */ - KEEP (*(.init4)) - *(.init5) - KEEP (*(.init5)) - *(.init6) /* C++ constructors. */ - KEEP (*(.init6)) - *(.init7) - KEEP (*(.init7)) - *(.init8) - KEEP (*(.init8)) - *(.init9) /* Call main(). */ - KEEP (*(.init9)) - *(.text) - . = ALIGN(2); - *(.text.*) - . = ALIGN(2); - *(.fini9) /* _exit() starts here. */ - KEEP (*(.fini9)) - *(.fini8) - KEEP (*(.fini8)) - *(.fini7) - KEEP (*(.fini7)) - *(.fini6) /* C++ destructors. */ - KEEP (*(.fini6)) - *(.fini5) - KEEP (*(.fini5)) - *(.fini4) - KEEP (*(.fini4)) - *(.fini3) - KEEP (*(.fini3)) - *(.fini2) - KEEP (*(.fini2)) - *(.fini1) - KEEP (*(.fini1)) - *(.fini0) /* Infinite loop after program termination. */ - KEEP (*(.fini0)) - _etext = . ; - } > text - .data : AT (ADDR (.text) + SIZEOF (.text)) - { - PROVIDE (__data_start = .) ; - *(.data) - *(.data*) - *(.rodata) /* We need to include .rodata here if gcc is used */ - *(.rodata*) /* with -fdata-sections. */ - *(.gnu.linkonce.d*) - . = ALIGN(2); - _edata = . ; - PROVIDE (__data_end = .) ; - } > data - .bss : AT (ADDR (.bss)) - { - PROVIDE (__bss_start = .) ; - *(.bss) - *(.bss*) - *(COMMON) - PROVIDE (__bss_end = .) ; - } > data - __data_load_start = LOADADDR(.data); - __data_load_end = __data_load_start + SIZEOF(.data); - /* Global data not cleared after reset. */ - .noinit : - { - PROVIDE (__noinit_start = .) ; - *(.noinit*) - PROVIDE (__noinit_end = .) ; - _end = . ; - PROVIDE (__heap_start = .) ; - } > data - /* keymap region is located at end of flash - * .fn_actions Fn actions definitions - * .keymaps Mapping layers - */ - .keymap : - { - PROVIDE(__keymap_start = .) ; - *(.keymap.fn_actions) /* 32*actions = 64bytes */ - . = ALIGN(0x40); - *(.keymap.keymaps) /* rest of .keymap section */ - *(.keymap*) - /* . = ALIGN(0x800); */ /* keymap section takes 2KB- */ - } > keymap = 0x00 /* zero fill */ - .eeprom : - { - *(.eeprom*) - __eeprom_end = . ; - } > eeprom - .fuse : - { - KEEP(*(.fuse)) - KEEP(*(.lfuse)) - KEEP(*(.hfuse)) - KEEP(*(.efuse)) - } > fuse - .lock : - { - KEEP(*(.lock*)) - } > lock - .signature : - { - KEEP(*(.signature*)) - } > signature - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } - /* DWARF debug sections. - Symbols in the DWARF debugging sections are relative to the beginning - of the section so we begin them at 0. */ - /* DWARF 1 */ - .debug 0 : { *(.debug) } - .line 0 : { *(.line) } - /* GNU DWARF 1 extensions */ - .debug_srcinfo 0 : { *(.debug_srcinfo) } - .debug_sfnames 0 : { *(.debug_sfnames) } - /* DWARF 1.1 and DWARF 2 */ - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - /* DWARF 2 */ - .debug_info 0 : { *(.debug_info) *(.gnu.linkonce.wi.*) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } -} diff --git a/tmk_core/ldscript_keymap_avr5.x b/tmk_core/ldscript_keymap_avr5.x deleted file mode 100644 index 9b46e6c36fff..000000000000 --- a/tmk_core/ldscript_keymap_avr5.x +++ /dev/null @@ -1,268 +0,0 @@ -/* - * linker script for configurable keymap - * - * This adds keymap section which places keymap at fixed address and - * is based on binutils-avr ldscripts(/usr/lib/ldscripts/avr5.x). - */ -OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr") -OUTPUT_ARCH(avr:5) -MEMORY -{ - /* With keymap section - * - * Flash Map of ATMega32U4(32KB) - * +------------+ 0x0000 - * | .vectors | - * | .progmem | - * | .init0-9 | > text region - * | .text | - * | .fini9-0 | - * | | - * |------------| _etext - * | .data | - * | .bss | > data region - * | .noinit | - * | | - * |------------| 0x6800 - * | .keymap | > keymap region(2KB) - * |------------| 0x7000 - * | bootloader | 4KB - * +------------+ 0x7FFF - */ - text (rx) : ORIGIN = 0, LENGTH = 128K - keymap (rw!x) : ORIGIN = 0x6800, LENGTH = 2K - data (rw!x) : ORIGIN = 0x800060, LENGTH = 0xffa0 - eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 64K - fuse (rw!x) : ORIGIN = 0x820000, LENGTH = 1K - lock (rw!x) : ORIGIN = 0x830000, LENGTH = 1K - signature (rw!x) : ORIGIN = 0x840000, LENGTH = 1K -} -SECTIONS -{ - /* Read-only sections, merged into text segment: */ - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .gnu.version : { *(.gnu.version) } - .gnu.version_d : { *(.gnu.version_d) } - .gnu.version_r : { *(.gnu.version_r) } - .rel.init : { *(.rel.init) } - .rela.init : { *(.rela.init) } - .rel.text : - { - *(.rel.text) - *(.rel.text.*) - *(.rel.gnu.linkonce.t*) - } - .rela.text : - { - *(.rela.text) - *(.rela.text.*) - *(.rela.gnu.linkonce.t*) - } - .rel.fini : { *(.rel.fini) } - .rela.fini : { *(.rela.fini) } - .rel.rodata : - { - *(.rel.rodata) - *(.rel.rodata.*) - *(.rel.gnu.linkonce.r*) - } - .rela.rodata : - { - *(.rela.rodata) - *(.rela.rodata.*) - *(.rela.gnu.linkonce.r*) - } - .rel.data : - { - *(.rel.data) - *(.rel.data.*) - *(.rel.gnu.linkonce.d*) - } - .rela.data : - { - *(.rela.data) - *(.rela.data.*) - *(.rela.gnu.linkonce.d*) - } - .rel.ctors : { *(.rel.ctors) } - .rela.ctors : { *(.rela.ctors) } - .rel.dtors : { *(.rel.dtors) } - .rela.dtors : { *(.rela.dtors) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rel.bss : { *(.rel.bss) } - .rela.bss : { *(.rela.bss) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } - /* Internal text space or external memory. */ - .text : - { - *(.vectors) - KEEP(*(.vectors)) - /* For data that needs to reside in the lower 64k of progmem. */ - *(.progmem.gcc*) - *(.progmem*) - . = ALIGN(2); - __trampolines_start = . ; - /* The jump trampolines for the 16-bit limited relocs will reside here. */ - *(.trampolines) - *(.trampolines*) - __trampolines_end = . ; - /* For future tablejump instruction arrays for 3 byte pc devices. - We don't relax jump/call instructions within these sections. */ - *(.jumptables) - *(.jumptables*) - /* For code that needs to reside in the lower 128k progmem. */ - *(.lowtext) - *(.lowtext*) - __ctors_start = . ; - *(.ctors) - __ctors_end = . ; - __dtors_start = . ; - *(.dtors) - __dtors_end = . ; - KEEP(SORT(*)(.ctors)) - KEEP(SORT(*)(.dtors)) - /* From this point on, we don't bother about wether the insns are - below or above the 16 bits boundary. */ - *(.init0) /* Start here after reset. */ - KEEP (*(.init0)) - *(.init1) - KEEP (*(.init1)) - *(.init2) /* Clear __zero_reg__, set up stack pointer. */ - KEEP (*(.init2)) - *(.init3) - KEEP (*(.init3)) - *(.init4) /* Initialize data and BSS. */ - KEEP (*(.init4)) - *(.init5) - KEEP (*(.init5)) - *(.init6) /* C++ constructors. */ - KEEP (*(.init6)) - *(.init7) - KEEP (*(.init7)) - *(.init8) - KEEP (*(.init8)) - *(.init9) /* Call main(). */ - KEEP (*(.init9)) - *(.text) - . = ALIGN(2); - *(.text.*) - . = ALIGN(2); - *(.fini9) /* _exit() starts here. */ - KEEP (*(.fini9)) - *(.fini8) - KEEP (*(.fini8)) - *(.fini7) - KEEP (*(.fini7)) - *(.fini6) /* C++ destructors. */ - KEEP (*(.fini6)) - *(.fini5) - KEEP (*(.fini5)) - *(.fini4) - KEEP (*(.fini4)) - *(.fini3) - KEEP (*(.fini3)) - *(.fini2) - KEEP (*(.fini2)) - *(.fini1) - KEEP (*(.fini1)) - *(.fini0) /* Infinite loop after program termination. */ - KEEP (*(.fini0)) - _etext = . ; - } > text - .data : AT (ADDR (.text) + SIZEOF (.text)) - { - PROVIDE (__data_start = .) ; - *(.data) - *(.data*) - *(.rodata) /* We need to include .rodata here if gcc is used */ - *(.rodata*) /* with -fdata-sections. */ - *(.gnu.linkonce.d*) - . = ALIGN(2); - _edata = . ; - PROVIDE (__data_end = .) ; - } > data - .bss : AT (ADDR (.bss)) - { - PROVIDE (__bss_start = .) ; - *(.bss) - *(.bss*) - *(COMMON) - PROVIDE (__bss_end = .) ; - } > data - __data_load_start = LOADADDR(.data); - __data_load_end = __data_load_start + SIZEOF(.data); - /* Global data not cleared after reset. */ - .noinit : - { - PROVIDE (__noinit_start = .) ; - *(.noinit*) - PROVIDE (__noinit_end = .) ; - _end = . ; - PROVIDE (__heap_start = .) ; - } > data - /* keymap region is located at end of flash - * .fn_actions Fn actions definitions - * .keymaps Mapping layers - */ - .keymap : - { - PROVIDE(__keymap_start = .) ; - *(.keymap.fn_actions) /* 32*actions = 64bytes */ - . = ALIGN(0x40); - *(.keymap.keymaps) /* rest of .keymap section */ - *(.keymap*) - /* . = ALIGN(0x800); */ /* keymap section takes 2KB- */ - } > keymap = 0x00 /* zero fill */ - .eeprom : - { - *(.eeprom*) - __eeprom_end = . ; - } > eeprom - .fuse : - { - KEEP(*(.fuse)) - KEEP(*(.lfuse)) - KEEP(*(.hfuse)) - KEEP(*(.efuse)) - } > fuse - .lock : - { - KEEP(*(.lock*)) - } > lock - .signature : - { - KEEP(*(.signature*)) - } > signature - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } - /* DWARF debug sections. - Symbols in the DWARF debugging sections are relative to the beginning - of the section so we begin them at 0. */ - /* DWARF 1 */ - .debug 0 : { *(.debug) } - .line 0 : { *(.line) } - /* GNU DWARF 1 extensions */ - .debug_srcinfo 0 : { *(.debug_srcinfo) } - .debug_sfnames 0 : { *(.debug_sfnames) } - /* DWARF 1.1 and DWARF 2 */ - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - /* DWARF 2 */ - .debug_info 0 : { *(.debug_info) *(.gnu.linkonce.wi.*) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } -} From 68f3eb799be0c66d7bcad2ba7ea9e5a9020fae36 Mon Sep 17 00:00:00 2001 From: Rys Sommefeldt Date: Thu, 16 Jan 2020 18:06:42 +0000 Subject: [PATCH 298/429] [Keyboard] Graystudio Space65 ISO UK layout and keymap (#7912) * ISO UK layout for Graystudio Space65 * Quick line on how to build it in the readme * Update ASCII art layout guide to match reality * Whoops, space is actually K47, not K46 * Rename to 65_iso_blocker and remove uk designation --- .../gray_studio/space65/keymaps/iso/keymap.c | 59 +++++++++++++++++++ .../gray_studio/space65/keymaps/iso/readme.md | 3 + keyboards/gray_studio/space65/rules.mk | 2 +- keyboards/gray_studio/space65/space65.h | 13 ++++ 4 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 keyboards/gray_studio/space65/keymaps/iso/keymap.c create mode 100644 keyboards/gray_studio/space65/keymaps/iso/readme.md diff --git a/keyboards/gray_studio/space65/keymaps/iso/keymap.c b/keyboards/gray_studio/space65/keymaps/iso/keymap.c new file mode 100644 index 000000000000..66c69eba8b57 --- /dev/null +++ b/keyboards/gray_studio/space65/keymaps/iso/keymap.c @@ -0,0 +1,59 @@ +/* Copyright 2020 Rys Sommefeldt + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_65_iso_blocker( + /* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ ` │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │Del│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent├───┤ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │PUp│ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤ + * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │PDn│ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * │Ctrl│LGUI│LAlt│      Spaaaaaaace       │RAlt│ L1 │ │ ← │ ↓ │ → │ + * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ + */ + 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_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_DEL, + 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_NUHS, KC_ENT, KC_PGUP, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_65_iso_blocker( + /* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │RST│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│       │   │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │ TOG │PLN│MOD│HU+│HU-│SA+│SA-│VA+│VA-│   │   │   │   │     │   │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    ├───┤ + * │      │   │   │   │   │   │   │   │   │   │   │   │   │    │   │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤ + * │    │   │   │   │   │   │   │   │   │   │   │   │      │   │   │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * │    │    │    │                        │    │    │ │   │   │   │ + * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ + */ + RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + RGB_TOG, RGB_M_P, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), +}; diff --git a/keyboards/gray_studio/space65/keymaps/iso/readme.md b/keyboards/gray_studio/space65/keymaps/iso/readme.md new file mode 100644 index 000000000000..e7d3dd8238fe --- /dev/null +++ b/keyboards/gray_studio/space65/keymaps/iso/readme.md @@ -0,0 +1,3 @@ +# ISO keymap for Space65 + +Make this firmware with `make gray_studio/space65:iso`. diff --git a/keyboards/gray_studio/space65/rules.mk b/keyboards/gray_studio/space65/rules.mk index ced89eac045d..e3909d8dd465 100644 --- a/keyboards/gray_studio/space65/rules.mk +++ b/keyboards/gray_studio/space65/rules.mk @@ -32,4 +32,4 @@ AUDIO_ENABLE = no # Audio output on port C6 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400) -LAYOUTS = 65_ansi_blocker +LAYOUTS = 65_ansi_blocker 65_iso_blocker diff --git a/keyboards/gray_studio/space65/space65.h b/keyboards/gray_studio/space65/space65.h index 520679a2ad56..943e9e66c9ae 100644 --- a/keyboards/gray_studio/space65/space65.h +++ b/keyboards/gray_studio/space65/space65.h @@ -55,3 +55,16 @@ { k40, k41, KC_NO, k43, KC_NO, KC_NO, KC_NO, k47, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E, k4F }, \ } +#define LAYOUT_65_iso_blocker( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \ + K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \ + K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1E, K2D, K2F, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \ + K40, K41, K43, K47, K4A, K4B, K4D, K4E, K4F \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO, K0F }, \ + { K10, KC_NO, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ + { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, K2F }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E, K3F }, \ + { K40, K41, KC_NO, K43, KC_NO, KC_NO, KC_NO, K47, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D, K4E, K4F }, \ +} From 68ced3200f357d9a541ae719bea3cfc02e3c2b23 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Thu, 16 Jan 2020 14:34:25 -0800 Subject: [PATCH 299/429] Further changes to HHKB keymap (#7918) * Changes to HHKB Keymap for useability * Changes to HHKB Keymap for useability * Added KC_GRV to _FL. --- keyboards/hhkb/keymaps/xyverz/keymap.c | 30 ++++++++++++++------------ 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/keyboards/hhkb/keymaps/xyverz/keymap.c b/keyboards/hhkb/keymaps/xyverz/keymap.c index 56816354d183..eebaede979fc 100644 --- a/keyboards/hhkb/keymaps/xyverz/keymap.c +++ b/keyboards/hhkb/keymaps/xyverz/keymap.c @@ -19,6 +19,8 @@ enum layer_names { enum planck_keycodes { DVORAK = SAFE_RANGE, QWERTY, COLEMAK }; +#define FN_TAB LT(_FL, KC_TAB) + // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -27,9 +29,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-----------------------------------------------------------. * |ESC | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \ |Del| * |-----------------------------------------------------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]|BkSpc| + * |Fn/Tb| Q| W| E| R| T| Y| U| I| O| P| [| ]|BkSpc| * |-----------------------------------------------------------| - * |Fn | A| S| D| F| G| H| J| K| L| ;| '| Return| + * |Control| A| S| D| F| G| H| J| K| L| ;| '| Return| * |-----------------------------------------------------------| * |Shift | Z| X| C| V| B| N| M| ,| .| /| Shift |Fn| * |-----------------------------------------------------------| @@ -38,8 +40,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ /* Layer 0: Qwerty */ [_QW] = LAYOUT( - 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_DEL , - 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, + KC_GESC, 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_DEL , + FN_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, 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_ENT , KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FL), KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT @@ -50,9 +52,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-----------------------------------------------------------. * |ESC | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| [| ]| \ |Del| * |-----------------------------------------------------------| - * |Tab | '| ,| .| P| Y| F| G| C| R| L| /| =|BkSpc| + * |Fn/Tb| '| ,| .| P| Y| F| G| C| R| L| /| =|BkSpc| * |-----------------------------------------------------------| - * |Fn | A| O| E| U| I| D| H| T| N| S| -| Return| + * |Control| A| O| E| U| I| D| H| T| N| S| -| Return| * |-----------------------------------------------------------| * |Shift | ;| Q| J| K| X| B| M| W| V| Z| Shift |Fn| * |-----------------------------------------------------------| @@ -61,8 +63,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ /* Layer 1: Dvorak */ [_DV] = LAYOUT( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL , - KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSPC, + KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL , + FN_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSPC, KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT, KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, MO(_FL), KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT @@ -73,9 +75,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-----------------------------------------------------------. * |ESC | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \ |Del| * |-----------------------------------------------------------| - * |Tab | Q| W| F| P| G| J| L| U| Y| ;| [| ]|BkSpc| + * |Fn/Tb| Q| W| F| P| G| J| L| U| Y| ;| [| ]|BkSpc| * |-----------------------------------------------------------| - * |Fn | A| R| S| T| D| H| N| E| I| O| '| Return| + * |Control| A| R| S| T| D| H| N| E| I| O| '| Return| * |-----------------------------------------------------------| * |Shift | Z| X| C| V| B| K| M| ,| .| /| Shift |Fn| * |-----------------------------------------------------------| @@ -84,8 +86,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ /* Layer 2: Colemak */ [_CM] = LAYOUT( - 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_DEL , - 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_BSPC, + KC_GESC, 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_DEL , + FN_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_BSPC, KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FL), KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT @@ -94,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * _FL: Function Layer * ,-----------------------------------------------------------. - * | |F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| |RST| + * |Grv |F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| |RST| * |-----------------------------------------------------------| * | | |_QW|_DV|_CM| | |PgU| Up|PgD|PSc|SLk|Pau| | * |-----------------------------------------------------------| @@ -107,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ /* Layer 3: Functions */ [_FL] = LAYOUT( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RESET , + 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, _______, RESET , _______, _______, QWERTY, DVORAK, COLEMAK, _______, _______, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_CAPS, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_END, _______, _______, _______, _______, _______, _______, From b0ca4de0fb75b20da9bd645e09190aedfb217eb4 Mon Sep 17 00:00:00 2001 From: Josh Hinnebusch Date: Fri, 17 Jan 2020 02:15:08 -0500 Subject: [PATCH 300/429] [Keyboard] add VIA support for hiney PCBs (#7910) * add VIA support for hiney PCBs * update LED per request * update LED text per request * remove extra stuff --- .../hineybush/h75_singa/keymaps/via/keymap.c | 63 +++++++++++++++++++ .../hineybush/h75_singa/keymaps/via/readme.md | 1 + .../hineybush/h75_singa/keymaps/via/rules.mk | 1 + keyboards/hineybush/h87a/keymaps/via/keymap.c | 63 +++++++++++++++++++ .../hineybush/h87a/keymaps/via/readme.md | 1 + keyboards/hineybush/h87a/keymaps/via/rules.mk | 1 + keyboards/hineybush/h88/keymaps/via/keymap.c | 52 +++++++++++++++ keyboards/hineybush/h88/keymaps/via/readme.md | 1 + keyboards/hineybush/h88/keymaps/via/rules.mk | 1 + keyboards/hineybush/h88/rules.mk | 2 +- keyboards/hineybush/hbcp/keymaps/via/keymap.c | 60 ++++++++++++++++++ .../hineybush/hbcp/keymaps/via/readme.md | 2 + keyboards/hineybush/hbcp/keymaps/via/rules.mk | 1 + keyboards/hineybush/physix/rules.mk | 2 +- keyboards/hineybush/sm68/rules.mk | 2 +- 15 files changed, 250 insertions(+), 3 deletions(-) create mode 100644 keyboards/hineybush/h75_singa/keymaps/via/keymap.c create mode 100644 keyboards/hineybush/h75_singa/keymaps/via/readme.md create mode 100644 keyboards/hineybush/h75_singa/keymaps/via/rules.mk create mode 100644 keyboards/hineybush/h87a/keymaps/via/keymap.c create mode 100644 keyboards/hineybush/h87a/keymaps/via/readme.md create mode 100644 keyboards/hineybush/h87a/keymaps/via/rules.mk create mode 100644 keyboards/hineybush/h88/keymaps/via/keymap.c create mode 100644 keyboards/hineybush/h88/keymaps/via/readme.md create mode 100644 keyboards/hineybush/h88/keymaps/via/rules.mk create mode 100644 keyboards/hineybush/hbcp/keymaps/via/keymap.c create mode 100644 keyboards/hineybush/hbcp/keymaps/via/readme.md create mode 100644 keyboards/hineybush/hbcp/keymaps/via/rules.mk diff --git a/keyboards/hineybush/h75_singa/keymaps/via/keymap.c b/keyboards/hineybush/h75_singa/keymaps/via/keymap.c new file mode 100644 index 000000000000..37efc344c0e4 --- /dev/null +++ b/keyboards/hineybush/h75_singa/keymaps/via/keymap.c @@ -0,0 +1,63 @@ +/* Copyright 2019 hineybush + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, \ + k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, \ + k200, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, \ + k300, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314, k315, \ + k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k414, k415, \ + k500, k501, k502, k504, k506, k508, k510, k511, k513, k514, k515 \ */ + [0] = LAYOUT_all( + KC_ESC, 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_PSCR, KC_PAUS, KC_DEL, + 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, KC_BSPC, KC_HOME, + 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_PGUP, + 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_NUHS, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + + ), + + [1] = 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,RGB_TOG, + KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, RESET, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,RGB_MOD, + 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,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,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 + ), +}; + + diff --git a/keyboards/hineybush/h75_singa/keymaps/via/readme.md b/keyboards/hineybush/h75_singa/keymaps/via/readme.md new file mode 100644 index 000000000000..4c3cfd80098a --- /dev/null +++ b/keyboards/hineybush/h75_singa/keymaps/via/readme.md @@ -0,0 +1 @@ +# The default VIA keymap for h75_singa diff --git a/keyboards/hineybush/h75_singa/keymaps/via/rules.mk b/keyboards/hineybush/h75_singa/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/hineybush/h75_singa/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/hineybush/h87a/keymaps/via/keymap.c b/keyboards/hineybush/h87a/keymaps/via/keymap.c new file mode 100644 index 000000000000..e4be1cfc9bf8 --- /dev/null +++ b/keyboards/hineybush/h87a/keymaps/via/keymap.c @@ -0,0 +1,63 @@ +/* Copyright 2020 Josh Hinnebusch + + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( + KC_ESC, 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_PSCR, KC_SLCK, KC_PAUS, + 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, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + 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_DEL, KC_END, KC_PGDN, + 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_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_TRNS, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [1] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, BL_INC, + 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_VOLU, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + 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, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, BL_INC, + 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_VOLU, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + 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, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, BL_INC, + 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_VOLU, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + 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), + +}; + +void led_init_ports(void) { + setPinOutput(D5); + setPinOutput(E6); +} + +bool led_update_user(led_t led_state) { + writePin(D5, !led_state.caps_lock); + writePin(E6, !led_state.scroll_lock); + return true; +} diff --git a/keyboards/hineybush/h87a/keymaps/via/readme.md b/keyboards/hineybush/h87a/keymaps/via/readme.md new file mode 100644 index 000000000000..f81b69ee8386 --- /dev/null +++ b/keyboards/hineybush/h87a/keymaps/via/readme.md @@ -0,0 +1 @@ +# The default VIA keymap for h87a diff --git a/keyboards/hineybush/h87a/keymaps/via/rules.mk b/keyboards/hineybush/h87a/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/hineybush/h87a/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/hineybush/h88/keymaps/via/keymap.c b/keyboards/hineybush/h88/keymaps/via/keymap.c new file mode 100644 index 000000000000..0e6bd37c1b46 --- /dev/null +++ b/keyboards/hineybush/h88/keymaps/via/keymap.c @@ -0,0 +1,52 @@ +/* Copyright 2020 Josh Hinnebusch + + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( + KC_ESC, 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_0, KC_PSCR, KC_SLCK, KC_PAUS, + 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, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + 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_DEL, KC_END, KC_PGDN, + 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_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_TRNS, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [1] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, BL_TOGG, BL_DEC, BL_INC, + 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_VOLU, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + 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, 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, 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), + +}; diff --git a/keyboards/hineybush/h88/keymaps/via/readme.md b/keyboards/hineybush/h88/keymaps/via/readme.md new file mode 100644 index 000000000000..086686e7d675 --- /dev/null +++ b/keyboards/hineybush/h88/keymaps/via/readme.md @@ -0,0 +1 @@ +# The default VIA keymap for h88a diff --git a/keyboards/hineybush/h88/keymaps/via/rules.mk b/keyboards/hineybush/h88/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/hineybush/h88/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/hineybush/h88/rules.mk b/keyboards/hineybush/h88/rules.mk index 62b2d7b8b371..f39537546045 100644 --- a/keyboards/hineybush/h88/rules.mk +++ b/keyboards/hineybush/h88/rules.mk @@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug diff --git a/keyboards/hineybush/hbcp/keymaps/via/keymap.c b/keyboards/hineybush/hbcp/keymaps/via/keymap.c new file mode 100644 index 000000000000..8a260cee8fe5 --- /dev/null +++ b/keyboards/hineybush/hbcp/keymaps/via/keymap.c @@ -0,0 +1,60 @@ +/* Copyright 2019 hineybush + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( + + KC_ESC, 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_INS, KC_PGUP, KC_PGDN, + 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_GRV, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS, + 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_P7, KC_P8, KC_P9, KC_PMNS, + 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_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_TRNS, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, MO(1), KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT + + ), + + [1] = 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_PSCR, KC_SLCK,KC_HOME, KC_END, + 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, RGB_HUD, RGB_HUI,KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, RESET ,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_SAI,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, RGB_VAD, RGB_VAI,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_VOLU, RGB_TOG, RGB_MOD,KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI,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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI,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 + + ), +}; + diff --git a/keyboards/hineybush/hbcp/keymaps/via/readme.md b/keyboards/hineybush/hbcp/keymaps/via/readme.md new file mode 100644 index 000000000000..be77ea7ff61c --- /dev/null +++ b/keyboards/hineybush/hbcp/keymaps/via/readme.md @@ -0,0 +1,2 @@ +# The default VIA keymap for hbcp + diff --git a/keyboards/hineybush/hbcp/keymaps/via/rules.mk b/keyboards/hineybush/hbcp/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/hineybush/hbcp/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/hineybush/physix/rules.mk b/keyboards/hineybush/physix/rules.mk index 5c1f5fb4b074..010cb024d0dd 100644 --- a/keyboards/hineybush/physix/rules.mk +++ b/keyboards/hineybush/physix/rules.mk @@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug diff --git a/keyboards/hineybush/sm68/rules.mk b/keyboards/hineybush/sm68/rules.mk index 49f5ca7fdcab..28e24020af0c 100644 --- a/keyboards/hineybush/sm68/rules.mk +++ b/keyboards/hineybush/sm68/rules.mk @@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug From 4ec36acbce3a4503762fc6504f0064d97cd1b202 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 17 Jan 2020 09:30:32 +0100 Subject: [PATCH 301/429] [Keyboard] Add Plaid-Pad 4x4 numpad (#7900) * Add Plaid-Pad code * Move ENCODER_ENABLE under Build Options * Update keyboards/keycapsss/plaid_pad/info.json * Update keyboards/keycapsss/plaid_pad/keymaps/default/keymap.c * Update keyboards/keycapsss/plaid_pad/plaid_pad.h * Update keyboards/keycapsss/plaid_pad/rules.mk * Update keyboards/keycapsss/plaid_pad/rules.mk * Update keyboards/keycapsss/plaid_pad/rules.mk * Update keyboards/keycapsss/plaid_pad/rules.mk * Update keyboards/keycapsss/plaid_pad/rules.mk * Update keyboards/keycapsss/plaid_pad/rules.mk * Update keyboards/keycapsss/plaid_pad/rules.mk * Update keyboards/keycapsss/plaid_pad/readme.md * Update keyboards/keycapsss/plaid_pad/readme.md * Update keyboards/keycapsss/plaid_pad/readme.md * Update keyboards/keycapsss/plaid_pad/usbconfig.h * Update keyboards/keycapsss/plaid_pad/usbconfig.h * Update keyboards/keycapsss/plaid_pad/usbconfig.h * Update keyboards/keycapsss/plaid_pad/usbconfig.h * Update keyboards/keycapsss/plaid_pad/config.h * Update keyboards/keycapsss/plaid_pad/usbconfig.h * Update keyboards/keycapsss/plaid_pad/usbconfig.h * Update keyboards/keycapsss/plaid_pad/usbconfig.h * Update keyboards/keycapsss/plaid_pad/rules.mk * Update keyboards/keycapsss/plaid_pad/config.h * Update keyboards/keycapsss/plaid_pad/config.h * Update keyboards/keycapsss/plaid_pad/usbconfig.h * Update keyboards/keycapsss/plaid_pad/usbconfig.h * Update keyboards/keycapsss/plaid_pad/config.h --- keyboards/keycapsss/plaid_pad/config.h | 38 ++ keyboards/keycapsss/plaid_pad/info.json | 31 ++ .../plaid_pad/keymaps/default/config.h | 3 + .../plaid_pad/keymaps/default/keymap.c | 44 ++ .../plaid_pad/keymaps/default/readme.md | 11 + keyboards/keycapsss/plaid_pad/plaid_pad.c | 1 + keyboards/keycapsss/plaid_pad/plaid_pad.h | 18 + keyboards/keycapsss/plaid_pad/readme.md | 25 ++ keyboards/keycapsss/plaid_pad/rules.mk | 41 ++ keyboards/keycapsss/plaid_pad/usbconfig.h | 383 ++++++++++++++++++ 10 files changed, 595 insertions(+) create mode 100644 keyboards/keycapsss/plaid_pad/config.h create mode 100644 keyboards/keycapsss/plaid_pad/info.json create mode 100644 keyboards/keycapsss/plaid_pad/keymaps/default/config.h create mode 100644 keyboards/keycapsss/plaid_pad/keymaps/default/keymap.c create mode 100644 keyboards/keycapsss/plaid_pad/keymaps/default/readme.md create mode 100644 keyboards/keycapsss/plaid_pad/plaid_pad.c create mode 100644 keyboards/keycapsss/plaid_pad/plaid_pad.h create mode 100644 keyboards/keycapsss/plaid_pad/readme.md create mode 100644 keyboards/keycapsss/plaid_pad/rules.mk create mode 100644 keyboards/keycapsss/plaid_pad/usbconfig.h diff --git a/keyboards/keycapsss/plaid_pad/config.h b/keyboards/keycapsss/plaid_pad/config.h new file mode 100644 index 000000000000..c4d22b6636b6 --- /dev/null +++ b/keyboards/keycapsss/plaid_pad/config.h @@ -0,0 +1,38 @@ +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0xAF12 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Keycapsss +#define PRODUCT Plaid-Pad +#define DESCRIPTION 4x4 numpad with through hole components + +/* key matrix size */ +#define MATRIX_ROWS 4 +#define MATRIX_COLS 4 + +#define MATRIX_ROW_PINS { C0, C1, C2, C3 } +#define MATRIX_COL_PINS { B0, D7, D6, D5 } +#define UNUSED_PINS { B3, B4, B5, D4} + +#define ENCODERS_PAD_A { D0, B1 } +#define ENCODERS_PAD_B { D1, B2 } +#define ENCODER_RESOLUTION 4 + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +#define NO_UART 1 +#define USB_MAX_POWER_CONSUMPTION 100 + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE + +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/keycapsss/plaid_pad/info.json b/keyboards/keycapsss/plaid_pad/info.json new file mode 100644 index 000000000000..cbc2b5210d42 --- /dev/null +++ b/keyboards/keycapsss/plaid_pad/info.json @@ -0,0 +1,31 @@ +{ + "keyboard_name": "Plaid-Pad", + "keyboard_folder": "plaid_pad", + "url": "https://keycapsss.com/diy-kits/104/plaid-pad-4x4-numpad", + "maintainer": "BenRoe", + "width": 4, + "height": 4, + "layouts": { + "LAYOUT_ortho_4x4": { + "key_count": 16, + "layout": [ + {"w": 1,"x": 0,"y": 0}, + {"w": 1,"x": 1,"y": 0}, + {"w": 1,"x": 2,"y": 0}, + {"w": 1,"x": 3,"y": 0}, + {"w": 1,"x": 0,"y": 1}, + {"w": 1,"x": 1,"y": 1}, + {"w": 1,"x": 2,"y": 1}, + {"w": 1,"x": 3,"y": 1}, + {"w": 1,"x": 0,"y": 2}, + {"w": 1,"x": 1,"y": 2}, + {"w": 1,"x": 2,"y": 2}, + {"w": 1,"x": 3,"y": 2}, + {"w": 1,"x": 0,"y": 3}, + {"w": 1,"x": 1,"y": 3}, + {"w": 1,"x": 2,"y": 3}, + {"w": 1,"x": 3,"y": 3} + ] + } + } +} diff --git a/keyboards/keycapsss/plaid_pad/keymaps/default/config.h b/keyboards/keycapsss/plaid_pad/keymaps/default/config.h new file mode 100644 index 000000000000..271f48d0011b --- /dev/null +++ b/keyboards/keycapsss/plaid_pad/keymaps/default/config.h @@ -0,0 +1,3 @@ +#pragma once + +// place overrides here diff --git a/keyboards/keycapsss/plaid_pad/keymaps/default/keymap.c b/keyboards/keycapsss/plaid_pad/keymaps/default/keymap.c new file mode 100644 index 000000000000..bdfd7fb780bc --- /dev/null +++ b/keyboards/keycapsss/plaid_pad/keymaps/default/keymap.c @@ -0,0 +1,44 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* + * ,-----------------------, + * | 7 | 8 | 9 | / | + * |-----+-----+-----+-----| + * | 4 | 5 | 6 | * | + * |-----+-----+-----+-----| + * | 1 | 2 | 3 | - | + * |-----+-----+-----+-----| + * | 0 | . | = | + | + * `-----------------------' + */ +LAYOUT_ortho_4x4( + KC_P7, KC_P8, KC_P9, KC_PSLS, + KC_P4, KC_P5, KC_P6, KC_PAST, + KC_P1, KC_P2, KC_P3, KC_PMNS, + KC_P0, KC_PDOT, KC_PEQL, KC_PPLS +) + +}; + +// Set led state during powerup +void keyboard_post_init_user(void) { + writePinHigh(LED_RED); +} + +void encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { // First encoder - top left + if (clockwise) { + tap_code(KC_UP); + } else { + tap_code(KC_DOWN); + } + } else if (index == 1) { // Second encoder - top right + if (clockwise) { + tap_code(KC_UP); + } else { + tap_code(KC_DOWN); + } + } +} diff --git a/keyboards/keycapsss/plaid_pad/keymaps/default/readme.md b/keyboards/keycapsss/plaid_pad/keymaps/default/readme.md new file mode 100644 index 000000000000..1c1b1513dd1a --- /dev/null +++ b/keyboards/keycapsss/plaid_pad/keymaps/default/readme.md @@ -0,0 +1,11 @@ + + + +# Default Plaid-Pad Layout + +This is the default layout that comes flashed on every Plaid-Pad. +The upper left (7) and right (/) switch, can be replaced by a rotary encoder. +They do "Up Arrow" (KC_UP) and "Down Arrow" (KC_DOWN). +Encoder with build-in switch are supported. + + diff --git a/keyboards/keycapsss/plaid_pad/plaid_pad.c b/keyboards/keycapsss/plaid_pad/plaid_pad.c new file mode 100644 index 000000000000..befddf42a994 --- /dev/null +++ b/keyboards/keycapsss/plaid_pad/plaid_pad.c @@ -0,0 +1 @@ +#include "plaid_pad.h" diff --git a/keyboards/keycapsss/plaid_pad/plaid_pad.h b/keyboards/keycapsss/plaid_pad/plaid_pad.h new file mode 100644 index 000000000000..fae9b132a873 --- /dev/null +++ b/keyboards/keycapsss/plaid_pad/plaid_pad.h @@ -0,0 +1,18 @@ +#pragma once + +#include "quantum.h" + +#define LAYOUT_ortho_4x4( \ + K00, K01, K02, K03, \ + K10, K11, K12, K13, \ + K20, K21, K22, K23, \ + K30, K31, K32, K33 \ +) { \ + { K00, K01, K02, K03 }, \ + { K10, K11, K12, K13 }, \ + { K20, K21, K22, K23 }, \ + { K30, K31, K32, K33 } \ +} + +#define LED_RED C5 // LED1 +#define LED_GREEN C4 // LED2 diff --git a/keyboards/keycapsss/plaid_pad/readme.md b/keyboards/keycapsss/plaid_pad/readme.md new file mode 100644 index 000000000000..ad38f119ce8f --- /dev/null +++ b/keyboards/keycapsss/plaid_pad/readme.md @@ -0,0 +1,25 @@ +# Plaid-Pad + + + +A 4x4 numpad with only through hole components. +It's a great companion to the Plaid keyboard by [hsgw](https://github.com/hsgw/) and heavily inspired by it. + +* Keyboard Maintainer: BenRoe [Github](https://github.com/BenRoe) / [Twitter](https://twitter.com/keycapsss) +* Hardware Supported: ATmega328P with VUSB ([see Bootloader section](#Bootloader)) +* Hardware Availability: [Keycapsss.com](https://keycapsss.com) + +Make example for this keyboard (after setting up your build environment): + + make keycapsss/plaid_pad:default + +Flashing example for this keyboard: + + make keycapsss/plaid_pad:default:flash + +## Bootloader +- same usbasploader as Plaid ([Instruction](https://github.com/hsgw/plaid/blob/master/doc/en/bootloader.md), [Repository](https://github.com/hsgw/USBaspLoader/tree/plaid)) + +--- + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/keycapsss/plaid_pad/rules.mk b/keyboards/keycapsss/plaid_pad/rules.mk new file mode 100644 index 000000000000..f62833ca6bc9 --- /dev/null +++ b/keyboards/keycapsss/plaid_pad/rules.mk @@ -0,0 +1,41 @@ +# MCU name +MCU = atmega328p + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = USBasp + +# disable debug code +OPT_DEFS = -DDEBUG_LEVEL=0 + + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs +ENCODER_ENABLE = yes + +LAYOUTS = ortho_4x4 +LAYOUTS_HAS_RGB = no diff --git a/keyboards/keycapsss/plaid_pad/usbconfig.h b/keyboards/keycapsss/plaid_pad/usbconfig.h new file mode 100644 index 000000000000..e208e99f2e47 --- /dev/null +++ b/keyboards/keycapsss/plaid_pad/usbconfig.h @@ -0,0 +1,383 @@ +/* Name: usbconfig.h + * Project: V-USB, virtual USB port for Atmel's(r) AVR(r) microcontrollers + * Author: Christian Starkjohann + * Creation Date: 2005-04-01 + * Tabsize: 4 + * Copyright: (c) 2005 by OBJECTIVE DEVELOPMENT Software GmbH + * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt) + * This Revision: $Id: usbconfig-prototype.h 785 2010-05-30 17:57:07Z cs $ + */ + +#pragma once + +#include "config.h" + +/* +General Description: +This file is an example configuration (with inline documentation) for the USB +driver. It configures V-USB for USB D+ connected to Port D bit 2 (which is +also hardware interrupt 0 on many devices) and USB D- to Port D bit 4. You may +wire the lines to any other port, as long as D+ is also wired to INT0 (or any +other hardware interrupt, as long as it is the highest level interrupt, see +section at the end of this file). +*/ + +/* ---------------------------- Hardware Config ---------------------------- */ + +#define USB_CFG_IOPORTNAME D +/* This is the port where the USB bus is connected. When you configure it to + * "B", the registers PORTB, PINB and DDRB will be used. + */ +#define USB_CFG_DMINUS_BIT 3 +/* This is the bit number in USB_CFG_IOPORT where the USB D- line is connected. + * This may be any bit in the port. + */ +#define USB_CFG_DPLUS_BIT 2 +/* This is the bit number in USB_CFG_IOPORT where the USB D+ line is connected. + * This may be any bit in the port. Please note that D+ must also be connected + * to interrupt pin INT0! [You can also use other interrupts, see section + * "Optional MCU Description" below, or you can connect D- to the interrupt, as + * it is required if you use the USB_COUNT_SOF feature. If you use D- for the + * interrupt, the USB interrupt will also be triggered at Start-Of-Frame + * markers every millisecond.] + */ +#define USB_CFG_CLOCK_KHZ (F_CPU/1000) +/* Clock rate of the AVR in kHz. Legal values are 12000, 12800, 15000, 16000, + * 16500, 18000 and 20000. The 12.8 MHz and 16.5 MHz versions of the code + * require no crystal, they tolerate +/- 1% deviation from the nominal + * frequency. All other rates require a precision of 2000 ppm and thus a + * crystal! + * Since F_CPU should be defined to your actual clock rate anyway, you should + * not need to modify this setting. + */ +#define USB_CFG_CHECK_CRC 0 +/* Define this to 1 if you want that the driver checks integrity of incoming + * data packets (CRC checks). CRC checks cost quite a bit of code size and are + * currently only available for 18 MHz crystal clock. You must choose + * USB_CFG_CLOCK_KHZ = 18000 if you enable this option. + */ + +/* ----------------------- Optional Hardware Config ------------------------ */ + +/* #define USB_CFG_PULLUP_IOPORTNAME D */ +/* If you connect the 1.5k pullup resistor from D- to a port pin instead of + * V+, you can connect and disconnect the device from firmware by calling + * the macros usbDeviceConnect() and usbDeviceDisconnect() (see usbdrv.h). + * This constant defines the port on which the pullup resistor is connected. + */ +/* #define USB_CFG_PULLUP_BIT 4 */ +/* This constant defines the bit number in USB_CFG_PULLUP_IOPORT (defined + * above) where the 1.5k pullup resistor is connected. See description + * above for details. + */ + +/* --------------------------- Functional Range ---------------------------- */ + +#define USB_CFG_HAVE_INTRIN_ENDPOINT 1 +/* Define this to 1 if you want to compile a version with two endpoints: The + * default control endpoint 0 and an interrupt-in endpoint (any other endpoint + * number). + */ +#define USB_CFG_HAVE_INTRIN_ENDPOINT3 1 +/* Define this to 1 if you want to compile a version with three endpoints: The + * default control endpoint 0, an interrupt-in endpoint 3 (or the number + * configured below) and a catch-all default interrupt-in endpoint as above. + * You must also define USB_CFG_HAVE_INTRIN_ENDPOINT to 1 for this feature. + */ +#define USB_CFG_EP3_NUMBER 3 +/* If the so-called endpoint 3 is used, it can now be configured to any other + * endpoint number (except 0) with this macro. Default if undefined is 3. + */ +/* #define USB_INITIAL_DATATOKEN USBPID_DATA1 */ +/* The above macro defines the startup condition for data toggling on the + * interrupt/bulk endpoints 1 and 3. Defaults to USBPID_DATA1. + * Since the token is toggled BEFORE sending any data, the first packet is + * sent with the oposite value of this configuration! + */ +#define USB_CFG_IMPLEMENT_HALT 0 +/* Define this to 1 if you also want to implement the ENDPOINT_HALT feature + * for endpoint 1 (interrupt endpoint). Although you may not need this feature, + * it is required by the standard. We have made it a config option because it + * bloats the code considerably. + */ +#define USB_CFG_SUPPRESS_INTR_CODE 0 +/* Define this to 1 if you want to declare interrupt-in endpoints, but don't + * want to send any data over them. If this macro is defined to 1, functions + * usbSetInterrupt() and usbSetInterrupt3() are omitted. This is useful if + * you need the interrupt-in endpoints in order to comply to an interface + * (e.g. HID), but never want to send any data. This option saves a couple + * of bytes in flash memory and the transmit buffers in RAM. + */ +#define USB_CFG_IS_SELF_POWERED 0 +/* Define this to 1 if the device has its own power supply. Set it to 0 if the + * device is powered from the USB bus. + */ +#define USB_CFG_IMPLEMENT_FN_WRITE 1 +/* Set this to 1 if you want usbFunctionWrite() to be called for control-out + * transfers. Set it to 0 if you don't need it and want to save a couple of + * bytes. + */ +#define USB_CFG_IMPLEMENT_FN_READ 0 +/* Set this to 1 if you need to send control replies which are generated + * "on the fly" when usbFunctionRead() is called. If you only want to send + * data from a static buffer, set it to 0 and return the data from + * usbFunctionSetup(). This saves a couple of bytes. + */ +#define USB_CFG_IMPLEMENT_FN_WRITEOUT 0 +/* Define this to 1 if you want to use interrupt-out (or bulk out) endpoints. + * You must implement the function usbFunctionWriteOut() which receives all + * interrupt/bulk data sent to any endpoint other than 0. The endpoint number + * can be found in 'usbRxToken'. + */ +#define USB_CFG_HAVE_FLOWCONTROL 0 +/* Define this to 1 if you want flowcontrol over USB data. See the definition + * of the macros usbDisableAllRequests() and usbEnableAllRequests() in + * usbdrv.h. + */ +#define USB_CFG_DRIVER_FLASH_PAGE 0 +/* If the device has more than 64 kBytes of flash, define this to the 64 k page + * where the driver's constants (descriptors) are located. Or in other words: + * Define this to 1 for boot loaders on the ATMega128. + */ +#define USB_CFG_LONG_TRANSFERS 0 +/* Define this to 1 if you want to send/receive blocks of more than 254 bytes + * in a single control-in or control-out transfer. Note that the capability + * for long transfers increases the driver size. + */ +/* #define USB_RX_USER_HOOK(data, len) if(usbRxToken == (uchar)USBPID_SETUP) blinkLED(); */ +/* This macro is a hook if you want to do unconventional things. If it is + * defined, it's inserted at the beginning of received message processing. + * If you eat the received message and don't want default processing to + * proceed, do a return after doing your things. One possible application + * (besides debugging) is to flash a status LED on each packet. + */ +/* #define USB_RESET_HOOK(resetStarts) if(!resetStarts){hadUsbReset();} */ +/* This macro is a hook if you need to know when an USB RESET occurs. It has + * one parameter which distinguishes between the start of RESET state and its + * end. + */ +/* #define USB_SET_ADDRESS_HOOK() hadAddressAssigned(); */ +/* This macro (if defined) is executed when a USB SET_ADDRESS request was + * received. + */ +#define USB_COUNT_SOF 0 +/* define this macro to 1 if you need the global variable "usbSofCount" which + * counts SOF packets. This feature requires that the hardware interrupt is + * connected to D- instead of D+. + */ +/* #ifdef __ASSEMBLER__ + * macro myAssemblerMacro + * in YL, TCNT0 + * sts timer0Snapshot, YL + * endm + * #endif + * #define USB_SOF_HOOK myAssemblerMacro + * This macro (if defined) is executed in the assembler module when a + * Start Of Frame condition is detected. It is recommended to define it to + * the name of an assembler macro which is defined here as well so that more + * than one assembler instruction can be used. The macro may use the register + * YL and modify SREG. If it lasts longer than a couple of cycles, USB messages + * immediately after an SOF pulse may be lost and must be retried by the host. + * What can you do with this hook? Since the SOF signal occurs exactly every + * 1 ms (unless the host is in sleep mode), you can use it to tune OSCCAL in + * designs running on the internal RC oscillator. + * Please note that Start Of Frame detection works only if D- is wired to the + * interrupt, not D+. THIS IS DIFFERENT THAN MOST EXAMPLES! + */ +#define USB_CFG_CHECK_DATA_TOGGLING 0 +/* define this macro to 1 if you want to filter out duplicate data packets + * sent by the host. Duplicates occur only as a consequence of communication + * errors, when the host does not receive an ACK. Please note that you need to + * implement the filtering yourself in usbFunctionWriteOut() and + * usbFunctionWrite(). Use the global usbCurrentDataToken and a static variable + * for each control- and out-endpoint to check for duplicate packets. + */ +#define USB_CFG_HAVE_MEASURE_FRAME_LENGTH 0 +/* define this macro to 1 if you want the function usbMeasureFrameLength() + * compiled in. This function can be used to calibrate the AVR's RC oscillator. + */ +#define USB_USE_FAST_CRC 0 +/* The assembler module has two implementations for the CRC algorithm. One is + * faster, the other is smaller. This CRC routine is only used for transmitted + * messages where timing is not critical. The faster routine needs 31 cycles + * per byte while the smaller one needs 61 to 69 cycles. The faster routine + * may be worth the 32 bytes bigger code size if you transmit lots of data and + * run the AVR close to its limit. + */ + +/* -------------------------- Device Description --------------------------- */ + +#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) +/* USB vendor ID for the device, low byte first. If you have registered your + * own Vendor ID, define it here. Otherwise you may use one of obdev's free + * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! + * *** IMPORTANT NOTE *** + * This template uses obdev's shared VID/PID pair for Vendor Class devices + * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand + * the implications! + */ +#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) +/* This is the ID of the product, low byte first. It is interpreted in the + * scope of the vendor ID. If you have registered your own VID with usb.org + * or if you have licensed a PID from somebody else, define it here. Otherwise + * you may use one of obdev's free shared VID/PID pairs. See the file + * USB-IDs-for-free.txt for details! + * *** IMPORTANT NOTE *** + * This template uses obdev's shared VID/PID pair for Vendor Class devices + * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand + * the implications! + */ +#define USB_CFG_DEVICE_VERSION (DEVICE_VER & 0xFF), ((DEVICE_VER >> 8) & 0xFF) +/* Version number of the device: Minor number first, then major number. + */ +#define USB_CFG_VENDOR_NAME 'K','e','y','c','a','p','s','s','s' +#define USB_CFG_VENDOR_NAME_LEN 9 +/* These two values define the vendor name returned by the USB device. The name + * must be given as a list of characters under single quotes. The characters + * are interpreted as Unicode (UTF-16) entities. + * If you don't want a vendor name string, undefine these macros. + * ALWAYS define a vendor name containing your Internet domain name if you use + * obdev's free shared VID/PID pair. See the file USB-IDs-for-free.txt for + * details. + */ +#define USB_CFG_DEVICE_NAME 'P', 'l', 'a', 'i', 'd', '-', 'P', 'a', 'd' +#define USB_CFG_DEVICE_NAME_LEN 9 +/* Same as above for the device name. If you don't want a device name, undefine + * the macros. See the file USB-IDs-for-free.txt before you assign a name if + * you use a shared VID/PID. + */ +/*#define USB_CFG_SERIAL_NUMBER 'N', 'o', 'n', 'e' */ +/*#define USB_CFG_SERIAL_NUMBER_LEN 0 */ +/* Same as above for the serial number. If you don't want a serial number, + * undefine the macros. + * It may be useful to provide the serial number through other means than at + * compile time. See the section about descriptor properties below for how + * to fine tune control over USB descriptors such as the string descriptor + * for the serial number. + */ +#define USB_CFG_DEVICE_CLASS 0 +#define USB_CFG_DEVICE_SUBCLASS 0 +/* See USB specification if you want to conform to an existing device class. + * Class 0xff is "vendor specific". + */ +#define USB_CFG_INTERFACE_CLASS 3 /* HID */ +#define USB_CFG_INTERFACE_SUBCLASS 1 /* Boot */ +#define USB_CFG_INTERFACE_PROTOCOL 1 /* Keyboard */ +/* See USB specification if you want to conform to an existing device class or + * protocol. The following classes must be set at interface level: + * HID class is 3, no subclass and protocol required (but may be useful!) + * CDC class is 2, use subclass 2 and protocol 1 for ACM + */ +#define USB_CFG_HID_REPORT_DESCRIPTOR_LENGTH 0 +/* Define this to the length of the HID report descriptor, if you implement + * an HID device. Otherwise don't define it or define it to 0. + * If you use this define, you must add a PROGMEM character array named + * "usbHidReportDescriptor" to your code which contains the report descriptor. + * Don't forget to keep the array and this define in sync! + */ + +/* #define USB_PUBLIC static */ +/* Use the define above if you #include usbdrv.c instead of linking against it. + * This technique saves a couple of bytes in flash memory. + */ + +/* ------------------- Fine Control over USB Descriptors ------------------- */ +/* If you don't want to use the driver's default USB descriptors, you can + * provide our own. These can be provided as (1) fixed length static data in + * flash memory, (2) fixed length static data in RAM or (3) dynamically at + * runtime in the function usbFunctionDescriptor(). See usbdrv.h for more + * information about this function. + * Descriptor handling is configured through the descriptor's properties. If + * no properties are defined or if they are 0, the default descriptor is used. + * Possible properties are: + * + USB_PROP_IS_DYNAMIC: The data for the descriptor should be fetched + * at runtime via usbFunctionDescriptor(). If the usbMsgPtr mechanism is + * used, the data is in FLASH by default. Add property USB_PROP_IS_RAM if + * you want RAM pointers. + * + USB_PROP_IS_RAM: The data returned by usbFunctionDescriptor() or found + * in static memory is in RAM, not in flash memory. + * + USB_PROP_LENGTH(len): If the data is in static memory (RAM or flash), + * the driver must know the descriptor's length. The descriptor itself is + * found at the address of a well known identifier (see below). + * List of static descriptor names (must be declared PROGMEM if in flash): + * char usbDescriptorDevice[]; + * char usbDescriptorConfiguration[]; + * char usbDescriptorHidReport[]; + * char usbDescriptorString0[]; + * int usbDescriptorStringVendor[]; + * int usbDescriptorStringDevice[]; + * int usbDescriptorStringSerialNumber[]; + * Other descriptors can't be provided statically, they must be provided + * dynamically at runtime. + * + * Descriptor properties are or-ed or added together, e.g.: + * #define USB_CFG_DESCR_PROPS_DEVICE (USB_PROP_IS_RAM | USB_PROP_LENGTH(18)) + * + * The following descriptors are defined: + * USB_CFG_DESCR_PROPS_DEVICE + * USB_CFG_DESCR_PROPS_CONFIGURATION + * USB_CFG_DESCR_PROPS_STRINGS + * USB_CFG_DESCR_PROPS_STRING_0 + * USB_CFG_DESCR_PROPS_STRING_VENDOR + * USB_CFG_DESCR_PROPS_STRING_PRODUCT + * USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER + * USB_CFG_DESCR_PROPS_HID + * USB_CFG_DESCR_PROPS_HID_REPORT + * USB_CFG_DESCR_PROPS_UNKNOWN (for all descriptors not handled by the driver) + * + * Note about string descriptors: String descriptors are not just strings, they + * are Unicode strings prefixed with a 2 byte header. Example: + * int serialNumberDescriptor[] = { + * USB_STRING_DESCRIPTOR_HEADER(6), + * 'S', 'e', 'r', 'i', 'a', 'l' + * }; + */ + +#define USB_CFG_DESCR_PROPS_DEVICE 0 +#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC +//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0 +#define USB_CFG_DESCR_PROPS_STRINGS 0 +#define USB_CFG_DESCR_PROPS_STRING_0 0 +#define USB_CFG_DESCR_PROPS_STRING_VENDOR 0 +#define USB_CFG_DESCR_PROPS_STRING_PRODUCT 0 +#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER 0 +#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC +//#define USB_CFG_DESCR_PROPS_HID 0 +#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC +//#define USB_CFG_DESCR_PROPS_HID_REPORT 0 +#define USB_CFG_DESCR_PROPS_UNKNOWN 0 + +#define usbMsgPtr_t unsigned short +/* If usbMsgPtr_t is not defined, it defaults to 'uchar *'. We define it to + * a scalar type here because gcc generates slightly shorter code for scalar + * arithmetics than for pointer arithmetics. Remove this define for backward + * type compatibility or define it to an 8 bit type if you use data in RAM only + * and all RAM is below 256 bytes (tiny memory model in IAR CC). + */ + +/* ----------------------- Optional MCU Description ------------------------ */ + +/* The following configurations have working defaults in usbdrv.h. You + * usually don't need to set them explicitly. Only if you want to run + * the driver on a device which is not yet supported or with a compiler + * which is not fully supported (such as IAR C) or if you use a differnt + * interrupt than INT0, you may have to define some of these. + */ +/* #define USB_INTR_CFG MCUCR */ +/* #define USB_INTR_CFG_SET ((1 << ISC00) | (1 << ISC01)) */ +/* #define USB_INTR_CFG_CLR 0 */ +/* #define USB_INTR_ENABLE GIMSK */ +/* #define USB_INTR_ENABLE_BIT INT0 */ +/* #define USB_INTR_PENDING GIFR */ +/* #define USB_INTR_PENDING_BIT INTF0 */ +/* #define USB_INTR_VECTOR INT0_vect */ + +/* Set INT1 for D- falling edge to count SOF */ +/* #define USB_INTR_CFG EICRA */ +// #define USB_INTR_CFG_SET ((1 << ISC11) | (0 << ISC10)) +// /* #define USB_INTR_CFG_CLR 0 */ +// /* #define USB_INTR_ENABLE EIMSK */ +// #define USB_INTR_ENABLE_BIT INT1 +// /* #define USB_INTR_PENDING EIFR */ +// #define USB_INTR_PENDING_BIT INTF1 +// #define USB_INTR_VECTOR INT1_vect From 45eab9d6173b0c123d07a8d9f1b5eca5ab4074a8 Mon Sep 17 00:00:00 2001 From: Callum Oakley Date: Fri, 17 Jan 2020 15:59:07 +0000 Subject: [PATCH 302/429] move caps because it can be triggered accidentally by sequences such as '("' (#7923) Thanks! --- keyboards/planck/keymaps/callum/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/planck/keymaps/callum/keymap.c b/keyboards/planck/keymaps/callum/keymap.c index c6298d247ba9..34ef05248747 100644 --- a/keyboards/planck/keymaps/callum/keymap.c +++ b/keyboards/planck/keymaps/callum/keymap.c @@ -163,12 +163,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [SYMB] = LAYOUT_planck_grid( esc, n7, n5, n3, n1, n9, n8, n0, n2, n4, n6, dash, del, at, dlr, eql, lprn, lbrc, rbrc, rprn, astr, hash, plus, gbp, - caps, grv, pipe, bsls, lcbr, tild, circ, rcbr, ampr, exlm, perc, caps, + ____, grv, pipe, bsls, lcbr, tild, circ, rcbr, ampr, exlm, perc, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____ ), [MOVE] = LAYOUT_planck_grid( - esc, xxxx, slup, dtl, dtr, xxxx, xxxx, home, up, end, xxxx, xxxx, + esc, xxxx, slup, dtl, dtr, xxxx, xxxx, home, up, end, xxxx, caps, del, xxxx, sldn, tabl, tabr, xxxx, xxxx, left, down, rght, xxxx, xxxx, ____, xxxx, xxxx, back, fwd, xxxx, xxxx, pgdn, pgup, xxxx, xxxx, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____ From c6cd359374fc7d318da8ce98df0eebc2cf86714a Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 17 Jan 2020 15:34:43 -0800 Subject: [PATCH 303/429] [User] Add 1PassX Autofill macro --- layouts/community/ortho_4x12/brandonschlack/keymap.c | 2 +- layouts/community/ortho_5x12/brandonschlack/keymap.c | 2 +- users/brandonschlack/process_records.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c index 4ed5dd444142..05cbde92e167 100644 --- a/layouts/community/ortho_4x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c @@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, MC_BACK, MC_FWRD, PRV_TAB, NXT_TAB, NXT_WIN, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, _______, PW_ATFL, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ // └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c index abc5553c88fa..1d1bffea1263 100644 --- a/layouts/community/ortho_5x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, MC_BACK, MC_FWRD, PRV_TAB, NXT_TAB, NXT_WIN, \ // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, _______, PW_ATFL, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ // └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 708f0e2aa325..c133503d5b7d 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -86,7 +86,8 @@ void matrix_scan_cmd_tab(void); #define MC_PLYR LGUI(KC_F8) // Focuses current Media Player #define MC_UNDO LGUI(KC_Z) // Undo (Command-Z) #define MC_REDO LSFT(LGUI(KC_Z)) // Redo (Shift-Command-Z) -#define PW_ATFL HYPR(KC_BSLS) // Password Autofill (Shift-Control-Option-Command-\) +#define OP_AFLL HYPR(KC_BSLS) // 1Password Autofill (Shift-Control-Option-Command-\) +#define PX_AFLL LSFT(LALT(KC_X)) // 1PasswordX Autofill (Shift-Option-X) // Reverse scrolling for using with macOS Natural Scrolling. #define MC_WH_U KC_WH_D // Mouse Wheel Up #define MC_WH_D KC_WH_U // Mouse Wheel Down From 6b4bf79bf4e93ed8411e624c0f3751aae281f925 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 22 Jan 2020 17:58:09 -0800 Subject: [PATCH 304/429] [Keymap] Initial Nightmare keymap --- .../nightmare/keymaps/brandonschlack/config.h | 19 ++++++++ .../nightmare/keymaps/brandonschlack/keymap.c | 43 +++++++++++++++++++ .../keymaps/brandonschlack/readme.md | 3 ++ 3 files changed, 65 insertions(+) create mode 100644 keyboards/nightmare/keymaps/brandonschlack/config.h create mode 100644 keyboards/nightmare/keymaps/brandonschlack/keymap.c create mode 100644 keyboards/nightmare/keymaps/brandonschlack/readme.md diff --git a/keyboards/nightmare/keymaps/brandonschlack/config.h b/keyboards/nightmare/keymaps/brandonschlack/config.h new file mode 100644 index 000000000000..d267733f98c0 --- /dev/null +++ b/keyboards/nightmare/keymaps/brandonschlack/config.h @@ -0,0 +1,19 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ + +#pragma once + +// place overrides here diff --git a/keyboards/nightmare/keymaps/brandonschlack/keymap.c b/keyboards/nightmare/keymaps/brandonschlack/keymap.c new file mode 100644 index 000000000000..bd8d5b8b4e24 --- /dev/null +++ b/keyboards/nightmare/keymaps/brandonschlack/keymap.c @@ -0,0 +1,43 @@ +/* Copyright 2019 cfbender + * + * 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 . + */ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +#define HYP_TAB HYPR_T(KC_TAB) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[_BASE] = LAYOUT_split( \ + KC_HOME, KC_ESC, 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, \ + KC_PGUP, HYP_TAB, 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_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, LOWER, \ + KC_END, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, RAISE \ +), + +[_LOWER] = LAYOUT_split( \ + MC_SLPD, 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_DELT, \ + KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE, _______, \ + KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______ \ +), + +[_RAISE] = LAYOUT_split( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, \ + _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, _______, _______, KC_LEFT, KC_RGHT, _______, \ + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, KC_DOWN, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +), +}; + diff --git a/keyboards/nightmare/keymaps/brandonschlack/readme.md b/keyboards/nightmare/keymaps/brandonschlack/readme.md new file mode 100644 index 000000000000..fed992a9472a --- /dev/null +++ b/keyboards/nightmare/keymaps/brandonschlack/readme.md @@ -0,0 +1,3 @@ +# brandonschlack's Nightmare Keymap + +![Base Layer](https://i.imgur.com/YTVjXZv.jpg) From 27dd69616f7fd46d1b82c612c7ea22cc4dac1f78 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 24 Jan 2020 11:49:13 -0800 Subject: [PATCH 305/429] [User] Refactor _MACRO layer define to _KARABINER --- .../keebio/bdn9/keymaps/brandonschlack/keymap.c | 10 +++++----- .../romac/keymaps/brandonschlack/keymap.c | 12 ++++++------ keyboards/launchpad/keymaps/brandonschlack/keymap.c | 8 ++++---- users/brandonschlack/brandonschlack.h | 2 +- users/brandonschlack/process_records.h | 2 +- users/brandonschlack/readme.md | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index e5b33ed15dcd..2ddee93b873f 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { │ 7 │ 8 │ 9 │ └────────┴────────┴────────┘ */ - [_MACRO] = LAYOUT( + [_KARABINER] = LAYOUT( KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, DTP_AVC, KC_P7, KC_P8, DTP_ADJ @@ -193,7 +193,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = LAYOUT( QM_MAKE, DF_REDR, TG_LGHT, - DF_MEDA, DF_NAVI, DF_MCRO, + DF_MEDA, DF_NAVI, DF_KBNR, TG_REVW, TG_LNAV, TG_EDIT ), }; @@ -210,7 +210,7 @@ const uint16_t PROGMEM encoders[][2][2] = { [_REEDER] = {{ KC_J, KC_K }, { KC_N, KC_P }}, [_MEDIA] = {{ KC_VOLU, KC_VOLD }, { KC_MFFD, KC_MRWD }}, [_NAVI] = {{ MC_WH_D, MC_WH_U }, { NXT_TAB, PRV_TAB }}, - [_MACRO] = {{ KC_PPLS, KC_PMNS }, { KC_PEQL, KC_PDOT }}, + [_KARABINER] = {{ KC_PPLS, KC_PMNS }, { KC_PEQL, KC_PDOT }}, [LR_NAV] = {{ KC_EQL, KC_MINS }, { KC_PGUP, KC_PGDN }}, [LR_REVIEW] = {{ KC_RBRC, KC_LBRC }, { G(KC_UP), G(KC_DOWN) }}, [LR_EDIT] = {{ KC_DOT, KC_COMM }, { KC_EQL, KC_MINS }}, @@ -318,7 +318,7 @@ void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { case _NAVI: keycode = KC_PGUP; break; - case _MACRO: + case _KARABINER: keycode = KC_P6; break; case LR_NAV: @@ -335,7 +335,7 @@ void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { case _REEDER: keycode = G(KC_3); break; - case _MACRO: + case _KARABINER: keycode = KC_P9; break; case _MEDIA: diff --git a/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c b/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c index 113119e60fb6..31e8e87567c5 100644 --- a/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c +++ b/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c @@ -21,13 +21,13 @@ enum romac_layers { NUMPAD = 0, FN, NUMLOCK, - MACRO + KARABINER }; #define DF_NMPD DF(NUMPAD) #define DF_NMLK DF(NUMLOCK) -#undef DF_MCRO -#define DF_MCRO DF(MACRO) +#undef DF_KBNR +#define DF_KBNR DF(KARABINER) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [FN] = LAYOUT( KC_PSLS, KC_PAST, KC_BSPC, \ KC_TRNS, KC_TRNS, KC_PMNS, \ - DF_NMLK, DF_MCRO, KC_PPLS, \ + DF_NMLK, DF_KBNR, KC_PPLS, \ KC_TRNS, TG_ADJT, KC_PENT \ ), @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { DF_NMPD, KC_INS, KC_DEL \ ), - [MACRO] = LAYOUT( + [KARABINER] = LAYOUT( KC_F13, KC_F14, KC_F15, \ KC_F16, KC_F17, KC_F18, \ KC_F19, KC_F20, KC_F21, \ @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( QM_MAKE, EEP_RST, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, \ - DF_NMPD, DF_NMLK, DF_MCRO, \ + DF_NMPD, DF_NMLK, DF_KBNR, \ KC_TRNS, XXXXXXX, XXXXXXX \ ) }; diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index 0a733a8540be..a57947fbf7e3 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ 7 │ 8 │ * └──────┴──────┘ */ -[_MACRO] = LAYOUT( \ +[_KARABINER] = LAYOUT( \ KC_P1, KC_P2, \ KC_P3, KC_P4, \ KC_P5, KC_P6, \ @@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( \ QM_MAKE, RESET, \ DF_REDR, DF_MEDA, \ - DF_NAVI, DF_MCRO, \ + DF_NAVI, DF_KBNR, \ TG_LGHT, XXXXXXX \ ) @@ -152,7 +152,7 @@ void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { case _NAVI: keycode = REO_TAB; break; - case _MACRO: + case _KARABINER: keycode = KC_P7; break; } @@ -168,7 +168,7 @@ void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { case _NAVI: keycode = CLS_TAB; break; - case _MACRO: + case _KARABINER: keycode = KC_P8; break; } diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 23ba0dfe91d6..6a7256c7afac 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -22,7 +22,7 @@ enum bs_layers { _REEDER = 0, _MEDIA, _NAVI, - _MACRO, + _KARABINER, #endif KEYMAP_LAYERS, // Add more layers in keymaps /* Protected Layer */ diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index c133503d5b7d..5b2e06cea928 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -100,7 +100,7 @@ void matrix_scan_cmd_tab(void); #define DF_REDR DF(_REEDER) // Set Default Layer to Reeder shortcuts #define DF_MEDA DF(_MEDIA) // Set Default Layer to Media controls #define DF_NAVI DF(_NAVI) // Set Default Layer to Navigation shortcuts -#define DF_MCRO DF(_MACRO) // Set Default Layer to Basic Macro keys +#define DF_KBNR DF(_KARABINER) // Set Default Layer to Basic Macro keys #endif // RGB Theme diff --git a/users/brandonschlack/readme.md b/users/brandonschlack/readme.md index 7da55a4bd6e8..ebdb05e6a94a 100644 --- a/users/brandonschlack/readme.md +++ b/users/brandonschlack/readme.md @@ -14,7 +14,7 @@ and macropads: * **_REEDER**: Shortcuts for [Reeder.app](https://reederapp.com/), my RSS feed reader * **_MEDIA**: Media controls * **_NAVI**: Navigation macros, for changing tabs and scrolling -* **_MACRO**: Generic macro keys, meant to be customized per app with [Karabiner](https://pqrs.org/osx/karabiner/) +* **_KARABINER**: Generic macro keys, meant to be customized per app with [Karabiner](https://pqrs.org/osx/karabiner/) #### Protected Layers I have some named "protected" layers, meant to be at the end of the layer list for changing keyboard settings and features. From b42b14597f5f44f86be86afc2e12af15bf84d7c1 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 24 Jan 2020 12:19:26 -0800 Subject: [PATCH 306/429] [User] Refactor _FN layer define to _FN1 --- .../coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c | 2 +- .../gray_studio/think65/solder/keymaps/brandonschlack/keymap.c | 2 +- keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c | 2 +- keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c | 2 +- layouts/community/60_ansi/brandonschlack-ansi/keymap.c | 2 +- .../60_ansi_split_bs_rshift/brandonschlack-split/keymap.c | 2 +- layouts/community/65_ansi_blocker/brandonschlack/keymap.c | 2 +- layouts/community/75_ansi/brandonschlack/keymap.c | 2 +- layouts/community/ortho_4x12/brandonschlack/keymap.c | 2 +- layouts/community/ortho_5x12/brandonschlack/keymap.c | 2 +- layouts/community/tkl_ansi/brandonschlack/keymap.c | 2 +- users/brandonschlack/brandonschlack.h | 2 +- users/brandonschlack/process_records.h | 2 +- users/brandonschlack/readme.md | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c index de03817f69e9..78d329815e83 100644 --- a/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c +++ b/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ │ │ │ │ │ │Hom│PgD│End│ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ */ -[_FN] = LAYOUT_65_ansi( +[_FN1] = LAYOUT_65_ansi( 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_DELT, MC_SLPD, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_VOLU, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, \ diff --git a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c index 91def7a403c5..fc96c68df677 100644 --- a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c +++ b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ │ │ │ │ │ │Hom│PgD│End│ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ -[_FN] = LAYOUT_all( \ +[_FN1] = LAYOUT_all( \ 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_DELT, XXXXXXX, KC_VOLU, \ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_SLPD, KC_VOLD, \ RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, MC_MSSN, MC_LHPD, _______, XXXXXXX, \ diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index eb86a2cfc616..ad1a37d055fb 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ │ │ │ │ │ │Hom│PgD│End│ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ -[_FN] = LAYOUT( +[_FN1] = LAYOUT( QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_MSSN, MC_SLPD, \ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, KC_VOLU, \ _______, _______, _______, _______, _______, _______, _______, _______, QM_KYMP, _______, _______, _______, TG_ADJT, KC_VOLD, \ diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c index 69f108d6a461..0d6c19502729 100644 --- a/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ │ │ │ │ │ │Hom│PgD│End│ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ -[_FN] = LAYOUT_all( +[_FN1] = LAYOUT_all( QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_MSSN, MC_SLPD, \ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, KC_VOLU, \ _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, QM_KYMP, _______, _______, _______, TG_ADJT, KC_VOLD, \ diff --git a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c index cabd121661a9..d2a8f7bf78a1 100644 --- a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c +++ b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ │ │ │ │ │ │ │ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ */ -[_FN] = LAYOUT_60_ansi( \ +[_FN1] = LAYOUT_60_ansi( \ 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_DELT, \ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_PGUP, MC_MSSN, MC_SLPD, \ RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_VOLD, KC_VOLU, KC_HOME, KC_END, _______, \ diff --git a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c index f91c9e7c86ce..cfcee61bea8e 100644 --- a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c +++ b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ │ │ │ │ │ │ │ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ */ -[_FN] = LAYOUT_60_ansi_split_bs_rshift( \ +[_FN1] = LAYOUT_60_ansi_split_bs_rshift( \ QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, \ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_PGUP, MC_MSSN, KC_DELT, \ RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_VOLD, KC_VOLU, KC_HOME, KC_END, _______, \ diff --git a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c index 3ea4d8e39dbb..9fe45901fbf1 100644 --- a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c +++ b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ │ │ │ │ │ │Hom│PgD│End│ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ -[_FN] = LAYOUT_65_ansi_blocker( \ +[_FN1] = LAYOUT_65_ansi_blocker( \ 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_DELT, MC_SLPD, \ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_VOLU, \ RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, \ diff --git a/layouts/community/75_ansi/brandonschlack/keymap.c b/layouts/community/75_ansi/brandonschlack/keymap.c index 947590a54060..7fe18fe0f807 100644 --- a/layouts/community/75_ansi/brandonschlack/keymap.c +++ b/layouts/community/75_ansi/brandonschlack/keymap.c @@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ │ │ │ │ │ │Hom│PgD│End│ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ */ -[_FN] = LAYOUT_75_ansi( \ +[_FN1] = LAYOUT_75_ansi( \ QM_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELT, MC_SLPD, \ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, \ diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c index 05cbde92e167..b827902ba0b2 100644 --- a/layouts/community/ortho_4x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Function */ -[_FN] = LAYOUT_ortho_4x12( \ +[_FN1] = LAYOUT_ortho_4x12( \ // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ _______, _______, _______, _______, _______, _______, _______, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, MC_SLPD, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c index 1d1bffea1263..9f9eaf3b15fb 100644 --- a/layouts/community/ortho_5x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Function */ -[_FN] = LAYOUT_ortho_5x12( \ +[_FN1] = LAYOUT_ortho_5x12( \ // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ _______, _______, _______, _______, _______, _______, _______, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, MC_SLPD, \ // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ diff --git a/layouts/community/tkl_ansi/brandonschlack/keymap.c b/layouts/community/tkl_ansi/brandonschlack/keymap.c index 68f2476ebf59..c3646e0476f5 100644 --- a/layouts/community/tkl_ansi/brandonschlack/keymap.c +++ b/layouts/community/tkl_ansi/brandonschlack/keymap.c @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ │ │ │ │ │ │ │ │Hom│PgD│End│ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┴─┴───┴───┴───┘ */ -[_FN] = LAYOUT_tkl_ansi( \ +[_FN1] = LAYOUT_tkl_ansi( \ QM_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELT, KC_MPLY, MC_SLPD, KC_VOLU, \ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_VOLD, \ diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 6a7256c7afac..c571c5fd72e1 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -15,7 +15,7 @@ enum bs_layers { #if !defined(IS_MACROPAD) // Keyboard Layers _BASE = 0, - _FN = 1, + _FN1 = 1, _LOWER, _RAISE, #else // Macropad Layers diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 5b2e06cea928..d0bce198a475 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -27,7 +27,7 @@ void matrix_scan_cmd_tab(void); #define HY_ESC ALL_T(KC_ESC) // Hold Escape for Hyper (Shift-Control-Option-Command) #define SF_CAPS LSFT_T(KC_CAPS) // Hold Caps Lock for Left Shift #define SFT_ENT RSFT_T(KC_ENT) // Hold Enter for Right Shift -#define FN_LYR MO(_FN) // Hold for FN Layer +#define FN_LYR MO(_FN1) // Hold for FN Layer #define LOWER MO(_LOWER) // Hold for LOWER Layer #define RAISE MO(_RAISE) // Hold for RAISE Layer #define TG_ADJT TG(_ADJUST) // Toggle ADJUST Layer diff --git a/users/brandonschlack/readme.md b/users/brandonschlack/readme.md index ebdb05e6a94a..84f216f9f885 100644 --- a/users/brandonschlack/readme.md +++ b/users/brandonschlack/readme.md @@ -7,7 +7,7 @@ My QMK home. I feel as though I stand on the shoulders of giants, for a lot of m I have some predefined layer names for keyboards: * **_BASE**: Default Layer, QWERTY layout. -* **_FN**: Function Layer for 60% and above, and additional macros and shortcuts on 50% and below. +* **_FN1**: Function Layer for 60% and above, and additional macros and shortcuts on 50% and below. * **_LOWER** and **_RAISE**: Function layers for 40% and macropads: From b906b44c93dfa2873865fd18bbee3496d03bbc09 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 24 Jan 2020 12:35:09 -0800 Subject: [PATCH 307/429] [User] Refactor layer defines for _FN2, _MACRO --- .../ortho_4x12/brandonschlack/keymap.c | 28 ++++++++-------- .../ortho_5x12/brandonschlack/keymap.c | 32 +++++++++---------- users/brandonschlack/brandonschlack.h | 7 ++-- users/brandonschlack/process_records.h | 1 + 4 files changed, 36 insertions(+), 32 deletions(-) diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c index b827902ba0b2..96454f3acb4b 100644 --- a/layouts/community/ortho_4x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c @@ -31,20 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ - FN_LYR, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ -// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ -), - -/* Function */ -[_FN1] = LAYOUT_ortho_4x12( \ -// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ - _______, _______, _______, _______, _______, _______, _______, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, MC_SLPD, \ -// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, _______, MC_BACK, MC_FWRD, PRV_TAB, NXT_TAB, NXT_WIN, \ -// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, \ -// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + MACRO, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ // └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ), @@ -74,6 +61,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ), +/* Macros */ +[_MACRO] = LAYOUT_ortho_4x12( \ +// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ + _______, _______, _______, _______, _______, _______, _______, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, MC_SLPD, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ + _______, _______, _______, _______, _______, _______, _______, MC_BACK, MC_FWRD, PRV_TAB, NXT_TAB, NXT_WIN, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ + _______, _______, _______, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ +), + /* Adjust (Lower + Raise) */ [_ADJUST] = LAYOUT_ortho_4x12( \ // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c index 9f9eaf3b15fb..1d2ec325b414 100644 --- a/layouts/community/ortho_5x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c @@ -33,22 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ - FN_LYR, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ -// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ -), - -/* Function */ -[_FN1] = LAYOUT_ortho_5x12( \ -// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ - _______, _______, _______, _______, _______, _______, _______, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, MC_SLPD, \ -// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ -// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, _______, MC_BACK, MC_FWRD, PRV_TAB, NXT_TAB, NXT_WIN, \ -// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, \ -// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + MACRO, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ // └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ), @@ -82,6 +67,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ), +/* Function */ +[_MACRO] = LAYOUT_ortho_5x12( \ +// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ + _______, _______, _______, _______, _______, _______, _______, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, MC_SLPD, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + _______, _______, _______, _______, _______, _______, _______, MC_BACK, MC_FWRD, PRV_TAB, NXT_TAB, NXT_WIN, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + _______, _______, _______, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, \ +// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ +), + /* Adjust (Lower + Raise) */ [_ADJUST] = LAYOUT_ortho_5x12( \ // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index c571c5fd72e1..303739aff7b5 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -16,8 +16,8 @@ enum bs_layers { #if !defined(IS_MACROPAD) // Keyboard Layers _BASE = 0, _FN1 = 1, - _LOWER, - _RAISE, + _FN2, + _MACRO, #else // Macropad Layers _REEDER = 0, _MEDIA, @@ -31,6 +31,9 @@ enum bs_layers { _ADJUST = 15 // 15: Change keyboard settings }; +#define _LOWER _FN1 +#define _RAISE _FN2 + /* TODO User EECONFIG */ typedef union { uint32_t raw; diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index d0bce198a475..17129cd29990 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -30,6 +30,7 @@ void matrix_scan_cmd_tab(void); #define FN_LYR MO(_FN1) // Hold for FN Layer #define LOWER MO(_LOWER) // Hold for LOWER Layer #define RAISE MO(_RAISE) // Hold for RAISE Layer +#define MACRO MO(_MACRO) // Hold for MACRO Layer #define TG_ADJT TG(_ADJUST) // Toggle ADJUST Layer #define TG_LGHT TG(_LIGHT) // Toggle LIGHT Layer /** From a8469b61f27ad5e2a1d26fc31babd0e59fbd3b46 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 24 Jan 2020 12:36:30 -0800 Subject: [PATCH 308/429] [User] Refactor Media Mod-Tap defines --- .../discipline/keymaps/brandonschlack/keymap.c | 2 +- .../think65/solder/keymaps/brandonschlack/keymap.c | 4 ++-- .../kbd67/hotswap/keymaps/brandonschlack/keymap.c | 2 +- .../kbd67/rev2/keymaps/brandonschlack/keymap.c | 2 +- .../community/60_ansi/brandonschlack-ansi/keymap.c | 4 ++-- .../brandonschlack-split/keymap.c | 2 +- .../65_ansi_blocker/brandonschlack/keymap.c | 2 +- layouts/community/75_ansi/brandonschlack/keymap.c | 2 +- layouts/community/tkl_ansi/brandonschlack/keymap.c | 2 +- users/brandonschlack/process_records.h | 12 +++++------- 10 files changed, 16 insertions(+), 18 deletions(-) diff --git a/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c index 78d329815e83..7122a4bd6ef2 100644 --- a/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c +++ b/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_PGUP, \ HY_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_PGDN, \ 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_UP, KC_END, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MM_RGUI, MM_RALT, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, RWD_GUI, FFD_ALT, PLY_FN1, KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ diff --git a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c index fc96c68df677..c314005ca11e 100644 --- a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c +++ b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_PGDN, \ HY_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, XXXXXXX, \ KC_LSFT, XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, XXXXXXX, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, PLY_FN1, KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ @@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_DELT, XXXXXXX, KC_VOLU, \ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_SLPD, KC_VOLD, \ RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, MC_MSSN, MC_LHPD, _______, XXXXXXX, \ - _______, XXXXXXX, RGB_LYR, RGB_THM, _______, _______, RESET, _______, QM_MAKE, KC_MRWD, KC_MFFD, KC_MPLY, MM_RSFT, KC_PGUP, XXXXXXX, \ + _______, XXXXXXX, RGB_LYR, RGB_THM, _______, _______, RESET, _______, QM_MAKE, KC_MRWD, KC_MFFD, KC_MPLY, MUT_SFT, KC_PGUP, XXXXXXX, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), /* Blank Layout diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index ad1a37d055fb..be5c9b70340c 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, KC_PGUP, \ HY_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_PGDN, \ 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_UP, KC_END, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT), + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, PLY_FN1, KC_LEFT, KC_DOWN, KC_RGHT), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c index 0d6c19502729..3060f2d4fb34 100644 --- a/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, KC_PGUP, \ HY_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_PGDN, \ KC_LSFT, XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, \ - KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, KC_SPC, XXXXXXX, KC_RGUI, MM_FNPY, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT), + KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, KC_SPC, XXXXXXX, KC_RGUI, PLY_FN1, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ diff --git a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c index d2a8f7bf78a1..01493f8919b0 100644 --- a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c +++ b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, \ HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT_RSUP, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MM_RGPY, MT_RALT, MT_RFDN, MT_RCRT \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, PLY_GUI, MT_RALT, MT_RFDN, MT_RCRT \ ), /* Function Layer @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_DELT, \ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_PGUP, MC_MSSN, MC_SLPD, \ RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_VOLD, KC_VOLU, KC_HOME, KC_END, _______, \ - _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, QM_MAKE, KC_MRWD, KC_MFFD, KC_PGDN, MM_RSFT, \ + _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, QM_MAKE, KC_MRWD, KC_MFFD, KC_PGDN, MUT_SFT, \ _______, _______, _______, _______, _______, _______, _______, _______ \ ), /* Layer diff --git a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c index cfcee61bea8e..2e344213d01a 100644 --- a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c +++ b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, \ HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT_RSUP, MM_FNPY, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT_RSUP, PLY_FN1, \ KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MT_RALT, MT_RFDN, MT_RCRT \ ), diff --git a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c index 9fe45901fbf1..3cb93b60d8f0 100644 --- a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c +++ b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_PGUP, \ HY_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_PGDN, \ 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_UP, KC_END, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, PLY_FN1, KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ diff --git a/layouts/community/75_ansi/brandonschlack/keymap.c b/layouts/community/75_ansi/brandonschlack/keymap.c index 7fe18fe0f807..84409450f580 100644 --- a/layouts/community/75_ansi/brandonschlack/keymap.c +++ b/layouts/community/75_ansi/brandonschlack/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_PGUP, \ HY_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_PGDN, \ 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_UP, KC_END, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MM_RGUI, MM_RALT, MM_FNPY, KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, RWD_GUI, FFD_ALT, PLY_FN1, KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ diff --git a/layouts/community/tkl_ansi/brandonschlack/keymap.c b/layouts/community/tkl_ansi/brandonschlack/keymap.c index c3646e0476f5..85914bb7c5c5 100644 --- a/layouts/community/tkl_ansi/brandonschlack/keymap.c +++ b/layouts/community/tkl_ansi/brandonschlack/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_DEL, KC_END, KC_PGDN, \ HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MM_RGUI, MM_RALT, MM_FNPY, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, RWD_GUI, FFD_ALT, PLY_FN1, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┐ diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 17129cd29990..75e8ade6a472 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -38,13 +38,11 @@ void matrix_scan_cmd_tab(void); * Use the Mod-Tap feature for easy media controls * Used with >=65% layouts */ -#define MM_RGUI RGUI_T(KC_MRWD) // Tap Right GUI for Prev Track -#define MM_RGPY RGUI_T(KC_MPLY) // Tap Right GUI for Play/Pause -#define MM_RALT RALT_T(KC_MFFD) // Tap Right Alt for Next Track -#define MM_FNPY LT(1, KC_MPLY) // Tap Fn for Play/Pause -#define MM_RSFT RSFT_T(KC_MUTE) // Tap Right Shift for Mute -#define LWR_MUT LT(_LOWER, KC_MUTE) // Tap Lower for Mute -#define RAI_PLY LT(_RAISE, KC_MPLY) // Tap Raise for Play/Pause +#define RWD_GUI RGUI_T(KC_MRWD) // Tap Right GUI for Prev Track +#define PLY_GUI RGUI_T(KC_MPLY) // Tap Right GUI for Play/Pause +#define FFD_ALT RALT_T(KC_MFFD) // Tap Right Alt for Next Track +#define PLY_FN1 LT(1, KC_MPLY) // Tap Fn for Play/Pause +#define MUT_SFT RSFT_T(KC_MUTE) // Tap Right Shift for Mute /** * Arrow Mod-Tap * Use the Mod-Tap feature for arrow keys From a7d75ddfad23d6c4ac06847e1006316139e95284 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 24 Jan 2020 12:53:11 -0800 Subject: [PATCH 309/429] [User] Refactor Arrow/Nav Mod-Taps for readability --- .../60_ansi/brandonschlack-ansi/keymap.c | 4 ++-- .../brandonschlack-split/keymap.c | 4 ++-- users/brandonschlack/process_records.h | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c index 01493f8919b0..52e2ce257420 100644 --- a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c +++ b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c @@ -19,8 +19,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_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, \ HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT_RSUP, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, PLY_GUI, MT_RALT, MT_RFDN, MT_RCRT \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, UP_RSFT, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, PLY_GUI, LFT_ALT, DWN_FN1, RGT_CTL \ ), /* Function Layer diff --git a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c index 2e344213d01a..1ca03ede7086 100644 --- a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c +++ b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c @@ -34,8 +34,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, \ HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT_RSUP, PLY_FN1, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MT_RALT, MT_RFDN, MT_RCRT \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, UP_RSFT, PLY_FN1, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, LFT_ALT, DWN_FN1, RGT_CTL \ ), /* Function Layer diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 75e8ade6a472..117a8f42655b 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -48,19 +48,19 @@ void matrix_scan_cmd_tab(void); * Use the Mod-Tap feature for arrow keys * Mostly used for 60% layouts */ -#define MT_RSUP RSFT_T(KC_UP) // Tap Right Shift for Up -#define MT_RALT RALT_T(KC_LEFT) // Tap Right Alt for Left -#define MT_RFDN LT(1, KC_DOWN) // Tap Fn for Down -#define MT_RCRT RCTL_T(KC_RGHT) // Tap Right Ctrl for Right +#define UP_RSFT RSFT_T(KC_UP) // Tap Right Shift for Up +#define LFT_ALT RALT_T(KC_LEFT) // Tap Right Alt for Left +#define DWN_FN1 LT(1, KC_DOWN) // Tap Fn for Down +#define RGT_CTL RCTL_T(KC_RGHT) // Tap Right Ctrl for Right /** * Nav Mod-Tap * Use the Mod-Tap feature for nav keys (Home/End, Page Up/Down) * Mostly used for 60% layouts, on a function layer */ -#define MT_RSPU RSFT_T(KC_PGUP) // Tap Right Shift for Page Up -#define MT_RAHM RALT_T(KC_HOME) // Tap Right Alt for Home -#define MT_RFPD LT(1, KC_PGDN) // Tap Fn for Page Down -#define MT_RCED RCTL_T(KC_END) // Tap Right Ctrl for End +#define PGU_SFT RSFT_T(KC_PGUP) // Tap Right Shift for Page Up +#define HOM_ALT RALT_T(KC_HOME) // Tap Right Alt for Home +#define PGD_FN2 LT(2, KC_PGDN) // Tap Fn2 for Page Down +#define END_CTL RCTL_T(KC_END) // Tap Right Ctrl for End /** * MacOS From 244ed9c6b6fa3153947dec33a55404a27173b5b9 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 24 Jan 2020 17:36:41 -0800 Subject: [PATCH 310/429] [User] Fix _MACRO layer define refactor --- layouts/community/ortho_4x12/brandonschlack/keymap.c | 2 +- layouts/community/ortho_5x12/brandonschlack/keymap.c | 2 +- users/brandonschlack/process_records.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c index 96454f3acb4b..ff6c96d7c2fa 100644 --- a/layouts/community/ortho_4x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ - MACRO, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ + MCO_LYR, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ // └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ), diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c index 1d2ec325b414..7f794e9b4d13 100644 --- a/layouts/community/ortho_5x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ - MACRO, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ + MCO_LYR, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ // └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ), diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 117a8f42655b..6190e566564d 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -30,7 +30,7 @@ void matrix_scan_cmd_tab(void); #define FN_LYR MO(_FN1) // Hold for FN Layer #define LOWER MO(_LOWER) // Hold for LOWER Layer #define RAISE MO(_RAISE) // Hold for RAISE Layer -#define MACRO MO(_MACRO) // Hold for MACRO Layer +#define MCO_LYR MO(_MACRO) // Hold for MACRO Layer #define TG_ADJT TG(_ADJUST) // Toggle ADJUST Layer #define TG_LGHT TG(_LIGHT) // Toggle LIGHT Layer /** From 3756ebc21b794c7a1a9b179fe26cecafc4634aa2 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Sat, 25 Jan 2020 15:12:04 -0800 Subject: [PATCH 311/429] [Keymap] Fix FN_LYR layer define refactor --- layouts/community/ortho_4x12/brandonschlack/keymap.c | 2 +- layouts/community/ortho_5x12/brandonschlack/keymap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c index ff6c96d7c2fa..8b27d1bd74b6 100644 --- a/layouts/community/ortho_4x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c @@ -210,7 +210,7 @@ bool music_mask_user(uint16_t keycode) { switch (keycode) { case RAISE: case LOWER: - case FN_LYR: + case MCO_LYR: return false; default: return true; diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c index 7f794e9b4d13..5705db72fc27 100644 --- a/layouts/community/ortho_5x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c @@ -206,7 +206,7 @@ bool music_mask_user(uint16_t keycode) { switch (keycode) { case RAISE: case LOWER: - case FN_LYR: + case MCO_LYR: return false; default: return true; From 213810ea86dcc55390a8254f104a5230ccc44e82 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Sat, 25 Jan 2020 15:13:12 -0800 Subject: [PATCH 312/429] [Keymap] Refactor think65 keymap to 65_ansi_blocker --- .../solder/keymaps/brandonschlack/keymap.c | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c index c314005ca11e..1702fd44a18e 100644 --- a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c +++ b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c @@ -30,12 +30,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │Ctrl│ Opt│ Cmd│ Space │Cmd │FnPy│ │Lef│Dow│Rig│ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ -[_BASE] = 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, XXXXXXX, KC_PGUP, \ - 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_PGDN, \ - HY_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, XXXXXXX, \ - KC_LSFT, XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, XXXXXXX, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, PLY_FN1, KC_LEFT, KC_DOWN, KC_RGHT \ +[_BASE] = LAYOUT_65_ansi_blocker( \ + 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_PGUP, \ + 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_PGDN, \ + HY_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, XXXXXXX, \ + 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_UP, XXXXXXX, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, PLY_FN1, KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ @@ -50,12 +50,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ │ │ │ │ │ │Hom│PgD│End│ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ */ -[_FN1] = LAYOUT_all( \ - 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_DELT, XXXXXXX, KC_VOLU, \ - RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_SLPD, KC_VOLD, \ - RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, MC_MSSN, MC_LHPD, _______, XXXXXXX, \ - _______, XXXXXXX, RGB_LYR, RGB_THM, _______, _______, RESET, _______, QM_MAKE, KC_MRWD, KC_MFFD, KC_MPLY, MUT_SFT, KC_PGUP, XXXXXXX, \ - _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ +[_FN1] = LAYOUT_65_ansi_blocker( \ + 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_DELT, KC_VOLU, \ + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_SLPD, KC_VOLD, \ + RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, MC_MSSN, MC_LHPD, _______, XXXXXXX, \ + _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, QM_MAKE, KC_MRWD, KC_MFFD, KC_MPLY, MUT_SFT, KC_PGUP, XXXXXXX, \ + _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), /* Blank Layout * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ @@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ * │ │ │ │ │ │ │ │ │ │ │ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘ -[X] = LAYOUT_all( \ +[X] = LAYOUT_65_ansi_blocker( \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ From 1ea2e4480098b6af1e8d9c745ef79318c1f1866c Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 27 Jan 2020 12:02:30 -0800 Subject: [PATCH 313/429] [Keymap] 60_ansi keymap fixes * Add Play/Pause to Fn+Enter * Change Launchpad to Fn+] --- layouts/community/60_ansi/brandonschlack-ansi/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c index 52e2ce257420..7e24652a53cf 100644 --- a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c +++ b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ * │RMod │RH+│RS+│RV+│AS+│ │ │ │F13│F14│F15│PgU│LHP│ SLP │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │RTgl │RH-│RS-│RV-│AS-│ │ │ │VlD│VlU│Hom│End│ │ + * │RTgl │RH-│RS-│RV-│AS-│ │ │ │VlD│VlU│Hom│End│ PlyPse │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ * │ │LYR│Thm│ │ │RST│ │MKE│Prv│Nxt│PgD│ MteSft │ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ @@ -38,8 +38,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FN1] = LAYOUT_60_ansi( \ 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_DELT, \ - RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_PGUP, MC_MSSN, MC_SLPD, \ - RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_VOLD, KC_VOLU, KC_HOME, KC_END, _______, \ + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_PGUP, MC_LHPD, MC_SLPD, \ + RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_VOLD, KC_VOLU, KC_HOME, KC_END, KC_MPLY, \ _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, QM_MAKE, KC_MRWD, KC_MFFD, KC_PGDN, MUT_SFT, \ _______, _______, _______, _______, _______, _______, _______, _______ \ ), From 20fd5b3eaa383440ccd32c49e249597de9b6bd03 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 31 Jan 2020 14:45:08 -0800 Subject: [PATCH 314/429] [Keymap] Move vol controls on 60_ keymaps --- layouts/community/60_ansi/brandonschlack-ansi/keymap.c | 8 ++++---- .../60_ansi_split_bs_rshift/brandonschlack-split/keymap.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c index 7e24652a53cf..4b6f8155f108 100644 --- a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c +++ b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c @@ -29,9 +29,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ * │RMod │RH+│RS+│RV+│AS+│ │ │ │F13│F14│F15│PgU│LHP│ SLP │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │RTgl │RH-│RS-│RV-│AS-│ │ │ │VlD│VlU│Hom│End│ PlyPse │ + * │RTgl │RH-│RS-│RV-│AS-│ │ │VlD│VlU│Mut│Hom│End│ PlyPse │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ - * │ │LYR│Thm│ │ │RST│ │MKE│Prv│Nxt│PgD│ MteSft │ + * │ │LYR│Thm│ │ │RST│ │MKE│Prv│Nxt│PgD│ │ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ * │ │ │ │ │ │ │ │ │ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ @@ -39,8 +39,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_60_ansi( \ 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_DELT, \ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_PGUP, MC_LHPD, MC_SLPD, \ - RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_VOLD, KC_VOLU, KC_HOME, KC_END, KC_MPLY, \ - _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, QM_MAKE, KC_MRWD, KC_MFFD, KC_PGDN, MUT_SFT, \ + RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_HOME, KC_END, KC_MPLY, \ + _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, QM_MAKE, KC_MRWD, KC_MFFD, KC_PGDN, _______, \ _______, _______, _______, _______, _______, _______, _______, _______ \ ), /* Layer diff --git a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c index 1ca03ede7086..872891565479 100644 --- a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c +++ b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ * │RMod │RH+│RS+│RV+│AS+│ │ │ │F13│F14│F15│PgU│MNC│ Del │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │RTgl │RH-│RS-│RV-│AS-│ │ │ │VlD│VlU│Hom│End│ │ + * │RTgl │RH-│RS-│RV-│AS-│ │ │VlD│VlU│Mut│Hom│End│ │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ * │ │LYR│Thm│ │ │RST│ │Mte│Prv│Nxt│PgD│ │ │ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ @@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_60_ansi_split_bs_rshift( \ QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, \ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_PGUP, MC_MSSN, KC_DELT, \ - RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_VOLD, KC_VOLU, KC_HOME, KC_END, _______, \ + RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_HOME, KC_END, _______, \ _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, KC_MUTE, KC_MRWD, KC_MFFD, KC_PGDN, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______ \ ), From 3e720331943f82621802e6024f29967df679f05d Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Mon, 3 Feb 2020 19:24:17 -0800 Subject: [PATCH 315/429] Revert "[User] Move eeconfig_read_user to pre_init" This reverts commit a80f883a64f2dec6ba8322bbccfba0aef67b2ceb. --- users/brandonschlack/brandonschlack.c | 10 ++-------- users/brandonschlack/brandonschlack.h | 1 - 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index ce1e91b9067e..ccf06f6309f8 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -14,14 +14,6 @@ void eeconfig_init_user(void) { eeconfig_update_user(user_config.raw); } -__attribute__((weak)) void keyboard_pre_init_keymap(void) {} - -void keyboard_pre_init_user(void) { - // Read the user config from EEPROM - user_config.raw = eeconfig_read_user(); - keyboard_pre_init_keymap(); -} - __attribute__((weak)) void matrix_init_keymap(void){ } @@ -37,6 +29,8 @@ void keyboard_post_init_keymap(void){ } * calls RGB init if RGBs enabled */ void keyboard_post_init_user(void){ + // Read the user config from EEPROM + user_config.raw = eeconfig_read_user(); // Do RGB things if RGBs enabled #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) keyboard_post_init_rgb(); diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 303739aff7b5..2f84c9c0fd3f 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -44,7 +44,6 @@ typedef union { } user_config_t; extern user_config_t user_config; -void keyboard_pre_init_keymap(void); void matrix_init_keymap(void); void keyboard_post_init_keymap(void); void shutdown_keymap(void); From f2ea77a54d7e6e975f11aece8ad9d38bd71893ce Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 25 Feb 2020 14:43:56 -0800 Subject: [PATCH 316/429] [User] Move Hyper Tab alias to userspace --- keyboards/nightmare/keymaps/brandonschlack/keymap.c | 2 -- users/brandonschlack/process_records.h | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/keyboards/nightmare/keymaps/brandonschlack/keymap.c b/keyboards/nightmare/keymaps/brandonschlack/keymap.c index bd8d5b8b4e24..6176a744d250 100644 --- a/keyboards/nightmare/keymaps/brandonschlack/keymap.c +++ b/keyboards/nightmare/keymaps/brandonschlack/keymap.c @@ -16,8 +16,6 @@ #include QMK_KEYBOARD_H #include "brandonschlack.h" -#define HYP_TAB HYPR_T(KC_TAB) - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_split( \ KC_HOME, KC_ESC, 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, \ diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 6190e566564d..034faa629285 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -23,10 +23,14 @@ void matrix_scan_cmd_tab(void); * Some meta aliases for QMK features such as Mod-Taps * and for cleaner looking Layer Toggles */ -#define HY_CAPS ALL_T(KC_CAPS) // Hold Caps Lock for Hyper (Shift-Control-Option-Command) +/* Hyper Mod-Tap */ #define HY_ESC ALL_T(KC_ESC) // Hold Escape for Hyper (Shift-Control-Option-Command) +#define HY_TAB ALL_T(KC_TAB) // Hold Tab for Hyper (Shift-Control-Option-Command) +#define HY_CAPS ALL_T(KC_CAPS) // Hold Caps Lock for Hyper (Shift-Control-Option-Command) +/* Shift Mod-Tap */ #define SF_CAPS LSFT_T(KC_CAPS) // Hold Caps Lock for Left Shift #define SFT_ENT RSFT_T(KC_ENT) // Hold Enter for Right Shift +/* Layer Aliases */ #define FN_LYR MO(_FN1) // Hold for FN Layer #define LOWER MO(_LOWER) // Hold for LOWER Layer #define RAISE MO(_RAISE) // Hold for RAISE Layer From 9ff637916a3d2365e34dafd62f2075f5b85a9dbc Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 25 Feb 2020 15:00:54 -0800 Subject: [PATCH 317/429] [Keymap] Update nightmare keymap * Add ASCII preview * Update Lower, Raise layers * Add Adjust layer --- .../nightmare/keymaps/brandonschlack/keymap.c | 90 +++++++++++++++++-- 1 file changed, 83 insertions(+), 7 deletions(-) diff --git a/keyboards/nightmare/keymaps/brandonschlack/keymap.c b/keyboards/nightmare/keymaps/brandonschlack/keymap.c index 6176a744d250..3ae24cccb936 100644 --- a/keyboards/nightmare/keymaps/brandonschlack/keymap.c +++ b/keyboards/nightmare/keymaps/brandonschlack/keymap.c @@ -17,25 +17,101 @@ #include "brandonschlack.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/** + * Base + * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Hom│││Esc│ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│Bck│ + * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │PgU│││Tab │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│ + * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ + * │PgD│││Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│Shft│Low│ + * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┼┬┬┬┤ + * │End││││││││Ctl│Opt │Cmd│ Space │ Space │Cmd│Opt │Rse││││││ + * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ + */ [_BASE] = LAYOUT_split( \ KC_HOME, KC_ESC, 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, \ - KC_PGUP, HYP_TAB, 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_PGUP, HY_TAB, 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_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, LOWER, \ KC_END, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, RAISE \ ), - +/** + * Lower + * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │SlD│││` ~│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│Del│ + * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │VlU│││ │ ← │ ↑ │ ↓ │ → │ │ │ │ │ │ │ │| \│ + * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ + * │VlD│││ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┼┬┬┬┤ + * │Mut││││││││ │ │ │ │ │ │ │ ││││││ + * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ + */ [_LOWER] = LAYOUT_split( \ MC_SLPD, 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_DELT, \ - KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE, _______, \ + KC_VOLU, _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, KC_PIPE, \ KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______ \ ), - +/** + * Raise + * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │SlD│││ │ │ │ │ │ │ │ │ │ │ │ ↑ │ │ │ + * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │Nxt│││ │ F1│ F2│ F3│ F4│ F5│ F6│ │ │ │ ← │ → │ │ + * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ + * │Prv│││ │ F7│ F8│ F9│F10│F11│F12│ │ │ │ ↓ │ │ │ + * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┼┬┬┬┤ + * │Ply││││││││ │ │ │ │ │ │ │ ││││││ + * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ + */ [_RAISE] = LAYOUT_split( \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, \ - _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, _______, _______, KC_LEFT, KC_RGHT, _______, \ - _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, KC_DOWN, _______, _______, \ + MC_SLPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, \ + KC_MFFD, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, _______, _______, KC_LEFT, KC_RGHT, _______, \ + KC_MRWD, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, KC_DOWN, _______, _______, \ + KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______ \ +), +/** + * Adjust + * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ │││ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ │││ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ + * │ │││ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┼┬┬┬┤ + * │ ││││││││ │ │ │ │ │ │ │ ││││││ + * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ + */ +[_ADJUST] = LAYOUT_split( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +), +/** + * Blank + * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ │││ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ │││ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ + * │ │││ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┼┬┬┬┤ + * │ ││││││││ │ │ │ │ │ │ │ ││││││ + * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ + */ +/* +[] = LAYOUT_split( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), +*/ }; +layer_state_t layer_state_set_keymap(layer_state_t state) { + state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); + return state; +} From c89e3c6cf0c4f0e80aa5925669abc57d46dd7a4f Mon Sep 17 00:00:00 2001 From: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com> Date: Wed, 26 Feb 2020 10:12:13 +0100 Subject: [PATCH 318/429] Fixed OS detection such that OSX doesn't take over the world (#8248) --- lib/python/qmk/cli/doctor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/python/qmk/cli/doctor.py b/lib/python/qmk/cli/doctor.py index 577588492db4..41db41184ff5 100755 --- a/lib/python/qmk/cli/doctor.py +++ b/lib/python/qmk/cli/doctor.py @@ -170,7 +170,7 @@ def doctor(cli): # Determine our OS and run platform specific tests OS = platform.platform().lower() # noqa (N806), uppercase name is ok in this instance - if 'darwin' or 'macos' in OS: + if 'darwin' in OS or 'macos' in OS: if not os_test_macos(): ok = False elif 'linux' in OS: From 9f3c731758fdaeab06a09464cdde2d6c2c6b92b3 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 27 Feb 2020 11:56:29 -0800 Subject: [PATCH 319/429] [User] Add Lower-Space and Raise-Space aliases --- users/brandonschlack/process_records.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 034faa629285..b124c42e1630 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -33,6 +33,8 @@ void matrix_scan_cmd_tab(void); /* Layer Aliases */ #define FN_LYR MO(_FN1) // Hold for FN Layer #define LOWER MO(_LOWER) // Hold for LOWER Layer +#define SPC_LWR LT(_LOWER, KC_SPC) // Tap for Space, Hold for LOWER Layer +#define SPC_RAI LT(_RAISE, KC_SPC) // Tap for Space, Hold for RAISE Layer #define RAISE MO(_RAISE) // Hold for RAISE Layer #define MCO_LYR MO(_MACRO) // Hold for MACRO Layer #define TG_ADJT TG(_ADJUST) // Toggle ADJUST Layer From 58373759d7a5acb6d3abb4dd1bbf58812ff9c226 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 27 Feb 2020 11:59:48 -0800 Subject: [PATCH 320/429] [Keymap] Update nightmare keymap * Add Lower-/Raise-Space * Changed Lower, Raise keys to Macro, RCtrl * Add F-keys to Lower Layer * Add Macro Layer * Add Make,Reset to Adjust Layers --- .../nightmare/keymaps/brandonschlack/keymap.c | 48 +++++++++++++------ 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/keyboards/nightmare/keymaps/brandonschlack/keymap.c b/keyboards/nightmare/keymaps/brandonschlack/keymap.c index 3ae24cccb936..50e09de54d0a 100644 --- a/keyboards/nightmare/keymaps/brandonschlack/keymap.c +++ b/keyboards/nightmare/keymaps/brandonschlack/keymap.c @@ -24,34 +24,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ * │PgU│││Tab │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ - * │PgD│││Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│Shft│Low│ + * │PgD│││Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│Shft│ Fn│ * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┼┬┬┬┤ - * │End││││││││Ctl│Opt │Cmd│ Space │ Space │Cmd│Opt │Rse││││││ + * │End││││││││Ctl│Opt │Cmd│ Space │ Space │Cmd│Opt │Ctl││││││ * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ */ [_BASE] = LAYOUT_split( \ KC_HOME, KC_ESC, 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, \ KC_PGUP, HY_TAB, 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_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, LOWER, \ - KC_END, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, RAISE \ + KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MCO_LYR, \ + KC_END, KC_LCTL, KC_LALT, KC_LGUI, SPC_LWR, SPC_LWR, KC_RGUI, KC_RALT, KC_RCTL \ ), /** * Lower * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ * │SlD│││` ~│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│Del│ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │VlU│││ │ ← │ ↑ │ ↓ │ → │ │ │ │ │ │ │ │| \│ + * │VlU│││ │ ← │ ↓ │ ↑ │ → │ │ F1│ F2│ F3│ F4│ F5│ F6│ | \ │ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ - * │VlD│││ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │VlD│││ │ │ │ │ │ F7│ F8│ F9│F10│F11│F12│ │ │ * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┼┬┬┬┤ * │Mut││││││││ │ │ │ │ │ │ │ ││││││ * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ */ [_LOWER] = LAYOUT_split( \ MC_SLPD, 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_DELT, \ - KC_VOLU, _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, KC_PIPE, \ - KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______ \ + KC_VOLU, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_BSLS, \ + KC_VOLD, _______, _______, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, \ + KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______ \ ), /** * Raise @@ -69,25 +69,43 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { MC_SLPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, \ KC_MFFD, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, _______, _______, KC_LEFT, KC_RGHT, _______, \ KC_MRWD, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, KC_DOWN, _______, _______, \ - KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______ \ + KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______ \ +), +/** + * Macros + * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ │││ │BrD│BrU│Msn│LHP│ │ │Prv│Ply│Nxt│Mut│VlD│VlU│SLP│ + * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ │││NxW │PvT│NxT│Bck│Fwd│ │ │ │ │ │ │ │ │ + * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ + * │ │││ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┼┬┬┬┤ + * │ ││││││││ │ │ │ │ │ │ │ ││││││ + * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ + */ +[_MACRO] = LAYOUT_split( \ + _______, _______, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, _______, \ + _______, _______, _______, _______, MC_BACK, MC_FWRD, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), /** * Adjust * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │ │││ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │││Mke│ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ * │ │││ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ * │ │││ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┼┬┬┬┤ - * │ ││││││││ │ │ │ │ │ │ │ ││││││ + * │ ││││││││ │ │ │ │ │ │ │RST││││││ * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ */ [_ADJUST] = LAYOUT_split( \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + _______, _______, _______, _______, _______, _______, _______, _______, RESET \ ), /** * Blank @@ -106,7 +124,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), */ }; From 984d4af4c8b33f0d0f65444e3b24496ad84acf4f Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 27 Feb 2020 12:29:03 -0800 Subject: [PATCH 321/429] [User] Remove send_string delays in userspace --- users/brandonschlack/process_records.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index 52efce648d28..088b76d20527 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -1,11 +1,5 @@ #include "brandonschlack.h" -#if defined(TAP_CODE_DELAY) - #define SS_DELAY TAP_CODE_DELAY -#else - #define SS_DELAY 5 -#endif - // Super CMD↯TAB bool is_cmd_tab_active = false; uint16_t cmd_tab_timer = 0; @@ -45,17 +39,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { break; case QM_VRSN: // Prints firmware version if (record->event.pressed) { - send_string_with_delay_P(PSTR(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE), SS_DELAY); + SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE); } break; case QM_KYBD: // Prints keyboard path if (record->event.pressed) { - send_string_with_delay_P(PSTR("keyboards/" QMK_KEYBOARD "/"), SS_DELAY); + SEND_STRING("keyboards/" QMK_KEYBOARD "/"); } break; case QM_KYMP: // Prints keymap path if (record->event.pressed) { - send_string_with_delay_P(PSTR("keyboards/" QMK_KEYBOARD "/keymaps/" QMK_KEYMAP "/keymap.c"), SS_DELAY); + SEND_STRING("keyboards/" QMK_KEYBOARD "/keymaps/" QMK_KEYMAP "/keymap.c"); } break; case CMD_TAB: // Super CMD↯TAB @@ -135,23 +129,23 @@ void matrix_scan_cmd_tab(void) { * Sends FORCE_LAYOUT parameter if built with FORCE_LAYOUT */ void send_make_command(bool flash_bootloader) { - send_string_with_delay_P(PSTR("make " QMK_KEYBOARD ":" QMK_KEYMAP), SS_DELAY); + SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP); if (flash_bootloader) { #if defined(KEYBOARD_massdrop_alt) // only run for Massdrop ALT - send_string_with_delay_P(PSTR(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP), SS_DELAY); + SEND_STRING(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP); #elif defined(KEYBOARD_coseyfannitutti_discipline) // only run for Discipline 65 - send_string_with_delay_P(PSTR(":program"), SS_DELAY); + SEND_STRING(":program"); #else // use universal flash command - send_string_with_delay_P(PSTR(":flash"), SS_DELAY); + SEND_STRING(":flash"); #endif #if defined(FORCE_LAYOUT) // Add layout string if built with FORCE_LAYOUT - send_string_with_delay_P(PSTR(" FORCE_LAYOUT=" FORCE_LAYOUT), SS_DELAY); + SEND_STRING(" FORCE_LAYOUT=" FORCE_LAYOUT); #endif #if defined(CONVERT_TO_PROTON_C) // Add CTPC if built with CONVERT_TO_PROTON_C - send_string_with_delay_P(PSTR(" CTPC=" CONVERT_TO_PROTON_C), SS_DELAY); + SEND_STRING(" CTPC=" CONVERT_TO_PROTON_C); #endif } - send_string_with_delay_P(PSTR(SS_TAP(X_ENTER)), SS_DELAY); + SEND_STRING(SS_TAP(X_ENTER)); if (flash_bootloader) { reset_keyboard(); } From 62001cd216ebdf62a74a162900e4d60aa849cefd Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 27 Feb 2020 12:42:51 -0800 Subject: [PATCH 322/429] [User] Add Right-RGUI, Down-RAlt for 40% layouts --- users/brandonschlack/process_records.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index b124c42e1630..2b4fac9d567a 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -52,11 +52,13 @@ void matrix_scan_cmd_tab(void); /** * Arrow Mod-Tap * Use the Mod-Tap feature for arrow keys - * Mostly used for 60% layouts + * Mostly used for 40-60% layouts */ #define UP_RSFT RSFT_T(KC_UP) // Tap Right Shift for Up #define LFT_ALT RALT_T(KC_LEFT) // Tap Right Alt for Left +#define LFT_GUI RGUI_T(KC_LEFT) // Tap Right GUI for Left #define DWN_FN1 LT(1, KC_DOWN) // Tap Fn for Down +#define DWN_ALT RALT_T(KC_DOWN) // Tap Right Alt for Down #define RGT_CTL RCTL_T(KC_RGHT) // Tap Right Ctrl for Right /** * Nav Mod-Tap From ad91b06ddeadeea05fa33fe8a719a88441feee14 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 27 Feb 2020 12:50:52 -0800 Subject: [PATCH 323/429] [Keymap] Fixes for nightmare keymap * Fix Lower/Raise Layers to match ortho maps * Add Play/Pause to Lower/Raise * Add Arrow Mod-Taps * Add Next-/Prev-Tab, Next-Window to Macro Layer --- .../nightmare/keymaps/brandonschlack/keymap.c | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/keyboards/nightmare/keymaps/brandonschlack/keymap.c b/keyboards/nightmare/keymaps/brandonschlack/keymap.c index 50e09de54d0a..f401784b40ec 100644 --- a/keyboards/nightmare/keymaps/brandonschlack/keymap.c +++ b/keyboards/nightmare/keymaps/brandonschlack/keymap.c @@ -32,43 +32,43 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_split( \ KC_HOME, KC_ESC, 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, \ KC_PGUP, HY_TAB, 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_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MCO_LYR, \ - KC_END, KC_LCTL, KC_LALT, KC_LGUI, SPC_LWR, SPC_LWR, KC_RGUI, KC_RALT, KC_RCTL \ + KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, UP_RSFT, MCO_LYR, \ + KC_END, KC_LCTL, KC_LALT, KC_LGUI, SPC_LWR, SPC_RAI, LFT_GUI, DWN_ALT, RGT_CTL \ ), /** * Lower * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │SlD│││` ~│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│Del│ + * │SlD│││ ` │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │VlU│││ │ ← │ ↓ │ ↑ │ → │ │ F1│ F2│ F3│ F4│ F5│ F6│ | \ │ + * │VlU│││ │ ← │ ↓ │ ↑ │ → │ │ F1│ F2│ F3│ F4│ F5│ F6│ | │ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ - * │VlD│││ │ │ │ │ │ F7│ F8│ F9│F10│F11│F12│ │ │ + * │VlD│││ │ │ │ │ │ F7│ F8│ F9│F10│F11│F12│ │Ply│ * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┼┬┬┬┤ * │Mut││││││││ │ │ │ │ │ │ │ ││││││ * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ */ [_LOWER] = LAYOUT_split( \ - MC_SLPD, 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_DELT, \ - KC_VOLU, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_BSLS, \ - KC_VOLD, _______, _______, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, \ + MC_SLPD, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, _______, \ + KC_VOLU, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_PIPE, \ + KC_VOLD, _______, _______, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_MPLY, \ KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______ \ ), /** * Raise * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │SlD│││ │ │ │ │ │ │ │ │ │ │ │ ↑ │ │ │ + * │SlD│││ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │Nxt│││ │ F1│ F2│ F3│ F4│ F5│ F6│ │ │ │ ← │ → │ │ + * │Nxt│││ │ ← │ ↓ │ ↑ │ → │ │ F1│ F2│ F3│ F4│ F5│ F6│ \ │ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ - * │Prv│││ │ F7│ F8│ F9│F10│F11│F12│ │ │ │ ↓ │ │ │ + * │Prv│││ │ │ │ │ │ F7│ F8│ F9│F10│F11│F12│ │Ply│ * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┼┬┬┬┤ * │Ply││││││││ │ │ │ │ │ │ │ ││││││ * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ */ [_RAISE] = LAYOUT_split( \ - MC_SLPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, \ - KC_MFFD, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, _______, _______, KC_LEFT, KC_RGHT, _______, \ - KC_MRWD, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, KC_DOWN, _______, _______, \ + MC_SLPD, 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_MFFD, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_BSLS, \ + KC_MRWD, _______, _______, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_MPLY, \ KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______ \ ), /** @@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_MACRO] = LAYOUT_split( \ _______, _______, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, _______, \ - _______, _______, _______, _______, MC_BACK, MC_FWRD, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, NXT_WIN, PRV_TAB, NXT_TAB, MC_BACK, MC_FWRD, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), From 2544626d5cdf4b94354e0e493d010751b1ca6499 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 27 Feb 2020 15:15:48 -0800 Subject: [PATCH 324/429] [Keymap] More nightmare keymap additions * Add Play/Macro Layer-Tap * Add Delete, ShiftCaps to Raise,Lower * Fix missing Sleep Display on Macro layer * Add Password Autofill shortcuts to macro layer * Update readme with preview image --- .../nightmare/keymaps/brandonschlack/keymap.c | 26 +++++++++---------- .../keymaps/brandonschlack/readme.md | 2 +- users/brandonschlack/process_records.h | 1 + 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/keyboards/nightmare/keymaps/brandonschlack/keymap.c b/keyboards/nightmare/keymaps/brandonschlack/keymap.c index f401784b40ec..73fefe170da9 100644 --- a/keyboards/nightmare/keymaps/brandonschlack/keymap.c +++ b/keyboards/nightmare/keymaps/brandonschlack/keymap.c @@ -32,25 +32,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_split( \ KC_HOME, KC_ESC, 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, \ KC_PGUP, HY_TAB, 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_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, UP_RSFT, MCO_LYR, \ + KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, UP_RSFT, PLY_MCO, \ KC_END, KC_LCTL, KC_LALT, KC_LGUI, SPC_LWR, SPC_RAI, LFT_GUI, DWN_ALT, RGT_CTL \ ), /** * Lower * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │SlD│││ ` │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ + * │SlD│││ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │VlU│││ │ ← │ ↓ │ ↑ │ → │ │ F1│ F2│ F3│ F4│ F5│ F6│ | │ + * │VlU│││Del │ ← │ ↓ │ ↑ │ → │ │ F1│ F2│ F3│ F4│ F5│ F6│ | │ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ - * │VlD│││ │ │ │ │ │ F7│ F8│ F9│F10│F11│F12│ │Ply│ + * │VlD│││SfCaps│ │ │ │ │ F7│ F8│ F9│F10│F11│F12│ │Ply│ * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┼┬┬┬┤ * │Mut││││││││ │ │ │ │ │ │ │ ││││││ * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ */ [_LOWER] = LAYOUT_split( \ MC_SLPD, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, _______, \ - KC_VOLU, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_PIPE, \ - KC_VOLD, _______, _______, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_MPLY, \ + KC_VOLU, KC_DELT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_PIPE, \ + KC_VOLD, SF_CAPS, _______, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_MPLY, \ KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______ \ ), /** @@ -58,17 +58,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ * │SlD│││ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │Nxt│││ │ ← │ ↓ │ ↑ │ → │ │ F1│ F2│ F3│ F4│ F5│ F6│ \ │ + * │Nxt│││Del │ ← │ ↓ │ ↑ │ → │ │ F1│ F2│ F3│ F4│ F5│ F6│ \ │ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ - * │Prv│││ │ │ │ │ │ F7│ F8│ F9│F10│F11│F12│ │Ply│ + * │Prv│││SfCaps│ │ │ │ │ F7│ F8│ F9│F10│F11│F12│ │Ply│ * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┼┬┬┬┤ * │Ply││││││││ │ │ │ │ │ │ │ ││││││ * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ */ [_RAISE] = LAYOUT_split( \ MC_SLPD, 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_MFFD, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_BSLS, \ - KC_MRWD, _______, _______, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_MPLY, \ + KC_MFFD, KC_DELT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_BSLS, \ + KC_MRWD, SF_CAPS, _______, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_MPLY, \ KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______ \ ), /** @@ -78,15 +78,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ * │ │││NxW │PvT│NxT│Bck│Fwd│ │ │ │ │ │ │ │ │ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ - * │ │││ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │││ │ │ │ │1PX│1Ps│ │ │ │ │ │ │ │ * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┼┬┬┬┤ * │ ││││││││ │ │ │ │ │ │ │ ││││││ * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ */ [_MACRO] = LAYOUT_split( \ - _______, _______, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, _______, \ + _______, _______, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, MC_SLPD, \ _______, NXT_WIN, PRV_TAB, NXT_TAB, MC_BACK, MC_FWRD, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), /** diff --git a/keyboards/nightmare/keymaps/brandonschlack/readme.md b/keyboards/nightmare/keymaps/brandonschlack/readme.md index fed992a9472a..2b9ebfc707b1 100644 --- a/keyboards/nightmare/keymaps/brandonschlack/readme.md +++ b/keyboards/nightmare/keymaps/brandonschlack/readme.md @@ -1,3 +1,3 @@ # brandonschlack's Nightmare Keymap -![Base Layer](https://i.imgur.com/YTVjXZv.jpg) +![Base, Raise, Lower](https://i.imgur.com/j02sheQ.jpg) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 2b4fac9d567a..e3afb808021e 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -48,6 +48,7 @@ void matrix_scan_cmd_tab(void); #define PLY_GUI RGUI_T(KC_MPLY) // Tap Right GUI for Play/Pause #define FFD_ALT RALT_T(KC_MFFD) // Tap Right Alt for Next Track #define PLY_FN1 LT(1, KC_MPLY) // Tap Fn for Play/Pause +#define PLY_MCO LT(_MACRO, KC_MPLY) // Tap MacroFn for Play/Pause #define MUT_SFT RSFT_T(KC_MUTE) // Tap Right Shift for Mute /** * Arrow Mod-Tap From 6224bbc3dbd20ebe990e2d47ca47cc42d0f975f1 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 27 Feb 2020 16:03:49 -0800 Subject: [PATCH 325/429] [User][Keymap] Fix rgb_matrix_indicator for kbd67/mkiirgb --- layouts/community/65_ansi_blocker/brandonschlack/config.h | 3 ++- layouts/community/65_ansi_blocker/brandonschlack/keymap.c | 2 -- users/brandonschlack/rgb_bs.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/layouts/community/65_ansi_blocker/brandonschlack/config.h b/layouts/community/65_ansi_blocker/brandonschlack/config.h index 74868d57c702..0527f8d84104 100644 --- a/layouts/community/65_ansi_blocker/brandonschlack/config.h +++ b/layouts/community/65_ansi_blocker/brandonschlack/config.h @@ -40,9 +40,10 @@ #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH #define QMK_KEYS_PER_SCAN 4 + +#define USB_LED_CAPS_LOCK_SCANCODE 30 #endif #ifdef KEYBOARD_massdrop_alt #undef USB_LED_INDICATOR_ENABLE -#define USB_LED_CAPS_LOCK_SCANCODE 30 #endif diff --git a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c index 3cb93b60d8f0..f9fbc14dbc6a 100644 --- a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c +++ b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c @@ -107,13 +107,11 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { #ifdef RGB_MATRIX_ENABLE void rgb_matrix_indicators_user(void) { - #ifdef KEYBOARD_massdrop if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) { rgb_matrix_set_color(USB_LED_CAPS_LOCK_SCANCODE, RGB_GREEN); } else if (!HAS_ANY_FLAGS(rgb_matrix_get_flags(), LED_FLAG_KEYS)){ rgb_matrix_set_color(USB_LED_CAPS_LOCK_SCANCODE, 0, 0, 0); } - #endif } #endif diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index d09035a662a7..79715a8a434e 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -106,7 +106,7 @@ void rgb_matrix_cycle_flag (void) { break; default: rgb_matrix_set_flags(LED_FLAG_ALL); - rgb_matrix_enable_noeeprom(); + rgb_matrix_enable(); break; } } From 1ac49cec9b82b374107b807d86d23c317ee47080 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 2 Mar 2020 10:41:43 -0800 Subject: [PATCH 326/429] [User] Remove ENCODER_FLIP from userspace --- .../keebio/bdn9/keymaps/brandonschlack/config.h | 2 -- .../keebio/bdn9/keymaps/brandonschlack/keymap.c | 2 +- users/brandonschlack/brandonschlack.c | 15 --------------- users/brandonschlack/brandonschlack.h | 4 ---- 4 files changed, 1 insertion(+), 22 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h index 5a0e76c6a483..843d55b64944 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h @@ -1,7 +1,5 @@ #pragma once -#define ENCODER_FLIP - #undef RGBLIGHT_ANIMATIONS #define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 2ddee93b873f..d913d1d704b1 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -216,7 +216,7 @@ const uint16_t PROGMEM encoders[][2][2] = { [LR_EDIT] = {{ KC_DOT, KC_COMM }, { KC_EQL, KC_MINS }}, }; -void encoder_update_keymap(uint8_t index, bool clockwise) { +void encoder_update_user(uint8_t index, bool clockwise) { uint8_t layer = get_highest_layer(layer_state); switch (layer) { diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index ccf06f6309f8..a3c29a47c466 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -129,18 +129,3 @@ layer_state_t layer_state_set_user(layer_state_t state) { #endif // RGBLIGHT_ENABLE return layer_state_set_keymap(state); } - -#ifdef ENCODER_ENABLE -__attribute__ ((weak)) -void encoder_update_keymap(uint8_t index, bool clockwise) { } - -/** - * If ENCODER_FLIP defined, then toggle clockwise - */ -void encoder_update_user(uint8_t index, bool clockwise) { -#ifdef ENCODER_FLIP - clockwise = !clockwise; -#endif - encoder_update_keymap(index, clockwise); -} -#endif diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 2f84c9c0fd3f..32cd18025de8 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -52,7 +52,3 @@ void suspend_wakeup_init_keymap(void); void matrix_scan_keymap(void); layer_state_t default_layer_state_set_keymap(layer_state_t state); layer_state_t layer_state_set_keymap(layer_state_t state); - -#ifdef ENCODER_ENABLE -void encoder_update_keymap(uint8_t index, bool clockwise); -#endif From b88efd8a2de5ad2b095a930c743abd738e62755e Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 2 Mar 2020 10:43:40 -0800 Subject: [PATCH 327/429] [User] Exclude LTO from ChibiOS Boards --- users/brandonschlack/rules.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/users/brandonschlack/rules.mk b/users/brandonschlack/rules.mk index 296fd8701fa6..2dfc332ab951 100644 --- a/users/brandonschlack/rules.mk +++ b/users/brandonschlack/rules.mk @@ -3,9 +3,9 @@ SRC += brandonschlack.c \ SPACE_CADET_ENABLE = no -# Use LTO except for Massdrop boards -ifeq (, $(findstring massdrop, $(KEYBOARD))) - LTO_ENABLE = yes +# Use LTO except for ChibiOS +ifneq ($(PLATFORM),CHIBIOS) + LTO_ENABLE = yes endif ifeq ($(strip $(IS_MACROPAD)), yes) From 5c75dc63c93eff19d8f1b883b4162360eb274246 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 9 Mar 2020 11:56:00 -0700 Subject: [PATCH 328/429] [Keymap] Add EEP_RST to 4x12 and 5x15 layouts --- layouts/community/ortho_4x12/brandonschlack/keymap.c | 2 +- layouts/community/ortho_5x12/brandonschlack/keymap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c index 8b27d1bd74b6..f02139641cda 100644 --- a/layouts/community/ortho_4x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c @@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, RGB_RTHM,RGB_THM, _______, _______, _______, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + EEP_RST, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ // └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ) diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c index 5705db72fc27..0cca4ffa8a5b 100644 --- a/layouts/community/ortho_5x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c @@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, RGB_RTHM,RGB_THM, _______, _______, _______, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + EEP_RST, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ // └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ) From cac939ee122ed5593a72109b016250b0c2a8c6ee Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 12 Mar 2020 15:32:07 -0700 Subject: [PATCH 329/429] [User] Add PLY_FN2 alias --- users/brandonschlack/process_records.h | 1 + 1 file changed, 1 insertion(+) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index e3afb808021e..0b53a2930652 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -48,6 +48,7 @@ void matrix_scan_cmd_tab(void); #define PLY_GUI RGUI_T(KC_MPLY) // Tap Right GUI for Play/Pause #define FFD_ALT RALT_T(KC_MFFD) // Tap Right Alt for Next Track #define PLY_FN1 LT(1, KC_MPLY) // Tap Fn for Play/Pause +#define PLY_FN2 LT(2, KC_MPLY) // Tap Fn2 for Play/Pause #define PLY_MCO LT(_MACRO, KC_MPLY) // Tap MacroFn for Play/Pause #define MUT_SFT RSFT_T(KC_MUTE) // Tap Right Shift for Mute /** From 87f327bcb7345c11ca8f64ab5a62b8ffde8705c9 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 12 Mar 2020 15:34:48 -0700 Subject: [PATCH 330/429] [Keymap] Fix 60_ansi_split_bs_rshift keymap - Remove duplicate Mute from FN layer - Add missing closing brace and semicolon --- .../60_ansi_split_bs_rshift/brandonschlack-split/keymap.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c index 872891565479..10b87bac824c 100644 --- a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c +++ b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ * │RTgl │RH-│RS-│RV-│AS-│ │ │VlD│VlU│Mut│Hom│End│ │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - * │ │LYR│Thm│ │ │RST│ │Mte│Prv│Nxt│PgD│ │ │ + * │ │LYR│Thm│ │ │RST│ │ │Prv│Nxt│PgD│ │ │ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ * │ │ │ │ │ │ │ │ │ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ @@ -55,9 +55,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, \ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_PGUP, MC_MSSN, KC_DELT, \ RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_HOME, KC_END, _______, \ - _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, KC_MUTE, KC_MRWD, KC_MFFD, KC_PGDN, _______, _______, \ + _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, _______, KC_MRWD, KC_MFFD, KC_PGDN, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______ \ -), +) /* Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ @@ -80,6 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______ \ ) */ +}; void matrix_init_keymap(void) { //user initialization From d1b91b4cdc372f4518cc4952b9592088568b58fa Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 12 Mar 2020 16:19:02 -0700 Subject: [PATCH 331/429] [User] Refactor personal Media keycodes - Change KC_MFFD/KC_MRWD to KC_MNXT/KC_MPRV --- .../think65/solder/keymaps/brandonschlack/keymap.c | 2 +- .../kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c | 2 +- .../kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c | 2 +- keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c | 2 +- keyboards/launchpad/keymaps/brandonschlack/keymap.c | 4 ++-- keyboards/nightmare/keymaps/brandonschlack/keymap.c | 6 +++--- layouts/community/60_ansi/brandonschlack-ansi/keymap.c | 2 +- .../60_ansi_split_bs_rshift/brandonschlack-split/keymap.c | 2 +- layouts/community/65_ansi_blocker/brandonschlack/keymap.c | 2 +- layouts/community/75_ansi/brandonschlack/keymap.c | 2 +- layouts/community/tkl_ansi/brandonschlack/keymap.c | 2 +- users/brandonschlack/process_records.h | 4 ++-- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c index 1702fd44a18e..8b406860c992 100644 --- a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c +++ b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c @@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_DELT, KC_VOLU, \ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_SLPD, KC_VOLD, \ RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, MC_MSSN, MC_LHPD, _______, XXXXXXX, \ - _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, QM_MAKE, KC_MRWD, KC_MFFD, KC_MPLY, MUT_SFT, KC_PGUP, XXXXXXX, \ + _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, QM_MAKE, KC_MPRV, KC_MNXT, KC_MPLY, MUT_SFT, KC_PGUP, XXXXXXX, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), /* Blank Layout diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index be5c9b70340c..74bf1d14ab5b 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_MSSN, MC_SLPD, \ _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, KC_VOLU, \ _______, _______, _______, _______, _______, _______, _______, _______, QM_KYMP, _______, _______, _______, TG_ADJT, KC_VOLD, \ - _______, _______, _______, _______, QM_VRSN, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, KC_PGUP, KC_MUTE, \ + _______, _______, _______, _______, QM_VRSN, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MPLY, _______, KC_PGUP, KC_MUTE, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), /* Adjust Layer Layer diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c index 3060f2d4fb34..4c8e9234de80 100644 --- a/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c @@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_MSSN, MC_SLPD, \ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DEL, KC_VOLU, \ _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, QM_KYMP, _______, _______, _______, TG_ADJT, KC_VOLD, \ - _______, XXXXXXX, RGB_TOG, RGB_LYR, RGB_THM, QM_VRSN, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, _______, KC_PGUP, KC_MUTE, \ + _______, XXXXXXX, RGB_TOG, RGB_LYR, RGB_THM, QM_VRSN, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MPLY, _______, KC_PGUP, KC_MUTE, \ _______, _______, _______, XXXXXXX, _______, XXXXXXX, _______, _______, XXXXXXX, KC_HOME, KC_PGDN, KC_END ), /* Adjust Layer Layer diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index d913d1d704b1..4c0e59b642e2 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -208,7 +208,7 @@ void keyboard_post_init_keymap(void){ */ const uint16_t PROGMEM encoders[][2][2] = { [_REEDER] = {{ KC_J, KC_K }, { KC_N, KC_P }}, - [_MEDIA] = {{ KC_VOLU, KC_VOLD }, { KC_MFFD, KC_MRWD }}, + [_MEDIA] = {{ KC_VOLU, KC_VOLD }, { KC_MNXT, KC_MPRV }}, [_NAVI] = {{ MC_WH_D, MC_WH_U }, { NXT_TAB, PRV_TAB }}, [_KARABINER] = {{ KC_PPLS, KC_PMNS }, { KC_PEQL, KC_PDOT }}, [LR_NAV] = {{ KC_EQL, KC_MINS }, { KC_PGUP, KC_PGDN }}, diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index a57947fbf7e3..db2e7c380d3f 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -49,8 +49,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_MEDIA] = LAYOUT( \ KC_MUTE, KC_MPLY, \ - KC_VOLU, KC_MFFD, \ - KC_VOLD, KC_MRWD, \ + KC_VOLU, KC_MNXT, \ + KC_VOLD, KC_MPRV, \ TD(TD_SHLD_LGHT), TD(TD_SHLD_ADJT) \ ), diff --git a/keyboards/nightmare/keymaps/brandonschlack/keymap.c b/keyboards/nightmare/keymaps/brandonschlack/keymap.c index 73fefe170da9..af2ee69c79e9 100644 --- a/keyboards/nightmare/keymaps/brandonschlack/keymap.c +++ b/keyboards/nightmare/keymaps/brandonschlack/keymap.c @@ -67,8 +67,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_RAISE] = LAYOUT_split( \ MC_SLPD, 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_MFFD, KC_DELT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_BSLS, \ - KC_MRWD, SF_CAPS, _______, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_MPLY, \ + KC_MNXT, KC_DELT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_BSLS, \ + KC_MPRV, SF_CAPS, _______, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_MPLY, \ KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______ \ ), /** @@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ */ [_MACRO] = LAYOUT_split( \ - _______, _______, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, MC_SLPD, \ + _______, _______, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, MC_SLPD, \ _______, NXT_WIN, PRV_TAB, NXT_TAB, MC_BACK, MC_FWRD, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______ \ diff --git a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c index 4b6f8155f108..9f0d3584a0f7 100644 --- a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c +++ b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_DELT, \ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_PGUP, MC_LHPD, MC_SLPD, \ RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_HOME, KC_END, KC_MPLY, \ - _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, QM_MAKE, KC_MRWD, KC_MFFD, KC_PGDN, _______, \ + _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, QM_MAKE, KC_MPRV, KC_MNXT, KC_PGDN, _______, \ _______, _______, _______, _______, _______, _______, _______, _______ \ ), /* Layer diff --git a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c index 10b87bac824c..72494f7c7458 100644 --- a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c +++ b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c @@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, \ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_PGUP, MC_MSSN, KC_DELT, \ RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_HOME, KC_END, _______, \ - _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, _______, KC_MRWD, KC_MFFD, KC_PGDN, _______, _______, \ + _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, _______, KC_MPRV, KC_MNXT, KC_PGDN, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______ \ ) /* Layer diff --git a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c index f9fbc14dbc6a..370c9241b44d 100644 --- a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c +++ b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c @@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_DELT, MC_SLPD, \ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_VOLU, \ RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, \ - _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, QM_MAKE, KC_MRWD, KC_MFFD, KC_MPLY, _______, KC_PGUP, KC_MUTE, \ + _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, QM_MAKE, KC_MPRV, KC_MNXT, KC_MPLY, _______, KC_PGUP, KC_MUTE, \ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), /* Blank Layout diff --git a/layouts/community/75_ansi/brandonschlack/keymap.c b/layouts/community/75_ansi/brandonschlack/keymap.c index 84409450f580..fe411603543d 100644 --- a/layouts/community/75_ansi/brandonschlack/keymap.c +++ b/layouts/community/75_ansi/brandonschlack/keymap.c @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ */ [_FN1] = LAYOUT_75_ansi( \ - QM_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_MPLY, \ + QM_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MPLY, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELT, MC_SLPD, \ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, \ RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, \ diff --git a/layouts/community/tkl_ansi/brandonschlack/keymap.c b/layouts/community/tkl_ansi/brandonschlack/keymap.c index 85914bb7c5c5..353eb9bb9f5e 100644 --- a/layouts/community/tkl_ansi/brandonschlack/keymap.c +++ b/layouts/community/tkl_ansi/brandonschlack/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT_tkl_ansi( \ QM_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELT, KC_MPLY, MC_SLPD, KC_VOLU, \ - RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MFFD, KC_VOLD, \ + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD, \ RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, _______, _______, _______, _______, _______, KC_PGUP, \ _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 0b53a2930652..e85eeaafc387 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -44,9 +44,9 @@ void matrix_scan_cmd_tab(void); * Use the Mod-Tap feature for easy media controls * Used with >=65% layouts */ -#define RWD_GUI RGUI_T(KC_MRWD) // Tap Right GUI for Prev Track +#define RWD_GUI RGUI_T(KC_MPRV) // Tap Right GUI for Prev Track #define PLY_GUI RGUI_T(KC_MPLY) // Tap Right GUI for Play/Pause -#define FFD_ALT RALT_T(KC_MFFD) // Tap Right Alt for Next Track +#define FFD_ALT RALT_T(KC_MNXT) // Tap Right Alt for Next Track #define PLY_FN1 LT(1, KC_MPLY) // Tap Fn for Play/Pause #define PLY_FN2 LT(2, KC_MPLY) // Tap Fn2 for Play/Pause #define PLY_MCO LT(_MACRO, KC_MPLY) // Tap MacroFn for Play/Pause From 583f60c5c2c5fbd3feb9c66b27bce12811a0a416 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Tue, 17 Mar 2020 11:50:00 -0700 Subject: [PATCH 332/429] [Keymap] Update nightmare keymap - Consolidate Media Controls, mirror on both Lower, Raise --- .../nightmare/keymaps/brandonschlack/keymap.c | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/keyboards/nightmare/keymaps/brandonschlack/keymap.c b/keyboards/nightmare/keymaps/brandonschlack/keymap.c index af2ee69c79e9..7f618b521814 100644 --- a/keyboards/nightmare/keymaps/brandonschlack/keymap.c +++ b/keyboards/nightmare/keymaps/brandonschlack/keymap.c @@ -38,38 +38,38 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /** * Lower * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │SlD│││ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ + * │Nxt│││ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ * │VlU│││Del │ ← │ ↓ │ ↑ │ → │ │ F1│ F2│ F3│ F4│ F5│ F6│ | │ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ * │VlD│││SfCaps│ │ │ │ │ F7│ F8│ F9│F10│F11│F12│ │Ply│ * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┼┬┬┬┤ - * │Mut││││││││ │ │ │ │ │ │ │ ││││││ + * │Prv││││││││ │ │ │ │ │ │ │ ││││││ * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ */ [_LOWER] = LAYOUT_split( \ - MC_SLPD, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, _______, \ + KC_MNXT, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, _______, \ KC_VOLU, KC_DELT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_PIPE, \ KC_VOLD, SF_CAPS, _______, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_MPLY, \ - KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______ \ + KC_MPRV, _______, _______, _______, _______, _______, _______, _______, _______ \ ), /** * Raise * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │SlD│││ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │ + * │Nxt│││ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │Nxt│││Del │ ← │ ↓ │ ↑ │ → │ │ F1│ F2│ F3│ F4│ F5│ F6│ \ │ + * │VlU│││Del │ ← │ ↓ │ ↑ │ → │ │ F1│ F2│ F3│ F4│ F5│ F6│ \ │ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ - * │Prv│││SfCaps│ │ │ │ │ F7│ F8│ F9│F10│F11│F12│ │Ply│ + * │VlD│││SfCaps│ │ │ │ │ F7│ F8│ F9│F10│F11│F12│ │Ply│ * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┼┬┬┬┤ - * │Ply││││││││ │ │ │ │ │ │ │ ││││││ + * │Prv││││││││ │ │ │ │ │ │ │ ││││││ * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ */ [_RAISE] = LAYOUT_split( \ - MC_SLPD, 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_MNXT, KC_DELT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_BSLS, \ - KC_MPRV, SF_CAPS, _______, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_MPLY, \ - KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______ \ + KC_MNXT, 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_VOLU, KC_DELT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_BSLS, \ + KC_VOLD, SF_CAPS, _______, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_MPLY, \ + KC_MPRV, _______, _______, _______, _______, _______, _______, _______, _______ \ ), /** * Macros From e023d37785721c8f85823b2ee0e5fe5f954e5104 Mon Sep 17 00:00:00 2001 From: Diego Song Date: Thu, 19 Mar 2020 19:33:13 -0400 Subject: [PATCH 333/429] VIA Support for GH60 (#8442) * VIA Support: GH60 Rev C and GH60 Satan * Corrected GH60 VIA default keymap * Corrected GH60 VIA default keymap pt 2 * Copied default keymap over via default keymap * Satan GH60 default corrected for VIA * Satan GH60 default corrected for VIA pt 2 * Satan GH60 LTO enable for size * Transparent 4th dynamic layer for GH60 Via support * Update keyboards/gh60/revc/info.json * Update keyboards/gh60/satan/info.json * Update keyboards/gh60/satan/info.json * Removed deprecated JSON keys gh60/revc/info.json * Removed inline comment next to VID for GH60 Satan --- keyboards/gh60/revc/config.h | 9 ++-- keyboards/gh60/revc/info.json | 7 +-- keyboards/gh60/revc/keymaps/via/keymap.c | 53 +++++++++++++++++++++++ keyboards/gh60/revc/keymaps/via/rules.mk | 1 + keyboards/gh60/satan/config.h | 6 +-- keyboards/gh60/satan/info.json | 2 +- keyboards/gh60/satan/keymaps/via/keymap.c | 53 +++++++++++++++++++++++ keyboards/gh60/satan/keymaps/via/rules.mk | 2 + 8 files changed, 121 insertions(+), 12 deletions(-) create mode 100644 keyboards/gh60/revc/keymaps/via/keymap.c create mode 100644 keyboards/gh60/revc/keymaps/via/rules.mk create mode 100644 keyboards/gh60/satan/keymaps/via/keymap.c create mode 100644 keyboards/gh60/satan/keymaps/via/rules.mk diff --git a/keyboards/gh60/revc/config.h b/keyboards/gh60/revc/config.h index e0cfa7268d30..8c24b1e7e624 100644 --- a/keyboards/gh60/revc/config.h +++ b/keyboards/gh60/revc/config.h @@ -14,14 +14,17 @@ 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 . */ + +#pragma once + #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 +#define VENDOR_ID 0x4335 // GEEKhack +#define PRODUCT_ID 0x0001 #define DEVICE_VER 0x0001 #define MANUFACTURER geekhack -#define PRODUCT GH60 +#define PRODUCT GH60 Rev C #define DESCRIPTION t.m.k. keyboard firmware for GH60 /* key matrix size */ diff --git a/keyboards/gh60/revc/info.json b/keyboards/gh60/revc/info.json index bbfa1f2dab4c..7a8a19c1eced 100644 --- a/keyboards/gh60/revc/info.json +++ b/keyboards/gh60/revc/info.json @@ -1,10 +1,7 @@ { - "keyboard_name": "GH60", - "url": "http://qmk.fm/keyboards/gh60", + "keyboard_name": "GH60 Rev C", + "url": "", "maintainer": "qmk", - "keyboard_folder": "gh60", - "processor": "atmega32u4", - "manufacturer": "geekhack", "width": 15, "height": 5, "layouts": { diff --git a/keyboards/gh60/revc/keymaps/via/keymap.c b/keyboards/gh60/revc/keymaps/via/keymap.c new file mode 100644 index 000000000000..653636c7323a --- /dev/null +++ b/keyboards/gh60/revc/keymaps/via/keymap.c @@ -0,0 +1,53 @@ +/* Copyright 2020 Diego Song + + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( /* 0: 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, + 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, TG(2), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL + ), + + [1] = LAYOUT_all( /* 1: fn */ + KC_ESC, 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_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, 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( /* 2: arrows */ + 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_UP, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [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 + ), + +}; diff --git a/keyboards/gh60/revc/keymaps/via/rules.mk b/keyboards/gh60/revc/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/gh60/revc/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/gh60/satan/config.h b/keyboards/gh60/satan/config.h index d8c9ae9ab57f..8c172314a817 100644 --- a/keyboards/gh60/satan/config.h +++ b/keyboards/gh60/satan/config.h @@ -20,11 +20,11 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 +#define VENDOR_ID 0x4335 +#define PRODUCT_ID 0x0002 #define DEVICE_VER 0x0003 #define MANUFACTURER SATAN -#define PRODUCT GH60 +#define PRODUCT GH60 Satan #define DESCRIPTION 60% keyboard with backlight and WS2812 support /* key matrix size */ diff --git a/keyboards/gh60/satan/info.json b/keyboards/gh60/satan/info.json index 2b2e96ed19c6..a805c6cf9108 100644 --- a/keyboards/gh60/satan/info.json +++ b/keyboards/gh60/satan/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "Satan GH60", + "keyboard_name": "GH60 Satan", "url": "", "maintainer": "qmk", "width": 15, diff --git a/keyboards/gh60/satan/keymaps/via/keymap.c b/keyboards/gh60/satan/keymaps/via/keymap.c new file mode 100644 index 000000000000..c9c6acf6817f --- /dev/null +++ b/keyboards/gh60/satan/keymaps/via/keymap.c @@ -0,0 +1,53 @@ +/* Copyright 2020 Diego Song + + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( /* 0: 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, + 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, TG(2), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + ), + + [1] = LAYOUT_all( /* 1: fn */ + KC_ESC, 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_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, 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( /* 2: arrows */ + 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_UP, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [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 + ), + +}; \ No newline at end of file diff --git a/keyboards/gh60/satan/keymaps/via/rules.mk b/keyboards/gh60/satan/keymaps/via/rules.mk new file mode 100644 index 000000000000..43061db1dd46 --- /dev/null +++ b/keyboards/gh60/satan/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes \ No newline at end of file From dbcaba29361e17b690a8a5a2699114648aef364c Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 20 Mar 2020 12:27:52 +1100 Subject: [PATCH 334/429] Update JIS keymap and sendstring LUT (#8457) --- quantum/keymap_extras/keymap_jp.h | 164 ++++++++++++++++++------- quantum/keymap_extras/sendstring_jis.h | 2 +- 2 files changed, 120 insertions(+), 46 deletions(-) diff --git a/quantum/keymap_extras/keymap_jp.h b/quantum/keymap_extras/keymap_jp.h index 01586d5674f8..e608481d8733 100644 --- a/quantum/keymap_extras/keymap_jp.h +++ b/quantum/keymap_extras/keymap_jp.h @@ -20,55 +20,129 @@ * note: This website is written in Japanese. */ -#ifndef KEYMAP_JP_H -#define KEYMAP_JP_H +#pragma once #include "keymap.h" -#define JP_ZHTG KC_GRV // hankaku/zenkaku|kanzi -#define JP_YEN KC_INT3 // yen, | -#define JP_CIRC KC_EQL // ^, ~ -#define JP_AT KC_LBRC // @, ` -#define JP_LBRC KC_RBRC // [, { -#define JP_COLN KC_QUOT // :, * -#define JP_RBRC KC_NUHS // ], } -#define JP_BSLS KC_INT1 // \, _ -#define JP_MHEN KC_INT5 // muhenkan -#define JP_HENK KC_INT4 // henkan -#define JP_KANA KC_INT2 // katakana/hiragana|ro-mazi +// clang-format off -#define JP_MKANA KC_LANG1 // kana on MacOSX -#define JP_MEISU KC_LANG2 // eisu on MacOSX +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Z↔︎H│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ ^ │ ¥ │   │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ @ │ [ │     │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │ + * │ Eisū │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ : │ ] │    │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤ + * │        │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ \ │      │ + * ├─────┬──┴┬──┴──┬┴───┴┬──┴───┴──┬┴───┴┬──┴┬──┴┬──┴┬──┴┬─────┤ + * │     │   │     │Muhen│         │ Hen │K↔H│   │   │   │     │ + * └─────┴───┴─────┴─────┴─────────┴─────┴───┴───┴───┴───┴─────┘ + */ +// Row 1 +#define JP_ZKHK KC_GRV // Zenkaku ↔︎ Hankaku ↔ Kanji (半角 ↔ 全角 ↔ 漢字) +#define JP_1 KC_1 // 1 +#define JP_2 KC_2 // 2 +#define JP_3 KC_3 // 3 +#define JP_4 KC_4 // 4 +#define JP_5 KC_5 // 5 +#define JP_6 KC_6 // 6 +#define JP_7 KC_7 // 7 +#define JP_8 KC_8 // 8 +#define JP_9 KC_9 // 9 +#define JP_0 KC_0 // 0 +#define JP_MINS KC_MINS // - +#define JP_CIRC KC_EQL // ^ +#define JP_YEN KC_INT3 // ¥ +// Row 2 +#define JP_Q KC_Q // Q +#define JP_W KC_W // W +#define JP_E KC_E // E +#define JP_R KC_R // R +#define JP_T KC_T // T +#define JP_Y KC_Y // Y +#define JP_U KC_U // U +#define JP_I KC_I // I +#define JP_O KC_O // O +#define JP_P KC_P // P +#define JP_AT KC_LBRC // @ +#define JP_LBRC KC_RBRC // [ +// Row 3 +#define JP_EISU KC_CAPS // Eisū (英数) +#define JP_A KC_A // A +#define JP_S KC_S // S +#define JP_D KC_D // D +#define JP_F KC_F // F +#define JP_G KC_G // G +#define JP_H KC_H // H +#define JP_J KC_J // J +#define JP_K KC_K // K +#define JP_L KC_L // L +#define JP_SCLN KC_SCLN // ; +#define JP_COLN KC_QUOT // : +#define JP_RBRC KC_NUHS // ] +// Row 4 +#define JP_Z KC_Z // Z +#define JP_X KC_X // X +#define JP_C KC_C // C +#define JP_V KC_V // V +#define JP_B KC_B // B +#define JP_N KC_N // N +#define JP_M KC_M // M +#define JP_COMM KC_COMM // , +#define JP_DOT KC_DOT // . +#define JP_SLSH KC_SLSH // / +#define JP_BSLS KC_INT1 // (backslash) +// Row 5 +#define JP_MHEN KC_INT5 // Muhenkan (無変換) +#define JP_HENK KC_INT4 // Henkan (変換) +#define JP_KANA KC_INT2 // Katakana ↔ Hiragana ↔ Rōmaji (カタカナ ↔ ひらがな ↔ ローマ字) -// Aliases for shifted symbols -#define JP_DQT LSFT(KC_2) // " -#define JP_AMPR LSFT(KC_6) // & -#define JP_QUOT LSFT(KC_7) // ' -#define JP_LPRN LSFT(KC_8) // ( -#define JP_RPRN LSFT(KC_9) // ) -#define JP_EQL LSFT(KC_MINS) // = -#define JP_TILD LSFT(JP_CIRC) // ~ -#define JP_PIPE LSFT(JP_YEN) // | -#define JP_GRV LSFT(JP_AT) // ` -#define JP_LCBR LSFT(JP_LBRC) // { -#define JP_PLUS LSFT(KC_SCLN) // + -#define JP_ASTR LSFT(JP_COLN) // * -#define JP_RCBR LSFT(JP_RBRC) // } -#define JP_UNDS LSFT(JP_BSLS) // _ +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │   │ ! │ " │ # │ $ │ % │ & │ ' │ ( │ ) │   │ = │ ~ │ | │   │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │     │   │   │   │   │   │   │   │   │   │   │ ` │ { │     │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │ + * │ Caps │   │   │   │   │   │   │   │   │   │ + │ * │ } │    │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤ + * │        │   │   │   │   │   │   │   │ < │ > │ ? │ _ │      │ + * ├─────┬──┴┬──┴──┬┴───┴┬──┴───┴──┬┴───┴┬──┴┬──┴┬──┴┬──┴┬─────┤ + * │     │   │     │     │         │     │   │   │   │   │     │ + * └─────┴───┴─────┴─────┴─────────┴─────┴───┴───┴───┴───┴─────┘ + */ +// Row 1 +#define JP_EXLM S(JP_1) // ! +#define JP_DQUO S(JP_2) // " +#define JP_HASH S(JP_3) // # +#define JP_DLR S(JP_4) // $ +#define JP_PERC S(JP_5) // % +#define JP_AMPR S(JP_6) // & +#define JP_QUOT S(JP_7) // ' +#define JP_LPRN S(JP_8) // ( +#define JP_RPRN S(JP_9) // ) +#define JP_EQL S(JP_MINS) // = +#define JP_TILD S(JP_CIRC) // ~ +#define JP_PIPE S(JP_YEN) // | +// Row 2 +#define JP_GRV S(JP_AT) // ` +#define JP_LCBR S(JP_LBRC) // { +// Row 3 +#define JP_CAPS S(JP_EISU) // Caps Lock +#define JP_PLUS S(JP_SCLN) // + +#define JP_ASTR S(JP_COLN) // * +#define JP_RCBR S(JP_RBRC) // } +// Row 4 +#define JP_LABK S(JP_COMM) // < +#define JP_RABK S(JP_DOT) // > +#define JP_QUES S(JP_SLSH) // ? +#define JP_UNDS S(JP_BSLS) // _ -// These symbols are correspond to US101-layout. -#define JP_MINS KC_MINS // - -#define JP_SCLN KC_SCLN // ; -#define JP_COMM KC_COMM // , -#define JP_DOT KC_DOT // . -#define JP_SLSH KC_SLSH // / -// shifted -#define JP_EXLM KC_EXLM // ! -#define JP_HASH KC_HASH // # -#define JP_DLR KC_DLR // $ -#define JP_PERC KC_PERC // % -#define JP_LT KC_LT // < -#define JP_GT KC_GT // > -#define JP_QUES KC_QUES // ? +// DEPRECATED +#define JP_ZHTG JP_ZKHK +#define JP_DQT JP_DQUO +#define JP_LT JP_LABK +#define JP_GT JP_RABK -#endif +#define JP_MEISU KC_LANG2 // Eisū (英数) on macOS +#define JP_MKANA KC_LANG1 // Kana (かな) on macOS diff --git a/quantum/keymap_extras/sendstring_jis.h b/quantum/keymap_extras/sendstring_jis.h index 8b0dc99561c4..58335ad41d07 100644 --- a/quantum/keymap_extras/sendstring_jis.h +++ b/quantum/keymap_extras/sendstring_jis.h @@ -40,7 +40,7 @@ const uint8_t ascii_to_shift_lut[16] PROGMEM = { KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 0), KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), - KCLUT_ENTRY(0, 0, 0, 1, 1, 1, 1, 0), + KCLUT_ENTRY(0, 0, 0, 1, 1, 1, 1, 0) }; const uint8_t ascii_to_keycode_lut[128] PROGMEM = { From ce4054f9fb55cab5ded094114fd00f175e2b1a46 Mon Sep 17 00:00:00 2001 From: Wilba Date: Fri, 20 Mar 2020 16:36:54 +1100 Subject: [PATCH 335/429] Add VIA support to Leaf 60 (#8490) --- keyboards/foxlab/leaf60/hotswap/config.h | 6 +-- .../leaf60/hotswap/keymaps/via/keymap.c | 48 +++++++++++++++++++ .../leaf60/hotswap/keymaps/via/rules.mk | 1 + keyboards/foxlab/leaf60/universal/config.h | 6 +-- .../leaf60/universal/keymaps/via/keymap.c | 48 +++++++++++++++++++ .../leaf60/universal/keymaps/via/rules.mk | 1 + 6 files changed, 104 insertions(+), 6 deletions(-) create mode 100644 keyboards/foxlab/leaf60/hotswap/keymaps/via/keymap.c create mode 100644 keyboards/foxlab/leaf60/hotswap/keymaps/via/rules.mk create mode 100644 keyboards/foxlab/leaf60/universal/keymaps/via/keymap.c create mode 100644 keyboards/foxlab/leaf60/universal/keymaps/via/rules.mk diff --git a/keyboards/foxlab/leaf60/hotswap/config.h b/keyboards/foxlab/leaf60/hotswap/config.h index 752b403c5094..c78ad5425c83 100644 --- a/keyboards/foxlab/leaf60/hotswap/config.h +++ b/keyboards/foxlab/leaf60/hotswap/config.h @@ -20,11 +20,11 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 +#define VENDOR_ID 0x464C // "FL" +#define PRODUCT_ID 0x0001 #define DEVICE_VER 0x0001 #define MANUFACTURER Fox Lab -#define PRODUCT Leaf60 Hotswap +#define PRODUCT Leaf 60 Hotswap #define DESCRIPTION A custom hotswap 60% keyboard /* key matrix size */ diff --git a/keyboards/foxlab/leaf60/hotswap/keymaps/via/keymap.c b/keyboards/foxlab/leaf60/hotswap/keymaps/via/keymap.c new file mode 100644 index 000000000000..14d82004555d --- /dev/null +++ b/keyboards/foxlab/leaf60/hotswap/keymaps/via/keymap.c @@ -0,0 +1,48 @@ +/* Copyright 2019 Fox Lab + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + LAYOUT_60_tsangan_hhkb( + 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_GRV, KC_BSLS, + 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, + 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_DEL, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RALT, KC_RCTL), + + LAYOUT_60_tsangan_hhkb( + RESET, 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_TRNS, KC_TRNS, + KC_TRNS, BL_TOGG, BL_DEC, BL_INC, BL_STEP, 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), + + LAYOUT_60_tsangan_hhkb( + 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), + + LAYOUT_60_tsangan_hhkb( + 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) + +}; diff --git a/keyboards/foxlab/leaf60/hotswap/keymaps/via/rules.mk b/keyboards/foxlab/leaf60/hotswap/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/foxlab/leaf60/hotswap/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/foxlab/leaf60/universal/config.h b/keyboards/foxlab/leaf60/universal/config.h index f038430f9310..4b32d27393be 100644 --- a/keyboards/foxlab/leaf60/universal/config.h +++ b/keyboards/foxlab/leaf60/universal/config.h @@ -20,11 +20,11 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 +#define VENDOR_ID 0x464C // "FL" +#define PRODUCT_ID 0x0002 #define DEVICE_VER 0x0001 #define MANUFACTURER Fox Lab -#define PRODUCT Leaf60 Universal +#define PRODUCT Leaf 60 Universal #define DESCRIPTION A custom 60% keyboard /* key matrix size */ diff --git a/keyboards/foxlab/leaf60/universal/keymaps/via/keymap.c b/keyboards/foxlab/leaf60/universal/keymaps/via/keymap.c new file mode 100644 index 000000000000..c6e40ca4ea3e --- /dev/null +++ b/keyboards/foxlab/leaf60/universal/keymaps/via/keymap.c @@ -0,0 +1,48 @@ +/* Copyright 2019 Fox Lab + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + 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_GRV, 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_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_DEL, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL), + + LAYOUT_all( + RESET, 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_TRNS, KC_TRNS, + KC_TRNS, BL_TOGG, BL_DEC, BL_INC, BL_STEP, 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), + + 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, KC_TRNS), + + 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, KC_TRNS) + +}; diff --git a/keyboards/foxlab/leaf60/universal/keymaps/via/rules.mk b/keyboards/foxlab/leaf60/universal/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/foxlab/leaf60/universal/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes From 1be1e64df642a36e77ee18daef1c07c7718aaeb1 Mon Sep 17 00:00:00 2001 From: Nick Snyder Date: Fri, 20 Mar 2020 01:48:55 -0700 Subject: [PATCH 336/429] Highlight .inc files as .c files (#8496) --- .vscode/settings.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.vscode/settings.json b/.vscode/settings.json index 0caee2241dc2..f17b9e23e3e1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -11,6 +11,7 @@ "files.associations": { "*.h": "c", "*.c": "c", + "*.inc": "c", "*.cpp": "cpp", "*.hpp": "cpp", "xstddef": "c", From e9eb274d14cdbe3deb40e897b6964a9842fd9e2a Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Mon, 23 Mar 2020 10:35:47 -0700 Subject: [PATCH 337/429] [User] Update make command - Remove KEYBOARD_coseyfannitutti_discipline special case, use default :flash - Move FORCE_LAYOUT and CONVERT_TO_PROTON_C options outside of flash_bootloader --- users/brandonschlack/process_records.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index 088b76d20527..2a796f925fa4 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -133,18 +133,16 @@ void send_make_command(bool flash_bootloader) { if (flash_bootloader) { #if defined(KEYBOARD_massdrop_alt) // only run for Massdrop ALT SEND_STRING(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP); -#elif defined(KEYBOARD_coseyfannitutti_discipline) // only run for Discipline 65 - SEND_STRING(":program"); #else // use universal flash command SEND_STRING(":flash"); #endif + } #if defined(FORCE_LAYOUT) // Add layout string if built with FORCE_LAYOUT - SEND_STRING(" FORCE_LAYOUT=" FORCE_LAYOUT); + SEND_STRING(" FORCE_LAYOUT=" FORCE_LAYOUT); #endif #if defined(CONVERT_TO_PROTON_C) // Add CTPC if built with CONVERT_TO_PROTON_C - SEND_STRING(" CTPC=" CONVERT_TO_PROTON_C); + SEND_STRING(" CTPC=yes"); #endif - } SEND_STRING(SS_TAP(X_ENTER)); if (flash_bootloader) { reset_keyboard(); From 4941b6d3d58761358d570e899aa30c4ef06f3595 Mon Sep 17 00:00:00 2001 From: johannbl Date: Sun, 22 Mar 2020 20:28:11 -0400 Subject: [PATCH 338/429] [Keyboard] Added two new layouts for the cospad (#8502) * creation new numpad layout for 23 keys creation of new keymap * Update cospad.h * Update info.json * Update keymap.c * Update keymap.c Added a macro for the "00" key. * added two new keymap. one for each new layout. The new keymaps are based on the default keymap but focus on * Update keyboards/cospad/cospad.h Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cospad/cospad.h Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cospad/keymaps/johannbl/numpad2/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cospad/info.json Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cospad/keymaps/johannbl/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cospad/keymaps/johannbl/numpad2/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cospad/info.json Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cospad/keymaps/johannbl/numpad3/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cospad/keymaps/johannbl/numpad3/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cospad/keymaps/johannbl/numpad3/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keymap.c layout name fix. * Update keyboards/cospad/keymaps/johannbl/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cospad/info.json Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cospad/keymaps/johannbl/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/cospad/keymaps/johannbl/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Delete keymap.c * Rename keyboards/cospad/keymaps/johannbl/numpad2/keymap.c to keyboards/cospad/keymaps/johannbl/split_plus_and_zero/keymap.c * Rename keyboards/cospad/keymaps/johannbl/numpad3/keymap.c to keyboards/cospad/keymaps/johannbl/split_zero/keymap.c * Rename keyboards/cospad/keymaps/johannbl/split_plus_and_zero/keymap.c to keyboards/cospad/keymaps/split_plus_and_zero/keymap.c * Rename keyboards/cospad/keymaps/johannbl/split_zero/keymap.c to keyboards/cospad/keymaps/split_zero/keymap.c * Update keyboards/cospad/keymaps/split_plus_and_zero/keymap.c Co-Authored-By: Nick Brassel Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Nick Brassel --- keyboards/cospad/cospad.h | 64 +++++++++++++++ keyboards/cospad/info.json | 67 ++++++++++++++- .../keymaps/split_plus_and_zero/keymap.c | 81 +++++++++++++++++++ keyboards/cospad/keymaps/split_zero/keymap.c | 81 +++++++++++++++++++ 4 files changed, 292 insertions(+), 1 deletion(-) create mode 100644 keyboards/cospad/keymaps/split_plus_and_zero/keymap.c create mode 100644 keyboards/cospad/keymaps/split_zero/keymap.c diff --git a/keyboards/cospad/cospad.h b/keyboards/cospad/cospad.h index fc52204edaf9..f5ae8961f1d5 100644 --- a/keyboards/cospad/cospad.h +++ b/keyboards/cospad/cospad.h @@ -125,6 +125,70 @@ { k50, ___, k52, ___ } \ } + +/* 6x4 numpad with split Plus and 0 keys + * ,-------------------. + * | 00 | 01 | 02 | 03 | + * |----|----|----|----| + * | 10 | 11 | 12 | 13 | + * |----|----|----|----| + * | 20 | 21 | 22 | 23 | + * |----|----|----|----| + * | 30 | 31 | 32 | 33 | + * |----|----|----|----| + * | 40 | 41 | 42 | | + * |----|----|----| 43 | + * | 50 | 51 | 52 | | + * `-------------------' + */ +#define LAYOUT_numpad_6x4_split_plus_zero( \ + k00, k01, k02, k03, \ + k10, k11, k12, k13, \ + k20, k21, k22, k23, \ + k30, k31, k32, k33, \ + k40, k41, k42, \ + k50, k51, k52, k43 \ +) \ +{ \ + { k00, k01, k02, k03 }, \ + { k10, k11, k12, k13 }, \ + { k20, k21, k22, k23 }, \ + { k30, k31, k32, k33 }, \ + { k40, k41, k42, k43 }, \ + { k50, k51, k52, ___ } \ +} + +/* 6x4 numpad with split 0 key + * ,-------------------. + * | 00 | 01 | 02 | 03 | + * |----|----|----|----| + * | 10 | 11 | 12 | 13 | + * |----|----|----|----| + * | 20 | 21 | 22 | | + * |----|----|----| 23 | + * | 30 | 31 | 32 | | + * |----|----|----|----| + * | 40 | 41 | 42 | | + * |----|----|----| 43 | + * | 50 | 51 | 52 | | + * `-------------------' + */ +#define LAYOUT_numpad_6x4_split_zero( \ + k00, k01, k02, k03, \ + k10, k11, k12, k13, \ + k20, k21, k22, \ + k30, k31, k32, k23, \ + k40, k41, k42, \ + k50, k51, k52, k43 \ +) \ +{ \ + { k00, k01, k02, k03 }, \ + { k10, k11, k12, k13 }, \ + { k20, k21, k22, k23 }, \ + { k30, k31, k32, ___ }, \ + { k40, k41, k42, k43 }, \ + { k50, k51, k52, ___ } \ +} // Add backwards compatibility for existing keymaps #define cospad_bl_led_on backlight_enable #define cospad_bl_led_off backlight_disable diff --git a/keyboards/cospad/info.json b/keyboards/cospad/info.json index 83bf81c14df2..1cd197d3fdd9 100644 --- a/keyboards/cospad/info.json +++ b/keyboards/cospad/info.json @@ -102,6 +102,71 @@ {"x":2, "y":5}, {"x":3, "y":5} ] - } + }, + "LAYOUT_numpad_6x4_split_plus_zero": { + "key_count": 23, + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + + {"x":0, "y":1}, + {"x":1, "y":1}, + {"x":2, "y":1}, + {"x":3, "y":1}, + + {"x":0, "y":2}, + {"x":1, "y":2}, + {"x":2, "y":2}, + {"x":3, "y":2}, + + {"x":0, "y":3}, + {"x":1, "y":3}, + {"x":2, "y":3}, + {"x":3, "y":3}, + + {"x":0, "y":4}, + {"x":1, "y":4}, + {"x":2, "y":4}, + + {"x":0, "y":5}, + {"x":1, "y":5}, + {"x":2, "y":5}, + {"x":3, "y":4, "h":2} + ] + }, + "LAYOUT_numpad_6x4_split_zero": { + "key_count": 22, + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + + {"x":0, "y":1}, + {"x":1, "y":1}, + {"x":2, "y":1}, + {"x":3, "y":1}, + + {"x":0, "y":2}, + {"x":1, "y":2}, + {"x":2, "y":2}, + + {"x":0, "y":3}, + {"x":1, "y":3}, + {"x":2, "y":3}, + {"x":3, "y":2, "h":2}, + + {"x":0, "y":4}, + {"x":1, "y":4}, + {"x":2, "y":4}, + + {"x":0, "y":5}, + {"x":1, "y":5}, + {"x":2, "y":5}, + {"x":3, "y":4, "h":2} + ] + } } } diff --git a/keyboards/cospad/keymaps/split_plus_and_zero/keymap.c b/keyboards/cospad/keymaps/split_plus_and_zero/keymap.c new file mode 100644 index 000000000000..dd2ff00cd1fd --- /dev/null +++ b/keyboards/cospad/keymaps/split_plus_and_zero/keymap.c @@ -0,0 +1,81 @@ +#include QMK_KEYBOARD_H + +/* + * This keymap is based on the default keymap for the cospad. + * It was adapted for the split Plus and split 0 layout focusing on the "00" key. + */ + +enum custom_keycodes { + DBL_ZRO = SAFE_RANGE, +}; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case DBL_ZRO: + if (record->event.pressed) { + // when keycode DBL_ZRO is pressed + SEND_STRING("00"); + } else { + // when keycode DBL_ZRO is released + } + break; + + } + return true; +}; + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BL, + _FL +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Keymap _BL: (Base Layer) Default Layer + * ,-------------------. + * |Esc |TAB | FN | BS | + * |----|----|----|----| + * | NL | / | * | - | + * |----|----|----|----| + * | 7 | 8 | 9 | ~ | + * |----|----|----|----| + * | 4 | 5 | 6 | + | + * |----|----|----|----| + * | 1 | 2 | 3 | | + * |----|----|----| En | + * | 0 | 00 | . | | + * `-------------------' + */ + [_BL] = LAYOUT_numpad_6x4_split_plus_zero( + KC_ESC, KC_TAB, MO(_FL), KC_BSPC, + KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + KC_P7, KC_P8, KC_P9, KC_TILD, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, + KC_P0, DBL_ZRO, KC_PDOT, KC_PENT + ), + + /* Keymap _FL: Function Layer + * ,-------------------. + * |RGBT| | | | + * |----|----|----|----| + * |RGBM|RGBP|BTOG| | + * |----|----|----|----| + * |HUD |HUI |BON | | + * |----|----|----|----| + * |SAD |SAI |BOFF| | + * |----|----|----|----| + * |VAD |VAS |BSTP| | + * |----|----|----| | + * | | |RST | | + * `-------------------' + */ + [_FL] = LAYOUT_numpad_6x4_split_plus_zero( + RGB_TOG, _______, _______, _______, + RGB_MOD, RGB_M_P, BL_TOGG, _______, + RGB_HUD, RGB_HUI, BL_ON, _______, + RGB_SAD, RGB_SAI, BL_OFF, _______, + RGB_VAD, RGB_VAI, BL_STEP, + _______, _______, RESET, _______ + ) +}; diff --git a/keyboards/cospad/keymaps/split_zero/keymap.c b/keyboards/cospad/keymaps/split_zero/keymap.c new file mode 100644 index 000000000000..3a0c7d6e4ef4 --- /dev/null +++ b/keyboards/cospad/keymaps/split_zero/keymap.c @@ -0,0 +1,81 @@ +#include QMK_KEYBOARD_H + +/* + * This keymap is based on the default keymap for the cospad. + * It was adapted for the split 0 layout focusing on the "00" key. + */ + +enum custom_keycodes { + DBL_ZRO = SAFE_RANGE, +}; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case DBL_ZRO: + if (record->event.pressed) { + // when keycode DBL_ZRO is pressed + SEND_STRING("00"); + } else { + // when keycode DBL_ZRO is released + } + break; + + } + return true; +}; + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BL, + _FL +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Keymap _BL: (Base Layer) Default Layer + * ,-------------------. + * |Esc |TAB | FN | BS | + * |----|----|----|----| + * | NL | / | * | - | + * |----|----|----|----| + * | 7 | 8 | 9 | | + * |----|----|----| + | + * | 4 | 5 | 6 | | + * |----|----|----|----| + * | 1 | 2 | 3 | | + * |----|----|----| En | + * | 0 | 00 | . | | + * `-------------------' + */ + [_BL] = LAYOUT_numpad_6x4_split_zero( + KC_ESC, KC_TAB, MO(_FL), KC_BSPC, + KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + KC_P7, KC_P8, KC_P9, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, + KC_P0, DBL_ZRO, KC_PDOT, KC_PENT + ), + + /* Keymap _FL: Function Layer + * ,-------------------. + * |RGBT| | | | + * |----|----|----|----| + * |RGBM|RGBP|BTOG| | + * |----|----|----|----| + * |HUD |HUI |BON | | + * |----|----|----| | + * |SAD |SAI |BOFF| | + * |----|----|----|----| + * |VAD |VAS |BSTP| | + * |----|----|----| | + * | | |RST | | + * `-------------------' + */ + [_FL] = LAYOUT_numpad_6x4_split_zero( + RGB_TOG, _______, _______, _______, + RGB_MOD, RGB_M_P, BL_TOGG, _______, + RGB_HUD, RGB_HUI, BL_ON, + RGB_SAD, RGB_SAI, BL_OFF, _______, + RGB_VAD, RGB_VAI, BL_STEP, + _______, _______, RESET, _______ + ) +}; From c3bea84c84366b32af2957464a9ad37f40269f70 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 23 Mar 2020 11:31:19 +1100 Subject: [PATCH 339/429] Add Czech keymap (#8526) --- quantum/keymap_extras/keymap_czech.h | 173 +++++++++++++++++++++++ quantum/keymap_extras/sendstring_czech.h | 100 +++++++++++++ 2 files changed, 273 insertions(+) create mode 100644 quantum/keymap_extras/keymap_czech.h create mode 100644 quantum/keymap_extras/sendstring_czech.h diff --git a/quantum/keymap_extras/keymap_czech.h b/quantum/keymap_extras/keymap_czech.h new file mode 100644 index 000000000000..7e9d299f499c --- /dev/null +++ b/quantum/keymap_extras/keymap_czech.h @@ -0,0 +1,173 @@ +/* Copyright 2020 + * + * 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 . + */ + +#pragma once + +#include "keymap.h" + +// clang-format off + +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ; │ + │ ě │ š │ č │ ř │ ž │ ý │ á │ í │ é │ = │ ´ │       │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │     │ Q │ W │ E │ R │ T │ Z │ U │ I │ O │ P │ ú │ ) │     │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │ + * │      │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ů │ § │ ¨ │    │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │    │ \ │ Y │ X │ C │ V │ B │ N │ M │ , │ . │ - │          │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │    │    │    │                        │    │    │    │    │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ +// Row 1 +#define CZ_SCLN KC_GRV // ; +#define CZ_PLUS KC_1 // + +#define CZ_ECAR KC_2 // ě +#define CZ_SCAR KC_3 // š +#define CZ_CCAR KC_4 // č +#define CZ_RCAR KC_5 // ř +#define CZ_ZCAR KC_6 // ž +#define CZ_YACU KC_7 // ý +#define CZ_AACU KC_8 // á +#define CZ_IACU KC_9 // í +#define CZ_EACU KC_0 // é +#define CZ_EQL KC_MINS // = +#define CZ_ACUT KC_EQL // ´ (dead) +// Row 2 +#define CZ_Q KC_Q // Q +#define CZ_W KC_W // W +#define CZ_E KC_E // E +#define CZ_R KC_R // R +#define CZ_T KC_T // T +#define CZ_Z KC_Y // Z +#define CZ_U KC_U // U +#define CZ_I KC_I // I +#define CZ_O KC_O // O +#define CZ_P KC_P // P +#define CZ_UACU KC_LBRC // ú +#define CZ_RPRN KC_RBRC // ) +// Row 3 +#define CZ_A KC_A // A +#define CZ_S KC_S // S +#define CZ_D KC_D // D +#define CZ_F KC_F // F +#define CZ_G KC_G // G +#define CZ_H KC_H // H +#define CZ_J KC_J // J +#define CZ_K KC_K // K +#define CZ_L KC_L // L +#define CZ_URNG KC_SCLN // ů +#define CZ_SECT KC_QUOT // § +#define CZ_DIAE KC_NUHS // ¨ (dead) +// Row 4 +#define CZ_BSLS KC_NUBS // (backslash) +#define CZ_Y KC_Z // Y +#define CZ_X KC_X // X +#define CZ_C KC_C // C +#define CZ_V KC_V // V +#define CZ_B KC_B // B +#define CZ_N KC_N // N +#define CZ_M KC_M // M +#define CZ_COMM KC_COMM // , +#define CZ_DOT KC_DOT // . +#define CZ_MINS KC_SLSH // - + +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ° │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ % │ ˇ │       │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │     │   │   │   │   │   │   │   │   │   │   │ / │ ( │     │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │ + * │      │   │   │   │   │   │   │   │   │   │ " │ ! │ ' │    │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │    │ | │   │   │   │   │   │   │   │ ; │ : │ _ │          │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │    │    │    │                        │    │    │    │    │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ +// Row 1 +#define CZ_RNGA S(CZ_SCLN) // ° (dead) +#define CZ_1 S(CZ_PLUS) // 1 +#define CZ_2 S(CZ_ECAR) // 2 +#define CZ_3 S(CZ_SCAR) // 3 +#define CZ_4 S(CZ_CCAR) // 4 +#define CZ_5 S(CZ_RCAR) // 5 +#define CZ_6 S(CZ_ZCAR) // 6 +#define CZ_7 S(CZ_YACU) // 7 +#define CZ_8 S(CZ_AACU) // 8 +#define CZ_9 S(CZ_IACU) // 9 +#define CZ_0 S(CZ_EACU) // 0 +#define CZ_PERC S(CZ_PLUS) // % +#define CZ_CARN S(CZ_ACUT) // ˇ (dead) +// Row 2 +#define CZ_SLSH S(CZ_UACU) // / +#define CZ_LPRN S(CZ_RPRN) // ( +// Row 3 +#define CZ_DQUO S(CZ_URNG) // " +#define CZ_EXLM S(CZ_SECT) // ! +#define CZ_QUOT S(CZ_DIAE) // ' +// Row 4 +#define CZ_PIPE S(CZ_BSLS) // | +#define CZ_SCLN S(CZ_COMM) // ; +#define CZ_COLN S(CZ_DOT) // : +#define CZ_UNDS S(CZ_MINS) // _ + +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │   │ ~ │   │ ^ │ ˘ │   │ ˛ │ ` │ ˙ │   │ ˝ │   │ ¸ │       │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │     │   │   │ € │   │   │   │   │   │   │   │ ÷ │ × │     │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │ + * │      │   │ đ │ Đ │ [ │ ] │   │   │ ł │ Ł │ $ │ ß │ ¤ │    │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │    │   │   │ # │ & │ @ │ { │ } │   │ < │ > │ * │          │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │    │    │    │                        │    │    │    │    │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ +// Row 1 +#define CZ_TILD ALGR(CZ_PLUS) // ~ +#define CZ_CIRC ALGR(CZ_SCAR) // ^ (dead) +#define CZ_BREV ALGR(CZ_CCAR) // ˘ (dead) +#define CZ_OGON ALGR(CZ_ZCAR) // ˛ (dead) +#define CZ_GRV ALGR(CZ_YACU) // ` (dead) +#define CZ_DOTA ALGR(CZ_AACU) // ˙ (dead) +#define CZ_DACU ALGR(CZ_EACU) // ˝ (dead) +#define CZ_CEDL ALGR(CZ_ACUT) // ¸ (dead) +// Row 2 +#define CZ_EURO ALGR(CZ_E) // € +#define CZ_DIV ALGR(CZ_UACU) // ÷ +#define CZ_MUL ALGR(CZ_RPRN) // × +// Row 3 +#define CZ_LDST ALGR(CZ_S) // đ +#define CZ_CDST ALGR(CZ_D) // Đ +#define CZ_LBRC ALGR(CZ_F) // [ +#define CZ_RBRC ALGR(CZ_G) // ] +#define CZ_LLST ALGR(CZ_K) // ł +#define CZ_CLST ALGR(CZ_L) // Ł +#define CZ_DLR ALGR(CZ_URNG) // $ +#define CZ_SS ALGR(CZ_SECT) // ß +#define CZ_CURR ALGR(CZ_DIAE) // ¤ +// Row 4 +#define CZ_HASH ALGR(CZ_X) // # +#define CZ_AMPR ALGR(CZ_C) // & +#define CZ_AT ALGR(CZ_V) // @ +#define CZ_LCBR ALGR(CZ_B) // { +#define CZ_RCBR ALGR(CZ_N) // } +#define CZ_LABK ALGR(CZ_COMM) // < +#define CZ_RABK ALGR(CZ_DOT) // > +#define CZ_ASTR ALGR(CZ_MINS) // * diff --git a/quantum/keymap_extras/sendstring_czech.h b/quantum/keymap_extras/sendstring_czech.h new file mode 100644 index 000000000000..94879dfd4ecc --- /dev/null +++ b/quantum/keymap_extras/sendstring_czech.h @@ -0,0 +1,100 @@ +/* Copyright 2020 + * + * 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 . + */ + +// Sendstring lookup tables for Czech layouts + +#pragma once + +#include "keymap_czech.h" +#include "quantum.h" + +// clang-format off + +const uint8_t ascii_to_shift_lut[16] PROGMEM = { + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + + KCLUT_ENTRY(0, 1, 1, 0, 0, 1, 0, 1), + KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 1), + KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1), + KCLUT_ENTRY(1, 1, 1, 0, 0, 0, 0, 1), + KCLUT_ENTRY(0, 1, 1, 1, 1, 1, 1, 1), + KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1), + KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1), + KCLUT_ENTRY(1, 1, 1, 0, 0, 0, 0, 1), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0) +}; + +const uint8_t ascii_to_altgr_lut[16] PROGMEM = { + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + + KCLUT_ENTRY(0, 0, 0, 1, 1, 0, 1, 0), + KCLUT_ENTRY(0, 0, 1, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 1, 0, 1, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 1, 0, 1, 1, 0), + KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0), + KCLUT_ENTRY(0, 0, 0, 1, 0, 1, 1, 0), +}; + +const uint8_t ascii_to_keycode_lut[128] PROGMEM = { + // NUL SOH STX ETX EOT ENQ ACK BEL + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + // BS TAB LF VT FF CR SO SI + KC_BSPC, KC_TAB, KC_ENT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + // DLE DC1 DC2 DC3 DC4 NAK SYN ETB + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + // CAN EM SUB ESC FS GS RS US + XXXXXXX, XXXXXXX, XXXXXXX, KC_ESC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + + // ! " # $ % & ' + KC_SPC, CZ_SECT, CZ_URNG, CZ_X, CZ_URNG, CZ_EQL, CZ_C, CZ_DIAE, + // ( ) * + , - . / + CZ_LPRN, CZ_LPRN, CZ_MINS, CZ_PLUS, CZ_COMM, CZ_MINS, CZ_DOT, CZ_UACU, + // 0 1 2 3 4 5 6 7 + CZ_EACU, CZ_PLUS, CZ_ECAR, CZ_SCAR, CZ_CCAR, CZ_RCAR, CZ_ZCAR, CZ_YACU, + // 8 9 : ; < = > ? + CZ_AACU, CZ_IACU, CZ_DOT, CZ_SCLN, CZ_COMM, CZ_EQL, CZ_DOT, CZ_COMM, + // @ A B C D E F G + CZ_V, CZ_A, CZ_B, CZ_C, CZ_D, CZ_E, CZ_F, CZ_G, + // H I J K L M N O + CZ_H, CZ_I, CZ_J, CZ_K, CZ_L, CZ_M, CZ_N, CZ_O, + // P Q R S T U V W + CZ_P, CZ_Q, CZ_R, CZ_S, CZ_T, CZ_U, CZ_V, CZ_W, + // X Y Z [ \ ] ^ _ + CZ_X, CZ_Y, CZ_Z, CZ_F, CZ_BSLS, CZ_G, CZ_SCAR, CZ_MINS, + // ` a b c d e f g + CZ_YACU, CZ_A, CZ_B, CZ_C, CZ_D, CZ_E, CZ_F, CZ_G, + // h i j k l m n o + CZ_H, CZ_I, CZ_J, CZ_K, CZ_L, CZ_M, CZ_N, CZ_O, + // p q r s t u v w + CZ_P, CZ_Q, CZ_R, CZ_S, CZ_T, CZ_U, CZ_V, CZ_W, + // x y z { | } ~ DEL + CZ_X, CZ_Y, CZ_Z, CZ_B, CZ_BSLS, CZ_N, CZ_PLUS, KC_DEL +}; From 0c7ee5e2a08475e00d1f89572d521244ab2028e6 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 23 Mar 2020 11:32:43 +1100 Subject: [PATCH 340/429] Add Irish keymap (#8528) --- quantum/keymap_extras/keymap_irish.h | 152 +++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) create mode 100644 quantum/keymap_extras/keymap_irish.h diff --git a/quantum/keymap_extras/keymap_irish.h b/quantum/keymap_extras/keymap_irish.h new file mode 100644 index 000000000000..6825d4311f1e --- /dev/null +++ b/quantum/keymap_extras/keymap_irish.h @@ -0,0 +1,152 @@ +/* Copyright 2020 + * + * 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 . + */ + +#pragma once + +#include "keymap.h" + +// clang-format off + +/* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │       │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │ + * │      │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │    │ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │          │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │    │    │    │                        │    │    │    │    │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ +// Row 1 +#define IE_GRV KC_GRV // ` +#define IE_1 KC_1 // 1 +#define IE_2 KC_2 // 2 +#define IE_3 KC_3 // 3 +#define IE_4 KC_4 // 4 +#define IE_5 KC_5 // 5 +#define IE_6 KC_6 // 6 +#define IE_7 KC_7 // 7 +#define IE_8 KC_8 // 8 +#define IE_9 KC_9 // 9 +#define IE_0 KC_0 // 0 +#define IE_MINS KC_MINS // - +#define IE_EQL KC_EQL // = +// Row 2 +#define IE_Q KC_Q // Q +#define IE_W KC_W // W +#define IE_E KC_E // E +#define IE_R KC_R // R +#define IE_T KC_T // T +#define IE_Y KC_Y // Y +#define IE_U KC_U // U +#define IE_I KC_I // I +#define IE_O KC_O // O +#define IE_P KC_P // P +#define IE_LBRC KC_LBRC // [ +#define IE_RBRC KC_RBRC // ] +// Row 3 +#define IE_A KC_A // A +#define IE_S KC_S // S +#define IE_D KC_D // D +#define IE_F KC_F // F +#define IE_G KC_G // G +#define IE_H KC_H // H +#define IE_J KC_J // J +#define IE_K KC_K // K +#define IE_L KC_L // L +#define IE_SCLN KC_SCLN // ; +#define IE_QUOT KC_QUOT // ' +#define IE_HASH KC_NUHS // # +// Row 4 +#define IE_BSLS KC_NUBS // (backslash) +#define IE_Z KC_Z // Z +#define IE_X KC_X // X +#define IE_C KC_C // C +#define IE_V KC_V // V +#define IE_B KC_B // B +#define IE_N KC_N // N +#define IE_M KC_M // M +#define IE_COMM KC_COMM // , +#define IE_DOT KC_DOT // . +#define IE_SLSH KC_SLSH // / + +/* Shifted symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ¬ │ ! │ " │ £ │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │     │   │   │   │   │   │   │   │   │   │   │ { │ } │     │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │ + * │      │   │   │   │   │   │   │   │   │   │ : │ @ │ ~ │    │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │    │ | │   │   │   │   │   │   │   │ < │ > │ ? │          │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │    │    │    │                        │    │    │    │    │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ +// Row 1 +#define IE_NOT S(IE_GRV) // ¬ +#define IE_EXLM S(IE_1) // ! +#define IE_DQUO S(IE_2) // " +#define IE_PND S(IE_3) // £ +#define IE_DLR S(IE_4) // $ +#define IE_PERC S(IE_5) // % +#define IE_CIRC S(IE_6) // ^ +#define IE_AMPR S(IE_7) // & +#define IE_ASTR S(IE_8) // * +#define IE_LPRN S(IE_9) // ( +#define IE_RPRN S(IE_0) // ) +#define IE_UNDS S(IE_MINS) // _ +#define IE_PLUS S(IE_EQL) // + +// Row 2 +#define IE_LCBR S(IE_LBRC) // { +#define IE_RCBR S(IE_RBRC) // } +// Row 3 +#define IE_COLN S(IE_SCLN) // : +#define IE_AT S(IE_QUOT) // @ +#define IE_TILD S(IE_HASH) // ~ +// Row 4 +#define IE_PIPE S(IE_BSLS) // | +#define IE_LABK S(IE_COMM) // < +#define IE_RABK S(IE_DOT) // > +#define IE_QUES S(IE_SLSH) // ? + +/* AltGr symbols + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ + * │ ¦ │   │   │   │ € │   │   │   │   │   │   │   │   │       │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ + * │     │   │   │ É │   │   │   │ Ú │ Í │ Ó │   │   │   │     │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │ + * │      │ Á │   │   │   │   │   │   │   │   │   │ ´ │   │    │ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ + * │    │   │   │   │   │   │   │   │   │   │   │   │          │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ + * │    │    │    │                        │    │    │    │    │ + * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ + */ +// Row 1 +#define IE_BRKP ALGR(IE_GRV) // ¦ +#define IE_EURO ALGR(IE_4) // € +// Row 2 +#define IE_EACU ALGR(IE_E) // É +#define IE_UACU ALGR(IE_U) // Ú +#define IE_IACU ALGR(IE_I) // Í +#define IE_OACU ALGR(IE_O) // Ó +// Row 3 +#define IE_AACU ALGR(IE_A) // Á +#define IE_ACUT ALGR(IE_QUOT) // ´ (dead) From 23eb2f587b3468dc4597d1ad145adeaeab8eb5bc Mon Sep 17 00:00:00 2001 From: spidey3 Date: Mon, 23 Mar 2020 00:11:41 -0400 Subject: [PATCH 341/429] [Keymap] Add spidey3 keymap for 75_ansi, and a spidey3 userspace (#8470) * First cut at Josh Diamond's KBD75 customizations. Includes: * My unique keymap with ChromeOS specific keys * Use RGB underglow to indicate Caps Lock * Some unicode bindings * Some changes to make debugging easier * Updated spidey3 to be applicable to all 75_ansi boards * Sadly, ChromeOS doesn't pay attention to most consumer codes * Add mac layer; fix flakeyness in CAPS_LOCK underglow. * Make layers.json match the keymap (to the extent possible) * Major cleanup; fix broken debug persistence * Cleanup some whitespace issues * Fix incorrect log message. * Rework layer indication to user RGBLIGHT_LAYERS * Update layouts/community/75_ansi/spidey3/keymap.c Co-Authored-By: Drashna Jaelre * Rename users/spidey3/rgblight.c to layer_rgb.c per suggestion * Refactor to use set_single_persistant_default_layer(). * Use dprint/f to make logging more elegant. * Update users/spidey3/config.h Co-Authored-By: Drashna Jaelre * Update users/spidey3/config.h Co-Authored-By: Drashna Jaelre * Update layouts/community/75_ansi/spidey3/rules.mk Co-Authored-By: Ryan * Update users/spidey3/spidey3.c Co-Authored-By: Ryan * Update users/spidey3/layer_rgb.c Co-Authored-By: Ryan * Update users/spidey3/init.c Co-Authored-By: Ryan * Changes from code review Co-authored-by: Joshua Diamond Co-authored-by: Drashna Jaelre Co-authored-by: Ryan --- layouts/community/75_ansi/spidey3/keymap.c | 33 +++++++++ layouts/community/75_ansi/spidey3/readme.md | 14 ++++ layouts/community/75_ansi/spidey3/rules.mk | 15 ++++ users/spidey3/config.h | 5 ++ users/spidey3/init.c | 21 ++++++ users/spidey3/layer_rgb.c | 81 +++++++++++++++++++++ users/spidey3/readme.md | 14 ++++ users/spidey3/rules.mk | 10 +++ users/spidey3/spidey3.c | 80 ++++++++++++++++++++ users/spidey3/spidey3.h | 40 ++++++++++ users/spidey3/unicode.c | 19 +++++ users/spidey3/unicode.h | 19 +++++ 12 files changed, 351 insertions(+) create mode 100644 layouts/community/75_ansi/spidey3/keymap.c create mode 100644 layouts/community/75_ansi/spidey3/readme.md create mode 100644 layouts/community/75_ansi/spidey3/rules.mk create mode 100644 users/spidey3/config.h create mode 100644 users/spidey3/init.c create mode 100644 users/spidey3/layer_rgb.c create mode 100644 users/spidey3/readme.md create mode 100644 users/spidey3/rules.mk create mode 100644 users/spidey3/spidey3.c create mode 100644 users/spidey3/spidey3.h create mode 100644 users/spidey3/unicode.c create mode 100644 users/spidey3/unicode.h diff --git a/layouts/community/75_ansi/spidey3/keymap.c b/layouts/community/75_ansi/spidey3/keymap.c new file mode 100644 index 000000000000..511fea28d86f --- /dev/null +++ b/layouts/community/75_ansi/spidey3/keymap.c @@ -0,0 +1,33 @@ +#include "spidey3.h" + +#define SETTINGS A(S(KC_S)) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // Linux / Win layout + [_BASE] = LAYOUT_75_ansi( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, SETTINGS, KC_INS, KC_DEL, + 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, KC_HOME, + 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_PGUP, + 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_PGDN, + 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_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + // OSX layout + [_OSX] = LAYOUT_75_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_EJCT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LALT, KC_LGUI, _______, _______, _______, _______, _______, _______, _______ + ), + // FN + [_FN] = LAYOUT_75_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PWR, + _______, _______, _______, _______, _______, _______, _______, _______, X_BUL, _______, _______, X_DASH, _______, RESET, EEP_RST, + _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, VLK_TOG, _______, _______, KC_VOLU, + _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_G, RGB_M_T, SPI_LNX, _______, _______, _______, KC_VOLD, + _______, SPI_GLO, _______, SPI_WIN, _______, _______, _______, SPI_OSX, X(LARR), X(RARR), DEBUG, _______, KC_BRIU, KC_MUTE, + _______, _______, _______, _______, _______, _______, _______, _______, KC_BRID, _______ + ) +}; diff --git a/layouts/community/75_ansi/spidey3/readme.md b/layouts/community/75_ansi/spidey3/readme.md new file mode 100644 index 000000000000..409d6e5f81fa --- /dev/null +++ b/layouts/community/75_ansi/spidey3/readme.md @@ -0,0 +1,14 @@ +Copyright 2020 Joshua Diamond josh@windowoffire.com @spidey3 + +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 . diff --git a/layouts/community/75_ansi/spidey3/rules.mk b/layouts/community/75_ansi/spidey3/rules.mk new file mode 100644 index 000000000000..d9ac1126ce41 --- /dev/null +++ b/layouts/community/75_ansi/spidey3/rules.mk @@ -0,0 +1,15 @@ +# Build Options +# comment out to disable the options. +# +BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +AUDIO_ENABLE = no +RGBLIGHT_ENABLE = yes +UNICODEMAP_ENABLE = yes +VELOCIKEY_ENABLE = yes diff --git a/users/spidey3/config.h b/users/spidey3/config.h new file mode 100644 index 000000000000..9da7f5530259 --- /dev/null +++ b/users/spidey3/config.h @@ -0,0 +1,5 @@ +#pragma once + +#define LED_DISABLE_WHEN_USB_SUSPENDED true +#define RGB_DISABLE_WHEN_USB_SUSPENDED true +#define RGBLIGHT_LAYERS diff --git a/users/spidey3/init.c b/users/spidey3/init.c new file mode 100644 index 000000000000..a4be6113f462 --- /dev/null +++ b/users/spidey3/init.c @@ -0,0 +1,21 @@ +#include "spidey3.h" + +void keyboard_post_init_user(void) { + print("SPIDEY3: keyboard_post_init_user\n"); + uprintf(" debug_enable=%u\n", debug_enable); +#ifdef RGBLIGHT_ENABLE + keyboard_post_init_user_rgb(); +#endif +} + +void eeconfig_init_user(void) { + print("SPIDEY3: eeconfig_init_user\n"); + set_single_persistent_default_layer(_BASE); +#ifdef UNICODEMAP_ENABLE + eeconfig_init_user_unicode(); +#endif + +#ifdef RGBLIGHT_ENABLE + eeconfig_init_user_rgb(); +#endif +} diff --git a/users/spidey3/layer_rgb.c b/users/spidey3/layer_rgb.c new file mode 100644 index 000000000000..d80eb20a3192 --- /dev/null +++ b/users/spidey3/layer_rgb.c @@ -0,0 +1,81 @@ +#include QMK_KEYBOARD_H + +#include "spidey3.h" +#include "velocikey.h" + +uint32_t rgb_mode; +uint16_t rgb_hue; +uint8_t rgb_sat; +uint8_t rgb_val; +bool rgb_saved = 0; + +void spidey_swirl(void) { + dprint("SPIDEY3: Setting Spidey Swirl!\n"); + rgblight_enable(); + rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL); + rgblight_sethsv(213, 255, 128); +#ifdef VELOCIKEY_ENABLE + if (!velocikey_enabled()) + velocikey_toggle(); +#endif +} + +void eeconfig_init_user_rgb(void) +{ + spidey_swirl(); +} + +const rgblight_segment_t PROGMEM _capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS( {0, 2, HSV_AZURE}, {14, 2, HSV_AZURE} ); +const rgblight_segment_t PROGMEM _layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS( {7, 1, HSV_PURPLE} ); +const rgblight_segment_t PROGMEM _layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS( {9, 2, HSV_GREEN} ); + +// Now define the array of layers. Later layers take precedence +const rgblight_segment_t* const PROGMEM _rgb_layers[] = RGBLIGHT_LAYERS_LIST( _capslock_layer, _layer1_layer, _layer2_layer ); +const uint8_t PROGMEM _n_rgb_layers = sizeof(_rgb_layers) / sizeof(_rgb_layers[0]) - 1; + +void do_rgb_layers(layer_state_t state, uint8_t start, uint8_t end) { + dprint("SPIDEY3: do_rgb_layers()\n"); + for (uint8_t i=start; ievent.pressed) { + spidey_swirl(); + } + break; + } + + return true; +} diff --git a/users/spidey3/readme.md b/users/spidey3/readme.md new file mode 100644 index 000000000000..409d6e5f81fa --- /dev/null +++ b/users/spidey3/readme.md @@ -0,0 +1,14 @@ +Copyright 2020 Joshua Diamond josh@windowoffire.com @spidey3 + +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 . diff --git a/users/spidey3/rules.mk b/users/spidey3/rules.mk new file mode 100644 index 000000000000..0a77d2bfc76b --- /dev/null +++ b/users/spidey3/rules.mk @@ -0,0 +1,10 @@ + +SRC += init.c +SRC += spidey3.c + +ifeq ($(strip $(RGBLIGHT_ENABLE)), yes) + SRC += layer_rgb.c +endif +ifeq ($(strip $(UNICODEMAP_ENABLE)), yes) + SRC += unicode.c +endif diff --git a/users/spidey3/spidey3.c b/users/spidey3/spidey3.c new file mode 100644 index 000000000000..d0b794704366 --- /dev/null +++ b/users/spidey3/spidey3.c @@ -0,0 +1,80 @@ +#include QMK_KEYBOARD_H + +#include "spidey3.h" + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + +// If console is enabled, it will print the matrix position and status of each key pressed +// dprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed); + + if (record->event.pressed) { + switch (keycode) { +#ifndef NO_DEBUG + // Re-implement this here, but fix the persistence! + case DEBUG: + debug_enable ^= 1; + if (debug_enable) { + print("DEBUG: enabled.\n"); + } else { + print("DEBUG: disabled.\n"); + } + eeconfig_update_debug(debug_config.raw); +#endif + return false; + case SPI_LNX: + dprint("SPIDEY3: SPI_LNX\n"); + set_single_persistent_default_layer(_BASE); + layer_off(_OSX); +#if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) + set_unicode_input_mode(UC_LNX); +#endif + return false; + case SPI_OSX: + dprint("SPIDEY3: SPI_OSX\n"); + set_single_persistent_default_layer(_OSX); +#if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) + set_unicode_input_mode(UC_OSX); +#endif + return false; + case SPI_WIN: + dprint("SPIDEY3: SPI_WIN\n"); + set_single_persistent_default_layer(_BASE); + layer_off(_OSX); +#if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) + set_unicode_input_mode(UC_WINC); +#endif + return false; + } + } + +#ifdef RGBLIGHT_ENABLE + bool res = process_record_user_rgb(keycode, record); + if (!res) return false; +#endif + + return true; +} + +layer_state_t default_layer_state_set_user(layer_state_t state) { +#ifdef RGBLIGHT_ENABLE + return default_layer_state_set_user_rgb(state); +#else + return state; +#endif +} + +layer_state_t layer_state_set_user(layer_state_t state) { +#ifdef RGBLIGHT_ENABLE + return layer_state_set_user_rgb(state); +#else + return state; +#endif +} + +bool led_update_user(led_t led_state) { +#ifdef RGBLIGHT_ENABLE + return led_update_user_rgb(led_state); +#else + return true; +#endif +} diff --git a/users/spidey3/spidey3.h b/users/spidey3/spidey3.h new file mode 100644 index 000000000000..125f70a9ac9b --- /dev/null +++ b/users/spidey3/spidey3.h @@ -0,0 +1,40 @@ +#pragma once + +#include QMK_KEYBOARD_H + +#ifdef UNICODEMAP_ENABLE +#include "unicode.h" +#endif + +enum userspace_layers { + _BASE = 0, + _OSX, + _FN, +}; + +enum rgb_base_layer { + RGB_LAYER_BASE_DEFAULT = _BASE, + RGB_LAYER_BASE_REGULAR = _FN, +}; + +enum custom_keycodes { + SPI_GLO = SAFE_RANGE, + SPI_LNX, + SPI_OSX, + SPI_WIN, +}; + +#ifdef RGBLIGHT_ENABLE +void eeconfig_init_user_rgb(void); +void matrix_init_user_rgb(void); +void keyboard_post_init_user_rgb(void); +bool process_record_user_rgb(uint16_t keycode, keyrecord_t *record); +layer_state_t layer_state_set_user_rgb(layer_state_t state); +layer_state_t default_layer_state_set_user_rgb(layer_state_t state); +bool led_update_user_rgb(led_t led_state); +#endif + +#ifdef UNICODEMAP_ENABLE +void eeconfig_init_user_unicode(void); +#endif + diff --git a/users/spidey3/unicode.c b/users/spidey3/unicode.c new file mode 100644 index 000000000000..41ceef83756e --- /dev/null +++ b/users/spidey3/unicode.c @@ -0,0 +1,19 @@ + +#include "unicode.h" + +const uint32_t PROGMEM unicode_map[] = { + [BUL1] = 0x2022, // • + [BUL2] = 0x25E6, // ◦ + [LARR] = 0x2190, // ← + [RARR] = 0x2192, // → + [ENDASH] = 0x2013, // – + [EMDASH] = 0x2014, // — +}; + +void eeconfig_init_user_unicode(void) +{ + // Default to Linux style + set_unicode_input_mode(UC_LNX); +} + + diff --git a/users/spidey3/unicode.h b/users/spidey3/unicode.h new file mode 100644 index 000000000000..72a91e8a8069 --- /dev/null +++ b/users/spidey3/unicode.h @@ -0,0 +1,19 @@ +#pragma once + +#include QMK_KEYBOARD_H + +#ifdef UNICODEMAP_ENABLE + +enum unicode_names { + BUL1, + BUL2, + LARR, + RARR, + ENDASH, + EMDASH, +}; + +#define X_BUL (XP(BUL1, BUL2)) +#define X_DASH (XP(ENDASH, EMDASH)) + +#endif From cd8d532f9aeda480d1da916b35ca2e76a6261a97 Mon Sep 17 00:00:00 2001 From: Xelus22 Date: Mon, 23 Mar 2020 15:27:00 +1100 Subject: [PATCH 342/429] [Keyboard] Snap96 Keyboard (#8416) * snap96 * fix readme * small fixes * remove 4th layer * moved via config to via folder * remove suspend * via config.h * kc_nubs * remove kc_trns to define and remove layer 2 * remove merge conflicts * remove define and add 3rd layer for VIA keymap * fix comma Co-authored-by: Xelus22 --- keyboards/xelus/snap96/config.h | 31 +++++++++++++++++ .../xelus/snap96/keymaps/default/keymap.c | 22 +++++++++++++ keyboards/xelus/snap96/keymaps/via/config.h | 2 ++ keyboards/xelus/snap96/keymaps/via/keymap.c | 31 +++++++++++++++++ keyboards/xelus/snap96/keymaps/via/rules.mk | 1 + keyboards/xelus/snap96/readme.md | 13 ++++++++ keyboards/xelus/snap96/rules.mk | 33 +++++++++++++++++++ keyboards/xelus/snap96/snap96.c | 1 + keyboards/xelus/snap96/snap96.h | 25 ++++++++++++++ 9 files changed, 159 insertions(+) create mode 100644 keyboards/xelus/snap96/config.h create mode 100644 keyboards/xelus/snap96/keymaps/default/keymap.c create mode 100644 keyboards/xelus/snap96/keymaps/via/config.h create mode 100644 keyboards/xelus/snap96/keymaps/via/keymap.c create mode 100644 keyboards/xelus/snap96/keymaps/via/rules.mk create mode 100644 keyboards/xelus/snap96/readme.md create mode 100644 keyboards/xelus/snap96/rules.mk create mode 100644 keyboards/xelus/snap96/snap96.c create mode 100644 keyboards/xelus/snap96/snap96.h diff --git a/keyboards/xelus/snap96/config.h b/keyboards/xelus/snap96/config.h new file mode 100644 index 000000000000..0ebc75e3911a --- /dev/null +++ b/keyboards/xelus/snap96/config.h @@ -0,0 +1,31 @@ +#pragma once + +#include "config_common.h" + +// USB Device descriptor parameter +#define VENDOR_ID 0x5845 // XE +#define PRODUCT_ID 0x5396 // Snap96 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Xelus +#define PRODUCT Snap96 +#define DESCRIPTION Snap96 + +// key matrix size +#define MATRIX_ROWS 12 +#define MATRIX_COLS 10 + +// key matrix pins +#define MATRIX_ROW_PINS { B2, B1, B0, C7, F6, F7, B3, D1, D2, D7, B6, C6 } +#define MATRIX_COL_PINS { E6, D5, B7, D0, F5, D3, B4, B5, D4, D6 } +#define UNUSED_PINS + +// COL2ROW or ROW2COL +#define DIODE_DIRECTION COL2ROW + +// Set 0 if debouncing isn't needed +#define DEBOUNCE 5 + +// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap +#define LOCKING_SUPPORT_ENABLE +// Locking resynchronize hack +#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/xelus/snap96/keymaps/default/keymap.c b/keyboards/xelus/snap96/keymaps/default/keymap.c new file mode 100644 index 000000000000..31c7a2ff28f5 --- /dev/null +++ b/keyboards/xelus/snap96/keymaps/default/keymap.c @@ -0,0 +1,22 @@ +// Default layout for Snap96 +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_ESC, 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, KC_SLCK, KC_HOME, KC_END, + 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, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + 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_P7, KC_P8, KC_P9, KC_PPLS, + 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_P4, KC_P5, KC_P6, KC_PPLS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT + ), + + [1] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/xelus/snap96/keymaps/via/config.h b/keyboards/xelus/snap96/keymaps/via/config.h new file mode 100644 index 000000000000..96c85573df1e --- /dev/null +++ b/keyboards/xelus/snap96/keymaps/via/config.h @@ -0,0 +1,2 @@ +// 3 layers or else it will not fit in EEPROM +#define DYNAMIC_KEYMAP_LAYER_COUNT 3 diff --git a/keyboards/xelus/snap96/keymaps/via/keymap.c b/keyboards/xelus/snap96/keymaps/via/keymap.c new file mode 100644 index 000000000000..03547d5fd1af --- /dev/null +++ b/keyboards/xelus/snap96/keymaps/via/keymap.c @@ -0,0 +1,31 @@ +// VIA layout for Snap96 +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_ESC, 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, KC_SLCK, KC_HOME, KC_END, + 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, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + 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_P7, KC_P8, KC_P9, KC_PPLS, + 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_P4, KC_P5, KC_P6, KC_PPLS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT + ), + + [1] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/xelus/snap96/keymaps/via/rules.mk b/keyboards/xelus/snap96/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/xelus/snap96/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/xelus/snap96/readme.md b/keyboards/xelus/snap96/readme.md new file mode 100644 index 000000000000..55751c1c5f97 --- /dev/null +++ b/keyboards/xelus/snap96/readme.md @@ -0,0 +1,13 @@ +# Snap96 + +A 96 Keyboard which supports various layouts and is able to be "snapped" to smaller layouts. + +* Keyboard Maintainer: [Xelus22](https://github.com/Xelus22) +* Hardware Supported: Snap96 +* Hardware Availability: Custom Project + +Make example for this keyboard (after setting up your build environment): + + make xelus/snap96:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/xelus/snap96/rules.mk b/keyboards/xelus/snap96/rules.mk new file mode 100644 index 000000000000..a52c97b2d52e --- /dev/null +++ b/keyboards/xelus/snap96/rules.mk @@ -0,0 +1,33 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default +MIDI_ENABLE = no # MIDI support +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - We have custom RGB underglow + diff --git a/keyboards/xelus/snap96/snap96.c b/keyboards/xelus/snap96/snap96.c new file mode 100644 index 000000000000..e7c728bb05d9 --- /dev/null +++ b/keyboards/xelus/snap96/snap96.c @@ -0,0 +1 @@ +#include "snap96.h" diff --git a/keyboards/xelus/snap96/snap96.h b/keyboards/xelus/snap96/snap96.h new file mode 100644 index 000000000000..cbdbc97cb33a --- /dev/null +++ b/keyboards/xelus/snap96/snap96.h @@ -0,0 +1,25 @@ +#pragma once + +#include "quantum.h" + +#define LAYOUT_all( \ + K0000, K0001, K0002, K0003, K0004, K0005, K0006, K0007, K0008, K0009, K0600, K0601, K0602, K0603, K0604, K0605, K0606, K0607, K0608, \ + K0100, K0101, K0102, K0103, K0104, K0105, K0106, K0107, K0108, K0109, K0700, K0701, K0702, K0703, K0704, K0705, K0706, K0707, K0708, \ + K0200, K0201, K0202, K0203, K0204, K0205, K0206, K0207, K0208, K0209, K0800, K0801, K0802, K0804, K0805, K0806, K0807, K0808, \ + K0300, K0301, K0302, K0303, K0304, K0305, K0306, K0307, K0308, K0309, K0900, K0901, K0903, K0905, K0906, K0907, K0908, \ + K0400, K0401, K0402, K0403, K0404, K0405, K0406, K0407, K0408, K0409, K1000, K1001, K1003, K1004, K1005, K1006, K1007, K1008, \ + K0500, K0501, K0502, K0505, K0506, K0509, K1100, K1101, K1102, K1103, K1104, K1105, K1106, K1107, K1108 \ +) { \ + { K0000, K0001, K0002, K0003, K0004, K0005, K0006, K0007, K0008, K0009 }, \ + { K0100, K0101, K0102, K0103, K0104, K0105, K0106, K0107, K0108, K0109 }, \ + { K0200, K0201, K0202, K0203, K0204, K0205, K0206, K0207, K0208, K0209 }, \ + { K0300, K0301, K0302, K0303, K0304, K0305, K0306, K0307, K0308, K0309 }, \ + { K0400, K0401, K0402, K0403, K0404, K0405, K0406, K0407, K0408, K0409 }, \ + { K0500, K0501, K0502, KC_NO, KC_NO, K0505, K0506, KC_NO, KC_NO, K0509 }, \ + { K0600, K0601, K0602, K0603, K0604, K0605, K0606, K0607, K0608, KC_NO }, \ + { K0700, K0701, K0702, K0703, K0704, K0705, K0706, K0707, K0708, KC_NO }, \ + { K0800, K0801, K0802, KC_NO, K0804, K0805, K0806, K0807, K0808, KC_NO }, \ + { K0900, K0901, KC_NO, K0903, KC_NO, K0905, K0906, K0907, K0908, KC_NO }, \ + { K1000, K1001, KC_NO, K1003, K1004, K1005, K1006, K1007, K1008, KC_NO }, \ + { K1100, K1101, K1102, K1103, K1104, K1105, K1106, K1107, K1108, KC_NO } \ +} From c5eccfdf85e670a32ec248c9cda4f2ac25050831 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Wed, 25 Mar 2020 10:02:55 -0700 Subject: [PATCH 343/429] [Keymap] Update discipline keymap to 2_right_mods --- .../keymaps/brandonschlack/keymap.c | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c index 7122a4bd6ef2..39878a65ed20 100644 --- a/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c +++ b/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c @@ -26,16 +26,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│PgD│ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│End│ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ - * │Ctrl│ Opt│ Cmd│ Space │Cmd│Opt│Fn │Lef│Dow│Rig│ - * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤ + * │Ctrl│ Opt│ Cmd│ Space │ Cmd │FnPly│Lef│Dow│Rig│ + * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┘ */ -[_BASE] = LAYOUT_65_ansi( \ +[_BASE] = LAYOUT_65_ansi_2_right_mods( \ 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_HOME, \ 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_PGUP, \ - HY_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_PGDN, \ + HY_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_PGDN, \ 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_UP, KC_END, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, RWD_GUI, FFD_ALT, PLY_FN1, KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, PLY_FN1, KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ @@ -45,16 +45,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ * │ │ │ │ │ │ │ │ │ │ │ │ │ │VlD│ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │PgU│Mut│ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ - * │ │ │ │ │ │ │ │Hom│PgD│End│ - * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ + * │ │ │ │ │ │RST│ │Mke│Prv│Nxt│Ply│ │PgU│Mut│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤ + * │ │ │ │ │ │ │Hom│PgD│End│ + * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┘ */ -[_FN1] = LAYOUT_65_ansi( +[_FN1] = LAYOUT_65_ansi_2_right_mods( \ 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_DELT, MC_SLPD, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, MC_LHPD, KC_VOLU, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, \ - _______, _______, _______, _______, _______, _______, _______, QM_MAKE, _______, _______, _______, _______, KC_PGUP, KC_MUTE, \ - _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ + _______, _______, _______, _______, _______, RESET, _______, QM_MAKE, KC_MPRV, KC_MNXT, KC_MPLY, _______, KC_PGUP, KC_MUTE, \ + _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ ) }; From 2ae36eea3e10245a54d3c5a5988c5657f79ae716 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Mon, 13 Apr 2020 15:49:02 -0700 Subject: [PATCH 344/429] [User] Add more arrow mod-taps --- users/brandonschlack/process_records.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index e85eeaafc387..294b9f0939cf 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -60,7 +60,9 @@ void matrix_scan_cmd_tab(void); #define LFT_ALT RALT_T(KC_LEFT) // Tap Right Alt for Left #define LFT_GUI RGUI_T(KC_LEFT) // Tap Right GUI for Left #define DWN_FN1 LT(1, KC_DOWN) // Tap Fn for Down +#define DWN_FN2 LT(2, KC_DOWN) // Tap Fn2 for Down #define DWN_ALT RALT_T(KC_DOWN) // Tap Right Alt for Down +#define RGT_ALT RALT_T(KC_RGHT) // Tap Right Alt for Right #define RGT_CTL RCTL_T(KC_RGHT) // Tap Right Ctrl for Right /** * Nav Mod-Tap From c848c5b62849af145d579bba81dda60daa9a07dd Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Mon, 13 Apr 2020 15:49:45 -0700 Subject: [PATCH 345/429] [Keymap] Add romeo keymap --- .../romeo/keymaps/brandonschlack/keymap.c | 112 ++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c diff --git a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c new file mode 100644 index 000000000000..ff7184fc3784 --- /dev/null +++ b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c @@ -0,0 +1,112 @@ +/* Copyright 2019 COSEYFANNITUTTI + * + * 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 . + */ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Base Layer +* ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ +* │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ Bspc│ +* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ +* │HyEsc │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Enter│ +* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ +* │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│ ShftU│ +* ├────┬───┼───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤ +* │Ctrl│Opt│Cmd│ Space │CmdL│FnD│OptR│ +* └────┴───┴───┴────────────────────────┴────┴───┴────┘ +*/ +[_BASE] = LAYOUT_ansi_40( \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ + HY_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, UP_RSFT, \ + KC_LCTL, KC_LOPT, KC_LCMD, SPC_RAI, LFT_GUI, DWN_FN1, RGT_ALT \ +), +/* Lower +* ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ +* │Del │ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│ │ +* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ +* │Caps │Hom│PgD│PgU│End│Mut│{ [│} ]│F11│F12│ Play│ +* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ +* │ │Prv│Nxt│VlD│VlU│~ `│| \│: ;│" '│? /│ │ +* ├────┬───┼───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤ +* │ │ │ │ │ │ │ │ +* └────┴───┴───┴────────────────────────┴────┴───┴────┘ +*/ +[_LOWER] = LAYOUT_ansi_40( \ + KC_DELT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, \ + KC_CAPS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_MUTE, KC_LBRC, KC_RBRC, KC_F11, KC_F12, KC_MPLY, \ + _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_GRV, KC_BSLS, KC_SCLN, KC_QUOT, KC_EQL, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ +), +/* Raise +* ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ +* │Del │! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│ │ +* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ +* │Caps │Lft│Dwn│ Up│Rgt│Mut│{ [│} ]│_ -│+ =│ Play│ +* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ +* │ │Prv│Nxt│VlD│VlU│~ `│| \│: ;│" '│? /│ │ +* ├────┬───┼───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤ +* │ │ │ │ │ │ │ │ +* └────┴───┴───┴────────────────────────┴────┴───┴────┘ +*/ +[_RAISE] = LAYOUT_ansi_40( \ + KC_DELT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ + KC_CAPS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_MUTE, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_MPLY, \ + _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_GRV, KC_BSLS, KC_SCLN, KC_QUOT, KC_EQL, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ +), +/* Adjust/Macro Layer +* ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ +* │Make │BrD│BrU│Msn│LHP│ │ │ │ │ │ │ SlpD│ +* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ +* │NxW │PvT│NxT│Bck│Fwd│ │ │ │ │ │ Reset│ +* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ +* │ │ │ │ │1PX│1Ps│ │ │ │ │ │ +* ├────┬───┼───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤ +* │ │ │ │ │ │ │ │ +* └────┴───┴───┴────────────────────────┴────┴───┴────┘ +*/ +[_ADJUST] = LAYOUT_ansi_40( \ + QM_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, MC_SLPD, \ + NXT_WIN, PRV_TAB, NXT_TAB, MC_BACK, MC_FWRD, _______, _______, _______, _______, _______, RESET, \ + _______, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ +) +/* Blank Layer +* ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ +* │ │ │ │ │ │ │ │ │ │ │ │ │ +* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ +* │ │ │ │ │ │ │ │ │ │ │ │ +* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ +* │ │ │ │ │ │ │ │ │ │ │ │ +* ├────┬───┼───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤ +* │ │ │ │ │ │ │ │ +* └────┴───┴───┴────────────────────────┴────┴───┴────┘ +*/ +/* +[BLANK] = LAYOUT_ansi_40( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ +) +*/ +}; + +layer_state_t layer_state_set_keymap(layer_state_t state) { + state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); + return state; +} From a998aeab237e998f4d28a6ccb1db1535a7e6b288 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Thu, 16 Apr 2020 11:22:24 -0700 Subject: [PATCH 346/429] [User] Update Arrow & Nav Mod-Tap aliases - Add Down-Lower/Raise -Update Nav Mod-Taps for parity to Arrow Mod-Taps --- users/brandonschlack/process_records.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 294b9f0939cf..cddf71357e6b 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -60,19 +60,27 @@ void matrix_scan_cmd_tab(void); #define LFT_ALT RALT_T(KC_LEFT) // Tap Right Alt for Left #define LFT_GUI RGUI_T(KC_LEFT) // Tap Right GUI for Left #define DWN_FN1 LT(1, KC_DOWN) // Tap Fn for Down +#define DWN_LWR DWN_FN1 // Tap Lower for Down #define DWN_FN2 LT(2, KC_DOWN) // Tap Fn2 for Down +#define DWN_RAI DWN_FN2 // Tap Raise for Down #define DWN_ALT RALT_T(KC_DOWN) // Tap Right Alt for Down #define RGT_ALT RALT_T(KC_RGHT) // Tap Right Alt for Right #define RGT_CTL RCTL_T(KC_RGHT) // Tap Right Ctrl for Right /** * Nav Mod-Tap * Use the Mod-Tap feature for nav keys (Home/End, Page Up/Down) - * Mostly used for 60% layouts, on a function layer + * Mostly used for 40-60% layouts, on a function layer */ #define PGU_SFT RSFT_T(KC_PGUP) // Tap Right Shift for Page Up #define HOM_ALT RALT_T(KC_HOME) // Tap Right Alt for Home +#define HOM_GUI RGUI_T(KC_HOME) // Tap Right GUI for Home +#define PGD_FN1 LT(1, KC_PGDN) // Tap Fn for Page Down +#define PGD_LWR PGD_FN1 // Tap Lower for Page Down #define PGD_FN2 LT(2, KC_PGDN) // Tap Fn2 for Page Down -#define END_CTL RCTL_T(KC_END) // Tap Right Ctrl for End +#define PGD_RAI PGD_FN2 // Tap Raise for Page Down +#define DWN_ALT RALT_T(KC_PGDN) // Tap Right Alt for Down +#define END_ALT ROPT_T(KC_END) // Tap Right Option for End +#define END_CTL RCTL_T(KC_END) // Tap Right Control for End /** * MacOS From c12ccbd64e8de61e6f2eaa8987166911870ab791 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Thu, 16 Apr 2020 11:48:46 -0700 Subject: [PATCH 347/429] [Keymap] Update Romeo keymap - Fix missing Slash on Raise - Add arrows to both Lower,Raise layers - Add Nav Mod-Taps to Raise --- .../romeo/keymaps/brandonschlack/keymap.c | 16 ++++++++-------- users/brandonschlack/process_records.h | 1 - 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c index ff7184fc3784..86d1398a3ead 100644 --- a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c +++ b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c @@ -23,22 +23,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ * │HyEsc │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Enter│ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ -* │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│ ShftU│ +* │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│ ↑Shft│ * ├────┬───┼───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤ -* │Ctrl│Opt│Cmd│ Space │CmdL│FnD│OptR│ +* │Ctrl│Opt│Cmd│ Space │←Cmd│↓Fn│→Opt│ * └────┴───┴───┴────────────────────────┴────┴───┴────┘ */ [_BASE] = LAYOUT_ansi_40( \ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ HY_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, \ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, UP_RSFT, \ - KC_LCTL, KC_LOPT, KC_LCMD, SPC_RAI, LFT_GUI, DWN_FN1, RGT_ALT \ + KC_LCTL, KC_LOPT, KC_LCMD, SPC_RAI, LFT_GUI, DWN_LWR, RGT_ALT \ ), /* Lower * ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ * │Del │ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│ │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ -* │Caps │Hom│PgD│PgU│End│Mut│{ [│} ]│F11│F12│ Play│ +* │Caps │ ← │ ↓ │ ↑ │ → │Mut│{ [│} ]│F11│F12│ Play│ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ * │ │Prv│Nxt│VlD│VlU│~ `│| \│: ;│" '│? /│ │ * ├────┬───┼───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤ @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LOWER] = LAYOUT_ansi_40( \ KC_DELT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, \ - KC_CAPS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_MUTE, KC_LBRC, KC_RBRC, KC_F11, KC_F12, KC_MPLY, \ + KC_CAPS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_MUTE, KC_LBRC, KC_RBRC, KC_F11, KC_F12, KC_MPLY, \ _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_GRV, KC_BSLS, KC_SCLN, KC_QUOT, KC_EQL, _______, \ _______, _______, _______, _______, _______, _______, _______ \ ), @@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ * │Del │! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│ │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ -* │Caps │Lft│Dwn│ Up│Rgt│Mut│{ [│} ]│_ -│+ =│ Play│ +* │Caps │ ← │ ↓ │ ↑ │ → │Mut│{ [│} ]│_ -│+ =│ Play│ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ * │ │Prv│Nxt│VlD│VlU│~ `│| \│: ;│" '│? /│ │ * ├────┬───┼───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤ @@ -65,8 +65,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_RAISE] = LAYOUT_ansi_40( \ KC_DELT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ KC_CAPS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_MUTE, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_MPLY, \ - _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_GRV, KC_BSLS, KC_SCLN, KC_QUOT, KC_EQL, _______, \ - _______, _______, _______, _______, _______, _______, _______ \ + _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_GRV, KC_BSLS, KC_SCLN, KC_QUOT, KC_SLSH, PGU_SFT, \ + _______, _______, _______, _______, HOM_GUI, PGD_LWR, END_ALT \ ), /* Adjust/Macro Layer * ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index cddf71357e6b..8245a953620f 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -78,7 +78,6 @@ void matrix_scan_cmd_tab(void); #define PGD_LWR PGD_FN1 // Tap Lower for Page Down #define PGD_FN2 LT(2, KC_PGDN) // Tap Fn2 for Page Down #define PGD_RAI PGD_FN2 // Tap Raise for Page Down -#define DWN_ALT RALT_T(KC_PGDN) // Tap Right Alt for Down #define END_ALT ROPT_T(KC_END) // Tap Right Option for End #define END_CTL RCTL_T(KC_END) // Tap Right Control for End From ddaa1739efc88b1ecfd5f56b781fca3f21b0e5ab Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Thu, 16 Apr 2020 12:12:31 -0700 Subject: [PATCH 348/429] [User] Change *ALT,*GUI keycodes to *OPT,*CMD --- .../keymaps/brandonschlack/keymap.c | 2 +- .../romeo/keymaps/brandonschlack/keymap.c | 4 +- .../solder/keymaps/brandonschlack/keymap.c | 2 +- .../hotswap/keymaps/brandonschlack/keymap.c | 2 +- .../rev2/keymaps/brandonschlack/keymap.c | 2 +- .../nightmare/keymaps/brandonschlack/keymap.c | 2 +- .../60_ansi/brandonschlack-ansi/keymap.c | 4 +- .../brandonschlack-split/keymap.c | 4 +- .../65_ansi_blocker/brandonschlack/keymap.c | 2 +- .../community/75_ansi/brandonschlack/keymap.c | 2 +- .../ortho_4x12/brandonschlack/keymap.c | 2 +- .../ortho_5x12/brandonschlack/keymap.c | 2 +- .../tkl_ansi/brandonschlack/keymap.c | 2 +- users/brandonschlack/process_records.h | 46 +++++++++---------- 14 files changed, 39 insertions(+), 39 deletions(-) diff --git a/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c b/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c index 39878a65ed20..4c63a3e14adb 100644 --- a/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c +++ b/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_PGUP, \ HY_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_PGDN, \ 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_UP, KC_END, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, PLY_FN1, KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, PLY_FN1, KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ diff --git a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c index 86d1398a3ead..40a52ab1a107 100644 --- a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c +++ b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ HY_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, \ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, UP_RSFT, \ - KC_LCTL, KC_LOPT, KC_LCMD, SPC_RAI, LFT_GUI, DWN_LWR, RGT_ALT \ + KC_LCTL, KC_LOPT, KC_LCMD, SPC_RAI, LFT_CMD, DWN_LWR, RGT_OPT \ ), /* Lower * ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ @@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_DELT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ KC_CAPS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_MUTE, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_MPLY, \ _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_GRV, KC_BSLS, KC_SCLN, KC_QUOT, KC_SLSH, PGU_SFT, \ - _______, _______, _______, _______, HOM_GUI, PGD_LWR, END_ALT \ + _______, _______, _______, _______, HOM_CMD, PGD_LWR, END_OPT \ ), /* Adjust/Macro Layer * ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ diff --git a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c index 8b406860c992..595540199860 100644 --- a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c +++ b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_PGDN, \ HY_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, XXXXXXX, \ 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_UP, XXXXXXX, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, PLY_FN1, KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, PLY_FN1, KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index 74bf1d14ab5b..74cef88c0ddd 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, KC_PGUP, \ HY_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_PGDN, \ 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_UP, KC_END, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, PLY_FN1, KC_LEFT, KC_DOWN, KC_RGHT), + KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, PLY_FN1, KC_LEFT, KC_DOWN, KC_RGHT), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c index 4c8e9234de80..e5189af82564 100644 --- a/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, KC_PGUP, \ HY_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_PGDN, \ KC_LSFT, XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, \ - KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, KC_SPC, XXXXXXX, KC_RGUI, PLY_FN1, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT), + KC_LCTL, KC_LOPT, KC_LCMD, XXXXXXX, KC_SPC, XXXXXXX, KC_RCMD, PLY_FN1, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ diff --git a/keyboards/nightmare/keymaps/brandonschlack/keymap.c b/keyboards/nightmare/keymaps/brandonschlack/keymap.c index 7f618b521814..908489fdce32 100644 --- a/keyboards/nightmare/keymaps/brandonschlack/keymap.c +++ b/keyboards/nightmare/keymaps/brandonschlack/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_HOME, KC_ESC, 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, \ KC_PGUP, HY_TAB, 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_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, UP_RSFT, PLY_MCO, \ - KC_END, KC_LCTL, KC_LALT, KC_LGUI, SPC_LWR, SPC_RAI, LFT_GUI, DWN_ALT, RGT_CTL \ + KC_END, KC_LCTL, KC_LOPT, KC_LCMD, SPC_LWR, SPC_RAI, LFT_CMD, DWN_OPT, RGT_CTL \ ), /** * Lower diff --git a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c index 9f0d3584a0f7..089a169bca20 100644 --- a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c +++ b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ ↑ Shift│ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ - * │Ctrl│ Opt│ Cmd│ Space │CmdP│←Alt│↓ Fn│→Ctl│ + * │Ctrl│ Opt│ Cmd│ Space │CmdP│←Opt│↓ Fn│→Ctl│ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ */ [_BASE] = LAYOUT_60_ansi( \ @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, \ HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, UP_RSFT, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, PLY_GUI, LFT_ALT, DWN_FN1, RGT_CTL \ + KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, PLY_CMD, LFT_OPT, DWN_FN1, RGT_CTL \ ), /* Function Layer diff --git a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c index 72494f7c7458..bebc9cf2de9c 100644 --- a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c +++ b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ * │ LShift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │↑ Shft│FnP│ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ - * │LCtl│LAlt│LGui│ Space │RGui│←Alt│↓ Fn│→Ctl│ + * │Ctrl│Opt │Cmd │ Space │ Cmd│←Opt│↓ Fn│→Ctl│ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ */ [_BASE] = LAYOUT_60_ansi_split_bs_rshift( \ @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, \ HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, UP_RSFT, PLY_FN1, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, LFT_ALT, DWN_FN1, RGT_CTL \ + KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, LFT_OPT, DWN_FN1, RGT_CTL \ ), /* Function Layer diff --git a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c index 370c9241b44d..6b67cfdca5b6 100644 --- a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c +++ b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_PGUP, \ HY_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_PGDN, \ 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_UP, KC_END, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, PLY_FN1, KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, PLY_FN1, KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ diff --git a/layouts/community/75_ansi/brandonschlack/keymap.c b/layouts/community/75_ansi/brandonschlack/keymap.c index fe411603543d..de6919bc65b2 100644 --- a/layouts/community/75_ansi/brandonschlack/keymap.c +++ b/layouts/community/75_ansi/brandonschlack/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_PGUP, \ HY_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_PGDN, \ 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_UP, KC_END, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, RWD_GUI, FFD_ALT, PLY_FN1, KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, RWD_CMD, FFD_OPT, PLY_FN1, KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c index f02139641cda..74e6035816c5 100644 --- a/layouts/community/ortho_4x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ - MCO_LYR, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ + MCO_LYR, KC_LCTL, KC_LOPT, KC_LCMD, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ // └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ), diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c index 0cca4ffa8a5b..311266093950 100644 --- a/layouts/community/ortho_5x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT, \ // ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤ - MCO_LYR, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ + MCO_LYR, KC_LCTL, KC_LOPT, KC_LCMD, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ // └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘ ), diff --git a/layouts/community/tkl_ansi/brandonschlack/keymap.c b/layouts/community/tkl_ansi/brandonschlack/keymap.c index 353eb9bb9f5e..6f13d33b4aea 100644 --- a/layouts/community/tkl_ansi/brandonschlack/keymap.c +++ b/layouts/community/tkl_ansi/brandonschlack/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_DEL, KC_END, KC_PGDN, \ HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, RWD_GUI, FFD_ALT, PLY_FN1, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, RWD_CMD, FFD_OPT, PLY_FN1, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ ), /* Function Layer * ┌───┬───┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┐ diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 8245a953620f..402ea98e2e38 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -44,9 +44,9 @@ void matrix_scan_cmd_tab(void); * Use the Mod-Tap feature for easy media controls * Used with >=65% layouts */ -#define RWD_GUI RGUI_T(KC_MPRV) // Tap Right GUI for Prev Track -#define PLY_GUI RGUI_T(KC_MPLY) // Tap Right GUI for Play/Pause -#define FFD_ALT RALT_T(KC_MNXT) // Tap Right Alt for Next Track +#define RWD_CMD RCMD_T(KC_MPRV) // Tap Right Command for Prev Track +#define PLY_CMD RCMD_T(KC_MPLY) // Tap Right Command for Play/Pause +#define FFD_OPT ROPT_T(KC_MNXT) // Tap Right Option for Next Track #define PLY_FN1 LT(1, KC_MPLY) // Tap Fn for Play/Pause #define PLY_FN2 LT(2, KC_MPLY) // Tap Fn2 for Play/Pause #define PLY_MCO LT(_MACRO, KC_MPLY) // Tap MacroFn for Play/Pause @@ -57,14 +57,14 @@ void matrix_scan_cmd_tab(void); * Mostly used for 40-60% layouts */ #define UP_RSFT RSFT_T(KC_UP) // Tap Right Shift for Up -#define LFT_ALT RALT_T(KC_LEFT) // Tap Right Alt for Left -#define LFT_GUI RGUI_T(KC_LEFT) // Tap Right GUI for Left +#define LFT_OPT ROPT_T(KC_LEFT) // Tap Right Option for Left +#define LFT_CMD RCMD_T(KC_LEFT) // Tap Right Command for Left #define DWN_FN1 LT(1, KC_DOWN) // Tap Fn for Down #define DWN_LWR DWN_FN1 // Tap Lower for Down #define DWN_FN2 LT(2, KC_DOWN) // Tap Fn2 for Down #define DWN_RAI DWN_FN2 // Tap Raise for Down -#define DWN_ALT RALT_T(KC_DOWN) // Tap Right Alt for Down -#define RGT_ALT RALT_T(KC_RGHT) // Tap Right Alt for Right +#define DWN_OPT ROPT_T(KC_DOWN) // Tap Right Option for Down +#define RGT_OPT ROPT_T(KC_RGHT) // Tap Right Option for Right #define RGT_CTL RCTL_T(KC_RGHT) // Tap Right Ctrl for Right /** * Nav Mod-Tap @@ -72,13 +72,13 @@ void matrix_scan_cmd_tab(void); * Mostly used for 40-60% layouts, on a function layer */ #define PGU_SFT RSFT_T(KC_PGUP) // Tap Right Shift for Page Up -#define HOM_ALT RALT_T(KC_HOME) // Tap Right Alt for Home -#define HOM_GUI RGUI_T(KC_HOME) // Tap Right GUI for Home +#define HOM_OPT ROPT_T(KC_HOME) // Tap Right Option for Home +#define HOM_CMD RCMD_T(KC_HOME) // Tap Right Command for Home #define PGD_FN1 LT(1, KC_PGDN) // Tap Fn for Page Down #define PGD_LWR PGD_FN1 // Tap Lower for Page Down #define PGD_FN2 LT(2, KC_PGDN) // Tap Fn2 for Page Down #define PGD_RAI PGD_FN2 // Tap Raise for Page Down -#define END_ALT ROPT_T(KC_END) // Tap Right Option for End +#define END_OPT ROPT_T(KC_END) // Tap Right Option for End #define END_CTL RCTL_T(KC_END) // Tap Right Control for End /** @@ -87,25 +87,25 @@ void matrix_scan_cmd_tab(void); * Reference: https://support.apple.com/en-us/HT201236 */ #define MC_POWR KC_POWER // Power (KC_POWER) -#define MC_SLEP LALT(LGUI(KC_POWER)) // Sleep (Option-Command-Power) +#define MC_SLEP LOPT(LCMD(KC_POWER)) // Sleep (Option-Command-Power) #define MC_SLPD LCTL(LSFT(KC_POWER)) // Sleep Display (Control-Shift-Power) -#define MC_LOCK LCTL(LGUI(KC_Q)) // Lock Screen (Control-Command-Q) +#define MC_LOCK LCTL(LCMD(KC_Q)) // Lock Screen (Control-Command-Q) #define MC_MSSN KC_FIND // Mission Control: Configure karabiner for find -> mission_control #define MC_LHPD KC_MENU // Launchpad: Configure karabiner for menu -> launchpad -#define MC_CMTB LGUI(KC_TAB) // Command-Tab -#define MC_BACK LGUI(KC_LBRC) // Back (Command–Left Bracket) -#define MC_FWRD LGUI(KC_RBRC) // Forward (Command–Right Bracket) -#define CLS_TAB LGUI(KC_W) // Close Tab (Command–W) -#define REO_TAB LSFT(LGUI(KC_T)) // Reopen Last Tab (Shift-Command-T) +#define MC_CMTB LCMD(KC_TAB) // Command-Tab +#define MC_BACK LCMD(KC_LBRC) // Back (Command–Left Bracket) +#define MC_FWRD LCMD(KC_RBRC) // Forward (Command–Right Bracket) +#define CLS_TAB LCMD(KC_W) // Close Tab (Command–W) +#define REO_TAB LSFT(LCMD(KC_T)) // Reopen Last Tab (Shift-Command-T) #define NXT_TAB LCTL(KC_TAB) // Next Tab (Control-Tab) #define PRV_TAB LSFT(LCTL(KC_TAB)) // Previous Tab (Shift-Control-Tab) -#define NXT_WIN LGUI(KC_GRV) // Next Window (Control-Grave) -#define PRV_WIN LGUI(KC_TILD) // Previous Window (Shift-Control-Grave) -#define MC_PLYR LGUI(KC_F8) // Focuses current Media Player -#define MC_UNDO LGUI(KC_Z) // Undo (Command-Z) -#define MC_REDO LSFT(LGUI(KC_Z)) // Redo (Shift-Command-Z) +#define NXT_WIN LCMD(KC_GRV) // Next Window (Control-Grave) +#define PRV_WIN LCMD(KC_TILD) // Previous Window (Shift-Control-Grave) +#define MC_PLYR LCMD(KC_F8) // Focuses current Media Player +#define MC_UNDO LCMD(KC_Z) // Undo (Command-Z) +#define MC_REDO LSFT(LCMD(KC_Z)) // Redo (Shift-Command-Z) #define OP_AFLL HYPR(KC_BSLS) // 1Password Autofill (Shift-Control-Option-Command-\) -#define PX_AFLL LSFT(LALT(KC_X)) // 1PasswordX Autofill (Shift-Option-X) +#define PX_AFLL LSFT(LOPT(KC_X)) // 1PasswordX Autofill (Shift-Option-X) // Reverse scrolling for using with macOS Natural Scrolling. #define MC_WH_U KC_WH_D // Mouse Wheel Up #define MC_WH_D KC_WH_U // Mouse Wheel Down From a62defb9f26ce6a074e04a87879ebe39cc4c54d8 Mon Sep 17 00:00:00 2001 From: brandonschlack Date: Thu, 16 Apr 2020 12:56:24 -0700 Subject: [PATCH 349/429] [Keymap] Update romeo keymap - Move F-keys on Lower - Move media keys on Lower - Move symbols on Raise --- .../romeo/keymaps/brandonschlack/keymap.c | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c index 40a52ab1a107..1397eba505d1 100644 --- a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c +++ b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c @@ -36,36 +36,36 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Lower * ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ -* │Del │ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│ │ +* │F1 │ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│ F12│ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ -* │Caps │ ← │ ↓ │ ↑ │ → │Mut│{ [│} ]│F11│F12│ Play│ +* │Caps │ ← │ ↓ │ ↑ │ → │F13│F14│F15│VlD│VlU│ Play│ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ -* │ │Prv│Nxt│VlD│VlU│~ `│| \│: ;│" '│? /│ │ +* │ │Hom│PgD│PgU│End│ │ │Mut│Prv│Nxt│ │ * ├────┬───┼───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤ * │ │ │ │ │ │ │ │ * └────┴───┴───┴────────────────────────┴────┴───┴────┘ */ [_LOWER] = LAYOUT_ansi_40( \ - KC_DELT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, \ - KC_CAPS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_MUTE, KC_LBRC, KC_RBRC, KC_F11, KC_F12, KC_MPLY, \ - _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_GRV, KC_BSLS, KC_SCLN, KC_QUOT, KC_EQL, _______, \ + 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_CAPS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_F13, KC_F14, KC_F15, KC_VOLD, KC_VOLU, KC_MPLY, \ + _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______, KC_MUTE, KC_MPRV, KC_MNXT, _______, \ _______, _______, _______, _______, _______, _______, _______ \ ), /* Raise * ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ * │Del │! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│ │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ -* │Caps │ ← │ ↓ │ ↑ │ → │Mut│{ [│} ]│_ -│+ =│ Play│ +* │Caps │ ← │ ↓ │ ↑ │ → │{ [│} ]│_ -│+ =│: ;│ " ' │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ -* │ │Prv│Nxt│VlD│VlU│~ `│| \│: ;│" '│? /│ │ +* │ │Hom│PgD│PgU│End│ │ │| \│~ `│? /│ ⇞Sft│ * ├────┬───┼───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤ -* │ │ │ │ │ │ │ │ +* │ │ │ │ │↖︎Cmd│⇟Fn│↘︎Opt│ * └────┴───┴───┴────────────────────────┴────┴───┴────┘ */ [_RAISE] = LAYOUT_ansi_40( \ KC_DELT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ - KC_CAPS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_MUTE, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_MPLY, \ - _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_GRV, KC_BSLS, KC_SCLN, KC_QUOT, KC_SLSH, PGU_SFT, \ + KC_CAPS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_SCLN, KC_QUOT, \ + _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______, KC_BSLS, KC_GRV, KC_SLSH, PGU_SFT, \ _______, _______, _______, _______, HOM_CMD, PGD_LWR, END_OPT \ ), /* Adjust/Macro Layer From a5baa65ae53709cae381511dd889c33fea2dde25 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 23 Apr 2020 12:28:26 -0700 Subject: [PATCH 350/429] [User] Add CTL,CMD Mod-Tap aliases --- users/brandonschlack/process_records.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 402ea98e2e38..33aba3a1bfc8 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -23,6 +23,14 @@ void matrix_scan_cmd_tab(void); * Some meta aliases for QMK features such as Mod-Taps * and for cleaner looking Layer Toggles */ +/* Control Mod-Tap */ +#define CTL_ESC CTL_T(KC_ESC) // Hold Escape for Control +#define CTL_TAB CTL_T(KC_TAB) // Hold Tab for Control +#define CTL_CAP CTL_T(KC_CAPS) // Hold Caps Lock for Control +/* Command Mod-Tap */ +#define CMD_ESC CMD_T(KC_ESC) // Hold Escape for Command +#define CMD_TAB CMD_T(KC_TAB) // Hold Tab for Command +#define CMD_CAP CMD_T(KC_CAPS) // Hold Caps Lock for Command /* Hyper Mod-Tap */ #define HY_ESC ALL_T(KC_ESC) // Hold Escape for Hyper (Shift-Control-Option-Command) #define HY_TAB ALL_T(KC_TAB) // Hold Tab for Hyper (Shift-Control-Option-Command) @@ -30,6 +38,7 @@ void matrix_scan_cmd_tab(void); /* Shift Mod-Tap */ #define SF_CAPS LSFT_T(KC_CAPS) // Hold Caps Lock for Left Shift #define SFT_ENT RSFT_T(KC_ENT) // Hold Enter for Right Shift +#define SF_SLSH RSFT_T(KC_SLSH) // Tap Right Shift for Slash (/) /* Layer Aliases */ #define FN_LYR MO(_FN1) // Hold for FN Layer #define LOWER MO(_LOWER) // Hold for LOWER Layer From 92554b4b585e2669fc48325dbab9cf13a2cc9d4f Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 23 Apr 2020 12:32:11 -0700 Subject: [PATCH 351/429] [Keymap] Add initial neuron keymap --- .../neuron/keymaps/brandonschlack/keymap.c | 101 ++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c diff --git a/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c b/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c new file mode 100644 index 000000000000..d716d78abb2f --- /dev/null +++ b/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c @@ -0,0 +1,101 @@ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Base Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Esc│ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │Bsp│ + * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │CTab│ A │ S │ D │ F │ G │ H │ J │ K │ L │ Enter│ + * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ + * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│?/Sf│ + * ├┬┬┬┬──┴┬──┴──┬┴───┴───┼───┴───┴──┬┴───┴┬──┴┬┬┬┬┤ + * │││││Opt│Cmd │ SpcLwr │ SpcRse │ Cmd│Ctl│││││ + * └┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┘ + */ +[_BASE] = LAYOUT( \ + HY_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ + CTL_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, SF_SLSH, \ + KC_LOPT, KC_LCMD, SPC_LWR, SPC_RAI, KC_RCMD, KC_RCTL, \ +), +/* Lower + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ │ F1│ F2│ F3│ F4│F13│F14│F15│ ↑ │PgU│Del│ │ + * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ │ F5│ F6│ F7│ F8│Prv│Nxt│ ← │ ↓ │ → │ Ply │ + * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ + * │SfCaps│ F9│F10│F11│F12│VlD│VlU│Hom│End│PgD│MtSf│ + * ├┬┬┬┬──┴┬──┴──┬┴───┴───┼───┴───┴──┬┴───┴┬──┴┬┬┬┬┤ + * │││││ │ │ │ │ │ │││││ + * └┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┘ + */ +[_LOWER] = LAYOUT( \ + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F13, KC_F14, KC_F15, KC_UP, KC_PGUP, KC_DELT, _______, \ + _______, KC_F5, KC_F6, KC_F7, KC_F8, KC_MPRV, KC_MNXT, KC_LEFT, KC_DOWN, KC_RGHT, KC_MPLY, \ + _______, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLD, KC_VOLU, KC_HOME, KC_END, KC_PGDN, MUT_SFT, \ + _______, _______, _______, _______, _______, _______, \ +), +/* Raise + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ │! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│ │ + * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ │ ← │ ↓ │ ↑ │ → │{ [│} ]│_ -│+ =│: ;│ " ' │ + * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ + * │SfCaps│ │ │ │ │ │ │ │| \│~ `│ │ + * ├┬┬┬┬──┴┬──┴──┬┴───┴───┼───┴───┴──┬┴───┴┬──┴┬┬┬┬┤ + * │││││ │ │ │ │ │ │││││ + * └┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┘ + */ + +[_RAISE] = LAYOUT( \ + _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ + _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_SCLN, KC_QUOT, \ + SF_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_GRV, KC_SLSH, _______, \ + _______, _______, _______, _______, _______, _______, \ +), +/* Adjust/Macro + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Mke│BrD│BrU│Msn│LHP│ │ │ │ │ │ │SlD│ + * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │NxW │ │ │ │PvT│Bck│Fwd│NxT│ │ │ Reset│ + * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ + * │ │ │ │ │1PX│1Ps│ │ │ │ │ │ + * ├┬┬┬┬──┴┬──┴──┬┴───┴───┼───┴───┴──┬┴───┴┬──┴┬┬┬┬┤ + * │││││ │ │ │ │ │ │││││ + * └┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┘ + */ + +[_ADJUST] = LAYOUT( \ + QM_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, MC_SLPD, \ + NXT_WIN, _______, _______, _______, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, _______, _______, RESET, \ + _______, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, \ +) +/* Blank Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ + * ├┬┬┬┬──┴┬──┴──┬┴───┴───┼───┴───┴──┬┴───┴┬──┴┬┬┬┬┤ + * │││││ │ │ │ │ │ │││││ + * └┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┘ + */ +/* +[BLANK] = LAYOUT( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, \ +) +*/ + +}; + +layer_state_t layer_state_set_keymap(layer_state_t state) { + state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); + return state; +} + From 400ca8b11d93a80702cca8701a8a31e4a9cd8605 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Sat, 25 Apr 2020 23:39:27 -0700 Subject: [PATCH 352/429] [Keymap] Fix neuron keymap --- .../neuron/keymaps/brandonschlack/keymap.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c b/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c index d716d78abb2f..3d4e3e06c70e 100644 --- a/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c +++ b/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c @@ -10,14 +10,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│?/Sf│ * ├┬┬┬┬──┴┬──┴──┬┴───┴───┼───┴───┴──┬┴───┴┬──┴┬┬┬┬┤ - * │││││Opt│Cmd │ SpcLwr │ SpcRse │ Cmd│Ctl│││││ + * │││││Opt│Cmd │ SpcLwr │ SpcRse │ Ctl│Cmd│││││ * └┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┘ */ [_BASE] = LAYOUT( \ HY_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ CTL_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, \ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, SF_SLSH, \ - KC_LOPT, KC_LCMD, SPC_LWR, SPC_RAI, KC_RCMD, KC_RCTL, \ + KC_LOPT, KC_LCMD, SPC_LWR, XXXXXXX, SPC_RAI, KC_RCTL, KC_RCMD \ ), /* Lower * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F13, KC_F14, KC_F15, KC_UP, KC_PGUP, KC_DELT, _______, \ _______, KC_F5, KC_F6, KC_F7, KC_F8, KC_MPRV, KC_MNXT, KC_LEFT, KC_DOWN, KC_RGHT, KC_MPLY, \ _______, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLD, KC_VOLU, KC_HOME, KC_END, KC_PGDN, MUT_SFT, \ - _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, XXXXXXX, _______, _______, _______ \ ), /* Raise * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ @@ -51,8 +51,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_RAISE] = LAYOUT( \ _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_SCLN, KC_QUOT, \ - SF_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_GRV, KC_SLSH, _______, \ - _______, _______, _______, _______, _______, _______, \ + SF_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, KC_GRV, _______, \ + _______, _______, _______, XXXXXXX, _______, _______, _______ \ ), /* Adjust/Macro * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ @@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QM_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, MC_SLPD, \ NXT_WIN, _______, _______, _______, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, _______, _______, RESET, \ _______, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, XXXXXXX, _______, _______, _______ \ ) /* Blank Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ @@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, XXXXXXX, _______, _______, _______ \ ) */ From e4581b0b1291727e80a4a3ab4ab7ed898ac30a21 Mon Sep 17 00:00:00 2001 From: umi <57262844+umi-umi@users.noreply.github.com> Date: Sun, 26 Apr 2020 23:10:05 +0900 Subject: [PATCH 353/429] [Docs] Japanese translation of docs/feature_dynamic_macros.md (#8842) * add feature_dynamic_macros.md translation * add header * add header * update based on comment * update based on comment --- docs/ja/feature_dynamic_macros.md | 71 +++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 docs/ja/feature_dynamic_macros.md diff --git a/docs/ja/feature_dynamic_macros.md b/docs/ja/feature_dynamic_macros.md new file mode 100644 index 000000000000..ab8ec371374e --- /dev/null +++ b/docs/ja/feature_dynamic_macros.md @@ -0,0 +1,71 @@ +# 動的マクロ: ランタイムでのマクロの記録および再生 + + + +QMK はその場で作られた一時的なマクロをサポートします。これらを動的マクロと呼びます。それらはユーザがキーボードから定義し、キーボードのプラグを抜くか再起動すると失われます。 + +1つまたは2つのマクロに合計128のキー押下を保存できます。RAM をより多く使用してサイズを増やすことができます。 + +有効にするには、最初に `rules.mk` に `DYNAMIC_MACRO_ENABLE = yes` を記述します。そして、以下のキーをキーマップに追加します: + +| キー | Alias | 説明 | +|------------------|----------|---------------------------------------------------| +| `DYN_REC_START1` | `DM_REC1` | マクロ 1 の記録を開始します | +| `DYN_REC_START2` | `DM_REC2` | マクロ 2 の記録を開始します | +| `DYN_MACRO_PLAY1` | `DM_PLY1` | マクロ 1 を再生します | +| `DYN_MACRO_PLAY2` | `DM_PLY2` | マクロ 2 を再生します | +| `DYN_REC_STOP` | `DM_RSTP` | 現在記録中のマクロの記録を終了します。 | + +これが必要な全てです。 + +マクロの記録を開始するには、`DYN_REC_START1` または `DYN_REC_START2` のどちらかを押します。 + +記録を終了するには、`DYN_REC_STOP` レイヤーボタンを押します。 + +マクロを再生するには、`DYN_MACRO_PLAY1` あるいは `DYN_MACRO_PLAY2` のどちらかを押します。 + +マクロの一部としてマクロを再生することができます。マクロ 1 を記録中にマクロ 2 を再生、またはその逆も問題ありません。ただし、再帰的なマクロ、つまりマクロ 1 を再生するマクロ 1 は作成しないでください。もしそうしてキーボードが反応しなくなった場合は、キーボードを取り外し再び接続します。これを完全に無効にするには、`config.h` ファイルで `DYNAMIC_MACRO_NO_NESTING` を定義します。 + +?> 動的マクロの内部の詳細については、`process_dynamic_macro.h` および `process_dynamic_macro.c` ファイルのコメントを読んでください。 + +## カスタマイズ + +ある程度のカスタマイズを可能にするオプションがいくつか追加されています。 + +| 定義 | デフォルト | 説明 | +|----------------------------|----------------|-----------------------------------------------------------------------------------------------------------------| +| `DYNAMIC_MACRO_SIZE` | 128 | 動的マクロが使用できるメモリ量を設定します。これは限られたリソースであり、コントローラに依存します。 | +| `DYNAMIC_MACRO_USER_CALL` | *定義なし* | これを定義すると、ユーザの `keymap.c` ファイルを使ってマクロが起動されます。 | +| `DYNAMIC_MACRO_NO_NESTING` | *定義なし* | これを定義すると、別のマクロからマクロを呼び出す(入れ子になったマクロ)機能を無効にします。 | + + +記録中にキーを押すたびに LED が点滅し始めた場合は、マクロバッファにマクロを入れるスペースがもう無いことを意味します。マクロを入れるには、他のマクロ(それらは同じバッファを共有します)を短くするか、`config.h` に `DYNAMIC_MACRO_SIZE` 定義を追加することでバッファを増やします(デフォルト値: 128; ヘッダ内のコメントを読んでください)。 + + +### DYNAMIC_MACRO_USER_CALL + +以前のバージョンの動的マクロをお使いの方へ: 専用の `DYN_REC_STOP` キーを使わずに動的マクロキーへのアクセスに使われるレイヤーモディファイアのみを使って、マクロの記録を終了することもまだ可能です。この動作に戻したい場合は、`#define DYNAMIC_MACRO_USER_CALL` を `config.h` に追加し、以下のスニペットを `process_record_user()` 関数の先頭に記述します: + +```c + uint16_t macro_kc = (keycode == MO(_DYN) ? DYN_REC_STOP : keycode); + + if (!process_record_dynamic_macro(macro_kc, record)) { + return false; + } +``` + +### ユーザフック + +カスタム機能とフィードバックオプションを動的マクロ機能に追加するために使うことができるフックが幾つかあります。これによりある程度のカスタマイズが可能になります。 + +direction がどのマクロであるかを示すことに注意してください。`1` がマクロ 1、`-1` がマクロ 2、0 がマクロ無しです。 + +* `dynamic_macro_record_start_user(void)` - マクロの記録を開始する時に起動されます。 +* `dynamic_macro_play_user(int8_t direction)` - マクロを再生する時に起動されます。 +* `dynamic_macro_record_key_user(int8_t direction, keyrecord_t *record)` - マクロの記録中に各キー押下で起動されます。 +* `dynamic_macro_record_end_user(int8_t direction)` - マクロの記録を停止した時に起動されます。 + +さらに、動的マクロ機能が有効な場合にバックライトを点滅させるために `dynamic_macro_led_blink()` を呼び出すことができます。 From 132595b5174be563c8f479218a089108bf32b32f Mon Sep 17 00:00:00 2001 From: Keenan Brock Date: Sun, 26 Apr 2020 11:32:20 -0400 Subject: [PATCH 354/429] kle2json: fix invocation error resolves an issue while finding the file path TypeError: unsupported operand type(s) for +: 'PosixPath' and 'str' --- lib/python/qmk/cli/kle2json.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/python/qmk/cli/kle2json.py b/lib/python/qmk/cli/kle2json.py index 5268462f927e..798f95fd1960 100755 --- a/lib/python/qmk/cli/kle2json.py +++ b/lib/python/qmk/cli/kle2json.py @@ -69,7 +69,7 @@ def kle2json(cli): # Replace layout in keyboard json keyboard = keyboard.replace('"LAYOUT_JSON_HERE"', layout) # Write our info.json - file = open(out_path + "/info.json", "w") + file = open(out_path / "info.json", "w") file.write(keyboard) file.close() cli.log.info('Wrote out {fg_cyan}%s/info.json', out_path) From f4ca1b73b6be757afe62bbd2deb26dd1c520d330 Mon Sep 17 00:00:00 2001 From: Keenan Brock Date: Sun, 26 Apr 2020 11:34:07 -0400 Subject: [PATCH 355/429] kle2info: trim down x and y output fixes quirks with float implementation. before: {"label":"Esc", "x":0.66, "y":1.45}, {"label":"!", "x":1.6600000000000001, "y":1.45} after: {"label":"Esc", "x":0.66, "y":1.45}, {"label":"!", "x":1.66, "y":1.45} --- lib/python/kle2xy.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/python/kle2xy.py b/lib/python/kle2xy.py index bff1d025b768..003476f92e56 100644 --- a/lib/python/kle2xy.py +++ b/lib/python/kle2xy.py @@ -110,8 +110,8 @@ def parse_layout(self, layout): # noqa FIXME(skullydazed): flake8 says this ha else: current_key['name'] = key - current_key['row'] = current_row - current_key['column'] = current_col + current_key['row'] = round(current_row, 2) + current_key['column'] = round(current_col, 2) # Determine the X center x_center = (current_key['width'] * self.key_width) / 2 From a274ddc26a6deea5a4af4ca2f71ad80477626c93 Mon Sep 17 00:00:00 2001 From: umi <57262844+umi-umi@users.noreply.github.com> Date: Mon, 27 Apr 2020 16:43:41 +0900 Subject: [PATCH 356/429] [Docs] Japanese translation of docs/feature_hd44780.md (#8875) * add feature_hd44780.md translation * update based on comment * update based on comment * update based on comment --- docs/ja/feature_hd44780.md | 62 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 docs/ja/feature_hd44780.md diff --git a/docs/ja/feature_hd44780.md b/docs/ja/feature_hd44780.md new file mode 100644 index 000000000000..5258632536cb --- /dev/null +++ b/docs/ja/feature_hd44780.md @@ -0,0 +1,62 @@ +# HD44780 LCD ディスプレイ + + + +これは Peter Fleury の LCD ライブラリの統合です。このページは基本について説明します。[詳細なドキュメントについてはこのページをご覧ください](http://homepage.hispeed.ch/peterfleury/doxygen/avr-gcc-libraries/group__pfleury__lcd.html) (訳注）原文のリンク先のページは、サービスの終了に伴って削除されています。移行先は (http://www.peterfleury.epizy.com/doxygen/avr-gcc-libraries/group__pfleury__lcd.html) と思われます。 + +HD44780 ディスプレイのサポートを有効にするには、キーボードの `rules.mk` の `HD44780_ENABLE` フラグを yes に設定します。 + +## 設定 + +ディスプレイで使用されるピンとディスプレイの行と列の数を、キーボードの `config.h` に設定する必要があります。 + + +HD44780 のラベルが付いたセクションのコメントを外し、必要に応じてパラメータを変更します。 +```` +/* + * HD44780 LCD ディスプレイ設定 + */ + +#define LCD_LINES 2 //< ディスプレイの表示行数 +#define LCD_DISP_LENGTH 16 //< ディスプレイの行ごとの表示文字数 +#define LCD_IO_MODE 1 //< 0: メモリマップモード 1: IO ポートモード +#if LCD_IO_MODE +#define LCD_PORT PORTB //< LCD 行のためのポート +#define LCD_DATA0_PORT LCD_PORT //< 4ビットデータビット 0 のポート +#define LCD_DATA1_PORT LCD_PORT //< 4ビットデータビット 1 のポート +#define LCD_DATA2_PORT LCD_PORT //< 4ビットデータビット 2 のポート +#define LCD_DATA3_PORT LCD_PORT //< 4ビットデータビット 3 のポート +#define LCD_DATA0_PIN 4 //< 4ビットデータビット 0 のピン +#define LCD_DATA1_PIN 5 //< 4ビットデータビット 1 のピン +#define LCD_DATA2_PIN 6 //< 4ビットデータビット 2 のピン +#define LCD_DATA3_PIN 7 //< 4ビットデータビット 3 のピン +#define LCD_RS_PORT LCD_PORT //< RS 線のためのポート +#define LCD_RS_PIN 3 //< RS 線のためのピン +#define LCD_RW_PORT LCD_PORT //< RW 線のためのポート +#define LCD_RW_PIN 2 //< RW 線のためのピン +#define LCD_E_PORT LCD_PORT //< Enable 線のためのポート +#define LCD_E_PIN 1 //< Enable 線のためのピン +#endif +```` + +他のプロパティを設定する必要がある場合は、それらを `quantum/hd44780.h` からコピーし、`config.h` に設定することができます。（訳注）`quantum/hd44780.h` は `drivers/avr/hd44780.h` の間違いではないかと思われます。 + +## 使用法 + +ディスプレイを初期化するには、以下のパラメータのうちの1つを使って `lcd_init()` を呼び出します: +```` +LCD_DISP_OFF : ディスプレイオフ +LCD_DISP_ON : ディスプレイオン、カーソルオフ +LCD_DISP_ON_CURSOR : ディスプレイオン、カーソルオン +LCD_DISP_ON_CURSOR_BLINK : ディスプレイオン、点滅カーソル +```` +これはキーボードの `matrix_init_kb` またはキーマップの `matrix_init_user` で行うのが最適です。 +使用前にディスプレイをクリアすることをお勧めします。 +そのためには、`lcd_clrsrc()` を呼びます。 + +ディスプレイに何かを表示するには、最初に `lcd_gotoxy(column, line)` を呼びます。最初の行の先頭に移動するには、`lcd_gotoxy(0, 0)` を呼び出し、その後 `lcd_puts("example string")` を使って文字列を出力します。 + +ディスプレイを制御することができる、より多くのメソッドがあります。[詳細なドキュメントについてはリンクされたページをご覧ください](http://homepage.hispeed.ch/peterfleury/doxygen/avr-gcc-libraries/group__pfleury__lcd.html) (訳注）原文のリンク先のページは、サービスの終了に伴って削除されています。移行先は (http://www.peterfleury.epizy.com/doxygen/avr-gcc-libraries/group__pfleury__lcd.html) と思われます。 From 692bf4790af94e89e47d6023d958baa0fa0ffb74 Mon Sep 17 00:00:00 2001 From: umi <57262844+umi-umi@users.noreply.github.com> Date: Mon, 27 Apr 2020 16:47:15 +0900 Subject: [PATCH 357/429] [Docs] Japanese translation of docs/feature_grave_esc.md (#8873) * add feature_grave_esc.md translation * update based on comment * update based on comment * update based on comment * update based on comment * update based on comment --- docs/ja/feature_grave_esc.md | 37 ++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 docs/ja/feature_grave_esc.md diff --git a/docs/ja/feature_grave_esc.md b/docs/ja/feature_grave_esc.md new file mode 100644 index 000000000000..8c6680d74d78 --- /dev/null +++ b/docs/ja/feature_grave_esc.md @@ -0,0 +1,37 @@ +# グレイブエスケープ + + + +60% キーボード、またはファンクションキー行の無い他のレイアウトを使っている場合、専用の Escape キーが無いことに気付くでしょう。グレイブエスケープは grave キー (` および `~`) を Escape と共有することができる機能です。 + +## 使用法 + +キーマップ内の `KC_GRAVE` キー (通常は`1` キーの左)を `KC_GESC` に置き換えます。ほとんどの場合、このキーは押された時に `KC_ESC` を出力します。ただし、Shift あるいは GUI を押したままにすると、代わりに `KC_GRV` を出力します。 + +## OS に見えるもの + +メアリーがキーボードで GESC を押すと、OS には KC_ESC 文字が見えます。メアリーが Shift を押しながら GESC を押すと、`~` または Shift された時はバッククォートを出力します。彼女が GUI/CMD/WIN を押したままにすると、1つの ` 文字を出力します。 + +## キーコード + +| キー | エイリアス | 説明 | +|---------|-----------|------------------------------------------------------------------| +| `KC_GESC` | `GRAVE_ESC` | 押された場合に Escape。Shift あるいは GUI が押されたままの場合は ` | + +### 注意事項 + +macOS では、Command+` はデフォルトで "次のウィンドウを操作対象にする" にマップされます。つまりバッククォートを出力しません。さらに、ショートカットがキーボード環境設定で変更された場合でも、ターミナルは常にこのショートカットを認識してウィンドウを切り替えます。 + +## 設定 + +グレイブエスケープが壊す可能性のあるキーの組み合わせが幾つかあります。その中には、Windows では Control+Shift+Escape、macOSでは Command+Option+Escape があります。これを回避するには、`config.h` で以下のオプションを `#define` することができます: + +| 定義 | 説明 | +|--------------------------|-----------------------------------------| +| `GRAVE_ESC_ALT_OVERRIDE` | Alt が押された場合、常に Escape を送信する | +| `GRAVE_ESC_CTRL_OVERRIDE` | Control が押された場合、常に Escape を送信する | +| `GRAVE_ESC_GUI_OVERRIDE` | GUI が押された場合、常に Escape を送信する | +| `GRAVE_ESC_SHIFT_OVERRIDE` | Shift が押された場合、常に Escape を送信する | From 3bd347afbb3e56b5cf57c6dd52f0c7d85641c510 Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Mon, 27 Apr 2020 20:25:51 +0300 Subject: [PATCH 358/429] [Keyboard] Aplx2 osu! keyboard (#8847) * Create test.txt * aplx6 * Delete test.txt * fff * Delete ffff * test compile * Create README.md * edited * requests * Update keyboards/aplx6/README.md * Update keyboards/aplx6/README.md * Update keyboards/aplx6/README.md * Update keyboards/aplx6/README.md * Update keyboards/aplx6/README.md * Update keyboards/aplx6/README.md * Update keyboards/aplx6/README.md * Update keyboards/aplx6/rules.mk * Update keyboards/aplx6/rules.mk * Update keyboards/aplx6/README.md * Update keyboards/aplx6/README.md * Update keyboards/aplx6/README.md * pins update * update * update pins * Update keyboards/aplx6/README.md * Update keyboards/aplx6/README.md * initial commit * Update aplx2.h * Update keyboards/aplx2/README.md * Update keyboards/aplx6/README.md * Update keyboards/aplx6/README.md * Update keyboards/aplx2/README.md * folder change * Update keyboards/handwired/aplx2/README.md * Update keyboards/handwired/aplx2/README.md * latest suggestion * Update keyboards/handwired/aplx2/README.md --- keyboards/handwired/aplx2/README.md | 34 +++++++++++++++ keyboards/handwired/aplx2/aplx2.c | 19 +++++++++ keyboards/handwired/aplx2/aplx2.h | 25 +++++++++++ keyboards/handwired/aplx2/config.h | 41 +++++++++++++++++++ .../handwired/aplx2/keymaps/default/keymap.c | 16 ++++++++ keyboards/handwired/aplx2/rules.mk | 33 +++++++++++++++ 6 files changed, 168 insertions(+) create mode 100644 keyboards/handwired/aplx2/README.md create mode 100644 keyboards/handwired/aplx2/aplx2.c create mode 100644 keyboards/handwired/aplx2/aplx2.h create mode 100644 keyboards/handwired/aplx2/config.h create mode 100644 keyboards/handwired/aplx2/keymaps/default/keymap.c create mode 100644 keyboards/handwired/aplx2/rules.mk diff --git a/keyboards/handwired/aplx2/README.md b/keyboards/handwired/aplx2/README.md new file mode 100644 index 000000000000..424d964817f4 --- /dev/null +++ b/keyboards/handwired/aplx2/README.md @@ -0,0 +1,34 @@ +# Aplx2 + +![Front](https://i.imgur.com/cN4WfaQl.jpg) + +A simple 2% keyboard for osu!. Designed to be assembled as a sandwich with a Pro Micro, using M3 x 16mm screws, your choice of MX- or Alps-compatible switches, and 1N4148 diodes. + +**Layout:** +The default layout is: Z , X . +Used pins can be found in `config.h`. All ProMicro pins can be found [here](https://cdn.sparkfun.com/datasheets/Dev/Arduino/Boards/ProMicro16MHzv1.pdf). + +* Keyboard Maintainer: [Aplyard](https://github.com/Aplyard) +* Hardware Supported: Pro Micro (ATmega32U4) +* Hardware Availability: [GitHub](https://github.com/Aplyard/Aplx2), [Thingiverse](https://www.thingiverse.com/thing:4294608) + +Make example for this keyboard (after setting up your build environment): + + make handwired/aplx2:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +--- +**Designed in:** +Fusion360 +[Keyboard Plate & Case Builder](http://builder.swillkb.com/) + + +**Usefull Links:** +[Qmk Online Configurator](https://config.qmk.fm/#) + +**Alternatives of qmk that worked for me:** +[Keyboard Layout Editor](http://www.keyboard-layout-editor.com/#/) +[Firmware Builder](https://kbfirmware.com/) + +--- diff --git a/keyboards/handwired/aplx2/aplx2.c b/keyboards/handwired/aplx2/aplx2.c new file mode 100644 index 000000000000..e3dd174542e4 --- /dev/null +++ b/keyboards/handwired/aplx2/aplx2.c @@ -0,0 +1,19 @@ +/* +Copyright 2020 April Aplyard + +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 . +*/ + +#include "aplx2.h" + diff --git a/keyboards/handwired/aplx2/aplx2.h b/keyboards/handwired/aplx2/aplx2.h new file mode 100644 index 000000000000..a47b064b96ab --- /dev/null +++ b/keyboards/handwired/aplx2/aplx2.h @@ -0,0 +1,25 @@ +/* +Copyright 2020 April Aplyard + +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 . +*/ + +#pragma once +#include "quantum.h" + +#define LAYOUT( \ + K00, K01 \ +) { \ + { K00 , K01 } \ +} diff --git a/keyboards/handwired/aplx2/config.h b/keyboards/handwired/aplx2/config.h new file mode 100644 index 000000000000..041f956b8da2 --- /dev/null +++ b/keyboards/handwired/aplx2/config.h @@ -0,0 +1,41 @@ +/* +Copyright 2020 April Aplyard + +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 . +*/ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xE0E0 +#define PRODUCT_ID 0x0030 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Aplyard +#define PRODUCT Aplx2 +#define DESCRIPTION Aplx2% osu! + +/* key matrix size */ +#define MATRIX_ROWS 1 +#define MATRIX_COLS 2 + +/* pin-out */ +#define MATRIX_ROW_PINS { D1 } +#define MATRIX_COL_PINS { B5, D3 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + diff --git a/keyboards/handwired/aplx2/keymaps/default/keymap.c b/keyboards/handwired/aplx2/keymaps/default/keymap.c new file mode 100644 index 000000000000..b99a7df0610d --- /dev/null +++ b/keyboards/handwired/aplx2/keymaps/default/keymap.c @@ -0,0 +1,16 @@ +#include QMK_KEYBOARD_H + +#define _MAIN 0 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Keymap __MAIN: Default Layer + * ,---------------. + * | |-----|-----| | + * | | Ζ | Χ | | + * | |-----|-----| | + * '---------------' + */ + [_MAIN] = LAYOUT( + KC_Z, KC_X + ), +}; diff --git a/keyboards/handwired/aplx2/rules.mk b/keyboards/handwired/aplx2/rules.mk new file mode 100644 index 000000000000..af9df6087f33 --- /dev/null +++ b/keyboards/handwired/aplx2/rules.mk @@ -0,0 +1,33 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = caterina + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs +UNICODE_ENABLE = no # Unicode From 69d688d3fb102ebc5973c94844e795e0f08d80d4 Mon Sep 17 00:00:00 2001 From: Daniel Dylewsky <54324976+ddylewsky@users.noreply.github.com> Date: Mon, 27 Apr 2020 13:29:27 -0400 Subject: [PATCH 359/429] [Keymap] Vitamins_included keymap vitavim (#8864) * Add new keymap to vitamins_included, this has four layers. Updated config file to sync rgb between the two halves. * Cleaned up and added documentation for the keymap * Updated the keymaps and documentation. * Update keyboards/vitamins_included/keymaps/vitavim/keymap.c * Update keyboards/vitamins_included/keymaps/vitavim/keymap.c * Update keyboards/vitamins_included/keymaps/vitavim/keymap.c * Update keyboards/vitamins_included/keymaps/vitavim/config.h * Update keyboards/vitamins_included/keymaps/vitavim/keymap.c * Update keyboards/vitamins_included/keymaps/vitavim/keymap.c * Update keyboards/vitamins_included/keymaps/vitavim/keymap.c * Update keyboards/vitamins_included/keymaps/vitavim/keymap.c * Update keyboards/vitamins_included/keymaps/vitavim/keymap.c * Update keyboards/vitamins_included/keymaps/vitavim/keymap.c --- .../keymaps/vitavim/config.h | 42 +++++++ .../keymaps/vitavim/keymap.c | 106 ++++++++++++++++++ 2 files changed, 148 insertions(+) create mode 100644 keyboards/vitamins_included/keymaps/vitavim/config.h create mode 100644 keyboards/vitamins_included/keymaps/vitavim/keymap.c diff --git a/keyboards/vitamins_included/keymaps/vitavim/config.h b/keyboards/vitamins_included/keymaps/vitavim/config.h new file mode 100644 index 000000000000..95dd8ec46435 --- /dev/null +++ b/keyboards/vitamins_included/keymaps/vitavim/config.h @@ -0,0 +1,42 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 . +*/ + +#pragma once + +/* Use I2C or Serial. Default is Serial */ +// #define USE_I2C + +/* Select hand configuration */ +// Defaults: +// Rev1: EE_HANDS +// Rev2: SPLIT_HAND_PIN B4 + +// You can override the defaults (rev1 doesn't support SPLIT_HAND_PIN) +//#define EE_HANDS +//#define MASTER_LEFT +//#define MASTER_RIGHT + + +#ifdef AUDIO_ENABLE + #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ + SONG(DVORAK_SOUND), \ + SONG(COLEMAK_SOUND) \ + } +#endif diff --git a/keyboards/vitamins_included/keymaps/vitavim/keymap.c b/keyboards/vitamins_included/keymaps/vitavim/keymap.c new file mode 100644 index 000000000000..e90f0e076ebc --- /dev/null +++ b/keyboards/vitamins_included/keymaps/vitavim/keymap.c @@ -0,0 +1,106 @@ +#include QMK_KEYBOARD_H +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. +enum layers { + _ALPHAS, + _MODS, + _VIM, + _NUMPAD, + _CODE, +}; +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Alphas + * ,--------------------------------------------------------------------------------------------. + * | Tab | q | w | e | r | t | y | u | i | o | p | ins | + * |--------+------+-----+------+---------+------+------+-------+------+------+--------+--------| + * |ctl(esc)| a | s | d | f | g | h | j | k | l |LT(2,;:)|sft(ent)| + * |--------+------+-----+------+---------+------|------+-------+------+------+--------+--------| + * |LSPO | z | x | c | v | b | n | m | ,< | .> | up | RSPC | + * |--------+------+-----+------+---------+------+------+-------+------+------+--------+--------| + * | ctl | GUI | alt |MO(1) |lt(3,del)|Space |Space |bckspc |MO(4) | left | down | right | + * `--------------------------------------------------------------------------------------------' + */ +[_ALPHAS] = LAYOUT_ortho_4x12( + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_INS, + LCTL_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(2,KC_SCLN), RSFT_T(KC_ENT), + KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_RSPC, + KC_LCTL, KC_LGUI, KC_LALT, MO(1), LT(3,KC_DEL), KC_SPC, KC_SPC, KC_BSPC, MO(4), KC_LEFT, KC_DOWN, KC_RGHT +), + +/* MODS + * ,-----------------------------------------------------------------------------------. + * | `~ | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 |PrtSc | + * |-------+------+------+------+------+-------------+------+------+------+------+------| + * |Meh(F7)| ! | * | # | $ | % | ^ | & | * | '" | " | \| | + * |-------+------+------+------+------+------|------+------+------+------+------+------| + * | LS/( | z | x | [{ | ] | b | -_ | =+ | /? | \| | PgUp | RS/) | + * |-------+------+------+------+------+------+------+------+------+------+------+------| + * | Ctrl | | | | | spc | _ |bckspc| | Home |PgDwn | End | + * `------------------------------------------------------------------------------------' + */ +[_MODS] = LAYOUT_ortho_4x12( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PSCR, + MEH(KC_F7), KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_QUOT, KC_DQUO, KC_BSLS, + LSFT_T(KC_LCBR), KC_Z, KC_X, KC_LBRC, KC_RBRC, KC_B, KC_MINS, KC_EQL, KC_SLSH, KC_BSLS, KC_PGUP, RSFT_T(KC_RCBR), + KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_UNDS, KC_BSPC, KC_NO, KC_HOME, KC_PGDN, KC_END +), + +/* VIM layer that adds vim navigation by holding the ; key. Includes keys like $,^ for end/beg of line and b,w,e,d,y. Also includes + * quick keys for excel like alt(=) for sum, ctl(+) & ctl(-) to add/remove columns/rows. + * ,--------------------------------------------------------------------------------------. + * | Tab | "' | b | w | e | d | y | Vol- | Vol+ | TO(0)| TG(2) |reset | + * |--------+------+-----+-----+--------+-----+------+------+------+------+--------+------| + * |Ctl(Esc)| Home |Home |Pg Up|Pg Down | End | Left | Down | Up |Right |LT(2,;:)|Enter | + * |--------+------+-----+-----+--------+-----|------+------+------+------+--------+------| + * | sft | ;: | q | ^ | $ | x |alt(=)|ctl(+)|ctl(-)| | | | + * |--------+------+-----+-----+--------+-----+------+------+------+------+--------+------| + * | Ctl | GUI | alt | sft |sft(ctl)| spc | del | bspc | | | | | + * `--------------------------------------------------------------------------------------' + */ +[_VIM] = LAYOUT_ortho_4x12( + KC_TAB, KC_QUOT, KC_B, KC_W, KC_E, KC_D, KC_Y, KC_VOLD, KC_VOLU, TO(0), TG(2), RESET, + LCTL_T(KC_ESC), KC_HOME, KC_HOME, KC_PGUP, KC_PGDN, KC_END, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, LT(2,KC_SCLN), KC_ENT, + KC_LSFT, KC_SCLN, KC_Q, KC_CIRC, KC_DLR, KC_X, RALT(KC_EQL), RCTL(KC_PLUS), RCTL(KC_PMNS), KC_NO, KC_NO, KC_TRNS, + KC_LCTL, KC_LGUI, KC_LALT, KC_LSFT, LSFT(KC_LCTL), KC_SPC, KC_DEL, KC_BSPC, KC_NO, KC_NO, KC_NO, KC_TRNS +), + +/* NUMPAD: Numpad with operators and other keys + * ,-------------------------------------------------------------------------------------. + * | [{ | ! | @ | # | $ | % | ( | 7 | 8 | 9 | ) | ]} | + * |------+------+------+------+------+-------------+------+------+------+------+--------| + * | { | / | * | - | + | | = | 4 | 5 | 6 | ;: | } | + * |------+------+------+------+------+------|------+------+------+------+------+--------| + * | sft( | | | | | | | 1 | 2 | 3 | |kc_sft()| + * |------+------+------+------+------+------+------+------+------+------+------+--------| + * | | | | | |Space |Space | 0 | | | | | + * `-------------------------------------------------------------------------------------' + */ +[_NUMPAD] = LAYOUT_ortho_4x12( + KC_LBRC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_LPRN, KC_7, KC_8, KC_9, KC_RPRN, KC_RBRC, + KC_LCBR, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, KC_NO, KC_EQL, KC_4, KC_5, KC_6, KC_SCLN, KC_RCBR, + KC_LSPO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_1, KC_2, KC_3, KC_PEQL, KC_RSPC, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_0, KC_NO, KC_NO, KC_NO, KC_NO +), + +/* CODE + * ,---------------------------------------------------------------------------. + * | ~` | F11 | F12 | 3 | 4 | 5 | 6 | : | - | > | 0 | Del | + * |----+-----+-----+----+-----+-------------+------+-----+------+------+------| + * | | / | * | { | [{ | ( | ) | ]} | } | '" | ]} | \| | + * |----+-----+-----+----+-----+-----|------+------+------+------+------+------| + * | | F7 | F8 | F9 | F10 | F11 | ~ | = | \ |RGBTOG|RGBHUI|RGBHUD| + * |----+-----+-----+----+-----+-----+------+------+------+------+------+------| + * | | | | | | | | | |RGBVAD|RBGVAI|RGBMOD| + * `---------------------------------------------------------------------------' + */ +[_CODE] = LAYOUT_ortho_4x12( + KC_GRV, KC_F11, KC_F12, KC_3, KC_4, KC_5, KC_6, KC_COLN, KC_MINS, KC_GT, KC_0, KC_DEL, + KC_TRNS, KC_PSLS, KC_PAST, KC_LCBR, KC_LBRC, KC_LPRN, KC_RPRN, KC_RBRC, KC_RCBR, KC_QUOT, KC_RBRC, KC_BSLS, + KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_TILD, KC_EQL, KC_NUBS, RGB_TOG, RGB_HUI, RGB_HUD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, RGB_MOD +) + +}; From ab588a9d6ad1f6d7ff9ba8d52070389d86697e40 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 29 Apr 2020 11:59:35 -0700 Subject: [PATCH 360/429] [User] Remove CMD_TAB Mod-Tap, Add Slash-Lower - Removes CMD_TAB Mod-Tap, conflicts with macro - Add Slash-Lower Layer-Tap for 40% layouts --- users/brandonschlack/process_records.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 33aba3a1bfc8..524abdacdde1 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -29,7 +29,6 @@ void matrix_scan_cmd_tab(void); #define CTL_CAP CTL_T(KC_CAPS) // Hold Caps Lock for Control /* Command Mod-Tap */ #define CMD_ESC CMD_T(KC_ESC) // Hold Escape for Command -#define CMD_TAB CMD_T(KC_TAB) // Hold Tab for Command #define CMD_CAP CMD_T(KC_CAPS) // Hold Caps Lock for Command /* Hyper Mod-Tap */ #define HY_ESC ALL_T(KC_ESC) // Hold Escape for Hyper (Shift-Control-Option-Command) @@ -44,6 +43,7 @@ void matrix_scan_cmd_tab(void); #define LOWER MO(_LOWER) // Hold for LOWER Layer #define SPC_LWR LT(_LOWER, KC_SPC) // Tap for Space, Hold for LOWER Layer #define SPC_RAI LT(_RAISE, KC_SPC) // Tap for Space, Hold for RAISE Layer +#define SLH_LWR LT(_LOWER, KC_SLSH) // Tap for /, Hold for LOWER Layer #define RAISE MO(_RAISE) // Hold for RAISE Layer #define MCO_LYR MO(_MACRO) // Hold for MACRO Layer #define TG_ADJT TG(_ADJUST) // Toggle ADJUST Layer From e0a0550246081854ef6cce3003658cc87692488d Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 29 Apr 2020 12:00:33 -0700 Subject: [PATCH 361/429] [Keymap] Change neuron keymap to single space --- .../neuron/keymaps/brandonschlack/keymap.c | 114 +++++++++--------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c b/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c index 3d4e3e06c70e..5b91152d1f8b 100644 --- a/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c +++ b/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c @@ -3,92 +3,92 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base Layer - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │Esc│ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │Bsp│ - * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │CTab│ A │ S │ D │ F │ G │ H │ J │ K │ L │ Enter│ - * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ - * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│?/Sf│ - * ├┬┬┬┬──┴┬──┴──┬┴───┴───┼───┴───┴──┬┴───┴┬──┴┬┬┬┬┤ - * │││││Opt│Cmd │ SpcLwr │ SpcRse │ Ctl│Cmd│││││ - * └┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Esc│ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │Bsp│ + * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │HyTb│ A │ S │ D │ F │ G │ H │ J │ K │ L │ Enter│ + * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ + * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│?/Lw│ + * ├┬┬┬┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬┬┬┬┤ + * │││││Opt │Cmd │         SpcRse         │Ctrl│││││ + * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘ */ [_BASE] = LAYOUT( \ - HY_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ - CTL_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, SF_SLSH, \ - KC_LOPT, KC_LCMD, SPC_LWR, XXXXXXX, SPC_RAI, KC_RCTL, KC_RCMD \ + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ + HY_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, SLH_LWR, \ + KC_LOPT, KC_LCMD, XXXXXXX, SPC_RAI, XXXXXXX, XXXXXXX, KC_LCTL \ ), /* Lower - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │ │ F1│ F2│ F3│ F4│F13│F14│F15│ ↑ │PgU│Del│ │ - * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │ │ F5│ F6│ F7│ F8│Prv│Nxt│ ← │ ↓ │ → │ Ply │ - * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ - * │SfCaps│ F9│F10│F11│F12│VlD│VlU│Hom│End│PgD│MtSf│ - * ├┬┬┬┬──┴┬──┴──┬┴───┴───┼───┴───┴──┬┴───┴┬──┴┬┬┬┬┤ - * │││││ │ │ │ │ │ │││││ - * └┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │   │ F1│ F2│ F3│ F4│F13│F14│F15│Hom│ ↑ │PgU│   │ + * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │    │ F5│ F6│ F7│ F8│Prv│Nxt│VlU│ ← │ → │  Ply │ + * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ + * │SfCaps│ F9│F10│F11│F12│Mut│VlD│End│ ↓ │PgD│    │ + * ├┬┬┬┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬┬┬┬┤ + * │││││    │    │                        │    │││││ + * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘ */ [_LOWER] = LAYOUT( \ - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F13, KC_F14, KC_F15, KC_UP, KC_PGUP, KC_DELT, _______, \ - _______, KC_F5, KC_F6, KC_F7, KC_F8, KC_MPRV, KC_MNXT, KC_LEFT, KC_DOWN, KC_RGHT, KC_MPLY, \ - _______, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLD, KC_VOLU, KC_HOME, KC_END, KC_PGDN, MUT_SFT, \ - _______, _______, _______, XXXXXXX, _______, _______, _______ \ + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F13, KC_F14, KC_F15, KC_HOME, KC_UP, KC_PGUP, _______, \ + _______, KC_F5, KC_F6, KC_F7, KC_F8, KC_MPRV, KC_MNXT, KC_VOLU, KC_LEFT, KC_RGHT, KC_MPLY, \ + SF_CAPS, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_VOLD, KC_HOME, KC_DOWN, KC_PGDN, _______, \ + _______, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______ \ ), /* Raise - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │ │! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│ │ - * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │ │ ← │ ↓ │ ↑ │ → │{ [│} ]│_ -│+ =│: ;│ " ' │ - * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ - * │SfCaps│ │ │ │ │ │ │ │| \│~ `│ │ - * ├┬┬┬┬──┴┬──┴──┬┴───┴───┼───┴───┴──┬┴───┴┬──┴┬┬┬┬┤ - * │││││ │ │ │ │ │ │││││ - * └┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │   │! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│   │ + * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │    │ ← │ ↓ │ ↑ │ → │{ [│} ]│_ -│+ =│: ;│  " ' │ + * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ + * │SfCaps│   │   │   │   │   │   │   │| \│~ `│    │ + * ├┬┬┬┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬┬┬┬┤ + * │││││    │    │                        │    │││││ + * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘ */ [_RAISE] = LAYOUT( \ _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_SCLN, KC_QUOT, \ SF_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, KC_GRV, _______, \ - _______, _______, _______, XXXXXXX, _______, _______, _______ \ + _______, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______ \ ), /* Adjust/Macro - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │Mke│BrD│BrU│Msn│LHP│ │ │ │ │ │ │SlD│ - * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │NxW │ │ │ │PvT│Bck│Fwd│NxT│ │ │ Reset│ - * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ - * │ │ │ │ │1PX│1Ps│ │ │ │ │ │ - * ├┬┬┬┬──┴┬──┴──┬┴───┴───┼───┴───┴──┬┴───┴┬──┴┬┬┬┬┤ - * │││││ │ │ │ │ │ │││││ - * └┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Mke│BrD│BrU│Msn│LHP│   │   │   │   │   │   │SlD│ + * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │NxW │PvT│NxT│Bck│Fwd│   │   │   │   │   │ Reset│ + * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ + * │      │   │   │   │1PX│1Ps│   │   │   │   │    │ + * ├┬┬┬┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬┬┬┬┤ + * │││││    │    │                        │    │││││ + * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘ */ [_ADJUST] = LAYOUT( \ QM_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, MC_SLPD, \ - NXT_WIN, _______, _______, _______, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, _______, _______, RESET, \ + NXT_WIN, PRV_TAB, NXT_TAB, MC_BACK, MC_FWRD, _______, _______, _______, _______, _______, RESET, \ _______, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, _______, \ - _______, _______, _______, XXXXXXX, _______, _______, _______ \ + _______, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______ \ ) /* Blank Layer - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ - * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ - * ├┬┬┬┬──┴┬──┴──┬┴───┴───┼───┴───┴──┬┴───┴┬──┴┬┬┬┬┤ - * │││││ │ │ │ │ │ │││││ - * └┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │   │   │   │   │   │   │   │   │   │   │   │   │ + * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │    │   │   │   │   │   │   │   │   │   │      │ + * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ + * │      │   │   │   │   │   │   │   │   │   │    │ + * ├┬┬┬┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬┬┬┬┤ + * │││││    │    │                        │    │││││ + * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘ */ /* [BLANK] = LAYOUT( \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, XXXXXXX, _______, _______, _______ \ + _______, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______ \ ) */ From bc9e5040a5642245583281435844cc4d275b91b5 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 1 May 2020 14:53:52 -0700 Subject: [PATCH 362/429] [User] Add BackSlash-Shift,-Lower aliases --- users/brandonschlack/process_records.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 524abdacdde1..cc821e4713e3 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -38,12 +38,14 @@ void matrix_scan_cmd_tab(void); #define SF_CAPS LSFT_T(KC_CAPS) // Hold Caps Lock for Left Shift #define SFT_ENT RSFT_T(KC_ENT) // Hold Enter for Right Shift #define SF_SLSH RSFT_T(KC_SLSH) // Tap Right Shift for Slash (/) +#define SF_BSLS RSFT_T(KC_BSLS) // Tap Right Shift for Back Slash (\) /* Layer Aliases */ #define FN_LYR MO(_FN1) // Hold for FN Layer #define LOWER MO(_LOWER) // Hold for LOWER Layer #define SPC_LWR LT(_LOWER, KC_SPC) // Tap for Space, Hold for LOWER Layer #define SPC_RAI LT(_RAISE, KC_SPC) // Tap for Space, Hold for RAISE Layer #define SLH_LWR LT(_LOWER, KC_SLSH) // Tap for /, Hold for LOWER Layer +#define BSL_LWR LT(_LOWER, KC_BSLS) // Tap for \, Hold for LOWER Layer #define RAISE MO(_RAISE) // Hold for RAISE Layer #define MCO_LYR MO(_MACRO) // Hold for MACRO Layer #define TG_ADJT TG(_ADJUST) // Toggle ADJUST Layer From 0a1fbe14817b082b128793c25c7c7089a52acbed Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 1 May 2020 14:56:15 -0700 Subject: [PATCH 363/429] [Keymap] Update 40s keymaps - Update Neuron, Romeo, Nightmare keymaps with similar maps - Change Neuron, Nightmare to single spacebar --- .../romeo/keymaps/brandonschlack/keymap.c | 48 ++++---- .../nightmare/keymaps/brandonschlack/keymap.c | 106 +++++++---------- .../neuron/keymaps/brandonschlack/keymap.c | 110 +++++++++--------- 3 files changed, 123 insertions(+), 141 deletions(-) diff --git a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c index 1397eba505d1..3f6a3abe8ce6 100644 --- a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c +++ b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c @@ -23,66 +23,66 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ * │HyEsc │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Enter│ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ -* │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│ ↑Shft│ +* │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│ ?/Sft│ * ├────┬───┼───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤ -* │Ctrl│Opt│Cmd│ Space │←Cmd│↓Fn│→Opt│ +* │Ctrl│Opt│Cmd│ Space │ Cmd│Lwr│ Opt│ * └────┴───┴───┴────────────────────────┴────┴───┴────┘ */ [_BASE] = LAYOUT_ansi_40( \ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ HY_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, UP_RSFT, \ - KC_LCTL, KC_LOPT, KC_LCMD, SPC_RAI, LFT_CMD, DWN_LWR, RGT_OPT \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, SF_SLSH, \ + KC_LCTL, KC_LOPT, KC_LCMD, SPC_RAI, KC_RCMD, LOWER, KC_ROPT \ ), /* Lower * ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ -* │F1 │ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│ F12│ +* │Del │BrD│BrU│Msn│LHP│   │   │   │Hom│ ↑ │PgU│ SlpD│ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ -* │Caps │ ← │ ↓ │ ↑ │ → │F13│F14│F15│VlD│VlU│ Play│ +* │HyCaps│Mut│VlU│NxW│PvT│Bck│Fwd│NxT│ ← │ → │ Play│ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ -* │ │Hom│PgD│PgU│End│ │ │Mut│Prv│Nxt│ │ +* │ │Prv│VlD│Nxt│1PX│1Ps│   │End│ ↓ │PgD│ │ * ├────┬───┼───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤ * │ │ │ │ │ │ │ │ * └────┴───┴───┴────────────────────────┴────┴───┴────┘ */ [_LOWER] = LAYOUT_ansi_40( \ - 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_CAPS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_F13, KC_F14, KC_F15, KC_VOLD, KC_VOLU, KC_MPLY, \ - _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______, KC_MUTE, KC_MPRV, KC_MNXT, _______, \ + KC_DELT, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, KC_HOME, KC_UP, KC_PGUP, MC_SLPD, \ + HY_CAPS, KC_MUTE, KC_VOLU, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, KC_LEFT, KC_RGHT, KC_MPLY, \ + _______, KC_MPRV, KC_VOLD, KC_MNXT, PX_AFLL, OP_AFLL, KC_VOLD, KC_END, KC_DOWN, KC_PGDN, _______, \ _______, _______, _______, _______, _______, _______, _______ \ ), /* Raise * ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ -* │Del │! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│ │ +* │~ `  │! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│ │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ -* │Caps │ ← │ ↓ │ ↑ │ → │{ [│} ]│_ -│+ =│: ;│ " ' │ +* │     │ F1│ F2│ F3│ F4│ F5│ F6│_ -│+ =│: ;│ " '│ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ -* │ │Hom│PgD│PgU│End│ │ │| \│~ `│? /│ ⇞Sft│ +* │ │ F7│ F8│ F9│F10│F11│F12│   │{ [│} ]│ |\Sft│ * ├────┬───┼───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤ -* │ │ │ │ │↖︎Cmd│⇟Fn│↘︎Opt│ +* │ │ │ │ │    │   │    │ * └────┴───┴───┴────────────────────────┴────┴───┴────┘ */ [_RAISE] = LAYOUT_ansi_40( \ - KC_DELT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ - KC_CAPS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_SCLN, KC_QUOT, \ - _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______, KC_BSLS, KC_GRV, KC_SLSH, PGU_SFT, \ - _______, _______, _______, _______, HOM_CMD, PGD_LWR, END_OPT \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_SCLN, KC_QUOT, \ + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_LBRC, KC_RBRC, SF_BSLS, \ + _______, _______, _______, _______, _______, _______, _______ \ ), /* Adjust/Macro Layer * ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ -* │Make │BrD│BrU│Msn│LHP│ │ │ │ │ │ │ SlpD│ +* │Make │   │   │EEP│RST│ │ │ │ │ │ │     │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ -* │NxW │PvT│NxT│Bck│Fwd│ │ │ │ │ │ Reset│ +* │ │ │ │ │ │ │ │ │ │ │ │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ -* │ │ │ │ │1PX│1Ps│ │ │ │ │ │ +* │ │ │ │ │ │ │ │ │ │ │ │ * ├────┬───┼───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤ * │ │ │ │ │ │ │ │ * └────┴───┴───┴────────────────────────┴────┴───┴────┘ */ [_ADJUST] = LAYOUT_ansi_40( \ - QM_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, MC_SLPD, \ - NXT_WIN, PRV_TAB, NXT_TAB, MC_BACK, MC_FWRD, _______, _______, _______, _______, _______, RESET, \ - _______, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, _______, \ + QM_MAKE, _______, _______, EEP_RST, RESET, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______ \ ) /* Blank Layer diff --git a/keyboards/nightmare/keymaps/brandonschlack/keymap.c b/keyboards/nightmare/keymaps/brandonschlack/keymap.c index 908489fdce32..43cf0576c3c7 100644 --- a/keyboards/nightmare/keymaps/brandonschlack/keymap.c +++ b/keyboards/nightmare/keymaps/brandonschlack/keymap.c @@ -20,107 +20,89 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /** * Base * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │Hom│││Esc│ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│Bck│ + * │Hom│││Esc│ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│Bck│ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │PgU│││Tab │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│ + * │PgU│││Tab │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ - * │PgD│││Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│Shft│ Fn│ - * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┼┬┬┬┤ - * │End││││││││Ctl│Opt │Cmd│ Space │ Space │Cmd│Opt │Ctl││││││ - * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ + * │PgD│││Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│Shft│ Fn│ + * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┼───┬┼┬┬┬┤ + * │End││││││││Opt│Cmd │                           │ Cmd│Ctl││││││ + * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘ */ -[_BASE] = LAYOUT_split( \ +[_BASE] = LAYOUT_default( \ KC_HOME, KC_ESC, 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, \ KC_PGUP, HY_TAB, 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_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, UP_RSFT, PLY_MCO, \ - KC_END, KC_LCTL, KC_LOPT, KC_LCMD, SPC_LWR, SPC_RAI, LFT_CMD, DWN_OPT, RGT_CTL \ + KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, PLY_FN1, \ + KC_END, KC_LOPT, KC_LCMD, SPC_RAI, KC_RCMD, KC_RCTL \ ), /** * Lower * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │Nxt│││ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ │ + * │Nxt│││Del│BrD│BrU│Msn│LHP│   │   │   │   │   │   │ ↑ │Mut│SlD│ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │VlU│││Del │ ← │ ↓ │ ↑ │ → │ │ F1│ F2│ F3│ F4│ F5│ F6│ | │ + * │VlU│││    │   │   │NxW│PvT│Bck│Fwd│NxT│   │   │ ← │ → │ Play │ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ - * │VlD│││SfCaps│ │ │ │ │ F7│ F8│ F9│F10│F11│F12│ │Ply│ - * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┼┬┬┬┤ - * │Prv││││││││ │ │ │ │ │ │ │ ││││││ - * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ + * │VlD│││SftCap│   │   │   │1PX│1Ps│   │   │   │   │ ↓ │    │   │ + * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┼───┬┼┬┬┬┤ + * │Prv││││││││   │    │                           │    │   ││││││ + * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘ */ -[_LOWER] = LAYOUT_split( \ - KC_MNXT, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, _______, \ - KC_VOLU, KC_DELT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_PIPE, \ - KC_VOLD, SF_CAPS, _______, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_MPLY, \ - KC_MPRV, _______, _______, _______, _______, _______, _______, _______, _______ \ +[_LOWER] = LAYOUT_default( \ + KC_MNXT, KC_DELT, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, KC_UP, KC_MUTE, MC_SLPD, \ + KC_VOLU, _______, _______, _______, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, _______, _______, KC_LEFT, KC_RGHT, KC_MPLY, \ + KC_VOLD, SF_CAPS, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, KC_DOWN, _______, _______, \ + KC_MPRV, _______, _______, _______, _______, _______ \ ), /** * Raise * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │Nxt│││ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ │ + * │Nxt│││ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │   │ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │VlU│││Del │ ← │ ↓ │ ↑ │ → │ │ F1│ F2│ F3│ F4│ F5│ F6│ \ │ + * │VlU│││    │ F1│ F2│ F3│ F4│ F5│ F6│   │   │   │   │   │      │ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ - * │VlD│││SfCaps│ │ │ │ │ F7│ F8│ F9│F10│F11│F12│ │Ply│ - * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┼┬┬┬┤ - * │Prv││││││││ │ │ │ │ │ │ │ ││││││ - * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ + * │VlD│││      │ F7│ F8│ F9│F10│F11│F12│   │   │   │| \│    │   │ + * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┼───┬┼┬┬┬┤ + * │Prv││││││││   │    │                           │    │   ││││││ + * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘ */ -[_RAISE] = LAYOUT_split( \ +[_RAISE] = LAYOUT_default( \ KC_MNXT, 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_VOLU, KC_DELT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_BSLS, \ - KC_VOLD, SF_CAPS, _______, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_MPLY, \ - KC_MPRV, _______, _______, _______, _______, _______, _______, _______, _______ \ -), -/** - * Macros - * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │ │││ │BrD│BrU│Msn│LHP│ │ │Prv│Ply│Nxt│Mut│VlD│VlU│SLP│ - * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │ │││NxW │PvT│NxT│Bck│Fwd│ │ │ │ │ │ │ │ │ - * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ - * │ │││ │ │ │ │1PX│1Ps│ │ │ │ │ │ │ │ - * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┼┬┬┬┤ - * │ ││││││││ │ │ │ │ │ │ │ ││││││ - * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ - */ -[_MACRO] = LAYOUT_split( \ - _______, _______, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, MC_SLPD, \ - _______, NXT_WIN, PRV_TAB, NXT_TAB, MC_BACK, MC_FWRD, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + KC_VOLU, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, _______, _______, _______, _______, _______, \ + KC_VOLD, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, KC_BSLS, _______, _______, \ + KC_MPRV, _______, _______, _______, _______, _______ \ ), /** * Adjust * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │ │││Mke│ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │   │││Mke│   │   │EEP│RST│   │   │   │   │   │   │   │   │   │ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │ │││ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │   │││    │   │   │   │   │   │   │   │   │   │   │   │      │ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ - * │ │││ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┼┬┬┬┤ - * │ ││││││││ │ │ │ │ │ │ │RST││││││ - * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ + * │   │││      │   │   │   │   │   │   │   │   │   │   │    │   │ + * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┼───┬┼┬┬┬┤ + * │   ││││││││   │    │                           │    │   ││││││ + * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘ */ -[_ADJUST] = LAYOUT_split( \ - _______, QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ +[_ADJUST] = LAYOUT_default( \ + _______, QM_MAKE, _______, _______, EEP_RST, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, RESET \ + _______, _______, _______, _______, _______, _______ \ ), /** * Blank * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │ │││ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │   │││   │   │   │   │   │   │   │   │   │   │   │   │   │   │ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │ │││ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │   │││    │   │   │   │   │   │   │   │   │   │   │   │      │ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ - * │ │││ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │   │││      │   │   │   │   │   │   │   │   │   │   │    │   │ * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┼┬┬┬┤ - * │ ││││││││ │ │ │ │ │ │ │ ││││││ + * │   ││││││││   │    │   │        │          │   │    │   ││││││ * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ */ /* -[] = LAYOUT_split( \ +[] = LAYOUT_default( \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ diff --git a/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c b/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c index 5b91152d1f8b..354889814dbb 100644 --- a/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c +++ b/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c @@ -3,85 +3,85 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base Layer - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │Esc│ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │Bsp│ - * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │HyTb│ A │ S │ D │ F │ G │ H │ J │ K │ L │ Enter│ - * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ - * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│?/Lw│ - * ├┬┬┬┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬┬┬┬┤ - * │││││Opt │Cmd │         SpcRse         │Ctrl│││││ - * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Esc│ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │Bsp│ + * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │HyTb│ A │ S │ D │ F │ G │ H │ J │ K │ L │ Enter│ + * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ + * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│?/Lw│ + * ├┬┬┬┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬┬┬┬┤ + * │││││Opt │Cmd │         SpcRse         │Ctrl│││││ + * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘ */ [_BASE] = LAYOUT( \ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ HY_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, \ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, SLH_LWR, \ - KC_LOPT, KC_LCMD, XXXXXXX, SPC_RAI, XXXXXXX, XXXXXXX, KC_LCTL \ + KC_LOPT, KC_LCMD, XXXXXXX, SPC_RAI, XXXXXXX, XXXXXXX, KC_LCTL \ ), /* Lower - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │   │ F1│ F2│ F3│ F4│F13│F14│F15│Hom│ ↑ │PgU│   │ - * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │    │ F5│ F6│ F7│ F8│Prv│Nxt│VlU│ ← │ → │  Ply │ - * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ - * │SfCaps│ F9│F10│F11│F12│Mut│VlD│End│ ↓ │PgD│    │ - * ├┬┬┬┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬┬┬┬┤ - * │││││    │    │                        │    │││││ - * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Del│BrD│BrU│Msn│LHP│   │   │   │Hom│ ↑ │PgU│SlD│ + * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │    │Mut│VlU│NxW│PvT│Bck│Fwd│NxT│ ← │ → │  Ply │ + * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ + * │SfCaps│Prv│VlD│Nxt│1PX│1Ps│   │End│ ↓ │PgD│    │ + * ├┬┬┬┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬┬┬┬┤ + * │││││    │    │                        │    │││││ + * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘ */ [_LOWER] = LAYOUT( \ - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F13, KC_F14, KC_F15, KC_HOME, KC_UP, KC_PGUP, _______, \ - _______, KC_F5, KC_F6, KC_F7, KC_F8, KC_MPRV, KC_MNXT, KC_VOLU, KC_LEFT, KC_RGHT, KC_MPLY, \ - SF_CAPS, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_VOLD, KC_HOME, KC_DOWN, KC_PGDN, _______, \ + KC_DELT, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, KC_HOME, KC_UP, KC_PGUP, MC_SLPD, \ + _______, KC_MUTE, KC_VOLU, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, KC_LEFT, KC_RGHT, KC_MPLY, \ + SF_CAPS, KC_MPRV, KC_VOLD, KC_MNXT, PX_AFLL, OP_AFLL, KC_VOLD, KC_END, KC_DOWN, KC_PGDN, _______, \ _______, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______ \ ), /* Raise - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │   │! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│   │ - * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │    │ ← │ ↓ │ ↑ │ → │{ [│} ]│_ -│+ =│: ;│  " ' │ - * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ - * │SfCaps│   │   │   │   │   │   │   │| \│~ `│    │ - * ├┬┬┬┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬┬┬┬┤ - * │││││    │    │                        │    │││││ - * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │~ `│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│   │ + * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │    │ F1│ F2│ F3│ F4│ F5│ F6│_ -│+ =│: ;│   " '│ + * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ + * │      │ F7│ F8│ F9│F10│F11│F12│   │{ [│} ]│|\Lw│ + * ├┬┬┬┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬┬┬┬┤ + * │││││    │    │                        │    │││││ + * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘ */ [_RAISE] = LAYOUT( \ - _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ - _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_SCLN, KC_QUOT, \ - SF_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, KC_GRV, _______, \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_SCLN, KC_QUOT, \ + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_LBRC, KC_RBRC, KC_BSLS, BSL_LWR, \ _______, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______ \ ), /* Adjust/Macro - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │Mke│BrD│BrU│Msn│LHP│   │   │   │   │   │   │SlD│ - * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │NxW │PvT│NxT│Bck│Fwd│   │   │   │   │   │ Reset│ - * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ - * │      │   │   │   │1PX│1Ps│   │   │   │   │    │ - * ├┬┬┬┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬┬┬┬┤ - * │││││    │    │                        │    │││││ - * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Mke│   │   │EEP│RST│   │   │   │   │   │   │   │ + * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │    │   │   │   │   │   │   │   │   │   │      │ + * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ + * │      │   │   │   │   │   │   │   │   │   │    │ + * ├┬┬┬┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬┬┬┬┤ + * │││││    │    │                        │    │││││ + * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘ */ [_ADJUST] = LAYOUT( \ - QM_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, MC_SLPD, \ - NXT_WIN, PRV_TAB, NXT_TAB, MC_BACK, MC_FWRD, _______, _______, _______, _______, _______, RESET, \ - _______, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, _______, \ + QM_MAKE, _______, _______, EEP_RST, RESET, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______ \ ) /* Blank Layer - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │   │   │   │   │   │   │   │   │   │   │   │   │ - * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │    │   │   │   │   │   │   │   │   │   │      │ - * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ - * │      │   │   │   │   │   │   │   │   │   │    │ - * ├┬┬┬┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬┬┬┬┤ - * │││││    │    │                        │    │││││ - * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │   │   │   │   │   │   │   │   │   │   │   │   │ + * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │    │   │   │   │   │   │   │   │   │   │      │ + * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ + * │      │   │   │   │   │   │   │   │   │   │    │ + * ├┬┬┬┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬┬┬┬┤ + * │││││    │    │                        │    │││││ + * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘ */ /* [BLANK] = LAYOUT( \ From 14a12eaba43833cbd44858a24eaed779769e1667 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 1 May 2020 14:57:17 -0700 Subject: [PATCH 364/429] [Keymap] Add Liminal keymap --- .../liminal/keymaps/brandonschlack/keymap.c | 101 ++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c diff --git a/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c b/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c new file mode 100644 index 000000000000..f9aea6c4dadf --- /dev/null +++ b/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c @@ -0,0 +1,101 @@ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Base + * ┌───┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │Hom│Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│ BsPc│ + * ├───┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │PgU│HyEsc │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│   Enter│ + * ├───┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ + * │PgD│Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ ↑Shft│ + * ├───┼────┬───┼───┴┬──┴───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤ + * │End│Ctrl│Opt│Cmd │        Space-Raise        │←Cmd│↓Lw│→Opt│ + * └───┴────┴───┴────┴───────────────────────────┴────┴───┴────┘ + */ +[_BASE] = LAYOUT_base_kit_all( \ + KC_HOME, 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_BSPC, \ + KC_PGUP, HY_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, XXXXXXX, KC_ENT, \ + KC_PGDN, KC_LSFT, XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, UP_RSFT, \ + KC_END, KC_LCTL, KC_LOPT, KC_LCMD, XXXXXXX, SPC_RAI, XXXXXXX, LFT_CMD, DWN_LWR, RGT_OPT \ +), + +/* Lower + * ┌───┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │Nxt│Del  │BrD│BrU│Msn│LHP│   │   │   │   │   │ ↑ │Mut│ SlpD│ + * ├───┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │VlU│HyCaps│   │   │NxW│PvT│Bck│Fwd│NxT│   │ ← │ → │    Play│ + * ├───┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ + * │VlD│        │   │   │   │1PX│1Ps│   │   │   │ ↓ │   │      │ + * ├───┼────┬───┼───┴┬──┴───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤ + * │Prv│    │   │    │                           │    │   │    │ + * └───┴────┴───┴────┴───────────────────────────┴────┴───┴────┘ + */ +[_LOWER] = LAYOUT_base_kit_all( \ + KC_MNXT, KC_DELT, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, KC_UP, KC_MUTE, MC_SLPD, \ + KC_VOLU, HY_CAPS, _______, _______, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, _______, KC_LEFT, KC_RGHT, XXXXXXX, KC_MPLY, \ + KC_VOLD, _______, XXXXXXX, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, KC_DOWN, _______, _______, \ + KC_MPRV, _______, _______, _______, XXXXXXX, _______, XXXXXXX, _______, _______, _______ \ +), + +/* Raise + * ┌───┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │Nxt│~ `  │! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│} ]│     │ + * ├───┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │VlU│      │ F1│ F2│ F3│ F4│ F5│ F6│_ -│+ =│   │" '│        │ + * ├───┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ + * │VlD│        │ F7│ F8│ F9│F10│F11│F12│   │{ [│} ]│| \│ ⇞Shft│ + * ├───┼────┬───┼───┴┬──┴───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤ + * │Prv│    │   │    │                           │↖︎Cmd│⇟Fn│↘︎Opt│ + * └───┴────┴───┴────┴───────────────────────────┴────┴───┴────┘ + */ +[_RAISE] = LAYOUT_base_kit_all( \ + KC_MNXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_RBRC, _______, \ + KC_VOLU, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, _______, KC_QUOT, XXXXXXX, _______, \ + KC_VOLD, _______, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_LBRC, KC_RBRC, KC_BSLS, PGU_SFT, \ + KC_MPRV, _______, _______, _______, XXXXXXX, _______, XXXXXXX, HOM_CMD, PGD_LWR, END_OPT \ +), + +/* Adjust + * ┌───┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │   │Make │   │   │EEP│RST│   │   │   │   │   │   │   │     │ + * ├───┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │   │      │   │   │   │   │   │   │   │   │   │   │        │ + * ├───┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ + * │   │        │   │   │   │   │   │   │   │   │   │   │      │ + * ├───┼────┬───┼───┴┬──┴───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤ + * │   │    │   │    │                           │    │   │    │ + * └───┴────┴───┴────┴───────────────────────────┴────┴───┴────┘ + */ +[_ADJUST] = LAYOUT_base_kit_all( \ + _______, QM_MAKE, _______, _______, EEP_RST, RESET, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, \ + _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, XXXXXXX, _______, XXXXXXX, _______, _______, _______ \ +), + +/* Blank layer + * ┌───┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ + * │   │     │   │   │   │   │   │   │   │   │   │   │   │     │ + * ├───┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │   │      │   │   │   │   │   │   │   │   │   │   │        │ + * ├───┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ + * │   │        │   │   │   │   │   │   │   │   │   │   │      │ + * ├───┼────┬───┼───┴┬──┴───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤ + * │   │    │   │    │                           │    │   │    │ + * └───┴────┴───┴────┴───────────────────────────┴────┴───┴────┘ + */ +/* +[_BLANK] = LAYOUT_base_kit_all( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, \ + _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, XXXXXXX, _______, XXXXXXX, _______, _______, _______ \ +), +*/ +}; + +layer_state_t layer_state_set_keymap(layer_state_t state) { + state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); + return state; +} From a9017d23b5c81469b4fc586dc7dd0f1ac547ded2 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 4 May 2020 13:14:55 -0700 Subject: [PATCH 365/429] [Keymap] Fix Neuron keymap --- keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c b/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c index 354889814dbb..ef34c4c6e648 100644 --- a/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c +++ b/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_RAISE] = LAYOUT( \ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_SCLN, KC_QUOT, \ - _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_LBRC, KC_RBRC, KC_BSLS, BSL_LWR, \ + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_LBRC, KC_RBRC, BSL_LWR, \ _______, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______ \ ), /* Adjust/Macro From 26e51aadea19a1269f9a4092ad741d9d1b1beeb8 Mon Sep 17 00:00:00 2001 From: TheFourthCow <63170386+TheFourthCow@users.noreply.github.com> Date: Tue, 5 May 2020 21:29:47 -0400 Subject: [PATCH 366/429] edit to default funky40 keymap (#9014) --- keyboards/funky40/keymaps/default/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/funky40/keymaps/default/keymap.c b/keyboards/funky40/keymaps/default/keymap.c index fff5a820bfaa..fd9317e74573 100644 --- a/keyboards/funky40/keymaps/default/keymap.c +++ b/keyboards/funky40/keymaps/default/keymap.c @@ -19,10 +19,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LAYOUT( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, 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_DOT, KC_DOT, KC_SLSH, KC_SFTENT, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, LT(1, KC_DEL), KC_SPC, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT), + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_SFTENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, LT(1, KC_DEL), KC_SPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT), LAYOUT( KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, From fcabf8ee695102b67f696d32d6a6724874446e0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?= Date: Wed, 6 May 2020 13:11:59 -0300 Subject: [PATCH 367/429] Add Elongate PCB support (#8419) * Working on proto * Start adding VIA support * Apply suggestions from code review Removed redundant comments and fixed typos Co-Authored-By: Ryan Co-Authored-By: Joel Challis * Delete useless config.h As per code review * Delete elongate.c As per code review * Updated readme.md * Update keyboards/acheron/elongate/keymaps/default/keymap.c As per code review Co-Authored-By: Ryan * Apply suggestions from code review Removed RGB_MODE_TEST definition and substituted for RGB_M_T Co-Authored-By: Ryan * Apply suggestions from code review Reverted changes to alice.h Co-Authored-By: Ryan * Update info.json * Update via/keymap.c Co-Authored-By: Ryan * Solve compiling issue for via keymap * Add botmagic support and remoce console_enable Co-Authored-By: Joel Challis * Update keyboards/acheron/elongate/rules.mk Co-authored-by: Ryan * Update keyboards/acheron/elongate/keymaps/via/rules.mk Co-authored-by: Ryan * Update keyboards/acheron/elongate/rules.mk Co-authored-by: Ryan * Update keyboards/acheron/elongate/config.h Co-authored-by: Ryan Co-authored-by: Gondolindrim Co-authored-by: Ryan Co-authored-by: Joel Challis --- keyboards/acheron/elongate/config.h | 250 ++++++++++++++++++ keyboards/acheron/elongate/elongate.c | 26 ++ keyboards/acheron/elongate/elongate.h | 44 +++ keyboards/acheron/elongate/info.json | 70 +++++ .../acheron/elongate/keymaps/default/keymap.c | 34 +++ .../elongate/keymaps/default/readme.md | 1 + .../acheron/elongate/keymaps/via/config.h | 3 + .../acheron/elongate/keymaps/via/keymap.c | 34 +++ .../acheron/elongate/keymaps/via/rules.mk | 1 + keyboards/acheron/elongate/readme.md | 25 ++ keyboards/acheron/elongate/rules.mk | 34 +++ 11 files changed, 522 insertions(+) create mode 100644 keyboards/acheron/elongate/config.h create mode 100644 keyboards/acheron/elongate/elongate.c create mode 100644 keyboards/acheron/elongate/elongate.h create mode 100644 keyboards/acheron/elongate/info.json create mode 100644 keyboards/acheron/elongate/keymaps/default/keymap.c create mode 100644 keyboards/acheron/elongate/keymaps/default/readme.md create mode 100644 keyboards/acheron/elongate/keymaps/via/config.h create mode 100644 keyboards/acheron/elongate/keymaps/via/keymap.c create mode 100644 keyboards/acheron/elongate/keymaps/via/rules.mk create mode 100644 keyboards/acheron/elongate/readme.md create mode 100644 keyboards/acheron/elongate/rules.mk diff --git a/keyboards/acheron/elongate/config.h b/keyboards/acheron/elongate/config.h new file mode 100644 index 000000000000..df8c1a831496 --- /dev/null +++ b/keyboards/acheron/elongate/config.h @@ -0,0 +1,250 @@ +/* +Copyright 2020 Gondolindrim + +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 . +*/ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x4150 //AP for AcheronProject +#define PRODUCT_ID 0x454C // EL for Elongate +#define DEVICE_VER 0x0001 +#define MANUFACTURER Acheron Project +#define PRODUCT Elongate +#define DESCRIPTION Acheron Project Elongate + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 13 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { D3, B7, D5, B5, D6 } +#define MATRIX_COL_PINS { F5, F6, F4, F1, F0, B2, B1, C6, B0, B3, E6, D4, B4} +//#define UNUSED_PINS + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +/* + * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. + */ +// #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 + +// #define BACKLIGHT_PIN B7 +// #define BACKLIGHT_BREATHING +// #define BACKLIGHT_LEVELS 3 + +#define RGB_DI_PIN D7 +#ifdef RGB_DI_PIN + #define RGBLED_NUM 16 + #define RGBLIGHT_HUE_STEP 8 + #define RGBLIGHT_SAT_STEP 8 + #define RGBLIGHT_VAL_STEP 8 + #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ + #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +/*== all animations enable ==*/ + #define RGBLIGHT_ANIMATIONS +/*== or choose animations ==*/ +// #define RGBLIGHT_EFFECT_BREATHING +// #define RGBLIGHT_EFFECT_RAINBOW_MOOD +// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL +// #define RGBLIGHT_EFFECT_SNAKE +// #define RGBLIGHT_EFFECT_KNIGHT +// #define RGBLIGHT_EFFECT_CHRISTMAS +// #define RGBLIGHT_EFFECT_STATIC_GRADIENT +// #define RGBLIGHT_EFFECT_RGB_TEST +// #define RGBLIGHT_EFFECT_ALTERNATING +/*== customize breathing effect ==*/ + /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ + #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 + /*==== use exp() and sin() ====*/ +// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 +// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +#endif + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. + * This is userful for the Windows task manager shortcut (ctrl+shift+esc). + */ +// #define GRAVE_ESC_CTRL_OVERRIDE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Magic Key Options + * + * Magic keys are hotkey commands that allow control over firmware functions of + * the keyboard. They are best used in combination with the HID Listen program, + * found here: https://www.pjrc.com/teensy/hid_listen.html + * + * The options below allow the magic key functionality to be changed. This is + * useful if your keyboard/keypad is missing keys and you want magic key support. + * + */ + +/* key combination for magic key command */ +/* defined by default; to change, uncomment and set to the combination you want */ +// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT) + +/* control how magic key switches layers */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false + +/* override magic key keymap */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM +//#define MAGIC_KEY_HELP H +//#define MAGIC_KEY_HELP_ALT SLASH +//#define MAGIC_KEY_DEBUG D +//#define MAGIC_KEY_DEBUG_MATRIX X +//#define MAGIC_KEY_DEBUG_KBD K +//#define MAGIC_KEY_DEBUG_MOUSE M +//#define MAGIC_KEY_VERSION V +//#define MAGIC_KEY_STATUS S +//#define MAGIC_KEY_CONSOLE C +//#define MAGIC_KEY_LAYER0 0 +//#define MAGIC_KEY_LAYER0_ALT GRAVE +//#define MAGIC_KEY_LAYER1 1 +//#define MAGIC_KEY_LAYER2 2 +//#define MAGIC_KEY_LAYER3 3 +//#define MAGIC_KEY_LAYER4 4 +//#define MAGIC_KEY_LAYER5 5 +//#define MAGIC_KEY_LAYER6 6 +//#define MAGIC_KEY_LAYER7 7 +//#define MAGIC_KEY_LAYER8 8 +//#define MAGIC_KEY_LAYER9 9 +//#define MAGIC_KEY_BOOTLOADER B +//#define MAGIC_KEY_BOOTLOADER_ALT ESC +//#define MAGIC_KEY_LOCK CAPS +//#define MAGIC_KEY_EEPROM E +//#define MAGIC_KEY_EEPROM_CLEAR BSPACE +//#define MAGIC_KEY_NKRO N +//#define MAGIC_KEY_SLEEP_LED Z + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT + +/* disable these deprecated features by default */ +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION +/* + * MIDI options + */ + +/* Prevent use of disabled MIDI features in the keymap */ +//#define MIDI_ENABLE_STRICT 1 + +/* enable basic MIDI features: + - MIDI notes can be sent when in Music mode is on +*/ +//#define MIDI_BASIC + +/* enable advanced MIDI features: + - MIDI notes can be added to the keymap + - Octave shift and transpose + - Virtual sustain, portamento, and modulation wheel + - etc. +*/ +//#define MIDI_ADVANCED + +/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ +//#define MIDI_TONE_KEYCODE_OCTAVES 1 + +/* + * HD44780 LCD Display Configuration + */ +/* +#define LCD_LINES 2 //< number of visible lines of the display +#define LCD_DISP_LENGTH 16 //< visibles characters per line of the display + +#define LCD_IO_MODE 1 //< 0: memory mapped mode, 1: IO port mode + +#if LCD_IO_MODE +#define LCD_PORT PORTB //< port for the LCD lines +#define LCD_DATA0_PORT LCD_PORT //< port for 4bit data bit 0 +#define LCD_DATA1_PORT LCD_PORT //< port for 4bit data bit 1 +#define LCD_DATA2_PORT LCD_PORT //< port for 4bit data bit 2 +#define LCD_DATA3_PORT LCD_PORT //< port for 4bit data bit 3 +#define LCD_DATA0_PIN 4 //< pin for 4bit data bit 0 +#define LCD_DATA1_PIN 5 //< pin for 4bit data bit 1 +#define LCD_DATA2_PIN 6 //< pin for 4bit data bit 2 +#define LCD_DATA3_PIN 7 //< pin for 4bit data bit 3 +#define LCD_RS_PORT LCD_PORT //< port for RS line +#define LCD_RS_PIN 3 //< pin for RS line +#define LCD_RW_PORT LCD_PORT //< port for RW line +#define LCD_RW_PIN 2 //< pin for RW line +#define LCD_E_PORT LCD_PORT //< port for Enable line +#define LCD_E_PIN 1 //< pin for Enable line +#endif +*/ + +/* Bootmagic Lite key configuration */ +// #define BOOTMAGIC_LITE_ROW 0 +// #define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/acheron/elongate/elongate.c b/keyboards/acheron/elongate/elongate.c new file mode 100644 index 000000000000..31c472036079 --- /dev/null +++ b/keyboards/acheron/elongate/elongate.c @@ -0,0 +1,26 @@ +/* Copyright 2020 Gondolindrim + * + * 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 . + */ + +#include "elongate.h" +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if(res) { + writePin(D2, led_state.num_lock); + writePin(D1, led_state.caps_lock); + writePin(D0, led_state.scroll_lock); + } + return res; +} diff --git a/keyboards/acheron/elongate/elongate.h b/keyboards/acheron/elongate/elongate.h new file mode 100644 index 000000000000..6ff32b4f7575 --- /dev/null +++ b/keyboards/acheron/elongate/elongate.h @@ -0,0 +1,44 @@ +/* Copyright 2020 Gondolindrim + * + * 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 . + */ + +#pragma once + +#include "quantum.h" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the Keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ + +#define KNO KC_NO + +#define LAYOUT( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K49, K41, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1B, K1C, K4A, K42, \ + K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K4B, K44, \ + K30, K31, K32, K34, K37, K3A, K3B, K3C, K3D, K4C, K47 \ +)\ +{\ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, KNO, K1B, K1C }, \ + { K20, KNO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \ + { K30, K31, K32, KNO, K34, KNO, KNO, K37, KNO, K3A, K3B, K3C, K3D }, \ + { KNO, K41, K42, KNO, K44, KNO, KNO, K47, KNO, K49, K4A, K4B, K4C } \ +} diff --git a/keyboards/acheron/elongate/info.json b/keyboards/acheron/elongate/info.json new file mode 100644 index 000000000000..9664638c5190 --- /dev/null +++ b/keyboards/acheron/elongate/info.json @@ -0,0 +1,70 @@ +{ + "keyboard_name": "Elongate", + "url": "http://gondolindrim.github.io/AcheronDocs/elongate/introduction.html", + "maintainer": "Gondolindrim", + "width": 15.5, + "height": 4.25, + "layouts": { + "LAYOUT_all": { + "layout": [ + {"label":"Tab", "x":0, "y":0}, + {"label":"Q", "x":1, "y":0}, + {"label":"W", "x":2, "y":0}, + {"label":"E", "x":3, "y":0}, + {"label":"R", "x":4, "y":0}, + {"label":"T", "x":5, "y":0}, + {"label":"Y", "x":6, "y":0}, + {"label":"U", "x":7, "y":0}, + {"label":"I", "x":8, "y":0}, + {"label":"O", "x":9, "y":0}, + {"label":"P", "x":10, "y":0}, + {"label":"Backspace", "x":11, "y":0}, + {"label":"7", "x":12.5, "y":0}, + {"label":"8", "x":13.5, "y":0}, + {"label":"9", "x":14.5, "y":0}, + + {"label":"Caps Lock", "x":0, "y":1, "w":1.25}, + {"label":"A", "x":1.25, "y":1}, + {"label":"S", "x":2.25, "y":1}, + {"label":"D", "x":3.25, "y":1}, + {"label":"F", "x":4.25, "y":1}, + {"label":"G", "x":5.25, "y":1}, + {"label":"H", "x":6.25, "y":1}, + {"label":"J", "x":7.25, "y":1}, + {"label":"K", "x":8.25, "y":1}, + {"label":"L", "x":9.25, "y":1}, + {"label":"Enter", "x":10.25, "y":1.75}, + {"label":"4", "x":12.5, "y":1}, + {"label":"5", "x":13.5, "y":1}, + {"label":"6", "x":14.5, "y":1}, + + {"label":"Shift", "x":0, "y":2, "w":1.75}, + {"label":"Z", "x":1.75, "y":2}, + {"label":"X", "x":2.75, "y":2}, + {"label":"C", "x":3.75, "y":2}, + {"label":"V", "x":4.75, "y":2}, + {"label":"B", "x":5.75, "y":2}, + {"label":"N", "x":6.75, "y":2}, + {"label":"M", "x":7.75, "y":2}, + {"label":"<", "x":8.75, "y":2}, + {"label":"Fn1", "x":9.75, "y":2}, + {"label":"Up", "x":11.25, "y":2.25}, + {"label":"1", "x":12.5, "y":2}, + {"label":"2", "x":13.5, "y":2}, + {"label":"3", "x":14.5, "y":2}, + + {"label":"Ctrl", "x":0, "y":3, "w":1.25}, + {"label":"Win", "x":1.25, "y":3}, + {"label":"Alt", "x":2.25, "y":3, "w":1.25}, + {"label":"Space/Fn2", "x":3.5, "y":3, "w":2.25}, + {"label":"Space", "x":6.25, "y":3, "w":2.75}, + {"label":"Alt", "x":9, "y":3}, + {"label":"Left", "x":10.25, "y":3.25}, + {"label":"Down", "x":11.25, "y":3.25}, + {"label":"Right", "x":12.25, "y":3.25}, + {"label":"0", "x":13.5, "y":3}, + {"label":".", "x":14.5, "y":3}, + ] + } + } +} diff --git a/keyboards/acheron/elongate/keymaps/default/keymap.c b/keyboards/acheron/elongate/keymaps/default/keymap.c new file mode 100644 index 000000000000..c2b809b7444a --- /dev/null +++ b/keyboards/acheron/elongate/keymaps/default/keymap.c @@ -0,0 +1,34 @@ +/* Copyright 2020 Gondolindrim + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT( /* Base */ + 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_P7, KC_P8, KC_P9, + KC_SLCK, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENTER, KC_P4, KC_P5, KC_P6, + KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, MO(1) , KC_UP, KC_P1, KC_P2, KC_P3, + KC_LCTRL, KC_LWIN, KC_LALT, LT(2, KC_SPACE), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT, KC_P0, KC_DOT), +[1] = LAYOUT( /* Base */ + KC_F1, KC_F2, KC_F2, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_NLCK, KC_SLCK, KC_CAPS, + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_RSHIFT, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCLN, KC_QUOT, KC_SLSH, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_HOME, KC_PGDN, KC_END , KC_TRNS, KC_TRNS), +[2] = LAYOUT( /* Base */ + 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, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_M_T, 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_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), +}; diff --git a/keyboards/acheron/elongate/keymaps/default/readme.md b/keyboards/acheron/elongate/keymaps/default/readme.md new file mode 100644 index 000000000000..a154ac591555 --- /dev/null +++ b/keyboards/acheron/elongate/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for Elongate diff --git a/keyboards/acheron/elongate/keymaps/via/config.h b/keyboards/acheron/elongate/keymaps/via/config.h new file mode 100644 index 000000000000..a3b77a5b4d0b --- /dev/null +++ b/keyboards/acheron/elongate/keymaps/via/config.h @@ -0,0 +1,3 @@ +#pragma once + +#define DYNAMIC_KEYMAP_LAYER_COUNT 3 diff --git a/keyboards/acheron/elongate/keymaps/via/keymap.c b/keyboards/acheron/elongate/keymaps/via/keymap.c new file mode 100644 index 000000000000..c2b809b7444a --- /dev/null +++ b/keyboards/acheron/elongate/keymaps/via/keymap.c @@ -0,0 +1,34 @@ +/* Copyright 2020 Gondolindrim + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT( /* Base */ + 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_P7, KC_P8, KC_P9, + KC_SLCK, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENTER, KC_P4, KC_P5, KC_P6, + KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, MO(1) , KC_UP, KC_P1, KC_P2, KC_P3, + KC_LCTRL, KC_LWIN, KC_LALT, LT(2, KC_SPACE), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT, KC_P0, KC_DOT), +[1] = LAYOUT( /* Base */ + KC_F1, KC_F2, KC_F2, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_NLCK, KC_SLCK, KC_CAPS, + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_RSHIFT, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCLN, KC_QUOT, KC_SLSH, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_HOME, KC_PGDN, KC_END , KC_TRNS, KC_TRNS), +[2] = LAYOUT( /* Base */ + 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, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_M_T, 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_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), +}; diff --git a/keyboards/acheron/elongate/keymaps/via/rules.mk b/keyboards/acheron/elongate/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/acheron/elongate/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/acheron/elongate/readme.md b/keyboards/acheron/elongate/readme.md new file mode 100644 index 000000000000..83c0eeada123 --- /dev/null +++ b/keyboards/acheron/elongate/readme.md @@ -0,0 +1,25 @@ +# Acheron Aχξρων 45-S-ATMEGA-MX-TH-WI (codename "Elongate") QMK firmware + +

+ +

+ +## Introduction + +This is the QMK firmware repository for the ElongatePCN, compatible with revisions Beta and pre-Beta. + +The ElongatePCB is an Open-Hardware guidelines compliant PCB which files can be found at [this link](https://github.com/Gondolindrim/AElongate). Its designer and maintainer is [Gondolindrim](https://github.com/Gondolindrim). + +## PCB Documentation + +See the [AcheronDocs](https://gondolindrim.github.io/AcheronDocs/elongate/introduction.html) page for the ElongatePCB full documentation. You can also check the KiCad PCB files at the [Elongate GitHub repository](https://github.com/Gondolindrim/Elongate). + +Before using the files for personal or commercial use, please read the [Acheron Open-Hardware License V1.2](https://gondolindrim.github.io/AcheronDocs/license/license.html) under which the Austin PCB is published. + +## How to compile + +After setting up your build environment, you can compile the Austin default keymap by using: + + make acheron/elongate:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/acheron/elongate/rules.mk b/keyboards/acheron/elongate/rules.mk new file mode 100644 index 000000000000..0f0ca33e9c6c --- /dev/null +++ b/keyboards/acheron/elongate/rules.mk @@ -0,0 +1,34 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs + +LTO_ENABLE = yes From c6e806f679c2d28309d099ca544c3cddfff221d1 Mon Sep 17 00:00:00 2001 From: Zach White Date: Wed, 6 May 2020 09:55:44 -0700 Subject: [PATCH 368/429] New keyboard: Clueboard 2x1800 2019 (#8721) * Initial support for the 2019 2x1800 * Get all hardware working. * Fix shake to undo * Use the method suggested by @reywood * Remove the unnecessary for loop * changes suggested by @noroadsleft * Fix comma, period, and forward slash keys for clueboard 2x1800 default keymap by @reywood * Call led_set_user at the end of led_set_kb (#6265) * [Keymap] Add default layouts for 2u spacebar (#6266) * make progress on drawing mode * Finish drawing toy mode * Update keyboards/clueboard/2x1800/2019/config.h Co-Authored-By: Drashna Jaelre * Update keyboards/clueboard/2x1800/2019/2019.c Co-Authored-By: Drashna Jaelre * Update keyboards/clueboard/2x1800/2019/2019.c Co-Authored-By: Drashna Jaelre * Update keyboards/clueboard/2x1800/2019/2019.c Co-Authored-By: Drashna Jaelre * Update keyboards/clueboard/2x1800/2019/rules.mk Co-Authored-By: Drashna Jaelre * Update keyboards/clueboard/2x1800/2019/rules.mk Co-Authored-By: Ryan * remove unnecessary files * Update keyboards/clueboard/2x1800/2019/rules.mk Co-Authored-By: Ryan * apply suggestions * Apply suggestions from code review Co-Authored-By: Ryan Co-authored-by: Sean Dwyer Co-authored-by: Drashna Jaelre Co-authored-by: Ryan --- .../2x1800/{2x1800.c => 2018/2018.c} | 2 +- .../2x1800/{2x1800.h => 2018/2018.h} | 0 .../clueboard/2x1800/{ => 2018}/config.h | 2 +- keyboards/clueboard/2x1800/2018/info.json | 42 +++ .../{ => 2018}/keymaps/default/config.h | 0 .../2x1800/2018/keymaps/default/keymap.json | 11 + .../{ => 2018}/keymaps/default/readme.md | 0 .../{ => 2018}/keymaps/default_4u/keymap.c | 2 +- .../{ => 2018}/keymaps/default_4u/readme.md | 0 .../{ => 2018}/keymaps/default_7u/keymap.c | 0 .../{ => 2018}/keymaps/default_7u/readme.md | 0 .../{ => 2018}/keymaps/macroboard/keymap.c | 2 +- .../{ => 2018}/keymaps/macroboard/readme.md | 0 .../keymaps/mouseboard_left/keymap.c | 2 +- .../keymaps/mouseboard_left/readme.md | 0 .../keymaps/mouseboard_right/keymap.c | 2 +- .../keymaps/mouseboard_right/readme.md | 0 keyboards/clueboard/2x1800/2018/readme.md | 13 + .../clueboard/2x1800/{ => 2018}/rules.mk | 0 keyboards/clueboard/2x1800/2019/2019.c | 182 +++++++++++++ keyboards/clueboard/2x1800/2019/2019.h | 257 ++++++++++++++++++ keyboards/clueboard/2x1800/2019/config.h | 214 +++++++++++++++ keyboards/clueboard/2x1800/2019/info.json | 42 +++ .../2x1800/2019/keymaps/default/keymap.json | 11 + .../2x1800/2019/keymaps/default/readme.md | 1 + .../keymaps/default_1u_ansi}/keymap.c | 16 +- .../2019/keymaps/default_1u_ansi/readme.md | 1 + .../2019/keymaps/default_1u_iso/keymap.c | 28 ++ .../2019/keymaps/default_1u_iso/readme.md | 1 + .../2019/keymaps/default_2u_ansi/keymap.c | 28 ++ .../2019/keymaps/default_2u_ansi/readme.md | 1 + .../2019/keymaps/default_2u_iso/keymap.c | 28 ++ .../2019/keymaps/default_2u_iso/readme.md | 1 + .../keymaps/default_4u_ansi}/config.h | 2 - .../2019/keymaps/default_4u_ansi/keymap.c | 28 ++ .../2019/keymaps/default_4u_ansi/readme.md | 1 + .../keymaps/default_4u_iso}/config.h | 2 - .../2019/keymaps/default_4u_iso/keymap.c | 28 ++ .../2019/keymaps/default_4u_iso/readme.md | 1 + .../keymaps/default_7u_ansi}/config.h | 2 - .../2019/keymaps/default_7u_ansi/keymap.c | 28 ++ .../2019/keymaps/default_7u_ansi/readme.md | 1 + .../keymaps/default_7u_iso}/config.h | 2 - .../2019/keymaps/default_7u_iso/keymap.c | 28 ++ .../2019/keymaps/default_7u_iso/readme.md | 1 + keyboards/clueboard/2x1800/2019/readme.md | 13 + keyboards/clueboard/2x1800/2019/rules.mk | 25 ++ keyboards/clueboard/2x1800/info.json | 39 +-- .../2x1800/keymaps/mouseboard_right/config.h | 21 -- keyboards/clueboard/2x1800/readme.md | 7 +- 50 files changed, 1036 insertions(+), 82 deletions(-) rename keyboards/clueboard/2x1800/{2x1800.c => 2018/2018.c} (98%) rename keyboards/clueboard/2x1800/{2x1800.h => 2018/2018.h} (100%) rename keyboards/clueboard/2x1800/{ => 2018}/config.h (99%) create mode 100644 keyboards/clueboard/2x1800/2018/info.json rename keyboards/clueboard/2x1800/{ => 2018}/keymaps/default/config.h (100%) create mode 100644 keyboards/clueboard/2x1800/2018/keymaps/default/keymap.json rename keyboards/clueboard/2x1800/{ => 2018}/keymaps/default/readme.md (100%) rename keyboards/clueboard/2x1800/{ => 2018}/keymaps/default_4u/keymap.c (94%) rename keyboards/clueboard/2x1800/{ => 2018}/keymaps/default_4u/readme.md (100%) rename keyboards/clueboard/2x1800/{ => 2018}/keymaps/default_7u/keymap.c (100%) rename keyboards/clueboard/2x1800/{ => 2018}/keymaps/default_7u/readme.md (100%) rename keyboards/clueboard/2x1800/{ => 2018}/keymaps/macroboard/keymap.c (97%) rename keyboards/clueboard/2x1800/{ => 2018}/keymaps/macroboard/readme.md (100%) rename keyboards/clueboard/2x1800/{ => 2018}/keymaps/mouseboard_left/keymap.c (94%) rename keyboards/clueboard/2x1800/{ => 2018}/keymaps/mouseboard_left/readme.md (100%) rename keyboards/clueboard/2x1800/{ => 2018}/keymaps/mouseboard_right/keymap.c (94%) rename keyboards/clueboard/2x1800/{ => 2018}/keymaps/mouseboard_right/readme.md (100%) create mode 100644 keyboards/clueboard/2x1800/2018/readme.md rename keyboards/clueboard/2x1800/{ => 2018}/rules.mk (100%) create mode 100644 keyboards/clueboard/2x1800/2019/2019.c create mode 100644 keyboards/clueboard/2x1800/2019/2019.h create mode 100644 keyboards/clueboard/2x1800/2019/config.h create mode 100644 keyboards/clueboard/2x1800/2019/info.json create mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default/keymap.json create mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default/readme.md rename keyboards/clueboard/2x1800/{keymaps/default => 2019/keymaps/default_1u_ansi}/keymap.c (78%) create mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default_1u_ansi/readme.md create mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default_1u_iso/keymap.c create mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default_1u_iso/readme.md create mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default_2u_ansi/keymap.c create mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default_2u_ansi/readme.md create mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default_2u_iso/keymap.c create mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default_2u_iso/readme.md rename keyboards/clueboard/2x1800/{keymaps/default_7u => 2019/keymaps/default_4u_ansi}/config.h (96%) create mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default_4u_ansi/keymap.c create mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default_4u_ansi/readme.md rename keyboards/clueboard/2x1800/{keymaps/mouseboard_left => 2019/keymaps/default_4u_iso}/config.h (96%) create mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/keymap.c create mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/readme.md rename keyboards/clueboard/2x1800/{keymaps/macroboard => 2019/keymaps/default_7u_ansi}/config.h (96%) create mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/keymap.c create mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/readme.md rename keyboards/clueboard/2x1800/{keymaps/default_4u => 2019/keymaps/default_7u_iso}/config.h (96%) create mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/keymap.c create mode 100644 keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/readme.md create mode 100644 keyboards/clueboard/2x1800/2019/readme.md create mode 100644 keyboards/clueboard/2x1800/2019/rules.mk delete mode 100644 keyboards/clueboard/2x1800/keymaps/mouseboard_right/config.h diff --git a/keyboards/clueboard/2x1800/2x1800.c b/keyboards/clueboard/2x1800/2018/2018.c similarity index 98% rename from keyboards/clueboard/2x1800/2x1800.c rename to keyboards/clueboard/2x1800/2018/2018.c index 09c90adbcf69..1745309ff226 100644 --- a/keyboards/clueboard/2x1800/2x1800.c +++ b/keyboards/clueboard/2x1800/2018/2018.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "2x1800.h" +#include "2018.h" void matrix_init_kb(void) { // Set our LED pins as output diff --git a/keyboards/clueboard/2x1800/2x1800.h b/keyboards/clueboard/2x1800/2018/2018.h similarity index 100% rename from keyboards/clueboard/2x1800/2x1800.h rename to keyboards/clueboard/2x1800/2018/2018.h diff --git a/keyboards/clueboard/2x1800/config.h b/keyboards/clueboard/2x1800/2018/config.h similarity index 99% rename from keyboards/clueboard/2x1800/config.h rename to keyboards/clueboard/2x1800/2018/config.h index e343011f9540..af67b15b262a 100644 --- a/keyboards/clueboard/2x1800/config.h +++ b/keyboards/clueboard/2x1800/2018/config.h @@ -25,7 +25,7 @@ along with this program. If not, see . #define PRODUCT_ID 0x23A0 #define DEVICE_VER 0x0001 #define MANUFACTURER Clueboard -#define PRODUCT Double 1800 +#define PRODUCT 2x1800 2018 #define DESCRIPTION What does it mean? /* key matrix size */ diff --git a/keyboards/clueboard/2x1800/2018/info.json b/keyboards/clueboard/2x1800/2018/info.json new file mode 100644 index 000000000000..0e3bb36a9d88 --- /dev/null +++ b/keyboards/clueboard/2x1800/2018/info.json @@ -0,0 +1,42 @@ +{ + "keyboard_name": "Clueboard 2x1800", + "url": "", + "maintainer": "skullydazed", + "width": 24, + "height": 6.5, + "layouts": { + "LAYOUT": { + "key_count": 127, + "layout": [ + {"label":"Home", "x":0, "y":0}, {"label":"End", "x":1, "y":0}, {"label":"PgUp", "x":2, "y":0}, {"label":"PgDn", "x":3, "y":0}, {"label":"Esc", "x":4.75, "y":0}, {"label":"F1", "x":6.25, "y":0}, {"label":"F2", "x":7.25, "y":0}, {"label":"F3", "x":8.25, "y":0}, {"label":"F4", "x":9.25, "y":0}, {"label":"F5", "x":10.75, "y":0}, {"label":"F6", "x":11.75, "y":0}, {"label":"F7", "x":12.75, "y":0}, {"label":"F8", "x":13.75, "y":0}, {"label":"F9", "x":15.25, "y":0}, {"label":"F10", "x":16.25, "y":0}, {"label":"F11", "x":17.25, "y":0}, {"label":"F12", "x":18.25, "y":0}, {"label":"PrtSc", "x":20, "y":0}, {"label":"Scroll Lock", "x":21, "y":0}, {"label":"Pause", "x":22, "y":0}, {"label":"Insert", "x":23, "y":0}, + {"label":"-", "x":0, "y":1.25}, {"label":"Num Lock", "x":1, "y":1.25}, {"label":"/", "x":2, "y":1.25}, {"label":"*", "x":3, "y":1.25}, {"label":"~", "x":4.5, "y":1.25}, {"label":"!", "x":5.5, "y":1.25}, {"label":"@", "x":6.5, "y":1.25}, {"label":"#", "x":7.5, "y":1.25}, {"label":"$", "x":8.5, "y":1.25}, {"label":"%", "x":9.5, "y":1.25}, {"label":"^", "x":10.5, "y":1.25}, {"label":"&", "x":11.5, "y":1.25}, {"label":"*", "x":12.5, "y":1.25}, {"label":"(", "x":13.5, "y":1.25}, {"label":")", "x":14.5, "y":1.25}, {"label":"_", "x":15.5, "y":1.25}, {"label":"+", "x":16.5, "y":1.25}, {"label":"Backspace", "x":17.5, "y":1.25, "w":2}, {"label":"Num Lock", "x":20, "y":1.25}, {"label":"/", "x":21, "y":1.25}, {"label":"*", "x":22, "y":1.25}, {"label":"-", "x":23, "y":1.25}, + {"label":"+", "x":0, "y":2.25, "h":2}, {"label":"7", "x":1, "y":2.25}, {"label":"8", "x":2, "y":2.25}, {"label":"9", "x":3, "y":2.25}, {"label":"Tab", "x":4.5, "y":2.25, "w":1.5}, {"label":"Q", "x":6, "y":2.25}, {"label":"W", "x":7, "y":2.25}, {"label":"E", "x":8, "y":2.25}, {"label":"R", "x":9, "y":2.25}, {"label":"T", "x":10, "y":2.25}, {"label":"Y", "x":11, "y":2.25}, {"label":"U", "x":12, "y":2.25}, {"label":"I", "x":13, "y":2.25}, {"label":"O", "x":14, "y":2.25}, {"label":"P", "x":15, "y":2.25}, {"label":"{", "x":16, "y":2.25}, {"label":"}", "x":17, "y":2.25}, {"label":"|", "x":18, "y":2.25, "w":1.5}, {"label":"7", "x":20, "y":2.25}, {"label":"8", "x":21, "y":2.25}, {"label":"9", "x":22, "y":2.25}, {"label":"+", "x":23, "y":2.25, "h":2}, + {"label":"4", "x":1, "y":3.25}, {"label":"5", "x":2, "y":3.25}, {"label":"6", "x":3, "y":3.25}, {"label":"Caps Lock", "x":4.5, "y":3.25, "w":1.75}, {"label":"A", "x":6.25, "y":3.25}, {"label":"S", "x":7.25, "y":3.25}, {"label":"D", "x":8.25, "y":3.25}, {"label":"F", "x":9.25, "y":3.25}, {"label":"G", "x":10.25, "y":3.25}, {"label":"H", "x":11.25, "y":3.25}, {"label":"J", "x":12.25, "y":3.25}, {"label":"K", "x":13.25, "y":3.25}, {"label":"L", "x":14.25, "y":3.25}, {"label":":", "x":15.25, "y":3.25}, {"label":"\"", "x":16.25, "y":3.25}, {"label":"Enter", "x":17.25, "y":3.25, "w":2.25}, {"label":"4", "x":20, "y":3.25}, {"label":"5", "x":21, "y":3.25}, {"label":"6", "x":22, "y":3.25}, + {"label":"Enter", "x":0, "y":4.25, "h":2}, {"label":"1", "x":1, "y":4.25}, {"label":"2", "x":2, "y":4.25}, {"label":"3", "x":3, "y":4.25}, {"label":"\\u2191", "x":4.25, "y":4.5}, {"label":"Shift", "x":5.5, "y":4.25, "w":1.25}, {"label":"Z", "x":6.75, "y":4.25}, {"label":"X", "x":7.75, "y":4.25}, {"label":"C", "x":8.75, "y":4.25}, {"label":"V", "x":9.75, "y":4.25}, {"label":"B", "x":10.75, "y":4.25}, {"label":"N", "x":11.75, "y":4.25}, {"label":"M", "x":12.75, "y":4.25}, {"label":"<", "x":13.75, "y":4.25}, {"label":">", "x":14.75, "y":4.25}, {"label":"?", "x":15.75, "y":4.25}, {"label":"Shift", "x":16.75, "y":4.25, "w":1.75}, {"label":"\\u2191", "x":18.75, "y":4.5}, {"label":"1", "x":20, "y":4.25}, {"label":"2", "x":21, "y":4.25}, {"label":"3", "x":22, "y":4.25}, {"label":"Enter", "x":23, "y":4.25, "h":2}, + {"label":"0", "x":1, "y":5.25}, {"label":".", "x":2, "y":5.25}, {"label":"\\u2190", "x":3.25, "y":5.5}, {"label":"\\u2193", "x":4.25, "y":5.5}, {"label":"\\u2192", "x":5.25, "y":5.5}, {"label":"Ctrl", "x":6.5, "y":5.25}, {"label":"Win", "x":7.5, "y":5.25}, {"label":"Alt", "x":8.5, "y":5.25}, {"label":"1u", "x":9.5, "y":5.25}, {"label":"1u", "x":10.5, "y":5.25}, {"label":"1u", "x":11.5, "y":5.25}, {"label":"1u", "x":12.5, "y":5.25}, {"label":"Alt", "x":13.5, "y":5.25}, {"label":"Win", "x":14.5, "y":5.25}, {"label":"Menu", "x":15.5, "y":5.25}, {"label":"Ctrl", "x":16.5, "y":5.25}, {"label":"\\u2190", "x":17.75, "y":5.5}, {"label":"\\u2193", "x":18.75, "y":5.5}, {"label":"\\u2192", "x":19.75, "y":5.5}, {"label":"0", "x":21, "y":5.25}, {"label":".", "x":22, "y":5.25} + ] + }, + "LAYOUT_7u_space": { + "key_count": 121, + "layout": [ + {"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k03", "x":3, "y":0}, {"label":"k04", "x":4.75, "y":0}, {"label":"k06", "x":6.25, "y":0}, {"label":"k07", "x":7.25, "y":0}, {"label":"k08", "x":8.25, "y":0}, {"label":"k09", "x":9.25, "y":0}, {"label":"k0a", "x":10.75, "y":0}, {"label":"k60", "x":11.75, "y":0}, {"label":"k61", "x":12.75, "y":0}, {"label":"k62", "x":13.75, "y":0}, {"label":"k63", "x":15.25, "y":0}, {"label":"k64", "x":16.25, "y":0}, {"label":"k65", "x":17.25, "y":0}, {"label":"k66", "x":18.25, "y":0}, {"label":"k67", "x":20, "y":0}, {"label":"k68", "x":21, "y":0}, {"label":"k69", "x":22, "y":0}, {"label":"k6a", "x":23, "y":0}, + {"label":"k10", "x":0, "y":1.25}, {"label":"k11", "x":1, "y":1.25}, {"label":"k12", "x":2, "y":1.25}, {"label":"k13", "x":3, "y":1.25}, {"label":"k14", "x":4.5, "y":1.25}, {"label":"k15", "x":5.5, "y":1.25}, {"label":"k16", "x":6.5, "y":1.25}, {"label":"k17", "x":7.5, "y":1.25}, {"label":"k18", "x":8.5, "y":1.25}, {"label":"k19", "x":9.5, "y":1.25}, {"label":"k0a", "x":10.5, "y":1.25}, {"label":"k70", "x":11.5, "y":1.25}, {"label":"k71", "x":12.5, "y":1.25}, {"label":"k72", "x":13.5, "y":1.25}, {"label":"k73", "x":14.5, "y":1.25}, {"label":"k74", "x":15.5, "y":1.25}, {"label":"k75", "x":16.5, "y":1.25}, {"label":"k76", "x":17.5, "y":1.25, "w":2}, {"label":"k77", "x":20, "y":1.25}, {"label":"k78", "x":21, "y":1.25}, {"label":"k79", "x":22, "y":1.25}, {"label":"k7a", "x":23, "y":1.25}, + {"label":"k20", "x":0, "y":2.25, "h":2}, {"label":"k21", "x":1, "y":2.25}, {"label":"k22", "x":2, "y":2.25}, {"label":"k23", "x":3, "y":2.25}, {"label":"k24", "x":4.5, "y":2.25, "w":1.5}, {"label":"k25", "x":6, "y":2.25}, {"label":"k26", "x":7, "y":2.25}, {"label":"k27", "x":8, "y":2.25}, {"label":"k28", "x":9, "y":2.25}, {"label":"k29", "x":10, "y":2.25}, {"label":"k2a", "x":11, "y":2.25}, {"label":"k80", "x":12, "y":2.25}, {"label":"k81", "x":13, "y":2.25}, {"label":"k82", "x":14, "y":2.25}, {"label":"k83", "x":15, "y":2.25}, {"label":"k84", "x":16, "y":2.25}, {"label":"k85", "x":17, "y":2.25}, {"label":"k86", "x":18, "y":2.25, "w":1.5}, {"label":"k87", "x":20, "y":2.25}, {"label":"k88", "x":21, "y":2.25}, {"label":"k89", "x":22, "y":2.25}, {"label":"k8a", "x":23, "y":2.25, "h":2}, + {"label":"k31", "x":1, "y":3.25}, {"label":"k32", "x":2, "y":3.25}, {"label":"k33", "x":3, "y":3.25}, {"label":"k34", "x":4.5, "y":3.25, "w":1.75}, {"label":"k35", "x":6.25, "y":3.25}, {"label":"k36", "x":7.25, "y":3.25}, {"label":"k37", "x":8.25, "y":3.25}, {"label":"k38", "x":9.25, "y":3.25}, {"label":"k39", "x":10.25, "y":3.25}, {"label":"k3a", "x":11.25, "y":3.25}, {"label":"k90", "x":12.25, "y":3.25}, {"label":"k91", "x":13.25, "y":3.25}, {"label":"k92", "x":14.25, "y":3.25}, {"label":"k93", "x":15.25, "y":3.25}, {"label":"k94", "x":16.25, "y":3.25}, {"label":"k95", "x":17.25, "y":3.25, "w":2.25}, {"label":"k97", "x":20, "y":3.25}, {"label":"k98", "x":21, "y":3.25}, {"label":"k99", "x":22, "y":3.25}, + {"label":"k40", "x":0, "y":4.25, "h":2}, {"label":"k41", "x":1, "y":4.25}, {"label":"k42", "x":2, "y":4.25}, {"label":"k43", "x":3, "y":4.25}, {"label":"k45", "x":5.5, "y":4.25, "w":1.25}, {"label":"k46", "x":6.75, "y":4.25}, {"label":"k47", "x":7.75, "y":4.25}, {"label":"k48", "x":8.75, "y":4.25}, {"label":"k49", "x":9.75, "y":4.25}, {"label":"k4a", "x":10.75, "y":4.25}, {"label":"ka0", "x":11.75, "y":4.25}, {"label":"ka1", "x":12.75, "y":4.25}, {"label":"ka2", "x":13.75, "y":4.25}, {"label":"ka3", "x":14.75, "y":4.25}, {"label":"ka4", "x":15.75, "y":4.25}, {"label":"ka5", "x":16.75, "y":4.25, "w":1.75}, {"label":"ka7", "x":20, "y":4.25}, {"label":"ka8", "x":21, "y":4.25}, {"label":"ka9", "x":22, "y":4.25}, {"label":"kaa", "x":23, "y":4.25, "h":2}, {"label":"k44", "x":4.25, "y":4.5}, {"label":"k96", "x":18.75, "y":4.5}, + {"label":"k51", "x":1, "y":5.25}, {"label":"k52", "x":2, "y":5.25}, {"label":"k56", "x":6.5, "y":5.25}, {"label":"k57", "x":7.5, "y":5.25}, {"label":"kb0", "x":8.5, "y":5.25, "w":7}, {"label":"kb4", "x":15.5, "y":5.25}, {"label":"kb5", "x":16.5, "y":5.25}, {"label":"kb8", "x":21, "y":5.25}, {"label":"kb9", "x":22, "y":5.25}, {"label":"k53", "x":3.25, "y":5.5}, {"label":"k54", "x":4.25, "y":5.5}, {"label":"k55", "x":5.25, "y":5.5}, {"label":"ka6", "x":17.75, "y":5.5}, {"label":"kb6", "x":18.75, "y":5.5}, {"label":"kb7", "x":19.75, "y":5.5} + ] + }, + "LAYOUT_4u_space": { + "key_count": 124, + "layout": [ + {"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k03", "x":3, "y":0}, {"label":"k04", "x":4.75, "y":0}, {"label":"k06", "x":6.25, "y":0}, {"label":"k07", "x":7.25, "y":0}, {"label":"k08", "x":8.25, "y":0}, {"label":"k09", "x":9.25, "y":0}, {"label":"k0a", "x":10.75, "y":0}, {"label":"k60", "x":11.75, "y":0}, {"label":"k61", "x":12.75, "y":0}, {"label":"k62", "x":13.75, "y":0}, {"label":"k63", "x":15.25, "y":0}, {"label":"k64", "x":16.25, "y":0}, {"label":"k65", "x":17.25, "y":0}, {"label":"k66", "x":18.25, "y":0}, {"label":"k67", "x":20, "y":0}, {"label":"k68", "x":21, "y":0}, {"label":"k69", "x":22, "y":0}, {"label":"k6a", "x":23, "y":0}, + {"label":"k10", "x":0, "y":1.25}, {"label":"k11", "x":1, "y":1.25}, {"label":"k12", "x":2, "y":1.25}, {"label":"k13", "x":3, "y":1.25}, {"label":"k14", "x":4.5, "y":1.25}, {"label":"k15", "x":5.5, "y":1.25}, {"label":"k16", "x":6.5, "y":1.25}, {"label":"k17", "x":7.5, "y":1.25}, {"label":"k18", "x":8.5, "y":1.25}, {"label":"k19", "x":9.5, "y":1.25}, {"label":"k0a", "x":10.5, "y":1.25}, {"label":"k70", "x":11.5, "y":1.25}, {"label":"k71", "x":12.5, "y":1.25}, {"label":"k72", "x":13.5, "y":1.25}, {"label":"k73", "x":14.5, "y":1.25}, {"label":"k74", "x":15.5, "y":1.25}, {"label":"k75", "x":16.5, "y":1.25}, {"label":"k76", "x":17.5, "y":1.25, "w":2}, {"label":"k77", "x":20, "y":1.25}, {"label":"k78", "x":21, "y":1.25}, {"label":"k79", "x":22, "y":1.25}, {"label":"k7a", "x":23, "y":1.25}, + {"label":"k20", "x":0, "y":2.25, "h":2}, {"label":"k21", "x":1, "y":2.25}, {"label":"k22", "x":2, "y":2.25}, {"label":"k23", "x":3, "y":2.25}, {"label":"k24", "x":4.5, "y":2.25, "w":1.5}, {"label":"k25", "x":6, "y":2.25}, {"label":"k26", "x":7, "y":2.25}, {"label":"k27", "x":8, "y":2.25}, {"label":"k28", "x":9, "y":2.25}, {"label":"k29", "x":10, "y":2.25}, {"label":"k2a", "x":11, "y":2.25}, {"label":"k80", "x":12, "y":2.25}, {"label":"k81", "x":13, "y":2.25}, {"label":"k82", "x":14, "y":2.25}, {"label":"k83", "x":15, "y":2.25}, {"label":"k84", "x":16, "y":2.25}, {"label":"k85", "x":17, "y":2.25}, {"label":"k86", "x":18, "y":2.25, "w":1.5}, {"label":"k87", "x":20, "y":2.25}, {"label":"k88", "x":21, "y":2.25}, {"label":"k89", "x":22, "y":2.25}, {"label":"k8a", "x":23, "y":2.25, "h":2}, + {"label":"k31", "x":1, "y":3.25}, {"label":"k32", "x":2, "y":3.25}, {"label":"k33", "x":3, "y":3.25}, {"label":"k34", "x":4.5, "y":3.25, "w":1.75}, {"label":"k35", "x":6.25, "y":3.25}, {"label":"k36", "x":7.25, "y":3.25}, {"label":"k37", "x":8.25, "y":3.25}, {"label":"k38", "x":9.25, "y":3.25}, {"label":"k39", "x":10.25, "y":3.25}, {"label":"k3a", "x":11.25, "y":3.25}, {"label":"k90", "x":12.25, "y":3.25}, {"label":"k91", "x":13.25, "y":3.25}, {"label":"k92", "x":14.25, "y":3.25}, {"label":"k93", "x":15.25, "y":3.25}, {"label":"k94", "x":16.25, "y":3.25}, {"label":"k95", "x":17.25, "y":3.25, "w":2.25}, {"label":"k97", "x":20, "y":3.25}, {"label":"k98", "x":21, "y":3.25}, {"label":"k99", "x":22, "y":3.25}, + {"label":"k40", "x":0, "y":4.25, "h":2}, {"label":"k41", "x":1, "y":4.25}, {"label":"k42", "x":2, "y":4.25}, {"label":"k43", "x":3, "y":4.25}, {"label":"k45", "x":5.5, "y":4.25, "w":1.25}, {"label":"k46", "x":6.75, "y":4.25}, {"label":"k47", "x":7.75, "y":4.25}, {"label":"k48", "x":8.75, "y":4.25}, {"label":"k49", "x":9.75, "y":4.25}, {"label":"k4a", "x":10.75, "y":4.25}, {"label":"ka0", "x":11.75, "y":4.25}, {"label":"ka1", "x":12.75, "y":4.25}, {"label":"ka2", "x":13.75, "y":4.25}, {"label":"ka3", "x":14.75, "y":4.25}, {"label":"ka4", "x":15.75, "y":4.25}, {"label":"ka5", "x":16.75, "y":4.25, "w":1.75}, {"label":"ka7", "x":20, "y":4.25}, {"label":"ka8", "x":21, "y":4.25}, {"label":"ka9", "x":22, "y":4.25}, {"label":"kaa", "x":23, "y":4.25, "h":2}, {"label":"k44", "x":4.25, "y":4.5}, {"label":"k96", "x":18.75, "y":4.5}, + {"label":"k51", "x":1, "y":5.25}, {"label":"k52", "x":2, "y":5.25}, {"label":"k56", "x":6.5, "y":5.25}, {"label":"k57", "x":7.5, "y":5.25}, {"label":"k58", "x":8.5, "y":5.25}, {"label":"kb0", "x":9.5, "y":5.25, "w":4}, {"label":"kb2", "x":13.5, "y":5.25}, {"label":"kb3", "x":14.5, "y":5.25}, {"label":"kb4", "x":15.5, "y":5.25}, {"label":"kb5", "x":16.5, "y":5.25}, {"label":"kb8", "x":21, "y":5.25}, {"label":"kb9", "x":22, "y":5.25}, {"label":"k53", "x":3.25, "y":5.5}, {"label":"k54", "x":4.25, "y":5.5}, {"label":"k55", "x":5.25, "y":5.5}, {"label":"ka6", "x":17.75, "y":5.5}, {"label":"kb6", "x":18.75, "y":5.5}, {"label":"kb7", "x":19.75, "y":5.5} + ] + } + } +} diff --git a/keyboards/clueboard/2x1800/keymaps/default/config.h b/keyboards/clueboard/2x1800/2018/keymaps/default/config.h similarity index 100% rename from keyboards/clueboard/2x1800/keymaps/default/config.h rename to keyboards/clueboard/2x1800/2018/keymaps/default/config.h diff --git a/keyboards/clueboard/2x1800/2018/keymaps/default/keymap.json b/keyboards/clueboard/2x1800/2018/keymaps/default/keymap.json new file mode 100644 index 000000000000..f7316001c36e --- /dev/null +++ b/keyboards/clueboard/2x1800/2018/keymaps/default/keymap.json @@ -0,0 +1,11 @@ +{ + "keyboard":"clueboard/2x1800/2018", + "keymap":"default", + "layout":"LAYOUT", + "layers":[ + ["KC_HOME","KC_END","KC_PGUP","KC_PGDN","KC_ESC","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_PSCR","KC_SLCK","KC_PAUS","KC_INS","KC_PMNS","KC_NLCK","KC_PSLS","KC_PAST","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","KC_NLCK","KC_PSLS","KC_PAST","KC_PMNS","KC_PPLS","KC_P7","KC_P8","KC_P9","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_P7","KC_P8","KC_P9","KC_PSLS","KC_P4","KC_P5","KC_P6","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_P4","KC_P5","KC_P6","KC_PENT","KC_P1","KC_P2","KC_P3","KC_UP","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_SLSH","KC_COMM","KC_DOT","KC_RSFT","KC_UP","KC_P1","KC_P2","KC_P3","KC_PENT","KC_P0","KC_PDOT","KC_LEFT","KC_DOWN","KC_RGHT","KC_LCTL","KC_LGUI","KC_LALT","KC_SPC","KC_SPC","KC_SPC","KC_SPC","KC_RALT","KC_RGUI","KC_APP","KC_RCTL","KC_LEFT","KC_DOWN","KC_RGHT","KC_P0","KC_PDOT"] + ], + "author":"skullydazed", + "notes":"", + "version":1 +} diff --git a/keyboards/clueboard/2x1800/keymaps/default/readme.md b/keyboards/clueboard/2x1800/2018/keymaps/default/readme.md similarity index 100% rename from keyboards/clueboard/2x1800/keymaps/default/readme.md rename to keyboards/clueboard/2x1800/2018/keymaps/default/readme.md diff --git a/keyboards/clueboard/2x1800/keymaps/default_4u/keymap.c b/keyboards/clueboard/2x1800/2018/keymaps/default_4u/keymap.c similarity index 94% rename from keyboards/clueboard/2x1800/keymaps/default_4u/keymap.c rename to keyboards/clueboard/2x1800/2018/keymaps/default_4u/keymap.c index c33dfd31e65d..04fa371b09a7 100644 --- a/keyboards/clueboard/2x1800/keymaps/default_4u/keymap.c +++ b/keyboards/clueboard/2x1800/2018/keymaps/default_4u/keymap.c @@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST, 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, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \ KC_PPLS, KC_P7, KC_P8, KC_P9, 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_P7, KC_P8, KC_P9, KC_PSLS, \ KC_P4, KC_P5, KC_P6, 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_P4, KC_P5, KC_P6, \ - KC_PENT, KC_P1, KC_P2, KC_P3, KC_UP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_SLSH, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, \ + KC_PENT, KC_P1, KC_P2, KC_P3, KC_UP, 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_UP, KC_P1, KC_P2, KC_P3, KC_PENT, \ KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT \ ) }; diff --git a/keyboards/clueboard/2x1800/keymaps/default_4u/readme.md b/keyboards/clueboard/2x1800/2018/keymaps/default_4u/readme.md similarity index 100% rename from keyboards/clueboard/2x1800/keymaps/default_4u/readme.md rename to keyboards/clueboard/2x1800/2018/keymaps/default_4u/readme.md diff --git a/keyboards/clueboard/2x1800/keymaps/default_7u/keymap.c b/keyboards/clueboard/2x1800/2018/keymaps/default_7u/keymap.c similarity index 100% rename from keyboards/clueboard/2x1800/keymaps/default_7u/keymap.c rename to keyboards/clueboard/2x1800/2018/keymaps/default_7u/keymap.c diff --git a/keyboards/clueboard/2x1800/keymaps/default_7u/readme.md b/keyboards/clueboard/2x1800/2018/keymaps/default_7u/readme.md similarity index 100% rename from keyboards/clueboard/2x1800/keymaps/default_7u/readme.md rename to keyboards/clueboard/2x1800/2018/keymaps/default_7u/readme.md diff --git a/keyboards/clueboard/2x1800/keymaps/macroboard/keymap.c b/keyboards/clueboard/2x1800/2018/keymaps/macroboard/keymap.c similarity index 97% rename from keyboards/clueboard/2x1800/keymaps/macroboard/keymap.c rename to keyboards/clueboard/2x1800/2018/keymaps/macroboard/keymap.c index f69ed801e763..ca6be8326e8d 100644 --- a/keyboards/clueboard/2x1800/keymaps/macroboard/keymap.c +++ b/keyboards/clueboard/2x1800/2018/keymaps/macroboard/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { MACRO05, MACRO06, MACRO07, MACRO08, 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, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \ MACRO09, MACRO10, MACRO11, MACRO12, 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_P7, KC_P8, KC_P9, KC_PSLS, \ MACRO13, MACRO14, MACRO15, 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_P4, KC_P5, KC_P6, \ - MACRO16, MACRO17, MACRO18, MACRO19, KC_UP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_SLSH, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, \ + MACRO16, MACRO17, MACRO18, MACRO19, KC_UP, 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_UP, KC_P1, KC_P2, KC_P3, KC_PENT, \ MACRO20, MACRO21, KC_LEFT, KC_DOWN, KC_RGHT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT \ ) }; diff --git a/keyboards/clueboard/2x1800/keymaps/macroboard/readme.md b/keyboards/clueboard/2x1800/2018/keymaps/macroboard/readme.md similarity index 100% rename from keyboards/clueboard/2x1800/keymaps/macroboard/readme.md rename to keyboards/clueboard/2x1800/2018/keymaps/macroboard/readme.md diff --git a/keyboards/clueboard/2x1800/keymaps/mouseboard_left/keymap.c b/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_left/keymap.c similarity index 94% rename from keyboards/clueboard/2x1800/keymaps/mouseboard_left/keymap.c rename to keyboards/clueboard/2x1800/2018/keymaps/mouseboard_left/keymap.c index e0c97aadac01..15c5f6ebb463 100644 --- a/keyboards/clueboard/2x1800/keymaps/mouseboard_left/keymap.c +++ b/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_left/keymap.c @@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_NO, KC_NO, KC_BTN4, KC_BTN5, 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, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \ KC_WH_U, KC_NO, KC_MS_U, 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, KC_P7, KC_P8, KC_P9, KC_PSLS, \ KC_MS_L, KC_BTN3, KC_MS_R, 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_P4, KC_P5, KC_P6, \ - KC_WH_D, KC_BTN1, KC_MS_D, KC_BTN2, KC_UP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_SLSH, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, \ + KC_WH_D, KC_BTN1, KC_MS_D, KC_BTN2, KC_UP, 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_UP, KC_P1, KC_P2, KC_P3, KC_PENT, \ KC_WH_L, KC_WH_R, KC_LEFT, KC_DOWN, KC_RGHT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT \ ) }; diff --git a/keyboards/clueboard/2x1800/keymaps/mouseboard_left/readme.md b/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_left/readme.md similarity index 100% rename from keyboards/clueboard/2x1800/keymaps/mouseboard_left/readme.md rename to keyboards/clueboard/2x1800/2018/keymaps/mouseboard_left/readme.md diff --git a/keyboards/clueboard/2x1800/keymaps/mouseboard_right/keymap.c b/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_right/keymap.c similarity index 94% rename from keyboards/clueboard/2x1800/keymaps/mouseboard_right/keymap.c rename to keyboards/clueboard/2x1800/2018/keymaps/mouseboard_right/keymap.c index d140f5d74eff..3e66342499db 100644 --- a/keyboards/clueboard/2x1800/keymaps/mouseboard_right/keymap.c +++ b/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_right/keymap.c @@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST, 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, KC_NO, KC_ACL0, KC_ACL1, KC_ACL2, \ KC_PPLS, KC_P7, KC_P8, KC_P9, 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_NO, KC_MS_U, KC_NO, KC_WH_U, \ KC_P4, KC_P5, KC_P6, 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_MS_L, KC_BTN3, KC_MS_R, \ - KC_PENT, KC_P1, KC_P2, KC_P3, KC_UP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_SLSH, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_BTN1, KC_MS_D, KC_BTN2, KC_WH_D, \ + KC_PENT, KC_P1, KC_P2, KC_P3, KC_UP, 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_UP, KC_BTN1, KC_MS_D, KC_BTN2, KC_WH_D, \ KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_WH_L, KC_WH_R \ ) }; diff --git a/keyboards/clueboard/2x1800/keymaps/mouseboard_right/readme.md b/keyboards/clueboard/2x1800/2018/keymaps/mouseboard_right/readme.md similarity index 100% rename from keyboards/clueboard/2x1800/keymaps/mouseboard_right/readme.md rename to keyboards/clueboard/2x1800/2018/keymaps/mouseboard_right/readme.md diff --git a/keyboards/clueboard/2x1800/2018/readme.md b/keyboards/clueboard/2x1800/2018/readme.md new file mode 100644 index 000000000000..df4412de4d32 --- /dev/null +++ b/keyboards/clueboard/2x1800/2018/readme.md @@ -0,0 +1,13 @@ +# Clueboard 2x1800 + +Clueboard Double 1800 All The Way + +* Keyboard Maintainer: [Zach White](https://github.com/skullydazed) +* Hardware Supported: Clueboard 2x1800 PCB +* Hardware Availability: 2018 Apr 1 Group Buy + +Make example for this keyboard: + + make clueboard/2x1800/2018:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/clueboard/2x1800/rules.mk b/keyboards/clueboard/2x1800/2018/rules.mk similarity index 100% rename from keyboards/clueboard/2x1800/rules.mk rename to keyboards/clueboard/2x1800/2018/rules.mk diff --git a/keyboards/clueboard/2x1800/2019/2019.c b/keyboards/clueboard/2x1800/2019/2019.c new file mode 100644 index 000000000000..29f7a4901ceb --- /dev/null +++ b/keyboards/clueboard/2x1800/2019/2019.c @@ -0,0 +1,182 @@ +/* Copyright 2017 Zach White + * + * 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 . + */ +#include "2019.h" + +void matrix_init_kb(void) { + // Set our LED pins as output + setPinOutput(D6); + setPinOutput(B4); + setPinOutput(B5); + setPinOutput(B6); + + // Set our Tilt Sensor pins as input + setPinInputHigh(SHAKE_PIN_A); + setPinInputHigh(SHAKE_PIN_B); + + // Run the keymap level init + matrix_init_user(); +} + +#ifdef DRAWING_ENABLE +bool drawing_mode = false; +bool btn1_pressed = false; +bool btn2_pressed = false; +bool btn3_pressed = false; +bool btn4_pressed = false; + +void check_encoder_buttons(void) { + if (btn1_pressed && btn2_pressed && btn3_pressed && btn4_pressed) { + // All 4 buttons pressed, toggle drawing mode + if (drawing_mode) { + dprintf("Turning drawing mode off.\n"); + drawing_mode = false; + writePinLow(D6); + unregister_code(KC_BTN1); + } else { + dprintf("Turning drawing mode on.\n"); + drawing_mode = true; + writePinHigh(D6); + register_code(KC_BTN1); + } + } +} +#endif + +#ifdef SHAKE_ENABLE +uint8_t tilt_state = 0x11; +uint8_t detected_shakes = 0; +static uint16_t shake_timer; +#endif + +void matrix_scan_kb(void) { +#ifdef SHAKE_ENABLE + // Read the current state of the tilt sensor. It is physically + // impossible for both pins to register a low state at the same time. + uint8_t tilt_read = (readPin(SHAKE_PIN_A) << 4) | readPin(SHAKE_PIN_B); + + // Check to see if the tilt sensor has changed state since our last read + if (tilt_state != tilt_read) { + shake_timer = timer_read(); + detected_shakes++; + tilt_state = tilt_read; + } + + if ((detected_shakes > 0) && (timer_elapsed(shake_timer) > SHAKE_TIMEOUT)) { + if (detected_shakes > SHAKE_COUNT) { + dprintf("Shake triggered! We detected %d shakes.\n", detected_shakes); + tap_code16(SHAKE_KEY); + } else { + dprintf("Shake not triggered! We detected %d shakes.\n", detected_shakes); + } + detected_shakes = 0; + } +#endif + + matrix_scan_user(); +} + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { +#ifdef DRAWING_ENABLE + if (keycode == ENC_BTN1) { + if (record->event.pressed) { + btn1_pressed = true; + register_code(KC_BTN1); + } else { + btn1_pressed = false; + unregister_code(KC_BTN1); + } + } + if (keycode == ENC_BTN2) { + if (record->event.pressed) { + btn2_pressed = true; + register_code(KC_BTN2); + } else { + btn2_pressed = false; + unregister_code(KC_BTN2); + } + } + if (keycode == ENC_BTN3) { + if (record->event.pressed) { + btn3_pressed = true; + register_code(KC_BTN3); + } else { + btn3_pressed = false; + unregister_code(KC_BTN3); + } + } + if (keycode == ENC_BTN4) { + if (record->event.pressed) { + btn4_pressed = true; + register_code(KC_BTN4); + } else { + btn4_pressed = false; + unregister_code(KC_BTN4); + } + } + + check_encoder_buttons(); +#endif + + return process_record_user(keycode, record); +} + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if(res) { + writePin(B4, !led_state.num_lock); + writePin(B5, !led_state.caps_lock); + writePin(B6, !led_state.scroll_lock); + } + + return res; +} + +__attribute__ ((weak)) +bool encoder_update_keymap(int8_t index, bool clockwise) { + return false; +} + +void encoder_update_kb(int8_t index, bool clockwise) { + if (!encoder_update_keymap(index, clockwise)) { + // Encoder 1, outside left + if (index == 0 && clockwise) { + tap_code(KC_MS_U); // turned right + } else if (index == 0) { + tap_code(KC_MS_D); // turned left + } + + // Encoder 2, inside left + else if (index == 1 && clockwise) { + tap_code(KC_WH_D); // turned right + } else if (index == 1) { + tap_code(KC_WH_U); // turned left + } + + // Encoder 3, inside right + else if (index == 2 && clockwise) { + tap_code(KC_VOLU); // turned right + } else if (index == 2) { + tap_code(KC_VOLD); // turned left + } + + // Encoder 4, outside right + else if (index == 3 && clockwise) { + tap_code(KC_MS_R); // turned right + } else if (index == 3) { + tap_code(KC_MS_L); // turned left + } + } +} diff --git a/keyboards/clueboard/2x1800/2019/2019.h b/keyboards/clueboard/2x1800/2019/2019.h new file mode 100644 index 000000000000..b9151071fdc8 --- /dev/null +++ b/keyboards/clueboard/2x1800/2019/2019.h @@ -0,0 +1,257 @@ +/* Copyright 2017 Zach White + * + * 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 . + */ +#pragma once + +#include "quantum.h" + +enum TWOx1800_keycodes { + ENC_BTN1 = SAFE_RANGE, + ENC_BTN2, + ENC_BTN3, + ENC_BTN4, + NEW_SAFE_RANGE +}; + +#undef SAFE_RANGE +#define SAFE_RANGE NEW_SAFE_RANGE + +// This a shortcut to help you visually see your layout. +// The first section contains all of the arguments +// The second converts the arguments into a two-dimensional array +#define LAYOUT_all( \ + e00, e01, e02, e03, \ + k00, k01, k02, k03, k04, k06, k07, k08, k09, k0a, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8a, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k90, k91, k92, k93, k94, k9a, k95, k97, k98, k99, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, ka0, ka1, ka2, ka3, ka4, ka5, k96, ka7, ka8, ka9, kaa, \ + k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, kb0, kb1, kb2, kb3, kb4, kb5, ka6, kb6, kb7, kb8, kb9 \ +) { \ + { k00, k01, k02, k03, k04, KC_NO, k06, k07, k08, k09, k0a }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a }, \ + { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a }, \ + { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a }, \ + { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a }, \ + { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a }, \ + { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8a }, \ + { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9a }, \ + { ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7, ka8, ka9, kaa }, \ + { kb0, kb1, kb2, kb3, kb4, kb5, kb6, kb7, kb8, kb9, KC_NO }, \ + { KC_NO, KC_NO, KC_NO, e00, e01, KC_NO, KC_NO, KC_NO, KC_NO, e02, e03 } \ +} + +#define LAYOUT_1u_ansi( \ + e00, e01, e02, e03, \ + k00, k01, k02, k03, k04, k06, k07, k08, k09, k0a, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8a, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k90, k91, k92, k93, k94, k95, k97, k98, k99, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, ka0, ka1, ka2, ka3, ka4, ka5, k96, ka7, ka8, ka9, kaa, \ + k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, kb0, kb1, kb2, kb3, kb4, kb5, ka6, kb6, kb7, kb8, kb9 \ +) { \ + { k00, k01, k02, k03, k04, KC_NO, k06, k07, k08, k09, k0a }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a }, \ + { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a }, \ + { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a }, \ + { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a }, \ + { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a }, \ + { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8a }, \ + { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, KC_NO }, \ + { ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7, ka8, ka9, kaa }, \ + { kb0, kb1, kb2, kb3, kb4, kb5, kb6, kb7, kb8, kb9, KC_NO }, \ + { KC_NO, KC_NO, KC_NO, e00, e01, KC_NO, KC_NO, KC_NO, KC_NO, e02, e03 } \ +} + +#define LAYOUT_1u_iso( \ + e00, e01, e02, e03, \ + k00, k01, k02, k03, k04, k06, k07, k08, k09, k0a, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k80, k81, k82, k83, k84, k85, k87, k88, k89, k8a, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k90, k91, k92, k93, k94, k9a, k95, k97, k98, k99, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, ka0, ka1, ka2, ka3, ka4, ka5, k96, ka7, ka8, ka9, kaa, \ + k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, kb0, kb1, kb2, kb3, kb4, kb5, ka6, kb6, kb7, kb8, kb9 \ +) { \ + { k00, k01, k02, k03, k04, KC_NO, k06, k07, k08, k09, k0a }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a }, \ + { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a }, \ + { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a }, \ + { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a }, \ + { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a }, \ + { k80, k81, k82, k83, k84, k85, KC_NO, k87, k88, k89, k8a }, \ + { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9a }, \ + { ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7, ka8, ka9, kaa }, \ + { kb0, kb1, kb2, kb3, kb4, kb5, kb6, kb7, kb8, kb9, KC_NO }, \ + { KC_NO, KC_NO, KC_NO, e00, e01, KC_NO, KC_NO, KC_NO, KC_NO, e02, e03 } \ +} + +#define LAYOUT_2u_ansi( \ + e00, e01, e02, e03, \ + k00, k01, k02, k03, k04, k06, k07, k08, k09, k0a, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8a, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k90, k91, k92, k93, k94, k95, k97, k98, k99, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, ka0, ka1, ka2, ka3, ka4, ka5, k96, ka7, ka8, ka9, kaa, \ + k51, k52, k53, k54, k55, k56, k57, k58, k59, kb0, kb1, kb2, kb3, kb4, kb5, ka6, kb6, kb7, kb8, kb9 \ +) { \ + { k00, k01, k02, k03, k04, KC_NO, k06, k07, k08, k09, k0a }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a }, \ + { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a }, \ + { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, KC_NO }, \ + { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a }, \ + { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a }, \ + { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8a }, \ + { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, KC_NO }, \ + { ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7, ka8, ka9, kaa }, \ + { kb0, kb1, kb2, kb3, kb4, kb5, kb6, kb7, kb8, kb9, KC_NO }, \ + { KC_NO, KC_NO, KC_NO, e00, e01, KC_NO, KC_NO, KC_NO, KC_NO, e02, e03 } \ +} + +#define LAYOUT_2u_iso( \ + e00, e01, e02, e03, \ + k00, k01, k02, k03, k04, k06, k07, k08, k09, k0a, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k80, k81, k82, k83, k84, k85, k87, k88, k89, k8a, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k90, k91, k92, k93, k94, k9a, k95, k97, k98, k99, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, ka0, ka1, ka2, ka3, ka4, ka5, k96, ka7, ka8, ka9, kaa, \ + k51, k52, k53, k54, k55, k56, k57, k58, k59, kb0, kb1, kb2, kb3, kb4, kb5, ka6, kb6, kb7, kb8, kb9 \ +) { \ + { k00, k01, k02, k03, k04, KC_NO, k06, k07, k08, k09, k0a }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a }, \ + { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a }, \ + { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, KC_NO }, \ + { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a }, \ + { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a }, \ + { k80, k81, k82, k83, k84, k85, KC_NO, k87, k88, k89, k8a }, \ + { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9a }, \ + { ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7, ka8, ka9, kaa }, \ + { kb0, kb1, kb2, kb3, kb4, kb5, kb6, kb7, kb8, kb9, KC_NO }, \ + { KC_NO, KC_NO, KC_NO, e00, e01, KC_NO, KC_NO, KC_NO, KC_NO, e02, e03 } \ +} + +#define LAYOUT_4u_ansi( \ + e00, e01, e02, e03, \ + k00, k01, k02, k03, k04, k06, k07, k08, k09, k0a, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8a, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k90, k91, k92, k93, k94, k95, k97, k98, k99, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, ka0, ka1, ka2, ka3, ka4, ka5, k96, ka7, ka8, ka9, kaa, \ + k51, k52, k53, k54, k55, k56, k57, k58, kb0, kb2, kb3, kb4, kb5, ka6, kb6, kb7, kb8, kb9 \ +) { \ + { k00, k01, k02, k03, k04, KC_NO, k06, k07, k08, k09, k0a }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a }, \ + { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a }, \ + { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, KC_NO, KC_NO }, \ + { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a }, \ + { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a }, \ + { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8a }, \ + { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, KC_NO }, \ + { ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7, ka8, ka9, kaa }, \ + { kb0, KC_NO, kb2, kb3, kb4, kb5, kb6, kb7, kb8, kb9, KC_NO }, \ + { KC_NO, KC_NO, KC_NO, e00, e01, KC_NO, KC_NO, KC_NO, KC_NO, e02, e03 } \ +} + +#define LAYOUT_4u_iso( \ + e00, e01, e02, e03, \ + k00, k01, k02, k03, k04, k06, k07, k08, k09, k0a, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k80, k81, k82, k83, k84, k85, k87, k88, k89, k8a, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k90, k91, k92, k93, k94, k9a, k95, k97, k98, k99, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, ka0, ka1, ka2, ka3, ka4, ka5, k96, ka7, ka8, ka9, kaa, \ + k51, k52, k53, k54, k55, k56, k57, k58, kb0, kb2, kb3, kb4, kb5, ka6, kb6, kb7, kb8, kb9 \ +) { \ + { k00, k01, k02, k03, k04, KC_NO, k06, k07, k08, k09, k0a }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a }, \ + { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a }, \ + { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, KC_NO, KC_NO }, \ + { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a }, \ + { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a }, \ + { k80, k81, k82, k83, k84, k85, KC_NO, k87, k88, k89, k8a }, \ + { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9a }, \ + { ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7, ka8, ka9, kaa }, \ + { kb0, KC_NO, kb2, kb3, kb4, kb5, kb6, kb7, kb8, kb9, KC_NO }, \ + { KC_NO, KC_NO, KC_NO, e00, e01, KC_NO, KC_NO, KC_NO, KC_NO, e02, e03 } \ +} + +#define LAYOUT_7u_ansi( \ + e00, e01, e02, e03, \ + k00, k01, k02, k03, k04, k06, k07, k08, k09, k0a, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8a, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k90, k91, k92, k93, k94, k95, k97, k98, k99, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, ka0, ka1, ka2, ka3, ka4, ka5, k96, ka7, ka8, ka9, kaa, \ + k51, k52, k53, k54, k55, k56, k57, kb0, kb4, kb5, ka6, kb6, kb7, kb8, kb9 \ +) { \ + { k00, k01, k02, k03, k04, KC_NO, k06, k07, k08, k09, k0a }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a }, \ + { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a }, \ + { KC_NO, k51, k52, k53, k54, k55, k56, k57, KC_NO, KC_NO, KC_NO }, \ + { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a }, \ + { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a }, \ + { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8a }, \ + { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, KC_NO }, \ + { ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7, ka8, ka9, kaa }, \ + { kb0, KC_NO, KC_NO, KC_NO, kb4, kb5, kb6, kb7, kb8, kb9, KC_NO }, \ + { KC_NO, KC_NO, KC_NO, e00, e01, KC_NO, KC_NO, KC_NO, KC_NO, e02, e03 } \ +} + +#define LAYOUT_7u_iso( \ + e00, e01, e02, e03, \ + k00, k01, k02, k03, k04, k06, k07, k08, k09, k0a, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k80, k81, k82, k83, k84, k85, k87, k88, k89, k8a, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k90, k91, k92, k93, k94, k9a, k95, k97, k98, k99, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, ka0, ka1, ka2, ka3, ka4, ka5, k96, ka7, ka8, ka9, kaa, \ + k51, k52, k53, k54, k55, k56, k57, kb0, kb4, kb5, ka6, kb6, kb7, kb8, kb9 \ +) { \ + { k00, k01, k02, k03, k04, KC_NO, k06, k07, k08, k09, k0a }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a }, \ + { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a }, \ + { KC_NO, k51, k52, k53, k54, k55, k56, k57, KC_NO, KC_NO, KC_NO }, \ + { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a }, \ + { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a }, \ + { k80, k81, k82, k83, k84, k85, KC_NO, k87, k88, k89, k8a }, \ + { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9a }, \ + { ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7, ka8, ka9, kaa }, \ + { kb0, KC_NO, KC_NO, KC_NO, kb4, kb5, kb6, kb7, kb8, kb9, KC_NO }, \ + { KC_NO, KC_NO, KC_NO, e00, e01, KC_NO, KC_NO, KC_NO, KC_NO, e02, e03 } \ +} + +#define LAYOUT LAYOUT_all + +// Encoder update function that returns true/false +__attribute__ ((weak)) +bool encoder_update_keymap(int8_t index, bool clockwise); + +// Encoder button combo check +void check_encoder_buttons(void); diff --git a/keyboards/clueboard/2x1800/2019/config.h b/keyboards/clueboard/2x1800/2019/config.h new file mode 100644 index 000000000000..b9e087f62add --- /dev/null +++ b/keyboards/clueboard/2x1800/2019/config.h @@ -0,0 +1,214 @@ +/* +Copyright 2017 Zach White + +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 . +*/ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xC1ED +#define PRODUCT_ID 0x23A0 +#define DEVICE_VER 0x0002 +#define MANUFACTURER Clueboard +#define PRODUCT 2x1800 2019 +#define DESCRIPTION Mechanical Drawing Toy Edition + +/* key matrix size */ +#define MATRIX_ROWS 13 +#define MATRIX_COLS 11 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * +*/ +#define MATRIX_ROW_PINS { C0, C1, C2, C3, C7, F7, B1, F2, F3, F4, F5, F6, C6 } +#define MATRIX_COL_PINS { D2, D3, D4, D5, D7, E0, E1, B0, E6, B3, B2 } +#define UNUSED_PINS { D0, D1, D6, C5, E7, F0, F1 } + +#define ENCODERS_PAD_A { A5, A4, A2, A1 } +#define ENCODERS_PAD_B { A6, A7, A3, A0 } +#define ENCODER_RESOLUTION 4 + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION ROW2COL + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* audio support */ +#define B7_AUDIO +#define C4_AUDIO +#define AUDIO_CLICKY + +/* number of backlight levels */ +// #define BACKLIGHT_PIN B7 +// #define BACKLIGHT_BREATHING +// #define BACKLIGHT_LEVELS 3 + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +#define RGB_DI_PIN C5 +#define RGBLIGHT_ANIMATIONS +#define RGBLED_NUM 16 +#define RGBLIGHT_HUE_STEP 8 +#define RGBLIGHT_SAT_STEP 8 +#define RGBLIGHT_VAL_STEP 8 + +/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. + * This is userful for the Windows task manager shortcut (ctrl+shift+esc). + */ +// #define GRAVE_ESC_CTRL_OVERRIDE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Magic Key Options + * + * Magic keys are hotkey commands that allow control over firmware functions of + * the keyboard. They are best used in combination with the HID Listen program, + * found here: https://www.pjrc.com/teensy/hid_listen.html + * + * The options below allow the magic key functionality to be changed. This is + * useful if your keyboard/keypad is missing keys and you want magic key support. + * + */ + +/* control how magic key switches layers */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false + +/* override magic key keymap */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM +//#define MAGIC_KEY_HELP1 H +//#define MAGIC_KEY_HELP2 SLASH +//#define MAGIC_KEY_DEBUG D +//#define MAGIC_KEY_DEBUG_MATRIX X +//#define MAGIC_KEY_DEBUG_KBD K +//#define MAGIC_KEY_DEBUG_MOUSE M +//#define MAGIC_KEY_VERSION V +//#define MAGIC_KEY_STATUS S +//#define MAGIC_KEY_CONSOLE C +//#define MAGIC_KEY_LAYER0_ALT1 ESC +//#define MAGIC_KEY_LAYER0_ALT2 GRAVE +//#define MAGIC_KEY_LAYER0 0 +//#define MAGIC_KEY_LAYER1 1 +//#define MAGIC_KEY_LAYER2 2 +//#define MAGIC_KEY_LAYER3 3 +//#define MAGIC_KEY_LAYER4 4 +//#define MAGIC_KEY_LAYER5 5 +//#define MAGIC_KEY_LAYER6 6 +//#define MAGIC_KEY_LAYER7 7 +//#define MAGIC_KEY_LAYER8 8 +//#define MAGIC_KEY_LAYER9 9 +//#define MAGIC_KEY_BOOTLOADER PAUSE +//#define MAGIC_KEY_LOCK CAPS +//#define MAGIC_KEY_EEPROM E +//#define MAGIC_KEY_NKRO N +//#define MAGIC_KEY_SLEEP_LED Z + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION + +/* + * MIDI options + */ + +/* Prevent use of disabled MIDI features in the keymap */ +//#define MIDI_ENABLE_STRICT 1 + +/* enable basic MIDI features: + - MIDI notes can be sent when in Music mode is on +*/ +//#define MIDI_BASIC + +/* enable advanced MIDI features: + - MIDI notes can be added to the keymap + - Octave shift and transpose + - Virtual sustain, portamento, and modulation wheel + - etc. +*/ +//#define MIDI_ADVANCED + +/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ +//#define MIDI_TONE_KEYCODE_OCTAVES 1 + +/* + * Drawing mode + */ +#define DRAWING_ENABLE +//#define UNDO_KEY LGUI(KC_Z) // What key to send for undo +//#define UNDO_KEY LCTL(KC_Z) +#define UNDO_KEY LGUI(KC_SLSH) + +/* + * Shake to undo configuration + */ +#define SHAKE_ENABLE +#define SHAKE_PIN_A E4 +#define SHAKE_PIN_B E5 +#define SHAKE_TIMEOUT 500 // How long after shaking stops before we register it +#define SHAKE_COUNT 8 // How many shakes it takes to activate +#define SHAKE_KEY UNDO_KEY // What key to send after a shake diff --git a/keyboards/clueboard/2x1800/2019/info.json b/keyboards/clueboard/2x1800/2019/info.json new file mode 100644 index 000000000000..0e3bb36a9d88 --- /dev/null +++ b/keyboards/clueboard/2x1800/2019/info.json @@ -0,0 +1,42 @@ +{ + "keyboard_name": "Clueboard 2x1800", + "url": "", + "maintainer": "skullydazed", + "width": 24, + "height": 6.5, + "layouts": { + "LAYOUT": { + "key_count": 127, + "layout": [ + {"label":"Home", "x":0, "y":0}, {"label":"End", "x":1, "y":0}, {"label":"PgUp", "x":2, "y":0}, {"label":"PgDn", "x":3, "y":0}, {"label":"Esc", "x":4.75, "y":0}, {"label":"F1", "x":6.25, "y":0}, {"label":"F2", "x":7.25, "y":0}, {"label":"F3", "x":8.25, "y":0}, {"label":"F4", "x":9.25, "y":0}, {"label":"F5", "x":10.75, "y":0}, {"label":"F6", "x":11.75, "y":0}, {"label":"F7", "x":12.75, "y":0}, {"label":"F8", "x":13.75, "y":0}, {"label":"F9", "x":15.25, "y":0}, {"label":"F10", "x":16.25, "y":0}, {"label":"F11", "x":17.25, "y":0}, {"label":"F12", "x":18.25, "y":0}, {"label":"PrtSc", "x":20, "y":0}, {"label":"Scroll Lock", "x":21, "y":0}, {"label":"Pause", "x":22, "y":0}, {"label":"Insert", "x":23, "y":0}, + {"label":"-", "x":0, "y":1.25}, {"label":"Num Lock", "x":1, "y":1.25}, {"label":"/", "x":2, "y":1.25}, {"label":"*", "x":3, "y":1.25}, {"label":"~", "x":4.5, "y":1.25}, {"label":"!", "x":5.5, "y":1.25}, {"label":"@", "x":6.5, "y":1.25}, {"label":"#", "x":7.5, "y":1.25}, {"label":"$", "x":8.5, "y":1.25}, {"label":"%", "x":9.5, "y":1.25}, {"label":"^", "x":10.5, "y":1.25}, {"label":"&", "x":11.5, "y":1.25}, {"label":"*", "x":12.5, "y":1.25}, {"label":"(", "x":13.5, "y":1.25}, {"label":")", "x":14.5, "y":1.25}, {"label":"_", "x":15.5, "y":1.25}, {"label":"+", "x":16.5, "y":1.25}, {"label":"Backspace", "x":17.5, "y":1.25, "w":2}, {"label":"Num Lock", "x":20, "y":1.25}, {"label":"/", "x":21, "y":1.25}, {"label":"*", "x":22, "y":1.25}, {"label":"-", "x":23, "y":1.25}, + {"label":"+", "x":0, "y":2.25, "h":2}, {"label":"7", "x":1, "y":2.25}, {"label":"8", "x":2, "y":2.25}, {"label":"9", "x":3, "y":2.25}, {"label":"Tab", "x":4.5, "y":2.25, "w":1.5}, {"label":"Q", "x":6, "y":2.25}, {"label":"W", "x":7, "y":2.25}, {"label":"E", "x":8, "y":2.25}, {"label":"R", "x":9, "y":2.25}, {"label":"T", "x":10, "y":2.25}, {"label":"Y", "x":11, "y":2.25}, {"label":"U", "x":12, "y":2.25}, {"label":"I", "x":13, "y":2.25}, {"label":"O", "x":14, "y":2.25}, {"label":"P", "x":15, "y":2.25}, {"label":"{", "x":16, "y":2.25}, {"label":"}", "x":17, "y":2.25}, {"label":"|", "x":18, "y":2.25, "w":1.5}, {"label":"7", "x":20, "y":2.25}, {"label":"8", "x":21, "y":2.25}, {"label":"9", "x":22, "y":2.25}, {"label":"+", "x":23, "y":2.25, "h":2}, + {"label":"4", "x":1, "y":3.25}, {"label":"5", "x":2, "y":3.25}, {"label":"6", "x":3, "y":3.25}, {"label":"Caps Lock", "x":4.5, "y":3.25, "w":1.75}, {"label":"A", "x":6.25, "y":3.25}, {"label":"S", "x":7.25, "y":3.25}, {"label":"D", "x":8.25, "y":3.25}, {"label":"F", "x":9.25, "y":3.25}, {"label":"G", "x":10.25, "y":3.25}, {"label":"H", "x":11.25, "y":3.25}, {"label":"J", "x":12.25, "y":3.25}, {"label":"K", "x":13.25, "y":3.25}, {"label":"L", "x":14.25, "y":3.25}, {"label":":", "x":15.25, "y":3.25}, {"label":"\"", "x":16.25, "y":3.25}, {"label":"Enter", "x":17.25, "y":3.25, "w":2.25}, {"label":"4", "x":20, "y":3.25}, {"label":"5", "x":21, "y":3.25}, {"label":"6", "x":22, "y":3.25}, + {"label":"Enter", "x":0, "y":4.25, "h":2}, {"label":"1", "x":1, "y":4.25}, {"label":"2", "x":2, "y":4.25}, {"label":"3", "x":3, "y":4.25}, {"label":"\\u2191", "x":4.25, "y":4.5}, {"label":"Shift", "x":5.5, "y":4.25, "w":1.25}, {"label":"Z", "x":6.75, "y":4.25}, {"label":"X", "x":7.75, "y":4.25}, {"label":"C", "x":8.75, "y":4.25}, {"label":"V", "x":9.75, "y":4.25}, {"label":"B", "x":10.75, "y":4.25}, {"label":"N", "x":11.75, "y":4.25}, {"label":"M", "x":12.75, "y":4.25}, {"label":"<", "x":13.75, "y":4.25}, {"label":">", "x":14.75, "y":4.25}, {"label":"?", "x":15.75, "y":4.25}, {"label":"Shift", "x":16.75, "y":4.25, "w":1.75}, {"label":"\\u2191", "x":18.75, "y":4.5}, {"label":"1", "x":20, "y":4.25}, {"label":"2", "x":21, "y":4.25}, {"label":"3", "x":22, "y":4.25}, {"label":"Enter", "x":23, "y":4.25, "h":2}, + {"label":"0", "x":1, "y":5.25}, {"label":".", "x":2, "y":5.25}, {"label":"\\u2190", "x":3.25, "y":5.5}, {"label":"\\u2193", "x":4.25, "y":5.5}, {"label":"\\u2192", "x":5.25, "y":5.5}, {"label":"Ctrl", "x":6.5, "y":5.25}, {"label":"Win", "x":7.5, "y":5.25}, {"label":"Alt", "x":8.5, "y":5.25}, {"label":"1u", "x":9.5, "y":5.25}, {"label":"1u", "x":10.5, "y":5.25}, {"label":"1u", "x":11.5, "y":5.25}, {"label":"1u", "x":12.5, "y":5.25}, {"label":"Alt", "x":13.5, "y":5.25}, {"label":"Win", "x":14.5, "y":5.25}, {"label":"Menu", "x":15.5, "y":5.25}, {"label":"Ctrl", "x":16.5, "y":5.25}, {"label":"\\u2190", "x":17.75, "y":5.5}, {"label":"\\u2193", "x":18.75, "y":5.5}, {"label":"\\u2192", "x":19.75, "y":5.5}, {"label":"0", "x":21, "y":5.25}, {"label":".", "x":22, "y":5.25} + ] + }, + "LAYOUT_7u_space": { + "key_count": 121, + "layout": [ + {"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k03", "x":3, "y":0}, {"label":"k04", "x":4.75, "y":0}, {"label":"k06", "x":6.25, "y":0}, {"label":"k07", "x":7.25, "y":0}, {"label":"k08", "x":8.25, "y":0}, {"label":"k09", "x":9.25, "y":0}, {"label":"k0a", "x":10.75, "y":0}, {"label":"k60", "x":11.75, "y":0}, {"label":"k61", "x":12.75, "y":0}, {"label":"k62", "x":13.75, "y":0}, {"label":"k63", "x":15.25, "y":0}, {"label":"k64", "x":16.25, "y":0}, {"label":"k65", "x":17.25, "y":0}, {"label":"k66", "x":18.25, "y":0}, {"label":"k67", "x":20, "y":0}, {"label":"k68", "x":21, "y":0}, {"label":"k69", "x":22, "y":0}, {"label":"k6a", "x":23, "y":0}, + {"label":"k10", "x":0, "y":1.25}, {"label":"k11", "x":1, "y":1.25}, {"label":"k12", "x":2, "y":1.25}, {"label":"k13", "x":3, "y":1.25}, {"label":"k14", "x":4.5, "y":1.25}, {"label":"k15", "x":5.5, "y":1.25}, {"label":"k16", "x":6.5, "y":1.25}, {"label":"k17", "x":7.5, "y":1.25}, {"label":"k18", "x":8.5, "y":1.25}, {"label":"k19", "x":9.5, "y":1.25}, {"label":"k0a", "x":10.5, "y":1.25}, {"label":"k70", "x":11.5, "y":1.25}, {"label":"k71", "x":12.5, "y":1.25}, {"label":"k72", "x":13.5, "y":1.25}, {"label":"k73", "x":14.5, "y":1.25}, {"label":"k74", "x":15.5, "y":1.25}, {"label":"k75", "x":16.5, "y":1.25}, {"label":"k76", "x":17.5, "y":1.25, "w":2}, {"label":"k77", "x":20, "y":1.25}, {"label":"k78", "x":21, "y":1.25}, {"label":"k79", "x":22, "y":1.25}, {"label":"k7a", "x":23, "y":1.25}, + {"label":"k20", "x":0, "y":2.25, "h":2}, {"label":"k21", "x":1, "y":2.25}, {"label":"k22", "x":2, "y":2.25}, {"label":"k23", "x":3, "y":2.25}, {"label":"k24", "x":4.5, "y":2.25, "w":1.5}, {"label":"k25", "x":6, "y":2.25}, {"label":"k26", "x":7, "y":2.25}, {"label":"k27", "x":8, "y":2.25}, {"label":"k28", "x":9, "y":2.25}, {"label":"k29", "x":10, "y":2.25}, {"label":"k2a", "x":11, "y":2.25}, {"label":"k80", "x":12, "y":2.25}, {"label":"k81", "x":13, "y":2.25}, {"label":"k82", "x":14, "y":2.25}, {"label":"k83", "x":15, "y":2.25}, {"label":"k84", "x":16, "y":2.25}, {"label":"k85", "x":17, "y":2.25}, {"label":"k86", "x":18, "y":2.25, "w":1.5}, {"label":"k87", "x":20, "y":2.25}, {"label":"k88", "x":21, "y":2.25}, {"label":"k89", "x":22, "y":2.25}, {"label":"k8a", "x":23, "y":2.25, "h":2}, + {"label":"k31", "x":1, "y":3.25}, {"label":"k32", "x":2, "y":3.25}, {"label":"k33", "x":3, "y":3.25}, {"label":"k34", "x":4.5, "y":3.25, "w":1.75}, {"label":"k35", "x":6.25, "y":3.25}, {"label":"k36", "x":7.25, "y":3.25}, {"label":"k37", "x":8.25, "y":3.25}, {"label":"k38", "x":9.25, "y":3.25}, {"label":"k39", "x":10.25, "y":3.25}, {"label":"k3a", "x":11.25, "y":3.25}, {"label":"k90", "x":12.25, "y":3.25}, {"label":"k91", "x":13.25, "y":3.25}, {"label":"k92", "x":14.25, "y":3.25}, {"label":"k93", "x":15.25, "y":3.25}, {"label":"k94", "x":16.25, "y":3.25}, {"label":"k95", "x":17.25, "y":3.25, "w":2.25}, {"label":"k97", "x":20, "y":3.25}, {"label":"k98", "x":21, "y":3.25}, {"label":"k99", "x":22, "y":3.25}, + {"label":"k40", "x":0, "y":4.25, "h":2}, {"label":"k41", "x":1, "y":4.25}, {"label":"k42", "x":2, "y":4.25}, {"label":"k43", "x":3, "y":4.25}, {"label":"k45", "x":5.5, "y":4.25, "w":1.25}, {"label":"k46", "x":6.75, "y":4.25}, {"label":"k47", "x":7.75, "y":4.25}, {"label":"k48", "x":8.75, "y":4.25}, {"label":"k49", "x":9.75, "y":4.25}, {"label":"k4a", "x":10.75, "y":4.25}, {"label":"ka0", "x":11.75, "y":4.25}, {"label":"ka1", "x":12.75, "y":4.25}, {"label":"ka2", "x":13.75, "y":4.25}, {"label":"ka3", "x":14.75, "y":4.25}, {"label":"ka4", "x":15.75, "y":4.25}, {"label":"ka5", "x":16.75, "y":4.25, "w":1.75}, {"label":"ka7", "x":20, "y":4.25}, {"label":"ka8", "x":21, "y":4.25}, {"label":"ka9", "x":22, "y":4.25}, {"label":"kaa", "x":23, "y":4.25, "h":2}, {"label":"k44", "x":4.25, "y":4.5}, {"label":"k96", "x":18.75, "y":4.5}, + {"label":"k51", "x":1, "y":5.25}, {"label":"k52", "x":2, "y":5.25}, {"label":"k56", "x":6.5, "y":5.25}, {"label":"k57", "x":7.5, "y":5.25}, {"label":"kb0", "x":8.5, "y":5.25, "w":7}, {"label":"kb4", "x":15.5, "y":5.25}, {"label":"kb5", "x":16.5, "y":5.25}, {"label":"kb8", "x":21, "y":5.25}, {"label":"kb9", "x":22, "y":5.25}, {"label":"k53", "x":3.25, "y":5.5}, {"label":"k54", "x":4.25, "y":5.5}, {"label":"k55", "x":5.25, "y":5.5}, {"label":"ka6", "x":17.75, "y":5.5}, {"label":"kb6", "x":18.75, "y":5.5}, {"label":"kb7", "x":19.75, "y":5.5} + ] + }, + "LAYOUT_4u_space": { + "key_count": 124, + "layout": [ + {"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k03", "x":3, "y":0}, {"label":"k04", "x":4.75, "y":0}, {"label":"k06", "x":6.25, "y":0}, {"label":"k07", "x":7.25, "y":0}, {"label":"k08", "x":8.25, "y":0}, {"label":"k09", "x":9.25, "y":0}, {"label":"k0a", "x":10.75, "y":0}, {"label":"k60", "x":11.75, "y":0}, {"label":"k61", "x":12.75, "y":0}, {"label":"k62", "x":13.75, "y":0}, {"label":"k63", "x":15.25, "y":0}, {"label":"k64", "x":16.25, "y":0}, {"label":"k65", "x":17.25, "y":0}, {"label":"k66", "x":18.25, "y":0}, {"label":"k67", "x":20, "y":0}, {"label":"k68", "x":21, "y":0}, {"label":"k69", "x":22, "y":0}, {"label":"k6a", "x":23, "y":0}, + {"label":"k10", "x":0, "y":1.25}, {"label":"k11", "x":1, "y":1.25}, {"label":"k12", "x":2, "y":1.25}, {"label":"k13", "x":3, "y":1.25}, {"label":"k14", "x":4.5, "y":1.25}, {"label":"k15", "x":5.5, "y":1.25}, {"label":"k16", "x":6.5, "y":1.25}, {"label":"k17", "x":7.5, "y":1.25}, {"label":"k18", "x":8.5, "y":1.25}, {"label":"k19", "x":9.5, "y":1.25}, {"label":"k0a", "x":10.5, "y":1.25}, {"label":"k70", "x":11.5, "y":1.25}, {"label":"k71", "x":12.5, "y":1.25}, {"label":"k72", "x":13.5, "y":1.25}, {"label":"k73", "x":14.5, "y":1.25}, {"label":"k74", "x":15.5, "y":1.25}, {"label":"k75", "x":16.5, "y":1.25}, {"label":"k76", "x":17.5, "y":1.25, "w":2}, {"label":"k77", "x":20, "y":1.25}, {"label":"k78", "x":21, "y":1.25}, {"label":"k79", "x":22, "y":1.25}, {"label":"k7a", "x":23, "y":1.25}, + {"label":"k20", "x":0, "y":2.25, "h":2}, {"label":"k21", "x":1, "y":2.25}, {"label":"k22", "x":2, "y":2.25}, {"label":"k23", "x":3, "y":2.25}, {"label":"k24", "x":4.5, "y":2.25, "w":1.5}, {"label":"k25", "x":6, "y":2.25}, {"label":"k26", "x":7, "y":2.25}, {"label":"k27", "x":8, "y":2.25}, {"label":"k28", "x":9, "y":2.25}, {"label":"k29", "x":10, "y":2.25}, {"label":"k2a", "x":11, "y":2.25}, {"label":"k80", "x":12, "y":2.25}, {"label":"k81", "x":13, "y":2.25}, {"label":"k82", "x":14, "y":2.25}, {"label":"k83", "x":15, "y":2.25}, {"label":"k84", "x":16, "y":2.25}, {"label":"k85", "x":17, "y":2.25}, {"label":"k86", "x":18, "y":2.25, "w":1.5}, {"label":"k87", "x":20, "y":2.25}, {"label":"k88", "x":21, "y":2.25}, {"label":"k89", "x":22, "y":2.25}, {"label":"k8a", "x":23, "y":2.25, "h":2}, + {"label":"k31", "x":1, "y":3.25}, {"label":"k32", "x":2, "y":3.25}, {"label":"k33", "x":3, "y":3.25}, {"label":"k34", "x":4.5, "y":3.25, "w":1.75}, {"label":"k35", "x":6.25, "y":3.25}, {"label":"k36", "x":7.25, "y":3.25}, {"label":"k37", "x":8.25, "y":3.25}, {"label":"k38", "x":9.25, "y":3.25}, {"label":"k39", "x":10.25, "y":3.25}, {"label":"k3a", "x":11.25, "y":3.25}, {"label":"k90", "x":12.25, "y":3.25}, {"label":"k91", "x":13.25, "y":3.25}, {"label":"k92", "x":14.25, "y":3.25}, {"label":"k93", "x":15.25, "y":3.25}, {"label":"k94", "x":16.25, "y":3.25}, {"label":"k95", "x":17.25, "y":3.25, "w":2.25}, {"label":"k97", "x":20, "y":3.25}, {"label":"k98", "x":21, "y":3.25}, {"label":"k99", "x":22, "y":3.25}, + {"label":"k40", "x":0, "y":4.25, "h":2}, {"label":"k41", "x":1, "y":4.25}, {"label":"k42", "x":2, "y":4.25}, {"label":"k43", "x":3, "y":4.25}, {"label":"k45", "x":5.5, "y":4.25, "w":1.25}, {"label":"k46", "x":6.75, "y":4.25}, {"label":"k47", "x":7.75, "y":4.25}, {"label":"k48", "x":8.75, "y":4.25}, {"label":"k49", "x":9.75, "y":4.25}, {"label":"k4a", "x":10.75, "y":4.25}, {"label":"ka0", "x":11.75, "y":4.25}, {"label":"ka1", "x":12.75, "y":4.25}, {"label":"ka2", "x":13.75, "y":4.25}, {"label":"ka3", "x":14.75, "y":4.25}, {"label":"ka4", "x":15.75, "y":4.25}, {"label":"ka5", "x":16.75, "y":4.25, "w":1.75}, {"label":"ka7", "x":20, "y":4.25}, {"label":"ka8", "x":21, "y":4.25}, {"label":"ka9", "x":22, "y":4.25}, {"label":"kaa", "x":23, "y":4.25, "h":2}, {"label":"k44", "x":4.25, "y":4.5}, {"label":"k96", "x":18.75, "y":4.5}, + {"label":"k51", "x":1, "y":5.25}, {"label":"k52", "x":2, "y":5.25}, {"label":"k56", "x":6.5, "y":5.25}, {"label":"k57", "x":7.5, "y":5.25}, {"label":"k58", "x":8.5, "y":5.25}, {"label":"kb0", "x":9.5, "y":5.25, "w":4}, {"label":"kb2", "x":13.5, "y":5.25}, {"label":"kb3", "x":14.5, "y":5.25}, {"label":"kb4", "x":15.5, "y":5.25}, {"label":"kb5", "x":16.5, "y":5.25}, {"label":"kb8", "x":21, "y":5.25}, {"label":"kb9", "x":22, "y":5.25}, {"label":"k53", "x":3.25, "y":5.5}, {"label":"k54", "x":4.25, "y":5.5}, {"label":"k55", "x":5.25, "y":5.5}, {"label":"ka6", "x":17.75, "y":5.5}, {"label":"kb6", "x":18.75, "y":5.5}, {"label":"kb7", "x":19.75, "y":5.5} + ] + } + } +} diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default/keymap.json b/keyboards/clueboard/2x1800/2019/keymaps/default/keymap.json new file mode 100644 index 000000000000..f5d901ab61b7 --- /dev/null +++ b/keyboards/clueboard/2x1800/2019/keymaps/default/keymap.json @@ -0,0 +1,11 @@ +{ + "keyboard":"clueboard/2x1800/2019", + "keymap":"default", + "layout":"LAYOUT", + "layers":[ + ["ENC_BTN1","ENC_BTN2","ENC_BTN3","ENC_BTN4","KC_HOME","KC_END","KC_PGUP","KC_PGDN","KC_ESC","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_PSCR","KC_SLCK","KC_PAUS","KC_INS","KC_PMNS","KC_NLCK","KC_PSLS","KC_PAST","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","KC_NLCK","KC_PSLS","KC_PAST","KC_PMNS","KC_PPLS","KC_P7","KC_P8","KC_P9","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_P7","KC_P8","KC_P9","KC_PSLS","KC_P4","KC_P5","KC_P6","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_NUHS","KC_ENT","KC_P4","KC_P5","KC_P6","KC_PENT","KC_P1","KC_P2","KC_P3","KC_UP","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_SLSH","KC_COMM","KC_DOT","KC_RSFT","KC_UP","KC_P1","KC_P2","KC_P3","KC_PENT","KC_P0","KC_PDOT","KC_LEFT","KC_DOWN","KC_RGHT","KC_LCTL","KC_LGUI","KC_LALT","KC_SPC","KC_SPC","KC_SPC","KC_SPC","KC_RALT","KC_RGUI","KC_APP","KC_RCTL","KC_LEFT","KC_DOWN","KC_RGHT","KC_P0","KC_PDOT"] + ], + "author":"skullydazed", + "notes":"", + "version":1 +} diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default/readme.md b/keyboards/clueboard/2x1800/2019/keymaps/default/readme.md new file mode 100644 index 000000000000..4e3457efce62 --- /dev/null +++ b/keyboards/clueboard/2x1800/2019/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for 2x1800 diff --git a/keyboards/clueboard/2x1800/keymaps/default/keymap.c b/keyboards/clueboard/2x1800/2019/keymaps/default_1u_ansi/keymap.c similarity index 78% rename from keyboards/clueboard/2x1800/keymaps/default/keymap.c rename to keyboards/clueboard/2x1800/2019/keymaps/default_1u_ansi/keymap.c index 2e4b75924d9a..3c504930da85 100644 --- a/keyboards/clueboard/2x1800/keymaps/default/keymap.c +++ b/keyboards/clueboard/2x1800/2019/keymaps/default_1u_ansi/keymap.c @@ -16,13 +16,13 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT( - KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_ESC, 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_PSCR, KC_SLCK, KC_PAUS, KC_INS, \ - \ - KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST, 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, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \ - KC_PPLS, KC_P7, KC_P8, KC_P9, 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_P7, KC_P8, KC_P9, KC_PSLS, \ - KC_P4, KC_P5, KC_P6, 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_P4, KC_P5, KC_P6, \ - KC_PENT, KC_P1, KC_P2, KC_P3, KC_UP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_SLSH, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, \ - KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT \ +[0] = LAYOUT_1u_ansi( + KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4, + KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_ESC, 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_PSCR, KC_SLCK, KC_PAUS, KC_INS, + KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST, 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, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + KC_PPLS, KC_P7, KC_P8, KC_P9, 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_P7, KC_P8, KC_P9, KC_PSLS, + KC_P4, KC_P5, KC_P6, 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_P4, KC_P5, KC_P6, + KC_PENT, KC_P1, KC_P2, KC_P3, KC_UP, 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_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ) }; diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_1u_ansi/readme.md b/keyboards/clueboard/2x1800/2019/keymaps/default_1u_ansi/readme.md new file mode 100644 index 000000000000..4e3457efce62 --- /dev/null +++ b/keyboards/clueboard/2x1800/2019/keymaps/default_1u_ansi/readme.md @@ -0,0 +1 @@ +# The default keymap for 2x1800 diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_1u_iso/keymap.c b/keyboards/clueboard/2x1800/2019/keymaps/default_1u_iso/keymap.c new file mode 100644 index 000000000000..17cb57abe747 --- /dev/null +++ b/keyboards/clueboard/2x1800/2019/keymaps/default_1u_iso/keymap.c @@ -0,0 +1,28 @@ +/* Copyright 2017 Zach White + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT_1u_iso( + KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4, + KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_ESC, 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_PSCR, KC_SLCK, KC_PAUS, KC_INS, + KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST, 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, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + KC_PPLS, KC_P7, KC_P8, KC_P9, 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_P7, KC_P8, KC_P9, KC_PSLS, + KC_P4, KC_P5, KC_P6, 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_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, + KC_PENT, KC_P1, KC_P2, KC_P3, KC_UP, 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_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT +) +}; diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_1u_iso/readme.md b/keyboards/clueboard/2x1800/2019/keymaps/default_1u_iso/readme.md new file mode 100644 index 000000000000..4e3457efce62 --- /dev/null +++ b/keyboards/clueboard/2x1800/2019/keymaps/default_1u_iso/readme.md @@ -0,0 +1 @@ +# The default keymap for 2x1800 diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_2u_ansi/keymap.c b/keyboards/clueboard/2x1800/2019/keymaps/default_2u_ansi/keymap.c new file mode 100644 index 000000000000..2bd91000b643 --- /dev/null +++ b/keyboards/clueboard/2x1800/2019/keymaps/default_2u_ansi/keymap.c @@ -0,0 +1,28 @@ +/* Copyright 2017 Zach White + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT_2u_ansi( + KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4, + KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_ESC, 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_PSCR, KC_SLCK, KC_PAUS, KC_INS, + KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST, 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, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + KC_PPLS, KC_P7, KC_P8, KC_P9, 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_P7, KC_P8, KC_P9, KC_PSLS, + KC_P4, KC_P5, KC_P6, 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_P4, KC_P5, KC_P6, + KC_PENT, KC_P1, KC_P2, KC_P3, KC_UP, 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_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT +) +}; diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_2u_ansi/readme.md b/keyboards/clueboard/2x1800/2019/keymaps/default_2u_ansi/readme.md new file mode 100644 index 000000000000..c933ee3edb7b --- /dev/null +++ b/keyboards/clueboard/2x1800/2019/keymaps/default_2u_ansi/readme.md @@ -0,0 +1 @@ +# The default keymap for 2x1800 with 2u spacebar diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_2u_iso/keymap.c b/keyboards/clueboard/2x1800/2019/keymaps/default_2u_iso/keymap.c new file mode 100644 index 000000000000..5e1c96d14481 --- /dev/null +++ b/keyboards/clueboard/2x1800/2019/keymaps/default_2u_iso/keymap.c @@ -0,0 +1,28 @@ +/* Copyright 2017 Zach White + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT_2u_iso( + KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4, + KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_ESC, 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_PSCR, KC_SLCK, KC_PAUS, KC_INS, + KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST, 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, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + KC_PPLS, KC_P7, KC_P8, KC_P9, 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_P7, KC_P8, KC_P9, KC_PSLS, + KC_P4, KC_P5, KC_P6, 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_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, + KC_PENT, KC_P1, KC_P2, KC_P3, KC_UP, 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_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT +) +}; diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_2u_iso/readme.md b/keyboards/clueboard/2x1800/2019/keymaps/default_2u_iso/readme.md new file mode 100644 index 000000000000..c933ee3edb7b --- /dev/null +++ b/keyboards/clueboard/2x1800/2019/keymaps/default_2u_iso/readme.md @@ -0,0 +1 @@ +# The default keymap for 2x1800 with 2u spacebar diff --git a/keyboards/clueboard/2x1800/keymaps/default_7u/config.h b/keyboards/clueboard/2x1800/2019/keymaps/default_4u_ansi/config.h similarity index 96% rename from keyboards/clueboard/2x1800/keymaps/default_7u/config.h rename to keyboards/clueboard/2x1800/2019/keymaps/default_4u_ansi/config.h index 152e2f148759..dd48c69e36e2 100644 --- a/keyboards/clueboard/2x1800/keymaps/default_7u/config.h +++ b/keyboards/clueboard/2x1800/2019/keymaps/default_4u_ansi/config.h @@ -16,6 +16,4 @@ #pragma once -#include "config_common.h" - // place overrides here diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_4u_ansi/keymap.c b/keyboards/clueboard/2x1800/2019/keymaps/default_4u_ansi/keymap.c new file mode 100644 index 000000000000..9e1c211a84b5 --- /dev/null +++ b/keyboards/clueboard/2x1800/2019/keymaps/default_4u_ansi/keymap.c @@ -0,0 +1,28 @@ +/* Copyright 2017 Zach White + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT_4u_ansi( + KC_1, KC_2, KC_3, KC_4, + KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_ESC, 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_PSCR, KC_SLCK, KC_PAUS, KC_INS, + KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST, 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, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + KC_PPLS, KC_P7, KC_P8, KC_P9, 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_P7, KC_P8, KC_P9, KC_PSLS, + KC_P4, KC_P5, KC_P6, 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_P4, KC_P5, KC_P6, + KC_PENT, KC_P1, KC_P2, KC_P3, KC_UP, 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_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT +) +}; diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_4u_ansi/readme.md b/keyboards/clueboard/2x1800/2019/keymaps/default_4u_ansi/readme.md new file mode 100644 index 000000000000..a696972e8c4b --- /dev/null +++ b/keyboards/clueboard/2x1800/2019/keymaps/default_4u_ansi/readme.md @@ -0,0 +1 @@ +# The default keymap for 2x1800 with 4u Spacebar diff --git a/keyboards/clueboard/2x1800/keymaps/mouseboard_left/config.h b/keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/config.h similarity index 96% rename from keyboards/clueboard/2x1800/keymaps/mouseboard_left/config.h rename to keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/config.h index 152e2f148759..dd48c69e36e2 100644 --- a/keyboards/clueboard/2x1800/keymaps/mouseboard_left/config.h +++ b/keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/config.h @@ -16,6 +16,4 @@ #pragma once -#include "config_common.h" - // place overrides here diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/keymap.c b/keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/keymap.c new file mode 100644 index 000000000000..261f578cdfeb --- /dev/null +++ b/keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/keymap.c @@ -0,0 +1,28 @@ +/* Copyright 2017 Zach White + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT_4u_iso( + KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4, + KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_ESC, 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_PSCR, KC_SLCK, KC_PAUS, KC_INS, + KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST, 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, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + KC_PPLS, KC_P7, KC_P8, KC_P9, 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_P7, KC_P8, KC_P9, KC_PSLS, + KC_P4, KC_P5, KC_P6, 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_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, + KC_PENT, KC_P1, KC_P2, KC_P3, KC_UP, 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_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT +) +}; diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/readme.md b/keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/readme.md new file mode 100644 index 000000000000..a696972e8c4b --- /dev/null +++ b/keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/readme.md @@ -0,0 +1 @@ +# The default keymap for 2x1800 with 4u Spacebar diff --git a/keyboards/clueboard/2x1800/keymaps/macroboard/config.h b/keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/config.h similarity index 96% rename from keyboards/clueboard/2x1800/keymaps/macroboard/config.h rename to keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/config.h index 152e2f148759..dd48c69e36e2 100644 --- a/keyboards/clueboard/2x1800/keymaps/macroboard/config.h +++ b/keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/config.h @@ -16,6 +16,4 @@ #pragma once -#include "config_common.h" - // place overrides here diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/keymap.c b/keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/keymap.c new file mode 100644 index 000000000000..f8f9d820dfd4 --- /dev/null +++ b/keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/keymap.c @@ -0,0 +1,28 @@ +/* Copyright 2017 Zach White + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT_7u_ansi( + KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4, + KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_ESC, 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_PSCR, KC_SLCK, KC_PAUS, KC_DEL, + KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST, 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, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + KC_PPLS, KC_P7, KC_P8, KC_P9, 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_P7, KC_P8, KC_P9, KC_PSLS, + KC_P4, KC_P5, KC_P6, 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_P4, KC_P5, KC_P6, + KC_PENT, KC_P1, KC_P2, KC_P3, KC_UP, 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_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT, KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_APP, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT +) +}; diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/readme.md b/keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/readme.md new file mode 100644 index 000000000000..f5718e842dc2 --- /dev/null +++ b/keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/readme.md @@ -0,0 +1 @@ +# The default keymap for 2x1800 with 7u spacebar diff --git a/keyboards/clueboard/2x1800/keymaps/default_4u/config.h b/keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/config.h similarity index 96% rename from keyboards/clueboard/2x1800/keymaps/default_4u/config.h rename to keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/config.h index 152e2f148759..dd48c69e36e2 100644 --- a/keyboards/clueboard/2x1800/keymaps/default_4u/config.h +++ b/keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/config.h @@ -16,6 +16,4 @@ #pragma once -#include "config_common.h" - // place overrides here diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/keymap.c b/keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/keymap.c new file mode 100644 index 000000000000..88ea3fb850de --- /dev/null +++ b/keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/keymap.c @@ -0,0 +1,28 @@ +/* Copyright 2017 Zach White + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT_7u_iso( + KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4, + KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_ESC, 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_PSCR, KC_SLCK, KC_PAUS, KC_DEL, + KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST, 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, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + KC_PPLS, KC_P7, KC_P8, KC_P9, 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_P7, KC_P8, KC_P9, KC_PSLS, + KC_P4, KC_P5, KC_P6, 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_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, + KC_PENT, KC_P1, KC_P2, KC_P3, KC_UP, 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_UP, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT, KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_APP, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT +) +}; diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/readme.md b/keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/readme.md new file mode 100644 index 000000000000..f5718e842dc2 --- /dev/null +++ b/keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/readme.md @@ -0,0 +1 @@ +# The default keymap for 2x1800 with 7u spacebar diff --git a/keyboards/clueboard/2x1800/2019/readme.md b/keyboards/clueboard/2x1800/2019/readme.md new file mode 100644 index 000000000000..538c15324938 --- /dev/null +++ b/keyboards/clueboard/2x1800/2019/readme.md @@ -0,0 +1,13 @@ +# Clueboard 2x1800 + +Clueboard 2x1800 Mechanical Drawing Toy Edition + +* Keyboard Maintainer: [Zach White](https://github.com/skullydazed) +* Hardware Supported: Clueboard 2x1800 2019 PCB +* Hardware Availability: 2019 Apr 1 Group Buy + +Make example for this keyboard: + + make clueboard/2x1800/2019:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/clueboard/2x1800/2019/rules.mk b/keyboards/clueboard/2x1800/2019/rules.mk new file mode 100644 index 000000000000..dcad3ec90e8c --- /dev/null +++ b/keyboards/clueboard/2x1800/2019/rules.mk @@ -0,0 +1,25 @@ +# MCU name +MCU = at90usb1286 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = halfkay + +# Build Options +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +ENCODER_ENABLE = yes # Rotary encoder (knob) support +NKRO_ENABLE = yes # USB Nkey Rollover +MIDI_ENABLE = no # MIDI support +UNICODE_ENABLE = no # Unicode +RGBLIGHT_ENABLE = yes # RGB on pin C5 +AUDIO_ENABLE = yes # Audio output on pin C4 and B7 diff --git a/keyboards/clueboard/2x1800/info.json b/keyboards/clueboard/2x1800/info.json index 0e3bb36a9d88..785743a3074d 100644 --- a/keyboards/clueboard/2x1800/info.json +++ b/keyboards/clueboard/2x1800/info.json @@ -1,42 +1,5 @@ { "keyboard_name": "Clueboard 2x1800", "url": "", - "maintainer": "skullydazed", - "width": 24, - "height": 6.5, - "layouts": { - "LAYOUT": { - "key_count": 127, - "layout": [ - {"label":"Home", "x":0, "y":0}, {"label":"End", "x":1, "y":0}, {"label":"PgUp", "x":2, "y":0}, {"label":"PgDn", "x":3, "y":0}, {"label":"Esc", "x":4.75, "y":0}, {"label":"F1", "x":6.25, "y":0}, {"label":"F2", "x":7.25, "y":0}, {"label":"F3", "x":8.25, "y":0}, {"label":"F4", "x":9.25, "y":0}, {"label":"F5", "x":10.75, "y":0}, {"label":"F6", "x":11.75, "y":0}, {"label":"F7", "x":12.75, "y":0}, {"label":"F8", "x":13.75, "y":0}, {"label":"F9", "x":15.25, "y":0}, {"label":"F10", "x":16.25, "y":0}, {"label":"F11", "x":17.25, "y":0}, {"label":"F12", "x":18.25, "y":0}, {"label":"PrtSc", "x":20, "y":0}, {"label":"Scroll Lock", "x":21, "y":0}, {"label":"Pause", "x":22, "y":0}, {"label":"Insert", "x":23, "y":0}, - {"label":"-", "x":0, "y":1.25}, {"label":"Num Lock", "x":1, "y":1.25}, {"label":"/", "x":2, "y":1.25}, {"label":"*", "x":3, "y":1.25}, {"label":"~", "x":4.5, "y":1.25}, {"label":"!", "x":5.5, "y":1.25}, {"label":"@", "x":6.5, "y":1.25}, {"label":"#", "x":7.5, "y":1.25}, {"label":"$", "x":8.5, "y":1.25}, {"label":"%", "x":9.5, "y":1.25}, {"label":"^", "x":10.5, "y":1.25}, {"label":"&", "x":11.5, "y":1.25}, {"label":"*", "x":12.5, "y":1.25}, {"label":"(", "x":13.5, "y":1.25}, {"label":")", "x":14.5, "y":1.25}, {"label":"_", "x":15.5, "y":1.25}, {"label":"+", "x":16.5, "y":1.25}, {"label":"Backspace", "x":17.5, "y":1.25, "w":2}, {"label":"Num Lock", "x":20, "y":1.25}, {"label":"/", "x":21, "y":1.25}, {"label":"*", "x":22, "y":1.25}, {"label":"-", "x":23, "y":1.25}, - {"label":"+", "x":0, "y":2.25, "h":2}, {"label":"7", "x":1, "y":2.25}, {"label":"8", "x":2, "y":2.25}, {"label":"9", "x":3, "y":2.25}, {"label":"Tab", "x":4.5, "y":2.25, "w":1.5}, {"label":"Q", "x":6, "y":2.25}, {"label":"W", "x":7, "y":2.25}, {"label":"E", "x":8, "y":2.25}, {"label":"R", "x":9, "y":2.25}, {"label":"T", "x":10, "y":2.25}, {"label":"Y", "x":11, "y":2.25}, {"label":"U", "x":12, "y":2.25}, {"label":"I", "x":13, "y":2.25}, {"label":"O", "x":14, "y":2.25}, {"label":"P", "x":15, "y":2.25}, {"label":"{", "x":16, "y":2.25}, {"label":"}", "x":17, "y":2.25}, {"label":"|", "x":18, "y":2.25, "w":1.5}, {"label":"7", "x":20, "y":2.25}, {"label":"8", "x":21, "y":2.25}, {"label":"9", "x":22, "y":2.25}, {"label":"+", "x":23, "y":2.25, "h":2}, - {"label":"4", "x":1, "y":3.25}, {"label":"5", "x":2, "y":3.25}, {"label":"6", "x":3, "y":3.25}, {"label":"Caps Lock", "x":4.5, "y":3.25, "w":1.75}, {"label":"A", "x":6.25, "y":3.25}, {"label":"S", "x":7.25, "y":3.25}, {"label":"D", "x":8.25, "y":3.25}, {"label":"F", "x":9.25, "y":3.25}, {"label":"G", "x":10.25, "y":3.25}, {"label":"H", "x":11.25, "y":3.25}, {"label":"J", "x":12.25, "y":3.25}, {"label":"K", "x":13.25, "y":3.25}, {"label":"L", "x":14.25, "y":3.25}, {"label":":", "x":15.25, "y":3.25}, {"label":"\"", "x":16.25, "y":3.25}, {"label":"Enter", "x":17.25, "y":3.25, "w":2.25}, {"label":"4", "x":20, "y":3.25}, {"label":"5", "x":21, "y":3.25}, {"label":"6", "x":22, "y":3.25}, - {"label":"Enter", "x":0, "y":4.25, "h":2}, {"label":"1", "x":1, "y":4.25}, {"label":"2", "x":2, "y":4.25}, {"label":"3", "x":3, "y":4.25}, {"label":"\\u2191", "x":4.25, "y":4.5}, {"label":"Shift", "x":5.5, "y":4.25, "w":1.25}, {"label":"Z", "x":6.75, "y":4.25}, {"label":"X", "x":7.75, "y":4.25}, {"label":"C", "x":8.75, "y":4.25}, {"label":"V", "x":9.75, "y":4.25}, {"label":"B", "x":10.75, "y":4.25}, {"label":"N", "x":11.75, "y":4.25}, {"label":"M", "x":12.75, "y":4.25}, {"label":"<", "x":13.75, "y":4.25}, {"label":">", "x":14.75, "y":4.25}, {"label":"?", "x":15.75, "y":4.25}, {"label":"Shift", "x":16.75, "y":4.25, "w":1.75}, {"label":"\\u2191", "x":18.75, "y":4.5}, {"label":"1", "x":20, "y":4.25}, {"label":"2", "x":21, "y":4.25}, {"label":"3", "x":22, "y":4.25}, {"label":"Enter", "x":23, "y":4.25, "h":2}, - {"label":"0", "x":1, "y":5.25}, {"label":".", "x":2, "y":5.25}, {"label":"\\u2190", "x":3.25, "y":5.5}, {"label":"\\u2193", "x":4.25, "y":5.5}, {"label":"\\u2192", "x":5.25, "y":5.5}, {"label":"Ctrl", "x":6.5, "y":5.25}, {"label":"Win", "x":7.5, "y":5.25}, {"label":"Alt", "x":8.5, "y":5.25}, {"label":"1u", "x":9.5, "y":5.25}, {"label":"1u", "x":10.5, "y":5.25}, {"label":"1u", "x":11.5, "y":5.25}, {"label":"1u", "x":12.5, "y":5.25}, {"label":"Alt", "x":13.5, "y":5.25}, {"label":"Win", "x":14.5, "y":5.25}, {"label":"Menu", "x":15.5, "y":5.25}, {"label":"Ctrl", "x":16.5, "y":5.25}, {"label":"\\u2190", "x":17.75, "y":5.5}, {"label":"\\u2193", "x":18.75, "y":5.5}, {"label":"\\u2192", "x":19.75, "y":5.5}, {"label":"0", "x":21, "y":5.25}, {"label":".", "x":22, "y":5.25} - ] - }, - "LAYOUT_7u_space": { - "key_count": 121, - "layout": [ - {"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k03", "x":3, "y":0}, {"label":"k04", "x":4.75, "y":0}, {"label":"k06", "x":6.25, "y":0}, {"label":"k07", "x":7.25, "y":0}, {"label":"k08", "x":8.25, "y":0}, {"label":"k09", "x":9.25, "y":0}, {"label":"k0a", "x":10.75, "y":0}, {"label":"k60", "x":11.75, "y":0}, {"label":"k61", "x":12.75, "y":0}, {"label":"k62", "x":13.75, "y":0}, {"label":"k63", "x":15.25, "y":0}, {"label":"k64", "x":16.25, "y":0}, {"label":"k65", "x":17.25, "y":0}, {"label":"k66", "x":18.25, "y":0}, {"label":"k67", "x":20, "y":0}, {"label":"k68", "x":21, "y":0}, {"label":"k69", "x":22, "y":0}, {"label":"k6a", "x":23, "y":0}, - {"label":"k10", "x":0, "y":1.25}, {"label":"k11", "x":1, "y":1.25}, {"label":"k12", "x":2, "y":1.25}, {"label":"k13", "x":3, "y":1.25}, {"label":"k14", "x":4.5, "y":1.25}, {"label":"k15", "x":5.5, "y":1.25}, {"label":"k16", "x":6.5, "y":1.25}, {"label":"k17", "x":7.5, "y":1.25}, {"label":"k18", "x":8.5, "y":1.25}, {"label":"k19", "x":9.5, "y":1.25}, {"label":"k0a", "x":10.5, "y":1.25}, {"label":"k70", "x":11.5, "y":1.25}, {"label":"k71", "x":12.5, "y":1.25}, {"label":"k72", "x":13.5, "y":1.25}, {"label":"k73", "x":14.5, "y":1.25}, {"label":"k74", "x":15.5, "y":1.25}, {"label":"k75", "x":16.5, "y":1.25}, {"label":"k76", "x":17.5, "y":1.25, "w":2}, {"label":"k77", "x":20, "y":1.25}, {"label":"k78", "x":21, "y":1.25}, {"label":"k79", "x":22, "y":1.25}, {"label":"k7a", "x":23, "y":1.25}, - {"label":"k20", "x":0, "y":2.25, "h":2}, {"label":"k21", "x":1, "y":2.25}, {"label":"k22", "x":2, "y":2.25}, {"label":"k23", "x":3, "y":2.25}, {"label":"k24", "x":4.5, "y":2.25, "w":1.5}, {"label":"k25", "x":6, "y":2.25}, {"label":"k26", "x":7, "y":2.25}, {"label":"k27", "x":8, "y":2.25}, {"label":"k28", "x":9, "y":2.25}, {"label":"k29", "x":10, "y":2.25}, {"label":"k2a", "x":11, "y":2.25}, {"label":"k80", "x":12, "y":2.25}, {"label":"k81", "x":13, "y":2.25}, {"label":"k82", "x":14, "y":2.25}, {"label":"k83", "x":15, "y":2.25}, {"label":"k84", "x":16, "y":2.25}, {"label":"k85", "x":17, "y":2.25}, {"label":"k86", "x":18, "y":2.25, "w":1.5}, {"label":"k87", "x":20, "y":2.25}, {"label":"k88", "x":21, "y":2.25}, {"label":"k89", "x":22, "y":2.25}, {"label":"k8a", "x":23, "y":2.25, "h":2}, - {"label":"k31", "x":1, "y":3.25}, {"label":"k32", "x":2, "y":3.25}, {"label":"k33", "x":3, "y":3.25}, {"label":"k34", "x":4.5, "y":3.25, "w":1.75}, {"label":"k35", "x":6.25, "y":3.25}, {"label":"k36", "x":7.25, "y":3.25}, {"label":"k37", "x":8.25, "y":3.25}, {"label":"k38", "x":9.25, "y":3.25}, {"label":"k39", "x":10.25, "y":3.25}, {"label":"k3a", "x":11.25, "y":3.25}, {"label":"k90", "x":12.25, "y":3.25}, {"label":"k91", "x":13.25, "y":3.25}, {"label":"k92", "x":14.25, "y":3.25}, {"label":"k93", "x":15.25, "y":3.25}, {"label":"k94", "x":16.25, "y":3.25}, {"label":"k95", "x":17.25, "y":3.25, "w":2.25}, {"label":"k97", "x":20, "y":3.25}, {"label":"k98", "x":21, "y":3.25}, {"label":"k99", "x":22, "y":3.25}, - {"label":"k40", "x":0, "y":4.25, "h":2}, {"label":"k41", "x":1, "y":4.25}, {"label":"k42", "x":2, "y":4.25}, {"label":"k43", "x":3, "y":4.25}, {"label":"k45", "x":5.5, "y":4.25, "w":1.25}, {"label":"k46", "x":6.75, "y":4.25}, {"label":"k47", "x":7.75, "y":4.25}, {"label":"k48", "x":8.75, "y":4.25}, {"label":"k49", "x":9.75, "y":4.25}, {"label":"k4a", "x":10.75, "y":4.25}, {"label":"ka0", "x":11.75, "y":4.25}, {"label":"ka1", "x":12.75, "y":4.25}, {"label":"ka2", "x":13.75, "y":4.25}, {"label":"ka3", "x":14.75, "y":4.25}, {"label":"ka4", "x":15.75, "y":4.25}, {"label":"ka5", "x":16.75, "y":4.25, "w":1.75}, {"label":"ka7", "x":20, "y":4.25}, {"label":"ka8", "x":21, "y":4.25}, {"label":"ka9", "x":22, "y":4.25}, {"label":"kaa", "x":23, "y":4.25, "h":2}, {"label":"k44", "x":4.25, "y":4.5}, {"label":"k96", "x":18.75, "y":4.5}, - {"label":"k51", "x":1, "y":5.25}, {"label":"k52", "x":2, "y":5.25}, {"label":"k56", "x":6.5, "y":5.25}, {"label":"k57", "x":7.5, "y":5.25}, {"label":"kb0", "x":8.5, "y":5.25, "w":7}, {"label":"kb4", "x":15.5, "y":5.25}, {"label":"kb5", "x":16.5, "y":5.25}, {"label":"kb8", "x":21, "y":5.25}, {"label":"kb9", "x":22, "y":5.25}, {"label":"k53", "x":3.25, "y":5.5}, {"label":"k54", "x":4.25, "y":5.5}, {"label":"k55", "x":5.25, "y":5.5}, {"label":"ka6", "x":17.75, "y":5.5}, {"label":"kb6", "x":18.75, "y":5.5}, {"label":"kb7", "x":19.75, "y":5.5} - ] - }, - "LAYOUT_4u_space": { - "key_count": 124, - "layout": [ - {"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k03", "x":3, "y":0}, {"label":"k04", "x":4.75, "y":0}, {"label":"k06", "x":6.25, "y":0}, {"label":"k07", "x":7.25, "y":0}, {"label":"k08", "x":8.25, "y":0}, {"label":"k09", "x":9.25, "y":0}, {"label":"k0a", "x":10.75, "y":0}, {"label":"k60", "x":11.75, "y":0}, {"label":"k61", "x":12.75, "y":0}, {"label":"k62", "x":13.75, "y":0}, {"label":"k63", "x":15.25, "y":0}, {"label":"k64", "x":16.25, "y":0}, {"label":"k65", "x":17.25, "y":0}, {"label":"k66", "x":18.25, "y":0}, {"label":"k67", "x":20, "y":0}, {"label":"k68", "x":21, "y":0}, {"label":"k69", "x":22, "y":0}, {"label":"k6a", "x":23, "y":0}, - {"label":"k10", "x":0, "y":1.25}, {"label":"k11", "x":1, "y":1.25}, {"label":"k12", "x":2, "y":1.25}, {"label":"k13", "x":3, "y":1.25}, {"label":"k14", "x":4.5, "y":1.25}, {"label":"k15", "x":5.5, "y":1.25}, {"label":"k16", "x":6.5, "y":1.25}, {"label":"k17", "x":7.5, "y":1.25}, {"label":"k18", "x":8.5, "y":1.25}, {"label":"k19", "x":9.5, "y":1.25}, {"label":"k0a", "x":10.5, "y":1.25}, {"label":"k70", "x":11.5, "y":1.25}, {"label":"k71", "x":12.5, "y":1.25}, {"label":"k72", "x":13.5, "y":1.25}, {"label":"k73", "x":14.5, "y":1.25}, {"label":"k74", "x":15.5, "y":1.25}, {"label":"k75", "x":16.5, "y":1.25}, {"label":"k76", "x":17.5, "y":1.25, "w":2}, {"label":"k77", "x":20, "y":1.25}, {"label":"k78", "x":21, "y":1.25}, {"label":"k79", "x":22, "y":1.25}, {"label":"k7a", "x":23, "y":1.25}, - {"label":"k20", "x":0, "y":2.25, "h":2}, {"label":"k21", "x":1, "y":2.25}, {"label":"k22", "x":2, "y":2.25}, {"label":"k23", "x":3, "y":2.25}, {"label":"k24", "x":4.5, "y":2.25, "w":1.5}, {"label":"k25", "x":6, "y":2.25}, {"label":"k26", "x":7, "y":2.25}, {"label":"k27", "x":8, "y":2.25}, {"label":"k28", "x":9, "y":2.25}, {"label":"k29", "x":10, "y":2.25}, {"label":"k2a", "x":11, "y":2.25}, {"label":"k80", "x":12, "y":2.25}, {"label":"k81", "x":13, "y":2.25}, {"label":"k82", "x":14, "y":2.25}, {"label":"k83", "x":15, "y":2.25}, {"label":"k84", "x":16, "y":2.25}, {"label":"k85", "x":17, "y":2.25}, {"label":"k86", "x":18, "y":2.25, "w":1.5}, {"label":"k87", "x":20, "y":2.25}, {"label":"k88", "x":21, "y":2.25}, {"label":"k89", "x":22, "y":2.25}, {"label":"k8a", "x":23, "y":2.25, "h":2}, - {"label":"k31", "x":1, "y":3.25}, {"label":"k32", "x":2, "y":3.25}, {"label":"k33", "x":3, "y":3.25}, {"label":"k34", "x":4.5, "y":3.25, "w":1.75}, {"label":"k35", "x":6.25, "y":3.25}, {"label":"k36", "x":7.25, "y":3.25}, {"label":"k37", "x":8.25, "y":3.25}, {"label":"k38", "x":9.25, "y":3.25}, {"label":"k39", "x":10.25, "y":3.25}, {"label":"k3a", "x":11.25, "y":3.25}, {"label":"k90", "x":12.25, "y":3.25}, {"label":"k91", "x":13.25, "y":3.25}, {"label":"k92", "x":14.25, "y":3.25}, {"label":"k93", "x":15.25, "y":3.25}, {"label":"k94", "x":16.25, "y":3.25}, {"label":"k95", "x":17.25, "y":3.25, "w":2.25}, {"label":"k97", "x":20, "y":3.25}, {"label":"k98", "x":21, "y":3.25}, {"label":"k99", "x":22, "y":3.25}, - {"label":"k40", "x":0, "y":4.25, "h":2}, {"label":"k41", "x":1, "y":4.25}, {"label":"k42", "x":2, "y":4.25}, {"label":"k43", "x":3, "y":4.25}, {"label":"k45", "x":5.5, "y":4.25, "w":1.25}, {"label":"k46", "x":6.75, "y":4.25}, {"label":"k47", "x":7.75, "y":4.25}, {"label":"k48", "x":8.75, "y":4.25}, {"label":"k49", "x":9.75, "y":4.25}, {"label":"k4a", "x":10.75, "y":4.25}, {"label":"ka0", "x":11.75, "y":4.25}, {"label":"ka1", "x":12.75, "y":4.25}, {"label":"ka2", "x":13.75, "y":4.25}, {"label":"ka3", "x":14.75, "y":4.25}, {"label":"ka4", "x":15.75, "y":4.25}, {"label":"ka5", "x":16.75, "y":4.25, "w":1.75}, {"label":"ka7", "x":20, "y":4.25}, {"label":"ka8", "x":21, "y":4.25}, {"label":"ka9", "x":22, "y":4.25}, {"label":"kaa", "x":23, "y":4.25, "h":2}, {"label":"k44", "x":4.25, "y":4.5}, {"label":"k96", "x":18.75, "y":4.5}, - {"label":"k51", "x":1, "y":5.25}, {"label":"k52", "x":2, "y":5.25}, {"label":"k56", "x":6.5, "y":5.25}, {"label":"k57", "x":7.5, "y":5.25}, {"label":"k58", "x":8.5, "y":5.25}, {"label":"kb0", "x":9.5, "y":5.25, "w":4}, {"label":"kb2", "x":13.5, "y":5.25}, {"label":"kb3", "x":14.5, "y":5.25}, {"label":"kb4", "x":15.5, "y":5.25}, {"label":"kb5", "x":16.5, "y":5.25}, {"label":"kb8", "x":21, "y":5.25}, {"label":"kb9", "x":22, "y":5.25}, {"label":"k53", "x":3.25, "y":5.5}, {"label":"k54", "x":4.25, "y":5.5}, {"label":"k55", "x":5.25, "y":5.5}, {"label":"ka6", "x":17.75, "y":5.5}, {"label":"kb6", "x":18.75, "y":5.5}, {"label":"kb7", "x":19.75, "y":5.5} - ] - } - } + "maintainer": "skullydazed" } diff --git a/keyboards/clueboard/2x1800/keymaps/mouseboard_right/config.h b/keyboards/clueboard/2x1800/keymaps/mouseboard_right/config.h deleted file mode 100644 index 152e2f148759..000000000000 --- a/keyboards/clueboard/2x1800/keymaps/mouseboard_right/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2017 Zach White - * - * 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 . - */ - -#pragma once - -#include "config_common.h" - -// place overrides here diff --git a/keyboards/clueboard/2x1800/readme.md b/keyboards/clueboard/2x1800/readme.md index 7e2c206ede76..01b975695dca 100644 --- a/keyboards/clueboard/2x1800/readme.md +++ b/keyboards/clueboard/2x1800/readme.md @@ -1,6 +1,11 @@ # Clueboard 2x1800 -Clueboard Double 1800 All The Way +Clueboard 2x1800 + +This is a keyboard that Clueboard releases for a 1-day group buy every Apr 1. Each year has a different theme. + +* [2018:](2018/) Double 1800 All The Way +* [2019:](2019/) Mechanical Drawing Toy Edition * Keyboard Maintainer: [Zach White](https://github.com/skullydazed) * Hardware Supported: Clueboard 2x1800 PCB From db0508ea91c74b27c06c9940788e89d9854dad69 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Wed, 6 May 2020 14:14:28 -0700 Subject: [PATCH 369/429] [Keymap] Xyverz Kinesis keymap update (#9018) * Mitor Tweaks Updating Dvorak keymap to change location of Slash and Backslash to positions more in line with my 12x5 and similar ortho layouts * Fixed readme.md Tidied up the readme and make some minor changes. * Adding atreus config file Adding a config file for my Atreus keyboard. This is to help with the keychatter issues I've been having on my Atreus. * Changes as requested per @zvecr Added `#pragma once` to beginning of config.h file as requested by @zvecr. --- keyboards/atreus/keymaps/xyverz/config.h | 4 ++++ keyboards/kinesis/keymaps/xyverz/keymap.c | 14 +++++++------- keyboards/kinesis/keymaps/xyverz/readme.md | 12 ++++++------ 3 files changed, 17 insertions(+), 13 deletions(-) create mode 100644 keyboards/atreus/keymaps/xyverz/config.h diff --git a/keyboards/atreus/keymaps/xyverz/config.h b/keyboards/atreus/keymaps/xyverz/config.h new file mode 100644 index 000000000000..037c9f3180ca --- /dev/null +++ b/keyboards/atreus/keymaps/xyverz/config.h @@ -0,0 +1,4 @@ +#pragma once + +#undef DEBOUNCE +#define DEBOUNCE 6 diff --git a/keyboards/kinesis/keymaps/xyverz/keymap.c b/keyboards/kinesis/keymaps/xyverz/keymap.c index 18fdb2e08fbb..ffc4459547aa 100644 --- a/keyboards/kinesis/keymaps/xyverz/keymap.c +++ b/keyboards/kinesis/keymaps/xyverz/keymap.c @@ -28,15 +28,15 @@ enum custom_keycodes { DVORAK = SAFE_RANGE, QWERTY, COLEMAK, KEYPAD }; Dvorak layer: ,-------------------------------------------.,-------------------------------------------. - | ] | 1 | 2 | 3 | 4 | 5 || 6 | 7 | 8 | 9 | 0 | [ | + | = | 1 | 2 | 3 | 4 | 5 || 6 | 7 | 8 | 9 | 0 | \ | |--------+------+------+------+------+------||------+------+------+------+------+--------| - | Tab | ' | , | . | P | Y || F | G | C | R | L | \ | + | Tab | ' | , | . | P | Y || F | G | C | R | L | / | |--------+------+------+------+------+------||------+------+------+------+------+--------| | CapsLk | A | O | E | U | I || D | H | T | N | S | - | |--------+------+------+------+------+------||------+------+------+------+------+--------| | LShift | Z | X | C | V | X || B | M | W | V | Z | RShift | `--------+------+------+------+------+------'`------+------+------+------+------+--------' - | ` | INS | Left | Rght | | Up | Dn | / | = | + | ` | INS | Left | Rght | | Up | Dn | [ | ] | `---------------------------' `---------------------------' ,--------------.,--------------. | LCtl | LAlt || RGUI | RCtl | @@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DVORAK] = LAYOUT ( // Left Hand KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, - KC_RBRC, KC_1, KC_2, KC_3, KC_4, KC_5, + KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, @@ -124,11 +124,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Right Hand KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD), RESET, - KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, - KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSLS, + KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, + KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, - KC_UP, KC_DOWN, KC_SLSH, KC_EQL, + KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, // Right Thumb KC_RGUI, KC_RCTL, KC_PGUP, diff --git a/keyboards/kinesis/keymaps/xyverz/readme.md b/keyboards/kinesis/keymaps/xyverz/readme.md index 702af4474a29..f0f55a478b42 100644 --- a/keyboards/kinesis/keymaps/xyverz/readme.md +++ b/keyboards/kinesis/keymaps/xyverz/readme.md @@ -2,9 +2,7 @@ ## About this keymap: -The Dvorak layout shown here stems from my early Kinesis years, using the Contour PS/2 with a Dvorak software layout. Because of this, the RBRC and LBRC were on opposite sides of the board in the corner keys. I've decided to continue using this layout with my QMK Kinesis. - -The QWERTY layout shown here is based entirely on the Kinesis Advantage layout. The Colemak layout is merely an adaptation of that. +This is is pretty much a stock Advantage layout for Dvorak, with a bit of rearranging of certain keys. The QWERTY layout shown here is based entirely on the Kinesis Advantage layout. The Colemak layout is merely an adaptation of that. I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar to the default Planck layouts. @@ -12,6 +10,8 @@ Depending on the OS, most of the LEDs are now working in this keymap, but I stil Removed the Media layer 2018-12-07 +Updated Dvorak layer to move slash to a position relative to my other 5x12 ortholinear keyboards 2020-05-04 + ## Still to do: * Figure out how to make the Numpad LED work properly. @@ -27,15 +27,15 @@ Removed the Media layer 2018-12-07 ### Layer 0: Dvorak layer ,-------------------------------------------.,-------------------------------------------. - | ] | 1 | 2 | 3 | 4 | 5 || 6 | 7 | 8 | 9 | 0 | [ | + | = | 1 | 2 | 3 | 4 | 5 || 6 | 7 | 8 | 9 | 0 | \ | |--------+------+------+------+------+------||------+------+------+------+------+--------| - | Tab | ' | , | . | P | Y || F | G | C | R | L | \ | + | Tab | ' | , | . | P | Y || F | G | C | R | L | / | |--------+------+------+------+------+------||------+------+------+------+------+--------| | CapsLk | A | O | E | U | I || D | H | T | N | S | - | |--------+------+------+------+------+------||------+------+------+------+------+--------| | LShift | Z | X | C | V | X || B | M | W | V | Z | RShift | `--------+------+------+------+------+------'`------+------+------+------+------+--------' - | ` | INS | Left | Rght | | Up | Dn | / | = | + | ` | INS | Left | Rght | | Up | Dn | [ | ] | `---------------------------' `---------------------------' ,--------------.,--------------. | LCtl | LAlt || RGUI | RCtl | From 02856f0c02fc673170eaf4bfed1d8297ec2d0c15 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 7 May 2020 08:56:12 +1000 Subject: [PATCH 370/429] Remove old_keymap_files directory from planck (#8917) --- .../common_keymaps/keymap_brett.c | 42 ----- .../common_keymaps/keymap_dotcom.c | 34 ---- .../common_keymaps/keymap_jack.c | 50 ------ .../common_keymaps/keymap_joe.c | 83 ---------- .../common_keymaps/keymap_matthew.c | 70 -------- .../common_keymaps/keymap_nathan.c | 154 ------------------ .../common_keymaps/keymap_paul.c | 49 ------ .../common_keymaps/keymap_peasant.c | 51 ------ .../common_keymaps/keymap_reed.c | 74 --------- .../common_keymaps/keymap_sean.c | 105 ------------ .../common_keymaps/keymap_shane.c | 99 ----------- .../common_keymaps/keymap_simon.c | 44 ----- .../common_keymaps/keymap_tim.c | 44 ----- .../common_keymaps/keymap_wilba.c | 54 ------ .../planck/old_keymap_files/keymap_common.c | 30 ---- .../planck/old_keymap_files/keymap_common.h | 129 --------------- 16 files changed, 1112 deletions(-) delete mode 100644 keyboards/planck/old_keymap_files/common_keymaps/keymap_brett.c delete mode 100644 keyboards/planck/old_keymap_files/common_keymaps/keymap_dotcom.c delete mode 100644 keyboards/planck/old_keymap_files/common_keymaps/keymap_jack.c delete mode 100644 keyboards/planck/old_keymap_files/common_keymaps/keymap_joe.c delete mode 100644 keyboards/planck/old_keymap_files/common_keymaps/keymap_matthew.c delete mode 100644 keyboards/planck/old_keymap_files/common_keymaps/keymap_nathan.c delete mode 100644 keyboards/planck/old_keymap_files/common_keymaps/keymap_paul.c delete mode 100644 keyboards/planck/old_keymap_files/common_keymaps/keymap_peasant.c delete mode 100644 keyboards/planck/old_keymap_files/common_keymaps/keymap_reed.c delete mode 100644 keyboards/planck/old_keymap_files/common_keymaps/keymap_sean.c delete mode 100644 keyboards/planck/old_keymap_files/common_keymaps/keymap_shane.c delete mode 100644 keyboards/planck/old_keymap_files/common_keymaps/keymap_simon.c delete mode 100644 keyboards/planck/old_keymap_files/common_keymaps/keymap_tim.c delete mode 100644 keyboards/planck/old_keymap_files/common_keymaps/keymap_wilba.c delete mode 100644 keyboards/planck/old_keymap_files/keymap_common.c delete mode 100644 keyboards/planck/old_keymap_files/keymap_common.h diff --git a/keyboards/planck/old_keymap_files/common_keymaps/keymap_brett.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_brett.c deleted file mode 100644 index cdebcd1433cd..000000000000 --- a/keyboards/planck/old_keymap_files/common_keymaps/keymap_brett.c +++ /dev/null @@ -1,42 +0,0 @@ -#include "keymap.h" - -#define KC_MO1 MO(1) -#define KC_MO2 MO(2) - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = KEYMAP( - ESC, Q, W, E, R, T, Y, U, I, O, P, BSPC, - LCTL, A, S, D, F, G, H, J, K, L, SCLN, ENT, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, RSFT, - TAB, LGUI, RSFT, LALT, MO2, SPC, MO1, LEFT, DOWN, UP, RGHT), -[1] = KEYMAP( /* RAISE */ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, DEL, - TRNS, F1, F2, F3, F4, F5, F6, 4, 5, 6, QUOT, TRNS, - TRNS, F7, F8, F9, F10, F11, F12, 1, 2, 3, TRNS, PGUP, - MPRV, MNXT, TRNS, MUTE, TRNS, TRNS, MO1, 0, 0, TRNS, PGDN), -[2] = KEYMAP( /* LOWER */ - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, MINS, - TRNS, TRNS, TRNS, PAUSE, TRNS, TRNS, TRNS, TRNS, LBRC, RBRC, BSLS, EQL, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - MPLY, MSTP, VOLU, VOLD, MO2, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS), -}; -const uint16_t PROGMEM fn_actions[] = { - [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1), - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2), - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3), - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4), - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5), - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6), - [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7), - [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8), - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9), - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0), - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), - [28] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), - - [29] = ACTION_MODS_KEY(MOD_LSFT | MOD_RSFT, KC_PAUSE), -}; diff --git a/keyboards/planck/old_keymap_files/common_keymaps/keymap_dotcom.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_dotcom.c deleted file mode 100644 index 5a85a6086ce0..000000000000 --- a/keyboards/planck/old_keymap_files/common_keymaps/keymap_dotcom.c +++ /dev/null @@ -1,34 +0,0 @@ -#include "keymap.h" - -#define KC_MO1 MO(1) - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = KEYMAP( - ESC, Q, W, E, R, T, Y, U, I, O, P, BSPC, - MO1, A, S, D, F, G, H, J, K, L, SCLN, ENT, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, LBRC, - LCTL, BSLS, QUOT, LALT, FN22, SPC, LEFT, UP, DOWN, RGHT, RBRC), -[1] = KEYMAP( - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, DEL, - TRNS, FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, TRNS, TRNS, TRNS, - TRNS, FN18, FN19, FN22, EQL, MINS, FN20, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, MO1, TRNS, VOLD, VOLU, TRNS), -}; -const uint16_t PROGMEM fn_actions[] = { - [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1), - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2), - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3), - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4), - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5), - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6), - [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7), - [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8), - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9), - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0), - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), - [28] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), -}; diff --git a/keyboards/planck/old_keymap_files/common_keymaps/keymap_jack.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_jack.c deleted file mode 100644 index 14db7feaa069..000000000000 --- a/keyboards/planck/old_keymap_files/common_keymaps/keymap_jack.c +++ /dev/null @@ -1,50 +0,0 @@ -#include "keymap.h" - -#define KC_MO2 MO(2) -#define KC_MO3 MO(3) - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = KEYMAP( /* Jack */ - TAB, Q, W, E, R, T, Y, U, I, O, P, BSPC, - ESC, A, S, D, F, G, H, J, K, L, SCLN, QUOT, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, ENT, - RSFT, LCTL, LALT, LGUI, MO3, SPC, MO2, LEFT, DOWN, UP, RGHT), -[1] = KEYMAP( /* Jack colemak */ - TAB, Q, W, F, P, G, J, L, U, Y, SCLN, BSPC, - ESC, A, R, S, T, D, H, N, E, I, O, QUOT, - LSFT, Z, X, C, V, B, K, M, COMM, DOT, SLSH, ENT, - FN3, LCTL, LALT, LGUI, MO3, SPC, MO2, LEFT, DOWN, UP, RGHT), -[2] = KEYMAP( /* Jack RAISE */ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, BSPC, - TRNS, FN3, FN4, PAUSE, TRNS, TRNS, TRNS, MINS, EQL, LBRC, RBRC, BSLS, - TRNS, F11, F12, F13, F14, F15, F16, F17, F18, F19, F20, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, MO2, MNXT, VOLD, VOLU, MPLY), -[3] = KEYMAP( /* Jack LOWER */ - FN22, FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, FN18, FN19, BSPC, - TRNS, FN3, FN4, PAUSE, TRNS, TRNS, TRNS, FN20, FN21, FN23, FN24, FN28, - TRNS, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, TRNS, - TRNS, TRNS, TRNS, TRNS, MO3, TRNS, TRNS, MNXT, VOLD, VOLU, MPLY), -}; -const uint16_t PROGMEM fn_actions[] = { - [3] = ACTION_DEFAULT_LAYER_SET(0), - [4] = ACTION_DEFAULT_LAYER_SET(1), - - [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1), - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2), - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3), - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4), - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5), - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6), - [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7), - [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8), - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9), - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0), - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), - [28] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), - - [29] = ACTION_MODS_KEY(MOD_LSFT | MOD_RSFT, KC_PAUSE), -}; diff --git a/keyboards/planck/old_keymap_files/common_keymaps/keymap_joe.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_joe.c deleted file mode 100644 index efd188a8ee81..000000000000 --- a/keyboards/planck/old_keymap_files/common_keymaps/keymap_joe.c +++ /dev/null @@ -1,83 +0,0 @@ -#include "keymap.h" - -#define KC_MO2 MO(2) -#define KC_MO3 MO(3) -#define KC_MO4 MO(4) - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = KEYMAP( /* Joe qwerty */ - ESC, Q, W, E, R, T, Y, U, I, O, P, MINS, - BSPC, A, S, D, F, G, H, J, K, L, SCLN, ENTER, - FN7, Z, X, C, V, B, N, M, COMM, DOT, SLSH, QUOT, - LCTL, LGUI, LALT, LSFT, MO3, SPC, MO2, LEFT, UP, DOWN, RGHT), -[1] = KEYMAP( /* Joe colemak */ - ESC, Q, W, F, P, G, J, L, U, Y, SCLN, MINS, - BSPC, A, R, S, T, D, H, N, E, I, O, ENTER, - FN7, Z, X, C, V, B, K, M, COMM, DOT, SLSH, QUOT, - LCTL, LGUI, LALT, LSFT, MO3, SPC, MO2, LEFT, UP, DOWN, RGHT), -[2] = KEYMAP( /* Joe UPPER */ - F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, - DEL, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, MENU, CAPS, INS, PSCR, TRNS, FN5, FN6, - TRNS, TRNS, TRNS, TRNS, MO4, TRNS, MO2, FN26, FN27, FN28, FN29), -[3] = KEYMAP( /* Joe LOWER */ - GRV, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN8, FN9, FN30, - BSPC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, TRNS, - BSLS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, LBRC, RBRC, TRNS, EQL, - TRNS, TRNS, TRNS, TRNS, MO3, TRNS, MO4, HOME, PGUP, PGDN, END), -[4] = KEYMAP( /* Joe LOWER + UPPER */ - FN3, FN4, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, SLEP, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, MUTE, VOLD, VOLU, MPLY), -}; - -enum macro_id { - M_Q0, - M_Q1, - M_Q2 -}; - -const uint16_t PROGMEM fn_actions[] = { - [3] = ACTION_DEFAULT_LAYER_SET(0), - [4] = ACTION_DEFAULT_LAYER_SET(1), - - [5] = ACTION_MODS_KEY(MOD_LCTL, KC_PGUP), - [6] = ACTION_MODS_KEY(MOD_LCTL, KC_PGDN), - - /* tab on tap, shift on hold */ - [7] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_TAB), - - [8] = ACTION_MACRO(M_Q0), - [9] = ACTION_MACRO(M_Q1), - - [26] = ACTION_MODS_KEY(MOD_LCTL | MOD_LALT, KC_LEFT), - [27] = ACTION_MODS_KEY(MOD_LCTL | MOD_LALT, KC_UP), - [28] = ACTION_MODS_KEY(MOD_LCTL | MOD_LALT, KC_DOWN), - [29] = ACTION_MODS_KEY(MOD_LCTL | MOD_LALT, KC_RGHT), - - [30] = ACTION_MACRO(M_Q2), -}; - -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - keyevent_t event = record->event; - switch (id) { - case M_Q0: - /* :( | ): */ - return event.pressed ? - MACRO( D(LSFT), T(P), T(9), T(SPC), T(SPC), T(0), T(P), U(LSFT), T(LEFT), T(LEFT), T(LEFT), END ) : - MACRO_NONE; - case M_Q1: - /* (: | :) */ - return event.pressed ? - MACRO( D(LSFT), T(9), T(P), T(SPC), T(SPC), T(P), T(0), U(LSFT), T(LEFT), T(LEFT), T(LEFT), END ) : - MACRO_NONE; - case M_Q2: - /* :) */ - return event.pressed ? - MACRO( D(LSFT), T(P), T(0), U(LSFT), END ) : - MACRO_NONE; - } - return MACRO_NONE; -} diff --git a/keyboards/planck/old_keymap_files/common_keymaps/keymap_matthew.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_matthew.c deleted file mode 100644 index fe0dfa619cd2..000000000000 --- a/keyboards/planck/old_keymap_files/common_keymaps/keymap_matthew.c +++ /dev/null @@ -1,70 +0,0 @@ -// by Matthew Pepers - https://github.com/pepers - -/* grid planck layout - modified programmer dvorak -,-----------------------------------------------------------------------------------------------. -| pause | @ | | | ^ | | | | | * | # | $ | del | -| esc | ; : | , < | . > | P | Y | F | G | G | C | R | bkspc | -| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | -|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------| -| & | / | { | ( | [ | = | ! | ] | ) | } | \ | + | -| ` ~ | A | O | E | U | I | D | H | T | N | S | - _ | -| % | 7 | 5 | 3 | 1 | 9 | 0 | 2 | 4 | 6 | 8 | ? | -|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------| -| | | | | | | | | | | | prtsc | -| tab | ' " | Q | J | K | X | B | M | W | V | Z | retrn | -| | | | | | | | | | | | insrt | -|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------| -| | | | | | | | | | | | | -| lctrl | lgui | lalt | ralt | lower | shift | space | raise | left | down | up | right | -| | | | | | | | | home | pgdn | pgup | end | -`-----------------------------------------------------------------------------------------------' -*/ - -#include "keymap.h" - -#define KC_MO1 MO(1) -#define KC_MO2 MO(2) - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* 0: dvorak */ - [0] = KEYMAP_GRID( ESC, SCLN, COMM, DOT, P, Y, F, G, C, R, L, BSPC, \ - GRV, A, O, E, U, I, D, H, T, N, S, MINS, \ - TAB, QUOT, Q, J, K, X, B, M, W, V, Z, ENT, \ - LCTL, LGUI, LALT, RALT, MO1, LSFT, SPC, MO2, LEFT, DOWN, UP, RGHT), - - /* 1: lower (FN1) */ - [1] = KEYMAP_GRID( F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, \ - FN17, 7, 5, 3, 1, 9, 0, 2, 4, 6, 8, FN18, \ - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, INS, \ - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, HOME, PGDN, PGUP, END), - - /* 2: raise (FN2) */ - [2] = KEYMAP_GRID(PAUS, FN19, FN20, FN21, TRNS, TRNS, TRNS, TRNS, FN22, FN23, FN24, DEL, \ - FN10, SLSH, FN11, FN12, LBRC, EQL, FN13, RBRC, FN14, FN15, BSLS, FN16, \ - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, PSCR, \ - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS), - -}; - -const uint16_t PROGMEM fn_actions[] = { - // lower row1 - [17] = ACTION_MODS_KEY(MOD_LSFT, KC_5), // % - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_SLASH), // ? - - // raise row0 - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_2), // @ - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLASH), // | - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_6), // ^ - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_8), // * - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_3), // # - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_4), // $ - - // raise row1 - [10] = ACTION_MODS_KEY(MOD_LSFT, KC_7), // & - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRACKET), // { - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_9), // ( - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_1), // ! - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_0), // ) - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRACKET), // } - [16] = ACTION_MODS_KEY(MOD_LSFT, KC_EQUAL), // + -}; diff --git a/keyboards/planck/old_keymap_files/common_keymaps/keymap_nathan.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_nathan.c deleted file mode 100644 index 7cc5e7f0ac81..000000000000 --- a/keyboards/planck/old_keymap_files/common_keymaps/keymap_nathan.c +++ /dev/null @@ -1,154 +0,0 @@ -// Author: Nathan Ross Powell -// https://github.com/nathanrosspowell/tmk_keyboard/blob/planck-jack/keyboard/planck/keymap_nathan.c - -#include "keymap.h" - -#define KC_MO1 MO(1) -#define KC_MO2 MO(2) - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* 0: main layer - * ,-----------------------------------------------------------------------. - * |Tab | q | w | e | r | t | y | u | i | o | p | BS | - * |-----------------------------------------------------------------------| - * |Ctrl | a | s | d | f | g | h | j | k | l | ; | Ret | - * |-----------------------------------------------------------------------| - * |Shift| z | x | c | v | b | n | m | [ | ( | { | < | - * |-----------------------------------------------------------------------| - * |Meta | \ | / | Alt |Lower|Space|Space|Upper|Left |Down | Up |Right| - * `-----------------------------------------------------------------------' - */ - [0] = KEYMAP_GRID( - TAB, Q, W, E, R, T, Y, U, I, O, P, BSPC, - LCTL, A, S, D, F, G, H, J, K, L, SCLN, ENT, - RSFT, Z, X, C, V, B, N, M, LBRC, FN10, FN11, FN12, - LGUI, BSLS, SLSH, LALT, MO1, SPC, SPC, MO2, LEFT, DOWN, UP, RGHT), - - /* 1: fn left/lower layer - * The top row are Visual Studio combos: - * 'Run', 'Breakpoint', 'Step over', 'Step into', 'Set cursor to line' - * 2nd row are key combos: - * 'ctrl-alt-delete', 'ctrl-shift-escape' - * 3rd row are macros keys: - * 'P0' - 'P5' execute a script on Windows machines - * ,-----------------------------------------------------------------------. - * | ESC | F5 | F9 | F10 | F11 |S+F11|CSF10|NLock|Num7 |Num8 |Num9 | Del | - * |-----------------------------------------------------------------------| - * | |C/A/D|C/S/E| Ins |Print|Pause|SLock|Num0 |Num4 |Num5 |Num6 |Num= | - * |-----------------------------------------------------------------------| - * | | P0 | P1 | P2 | P3 | P4 | P5 |Num. |Num1 |Num2 |Num3 |Num/ | - * |-----------------------------------------------------------------------| - * | |User | | | | | | |Home |PgDn |PgUp | End | - * `-----------------------------------------------------------------------' - */ - [1] = KEYMAP_GRID( - ESC, F5, F9, F10, F11, FN30, FN31, NLCK, P7, P8, P9, DEL, - TRNS, FN16, FN17, INS, PSCR, PAUS, SLCK, P0, P4, P5, P6, PEQL, - TRNS, FN2, FN3, FN4, FN5, FN6, FN7, PDOT, P1, P2, P3, PSLS, - TRNS, FN8, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, HOME, PGDN, PGUP, END ), - - /* 2: fn right/raise layer - * ,-----------------------------------------------------------------------. - * | F1 | F2 | F3 | F4 |F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | - * |-----------------------------------------------------------------------| - * | | ! | @ | # | $ | % | ^ | & | * | - | + | = | - * |-----------------------------------------------------------------------| - * | | _ | ' | " | ` | ~ | , | . | ] | ) | } | > | - * |-----------------------------------------------------------------------| - * | |NextT|PrevT| | | | Esc | |Mute |Vol- |Vol+ | P/P | - * `-----------------------------------------------------------------------' - */ - [2] = KEYMAP_GRID( - F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, - TRNS, FN18, FN19, FN20, FN21, FN22, FN23, FN24, FN25, MINS, FN26, PAST, - TRNS, FN27, QUOT, FN28, GRV, FN29, COMM, DOT, RBRC, FN13, FN14, FN15, - TRNS, MNXT, MPRV, TRNS, TRNS, TRNS, ESC, TRNS, MUTE, VOLD, VOLU, MPLY ), -}; - -enum macro_id { - M_P0, - M_P1, - M_P2, - M_P3, - M_P4, - M_P5, - M_USERNAME -}; - -const uint16_t PROGMEM fn_actions[] = { - // Program macros - [2] = ACTION_MACRO(M_P0), - [3] = ACTION_MACRO(M_P1), - [4] = ACTION_MACRO(M_P2), - [5] = ACTION_MACRO(M_P3), - [6] = ACTION_MACRO(M_P4), - [7] = ACTION_MACRO(M_P5), - [8] = ACTION_MACRO(M_USERNAME), - // Braces - [10] = ACTION_MODS_KEY(MOD_LSFT, KC_9), // ( - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), // { - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_COMMA), // < - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_0), // ) - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), // } - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_DOT), // > - // Combo - [16] = ACTION_MODS_KEY(MOD_LALT | MOD_LCTL, KC_DEL), // Ctrl+Alt+Delete - [17] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL, KC_ESC), // Ctrl+Shft+Escape - // Symbols - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_1), // ! - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_2), // @ - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_3), // # - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_4), // $ - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_5), // % - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_6), // ^ - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_7), // & - [25] = ACTION_MODS_KEY(MOD_LSFT, KC_8), // * - [26] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), // + - [27] = ACTION_MODS_KEY(MOD_LSFT, KC_MINUS), // _ - [28] = ACTION_MODS_KEY(MOD_LSFT, KC_QUOTE), // " - [29] = ACTION_MODS_KEY(MOD_LSFT, KC_GRAVE), // ~ - // Debugging - [30] = ACTION_MODS_KEY(MOD_LSFT, KC_F11), // Step into - [31] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL, KC_F10), // Set cursor to line - }; - -// Run a script and pass a key number to it. This is Windows specific and the script needs to be on your path. -// *open run dialog* keypress.py [PRG_NUM] -#define ADD_PYTHON_PROGRAM_ON_WIN( PRG_NUM ) MACRO( D(LGUI), T(R), U(LGUI), W(100), T(K), T(E), T(Y), T(P), T(R), T(E), T(S), T(S), T(DOT), T(P), T(Y), T(SPC), T(PRG_NUM), END ) -// *return* -#define RUN_PYTHON_PROGRAM_ON_WIN MACRO( T(ENT), END ) - -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { - keyevent_t event = record->event; - switch (id) { - case M_P0: - return event.pressed ? - ADD_PYTHON_PROGRAM_ON_WIN( 0 ) : - RUN_PYTHON_PROGRAM_ON_WIN; - case M_P1: - return event.pressed ? - ADD_PYTHON_PROGRAM_ON_WIN( 1 ) : - RUN_PYTHON_PROGRAM_ON_WIN; - case M_P2: - return event.pressed ? - ADD_PYTHON_PROGRAM_ON_WIN( 2 ) : - RUN_PYTHON_PROGRAM_ON_WIN; - case M_P3: - return event.pressed ? - ADD_PYTHON_PROGRAM_ON_WIN( 3 ) : - RUN_PYTHON_PROGRAM_ON_WIN; - case M_P4: - return event.pressed ? - ADD_PYTHON_PROGRAM_ON_WIN( 4 ) : - RUN_PYTHON_PROGRAM_ON_WIN; - case M_P5: - return event.pressed ? - ADD_PYTHON_PROGRAM_ON_WIN( 5 ) : - RUN_PYTHON_PROGRAM_ON_WIN; - case M_USERNAME: - return event.pressed ? - MACRO( T(N), T(A), T(T), T(H), T(A), T(N), T(R), T(O), T(S), T(S), T(P), T(O), T(W), T(E), T(L), T(L), END ) : - MACRO_NONE; - } - return MACRO_NONE; -} diff --git a/keyboards/planck/old_keymap_files/common_keymaps/keymap_paul.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_paul.c deleted file mode 100644 index 829c047be6f1..000000000000 --- a/keyboards/planck/old_keymap_files/common_keymaps/keymap_paul.c +++ /dev/null @@ -1,49 +0,0 @@ -#include "keymap.h" - -#define KC_MO1 MO(1) -#define KC_MO2 MO(2) -#define KC_MO3 MO(3) - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = KEYMAP( /* Paul */ - TAB, Q, W, E, R, T, Y, U, I, O, P, BSPC, - MO1, A, S, D, F, G, H, J, K, L, SCLN, QUOT, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, ENT, - ESC, LCTL, LALT, LGUI, MO2, SPC, MO3, LEFT, DOWN, UP, RGHT), -[1] = KEYMAP( /* Paul FN */ - TRNS, TRNS, TRNS, FN8, FN9, TRNS, TRNS, TRNS, TRNS, MUTE, VOLD, VOLU, - MO1, TRNS, TRNS, HOME, END, TRNS, TRNS, TRNS, TRNS, MPRV, MPLY, MNXT, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, UP, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, LEFT, DOWN, RGHT), -[2] = KEYMAP( /* Paul LOWER */ - FN22, FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, FN18, FN19, BSPC, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN20, FN21, FN23, FN24, FN28, - TRNS, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, TRNS, - TRNS, TRNS, TRNS, TRNS, MO2, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS), -[3] = KEYMAP( /* Paul RAISE */ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, BSPC, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, MINS, EQL, LBRC, RBRC, BSLS, - TRNS, F11, F12, F13, F14, F15, F16, F17, F18, F19, F20, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, MO3, TRNS, TRNS, TRNS, TRNS), -}; -const uint16_t PROGMEM fn_actions[] = { - [8] = ACTION_MODS_KEY(MOD_LSFT, KC_HOME), - [9] = ACTION_MODS_KEY(MOD_LSFT, KC_END), - [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1), - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2), - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3), - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4), - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5), - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6), - [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7), - [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8), - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9), - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0), - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), - [28] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), - -}; diff --git a/keyboards/planck/old_keymap_files/common_keymaps/keymap_peasant.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_peasant.c deleted file mode 100644 index f6493e33a904..000000000000 --- a/keyboards/planck/old_keymap_files/common_keymaps/keymap_peasant.c +++ /dev/null @@ -1,51 +0,0 @@ -#include "keymap.h" - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = KEYMAP( /* Native */ - ESC, Q, W, E, R, T, Y, U, I, O, P, FN2, - BSPC, A, S, D, F, G, H, J, K, L, SCLN, QUOT, - TAB, Z, X, C, V, B, N, M, COMM, DOT, SLSH, ENT, - DEL, LCTL, NO, LSFT, LALT, SPC, NO, LEFT, DOWN, UP, RGHT), - [1] = KEYMAP( /* QWERTY->PHOTOSHOP */ - DELETE, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, FN1, - O, G, S, U, T, FN27, F21, F10, F11, F7, F8, F9, - TAB, FN4, FN5, FN6, F1, FN7, F18, F19, F23, F20, F22, FN9, - COMM, DOT, FN10, FN11, FN3, SPC, FN12, F2, FN8, F3, F14), - [2] = KEYMAP( /* 2: FN3 PHOTOSHOP */ - ESC, FN25, FN26, NO, NO, NO, NO, NO, NO, NO, NO, NO, - NO, NO, NO, NO, NO, NO, NO, NO, NO, FN19, FN20, FN21, - C, NO, FN22, FN5, NO, FN23, NO, NO, NO, NO, FN13, NO, - FN14, FN15, FN16, FN17, FN3, SPC, FN18, NO, NO, F24, NO), -}; - -const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_DEFAULT_LAYER_SET(0), // set Qwerty layout - [2] = ACTION_DEFAULT_LAYER_SET(1), // set Photoshop presets - [3] = ACTION_LAYER_ON_OFF(2), // Photoshop function layer - - [4] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL | MOD_LALT, KC_F9), // photo folder AHK - [5] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL, KC_I), // select inverse - [6] = ACTION_MODS_KEY(MOD_LSFT, KC_M), // marquee select - [7] = ACTION_MODS_KEY(MOD_LALT, KC_BSPC), // fill - [8] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL | MOD_LALT, KC_X), // warp - [9] = ACTION_MODS_KEY(MOD_LCTL | MOD_LALT | MOD_LSFT, KC_F12), // merge all new layer - [10] = ACTION_MODS_KEY(MOD_LCTL, KC_MINS), // zoom out - [11] = ACTION_MODS_KEY(MOD_LCTL, KC_H), // RBG sliders - [12] = ACTION_MODS_KEY(MOD_LCTL, KC_S), // save - [13] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL, KC_F5), // layer mask from transparancy - [14] = ACTION_MODS_KEY(MOD_LALT, KC_LBRC), // prev layer - [15] = ACTION_MODS_KEY(MOD_LALT, KC_RBRC), // next layer - [16] = ACTION_MODS_KEY(MOD_LCTL, KC_EQL), // zoom in - [17] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL, KC_H), // HSV sliders - [18] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL | MOD_LALT, KC_F11), // save as PNG - [19] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL | MOD_LALT, KC_F7), // gaussian blur - [20] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL | MOD_LALT, KC_F8), // motion blur - [21] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL, KC_X), // liquify filter - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), // prev layer blending - [23] = ACTION_MODS_KEY(MOD_LSFT | MOD_LALT, KC_N), // normal layer blending - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), // next layer blending - [25] = ACTION_MODS_KEY(MOD_LCTL, KC_Z), // step back - [26] = ACTION_MODS_KEY(MOD_LCTL, KC_Y), // step forward - [27] = ACTION_MODS_KEY(MOD_LCTL, KC_R), // rasterize - -}; diff --git a/keyboards/planck/old_keymap_files/common_keymaps/keymap_reed.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_reed.c deleted file mode 100644 index 9e6e953e3127..000000000000 --- a/keyboards/planck/old_keymap_files/common_keymaps/keymap_reed.c +++ /dev/null @@ -1,74 +0,0 @@ -#include "keymap.h" - -#define KC_MO2 MO(2) -#define KC_MO3 MO(3) - -/* - * BUILD: - * Simply run the command below in the keyboards/planck directory - * to build against this keymap - * - * make KEYMAP=reed COMMON_KEYMAP=true - * - * - * DETAILS: - * - * This layout works off of Jack's layout, making some changes that I - * feel significantly improve the function of the keyboard. Major changes - * include adding a "gaming mode" that will allow users to still access - * the number keys 1 through 4 easily for games that require it. Also - * included is the ability to use the tap/hold function for easy use of - * right shift and thumb shift with their tapped companions. - * - */ -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = KEYMAP_GRID( /* Reed */ - ESC, Q, W, E, R, T, Y, U, I, O, P, BSPC, - TAB, A, S, D, F, G, H, J, K, L, SCLN, QUOT, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, FN5, - LCTL, CAPS, LALT, LGUI, MO3, FN7, SPC, MO2, LEFT, DOWN, UP, RGHT), - -[1] = KEYMAP_GRID( /* Reed EXTREME GAMING */ - ESC, Q, W, E, R, T, Y, U, I, O, P, BSPC, - TAB, A, S, D, F, G, H, J, K, L, SCLN, QUOT, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, FN5, - LCTL, 1, 2, 3, 4, SPC, MO3, MO2, LEFT, DOWN, UP, RGHT), - -[2] = KEYMAP_GRID( /* Reed RAISE */ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, BSPC, - TRNS, FN3, FN4, PAUSE, TRNS, TRNS, TRNS, MINS, EQL, LBRC, RBRC, BSLS, - TRNS, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, MO2, MNXT, VOLD, VOLU, MPLY), - -[3] = KEYMAP_GRID( /* Reed LOWER */ - TRNS, FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, FN18, FN19, DEL, - TRNS, TRNS, INS, HOME, PGUP, TRNS, TRNS, FN20, FN21, FN23, FN24, FN28, - TRNS, TRNS, DEL, END, PGDN, F11, F12, F13, TRNS, VOLD, VOLU, TRNS, - TRNS, TRNS, TRNS, TRNS, MO3, TRNS, TRNS, TRNS, MPRV, MUTE, MPLY, MNXT), -}; -const uint16_t PROGMEM fn_actions[] = { - [3] = ACTION_DEFAULT_LAYER_SET(0), - [4] = ACTION_DEFAULT_LAYER_SET(1), - // Actions for the tap/hold modifiers listed above - [5] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_ENT), - [7] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_BSPC), - - [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1), - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2), - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3), - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4), - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5), - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6), - [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7), - [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8), - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9), - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0), - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), - [28] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), - - [29] = ACTION_MODS_KEY(MOD_LSFT | MOD_RSFT, KC_PAUSE), -}; diff --git a/keyboards/planck/old_keymap_files/common_keymaps/keymap_sean.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_sean.c deleted file mode 100644 index 10a112986e27..000000000000 --- a/keyboards/planck/old_keymap_files/common_keymaps/keymap_sean.c +++ /dev/null @@ -1,105 +0,0 @@ -#define KC_RESET 0x5000 -#include "keymap_common.h" - -enum planck_layers { - _DVRK, - _LOWER, - _RAISE, - _ADJUST -}; - -#define KC_LOWR MO(_LOWER) -#define KC_RAIS MO(_RAISE) -#define KC_ADJS MO(_ADJUST) - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -/* Dvorak - * ,-----------------------------------------------------------------------------------. - * | " | , | . | P | Y | / | = | F | G | C | R | L | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | A | O | E | U | I | ESC | BSPC | D | H | T | N | S | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | ; | Q | J | K | X | TAB | ENT | B | M | W | V | Z | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Sft | Ctl | Alt | Gui |Lower | Space |Raise | < | v | ^ | > | - * `-----------------------------------------------------------------------------------' - */ - [_DVRK] = KEYMAP( - QUOT, COMM, DOT, P, Y, SLSH, EQL, F, G, C, R, L, - A, O, E, U, I, ESC, BSPC, D, H, T, N, S, - SCLN, Q, J, K, X, TAB, ENT, B, M, W, V, Z, - LSFT, LCTL, LALT, LGUI, LOWR, SPC, RAIS,LEFT, DOWN, UP, RGHT), - -/* Lower - * ,-----------------------------------------------------------------------------------. - * | F1 | F2 | F3 | F4 | F5 | { | } | F6 | F7 | F8 | F9 | F10 | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | 1 | 2 | 3 | 4 | 5 | [ | ] | 6 | 7 | 8 | 9 | 0 | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | ~ | | | ` | - | _ | INS | DEL | ( | ) | + | = | \ | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Sft | Ctl | Alt | Gui |Lower | Space |Raise | | PgDn | PgUp | End | - * `-----------------------------------------------------------------------------------' - */ - [_LOWER] = KEYMAP( /* fn1 lower */ - F1, F2, F3, F4, F5, FN26, FN27, F6, F7, F8, F9, F10, - 1, 2, 3, 4, 5, LBRC, RBRC, 6, 7, 8, 9, 0, - FN23, FN25, GRV,MINS, FN24, INS, DEL, FN19, FN20, FN22, EQL, BSLS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, ADJS,HOME, PGDN, PGUP, END), - -/* Raise - * ,-----------------------------------------------------------------------------------. - * | F11 | F12 | F13 | F14 | F15 | - | _ | F16 | F17 | F18 | F19 | F20 | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | ! | @ | # | $ | % | | | ^ | & | * | ( | ) | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | CAPS | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' - */ - [_RAISE] = KEYMAP( /* fn2 raise */ - F11, F12, F13, F14, F15,MINS, FN24, F16, F17, F18, F19, F20, - FN11, FN12, FN13, FN14, FN15, NO, NO, FN16, FN17, FN18, FN19, FN20, - PWR, EJCT, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, - CAPS, TRNS, TRNS, TRNS, ADJS,TRNS, RAIS, NO, NO, NO, NO), -/* Adjust (Lower + Raise or SLower + SRaise) - * ,-----------------------------------------------------------------------------------. - * | | Reset| | | | | | | | | | | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | PWR | EJCT | | | | | | CAPS | | | | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * |DVORAK| | | | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' - */ -[_ADJUST] = KEYMAP( - NO, RESET, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, - PWR, EJCT, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, - CAPS, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, - NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO), -}; - -const uint16_t PROGMEM fn_actions[] = { - [3] = ACTION_DEFAULT_LAYER_SET(_DVRK), - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_1), //! - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_2), //@ - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_3), //# - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_4), //$ - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_5), //% - [16] = ACTION_MODS_KEY(MOD_LSFT, KC_6), //^ - [17] = ACTION_MODS_KEY(MOD_LSFT, KC_7), //& - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_8), //* - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_9), //( - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_0), //) - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_SLSH), //? - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), //+ - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), //~ - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), //_ - [25] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), //| - [26] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), //{ - [27] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), //} - [28] = ACTION_MODS_KEY(MOD_LSFT | MOD_RSFT, KC_PAUSE), -}; diff --git a/keyboards/planck/old_keymap_files/common_keymaps/keymap_shane.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_shane.c deleted file mode 100644 index 69ce9b8e09fa..000000000000 --- a/keyboards/planck/old_keymap_files/common_keymaps/keymap_shane.c +++ /dev/null @@ -1,99 +0,0 @@ -#include "keymap.h" -#include "action_layer.h" -#include "action.h" -#include "action_util.h" - -#define KC_MO6 MO(6) -#define KC_MO8 MO(8) - -/* - Shane's Planck Layout - http://www.keyboard-layout-editor.com/#/layouts/015d9011102619d7695c86ffe57cf441 -*/ -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = KEYMAP_AND_SWAP( /* Base */ - TAB, Q, W, E, R, T, Y, U, I, O, P, MINS, - LCTL, A, S, D, F, G, H, J, K, L, SCLN, BSPC, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, FN5, - /*ALPHA*/FN3, /*HYPER*/ /*SUPER*/LGUI, /*META*/LALT, LCTL, MO8, FN6, MO6, LEFT, DOWN, UP, RGHT), - [2] = KEYMAP_AND_SWAP( /* More modifiers */ - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, RCTL, RALT, RGUI, TRNS), - [4] = KEYMAP_AND_SWAP( /* WASD */ - TRNS, TRNS, UP, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, LEFT, DOWN, RIGHT, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS), - [6] = KEYMAP_AND_SWAP( /* Raise/FN1 */ - FN23, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, EQL, - TRNS, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, ENT, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, BSLS, TRNS, - PAUS, TRNS, TRNS, TRNS, TRNS, BSPC, TRNS, MUTE, PGUP, PGDN, MNXT), - [8] = KEYMAP_AND_SWAP( /* Lower/FN2 */ - ESC, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN19, FN20, TRNS, - TRNS, TRNS, TRNS, TRNS, CAPS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, QUOT, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN24, FN25, LBRC, RBRC, TRNS, TRNS, - FN4, TRNS, TRNS, TRNS, TRNS, ENT, TRNS, MPLY, VOLD, VOLU, MPRV), -}; - -enum function_id { - SPACE_FN, -}; - -void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - switch (id) { - case SPACE_FN: - if (record->event.pressed) { - // Change the keyboard maps. - // Whatever even layer's are on, turn on the odd one's too. - for (uint8_t i = 0; i < 9; i += 2) { - if (layer_state & (1UL << i)) - layer_on(i + 1); - } - layer_on(1); - } else { - // turn off all the even layers. - for (uint8_t i = 0; i < 9; i += 2) - layer_off(i + 1); - - if (record->tap.count != 0) { - // Space was tapped rather than used like a modifier. - // So send a space up and down event. - add_key(KC_SPC); - send_keyboard_report(); - del_key(KC_SPC); - send_keyboard_report(); - } - } - break; - } -} - - - -const uint16_t PROGMEM fn_actions[] = { - [3] = ACTION_LAYER_TOGGLE(2), // toggle more modifiers - [4] = ACTION_LAYER_TOGGLE(4), // toggle wasd - [5] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_ENT), - [6] = ACTION_FUNCTION_TAP(SPACE_FN), - - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_1), - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_2), - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_3), - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_4), - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_5), - [16] = ACTION_MODS_KEY(MOD_LSFT, KC_6), - [17] = ACTION_MODS_KEY(MOD_LSFT, KC_7), - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_8), - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_9), - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_0), - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), - [25] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), - [26] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), -}; diff --git a/keyboards/planck/old_keymap_files/common_keymaps/keymap_simon.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_simon.c deleted file mode 100644 index fa948077cec9..000000000000 --- a/keyboards/planck/old_keymap_files/common_keymaps/keymap_simon.c +++ /dev/null @@ -1,44 +0,0 @@ -#include "keymap.h" - -#define KC_MO1 MO(1) -#define KC_MO2 MO(2) - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = KEYMAP( /* Jack */ - ESC, Q, W, E, R, T, Y, U, I, O, P, BSPC, - TAB, A, S, D, F, G, H, J, K, L, DOT, ENT, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SCLN, DEL, - LCTL, ENT, LALT, CAPS, MO2, SPC, MO1, LEFT, DOWN, UP, RGHT), -[1] = KEYMAP( /* Jack RAISE */ - TRNS, F1, F2, F3, F4, NO, FN11, FN9, FN12, NO, FN14, TRNS, - TRNS, F5, F6, F7, F8, FN16, SLSH, MINS, EQL, LBRC, FN8, TRNS, - TRNS, F9, F10, F11, F12, F15, F16, FN22, SCLN, MINS, QUOT, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS), -[2] = KEYMAP( /* Jack LOWER */ - FN22, 1, 2, 3, FN13, FN14, FN15, FN16, FN17, FN18, FN19, BSPC, - TRNS, 4, 5, 6, TRNS, TRNS, TRNS, FN20, FN21, FN23, FN24, FN28, - TRNS, 7, 8, 9, 0, FN28, FN15, F7, F8, F9, F10, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS), -}; -const uint16_t PROGMEM fn_actions[] = { - [8] = ACTION_MODS_KEY(MOD_LSFT, KC_SLSH), - [9] = ACTION_MODS_KEY(MOD_LSFT, KC_QUOT), - [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1), - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2), - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3), - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4), - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5), - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6), - [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7), - [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8), - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9), - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0), - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), - [28] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), - - [29] = ACTION_MODS_KEY(MOD_LSFT | MOD_RSFT, KC_PAUSE), -}; diff --git a/keyboards/planck/old_keymap_files/common_keymaps/keymap_tim.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_tim.c deleted file mode 100644 index 5be56e725696..000000000000 --- a/keyboards/planck/old_keymap_files/common_keymaps/keymap_tim.c +++ /dev/null @@ -1,44 +0,0 @@ -#include "keymap.h" - -#define KC_MO2 MO(2) -#define KC_MO3 MO(3) - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = KEYMAP( - ESC, Q, W, E, R, T, Y, U, I, O, P, BSPC, - TAB, A, S, D, F, G, H, J, K, L, SCLN, ENT, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, RSFT, - LCTL, LALT, DEL, LGUI, MO3, SPC, MO2, F2, F5, F9, F12), -[2] = KEYMAP( /* RAISE */ - TRNS, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, BSPC, - GRV, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, MINS, EQL, LBRC, RBRC, BSLS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, QUOT, FN29, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, MO2, TRNS, TRNS, TRNS, TRNS), -[3] = KEYMAP( /* LOWER */ - TRNS, FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, FN18, FN19, BSPC, - FN22, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN20, FN21, FN23, FN24, FN28, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, QUOT, FN29, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, MO3, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS), -}; -const uint16_t PROGMEM fn_actions[] = { - [3] = ACTION_DEFAULT_LAYER_SET(0), - [4] = ACTION_DEFAULT_LAYER_SET(1), - - [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1), - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2), - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3), - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4), - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5), - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6), - [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7), - [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8), - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9), - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0), - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), - [28] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), - [29] = ACTION_MODS_KEY(MOD_LSFT, KC_QUOT), -}; diff --git a/keyboards/planck/old_keymap_files/common_keymaps/keymap_wilba.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_wilba.c deleted file mode 100644 index 054297b6362c..000000000000 --- a/keyboards/planck/old_keymap_files/common_keymaps/keymap_wilba.c +++ /dev/null @@ -1,54 +0,0 @@ -#include "keymap.h" - -#define KC_MO2 MO(2) -#define KC_MO3 MO(3) -#define KC_BLTG BL_TOGG -#define KC_BLIN BL_INC -#define KC_BLDE BL_DEC - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = KEYMAP( /* Wilba */ - BLTG, BLIN, BLDE, E, R, T, Y, U, I, O, P, BSPC, - TAB, A, S, D, F, G, H, J, K, L, SCLN, QUOT, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, ENT, - LCTL, LGUI, LALT, RSFT, MO2, SPC, MO3, LEFT, DOWN, UP, RGHT), -[1] = KEYMAP( /* Wilba Alternate */ - ESC, Q, W, E, R, T, Y, U, I, O, P, BSPC, - TAB, A, S, D, F, G, H, J, K, L, SCLN, QUOT, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, ENT, - LCTL, LGUI, LALT, RSFT, MO2, SPC, MO3, LEFT, DOWN, UP, RGHT), -[2] = KEYMAP( /* Wilba LOWER */ - TRNS, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, TRNS, - TRNS, F11, F12, LBRC, RBRC, FN20, EQL, FN23, FN24, MINS, FN21, TRNS, - TRNS, BSLS, GRV, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, MO2, TRNS, TRNS, MNXT, VOLD, VOLU, MPLY), -[3] = KEYMAP( /* Wilba RAISE */ - TRNS, FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, FN18, FN19, TRNS, - TRNS, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, TRNS, - TRNS, FN25, FN22, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, MO3, TRNS, TRNS, TRNS, TRNS), -}; -const uint16_t PROGMEM fn_actions[] = { - [3] = ACTION_DEFAULT_LAYER_SET(0), - [4] = ACTION_DEFAULT_LAYER_SET(1), - - [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1), // ! - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2), // @ - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3), // # - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4), // $ - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5), // % - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6), // ^ - [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7), // & - [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8), // * - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9), // ( - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0), // ) - - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), // _ - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), // + - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // ~ - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), // { - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), // } - [25] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), // | - - [26] = ACTION_MODS_KEY(MOD_LSFT | MOD_RSFT, KC_PAUSE) -}; diff --git a/keyboards/planck/old_keymap_files/keymap_common.c b/keyboards/planck/old_keymap_files/keymap_common.c deleted file mode 100644 index db4f18a95b48..000000000000 --- a/keyboards/planck/old_keymap_files/keymap_common.c +++ /dev/null @@ -1,30 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako - -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 . -*/ -#include "keymap.h" - - -/* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) -{ - return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); -} - -/* translates Fn keycode to action */ -action_t keymap_fn_to_action(uint8_t keycode) -{ - return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) }; -} diff --git a/keyboards/planck/old_keymap_files/keymap_common.h b/keyboards/planck/old_keymap_files/keymap_common.h deleted file mode 100644 index d46df92876a6..000000000000 --- a/keyboards/planck/old_keymap_files/keymap_common.h +++ /dev/null @@ -1,129 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako - -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 . -*/ -#ifndef KEYMAP_COMMON_H -#define KEYMAP_COMMON_H - -#include -#include -#include -#include "keycode.h" -#include "action.h" -#include "action_macro.h" -#include "report.h" -#include "host.h" -// #include "print.h" -#include "debug.h" -#include "keymap.h" - - -extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; -extern const uint16_t fn_actions[]; - - -// MIT Layout -/* - * ,-----------------------------------------------------------------------. - * | | | | | | | | | | | | | - * |-----------------------------------------------------------------------| - * | | | | | | | | | | | | | - * |-----------------------------------------------------------------------| - * | | | | | | | | | | | | | - * |-----------------------------------------------------------------------| - * | | | | | | | | | | | | - * `-----------------------------------------------------------------------' - */ -#define KEYMAP( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ - K30, K31, K32, K33, K34, K35, K37, K38, K39, K3A, K3B \ -) { \ - { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B }, \ - { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B }, \ - { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2A, KC_##K2B }, \ - { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K35, KC_##K37, KC_##K38, KC_##K39, KC_##K3A, KC_##K3B } \ -} - -// Grid Layout -/* - * ,-----------------------------------------------------------------------. - * | | | | | | | | | | | | | - * |-----------------------------------------------------------------------| - * | | | | | | | | | | | | | - * |-----------------------------------------------------------------------| - * | | | | | | | | | | | | | - * |-----------------------------------------------------------------------| - * | | | | | | | | | | | | | - * `-----------------------------------------------------------------------' - */ -#define KEYMAP_GRID( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B \ -) { \ - { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B }, \ - { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B }, \ - { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2A, KC_##K2B }, \ - { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39, KC_##K3A, KC_##K3B } \ -} - -#define KEYMAP_REVERSE( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ - K30, K31, K32, K33, K34, K35, K37, K38, K39, K3A, K3B \ - ) { \ - { KC_##K0B, KC_##K0A, KC_##K09, KC_##K08, KC_##K07, KC_##K06, KC_##K05, KC_##K04, KC_##K03, KC_##K02, KC_##K01, KC_##K00 }, \ - { KC_##K1B, KC_##K1A, KC_##K19, KC_##K18, KC_##K17, KC_##K16, KC_##K15, KC_##K14, KC_##K13, KC_##K12, KC_##K11, KC_##K10 }, \ - { KC_##K2B, KC_##K2A, KC_##K29, KC_##K28, KC_##K27, KC_##K26, KC_##K25, KC_##K24, KC_##K23, KC_##K22, KC_##K21, KC_##K20 }, \ - { KC_##K3B, KC_##K3A, KC_##K39, KC_##K38, KC_##K37, KC_##K35, KC_##K35, KC_##K34, KC_##K33, KC_##K32, KC_##K31, KC_##K30 }, \ - } - -#define KEYMAP_AND_REVERSE(args...) KEYMAP(args), KEYMAP_REVERSE(args) - -#define KEYMAP_SWAP( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ - K30, K31, K32, K33, K34, K35, K37, K38, K39, K3A, K3B \ - ) { \ - { KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05 }, \ - { KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15 }, \ - { KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25 }, \ - { KC_##K37, KC_##K38, KC_##K39, KC_##K3A, KC_##K3B, KC_##K35, KC_##K35, KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34 }, \ -} - -#define KEYMAP_AND_SWAP(args...) KEYMAP(args), KEYMAP_SWAP(args) - -/* - Keymap for the Planck 48 key variant. - */ -#define KEYMAP_48( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B \ -) { \ - { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B }, \ - { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B }, \ - { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2A, KC_##K2B }, \ - { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39, KC_##K3A, KC_##K3B }, \ -} - - -#endif From c4d030cacf08feeff4e3f8d087dc137efe475a7c Mon Sep 17 00:00:00 2001 From: Alex Daigre Date: Wed, 6 May 2020 18:03:42 -0500 Subject: [PATCH 371/429] [Keymap] Custom preonic layout optimised for programming (#8263) * my new layout, draft one, untested. * updated mapping to include more keys * updated layout name to be more descriptive. Updated readme with more information. * added more info to the readme and spellchecked it. * Added the Json for the keyboard layout images and updated the readme to reflect this. * Updated Image link Updated Image link so that it links to the correct place * updated copyright info to include MY name. * Updated copyright attribuatation to include the author of the file I modified. * added the backlighting key back to the adjust layer so that it is usable. * updated the name of the keymap to match my github name. --- keyboards/preonic/keymaps/AlexDaigre/config.h | 37 ++ .../keyboard-layout-editor/adjust.json | 80 +++++ .../keyboard-layout-editor/lower.json | 80 +++++ .../keyboard-layout-editor/main.json | 95 +++++ .../keyboard-layout-editor/raise.json | 80 +++++ keyboards/preonic/keymaps/AlexDaigre/keymap.c | 326 ++++++++++++++++++ .../preonic/keymaps/AlexDaigre/readme.md | 19 + keyboards/preonic/keymaps/AlexDaigre/rules.mk | 1 + 8 files changed, 718 insertions(+) create mode 100644 keyboards/preonic/keymaps/AlexDaigre/config.h create mode 100644 keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/adjust.json create mode 100644 keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/lower.json create mode 100644 keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/main.json create mode 100644 keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/raise.json create mode 100644 keyboards/preonic/keymaps/AlexDaigre/keymap.c create mode 100644 keyboards/preonic/keymaps/AlexDaigre/readme.md create mode 100644 keyboards/preonic/keymaps/AlexDaigre/rules.mk diff --git a/keyboards/preonic/keymaps/AlexDaigre/config.h b/keyboards/preonic/keymaps/AlexDaigre/config.h new file mode 100644 index 000000000000..40a9524b469d --- /dev/null +++ b/keyboards/preonic/keymaps/AlexDaigre/config.h @@ -0,0 +1,37 @@ +#pragma once + +#ifdef AUDIO_ENABLE + #define STARTUP_SONG SONG(PREONIC_SOUND) + // #define STARTUP_SONG SONG(NO_SOUND) + + #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ + SONG(COLEMAK_SOUND), \ + SONG(DVORAK_SOUND) \ + } +#endif + +#define MUSIC_MASK (keycode != KC_NO) + +/* + * MIDI options + */ + +/* Prevent use of disabled MIDI features in the keymap */ +//#define MIDI_ENABLE_STRICT 1 + +/* enable basic MIDI features: + - MIDI notes can be sent when in Music mode is on +*/ + +#define MIDI_BASIC + +/* enable advanced MIDI features: + - MIDI notes can be added to the keymap + - Octave shift and transpose + - Virtual sustain, portamento, and modulation wheel + - etc. +*/ +//#define MIDI_ADVANCED + +/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ +//#define MIDI_TONE_KEYCODE_OCTAVES 2 diff --git a/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/adjust.json b/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/adjust.json new file mode 100644 index 000000000000..6dac52cb9444 --- /dev/null +++ b/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/adjust.json @@ -0,0 +1,80 @@ +[ + { + "name": "Plank Don Gato Programming Raise Layer" + }, + [ + { + "a": 7 + }, + "F1", + "F2", + "F3", + "F4", + "F5", + "F6", + "F7", + "F8", + "F9", + "F10", + "F11", + "F12" + ], + [ + "", + "Reset", + "Debug", + "", + "", + "", + "", + "Term On", + "Term Off", + "", + "", + "" + ], + [ + "", + "", + "Mu Mod", + "Audio On", + "Audio Off", + "AG Norm", + "AG Swap", + "Qwerty", + "Colemak", + "Dvorak", + "", + "" + ], + [ + "", + "Voice -", + "Voice +", + "Music On", + "Music Off", + "", + "", + "", + "", + "", + "", + "" + ], + [ + "", + "", + "", + "", + "", + { + "w": 2 + }, + "", + "", + "Next", + "Vol -", + "Vol +", + "Play" + ] +] \ No newline at end of file diff --git a/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/lower.json b/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/lower.json new file mode 100644 index 000000000000..ccf860653fc4 --- /dev/null +++ b/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/lower.json @@ -0,0 +1,80 @@ +[ + { + "name": "Plank Don Gato Programming Lower Layer" + }, + [ + { + "a": 7 + }, + "Print Screen", + "Page Up", + "Page Down", + "Home", + "End", + "Insert", + "Scroll Lock", + "Num Lock", + "Pause", + "]", + "[", + "-" + ], + [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "Delete" + ], + [ + "Caps Lock", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + [ + "Right Shift", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "\\", + "Menu" + ], + [ + "Right Ctrl", + "Right Alt", + "Right Os", + "", + "", + { + "w": 2 + }, + "", + "", + "", + "", + "", + "" + ] +] \ No newline at end of file diff --git a/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/main.json b/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/main.json new file mode 100644 index 000000000000..77589c205cdb --- /dev/null +++ b/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/main.json @@ -0,0 +1,95 @@ +[ + { + "name": "Plank Don Gato Programming Main Layer" + }, + [ + { + "a": 5 + }, + "~\n`", + "!\n1", + "@\n2", + "#\n3", + "$\n4", + "%\n5", + "^\n6", + "&\n7", + "*\n8", + "(\n9", + ")\n0", + "+\n=" + ], + [ + { + "a": 7 + }, + "Tab", + "Q", + "W", + "E", + "R", + "T", + "Y", + "U", + "I", + "O", + "P", + "Back Space" + ], + [ + "Esc", + "A", + "S", + "D", + "F", + "G", + "H", + "J", + "K", + "L", + { + "a": 5 + }, + ":\n;", + "\"\n'" + ], + [ + { + "a": 7 + }, + "Shift", + "Z", + "X", + "C", + "V", + "B", + "N", + "M", + { + "a": 5 + }, + "<\n,", + ">\n.", + { + "a": 7 + }, + "/", + "Return" + ], + [ + "Ctrl", + "Alt", + "OS", + "Super", + "⇓", + { + "w": 2 + }, + "", + "⇑", + "←", + "↓", + "↑", + "→" + ] +] \ No newline at end of file diff --git a/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/raise.json b/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/raise.json new file mode 100644 index 000000000000..aae97d489fde --- /dev/null +++ b/keyboards/preonic/keymaps/AlexDaigre/keyboard-layout-editor/raise.json @@ -0,0 +1,80 @@ +[ + { + "name": "Plank Don Gato Programming Raise Layer" + }, + [ + { + "a": 7 + }, + "Print Screen", + "Page Up", + "Page Down", + "Home", + "End", + "Insert", + "Scroll Lock", + "Num Lock", + "Pause", + "{", + "}", + "_" + ], + [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "Delete" + ], + [ + "Caps Lock", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + [ + "Right Shift", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "|", + "Menu" + ], + [ + "Right Ctrl", + "Right Alt", + "Right Os", + "", + "", + { + "w": 2 + }, + "", + "", + "", + "", + "", + "" + ] + ] \ No newline at end of file diff --git a/keyboards/preonic/keymaps/AlexDaigre/keymap.c b/keyboards/preonic/keymaps/AlexDaigre/keymap.c new file mode 100644 index 000000000000..67d13005cfdc --- /dev/null +++ b/keyboards/preonic/keymaps/AlexDaigre/keymap.c @@ -0,0 +1,326 @@ +/* Copyright 2020 Alex Daigre + * Modified from layout provided by Jack Humbert + * + * 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 . + */ + +#include QMK_KEYBOARD_H +#include "muse.h" + +enum preonic_layers { + _QWERTY, + _COLEMAK, + _DVORAK, + _LOWER, + _RAISE, + _ADJUST +}; + +enum preonic_keycodes { + QWERTY = SAFE_RANGE, + COLEMAK, + DVORAK, + LOWER, + RAISE, + BACKLIT, + ADJUST +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Qwerty + * ,-----------------------------------------------------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | = | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | S | D | F | G | H | J | K | L | ; | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Ctrl | Alt | GUI |Adjust| Lower| Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_QWERTY] = LAYOUT_preonic_grid( \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQUAL, \ + 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_ESC, 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, KC_ENT, \ + KC_LCTL, KC_LALT, KC_LGUI, ADJUST, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ +), + +/* Colemak + * ,-----------------------------------------------------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | = | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Tab | Q | W | F | P | G | J | L | U | Y | ; | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | R | S | T | D | H | N | E | I | O | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | K | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Ctrl | Alt | GUI |Adjust| Lower| Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_COLEMAK] = LAYOUT_preonic_grid( \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQUAL, \ + KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ + KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \ + KC_LCTL, KC_LALT, KC_LGUI, ADJUST, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ +), + +/* Dvorak + * ,-----------------------------------------------------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | = | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Tab | " | , | . | P | Y | F | G | C | R | L | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | O | E | U | I | D | H | T | N | S | / | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| ; | Q | J | K | X | B | M | W | V | Z |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Ctrl | Alt | GUI |Adjust| Lower| Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_DVORAK] = LAYOUT_preonic_grid( \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQUAL, \ + KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \ + KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, \ + KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT, \ + KC_LCTL, KC_LALT, KC_LGUI, ADJUST, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ +), + +/* Lower + * ,-----------------------------------------------------------------------------------. + * |PrtScr| PgUp | PgDw | Home | End |Insert|ScrlLk|NumLck|Pause | [ | ] | - | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | | | | | | | | | | | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Caps | | | | | | | | | | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | | | | | | | | | | \ | Menu | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * |RCtrl | RAlt | RGui | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[_LOWER] = LAYOUT_preonic_grid( \ + KC_PSCREEN, KC_PGUP, KC_PGDOWN, KC_HOME, KC_END, KC_INSERT, KC_SCROLLLOCK, KC_NUMLOCK, KC_PAUSE, KC_LBRACKET, KC_RBRACKET, KC_MINUS, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELETE, \ + KC_CAPSLOCK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_RSHIFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLASH, KC_MENU, \ + KC_RCTRL, KC_RALT, KC_RGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +), + +/* Raise + * ,-----------------------------------------------------------------------------------. + * |PrtScr| PgUp | PgDw | Home | End |Insert|ScrlLk|NumLck|Pause | { | } | _ | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Caps | | | | | | | | | | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | | | | | | | | | | | | Menu | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * |RCtrl | RAlt | RGui | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[_RAISE] = LAYOUT_preonic_grid( \ + KC_PSCREEN, KC_PGUP, KC_PGDOWN, KC_HOME, KC_END, KC_INSERT, KC_SCROLLLOCK, KC_NUMLOCK, KC_PAUSE, KC_LEFT_CURLY_BRACE, KC_RIGHT_CURLY_BRACE, KC_UNDERSCORE, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELETE, \ + KC_CAPSLOCK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_RSHIFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE, KC_MENU, \ + KC_RCTRL, KC_RALT, KC_RGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +), + +/* Adjust (Lower + Raise) + * ,-----------------------------------------------------------------------------------. + * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | Reset| | | | | | | | | | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | | |Aud on|AudOff|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff| | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Light| | | | | | | Next | Vol- | Vol+ | Play | + * `-----------------------------------------------------------------------------------' + */ +[_ADJUST] = LAYOUT_preonic_grid( \ + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ + _______, RESET, DEBUG, _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, _______, \ + _______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \ + _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, \ + BACKLIT, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ +) + + +}; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QWERTY: + if (record->event.pressed) { + set_single_persistent_default_layer(_QWERTY); + } + return false; + break; + case COLEMAK: + if (record->event.pressed) { + set_single_persistent_default_layer(_COLEMAK); + } + return false; + break; + case DVORAK: + if (record->event.pressed) { + set_single_persistent_default_layer(_DVORAK); + } + return false; + break; + case ADJUST: + if (record->event.pressed) { + layer_on(_RAISE); + layer_on(_LOWER); + layer_on(_ADJUST); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_RAISE); + layer_off(_LOWER); + layer_off(_ADJUST); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case RAISE: + if (record->event.pressed) { + layer_on(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case BACKLIT: + if (record->event.pressed) { + register_code(KC_RSFT); + #ifdef BACKLIGHT_ENABLE + backlight_step(); + #endif + #ifdef __AVR__ + writePinLow(E6); + #endif + } else { + unregister_code(KC_RSFT); + #ifdef __AVR__ + writePinHigh(E6); + #endif + } + return false; + break; + } + return true; +}; + +bool muse_mode = false; +uint8_t last_muse_note = 0; +uint16_t muse_counter = 0; +uint8_t muse_offset = 70; +uint16_t muse_tempo = 50; + +void encoder_update_user(uint8_t index, bool clockwise) { + if (muse_mode) { + if (IS_LAYER_ON(_RAISE)) { + if (clockwise) { + muse_offset++; + } else { + muse_offset--; + } + } else { + if (clockwise) { + muse_tempo+=1; + } else { + muse_tempo-=1; + } + } + } else { + if (clockwise) { + register_code(KC_PGDN); + unregister_code(KC_PGDN); + } else { + register_code(KC_PGUP); + unregister_code(KC_PGUP); + } + } +} + +void dip_switch_update_user(uint8_t index, bool active) { + switch (index) { + case 0: + if (active) { + layer_on(_ADJUST); + } else { + layer_off(_ADJUST); + } + break; + case 1: + if (active) { + muse_mode = true; + } else { + muse_mode = false; + } + } +} + + +void matrix_scan_user(void) { +#ifdef AUDIO_ENABLE + if (muse_mode) { + if (muse_counter == 0) { + uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()]; + if (muse_note != last_muse_note) { + stop_note(compute_freq_for_midi_note(last_muse_note)); + play_note(compute_freq_for_midi_note(muse_note), 0xF); + last_muse_note = muse_note; + } + } + muse_counter = (muse_counter + 1) % muse_tempo; + } else { + if (muse_counter) { + stop_all_notes(); + muse_counter = 0; + } + } +#endif +} + +bool music_mask_user(uint16_t keycode) { + switch (keycode) { + case RAISE: + case LOWER: + return false; + default: + return true; + } +} diff --git a/keyboards/preonic/keymaps/AlexDaigre/readme.md b/keyboards/preonic/keymaps/AlexDaigre/readme.md new file mode 100644 index 000000000000..0aed8ebe0925 --- /dev/null +++ b/keyboards/preonic/keymaps/AlexDaigre/readme.md @@ -0,0 +1,19 @@ +[Layout Images](https://imgur.com/a/k95XQlP) + +# Alex Daigre's programming Layout + +The default Preonic layout is suited to general english typing but not very convent to program on. This is my custom layout to re-optimise the keyboard for programming tasks. +I have been programming with this keyboard layout at work and I found it much faster and easier to adjust to than the default layout. + +- Removed keys on the RAISE, LOWER, and ADJUST layers that duplicated keys on the main QWERTY layout. +- Moved the control, alt, and gui keys to a more natural position. +- Added the Caps-lock key on RAISE and LOWER in its position on a standard keyboard. +- Moved {}[], -_, and \| (on RAISE and LOWER) to be close to to similar keys on the QWERTY layout to make them easier to remember. They are kept as close as possible to their locations on a standard layout so users won't have to ADJUST their muscle memory much. + - (), {}, and [] are all on the 9 and 0 keys. This is where () are placed naturally, so it is easy to find all of your braces. + - -_ are moved to the += key. Now you can remember that -, +, and = are all together. The keys are also right next to each-other on a standard layout, so it is a very small move. + - \ and | have beeb moved to the /? key. Easy to remember as / and \ are together. +- Moved backspace to make room for +=. +- Added delete to the backspace key on RAISE / LOWER +- Removed backlight, from the main layer, and added an ADJUST key. As the Massdrop kits don't come with backlighting default, I think this is more useful for most users. +- I have left the Colemak and Dvorak alternate layouts, but they won't map up as conveniently to the other layers. +- I have included the keyboard layouts so that those wishing to make modifications or new versions of this layout can quickly update their images. diff --git a/keyboards/preonic/keymaps/AlexDaigre/rules.mk b/keyboards/preonic/keymaps/AlexDaigre/rules.mk new file mode 100644 index 000000000000..dcf16bef3994 --- /dev/null +++ b/keyboards/preonic/keymaps/AlexDaigre/rules.mk @@ -0,0 +1 @@ +SRC += muse.c From e3ee08b263df283d4a3e331c2034e099f512126d Mon Sep 17 00:00:00 2001 From: Stefano Date: Thu, 7 May 2020 01:31:22 +0200 Subject: [PATCH 372/429] jj28 (jj40 SuperMicro) update (#8885) * jj28 (jj40 SuperMicro) update * Update keyboards/jj40/keymaps/stevexyz/config.h Co-Authored-By: Joel Challis * removed jpegs * Update keyboards/jj40/keymaps/stevexyz/keymap.c Co-authored-by: Joel Challis * Update keyboards/jj40/keymaps/stevexyz/keymap.c Co-authored-by: Joel Challis * Update keyboards/jj40/keymaps/stevexyz/keymap.c Co-authored-by: Joel Challis Co-authored-by: stevexyz Co-authored-by: Joel Challis --- keyboards/jj40/keymaps/stevexyz/config.h | 12 ++-- .../keyboard-layout-editor-raw-data.txt | 4 -- keyboards/jj40/keymaps/stevexyz/keymap.c | 71 +++++++++++-------- keyboards/jj40/keymaps/stevexyz/readme.md | 5 +- keyboards/jj40/keymaps/stevexyz/rules.mk | 1 - 5 files changed, 51 insertions(+), 42 deletions(-) delete mode 100644 keyboards/jj40/keymaps/stevexyz/keyboard-layout-editor-raw-data.txt diff --git a/keyboards/jj40/keymaps/stevexyz/config.h b/keyboards/jj40/keymaps/stevexyz/config.h index 4d4825f9b640..84c02dddd6f1 100644 --- a/keyboards/jj40/keymaps/stevexyz/config.h +++ b/keyboards/jj40/keymaps/stevexyz/config.h @@ -1,6 +1,8 @@ +#pragma once // Behaviors That Can Be Configured + #define TAPPING_TERM 250 // how long before a tap becomes a hold, if set above 500, a key tapped during the tapping term will turn it into a hold too @@ -9,18 +11,18 @@ #define IGNORE_MOD_TAP_INTERRUPT // makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. +#define TAPPING_FORCE_HOLD + // makes it possible to use a dual role key as modifier shortly after having been tapped (see Hold after tap) + // Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) + + /* #define TAPPING_TERM_PER_KEY // enables handling for per key TAPPING_TERM settings #define RETRO_TAPPING // tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release - // See Retro Tapping for details #define TAPPING_TOGGLE 2 // how many taps before triggering the toggle - #define TAPPING_FORCE_HOLD - // makes it possible to use a dual role key as modifier shortly after having been tapped - // See Hold after tap - // Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) #define LEADER_TIMEOUT 300 // how long before the leader key times out // If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped. diff --git a/keyboards/jj40/keymaps/stevexyz/keyboard-layout-editor-raw-data.txt b/keyboards/jj40/keymaps/stevexyz/keyboard-layout-editor-raw-data.txt deleted file mode 100644 index 0117b5e2ee19..000000000000 --- a/keyboards/jj40/keymaps/stevexyz/keyboard-layout-editor-raw-data.txt +++ /dev/null @@ -1,4 +0,0 @@ -[{c:"#eeddcc",g:true,a:7},"","","","","","","","","","","",""], -["",{c:"#cccccc",g:false,a:4,fa:[2,1,5,5,8]},"F11\nF1\n!\n1\nQ","F12\nF2\n@\n2\nW","Layer Num\nF3\n#\n3\nE","Layer Light\nF4\n$\n4\nR","\nF5\n%\n5\nT","\nF6\n^\n6\nY","\nF7\n&\n7\nU","\nF8\n*\n8\nI","Layer Mouse\nF9\n(\n9\nO","\nF10\n)\n0\nP",{c:"#eeddcc",g:true,a:7},""], -["",{c:"#cccccc",t:"#000000\n\n\n\n\n\n\n\n\n\n#804020",g:false,a:4,fa:[2,1,5,5,8,0,2,2,0,0,1]},"Caps\n\n\n\nA\n\nEsc\nTab\n\n\nshift",{fa:[2,2,5,5,8,0,2,2,0,0,1]},"\n\n~\n`\nS\n\n\n\n\n\nfn","\n\n_\n-\nD\n\n\n\n\n\nnum",{t:"#000000"},"\n\n+\n=\nF",{t:"#000000\n\n\n\n\n\n\n\n\n\n#804020"},"\n\n{\n[\nG\n\n\n\n\n\n","\n\n}\n]\nH\n\n\n\n\n\n",{t:"#000000"},"\n\n|\n\\\nJ",{t:"#000000\n\n\n\n\n\n\n\n\n\n#804020"},"\n\n:\n;\nK\n\n\n\n\n\nfn","\n\n\"\n'\nL\n\n\n\n\n\nnum",{c:"#eeddcc",f:1,fa:[2,2,5,5,8,0,2,2,0,0,0]},"Ins\n\n\n\n\n\nBS\nDel\n\n\nshift",{t:"#000000",g:true,a:7,f:3},""], -["","",{c:"#cccccc",t:"#000000\n#804020",g:false,a:5,fa:[0,1,0,0,8]},"\nctrl\n\n\nZ","\nalt\n\n\nX",{t:"#000000\n\n\n\n\n\n\n\n\n\n#804020",a:4,fa:[2,1,0,0,8,0,0,0,0,0,1]},"^\n\n\n\nC\n\n\n\n\n\nfn","^\n\n\n\nV\n\n\n\n\n\nnum",{fa:[2,1,5,5,8,0,0,0,0,0,1]},"Prnt Scrn\n\n<\n,\nB\n\n\n\n\n\nshift","Scr Lock\n\n>\n.\nN\n\n\n\n\n\nalt","Paus\n\n?\n/\nM\n\n\n\n\n\nctrl",{t:"#000000\n#804020",a:5},"\nshift",{c:"#eeddcc",t:"#000000",g:true,a:7},"",""] diff --git a/keyboards/jj40/keymaps/stevexyz/keymap.c b/keyboards/jj40/keymaps/stevexyz/keymap.c index 4045d071092f..02601a30d9ce 100644 --- a/keyboards/jj40/keymaps/stevexyz/keymap.c +++ b/keyboards/jj40/keymaps/stevexyz/keymap.c @@ -22,6 +22,12 @@ */ +/* + * Nice to have: + * - tap dancing (p=backspace, q=escape, a=tab, vowel=accentedletter and same for consonant as the french c) + */ + + #include QMK_KEYBOARD_H enum layers { @@ -38,20 +44,24 @@ enum custom_keycodes { CK_TRIPLEZERO = SAFE_RANGE, }; +#define CK_CONFIGINIT EEPROM_RESET + enum { - TD_ENT_BSPC = 0, - TD_KPENT_BSPC, - TD_E_GRAVE, + TD_P_BSPC = 0, + TD_Q_ESC, + TD_A_TAB, TD_A_GRAVE, + TD_E_GRAVE, + TD_E_ACUTE, + TD_I_GRAVE, TD_O_GRAVE, TD_U_GRAVE, - TD_I_GRAVE, - TD_E_ACUTE, }; qk_tap_dance_action_t tap_dance_actions[] = { - [TD_ENT_BSPC] = ACTION_TAP_DANCE_DOUBLE(KC_ENT, KC_BSPC), - [TD_KPENT_BSPC] = ACTION_TAP_DANCE_DOUBLE(KC_KP_ENTER, KC_BSPC), - [TD_E_GRAVE] = ACTION_TAP_DANCE_DOUBLE(KC_E, KC_E), + [TD_P_BSPC] = ACTION_TAP_DANCE_DOUBLE(KC_P, KC_BSPC), + [TD_Q_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC), + [TD_A_TAB] = ACTION_TAP_DANCE_DOUBLE(KC_A, KC_TAB), + //[TD_E_GRAVE] = ACTION_TAP_DANCE_DOUBLE(KC_E, KC_EGRAVE), }; @@ -83,18 +93,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+-------------+------+------+------+------+------| * | | | | | | | | | | | | | * | | A | S | D | F | G | H | J | K | L | Enter| | - * | | Shift| FnNav|NumSym| ____ | OSkey| OSkey| ____ | FnNav|NumSym| Shift| | + * | | Shift| FnNav|NumSym| AltGr| OSkey| OSkey| AltGr| FnNav|NumSym| Shift| | * |------+------+------+------+------+------+------|------+------+------+------+------+ * | | | | | | | | | | | | | * | | | Z | X | C | V | B | N | M | Space| | | - * | | | Ctrl | Alt | FnNav|NumSym| Shift| Alt | Ctrl | Shift| | | + * | | | Ctrl | Alt | FnNav|NumSym| Shift| Alt | Ctrl | Shift| | | * `-----------------------------------------------------------------------------------' */ [LAYER_HOME] = LAYOUT_ortho_4x12( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, XXXXXXX, - XXXXXXX, MT(MOD_LSFT, KC_A), LT(LAYER_FUNC, KC_S), LT(LAYER_NUMSYM, KC_D), KC_F, MT(MOD_LGUI, KC_G), MT(MOD_RGUI, KC_H), KC_J, LT(LAYER_FUNC, KC_K), LT(LAYER_NUMSYM, KC_L), MT(MOD_RSFT, KC_ENT), XXXXXXX, - XXXXXXX, XXXXXXX, MT(MOD_LCTL, KC_Z), MT(MOD_LALT, KC_X), LT(LAYER_FUNC, KC_C), LT(LAYER_NUMSYM, KC_V), MT(MOD_LSFT, KC_B), MT(MOD_RALT, KC_N), MT(MOD_RCTL, KC_M), MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ), + XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, XXXXXXX, + XXXXXXX, MT(MOD_LSFT, KC_A), LT(LAYER_FUNC, KC_S), LT(LAYER_NUMSYM, KC_D), MT(MOD_RALT, KC_F), MT(MOD_LGUI, KC_G), MT(MOD_RGUI, KC_H), MT(MOD_RALT, KC_J), LT(LAYER_FUNC, KC_K), LT(LAYER_NUMSYM, KC_L), MT(MOD_RSFT, KC_ENT), XXXXXXX, + XXXXXXX, XXXXXXX, MT(MOD_LCTL, KC_Z), MT(MOD_LALT, KC_X), LT(LAYER_FUNC, KC_C), LT(LAYER_NUMSYM, KC_V), MT(MOD_LSFT, KC_B), MT(MOD_LALT, KC_N), MT(MOD_RCTL, KC_M), MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ), /* Function and Navigation Layer * ,-----------------------------------------------------------------------------------. @@ -108,18 +118,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+-------------+------+------+------+------+------| * | | | | | | | | | | | | | * | | ESC | Home | PgDn | PgUp | End | Left | Down | Up | Right| Baksp| | - * | | Shift|xxxxxx|SysLay| ____ | ____ | ____ | ____ |xxxxxx|SysLay| Shift| | + * | | Shift| ____ |SysLay| AltGr| OSkey| OSkey| AltGr| ____ |SysLay| Shift| | * |------+------+------+------+------+------+------|------+------+------+------+------+ * | | | | | | | | | | | | | * | | | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | | | - * | | | Ctrl | Alt |xxxxxx|SysLay| Shift| Alt | Ctrl | Shift| | | + * | | | Ctrl | Alt | ____ |SysLay| Shift| Alt | Ctrl | Shift| | | * `-----------------------------------------------------------------------------------' */ [LAYER_FUNC] = LAYOUT_ortho_4x12( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, - XXXXXXX, MT(MOD_LSFT, KC_ESC), KC_HOME, LT(LAYER_SYST, KC_PGDN), KC_PGUP, KC_END, KC_LEFT, KC_DOWN, KC_UP, LT(LAYER_SYST, KC_RGHT), MT(MOD_RSFT, KC_BSPC), XXXXXXX, - XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, KC_TRNS, MO(LAYER_SYST), KC_LSFT, KC_RALT, KC_RCTL, MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ), + XXXXXXX, MT(MOD_LSFT, KC_ESC), KC_HOME, LT(LAYER_SYST, KC_PGDN), MT(MOD_RALT, KC_PGUP), MT(MOD_LGUI, KC_END), MT(MOD_RGUI, KC_LEFT), MT(MOD_RALT, KC_DOWN), KC_UP, LT(LAYER_SYST, KC_RGHT), MT(MOD_RSFT, KC_BSPC), XXXXXXX, + XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, KC_NO, MO(LAYER_SYST), KC_LSFT, KC_LALT, KC_RCTL, MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ), /* Number and Symbols Layer * ,-----------------------------------------------------------------------------------. @@ -133,18 +143,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+-------------+------+------+------+------+------| * | | | ~ | _ | + | { | } | | | : | " | | | * | | TAB | ` | - | = | [ | ] | \ | ; | ' | | | - * | | Shift|SysLay|xxxxxx| ____ | ____ | ____ | ____ |SysLay|xxxxxx| Shift| | + * | | Shift|SysLay| ____ | AltGr| OSkey| OSkey| AltGr|SysLay| ____ | Shift| | * |------+------+------+------+------+------+------|------+------+------+------+------+ * | | | | | | | < | > | ? | | | | * | | | ____ | ____ | ____ | ____ | , | . | / | ____ | | | - * | | | Ctrl | Alt |SysLay|xxxxxx| Shift| ____ | ____ | Shift| | | + * | | | Ctrl | Alt |SysLay| ____ | Shift| Alt | Ctrl | Shift| | | * `-----------------------------------------------------------------------------------' */ [LAYER_NUMSYM] = LAYOUT_ortho_4x12( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, XXXXXXX, - XXXXXXX, MT(MOD_LSFT, KC_TAB), LT(LAYER_SYST, KC_GRV), KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, LT(LAYER_SYST, KC_SCLN), KC_QUOT, MT(MOD_RSFT, KC_DEL), XXXXXXX, - XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, MO(LAYER_SYST), KC_TRNS, MT(MOD_LSFT, KC_COMM), KC_DOT, KC_SLSH, MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ), + XXXXXXX, MT(MOD_LSFT, KC_TAB), LT(LAYER_SYST, KC_GRV), KC_MINS, MT(MOD_RALT, KC_EQL), MT(MOD_LGUI, KC_LBRC), MT(MOD_RGUI, KC_RBRC), MT(MOD_RALT, KC_BSLS), LT(LAYER_SYST, KC_SCLN), KC_QUOT, MT(MOD_RSFT, KC_DEL), XXXXXXX, + XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, MO(LAYER_SYST), KC_NO, MT(MOD_LSFT, KC_COMM), MT(MOD_LALT, KC_DOT), MT(MOD_RCTL, KC_SLSH), MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ), /* System Layer * ,-----------------------------------------------------------------------------------. @@ -153,11 +163,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | | | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | | | | | | - * | | F11 | F12 |NumLay|LghLay| ____ | ____ | ____ | ____ |MouLay|Backsp| | + * | | F11 | F12 |NumLay|LghLay| ____ |KbInit| Power|SysReq|MouLay|Backsp| | * | | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | | * |------+------+------+------+------+-------------+------+------+------+------+------| * | | | | | | | | | | | | | - * | | Caps | Mute | Vol- | Vol+ | Play | Next | ____ | ____ | ____ | Ins | | + * | | Caps | Mute | Vol- | Vol+ | Play | Next | ____ | ____ |OSMenu| Ins | | * | | Shift| ____ | ____ | ____ | ____ | ____ | ____ | ____ | ____ | Shift| | * |------+------+------+------+------+------+------|------+------+------+------+------+ * | | | | | | | | | | | | | @@ -167,9 +177,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [LAYER_SYST] = LAYOUT_ortho_4x12( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, KC_F11, KC_F12, TG(LAYER_NUMONLY), TG(LAYER_LIGHTS), KC_NO, KC_NO, KC_NO, KC_NO, TG(LAYER_MOUSE), KC_BSPC, XXXXXXX, - XXXXXXX, MT(MOD_LSFT, KC_CAPS), KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_NO, MT(MOD_RSFT, KC_INS), XXXXXXX, - XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ), + XXXXXXX, KC_F11, KC_F12, TG(LAYER_NUMONLY), TG(LAYER_LIGHTS), KC_NO, CK_CONFIGINIT, KC_POWER, KC_SYSREQ, TG(LAYER_MOUSE), KC_BSPC, XXXXXXX, + XXXXXXX, MT(MOD_LSFT, KC_CAPS), KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_APP, MT(MOD_RSFT, KC_INS), XXXXXXX, + XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, KC_NO, KC_NO, KC_PSCR, KC_SLCK, KC_PAUS, MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ), /* Numeric Keypad * ,-----------------------------------------------------------------------------------. @@ -233,7 +243,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+-------------+------+------+------+------+------| * | | | | | | | | | | | | | * | | Left | Down | Right| Whl- | ____ | ____ | ____ | ____ | ____ | Enter| | - * | | ____ | ____ | ____ | ____ | OSkey| OSkey| ____ | ____ | ____ | ____ | | + * | | ____ | ____ | ____ | ____ | OSkey| OSkey| AltGr| ____ | ____ | ____ | | * |------+------+------+------+------+------+------|------+------+------+------+------+ * | | | | | | | | | | | | | * | | | ____ | ____ | ____ | ____ | ____ | ____ | ____ | Space| | | @@ -243,14 +253,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [LAYER_MOUSE] = LAYOUT_ortho_4x12( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, KC_MS_WH_UP, KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, KC_NO, TG(LAYER_MOUSE), KC_NO, XXXXXXX, - XXXXXXX, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_WH_DOWN, KC_LGUI, KC_RGUI, KC_NO, KC_NO, KC_NO, KC_ENT, XXXXXXX, - XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, KC_NO, KC_NO, KC_LSFT, KC_RALT, KC_RCTL, MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ), + XXXXXXX, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_WH_DOWN, KC_LGUI, KC_RGUI, KC_RALT, KC_NO, KC_NO, KC_ENT, XXXXXXX, + XXXXXXX, XXXXXXX, KC_LCTL, KC_LALT, KC_NO, KC_NO, KC_LSFT, KC_LALT, KC_RCTL, MT(MOD_RSFT, KC_SPC), XXXXXXX, XXXXXXX ), }; void matrix_init_user(void) { - // set num lock on at start independently of state (for numonly layer to work) + // eeconfig_init(); // reset keyboard to a standard default state; useful when new releases messup with eeprom values + // set num lock on at start (for numonly layer to work) if (!(host_keyboard_leds() & (1< Date: Thu, 7 May 2020 00:01:19 -0400 Subject: [PATCH 373/429] [Keymap] New keymap layout for dztech/dz65rgb/keymaps (#8199) * New keymap layout for dztech/dz65rgb/keymaps * New keymap layout for dztech/dz65rgb/keymaps - Conding conventions fixes * Fix typo in Leader Key table * PR #8199 Feedback Commit #1 * Fixed data types and function names - Simplified accent macros by removing repetition - Added selection wrap macros - readme.md doc updated with changes * PR #8199 second feedback commit - Clarified function names, variables names and comments * Fix: accent output fix _grave <==> _circumflex * dry fixes on led set_color with hsv and led blinking code blocks --- .../dztech/dz65rgb/keymaps/drootz/config.h | 52 ++ .../dztech/dz65rgb/keymaps/drootz/keymap.c | 757 ++++++++++++++++++ .../dztech/dz65rgb/keymaps/drootz/readme.md | 210 +++++ .../dztech/dz65rgb/keymaps/drootz/rules.mk | 11 + 4 files changed, 1030 insertions(+) create mode 100644 keyboards/dztech/dz65rgb/keymaps/drootz/config.h create mode 100644 keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c create mode 100644 keyboards/dztech/dz65rgb/keymaps/drootz/readme.md create mode 100644 keyboards/dztech/dz65rgb/keymaps/drootz/rules.mk diff --git a/keyboards/dztech/dz65rgb/keymaps/drootz/config.h b/keyboards/dztech/dz65rgb/keymaps/drootz/config.h new file mode 100644 index 000000000000..5810507975a5 --- /dev/null +++ b/keyboards/dztech/dz65rgb/keymaps/drootz/config.h @@ -0,0 +1,52 @@ +#pragma once + +#define LEADER_PER_KEY_TIMING +#define LEADER_TIMEOUT 425 +#define TAP_HOLD_CAPS_DELAY 80 + +#ifdef RGB_MATRIX_ENABLE +/* Reset default from dz65rgb/v2 config.h */ +# undef DISABLE_RGB_MATRIX_SPLASH +# undef DISABLE_RGB_MATRIX_SOLID_SPLASH +# undef RGB_MATRIX_LED_FLUSH_LIMIT +# undef RGB_MATRIX_STARTUP_MODE +# undef RGB_MATRIX_MAXIMUM_BRIGHTNESS +# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 +# define RGB_MATRIX_LED_FLUSH_LIMIT 16 // default: 26 +# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_TYPING_HEATMAP +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS +# define RGB_MATRIX_STARTUP_HUE 10 +# define RGB_MATRIX_STARTUP_SAT 255 +# define RGB_MATRIX_STARTUP_VAL 200 +# define RGB_MATRIX_STARTUP_SPD 75 +/* Active RBG Modes */ +/* # define DISABLE_RGB_MATRIX_TYPING_HEATMAP // How hot is your WPM! */ +/* # define DISABLE_RGB_MATRIX_SPLASH // Full gradient & value pulse away from a single key hit then fades value out */ +/* # define DISABLE_RGB_MATRIX_SOLID_SPLASH // Hue & value pulse away from a single key hit then fades value out */ +/* Disabling to optimize firmware size */ +# define DISABLE_RGB_MATRIX_ALPHAS_MODS // Static dual hue, speed is hue for secondary hue +# define DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT // Static gradient left to right, speed controls how much gradient changes +# define DISABLE_RGB_MATRIX_BREATHING // Single hue brightness cycling animation +# define DISABLE_RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right +# define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL // Single hue 3 blade spinning pinwheel fades brightness +# define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness +# define DISABLE_RGB_MATRIX_CYCLE_ALL // Full keyboard solid hue cycling through full gradient +# define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // Full gradient scrolling left to right +# define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom +# define DISABLE_RGB_MATRIX_CYCLE_OUT_IN // Full gradient scrolling out to in +# define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Full dual gradients scrolling out to in +# define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradent Chevron shapped scrolling left to right +# define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL // Full gradient spinning pinwheel around center of keyboard +# define DISABLE_RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard +# define DISABLE_RGB_MATRIX_DUAL_BEACON // Full gradient spinning around center of keyboard +# define DISABLE_RGB_MATRIX_RAINBOW_BEACON // Full tighter gradient spinning around center of keyboard +# define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Full dual gradients spinning two halfs of keyboard +# define DISABLE_RGB_MATRIX_RAINDROPS // Randomly changes a single key's hue +# define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation +# define DISABLE_RGB_MATRIX_SOLID_REACTIVE // Static single hue, pulses keys hit to shifted hue then fades to current hue +#endif /* RBG MATRIX */ + +/* Firmware size Optimizations */ +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION +#define NO_ACTION_ONESHOT diff --git a/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c b/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c new file mode 100644 index 000000000000..c313f467e3d8 --- /dev/null +++ b/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c @@ -0,0 +1,757 @@ +#include QMK_KEYBOARD_H + +/**************** SOME GLOBALS *********************/ + +bool onMac = false; +bool isLeader = false; +bool isBlinking = false; +bool isRecording = false; +bool isPlaying = false; +const float led_dim_ratio = 0.50; +static uint16_t blink_cycle_timer, + blink_fade_in_timer, + blink_fade_out_timer, + macro_one_play_timer, + macro_two_play_timer, + macro_play_blink_timer = 2000; +static uint8_t fade_in_step_counter, + fade_out_step_counter, + blink_hsv_value; + +/**************** LED BLINK HELPER FUNCTIONS *********************/ + +/* +Function to set color with hsv arguments +- "hue", "sat" and "val" arguments above 255 will get value from rgb matrix config +- "val_ratio" is used to adjust brightness ratio +*/ +void rgb_matrix_set_color_hsv(uint8_t led, uint16_t hue, uint16_t sat, uint16_t val, float val_ratio) { + const uint8_t h = hue <= 255 ? hue : rgb_matrix_config.hsv.h; + const uint8_t s = sat <= 255 ? sat : rgb_matrix_config.hsv.s; + const uint8_t v = val <= 255 ? val * val_ratio : rgb_matrix_config.hsv.v * val_ratio; + HSV hsv_in = {h, s, v}; + RGB rgb_out = hsv_to_rgb(hsv_in); + rgb_matrix_set_color(led, rgb_out.r, rgb_out.g, rgb_out.b); +} + +void reset_blink_cycle(void) { + blink_cycle_timer = timer_read(); + blink_fade_in_timer = timer_read(); + blink_fade_out_timer = timer_read(); + blink_hsv_value = 0; + fade_in_step_counter = 0; + fade_out_step_counter = 0; +} + +void reset_blink_status(void) { + isRecording = false; + isPlaying = false; + isBlinking = false; +} + +void get_this_led_blinking(uint8_t led_index, bool speed, uint8_t hue, uint8_t sat) { + const uint16_t static_on_time = speed ? 200 : 500; + const uint16_t static_off_time = speed ? 200 : 500; + const uint8_t fade_timing = speed ? 100 : 150; + const uint8_t fade_step = speed ? 10 : 15; + const uint8_t fade_value_step_size = rgb_matrix_config.hsv.v / fade_step; + const uint8_t fade_cycle_time_elapsed = fade_timing / fade_step; + if (timer_elapsed(blink_cycle_timer) < static_on_time) { + if (timer_elapsed(blink_fade_in_timer) > fade_cycle_time_elapsed && fade_in_step_counter < fade_step) { + blink_hsv_value = blink_hsv_value + fade_value_step_size; + fade_in_step_counter = fade_in_step_counter + 1; + blink_fade_in_timer = timer_read(); + } + } else { + if (timer_elapsed(blink_fade_out_timer) > fade_cycle_time_elapsed && fade_out_step_counter < fade_step) { + blink_hsv_value = blink_hsv_value - fade_value_step_size; + fade_out_step_counter = fade_out_step_counter + 1; + blink_fade_out_timer = timer_read(); + } + } + + rgb_matrix_set_color_hsv(led_index, hue, sat, blink_hsv_value, 0.75); + + if (timer_elapsed(blink_cycle_timer) > static_on_time + static_off_time) { + reset_blink_cycle(); + } +} + + +/**************** LAYOUT *********************/ + +/* +[LEDS] + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 +15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 +30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43 +44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57 +58, 59, 60, 61, 62, 63, 64, 65, 66, 67 + +[KEYS] +ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =, BCK, INS +TAB, Q, W, E, R, T, Y, U, I, O, P, [, ], \,PGUP +CPS, A, S, D, F, G, H, J, K, L, COL, QOT, RETURN,PGDN +SFT, Z, X, C, V, B, N, M, COM, DOT, SLS, SHIFT, UP, DEL +CTL, GUI, ALT, SPACEBAR, ALT, FN, CTL, LFT, DWN, RIT +*/ + +enum layers { + _MAIN, + _MAC, + _FN +} + +const layers_leds_map[] = { + [_MAIN] = 45, + [_MAC] = 46, + [_FN] = 63 +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_MAIN] = LAYOUT_65_ansi( + KC_GESC, 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_INS, + 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_PGUP, + KC_LEAD, 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_PGDN, + 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_UP, KC_DEL, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [_MAC] = LAYOUT_65_ansi( + 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_LALT, KC_LGUI, KC_TRNS, KC_TRNS, MO(_FN), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [_FN] = LAYOUT_65_ansi( + DYN_REC_STOP, 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_NO, KC_NO, + KC_TRNS, KC_MUTE, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAD, RGB_SAI, DYN_MACRO_PLAY2, DYN_REC_START2, + KC_TRNS, KC_BRID, KC_VOLD, KC_BRIU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_HUI, DYN_MACRO_PLAY1, DYN_REC_START1, + KC_TRNS, TO(_MAIN), TO(_MAC), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SPD, RGB_SPI, KC_TRNS, RGB_VAI, KC_NO, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_VAD, RGB_MOD + ), +}; + +//**************** MATRIX SCANS *********************// + +void rgb_matrix_indicators_user(void) { + + #ifdef RGB_MATRIX_ENABLE + + /*Ensure some leds don't completeley turn off if hsv value setting is below 100 in the rgb matrix config */ + const uint8_t led_constant_val = rgb_matrix_config.hsv.v < 100 ? 100 : rgb_matrix_config.hsv.v; + + /* CapsLock LED indicator */ + if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) { + rgb_matrix_set_color_hsv(30, 999, 0, led_constant_val, 0.75); // WHITE + } + + /* Current layer LED indicator */ + rgb_matrix_set_color_hsv(layers_leds_map[get_highest_layer(layer_state)], 999, 0, led_constant_val, led_dim_ratio); // WHITE + + /* Leader Key LED under-glow */ + if (isLeader) { + rgb_matrix_set_color_hsv(14, 999, 999, 999, 1); // CONFIG + rgb_matrix_set_color_hsv(30, 999, 999, 999, 1); // CONFIG + } else { + rgb_matrix_set_color_hsv(14, 999, 999, 999, led_dim_ratio); // CONFIG + } + + /* Blinking LED indicator when recording Dynamic Macro */ + if (isRecording && isBlinking) { + get_this_led_blinking(0, false, 0, 255); + } + + /* Blinking LED indicator when playing Dynamic Macro */ + if (isPlaying && isBlinking) { + if (timer_elapsed(macro_one_play_timer) < macro_play_blink_timer || timer_elapsed(macro_two_play_timer) < macro_play_blink_timer) { + get_this_led_blinking(0, true, 85, 255); + } else { + if (isBlinking && isPlaying) { + reset_blink_status(); + reset_blink_cycle(); + } + } + } + + switch (biton32(layer_state)) { + case _FN: + /* Dynamic Macro LED indicator */ + if (isRecording) { + rgb_matrix_set_color_hsv(0, 0, 999, 999, 1); /* RED macro stop */ + } else { + rgb_matrix_set_color_hsv(43, 0, 999, 999, led_dim_ratio); /* RED macro 1 record */ + rgb_matrix_set_color_hsv(29, 0, 999, 999, led_dim_ratio); /* RED macro 2 record */ + rgb_matrix_set_color_hsv(42, 85, 999, 999, led_dim_ratio); /* GREEN macro 1 play */ + rgb_matrix_set_color_hsv(28, 85, 999, 999, led_dim_ratio); /* GREEN macro 2 play */ + } + /* Layer LED indicators */ + rgb_matrix_set_color_hsv(45, 999, 0, led_constant_val, led_dim_ratio); /* WHITE Layer _MAIN */ + rgb_matrix_set_color_hsv(46, 999, 0, led_constant_val, led_dim_ratio); /* WHITE Layer _MAC */ + break; + } + + #endif /* RGB_MATRIX */ +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + bool pressed = record->event.pressed; + if (pressed) { + switch (keycode) { + case TO(_MAC): + onMac = true; + break; + case TO(_MAIN): + onMac = false; + break; + } + } + return true; +} + +//**************** LEADER *********************// + +#ifdef LEADER_ENABLE + +/******* FRENCH ACCENT HELPER FUNCTIONS & DECLARATIONS *************/ +/*Most comonly used accents only*/ + +enum french_letter { + _A, + _E, + _I, + _O, + _U +}; + +const uint8_t french_letter_index[5] = { + [_A] = 0, + [_E] = 1, + [_I] = 2, + [_O] = 3, + [_U] = 4 +}; + +enum french_accent { + _CIRCUMFLEX, + _GRAVE, + _ACUTE +}; + +const uint8_t french_accent_index[3] = { + [_CIRCUMFLEX] = 0, + [_GRAVE] = 1, + [_ACUTE] = 2 +}; + +/* +This represent unicode decimal values +Each index will be mapped to numpad keycode to out put the correct sequence +All codes in this array should be of size 3 +All accent codes have the same index position as in the french_accent_index Array +*/ +const uint8_t french_decimal_unicodes[5][3][2] = { /*[Letter][Accent][Case]*/ + { + { + 131, // â + 194 //  + },{ + 133, // à + 192 // À + } + },{ + { + 136, // ê + 202 // Ê + },{ + 138, // è + 200 // È + },{ + 130, // é + 201 // É + } + },{ + { + 140, // î + 206 // Î + } + },{ + { + 147, // ô + 212 // Ô + } + },{ + { + 150, // û + 219 // Û + },{ + 151, // ù + 217 // Ù + } + } +}; + +void break_int_in_array(uint8_t int_code, uint8_t size, uint8_t *array) { + uint8_t i; + i = size; + while (i--) { + array[i] = int_code%10; + int_code /= 10; + } +} + +/* +Function meant to be used in Leader Key macros to output most commonly used french accents +This is designed and work on an English language keyboard setting on both Windows and Mac +=> accept french_letter and french_accent enum's as argument +*/ +void send_french_accent(uint8_t letter, uint8_t accent) { + + bool isCaps; + uint8_t decimal_unicode_in; + uint8_t decimal_unicode_size = 3; + uint8_t decimal_unicode_out[decimal_unicode_size]; + + /*Map to numpad keycodes*/ + const uint16_t numpad_key_map[10] = { + KC_P0, KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_P9 + }; + + /*Map to letter keycodes*/ + const uint16_t french_letter_key_map[5] = { + KC_A, KC_E, KC_I, KC_O, KC_U + }; + + /*Map to mod keys for French Mac shortcuts*/ + const uint16_t osx_mod_key_map[3] = { + KC_I, // _CIRCUMFLEX + KC_GRAVE, // _GRAVE + KC_E // _ACUTE + }; + + /* + Function to tap the correct keycodes in sequence for the + "Windows Alt Code" requested, aka Decimal Unicodes + */ + void tap_win_alt_code(void) { + if (isCaps) { + tap_code(numpad_key_map[0]); // Leading 0 on all upper case "Windows alt codes" + } + for (int i = 0; i < decimal_unicode_size; ++i) { + tap_code(numpad_key_map[decimal_unicode_out[i]]); + } + } + + isCaps = IS_HOST_LED_ON(USB_LED_CAPS_LOCK) ? true : false; + + if (onMac) { + if (isCaps) { + SEND_STRING(SS_TAP(X_CAPSLOCK)); + register_code(KC_LALT); + tap_code(osx_mod_key_map[accent]); + unregister_code(KC_LALT); + register_code(KC_LSFT); + tap_code(french_letter_key_map[letter]); + unregister_code(KC_LSFT); + tap_code(KC_CAPS); + } else { + register_code(KC_LALT); + tap_code(osx_mod_key_map[accent]); + unregister_code(KC_LALT); + tap_code(french_letter_key_map[letter]); + } + } else { + /*get the correct decimal unicode*/ + decimal_unicode_in = isCaps ? french_decimal_unicodes[letter][accent][1] : french_decimal_unicodes[letter][accent][0]; + break_int_in_array(decimal_unicode_in, decimal_unicode_size, decimal_unicode_out); + register_code(KC_LALT); + tap_win_alt_code(); + unregister_code(KC_LALT); + } +} + +/*Couple functions used to output the same macro on two different sequences*/ + +/* (|) */ +void ldrkey_send_paranthesis_wrap_ini(void) { + SEND_STRING("()" SS_TAP(X_LEFT)); +} + +/* (X) */ +void ldrkey_send_paranthesis_wrap_word(void) { + onMac ? SEND_STRING(SS_LALT(SS_TAP(X_LEFT)) "(" SS_LALT(SS_TAP(X_RIGHT)) ")") : SEND_STRING(SS_LCTL(SS_TAP(X_LEFT)) "(" SS_LCTL(SS_TAP(X_RIGHT)) ")"); +} + +/* (selection) */ +void ldrkey_send_paranthesis_wrap_selection(void) { + onMac ? SEND_STRING(SS_LGUI(SS_TAP(X_X)) "()" SS_TAP(X_LEFT) SS_LGUI(SS_TAP(X_V)) SS_TAP(X_RIGHT)) : SEND_STRING(SS_LCTL(SS_TAP(X_X)) "()" SS_TAP(X_LEFT) SS_LCTL(SS_TAP(X_V)) SS_TAP(X_RIGHT)); +} + +/* [|] */ +void ldrkey_send_bracket_wrap_ini(void) { + SEND_STRING("[]" SS_TAP(X_LEFT)); +} + +/* [X] */ +void ldrkey_send_bracket_wrap_word(void) { + onMac ? SEND_STRING(SS_LALT(SS_TAP(X_LEFT)) "[" SS_LALT(SS_TAP(X_RIGHT)) "]") : SEND_STRING(SS_LCTL(SS_TAP(X_LEFT)) "[" SS_LCTL(SS_TAP(X_RIGHT)) "]"); +} + +/* [selection] */ +void ldrkey_send_bracket_wrap_selection(void) { + onMac ? SEND_STRING(SS_LGUI(SS_TAP(X_X)) "[]" SS_TAP(X_LEFT) SS_LGUI(SS_TAP(X_V)) SS_TAP(X_RIGHT)) : SEND_STRING(SS_LCTL(SS_TAP(X_X)) "[]" SS_TAP(X_LEFT) SS_LCTL(SS_TAP(X_V)) SS_TAP(X_RIGHT)); +} + +/* {|} */ +void ldrkey_send_curlybrace_wrap_ini(void) { + SEND_STRING("{}" SS_TAP(X_LEFT)); +} + +/* {X} */ +void ldrkey_send_curlybrace_wrap_word(void) { + onMac ? SEND_STRING(SS_LALT(SS_TAP(X_LEFT)) "{" SS_LALT(SS_TAP(X_RIGHT)) "}") : SEND_STRING(SS_LCTL(SS_TAP(X_LEFT)) "{" SS_LCTL(SS_TAP(X_RIGHT)) "}"); +} + +/* {selection} */ +void ldrkey_send_curlybrace_wrap_selection(void) { + onMac ? SEND_STRING(SS_LGUI(SS_TAP(X_X)) "{}" SS_TAP(X_LEFT) SS_LGUI(SS_TAP(X_V)) SS_TAP(X_RIGHT)) : SEND_STRING(SS_LCTL(SS_TAP(X_X)) "{}" SS_TAP(X_LEFT) SS_LCTL(SS_TAP(X_V)) SS_TAP(X_RIGHT)); +} + +LEADER_EXTERNS(); + +void matrix_scan_user(void) +{ + LEADER_DICTIONARY() + { + leading = false; + leader_end(); + + /* Sequences on layer _MAIN & _MAC */ + /* éÉ => LdrKey > / */ + SEQ_ONE_KEY(KC_SLSH) { + send_french_accent(_E, _ACUTE); + } + /* àÀ => LdrKey > A */ + SEQ_ONE_KEY(KC_A) { + send_french_accent(_A, _GRAVE); + } + /* èÈ => LdrKey > E */ + SEQ_ONE_KEY(KC_E) { + send_french_accent(_E, _GRAVE); + } + /* ùÙ => LdrKey > U */ + SEQ_ONE_KEY(KC_U) { + send_french_accent(_U, _GRAVE); + } + /* â => LdrKey > A > A */ + SEQ_TWO_KEYS(KC_A, KC_A) { + send_french_accent(_A, _CIRCUMFLEX); + } + /* êÊ => LdrKey > E > E */ + SEQ_TWO_KEYS(KC_E, KC_E) { + send_french_accent(_E, _CIRCUMFLEX); + } + /* îÎ => LdrKey > I > I */ + SEQ_TWO_KEYS(KC_I, KC_I) { + send_french_accent(_I, _CIRCUMFLEX); + } + /* ôÔ => LdrKey > O > O */ + SEQ_TWO_KEYS(KC_O, KC_O) { + send_french_accent(_O, _CIRCUMFLEX); + } + /* ûÛ => LdrKey > U > U */ + SEQ_TWO_KEYS(KC_U, KC_U) { + send_french_accent(_U, _CIRCUMFLEX); + } + /* çÇ => LdrKey > C */ + SEQ_ONE_KEY(KC_C) { + if (onMac) { + SEND_STRING(SS_LALT("c")); + } else { + IS_HOST_LED_ON(USB_LED_CAPS_LOCK) ? SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P1) SS_TAP(X_P2) SS_TAP(X_P8) SS_UP(X_LALT)) : SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P1) SS_TAP(X_P3) SS_TAP(X_P5) SS_UP(X_LALT)); + } + } + /* CapsLock */ + SEQ_ONE_KEY(KC_LEAD) { + tap_code(KC_CAPS); + } + /* ± => LdrKey > = > - */ + SEQ_TWO_KEYS(KC_EQL, KC_MINS) { + onMac ? SEND_STRING(SS_LALT(SS_LSFT(SS_TAP(X_EQL)))) : SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P2) SS_TAP(X_P4) SS_TAP(X_P1) SS_UP(X_LALT)); + } + /* ≤ => LdrKey > - > = */ + SEQ_TWO_KEYS(KC_MINS, KC_EQL) { + onMac ? SEND_STRING(SS_LALT(SS_TAP(X_COMM))) : SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P2) SS_TAP(X_P4) SS_TAP(X_P3) SS_UP(X_LALT)); + } + /* ≥ => LdrKey > = > = */ + SEQ_TWO_KEYS(KC_EQL, KC_EQL) { + onMac ? SEND_STRING(SS_LALT(SS_TAP(X_DOT))) : SEND_STRING(SS_DOWN(X_LALT) SS_TAP(X_P2) SS_TAP(X_P4) SS_TAP(X_P2) SS_UP(X_LALT)); + } + /* <= => LdrKey > , > , */ + SEQ_TWO_KEYS(KC_COMM, KC_COMM) { + SEND_STRING(SS_LSFT(SS_TAP(X_COMM)) SS_TAP(X_SPC) SS_TAP(X_EQL) SS_TAP(X_LEFT) SS_TAP(X_BSPC) SS_TAP(X_RIGHT)); + } + /* => => LdrKey > . > . */ + SEQ_TWO_KEYS(KC_DOT, KC_DOT) { + SEND_STRING("=>"); + } + /* ", " => LdrKey > " " */ + SEQ_ONE_KEY(KC_SPC) { + SEND_STRING(", "); + } + /* ". " => LdrKey > " " > " " */ + SEQ_TWO_KEYS(KC_SPC, KC_SPC) { + SEND_STRING(". "); + } + /* Backward delete current word (on cursor) */ + SEQ_TWO_KEYS(KC_BSPC, KC_BSPC) { + onMac ? SEND_STRING(SS_LALT(SS_TAP(X_RIGHT)) SS_LALT(SS_LSFT(SS_TAP(X_LEFT))) SS_TAP(X_BSPC)) : SEND_STRING(SS_LCTL(SS_TAP(X_RIGHT)) SS_LCTL(SS_LSFT(SS_TAP(X_LEFT))) SS_TAP(X_BSPC)); + } + /* Previous word delete */ + SEQ_ONE_KEY(KC_BSPC) { + onMac ? SEND_STRING(SS_LALT(SS_LSFT(SS_TAP(X_LEFT))) SS_TAP(X_BSPC)) : SEND_STRING(SS_LCTL(SS_LSFT(SS_TAP(X_LEFT))) SS_TAP(X_BSPC)); + } + /* Forward delete current word (on cursor) */ + SEQ_TWO_KEYS(KC_DEL, KC_DEL) { + + onMac ? SEND_STRING(SS_LALT(SS_TAP(X_LEFT)) SS_LALT(SS_LSFT(SS_TAP(X_RIGHT))) SS_TAP(X_DEL)) : SEND_STRING(SS_LCTL(SS_TAP(X_LEFT)) SS_LCTL(SS_LSFT(SS_TAP(X_RIGHT))) SS_TAP(X_DEL)); + } + /* Next word delete */ + SEQ_ONE_KEY(KC_DEL) { + onMac ? SEND_STRING(SS_LALT(SS_LSFT(SS_TAP(X_RIGHT))) SS_TAP(X_DEL)): SEND_STRING(SS_LCTL(SS_LSFT(SS_TAP(X_RIGHT))) SS_TAP(X_DEL)); + } + /* ` => LdrKey > Escape */ + SEQ_ONE_KEY(KC_GESC) { + SEND_STRING("`"); + } + /* ``` => LdrKey > Escape > Escape > Escape */ + SEQ_THREE_KEYS(KC_GESC, KC_GESC, KC_GESC) { + SEND_STRING("```"); + } + /* Printscreen => LdrKey > Insert */ + SEQ_ONE_KEY(KC_INS) { + onMac ? SEND_STRING(SS_LGUI(SS_LSFT(SS_TAP(X_4)))) : SEND_STRING(SS_TAP(X_PSCR)); + } + /* Home => LdrKey > Page Up */ + SEQ_ONE_KEY(KC_PGUP) { + onMac ? SEND_STRING(SS_TAP(X_HOME)) : SEND_STRING(SS_LCTL(SS_TAP(X_HOME))); + } + /* End => LdrKey > Page Down */ + SEQ_ONE_KEY(KC_PGDN) { + onMac ? SEND_STRING(SS_TAP(X_END)) : SEND_STRING(SS_LCTL(SS_TAP(X_END))); + } + /* Close Curernt File/Tab => LdrKey > W */ + SEQ_ONE_KEY(KC_W) { + onMac ? SEND_STRING(SS_LGUI(SS_TAP(X_W))) : SEND_STRING(SS_LCTL(SS_TAP(X_W))); + } + /* Close Current App => LdrKey > Q */ + SEQ_ONE_KEY(KC_Q) { + onMac ? SEND_STRING(SS_LGUI(SS_TAP(X_Q))) : SEND_STRING(SS_LALT(SS_TAP(X_F4))); + } + /* " => LdrKey > ' */ + SEQ_ONE_KEY(KC_QUOT) { + SEND_STRING("\""); + } + /* "|" => LdrKey > ' > ' */ + SEQ_TWO_KEYS(KC_QUOT, KC_QUOT) { + SEND_STRING("\"\"" SS_TAP(X_LEFT)); + } + /* "X" wrap => LdrKey > ' > ' > ' */ + SEQ_THREE_KEYS(KC_QUOT, KC_QUOT, KC_QUOT) { + onMac ? SEND_STRING(SS_LALT(SS_TAP(X_LEFT)) "\"" SS_LALT(SS_TAP(X_RIGHT)) "\"") : SEND_STRING(SS_LCTL(SS_TAP(X_LEFT)) "\"" SS_LCTL(SS_TAP(X_RIGHT)) "\""); + } + /* ( => LdrKey > Left Shift */ + SEQ_ONE_KEY(KC_LSFT) { + SEND_STRING("("); + } + /* ) => LdrKey > Right Shift */ + SEQ_ONE_KEY(KC_RSFT) { + SEND_STRING(")"); + } + /* (|) => LdrKey > Left Shift > Left Shift */ + SEQ_TWO_KEYS(KC_LSFT, KC_LSFT) { + ldrkey_send_paranthesis_wrap_ini(); + } + /* (|) => LdrKey > Right Shift > Right Shift */ + SEQ_TWO_KEYS(KC_RSFT, KC_RSFT) { + ldrkey_send_paranthesis_wrap_ini(); + } + /* (X) wrap => LdrKey > Left Shift > W */ + SEQ_TWO_KEYS(KC_LSFT, KC_W) { + ldrkey_send_paranthesis_wrap_word(); + } + /* (X) wrap => LdrKey > Right Shift > W */ + SEQ_TWO_KEYS(KC_RSFT, KC_W) { + ldrkey_send_paranthesis_wrap_word(); + } + /* (X) wrap selection => LdrKey > Left Shift > W > W */ + SEQ_THREE_KEYS(KC_LSFT, KC_W, KC_W) { + ldrkey_send_paranthesis_wrap_selection(); + } + /* (X) wrap selection => LdrKey > Right Shift > W > W */ + SEQ_THREE_KEYS(KC_RSFT, KC_W, KC_W) { + ldrkey_send_paranthesis_wrap_selection(); + } + /* [ => LdrKey > Left CTL */ + SEQ_ONE_KEY(KC_LCTL) { + SEND_STRING("["); + } + /* ] => LdrKey > Right CTL */ + SEQ_ONE_KEY(KC_RCTL) { + SEND_STRING("]"); + } + /* [|] => LdrKey > Left CTL > Left CTL */ + SEQ_TWO_KEYS(KC_LCTL, KC_LCTL) { + ldrkey_send_bracket_wrap_ini(); + } + /* [|] => LdrKey > Right CTL > Right CTL */ + SEQ_TWO_KEYS(KC_RCTL, KC_RCTL) { + ldrkey_send_bracket_wrap_ini(); + } + /* [X] wrap => LdrKey > Left CTL > W */ + SEQ_TWO_KEYS(KC_LCTL, KC_W) { + ldrkey_send_bracket_wrap_word(); + } + /* [X] wrap => LdrKey > Right CTL > W */ + SEQ_TWO_KEYS(KC_RCTL, KC_W) { + ldrkey_send_bracket_wrap_word(); + } + /* [X] wrap selection => LdrKey > Left CTL > W > W */ + SEQ_THREE_KEYS(KC_LCTL, KC_W, KC_W) { + ldrkey_send_bracket_wrap_selection(); + } + /* [X] wrap selection => LdrKey > Right CTL > W > W */ + SEQ_THREE_KEYS(KC_RCTL, KC_W, KC_W) { + ldrkey_send_bracket_wrap_selection(); + } + /* { => LdrKey > Left ALT */ + SEQ_ONE_KEY(KC_LALT) { + SEND_STRING("{"); + } + /* } => LdrKey > Right ALT */ + SEQ_ONE_KEY(KC_RALT) { + SEND_STRING("}"); + } + /* {|} => LdrKey > Left ALT > Left ALT */ + SEQ_TWO_KEYS(KC_LALT, KC_LALT) { + ldrkey_send_curlybrace_wrap_ini(); + } + /* {|} => LdrKey > Right ALT > Right ALT */ + SEQ_TWO_KEYS(KC_RALT, KC_RALT) { + ldrkey_send_curlybrace_wrap_ini(); + } + /* {X} wrap => LdrKey > Left ALT > W */ + SEQ_TWO_KEYS(KC_LALT, KC_W) { + ldrkey_send_curlybrace_wrap_word(); + } + /* {X} wrap => LdrKey > Right ALT > W */ + SEQ_TWO_KEYS(KC_RALT, KC_W) { + ldrkey_send_curlybrace_wrap_word(); + } + /* {X} wrap selection => LdrKey > Left ALT > W > W */ + SEQ_THREE_KEYS(KC_LALT, KC_W, KC_W) { + ldrkey_send_curlybrace_wrap_selection(); + } + /* {X} wrap selection => LdrKey > Right ALT > W > W */ + SEQ_THREE_KEYS(KC_RALT, KC_W, KC_W) { + ldrkey_send_curlybrace_wrap_selection(); + } + /* Select everything on this line before cursor => LdrKey > Left */ + SEQ_ONE_KEY(KC_LEFT) { + onMac ? SEND_STRING(SS_LSFT(SS_LGUI(SS_TAP(X_LEFT)))) : SEND_STRING(SS_LSFT(SS_TAP(X_HOME))); + } + /* Select everything on this line after cursor => LdrKey > Right */ + SEQ_ONE_KEY(KC_RIGHT) { + onMac ? SEND_STRING(SS_LSFT(SS_LGUI(SS_TAP(X_RIGHT)))) : SEND_STRING(SS_LSFT(SS_TAP(X_END))); + } + /* Select everything on this line before cursor and bring on previous line => LdrKey > Left > Left */ + SEQ_TWO_KEYS(KC_LEFT, KC_LEFT) { + onMac ? SEND_STRING(SS_LSFT(SS_TAP(X_UP) SS_LGUI(SS_TAP(X_RIGHT)))) : SEND_STRING(SS_LSFT(SS_TAP(X_UP) SS_TAP(X_END))); + } + /* Select everything on this line => LdrKey > Right > Left */ + SEQ_TWO_KEYS(KC_RIGHT, KC_LEFT) { + onMac ? SEND_STRING(SS_LGUI(SS_TAP(X_RIGHT) SS_LSFT(SS_LGUI(SS_TAP(X_LEFT))))) : SEND_STRING(SS_TAP(X_END) SS_LSFT(SS_TAP(X_HOME))); + } + /* Select 1x Page Up on the page before the cursor => LdrKey > Up */ + SEQ_ONE_KEY(KC_UP) { + SEND_STRING(SS_LSFT(SS_TAP(X_PGUP))); + } + /* Select 1x Page Down on the page after the cursor => LdrKey > Down */ + SEQ_ONE_KEY(KC_DOWN) { + SEND_STRING(SS_LSFT(SS_TAP(X_PGDN))); + } + /* Select everything on the page before the cursor => LdrKey > Up > Up */ + SEQ_TWO_KEYS(KC_UP, KC_UP) { + onMac ? SEND_STRING(SS_LSFT(SS_LGUI(SS_TAP(X_UP)))) : SEND_STRING(SS_LSFT(SS_LCTL(SS_TAP(X_HOME)))); + } + /* Select everything on the page after the cursor => LdrKey > Down > Down */ + SEQ_TWO_KEYS(KC_DOWN, KC_DOWN) { + onMac ? SEND_STRING(SS_LSFT(SS_LGUI(SS_TAP(X_DOWN)))) : SEND_STRING(SS_LSFT(SS_LCTL(SS_TAP(X_END)))); + } + /* HELPER => spit out the url of the layout description page on github */ + SEQ_FIVE_KEYS(KC_GESC, KC_GESC, KC_GESC, KC_GESC, KC_GESC) { + SEND_STRING("https://github.com/qmk/qmk_firmware/tree/master/keyboards/dztech/dz65rgb/keymaps/drootz"); + } + /* google.ca => LdrKey > G > G */ + SEQ_TWO_KEYS(KC_G, KC_G) { + SEND_STRING("https://google.ca" SS_TAP(X_ENT)); + } + /* @gmail => LdrKey > M > L > T */ + SEQ_THREE_KEYS(KC_M, KC_L, KC_T) { + SEND_STRING("mailto." SS_TAP(X_D) SS_TAP(X_A) SS_TAP(X_N) SS_TAP(X_I) SS_TAP(X_E) SS_TAP(X_L) SS_TAP(X_R) SS_TAP(X_A) SS_TAP(X_C) SS_TAP(X_I) SS_TAP(X_N) SS_TAP(X_E) "@gmail.com"); + } + /* Show Desktop => LdrKey > D */ + SEQ_ONE_KEY(KC_D) { + onMac ? SEND_STRING(SS_LGUI(SS_TAP(X_SPC)) "Mission" SS_TAP(X_ENT)) : SEND_STRING(SS_LGUI(SS_TAP(X_D))); + } + } +} + +void leader_start(void) { + isLeader = true; +} + +void leader_end(void) { + isLeader = false; +} + +#endif /* LEADER */ + +/**************** DYNAMIC MACRO *********************/ + +void dynamic_macro_record_start_user(void) { + onMac = false; /* reset layer bool as dynamic macro clear the keyboard and reset layers. */ + if (!isBlinking && !isRecording) { + reset_blink_cycle(); + isBlinking = true; + isRecording = true; + } +} + +void dynamic_macro_record_end_user(int8_t direction) { + if (isBlinking && isRecording) { + reset_blink_status(); + reset_blink_cycle(); + } +} + +void dynamic_macro_play_user(int8_t direction) { + switch (direction) { + case 1: + if (!isBlinking && !isPlaying) { + reset_blink_cycle(); + isBlinking = true; + isPlaying = true; + macro_one_play_timer = timer_read(); + } + break; + case -1: + if (!isBlinking && !isPlaying) { + reset_blink_cycle(); + isBlinking = true; + isPlaying = true; + macro_two_play_timer = timer_read(); + } + break; + } +} diff --git a/keyboards/dztech/dz65rgb/keymaps/drootz/readme.md b/keyboards/dztech/dz65rgb/keymaps/drootz/readme.md new file mode 100644 index 000000000000..15f15d752bed --- /dev/null +++ b/keyboards/dztech/dz65rgb/keymaps/drootz/readme.md @@ -0,0 +1,210 @@ +![DZ65RGBv2 Layout Image - MAIN](https://res.cloudinary.com/drootz/image/upload/c_scale,w_800/v1582000645/drootz_dz65rgb_layer_0_main_n61oxl.jpg) + +# Drootz's DZ65RGBv2 ANSI Layout + +This layout fit best people who mainly type in English but regularly need to type in French _(using an English keyboard in OS setting)_. There are also some cool LED indicator effects and tons of Leader Key bindings/macros designed to work on both Mac and Windows OS. I tried to keep things as simple as possible from a usability perspective. Enjoy! + +- [LAYERS](#LAYERS) +- [LEADER KEY BINDINGS:](#LEADER-KEY-BINDINGS) + - [OS and Keyboard Macros](#OS-and-Keyboard-Macros) + - [French Accents](#French-Accents) + - [Special Characters and Punctuation](#Special-Characters-and-Punctuation) + - [Text Selection Macros](#Text-Selection-Macros) + - [Expanded Space Cadet Macros](#Expanded-Space-Cadet-Macros) + - [Text Expanders](#Text-Expanders) +- [STEP BY STEP FLASH INSTRUCTIONS](#STEP-BY-STEP-FLASH-INSTRUCTIONS) + +## HIGH LEVEL DESCRIPTION + +#### Dual function Capslock key +- Single tap to trigger the Leader Key +- Double tap to toggle Capslock ON/OFF + +#### 70+ useful Leader Key bindings and macros +- "Designed" to work on both Mac and Windows OS with an English keyboard OS setting +- Per key timing set at 425ms. Never a key sequence! +- 20+ Punctuation, ASCII, System shortcuts and macros +- 15+ French accents (è, é, ê, È, É, Ê, à, etc.) + - No need to switch to a French keyboard OS setting! + - Preserve Capslock if enabled +- 8 Text "selection" shortcuts +- 20+ Expanded "Space Cadet" feature with Shift, Ctrl, Alt and DoubleQuote for (), [], {} and "" +- Few useful strings output for my workflow (You may want to change or remove them...) + +#### Dynamic Macros enabled +- Record/Play up to 2 Macros +- Nesting allowed + +#### Kept only 4 RGB matrix animations due to size of firmware +- Typing Heatmap => How hot is your WPM! (preferred animation because of LED indicators) +- Matrix Splash => Full gradient & value pulse away from a single key hit then fades value out +- Solid Splash => Hue & value pulse away from a single key hit then fades value out +- Solid Color => Static single hue, no speed support + +#### LED indicators and animations +- White led when Capslock toggle ON +- The brightness of all the other indicator can be adjusted globally with the RGB matrix brightness setting on layer \_FN +- White LED indicator for layer selection and current layer identification +- Red and green blinking indicator when "recording" or "playing" Dynamic Macros +- Leader Key LED indicator: + - Persistent 50% dimmed under-glow on top right corner key + - Light up at 100% for the duration of the Leader Key timeout when activated + - Hue, saturation and brightness can be globally adjusted with the RGB matrix settings on layer \_FN + +#### 3 Layers +- \_MAIN: Default layer for Windows OS +- \_MAC: Transparent layer that switch left hand modifier KC_LALT and KC_LGUI keys for MacOS +- \_FN: Functions & settings layer: + - Macro 1 & 2 keycodes (Record, Stop, Play) with LED indicators + - F Keys (F1...F12) on number row + - RGB matrix & animation settings + - Screen brightness & volume system controls + - Layer selection + +## LAYERS + +- Colored keys on the layout visuals below represent the position of the LED indicators on each layer. +- Press down and hold the MO(\_FN) key to access the \_FN layer +- Double tap on the Capslock key to toggle Capslock ON/OFF +- \_TRNS keys use the next lowest non-transparent key (on lower layers) +- \_NO keys are ignored (nothing happens) + +### [Layer 0: \_MAIN](http://www.keyboard-layout-editor.com/#/gists/67c22220856a927766bd3e0331ed782a) +![DZ65RGBv2 Layout Image - MAIN](https://res.cloudinary.com/drootz/image/upload/c_scale,w_800/v1582000645/drootz_dz65rgb_layer_0_main_n61oxl.jpg) + +### [Layer 1: \_MAC](http://www.keyboard-layout-editor.com/#/gists/4a32d80c67c778658febf28524fb5000) +![DZ65RGBv2 Layout Image - MAC](https://res.cloudinary.com/drootz/image/upload/c_scale,w_800/v1582000653/drootz_dz65rgb_layer_1_mac_z4tsaw.jpg) + +### [Layer 2: \_FN](http://www.keyboard-layout-editor.com/#/gists/b583bd7cc5b0a75b4610bbda18fba65e) +![DZ65RGBv2 Layout Image - FN](https://res.cloudinary.com/drootz/image/upload/c_scale,w_800/v1582000661/drootz_dz65rgb_layer_2_fn_zv8yte.jpg) + +## LEADER KEY BINDINGS + +The Leader Key on this layout is triggered by tapping the Capslock key once. Once triggered, we have 450ms between each key press to type any one of the sequences listed below. All sequences are designed to work on both Mac and Windows with an English keyboard OS setting. + +- [OS and Keyboard Macros](#OS-and-Keyboard-Macros) +- [French Accents](#French-Accents) +- [Special Characters and Ponctuation](#Special-Characters-and-Ponctuation) +- [Text Selection Macros](#Text-Selection-Macros) +- [Expanded Space Cadet Macros](#Expanded-Space-Cadet-Macros) +- [Text Expanders](#Text-Expanders) + +#### Legend: + +| Acronym | Description | +| :--- | :--- | +| LDR | Leader Key | +| SFT | Shift key | +| CTL | Control key | +| ESC | Escape key | +| ¶ | Text cursor position | + +### OS and Keyboard Macros + +| Output | Sequence | Description +| :--- | :--- | :--- | +| Toggle Capslock | `LDR LDR` | Single tap Capslock to trigger the LDR key | +| Delete all previous characters in word on cursor OR; | `LDR BACKSPACE` | n/a | +| => Delete previous word if triggered repeatedly | `LDR BACKSPACE` | n/a | +| Delete all forward characters in word on cursor OR; | `LDR DEL` | n/a | +| => Delete next word if triggered repeatedly | `LDR DEL` | n/a | +| Backward Delete whole word on cursor | `LDR BACKSPACE BACKSPACE` | n/a | +| Forward Delete whole word on cursor | `LDR DEL DEL` | n/a | +| Printscreen | `LDR INSERT` | n/a | +| Home | `LDR PAGE-UP` | n/a | +| End | `LDR PAGE-DOWN` | n/a | +| OS: Close current file/tab | `LDR W` | n/a | +| OS: Close current application | `LDR Q` | n/a | +| OS: Show Desktop(Win) or Mission Control(Mac) | `LDR D` | The Mac sequence will work with LaunchBar (Cmd+Space) | + +### French Accents + +| Output | Sequence | Description +| :--- | :--- | :--- | +| `à`¶   or   `À`¶ | `LDR A` | Will output upper character if Capslock enabled. | +| `â`¶   or   `Â`¶ | `LDR A A` | Will output upper character if Capslock enabled. | +| `ç`¶   or   `Ç`¶ | `LDR C` | Will output upper character if Capslock enabled. | +| `è`¶   or   `È`¶ | `LDR E` | Will output upper character if Capslock enabled. | +| `ê`¶   or   `Ê`¶ | `LDR E E` | Will output upper character if Capslock enabled. | +| `é`¶   or   `É`¶ | `LDR /` | Will output upper character if Capslock enabled | +| `î`¶   or   `Î`¶ | `LDR I I` | Will output upper character if Capslock enabled. | +| `ô`¶   or   `Ô`¶ | `LDR O O` | Will output upper character if Capslock enabled. | +| `ù`¶   or   `Ù`¶ | `LDR U` | Will output upper character if Capslock enabled. | +| `û`¶   or   `Û`¶ | `LDR U U` | Will output upper character if Capslock enabled. | + +### Special Characters and Punctuation + +| Output | Sequence | Description | +| :--- | :--- | :--- | +| `±`¶ | `LDR = -` | n/a | +| `≤`¶ | `LDR - =` | n/a | +| `≥`¶ | `LDR = =` | n/a | +| `=>`¶ | `LDR , ,` | n/a | +| `<=`¶ | `LDR . .` | n/a | +| ``` ` ``` ¶ | `LDR ESC` | n/a | +| \`\`\` ¶ | `LDR ESC ESC ESC` | n/a | +| `,` space ¶ | `LDR SPACE` | n/a | +| `.` space ¶ | `LDR SPACE SPACE` | n/a | + +### Text Selection Macros + +| Output | Sequence | +| :--- | :--- | +| Select everything on this line before cursor | `LDR LEFT-ARROW` | +| Select everything on this line after cursor | `LDR RIGHT-ARROW` | +| Select everything on this line before cursor up to end of previous line | `LDR LEFT-ARROW LEFT-ARROW` | n/a | +| Select everything on this line | `LDR RIGHT-ARROW LEFT-ARROW` | +| Select 1x Page Up on the page before the cursor | `LDR UP-ARROW` | +| Select 1x Page Down on the page after the cursor | `LDR DOWN-ARROW` | +| Select everything on the page before the cursor | `LDR UP-ARROW UP-ARROW` | +| Select everything on the page after the cursor | `LDR DOWN-ARROW DOWN-ARROW` | + +### Expanded Space Cadet Macros + +| Output | Sequence | Description | +| :--- | :--- | :--- | +| `"`¶ | `LDR '` | Will output single double-quote | +| `"`¶`"` | `LDR ' '` | Will wrap cursor between two double-quotes | +| `"`WORD`"`¶ | `LDR ' ' '` | Will wrap word on cursor between two double-quotes | +| `(`¶ | `LDR LEFT-SFT` | Will output single left parenthesis | +| `)`¶ | `LDR RIGHT-SFT` | Will output single right parenthesis | +| `(`¶`)` | `LDR LEFT-SFT LEFT-SFT` | Will wrap cursor between two parenthesis' | +| `(`¶`)` | `LDR RIGHT-SFT RIGHT-SFT` | Will wrap cursor between two parenthesis' | +| `(`WORD`)`¶ | `LDR LEFT-SFT W` | Will wrap word on cursor between two parenthesis' | +| `(`WORD`)`¶ | `LDR RIGHT-SFT W` | Will wrap word on cursor between two parenthesis' | +| `(`SELECTION`)`¶ | `LDR LEFT-SFT W W` | Will wrap selection between two parenthesis' | +| `(`SELECTION`)`¶ | `LDR RIGHT-SFT W W` | Will wrap selection between two parenthesis' | +| `[`¶ | `LDR LEFT-CTL` | Will output single left bracket | +| `]`¶ | `LDR RIGHT-CTL` | Will output single right bracket | +| `[`¶`]` | `LDR LEFT-CTL LEFT-CTL` | Will wrap cursor between two brackets' | +| `[`¶`]` | `LDR RIGHT-CTL RIGHT-CTL` | Will wrap cursor between two brackets' | +| `[`WORD`]`¶ | `LDR LEFT-CTL W` | Will wrap word on cursor between two brackets' | +| `[`WORD`]`¶ | `LDR RIGHT-CTL W` | Will wrap word on cursor between two brackets' | +| `[`SELECTION`]`¶ | `LDR LEFT-CTL W W` | Will wrap selection between two brackets' | +| `[`SELECTION`]`¶ | `LDR RIGHT-CTL W W` | Will wrap selection between two brackets' | +| `{`¶ | `LDR LEFT-ALT` | Will output single left curly brace | +| `}`¶ | `LDR RIGHT-ALT` | Will output single right curly brace | +| `{`¶`}` | `LDR LEFT-ALT LEFT-ALT` | Will wrap cursor between two curly braces' | +| `{`¶`}` | `LDR RIGHT-ALT RIGHT-ALT` | Will wrap cursor between two curly braces' | +| `{`WORD`}`¶ | `LDR LEFT-ALT W` | Will wrap word on cursor between two curly braces' | +| `{`WORD`}`¶ | `LDR RIGHT-ALT W` | Will wrap word on cursor between two curly braces' | +| `{`SELECTION`}`¶ | `LDR LEFT-ALT W W` | Will wrap selection between two curly braces' | +| `{`SELECTION`}`¶ | `LDR RIGHT-ALT W W` | Will wrap selection between two curly braces' | + +### Text Expanders + +| Output | Sequence | Description | +| :--- | :--- | :--- | +| https://google.ca | `LDR G G` | n/a | +| Layout Help URL | `LDR ESC ESC ESC ESC ESC` | URL to this readme.md page | +| My Gmail | `LDR M L T` | You may want to update this before compiling the firmware | + +## STEP BY STEP FLASH INSTRUCTIONS +1. Build the Firmware. Run build command in directory: `make dztech/dz65rgb/v2:drootz` + - Approximate firmware size: 27302/28672 (95%, 1370 bytes free) +2. Flash the Firmware: + - Open QMK Toolbox Application + - Open firmware file: dztech_dz65rgb_v2_drootz.hex + - Unplug keyboard USB, and hold the ESC key while plugging it back in + - Check that QMK Toolbox displays: *** DFU device connected. + - Hit the flash button! diff --git a/keyboards/dztech/dz65rgb/keymaps/drootz/rules.mk b/keyboards/dztech/dz65rgb/keymaps/drootz/rules.mk new file mode 100644 index 000000000000..24a765ab9a04 --- /dev/null +++ b/keyboards/dztech/dz65rgb/keymaps/drootz/rules.mk @@ -0,0 +1,11 @@ +DYNAMIC_MACRO_ENABLE = yes +LEADER_ENABLE = yes + +# Firmware size Optimizations +EXTRAFLAGS += -flto +MOUSEKEY_ENABLE = no +NKRO_ENABLE = no +SPACE_CADET_ENABLE = no +TAP_DANCE_ENABLE = no +UNICODEMAP_ENABLE = no +SPLIT_KEYBOARD = no From aab1dc041dc29b4201e7dd2c105cec6117fa6a62 Mon Sep 17 00:00:00 2001 From: Jonathan Rascher Date: Thu, 7 May 2020 01:47:55 -0400 Subject: [PATCH 374/429] More community layout support for legacy KBD67 PCBs (#8933) * Community layout support for KBD67 hotswap * Community layout support for KBD67 rev1 * Community layout support for KBD67 rev2 * Move bcat's KBD67 hotswap layout to community --- keyboards/kbdfans/kbd67/hotswap/hotswap.h | 2 ++ keyboards/kbdfans/kbd67/hotswap/rules.mk | 2 ++ keyboards/kbdfans/kbd67/rev1/rules.mk | 2 ++ keyboards/kbdfans/kbd67/rev2/rev2.h | 2 ++ keyboards/kbdfans/kbd67/rev2/rules.mk | 2 +- .../community/65_ansi_blocker_split_bs}/bcat/keymap.c | 4 ++-- .../community/65_ansi_blocker_split_bs}/bcat/readme.md | 7 ++++--- 7 files changed, 15 insertions(+), 6 deletions(-) rename {keyboards/kbdfans/kbd67/hotswap/keymaps => layouts/community/65_ansi_blocker_split_bs}/bcat/keymap.c (94%) rename {keyboards/kbdfans/kbd67/hotswap/keymaps => layouts/community/65_ansi_blocker_split_bs}/bcat/readme.md (57%) diff --git a/keyboards/kbdfans/kbd67/hotswap/hotswap.h b/keyboards/kbdfans/kbd67/hotswap/hotswap.h index 45cf537cbe44..ba6c1686fa86 100644 --- a/keyboards/kbdfans/kbd67/hotswap/hotswap.h +++ b/keyboards/kbdfans/kbd67/hotswap/hotswap.h @@ -40,3 +40,5 @@ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, KC_NO, K3C, K3D, K3E}, \ { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, KC_NO, K4D, K4E}, \ } + +#define LAYOUT_65_ansi_blocker_split_bs LAYOUT diff --git a/keyboards/kbdfans/kbd67/hotswap/rules.mk b/keyboards/kbdfans/kbd67/hotswap/rules.mk index 08dd1f63590c..7739b69c0e34 100644 --- a/keyboards/kbdfans/kbd67/hotswap/rules.mk +++ b/keyboards/kbdfans/kbd67/hotswap/rules.mk @@ -31,3 +31,5 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE = no # Audio output on port C6 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches HD44780_ENABLE = no # Enable support for HD44780 based LCDs + +LAYOUTS = 65_ansi_blocker_split_bs diff --git a/keyboards/kbdfans/kbd67/rev1/rules.mk b/keyboards/kbdfans/kbd67/rev1/rules.mk index 7e305070ba83..8e96199b3d01 100644 --- a/keyboards/kbdfans/kbd67/rev1/rules.mk +++ b/keyboards/kbdfans/kbd67/rev1/rules.mk @@ -31,3 +31,5 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE = no # Audio output on port C6 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches HD44780_ENABLE = no # Enable support for HD44780 based LCDs + +LAYOUTS = 65_ansi diff --git a/keyboards/kbdfans/kbd67/rev2/rev2.h b/keyboards/kbdfans/kbd67/rev2/rev2.h index d4944109eacb..dba434926685 100644 --- a/keyboards/kbdfans/kbd67/rev2/rev2.h +++ b/keyboards/kbdfans/kbd67/rev2/rev2.h @@ -85,6 +85,8 @@ { K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D, K4E, K4F }, \ } +#define LAYOUT_65_ansi_blocker_split_bs LAYOUT_65_ansi_blocker_splitbs + #define LAYOUT_65_iso( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, \ K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \ diff --git a/keyboards/kbdfans/kbd67/rev2/rules.mk b/keyboards/kbdfans/kbd67/rev2/rules.mk index 8ff62ba42850..de55438dd83d 100644 --- a/keyboards/kbdfans/kbd67/rev2/rules.mk +++ b/keyboards/kbdfans/kbd67/rev2/rules.mk @@ -32,4 +32,4 @@ AUDIO_ENABLE = no # Audio output on port C6 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches HD44780_ENABLE = no # Enable support for HD44780 based LCDs -LAYOUTS = 65_ansi 65_iso 65_ansi_blocker +LAYOUTS = 65_ansi 65_iso 65_ansi_blocker 65_ansi_blocker_split_bs diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/bcat/keymap.c b/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c similarity index 94% rename from keyboards/kbdfans/kbd67/hotswap/keymaps/bcat/keymap.c rename to layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c index 22943357b32a..221fcfba5986 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/bcat/keymap.c +++ b/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c @@ -9,7 +9,7 @@ enum layer { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Default layer: http://www.keyboard-layout-editor.com/#/gists/dd675b40cc4df2c7bb78847ac29f5988 */ - [LAYER_DEFAULT] = LAYOUT( + [LAYER_DEFAULT] = LAYOUT_65_ansi_blocker_split_bs( 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_HOME, 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, KC_PGUP, 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_ENT, KC_PGDN, @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Function layer: http://www.keyboard-layout-editor.com/#/gists/f29128427f674c43777f045e363d1b44 */ - [LAYER_FUNCTION] = LAYOUT( + [LAYER_FUNCTION] = LAYOUT_65_ansi_blocker_split_bs( _______, 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_CAPS, _______, KC_MPLY, KC_VOLU, KC_MSTP, _______, EEP_RST, RESET, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/bcat/readme.md b/layouts/community/65_ansi_blocker_split_bs/bcat/readme.md similarity index 57% rename from keyboards/kbdfans/kbd67/hotswap/keymaps/bcat/readme.md rename to layouts/community/65_ansi_blocker_split_bs/bcat/readme.md index 16effc38155e..c7ea966d8d43 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/bcat/readme.md +++ b/layouts/community/65_ansi_blocker_split_bs/bcat/readme.md @@ -1,7 +1,8 @@ -# bcat's KBD67 hotswap layout +# bcat's 65% ANSI blocker split backspace layout -This is a standard 65% keyboard layout, with an HHKB-style (split) backspace -and media controls in the function layer (centered around the ESDF cluster). +This is a standard 65% keyboard layout, with a blocker to the left of the arrow +keys, an HHKB-style (split) backspace, and media controls in the function layer +(centered around the ESDF cluster). ## Default layer From cd405274e8dc6e721f64194c42dd7d564dc1474f Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Thu, 7 May 2020 16:27:12 +0900 Subject: [PATCH 375/429] Changed the VID/PID for Helix keyboards (#8989) --- keyboards/helix/pico/config.h | 4 ++-- keyboards/helix/rev1/config.h | 4 ++-- keyboards/helix/rev2/config.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/helix/pico/config.h b/keyboards/helix/pico/config.h index 05713d7602f4..a4cc77143b7d 100644 --- a/keyboards/helix/pico/config.h +++ b/keyboards/helix/pico/config.h @@ -19,8 +19,8 @@ along with this program. If not, see . #pragma once /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 +#define VENDOR_ID 0x3265 +#define PRODUCT_ID 0x0001 #define DEVICE_VER 0x0002 #define MANUFACTURER Yushakobo #define PRODUCT HelixPico diff --git a/keyboards/helix/rev1/config.h b/keyboards/helix/rev1/config.h index 1a5a2666411e..6c6ebea68a01 100644 --- a/keyboards/helix/rev1/config.h +++ b/keyboards/helix/rev1/config.h @@ -19,8 +19,8 @@ along with this program. If not, see . #pragma once /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 +#define VENDOR_ID 0x3265 +#define PRODUCT_ID 0x8000 #define DEVICE_VER 0x0001 #define MANUFACTURER Yushakobo #define PRODUCT Helix Alpha diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h index 467d2d66f6e7..f85896fbeab6 100644 --- a/keyboards/helix/rev2/config.h +++ b/keyboards/helix/rev2/config.h @@ -19,8 +19,8 @@ along with this program. If not, see . #pragma once /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 +#define VENDOR_ID 0x3265 +#define PRODUCT_ID 0x0000 #define DEVICE_VER 0x0001 #define MANUFACTURER Yushakobo #define PRODUCT Helix Beta From 03cf47934a32c9fa9ead03e05bbe4bbd99405998 Mon Sep 17 00:00:00 2001 From: ai03 Date: Thu, 7 May 2020 17:44:19 +0900 Subject: [PATCH 376/429] [Keyboard] Add QUAD-H LB75 keyboard (#8607) * Copy back old files from 9 months ago * Delete unnecessary functions in lb75.c * Remove LCD and MIDI config * Modernize ancient files * Update keymaps as necessary * Move files to vendor folder * Update readme to reflect changes * Modernize makefile * Remove split config * Update keyboards/quad_h/lb75/keymaps/continuous_fnrow/keymap.c * Update keyboards/quad_h/lb75/keymaps/via/keymap.c * Update keyboards/quad_h/lb75/keymaps/divided_fnrow/keymap.c * Update keyboards/quad_h/lb75/lb75.c * Update lb75.c * Update keyboards/quad_h/lb75/keymaps/continuous_fnrow/keymap.c * Update keyboards/quad_h/lb75/readme.md * Update keyboards/quad_h/lb75/keymaps/via/keymap.c * Update keyboards/quad_h/lb75/keymaps/continuous_fnrow/keymap.c * Update keyboards/quad_h/lb75/keymaps/divided_fnrow/keymap.c * Update keyboards/quad_h/lb75/keymaps/divided_fnrow/keymap.c * Update keyboards/quad_h/lb75/keymaps/via/keymap.c * Add default keymap as required * Update keyboards/quad_h/lb75/info.json * Update keyboards/quad_h/lb75/info.json * Update keyboards/quad_h/lb75/readme.md * Update keyboards/quad_h/lb75/readme.md --- keyboards/quad_h/lb75/config.h | 196 ++++++++++++++++++ keyboards/quad_h/lb75/info.json | 187 +++++++++++++++++ .../lb75/keymaps/continuous_fnrow/keymap.c | 35 ++++ .../lb75/keymaps/continuous_fnrow/readme.md | 3 + .../quad_h/lb75/keymaps/default/keymap.c | 35 ++++ .../quad_h/lb75/keymaps/default/readme.md | 3 + .../lb75/keymaps/divided_fnrow/keymap.c | 35 ++++ .../lb75/keymaps/divided_fnrow/readme.md | 3 + keyboards/quad_h/lb75/keymaps/via/keymap.c | 51 +++++ keyboards/quad_h/lb75/keymaps/via/readme.md | 3 + keyboards/quad_h/lb75/keymaps/via/rules.mk | 1 + keyboards/quad_h/lb75/lb75.c | 39 ++++ keyboards/quad_h/lb75/lb75.h | 73 +++++++ keyboards/quad_h/lb75/readme.md | 15 ++ keyboards/quad_h/lb75/rules.mk | 33 +++ 15 files changed, 712 insertions(+) create mode 100644 keyboards/quad_h/lb75/config.h create mode 100644 keyboards/quad_h/lb75/info.json create mode 100644 keyboards/quad_h/lb75/keymaps/continuous_fnrow/keymap.c create mode 100644 keyboards/quad_h/lb75/keymaps/continuous_fnrow/readme.md create mode 100644 keyboards/quad_h/lb75/keymaps/default/keymap.c create mode 100644 keyboards/quad_h/lb75/keymaps/default/readme.md create mode 100644 keyboards/quad_h/lb75/keymaps/divided_fnrow/keymap.c create mode 100644 keyboards/quad_h/lb75/keymaps/divided_fnrow/readme.md create mode 100644 keyboards/quad_h/lb75/keymaps/via/keymap.c create mode 100644 keyboards/quad_h/lb75/keymaps/via/readme.md create mode 100644 keyboards/quad_h/lb75/keymaps/via/rules.mk create mode 100644 keyboards/quad_h/lb75/lb75.c create mode 100644 keyboards/quad_h/lb75/lb75.h create mode 100644 keyboards/quad_h/lb75/readme.md create mode 100644 keyboards/quad_h/lb75/rules.mk diff --git a/keyboards/quad_h/lb75/config.h b/keyboards/quad_h/lb75/config.h new file mode 100644 index 000000000000..1c23ed5b362e --- /dev/null +++ b/keyboards/quad_h/lb75/config.h @@ -0,0 +1,196 @@ +/* +Copyright 2019 Ryota Goto + +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 . +*/ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xA103 +#define PRODUCT_ID 0x0007 +#define DEVICE_VER 0x0001 +#define MANUFACTURER QUADH +#define PRODUCT LB75 +#define DESCRIPTION Custom 75% keyboard + +/* key matrix size */ +#define MATRIX_ROWS 12 +#define MATRIX_COLS 8 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * +*/ + +#define MATRIX_ROW_PINS { D4, D6, D7, B4, B5, B6, C6, C7, D3, D5, F0, E6 } +#define MATRIX_COL_PINS { D2, D1, D0, F1, F4, F5, F6, F7 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +#define BACKLIGHT_PIN B7 +// #define BACKLIGHT_BREATHING +#define BACKLIGHT_LEVELS 5 + +#define RGB_DI_PIN B0 +#ifdef RGB_DI_PIN + #define RGBLED_NUM 16 + #define RGBLIGHT_HUE_STEP 8 + #define RGBLIGHT_SAT_STEP 8 + #define RGBLIGHT_VAL_STEP 8 + #define RGBLIGHT_LIMIT_VAL 220 /* The maximum brightness level */ + #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +/*== all animations enable ==*/ + #define RGBLIGHT_ANIMATIONS +// /*== or choose animations ==*/ +// #define RGBLIGHT_EFFECT_BREATHING +// #define RGBLIGHT_EFFECT_RAINBOW_MOOD +// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL +// #define RGBLIGHT_EFFECT_SNAKE +// #define RGBLIGHT_EFFECT_KNIGHT +// #define RGBLIGHT_EFFECT_CHRISTMAS +// #define RGBLIGHT_EFFECT_STATIC_GRADIENT +// #define RGBLIGHT_EFFECT_RGB_TEST +// #define RGBLIGHT_EFFECT_ALTERNATING +// /*== customize breathing effect ==*/ +// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ +// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 +// /*==== use exp() and sin() ====*/ +// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 +// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +#endif + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* number of backlight levels */ + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. + * This is userful for the Windows task manager shortcut (ctrl+shift+esc). + */ +// #define GRAVE_ESC_CTRL_OVERRIDE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Magic Key Options + * + * Magic keys are hotkey commands that allow control over firmware functions of + * the keyboard. They are best used in combination with the HID Listen program, + * found here: https://www.pjrc.com/teensy/hid_listen.html + * + * The options below allow the magic key functionality to be changed. This is + * useful if your keyboard/keypad is missing keys and you want magic key support. + * + */ + +/* key combination for magic key command */ +/* defined by default; to change, uncomment and set to the combination you want */ +// #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) + +/* control how magic key switches layers */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false + +/* override magic key keymap */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM +//#define MAGIC_KEY_HELP H +//#define MAGIC_KEY_HELP_ALT SLASH +//#define MAGIC_KEY_DEBUG D +//#define MAGIC_KEY_DEBUG_MATRIX X +//#define MAGIC_KEY_DEBUG_KBD K +//#define MAGIC_KEY_DEBUG_MOUSE M +//#define MAGIC_KEY_VERSION V +//#define MAGIC_KEY_STATUS S +//#define MAGIC_KEY_CONSOLE C +//#define MAGIC_KEY_LAYER0 0 +//#define MAGIC_KEY_LAYER0_ALT GRAVE +//#define MAGIC_KEY_LAYER1 1 +//#define MAGIC_KEY_LAYER2 2 +//#define MAGIC_KEY_LAYER3 3 +//#define MAGIC_KEY_LAYER4 4 +//#define MAGIC_KEY_LAYER5 5 +//#define MAGIC_KEY_LAYER6 6 +//#define MAGIC_KEY_LAYER7 7 +//#define MAGIC_KEY_LAYER8 8 +//#define MAGIC_KEY_LAYER9 9 +//#define MAGIC_KEY_BOOTLOADER B +//#define MAGIC_KEY_BOOTLOADER_ALT ESC +//#define MAGIC_KEY_LOCK CAPS +//#define MAGIC_KEY_EEPROM E +//#define MAGIC_KEY_EEPROM_CLEAR BSPACE +//#define MAGIC_KEY_NKRO N +//#define MAGIC_KEY_SLEEP_LED Z + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION + +/* Bootmagic Lite key configuration */ +// #define BOOTMAGIC_LITE_ROW 0 +// #define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/quad_h/lb75/info.json b/keyboards/quad_h/lb75/info.json new file mode 100644 index 000000000000..b1eebad38050 --- /dev/null +++ b/keyboards/quad_h/lb75/info.json @@ -0,0 +1,187 @@ +{ + "keyboard_name": "LB75", + "url": "", + "maintainer": "ai03", + "width": 16, + "height": 6, + "layouts": { + "LAYOUT_continuous_fnrow": { + "layout": [ + {"label":"Esc", "x":0, "y":0}, + {"label":"F1", "x":1, "y":0}, + {"label":"F2", "x":2, "y":0}, + {"label":"F3", "x":3, "y":0}, + {"label":"F4", "x":4, "y":0}, + {"label":"F5", "x":5, "y":0}, + {"label":"F6", "x":6, "y":0}, + {"label":"F7", "x":7, "y":0}, + {"label":"F8", "x":8, "y":0}, + {"label":"F9", "x":9, "y":0}, + {"label":"F10", "x":10, "y":0}, + {"label":"F11", "x":11, "y":0}, + {"label":"F12", "x":12, "y":0}, + {"label":"Print Screen", "x":13, "y":0}, + {"label":"Scroll Lock", "x":14, "y":0}, + {"label":"Pause", "x":15, "y":0}, + {"label":"~", "x":0, "y":1}, + {"label":"!", "x":1, "y":1}, + {"label":"@", "x":2, "y":1}, + {"label":"#", "x":3, "y":1}, + {"label":"$", "x":4, "y":1}, + {"label":"%", "x":5, "y":1}, + {"label":"^", "x":6, "y":1}, + {"label":"&", "x":7, "y":1}, + {"label":"*", "x":8, "y":1}, + {"label":"(", "x":9, "y":1}, + {"label":")", "x":10, "y":1}, + {"label":"_", "x":11, "y":1}, + {"label":"+", "x":12, "y":1}, + {"label":"Back Space", "x":13, "y":1}, + {"label":"Delete", "x":14, "y":1}, + {"label":"Home", "x":15, "y":1}, + {"label":"Tab", "x":0, "y":2, "w":1.5}, + {"label":"Q", "x":1.5, "y":2}, + {"label":"W", "x":2.5, "y":2}, + {"label":"E", "x":3.5, "y":2}, + {"label":"R", "x":4.5, "y":2}, + {"label":"T", "x":5.5, "y":2}, + {"label":"Y", "x":6.5, "y":2}, + {"label":"U", "x":7.5, "y":2}, + {"label":"I", "x":8.5, "y":2}, + {"label":"O", "x":9.5, "y":2}, + {"label":"P", "x":10.5, "y":2}, + {"label":"{", "x":11.5, "y":2}, + {"label":"}", "x":12.5, "y":2}, + {"label":"|", "x":13.5, "y":2, "w":1.5}, + {"label":"End", "x":15, "y":2}, + {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, + {"label":"A", "x":1.75, "y":3}, + {"label":"S", "x":2.75, "y":3}, + {"label":"D", "x":3.75, "y":3}, + {"label":"F", "x":4.75, "y":3}, + {"label":"G", "x":5.75, "y":3}, + {"label":"H", "x":6.75, "y":3}, + {"label":"J", "x":7.75, "y":3}, + {"label":"K", "x":8.75, "y":3}, + {"label":"L", "x":9.75, "y":3}, + {"label":":", "x":10.75, "y":3}, + {"label":"\"", "x":11.75, "y":3}, + {"label":"Enter", "x":12.75, "y":3, "w":2.25}, + {"label":"PgUp", "x":15, "y":3}, + {"label":"Shift", "x":0, "y":4, "w":1.25}, + {"label":"|", "x":1.25, "y":4}, + {"label":"Z", "x":2.25, "y":4}, + {"label":"X", "x":3.25, "y":4}, + {"label":"C", "x":4.25, "y":4}, + {"label":"V", "x":5.25, "y":4}, + {"label":"B", "x":6.25, "y":4}, + {"label":"N", "x":7.25, "y":4}, + {"label":"M", "x":8.25, "y":4}, + {"label":"<", "x":9.25, "y":4}, + {"label":">", "x":10.25, "y":4}, + {"label":"?", "x":11.25, "y":4}, + {"label":"Shift", "x":12.25, "y":4, "w":1.75}, + {"label":"↑", "x":14, "y":4}, + {"label":"PgDn", "x":15, "y":4}, + {"label":"Ctrl", "x":0, "y":5, "w":1.25}, + {"label":"Win", "x":1.25, "y":5, "w":1.25}, + {"label":"Alt", "x":2.5, "y":5, "w":1.25}, + {"x":3.75, "y":5, "w":6.25}, + {"label":"Alt", "x":10, "y":5}, + {"label":"Win", "x":11, "y":5}, + {"label":"Ctrl", "x":12, "y":5}, + {"label":"←", "x":13, "y":5}, + {"label":"↓", "x":14, "y":5}, + {"label":"→", "x":15, "y":5} + ] + }, + "LAYOUT_divided_fnrow": { + "layout": [ + {"label":"Esc", "x":0, "y":0}, + {"label":"F1", "x":1.5, "y":0}, + {"label":"F2", "x":2.5, "y":0}, + {"label":"F3", "x":3.5, "y":0}, + {"label":"F4", "x":4.5, "y":0}, + {"label":"F5", "x":6, "y":0}, + {"label":"F6", "x":7, "y":0}, + {"label":"F7", "x":8, "y":0}, + {"label":"F8", "x":9, "y":0}, + {"label":"F9", "x":10.5, "y":0}, + {"label":"F10", "x":11.5, "y":0}, + {"label":"F11", "x":12.5, "y":0}, + {"label":"F12", "x":13.5, "y":0}, + {"label":"Print Screen", "x":15, "y":0}, + {"label":"~", "x":0, "y":1}, + {"label":"!", "x":1, "y":1}, + {"label":"@", "x":2, "y":1}, + {"label":"#", "x":3, "y":1}, + {"label":"$", "x":4, "y":1}, + {"label":"%", "x":5, "y":1}, + {"label":"^", "x":6, "y":1}, + {"label":"&", "x":7, "y":1}, + {"label":"*", "x":8, "y":1}, + {"label":"(", "x":9, "y":1}, + {"label":")", "x":10, "y":1}, + {"label":"_", "x":11, "y":1}, + {"label":"+", "x":12, "y":1}, + {"label":"Back Space", "x":13, "y":1}, + {"label":"Delete", "x":14, "y":1}, + {"label":"Home", "x":15, "y":1}, + {"label":"Tab", "x":0, "y":2, "w":1.5}, + {"label":"Q", "x":1.5, "y":2}, + {"label":"W", "x":2.5, "y":2}, + {"label":"E", "x":3.5, "y":2}, + {"label":"R", "x":4.5, "y":2}, + {"label":"T", "x":5.5, "y":2}, + {"label":"Y", "x":6.5, "y":2}, + {"label":"U", "x":7.5, "y":2}, + {"label":"I", "x":8.5, "y":2}, + {"label":"O", "x":9.5, "y":2}, + {"label":"P", "x":10.5, "y":2}, + {"label":"{", "x":11.5, "y":2}, + {"label":"}", "x":12.5, "y":2}, + {"label":"|", "x":13.5, "y":2, "w":1.5}, + {"label":"End", "x":15, "y":2}, + {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, + {"label":"A", "x":1.75, "y":3}, + {"label":"S", "x":2.75, "y":3}, + {"label":"D", "x":3.75, "y":3}, + {"label":"F", "x":4.75, "y":3}, + {"label":"G", "x":5.75, "y":3}, + {"label":"H", "x":6.75, "y":3}, + {"label":"J", "x":7.75, "y":3}, + {"label":"K", "x":8.75, "y":3}, + {"label":"L", "x":9.75, "y":3}, + {"label":":", "x":10.75, "y":3}, + {"label":"\"", "x":11.75, "y":3}, + {"label":"Enter", "x":12.75, "y":3, "w":2.25}, + {"label":"PgUp", "x":15, "y":3}, + {"label":"Shift", "x":0, "y":4, "w":1.25}, + {"label":"|", "x":1.25, "y":4}, + {"label":"Z", "x":2.25, "y":4}, + {"label":"X", "x":3.25, "y":4}, + {"label":"C", "x":4.25, "y":4}, + {"label":"V", "x":5.25, "y":4}, + {"label":"B", "x":6.25, "y":4}, + {"label":"N", "x":7.25, "y":4}, + {"label":"M", "x":8.25, "y":4}, + {"label":"<", "x":9.25, "y":4}, + {"label":">", "x":10.25, "y":4}, + {"label":"?", "x":11.25, "y":4}, + {"label":"Shift", "x":12.25, "y":4, "w":1.75}, + {"label":"↑", "x":14, "y":4}, + {"label":"PgDn", "x":15, "y":4}, + {"label":"Ctrl", "x":0, "y":5, "w":1.25}, + {"label":"Win", "x":1.25, "y":5, "w":1.25}, + {"label":"Alt", "x":2.5, "y":5, "w":1.25}, + {"x":3.75, "y":5, "w":6.25}, + {"label":"Alt", "x":10, "y":5}, + {"label":"Win", "x":11, "y":5}, + {"label":"Ctrl", "x":12, "y":5}, + {"label":"←", "x":13, "y":5}, + {"label":"↓", "x":14, "y":5}, + {"label":"→", "x":15, "y":5} + ] + } + } +} diff --git a/keyboards/quad_h/lb75/keymaps/continuous_fnrow/keymap.c b/keyboards/quad_h/lb75/keymaps/continuous_fnrow/keymap.c new file mode 100644 index 000000000000..817b3cbddb58 --- /dev/null +++ b/keyboards/quad_h/lb75/keymaps/continuous_fnrow/keymap.c @@ -0,0 +1,35 @@ +/* Copyright 2019 Ryota Goto + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_continuous_fnrow( /* Base */ + KC_ESC, 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_PSCR, KC_SLCK, KC_PAUS, + 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, KC_DEL, KC_HOME, + 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_END, + MO(1), 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_PGUP, + KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_continuous_fnrow( /* Fn */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_CAPS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_STEP, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/quad_h/lb75/keymaps/continuous_fnrow/readme.md b/keyboards/quad_h/lb75/keymaps/continuous_fnrow/readme.md new file mode 100644 index 000000000000..be0223d1a7f0 --- /dev/null +++ b/keyboards/quad_h/lb75/keymaps/continuous_fnrow/readme.md @@ -0,0 +1,3 @@ +# The continuous fnrow keymap for LB75 + +Non-blockered upper row \ No newline at end of file diff --git a/keyboards/quad_h/lb75/keymaps/default/keymap.c b/keyboards/quad_h/lb75/keymaps/default/keymap.c new file mode 100644 index 000000000000..817b3cbddb58 --- /dev/null +++ b/keyboards/quad_h/lb75/keymaps/default/keymap.c @@ -0,0 +1,35 @@ +/* Copyright 2019 Ryota Goto + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_continuous_fnrow( /* Base */ + KC_ESC, 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_PSCR, KC_SLCK, KC_PAUS, + 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, KC_DEL, KC_HOME, + 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_END, + MO(1), 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_PGUP, + KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_continuous_fnrow( /* Fn */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_CAPS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_STEP, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/quad_h/lb75/keymaps/default/readme.md b/keyboards/quad_h/lb75/keymaps/default/readme.md new file mode 100644 index 000000000000..6d3bb42bcf5a --- /dev/null +++ b/keyboards/quad_h/lb75/keymaps/default/readme.md @@ -0,0 +1,3 @@ +# The default keymap for LB75 + +Nothing special \ No newline at end of file diff --git a/keyboards/quad_h/lb75/keymaps/divided_fnrow/keymap.c b/keyboards/quad_h/lb75/keymaps/divided_fnrow/keymap.c new file mode 100644 index 000000000000..5a3a58482dbd --- /dev/null +++ b/keyboards/quad_h/lb75/keymaps/divided_fnrow/keymap.c @@ -0,0 +1,35 @@ +/* Copyright 2019 Ryota Goto + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_divided_fnrow( /* Base */ + KC_ESC, 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_PSCR, + 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, KC_DEL, KC_HOME, + 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_END, + MO(1), 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_PGUP, + KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_divided_fnrow( /* Fn */ + RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_CAPS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_STEP, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/quad_h/lb75/keymaps/divided_fnrow/readme.md b/keyboards/quad_h/lb75/keymaps/divided_fnrow/readme.md new file mode 100644 index 000000000000..0a2f0b5de8d7 --- /dev/null +++ b/keyboards/quad_h/lb75/keymaps/divided_fnrow/readme.md @@ -0,0 +1,3 @@ +# The divided fnrow keymap for LB75 + +Blockered upper row \ No newline at end of file diff --git a/keyboards/quad_h/lb75/keymaps/via/keymap.c b/keyboards/quad_h/lb75/keymaps/via/keymap.c new file mode 100644 index 000000000000..9df605dbb6ea --- /dev/null +++ b/keyboards/quad_h/lb75/keymaps/via/keymap.c @@ -0,0 +1,51 @@ +/* Copyright 2019 Ryota Goto + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_continuous_fnrow( /* Base */ + KC_ESC, 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_PSCR, KC_SLCK, KC_PAUS, + 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, KC_DEL, KC_HOME, + 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_END, + MO(1), 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_PGUP, + KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_continuous_fnrow( /* Fn */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_CAPS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_STEP, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_continuous_fnrow( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT_continuous_fnrow( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/quad_h/lb75/keymaps/via/readme.md b/keyboards/quad_h/lb75/keymaps/via/readme.md new file mode 100644 index 000000000000..943c015c1897 --- /dev/null +++ b/keyboards/quad_h/lb75/keymaps/via/readme.md @@ -0,0 +1,3 @@ +# The via keymap for LB75 + +For use with VIA configurator \ No newline at end of file diff --git a/keyboards/quad_h/lb75/keymaps/via/rules.mk b/keyboards/quad_h/lb75/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/quad_h/lb75/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/quad_h/lb75/lb75.c b/keyboards/quad_h/lb75/lb75.c new file mode 100644 index 000000000000..a18f45adb841 --- /dev/null +++ b/keyboards/quad_h/lb75/lb75.c @@ -0,0 +1,39 @@ +/* Copyright 2019 Ryota Goto + * + * 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 . + */ +#include "lb75.h" + + +void matrix_init_kb(void) { + // put your keyboard start-up code here + // runs once when the firmware starts up + + setPinOutput(B1); + setPinOutput(B2); + + matrix_init_user(); +} + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + + if(res) { + writePin(B1, !led_state.caps_lock); + writePin(B2, !led_state.scroll_lock); + } + + return res; +} + diff --git a/keyboards/quad_h/lb75/lb75.h b/keyboards/quad_h/lb75/lb75.h new file mode 100644 index 000000000000..697a5fbb21fd --- /dev/null +++ b/keyboards/quad_h/lb75/lb75.h @@ -0,0 +1,73 @@ +/* Copyright 2019 Ryota Goto + * + * 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 . + */ +#pragma once + +#include "quantum.h" + +/* This a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define LAYOUT_continuous_fnrow( \ + K000, K010, K001, K011, K002, K012, K003, K013, K004, K014, K005, K015, K006, K016, K007, K017, \ + K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K027, K037, \ + K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K047, K057, \ + K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075, K076, K077, \ + K080, K090, K081, K091, K082, K092, K083, K093, K084, K094, K085, K095, K086, K087, K097, \ + K100, K110, K101, K103, K105, K115, K106, K116, K107, K117 \ +) \ +{ \ + { K000, K001, K002, K003, K004, K005, K006, K007 }, \ + { K010, K011, K012, K013, K014, K015, K016, K017 }, \ + { K020, K021, K022, K023, K024, K025, K026, K027 }, \ + { K030, K031, K032, K033, K034, K035, K036, K037 }, \ + { K040, K041, K042, K043, K044, K045, K046, K047 }, \ + { K050, K051, K052, K053, K054, K055, KC_NO, K057 }, \ + { K060, K061, K062, K063, K064, K065, KC_NO, KC_NO }, \ + { K070, K071, K072, K073, K074, K075, K076, K077 }, \ + { K080, K081, K082, K083, K084, K085, K086, K087 }, \ + { K090, K091, K092, K093, K094, K095, KC_NO, K097 }, \ + { K100, K101, KC_NO, K103, KC_NO, K105, K106, K107 }, \ + { K110, KC_NO, KC_NO, KC_NO, KC_NO, K115, K116, K117 } \ +} + +#define LAYOUT_divided_fnrow( \ + K000, K010, K001, K011, K002, K003, K013, K004, K014, K005, K015, K006, K016, K017, \ + K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K027, K037, \ + K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K047, K057, \ + K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075, K076, K077, \ + K080, K090, K081, K091, K082, K092, K083, K093, K084, K094, K085, K095, K086, K087, K097, \ + K100, K110, K101, K103, K105, K115, K106, K116, K107, K117 \ +) \ +{ \ + { K000, K001, K002, K003, K004, K005, K006, KC_NO }, \ + { K010, K011, KC_NO, K013, K014, K015, K016, K017 }, \ + { K020, K021, K022, K023, K024, K025, K026, K027 }, \ + { K030, K031, K032, K033, K034, K035, K036, K037 }, \ + { K040, K041, K042, K043, K044, K045, K046, K047 }, \ + { K050, K051, K052, K053, K054, K055, KC_NO, K057 }, \ + { K060, K061, K062, K063, K064, K065, KC_NO, KC_NO }, \ + { K070, K071, K072, K073, K074, K075, K076, K077 }, \ + { K080, K081, K082, K083, K084, K085, K086, K087 }, \ + { K090, K091, K092, K093, K094, K095, KC_NO, K097 }, \ + { K100, K101, KC_NO, K103, KC_NO, K105, K106, K107 }, \ + { K110, KC_NO, KC_NO, KC_NO, KC_NO, K115, K116, K117 } \ +} + diff --git a/keyboards/quad_h/lb75/readme.md b/keyboards/quad_h/lb75/readme.md new file mode 100644 index 000000000000..7f44499f640b --- /dev/null +++ b/keyboards/quad_h/lb75/readme.md @@ -0,0 +1,15 @@ +# LB75 + +![LB75](https://i.imgur.com/UNhskvMl.jpg) + +LB75 PCB for QUAD-H + +* Keyboard Maintainer: [ai03](https://github.com/ai03-2725) +* Hardware Supported: The LB75 PCB +* Hardware Availability: Private + +Make example for this keyboard (after setting up your build environment): + + make quad_h/lb75:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/quad_h/lb75/rules.mk b/keyboards/quad_h/lb75/rules.mk new file mode 100644 index 000000000000..37a5d441a5cf --- /dev/null +++ b/keyboards/quad_h/lb75/rules.mk @@ -0,0 +1,33 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs + From 715cd43f0d72a984882aeb9e9b3247721b665ca0 Mon Sep 17 00:00:00 2001 From: marksard <38324387+marksard@users.noreply.github.com> Date: Thu, 7 May 2020 18:23:26 +0900 Subject: [PATCH 377/429] [Keyboard] Add keyboard firmware treadstone32lite (#8720) * Keyboard: add treeadstone48 * rename layout defines * Use of pragma once * move common include code * fixed info.json * change keymap layout from kc to normal * fix alpha revision keymap * fixed info.json * remove USE_Link_Time_Optimization * Add keyboard firmware of treadstone32lite * fixed by the review * I used to set this to a per-keymap setting, so I'll undo it. --- .../treadstone32/keymaps/default/config.h | 48 +++------- .../treadstone32/keymaps/default/keymap.c | 14 +-- .../treadstone32/keymaps/default/rules.mk | 3 +- .../treadstone32/keymaps/like_jis/config.h | 48 +++------- .../treadstone32/keymaps/like_jis/keymap.c | 12 +-- .../treadstone32/keymaps/like_jis/rules.mk | 7 -- keyboards/treadstone32/lite/config.h | 96 +++++++++++++++++++ .../{treadstone32.c => lite/lite.c} | 29 +----- .../{treadstone32.h => lite/lite.h} | 0 keyboards/treadstone32/lite/rules.mk | 9 ++ keyboards/treadstone32/readme.md | 5 +- keyboards/treadstone32/{ => rev1}/config.h | 70 +++++++------- keyboards/treadstone32/rev1/rev1.c | 16 ++++ keyboards/treadstone32/rev1/rev1.h | 45 +++++++++ keyboards/treadstone32/rules.mk | 2 + 15 files changed, 249 insertions(+), 155 deletions(-) create mode 100644 keyboards/treadstone32/lite/config.h rename keyboards/treadstone32/{treadstone32.c => lite/lite.c} (51%) rename keyboards/treadstone32/{treadstone32.h => lite/lite.h} (100%) create mode 100644 keyboards/treadstone32/lite/rules.mk rename keyboards/treadstone32/{ => rev1}/config.h (62%) create mode 100644 keyboards/treadstone32/rev1/rev1.c create mode 100644 keyboards/treadstone32/rev1/rev1.h diff --git a/keyboards/treadstone32/keymaps/default/config.h b/keyboards/treadstone32/keymaps/default/config.h index a6363f9b9a5f..863588c5aa68 100644 --- a/keyboards/treadstone32/keymaps/default/config.h +++ b/keyboards/treadstone32/keymaps/default/config.h @@ -1,22 +1,18 @@ -/* -This is the c configuration file for the keymap - -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -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 . -*/ +/* Copyright 2019 marksard + * + * 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 . + */ #pragma once @@ -30,7 +26,6 @@ along with this program. If not, see . #ifdef MOUSEKEY_ENABLE #undef MOUSEKEY_INTERVAL #define MOUSEKEY_INTERVAL 1 - #undef MOUSEKEY_TIME_TO_MAX #define MOUSEKEY_TIME_TO_MAX 150 @@ -43,16 +38,3 @@ along with this program. If not, see . #undef MOUSEKEY_DELAY #define MOUSEKEY_DELAY 0 #endif - -// Selection of RGBLIGHT MODE to use. -#if defined(LED_ANIMATIONS) - //#define RGBLIGHT_EFFECT_BREATHING - #define RGBLIGHT_EFFECT_RAINBOW_MOOD - #define RGBLIGHT_EFFECT_RAINBOW_SWIRL - //#define RGBLIGHT_EFFECT_SNAKE - #define RGBLIGHT_EFFECT_KNIGHT - //#define RGBLIGHT_EFFECT_CHRISTMAS - #define RGBLIGHT_EFFECT_STATIC_GRADIENT - //#define RGBLIGHT_EFFECT_RGB_TEST - //#define RGBLIGHT_EFFECT_ALTERNATING -#endif diff --git a/keyboards/treadstone32/keymaps/default/keymap.c b/keyboards/treadstone32/keymaps/default/keymap.c index b49e55f27c56..7ca797fcc006 100644 --- a/keyboards/treadstone32/keymaps/default/keymap.c +++ b/keyboards/treadstone32/keymaps/default/keymap.c @@ -38,12 +38,12 @@ enum custom_keycodes { #define KC_Z_CT LCTL_T(KC_Z) #define KC_X_AL LALT_T(KC_X) #define KC_C_GU LGUI_T(KC_C) -#define KC_SSCT LCTL_T(KC_SLSH) -#define KC_ENSF LSFT_T(KC_ENT) +#define KC_SSCT RCTL_T(KC_SLSH) +#define KC_ENSF RSFT_T(KC_ENT) // Lower layer mod tap #define KC_F6SF LSFT_T(KC_F6) -#define KC_BSSF LSFT_T(KC_BSLS) +#define KC_QUSF RSFT_T(KC_QUOT) #define KC_11CT LCTL_T(KC_F11) #define KC_12AL LALT_T(KC_F12) @@ -77,9 +77,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,---------------------------------------------------------------------------------------------------. KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| - KC_F6SF, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, XXXXXXX, XXXXXXX, KC_SCLN, KC_QUOT, + KC_F6SF, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, XXXXXXX, XXXXXXX, KC_SCLN, KC_QUSF, //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| - KC_11CT, KC_12AL, KC_ESC, KC_TAB, KANJI, KC_DEL, XXXXXXX, XXXXXXX, XXXXXXX, KC_GRV, + KC_11CT, KC_12AL, KC_ESC, KC_TAB, KANJI, KC_DEL, XXXXXXX, XXXXXXX, KC_RO, KC_GRV, //`---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' _______, KC_MLAD // `---------|---------' @@ -99,9 +99,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( //,---------------------------------------------------------------------------------------------------. - RESET, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + RESET, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_PSCR, //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| - RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, XXXXXXX, + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_NLCK, //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, KC_BTN1, KC_BTN2, XXXXXXX, XXXXXXX, XXXXXXX, //`---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' diff --git a/keyboards/treadstone32/keymaps/default/rules.mk b/keyboards/treadstone32/keymaps/default/rules.mk index 5ca4c5258662..882ddd697733 100644 --- a/keyboards/treadstone32/keymaps/default/rules.mk +++ b/keyboards/treadstone32/keymaps/default/rules.mk @@ -2,10 +2,9 @@ # change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically # + # If your custom treadstone32 pcb, you can rewrite to yes. RGBLIGHT_ENABLE = yes # LED underglow (Enable WS2812 RGB underlight.) -LED_ANIMATIONS = yes # LED animations - # Other selectable option IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) diff --git a/keyboards/treadstone32/keymaps/like_jis/config.h b/keyboards/treadstone32/keymaps/like_jis/config.h index a6363f9b9a5f..863588c5aa68 100644 --- a/keyboards/treadstone32/keymaps/like_jis/config.h +++ b/keyboards/treadstone32/keymaps/like_jis/config.h @@ -1,22 +1,18 @@ -/* -This is the c configuration file for the keymap - -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -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 . -*/ +/* Copyright 2019 marksard + * + * 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 . + */ #pragma once @@ -30,7 +26,6 @@ along with this program. If not, see . #ifdef MOUSEKEY_ENABLE #undef MOUSEKEY_INTERVAL #define MOUSEKEY_INTERVAL 1 - #undef MOUSEKEY_TIME_TO_MAX #define MOUSEKEY_TIME_TO_MAX 150 @@ -43,16 +38,3 @@ along with this program. If not, see . #undef MOUSEKEY_DELAY #define MOUSEKEY_DELAY 0 #endif - -// Selection of RGBLIGHT MODE to use. -#if defined(LED_ANIMATIONS) - //#define RGBLIGHT_EFFECT_BREATHING - #define RGBLIGHT_EFFECT_RAINBOW_MOOD - #define RGBLIGHT_EFFECT_RAINBOW_SWIRL - //#define RGBLIGHT_EFFECT_SNAKE - #define RGBLIGHT_EFFECT_KNIGHT - //#define RGBLIGHT_EFFECT_CHRISTMAS - #define RGBLIGHT_EFFECT_STATIC_GRADIENT - //#define RGBLIGHT_EFFECT_RGB_TEST - //#define RGBLIGHT_EFFECT_ALTERNATING -#endif diff --git a/keyboards/treadstone32/keymaps/like_jis/keymap.c b/keyboards/treadstone32/keymaps/like_jis/keymap.c index 891f484469c5..a738226d991f 100644 --- a/keyboards/treadstone32/keymaps/like_jis/keymap.c +++ b/keyboards/treadstone32/keymaps/like_jis/keymap.c @@ -39,12 +39,12 @@ enum custom_keycodes { #define KC_Z_CT LCTL_T(KC_Z) #define KC_X_AL LALT_T(KC_X) #define KC_C_GU LGUI_T(KC_C) -#define KC_SSCT LCTL_T(KC_SLSH) -#define KC_ENSF LSFT_T(KC_ENT) +#define KC_SSCT RCTL_T(KC_SLSH) +#define KC_ENSF RSFT_T(KC_ENT) // Lower layer mod tap #define KC_F6SF LSFT_T(KC_F6) -#define KC_BSSF LSFT_T(KC_BSLS) +#define KC_BSSF RSFT_T(KC_BSLS) #define KC_11CT LCTL_T(KC_F11) #define KC_12AL LALT_T(KC_F12) @@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| KC_F6SF, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, XXXXXXX, KC_SCLN, KC_QUOT, KC_BSSF, //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| - KC_11CT, KC_12AL, KC_ESC, KC_TAB, KANJI, KC_DEL, XXXXXXX, XXXXXXX, XXXXXXX, KC_RO, + KC_11CT, KC_12AL, KC_ESC, KC_TAB, KANJI, KC_DEL, XXXXXXX, XXXXXXX, KC_GRV, KC_RO, //`---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' _______, KC_MLAD // `---------|---------' @@ -100,9 +100,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( //,---------------------------------------------------------------------------------------------------. - RESET, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + RESET, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_PSCR, //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| - RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, XXXXXXX, + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_NLCK, //|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, KC_BTN1, KC_BTN2, XXXXXXX, XXXXXXX, XXXXXXX, //`---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' diff --git a/keyboards/treadstone32/keymaps/like_jis/rules.mk b/keyboards/treadstone32/keymaps/like_jis/rules.mk index 8c4541fa197b..882ddd697733 100644 --- a/keyboards/treadstone32/keymaps/like_jis/rules.mk +++ b/keyboards/treadstone32/keymaps/like_jis/rules.mk @@ -1,14 +1,10 @@ - # Build Options # change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically # -TAP_DANCE_ENABLE = no # If your custom treadstone32 pcb, you can rewrite to yes. RGBLIGHT_ENABLE = yes # LED underglow (Enable WS2812 RGB underlight.) -LED_ANIMATIONS = yes # LED animations - # Other selectable option IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) @@ -20,6 +16,3 @@ endif ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes) OPT_DEFS += -DIOS_DEVICE_ENABLE endif - -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend diff --git a/keyboards/treadstone32/lite/config.h b/keyboards/treadstone32/lite/config.h new file mode 100644 index 000000000000..f7c9b2e0d433 --- /dev/null +++ b/keyboards/treadstone32/lite/config.h @@ -0,0 +1,96 @@ +/* +Copyright 2020 marksard + +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 . +*/ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0xDFA5 +#define DEVICE_VER 0x0015 +#define MANUFACTURER marksard +#define PRODUCT treadstone32 lite +#define DESCRIPTION Minimal Symmetrical staggered 32-Key Keyboard + +/* key matrix size */ +#define MATRIX_ROWS 8 +#define MATRIX_COLS 5 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * +*/ +#define MATRIX_ROW_PINS { B6, B2, F7, F6, B3, B1, F4, F5 } +#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */ +#define DIODE_DIRECTION COL2ROW +#define RGB_DI_PIN D3 +#ifdef RGB_DI_PIN + #define RGBLED_NUM 6 + #ifndef IOS_DEVICE_ENABLE + #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ + #define RGBLIGHT_VAL_STEP 8 + #else + #define RGBLIGHT_LIMIT_VAL 50 + #define RGBLIGHT_VAL_STEP 4 + #endif + #define RGBLIGHT_HUE_STEP 8 + #define RGBLIGHT_SAT_STEP 8 + #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +/*== all animations enable ==*/ +// #define RGBLIGHT_ANIMATIONS +/*== or choose animations ==*/ +// #define RGBLIGHT_EFFECT_BREATHING + #define RGBLIGHT_EFFECT_RAINBOW_MOOD + #define RGBLIGHT_EFFECT_RAINBOW_SWIRL +// #define RGBLIGHT_EFFECT_SNAKE + #define RGBLIGHT_EFFECT_KNIGHT +// #define RGBLIGHT_EFFECT_CHRISTMAS + #define RGBLIGHT_EFFECT_STATIC_GRADIENT +// #define RGBLIGHT_EFFECT_RGB_TEST +// #define RGBLIGHT_EFFECT_ALTERNATING +/*== customize breathing effect ==*/ + /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ + #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 + /*==== use exp() and sin() ====*/ + #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 + #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +#endif + +#if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE) +// USB_MAX_POWER_CONSUMPTION value for treadstone32 keyboard +// 120 RGBoff +// 330 RGB 6 +// 300 RGB 32 + #define USB_MAX_POWER_CONSUMPTION 400 +#else + // fix iPhone and iPad power adapter issue + // iOS device need lessthan 100 + #define USB_MAX_POWER_CONSUMPTION 100 +#endif + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 diff --git a/keyboards/treadstone32/treadstone32.c b/keyboards/treadstone32/lite/lite.c similarity index 51% rename from keyboards/treadstone32/treadstone32.c rename to keyboards/treadstone32/lite/lite.c index 9d27f86ffedb..a1997feff0be 100644 --- a/keyboards/treadstone32/treadstone32.c +++ b/keyboards/treadstone32/lite/lite.c @@ -13,31 +13,4 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "treadstone32.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} +#include "lite.h" diff --git a/keyboards/treadstone32/treadstone32.h b/keyboards/treadstone32/lite/lite.h similarity index 100% rename from keyboards/treadstone32/treadstone32.h rename to keyboards/treadstone32/lite/lite.h diff --git a/keyboards/treadstone32/lite/rules.mk b/keyboards/treadstone32/lite/rules.mk new file mode 100644 index 000000000000..4bdc53c1108b --- /dev/null +++ b/keyboards/treadstone32/lite/rules.mk @@ -0,0 +1,9 @@ +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = caterina diff --git a/keyboards/treadstone32/readme.md b/keyboards/treadstone32/readme.md index 989a29c204bd..99cbe4e01454 100644 --- a/keyboards/treadstone32/readme.md +++ b/keyboards/treadstone32/readme.md @@ -10,9 +10,12 @@ Hardware Availability: links to where you can find this hardware Make example for this keyboard (after setting up your build environment): - make treadstone32:default:dfu + make treadstone32:default + or + make treadstone32/lite:default See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). [Build guide](https://github.com/marksard/Keyboards/blob/master/treadstone32/documents/treadstone32_buildguide.md) +[Build guide (lite)](https://github.com/marksard/Keyboards/blob/master/treadstone32/documents/treadstone32lite_buildguide.md) [Firmware](https://github.com/marksard/qmk_firmware/tree/my_customize/keyboards/treadstone32) diff --git a/keyboards/treadstone32/config.h b/keyboards/treadstone32/rev1/config.h similarity index 62% rename from keyboards/treadstone32/config.h rename to keyboards/treadstone32/rev1/config.h index b9cd94d4b61b..caec9c5825ab 100644 --- a/keyboards/treadstone32/config.h +++ b/keyboards/treadstone32/rev1/config.h @@ -48,29 +48,38 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - -/* ws2812 RGB LED */ #define RGB_DI_PIN D3 -#define RGBLIGHT_TIMER -#define ws2812_PORTREG PORTD -#define ws2812_DDRREG DDRD - -#define RGBLED_NUM 6 - -#ifndef IOS_DEVICE_ENABLE - #define RGBLIGHT_LIMIT_VAL 200 - #define RGBLIGHT_VAL_STEP 17 -#else - #define RGBLIGHT_LIMIT_VAL 50 - #define RGBLIGHT_VAL_STEP 4 +#ifdef RGB_DI_PIN + #define RGBLED_NUM 6 + #ifndef IOS_DEVICE_ENABLE + #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ + #define RGBLIGHT_VAL_STEP 8 + #else + #define RGBLIGHT_LIMIT_VAL 50 + #define RGBLIGHT_VAL_STEP 4 + #endif + #define RGBLIGHT_HUE_STEP 8 + #define RGBLIGHT_SAT_STEP 8 + #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +/*== all animations enable ==*/ +// #define RGBLIGHT_ANIMATIONS +/*== or choose animations ==*/ +// #define RGBLIGHT_EFFECT_BREATHING + #define RGBLIGHT_EFFECT_RAINBOW_MOOD + #define RGBLIGHT_EFFECT_RAINBOW_SWIRL +// #define RGBLIGHT_EFFECT_SNAKE + #define RGBLIGHT_EFFECT_KNIGHT +// #define RGBLIGHT_EFFECT_CHRISTMAS + #define RGBLIGHT_EFFECT_STATIC_GRADIENT +// #define RGBLIGHT_EFFECT_RGB_TEST +// #define RGBLIGHT_EFFECT_ALTERNATING +/*== customize breathing effect ==*/ + /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ + #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 + /*==== use exp() and sin() ====*/ + #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 + #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 #endif -#define RGBLIGHT_HUE_STEP 10 -#define RGBLIGHT_SAT_STEP 17 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE) // USB_MAX_POWER_CONSUMPTION value for treadstone32 keyboard @@ -84,20 +93,5 @@ along with this program. If not, see . #define USB_MAX_POWER_CONSUMPTION 100 #endif -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT -//#define NO_ACTION_MACRO -//#define NO_ACTION_FUNCTION +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 diff --git a/keyboards/treadstone32/rev1/rev1.c b/keyboards/treadstone32/rev1/rev1.c new file mode 100644 index 000000000000..bf41abddbe84 --- /dev/null +++ b/keyboards/treadstone32/rev1/rev1.c @@ -0,0 +1,16 @@ +/* Copyright 2019 marksard + * + * 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 . + */ +#include "rev1.h" diff --git a/keyboards/treadstone32/rev1/rev1.h b/keyboards/treadstone32/rev1/rev1.h new file mode 100644 index 000000000000..90181124c098 --- /dev/null +++ b/keyboards/treadstone32/rev1/rev1.h @@ -0,0 +1,45 @@ +/* Copyright 2019 marksard. + * + * 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 . + */ +#pragma once + +#include "quantum.h" + +#define K_N KC_NO + +/* This a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define LAYOUT( \ + L09, L08, L07, L06, L05, L04, L03, L02, L01, L00, \ + L19, L18, L17, L16, L15, L14, L13, L12, L11, L10, \ + L29, L28, L27, L26, L25, L24, L23, L22, L21, L20, \ + L35, L34 \ + ) \ + { \ + { L00, L01, L02, L03, L04 }, \ + { L10, L11, L12, L13, L14 }, \ + { L20, L21, L22, L23, L24 }, \ + { K_N, K_N, K_N, K_N, L34 }, \ + { L05, L06, L07, L08, L09 }, \ + { L15, L16, L17, L18, L19 }, \ + { L25, L26, L27, L28, L29 }, \ + { L35, K_N, K_N, K_N, K_N } \ + } diff --git a/keyboards/treadstone32/rules.mk b/keyboards/treadstone32/rules.mk index d779e70020b7..64ca6a721412 100644 --- a/keyboards/treadstone32/rules.mk +++ b/keyboards/treadstone32/rules.mk @@ -27,3 +27,5 @@ UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. LEADER_ENABLE = no + +DEFAULT_FOLDER = treadstone32/rev1 From cdaef6d1893a2fda00b278ed661e6f8f4ba06186 Mon Sep 17 00:00:00 2001 From: a_p_u_r_o Date: Thu, 7 May 2020 18:28:01 +0900 Subject: [PATCH 378/429] Fix inconsistent MATRIX_COLS: basekeys/slice (#9022) --- keyboards/basekeys/slice/rev1/config.h | 2 +- keyboards/basekeys/slice/rev1_rgb/config.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/basekeys/slice/rev1/config.h b/keyboards/basekeys/slice/rev1/config.h index a02154d82b35..d151d5873fa9 100644 --- a/keyboards/basekeys/slice/rev1/config.h +++ b/keyboards/basekeys/slice/rev1/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . /* key matrix size */ #define MATRIX_ROWS 10 -#define MATRIX_COLS 18 +#define MATRIX_COLS 9 // wiring of each half #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } diff --git a/keyboards/basekeys/slice/rev1_rgb/config.h b/keyboards/basekeys/slice/rev1_rgb/config.h index 6d423d9b5ed5..1145d086470c 100644 --- a/keyboards/basekeys/slice/rev1_rgb/config.h +++ b/keyboards/basekeys/slice/rev1_rgb/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . /* key matrix size */ #define MATRIX_ROWS 10 -#define MATRIX_COLS 18 +#define MATRIX_COLS 9 // wiring of each half #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } From 10b5ac18286fbf5487bc4250176b7188be2db6d0 Mon Sep 17 00:00:00 2001 From: halfenergized Date: Fri, 8 May 2020 01:08:37 +0700 Subject: [PATCH 379/429] Add TGR-910 VIA support (#8985) * Add VIA support * Update readme.md * Update readme.md * Update keyboards/tgr/910/readme.md * Update keyboards/tgr/910/readme.md * Update keyboards/tgr/910/readme.md --- keyboards/tgr/910/keymaps/via/keymap.c | 32 ++++++++++++++++++++++++++ keyboards/tgr/910/keymaps/via/rules.mk | 4 ++++ keyboards/tgr/910/readme.md | 4 +++- 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 keyboards/tgr/910/keymaps/via/keymap.c create mode 100644 keyboards/tgr/910/keymaps/via/rules.mk diff --git a/keyboards/tgr/910/keymaps/via/keymap.c b/keyboards/tgr/910/keymaps/via/keymap.c new file mode 100644 index 000000000000..3aff12b53077 --- /dev/null +++ b/keyboards/tgr/910/keymaps/via/keymap.c @@ -0,0 +1,32 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* layer 0: qwerty */ + [0] = LAYOUT_ansi_split_bs( + 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_GRV, KC_DEL, + 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, KC_PGUP, + 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_PGDN, + 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_UP, MO(2), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [1] = LAYOUT_ansi_split_bs( + 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_BSLS, KC_TRNS, + BL_TOGG, BL_STEP, BL_INC, BL_DEC, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, + RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, + KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, 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_ansi_split_bs( + KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, 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_PSCR, 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_MPLY, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MSTP, KC_MNXT), + + [3] = LAYOUT_ansi_split_bs( + 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, KC_TRNS, KC_TRNS), + }; diff --git a/keyboards/tgr/910/keymaps/via/rules.mk b/keyboards/tgr/910/keymaps/via/rules.mk new file mode 100644 index 000000000000..8acb1b1bade7 --- /dev/null +++ b/keyboards/tgr/910/keymaps/via/rules.mk @@ -0,0 +1,4 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes + +EXTRAKEY_ENABLE = no diff --git a/keyboards/tgr/910/readme.md b/keyboards/tgr/910/readme.md index df348f022460..63e86380b870 100644 --- a/keyboards/tgr/910/readme.md +++ b/keyboards/tgr/910/readme.md @@ -1,4 +1,4 @@ -# tgr-910 +# TGR-910 65% custom keyboard with a very nice design. @@ -6,6 +6,8 @@ * Hardware Supported: TGR-910 (Quadcube PCB) * Hardware Availability: [Geekhack GB](https://geekhack.org/index.php?topic=86047.0) +**Only works with Quadcube PCB, will not work with [TGR 910 CE](../910ce) PCB (a.k.a. TGR Unicorn v1.2)** + Make example for this keyboard (after setting up your build environment): make tgr/910:default From 3043800b35e9a256a687cf7de9e9b61486e74c61 Mon Sep 17 00:00:00 2001 From: QMK Bot Date: Thu, 7 May 2020 18:10:54 +0000 Subject: [PATCH 380/429] format code according to conventions [skip ci] --- keyboards/tgr/910/keymaps/via/rules.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/tgr/910/keymaps/via/rules.mk b/keyboards/tgr/910/keymaps/via/rules.mk index 8acb1b1bade7..9e1952e2368a 100644 --- a/keyboards/tgr/910/keymaps/via/rules.mk +++ b/keyboards/tgr/910/keymaps/via/rules.mk @@ -1,4 +1,4 @@ -VIA_ENABLE = yes -LTO_ENABLE = yes - -EXTRAKEY_ENABLE = no +VIA_ENABLE = yes +LTO_ENABLE = yes + +EXTRAKEY_ENABLE = no From 39ef10b8ffac7f87e77ed1fe6dba984afe750422 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Fri, 8 May 2020 01:17:23 +0700 Subject: [PATCH 381/429] [Keyboard] Mechlovin Pisces (#8943) * add new keyboard * clean up * Update rules.mk * Update rules.mk * update Co-authored-by: vuhopkep --- keyboards/mechlovin/pisces/config.h | 76 ++++++++++++++++++ keyboards/mechlovin/pisces/info.json | 80 +++++++++++++++++++ .../mechlovin/pisces/keymaps/default/keymap.c | 34 ++++++++ .../pisces/keymaps/default/readme.md | 1 + .../mechlovin/pisces/keymaps/via/keymap.c | 48 +++++++++++ .../mechlovin/pisces/keymaps/via/readme.md | 1 + .../mechlovin/pisces/keymaps/via/rules.mk | 1 + keyboards/mechlovin/pisces/pisces.c | 42 ++++++++++ keyboards/mechlovin/pisces/pisces.h | 36 +++++++++ keyboards/mechlovin/pisces/readme.md | 13 +++ keyboards/mechlovin/pisces/rules.mk | 32 ++++++++ 11 files changed, 364 insertions(+) create mode 100644 keyboards/mechlovin/pisces/config.h create mode 100644 keyboards/mechlovin/pisces/info.json create mode 100644 keyboards/mechlovin/pisces/keymaps/default/keymap.c create mode 100644 keyboards/mechlovin/pisces/keymaps/default/readme.md create mode 100644 keyboards/mechlovin/pisces/keymaps/via/keymap.c create mode 100644 keyboards/mechlovin/pisces/keymaps/via/readme.md create mode 100644 keyboards/mechlovin/pisces/keymaps/via/rules.mk create mode 100644 keyboards/mechlovin/pisces/pisces.c create mode 100644 keyboards/mechlovin/pisces/pisces.h create mode 100644 keyboards/mechlovin/pisces/readme.md create mode 100644 keyboards/mechlovin/pisces/rules.mk diff --git a/keyboards/mechlovin/pisces/config.h b/keyboards/mechlovin/pisces/config.h new file mode 100644 index 000000000000..37acff2c1196 --- /dev/null +++ b/keyboards/mechlovin/pisces/config.h @@ -0,0 +1,76 @@ +/* +Copyright 2020 Team Mechlovin' + +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 . +*/ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x4D4C // ML-Mechlovin +#define PRODUCT_ID 0x6501 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Team.Mechlovin +#define PRODUCT Pisces65 +#define DESCRIPTION Team.Mechlovin Pisces65 + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { B0, F0, F5, F6, F7 } +#define MATRIX_COL_PINS { E6, B1, B3, D0, D1, D2, D3, D5, F4, F1, D4, D6, D7, B4, B5 } + +#define DIODE_DIRECTION COL2ROW + +#define BACKLIGHT_PIN B7 +// #define BACKLIGHT_BREATHING +#define BACKLIGHT_LEVELS 3 + +#define RGB_DI_PIN E2 +#ifdef RGB_DI_PIN + #define RGBLED_NUM 12 + #define RGBLIGHT_HUE_STEP 8 + #define RGBLIGHT_SAT_STEP 8 + #define RGBLIGHT_VAL_STEP 8 + #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ + #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +/*== all animations enable ==*/ + #define RGBLIGHT_ANIMATIONS +// /*== or choose animations ==*/ +// #define RGBLIGHT_EFFECT_BREATHING +// #define RGBLIGHT_EFFECT_RAINBOW_MOOD +// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL +// #define RGBLIGHT_EFFECT_SNAKE +// #define RGBLIGHT_EFFECT_KNIGHT +// #define RGBLIGHT_EFFECT_CHRISTMAS +// #define RGBLIGHT_EFFECT_STATIC_GRADIENT +// #define RGBLIGHT_EFFECT_RGB_TEST +// #define RGBLIGHT_EFFECT_ALTERNATING +#endif + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/mechlovin/pisces/info.json b/keyboards/mechlovin/pisces/info.json new file mode 100644 index 000000000000..5b32d1186e5f --- /dev/null +++ b/keyboards/mechlovin/pisces/info.json @@ -0,0 +1,80 @@ +{ + "keyboard_name": "pisces", + "url": "", + "maintainer": "qmk", + "width": 16, + "height": 5, + "layouts": { + "LAYOUT": { + "key_count": 65, + "layout": [ + {"label":"K00 (B0,E6)", "x":0, "y":0}, + {"label":"K01 (B0,B1)", "x":1, "y":0}, + {"label":"K02 (B0,B3)", "x":2, "y":0}, + {"label":"K03 (B0,D0)", "x":3, "y":0}, + {"label":"K04 (B0,D1)", "x":4, "y":0}, + {"label":"K05 (B0,D2)", "x":5, "y":0}, + {"label":"K06 (B0,D3)", "x":6, "y":0}, + {"label":"K07 (B0,D5)", "x":7, "y":0}, + {"label":"K08 (B0,F4)", "x":8, "y":0}, + {"label":"K09 (B0,F1)", "x":9, "y":0}, + {"label":"K0A (B0,D4)", "x":10, "y":0}, + {"label":"K0B (B0,D6)", "x":11, "y":0}, + {"label":"K0C (B0,D7)", "x":12, "y":0}, + {"label":"K0D (B0,B4)", "x":13, "y":0, "w":2}, + {"label":"K10 (F0,E6)", "x":0, "y":1, "w":1.5}, + {"label":"K11 (F0,B1)", "x":1.5, "y":1}, + {"label":"K12 (F0,B3)", "x":2.5, "y":1}, + {"label":"K13 (F0,D0)", "x":3.5, "y":1}, + {"label":"K14 (F0,D1)", "x":4.5, "y":1}, + {"label":"K15 (F0,D2)", "x":5.5, "y":1}, + {"label":"K16 (F0,D3)", "x":6.5, "y":1}, + {"label":"K17 (F0,D5)", "x":7.5, "y":1}, + {"label":"K18 (F0,F4)", "x":8.5, "y":1}, + {"label":"K19 (F0,F1)", "x":9.5, "y":1}, + {"label":"K1A (F0,D4)", "x":10.5, "y":1}, + {"label":"K1B (F0,D6)", "x":11.5, "y":1}, + {"label":"K1C (F0,D7)", "x":12.5, "y":1}, + {"label":"K1D (F0,B4)", "x":13.5, "y":1, "w":1.5}, + {"label":"K1E (F0,B5)", "x":15, "y":1}, + {"label":"K20 (F5,E6)", "x":0, "y":2, "w":1.75}, + {"label":"K21 (F5,B1)", "x":1.75, "y":2}, + {"label":"K22 (F5,B3)", "x":2.75, "y":2}, + {"label":"K23 (F5,D0)", "x":3.75, "y":2}, + {"label":"K24 (F5,D1)", "x":4.75, "y":2}, + {"label":"K25 (F5,D2)", "x":5.75, "y":2}, + {"label":"K26 (F5,D3)", "x":6.75, "y":2}, + {"label":"K27 (F5,D5)", "x":7.75, "y":2}, + {"label":"K28 (F5,F4)", "x":8.75, "y":2}, + {"label":"K29 (F5,F1)", "x":9.75, "y":2}, + {"label":"K2A (F5,D4)", "x":10.75, "y":2}, + {"label":"K2B (F5,D6)", "x":11.75, "y":2}, + {"label":"K2D (F5,B4)", "x":12.75, "y":2, "w":2.25}, + {"label":"K2E (F5,B5)", "x":15, "y":2}, + {"label":"K30 (F6,E6)", "x":0, "y":3, "w":2.25}, + {"label":"K32 (F6,B3)", "x":2.25, "y":3}, + {"label":"K33 (F6,D0)", "x":3.25, "y":3}, + {"label":"K34 (F6,D1)", "x":4.25, "y":3}, + {"label":"K35 (F6,D2)", "x":5.25, "y":3}, + {"label":"K36 (F6,D3)", "x":6.25, "y":3}, + {"label":"K37 (F6,D5)", "x":7.25, "y":3}, + {"label":"K38 (F6,F4)", "x":8.25, "y":3}, + {"label":"K39 (F6,F1)", "x":9.25, "y":3}, + {"label":"K3A (F6,D4)", "x":10.25, "y":3}, + {"label":"K3B (F6,D6)", "x":11.25, "y":3}, + {"label":"K3C (F6,D7)", "x":12.25, "y":3, "w":1.75}, + {"label":"K3D (F6,B4)", "x":14, "y":3}, + {"label":"K3E (F6,B5)", "x":15, "y":3}, + {"label":"K40 (F7,E6)", "x":0, "y":4, "w":1.5}, + {"label":"K42 (F7,B3)", "x":2.25, "y":4, "w":1.5}, + {"label":"K46 (F7,D3)", "x":3.75, "y":4, "w":6.25}, + {"label":"K4A (F7,D4)", "x":10, "y":4, "w":1.25}, + {"label":"K4B (F7,D6)", "x":11.25, "y":4, "w":1.25}, + {"label":"K4C (F7,D7)", "x":13, "y":4}, + {"label":"K4D (F7,B4)", "x":14, "y":4}, + {"label":"K4E (F7,B5)", "x":15, "y":4} + ] + } + } + ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/" +} diff --git a/keyboards/mechlovin/pisces/keymaps/default/keymap.c b/keyboards/mechlovin/pisces/keymaps/default/keymap.c new file mode 100644 index 000000000000..d4890a11ada2 --- /dev/null +++ b/keyboards/mechlovin/pisces/keymaps/default/keymap.c @@ -0,0 +1,34 @@ +/* Copyright 2020 Team Mechlovin' + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + 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_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_DEL, + LCTL_T(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_HOME, + 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_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT( + KC_TRNS, BL_STEP, RGB_TOG, RGB_MOD, 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_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + +}; \ No newline at end of file diff --git a/keyboards/mechlovin/pisces/keymaps/default/readme.md b/keyboards/mechlovin/pisces/keymaps/default/readme.md new file mode 100644 index 000000000000..966b8fd8024e --- /dev/null +++ b/keyboards/mechlovin/pisces/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for pisces diff --git a/keyboards/mechlovin/pisces/keymaps/via/keymap.c b/keyboards/mechlovin/pisces/keymaps/via/keymap.c new file mode 100644 index 000000000000..4ea597a9f109 --- /dev/null +++ b/keyboards/mechlovin/pisces/keymaps/via/keymap.c @@ -0,0 +1,48 @@ +/* Copyright 2020 Team Mechlovin' + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + 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_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_DEL, + LCTL_T(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_HOME, + 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_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT( + KC_TRNS, BL_STEP, RGB_TOG, RGB_MOD, 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_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [2] = LAYOUT( + KC_TRNS, BL_STEP, RGB_TOG, RGB_MOD, 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_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [3] = LAYOUT( + KC_TRNS, BL_STEP, RGB_TOG, RGB_MOD, 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_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + +}; \ No newline at end of file diff --git a/keyboards/mechlovin/pisces/keymaps/via/readme.md b/keyboards/mechlovin/pisces/keymaps/via/readme.md new file mode 100644 index 000000000000..33523d559215 --- /dev/null +++ b/keyboards/mechlovin/pisces/keymaps/via/readme.md @@ -0,0 +1 @@ +# The VIA keymap for pisces diff --git a/keyboards/mechlovin/pisces/keymaps/via/rules.mk b/keyboards/mechlovin/pisces/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/mechlovin/pisces/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/mechlovin/pisces/pisces.c b/keyboards/mechlovin/pisces/pisces.c new file mode 100644 index 000000000000..2a0a97f6d402 --- /dev/null +++ b/keyboards/mechlovin/pisces/pisces.c @@ -0,0 +1,42 @@ +/* Copyright 2020 Team Mechlovin' + * + * 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 . + */ + +#include "pisces.h" + +// Optional override functions below. +// You can leave any or all of these undefined. +// These are only required if you want to perform custom actions. + +void matrix_init_kb(void) { + // put your keyboard start-up code here + // runs once when the firmware starts up + + matrix_init_user(); + led_init_ports(); +} + +void led_init_ports(void) { + setPinOutput(B2); + writePinLow(B2); +} + +bool led_update_kb(led_t led_state) { + if(led_update_user(led_state)) { + writePin(B2, led_state.caps_lock); + } + + return true; +} diff --git a/keyboards/mechlovin/pisces/pisces.h b/keyboards/mechlovin/pisces/pisces.h new file mode 100644 index 000000000000..743b787b7cc9 --- /dev/null +++ b/keyboards/mechlovin/pisces/pisces.h @@ -0,0 +1,36 @@ +/* Copyright 2020 Team Mechlovin' + * + * 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 . + */ + +#pragma once + +#include "quantum.h" + +#define LAYOUT( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \ + K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ + K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \ + { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ + { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E }, \ +} + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ \ No newline at end of file diff --git a/keyboards/mechlovin/pisces/readme.md b/keyboards/mechlovin/pisces/readme.md new file mode 100644 index 000000000000..3229f1a52f8c --- /dev/null +++ b/keyboards/mechlovin/pisces/readme.md @@ -0,0 +1,13 @@ +# pisces + +![pisces](https://i.imgur.com/Oq7TAt8l.jpg) + + +* Keyboard Maintainer: [Team Mechlovin'](https://github.com/mechlovin) +* Hardware Availability: Private GB, [GH IC](https://geekhack.org/index.php?topic=103579.0) + +Make example for this keyboard (after setting up your build environment): + + make mechlovin/pisces:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/mechlovin/pisces/rules.mk b/keyboards/mechlovin/pisces/rules.mk new file mode 100644 index 000000000000..9afc1864f13f --- /dev/null +++ b/keyboards/mechlovin/pisces/rules.mk @@ -0,0 +1,32 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs From 41e1956135fb8d7e7a2c77769103573361abfaa3 Mon Sep 17 00:00:00 2001 From: marksard <38324387+marksard@users.noreply.github.com> Date: Fri, 8 May 2020 03:49:40 +0900 Subject: [PATCH 382/429] [Keyboard] treadstone48/rev2 (#8719) * Keyboard: add treeadstone48 * rename layout defines * Use of pragma once * move common include code * fixed info.json * change keymap layout from kc to normal * fix alpha revision keymap * fixed info.json * remove USE_Link_Time_Optimization * Add keyboard firmware of treadstone48 rev.2 * move the rev1-supported keymap. * layout code was updated by review * remove comment bar * remove LTO ifded * Update keyboards/treadstone48/rev2/rev2.h * Update keyboards/treadstone48/rev2/rev2.h --- keyboards/treadstone48/readme.md | 5 +- .../{ => rev1}/keymaps/like_jis_rs/config.h | 0 .../{ => rev1}/keymaps/like_jis_rs/keymap.c | 0 .../{ => rev1}/keymaps/like_jis_rs/readme.md | 0 .../keymaps/like_jis_rs/readme_jp.md | 0 .../{ => rev1}/keymaps/like_jis_rs/rules.mk | 0 keyboards/treadstone48/rev2/config.h | 250 +++++++++++++++++ keyboards/treadstone48/rev2/info.json | 261 ++++++++++++++++++ keyboards/treadstone48/rev2/rev2.c | 17 ++ keyboards/treadstone48/rev2/rev2.h | 48 ++++ keyboards/treadstone48/rev2/rules.mk | 1 + 11 files changed, 581 insertions(+), 1 deletion(-) rename keyboards/treadstone48/{ => rev1}/keymaps/like_jis_rs/config.h (100%) rename keyboards/treadstone48/{ => rev1}/keymaps/like_jis_rs/keymap.c (100%) rename keyboards/treadstone48/{ => rev1}/keymaps/like_jis_rs/readme.md (100%) rename keyboards/treadstone48/{ => rev1}/keymaps/like_jis_rs/readme_jp.md (100%) rename keyboards/treadstone48/{ => rev1}/keymaps/like_jis_rs/rules.mk (100%) create mode 100644 keyboards/treadstone48/rev2/config.h create mode 100644 keyboards/treadstone48/rev2/info.json create mode 100644 keyboards/treadstone48/rev2/rev2.c create mode 100644 keyboards/treadstone48/rev2/rev2.h create mode 100644 keyboards/treadstone48/rev2/rules.mk diff --git a/keyboards/treadstone48/readme.md b/keyboards/treadstone48/readme.md index eef39c39b334..432ef33fe91f 100644 --- a/keyboards/treadstone48/readme.md +++ b/keyboards/treadstone48/readme.md @@ -11,8 +11,11 @@ Hardware Availability: links to where you can find this hardware Make example for this keyboard (after setting up your build environment): make treadstone48:default + or + make treadstone48/rev2:default See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). -[Build guide](https://github.com/marksard/Keyboards/blob/master/treadstpne48/documents/treadstone48_buildguide.md) +[Build guide](https://github.com/marksard/Keyboards/blob/master/treadstone48/documents/treadstone48_buildguide.md) +[Build guide (rev2)](https://github.com/marksard/Keyboards/blob/master/treadstone48/documents/treadstone48rev2_buildguide.md) [Firmware](https://github.com/marksard/qmk_firmware/tree/my_customize/keyboards/treadstone48) diff --git a/keyboards/treadstone48/keymaps/like_jis_rs/config.h b/keyboards/treadstone48/rev1/keymaps/like_jis_rs/config.h similarity index 100% rename from keyboards/treadstone48/keymaps/like_jis_rs/config.h rename to keyboards/treadstone48/rev1/keymaps/like_jis_rs/config.h diff --git a/keyboards/treadstone48/keymaps/like_jis_rs/keymap.c b/keyboards/treadstone48/rev1/keymaps/like_jis_rs/keymap.c similarity index 100% rename from keyboards/treadstone48/keymaps/like_jis_rs/keymap.c rename to keyboards/treadstone48/rev1/keymaps/like_jis_rs/keymap.c diff --git a/keyboards/treadstone48/keymaps/like_jis_rs/readme.md b/keyboards/treadstone48/rev1/keymaps/like_jis_rs/readme.md similarity index 100% rename from keyboards/treadstone48/keymaps/like_jis_rs/readme.md rename to keyboards/treadstone48/rev1/keymaps/like_jis_rs/readme.md diff --git a/keyboards/treadstone48/keymaps/like_jis_rs/readme_jp.md b/keyboards/treadstone48/rev1/keymaps/like_jis_rs/readme_jp.md similarity index 100% rename from keyboards/treadstone48/keymaps/like_jis_rs/readme_jp.md rename to keyboards/treadstone48/rev1/keymaps/like_jis_rs/readme_jp.md diff --git a/keyboards/treadstone48/keymaps/like_jis_rs/rules.mk b/keyboards/treadstone48/rev1/keymaps/like_jis_rs/rules.mk similarity index 100% rename from keyboards/treadstone48/keymaps/like_jis_rs/rules.mk rename to keyboards/treadstone48/rev1/keymaps/like_jis_rs/rules.mk diff --git a/keyboards/treadstone48/rev2/config.h b/keyboards/treadstone48/rev2/config.h new file mode 100644 index 000000000000..fb5011a0be41 --- /dev/null +++ b/keyboards/treadstone48/rev2/config.h @@ -0,0 +1,250 @@ +/* +Copyright 2020 marksard + +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 . +*/ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0xDFA3 +#define DEVICE_VER 0x0020 +#define MANUFACTURER marksard +#define PRODUCT treadstone48 +#define DESCRIPTION Symmetrical staggered 48 Keys Keyboard + +/* key matrix size */ +#define MATRIX_ROWS 8 +#define MATRIX_COLS 6 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2, B6 } +#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +/* + * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. + */ +// #define SOFT_SERIAL_PIN D2 // or D1, D2, D3, E6 + +// #define BACKLIGHT_PIN B7 +// #define BACKLIGHT_BREATHING +// #define BACKLIGHT_LEVELS 3 + +#define RGB_DI_PIN D3 +#ifdef RGB_DI_PIN + #define RGBLED_NUM 12 + #define RGBLIGHT_HUE_STEP 8 + #define RGBLIGHT_SAT_STEP 8 + #define RGBLIGHT_VAL_STEP 8 + #define RGBLIGHT_LIMIT_VAL 220 /* The maximum brightness level */ + #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +/*== all animations enable ==*/ +// #define RGBLIGHT_ANIMATIONS +/*== or choose animations ==*/ +// #define RGBLIGHT_EFFECT_BREATHING + #define RGBLIGHT_EFFECT_RAINBOW_MOOD + #define RGBLIGHT_EFFECT_RAINBOW_SWIRL +// #define RGBLIGHT_EFFECT_SNAKE + #define RGBLIGHT_EFFECT_KNIGHT +// #define RGBLIGHT_EFFECT_CHRISTMAS + #define RGBLIGHT_EFFECT_STATIC_GRADIENT +// #define RGBLIGHT_EFFECT_RGB_TEST +// #define RGBLIGHT_EFFECT_ALTERNATING +/*== customize breathing effect ==*/ + /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ + #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 + /*==== use exp() and sin() ====*/ + #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 + #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +#endif + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. + * This is userful for the Windows task manager shortcut (ctrl+shift+esc). + */ +// #define GRAVE_ESC_CTRL_OVERRIDE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Magic Key Options + * + * Magic keys are hotkey commands that allow control over firmware functions of + * the keyboard. They are best used in combination with the HID Listen program, + * found here: https://www.pjrc.com/teensy/hid_listen.html + * + * The options below allow the magic key functionality to be changed. This is + * useful if your keyboard/keypad is missing keys and you want magic key support. + * + */ + +/* key combination for magic key command */ +/* defined by default; to change, uncomment and set to the combination you want */ +// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT) + +/* control how magic key switches layers */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false + +/* override magic key keymap */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM +//#define MAGIC_KEY_HELP H +//#define MAGIC_KEY_HELP_ALT SLASH +//#define MAGIC_KEY_DEBUG D +//#define MAGIC_KEY_DEBUG_MATRIX X +//#define MAGIC_KEY_DEBUG_KBD K +//#define MAGIC_KEY_DEBUG_MOUSE M +//#define MAGIC_KEY_VERSION V +//#define MAGIC_KEY_STATUS S +//#define MAGIC_KEY_CONSOLE C +//#define MAGIC_KEY_LAYER0 0 +//#define MAGIC_KEY_LAYER0_ALT GRAVE +//#define MAGIC_KEY_LAYER1 1 +//#define MAGIC_KEY_LAYER2 2 +//#define MAGIC_KEY_LAYER3 3 +//#define MAGIC_KEY_LAYER4 4 +//#define MAGIC_KEY_LAYER5 5 +//#define MAGIC_KEY_LAYER6 6 +//#define MAGIC_KEY_LAYER7 7 +//#define MAGIC_KEY_LAYER8 8 +//#define MAGIC_KEY_LAYER9 9 +//#define MAGIC_KEY_BOOTLOADER B +//#define MAGIC_KEY_BOOTLOADER_ALT ESC +//#define MAGIC_KEY_LOCK CAPS +//#define MAGIC_KEY_EEPROM E +//#define MAGIC_KEY_EEPROM_CLEAR BSPACE +//#define MAGIC_KEY_NKRO N +//#define MAGIC_KEY_SLEEP_LED Z + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT + +/* disable these deprecated features by default */ +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION +/* + * MIDI options + */ + +/* Prevent use of disabled MIDI features in the keymap */ +//#define MIDI_ENABLE_STRICT 1 + +/* enable basic MIDI features: + - MIDI notes can be sent when in Music mode is on +*/ +//#define MIDI_BASIC + +/* enable advanced MIDI features: + - MIDI notes can be added to the keymap + - Octave shift and transpose + - Virtual sustain, portamento, and modulation wheel + - etc. +*/ +//#define MIDI_ADVANCED + +/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ +//#define MIDI_TONE_KEYCODE_OCTAVES 1 + +/* + * HD44780 LCD Display Configuration + */ +/* +#define LCD_LINES 2 //< number of visible lines of the display +#define LCD_DISP_LENGTH 16 //< visibles characters per line of the display + +#define LCD_IO_MODE 1 //< 0: memory mapped mode, 1: IO port mode + +#if LCD_IO_MODE +#define LCD_PORT PORTB //< port for the LCD lines +#define LCD_DATA0_PORT LCD_PORT //< port for 4bit data bit 0 +#define LCD_DATA1_PORT LCD_PORT //< port for 4bit data bit 1 +#define LCD_DATA2_PORT LCD_PORT //< port for 4bit data bit 2 +#define LCD_DATA3_PORT LCD_PORT //< port for 4bit data bit 3 +#define LCD_DATA0_PIN 4 //< pin for 4bit data bit 0 +#define LCD_DATA1_PIN 5 //< pin for 4bit data bit 1 +#define LCD_DATA2_PIN 6 //< pin for 4bit data bit 2 +#define LCD_DATA3_PIN 7 //< pin for 4bit data bit 3 +#define LCD_RS_PORT LCD_PORT //< port for RS line +#define LCD_RS_PIN 3 //< pin for RS line +#define LCD_RW_PORT LCD_PORT //< port for RW line +#define LCD_RW_PIN 2 //< pin for RW line +#define LCD_E_PORT LCD_PORT //< port for Enable line +#define LCD_E_PIN 1 //< pin for Enable line +#endif +*/ + +/* Bootmagic Lite key configuration */ +// #define BOOTMAGIC_LITE_ROW 0 +// #define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/treadstone48/rev2/info.json b/keyboards/treadstone48/rev2/info.json new file mode 100644 index 000000000000..df9e7591b509 --- /dev/null +++ b/keyboards/treadstone48/rev2/info.json @@ -0,0 +1,261 @@ +{ + "keyboard_name": "Treadstone48", + "url": "https://github.com/marksard/Keyboards", + "maintainer": "marksard", + "width": 14.75, + "height": 4, + "layouts": { + "LAYOUT_base": { + "layout": [ + { + "label": "Esc", + "x": 1, + "y": 0 + }, + { + "label": "Q", + "x": 2.25, + "y": 0 + }, + { + "label": "W", + "x": 3.25, + "y": 0 + }, + { + "label": "E", + "x": 4.25, + "y": 0 + }, + { + "label": "R", + "x": 5.25, + "y": 0 + }, + { + "label": "T", + "x": 6.25, + "y": 0 + }, + { + "label": "Y", + "x": 7.75, + "y": 0 + }, + { + "label": "U", + "x": 8.75, + "y": 0 + }, + { + "label": "I", + "x": 9.75, + "y": 0 + }, + { + "label": "O", + "x": 10.75, + "y": 0 + }, + { + "label": "P", + "x": 11.75, + "y": 0 + }, + { + "label": "-", + "x": 13.75, + "y": 0 + }, + { + "label": "Tab", + "x": 1, + "y": 1, + "w": 1.5 + }, + { + "label": "A", + "x": 2.5, + "y": 1 + }, + { + "label": "S", + "x": 3.5, + "y": 1 + }, + { + "label": "D", + "x": 4.5, + "y": 1 + }, + { + "label": "F", + "x": 5.5, + "y": 1 + }, + { + "label": "G", + "x": 6.5, + "y": 1 + }, + { + "label": "H", + "x": 7.5, + "y": 1 + }, + { + "label": "J", + "x": 8.5, + "y": 1 + }, + { + "label": "K", + "x": 9.5, + "y": 1 + }, + { + "label": "L", + "x": 10.5, + "y": 1 + }, + { + "label": ":", + "x": 11.5, + "y": 1 + }, + { + "label": "Enter", + "x": 12.5, + "y": 1, + "w": 2.25 + }, + { + "label": "Shift", + "x": 0, + "y": 2, + "w": 2.25 + }, + { + "label": "Z", + "x": 2.25, + "y": 2 + }, + { + "label": "X", + "x": 3.25, + "y": 2 + }, + { + "label": "C", + "x": 4.25, + "y": 2 + }, + { + "label": "V", + "x": 5.25, + "y": 2 + }, + { + "label": "B", + "x": 6.25, + "y": 2 + }, + { + "label": "N", + "x": 7.75, + "y": 2 + }, + { + "label": "M", + "x": 8.75, + "y": 2 + }, + { + "label": "<", + "x": 9.75, + "y": 2 + }, + { + "label": ">", + "x": 10.75, + "y": 2 + }, + { + "label": "?", + "x": 11.75, + "y": 2 + }, + { + "label": "\u2191", + "x": 12.75, + "y": 2 + }, + { + "label": "Ctrl", + "x": 0.75, + "y": 3, + "w": 1.25 + }, + { + "label": "Win", + "x": 2, + "y": 3, + "w": 1.25 + }, + { + "label": "Alt", + "x": 3.25, + "y": 3, + "w": 1.25 + }, + { + "label": "Lower", + "x": 4.5, + "y": 3 + }, + { + "label": "BackSpace", + "x": 5.5, + "y": 3, + "w": 2 + }, + { + "x": 7.5, + "y": 3, + "w": 2 + }, + { + "label": "Raise", + "x": 9.5, + "y": 3 + }, + { + "label": "Menu", + "x": 10.5, + "y": 3, + "w": 1.25 + }, + { + "label": "\u2190", + "x": 11.75, + "y": 3 + }, + { + "label": "\u2193", + "x": 12.75, + "y": 3 + }, + { + "label": "\u2192", + "x": 13.75, + "y": 3 + }, + { + "label": "_", + "x": 12.75, + "y": 0 + } + ] + } + } +} diff --git a/keyboards/treadstone48/rev2/rev2.c b/keyboards/treadstone48/rev2/rev2.c new file mode 100644 index 000000000000..f7e7bc770219 --- /dev/null +++ b/keyboards/treadstone48/rev2/rev2.c @@ -0,0 +1,17 @@ +/* Copyright 2020 marksard + * + * 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 . + */ + +#include "rev2.h" diff --git a/keyboards/treadstone48/rev2/rev2.h b/keyboards/treadstone48/rev2/rev2.h new file mode 100644 index 000000000000..651468c4a58d --- /dev/null +++ b/keyboards/treadstone48/rev2/rev2.h @@ -0,0 +1,48 @@ +/* Copyright 2020 marksard + * + * 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 . + */ + +#pragma once + +#include "quantum.h" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ + +#define LAYOUT_base( \ + L00, L01, L02, L03, L04, L05, L40, L41, L42, L43, L44, L45, \ + L10, L11, L12, L13, L14, L15, L50, L51, L52, L53, L54, L55, \ + L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, \ + L30, L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, L75 \ + ) \ + { \ + { L45, L44, L43, L42, L41, L40 }, \ + { L55, L54, L53, L52, L51, L50 }, \ + { L65, L64, L63, L62, L61, L60 }, \ + { L75, L74, L73, L72, L71, L70 }, \ + { L05, L04, L03, L02, L01, L00 }, \ + { L15, L14, L13, L12, L11, L10 }, \ + { L25, L24, L23, L22, L21, L20 }, \ + { L35, L34, L33, L32, L31, L30 } \ + } + +// full Keymap +#define LAYOUT_full LAYOUT_base diff --git a/keyboards/treadstone48/rev2/rules.mk b/keyboards/treadstone48/rev2/rules.mk new file mode 100644 index 000000000000..d29d9074a01a --- /dev/null +++ b/keyboards/treadstone48/rev2/rules.mk @@ -0,0 +1 @@ +SPLIT_KEYBOARD = no From 362942ceceaab6e27aa950e2774355d2f3c9862f Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Fri, 8 May 2020 01:58:36 +0700 Subject: [PATCH 383/429] [Keyboard] Mechlovin hannah60rgb (#8951) * add new keyboard hannah60rgb * delete line * Delete config.h * Update hannah60rgb.c * Update hannah60rgb.c * update * Update hannah60rgb.c * update Co-authored-by: vuhopkep --- keyboards/mechlovin/hannah60rgb/config.h | 58 +++++++++++++ keyboards/mechlovin/hannah60rgb/hannah60rgb.c | 54 +++++++++++++ keyboards/mechlovin/hannah60rgb/hannah60rgb.h | 63 +++++++++++++++ keyboards/mechlovin/hannah60rgb/info.json | 81 +++++++++++++++++++ .../hannah60rgb/keymaps/default/keymap.c | 26 ++++++ .../hannah60rgb/keymaps/default/readme.md | 1 + .../hannah60rgb/keymaps/via/keymap.c | 44 ++++++++++ .../hannah60rgb/keymaps/via/readme.md | 1 + .../hannah60rgb/keymaps/via/rules.mk | 1 + keyboards/mechlovin/hannah60rgb/readme.md | 15 ++++ keyboards/mechlovin/hannah60rgb/rules.mk | 27 +++++++ 11 files changed, 371 insertions(+) create mode 100644 keyboards/mechlovin/hannah60rgb/config.h create mode 100644 keyboards/mechlovin/hannah60rgb/hannah60rgb.c create mode 100644 keyboards/mechlovin/hannah60rgb/hannah60rgb.h create mode 100644 keyboards/mechlovin/hannah60rgb/info.json create mode 100644 keyboards/mechlovin/hannah60rgb/keymaps/default/keymap.c create mode 100644 keyboards/mechlovin/hannah60rgb/keymaps/default/readme.md create mode 100644 keyboards/mechlovin/hannah60rgb/keymaps/via/keymap.c create mode 100644 keyboards/mechlovin/hannah60rgb/keymaps/via/readme.md create mode 100644 keyboards/mechlovin/hannah60rgb/keymaps/via/rules.mk create mode 100644 keyboards/mechlovin/hannah60rgb/readme.md create mode 100644 keyboards/mechlovin/hannah60rgb/rules.mk diff --git a/keyboards/mechlovin/hannah60rgb/config.h b/keyboards/mechlovin/hannah60rgb/config.h new file mode 100644 index 000000000000..5ad16084f1bc --- /dev/null +++ b/keyboards/mechlovin/hannah60rgb/config.h @@ -0,0 +1,58 @@ +/* +Copyright 2020 Mechlovin' + +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 . +*/ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x4D4C // ML-Mechlovin +#define PRODUCT_ID 0x6001 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Team.Mechlovin +#define PRODUCT Hannah60 RGB +#define DESCRIPTION Team.Mechlovin Hannah60 RGB + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 14 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { A4, A5, A3, A2, A1 } +#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14 } + +#define DIODE_DIRECTION COL2ROW + +#define RGB_DI_PIN A15 +#define DRIVER_LED_TOTAL 72 +#define RGB_MATRIX_KEYPRESSES // reacts to keypresses +#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) +#define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects +#define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended +#define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) +#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 +#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set \ No newline at end of file diff --git a/keyboards/mechlovin/hannah60rgb/hannah60rgb.c b/keyboards/mechlovin/hannah60rgb/hannah60rgb.c new file mode 100644 index 000000000000..5acea8c665fe --- /dev/null +++ b/keyboards/mechlovin/hannah60rgb/hannah60rgb.c @@ -0,0 +1,54 @@ +/* Copyright 2020 Mechlovin' + * + * 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 . + */ + +#include "hannah60rgb.h" + +void matrix_init_kb(void) { + // put your keyboard start-up code here + // runs once when the firmware starts up + matrix_init_user(); + led_init_ports(); +}; + +#ifdef RGB_MATRIX_ENABLE +led_config_t g_led_config = { { + //Key Matrix to LED Index + {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, + {29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 15}, + {30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 16, 43}, + {59, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 44}, + {60, 61, 62, NO_LED, 63, NO_LED, 64, NO_LED, 67, NO_LED, 68, 69, 70, 71} +}, { + //LED Index to Physical Positon + { 0, 0}, { 16, 0}, { 32, 0 }, { 48, 0 }, { 64, 0}, { 80, 0}, { 96, 0}, { 112, 0}, { 128, 0}, { 144, 0}, { 160, 0}, { 176, 0}, {192, 0}, {208, 0}, {216, 0}, + {220, 0}, {211, 16}, {200,16 }, {176,16 }, {160,16}, {144,16}, {128,16}, { 112,16}, { 96,16}, { 80,16}, { 64,16}, { 48,16}, {32, 16}, {16, 16}, {0,16}, + { 0, 32}, { 16, 32}, { 32,32 }, { 48,32 }, { 64,32}, { 80,32}, { 96,32}, { 112,32}, { 128,32}, { 144,32}, { 160,32}, { 176,32}, {192, 32}, {208, 32}, {224,48}, + {208, 48}, {192, 48}, {160,48 }, {144,48 }, {128,48}, {112,48}, {96,48}, { 80,48}, { 64,48}, { 48,48}, { 32,48}, { 16,48}, {8, 48}, {0, 48}, {0,48}, + { 0, 64}, { 16, 64}, { 32,64 }, { 48,64 }, { 64,64}, { 80,64}, { 96,64}, { 112,64}, { 144,64}, { 160,64}, { 192,64}, { 224,64}, +}, { + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +} }; + +void rgb_matrix_indicators_user(void) { + if (host_keyboard_led_state().caps_lock) { + rgb_matrix_set_color(30, 255, 255, 255); + } +} +#endif \ No newline at end of file diff --git a/keyboards/mechlovin/hannah60rgb/hannah60rgb.h b/keyboards/mechlovin/hannah60rgb/hannah60rgb.h new file mode 100644 index 000000000000..8fd1c67979a0 --- /dev/null +++ b/keyboards/mechlovin/hannah60rgb/hannah60rgb.h @@ -0,0 +1,63 @@ +/* +Copyright 2020 Mechlovin' + +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 . +*/ +#pragma once + +#include "quantum.h" + +#define LAYOUT_all( \ +K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, \ +K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, \ +K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ +K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ +K40, K41, K42, K44, K46, K48, K4A, K4B, K4C, K4D \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ + { K40, K41, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, K4B, K4C, K4D }, \ +} +#define LAYOUT_60_ansi( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ + K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ + K40, K41, K42, K46, K4A, K4B, K4C, K4D \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ + { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO }, \ + { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D }, \ +} +#define LAYOUT_60_iso( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ + K40, K41, K42, K46, K4A, K4B, K4C, K4D \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO }, \ + { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D }, \ +} + + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/mechlovin/hannah60rgb/info.json b/keyboards/mechlovin/hannah60rgb/info.json new file mode 100644 index 000000000000..97d7b8492284 --- /dev/null +++ b/keyboards/mechlovin/hannah60rgb/info.json @@ -0,0 +1,81 @@ +{ + "keyboard_name": "hannah60rgb", + "url": "", + "maintainer": "qmk", + "width": 15, + "height": 5, + "layouts": { + "LAYOUT_all": { + "key_count": 66, + "layout": [ + {"label":"K00 (B0,B5)", "x":2.75, "y":0}, + {"label":"K01 (B0,B6)", "x":3.75, "y":0}, + {"label":"K02 (B0,B7)", "x":4.75, "y":0}, + {"label":"K03 (B0,C0)", "x":5.75, "y":0}, + {"label":"K04 (B0,C1)", "x":6.75, "y":0}, + {"label":"K05 (B0,C2)", "x":7.75, "y":0}, + {"label":"K06 (B0,C3)", "x":8.75, "y":0}, + {"label":"K07 (B0,C4)", "x":9.75, "y":0}, + {"label":"K08 (B0,C5)", "x":10.75, "y":0}, + {"label":"K09 (B0,C6)", "x":11.75, "y":0}, + {"label":"K0A (B0,C7)", "x":12.75, "y":0}, + {"label":"K0B (B0,D0)", "x":13.75, "y":0}, + {"label":"K0C (B0,D1)", "x":14.75, "y":0}, + {"label":"K0D (B0,F5)", "x":15.75, "y":0}, + {"label":"K1D (B1,F5)", "x":16.75, "y":0}, + {"label":"K10 (B1,B5)", "x":2.75, "y":1, "w":1.5}, + {"label":"K11 (B1,B6)", "x":4.25, "y":1}, + {"label":"K12 (B1,B7)", "x":5.25, "y":1}, + {"label":"K13 (B1,C0)", "x":6.25, "y":1}, + {"label":"K14 (B1,C1)", "x":7.25, "y":1}, + {"label":"K15 (B1,C2)", "x":8.25, "y":1}, + {"label":"K16 (B1,C3)", "x":9.25, "y":1}, + {"label":"K17 (B1,C4)", "x":10.25, "y":1}, + {"label":"K18 (B1,C5)", "x":11.25, "y":1}, + {"label":"K19 (B1,C6)", "x":12.25, "y":1}, + {"label":"K1A (B1,C7)", "x":13.25, "y":1}, + {"label":"K1B (B1,D0)", "x":14.25, "y":1}, + {"label":"K1C (B1,D1)", "x":15.25, "y":1}, + {"label":"K2C (B2,D1)", "x":16.25, "y":1, "w":1.5}, + {"label":"K20 (B2,B5)", "x":2.75, "y":2, "w":1.75}, + {"label":"K21 (B2,B6)", "x":4.5, "y":2}, + {"label":"K22 (B2,B7)", "x":5.5, "y":2}, + {"label":"K23 (B2,C0)", "x":6.5, "y":2}, + {"label":"K24 (B2,C1)", "x":7.5, "y":2}, + {"label":"K25 (B2,C2)", "x":8.5, "y":2}, + {"label":"K26 (B2,C3)", "x":9.5, "y":2}, + {"label":"K27 (B2,C4)", "x":10.5, "y":2}, + {"label":"K28 (B2,C5)", "x":11.5, "y":2}, + {"label":"K29 (B2,C6)", "x":12.5, "y":2}, + {"label":"K2A (B2,C7)", "x":13.5, "y":2}, + {"label":"K2B (B2,D0)", "x":14.5, "y":2}, + {"label":"K2D (B2,F5)", "x":15.5, "y":2, "w":2.25}, + {"label":"K30 (B3,B5)", "x":2.75, "y":3, "w":1.25}, + {"label":"K31 (B3,B6)", "x":4, "y":3}, + {"label":"K32 (B3,B7)", "x":5, "y":3}, + {"label":"K33 (B3,C0)", "x":6, "y":3}, + {"label":"K34 (B3,C1)", "x":7, "y":3}, + {"label":"K35 (B3,C2)", "x":8, "y":3}, + {"label":"K36 (B3,C3)", "x":9, "y":3}, + {"label":"K37 (B3,C4)", "x":10, "y":3}, + {"label":"K38 (B3,C5)", "x":11, "y":3}, + {"label":"K39 (B3,C6)", "x":12, "y":3}, + {"label":"K3A (B3,C7)", "x":13, "y":3}, + {"label":"K3B (B3,D0)", "x":14, "y":3}, + {"label":"K3C (B3,D1)", "x":15, "y":3, "w":1.75}, + {"label":"K3D (B3,F5)", "x":16.75, "y":3}, + {"label":"K40 (B4,B5)", "x":2.75, "y":4, "w":1.25}, + {"label":"K41 (B4,B6)", "x":4, "y":4, "w":1.25}, + {"label":"K42 (B4,B7)", "x":5.25, "y":4, "w":1.25}, + {"label":"K44 (B4,C1)", "x":6.5, "y":4, "w":2.75}, + {"label":"K46 (B4,C3)", "x":9.25, "y":4, "w":1.25}, + {"label":"K48 (B4,C5)", "x":10.5, "y":4, "w":2.25}, + {"label":"K4A (B4,C7)", "x":12.75, "y":4, "w":1.25}, + {"label":"K4B (B4,D0)", "x":14, "y":4, "w":1.25}, + {"label":"K4C (B4,D1)", "x":15.25, "y":4, "w":1.25}, + {"label":"K4D (B4,F5)", "x":16.5, "y":4, "w":1.25} + ] + } + } + ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/" +} diff --git a/keyboards/mechlovin/hannah60rgb/keymaps/default/keymap.c b/keyboards/mechlovin/hannah60rgb/keymaps/default/keymap.c new file mode 100644 index 000000000000..5edcdd099727 --- /dev/null +++ b/keyboards/mechlovin/hannah60rgb/keymaps/default/keymap.c @@ -0,0 +1,26 @@ +/* Copyright 2020 Mechlovin' + * + * 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 . + */ +#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_DEL, + 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_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), + +}; diff --git a/keyboards/mechlovin/hannah60rgb/keymaps/default/readme.md b/keyboards/mechlovin/hannah60rgb/keymaps/default/readme.md new file mode 100644 index 000000000000..9a101f5ace3d --- /dev/null +++ b/keyboards/mechlovin/hannah60rgb/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for hannah60rgb diff --git a/keyboards/mechlovin/hannah60rgb/keymaps/via/keymap.c b/keyboards/mechlovin/hannah60rgb/keymaps/via/keymap.c new file mode 100644 index 000000000000..0e22b84f06c5 --- /dev/null +++ b/keyboards/mechlovin/hannah60rgb/keymaps/via/keymap.c @@ -0,0 +1,44 @@ +/* Copyright 2020 Mechlovin' + * + * 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 . + */ +#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_DEL, + 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, + LT(2,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_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), + [1] = 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, 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, 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, KC_TRNS ), + +}; diff --git a/keyboards/mechlovin/hannah60rgb/keymaps/via/readme.md b/keyboards/mechlovin/hannah60rgb/keymaps/via/readme.md new file mode 100644 index 000000000000..794a57963c13 --- /dev/null +++ b/keyboards/mechlovin/hannah60rgb/keymaps/via/readme.md @@ -0,0 +1 @@ +# The VIA keymap for hannah60rgb diff --git a/keyboards/mechlovin/hannah60rgb/keymaps/via/rules.mk b/keyboards/mechlovin/hannah60rgb/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/mechlovin/hannah60rgb/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/mechlovin/hannah60rgb/readme.md b/keyboards/mechlovin/hannah60rgb/readme.md new file mode 100644 index 000000000000..777be816a0d4 --- /dev/null +++ b/keyboards/mechlovin/hannah60rgb/readme.md @@ -0,0 +1,15 @@ +# hannah60rgb + +![hannah60rgb](https://i.imgur.com/ImXgsyXl.png) + +A 60% PCB with per-key RGB, compatible with Poker and Unikorn cases. + +* Keyboard Maintainer: [Mechlovin'](https://github.com/mechlovin) +* Hardware Supported: hannah60rgb PCB, STM32F303 + + +Make example for this keyboard (after setting up your build environment): + + make mechlovin/hannah60rgb:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/mechlovin/hannah60rgb/rules.mk b/keyboards/mechlovin/hannah60rgb/rules.mk new file mode 100644 index 000000000000..1a5441fc7055 --- /dev/null +++ b/keyboards/mechlovin/hannah60rgb/rules.mk @@ -0,0 +1,27 @@ +# MCU name +MCU = STM32F303 + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs +RGB_MATRIX_ENABLE = WS2812 + +# generated by KBFirmware JSON to QMK Parser +# https://noroadsleft.github.io/kbf_qmk_converter/ From 89233b801b2a6d8bfac6a83ad69dffb6cede5be9 Mon Sep 17 00:00:00 2001 From: eniigmakeyboards Date: Thu, 7 May 2020 15:14:16 -0400 Subject: [PATCH 384/429] [Keyboard] Eniigma Keyboards ek87 (#8937) * Added ek87 support * Fixed readme * Update keyboards/eniigmakeyboards/ek87/rules.mk * Update keyboards/eniigmakeyboards/ek87/config.h * Update keyboards/eniigmakeyboards/ek87/ek87.c * fixed title * Deleted old files * Added rules.mk file to VIA keymap folder * Update keyboards/eniigmakeyboards/ek87/keymaps/default/keymap.c * Update keyboards/eniigmakeyboards/ek87/keymaps/via/keymap.c * Update keyboards/eniigmakeyboards/ek87/rules.mk * Deleted requested file * Removed VIA line from rules * Update keyboards/eniigmakeyboards/ek87/readme.md * Update keyboards/eniigmakeyboards/ek87/ek87.h * Update keyboards/eniigmakeyboards/ek87/ek87.h * Update keyboards/eniigmakeyboards/ek87/info.json * Update keyboards/eniigmakeyboards/ek87/keymaps/default/keymap.c * Update keyboards/eniigmakeyboards/ek87/keymaps/via/keymap.c * Renamed layouts and removed obsolete ones * Update keyboards/eniigmakeyboards/ek87/rules.mk * Update keyboards/eniigmakeyboards/ek87/rules.mk * Update keyboards/eniigmakeyboards/ek87/ek87.h * Update keyboards/eniigmakeyboards/ek87/ek87.h * Update keyboards/eniigmakeyboards/ek87/info.json * Update keyboards/eniigmakeyboards/ek87/info.json * Update keyboards/eniigmakeyboards/ek87/info.json * Update keyboards/eniigmakeyboards/ek87/info.json * Update keyboards/eniigmakeyboards/ek87/info.json * Update keyboards/eniigmakeyboards/ek87/info.json * Update keyboards/eniigmakeyboards/ek87/info.json --- keyboards/eniigmakeyboards/ek87/config.h | 250 ++++++++++++++++++ keyboards/eniigmakeyboards/ek87/ek87.c | 17 ++ keyboards/eniigmakeyboards/ek87/ek87.h | 150 +++++++++++ keyboards/eniigmakeyboards/ek87/info.json | 72 +++++ .../ek87/keymaps/default/keymap.c | 12 + .../ek87/keymaps/via/keymap.c | 36 +++ .../ek87/keymaps/via/rules.mk | 1 + keyboards/eniigmakeyboards/ek87/readme.md | 17 ++ keyboards/eniigmakeyboards/ek87/rules.mk | 32 +++ 9 files changed, 587 insertions(+) create mode 100644 keyboards/eniigmakeyboards/ek87/config.h create mode 100644 keyboards/eniigmakeyboards/ek87/ek87.c create mode 100644 keyboards/eniigmakeyboards/ek87/ek87.h create mode 100644 keyboards/eniigmakeyboards/ek87/info.json create mode 100644 keyboards/eniigmakeyboards/ek87/keymaps/default/keymap.c create mode 100644 keyboards/eniigmakeyboards/ek87/keymaps/via/keymap.c create mode 100644 keyboards/eniigmakeyboards/ek87/keymaps/via/rules.mk create mode 100644 keyboards/eniigmakeyboards/ek87/readme.md create mode 100644 keyboards/eniigmakeyboards/ek87/rules.mk diff --git a/keyboards/eniigmakeyboards/ek87/config.h b/keyboards/eniigmakeyboards/ek87/config.h new file mode 100644 index 000000000000..2f20a1594822 --- /dev/null +++ b/keyboards/eniigmakeyboards/ek87/config.h @@ -0,0 +1,250 @@ +/* +Copyright 2020 adamws + +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 . +*/ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x454B +#define PRODUCT_ID 0x0001 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Eniigma Keyboards +#define PRODUCT Eniigma Keyboards ek87 +#define DESCRIPTION Eniigma Keyboards ek87 + +/* key matrix size */ +#define MATRIX_ROWS 6 +#define MATRIX_COLS 18 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0 } +#define MATRIX_COL_PINS { F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, F0, F1, E6, D3, D2, D1 } +#define UNUSED_PINS { D5 } + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +/* + * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. + */ +#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 + +// #define BACKLIGHT_PIN B7 +// #define BACKLIGHT_BREATHING +// #define BACKLIGHT_LEVELS 3 + +// #define RGB_DI_PIN E2 +// #ifdef RGB_DI_PIN +// #define RGBLED_NUM 16 +// #define RGBLIGHT_HUE_STEP 8 +// #define RGBLIGHT_SAT_STEP 8 +// #define RGBLIGHT_VAL_STEP 8 +// #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ +// #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +// /*== all animations enable ==*/ +// #define RGBLIGHT_ANIMATIONS +// /*== or choose animations ==*/ +// #define RGBLIGHT_EFFECT_BREATHING +// #define RGBLIGHT_EFFECT_RAINBOW_MOOD +// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL +// #define RGBLIGHT_EFFECT_SNAKE +// #define RGBLIGHT_EFFECT_KNIGHT +// #define RGBLIGHT_EFFECT_CHRISTMAS +// #define RGBLIGHT_EFFECT_STATIC_GRADIENT +// #define RGBLIGHT_EFFECT_RGB_TEST +// #define RGBLIGHT_EFFECT_ALTERNATING +// /*== customize breathing effect ==*/ +// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ +// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 +// /*==== use exp() and sin() ====*/ +// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 +// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +// #endif + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. + * This is userful for the Windows task manager shortcut (ctrl+shift+esc). + */ +// #define GRAVE_ESC_CTRL_OVERRIDE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Magic Key Options + * + * Magic keys are hotkey commands that allow control over firmware functions of + * the keyboard. They are best used in combination with the HID Listen program, + * found here: https://www.pjrc.com/teensy/hid_listen.html + * + * The options below allow the magic key functionality to be changed. This is + * useful if your keyboard/keypad is missing keys and you want magic key support. + * + */ + +/* key combination for magic key command */ +/* defined by default; to change, uncomment and set to the combination you want */ +// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT) + +/* control how magic key switches layers */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false + +/* override magic key keymap */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM +//#define MAGIC_KEY_HELP H +//#define MAGIC_KEY_HELP_ALT SLASH +//#define MAGIC_KEY_DEBUG D +//#define MAGIC_KEY_DEBUG_MATRIX X +//#define MAGIC_KEY_DEBUG_KBD K +//#define MAGIC_KEY_DEBUG_MOUSE M +//#define MAGIC_KEY_VERSION V +//#define MAGIC_KEY_STATUS S +//#define MAGIC_KEY_CONSOLE C +//#define MAGIC_KEY_LAYER0 0 +//#define MAGIC_KEY_LAYER0_ALT GRAVE +//#define MAGIC_KEY_LAYER1 1 +//#define MAGIC_KEY_LAYER2 2 +//#define MAGIC_KEY_LAYER3 3 +//#define MAGIC_KEY_LAYER4 4 +//#define MAGIC_KEY_LAYER5 5 +//#define MAGIC_KEY_LAYER6 6 +//#define MAGIC_KEY_LAYER7 7 +//#define MAGIC_KEY_LAYER8 8 +//#define MAGIC_KEY_LAYER9 9 +//#define MAGIC_KEY_BOOTLOADER B +//#define MAGIC_KEY_BOOTLOADER_ALT ESC +//#define MAGIC_KEY_LOCK CAPS +//#define MAGIC_KEY_EEPROM E +//#define MAGIC_KEY_EEPROM_CLEAR BSPACE +//#define MAGIC_KEY_NKRO N +//#define MAGIC_KEY_SLEEP_LED Z + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT + +/* disable these deprecated features by default */ +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION +/* + * MIDI options + */ + +/* Prevent use of disabled MIDI features in the keymap */ +//#define MIDI_ENABLE_STRICT 1 + +/* enable basic MIDI features: + - MIDI notes can be sent when in Music mode is on +*/ +//#define MIDI_BASIC + +/* enable advanced MIDI features: + - MIDI notes can be added to the keymap + - Octave shift and transpose + - Virtual sustain, portamento, and modulation wheel + - etc. +*/ +//#define MIDI_ADVANCED + +/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ +//#define MIDI_TONE_KEYCODE_OCTAVES 1 + +/* + * HD44780 LCD Display Configuration + */ +/* +#define LCD_LINES 2 //< number of visible lines of the display +#define LCD_DISP_LENGTH 16 //< visibles characters per line of the display + +#define LCD_IO_MODE 1 //< 0: memory mapped mode, 1: IO port mode + +#if LCD_IO_MODE +#define LCD_PORT PORTB //< port for the LCD lines +#define LCD_DATA0_PORT LCD_PORT //< port for 4bit data bit 0 +#define LCD_DATA1_PORT LCD_PORT //< port for 4bit data bit 1 +#define LCD_DATA2_PORT LCD_PORT //< port for 4bit data bit 2 +#define LCD_DATA3_PORT LCD_PORT //< port for 4bit data bit 3 +#define LCD_DATA0_PIN 4 //< pin for 4bit data bit 0 +#define LCD_DATA1_PIN 5 //< pin for 4bit data bit 1 +#define LCD_DATA2_PIN 6 //< pin for 4bit data bit 2 +#define LCD_DATA3_PIN 7 //< pin for 4bit data bit 3 +#define LCD_RS_PORT LCD_PORT //< port for RS line +#define LCD_RS_PIN 3 //< pin for RS line +#define LCD_RW_PORT LCD_PORT //< port for RW line +#define LCD_RW_PIN 2 //< pin for RW line +#define LCD_E_PORT LCD_PORT //< port for Enable line +#define LCD_E_PIN 1 //< pin for Enable line +#endif +*/ + +/* Bootmagic Lite key configuration */ +// #define BOOTMAGIC_LITE_ROW 0 +// #define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/eniigmakeyboards/ek87/ek87.c b/keyboards/eniigmakeyboards/ek87/ek87.c new file mode 100644 index 000000000000..0101d679d985 --- /dev/null +++ b/keyboards/eniigmakeyboards/ek87/ek87.c @@ -0,0 +1,17 @@ +/* Copyright 2020 adamws + * + * 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 . + */ + +#include "ek87.h" diff --git a/keyboards/eniigmakeyboards/ek87/ek87.h b/keyboards/eniigmakeyboards/ek87/ek87.h new file mode 100644 index 000000000000..121365d596c2 --- /dev/null +++ b/keyboards/eniigmakeyboards/ek87/ek87.h @@ -0,0 +1,150 @@ +/* Copyright 2020 adamws + * + * 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 . + */ + +#pragma once + +#include "quantum.h" + +#define XXX KC_NO + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define LAYOUT_all( \ + k00, k02, k03, k04, k05, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4e, k4g, \ + k50, k51, k53, k56, k5a, k5b, k5d, k5e, k5f, k5g, k5h \ +) \ +{ \ + { k00, XXX, k02, k03, k04, k05, XXX, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h }, \ + { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h }, \ + { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX, XXX }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, k4e, XXX, k4g, XXX }, \ + { k50, k51, XXX, k53, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, XXX, k5d, k5e, k5f, k5g, k5h } \ +} + +#define LAYOUT_tkl_ansi( \ + k00, k02, k03, k04, k05, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1f, k1g, k1h, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ + k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4g, \ + k50, k51, k53, k56, k5a, k5b, k5d, k5e, k5f, k5g, k5h \ +) \ +{ \ + { k00, XXX, k02, k03, k04, k05, XXX, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX, k1f, k1g, k1h }, \ + { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h }, \ + { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX, XXX }, \ + { XXX, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, XXX, XXX, k4g, XXX }, \ + { k50, k51, XXX, k53, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, XXX, k5d, k5e, k5f, k5g, k5h } \ +} + +#define LAYOUT_tkl_ansi_tsangan( \ + k00, k02, k03, k04, k05, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1f, k1g, k1h, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ + k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4g, \ + k50, k51, k53, k56, k5b, k5d, k5e, k5f, k5g, k5h \ +) \ +{ \ + { k00, XXX, k02, k03, k04, k05, XXX, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX, k1f, k1g, k1h }, \ + { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h }, \ + { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX, XXX }, \ + { XXX, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, XXX, XXX, k4g, XXX }, \ + { k50, k51, XXX, k53, XXX, XXX, k56, XXX, XXX, XXX, XXX, k5b, XXX, k5d, k5e, k5f, k5g, k5h } \ +} + +#define LAYOUT_tkl_iso( \ + k00, k02, k03, k04, k05, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1f, k1g, k1h, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4g, \ + k50, k51, k53, k56, k5a, k5b, k5d, k5e, k5f, k5g, k5h \ +) \ +{ \ + { k00, XXX, k02, k03, k04, k05, XXX, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX, k1f, k1g, k1h }, \ + { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h }, \ + { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX, XXX }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, XXX, XXX, k4g, XXX }, \ + { k50, k51, XXX, k53, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, XXX, k5d, k5e, k5f, k5g, k5h } \ +} + +#define LAYOUT_tkl_iso_tsangan( \ + k00, k02, k03, k04, k05, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1f, k1g, k1h, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4g, \ + k50, k51, k53, k56, k5b, k5d, k5e, k5f, k5g, k5h \ +) \ +{ \ + { k00, XXX, k02, k03, k04, k05, XXX, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX, k1f, k1g, k1h }, \ + { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h }, \ + { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX, XXX }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, XXX, XXX, k4g, XXX }, \ + { k50, k51, XXX, k53, XXX, XXX, k56, XXX, XXX, XXX, XX, k5b, XXX, k5d, k5e, k5f, k5g, k5h } \ +} + +#define LAYOUT_tkl_iso_split_bs( \ + k00, k02, k03, k04, k05, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4g, \ + k50, k51, k53, k56, k5a, k5b, k5d, k5e, k5f, k5g, k5h \ +) \ +{ \ + { k00, XXX, k02, k03, k04, k05, XXX, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h }, \ + { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h }, \ + { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX, XXX }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, XXX, XXX, k4g, XXX }, \ + { k50, k51, XXX, k53, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, XXX, k5d, k5e, k5f, k5g, k5h } \ +} + +#define LAYOUT_tkl_iso_split_rshift( \ + k00, k02, k03, k04, k05, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1f, k1g, k1h, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, \ + k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4e, k4g, \ + k50, k51, k53, k56, k5a, k5b, k5d, k5e, k5f, k5g, k5h \ +) \ +{ \ + { k00, XXX, k02, k03, k04, k05, XXX, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX, k1f, k1g, k1h }, \ + { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h }, \ + { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX, XXX }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, k4e, XXX, k4g, XXX }, \ + { k50, k51, XXX, k53, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, XXX, k5d, k5e, k5f, k5g, k5h } \ +} + + diff --git a/keyboards/eniigmakeyboards/ek87/info.json b/keyboards/eniigmakeyboards/ek87/info.json new file mode 100644 index 000000000000..d8e622ca90da --- /dev/null +++ b/keyboards/eniigmakeyboards/ek87/info.json @@ -0,0 +1,72 @@ +{ + "keyboard_name": "ek87", + "url": "", + "maintainer": "adamws", + "width": 18.25, + "height": 6.25, + "layouts": { + "LAYOUT_all": { + "layout":[ + {"label":"k00","x":0,"y":0},{"label":"k02","x":2,"y":0},{"label":"k03","x":3,"y":0},{"label":"k04","x":4,"y":0},{"label":"k05","x":5,"y":0},{"label":"k07","x":6.5,"y":0},{"label":"k08","x":7.5,"y":0},{"label":"k09","x":8.5,"y":0},{"label":"k0a","x":9.5,"y":0},{"label":"k0b","x":11,"y":0},{"label":"k0c","x":12,"y":0},{"label":"k0d","x":13,"y":0},{"label":"k0e","x":14,"y":0},{"label":"k0f","x":15.25,"y":0},{"label":"k0g","x":16.25,"y":0},{"label":"k0h","x":17.25,"y":0}, + {"label":"k10","x":0,"y":1.25},{"label":"k11","x":1,"y":1.25},{"label":"k12","x":2,"y":1.25},{"label":"k13","x":3,"y":1.25},{"label":"k14","x":4,"y":1.25},{"label":"k15","x":5,"y":1.25},{"label":"k16","x":6,"y":1.25},{"label":"k17","x":7,"y":1.25},{"label":"k18","x":8,"y":1.25},{"label":"k19","x":9,"y":1.25},{"label":"k1a","x":10,"y":1.25},{"label":"k1b","x":11,"y":1.25},{"label":"k1c","x":12,"y":1.25},{"label":"k1d","x":13,"y":1.25},{"label":"k1e","x":14,"y":1.25},{"label":"k1f","x":15.25,"y":1.25},{"label":"k1g","x":16.25,"y":1.25},{"label":"k1h","x":17.25,"y":1.25}, + {"label":"k20","x":0,"y":2.25,"w":1.5},{"label":"k22","x":1.5,"y":2.25},{"label":"k23","x":2.5,"y":2.25},{"label":"k24","x":3.5,"y":2.25},{"label":"k25","x":4.5,"y":2.25},{"label":"k26","x":5.5,"y":2.25},{"label":"k27","x":6.5,"y":2.25},{"label":"k28","x":7.5,"y":2.25},{"label":"k29","x":8.5,"y":2.25},{"label":"k2a","x":9.5,"y":2.25},{"label":"k2b","x":10.5,"y":2.25},{"label":"k2c","x":11.5,"y":2.25},{"label":"k2d","x":12.5,"y":2.25},{"label":"k2e","x":13.5,"y":2.25,"w":1.5},{"label":"k2f","x":15.25,"y":2.25},{"label":"k2g","x":16.25,"y":2.25},{"label":"k2h","x":17.25,"y":2.25}, + {"label":"k30","x":0,"y":3.25,"w":1.75},{"label":"k32","x":1.75,"y":3.25},{"label":"k33","x":2.75,"y":3.25},{"label":"k34","x":3.75,"y":3.25},{"label":"k35","x":4.75,"y":3.25},{"label":"k36","x":5.75,"y":3.25},{"label":"k37","x":6.75,"y":3.25},{"label":"k38","x":7.75,"y":3.25},{"label":"k39","x":8.75,"y":3.25},{"label":"k3a","x":9.75,"y":3.25},{"label":"k3b","x":10.75,"y":3.25},{"label":"k3c","x":11.75,"y":3.25},{"label":"k3d","x":12.75,"y":3.25,"w":2.25}, + {"label":"k40","x":0,"y":4.25,"w":1.25},{"label":"k41","x":1.25,"y":4.25},{"label":"k42","x":2.25,"y":4.25},{"label":"k43","x":3.25,"y":4.25},{"label":"k44","x":4.25,"y":4.25},{"label":"k45","x":5.25,"y":4.25},{"label":"k46","x":6.25,"y":4.25},{"label":"k47","x":7.25,"y":4.25},{"label":"k48","x":8.25,"y":4.25},{"label":"k49","x":9.25,"y":4.25},{"label":"k4a","x":10.25,"y":4.25},{"label":"k4b","x":11.25,"y":4.25},{"label":"k4d","x":12.25,"y":4.25,"w":1.75},{"label":"k4e","x":14,"y":4.25},{"label":"k4g","x":16.25,"y":4.25}, + {"label":"k50","x":0,"y":5.25,"w":1.25},{"label":"k51","x":1.25,"y":5.25,"w":1.25},{"label":"k53","x":2.5,"y":5.25,"w":1.25},{"label":"k56","x":3.75,"y":5.25,"w":6.25},{"label":"k5a","x":10,"y":5.25,"w":1.25},{"label":"k5b","x":11.25,"y":5.25,"w":1.25},{"label":"k5d","x":12.5,"y":5.25,"w":1.25},{"label":"k5e","x":13.75,"y":5.25,"w":1.25},{"label":"5f","x":15.25,"y":5.25},{"label":"k5g","x":16.25,"y":5.25},{"label":"k5h","x":17.25,"y":5.25}] + }, + "LAYOUT_tkl_ansi": { + "layout":[ + {"label":"k00","x":0,"y":0},{"label":"k02","x":2,"y":0},{"label":"k03","x":3,"y":0},{"label":"k04","x":4,"y":0},{"label":"k05","x":5,"y":0},{"label":"k07","x":6.5,"y":0},{"label":"k08","x":7.5,"y":0},{"label":"k09","x":8.5,"y":0},{"label":"k0a","x":9.5,"y":0},{"label":"k0b","x":11,"y":0},{"label":"k0c","x":12,"y":0},{"label":"k0d","x":13,"y":0},{"label":"k0e","x":14,"y":0},{"label":"k0f","x":15.25,"y":0},{"label":"k0g","x":16.25,"y":0},{"label":"k0h","x":17.25,"y":0}, + {"label":"k10","x":0,"y":1.25},{"label":"k11","x":1,"y":1.25},{"label":"k12","x":2,"y":1.25},{"label":"k13","x":3,"y":1.25},{"label":"k14","x":4,"y":1.25},{"label":"k15","x":5,"y":1.25},{"label":"k16","x":6,"y":1.25},{"label":"k17","x":7,"y":1.25},{"label":"k18","x":8,"y":1.25},{"label":"k19","x":9,"y":1.25},{"label":"k1a","x":10,"y":1.25},{"label":"k1b","x":11,"y":1.25},{"label":"k1c","x":12,"y":1.25},{"label":"k1d","x":13,"y":1.25,"w":2},{"label":"k1f","x":15.25,"y":1.25},{"label":"k1g","x":16.25,"y":1.25},{"label":"k1h","x":17.25,"y":1.25}, + {"label":"k20","x":0,"y":2.25,"w":1.5},{"label":"k22","x":1.5,"y":2.25},{"label":"k23","x":2.5,"y":2.25},{"label":"k24","x":3.5,"y":2.25},{"label":"k25","x":4.5,"y":2.25},{"label":"k26","x":5.5,"y":2.25},{"label":"k27","x":6.5,"y":2.25},{"label":"k28","x":7.5,"y":2.25},{"label":"k29","x":8.5,"y":2.25},{"label":"k2a","x":9.5,"y":2.25},{"label":"k2b","x":10.5,"y":2.25},{"label":"k2c","x":11.5,"y":2.25},{"label":"k2d","x":12.5,"y":2.25},{"label":"k2e","x":13.5,"y":2.25,"w":1.5},{"label":"k2f","x":15.25,"y":2.25},{"label":"k2g","x":16.25,"y":2.25},{"label":"k2h","x":17.25,"y":2.25}, + {"label":"k30","x":0,"y":3.25,"w":1.75},{"label":"k32","x":1.75,"y":3.25},{"label":"k33","x":2.75,"y":3.25},{"label":"k34","x":3.75,"y":3.25},{"label":"k35","x":4.75,"y":3.25},{"label":"k36","x":5.75,"y":3.25},{"label":"k37","x":6.75,"y":3.25},{"label":"k38","x":7.75,"y":3.25},{"label":"k39","x":8.75,"y":3.25},{"label":"k3a","x":9.75,"y":3.25},{"label":"k3b","x":10.75,"y":3.25},{"label":"k3c","x":11.75,"y":3.25},{"label":"k3d","x":12.75,"y":3.25,"w":2.25}, + {"label":"k41","x":0,"y":4.25,"w":2.25},{"label":"k42","x":2.25,"y":4.25},{"label":"k43","x":3.25,"y":4.25},{"label":"k44","x":4.25,"y":4.25},{"label":"k45","x":5.25,"y":4.25},{"label":"k46","x":6.25,"y":4.25},{"label":"k47","x":7.25,"y":4.25},{"label":"k48","x":8.25,"y":4.25},{"label":"k49","x":9.25,"y":4.25},{"label":"k4a","x":10.25,"y":4.25},{"label":"k4b","x":11.25,"y":4.25},{"label":"k4d","x":12.25,"y":4.25,"w":2.75},{"label":"k4g","x":16.25,"y":4.25}, + {"label":"k50","x":0,"y":5.25,"w":1.25},{"label":"k51","x":1.25,"y":5.25,"w":1.25},{"label":"k53","x":2.5,"y":5.25,"w":1.25},{"label":"k56","x":3.75,"y":5.25,"w":6.25},{"label":"k5a","x":10,"y":5.25,"w":1.25},{"label":"k5b","x":11.25,"y":5.25,"w":1.25},{"label":"k5d","x":12.5,"y":5.25,"w":1.25},{"label":"k5e","x":13.75,"y":5.25,"w":1.25},{"label":"5f","x":15.25,"y":5.25},{"label":"k5g","x":16.25,"y":5.25},{"label":"k5h","x":17.25,"y":5.25}] + }, + "LAYOUT_tkl_ansi_tsangan": { + "layout":[ + {"label":"k00","x":0,"y":0},{"label":"k02","x":2,"y":0},{"label":"k03","x":3,"y":0},{"label":"k04","x":4,"y":0},{"label":"k05","x":5,"y":0},{"label":"k07","x":6.5,"y":0},{"label":"k08","x":7.5,"y":0},{"label":"k09","x":8.5,"y":0},{"label":"k0a","x":9.5,"y":0},{"label":"k0b","x":11,"y":0},{"label":"k0c","x":12,"y":0},{"label":"k0d","x":13,"y":0},{"label":"k0e","x":14,"y":0},{"label":"k0f","x":15.25,"y":0},{"label":"k0g","x":16.25,"y":0},{"label":"k0h","x":17.25,"y":0}, + {"label":"k10","x":0,"y":1.25},{"label":"k11","x":1,"y":1.25},{"label":"k12","x":2,"y":1.25},{"label":"k13","x":3,"y":1.25},{"label":"k14","x":4,"y":1.25},{"label":"k15","x":5,"y":1.25},{"label":"k16","x":6,"y":1.25},{"label":"k17","x":7,"y":1.25},{"label":"k18","x":8,"y":1.25},{"label":"k19","x":9,"y":1.25},{"label":"k1a","x":10,"y":1.25},{"label":"k1b","x":11,"y":1.25},{"label":"k1c","x":12,"y":1.25},{"label":"k1d","x":13,"y":1.25,"w":2},{"label":"k1f","x":15.25,"y":1.25},{"label":"k1g","x":16.25,"y":1.25},{"label":"k1h","x":17.25,"y":1.25}, + {"label":"k20","x":0,"y":2.25,"w":1.5},{"label":"k22","x":1.5,"y":2.25},{"label":"k23","x":2.5,"y":2.25},{"label":"k24","x":3.5,"y":2.25},{"label":"k25","x":4.5,"y":2.25},{"label":"k26","x":5.5,"y":2.25},{"label":"k27","x":6.5,"y":2.25},{"label":"k28","x":7.5,"y":2.25},{"label":"k29","x":8.5,"y":2.25},{"label":"k2a","x":9.5,"y":2.25},{"label":"k2b","x":10.5,"y":2.25},{"label":"k2c","x":11.5,"y":2.25},{"label":"k2d","x":12.5,"y":2.25},{"label":"k2e","x":13.5,"y":2.25,"w":1.5},{"label":"k2f","x":15.25,"y":2.25},{"label":"k2g","x":16.25,"y":2.25},{"label":"k2h","x":17.25,"y":2.25}, + {"label":"k30","x":0,"y":3.25,"w":1.75},{"label":"k32","x":1.75,"y":3.25},{"label":"k33","x":2.75,"y":3.25},{"label":"k34","x":3.75,"y":3.25},{"label":"k35","x":4.75,"y":3.25},{"label":"k36","x":5.75,"y":3.25},{"label":"k37","x":6.75,"y":3.25},{"label":"k38","x":7.75,"y":3.25},{"label":"k39","x":8.75,"y":3.25},{"label":"k3a","x":9.75,"y":3.25},{"label":"k3b","x":10.75,"y":3.25},{"label":"k3c","x":11.75,"y":3.25},{"label":"k3d","x":12.75,"y":3.25,"w":2.25}, + {"label":"k41","x":0,"y":4.25,"w":2.25},{"label":"k42","x":2.25,"y":4.25},{"label":"k43","x":3.25,"y":4.25},{"label":"k44","x":4.25,"y":4.25},{"label":"k45","x":5.25,"y":4.25},{"label":"k46","x":6.25,"y":4.25},{"label":"k47","x":7.25,"y":4.25},{"label":"k48","x":8.25,"y":4.25},{"label":"k49","x":9.25,"y":4.25},{"label":"k4a","x":10.25,"y":4.25},{"label":"k4b","x":11.25,"y":4.25},{"label":"k4d","x":12.25,"y":4.25,"w":2.75},{"label":"k4g","x":16.25,"y":4.25}, + {"label":"k50","x":0,"y":5.25,"w":1.5},{"label":"k51","x":1.5,"y":5.25},{"label":"k53","x":2.5,"y":5.25,"w":1.5},{"label":"k56","x":4,"y":5.25,"w":7},{"label":"k5b","x":11,"y":5.25,"w":1.5},{"label":"k5d","x":12.5,"y":5.25},{"label":"k5e","x":13.5,"y":5.25,"w":1.5},{"label":"5f","x":15.25,"y":5.25},{"label":"k5g","x":16.25,"y":5.25},{"label":"k5h","x":17.25,"y":5.25}] + }, + "LAYOUT_tkl_iso": { + "layout":[ + {"label":"k00","x":0,"y":0},{"label":"k02","x":2,"y":0},{"label":"k03","x":3,"y":0},{"label":"k04","x":4,"y":0},{"label":"k05","x":5,"y":0},{"label":"k07","x":6.5,"y":0},{"label":"k08","x":7.5,"y":0},{"label":"k09","x":8.5,"y":0},{"label":"k0a","x":9.5,"y":0},{"label":"k0b","x":11,"y":0},{"label":"k0c","x":12,"y":0},{"label":"k0d","x":13,"y":0},{"label":"k0e","x":14,"y":0},{"label":"k0f","x":15.25,"y":0},{"label":"k0g","x":16.25,"y":0},{"label":"k0h","x":17.25,"y":0}, + {"label":"k10","x":0,"y":1.25},{"label":"k11","x":1,"y":1.25},{"label":"k12","x":2,"y":1.25},{"label":"k13","x":3,"y":1.25},{"label":"k14","x":4,"y":1.25},{"label":"k15","x":5,"y":1.25},{"label":"k16","x":6,"y":1.25},{"label":"k17","x":7,"y":1.25},{"label":"k18","x":8,"y":1.25},{"label":"k19","x":9,"y":1.25},{"label":"k1a","x":10,"y":1.25},{"label":"k1b","x":11,"y":1.25},{"label":"k1c","x":12,"y":1.25},{"label":"k1d","x":13,"y":1.25,"w":2},{"label":"k1f","x":15.25,"y":1.25},{"label":"k1g","x":16.25,"y":1.25},{"label":"k1h","x":17.25,"y":1.25}, + {"label":"k20","x":0,"y":2.25,"w":1.5},{"label":"k22","x":1.5,"y":2.25},{"label":"k23","x":2.5,"y":2.25},{"label":"k24","x":3.5,"y":2.25},{"label":"k25","x":4.5,"y":2.25},{"label":"k26","x":5.5,"y":2.25},{"label":"k27","x":6.5,"y":2.25},{"label":"k28","x":7.5,"y":2.25},{"label":"k29","x":8.5,"y":2.25},{"label":"k2a","x":9.5,"y":2.25},{"label":"k2b","x":10.5,"y":2.25},{"label":"k2c","x":11.5,"y":2.25},{"label":"k2d","x":12.5,"y":2.25},{"label":"k2e","x":13.75,"y":2.25,"w":1.25,"h":2},{"label":"k2f","x":15.25,"y":2.25},{"label":"k2g","x":16.25,"y":2.25},{"label":"k2h","x":17.25,"y":2.25}, + {"label":"k30","x":0,"y":3.25,"w":1.75},{"label":"k32","x":1.75,"y":3.25},{"label":"k33","x":2.75,"y":3.25},{"label":"k34","x":3.75,"y":3.25},{"label":"k35","x":4.75,"y":3.25},{"label":"k36","x":5.75,"y":3.25},{"label":"k37","x":6.75,"y":3.25},{"label":"k38","x":7.75,"y":3.25},{"label":"k39","x":8.75,"y":3.25},{"label":"k3a","x":9.75,"y":3.25},{"label":"k3b","x":10.75,"y":3.25},{"label":"k3c","x":11.75,"y":3.25},{"label":"k3d","x":12.75,"y":3.25}, + {"label":"k40","x":0,"y":4.25,"w":1.25},{"label":"k41","x":1.24,"y":4.25},{"label":"k42","x":2.25,"y":4.25},{"label":"k43","x":3.25,"y":4.25},{"label":"k44","x":4.25,"y":4.25},{"label":"k45","x":5.25,"y":4.25},{"label":"k46","x":6.25,"y":4.25},{"label":"k47","x":7.25,"y":4.25},{"label":"k48","x":8.25,"y":4.25},{"label":"k49","x":9.25,"y":4.25},{"label":"k4a","x":10.25,"y":4.25},{"label":"k4b","x":11.25,"y":4.25},{"label":"k4d","x":12.25,"y":4.25,"w":2.75},{"label":"k4g","x":16.25,"y":4.25}, + {"label":"k50","x":0,"y":5.25,"w":1.25},{"label":"k51","x":1.25,"y":5.25,"w":1.25},{"label":"k53","x":2.5,"y":5.25,"w":1.25},{"label":"k56","x":3.75,"y":5.25,"w":6.25},{"label":"k5a","x":10,"y":5.25,"w":1.25},{"label":"k5b","x":11.25,"y":5.25,"w":1.25},{"label":"k5d","x":12.5,"y":5.25,"w":1.25},{"label":"k5e","x":13.75,"y":5.25,"w":1.25},{"label":"5f","x":15.25,"y":5.25},{"label":"k5g","x":16.25,"y":5.25},{"label":"k5h","x":17.25,"y":5.25}] + }, + "LAYOUT_tkl_iso_tsangan": { + "layout":[ + {"label":"k00","x":0,"y":0},{"label":"k02","x":2,"y":0},{"label":"k03","x":3,"y":0},{"label":"k04","x":4,"y":0},{"label":"k05","x":5,"y":0},{"label":"k07","x":6.5,"y":0},{"label":"k08","x":7.5,"y":0},{"label":"k09","x":8.5,"y":0},{"label":"k0a","x":9.5,"y":0},{"label":"k0b","x":11,"y":0},{"label":"k0c","x":12,"y":0},{"label":"k0d","x":13,"y":0},{"label":"k0e","x":14,"y":0},{"label":"k0f","x":15.25,"y":0},{"label":"k0g","x":16.25,"y":0},{"label":"k0h","x":17.25,"y":0}, + {"label":"k10","x":0,"y":1.25},{"label":"k11","x":1,"y":1.25},{"label":"k12","x":2,"y":1.25},{"label":"k13","x":3,"y":1.25},{"label":"k14","x":4,"y":1.25},{"label":"k15","x":5,"y":1.25},{"label":"k16","x":6,"y":1.25},{"label":"k17","x":7,"y":1.25},{"label":"k18","x":8,"y":1.25},{"label":"k19","x":9,"y":1.25},{"label":"k1a","x":10,"y":1.25},{"label":"k1b","x":11,"y":1.25},{"label":"k1c","x":12,"y":1.25},{"label":"k1d","x":13,"y":1.25,"w":2},{"label":"k1f","x":15.25,"y":1.25},{"label":"k1g","x":16.25,"y":1.25},{"label":"k1h","x":17.25,"y":1.25}, + {"label":"k20","x":0,"y":2.25,"w":1.5},{"label":"k22","x":1.5,"y":2.25},{"label":"k23","x":2.5,"y":2.25},{"label":"k24","x":3.5,"y":2.25},{"label":"k25","x":4.5,"y":2.25},{"label":"k26","x":5.5,"y":2.25},{"label":"k27","x":6.5,"y":2.25},{"label":"k28","x":7.5,"y":2.25},{"label":"k29","x":8.5,"y":2.25},{"label":"k2a","x":9.5,"y":2.25},{"label":"k2b","x":10.5,"y":2.25},{"label":"k2c","x":11.5,"y":2.25},{"label":"k2d","x":12.5,"y":2.25},{"label":"k2e","x":13.75,"y":2.25,"w":1.25,"h":2},{"label":"k2f","x":15.25,"y":2.25},{"label":"k2g","x":16.25,"y":2.25},{"label":"k2h","x":17.25,"y":2.25}, + {"label":"k30","x":0,"y":3.25,"w":1.75},{"label":"k32","x":1.75,"y":3.25},{"label":"k33","x":2.75,"y":3.25},{"label":"k34","x":3.75,"y":3.25},{"label":"k35","x":4.75,"y":3.25},{"label":"k36","x":5.75,"y":3.25},{"label":"k37","x":6.75,"y":3.25},{"label":"k38","x":7.75,"y":3.25},{"label":"k39","x":8.75,"y":3.25},{"label":"k3a","x":9.75,"y":3.25},{"label":"k3b","x":10.75,"y":3.25},{"label":"k3c","x":11.75,"y":3.25},{"label":"k3d","x":12.75,"y":3.25}, + {"label":"k40","x":0,"y":4.25,"w":1.25},{"label":"k41","x":1.24,"y":4.25},{"label":"k42","x":2.25,"y":4.25},{"label":"k43","x":3.25,"y":4.25},{"label":"k44","x":4.25,"y":4.25},{"label":"k45","x":5.25,"y":4.25},{"label":"k46","x":6.25,"y":4.25},{"label":"k47","x":7.25,"y":4.25},{"label":"k48","x":8.25,"y":4.25},{"label":"k49","x":9.25,"y":4.25},{"label":"k4a","x":10.25,"y":4.25},{"label":"k4b","x":11.25,"y":4.25},{"label":"k4d","x":12.25,"y":4.25,"w":2.75},{"label":"k4g","x":16.25,"y":4.25}, + {"label":"k50","x":0,"y":5.25,"w":1.5},{"label":"k51","x":1.5,"y":5.25},{"label":"k53","x":2.5,"y":5.25,"w":1.5},{"label":"k56","x":4,"y":5.25,"w":7},{"label":"k5b","x":11,"y":5.25,"w":1.5},{"label":"k5d","x":12.5,"y":5.25},{"label":"k5e","x":13.5,"y":5.25,"w":1.5},{"label":"5f","x":15.25,"y":5.25},{"label":"k5g","x":16.25,"y":5.25},{"label":"k5h","x":17.25,"y":5.25}] + }, + "LAYOUT_tkl_iso_split_bs": { + "layout":[ + {"label":"k00","x":0,"y":0},{"label":"k02","x":2,"y":0},{"label":"k03","x":3,"y":0},{"label":"k04","x":4,"y":0},{"label":"k05","x":5,"y":0},{"label":"k07","x":6.5,"y":0},{"label":"k08","x":7.5,"y":0},{"label":"k09","x":8.5,"y":0},{"label":"k0a","x":9.5,"y":0},{"label":"k0b","x":11,"y":0},{"label":"k0c","x":12,"y":0},{"label":"k0d","x":13,"y":0},{"label":"k0e","x":14,"y":0},{"label":"k0f","x":15.25,"y":0},{"label":"k0g","x":16.25,"y":0},{"label":"k0h","x":17.25,"y":0}, + {"label":"k10","x":0,"y":1.25},{"label":"k11","x":1,"y":1.25},{"label":"k12","x":2,"y":1.25},{"label":"k13","x":3,"y":1.25},{"label":"k14","x":4,"y":1.25},{"label":"k15","x":5,"y":1.25},{"label":"k16","x":6,"y":1.25},{"label":"k17","x":7,"y":1.25},{"label":"k18","x":8,"y":1.25},{"label":"k19","x":9,"y":1.25},{"label":"k1a","x":10,"y":1.25},{"label":"k1b","x":11,"y":1.25},{"label":"k1c","x":12,"y":1.25},{"label":"k1d","x":13,"y":1.25},{"label":"k1e","x":14,"y":1.25},{"label":"k1f","x":15.25,"y":1.25},{"label":"k1g","x":16.25,"y":1.25},{"label":"k1h","x":17.25,"y":1.25}, + {"label":"k20","x":0,"y":2.25,"w":1.5},{"label":"k22","x":1.5,"y":2.25},{"label":"k23","x":2.5,"y":2.25},{"label":"k24","x":3.5,"y":2.25},{"label":"k25","x":4.5,"y":2.25},{"label":"k26","x":5.5,"y":2.25},{"label":"k27","x":6.5,"y":2.25},{"label":"k28","x":7.5,"y":2.25},{"label":"k29","x":8.5,"y":2.25},{"label":"k2a","x":9.5,"y":2.25},{"label":"k2b","x":10.5,"y":2.25},{"label":"k2c","x":11.5,"y":2.25},{"label":"k2d","x":12.5,"y":2.25},{"label":"k2e","x":13.75,"y":2.25,"w":1.25,"h":2},{"label":"k2f","x":15.25,"y":2.25},{"label":"k2g","x":16.25,"y":2.25},{"label":"k2h","x":17.25,"y":2.25}, + {"label":"k30","x":0,"y":3.25,"w":1.75},{"label":"k32","x":1.75,"y":3.25},{"label":"k33","x":2.75,"y":3.25},{"label":"k34","x":3.75,"y":3.25},{"label":"k35","x":4.75,"y":3.25},{"label":"k36","x":5.75,"y":3.25},{"label":"k37","x":6.75,"y":3.25},{"label":"k38","x":7.75,"y":3.25},{"label":"k39","x":8.75,"y":3.25},{"label":"k3a","x":9.75,"y":3.25},{"label":"k3b","x":10.75,"y":3.25},{"label":"k3c","x":11.75,"y":3.25},{"label":"k3d","x":12.75,"y":3.25}, + {"label":"k40","x":0,"y":4.25,"w":1.25},{"label":"k41","x":1.24,"y":4.25},{"label":"k42","x":2.25,"y":4.25},{"label":"k43","x":3.25,"y":4.25},{"label":"k44","x":4.25,"y":4.25},{"label":"k45","x":5.25,"y":4.25},{"label":"k46","x":6.25,"y":4.25},{"label":"k47","x":7.25,"y":4.25},{"label":"k48","x":8.25,"y":4.25},{"label":"k49","x":9.25,"y":4.25},{"label":"k4a","x":10.25,"y":4.25},{"label":"k4b","x":11.25,"y":4.25},{"label":"k4d","x":12.25,"y":4.25,"w":2.75},{"label":"k4g","x":16.25,"y":4.25}, + {"label":"k50","x":0,"y":5.25,"w":1.25},{"label":"k51","x":1.25,"y":5.25,"w":1.25},{"label":"k53","x":2.5,"y":5.25,"w":1.25},{"label":"k56","x":3.75,"y":5.25,"w":6.25},{"label":"k5a","x":10,"y":5.25,"w":1.25},{"label":"k5b","x":11.25,"y":5.25,"w":1.25},{"label":"k5d","x":12.5,"y":5.25,"w":1.25},{"label":"k5e","x":13.75,"y":5.25,"w":1.25},{"label":"5f","x":15.25,"y":5.25},{"label":"k5g","x":16.25,"y":5.25},{"label":"k5h","x":17.25,"y":5.25}] + }, + "LAYOUT_tkl_iso_split_rshift": { + "layout":[ + {"label":"k00","x":0,"y":0},{"label":"k02","x":2,"y":0},{"label":"k03","x":3,"y":0},{"label":"k04","x":4,"y":0},{"label":"k05","x":5,"y":0},{"label":"k07","x":6.5,"y":0},{"label":"k08","x":7.5,"y":0},{"label":"k09","x":8.5,"y":0},{"label":"k0a","x":9.5,"y":0},{"label":"k0b","x":11,"y":0},{"label":"k0c","x":12,"y":0},{"label":"k0d","x":13,"y":0},{"label":"k0e","x":14,"y":0},{"label":"k0f","x":15.25,"y":0},{"label":"k0g","x":16.25,"y":0},{"label":"k0h","x":17.25,"y":0}, + {"label":"k10","x":0,"y":1.25},{"label":"k11","x":1,"y":1.25},{"label":"k12","x":2,"y":1.25},{"label":"k13","x":3,"y":1.25},{"label":"k14","x":4,"y":1.25},{"label":"k15","x":5,"y":1.25},{"label":"k16","x":6,"y":1.25},{"label":"k17","x":7,"y":1.25},{"label":"k18","x":8,"y":1.25},{"label":"k19","x":9,"y":1.25},{"label":"k1a","x":10,"y":1.25},{"label":"k1b","x":11,"y":1.25},{"label":"k1c","x":12,"y":1.25},{"label":"k1d","x":13,"y":1.25,"w":2},{"label":"k1f","x":15.25,"y":1.25},{"label":"k1g","x":16.25,"y":1.25},{"label":"k1h","x":17.25,"y":1.25}, + {"label":"k20","x":0,"y":2.25,"w":1.5},{"label":"k22","x":1.5,"y":2.25},{"label":"k23","x":2.5,"y":2.25},{"label":"k24","x":3.5,"y":2.25},{"label":"k25","x":4.5,"y":2.25},{"label":"k26","x":5.5,"y":2.25},{"label":"k27","x":6.5,"y":2.25},{"label":"k28","x":7.5,"y":2.25},{"label":"k29","x":8.5,"y":2.25},{"label":"k2a","x":9.5,"y":2.25},{"label":"k2b","x":10.5,"y":2.25},{"label":"k2c","x":11.5,"y":2.25},{"label":"k2d","x":12.5,"y":2.25},{"label":"k2e","x":13.75,"y":2.25,"w":1.25,"h":2},{"label":"k2f","x":15.25,"y":2.25},{"label":"k2g","x":16.25,"y":2.25},{"label":"k2h","x":17.25,"y":2.25}, + {"label":"k30","x":0,"y":3.25,"w":1.75},{"label":"k32","x":1.75,"y":3.25},{"label":"k33","x":2.75,"y":3.25},{"label":"k34","x":3.75,"y":3.25},{"label":"k35","x":4.75,"y":3.25},{"label":"k36","x":5.75,"y":3.25},{"label":"k37","x":6.75,"y":3.25},{"label":"k38","x":7.75,"y":3.25},{"label":"k39","x":8.75,"y":3.25},{"label":"k3a","x":9.75,"y":3.25},{"label":"k3b","x":10.75,"y":3.25},{"label":"k3c","x":11.75,"y":3.25},{"label":"k3d","x":12.75,"y":3.25}, + {"label":"k40","x":0,"y":4.25,"w":1.25},{"label":"k41","x":1.25,"y":4.25},{"label":"k42","x":2.25,"y":4.25},{"label":"k43","x":3.25,"y":4.25},{"label":"k44","x":4.25,"y":4.25},{"label":"k45","x":5.25,"y":4.25},{"label":"k46","x":6.25,"y":4.25},{"label":"k47","x":7.25,"y":4.25},{"label":"k48","x":8.25,"y":4.25},{"label":"k49","x":9.25,"y":4.25},{"label":"k4a","x":10.25,"y":4.25},{"label":"k4b","x":11.25,"y":4.25},{"label":"k4d","x":12.25,"y":4.25,"w":1.75},{"label":"k4e","x":14,"y":4.25},{"label":"k4g","x":16.25,"y":4.25}, + {"label":"k50","x":0,"y":5.25,"w":1.25},{"label":"k51","x":1.25,"y":5.25,"w":1.25},{"label":"k53","x":2.5,"y":5.25,"w":1.25},{"label":"k56","x":3.75,"y":5.25,"w":6.25},{"label":"k5a","x":10,"y":5.25,"w":1.25},{"label":"k5b","x":11.25,"y":5.25,"w":1.25},{"label":"k5d","x":12.5,"y":5.25,"w":1.25},{"label":"k5e","x":13.75,"y":5.25,"w":1.25},{"label":"5f","x":15.25,"y":5.25},{"label":"k5g","x":16.25,"y":5.25},{"label":"k5h","x":17.25,"y":5.25}] + } + } +} diff --git a/keyboards/eniigmakeyboards/ek87/keymaps/default/keymap.c b/keyboards/eniigmakeyboards/ek87/keymaps/default/keymap.c new file mode 100644 index 000000000000..563bb818a8bd --- /dev/null +++ b/keyboards/eniigmakeyboards/ek87/keymaps/default/keymap.c @@ -0,0 +1,12 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_tkl_ansi( + KC_ESC, 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_PSCR, KC_SLCK, KC_PAUS, + 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, KC_INS, KC_HOME, KC_PGUP, + 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_DEL, KC_END, KC_PGDN, + 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/keyboards/eniigmakeyboards/ek87/keymaps/via/keymap.c b/keyboards/eniigmakeyboards/ek87/keymaps/via/keymap.c new file mode 100644 index 000000000000..1a69d0502351 --- /dev/null +++ b/keyboards/eniigmakeyboards/ek87/keymaps/via/keymap.c @@ -0,0 +1,36 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_ESC, 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_PSCR, KC_SLCK, KC_PAUS, + 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_TRNS, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + 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_DEL, KC_END, KC_PGDN, + 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_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_TRNS, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = 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, 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, 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, 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 + ) +}; diff --git a/keyboards/eniigmakeyboards/ek87/keymaps/via/rules.mk b/keyboards/eniigmakeyboards/ek87/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/eniigmakeyboards/ek87/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/eniigmakeyboards/ek87/readme.md b/keyboards/eniigmakeyboards/ek87/readme.md new file mode 100644 index 000000000000..49966ba3b845 --- /dev/null +++ b/keyboards/eniigmakeyboards/ek87/readme.md @@ -0,0 +1,17 @@ +# Eniigma Keyboards ek87 + +![ek87](https://i.imgur.com/lmZYr1Pl.jpg) + +A highly compatible TKL PCB with JST daughterboard support, designed for use with all tenkeyless Eniigma Keyboards products. + +![layout](https://i.imgur.com/FNYcAEP.png) + +* Keyboard Maintainer: [eniigmakeyboards](https://github.com/eniigmakeyboards) and [adamws](https://github.com/adamws) +* Hardware Supported: Infinitum PCB/case, all future Eniigma Keyboards TKL products +* Hardware Availability: On the [Eniigma Keyboards website](https://eniigmakeyboards.com/collections/infinitum/products/ek87-pcb-preorder) + +Make example for this keyboard (after setting up your build environment): + + make eniigmakeyboards/ek87:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/eniigmakeyboards/ek87/rules.mk b/keyboards/eniigmakeyboards/ek87/rules.mk new file mode 100644 index 000000000000..00f426726e5e --- /dev/null +++ b/keyboards/eniigmakeyboards/ek87/rules.mk @@ -0,0 +1,32 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = no # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs From d087d20c6790d5883dae7f898cd15192e18c80db Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 7 May 2020 15:09:40 -0700 Subject: [PATCH 385/429] [Keymap] Update brandonschlack-split keymap - Add HHKB-arrow & nav - Remove F13-F15 - Shuffle media controls next to nav keys --- .../brandonschlack-split/keymap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c index bebc9cf2de9c..96e13ddc9984 100644 --- a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c +++ b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c @@ -42,20 +42,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ * │MKE│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│LHP│SLP│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │RMod │RH+│RS+│RV+│AS+│ │ │ │F13│F14│F15│PgU│MNC│ Del │ + * │RMod │RH+│RS+│RV+│AS+│ │ │ │VlU│Prv│Nxt│ ↑ │MNC│ Del │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │RTgl │RH-│RS-│RV-│AS-│ │ │VlD│VlU│Mut│Hom│End│ │ + * │RTgl │RH-│RS-│RV-│AS-│ │ │VlD│Hom│PgU│ ← │ → │ Play │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - * │ │LYR│Thm│ │ │RST│ │ │Prv│Nxt│PgD│ │ │ + * │ │LYR│Thm│ │ │RST│ │Mut│End│PgD│ ↓ │ │ │ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ * │ │ │ │ │ │ │ │ │ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ */ [_FN1] = LAYOUT_60_ansi_split_bs_rshift( \ QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, \ - RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_PGUP, MC_MSSN, KC_DELT, \ - RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_HOME, KC_END, _______, \ - _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, _______, KC_MPRV, KC_MNXT, KC_PGDN, _______, _______, \ + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_VOLU, KC_MPRV, KC_MNXT, KC_UP, MC_MSSN, KC_DELT, \ + RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, KC_VOLD, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_MPLY, \ + _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, KC_MUTE, KC_END, KC_PGDN, KC_DOWN, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______ \ ) /* Layer From e02154746bbef6c64cda772d3ac5aca79370a485 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 11 May 2020 09:47:19 -0700 Subject: [PATCH 386/429] [Keymap] Swap R-Option and Lower on Romeo --- .../coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c index 3f6a3abe8ce6..6d38fa56d96b 100644 --- a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c +++ b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c @@ -25,14 +25,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│ ?/Sft│ * ├────┬───┼───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤ -* │Ctrl│Opt│Cmd│ Space │ Cmd│Lwr│ Opt│ +* │Ctrl│Opt│Cmd│ Space │ Cmd│Opt│ Lwr│ * └────┴───┴───┴────────────────────────┴────┴───┴────┘ */ [_BASE] = LAYOUT_ansi_40( \ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ HY_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, \ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, SF_SLSH, \ - KC_LCTL, KC_LOPT, KC_LCMD, SPC_RAI, KC_RCMD, LOWER, KC_ROPT \ + KC_LCTL, KC_LOPT, KC_LCMD, SPC_RAI, KC_RCMD, KC_ROPT, LOWER \ ), /* Lower * ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ From ab2ddaffeb87ac1c3b6dceff882452adb7a5536a Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 11 May 2020 09:54:31 -0700 Subject: [PATCH 387/429] [Keymap] Update nightmare keymap preview --- keyboards/nightmare/keymaps/brandonschlack/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/nightmare/keymaps/brandonschlack/keymap.c b/keyboards/nightmare/keymaps/brandonschlack/keymap.c index 43cf0576c3c7..25e53c008d8c 100644 --- a/keyboards/nightmare/keymaps/brandonschlack/keymap.c +++ b/keyboards/nightmare/keymaps/brandonschlack/keymap.c @@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /** * Raise * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │Nxt│││ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │   │ + * │Nxt│││~ `│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│   │ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ * │VlU│││    │ F1│ F2│ F3│ F4│ F5│ F6│   │   │   │   │   │      │ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ From fd626a67758aa39781518d6b159a2cc428c0f2cd Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 15 May 2020 11:24:36 -0700 Subject: [PATCH 388/429] [Keymap] Change bdn9 to ENCODER_DIRECTION_FLIP --- .../keebio/bdn9/keymaps/brandonschlack/config.h | 2 ++ .../keebio/bdn9/keymaps/brandonschlack/keymap.c | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h index 843d55b64944..adef5b36b6b5 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h @@ -1,5 +1,7 @@ #pragma once +#define ENCODER_DIRECTION_FLIP + #undef RGBLIGHT_ANIMATIONS #define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 4c0e59b642e2..b688e44f1f51 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -207,13 +207,13 @@ void keyboard_post_init_keymap(void){ * Encoder */ const uint16_t PROGMEM encoders[][2][2] = { - [_REEDER] = {{ KC_J, KC_K }, { KC_N, KC_P }}, - [_MEDIA] = {{ KC_VOLU, KC_VOLD }, { KC_MNXT, KC_MPRV }}, - [_NAVI] = {{ MC_WH_D, MC_WH_U }, { NXT_TAB, PRV_TAB }}, - [_KARABINER] = {{ KC_PPLS, KC_PMNS }, { KC_PEQL, KC_PDOT }}, - [LR_NAV] = {{ KC_EQL, KC_MINS }, { KC_PGUP, KC_PGDN }}, - [LR_REVIEW] = {{ KC_RBRC, KC_LBRC }, { G(KC_UP), G(KC_DOWN) }}, - [LR_EDIT] = {{ KC_DOT, KC_COMM }, { KC_EQL, KC_MINS }}, + [_REEDER] = {{ KC_K, KC_J }, { KC_P, KC_N }}, + [_MEDIA] = {{ KC_VOLD, KC_VOLU }, { KC_MPRV, KC_MNXT }}, + [_NAVI] = {{ MC_WH_U, MC_WH_D }, { PRV_TAB, NXT_TAB }}, + [_KARABINER] = {{ KC_PMNS, KC_PPLS }, { KC_PDOT, KC_PEQL }}, + [LR_NAV] = {{ KC_MINS, KC_EQL }, { KC_PGDN, KC_PGUP }}, + [LR_REVIEW] = {{ KC_LBRC, KC_RBRC }, { G(KC_DOWN), G(KC_UP) }}, + [LR_EDIT] = {{ KC_COMM, KC_DOT }, { KC_MINS, KC_EQL }}, }; void encoder_update_user(uint8_t index, bool clockwise) { From 96f3d539da6b1433f2e23c71e5f7d9dd4242ba98 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 15 May 2020 11:26:03 -0700 Subject: [PATCH 389/429] [Keymap] Update bdn9 doc comments and preview --- .../bdn9/keymaps/brandonschlack/keymap.c | 116 +++++++++--------- 1 file changed, 60 insertions(+), 56 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index b688e44f1f51..92e7dcc35487 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -13,13 +13,17 @@ enum bdn9_keycodes { TG_EDIT }; -// Tap Dances +/** + * Tap Dances + * + * Use tap dance for layer changes + */ enum bdn9_dances { TD_DTAP_ADIO = 0, TD_DTAP_LGHT, TD_DTAP_ADJT }; -//Tap Dance Definitions +// Tap Dance Definitions qk_tap_dance_action_t tap_dance_actions[] = { [TD_DTAP_ADIO] = ACTION_TAP_DANCE_TRIGGER_LAYER(DOUBLE_TAP, _AUDIO), [TD_DTAP_LGHT] = ACTION_TAP_DANCE_TRIGGER_LAYER(DOUBLE_TAP, _LIGHT), @@ -27,7 +31,7 @@ qk_tap_dance_action_t tap_dance_actions[] = { }; // Tap Dance Aliases #if defined(RGBLIGHT_ENABLE) -#define DTP_AVC TD(TD_DTAP_LGHT) +#define DTP_AVC TD(TD_DTAP_LGHT) // #elif defined(AUDIO_ENABLE) #define DTP_AVC TD(TD_DTAP_ADIO) #endif @@ -37,14 +41,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Layer: Reeder ┌───────────┐ ┌───────────┐ - │ Items │ │ Subs │ - │ Prv Nxt │ │ Prv Nxt │ + │   Items   │  │    Subs   │ + │  Prv  Nxt │  │  Prv  Nxt │ ├────────┬──┴──┴──┬────────┤ - │ VwBrsw │ Star │ Sync │ + │ VwBrsw │  Star  │  Sync  │ ├────────┼────────┼────────┤ - │ CmdTab │ TgRead │ Clear │ + │ CmdTab │ TgRead │  Clear │ ├────────┼────────┼────────┤ - │ VwStard│ VwUnrd │ VwAll │ + │ VwStard│ VwUnrd │  VwAll │ └────────┴────────┴────────┘ */ [_REEDER] = LAYOUT( @@ -54,15 +58,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Layer: Media - ┌───────────┐ ┌───────────┐ - │ Vol │ │ Track │ - │ Prv Nxt │ │ Prv Nxt │ + ┌───────────┐  ┌───────────┐ + │    Vol    │  │   Track   │ + │  Prv  Nxt │  │  Prv  Nxt │ ├────────┬──┴──┴──┬────────┤ - │ Mute │ Player │ Sync │ + │  Mute  │ Player │  Sync  │ ├────────┼────────┼────────┤ - │ YT<10s │ YT Ply │ YT>10s │ + │ YT<10s │ YT Ply │ YT>10s │ ├────────┼────────┼────────┤ - │ Left │ Spce │ Rght │ + │  Left  │  Spce  │  Rght  │ └────────┴────────┴────────┘ */ [_MEDIA] = LAYOUT( @@ -72,15 +76,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Layer: Navigation - ┌───────────┐ ┌───────────┐ - │ Scroll │ │ Tab │ - │ Up Dn │ │ Prv Nxt │ + ┌───────────┐  ┌───────────┐ + │  Scroll   │  │    Tab    │ + │  Up   Dn  │  │  Prv  Nxt │ ├────────┬──┴──┴──┬────────┤ - │ ReOTab │ CmdTab │ ClsTab │ + │ ReOTab │ CmdTab │ ClsTab │ ├────────┼────────┼────────┤ - │ PgDn │ Up │ PgUp │ + │  PgDn  │   Up   │  PgUp  │ ├────────┼────────┼────────┤ - │ Left │ Down │ Rght │ + │  Left  │  Down  │  Rght  │ └────────┴────────┴────────┘ */ [_NAVI] = LAYOUT( @@ -90,15 +94,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Layer: Macro/Karabiner - ┌───────────┐ ┌───────────┐ - │ │ │ │ - │ - + │ │ . = │ + ┌───────────┐  ┌───────────┐ + │           │  │           │ + │   -    +  │  │   .    =  │ ├────────┬──┴──┴──┬────────┤ - │ 1 │ 2 │ 3 │ + │    1   │    2   │    3   │ ├────────┼────────┼────────┤ - │ 4 │ 5 │ 6 │ + │    4   │    5   │    6   │ ├────────┼────────┼────────┤ - │ 7 │ 8 │ 9 │ + │    7   │    8   │    9   │ └────────┴────────┴────────┘ */ [_KARABINER] = LAYOUT( @@ -108,15 +112,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Layer: Lightroom Navigation - ┌───────────┐ ┌───────────┐ - │ Thumbnail │ │ Scrl Grid │ - │ Dec Inc │ │ Up Dn │ + ┌───────────┐  ┌───────────┐ + │ Thumbnail │  │ Scrl Grid │ + │ Dec   Inc │  │ Up     Dn │ ├────────┬──┴──┴──┬────────┤ - │ TgRevw │CylGrdVw│ TgEdit │ + │ TgRevw │CylGrdVw│ TgEdit │ ├────────┼────────┼────────┤ - │ Start │ Up │ End │ + │  Start │   Up   │  End   │ ├────────┼────────┼────────┤ - │ Left │ Down │ Rght │ + │  Left  │  Down  │  Rght  │ └────────┴────────┴────────┘ */ [LR_NAV] = LAYOUT( @@ -126,15 +130,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Layer: Review/Rate - ┌───────────┐ ┌───────────┐ - │ Stars │ │ Flag │ - │ Dec Inc │ │ Dec Inc │ + ┌───────────┐  ┌───────────┐ + │   Stars   │  │   Flag    │ + │ Dec   Inc │  │ Dec   Inc │ ├────────┬──┴──┴──┬────────┤ - │ TgLNav │ Yellow │ TgEdit │ + │ TgLNav │ Yellow │ TgEdit │ ├────────┼────────┼────────┤ - │ NoStar │ Green │ UnFlag │ + │ NoStar │  Green │ UnFlag │ ├────────┼────────┼────────┤ - │ Left │ Blue │ Rght │ + │  Left  │  Blue  │  Rght  │ └────────┴────────┴────────┘ */ [LR_REVIEW] = LAYOUT( @@ -144,15 +148,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Layer: Edit/Develop - ┌───────────┐ ┌───────────┐ - │ Sliders │ │ Value │ - │ Prv Nxt │ │ Dec Inc │ + ┌───────────┐  ┌───────────┐ + │  Sliders  │  │   Value   │ + │ Prv   Nxt │  │ Dec   Inc │ ├────────┬──┴──┴──┬────────┤ - │ TgRevw │ Bf/Aft │ TgLNav │ + │ TgRevw │ Bf/Aft │ TgLNav │ ├────────┼────────┼────────┤ - │ FlgRjt │ Undo │ FlgPkd │ + │ FlgRjt │  Undo  │ FlgPkd │ ├────────┼────────┼────────┤ - │ Left │ Redo │ Rght │ + │  Left  │  Redo  │  Rght  │ └────────┴────────┴────────┘ */ [LR_EDIT] = LAYOUT( @@ -162,15 +166,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Layer: Light - ┌───────────┐ ┌───────────┐ - │ RGB Hue │ │ RGB Sat │ - │ Prv Nxt │ │ Dec Inc │ + ┌───────────┐  ┌───────────┐ + │  RGB Hue  │  │  RGB Sat  │ + │ Prv   Nxt │  │ Dec   Inc │ ├────────┬──┴──┴──┬────────┤ - │ RGBTgl │ Val+ │ TgLNav │ + │ RGBTgl │  Val+  │ TgLNav │ ├────────┼────────┼────────┤ - │ Mode- │ Val- │ Mode+ │ + │  Mode- │  Val-  │  Mode+ │ ├────────┼────────┼────────┤ - │ LyrTgl │ NxtThm │ XXXX │ + │ LyrTgl │ NxtThm │  XXXX  │ └────────┴────────┴────────┘ */ [_LIGHT] = LAYOUT( @@ -180,15 +184,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Layer: ADJUST - ┌───────────┐ ┌───────────┐ - │ XXXX │ │ XXXX │ - │ │ │ │ + ┌───────────┐  ┌───────────┐ + │    XXXX   │  │   XXXX    │ + │           │  │           │ ├────────┬──┴──┴──┬────────┤ - │ MAKE │ Reeder │ Light │ + │  MAKE  │ Reeder │  Light │ ├────────┼────────┼────────┤ - │ Media │ Navi │ Macro │ + │  Media │  Navi  │  Macro │ ├────────┼────────┼────────┤ - │ LR Rvw │ LR Nav │ LR Edt │ + │ LR Rvw │ LR Nav │ LR Edt │ └────────┴────────┴────────┘ */ [_ADJUST] = LAYOUT( From f05197cabe8475fac36223997d17f12b6fccfa0a Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 27 May 2020 10:31:26 -0700 Subject: [PATCH 390/429] [User] Add Command-Space Mod-Tap alias --- users/brandonschlack/process_records.h | 1 + 1 file changed, 1 insertion(+) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index cc821e4713e3..ea0620d2dbf9 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -30,6 +30,7 @@ void matrix_scan_cmd_tab(void); /* Command Mod-Tap */ #define CMD_ESC CMD_T(KC_ESC) // Hold Escape for Command #define CMD_CAP CMD_T(KC_CAPS) // Hold Caps Lock for Command +#define CMD_SPC CMD_T(KC_SPC) // Hold Space for Command /* Hyper Mod-Tap */ #define HY_ESC ALL_T(KC_ESC) // Hold Escape for Hyper (Shift-Control-Option-Command) #define HY_TAB ALL_T(KC_TAB) // Hold Tab for Hyper (Shift-Control-Option-Command) From 8c7a60a21dff4b2dbded21b3001e66d53809d308 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 27 May 2020 10:32:15 -0700 Subject: [PATCH 391/429] [Keymap] Fix whitespace in ascii preview --- .../brandonschlack-split/keymap.c | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c index 96e13ddc9984..b57d7aa7bd57 100644 --- a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c +++ b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c @@ -19,15 +19,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│ + * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│Bspc │ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│Bspc │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter │ + * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter  │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - * │ LShift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │↑ Shft│FnP│ + * │ LShift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │↑ Shft│FnP│ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ - * │Ctrl│Opt │Cmd │ Space │ Cmd│←Opt│↓ Fn│→Ctl│ + * │Ctrl│Opt │Cmd │         Space          │ Cmd│←Opt│↓ Fn│→Ctl│ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ */ [_BASE] = LAYOUT_60_ansi_split_bs_rshift( \ @@ -40,15 +40,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Function Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │MKE│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│LHP│SLP│ + * │MKE│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│LHP│SLP│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │RMod │RH+│RS+│RV+│AS+│ │ │ │VlU│Prv│Nxt│ ↑ │MNC│ Del │ + * │RMod │RH+│RS+│RV+│AS+│   │   │   │VlU│Prv│Nxt│ ↑ │MNC│ Del │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │RTgl │RH-│RS-│RV-│AS-│ │ │VlD│Hom│PgU│ ← │ → │ Play │ + * │RTgl  │RH-│RS-│RV-│AS-│   │   │VlD│Hom│PgU│ ← │ → │   Play │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - * │ │LYR│Thm│ │ │RST│ │Mut│End│PgD│ ↓ │ │ │ + * │        │LYR│Thm│   │   │RST│   │Mut│End│PgD│ ↓ │      │   │ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ - * │ │ │ │ │ │ │ │ │ + * │    │    │    │                        │    │    │    │    │ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ */ [_FN1] = LAYOUT_60_ansi_split_bs_rshift( \ @@ -60,15 +60,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) /* Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │      │   │   │   │   │   │   │   │   │   │   │   │        │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │        │   │   │   │   │   │   │   │   │   │   │      │   │ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ - * │ │ │ │ │ │ │ │ │ + * │    │    │    │                        │    │    │    │    │ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ */ /* From ed046264e19256c1305527db27372b8156e39e6f Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 2 Jun 2020 13:45:24 -0700 Subject: [PATCH 392/429] [Keymap] Initial Wonderland keymap --- .../keymaps/brandonschlack/config.h | 1 + .../keymaps/brandonschlack/keymap.c | 133 ++++++++++++++++++ .../keymaps/brandonschlack/rules.mk | 8 ++ 3 files changed, 142 insertions(+) create mode 100644 keyboards/maartenwut/wonderland/keymaps/brandonschlack/config.h create mode 100755 keyboards/maartenwut/wonderland/keymaps/brandonschlack/keymap.c create mode 100755 keyboards/maartenwut/wonderland/keymaps/brandonschlack/rules.mk diff --git a/keyboards/maartenwut/wonderland/keymaps/brandonschlack/config.h b/keyboards/maartenwut/wonderland/keymaps/brandonschlack/config.h new file mode 100644 index 000000000000..68534bfe1677 --- /dev/null +++ b/keyboards/maartenwut/wonderland/keymaps/brandonschlack/config.h @@ -0,0 +1 @@ +#define USE_LEDS_FOR_LAYERS diff --git a/keyboards/maartenwut/wonderland/keymaps/brandonschlack/keymap.c b/keyboards/maartenwut/wonderland/keymaps/brandonschlack/keymap.c new file mode 100755 index 000000000000..66cee63c57af --- /dev/null +++ b/keyboards/maartenwut/wonderland/keymaps/brandonschlack/keymap.c @@ -0,0 +1,133 @@ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +#define TOP_LED B1 +#define MIDDLE_LED B2 +#define BOTTOM_LED B3 + +bool is_led_stoplight_active = false; +uint8_t led_stoplight_index = 0; +uint16_t led_stoplight_timer = 0; +void matrix_scan_led_stoplight(void); + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[_BASE] = LAYOUT( \ + KC_HOME, 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_PGUP, 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, \ + KC_PGDN, HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, PLY_FN1, \ + KC_LOPT, KC_LCMD, SPC_RAI, KC_LCTL, SPC_RAI, KC_RCMD, KC_ROPT \ +), +[_FN1] = LAYOUT( \ + KC_MUTE, QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, \ + KC_VOLU, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_UP, MC_MSSN, KC_DELT, \ + KC_VOLD, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_MPLY, \ + _______, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ + +), +[_FN2] = LAYOUT( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ + +), +[_ADJUST] = LAYOUT( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ + +) +/* +[_BLANK] = LAYOUT( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ + +) +*/ +}; + +void keyboard_post_init_keymap(void) { + writePinHigh(TOP_LED); + writePinHigh(MIDDLE_LED); + writePinHigh(BOTTOM_LED); + + is_led_stoplight_active = true; + led_stoplight_timer = timer_read(); +}; + +void matrix_scan_led_stoplight(void) { + if (is_led_stoplight_active) { + if (timer_elapsed(led_stoplight_timer) > (1000 * (led_stoplight_index + 1))) { + switch (led_stoplight_index){ + case 0: + writePinLow(TOP_LED); + led_stoplight_index++; + break; + case 1: + writePinLow(MIDDLE_LED); + led_stoplight_index++; + break; + case 2: + writePinLow(BOTTOM_LED); + led_stoplight_index++; + break; + default: + led_stoplight_index = 0; + is_led_stoplight_active = false; + led_stoplight_timer = 0; + led_update_kb(host_keyboard_led_state()); + break; + + } + } + } +}; + +void matrix_scan_keymap(void) { + matrix_scan_led_stoplight(); +}; + +#ifdef USE_LEDS_FOR_LAYERS +// example of how to use LEDs as layer indicators +static uint8_t top = 0; +static uint8_t middle = 0; + +layer_state_t layer_state_set_keymap(layer_state_t state) { + top = middle = 0; + state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); + + switch (get_highest_layer(state)) { + case _FN1: + top = 1; + break; + case _FN2: + middle = 1; + break; + case _ADJUST: + top = 1; + middle = 1; + break; + default: // for any other layers, or the default layer + break; + } + return state; +} + +// override kb level function +bool led_update_user(led_t usb_led) { + if (!is_led_stoplight_active) { + writePin(TOP_LED, !top); + writePin(MIDDLE_LED, !middle); + writePin(BOTTOM_LED, !usb_led.caps_lock); // still use bottom for Caps Lock + }; + return false; // we are using LEDs for something else override kb +} +#endif diff --git a/keyboards/maartenwut/wonderland/keymaps/brandonschlack/rules.mk b/keyboards/maartenwut/wonderland/keymaps/brandonschlack/rules.mk new file mode 100755 index 000000000000..80361c34fddc --- /dev/null +++ b/keyboards/maartenwut/wonderland/keymaps/brandonschlack/rules.mk @@ -0,0 +1,8 @@ +# Build Options +# comment out to disable the options. +# +MOUSEKEY_ENABLE = yes # Mouse keys +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +VELOCIKEY_ENABLE = no + From 76358fe818431f71a950d2cea140e6dc49b97610 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 8 Jun 2020 10:09:06 -0700 Subject: [PATCH 393/429] [Keymap] Add extra MINS & EQL on Nightmare - Add KC_MINS & KC_EQL to Raise+J & Raise+K to help with 40% muscle memory. --- keyboards/nightmare/keymaps/brandonschlack/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/nightmare/keymaps/brandonschlack/keymap.c b/keyboards/nightmare/keymaps/brandonschlack/keymap.c index 25e53c008d8c..869052309a1a 100644 --- a/keyboards/nightmare/keymaps/brandonschlack/keymap.c +++ b/keyboards/nightmare/keymaps/brandonschlack/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ * │Nxt│││~ `│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│   │ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │VlU│││    │ F1│ F2│ F3│ F4│ F5│ F6│   │   │   │   │   │      │ + * │VlU│││    │ F1│ F2│ F3│ F4│ F5│ F6│_ -│+ =│   │   │   │      │ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ * │VlD│││      │ F7│ F8│ F9│F10│F11│F12│   │   │   │| \│    │   │ * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┼───┬┼┬┬┬┤ @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_RAISE] = LAYOUT_default( \ KC_MNXT, 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_VOLU, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, _______, _______, _______, _______, _______, \ + KC_VOLU, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, _______, _______, _______, _______, \ KC_VOLD, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, KC_BSLS, _______, _______, \ KC_MPRV, _______, _______, _______, _______, _______ \ ), From 3f0fe8c441b4226920a9cbef7574ec03033d8aaa Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 10 Jun 2020 14:51:14 -0700 Subject: [PATCH 394/429] [Keymap] Change arrows on romeo keymap --- .../romeo/keymaps/brandonschlack/keymap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c index 6d38fa56d96b..03bc765daa63 100644 --- a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c +++ b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c @@ -36,19 +36,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Lower * ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ -* │Del │BrD│BrU│Msn│LHP│   │   │   │Hom│ ↑ │PgU│ SlpD│ +* │Del │BrD│BrU│Msn│LHP│   │   │   │PgU│Hom│End│ SlpD│ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ -* │HyCaps│Mut│VlU│NxW│PvT│Bck│Fwd│NxT│ ← │ → │ Play│ +* │HyCaps│Mut│VlU│NxW│PvT│Bck│Fwd│NxT│PgD│ ↑ │ Play│ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ -* │ │Prv│VlD│Nxt│1PX│1Ps│   │End│ ↓ │PgD│ │ +* │ │Prv│VlD│Nxt│1PX│1Ps│   │ ← │ ↓ │ → │ │ * ├────┬───┼───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤ * │ │ │ │ │ │ │ │ * └────┴───┴───┴────────────────────────┴────┴───┴────┘ */ [_LOWER] = LAYOUT_ansi_40( \ - KC_DELT, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, KC_HOME, KC_UP, KC_PGUP, MC_SLPD, \ - HY_CAPS, KC_MUTE, KC_VOLU, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, KC_LEFT, KC_RGHT, KC_MPLY, \ - _______, KC_MPRV, KC_VOLD, KC_MNXT, PX_AFLL, OP_AFLL, KC_VOLD, KC_END, KC_DOWN, KC_PGDN, _______, \ + KC_DELT, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, KC_PGUP, KC_HOME, KC_END, MC_SLPD, \ + HY_CAPS, KC_MUTE, KC_VOLU, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, KC_PGDN, KC_UP, KC_MPLY, \ + _______, KC_MPRV, KC_VOLD, KC_MNXT, PX_AFLL, OP_AFLL, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, \ _______, _______, _______, _______, _______, _______, _______ \ ), /* Raise From 4cb484726dbd0756289c7db551e81841f7b2fc4e Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 12 Jun 2020 11:58:51 -0700 Subject: [PATCH 395/429] [User] Add PGD_OPT alias - Tap Right Option for Page Down alias --- users/brandonschlack/process_records.h | 1 + 1 file changed, 1 insertion(+) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index ea0620d2dbf9..6b710c6fcc92 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -86,6 +86,7 @@ void matrix_scan_cmd_tab(void); #define PGU_SFT RSFT_T(KC_PGUP) // Tap Right Shift for Page Up #define HOM_OPT ROPT_T(KC_HOME) // Tap Right Option for Home #define HOM_CMD RCMD_T(KC_HOME) // Tap Right Command for Home +#define PGD_OPT ROPT_T(KC_PGDN) // Tap Right Option for Page Down #define PGD_FN1 LT(1, KC_PGDN) // Tap Fn for Page Down #define PGD_LWR PGD_FN1 // Tap Lower for Page Down #define PGD_FN2 LT(2, KC_PGDN) // Tap Fn2 for Page Down From 40ee0b1f5ad77fcd36400d183135476d0b6eee87 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 12 Jun 2020 12:00:21 -0700 Subject: [PATCH 396/429] [Keymap] Add personal 60_tsangan_hhkb layout --- .../brandonschlack-tsngn/keymap.c | 69 +++++++++++++++++++ .../brandonschlack-tsngn/readme.md | 11 +++ .../brandonschlack-tsngn/rules.mk | 1 + 3 files changed, 81 insertions(+) create mode 100644 layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c create mode 100644 layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/readme.md create mode 100644 layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/rules.mk diff --git a/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c b/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c new file mode 100644 index 000000000000..4d6482be2fc9 --- /dev/null +++ b/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c @@ -0,0 +1,69 @@ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Base layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│Bspc │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter  │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + * │ LShift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │↑ Shft│FnP│ + * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ + * │Ctrl │Opt│ Cmd │                           │ ←Cmd│↓Op│→Ctrl│ + * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ + */ +[_BASE] = LAYOUT_60_tsangan_hhkb( \ + 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, \ + HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, UP_RSFT, PLY_FN1, \ + KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, LFT_CMD, DWN_OPT, RGT_CTL \ +), + +/* Function Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │MKE│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│LHP│SLP│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │RMod │RH+│RS+│RV+│Bl+│   │   │   │   │   │   │ ↑ │MNC│ Del │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │RTgl  │RH-│RS-│RV-│Bl-│   │   │   │VlD│Vlu│ ← │ → │   Play │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + * │        │LYR│Thm│BlT│   │RST│   │Mut│Prv│Nxt│ ↓ │PgUSft│   │ + * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ + * │     │   │     │                           │HmCmd│PDO│EndCl│ + * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ + */ +[_FN1] = LAYOUT_60_tsangan_hhkb( \ + QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, \ + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, BL_INC, _______, _______, _______, _______, _______, _______, KC_UP, MC_MSSN, KC_DELT, \ + RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, BL_DEC, _______, _______, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_RGHT, KC_MPLY, \ + _______, RGB_LYR, RGB_THM, BL_TOGG, _______, RESET, _______, KC_MUTE, KC_MPRV, KC_MNXT, KC_DOWN, PGU_SFT, _______, \ + _______, _______, _______, _______, HOM_CMD, PGD_OPT, END_CTL \ +) +/* Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │      │   │   │   │   │   │   │   │   │   │   │   │        │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + * │        │   │   │   │   │   │   │   │   │   │   │      │   │ + * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ + * │     │   │     │                           │     │   │     │ + * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ + */ +/* +[BLANK] = LAYOUT_60_tsangan_hhkb( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ +) +*/ + +}; diff --git a/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/readme.md b/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/readme.md new file mode 100644 index 000000000000..d79cf7f07ec5 --- /dev/null +++ b/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/readme.md @@ -0,0 +1,11 @@ +# brandonschlack's 60 Tsangan HHKB Layout + +It is used on + +* [AN-C](https://github.com/qmk/qmk_firmware/tree/master/keyboards/cannonkeys/an_c) +* [Instant60](https://github.com/qmk/qmk_firmware/tree/master/keyboards/cannonkeys/instant60) +* [Polaris](https://github.com/qmk/qmk_firmware/tree/master/keyboards/ai03/polaris) +* [Plain60](https://github.com/qmk/qmk_firmware/tree/master/keyboards/maartenwut/plain60) + +## Features +### Mod-Taps & Layer-Taps diff --git a/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/rules.mk b/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/rules.mk new file mode 100644 index 000000000000..7aaf727ad220 --- /dev/null +++ b/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/rules.mk @@ -0,0 +1 @@ +USER_NAME := brandonschlack From 220de4cabcd32650ba258385bf1af34c9d444373 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 12 Jun 2020 12:03:00 -0700 Subject: [PATCH 397/429] [Keymap] Update personal 60_ansi_split_bs_rshift - Add Nav Mod-Taps to FN layer - Move media controls on FN layer --- .../brandonschlack-split/keymap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c index b57d7aa7bd57..8947521ed7f0 100644 --- a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c +++ b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c @@ -42,21 +42,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ * │MKE│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│LHP│SLP│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │RMod │RH+│RS+│RV+│AS+│   │   │   │VlU│Prv│Nxt│ ↑ │MNC│ Del │ + * │RMod │RH+│RS+│RV+│AS+│   │   │   │   │   │   │ ↑ │MNC│ Del │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │RTgl  │RH-│RS-│RV-│AS-│   │   │VlD│Hom│PgU│ ← │ → │   Play │ + * │RTgl  │RH-│RS-│RV-│AS-│   │   │   │VlD│VlU│ ← │ → │   Play │ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - * │        │LYR│Thm│   │   │RST│   │Mut│End│PgD│ ↓ │      │   │ + * │        │LYR│Thm│   │   │RST│   │Mut│Prv│Nxt│ ↓ │PgUSft│   │ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ - * │    │    │    │                        │    │    │    │    │ + * │    │    │    │                        │    │HmOp│PgDF│EndC│ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ */ [_FN1] = LAYOUT_60_ansi_split_bs_rshift( \ QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, \ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_VOLU, KC_MPRV, KC_MNXT, KC_UP, MC_MSSN, KC_DELT, \ RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, KC_VOLD, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_MPLY, \ - _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, KC_MUTE, KC_END, KC_PGDN, KC_DOWN, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______ \ + _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, KC_MUTE, KC_END, KC_PGDN, KC_DOWN, PGU_SFT, _______, \ + _______, _______, _______, _______, _______, HOM_OPT, PGD_FN1, END_CTL \ ) /* Layer * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ From 00e346324ea31e1c9063247bede580470da1f99b Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 17 Jun 2020 12:25:48 -0700 Subject: [PATCH 398/429] [User] Add Right-RShift Mod-Tap alias --- users/brandonschlack/process_records.h | 1 + 1 file changed, 1 insertion(+) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 6b710c6fcc92..c82c45139bfe 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -76,6 +76,7 @@ void matrix_scan_cmd_tab(void); #define DWN_FN2 LT(2, KC_DOWN) // Tap Fn2 for Down #define DWN_RAI DWN_FN2 // Tap Raise for Down #define DWN_OPT ROPT_T(KC_DOWN) // Tap Right Option for Down +#define RGT_SFT RSFT_T(KC_RGHT) // Tap Right Shift for Right #define RGT_OPT ROPT_T(KC_RGHT) // Tap Right Option for Right #define RGT_CTL RCTL_T(KC_RGHT) // Tap Right Ctrl for Right /** From 0a848823f9d4cdd3630e8479b7a2bedfa41f707e Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 17 Jun 2020 12:26:42 -0700 Subject: [PATCH 399/429] [Keymap] Change arrows on Wonderland layout --- .../maartenwut/wonderland/keymaps/brandonschlack/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/maartenwut/wonderland/keymaps/brandonschlack/keymap.c b/keyboards/maartenwut/wonderland/keymaps/brandonschlack/keymap.c index 66cee63c57af..344e1bcb4be2 100755 --- a/keyboards/maartenwut/wonderland/keymaps/brandonschlack/keymap.c +++ b/keyboards/maartenwut/wonderland/keymaps/brandonschlack/keymap.c @@ -20,9 +20,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN1] = LAYOUT( \ KC_MUTE, QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, \ - KC_VOLU, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_UP, MC_MSSN, KC_DELT, \ - KC_VOLD, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_MPLY, \ - _______, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, \ + KC_VOLU, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_HOME, KC_UP, KC_END, KC_DELT, \ + KC_VOLD, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_MPRV, KC_MNXT, KC_PGDN, KC_UP, KC_MPLY, \ + _______, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, RGT_SFT, _______, \ _______, _______, _______, _______, _______, _______, _______ \ ), From 8831bc8bf4d9262516f3cd4868a3b4ea29deee98 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 17 Jun 2020 12:28:06 -0700 Subject: [PATCH 400/429] [Keymap] Restructure Stoplight LED towards feature --- .../keymaps/brandonschlack/config.h | 1 + .../keymaps/brandonschlack/keymap.c | 42 ++++++++++++++----- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/keyboards/maartenwut/wonderland/keymaps/brandonschlack/config.h b/keyboards/maartenwut/wonderland/keymaps/brandonschlack/config.h index 68534bfe1677..b9ff7db291cb 100644 --- a/keyboards/maartenwut/wonderland/keymaps/brandonschlack/config.h +++ b/keyboards/maartenwut/wonderland/keymaps/brandonschlack/config.h @@ -1 +1,2 @@ #define USE_LEDS_FOR_LAYERS +#define STOPLIGHT_LED diff --git a/keyboards/maartenwut/wonderland/keymaps/brandonschlack/keymap.c b/keyboards/maartenwut/wonderland/keymaps/brandonschlack/keymap.c index 344e1bcb4be2..373c6af45590 100755 --- a/keyboards/maartenwut/wonderland/keymaps/brandonschlack/keymap.c +++ b/keyboards/maartenwut/wonderland/keymaps/brandonschlack/keymap.c @@ -1,15 +1,11 @@ #include QMK_KEYBOARD_H #include "brandonschlack.h" +// LEDs #define TOP_LED B1 #define MIDDLE_LED B2 #define BOTTOM_LED B3 -bool is_led_stoplight_active = false; -uint8_t led_stoplight_index = 0; -uint16_t led_stoplight_timer = 0; -void matrix_scan_led_stoplight(void); - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT( \ KC_HOME, 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, \ @@ -54,7 +50,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ }; -void keyboard_post_init_keymap(void) { +#ifdef STOPLIGHT_LED +bool is_led_stoplight_active = false; +uint8_t led_stoplight_index = 0; +uint16_t led_stoplight_timer = 0; +void matrix_scan_led_stoplight(void); + +void led_stoplight_start(void) { writePinHigh(TOP_LED); writePinHigh(MIDDLE_LED); writePinHigh(BOTTOM_LED); @@ -63,20 +65,32 @@ void keyboard_post_init_keymap(void) { led_stoplight_timer = timer_read(); }; +void led_stoplight_set(pin_t pin) { + writePinLow(pin); +}; + +void led_stoplight_end(void) { + // Reset timer and status variables + led_stoplight_index = 0; + is_led_stoplight_active = false; + led_stoplight_timer = 0; + led_update_kb(host_keyboard_led_state()); +}; + void matrix_scan_led_stoplight(void) { if (is_led_stoplight_active) { if (timer_elapsed(led_stoplight_timer) > (1000 * (led_stoplight_index + 1))) { switch (led_stoplight_index){ case 0: - writePinLow(TOP_LED); + led_stoplight_set(TOP_LED); led_stoplight_index++; break; case 1: - writePinLow(MIDDLE_LED); + led_stoplight_set(MIDDLE_LED); led_stoplight_index++; break; case 2: - writePinLow(BOTTOM_LED); + led_stoplight_set(BOTTOM_LED); led_stoplight_index++; break; default: @@ -85,14 +99,22 @@ void matrix_scan_led_stoplight(void) { led_stoplight_timer = 0; led_update_kb(host_keyboard_led_state()); break; - } } } }; +#endif + +void keyboard_post_init_keymap(void) { +#ifdef STOPLIGHT_LED + led_stoplight_start(); +#endif +}; void matrix_scan_keymap(void) { +#ifdef STOPLIGHT_LED matrix_scan_led_stoplight(); +#endif }; #ifdef USE_LEDS_FOR_LAYERS From 5abd6259c5d59b7a07fbb3e11f9c99635c16de81 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 10 Jul 2020 10:23:50 -0700 Subject: [PATCH 401/429] [Keymap] Update Nightmare readme --- .../keymaps/brandonschlack/readme.md | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/keyboards/nightmare/keymaps/brandonschlack/readme.md b/keyboards/nightmare/keymaps/brandonschlack/readme.md index 2b9ebfc707b1..94c77833ff50 100644 --- a/keyboards/nightmare/keymaps/brandonschlack/readme.md +++ b/keyboards/nightmare/keymaps/brandonschlack/readme.md @@ -1,3 +1,20 @@ # brandonschlack's Nightmare Keymap -![Base, Raise, Lower](https://i.imgur.com/j02sheQ.jpg) +![Base, Raise, Lower](https://i.imgur.com/08759vK.png) + +## Features +- Mod-Taps & Layer-Taps + - Spacebar is used as a Fn button when held to access missing numrow and F-keys on the **RAISE** layer. + - Holding `Tab` acts as `HYPER`, or `Shift+Control+Option+Command`. I use this set global shortcuts, such as `HYPER+w` for my **W**indow manager Moom. +- **Lower** Layer + - `Lower+Esc` for `Delete` + - `Lower+LShift` for `Caps Lock`. Holding `Lower+LShift` still acts as `LShift` + - Arrow keys as `Lower+[`,`;`,`'`,`/` for `Up`,`Left`,`Right`,`Down`. + - Media keys as `Lower+Enter`,`Home`,`End` for `Play/Pause`,`Next Track`,`Prev Track` + - Volume controls as `Lower+]`,`Page Up`,`Page Down` for `Mute`,`Volume Up`,`Volume Down` +- MacOS shortcuts on **Lower** Layer + - Display Brightness as `Lower+Q`,`W` for `Brightness Down`, `Brightness Up` + - Mission Control as `Lower+E` + - Launchpad as `Lower+R` + - Sleep Display as `Lower+Backspace` + - Browser From 49e4c654c3ccad374c502c098ae417ebcdc2317c Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Fri, 10 Jul 2020 10:24:55 -0700 Subject: [PATCH 402/429] [Keymap] Swap KC_SCLN for KC_QUOT on Liminal --- .../the_royal/liminal/keymaps/brandonschlack/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c b/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c index f9aea6c4dadf..acda2c94ac5a 100644 --- a/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c +++ b/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c @@ -6,7 +6,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ┌───┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ * │Hom│Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│ BsPc│ * ├───┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │PgU│HyEsc │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│   Enter│ + * │PgU│HyEsc │ A │ S │ D │ F │ G │ H │ J │ K │ L │" '│   Enter│ * ├───┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ * │PgD│Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ ↑Shft│ * ├───┼────┬───┼───┴┬──┴───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤ @@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_BASE] = LAYOUT_base_kit_all( \ KC_HOME, 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_BSPC, \ - KC_PGUP, HY_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, XXXXXXX, KC_ENT, \ + KC_PGUP, HY_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, XXXXXXX, KC_ENT, \ KC_PGDN, KC_LSFT, XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, UP_RSFT, \ KC_END, KC_LCTL, KC_LOPT, KC_LCMD, XXXXXXX, SPC_RAI, XXXXXXX, LFT_CMD, DWN_LWR, RGT_OPT \ ), @@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ┌───┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ * │Nxt│~ `  │! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│} ]│     │ * ├───┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │VlU│      │ F1│ F2│ F3│ F4│ F5│ F6│_ -│+ =│   │" '│        │ + * │VlU│      │ F1│ F2│ F3│ F4│ F5│ F6│_ -│+ =│   │: ;│        │ * ├───┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤ * │VlD│        │ F7│ F8│ F9│F10│F11│F12│   │{ [│} ]│| \│ ⇞Shft│ * ├───┼────┬───┼───┴┬──┴───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤ @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_RAISE] = LAYOUT_base_kit_all( \ KC_MNXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_RBRC, _______, \ - KC_VOLU, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, _______, KC_QUOT, XXXXXXX, _______, \ + KC_VOLU, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, _______, KC_SCLN, XXXXXXX, _______, \ KC_VOLD, _______, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_LBRC, KC_RBRC, KC_BSLS, PGU_SFT, \ KC_MPRV, _______, _______, _______, XXXXXXX, _______, XXXXXXX, HOM_CMD, PGD_LWR, END_OPT \ ), From dabe3c47de3d6d44e6bef00720bb0cf02bf4c7d8 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 28 Jul 2020 11:33:14 -0700 Subject: [PATCH 403/429] [Keymap] Add 65_ansi_blocker_split_bs keymap --- .../brandonschlack-split/config.h | 49 ++++++++ .../brandonschlack-split/keymap.c | 116 ++++++++++++++++++ .../brandonschlack-split/readme.md | 15 +++ .../brandonschlack-split/rules.mk | 2 + 4 files changed, 182 insertions(+) create mode 100644 layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/config.h create mode 100644 layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c create mode 100644 layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/readme.md create mode 100644 layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/rules.mk diff --git a/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/config.h b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/config.h new file mode 100644 index 000000000000..0527f8d84104 --- /dev/null +++ b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/config.h @@ -0,0 +1,49 @@ +#pragma once + +#ifdef RGB_MATRIX_ENABLE +// Disable RGB Effects +#define DISABLE_RGB_MATRIX_ALPHAS_MODS +// #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN +// #define DISABLE_RGB_MATRIX_BREATHING +#define DISABLE_RGB_MATRIX_BAND_SAT +#define DISABLE_RGB_MATRIX_BAND_VAL +#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +#define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT +#define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL +#define DISABLE_RGB_MATRIX_CYCLE_ALL +#define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +#define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN +#define DISABLE_RGB_MATRIX_CYCLE_OUT_IN +#define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +#define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +#define DISABLE_RGB_MATRIX_DUAL_BEACON +#define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL +#define DISABLE_RGB_MATRIX_CYCLE_SPIRAL +#define DISABLE_RGB_MATRIX_RAINBOW_BEACON +#define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS +#define DISABLE_RGB_MATRIX_RAINDROPS +#define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +#define DISABLE_RGB_MATRIX_TYPING_HEATMAP +#define DISABLE_RGB_MATRIX_DIGITAL_RAIN +#define DISABLE_RGB_MATRIX_SOLID_REACTIVE +// #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +#define DISABLE_RGB_MATRIX_SPLASH +#define DISABLE_RGB_MATRIX_MULTISPLASH +#define DISABLE_RGB_MATRIX_SOLID_SPLASH +#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH + +#define QMK_KEYS_PER_SCAN 4 + +#define USB_LED_CAPS_LOCK_SCANCODE 30 +#endif + +#ifdef KEYBOARD_massdrop_alt +#undef USB_LED_INDICATOR_ENABLE +#endif diff --git a/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c new file mode 100644 index 000000000000..e370ce46ad99 --- /dev/null +++ b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c @@ -0,0 +1,116 @@ +/* Copyright 2019 Brandon Schlack + * + * 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 . + */ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Base Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│Hom│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ + * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│ Bspc│PgU│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│   Enter│PgD│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│End│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬┬┬───┼───┼───┤ + * │Ctrl│ Opt│ Cmd│          Space         │Cmd │FnPy│││Lef│Dow│Rig│ + * └────┴────┴────┴────────────────────────┴────┴────┴┴┴───┴───┴───┘ + */ +[_BASE] = LAYOUT_65_ansi_blocker_split_bs( \ + 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_HOME, \ + 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, KC_PGUP, \ + HY_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_PGDN, \ + 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_UP, KC_END, \ + KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, PLY_FN1, KC_LEFT, KC_DOWN, KC_RGHT \ +), +/* Function Layer + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Mke│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│LHP│MNC│SlD│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ + * │RMod │RH+│RS+│RV+│AS+│ │ │ │ │ │F13│F14│F15│  Del│VlU│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │RTgl │RH-│RS-│RV-│AS-│ │ │ │ │ │ │ │ │VlD│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ │LYR│Thm│ │ │RST│ │   │Prv│Nxt│Ply│ │PgU│Mut│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬┬┬───┼───┼───┤ + * │ │ │ │ │ │ │││Hom│PgD│End│ + * └────┴────┴────┴────────────────────────┴────┴────┴┴┴───┴───┴───┘ + */ +[_FN1] = LAYOUT_65_ansi_blocker_split_bs( \ + QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_MSSN, MC_SLPD, \ + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_F13, KC_F14, KC_F15, KC_DELT, KC_VOLU, \ + RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, \ + _______, RGB_LYR, RGB_THM, _______, _______, RESET, _______, _______, KC_MPRV, KC_MNXT, KC_MPLY, _______, KC_PGUP, KC_MUTE, \ + _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ +), +/* Blank Layout + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬┬┬───┼───┼───┤ + * │ │ │ │ │ │ │││ │ │ │ + * └────┴────┴────┴────────────────────────┴────┴────┴┴┴───┴───┴───┘ +[X] = LAYOUT_65_ansi_blocker_split_bs( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +), +*/ +}; + +// Runs just one time when the keyboard initializes. +void matrix_init_keymap(void) { +}; + +// Runs once after keyboard initializes +void keyboard_post_init_keymap(void) { +}; + +// Runs constantly in the background, in a loop. +void matrix_scan_keymap(void) { +}; + +bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + #ifdef KEYBOARD_massdrop + case RGB_TOG: + if (record->event.pressed) { + rgb_matrix_cycle_flag(); + } + return false; + #endif + default: + return true; //Process all other keycodes normally + } +} + +#ifdef RGB_MATRIX_ENABLE +void rgb_matrix_indicators_user(void) { + if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) { + rgb_matrix_set_color(USB_LED_CAPS_LOCK_SCANCODE, RGB_GREEN); + } else if (!HAS_ANY_FLAGS(rgb_matrix_get_flags(), LED_FLAG_KEYS)){ + rgb_matrix_set_color(USB_LED_CAPS_LOCK_SCANCODE, 0, 0, 0); + } +} +#endif diff --git a/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/readme.md b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/readme.md new file mode 100644 index 000000000000..51c7938eb47c --- /dev/null +++ b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/readme.md @@ -0,0 +1,15 @@ +# brandonschlack's 65% ANSI blocker split backspace layout + +This is my preferred 65% layout. + +It is used on: + +* [Massdrop ALT](https://github.com/qmk/qmk_firmware/tree/master/keyboards/massdrop/alt) +* [KBD67 MKII](https://github.com/qmk/qmk_firmware/tree/master/keyboards/kbdfans/kbd67/mkiirgb) + +## [Base Layer](http://www.keyboard-layout-editor.com/#/gists/a820c8629394f8f4c3943e6ee518d9a8) +![Base Layer](https://i.imgur.com/gPxDZl7.jpg) + +## [Function Layer](http://www.keyboard-layout-editor.com/#/gists/8ca73a6d3bec8ce736f5db60edf31dcf) +![Function Layer](https://i.imgur.com/gNKHgWa.jpg) + diff --git a/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/rules.mk b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/rules.mk new file mode 100644 index 000000000000..d12f9d5d3206 --- /dev/null +++ b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/rules.mk @@ -0,0 +1,2 @@ +# Build Options +USER_NAME := brandonschlack From 905a5c9fb5533e057e1fd28f67631ca8960b5774 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 28 Jul 2020 11:33:42 -0700 Subject: [PATCH 404/429] [Keymap] Add initial TMOv2 keymap --- .../tmov2/keymaps/brandonschlack/keymap.c | 99 +++++++++++++++++++ .../tmov2/keymaps/brandonschlack/rules.mk | 1 + 2 files changed, 100 insertions(+) create mode 100644 keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c create mode 100644 keyboards/cannonkeys/tmov2/keymaps/brandonschlack/rules.mk diff --git a/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c b/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c new file mode 100644 index 000000000000..7bd4004cbccb --- /dev/null +++ b/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c @@ -0,0 +1,99 @@ +/* +Copyright 2012,2013 Jun Wako + +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 . +*/ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /** + * Base + * ┌───┬┬┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Hom│││Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│Bck│ + * ├───┼┼┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │PgU│││HyEsc │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│ + * ├───┼┼┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ + * │PgD│││Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│Shft│ Fn│ + * ├───┼┼┼┬┬┬┬┬┬┬┬┴──┬┴───┴┬──┴───┴─┬─┴───┴───┴┬──┴──┬┴──┬┼┬┬┬┬┼┬┬┬┤ + * │End│││││││││││Opt│Cmd  │        │          │  Cmd│Ctl│││││││││││ + * └───┴┴┴┴┴┴┴┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┴┴┴┴┴┴┘ + */ + [_BASE] = LAYOUT_default( + KC_HOME, 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, \ + KC_PGUP, HY_ESC, 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_PGDN, KC_LSFT, XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, PLY_FN1, \ + KC_END, KC_LOPT, KC_LCMD, SPC_RAI, SPC_RAI, KC_RCMD, KC_RCTL \ + ), + /** + * Lower + * ┌───┬┬┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Nxt│││Del  │BrD│BrU│Msn│LHP│   │   │   │   │   │   │ ↑ │Mut│SlD│ + * ├───┼┼┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │VlU│││HyCaps│   │   │NxW│PvT│Bck│Fwd│NxT│   │   │ ← │ → │ Play │ + * ├───┼┼┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ + * │VlD│││        │   │   │   │1PX│1Ps│   │   │   │   │ ↓ │    │   │ + * ├───┼┼┼┬┬┬┬┬┬┬┬┴──┬┴───┴┬──┴───┴─┬─┴───┴───┴┬──┴──┬┴──┬┼┬┬┬┬┼┬┬┬┤ + * │Prv│││││││││││   │     │        │          │     │   │││││││││││ + * └───┴┴┴┴┴┴┴┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┴┴┴┴┴┴┘ + */ + [_LOWER] = LAYOUT_default( \ + KC_MNXT, KC_DELT, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, KC_UP, KC_MUTE, MC_SLPD, \ + KC_VOLU, HY_CAPS, _______, _______, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, _______, _______, KC_LEFT, KC_RGHT, KC_MPLY, \ + KC_VOLD, _______, XXXXXXX, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, KC_DOWN, _______, _______, \ + KC_MPRV, _______, _______, _______, _______, _______, _______ \ + ), + + /** + * Raise + * ┌───┬┬┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Nxt│││~ `  │! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│   │ + * ├───┼┼┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │VlU│││      │ F1│ F2│ F3│ F4│ F5│ F6│_ -│+ =│   │   │   │      │ + * ├───┼┼┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ + * │VlD│││        │ F7│ F8│ F9│F10│F11│F12│   │   │   │| \│    │   │ + * ├───┼┼┼┬┬┬┬┬┬┬┬┴──┬┴───┴┬──┴───┴─┬─┴───┴───┴┬──┴──┬┴──┬┼┬┬┬┬┼┬┬┬┤ + * │Prv│││││││││││   │     │        │          │     │   │││││││││││ + * └───┴┴┴┴┴┴┴┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┴┴┴┴┴┴┘ + */ + [_RAISE] = LAYOUT_default( \ + KC_MNXT, 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_VOLU, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, _______, _______, _______, _______, \ + KC_VOLD, _______, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, KC_BSLS, _______, _______, \ + KC_MPRV, _______, _______, _______, _______, _______, _______ \ + ), + /** + * Adjust + * ┌───┬┬┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │   │││Make │   │   │EEP│RST│   │   │   │   │   │   │   │   │   │ + * ├───┼┼┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │   │││      │   │   │   │   │   │   │   │   │   │   │   │      │ + * ├───┼┼┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ + * │   │││        │   │   │   │   │   │   │   │   │   │   │    │   │ + * ├───┼┼┼┬┬┬┬┬┬┬┬┴──┬┴───┴┬──┴───┴─┬─┴───┴───┴┬──┴──┬┴──┬┼┬┬┬┬┼┬┬┬┤ + * │   │││││││││││   │     │        │          │     │   │││││││││││ + * └───┴┴┴┴┴┴┴┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┴┴┴┴┴┴┘ + */ + [_ADJUST] = LAYOUT_default( \ + _______, QM_MAKE, _______, _______, EEP_RST, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ + ), +}; + +layer_state_t layer_state_set_keymap(layer_state_t state) { + state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); + return state; +} diff --git a/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/rules.mk b/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/rules.mk new file mode 100644 index 000000000000..e0ed6f0c2d6f --- /dev/null +++ b/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/rules.mk @@ -0,0 +1 @@ +RGBLIGHT_ENABLE = no From 45ec055554316750235b10c2db080f65e633f514 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 30 Jul 2020 14:54:20 -0700 Subject: [PATCH 405/429] [User] Implement macro mode layers - Remove IS_MACROPAD define - Define layers for macro keys in keymap layers - Move function layers higher in the stack - Implemented for bdn9, launchpad, nightmare --- .../bdn9/keymaps/brandonschlack/keymap.c | 17 ++- .../launchpad/keymaps/brandonschlack/keymap.c | 18 ++- .../nightmare/keymaps/brandonschlack/keymap.c | 105 ++++++++++++++++-- users/brandonschlack/brandonschlack.h | 12 +- users/brandonschlack/process_records.h | 14 +-- 5 files changed, 130 insertions(+), 36 deletions(-) diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 92e7dcc35487..3c5287bc9e5f 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -1,12 +1,27 @@ #include QMK_KEYBOARD_H #include "brandonschlack.h" +/** + * Layer Names + */ +#define _REEDER _BASE enum bdn9_layers { - LR_NAV = KEYMAP_LAYERS, + _MEDIA = KEYMAP_LAYERS, + _NAVI, + _KARABINER, + LR_NAV, LR_REVIEW, LR_EDIT }; +/** + * Keycodes & Macros + */ +#define DF_REDR DF(_REEDER) // Set Default Layer to Reeder shortcuts +#define DF_MEDA DF(_MEDIA) // Set Default Layer to Media controls +#define DF_NAVI DF(_NAVI) // Set Default Layer to Navigation shortcuts +#define DF_KBNR DF(_KARABINER) // Set Default Layer to Basic Macro keys + enum bdn9_keycodes { TG_LNAV = KEYMAP_SAFE_RANGE, TG_REVW, diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index db2e7c380d3f..aae258a5dee7 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -1,7 +1,23 @@ #include QMK_KEYBOARD_H #include "brandonschlack.h" -// Layers defined in brandonschlack.h +/** + * Layer Names + */ +#define _REEDER _BASE +enum bdn9_layers { + _MEDIA = KEYMAP_LAYERS, + _NAVI, + _KARABINER +}; + +/** + * Keycodes & Macros + */ +#define DF_REDR DF(_REEDER) // Set Default Layer to Reeder shortcuts +#define DF_MEDA DF(_MEDIA) // Set Default Layer to Media controls +#define DF_NAVI DF(_NAVI) // Set Default Layer to Navigation shortcuts +#define DF_KBNR DF(_KARABINER) // Set Default Layer to Basic Macro keys // Tap Dances enum launchpad_dances { diff --git a/keyboards/nightmare/keymaps/brandonschlack/keymap.c b/keyboards/nightmare/keymaps/brandonschlack/keymap.c index 869052309a1a..4b5122134689 100644 --- a/keyboards/nightmare/keymaps/brandonschlack/keymap.c +++ b/keyboards/nightmare/keymaps/brandonschlack/keymap.c @@ -16,6 +16,25 @@ #include QMK_KEYBOARD_H #include "brandonschlack.h" +/** + * Layer Names + * + * Layers mostly used for macro keys + */ +enum macro_layers { + _REEDER = KEYMAP_LAYERS, + _NAV, + _MOUSE, +}; + +/** + * Keycodes & Macros + */ +#define TG_BASE TO(_BASE) +#define TG_REDR TO(_REEDER) +#define TG_NAV TO(_NAV) +#define TG_MOUS TO(_MOUSE) + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /** * Base @@ -35,6 +54,65 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, PLY_FN1, \ KC_END, KC_LOPT, KC_LCMD, SPC_RAI, KC_RCMD, KC_RCTL \ ), + +/** + * Reeder + * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ P │││   │   │   │   │   │   │   │   │   │   │   │   │   │   │ + * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ K │││    │   │   │   │   │   │   │   │   │   │   │   │      │ + * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ + * │ J │││      │   │   │   │   │   │   │   │   │   │   │    │   │ + * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┼───┬┼┬┬┬┤ + * │ N ││││││││   │    │                           │    │   ││││││ + * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘ + */ + +[_REEDER] = LAYOUT_default( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______ \ +), + +/** + * Nav + * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ → │││   │   │   │   │   │   │   │   │   │   │   │   │   │   │ + * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ ↑ │││    │   │   │   │   │   │   │   │   │   │   │   │      │ + * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ + * │ ↓ │││      │   │   │   │   │   │   │   │   │   │   │    │   │ + * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┼───┬┼┬┬┬┤ + * │ ← ││││││││   │    │                           │    │   ││││││ + * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘ + */ +[_NAV] = LAYOUT_default( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______ \ +), + +/** + * Mouse + * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │WhU│││   │   │   │   │   │   │   │   │   │   │   │   │   │   │ + * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ ↑ │││    │   │   │   │   │   │   │   │   │   │   │   │      │ + * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ + * │ ↓ │││      │   │   │   │   │   │   │   │   │   │   │    │   │ + * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┼───┬┼┬┬┬┤ + * │WhD││││││││   │    │                           │    │   ││││││ + * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘ + */ +[_MOUSE] = LAYOUT_default( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______ \ +), + /** * Lower * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ @@ -53,6 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_VOLD, SF_CAPS, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, KC_DOWN, _______, _______, \ KC_MPRV, _______, _______, _______, _______, _______ \ ), + /** * Raise * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ @@ -71,24 +150,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_VOLD, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, KC_BSLS, _______, _______, \ KC_MPRV, _______, _______, _______, _______, _______ \ ), + /** * Adjust * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │   │││Mke│   │   │EEP│RST│   │   │   │   │   │   │   │   │   │ + * │Bse│││Mke│   │   │EEP│RST│   │   │   │   │   │   │   │   │   │ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │   │││    │   │   │   │   │   │   │   │   │   │   │   │      │ + * │Rdr│││    │   │   │   │   │   │   │   │   │   │   │   │      │ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ - * │   │││      │   │   │   │   │   │   │   │   │   │   │    │   │ + * │Nav│││      │   │   │   │   │   │   │   │   │   │   │    │   │ * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┼───┬┼┬┬┬┤ - * │   ││││││││   │    │                           │    │   ││││││ + * │Mse││││││││   │    │                           │    │   ││││││ * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘ */ [_ADJUST] = LAYOUT_default( \ - _______, QM_MAKE, _______, _______, EEP_RST, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______ \ + TG_BASE, QM_MAKE, _______, _______, EEP_RST, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + TG_REDR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + TG_NAV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + TG_MOUS, _______, _______, _______, _______, _______ \ ), + /** * Blank * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ @@ -97,16 +178,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │   │││    │   │   │   │   │   │   │   │   │   │   │   │      │ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ * │   │││      │   │   │   │   │   │   │   │   │   │   │    │   │ - * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┼┬┬┬┤ - * │   ││││││││   │    │   │        │          │   │    │   ││││││ - * └───┴┴┴┴┴┴┴┴───┴────┴───┴────────┴──────────┴───┴────┴───┴┴┴┴┴┘ + * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┼───┬┼┬┬┬┤ + * │   ││││││││   │    │                           │    │   ││││││ + * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘ */ /* [] = LAYOUT_default( \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + _______, _______, _______, _______, _______, _______ \ ), */ }; diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 32cd18025de8..b32335edff15 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -13,19 +13,11 @@ /* TODO Layer Names */ enum bs_layers { -#if !defined(IS_MACROPAD) // Keyboard Layers _BASE = 0, - _FN1 = 1, - _FN2, - _MACRO, -#else // Macropad Layers - _REEDER = 0, - _MEDIA, - _NAVI, - _KARABINER, -#endif KEYMAP_LAYERS, // Add more layers in keymaps /* Protected Layer */ + _FN1 = 11, + _FN2 = 12, _AUDIO = 13, // 13: Audio controls _LIGHT = 14, // 14: Backlight/RGB controls _ADJUST = 15 // 15: Change keyboard settings diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index c82c45139bfe..db1d0065a952 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -59,9 +59,8 @@ void matrix_scan_cmd_tab(void); #define RWD_CMD RCMD_T(KC_MPRV) // Tap Right Command for Prev Track #define PLY_CMD RCMD_T(KC_MPLY) // Tap Right Command for Play/Pause #define FFD_OPT ROPT_T(KC_MNXT) // Tap Right Option for Next Track -#define PLY_FN1 LT(1, KC_MPLY) // Tap Fn for Play/Pause -#define PLY_FN2 LT(2, KC_MPLY) // Tap Fn2 for Play/Pause -#define PLY_MCO LT(_MACRO, KC_MPLY) // Tap MacroFn for Play/Pause +#define PLY_FN1 LT(_FN1, KC_MPLY) // Tap Fn for Play/Pause +#define PLY_FN2 LT(_FN2, KC_MPLY) // Tap Fn2 for Play/Pause #define MUT_SFT RSFT_T(KC_MUTE) // Tap Right Shift for Mute /** * Arrow Mod-Tap @@ -126,15 +125,6 @@ void matrix_scan_cmd_tab(void); #define MC_WH_L KC_WH_R // Mouse Wheel Left #define MC_WH_R KC_WH_L // Mouse Wheel Right -// Macropad Defines -#if defined(IS_MACROPAD) -// Macropad Default Layer keycodes -#define DF_REDR DF(_REEDER) // Set Default Layer to Reeder shortcuts -#define DF_MEDA DF(_MEDIA) // Set Default Layer to Media controls -#define DF_NAVI DF(_NAVI) // Set Default Layer to Navigation shortcuts -#define DF_KBNR DF(_KARABINER) // Set Default Layer to Basic Macro keys -#endif - // RGB Theme #define RGB_THM RGB_THEME_FORWARD // Cycle next RGB_THEME #define RGB_RTHM RGB_THEME_REVERSE // Cycle previous RGB_THEME From 206cf3faf43bb86a50c4d6ad3ed6e617cabd7942 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 30 Jul 2020 14:55:01 -0700 Subject: [PATCH 406/429] [User] Change make_command to use qmk cli --- users/brandonschlack/process_records.c | 39 +++++++++++++++----------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index 2a796f925fa4..350e5205517d 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -12,11 +12,11 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { // Consolidated Macros bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case QM_MAKE: // + case QM_MAKE: // Sends 'qmk compile' or 'qmk flash' if (record->event.pressed) { bool flash = false; // If is a keyboard and auto-flash is not set in rules.mk, - // then Shift will trigger the :flash target + // then Shift will trigger the flash command #if !defined(FLASH_BOOTLOADER) && !defined(IS_MACROPAD) uint8_t temp_mod = get_mods(); uint8_t temp_osm = get_oneshot_mods(); @@ -30,7 +30,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { send_make_command(flash); } break; - case QM_FLSH: // Sends Make command with :flash target + case QM_FLSH: // Sends flash command instead of compile if (record->event.pressed) { clear_mods(); clear_oneshot_mods(); @@ -124,25 +124,32 @@ void matrix_scan_cmd_tab(void) { /** * Send Make Command * - * Sends 'make keyboard:keymap command to compile firmware - * Adds :flash target and resets keyboard, if flash_bootloader set to true - * Sends FORCE_LAYOUT parameter if built with FORCE_LAYOUT + * Sends 'qmk compile -kb keyboard -km keymap' command to compile firmware + * Uses 'qmk flash' and resets keyboard, if flash_bootloader set to true + * Sends CTPC and/or FORCE_LAYOUT parameters if built with those options */ void send_make_command(bool flash_bootloader) { - SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP); +#ifdef FORCE_LAYOUT // Add layout string if built with FORCE_LAYOUT + SEND_STRING("FORCE_LAYOUT=" FORCE_LAYOUT " "); +#endif +#ifdef CONVERT_TO_PROTON_C // Add CTPC if built with CONVERT_TO_PROTON_C + SEND_STRING("CTPC=yes "); +#endif + SEND_STRING("qmk "); if (flash_bootloader) { -#if defined(KEYBOARD_massdrop_alt) // only run for Massdrop ALT - SEND_STRING(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP); -#else // use universal flash command - SEND_STRING(":flash"); +#ifndef KEYBOARD_massdrop // Don't run flash for Massdrop boards + SEND_STRING("flash "); + } else { #endif + SEND_STRING("compile "); } -#if defined(FORCE_LAYOUT) // Add layout string if built with FORCE_LAYOUT - SEND_STRING(" FORCE_LAYOUT=" FORCE_LAYOUT); -#endif -#if defined(CONVERT_TO_PROTON_C) // Add CTPC if built with CONVERT_TO_PROTON_C - SEND_STRING(" CTPC=yes"); + SEND_STRING("-kb " QMK_KEYBOARD " "); + SEND_STRING("-km " QMK_KEYMAP); + if (flash_bootloader) { +#if defined(KEYBOARD_massdrop) // only run for Massdrop boards + SEND_STRING(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP); #endif + } SEND_STRING(SS_TAP(X_ENTER)); if (flash_bootloader) { reset_keyboard(); From 0bd7f4d7a4b4f7f2f2f500a907ecef2bf41154d7 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 30 Jul 2020 14:55:59 -0700 Subject: [PATCH 407/429] [Keymap] Update launchpad RGB config --- keyboards/launchpad/keymaps/brandonschlack/config.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/keyboards/launchpad/keymaps/brandonschlack/config.h b/keyboards/launchpad/keymaps/brandonschlack/config.h index 3b19c178f316..22e0ee1dce87 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/config.h +++ b/keyboards/launchpad/keymaps/brandonschlack/config.h @@ -1,9 +1,13 @@ #pragma once /* Underlight Configuration */ -#define RGB_DI_PIN F4 +#ifdef RGB_DI_PIN + #undef RGB_DI_PIN + #define RGB_DI_PIN F4 + #undef RGBLED_NUM + #define RGBLED_NUM 2 // Number of LEDs +#endif #define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation -#define RGBLED_NUM 2 // Number of LEDs #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 17 From c5e4e9db28b283f4ed22e30383940d27e07d1d5e Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 30 Jul 2020 14:56:42 -0700 Subject: [PATCH 408/429] [User] Disable RGB_THEME with RGBLIGHT_LAYERS --- users/brandonschlack/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/brandonschlack/config.h b/users/brandonschlack/config.h index de0d33509013..16e1b27cd3ad 100644 --- a/users/brandonschlack/config.h +++ b/users/brandonschlack/config.h @@ -9,7 +9,7 @@ # define RGBLIGHT_SLEEP #endif -#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) +#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) && !defined(RGBLIGHT_LAYERS) # define RGB_THEME_ENABLE #endif From 424b14fe18e9e3dbfe841e8562f5dd204a3984fb Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 30 Jul 2020 14:57:25 -0700 Subject: [PATCH 409/429] [Keymap] Update TMOv2 with macro layers --- .../tmov2/keymaps/brandonschlack/keymap.c | 93 +++++++++++++++++-- .../tmov2/keymaps/brandonschlack/rules.mk | 1 - 2 files changed, 85 insertions(+), 9 deletions(-) delete mode 100644 keyboards/cannonkeys/tmov2/keymaps/brandonschlack/rules.mk diff --git a/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c b/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c index 7bd4004cbccb..86bde2c32aca 100644 --- a/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c +++ b/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c @@ -17,6 +17,25 @@ along with this program. If not, see . #include QMK_KEYBOARD_H #include "brandonschlack.h" +/** + * Layer Names + * + * Layers mostly used for macro keys + */ +enum macro_layers { + _REEDER = KEYMAP_LAYERS, + _NAV, + _MOUSE, +}; + +/** + * Keycodes & Macros + */ +#define TG_BASE TO(_BASE) +#define TG_REDR TO(_REEDER) +#define TG_NAV TO(_NAV) +#define TG_MOUS TO(_MOUSE) + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /** * Base @@ -36,6 +55,60 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PGDN, KC_LSFT, XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, PLY_FN1, \ KC_END, KC_LOPT, KC_LCMD, SPC_RAI, SPC_RAI, KC_RCMD, KC_RCTL \ ), + /** + * Reeder + * ┌───┬┬┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ P │││     │   │   │   │   │   │   │   │   │   │   │   │   │   │ + * ├───┼┼┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ K │││      │   │   │   │   │   │   │   │   │   │   │   │      │ + * ├───┼┼┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ + * │ J │││        │   │   │   │   │   │   │   │   │   │   │    │   │ + * ├───┼┼┼┬┬┬┬┬┬┬┬┴──┬┴───┴┬──┴───┴─┬─┴───┴───┴┬──┴──┬┴──┬┼┬┬┬┬┼┬┬┬┤ + * │ N │││││││││││   │     │        │          │     │   │││││││││││ + * └───┴┴┴┴┴┴┴┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┴┴┴┴┴┴┘ + */ + [_REEDER] = LAYOUT_default( \ + KC_P, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_K, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_J, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_N, _______, _______, _______, _______, _______, _______ \ + ), + /** + * Nav + * ┌───┬┬┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ → │││     │   │   │   │   │   │   │   │   │   │   │   │   │   │ + * ├───┼┼┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ ↑ │││      │   │   │   │   │   │   │   │   │   │   │   │      │ + * ├───┼┼┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ + * │ ↓ │││        │   │   │   │   │   │   │   │   │   │   │    │   │ + * ├───┼┼┼┬┬┬┬┬┬┬┬┴──┬┴───┴┬──┴───┴─┬─┴───┴───┴┬──┴──┬┴──┬┼┬┬┬┬┼┬┬┬┤ + * │ ← │││││││││││   │     │        │          │     │   │││││││││││ + * └───┴┴┴┴┴┴┴┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┴┴┴┴┴┴┘ + */ + [_NAV] = LAYOUT_default( \ + KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_DOWN, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_LEFT, _______, _______, _______, _______, _______, _______ \ + ), + /** + * Mouse + * ┌───┬┬┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │WhU│││     │   │   │   │   │   │   │   │   │   │   │   │   │   │ + * ├───┼┼┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │ ↑ │││      │   │   │   │   │   │   │   │   │   │   │   │      │ + * ├───┼┼┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ + * │ ↓ │││        │   │   │   │   │   │   │   │   │   │   │    │   │ + * ├───┼┼┼┬┬┬┬┬┬┬┬┴──┬┴───┴┬──┴───┴─┬─┴───┴───┴┬──┴──┬┴──┬┼┬┬┬┬┼┬┬┬┤ + * │WhD│││││││││││   │     │        │          │     │   │││││││││││ + * └───┴┴┴┴┴┴┴┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┴┴┴┴┴┴┘ + */ + [_MOUSE] = LAYOUT_default( \ + MC_WH_U, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_DOWN, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + MC_WH_D, _______, _______, _______, _______, _______, _______ \ + ), /** * Lower * ┌───┬┬┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ @@ -76,23 +149,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /** * Adjust * ┌───┬┬┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │   │││Make │   │   │EEP│RST│   │   │   │   │   │   │   │   │   │ + * │Bse│││Make │   │   │EEP│RST│   │   │   │   │   │   │   │   │   │ * ├───┼┼┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │   │││      │   │   │   │   │   │   │   │   │   │   │   │      │ + * │Rdr│││      │   │   │   │   │   │   │   │   │   │   │   │      │ * ├───┼┼┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ - * │   │││        │   │   │   │   │   │   │   │   │   │   │    │   │ + * │Nav│││        │   │   │   │   │   │   │   │   │   │   │    │   │ * ├───┼┼┼┬┬┬┬┬┬┬┬┴──┬┴───┴┬──┴───┴─┬─┴───┴───┴┬──┴──┬┴──┬┼┬┬┬┬┼┬┬┬┤ - * │   │││││││││││   │     │        │          │     │   │││││││││││ + * │Mse│││││││││││   │     │        │          │     │   │││││││││││ * └───┴┴┴┴┴┴┴┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┴┴┴┴┴┴┘ */ [_ADJUST] = LAYOUT_default( \ - _______, QM_MAKE, _______, _______, EEP_RST, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______ \ + TG_BASE, QM_MAKE, _______, _______, EEP_RST, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + TG_REDR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + TG_NAV, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + TG_MOUS, _______, _______, _______, _______, _______, _______ \ ), }; +void keyboard_post_init_keymap(void) { + rgblight_disable_noeeprom(); +} + layer_state_t layer_state_set_keymap(layer_state_t state) { state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); return state; diff --git a/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/rules.mk b/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/rules.mk deleted file mode 100644 index e0ed6f0c2d6f..000000000000 --- a/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = no From 07aebca91d5e21ce6fffea839cdf61d659889f40 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 30 Jul 2020 14:58:10 -0700 Subject: [PATCH 410/429] [Keymap] Add initial adelais/rgb_led keymap --- .../adelais/keymaps/brandonschlack/config.h | 4 + .../adelais/keymaps/brandonschlack/keymap.c | 197 ++++++++++++++++++ .../adelais/keymaps/brandonschlack/readme.md | 1 + 3 files changed, 202 insertions(+) create mode 100644 keyboards/mechlovin/adelais/keymaps/brandonschlack/config.h create mode 100644 keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c create mode 100644 keyboards/mechlovin/adelais/keymaps/brandonschlack/readme.md diff --git a/keyboards/mechlovin/adelais/keymaps/brandonschlack/config.h b/keyboards/mechlovin/adelais/keymaps/brandonschlack/config.h new file mode 100644 index 000000000000..62ab40f57917 --- /dev/null +++ b/keyboards/mechlovin/adelais/keymaps/brandonschlack/config.h @@ -0,0 +1,4 @@ +#pragma once + +#define STOPLIGHT_LED +#define USE_LEDS_FOR_LAYERS diff --git a/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c b/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c new file mode 100644 index 000000000000..e349b051247a --- /dev/null +++ b/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c @@ -0,0 +1,197 @@ +/* Copyright 2020 Team Mechlovin + * + * 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 . + */ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +// LEDs +#define TOP_LED B2 +#define MIDDLE_LED C15 +#define BOTTOM_LED B9 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT_all( \ + KC_HOME, 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_PGUP, 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, \ + KC_PGDN, HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, PLY_FN1, KC_RSFT, KC_SLSH, \ + KC_LOPT, KC_LCMD, SPC_RAI, KC_LCTL, SPC_RAI, KC_RCMD, KC_ROPT \ + ), + [_FN1] = LAYOUT_all( \ + KC_MUTE, QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, \ + KC_VOLU, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_HOME, KC_UP, KC_END, KC_DELT, \ + KC_VOLD, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_MPRV, KC_MNXT, KC_PGDN, KC_UP, KC_MPLY, \ + _______, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, _______, RGT_SFT, KC_DOWN, \ + _______, _______, _______, _______, _______, _______, _______ \ + + ), + [_FN2] = LAYOUT_all( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ + + ), + [_ADJUST] = LAYOUT_all( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ + + ) + /* + [_BLANK] = LAYOUT( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ + + ) + */ +}; + +#ifdef STOPLIGHT_LED +bool is_led_stoplight_active = false; +uint8_t led_stoplight_index = 0; +uint16_t led_stoplight_timer = 0; +void matrix_scan_led_stoplight(void); + +void led_stoplight_start(void) { + writePinLow(TOP_LED); + writePinLow(MIDDLE_LED); + writePinLow(BOTTOM_LED); + + is_led_stoplight_active = true; + led_stoplight_timer = timer_read(); +}; + +void led_stoplight_set(pin_t pin) { + writePinHigh(pin); +}; + +void led_stoplight_end(void) { + // Reset timer and status variables + led_stoplight_index = 0; + is_led_stoplight_active = false; + led_stoplight_timer = 0; + led_update_kb(host_keyboard_led_state()); +}; + +void matrix_scan_led_stoplight(void) { + if (is_led_stoplight_active) { + if (timer_elapsed(led_stoplight_timer) > (1000 * (led_stoplight_index + 1))) { + switch (led_stoplight_index){ + case 0: + led_stoplight_set(TOP_LED); + led_stoplight_index++; + break; + case 1: + led_stoplight_set(MIDDLE_LED); + led_stoplight_index++; + break; + case 2: + led_stoplight_set(BOTTOM_LED); + led_stoplight_index++; + break; + default: + led_stoplight_index = 0; + is_led_stoplight_active = false; + led_stoplight_timer = 0; + led_update_kb(host_keyboard_led_state()); + break; + } + } + } +}; +#endif + +void keyboard_post_init_keymap(void) { +#ifdef STOPLIGHT_LED + led_stoplight_start(); +#endif +}; + +void matrix_scan_keymap(void) { +#ifdef STOPLIGHT_LED + matrix_scan_led_stoplight(); +#endif +}; + +#ifdef USE_LEDS_FOR_LAYERS +// example of how to use LEDs as layer indicators +static uint8_t top = 0; +static uint8_t middle = 0; + +layer_state_t layer_state_set_keymap(layer_state_t state) { + top = middle = 0; + state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); + + switch (get_highest_layer(state)) { + case _FN1: + top = 1; + break; + case _FN2: + middle = 1; + break; + case _ADJUST: + top = 1; + middle = 1; + break; + default: // for any other layers, or the default layer + break; + } + return state; +} + +// override kb level function +bool led_update_user(led_t usb_led) { + if (!is_led_stoplight_active) { + writePin(TOP_LED, top); + writePin(MIDDLE_LED, middle); + writePin(BOTTOM_LED, usb_led.caps_lock); // still use bottom for Caps Lock + }; + return false; // we are using LEDs for something else override kb +} +#endif + +#ifdef ENCODER_ENABLE +void encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + } + else if (index == 1) { + if (clockwise) { + tap_code(KC_LEFT); + } else { + tap_code(KC_RGHT); + } + } + else if (index == 2) { + if (clockwise) { + tap_code(KC_UP); + } else { + tap_code(KC_DOWN); + } + } +} + + #endif diff --git a/keyboards/mechlovin/adelais/keymaps/brandonschlack/readme.md b/keyboards/mechlovin/adelais/keymaps/brandonschlack/readme.md new file mode 100644 index 000000000000..54d78d873b52 --- /dev/null +++ b/keyboards/mechlovin/adelais/keymaps/brandonschlack/readme.md @@ -0,0 +1 @@ +# The default keymap for adelais From 6db70b4daad8fa2b45154a80b595b03e56073078 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 4 Aug 2020 12:36:46 -0700 Subject: [PATCH 411/429] [Keymap] Move RGB to ADJUST layer on adelais --- .../adelais/keymaps/brandonschlack/keymap.c | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c b/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c index e349b051247a..ba6e6e82eca0 100644 --- a/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c +++ b/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c @@ -26,30 +26,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_HOME, 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_PGUP, 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, \ KC_PGDN, HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, PLY_FN1, KC_RSFT, KC_SLSH, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, LOWER, KC_RSFT, KC_SLSH, \ KC_LOPT, KC_LCMD, SPC_RAI, KC_LCTL, SPC_RAI, KC_RCMD, KC_ROPT \ ), - [_FN1] = LAYOUT_all( \ + [_LOWER] = LAYOUT_all( \ KC_MUTE, QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, \ - KC_VOLU, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_HOME, KC_UP, KC_END, KC_DELT, \ + KC_VOLU, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_END, KC_DELT, \ KC_VOLD, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_MPRV, KC_MNXT, KC_PGDN, KC_UP, KC_MPLY, \ _______, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, _______, RGT_SFT, KC_DOWN, \ _______, _______, _______, _______, _______, _______, _______ \ ), - [_FN2] = LAYOUT_all( \ + [_RAISE] = LAYOUT_all( \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______ \ ), [_ADJUST] = LAYOUT_all( \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, RGB_LYR, RGB_THM, _______, EEP_RST, RESET, RESET, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______ \ ) @@ -142,20 +142,20 @@ layer_state_t layer_state_set_keymap(layer_state_t state) { state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); switch (get_highest_layer(state)) { - case _FN1: - top = 1; - break; - case _FN2: - middle = 1; - break; - case _ADJUST: - top = 1; - middle = 1; - break; - default: // for any other layers, or the default layer - break; + case _LOWER: + top = 1; + break; + case _RAISE: + middle = 1; + break; + case _ADJUST: + top = 1; + middle = 1; + break; + default: // for any other layers, or the default layer + break; } - return state; + return state; } // override kb level function From e309ed8dfab06eae45e2dac10a72a0defd08515e Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 4 Aug 2020 12:38:49 -0700 Subject: [PATCH 412/429] [Keymap] Move Esc on TMOv2 --- .../tmov2/keymaps/brandonschlack/keymap.c | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c b/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c index 86bde2c32aca..a7fb81aebaa5 100644 --- a/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c +++ b/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /** * Base * ┌───┬┬┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │Hom│││Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│Bck│ + * │Esc│││Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│Bck│ * ├───┼┼┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ * │PgU│││HyEsc │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│ * ├───┼┼┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └───┴┴┴┴┴┴┴┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┴┴┴┴┴┴┘ */ [_BASE] = LAYOUT_default( - KC_HOME, 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, \ + KC_ESC, 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, \ KC_PGUP, HY_ESC, 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_PGDN, KC_LSFT, XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, PLY_FN1, \ KC_END, KC_LOPT, KC_LCMD, SPC_RAI, SPC_RAI, KC_RCMD, KC_RCTL \ @@ -131,20 +131,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /** * Raise * ┌───┬┬┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │Nxt│││~ `  │! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│   │ + * │Hom│││~ `  │! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│   │ * ├───┼┼┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ - * │VlU│││      │ F1│ F2│ F3│ F4│ F5│ F6│_ -│+ =│   │   │   │      │ + * │PgU│││      │ F1│ F2│ F3│ F4│ F5│ F6│_ -│+ =│   │   │   │      │ * ├───┼┼┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ - * │VlD│││        │ F7│ F8│ F9│F10│F11│F12│   │   │   │| \│    │   │ + * │PgD│││        │ F7│ F8│ F9│F10│F11│F12│   │   │   │| \│    │   │ * ├───┼┼┼┬┬┬┬┬┬┬┬┴──┬┴───┴┬──┴───┴─┬─┴───┴───┴┬──┴──┬┴──┬┼┬┬┬┬┼┬┬┬┤ - * │Prv│││││││││││   │     │        │          │     │   │││││││││││ + * │End│││││││││││   │     │        │          │     │   │││││││││││ * └───┴┴┴┴┴┴┴┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┴┴┴┴┴┴┘ */ [_RAISE] = LAYOUT_default( \ - KC_MNXT, 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_VOLU, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, _______, _______, _______, _______, \ - KC_VOLD, _______, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, KC_BSLS, _______, _______, \ - KC_MPRV, _______, _______, _______, _______, _______, _______ \ + KC_HOME, 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_PGUP, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, _______, _______, _______, _______, \ + KC_PGDN, _______, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, KC_BSLS, _______, _______, \ + KC_END, _______, _______, _______, _______, _______, _______ \ ), /** * Adjust From 183fade865047b9aba15ef4b64871cc85231b53e Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 18 Aug 2020 14:39:18 -0700 Subject: [PATCH 413/429] [User] Add FN2_LYR layer alias --- users/brandonschlack/process_records.h | 1 + 1 file changed, 1 insertion(+) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index db1d0065a952..4f0a55878f05 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -42,6 +42,7 @@ void matrix_scan_cmd_tab(void); #define SF_BSLS RSFT_T(KC_BSLS) // Tap Right Shift for Back Slash (\) /* Layer Aliases */ #define FN_LYR MO(_FN1) // Hold for FN Layer +#define FN2_LYR MO(_FN2) // Hold for FN2 Layer #define LOWER MO(_LOWER) // Hold for LOWER Layer #define SPC_LWR LT(_LOWER, KC_SPC) // Tap for Space, Hold for LOWER Layer #define SPC_RAI LT(_RAISE, KC_SPC) // Tap for Space, Hold for RAISE Layer From bdd2a649cafef9d62b0e73e24cd99de213ff14f1 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 18 Aug 2020 14:40:43 -0700 Subject: [PATCH 414/429] [Keymap] Update ASCII preview for 60 Tsangan HHKB --- .../60_tsangan_hhkb/brandonschlack-tsngn/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c b/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c index 4d6482be2fc9..9a5497d028ea 100644 --- a/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c +++ b/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c @@ -6,13 +6,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│Bspc │ + * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│ Bspc│ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter  │ + * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│   Enter│ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - * │ LShift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │↑ Shft│FnP│ + * │LShift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │↑ Shft│FnP│ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ - * │Ctrl │Opt│ Cmd │                           │ ←Cmd│↓Op│→Ctrl│ + * │Ctrl │Opt│Cmd  │                           │ ←Cmd│↓Op│→Ctrl│ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ */ [_BASE] = LAYOUT_60_tsangan_hhkb( \ From b9bcc1fc96033521b62fa75afd7073f0ca64ad84 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 18 Aug 2020 14:41:22 -0700 Subject: [PATCH 415/429] [User] Move Stoplight RGB to userspace --- users/brandonschlack/brandonschlack.c | 92 +++++++++++++++++++++++---- users/brandonschlack/brandonschlack.h | 14 ++++ 2 files changed, 94 insertions(+), 12 deletions(-) diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index a3c29a47c466..91847539e4ed 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -1,6 +1,9 @@ #include "brandonschlack.h" user_config_t user_config; +#ifdef STOPLIGHT_LED +static stoplight_led_t stoplight_led; +#endif /** * Resets user config in EEPROM @@ -31,6 +34,10 @@ void keyboard_post_init_keymap(void){ } void keyboard_post_init_user(void){ // Read the user config from EEPROM user_config.raw = eeconfig_read_user(); + // Do Stoplight Animation if enabled +#ifdef STOPLIGHT_LED + led_stoplight_start(); +#endif // Do RGB things if RGBs enabled #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) keyboard_post_init_rgb(); @@ -47,14 +54,14 @@ void shutdown_keymap(void) {} * then set RGB color to Red */ void shutdown_user (void) { - #ifdef RGBLIGHT_ENABLE - rgblight_enable_noeeprom(); - rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); - rgblight_sethsv_noeeprom(0, 255, 127); - #endif // RGBLIGHT_ENABLE - #ifdef RGB_MATRIX_ENABLE - rgb_matrix_set_color_all( 0xFF, 0x00, 0x00 ); - #endif //RGB_MATRIX_ENABLE +#ifdef RGBLIGHT_ENABLE + rgblight_enable_noeeprom(); + rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); + rgblight_sethsv_noeeprom(0, 255, 127); +#endif // RGBLIGHT_ENABLE +#ifdef RGB_MATRIX_ENABLE + rgb_matrix_set_color_all( 0xFF, 0x00, 0x00 ); +#endif //RGB_MATRIX_ENABLE shutdown_keymap(); } @@ -65,11 +72,11 @@ void suspend_power_down_keymap(void) {} * Set rgb_matrix suspend state to true if not already */ void suspend_power_down_user(void) { - #ifdef RGB_MATRIX_ENABLE +#ifdef RGB_MATRIX_ENABLE if (!g_suspend_state) { rgb_matrix_set_suspend_state(true); } - #endif //RGB_MATRIX_ENABLE +#endif //RGB_MATRIX_ENABLE suspend_power_down_keymap(); } @@ -80,11 +87,11 @@ void suspend_wakeup_init_keymap(void) {} * Set rgb_matrix suspend state to false if not already */ void suspend_wakeup_init_user(void) { - #ifdef RGB_MATRIX_ENABLE +#ifdef RGB_MATRIX_ENABLE if (g_suspend_state) { rgb_matrix_set_suspend_state(false); } - #endif //RGB_MATRIX_ENABLE +#endif //RGB_MATRIX_ENABLE suspend_wakeup_init_keymap(); } @@ -96,6 +103,9 @@ void matrix_scan_keymap(void) {} */ void matrix_scan_user(void) { matrix_scan_cmd_tab(); +#ifdef STOPLIGHT_LED + matrix_scan_led_stoplight(); +#endif matrix_scan_keymap(); } @@ -129,3 +139,61 @@ layer_state_t layer_state_set_user(layer_state_t state) { #endif // RGBLIGHT_ENABLE return layer_state_set_keymap(state); } + +__attribute__((weak)) bool led_update_keymap(led_t led_state) { return true; } + +bool led_update_user(led_t led_state) { +#ifdef STOPLIGHT_LED + if (stoplight_led.is_active) { + return false; + } +#endif + return led_update_keymap(led_state); +} + +#ifdef STOPLIGHT_LED +void led_stoplight_start(void) { + writePin(TOP_LED, LED_ON(false)); + writePin(MIDDLE_LED, LED_ON(false)); + writePin(BOTTOM_LED, LED_ON(false)); + + stoplight_led.is_active = true; + stoplight_led.timer = timer_read(); +}; + +void led_stoplight_set(pin_t pin) { + writePin(pin, LED_ON(true)); +}; + +void led_stoplight_end(void) { + // Reset timer and status variables + stoplight_led.is_active = false; + stoplight_led.index = 0; + stoplight_led.timer = 0; + led_update_kb(host_keyboard_led_state()); +}; + +void matrix_scan_led_stoplight(void) { + if (stoplight_led.is_active) { + if (timer_elapsed(stoplight_led.timer) > (1000 * (stoplight_led.index + 1))) { + switch (stoplight_led.index){ + case 0: + led_stoplight_set(TOP_LED); + stoplight_led.index++; + break; + case 1: + led_stoplight_set(MIDDLE_LED); + stoplight_led.index++; + break; + case 2: + led_stoplight_set(BOTTOM_LED); + stoplight_led.index++; + break; + default: + led_stoplight_end(); + break; + } + } + } +}; +#endif diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index b32335edff15..504e7ed293a7 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -44,3 +44,17 @@ void suspend_wakeup_init_keymap(void); void matrix_scan_keymap(void); layer_state_t default_layer_state_set_keymap(layer_state_t state); layer_state_t layer_state_set_keymap(layer_state_t state); +bool led_update_keymap(led_t led_state); + +#ifdef STOPLIGHT_LED +typedef struct { + bool is_active :1; + uint8_t index :7; + uint16_t timer :16; +} stoplight_led_t; + +void led_stoplight_start(void); +void led_stoplight_set(pin_t pin); +void led_stoplight_end(void); +void matrix_scan_led_stoplight(void); +#endif From 7cc983aebd9df774fd163223213170ae09f295b8 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Tue, 18 Aug 2020 14:42:02 -0700 Subject: [PATCH 416/429] [Keymap] Add OSAv2 keymap --- .../tkc/osav2/keymaps/brandonschlack/config.h | 13 ++++ .../tkc/osav2/keymaps/brandonschlack/keymap.c | 73 +++++++++++++++++++ .../tkc/osav2/keymaps/brandonschlack/rules.mk | 9 +++ 3 files changed, 95 insertions(+) create mode 100644 keyboards/tkc/osav2/keymaps/brandonschlack/config.h create mode 100755 keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c create mode 100755 keyboards/tkc/osav2/keymaps/brandonschlack/rules.mk diff --git a/keyboards/tkc/osav2/keymaps/brandonschlack/config.h b/keyboards/tkc/osav2/keymaps/brandonschlack/config.h new file mode 100644 index 000000000000..fc8ec92eabf4 --- /dev/null +++ b/keyboards/tkc/osav2/keymaps/brandonschlack/config.h @@ -0,0 +1,13 @@ +#define USE_LEDS_FOR_LAYERS +#define STOPLIGHT_LED + +#define TOP_LED C7 +#define MIDDLE_LED C6 +#define BOTTOM_LED B6 + +// #define LED_PIN_FLIP +#ifdef LED_PIN_FLIP + #define LED_ON(flag) !flag +#else + #define LED_ON(flag) flag +#endif diff --git a/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c b/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c new file mode 100755 index 000000000000..756c4751a037 --- /dev/null +++ b/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c @@ -0,0 +1,73 @@ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* LAYOUT + * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐ + * │Hom│ │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│ │& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│ + * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │PgU│ │Tab  │ Q │ W │ E │ R │ T │ │ Y │ U │ I │ O │ P │{ [│} ]│ Bspc│ + * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │PgD│ │HyCaps│ A │ S │ D │ F │ G │ │ H │ J │ K │ L │: ;│" '│   Enter│ + * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + * │LShift  │ Z │ X │ C │ V │ B │ │ B │ N │ M │< ,│> .│? /│↑ Shft│FnP│ + * ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐ ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ + * │Ctrl │ │Opt  │Spc/Cmd│Fn2 │ │   Spc/Cmd│  Opt│ │ Ctrl│ + * └─────┘ └─────┴───────┴────┘ └──────────┴─────┘ └─────┘ + */ +[_BASE] = LAYOUT_all( \ + KC_HOME, 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_PGUP, 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, \ + KC_PGDN, HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, PLY_FN1, \ + KC_LCTL, KC_LOPT, CMD_SPC, FN2_LYR, CMD_SPC, KC_ROPT, KC_RCTL \ +), +[_FN1] = LAYOUT_all( \ + KC_MUTE, QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, \ + KC_VOLU, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_HOME, KC_UP, KC_END, KC_DELT, \ + KC_VOLD, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_MPRV, KC_MNXT, KC_PGDN, KC_UP, KC_MPLY, \ + _______, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, RGT_SFT, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ + +), +[_FN2] = LAYOUT_all( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ + +), +[_ADJUST] = LAYOUT_all( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ + +) +/* +[_BLANK] = LAYOUT( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ + +) +*/ +}; + +layer_state_t layer_state_set_keymap(layer_state_t state) { + state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); + return state; +} + +#ifdef USE_LEDS_FOR_LAYERS +bool led_update_keymap(led_t led_state) { + writePin(TOP_LED, LED_ON(IS_LAYER_ON(_FN1))); // Use for Layer 1 + writePin(MIDDLE_LED, LED_ON(IS_LAYER_ON(_FN2))); // Use for Layer 2 + writePin(BOTTOM_LED, LED_ON(led_state.caps_lock)); // Use for Caps Lock + return false; // Override default set by KB +} +#endif diff --git a/keyboards/tkc/osav2/keymaps/brandonschlack/rules.mk b/keyboards/tkc/osav2/keymaps/brandonschlack/rules.mk new file mode 100755 index 000000000000..9c896e0d819f --- /dev/null +++ b/keyboards/tkc/osav2/keymaps/brandonschlack/rules.mk @@ -0,0 +1,9 @@ +# Build Options +# comment out to disable the options. +# +BACKLIGHT_ENABLE = no +MOUSEKEY_ENABLE = yes # Mouse keys +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +VELOCIKEY_ENABLE = no + From e20349bad2212537661074fd2868feb95da5d6f1 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Thu, 27 Aug 2020 12:04:34 -0700 Subject: [PATCH 417/429] [Keymap] Update mods for OSAv2 --- keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c b/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c index 756c4751a037..e0ea83051080 100755 --- a/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c +++ b/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c @@ -10,17 +10,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ * │PgD│ │HyCaps│ A │ S │ D │ F │ G │ │ H │ J │ K │ L │: ;│" '│   Enter│ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - * │LShift  │ Z │ X │ C │ V │ B │ │ B │ N │ M │< ,│> .│? /│↑ Shft│FnP│ + * │LShift  │ Z │ X │ C │ V │ B │ │ B │ N │ M │< ,│> .│? /│↑ Shft│Fn │ * ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐ ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ - * │Ctrl │ │Opt  │Spc/Cmd│Fn2 │ │   Spc/Cmd│  Opt│ │ Ctrl│ + * │Opt  │ │Cmd  │Spc/Fn1│Ctrl│ │   Spc/Rai│  Cmd│ │  Opt│ * └─────┘ └─────┴───────┴────┘ └──────────┴─────┘ └─────┘ */ [_BASE] = LAYOUT_all( \ KC_HOME, 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_PGUP, 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, \ KC_PGDN, HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, PLY_FN1, \ - KC_LCTL, KC_LOPT, CMD_SPC, FN2_LYR, CMD_SPC, KC_ROPT, KC_RCTL \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TT(_FN1),\ + KC_LOPT, KC_LCMD, SPC_LWR, KC_LCTL, SPC_RAI, KC_RCMD, KC_ROPT \ ), [_FN1] = LAYOUT_all( \ KC_MUTE, QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, \ From 8ce73df2ce5aaa365525f6dc977ea9548b82b7dd Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 2 Sep 2020 14:18:24 -0700 Subject: [PATCH 418/429] [Keymap] Fix OSAv2 Nav keys --- keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c b/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c index e0ea83051080..4aadc6cb9580 100755 --- a/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c +++ b/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN1] = LAYOUT_all( \ KC_MUTE, QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, \ - KC_VOLU, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_HOME, KC_UP, KC_END, KC_DELT, \ + KC_VOLU, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_END, KC_DELT, \ KC_VOLD, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_MPRV, KC_MNXT, KC_PGDN, KC_UP, KC_MPLY, \ _______, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, RGT_SFT, _______, \ _______, _______, _______, _______, _______, _______, _______ \ From 925d85940af9bb7e13efd1756731eb2cb2f6a24f Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 2 Sep 2020 14:19:07 -0700 Subject: [PATCH 419/429] [Keymap] Update Neuron with numpad layout --- .../neuron/keymaps/brandonschlack/keymap.c | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c b/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c index ef34c4c6e648..32660c057b31 100644 --- a/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c +++ b/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT( \ KC_DELT, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, KC_HOME, KC_UP, KC_PGUP, MC_SLPD, \ _______, KC_MUTE, KC_VOLU, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, KC_LEFT, KC_RGHT, KC_MPLY, \ - SF_CAPS, KC_MPRV, KC_VOLD, KC_MNXT, PX_AFLL, OP_AFLL, KC_VOLD, KC_END, KC_DOWN, KC_PGDN, _______, \ + SF_CAPS, KC_MPRV, KC_VOLD, KC_MNXT, PX_AFLL, OP_AFLL, _______, KC_END, KC_DOWN, KC_PGDN, _______, \ _______, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______ \ ), /* Raise @@ -47,12 +47,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │││││    │    │                        │    │││││ * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘ */ - +/* [_RAISE] = LAYOUT( \ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_SCLN, KC_QUOT, \ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_LBRC, KC_RBRC, BSL_LWR, \ _______, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______ \ +), */ +/* Raise + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │~ `│ F1│ F2│ F3│ F4│{ [│} ]│& 7│* 8│( 9│) 0│   │ + * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ + * │    │ F5│ F6│ F7│ F8│_ -│ + │$ 4│% 5│^ 6│   " '│ + * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ + * │      │ F9│F10│F11│F12│+ =│! 1│@ 2│# 3│: ;│|\Lw│ + * ├┬┬┬┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬┬┬┬┤ + * │││││    │    │                        │    │││││ + * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘ + */ +[_RAISE] = LAYOUT( \ + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_LBRC, KC_RBRC, KC_7, KC_8, KC_9, KC_0, _______, \ + _______, KC_F5, KC_F6, KC_F7, KC_F8, KC_MINS, KC_PLUS, KC_4, KC_5, KC_6, KC_QUOT, \ + _______, KC_F9, KC_F10, KC_F11, KC_F12, KC_EQL, KC_1, KC_2, KC_3, KC_SCLN, BSL_LWR, \ + _______, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______ \ ), /* Adjust/Macro * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ From 0c073535161fef2f33503b7dccdd806292db1924 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Sun, 13 Sep 2020 13:54:28 -0700 Subject: [PATCH 420/429] [User] Disable Jamon theme, Enable Striker --- users/brandonschlack/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/brandonschlack/config.h b/users/brandonschlack/config.h index 16e1b27cd3ad..67e5585f80c9 100644 --- a/users/brandonschlack/config.h +++ b/users/brandonschlack/config.h @@ -14,7 +14,7 @@ #endif #ifdef RGB_THEME_ENABLE -# define DISABLE_RGB_THEME_STRIKER +# define DISABLE_RGB_THEME_JAMON # define DISABLE_RGB_THEME_OBLIQUE #endif From 988b21b3fa30d83972bbc71f4aa2fa0f511baa24 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 21 Sep 2020 14:51:01 -0700 Subject: [PATCH 421/429] [User] Refactor userspace layer naming - Refactors layer naming to allow for macro mode layers and function layers for those modes --- .../tmov2/keymaps/brandonschlack/keymap.c | 8 +++----- .../bdn9/keymaps/brandonschlack/keymap.c | 7 +++++-- .../nightmare/keymaps/brandonschlack/keymap.c | 8 +++----- users/brandonschlack/brandonschlack.h | 20 +++++++++++++------ users/brandonschlack/tap_dances.c | 6 ------ 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c b/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c index a7fb81aebaa5..d7c9b748f333 100644 --- a/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c +++ b/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c @@ -22,11 +22,9 @@ along with this program. If not, see . * * Layers mostly used for macro keys */ -enum macro_layers { - _REEDER = KEYMAP_LAYERS, - _NAV, - _MOUSE, -}; +#define _REEDER _M1 +#define _NAV _M2 +#define _MOUSE _M3 /** * Keycodes & Macros diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 3c5287bc9e5f..8ce056166859 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -4,9 +4,9 @@ /** * Layer Names */ -#define _REEDER _BASE enum bdn9_layers { - _MEDIA = KEYMAP_LAYERS, + _REEDER = 0, + _MEDIA, _NAVI, _KARABINER, LR_NAV, @@ -14,6 +14,9 @@ enum bdn9_layers { LR_EDIT }; +#define _AUDIO 13 +#define _LIGHT 14 + /** * Keycodes & Macros */ diff --git a/keyboards/nightmare/keymaps/brandonschlack/keymap.c b/keyboards/nightmare/keymaps/brandonschlack/keymap.c index 4b5122134689..5c45ad9fc5a2 100644 --- a/keyboards/nightmare/keymaps/brandonschlack/keymap.c +++ b/keyboards/nightmare/keymaps/brandonschlack/keymap.c @@ -21,11 +21,9 @@ * * Layers mostly used for macro keys */ -enum macro_layers { - _REEDER = KEYMAP_LAYERS, - _NAV, - _MOUSE, -}; +#define _REEDER _M1 +#define _NAV _M2 +#define _MOUSE _M3 /** * Keycodes & Macros diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index 504e7ed293a7..eb6498551bfb 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -14,12 +14,20 @@ /* TODO Layer Names */ enum bs_layers { _BASE = 0, - KEYMAP_LAYERS, // Add more layers in keymaps - /* Protected Layer */ - _FN1 = 11, - _FN2 = 12, - _AUDIO = 13, // 13: Audio controls - _LIGHT = 14, // 14: Backlight/RGB controls + _M1 = 1, + _M2 = 2, + _M3 = 3, + _M4 = 4, + _FN1 = 5, + _M1_FN1 = 6, + _M2_FN1 = 7, + _M3_FN1 = 8, + _M4_FN1 = 9, + _FN2 = 10, + _M1_FN2 = 11, + _M2_FN2 = 12, + _M3_FN2 = 13, + _M4_FN2 = 14, _ADJUST = 15 // 15: Change keyboard settings }; diff --git a/users/brandonschlack/tap_dances.c b/users/brandonschlack/tap_dances.c index 7cc44bc7ae81..8c7c99a04394 100644 --- a/users/brandonschlack/tap_dances.c +++ b/users/brandonschlack/tap_dances.c @@ -24,13 +24,7 @@ void td_trigger_layer_finished (qk_tap_dance_state_t *state, void *user_data) { qk_tap_dance_trigger_layer_t *data = (qk_tap_dance_trigger_layer_t *)user_data; data->state = cur_dance(state); -#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) - if ((data->layer == _LIGHT) && ((data->trigger == SINGLE_HOLD && data->state == DOUBLE_TAP) || (data->trigger == DOUBLE_TAP && data->state == TRIPLE_TAP))) { - rgblight_toggle(); - } else if (data->state == data->trigger) { -#else if (data->state == data->trigger) { -#endif layer_on(data->layer); } else { process_tap_dance_keycode(false, data->layer); From 9de899e1a42fd0d03962ce8f234441fb8676017a Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 21 Sep 2020 14:52:37 -0700 Subject: [PATCH 422/429] [User] Add Tap Toggle layer keycodes --- users/brandonschlack/process_records.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 4f0a55878f05..1c1003654fa5 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -44,11 +44,15 @@ void matrix_scan_cmd_tab(void); #define FN_LYR MO(_FN1) // Hold for FN Layer #define FN2_LYR MO(_FN2) // Hold for FN2 Layer #define LOWER MO(_LOWER) // Hold for LOWER Layer +#define RAISE MO(_RAISE) // Hold for RAISE Layer +#define TT_FN TT(_FN1) // Hold for FN Layer, or Double-Tap to Toggle +#define TT_FN2 TT(_FN2) // Hold for FN2 Layer, or Double-Tap to Toggle +#define TT_LWR TT(_LOWER) // Hold for LOWER Layer, or Double-Tap to Toggle +#define TT_RAI TT(_RAISE) // Hold for RAISE Layer, or Double-Tap to Toggle #define SPC_LWR LT(_LOWER, KC_SPC) // Tap for Space, Hold for LOWER Layer #define SPC_RAI LT(_RAISE, KC_SPC) // Tap for Space, Hold for RAISE Layer #define SLH_LWR LT(_LOWER, KC_SLSH) // Tap for /, Hold for LOWER Layer #define BSL_LWR LT(_LOWER, KC_BSLS) // Tap for \, Hold for LOWER Layer -#define RAISE MO(_RAISE) // Hold for RAISE Layer #define MCO_LYR MO(_MACRO) // Hold for MACRO Layer #define TG_ADJT TG(_ADJUST) // Toggle ADJUST Layer #define TG_LGHT TG(_LIGHT) // Toggle LIGHT Layer From c4c999a42e2b68ff289e5706f7969f0f446d21e7 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 21 Sep 2020 14:53:09 -0700 Subject: [PATCH 423/429] [Keymap] Update ergo-layout keymaps --- .../adelais/keymaps/brandonschlack/config.h | 13 +- .../adelais/keymaps/brandonschlack/keymap.c | 254 ++++++++---------- .../tkc/osav2/keymaps/brandonschlack/keymap.c | 89 ++++-- 3 files changed, 194 insertions(+), 162 deletions(-) diff --git a/keyboards/mechlovin/adelais/keymaps/brandonschlack/config.h b/keyboards/mechlovin/adelais/keymaps/brandonschlack/config.h index 62ab40f57917..d882a9d7b8e2 100644 --- a/keyboards/mechlovin/adelais/keymaps/brandonschlack/config.h +++ b/keyboards/mechlovin/adelais/keymaps/brandonschlack/config.h @@ -1,4 +1,15 @@ #pragma once -#define STOPLIGHT_LED #define USE_LEDS_FOR_LAYERS +#define STOPLIGHT_LED + +// LEDs +#define TOP_LED B2 +#define MIDDLE_LED C15 +#define BOTTOM_LED B9 +// #define LED_PIN_FLIP +#ifdef LED_PIN_FLIP + #define LED_ON(flag) !flag +#else + #define LED_ON(flag) flag +#endif diff --git a/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c b/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c index ba6e6e82eca0..cc37cd7f4620 100644 --- a/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c +++ b/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c @@ -16,156 +16,126 @@ #include QMK_KEYBOARD_H #include "brandonschlack.h" -// LEDs -#define TOP_LED B2 -#define MIDDLE_LED C15 -#define BOTTOM_LED B9 - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT_all( \ - KC_HOME, 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_PGUP, 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, \ - KC_PGDN, HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, LOWER, KC_RSFT, KC_SLSH, \ - KC_LOPT, KC_LCMD, SPC_RAI, KC_LCTL, SPC_RAI, KC_RCMD, KC_ROPT \ - ), - [_LOWER] = LAYOUT_all( \ - KC_MUTE, QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, \ - KC_VOLU, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_END, KC_DELT, \ - KC_VOLD, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_MPRV, KC_MNXT, KC_PGDN, KC_UP, KC_MPLY, \ - _______, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, _______, RGT_SFT, KC_DOWN, \ - _______, _______, _______, _______, _______, _______, _______ \ - - ), - [_RAISE] = LAYOUT_all( \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______ \ - - ), - [_ADJUST] = LAYOUT_all( \ - _______, QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, RGB_LYR, RGB_THM, _______, EEP_RST, RESET, RESET, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______ \ - - ) - /* - [_BLANK] = LAYOUT( \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______ \ - - ) - */ -}; - -#ifdef STOPLIGHT_LED -bool is_led_stoplight_active = false; -uint8_t led_stoplight_index = 0; -uint16_t led_stoplight_timer = 0; -void matrix_scan_led_stoplight(void); - -void led_stoplight_start(void) { - writePinLow(TOP_LED); - writePinLow(MIDDLE_LED); - writePinLow(BOTTOM_LED); - - is_led_stoplight_active = true; - led_stoplight_timer = timer_read(); -}; - -void led_stoplight_set(pin_t pin) { - writePinHigh(pin); -}; - -void led_stoplight_end(void) { - // Reset timer and status variables - led_stoplight_index = 0; - is_led_stoplight_active = false; - led_stoplight_timer = 0; - led_update_kb(host_keyboard_led_state()); -}; - -void matrix_scan_led_stoplight(void) { - if (is_led_stoplight_active) { - if (timer_elapsed(led_stoplight_timer) > (1000 * (led_stoplight_index + 1))) { - switch (led_stoplight_index){ - case 0: - led_stoplight_set(TOP_LED); - led_stoplight_index++; - break; - case 1: - led_stoplight_set(MIDDLE_LED); - led_stoplight_index++; - break; - case 2: - led_stoplight_set(BOTTOM_LED); - led_stoplight_index++; - break; - default: - led_stoplight_index = 0; - is_led_stoplight_active = false; - led_stoplight_timer = 0; - led_update_kb(host_keyboard_led_state()); - break; - } - } - } -}; -#endif - -void keyboard_post_init_keymap(void) { -#ifdef STOPLIGHT_LED - led_stoplight_start(); -#endif -}; - -void matrix_scan_keymap(void) { -#ifdef STOPLIGHT_LED - matrix_scan_led_stoplight(); -#endif +/* Base + * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ + * │Hom│ │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│         │& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│ + * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │PgU│ │Tab  │ Q │ W │ E │ R │ T │         │ Y │ U │ I │ O │ P │{ [│} ]│ Bspc│ + * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │PgD│ │HyCaps│ A │ S │ D │ F │ G │         │ H │ J │ K │ L │: ;│" '│   Enter│ + * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + *       │LShift  │ Z │ X │ C │ V │ B │     │ B │ N │ M │< ,│> .│? /│  Shft│Fn │ + *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ + *       │Opt  │     │Cmd  │Spc/Lwr│Ctrl│   │   Spc/Rai│  Cmd│           │  Opt│ + *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ + */ +[_BASE] = LAYOUT_all( \ + KC_HOME, 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_PGUP, 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, \ + KC_PGDN, HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, TT_LWR, KC_RSFT, KC_SLSH, \ + KC_LOPT, KC_LCMD, SPC_LWR, KC_LCTL, SPC_RAI, KC_RCMD, KC_ROPT \ +), +/* Lower + * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ + * │Mut│ │Mke│ F1│ F2│ F3│ F4│ F5│ F6│         │ F7│ F8│ F9│F10│F11│F12│LHP│SLP│ + * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │VlU│ │RMod │RH+│RS+│RV+│Sp+│   │         │   │   │   │   │PgU│Hom│End│  Del│ + * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │VlD│ │RTgl  │RH-│RS-│RV-│Sp-│   │         │   │   │Prv│Nxt│PgD│ ↑ │   Play │ + * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + *       │        │LYR│Thm│   │   │   │     │   │   │   │   │ ← │ ↓ │→ Shft│   │ + *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ + *       │     │     │     │       │    │   │          │     │           │     │ + *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ + */ +[_LOWER] = LAYOUT_all( \ + KC_MUTE, QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, \ + KC_VOLU, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_END, KC_DELT, \ + KC_VOLD, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_MPRV, KC_MNXT, KC_PGDN, KC_UP, KC_MPLY, \ + _______, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, _______, RGT_SFT, KC_DOWN, \ + _______, _______, _______, _______, _______, _______, _______ \ + +), +/* Raise + * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ + * │   │ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ + * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │   │ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │ + * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │   │ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │ + * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │ + *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ + *       │     │     │     │       │    │   │          │     │           │     │ + *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ + */ +[_RAISE] = LAYOUT_all( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ + +), +/* Adjust + * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ + * │   │ │Mke│   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ + * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │   │ │RMod │RH+│RS+│RV+│Sp+│   │         │   │   │   │   │   │   │   │     │ + * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │   │ │RTgl  │RH-│RS-│RV-│Sp-│   │         │   │   │   │   │   │   │        │ + * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + *       │        │LYR│Thm│   │EEP│Rst│     │Rst│   │   │   │   │   │      │   │ + *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ + *       │     │     │     │       │    │   │          │     │           │     │ + *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ + */ +[_ADJUST] = LAYOUT_all( \ + _______, QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, RGB_LYR, RGB_THM, _______, EEP_RST, RESET, RESET, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ + +) +/* Layout + * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ + * │   │ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ + * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │   │ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │ + * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │   │ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │ + * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │ + *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ + *       │     │     │     │       │    │   │          │     │           │     │ + *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ + */ +/* +[_BLANK] = LAYOUT( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ + +) +*/ }; -#ifdef USE_LEDS_FOR_LAYERS -// example of how to use LEDs as layer indicators -static uint8_t top = 0; -static uint8_t middle = 0; - layer_state_t layer_state_set_keymap(layer_state_t state) { - top = middle = 0; state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); - - switch (get_highest_layer(state)) { - case _LOWER: - top = 1; - break; - case _RAISE: - middle = 1; - break; - case _ADJUST: - top = 1; - middle = 1; - break; - default: // for any other layers, or the default layer - break; - } return state; } -// override kb level function -bool led_update_user(led_t usb_led) { - if (!is_led_stoplight_active) { - writePin(TOP_LED, top); - writePin(MIDDLE_LED, middle); - writePin(BOTTOM_LED, usb_led.caps_lock); // still use bottom for Caps Lock - }; - return false; // we are using LEDs for something else override kb +#ifdef USE_LEDS_FOR_LAYERS +bool led_update_keymap(led_t led_state) { + writePin(TOP_LED, LED_ON(IS_LAYER_ON(_FN1))); // Use for Layer 1 + writePin(MIDDLE_LED, LED_ON(IS_LAYER_ON(_FN2))); // Use for Layer 2 + writePin(BOTTOM_LED, LED_ON(led_state.caps_lock)); // Use for Caps Lock + return false; // Override default set by KB } #endif diff --git a/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c b/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c index 4aadc6cb9580..3fa08d0522ea 100755 --- a/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c +++ b/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c @@ -2,18 +2,18 @@ #include "brandonschlack.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* LAYOUT - * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐ - * │Hom│ │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│ │& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│ - * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │PgU│ │Tab  │ Q │ W │ E │ R │ T │ │ Y │ U │ I │ O │ P │{ [│} ]│ Bspc│ - * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │PgD│ │HyCaps│ A │ S │ D │ F │ G │ │ H │ J │ K │ L │: ;│" '│   Enter│ - * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - * │LShift  │ Z │ X │ C │ V │ B │ │ B │ N │ M │< ,│> .│? /│↑ Shft│Fn │ - * ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐ ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ - * │Opt  │ │Cmd  │Spc/Fn1│Ctrl│ │   Spc/Rai│  Cmd│ │  Opt│ - * └─────┘ └─────┴───────┴────┘ └──────────┴─────┘ └─────┘ +/* Base + * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ + * │Hom│ │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│         │& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│ + * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │PgU│ │Tab  │ Q │ W │ E │ R │ T │         │ Y │ U │ I │ O │ P │{ [│} ]│ Bspc│ + * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │PgD│ │HyCaps│ A │ S │ D │ F │ G │         │ H │ J │ K │ L │: ;│" '│   Enter│ + * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + *       │LShift  │ Z │ X │ C │ V │ B │     │ B │ N │ M │< ,│> .│? /│  Shft│Fn │ + *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ + *       │Opt  │     │Cmd  │Spc/Lwr│Ctrl│   │   Spc/Rai│  Cmd│           │  Opt│ + *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ */ [_BASE] = LAYOUT_all( \ KC_HOME, 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, \ @@ -22,7 +22,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TT(_FN1),\ KC_LOPT, KC_LCMD, SPC_LWR, KC_LCTL, SPC_RAI, KC_RCMD, KC_ROPT \ ), -[_FN1] = LAYOUT_all( \ +/* Lower + * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ + * │Mut│ │Mke│ F1│ F2│ F3│ F4│ F5│ F6│         │ F7│ F8│ F9│F10│F11│F12│LHP│SLP│ + * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │VlU│ │RMod │RH+│RS+│RV+│Sp+│   │         │   │   │   │   │PgU│Hom│End│  Del│ + * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │VlD│ │RTgl  │RH-│RS-│RV-│Sp-│   │         │   │   │Prv│Nxt│PgD│ ↑ │   Play │ + * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + *       │        │LYR│Thm│   │   │   │     │   │   │   │   │ ← │ ↓ │→ Shft│   │ + *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ + *       │     │     │     │       │    │   │          │     │           │     │ + *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ + */ +[_LOWER] = LAYOUT_all( \ KC_MUTE, QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, \ KC_VOLU, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_END, KC_DELT, \ KC_VOLD, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_MPRV, KC_MNXT, KC_PGDN, KC_UP, KC_MPLY, \ @@ -30,7 +43,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______ \ ), -[_FN2] = LAYOUT_all( \ +/* Raise + * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ + * │   │ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ + * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │   │ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │ + * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │   │ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │ + * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │ + *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ + *       │     │     │     │       │    │   │          │     │           │     │ + *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ + */ +[_RAISE] = LAYOUT_all( \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ @@ -38,14 +64,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______ \ ), +/* Adjust + * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ + * │   │ │Mke│   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ + * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │   │ │RMod │RH+│RS+│RV+│Sp+│   │         │   │   │   │   │   │   │   │     │ + * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │   │ │RTgl  │RH-│RS-│RV-│Sp-│   │         │   │   │   │   │   │   │        │ + * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + *       │        │LYR│Thm│   │EEP│Rst│     │Rst│   │   │   │   │   │      │   │ + *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ + *       │     │     │     │       │    │   │          │     │           │     │ + *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ + */ [_ADJUST] = LAYOUT_all( \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, RGB_LYR, RGB_THM, _______, EEP_RST, RESET, RESET, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______ \ - ) +/* Layout + * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ + * │   │ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ + * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │   │ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │ + * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │   │ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │ + * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │ + *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ + *       │     │     │     │       │    │   │          │     │           │     │ + *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ + */ /* [_BLANK] = LAYOUT( \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ From 399a80fb9bc32b7d1e5d3172ba70aa9588bbc51b Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 21 Sep 2020 16:49:49 -0700 Subject: [PATCH 424/429] [Keymap] Add macro layers to ergo-layout keymaps --- .../adelais/keymaps/brandonschlack/keymap.c | 143 ++++++++++++++--- .../tkc/osav2/keymaps/brandonschlack/keymap.c | 144 +++++++++++++++--- 2 files changed, 247 insertions(+), 40 deletions(-) diff --git a/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c b/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c index cc37cd7f4620..5da20153756e 100644 --- a/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c +++ b/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c @@ -16,14 +16,31 @@ #include QMK_KEYBOARD_H #include "brandonschlack.h" +/** + * Layer Names + * + * Layers mostly used for macro keys + */ +#define _REEDER _M1 +#define _MAIL _M2 +#define _REEDER_FN _M1_FN1 +#define _MAIL_FN _M2_FN1 + +/** + * Keycodes & Macros + */ +#define TG_BASE TO(_BASE) +#define TG_REDR TO(_REEDER) +#define TG_MAIL TO(_MAIL) + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ - * │Hom│ │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│         │& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│ + * │Ply│ │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│         │& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │PgU│ │Tab  │ Q │ W │ E │ R │ T │         │ Y │ U │ I │ O │ P │{ [│} ]│ Bspc│ + * │VlU│ │Tab  │ Q │ W │ E │ R │ T │         │ Y │ U │ I │ O │ P │{ [│} ]│ Bspc│ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │PgD│ │HyCaps│ A │ S │ D │ F │ G │         │ H │ J │ K │ L │: ;│" '│   Enter│ + * │VlD│ │HyCaps│ A │ S │ D │ F │ G │         │ H │ J │ K │ L │: ;│" '│   Enter│ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ *       │LShift  │ Z │ X │ C │ V │ B │     │ B │ N │ M │< ,│> .│? /│  Shft│Fn │ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ @@ -31,19 +48,61 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ */ [_BASE] = LAYOUT_all( \ - KC_HOME, 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_PGUP, 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, \ - KC_PGDN, HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, TT_LWR, KC_RSFT, KC_SLSH, \ + KC_MPLY, 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_VOLU, 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, \ + KC_VOLD, HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, LOWER, KC_RSFT, KC_SLSH, \ KC_LOPT, KC_LCMD, SPC_LWR, KC_LCTL, SPC_RAI, KC_RCMD, KC_ROPT \ ), +/* Reeder + * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ + * │ H │ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ + * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │ K │ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │ + * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ J │ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │ + * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │ + *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ + *       │     │     │     │       │    │   │          │     │           │     │ + *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ + */ +[_REEDER] = LAYOUT_all( \ + KC_H, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_K, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_J, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ + +), +/* Mail + * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ + * │Del│ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ + * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │It+│ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │ + * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │It-│ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │ + * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │ + *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ + *       │     │     │     │       │    │   │          │     │           │     │ + *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ + */ +[_MAIL] = LAYOUT_all( \ + G(KC_BSPC), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ + +), /* Lower * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ * │Mut│ │Mke│ F1│ F2│ F3│ F4│ F5│ F6│         │ F7│ F8│ F9│F10│F11│F12│LHP│SLP│ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │VlU│ │RMod │RH+│RS+│RV+│Sp+│   │         │   │   │   │   │PgU│Hom│End│  Del│ + * │Nxt│ │RMod │RH+│RS+│RV+│Sp+│   │         │   │   │   │   │PgU│Hom│End│  Del│ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │VlD│ │RTgl  │RH-│RS-│RV-│Sp-│   │         │   │   │Prv│Nxt│PgD│ ↑ │   Play │ + * │Prv│ │RTgl  │RH-│RS-│RV-│Sp-│   │         │   │   │Prv│Nxt│PgD│ ↑ │   Play │ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ *       │        │LYR│Thm│   │   │   │     │   │   │   │   │ ← │ ↓ │→ Shft│   │ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ @@ -52,11 +111,53 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LOWER] = LAYOUT_all( \ KC_MUTE, QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, \ - KC_VOLU, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_END, KC_DELT, \ - KC_VOLD, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_MPRV, KC_MNXT, KC_PGDN, KC_UP, KC_MPLY, \ + KC_MNXT, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_END, KC_DELT, \ + KC_MPRV, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_MPRV, KC_MNXT, KC_PGDN, KC_UP, KC_MPLY, \ _______, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, _______, RGT_SFT, KC_DOWN, \ _______, _______, _______, _______, _______, _______, _______ \ +), +/* Reeder Function + * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ + * │ L │ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ + * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │ P │ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │ + * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ N │ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │ + * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │ + *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ + *       │     │     │     │       │    │   │          │     │           │     │ + *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ + */ +[_REEDER_FN] = LAYOUT_all( \ + KC_L, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_P, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_N, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ + +), +/* Mail + * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ + * │Del│ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ + * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │It+│ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │ + * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │It-│ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │ + * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │ + *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ + *       │     │     │     │       │    │   │          │     │           │     │ + *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ + */ +[_MAIL_FN] = LAYOUT_all( \ + KC_BSPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + A(G(KC_LBRC)), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + A(G(KC_RBRC)), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ + ), /* Raise * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ @@ -81,11 +182,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Adjust * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ - * │   │ │Mke│   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ + * │Bse│ │Mke│   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │   │ │RMod │RH+│RS+│RV+│Sp+│   │         │   │   │   │   │   │   │   │     │ + * │Rdr│ │RMod │RH+│RS+│RV+│Sp+│   │         │   │   │   │   │   │   │   │     │ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │   │ │RTgl  │RH-│RS-│RV-│Sp-│   │         │   │   │   │   │   │   │        │ + * │Mai│ │RTgl  │RH-│RS-│RV-│Sp-│   │         │   │   │   │   │   │   │        │ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ *       │        │LYR│Thm│   │EEP│Rst│     │Rst│   │   │   │   │   │      │   │ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ @@ -93,9 +194,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ */ [_ADJUST] = LAYOUT_all( \ - _______, QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, \ + TG_BASE, QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + TG_REDR, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + TG_MAIL, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, RGB_LYR, RGB_THM, _______, EEP_RST, RESET, RESET, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______ \ @@ -126,14 +227,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; layer_state_t layer_state_set_keymap(layer_state_t state) { - state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); + state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); + state = update_tri_layer_state(state, _REEDER, _LOWER, _REEDER_FN); + state = update_tri_layer_state(state, _MAIL, _LOWER, _MAIL_FN); return state; } #ifdef USE_LEDS_FOR_LAYERS bool led_update_keymap(led_t led_state) { - writePin(TOP_LED, LED_ON(IS_LAYER_ON(_FN1))); // Use for Layer 1 - writePin(MIDDLE_LED, LED_ON(IS_LAYER_ON(_FN2))); // Use for Layer 2 + writePin(TOP_LED, LED_ON(IS_LAYER_ON(_REEDER) || IS_LAYER_ON(_MAIL))); // Use for Macro Layer + writePin(MIDDLE_LED, LED_ON(IS_LAYER_ON(_FN1))); // Use for Layer 2 writePin(BOTTOM_LED, LED_ON(led_state.caps_lock)); // Use for Caps Lock return false; // Override default set by KB } diff --git a/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c b/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c index 3fa08d0522ea..f63cecebe3df 100755 --- a/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c +++ b/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c @@ -1,14 +1,31 @@ #include QMK_KEYBOARD_H #include "brandonschlack.h" +/** + * Layer Names + * + * Layers mostly used for macro keys + */ +#define _REEDER _M1 +#define _MAIL _M2 +#define _REEDER_FN _M1_FN1 +#define _MAIL_FN _M2_FN1 + +/** + * Keycodes & Macros + */ +#define TG_BASE TO(_BASE) +#define TG_REDR TO(_REEDER) +#define TG_MAIL TO(_MAIL) + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ - * │Hom│ │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│         │& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│ + * │Ply│ │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│         │& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │PgU│ │Tab  │ Q │ W │ E │ R │ T │         │ Y │ U │ I │ O │ P │{ [│} ]│ Bspc│ + * │VlU│ │Tab  │ Q │ W │ E │ R │ T │         │ Y │ U │ I │ O │ P │{ [│} ]│ Bspc│ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │PgD│ │HyCaps│ A │ S │ D │ F │ G │         │ H │ J │ K │ L │: ;│" '│   Enter│ + * │VlD│ │HyCaps│ A │ S │ D │ F │ G │         │ H │ J │ K │ L │: ;│" '│   Enter│ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ *       │LShift  │ Z │ X │ C │ V │ B │     │ B │ N │ M │< ,│> .│? /│  Shft│Fn │ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ @@ -16,19 +33,61 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ */ [_BASE] = LAYOUT_all( \ - KC_HOME, 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_PGUP, 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, \ - KC_PGDN, HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TT(_FN1),\ + KC_MPLY, 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_VOLU, 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, \ + KC_VOLD, HY_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, LOWER, \ KC_LOPT, KC_LCMD, SPC_LWR, KC_LCTL, SPC_RAI, KC_RCMD, KC_ROPT \ ), +/* Reeder + * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ + * │ H │ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ + * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │ K │ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │ + * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ J │ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │ + * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │ + *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ + *       │     │     │     │       │    │   │          │     │           │     │ + *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ + */ +[_REEDER] = LAYOUT_all( \ + KC_H, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_K, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_J, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ + +), +/* Mail + * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ + * │Del│ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ + * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │It+│ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │ + * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │It-│ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │ + * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │ + *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ + *       │     │     │     │       │    │   │          │     │           │     │ + *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ + */ +[_MAIL] = LAYOUT_all( \ + G(KC_BSPC), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ + +), /* Lower * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ * │Mut│ │Mke│ F1│ F2│ F3│ F4│ F5│ F6│         │ F7│ F8│ F9│F10│F11│F12│LHP│SLP│ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │VlU│ │RMod │RH+│RS+│RV+│Sp+│   │         │   │   │   │   │PgU│Hom│End│  Del│ + * │Nxt│ │RMod │RH+│RS+│RV+│Sp+│   │         │   │   │   │   │PgU│Hom│End│  Del│ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │VlD│ │RTgl  │RH-│RS-│RV-│Sp-│   │         │   │   │Prv│Nxt│PgD│ ↑ │   Play │ + * │Prv│ │RTgl  │RH-│RS-│RV-│Sp-│   │         │   │   │Prv│Nxt│PgD│ ↑ │   Play │ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ *       │        │LYR│Thm│   │   │   │     │   │   │   │   │ ← │ ↓ │→ Shft│   │ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ @@ -37,11 +96,53 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LOWER] = LAYOUT_all( \ KC_MUTE, QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, \ - KC_VOLU, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_END, KC_DELT, \ - KC_VOLD, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_MPRV, KC_MNXT, KC_PGDN, KC_UP, KC_MPLY, \ + KC_MNXT, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_END, KC_DELT, \ + KC_MPRV, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_MPRV, KC_MNXT, KC_PGDN, KC_UP, KC_MPLY, \ _______, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, RGT_SFT, _______, \ _______, _______, _______, _______, _______, _______, _______ \ +), +/* Reeder Function + * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ + * │ L │ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ + * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │ P │ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │ + * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │ N │ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │ + * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │ + *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ + *       │     │     │     │       │    │   │          │     │           │     │ + *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ + */ +[_REEDER_FN] = LAYOUT_all( \ + KC_L, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_P, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_N, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ + +), +/* Mail + * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ + * │Del│ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ + * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ + * │It+│ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │ + * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ + * │It-│ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │ + * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ + *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │ + *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ + *       │     │     │     │       │    │   │          │     │           │     │ + *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ + */ +[_MAIL_FN] = LAYOUT_all( \ + KC_BSPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + A(G(KC_LBRC)), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + A(G(KC_RBRC)), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______ \ + ), /* Raise * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ @@ -66,11 +167,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Adjust * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ - * │   │ │Mke│   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ + * │Bse│ │Mke│   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │   │ │RMod │RH+│RS+│RV+│Sp+│   │         │   │   │   │   │   │   │   │     │ + * │Rdr│ │RMod │RH+│RS+│RV+│Sp+│   │         │   │   │   │   │   │   │   │     │ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │   │ │RTgl  │RH-│RS-│RV-│Sp-│   │         │   │   │   │   │   │   │        │ + * │Mai│ │RTgl  │RH-│RS-│RV-│Sp-│   │         │   │   │   │   │   │   │        │ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ *       │        │LYR│Thm│   │EEP│Rst│     │Rst│   │   │   │   │   │      │   │ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ @@ -78,11 +179,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ */ [_ADJUST] = LAYOUT_all( \ - _______, QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, \ + TG_BASE, QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + TG_REDR, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + TG_MAIL, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, RGB_LYR, RGB_THM, _______, EEP_RST, RESET, RESET, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______ \ + ) /* Layout * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ @@ -110,14 +212,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; layer_state_t layer_state_set_keymap(layer_state_t state) { - state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); + state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); + state = update_tri_layer_state(state, _REEDER, _LOWER, _REEDER_FN); + state = update_tri_layer_state(state, _MAIL, _LOWER, _MAIL_FN); return state; } #ifdef USE_LEDS_FOR_LAYERS bool led_update_keymap(led_t led_state) { - writePin(TOP_LED, LED_ON(IS_LAYER_ON(_FN1))); // Use for Layer 1 - writePin(MIDDLE_LED, LED_ON(IS_LAYER_ON(_FN2))); // Use for Layer 2 + writePin(TOP_LED, LED_ON(IS_LAYER_ON(_REEDER) || IS_LAYER_ON(_MAIL))); // Use for Macro Layer + writePin(MIDDLE_LED, LED_ON(IS_LAYER_ON(_FN1))); // Use for Layer 2 writePin(BOTTOM_LED, LED_ON(led_state.caps_lock)); // Use for Caps Lock return false; // Override default set by KB } From 3251cc6544c4c370ad8af72c906130b172c6e4a8 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Wed, 23 Sep 2020 14:57:54 -0700 Subject: [PATCH 425/429] [User] Fix copyright declarations for user --- keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c | 2 +- keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c | 2 +- .../gray_studio/think65/solder/keymaps/brandonschlack/config.h | 2 +- keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/config.h | 2 +- keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c | 2 +- keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c | 2 +- keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c | 2 +- keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c | 2 +- keyboards/nightmare/keymaps/brandonschlack/keymap.c | 2 +- .../60_ansi_split_bs_rshift/brandonschlack-split/keymap.c | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c b/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c index d7c9b748f333..4d5a9dade42c 100644 --- a/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c +++ b/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c @@ -1,5 +1,5 @@ /* -Copyright 2012,2013 Jun Wako +Copyright 2019 Brandon Schlack 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 diff --git a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c index 03bc765daa63..e7b80e804d88 100644 --- a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c +++ b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2019 COSEYFANNITUTTI +/* Copyright 2019 Brandon Schlack * * 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 diff --git a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/config.h b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/config.h index 309eb91979d7..157b55d76df3 100644 --- a/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/config.h +++ b/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/config.h @@ -1,4 +1,4 @@ -/* Copyright 2019 MechMerlin +/* Copyright 2019 Brandon Schlack * * 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 diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/config.h b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/config.h index 26c6d6ade101..72bace6ccfbf 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/config.h +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/config.h @@ -1,4 +1,4 @@ -/* Copyright 2019 MechMerlin +/* Copyright 2019 Brandon Schlack * * 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 diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index 74cef88c0ddd..fc2e878260de 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2019 MechMerlin +/* Copyright 2019 Brandon Schlack * * 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 diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c index e5189af82564..9601bb10ec2a 100644 --- a/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2019 MechMerlin +/* Copyright 2019 Brandon Schlack * * 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 diff --git a/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c b/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c index 31e8e87567c5..c5853f52329f 100644 --- a/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c +++ b/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2018 Jack Humbert +/* Copyright 2019 Brandon Schlack * * 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 diff --git a/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c b/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c index 5da20153756e..d3ab5ed110a1 100644 --- a/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c +++ b/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2020 Team Mechlovin +/* Copyright 2020 Brandon Schlack * * 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 diff --git a/keyboards/nightmare/keymaps/brandonschlack/keymap.c b/keyboards/nightmare/keymaps/brandonschlack/keymap.c index 5c45ad9fc5a2..a0e1d1c86f10 100644 --- a/keyboards/nightmare/keymaps/brandonschlack/keymap.c +++ b/keyboards/nightmare/keymaps/brandonschlack/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2019 cfbender +/* Copyright 2019 Brandon Schlack * * 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 diff --git a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c index 8947521ed7f0..11ba14f6d1fd 100644 --- a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c +++ b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2018 Yiancar +/* Copyright 2019 Brandon Schlack * * 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 From 4d6b3e25cec01c48d55504fe73311019e6751196 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 28 Sep 2020 11:40:04 -0700 Subject: [PATCH 426/429] [Keymap] Add Prime_E keymap --- .../prime_e/keymaps/brandonschlack/config.h | 15 +++ .../prime_e/keymaps/brandonschlack/keymap.c | 95 +++++++++++++++++++ .../prime_e/keymaps/brandonschlack/rules.mk | 2 + 3 files changed, 112 insertions(+) create mode 100644 keyboards/primekb/prime_e/keymaps/brandonschlack/config.h create mode 100644 keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c create mode 100644 keyboards/primekb/prime_e/keymaps/brandonschlack/rules.mk diff --git a/keyboards/primekb/prime_e/keymaps/brandonschlack/config.h b/keyboards/primekb/prime_e/keymaps/brandonschlack/config.h new file mode 100644 index 000000000000..845ed0cdc430 --- /dev/null +++ b/keyboards/primekb/prime_e/keymaps/brandonschlack/config.h @@ -0,0 +1,15 @@ +#pragma once + +#define USE_LEDS_FOR_LAYERS +#define STOPLIGHT_LED + +#define TOP_LED B1 +#define MIDDLE_LED B2 +#define BOTTOM_LED B3 + +// #define LED_PIN_FLIP +#ifdef LED_PIN_FLIP + #define LED_ON(flag) !flag +#else + #define LED_ON(flag) flag +#endif diff --git a/keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c b/keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c new file mode 100644 index 000000000000..a92fcbfec65f --- /dev/null +++ b/keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c @@ -0,0 +1,95 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ +#include QMK_KEYBOARD_H +#include "brandonschlack.h" + +// Tap Dance declarations +enum { + TD_LR_BRC, + TD_SD_QUOT +}; + +// Tap Dance definitions +qk_tap_dance_action_t tap_dance_actions[] = { + // Tap once for LBracket, twice for RBracket + [TD_LR_BRC] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC), + // Tap once for Single Quote, twice for Double Quote + [TD_SD_QUOT] = ACTION_TAP_DANCE_DOUBLE(KC_QUOT, KC_DQT) +}; + +#define LWR_B LT(_LOWER, KC_B) +#define LWR_EQL LT(_LOWER, KC_EQL) +#define TD_BRC TD(TD_LR_BRC) +#define TD_QUOT TD(TD_SD_QUOT) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT( \ + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, TD_BRC, KC_BSPC, \ + HY_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, TD_QUOT, KC_ENT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, LWR_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, LOWER, \ + KC_LCTL, KC_LOPT, KC_LCMD, SPC_RAI, SPC_RAI, KC_RCMD, KC_ROPT, KC_RCTL \ + ), + + [_LOWER] = LAYOUT( \ + KC_DELT, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, KC_HOME, KC_UP, KC_PGUP, MC_SLPD, \ + _______, KC_MUTE, KC_VOLU, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, _______, KC_LEFT, KC_RGHT, KC_MPLY, \ + SF_CAPS, KC_MPRV, KC_VOLD, KC_MNXT, _______, PX_AFLL, OP_AFLL, _______, _______, KC_END, KC_DOWN, KC_PGDN, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______ \ + ), + + [_RAISE] = LAYOUT( \ + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_LBRC, KC_RBRC, KC_7, KC_8, KC_9, KC_0, KC_RBRC, _______, \ + _______, KC_F5, KC_F6, KC_F7, KC_F8, KC_MINS, KC_PLUS, KC_4, KC_5, KC_6, KC_SCLN, _______, \ + _______, KC_F9, KC_F10, KC_F11, KC_F12, LWR_EQL, KC_EQL, KC_1, KC_2, KC_3, _______, KC_BSLS, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______ \ + ), + + [_ADJUST] = LAYOUT( \ + QM_MAKE, _______, _______, EEP_RST, RESET, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______ \ + ) + +/* + [BLANK] = LAYOUT( \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______ \ + ) + */ +}; + +void keyboard_pre_init_user(void) { + setPinOutput(TOP_LED); + setPinOutput(MIDDLE_LED); + setPinOutput(BOTTOM_LED); +} + +layer_state_t layer_state_set_keymap(layer_state_t state) { + state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); + return state; +} + +#ifdef USE_LEDS_FOR_LAYERS +bool led_update_keymap(led_t led_state) { + writePin(TOP_LED, LED_ON(IS_LAYER_ON(_FN1))); // Use for Layer 1 + writePin(MIDDLE_LED, LED_ON(IS_LAYER_ON(_FN2))); // Use for Layer 2 + writePin(BOTTOM_LED, LED_ON(led_state.caps_lock)); // Use for Caps Lock + return false; // Override default set by KB +} +#endif diff --git a/keyboards/primekb/prime_e/keymaps/brandonschlack/rules.mk b/keyboards/primekb/prime_e/keymaps/brandonschlack/rules.mk new file mode 100644 index 000000000000..c1dfab0c7246 --- /dev/null +++ b/keyboards/primekb/prime_e/keymaps/brandonschlack/rules.mk @@ -0,0 +1,2 @@ +BACKLIGHT_ENABLE = no +TAP_DANCE_ENABLE = yes From 1b7c217de436786855ca364f7f4cd9cf1caa394f Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 5 Oct 2020 13:56:07 -0700 Subject: [PATCH 427/429] [Keymap] Update license headers --- .../tmov2/keymaps/brandonschlack/keymap.c | 30 +++++++++---------- .../romeo/keymaps/brandonschlack/keymap.c | 2 +- .../bdn9/keymaps/brandonschlack/config.h | 15 ++++++++++ .../bdn9/keymaps/brandonschlack/keymap.c | 15 ++++++++++ .../romac/keymaps/brandonschlack/keymap.c | 1 - .../launchpad/keymaps/brandonschlack/config.h | 15 ++++++++++ .../launchpad/keymaps/brandonschlack/keymap.c | 15 ++++++++++ .../keymaps/brandonschlack/config.h | 17 +++++++++++ .../keymaps/brandonschlack/keymap.c | 15 ++++++++++ .../adelais/keymaps/brandonschlack/config.h | 15 ++++++++++ .../prime_e/keymaps/brandonschlack/config.h | 15 ++++++++++ .../liminal/keymaps/brandonschlack/keymap.c | 15 ++++++++++ .../tkc/osav2/keymaps/brandonschlack/config.h | 17 +++++++++++ .../tkc/osav2/keymaps/brandonschlack/keymap.c | 15 ++++++++++ .../neuron/keymaps/brandonschlack/keymap.c | 18 +++++++++-- .../60_ansi/brandonschlack-ansi/keymap.c | 15 ++++++++++ .../brandonschlack-tsngn/keymap.c | 15 ++++++++++ .../65_ansi_blocker/brandonschlack/config.h | 15 ++++++++++ .../brandonschlack-split/config.h | 15 ++++++++++ .../brandonschlack-split/keymap.c | 2 +- .../community/75_ansi/brandonschlack/keymap.c | 15 ++++++++++ .../ortho_4x12/brandonschlack/config.h | 15 ++++++++++ .../ortho_4x12/brandonschlack/keymap.c | 1 - .../ortho_5x12/brandonschlack/config.h | 15 ++++++++++ .../ortho_5x12/brandonschlack/keymap.c | 1 - .../tkl_ansi/brandonschlack/config.h | 17 ++++++++++- users/brandonschlack/brandonschlack.c | 15 ++++++++++ users/brandonschlack/brandonschlack.h | 15 ++++++++++ users/brandonschlack/config.h | 15 ++++++++++ users/brandonschlack/process_records.c | 15 ++++++++++ users/brandonschlack/process_records.h | 15 ++++++++++ users/brandonschlack/rgb_bs.c | 15 ++++++++++ users/brandonschlack/rgb_bs.h | 15 ++++++++++ users/brandonschlack/rgb_theme.h | 15 ++++++++++ users/brandonschlack/tap_dances.c | 15 ++++++++++ users/brandonschlack/tap_dances.h | 15 ++++++++++ 36 files changed, 473 insertions(+), 23 deletions(-) diff --git a/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c b/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c index 4d5a9dade42c..12d0a22ba654 100644 --- a/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c +++ b/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c @@ -1,19 +1,19 @@ -/* -Copyright 2019 Brandon Schlack - -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. +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ #include QMK_KEYBOARD_H #include "brandonschlack.h" diff --git a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c index e7b80e804d88..58beb1b5851e 100644 --- a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c +++ b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2019 Brandon Schlack +/* Copyright 2020 Brandon Schlack * * 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 diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h index adef5b36b6b5..cde5051c8b65 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #pragma once #define ENCODER_DIRECTION_FLIP diff --git a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c index 8ce056166859..443e8d0ae922 100644 --- a/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c +++ b/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #include QMK_KEYBOARD_H #include "brandonschlack.h" diff --git a/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c b/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c index c5853f52329f..b0e4d52143ee 100644 --- a/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c +++ b/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include QMK_KEYBOARD_H #include "brandonschlack.h" diff --git a/keyboards/launchpad/keymaps/brandonschlack/config.h b/keyboards/launchpad/keymaps/brandonschlack/config.h index 22e0ee1dce87..6aaf996e57a2 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/config.h +++ b/keyboards/launchpad/keymaps/brandonschlack/config.h @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #pragma once /* Underlight Configuration */ diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/launchpad/keymaps/brandonschlack/keymap.c index aae258a5dee7..1ef77ccc6ef1 100644 --- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c +++ b/keyboards/launchpad/keymaps/brandonschlack/keymap.c @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #include QMK_KEYBOARD_H #include "brandonschlack.h" diff --git a/keyboards/maartenwut/wonderland/keymaps/brandonschlack/config.h b/keyboards/maartenwut/wonderland/keymaps/brandonschlack/config.h index b9ff7db291cb..38383cffc258 100644 --- a/keyboards/maartenwut/wonderland/keymaps/brandonschlack/config.h +++ b/keyboards/maartenwut/wonderland/keymaps/brandonschlack/config.h @@ -1,2 +1,19 @@ +/* Copyright 2019 Brandon Schlack + * + * 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 . + */ +#pragma once + #define USE_LEDS_FOR_LAYERS #define STOPLIGHT_LED diff --git a/keyboards/maartenwut/wonderland/keymaps/brandonschlack/keymap.c b/keyboards/maartenwut/wonderland/keymaps/brandonschlack/keymap.c index 373c6af45590..ca7bd773c5a6 100755 --- a/keyboards/maartenwut/wonderland/keymaps/brandonschlack/keymap.c +++ b/keyboards/maartenwut/wonderland/keymaps/brandonschlack/keymap.c @@ -1,3 +1,18 @@ +/* Copyright 2019 Brandon Schlack + * + * 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 . + */ #include QMK_KEYBOARD_H #include "brandonschlack.h" diff --git a/keyboards/mechlovin/adelais/keymaps/brandonschlack/config.h b/keyboards/mechlovin/adelais/keymaps/brandonschlack/config.h index d882a9d7b8e2..f277bcfa3e6a 100644 --- a/keyboards/mechlovin/adelais/keymaps/brandonschlack/config.h +++ b/keyboards/mechlovin/adelais/keymaps/brandonschlack/config.h @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #pragma once #define USE_LEDS_FOR_LAYERS diff --git a/keyboards/primekb/prime_e/keymaps/brandonschlack/config.h b/keyboards/primekb/prime_e/keymaps/brandonschlack/config.h index 845ed0cdc430..8a9aa040f565 100644 --- a/keyboards/primekb/prime_e/keymaps/brandonschlack/config.h +++ b/keyboards/primekb/prime_e/keymaps/brandonschlack/config.h @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #pragma once #define USE_LEDS_FOR_LAYERS diff --git a/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c b/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c index acda2c94ac5a..6c92684068d2 100644 --- a/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c +++ b/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #include QMK_KEYBOARD_H #include "brandonschlack.h" diff --git a/keyboards/tkc/osav2/keymaps/brandonschlack/config.h b/keyboards/tkc/osav2/keymaps/brandonschlack/config.h index fc8ec92eabf4..e74d93c35f2e 100644 --- a/keyboards/tkc/osav2/keymaps/brandonschlack/config.h +++ b/keyboards/tkc/osav2/keymaps/brandonschlack/config.h @@ -1,3 +1,20 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ +#pragma once + #define USE_LEDS_FOR_LAYERS #define STOPLIGHT_LED diff --git a/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c b/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c index f63cecebe3df..5e3debd8d339 100755 --- a/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c +++ b/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #include QMK_KEYBOARD_H #include "brandonschlack.h" diff --git a/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c b/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c index 32660c057b31..1193fa32c2a7 100644 --- a/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c +++ b/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #include QMK_KEYBOARD_H #include "brandonschlack.h" @@ -112,7 +127,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; layer_state_t layer_state_set_keymap(layer_state_t state) { - state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); - return state; + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); } diff --git a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c index 089a169bca20..305f032354aa 100644 --- a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c +++ b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #include QMK_KEYBOARD_H #include "brandonschlack.h" diff --git a/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c b/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c index 9a5497d028ea..b6db28ed9d87 100644 --- a/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c +++ b/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #include QMK_KEYBOARD_H #include "brandonschlack.h" diff --git a/layouts/community/65_ansi_blocker/brandonschlack/config.h b/layouts/community/65_ansi_blocker/brandonschlack/config.h index 0527f8d84104..e7b09f422c73 100644 --- a/layouts/community/65_ansi_blocker/brandonschlack/config.h +++ b/layouts/community/65_ansi_blocker/brandonschlack/config.h @@ -1,3 +1,18 @@ +/* Copyright 2019 Brandon Schlack + * + * 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 . + */ #pragma once #ifdef RGB_MATRIX_ENABLE diff --git a/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/config.h b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/config.h index 0527f8d84104..9506c7fe9103 100644 --- a/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/config.h +++ b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/config.h @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #pragma once #ifdef RGB_MATRIX_ENABLE diff --git a/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c index e370ce46ad99..a173ced335a7 100644 --- a/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c +++ b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2019 Brandon Schlack +/* Copyright 2020 Brandon Schlack * * 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 diff --git a/layouts/community/75_ansi/brandonschlack/keymap.c b/layouts/community/75_ansi/brandonschlack/keymap.c index de6919bc65b2..0f9d63c7c046 100644 --- a/layouts/community/75_ansi/brandonschlack/keymap.c +++ b/layouts/community/75_ansi/brandonschlack/keymap.c @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #include QMK_KEYBOARD_H #include "brandonschlack.h" diff --git a/layouts/community/ortho_4x12/brandonschlack/config.h b/layouts/community/ortho_4x12/brandonschlack/config.h index 496494111051..9b6789c1c9f4 100644 --- a/layouts/community/ortho_4x12/brandonschlack/config.h +++ b/layouts/community/ortho_4x12/brandonschlack/config.h @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #pragma once #ifdef KEYBOARD_planck_rev6 diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c index 74e6035816c5..d4c1a4a867ea 100644 --- a/layouts/community/ortho_4x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include QMK_KEYBOARD_H #ifdef KEYBOARD_planck_rev6 #include "muse.h" diff --git a/layouts/community/ortho_5x12/brandonschlack/config.h b/layouts/community/ortho_5x12/brandonschlack/config.h index a9df4255178f..9968297363d5 100644 --- a/layouts/community/ortho_5x12/brandonschlack/config.h +++ b/layouts/community/ortho_5x12/brandonschlack/config.h @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #pragma once #ifdef KEYBOARD_preonic_rev3 diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c index 311266093950..4d7b7483adc2 100644 --- a/layouts/community/ortho_5x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include QMK_KEYBOARD_H #ifdef KEYBOARD_preonic_rev3 #include "muse.h" diff --git a/layouts/community/tkl_ansi/brandonschlack/config.h b/layouts/community/tkl_ansi/brandonschlack/config.h index 289d1a8da15e..df29654049d9 100644 --- a/layouts/community/tkl_ansi/brandonschlack/config.h +++ b/layouts/community/tkl_ansi/brandonschlack/config.h @@ -1,4 +1,19 @@ -# pragma once +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ +#pragma once // Explicit RGB Animation Mode Include #undef RGBLIGHT_ANIMATIONS diff --git a/users/brandonschlack/brandonschlack.c b/users/brandonschlack/brandonschlack.c index 91847539e4ed..1e52bd645260 100644 --- a/users/brandonschlack/brandonschlack.c +++ b/users/brandonschlack/brandonschlack.c @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #include "brandonschlack.h" user_config_t user_config; diff --git a/users/brandonschlack/brandonschlack.h b/users/brandonschlack/brandonschlack.h index eb6498551bfb..d7dbc0ea4b90 100644 --- a/users/brandonschlack/brandonschlack.h +++ b/users/brandonschlack/brandonschlack.h @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #pragma once #include "quantum.h" diff --git a/users/brandonschlack/config.h b/users/brandonschlack/config.h index 67e5585f80c9..8f09adef3e34 100644 --- a/users/brandonschlack/config.h +++ b/users/brandonschlack/config.h @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #pragma once #define TAPPING_TOGGLE 2 diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index 350e5205517d..dfd427bdc1e0 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #include "brandonschlack.h" // Super CMD↯TAB diff --git a/users/brandonschlack/process_records.h b/users/brandonschlack/process_records.h index 1c1003654fa5..057233fb0e42 100644 --- a/users/brandonschlack/process_records.h +++ b/users/brandonschlack/process_records.h @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #pragma once #include "brandonschlack.h" diff --git a/users/brandonschlack/rgb_bs.c b/users/brandonschlack/rgb_bs.c index 79715a8a434e..1abf785b494f 100644 --- a/users/brandonschlack/rgb_bs.c +++ b/users/brandonschlack/rgb_bs.c @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #include "brandonschlack.h" #include "rgb_theme.h" #include "rgb_bs.h" diff --git a/users/brandonschlack/rgb_bs.h b/users/brandonschlack/rgb_bs.h index 17e9505f5d2c..c5cbd59697b4 100644 --- a/users/brandonschlack/rgb_bs.h +++ b/users/brandonschlack/rgb_bs.h @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #pragma once #include "quantum.h" #ifdef RGB_THEME_ENABLE diff --git a/users/brandonschlack/rgb_theme.h b/users/brandonschlack/rgb_theme.h index eee41b1ea0e6..7c8b2923fccf 100644 --- a/users/brandonschlack/rgb_theme.h +++ b/users/brandonschlack/rgb_theme.h @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #pragma once #include "brandonschlack.h" diff --git a/users/brandonschlack/tap_dances.c b/users/brandonschlack/tap_dances.c index 8c7c99a04394..861b31805b67 100644 --- a/users/brandonschlack/tap_dances.c +++ b/users/brandonschlack/tap_dances.c @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #include "tap_dances.h" #include "process_keycode/process_tap_dance.h" diff --git a/users/brandonschlack/tap_dances.h b/users/brandonschlack/tap_dances.h index 7fa349600ef7..3747619a5ef4 100644 --- a/users/brandonschlack/tap_dances.h +++ b/users/brandonschlack/tap_dances.h @@ -1,3 +1,18 @@ +/* Copyright 2020 Brandon Schlack + * + * 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 . + */ #pragma once #include "brandonschlack.h" #ifdef TAP_DANCE_ENABLE From 040c2d53844a9fb0e4b6ccad23d2c4c885ecc06b Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 5 Oct 2020 13:57:09 -0700 Subject: [PATCH 428/429] [Keymap] Simplify tri-layer-state function --- keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c | 3 +-- .../coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c | 3 +-- keyboards/nightmare/keymaps/brandonschlack/keymap.c | 3 +-- keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c b/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c index 12d0a22ba654..1d0cdf4f09bc 100644 --- a/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c +++ b/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c @@ -169,6 +169,5 @@ void keyboard_post_init_keymap(void) { } layer_state_t layer_state_set_keymap(layer_state_t state) { - state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); - return state; + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); } diff --git a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c index 58beb1b5851e..3be5d44ea387 100644 --- a/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c +++ b/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c @@ -107,6 +107,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; layer_state_t layer_state_set_keymap(layer_state_t state) { - state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); - return state; + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); } diff --git a/keyboards/nightmare/keymaps/brandonschlack/keymap.c b/keyboards/nightmare/keymaps/brandonschlack/keymap.c index a0e1d1c86f10..16da418453d9 100644 --- a/keyboards/nightmare/keymaps/brandonschlack/keymap.c +++ b/keyboards/nightmare/keymaps/brandonschlack/keymap.c @@ -191,6 +191,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; layer_state_t layer_state_set_keymap(layer_state_t state) { - state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); - return state; + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); } diff --git a/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c b/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c index 6c92684068d2..4180e9464f26 100644 --- a/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c +++ b/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c @@ -111,6 +111,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; layer_state_t layer_state_set_keymap(layer_state_t state) { - state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); - return state; + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); } From dc26974e77819952b1f3f72691620db1816e0ef1 Mon Sep 17 00:00:00 2001 From: Brandon Schlack Date: Mon, 5 Oct 2020 13:57:56 -0700 Subject: [PATCH 429/429] [Keymap] Remove empty functions and configs --- .../hotswap/keymaps/brandonschlack/config.h | 19 ------------------- .../hotswap/keymaps/brandonschlack/keymap.c | 12 ------------ .../rev2/keymaps/brandonschlack/config.h | 17 ----------------- .../rev2/keymaps/brandonschlack/keymap.c | 12 ------------ .../nightmare/keymaps/brandonschlack/config.h | 19 ------------------- .../60_ansi/brandonschlack-ansi/keymap.c | 12 ------------ .../brandonschlack-split/keymap.c | 12 ------------ .../brandonschlack-split/keymap.c | 12 ------------ 8 files changed, 115 deletions(-) delete mode 100644 keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/config.h delete mode 100644 keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/config.h delete mode 100644 keyboards/nightmare/keymaps/brandonschlack/config.h diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/config.h b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/config.h deleted file mode 100644 index 72bace6ccfbf..000000000000 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2019 Brandon Schlack - * - * 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 . - */ - -#pragma once - -// place overrides here diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c index fc2e878260de..a73c961db022 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c @@ -100,15 +100,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______), }; */ - -void matrix_init_keymap(void) { - -} - -void matrix_scan_keymap(void) { - -} - -void led_set_user(uint8_t usb_led) { - -} diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/config.h b/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/config.h deleted file mode 100644 index a37375a2b27f..000000000000 --- a/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/config.h +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 Brandon Schlack - * - * 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 . - */ - -#pragma once diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c index 9601bb10ec2a..235cb2e87e0a 100644 --- a/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c +++ b/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c @@ -100,15 +100,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______), }; */ - -void matrix_init_keymap(void) { - -} - -void matrix_scan_keymap(void) { - -} - -void led_set_user(uint8_t usb_led) { - -} diff --git a/keyboards/nightmare/keymaps/brandonschlack/config.h b/keyboards/nightmare/keymaps/brandonschlack/config.h deleted file mode 100644 index d267733f98c0..000000000000 --- a/keyboards/nightmare/keymaps/brandonschlack/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 Brandon Schlack - * - * 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 . - */ - -#pragma once - -// place overrides here diff --git a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c index 305f032354aa..5282ff98b0c3 100644 --- a/layouts/community/60_ansi/brandonschlack-ansi/keymap.c +++ b/layouts/community/60_ansi/brandonschlack-ansi/keymap.c @@ -81,15 +81,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) */ }; - -void matrix_init_keymap(void) { - //user initialization -} - -void matrix_scan_keymap(void) { - //user matrix -} - -bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { - return true; -} diff --git a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c index 11ba14f6d1fd..906925ab96e4 100644 --- a/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c +++ b/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c @@ -81,15 +81,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) */ }; - -void matrix_init_keymap(void) { - //user initialization -} - -void matrix_scan_keymap(void) { - //user matrix -} - -bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { - return true; -} diff --git a/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c index a173ced335a7..9482b12c4486 100644 --- a/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c +++ b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c @@ -79,18 +79,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ }; -// Runs just one time when the keyboard initializes. -void matrix_init_keymap(void) { -}; - -// Runs once after keyboard initializes -void keyboard_post_init_keymap(void) { -}; - -// Runs constantly in the background, in a loop. -void matrix_scan_keymap(void) { -}; - bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { switch (keycode) { #ifdef KEYBOARD_massdrop