From 8e916d2b96a88ccaf02f259ae2594627b053bc74 Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Thu, 6 Jul 2017 13:23:34 -0600 Subject: [PATCH 01/25] initial lets split keymap for shaymdev --- .../lets_split/keymaps/shaymdev/Makefile | 3 + .../lets_split/keymaps/shaymdev/config.h | 37 +++ .../lets_split/keymaps/shaymdev/keymap.c | 213 ++++++++++++++++++ 3 files changed, 253 insertions(+) create mode 100644 keyboards/lets_split/keymaps/shaymdev/Makefile create mode 100644 keyboards/lets_split/keymaps/shaymdev/config.h create mode 100644 keyboards/lets_split/keymaps/shaymdev/keymap.c diff --git a/keyboards/lets_split/keymaps/shaymdev/Makefile b/keyboards/lets_split/keymaps/shaymdev/Makefile new file mode 100644 index 000000000000..457a3d01d4a4 --- /dev/null +++ b/keyboards/lets_split/keymaps/shaymdev/Makefile @@ -0,0 +1,3 @@ +ifndef QUANTUM_DIR + include ../../../../Makefile +endif diff --git a/keyboards/lets_split/keymaps/shaymdev/config.h b/keyboards/lets_split/keymaps/shaymdev/config.h new file mode 100644 index 000000000000..7f33a43630aa --- /dev/null +++ b/keyboards/lets_split/keymaps/shaymdev/config.h @@ -0,0 +1,37 @@ +/* +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 . +*/ + +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +/* Use I2C or Serial, not both */ + +#define USE_SERIAL +// #define USE_I2C + +/* Select hand configuration */ + +#define MASTER_LEFT +// #define _MASTER_RIGHT +// #define EE_HANDS + +#endif \ No newline at end of file diff --git a/keyboards/lets_split/keymaps/shaymdev/keymap.c b/keyboards/lets_split/keymaps/shaymdev/keymap.c new file mode 100644 index 000000000000..1d337a36f8a1 --- /dev/null +++ b/keyboards/lets_split/keymaps/shaymdev/keymap.c @@ -0,0 +1,213 @@ +#include "lets_split.h" +#include "action_layer.h" +#include "eeconfig.h" + +extern keymap_config_t keymap_config; + +// 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 _QWERTY 0 +#define _COLEMAK 1 +#define _DVORAK 2 +#define _LOWER 3 +#define _RAISE 4 +#define _ADJUST 16 + +enum custom_keycodes { + QWERTY = SAFE_RANGE, + COLEMAK, + DVORAK, + LOWER, + RAISE, + ADJUST, +}; + +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Qwerty + * ,-----------------------------------------------------------------------------------. + * | Esc | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Tab | A | S | D | F | G | H | J | K | L | ; | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * |Adjust| Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_QWERTY] = KEYMAP( \ + 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 , \ + ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ +), + +/* Colemak + * ,-----------------------------------------------------------------------------------. + * | Esc | Q | W | F | P | G | J | L | U | Y | ; | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Tab | A | R | S | T | D | H | N | E | I | O | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | K | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * |Adjust| Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_COLEMAK] = KEYMAP( \ + KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ + KC_TAB, 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 , \ + ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ +), + +/* Dvorak + * ,-----------------------------------------------------------------------------------. + * | Esc | ' | , | . | P | Y | F | G | C | R | L | / | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Tab | A | O | E | U | I | D | H | T | N | S | - | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | = | ; | Q | J | K | X | B | M | W | V | Z | \ | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * |Adjust| GUI | Raise |Lower |Shift |Ctrl |BKSpc |Space | Raise | Del | ALT |Right | + * `-----------------------------------------------------------------------------------' + */ +[_DVORAK] = KEYMAP( \ + KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ + KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ + KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS, \ + ADJUST, KC_LGUI, RAISE, LOWER, KC_LSFT, KC_LCTL, KC_BSPC, KC_SPC, RAISE, KC_DEL, KC_LALT, KC_RGHT \ +), + +/* Lower + * ,----------------------------------------------------------------------------------. + * | | ! | @ | { | } | & | | 7 | 8 | 9 | / | | + * |------+------+------+------+------+-----+------+------+------+------+-----+-----| + * | | # | $ | ( | ) | * | | 4 | 5 | 6 | + | | + * |------+------+------+------+------+-----+------+------+------+------+-----+-----| + * | | % | ^ | [ | ] | | | 1 | 2 | 3 |Enter | | + * |------+------+------+------+------+-----+------+------+------+------+-----+-----| + * | | | | | | | | | 0 | | | | + * `----------------------------------------------------------------------------------' + */ +[_LOWER] = KEYMAP( \ + _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, \ + _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, \ + _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, _______, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_0, _______, _______, _______ \ +), + +/* Raise + * ,-----------------------------------------------------------------------------------. + * | ` | | Home | Up | End | PgUp | Vol_ | F7 | F8 | F9 | F10 | | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Caps | | Left | Down | Right| PgDn | Vol+ | F4 | F5 | F6 | F11 | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | NumLk| | | | | Mute | F1 | F2 | F3 | F12 | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[_RAISE] = KEYMAP( \ + _______, XXXXXXX, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,\ + KC_CAPS, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX,\ + XXXXXXX, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX,\ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \), + +/* Adjust (Lower + Raise) + * ,-----------------------------------------------------------------------------------. + * | | Reset| | | | | | | | | | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[_ADJUST] = KEYMAP( \ + _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ + _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +) + + +}; + +#ifdef AUDIO_ENABLE +float tone_qwerty[][2] = SONG(QWERTY_SOUND); +float tone_dvorak[][2] = SONG(DVORAK_SOUND); +float tone_colemak[][2] = SONG(COLEMAK_SOUND); +#endif + +void persistent_default_layer_set(uint16_t default_layer) { + eeconfig_update_default_layer(default_layer); + default_layer_set(default_layer); +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QWERTY: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_qwerty, false, 0); + #endif + persistent_default_layer_set(1UL<<_QWERTY); + } + return false; + break; + case COLEMAK: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_colemak, false, 0); + #endif + persistent_default_layer_set(1UL<<_COLEMAK); + } + return false; + break; + case DVORAK: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_dvorak, false, 0); + #endif + persistent_default_layer_set(1UL<<_DVORAK); + } + 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 ADJUST: + if (record->event.pressed) { + layer_on(_ADJUST); + } else { + layer_off(_ADJUST); + } + return false; + break; + } + return true; +} From 4d55f1063bb489d0748b1f8231d5a88a884bfb45 Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Tue, 11 Jul 2017 10:29:25 -0600 Subject: [PATCH 02/25] initial orthodox keymap for shaymdev --- keyboards/orthodox/keymaps/shaymdev/Makefile | 6 + keyboards/orthodox/keymaps/shaymdev/config.h | 40 +++++ keyboards/orthodox/keymaps/shaymdev/keymap.c | 179 +++++++++++++++++++ 3 files changed, 225 insertions(+) create mode 100644 keyboards/orthodox/keymaps/shaymdev/Makefile create mode 100644 keyboards/orthodox/keymaps/shaymdev/config.h create mode 100644 keyboards/orthodox/keymaps/shaymdev/keymap.c diff --git a/keyboards/orthodox/keymaps/shaymdev/Makefile b/keyboards/orthodox/keymaps/shaymdev/Makefile new file mode 100644 index 000000000000..51bd5d457cb4 --- /dev/null +++ b/keyboards/orthodox/keymaps/shaymdev/Makefile @@ -0,0 +1,6 @@ +ifndef QUANTUM_DIR + include ../../../../Makefile +endif + +TAP_DANCE_ENABLE=yes + diff --git a/keyboards/orthodox/keymaps/shaymdev/config.h b/keyboards/orthodox/keymaps/shaymdev/config.h new file mode 100644 index 000000000000..0d48a1e950e1 --- /dev/null +++ b/keyboards/orthodox/keymaps/shaymdev/config.h @@ -0,0 +1,40 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert +Copyright 2017 Art Ortenburger + +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 CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +/* Use I2C or Serial, not both */ + +#define USE_SERIAL +// #define USE_I2C + +/* Select hand configuration */ + +// #define MASTER_LEFT +// #define _MASTER_RIGHT +#define EE_HANDS + +#define TAPPING_TERM 200 + +#endif diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c new file mode 100644 index 000000000000..043447a18966 --- /dev/null +++ b/keyboards/orthodox/keymaps/shaymdev/keymap.c @@ -0,0 +1,179 @@ +/* +This is the keymap for the keyboard + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert +Copyright 2017 Art Ortenburger + +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 "orthodox.h" +#include "action_layer.h" +#include "eeconfig.h" + +extern keymap_config_t keymap_config; + +// 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 _DVORAK 0 +#define _COLEMAK 1 +#define _QWERTY 2 +#define _LOWER 3 +#define _RAISE 4 +#define _ADJUST 16 + +enum custom_keycodes { + DVORAK = SAFE_RANGE, + COLEMAK, + QWERTY, + LOWER, + RAISE, + ADJUST, +}; + +//Tap Dance Declarations +enum { + TD_LOWER_ADJUST = 0 +}; + +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO + +#define LS__SPC MT(MOD_LSFT, KC_SPC) +#define LW__ADJ TD(TD_LOWER_ADJUST) + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + +[_DVORAK] = KEYMAP( \ + KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ + KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_ENT, XXXXXXX, KC_LALT, KC_DEL, XXXXXXX, KC_LGUI, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ + KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, LW__ADJ, KC_LSFT, KC_LCTL, KC_BSPC, LS__SPC, RAISE, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS, \ +), + +[_QWERTY] = KEYMAP( \ + 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_LEFT, XXXXXXX, KC_DOWN, KC_UP, XXXXXXX, KC_RIGHT,KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, LW__ADJ, KC_BSPC, KC_ENT, KC_RALT, LS__SPC, RAISE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI \ +), + +[_LOWER] = KEYMAP( \ + _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, \ + _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, XXXXXXX, _______, _______, XXXXXXX, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, \ + _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, _______, _______, _______, _______, _______, _______, KC_KP_0, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______, \ +), + +[_RAISE] = KEYMAP( \ + _______, XXXXXXX, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,\ + KC_CAPS, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, XXXXXXX, _______, _______, XXXXXXX, _______, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX,\ + XXXXXXX, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX,\ +), + +[_ADJUST] = KEYMAP( \ + _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ + _______, _______, _______, AU_ON, AU_OFF, AG_NORM, _______, XXXXXXX, _______, _______, XXXXXXX, _______, AG_SWAP, QWERTY , COLEMAK, DVORAK, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ +) + + +}; + +#ifdef AUDIO_ENABLE +float tone_qwerty[][2] = SONG(QWERTY_SOUND); +float tone_dvorak[][2] = SONG(DVORAK_SOUND); +float tone_colemak[][2] = SONG(COLEMAK_SOUND); +#endif + +void persistent_default_layer_set(uint16_t default_layer) { + eeconfig_update_default_layer(default_layer); + default_layer_set(default_layer); +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QWERTY: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_qwerty, false, 0); + #endif + persistent_default_layer_set(1UL<<_QWERTY); + } + return false; + break; + case COLEMAK: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_colemak, false, 0); + #endif + persistent_default_layer_set(1UL<<_COLEMAK); + } + return false; + break; + case DVORAK: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_dvorak, false, 0); + #endif + persistent_default_layer_set(1UL<<_DVORAK); + } + 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 ADJUST: + if (record->event.pressed) { + layer_on(_ADJUST); + } else { + layer_off(_ADJUST); + } + return false; + break; + } + return true; +} + + + +//Tap Dance Definitions +qk_tap_dance_action_t tap_dance_actions[] = { + //Tap once for Esc, twice for Caps Lock + [TD_LOWER_ADJUST] = ACTION_TAP_DANCE_DOUBLE(LOWER, ADJUST) +// Other declarations would go here, separated by commas, if you have them +}; + +//In Layer declaration, add tap dance item in place of a key code +//TD(TD_LOWER_ADJUST) From 8b1330135be9d7da4cf44ff0354e2b558cf2130b Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Mon, 31 Jul 2017 22:49:20 -0600 Subject: [PATCH 03/25] Remove broken lower/adjust key --- keyboards/orthodox/keymaps/shaymdev/Makefile | 2 -- keyboards/orthodox/keymaps/shaymdev/config.h | 2 -- keyboards/orthodox/keymaps/shaymdev/keymap.c | 20 ++++---------------- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/keyboards/orthodox/keymaps/shaymdev/Makefile b/keyboards/orthodox/keymaps/shaymdev/Makefile index 51bd5d457cb4..9c9280adb57e 100644 --- a/keyboards/orthodox/keymaps/shaymdev/Makefile +++ b/keyboards/orthodox/keymaps/shaymdev/Makefile @@ -2,5 +2,3 @@ ifndef QUANTUM_DIR include ../../../../Makefile endif -TAP_DANCE_ENABLE=yes - diff --git a/keyboards/orthodox/keymaps/shaymdev/config.h b/keyboards/orthodox/keymaps/shaymdev/config.h index 0d48a1e950e1..ae3a0042fde1 100644 --- a/keyboards/orthodox/keymaps/shaymdev/config.h +++ b/keyboards/orthodox/keymaps/shaymdev/config.h @@ -35,6 +35,4 @@ along with this program. If not, see . // #define _MASTER_RIGHT #define EE_HANDS -#define TAPPING_TERM 200 - #endif diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c index 043447a18966..760ddda49077 100644 --- a/keyboards/orthodox/keymaps/shaymdev/keymap.c +++ b/keyboards/orthodox/keymaps/shaymdev/keymap.c @@ -55,7 +55,6 @@ enum { #define XXXXXXX KC_NO #define LS__SPC MT(MOD_LSFT, KC_SPC) -#define LW__ADJ TD(TD_LOWER_ADJUST) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -64,25 +63,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DVORAK] = KEYMAP( \ KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_ENT, XXXXXXX, KC_LALT, KC_DEL, XXXXXXX, KC_LGUI, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ - KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, LW__ADJ, KC_LSFT, KC_LCTL, KC_BSPC, LS__SPC, RAISE, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS, \ + KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, LOWER, KC_LSFT, KC_LCTL, KC_BSPC, LS__SPC, RAISE, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS \ ), [_QWERTY] = KEYMAP( \ 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_LEFT, XXXXXXX, KC_DOWN, KC_UP, XXXXXXX, KC_RIGHT,KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ - KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, LW__ADJ, KC_BSPC, KC_ENT, KC_RALT, LS__SPC, RAISE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI \ + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, LOWER, KC_BSPC, KC_ENT, KC_RALT, LS__SPC, RAISE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI \ ), [_LOWER] = KEYMAP( \ _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, \ _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, XXXXXXX, _______, _______, XXXXXXX, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, \ - _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, _______, _______, _______, _______, _______, _______, KC_KP_0, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______, \ + _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, _______, _______, _______, _______, _______, _______, KC_KP_0, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______ \ ), [_RAISE] = KEYMAP( \ _______, XXXXXXX, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,\ KC_CAPS, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, XXXXXXX, _______, _______, XXXXXXX, _______, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX,\ - XXXXXXX, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX,\ + XXXXXXX, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX\ ), [_ADJUST] = KEYMAP( \ @@ -166,14 +165,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } - - -//Tap Dance Definitions -qk_tap_dance_action_t tap_dance_actions[] = { - //Tap once for Esc, twice for Caps Lock - [TD_LOWER_ADJUST] = ACTION_TAP_DANCE_DOUBLE(LOWER, ADJUST) -// Other declarations would go here, separated by commas, if you have them -}; - -//In Layer declaration, add tap dance item in place of a key code -//TD(TD_LOWER_ADJUST) From b37291ac08f42d58e9c88227906a9d39059f9c8a Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Mon, 31 Jul 2017 23:10:31 -0600 Subject: [PATCH 04/25] remove shift space --- keyboards/orthodox/keymaps/shaymdev/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c index 760ddda49077..cc690df450aa 100644 --- a/keyboards/orthodox/keymaps/shaymdev/keymap.c +++ b/keyboards/orthodox/keymaps/shaymdev/keymap.c @@ -63,13 +63,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DVORAK] = KEYMAP( \ KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_ENT, XXXXXXX, KC_LALT, KC_DEL, XXXXXXX, KC_LGUI, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ - KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, LOWER, KC_LSFT, KC_LCTL, KC_BSPC, LS__SPC, RAISE, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS \ + KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, LOWER, KC_LSFT, KC_LCTL, KC_BSPC, KC_SPC, RAISE, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS \ ), [_QWERTY] = KEYMAP( \ 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_LEFT, XXXXXXX, KC_DOWN, KC_UP, XXXXXXX, KC_RIGHT,KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ - KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, LOWER, KC_BSPC, KC_ENT, KC_RALT, LS__SPC, RAISE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI \ + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, LOWER, KC_BSPC, KC_ENT, KC_RALT, KC_SPC, RAISE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI \ ), [_LOWER] = KEYMAP( \ From e10ee8018d56e52164a857e79dd0e7f8b2791601 Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Tue, 29 Aug 2017 21:50:02 -0600 Subject: [PATCH 05/25] orthodox shaymdev: add reset and grv --- keyboards/orthodox/keymaps/shaymdev/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c index cc690df450aa..8efbe03e5d53 100644 --- a/keyboards/orthodox/keymaps/shaymdev/keymap.c +++ b/keyboards/orthodox/keymaps/shaymdev/keymap.c @@ -74,14 +74,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = KEYMAP( \ _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, \ - _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, XXXXXXX, _______, _______, XXXXXXX, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, \ - _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, _______, _______, _______, _______, _______, _______, KC_KP_0, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______ \ + _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, XXXXXXX, _______, _______, XXXXXXX, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, \ + _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV, _______, _______, _______, _______, _______, KC_KP_0, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______ \ ), [_RAISE] = KEYMAP( \ _______, XXXXXXX, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,\ KC_CAPS, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, XXXXXXX, _______, _______, XXXXXXX, _______, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX,\ - XXXXXXX, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX\ + RESET, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX\ ), [_ADJUST] = KEYMAP( \ From de6a478c9f35faf50ea66c0a9948934fdaf30150 Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Tue, 11 Jul 2017 10:29:25 -0600 Subject: [PATCH 06/25] initial orthodox keymap for shaymdev (rebase conflicts manually resolved) --- keyboards/orthodox/keymaps/shaymdev/Makefile | 2 ++ keyboards/orthodox/keymaps/shaymdev/config.h | 2 ++ keyboards/orthodox/keymaps/shaymdev/keymap.c | 22 +++++++++++++++----- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/keyboards/orthodox/keymaps/shaymdev/Makefile b/keyboards/orthodox/keymaps/shaymdev/Makefile index 9c9280adb57e..51bd5d457cb4 100644 --- a/keyboards/orthodox/keymaps/shaymdev/Makefile +++ b/keyboards/orthodox/keymaps/shaymdev/Makefile @@ -2,3 +2,5 @@ ifndef QUANTUM_DIR include ../../../../Makefile endif +TAP_DANCE_ENABLE=yes + diff --git a/keyboards/orthodox/keymaps/shaymdev/config.h b/keyboards/orthodox/keymaps/shaymdev/config.h index ae3a0042fde1..0d48a1e950e1 100644 --- a/keyboards/orthodox/keymaps/shaymdev/config.h +++ b/keyboards/orthodox/keymaps/shaymdev/config.h @@ -35,4 +35,6 @@ along with this program. If not, see . // #define _MASTER_RIGHT #define EE_HANDS +#define TAPPING_TERM 200 + #endif diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c index 8efbe03e5d53..043447a18966 100644 --- a/keyboards/orthodox/keymaps/shaymdev/keymap.c +++ b/keyboards/orthodox/keymaps/shaymdev/keymap.c @@ -55,6 +55,7 @@ enum { #define XXXXXXX KC_NO #define LS__SPC MT(MOD_LSFT, KC_SPC) +#define LW__ADJ TD(TD_LOWER_ADJUST) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -63,25 +64,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DVORAK] = KEYMAP( \ KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_ENT, XXXXXXX, KC_LALT, KC_DEL, XXXXXXX, KC_LGUI, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ - KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, LOWER, KC_LSFT, KC_LCTL, KC_BSPC, KC_SPC, RAISE, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS \ + KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, LW__ADJ, KC_LSFT, KC_LCTL, KC_BSPC, LS__SPC, RAISE, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS, \ ), [_QWERTY] = KEYMAP( \ 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_LEFT, XXXXXXX, KC_DOWN, KC_UP, XXXXXXX, KC_RIGHT,KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ - KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, LOWER, KC_BSPC, KC_ENT, KC_RALT, KC_SPC, RAISE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI \ + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, LW__ADJ, KC_BSPC, KC_ENT, KC_RALT, LS__SPC, RAISE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI \ ), [_LOWER] = KEYMAP( \ _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, \ - _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, XXXXXXX, _______, _______, XXXXXXX, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, \ - _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV, _______, _______, _______, _______, _______, KC_KP_0, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______ \ + _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, XXXXXXX, _______, _______, XXXXXXX, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, \ + _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, _______, _______, _______, _______, _______, _______, KC_KP_0, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______, \ ), [_RAISE] = KEYMAP( \ _______, XXXXXXX, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,\ KC_CAPS, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, XXXXXXX, _______, _______, XXXXXXX, _______, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX,\ - RESET, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX\ + XXXXXXX, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX,\ ), [_ADJUST] = KEYMAP( \ @@ -165,3 +166,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } + + +//Tap Dance Definitions +qk_tap_dance_action_t tap_dance_actions[] = { + //Tap once for Esc, twice for Caps Lock + [TD_LOWER_ADJUST] = ACTION_TAP_DANCE_DOUBLE(LOWER, ADJUST) +// Other declarations would go here, separated by commas, if you have them +}; + +//In Layer declaration, add tap dance item in place of a key code +//TD(TD_LOWER_ADJUST) From 92d491657a43c62dfd80af9edb9e6745884f9029 Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Mon, 31 Jul 2017 22:49:20 -0600 Subject: [PATCH 07/25] Remove broken lower/adjust key (orthodox rules.mk rebase merge conflicts manually) --- keyboards/orthodox/keymaps/shaymdev/Makefile | 2 -- keyboards/orthodox/keymaps/shaymdev/config.h | 2 -- keyboards/orthodox/keymaps/shaymdev/keymap.c | 20 ++++---------------- keyboards/orthodox/rules.mk | 12 +++++++++++- 4 files changed, 15 insertions(+), 21 deletions(-) diff --git a/keyboards/orthodox/keymaps/shaymdev/Makefile b/keyboards/orthodox/keymaps/shaymdev/Makefile index 51bd5d457cb4..9c9280adb57e 100644 --- a/keyboards/orthodox/keymaps/shaymdev/Makefile +++ b/keyboards/orthodox/keymaps/shaymdev/Makefile @@ -2,5 +2,3 @@ ifndef QUANTUM_DIR include ../../../../Makefile endif -TAP_DANCE_ENABLE=yes - diff --git a/keyboards/orthodox/keymaps/shaymdev/config.h b/keyboards/orthodox/keymaps/shaymdev/config.h index 0d48a1e950e1..ae3a0042fde1 100644 --- a/keyboards/orthodox/keymaps/shaymdev/config.h +++ b/keyboards/orthodox/keymaps/shaymdev/config.h @@ -35,6 +35,4 @@ along with this program. If not, see . // #define _MASTER_RIGHT #define EE_HANDS -#define TAPPING_TERM 200 - #endif diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c index 043447a18966..760ddda49077 100644 --- a/keyboards/orthodox/keymaps/shaymdev/keymap.c +++ b/keyboards/orthodox/keymaps/shaymdev/keymap.c @@ -55,7 +55,6 @@ enum { #define XXXXXXX KC_NO #define LS__SPC MT(MOD_LSFT, KC_SPC) -#define LW__ADJ TD(TD_LOWER_ADJUST) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -64,25 +63,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DVORAK] = KEYMAP( \ KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_ENT, XXXXXXX, KC_LALT, KC_DEL, XXXXXXX, KC_LGUI, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ - KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, LW__ADJ, KC_LSFT, KC_LCTL, KC_BSPC, LS__SPC, RAISE, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS, \ + KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, LOWER, KC_LSFT, KC_LCTL, KC_BSPC, LS__SPC, RAISE, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS \ ), [_QWERTY] = KEYMAP( \ 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_LEFT, XXXXXXX, KC_DOWN, KC_UP, XXXXXXX, KC_RIGHT,KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ - KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, LW__ADJ, KC_BSPC, KC_ENT, KC_RALT, LS__SPC, RAISE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI \ + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, LOWER, KC_BSPC, KC_ENT, KC_RALT, LS__SPC, RAISE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI \ ), [_LOWER] = KEYMAP( \ _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, \ _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, XXXXXXX, _______, _______, XXXXXXX, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, \ - _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, _______, _______, _______, _______, _______, _______, KC_KP_0, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______, \ + _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, _______, _______, _______, _______, _______, _______, KC_KP_0, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______ \ ), [_RAISE] = KEYMAP( \ _______, XXXXXXX, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,\ KC_CAPS, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, XXXXXXX, _______, _______, XXXXXXX, _______, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX,\ - XXXXXXX, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX,\ + XXXXXXX, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX\ ), [_ADJUST] = KEYMAP( \ @@ -166,14 +165,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } - - -//Tap Dance Definitions -qk_tap_dance_action_t tap_dance_actions[] = { - //Tap once for Esc, twice for Caps Lock - [TD_LOWER_ADJUST] = ACTION_TAP_DANCE_DOUBLE(LOWER, ADJUST) -// Other declarations would go here, separated by commas, if you have them -}; - -//In Layer declaration, add tap dance item in place of a key code -//TD(TD_LOWER_ADJUST) diff --git a/keyboards/orthodox/rules.mk b/keyboards/orthodox/rules.mk index 7a8c4f94885f..9097bfd71349 100644 --- a/keyboards/orthodox/rules.mk +++ b/keyboards/orthodox/rules.mk @@ -17,6 +17,16 @@ RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -SPLIT_KEYBOARD = yes +CUSTOM_MATRIX = yes + +avrdude: build + ls /dev/tty* > /tmp/1; \ + echo "Reset your Pro Micro now"; \ + while [ -z $$USB ]; do \ + sleep 1; \ + ls /dev/tty* > /tmp/2; \ + USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \ + done; \ + avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex DEFAULT_FOLDER = orthodox/rev3 From 95c078807e15494e341f7decfcfac71acf0e907f Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Mon, 31 Jul 2017 23:10:31 -0600 Subject: [PATCH 08/25] remove shift space --- keyboards/orthodox/keymaps/shaymdev/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c index 760ddda49077..cc690df450aa 100644 --- a/keyboards/orthodox/keymaps/shaymdev/keymap.c +++ b/keyboards/orthodox/keymaps/shaymdev/keymap.c @@ -63,13 +63,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DVORAK] = KEYMAP( \ KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_ENT, XXXXXXX, KC_LALT, KC_DEL, XXXXXXX, KC_LGUI, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ - KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, LOWER, KC_LSFT, KC_LCTL, KC_BSPC, LS__SPC, RAISE, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS \ + KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, LOWER, KC_LSFT, KC_LCTL, KC_BSPC, KC_SPC, RAISE, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS \ ), [_QWERTY] = KEYMAP( \ 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_LEFT, XXXXXXX, KC_DOWN, KC_UP, XXXXXXX, KC_RIGHT,KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ - KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, LOWER, KC_BSPC, KC_ENT, KC_RALT, LS__SPC, RAISE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI \ + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, LOWER, KC_BSPC, KC_ENT, KC_RALT, KC_SPC, RAISE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI \ ), [_LOWER] = KEYMAP( \ From 719139dbe15babcc1a7b54f492bfcc7ab3321377 Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Wed, 30 Aug 2017 23:03:32 -0600 Subject: [PATCH 09/25] RGB orthodox and LS and initial broken shergo port (rebase conflicts mannually resolved) --- .../lets_split/keymaps/shaymdev/Makefile | 2 + .../lets_split/keymaps/shaymdev/config.h | 6 +- .../lets_split/keymaps/shaymdev/keymap.c | 7 +- keyboards/orthodox/keymaps/shaymdev/Makefile | 1 + keyboards/orthodox/keymaps/shaymdev/config.h | 4 + keyboards/orthodox/keymaps/shaymdev/keymap.c | 38 ++-- keyboards/orthodox/rev1/config.h | 7 +- keyboards/shergo/Makefile | 18 ++ keyboards/shergo/config.h | 190 ++++++++++++++++++ keyboards/shergo/keymaps/default/Makefile | 37 ++++ keyboards/shergo/keymaps/default/config.h | 24 +++ keyboards/shergo/keymaps/default/keymap.c | 122 +++++++++++ keyboards/shergo/keymaps/default/readme.md | 1 + keyboards/shergo/readme.md | 28 +++ keyboards/shergo/rules.mk | 68 +++++++ keyboards/shergo/shergo.c | 43 ++++ keyboards/shergo/shergo.h | 50 +++++ 17 files changed, 616 insertions(+), 30 deletions(-) create mode 100644 keyboards/shergo/Makefile create mode 100644 keyboards/shergo/config.h create mode 100644 keyboards/shergo/keymaps/default/Makefile create mode 100644 keyboards/shergo/keymaps/default/config.h create mode 100644 keyboards/shergo/keymaps/default/keymap.c create mode 100644 keyboards/shergo/keymaps/default/readme.md create mode 100644 keyboards/shergo/readme.md create mode 100644 keyboards/shergo/rules.mk create mode 100644 keyboards/shergo/shergo.c create mode 100644 keyboards/shergo/shergo.h diff --git a/keyboards/lets_split/keymaps/shaymdev/Makefile b/keyboards/lets_split/keymaps/shaymdev/Makefile index 457a3d01d4a4..75e9c6503e8e 100644 --- a/keyboards/lets_split/keymaps/shaymdev/Makefile +++ b/keyboards/lets_split/keymaps/shaymdev/Makefile @@ -1,3 +1,5 @@ ifndef QUANTUM_DIR include ../../../../Makefile endif + +RGBLIGHT_ENABLE = yes diff --git a/keyboards/lets_split/keymaps/shaymdev/config.h b/keyboards/lets_split/keymaps/shaymdev/config.h index 7f33a43630aa..25c12d9290fa 100644 --- a/keyboards/lets_split/keymaps/shaymdev/config.h +++ b/keyboards/lets_split/keymaps/shaymdev/config.h @@ -34,4 +34,8 @@ along with this program. If not, see . // #define _MASTER_RIGHT // #define EE_HANDS -#endif \ No newline at end of file +#undef RGBLED_NUM +#define RGBLIGHT_ANIMATIONS +#define RGBLED_NUM 10 + +#endif diff --git a/keyboards/lets_split/keymaps/shaymdev/keymap.c b/keyboards/lets_split/keymaps/shaymdev/keymap.c index 1d337a36f8a1..36d459756e57 100644 --- a/keyboards/lets_split/keymaps/shaymdev/keymap.c +++ b/keyboards/lets_split/keymaps/shaymdev/keymap.c @@ -97,8 +97,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LOWER] = KEYMAP( \ _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, \ - _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, \ - _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, _______, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______, \ + RGB_MOD, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, \ + RGB_TOG, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, _______, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_0, _______, _______, _______ \ ), @@ -117,7 +117,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, XXXXXXX, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,\ KC_CAPS, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX,\ XXXXXXX, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX,\ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \), + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +), /* Adjust (Lower + Raise) * ,-----------------------------------------------------------------------------------. diff --git a/keyboards/orthodox/keymaps/shaymdev/Makefile b/keyboards/orthodox/keymaps/shaymdev/Makefile index 9c9280adb57e..75e9c6503e8e 100644 --- a/keyboards/orthodox/keymaps/shaymdev/Makefile +++ b/keyboards/orthodox/keymaps/shaymdev/Makefile @@ -2,3 +2,4 @@ ifndef QUANTUM_DIR include ../../../../Makefile endif +RGBLIGHT_ENABLE = yes diff --git a/keyboards/orthodox/keymaps/shaymdev/config.h b/keyboards/orthodox/keymaps/shaymdev/config.h index ae3a0042fde1..f0e6b98de2cf 100644 --- a/keyboards/orthodox/keymaps/shaymdev/config.h +++ b/keyboards/orthodox/keymaps/shaymdev/config.h @@ -35,4 +35,8 @@ along with this program. If not, see . // #define _MASTER_RIGHT #define EE_HANDS +#undef RGBLED_NUM +#define RGBLIGHT_ANIMATIONS +#define RGBLED_NUM 10 + #endif diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c index cc690df450aa..52f194cddeec 100644 --- a/keyboards/orthodox/keymaps/shaymdev/keymap.c +++ b/keyboards/orthodox/keymaps/shaymdev/keymap.c @@ -30,19 +30,17 @@ extern keymap_config_t keymap_config; // 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 _DVORAK 0 -#define _COLEMAK 1 -#define _QWERTY 2 +#define _QWERTY 1 #define _LOWER 3 #define _RAISE 4 #define _ADJUST 16 enum custom_keycodes { DVORAK = SAFE_RANGE, - COLEMAK, QWERTY, LOWER, RAISE, - ADJUST, + ADJUST }; //Tap Dance Declarations @@ -55,6 +53,8 @@ enum { #define XXXXXXX KC_NO #define LS__SPC MT(MOD_LSFT, KC_SPC) +#define TO_DV TO(_DVORAK) +#define TO_ADJ TO(_ADJUST) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -67,27 +67,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_QWERTY] = KEYMAP( \ - 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_LEFT, XXXXXXX, KC_DOWN, KC_UP, XXXXXXX, KC_RIGHT,KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ + 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_LEFT, XXXXXXX, KC_DOWN, KC_UP, XXXXXXX, KC_RIGHT,KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, LOWER, KC_BSPC, KC_ENT, KC_RALT, KC_SPC, RAISE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI \ ), [_LOWER] = KEYMAP( \ _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, \ - _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, XXXXXXX, _______, _______, XXXXXXX, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, \ - _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, _______, _______, _______, _______, _______, _______, KC_KP_0, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______ \ + _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, XXXXXXX, _______, _______, XXXXXXX, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, RGB_VAI, \ + _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV, _______, _______, _______, _______, _______, KC_KP_0, _______, KC_P1, KC_P2, KC_P3, KC_PENT, RGB_VAD \ ), [_RAISE] = KEYMAP( \ - _______, XXXXXXX, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,\ - KC_CAPS, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, XXXXXXX, _______, _______, XXXXXXX, _______, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX,\ - XXXXXXX, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX\ + _______, XXXXXXX, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,\ + KC_CAPS, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, XXXXXXX, _______, _______, XXXXXXX, _______, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX,\ + _______, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX\ ), [_ADJUST] = KEYMAP( \ - _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ - _______, _______, _______, AU_ON, AU_OFF, AG_NORM, _______, XXXXXXX, _______, _______, XXXXXXX, _______, AG_SWAP, QWERTY , COLEMAK, DVORAK, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ + TO_DV, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ + RGB_TOG, RGB_MOD, _______, AU_ON, AU_OFF, AG_NORM, _______, XXXXXXX, _______, _______, XXXXXXX, _______, AG_SWAP, QWERTY, DVORAK, _______, _______, _______, \ + RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ ) @@ -96,7 +96,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #ifdef AUDIO_ENABLE float tone_qwerty[][2] = SONG(QWERTY_SOUND); float tone_dvorak[][2] = SONG(DVORAK_SOUND); -float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif void persistent_default_layer_set(uint16_t default_layer) { @@ -115,15 +114,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; break; - case COLEMAK: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_NOTE_ARRAY(tone_colemak, false, 0); - #endif - persistent_default_layer_set(1UL<<_COLEMAK); - } - return false; - break; case DVORAK: if (record->event.pressed) { #ifdef AUDIO_ENABLE diff --git a/keyboards/orthodox/rev1/config.h b/keyboards/orthodox/rev1/config.h index 1dadae388d25..86b4b614c3cb 100644 --- a/keyboards/orthodox/rev1/config.h +++ b/keyboards/orthodox/rev1/config.h @@ -69,8 +69,11 @@ along with this program. If not, see . ) /* ws2812 RGB LED */ -//#define RGB_DI_PIN D3 -//#define RGBLED_NUM 16 // Number of LEDs +#define RGB_DI_PIN D3 +#define RGBLIGHT_TIMER +#define RGBLED_NUM 16 // Number of LEDs +#define ws2812_PORTREG PORTD +#define ws2812_DDRREG DDRD /* * Feature disable options diff --git a/keyboards/shergo/Makefile b/keyboards/shergo/Makefile new file mode 100644 index 000000000000..840dc9a28667 --- /dev/null +++ b/keyboards/shergo/Makefile @@ -0,0 +1,18 @@ +# Copyright 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 MAKEFILE_INCLUDED + include ../../Makefile +endif diff --git a/keyboards/shergo/config.h b/keyboards/shergo/config.h new file mode 100644 index 000000000000..aa5992215152 --- /dev/null +++ b/keyboards/shergo/config.h @@ -0,0 +1,190 @@ +/* +Copyright 2017 REPLACE_WITH_YOUR_NAME + +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 CONFIG_H +#define CONFIG_H + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x6060 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Shay Merrill +#define PRODUCT shergo v1 +#define DESCRIPTION A custom ergonomic keyboard by Shay Merrill + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 10 + +/* + * 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 { F0, F1, F4, F5, F6 } +#define MATRIX_COL_PINS { D3, D2, D1, D0, C6, B7, B3, B2, B1, B0} +#define UNUSED_PINS + +/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */ +#define DIODE_DIRECTION COL2ROW + +// #define BACKLIGHT_PIN B7 +// #define BACKLIGHT_BREATHING +// #define BACKLIGHT_LEVELS 3 + + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCING_DELAY 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 */ +#define IS_COMMAND() ( \ + keyboard_report->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_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 + +#endif diff --git a/keyboards/shergo/keymaps/default/Makefile b/keyboards/shergo/keymaps/default/Makefile new file mode 100644 index 000000000000..b8879076bd46 --- /dev/null +++ b/keyboards/shergo/keymaps/default/Makefile @@ -0,0 +1,37 @@ +# Copyright 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 . + + +# QMK 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 +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) +AUDIO_ENABLE = no # Audio output on port C6 +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif diff --git a/keyboards/shergo/keymaps/default/config.h b/keyboards/shergo/keymaps/default/config.h new file mode 100644 index 000000000000..f52a97bbc865 --- /dev/null +++ b/keyboards/shergo/keymaps/default/config.h @@ -0,0 +1,24 @@ +/* Copyright 2017 REPLACE_WITH_YOUR_NAME + * + * 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 CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +// place overrides here + +#endif diff --git a/keyboards/shergo/keymaps/default/keymap.c b/keyboards/shergo/keymaps/default/keymap.c new file mode 100644 index 000000000000..b3aa287143b7 --- /dev/null +++ b/keyboards/shergo/keymaps/default/keymap.c @@ -0,0 +1,122 @@ +/* Copyright 2017 REPLACE_WITH_YOUR_NAME + * + * 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 "shergo.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = +/***** Layer 0 - dvorak ****** + logically: + KEYMAP( ESC, QUOT, COMM, DOT, P, Y, F, G, C, R, L, SLSH, \ + GRV, A, O, E, U, I, D, H, T, N, S, MINS, \ + EQL, SCLN, Q, J, K, X, B, M, W, V, Z, BSLS, \ + LGUI, FN3, FN2, LSFT, LCTL, SPC, BSPC, DEL, FN3, RGUI \ + ),*/ +KEYMAP( FN25, GRV, X, I, Y, F, D, B, \ + ESC, QUOT, COMM, DOT, P, G, C, R, L, SLSH, \ + TAB, A, O, E, U, H, T, N, S, MINS, \ + EQL, SCLN, Q, J, K, M, W, V, Z, BSLS, \ + LGUI, FN3, FN2, LSFT, LCTL, BSPC, SPC, FN3, FN27, RGUI \ + ), + + +/***** Layer 1 - qwerty ******///TODO: see if when dvorak is default the backslash/minus thing is correct. Not sure how to handle TRNS +KEYMAP( FN25, GRV, B, G, T, Y, H, N, \ + ESC, Q, W, E, R, U, I, O, P, SLSH, \ + TAB, A, S, D, F, J, K, L, SCLN, QUOT, \ + EQL, Z, X, C, V, M, COMM, DOT, BSLS, MINS, \ + LGUI, FN3, FN2, LSFT, LCTL, BSPC, SPC, FN23, DEL, RGUI \ + ), + + +/***** Layer 2 - numbers and symbols ******/ +KEYMAP( TRNS, TRNS, TRNS, FN18, FN17, TRNS, TRNS, TRNS, \ + TRNS, FN11, FN12, FN21, FN22, P7, P8, P9, PMNS, TRNS, \ + FN26, FN13, FN14, FN19, FN10, P4, P5, P6, PPLS, TRNS, \ + TRNS, FN15, FN16, LBRC, RBRC, P1, P2, P3, PENT, TRNS, \ + TRNS, FN4, TRNS, TRNS, TRNS, TRNS, TRNS, P0, TRNS, PDOT \ + ), + +/***** Layer 3 - nav and f-keys ******/ +KEYMAP( TRNS, TRNS, TRNS, PGDN, PGUP, VOLU, VOLD, MUTE, \ + TRNS, TRNS, HOME, UP, END, F7, F8, F9, F10, TRNS, \ + CAPS, TRNS, LEFT, DOWN, RGHT, F4, F5, F6, F11, TRNS, \ + FN8, NLCK, TRNS, TRNS, TRNS, F1, F2, F3, F12, FN9, \ + TRNS, TRNS, FN5, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS \ + ) + +}; + +const uint16_t PROGMEM fn_actions[] = { + [2] = ACTION_LAYER_MOMENTARY(2), + [3] = ACTION_LAYER_MOMENTARY(3), + [4] = ACTION_LAYER_TOGGLE(2), + [5] = ACTION_LAYER_TOGGLE(3), + + [8] = ACTION_DEFAULT_LAYER_SET(0), //default as dvorak + [9] = ACTION_DEFAULT_LAYER_SET(1), //default as qwerty + + + [10] = ACTION_MODS_KEY(MOD_LSFT, KC_0), //) + [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), //( + + [21] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), //{ + [22] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), //} + + [25] = ACTION_MODS_TAP_KEY(MOD_LALT, KC_ENT), + [26] = ACTION_MODS_KEY(MOD_LALT | MOD_LCTL, KC_TAB), + [27] = ACTION_MODS_TAP_KEY(MOD_RALT, KC_DEL), + +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + // MACRODOWN only works in this function + switch(id) { + case 0: + if (record->event.pressed) { + register_code(KC_RSFT); + } else { + unregister_code(KC_RSFT); + } + break; + } + return MACRO_NONE; +}; + + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + return true; +} + +void led_set_user(uint8_t usb_led) { + +} diff --git a/keyboards/shergo/keymaps/default/readme.md b/keyboards/shergo/keymaps/default/readme.md new file mode 100644 index 000000000000..4c9b3cf79cfe --- /dev/null +++ b/keyboards/shergo/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for shergo \ No newline at end of file diff --git a/keyboards/shergo/readme.md b/keyboards/shergo/readme.md new file mode 100644 index 000000000000..261e9629cd0d --- /dev/null +++ b/keyboards/shergo/readme.md @@ -0,0 +1,28 @@ +shergo keyboard firmware +====================== + +## Quantum MK Firmware + +For the full Quantum feature list, see [the parent readme](/). + +## Building + +Download or clone the whole firmware and navigate to the keyboards/shergo folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. + +Depending on which keymap you would like to use, you will have to compile slightly differently. + +### Default + +To build with the default keymap, simply run `make default`. + +### Other Keymaps + +Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant keymap files. + +To build the firmware binary hex file with a keymap just do `make` with a keymap like this: + +``` +$ make [default|jack|] +``` + +Keymaps follow the format **__\.c__** and are stored in the `keymaps` folder. diff --git a/keyboards/shergo/rules.mk b/keyboards/shergo/rules.mk new file mode 100644 index 000000000000..ca2a2a5f80be --- /dev/null +++ b/keyboards/shergo/rules.mk @@ -0,0 +1,68 @@ +# MCU name +#MCU = at90usb1286 +MCU = atmega32u4 + +# Processor frequency. +# This will define a symbol, F_CPU, in all source code files equal to the +# processor frequency in Hz. You can then use this symbol in your source code to +# calculate timings. Do NOT tack on a 'UL' at the end, this will be done +# automatically to create a 32-bit value in your source code. +# +# This will be an integer division of F_USB below, as it is sourced by +# F_USB after it has run through any CPU prescalers. Note that this value +# does not *change* the processor frequency - it should merely be updated to +# reflect the processor speed set externally so that the code can use accurate +# software delays. +F_CPU = 16000000 + + +# +# LUFA specific +# +# Target architecture (see library "Board Types" documentation). +ARCH = AVR8 + +# Input clock frequency. +# This will define a symbol, F_USB, in all source code files equal to the +# input clock frequency (before any prescaling is performed) in Hz. This value may +# differ from F_CPU if prescaling is used on the latter, and is required as the +# raw input clock is fed directly to the PLL sections of the AVR for high speed +# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' +# at the end, this will be done automatically to create a 32-bit value in your +# source code. +# +# If no clock division is performed on the input clock inside the AVR (via the +# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. +F_USB = $(F_CPU) + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +# Boot Section Size in *bytes* +# Teensy halfKay 512 +# Teensy++ halfKay 1024 +# Atmel DFU loader 4096 +# LUFA bootloader 4096 +# USBaspLoader 2048 +OPT_DEFS += -DBOOTLOADER_SIZE=4096 + + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) +EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) +CONSOLE_ENABLE ?= yes # Console for debug(+400) +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 +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 diff --git a/keyboards/shergo/shergo.c b/keyboards/shergo/shergo.c new file mode 100644 index 000000000000..e2369cca2c52 --- /dev/null +++ b/keyboards/shergo/shergo.c @@ -0,0 +1,43 @@ +/* Copyright 2017 REPLACE_WITH_YOUR_NAME + * + * 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 "shergo.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); +} diff --git a/keyboards/shergo/shergo.h b/keyboards/shergo/shergo.h new file mode 100644 index 000000000000..a64507c41114 --- /dev/null +++ b/keyboards/shergo/shergo.h @@ -0,0 +1,50 @@ +/* Copyright 2017 REPLACE_WITH_YOUR_NAME + * + * 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 SHERGO_H +#define SHERGO_H + +#include "quantum.h" + +// This a shortcut to help you visually see your layout. +// The following is an example using the Planck MIT layout +// The first section contains all of the arguments +// The second converts the arguments into a two-dimensional array +/* +#define KEYMAP( \ + k00, k01, k02, \ + k10, k11 \ +) \ +{ \ + { k00, k01, k02 }, \ + { k10, KC_NO, k11 }, \ +} +*/ + +#define KEYMAP( \ + K00, K01, K02, K03, K04, K05, K06, K07, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, \ + K40, K41, K42, K43, K44, K45, K46, K47, K48, K49 \ + ) { \ + { KC_##K00, KC_##K01, KC_##K02, KC_##K04, KC_##K03, KC_##K05, KC_##K06, KC_##K07, KC_NO, KC_NO}, \ + { KC_##K10, KC_##K11, KC_##K12, KC_##K14, KC_##K13, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19 }, \ + { KC_##K20, KC_##K21, KC_##K22, KC_##K24, KC_##K23, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29 }, \ + { KC_##K30, KC_##K31, KC_##K32, KC_##K34, KC_##K33, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39 }, \ + { KC_##K40, KC_##K41, KC_##K42, KC_##K44, KC_##K43, KC_##K45, KC_##K46, KC_##K47, KC_##K48, KC_##K49 } \ +} + +#endif From 03de3ce0560ab00d675815e154c0b4f28cbae921 Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Wed, 26 Sep 2018 22:15:45 -0600 Subject: [PATCH 10/25] remove rgb on lower layer --- keyboards/orthodox/keymaps/shaymdev/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c index 52f194cddeec..78639fc0b170 100644 --- a/keyboards/orthodox/keymaps/shaymdev/keymap.c +++ b/keyboards/orthodox/keymaps/shaymdev/keymap.c @@ -74,8 +74,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = KEYMAP( \ _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, \ - _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, XXXXXXX, _______, _______, XXXXXXX, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, RGB_VAI, \ - _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV, _______, _______, _______, _______, _______, KC_KP_0, _______, KC_P1, KC_P2, KC_P3, KC_PENT, RGB_VAD \ + _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, XXXXXXX, _______, _______, XXXXXXX, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, \ + _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV, _______, _______, _______, _______, _______, KC_KP_0, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______ \ ), [_RAISE] = KEYMAP( \ From 818df63e539dbb0bd7b5452d0faaed49055647aa Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Thu, 27 Sep 2018 11:36:02 -0600 Subject: [PATCH 11/25] fix shaymdev orthodox layout to 46 instead of 48 --- keyboards/orthodox/keymaps/shaymdev/keymap.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c index 78639fc0b170..d0df56a76ff3 100644 --- a/keyboards/orthodox/keymaps/shaymdev/keymap.c +++ b/keyboards/orthodox/keymaps/shaymdev/keymap.c @@ -60,33 +60,33 @@ enum { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[_DVORAK] = KEYMAP( \ +[_DVORAK] = LAYOUT( \ KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ - KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_ENT, XXXXXXX, KC_LALT, KC_DEL, XXXXXXX, KC_LGUI, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ + KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_ENT, KC_LALT, KC_DEL, KC_LGUI, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, LOWER, KC_LSFT, KC_LCTL, KC_BSPC, KC_SPC, RAISE, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS \ ), -[_QWERTY] = KEYMAP( \ +[_QWERTY] = 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_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LEFT, XXXXXXX, KC_DOWN, KC_UP, XXXXXXX, KC_RIGHT,KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, LOWER, KC_BSPC, KC_ENT, KC_RALT, KC_SPC, RAISE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI \ ), -[_LOWER] = KEYMAP( \ +[_LOWER] = LAYOUT( \ _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, \ - _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, XXXXXXX, _______, _______, XXXXXXX, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, \ + _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, \ _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV, _______, _______, _______, _______, _______, KC_KP_0, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______ \ ), -[_RAISE] = KEYMAP( \ +[_RAISE] = LAYOUT( \ _______, XXXXXXX, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,\ - KC_CAPS, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, XXXXXXX, _______, _______, XXXXXXX, _______, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX,\ + KC_CAPS, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX,\ _______, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX\ ), -[_ADJUST] = KEYMAP( \ +[_ADJUST] = LAYOUT( \ TO_DV, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ - RGB_TOG, RGB_MOD, _______, AU_ON, AU_OFF, AG_NORM, _______, XXXXXXX, _______, _______, XXXXXXX, _______, AG_SWAP, QWERTY, DVORAK, _______, _______, _______, \ + RGB_TOG, RGB_MOD, _______, AU_ON, AU_OFF, AG_NORM, _______, _______, _______, _______, AG_SWAP, QWERTY, DVORAK, _______, _______, _______, \ RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ ) From 52c4e720ea81c1a2bf1e20ca9bbffe46e49e5309 Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Thu, 16 Jan 2020 16:24:23 -0700 Subject: [PATCH 12/25] Add printscreen and insert keys to raise layer --- keyboards/orthodox/keymaps/shaymdev/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c index d0df56a76ff3..62c8bac44d1b 100644 --- a/keyboards/orthodox/keymaps/shaymdev/keymap.c +++ b/keyboards/orthodox/keymaps/shaymdev/keymap.c @@ -79,8 +79,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_RAISE] = LAYOUT( \ - _______, XXXXXXX, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,\ - KC_CAPS, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX,\ + _______, KC_PSCR, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,\ + KC_CAPS, KC_INS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX,\ _______, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX\ ), From cc4f78793985af0ed51ba6761401bc2d582a0ea1 Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Sat, 21 Aug 2021 16:39:54 -0600 Subject: [PATCH 13/25] Add shaymdev keymap to the meira keyboard --- keyboards/meira/keymaps/shaymdev/config.h | 31 +++ keyboards/meira/keymaps/shaymdev/keymap.c | 310 +++++++++++++++++++++ keyboards/meira/keymaps/shaymdev/readme.md | 1 + keyboards/meira/keymaps/shaymdev/rules.c | 1 + 4 files changed, 343 insertions(+) create mode 100644 keyboards/meira/keymaps/shaymdev/config.h create mode 100644 keyboards/meira/keymaps/shaymdev/keymap.c create mode 100644 keyboards/meira/keymaps/shaymdev/readme.md create mode 100644 keyboards/meira/keymaps/shaymdev/rules.c diff --git a/keyboards/meira/keymaps/shaymdev/config.h b/keyboards/meira/keymaps/shaymdev/config.h new file mode 100644 index 000000000000..e3776d2eff17 --- /dev/null +++ b/keyboards/meira/keymaps/shaymdev/config.h @@ -0,0 +1,31 @@ +/* Copyright 2017 Cole Markham, WoodKeys.click + * + * 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 + +// place overrides here +#define MUSIC_MASK (keycode != KC_NO) +#ifdef AUDIO_ENABLE + #define STARTUP_SONG SONG(PLANCK_SOUND) + // #define STARTUP_SONG SONG(NO_SOUND) + + #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ + SONG(COLEMAK_SOUND), \ + SONG(DVORAK_SOUND) \ + } +#endif diff --git a/keyboards/meira/keymaps/shaymdev/keymap.c b/keyboards/meira/keymaps/shaymdev/keymap.c new file mode 100644 index 000000000000..02e237d32043 --- /dev/null +++ b/keyboards/meira/keymaps/shaymdev/keymap.c @@ -0,0 +1,310 @@ +/* Copyright 2017 Cole Markham + * + * 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 "lighting.h" + +#ifdef RGBLIGHT_ENABLE +//Following line allows macro to read current RGB settings +extern rgblight_config_t rgblight_config; +#endif + +#define _QWERTY 0 +#define _COLEMAK 1 +#define _DVORAK 2 +#define _LOWER 3 +#define _RAISE 4 +#define _ADJUST 16 + +enum custom_keycodes { + QWERTY = SAFE_RANGE, + COLEMAK, + DVORAK, + LOWER, + RAISE, + ADJUST, +}; + +#ifdef AUDIO_ENABLE + +float tone_my_startup[][2] = SONG(ODE_TO_JOY); +float tone_my_goodbye[][2] = SONG(ROCK_A_BYE_BABY); + +float tone_qwerty[][2] = SONG(QWERTY_SOUND); +float tone_dvorak[][2] = SONG(DVORAK_SOUND); +float tone_colemak[][2] = SONG(COLEMAK_SOUND); + +#endif /* AUDIO_ENABLE */ + +// define variables for reactive RGB +bool TOG_STATUS = false; +int RGB_current_mode; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Qwerty + * ,-----------------------------------------------------------------------------------. + * | Esc | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Tab | A | S | D | F | G | H | J | K | L | ; | ' | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Ctrl |Adjust| Alt | Alt |Lower | Cmd |Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ + [_QWERTY] = KEYMAP( \ + 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_LCTL, ADJUST, KC_LALT, KC_LALT, LOWER, KC_LGUI, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ + ), + + /* Colemak + * ,-----------------------------------------------------------------------------------. + * | 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 |Adjust| Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ + [_COLEMAK] = KEYMAP( \ + 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, ADJUST, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ + ), + + /* Dvorak + * ,-----------------------------------------------------------------------------------. + * | 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 |Adjust| Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ + [_DVORAK] = KEYMAP( \ + 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, ADJUST, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ + ), + + /* Lower + * ,-----------------------------------------------------------------------------------. + * | | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | ~ | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | | \ | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | | |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | Next | Vol- | Vol+ | Play | + * `-----------------------------------------------------------------------------------' + */ + [_LOWER] = KEYMAP( \ + _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, \ + KC_TILD, 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_QUOT, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END \ + ), + + /* Raise + * ,-----------------------------------------------------------------------------------. + * | | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | ` | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | | |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | Home | PgUp | PgDn | End | + * `-----------------------------------------------------------------------------------' + */ + [_RAISE] = KEYMAP( \ + _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ + KC_GRV, 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_HOME, KC_PGDN, KC_PGUP, KC_END \ + ), + + /* Adjust (Lower + Raise) + * ,-----------------------------------------------------------------------------------. + * | | Reset| | | | | | | | | | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ + [_ADJUST] = KEYMAP( \ + BL_TOGG, RESET, _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_PSCR, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, \ + BL_STEP, RGB_MOD, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ) +}; + +// Setting ADJUST layer RGB back to default +void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) { + if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) { +#ifdef RGBLIGHT_ENABLE + rgblight_mode(RGB_current_mode); +#endif + layer_on(layer3); + } else { + layer_off(layer3); + } +} + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QWERTY: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_SONG(tone_qwerty); + #endif +// persistent_default_layer_set(1UL<<_QWERTY); + } + return false; + break; + case COLEMAK: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_SONG(tone_colemak); + #endif +// persistent_default_layer_set(1UL<<_COLEMAK); + } + return false; + break; + case DVORAK: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_SONG(tone_dvorak); + #endif +// persistent_default_layer_set(1UL<<_DVORAK); + } + return false; + break; + case LOWER: + if (record->event.pressed) { + //not sure how to have keyboard check mode and set it to a variable, so my work around + //uses another variable that would be set to true after the first time a reactive key is pressed. + if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false + } else { + TOG_STATUS = !TOG_STATUS; +#ifdef RGBLIGHT_ENABLE + rgblight_mode(16); +#endif + } + layer_on(_LOWER); + update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST); + } else { +#ifdef RGBLIGHT_ENABLE + rgblight_mode(RGB_current_mode); // revert RGB to initial mode prior to RGB mode change +#endif + TOG_STATUS = false; + layer_off(_LOWER); + update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case RAISE: + if (record->event.pressed) { + //not sure how to have keyboard check mode and set it to a variable, so my work around + //uses another variable that would be set to true after the first time a reactive key is pressed. + if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false + } else { + TOG_STATUS = !TOG_STATUS; +#ifdef RGBLIGHT_ENABLE + rgblight_mode(15); +#endif + } + layer_on(_RAISE); + update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST); + } else { +#ifdef RGBLIGHT_ENABLE + rgblight_mode(RGB_current_mode); // revert RGB to initial mode prior to RGB mode change +#endif + layer_off(_RAISE); + TOG_STATUS = false; + update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case ADJUST: + // FIXME add RGB feedback + if (record->event.pressed) { + layer_on(_ADJUST); + } else { + layer_off(_ADJUST); + } + return false; + break; + case BL_TOGG: +#ifdef BACKLIGHT_ENABLE + if (record->event.pressed) { + print("Enabling backlight\n"); + backlight_init_ports(); + } +#endif + return false; + break; + case BL_STEP: + if (record->event.pressed) { + print("Stepping backlight\n"); +#ifdef BACKLIGHT_ENABLE + print("Really stepping backlight\n"); + backlight_step(); +#endif + + } + return false; + break; + //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released +#ifdef RGBLIGHT_ENABLE + case RGB_MOD: + if (record->event.pressed) { + rgblight_mode(RGB_current_mode); + rgblight_step(); + RGB_current_mode = rgblight_config.mode; + } + return false; + break; +#endif +// case BL_INC: +// meira_inc_backlight_level(); +// return false; +// break; + } + return true; +} + +void led_set_user(uint8_t usb_led) { + +} diff --git a/keyboards/meira/keymaps/shaymdev/readme.md b/keyboards/meira/keymaps/shaymdev/readme.md new file mode 100644 index 000000000000..be8404881324 --- /dev/null +++ b/keyboards/meira/keymaps/shaymdev/readme.md @@ -0,0 +1 @@ +# The default keymap for meira diff --git a/keyboards/meira/keymaps/shaymdev/rules.c b/keyboards/meira/keymaps/shaymdev/rules.c new file mode 100644 index 000000000000..15b7f725b26d --- /dev/null +++ b/keyboards/meira/keymaps/shaymdev/rules.c @@ -0,0 +1 @@ +CONSOLE_ENABLE = yes From 9966b5a0d4aba08553ce2eb576cc38d51058651d Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Tue, 31 Aug 2021 13:23:18 -0600 Subject: [PATCH 14/25] lets split matching my orthodox layout --- .../lets_split/keymaps/shaymdev/keymap.c | 151 ++++-------------- 1 file changed, 34 insertions(+), 117 deletions(-) diff --git a/keyboards/lets_split/keymaps/shaymdev/keymap.c b/keyboards/lets_split/keymaps/shaymdev/keymap.c index 36d459756e57..a06e67ca0ae5 100644 --- a/keyboards/lets_split/keymaps/shaymdev/keymap.c +++ b/keyboards/lets_split/keymaps/shaymdev/keymap.c @@ -8,17 +8,15 @@ extern keymap_config_t keymap_config; // 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 _QWERTY 0 -#define _COLEMAK 1 -#define _DVORAK 2 -#define _LOWER 3 -#define _RAISE 4 +#define _DVORAK 0 +#define _QWERTY 1 +#define _LOWER 2 +#define _RAISE 3 #define _ADJUST 16 enum custom_keycodes { - QWERTY = SAFE_RANGE, - COLEMAK, - DVORAK, + DVORAK = SAFE_RANGE, + QWERTY, LOWER, RAISE, ADJUST, @@ -28,123 +26,51 @@ enum custom_keycodes { #define _______ KC_TRNS #define XXXXXXX KC_NO +#define TO_DV TO(_DVORAK) +#define TO_ADJ TO(_ADJUST) + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* Qwerty - * ,-----------------------------------------------------------------------------------. - * | Esc | Q | W | E | R | T | Y | U | I | O | P | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Tab | A | S | D | F | G | H | J | K | L | ; | " | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * |Adjust| Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | - * `-----------------------------------------------------------------------------------' - */ -[_QWERTY] = KEYMAP( \ - 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 , \ - ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ +[_DVORAK] = LAYOUT( \ + KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ + KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ + KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS, \ + ADJUST, KC_ENT, KC_LALT, LOWER, KC_LSFT, KC_LCTL, KC_BSPC, KC_SPC, RAISE, KC_DEL, KC_LGUI, XXXXXXX \ ), -/* Colemak - * ,-----------------------------------------------------------------------------------. - * | Esc | Q | W | F | P | G | J | L | U | Y | ; | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Tab | A | R | S | T | D | H | N | E | I | O | " | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | K | M | , | . | / |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * |Adjust| Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | - * `-----------------------------------------------------------------------------------' - */ -[_COLEMAK] = KEYMAP( \ - KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ - KC_TAB, 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 , \ - ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ +[_QWERTY] = 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_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI,\ + _______, KC_ENT, KC_LALT, LOWER, KC_LSFT, KC_LCTL, KC_BSPC, KC_SPC, RAISE, KC_DEL, KC_LGUI, XXXXXXX \ ), -/* Dvorak - * ,-----------------------------------------------------------------------------------. - * | Esc | ' | , | . | P | Y | F | G | C | R | L | / | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Tab | A | O | E | U | I | D | H | T | N | S | - | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | = | ; | Q | J | K | X | B | M | W | V | Z | \ | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * |Adjust| GUI | Raise |Lower |Shift |Ctrl |BKSpc |Space | Raise | Del | ALT |Right | - * `-----------------------------------------------------------------------------------' - */ -[_DVORAK] = KEYMAP( \ - KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ - KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ - KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS, \ - ADJUST, KC_LGUI, RAISE, LOWER, KC_LSFT, KC_LCTL, KC_BSPC, KC_SPC, RAISE, KC_DEL, KC_LALT, KC_RGHT \ +[_LOWER] = LAYOUT( \ + _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, \ + _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, \ + _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______, \ + _______, _______, _______, _______, _______, _______, _______, KC_KP_0, _______, _______, _______, _______ ), -/* Lower - * ,----------------------------------------------------------------------------------. - * | | ! | @ | { | } | & | | 7 | 8 | 9 | / | | - * |------+------+------+------+------+-----+------+------+------+------+-----+-----| - * | | # | $ | ( | ) | * | | 4 | 5 | 6 | + | | - * |------+------+------+------+------+-----+------+------+------+------+-----+-----| - * | | % | ^ | [ | ] | | | 1 | 2 | 3 |Enter | | - * |------+------+------+------+------+-----+------+------+------+------+-----+-----| - * | | | | | | | | | 0 | | | | - * `----------------------------------------------------------------------------------' - */ -[_LOWER] = KEYMAP( \ - _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, \ - RGB_MOD, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, \ - RGB_TOG, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, _______, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_0, _______, _______, _______ \ +[_RAISE] = LAYOUT( \ + _______, KC_PSCR, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,\ + KC_CAPS, KC_INS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX,\ + _______, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX,\ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), -/* Raise - * ,-----------------------------------------------------------------------------------. - * | ` | | Home | Up | End | PgUp | Vol_ | F7 | F8 | F9 | F10 | | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Caps | | Left | Down | Right| PgDn | Vol+ | F4 | F5 | F6 | F11 | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | NumLk| | | | | Mute | F1 | F2 | F3 | F12 | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' - */ -[_RAISE] = KEYMAP( \ - _______, XXXXXXX, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,\ - KC_CAPS, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX,\ - XXXXXXX, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX,\ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ -), - -/* Adjust (Lower + Raise) - * ,-----------------------------------------------------------------------------------. - * | | Reset| | | | | | | | | | Del | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' - */ -[_ADJUST] = KEYMAP( \ - _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ - _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ +[_ADJUST] = LAYOUT( \ + TO_DV, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ + RGB_TOG, RGB_MOD, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, DVORAK, _______, _______, _______, \ + RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) - }; #ifdef AUDIO_ENABLE float tone_qwerty[][2] = SONG(QWERTY_SOUND); float tone_dvorak[][2] = SONG(DVORAK_SOUND); -float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif void persistent_default_layer_set(uint16_t default_layer) { @@ -163,15 +89,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; break; - case COLEMAK: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_NOTE_ARRAY(tone_colemak, false, 0); - #endif - persistent_default_layer_set(1UL<<_COLEMAK); - } - return false; - break; case DVORAK: if (record->event.pressed) { #ifdef AUDIO_ENABLE From 624347875275664487f94cf3d0ab6f577d5b7686 Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Tue, 31 Aug 2021 16:09:47 -0600 Subject: [PATCH 15/25] lets split rgb restored --- keyboards/lets_split/keymaps/shaymdev/Makefile | 5 ----- keyboards/lets_split/keymaps/shaymdev/config.h | 3 +++ keyboards/lets_split/keymaps/shaymdev/rules.mk | 1 + keyboards/orthodox/keymaps/shaymdev/Makefile | 5 ----- keyboards/orthodox/keymaps/shaymdev/config.h | 4 +++- keyboards/orthodox/keymaps/shaymdev/keymap.c | 1 - keyboards/orthodox/keymaps/shaymdev/rules.mk | 1 + 7 files changed, 8 insertions(+), 12 deletions(-) delete mode 100644 keyboards/lets_split/keymaps/shaymdev/Makefile create mode 100644 keyboards/lets_split/keymaps/shaymdev/rules.mk delete mode 100644 keyboards/orthodox/keymaps/shaymdev/Makefile create mode 100644 keyboards/orthodox/keymaps/shaymdev/rules.mk diff --git a/keyboards/lets_split/keymaps/shaymdev/Makefile b/keyboards/lets_split/keymaps/shaymdev/Makefile deleted file mode 100644 index 75e9c6503e8e..000000000000 --- a/keyboards/lets_split/keymaps/shaymdev/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -ifndef QUANTUM_DIR - include ../../../../Makefile -endif - -RGBLIGHT_ENABLE = yes diff --git a/keyboards/lets_split/keymaps/shaymdev/config.h b/keyboards/lets_split/keymaps/shaymdev/config.h index 25c12d9290fa..9395bd40fa6d 100644 --- a/keyboards/lets_split/keymaps/shaymdev/config.h +++ b/keyboards/lets_split/keymaps/shaymdev/config.h @@ -34,8 +34,11 @@ along with this program. If not, see . // #define _MASTER_RIGHT // #define EE_HANDS +#undef RGB_DI_PIN +#define RGB_DI_PIN D3 #undef RGBLED_NUM #define RGBLIGHT_ANIMATIONS #define RGBLED_NUM 10 + #endif diff --git a/keyboards/lets_split/keymaps/shaymdev/rules.mk b/keyboards/lets_split/keymaps/shaymdev/rules.mk new file mode 100644 index 000000000000..1e3cebb14515 --- /dev/null +++ b/keyboards/lets_split/keymaps/shaymdev/rules.mk @@ -0,0 +1 @@ +RGBLIGHT_ENABLE = yes diff --git a/keyboards/orthodox/keymaps/shaymdev/Makefile b/keyboards/orthodox/keymaps/shaymdev/Makefile deleted file mode 100644 index 75e9c6503e8e..000000000000 --- a/keyboards/orthodox/keymaps/shaymdev/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -ifndef QUANTUM_DIR - include ../../../../Makefile -endif - -RGBLIGHT_ENABLE = yes diff --git a/keyboards/orthodox/keymaps/shaymdev/config.h b/keyboards/orthodox/keymaps/shaymdev/config.h index f0e6b98de2cf..98ac2b471666 100644 --- a/keyboards/orthodox/keymaps/shaymdev/config.h +++ b/keyboards/orthodox/keymaps/shaymdev/config.h @@ -22,7 +22,7 @@ along with this program. If not, see . #ifndef CONFIG_USER_H #define CONFIG_USER_H -#include "../../config.h" +#include "config_common.h" /* Use I2C or Serial, not both */ @@ -38,5 +38,7 @@ along with this program. If not, see . #undef RGBLED_NUM #define RGBLIGHT_ANIMATIONS #define RGBLED_NUM 10 +#undef RGB_DI_PIN +#define RGB_DI_PIN D3 #endif diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c index 62c8bac44d1b..a73da2014175 100644 --- a/keyboards/orthodox/keymaps/shaymdev/keymap.c +++ b/keyboards/orthodox/keymaps/shaymdev/keymap.c @@ -52,7 +52,6 @@ enum { #define _______ KC_TRNS #define XXXXXXX KC_NO -#define LS__SPC MT(MOD_LSFT, KC_SPC) #define TO_DV TO(_DVORAK) #define TO_ADJ TO(_ADJUST) diff --git a/keyboards/orthodox/keymaps/shaymdev/rules.mk b/keyboards/orthodox/keymaps/shaymdev/rules.mk new file mode 100644 index 000000000000..1e3cebb14515 --- /dev/null +++ b/keyboards/orthodox/keymaps/shaymdev/rules.mk @@ -0,0 +1 @@ +RGBLIGHT_ENABLE = yes From 1ceb585fb4d982913bf9640b718fad5376b372c5 Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Tue, 31 Aug 2021 18:06:32 -0600 Subject: [PATCH 16/25] orthodox rgb fix --- keyboards/orthodox/keymaps/shaymdev/config.h | 12 +++--------- keyboards/orthodox/keymaps/shaymdev/keymap.c | 6 +----- keyboards/orthodox/keymaps/shaymdev/rules.mk | 2 +- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/keyboards/orthodox/keymaps/shaymdev/config.h b/keyboards/orthodox/keymaps/shaymdev/config.h index 98ac2b471666..4ec6c598e3d5 100644 --- a/keyboards/orthodox/keymaps/shaymdev/config.h +++ b/keyboards/orthodox/keymaps/shaymdev/config.h @@ -19,10 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include "config_common.h" +#pragma once /* Use I2C or Serial, not both */ @@ -30,15 +27,12 @@ along with this program. If not, see . // #define USE_I2C /* Select hand configuration */ - // #define MASTER_LEFT -// #define _MASTER_RIGHT +// #define MASTER_RIGHT #define EE_HANDS #undef RGBLED_NUM #define RGBLIGHT_ANIMATIONS #define RGBLED_NUM 10 #undef RGB_DI_PIN -#define RGB_DI_PIN D3 - -#endif +#define RGB_DI_PIN D3 \ No newline at end of file diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c index a73da2014175..79e5bd71bf1a 100644 --- a/keyboards/orthodox/keymaps/shaymdev/keymap.c +++ b/keyboards/orthodox/keymaps/shaymdev/keymap.c @@ -19,11 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "orthodox.h" -#include "action_layer.h" -#include "eeconfig.h" - -extern keymap_config_t keymap_config; +#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. diff --git a/keyboards/orthodox/keymaps/shaymdev/rules.mk b/keyboards/orthodox/keymaps/shaymdev/rules.mk index 1e3cebb14515..7ad666d1a383 100644 --- a/keyboards/orthodox/keymaps/shaymdev/rules.mk +++ b/keyboards/orthodox/keymaps/shaymdev/rules.mk @@ -1 +1 @@ -RGBLIGHT_ENABLE = yes +RGBLIGHT_ENABLE = yes \ No newline at end of file From fc616c3b4f30a9fe847b54e4faff50608deb7717 Mon Sep 17 00:00:00 2001 From: "U-MAINMAN\\smerrill" Date: Wed, 1 Sep 2021 12:31:57 -0600 Subject: [PATCH 17/25] rebuild orthodox keymap from default --- keyboards/orthodox/keymaps/shaymdev/config.h | 12 ++- keyboards/orthodox/keymaps/shaymdev/keymap.c | 85 ++++---------------- 2 files changed, 27 insertions(+), 70 deletions(-) diff --git a/keyboards/orthodox/keymaps/shaymdev/config.h b/keyboards/orthodox/keymaps/shaymdev/config.h index 4ec6c598e3d5..be1673850bf6 100644 --- a/keyboards/orthodox/keymaps/shaymdev/config.h +++ b/keyboards/orthodox/keymaps/shaymdev/config.h @@ -35,4 +35,14 @@ along with this program. If not, see . #define RGBLIGHT_ANIMATIONS #define RGBLED_NUM 10 #undef RGB_DI_PIN -#define RGB_DI_PIN D3 \ No newline at end of file +#define RGB_DI_PIN D3 + +#ifdef AUDIO_ENABLE + #define STARTUP_SONG SONG(PLANCK_SOUND) + // #define STARTUP_SONG SONG(NO_SOUND) + + #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ + SONG(COLEMAK_SOUND), \ + SONG(DVORAK_SOUND) \ + } +#endif diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c index 79e5bd71bf1a..757cf188a404 100644 --- a/keyboards/orthodox/keymaps/shaymdev/keymap.c +++ b/keyboards/orthodox/keymaps/shaymdev/keymap.c @@ -34,24 +34,12 @@ along with this program. If not, see . enum custom_keycodes { DVORAK = SAFE_RANGE, QWERTY, - LOWER, - RAISE, - ADJUST }; -//Tap Dance Declarations -enum { - TD_LOWER_ADJUST = 0 -}; - -// Fillers to make layering more clear -#define _______ KC_TRNS -#define XXXXXXX KC_NO +#define LOWER MO(_LOWER) +#define RAISE MO(_RAISE) #define TO_DV TO(_DVORAK) -#define TO_ADJ TO(_ADJUST) - - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -88,65 +76,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -#ifdef AUDIO_ENABLE -float tone_qwerty[][2] = SONG(QWERTY_SOUND); -float tone_dvorak[][2] = SONG(DVORAK_SOUND); -#endif - -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); } bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case QWERTY: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_NOTE_ARRAY(tone_qwerty, false, 0); - #endif - persistent_default_layer_set(1UL<<_QWERTY); - } - return false; - break; - case DVORAK: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_NOTE_ARRAY(tone_dvorak, false, 0); - #endif - persistent_default_layer_set(1UL<<_DVORAK); - } - 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 ADJUST: - if (record->event.pressed) { - layer_on(_ADJUST); - } else { - layer_off(_ADJUST); - } - return false; - break; + case QWERTY: + if (record->event.pressed) { + set_single_persistent_default_layer(_QWERTY); + } + return false; + break; + case DVORAK: + if (record->event.pressed) { + set_single_persistent_default_layer(_DVORAK); + } + return false; + break; } return true; } - From 9015581912f74bbf338c40b269f210f3eff007a6 Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Fri, 3 Sep 2021 15:02:38 -0600 Subject: [PATCH 18/25] add orthodox rgb layer indicators --- keyboards/orthodox/keymaps/shaymdev/config.h | 4 + keyboards/orthodox/keymaps/shaymdev/keymap.c | 97 +++++++++++++++++--- keyboards/orthodox/keymaps/shaymdev/rules.mk | 3 +- 3 files changed, 89 insertions(+), 15 deletions(-) diff --git a/keyboards/orthodox/keymaps/shaymdev/config.h b/keyboards/orthodox/keymaps/shaymdev/config.h index be1673850bf6..17cb670e38d3 100644 --- a/keyboards/orthodox/keymaps/shaymdev/config.h +++ b/keyboards/orthodox/keymaps/shaymdev/config.h @@ -34,8 +34,12 @@ along with this program. If not, see . #undef RGBLED_NUM #define RGBLIGHT_ANIMATIONS #define RGBLED_NUM 10 +// #define RGBLED_SPLIT { 5, 5 } #undef RGB_DI_PIN #define RGB_DI_PIN D3 +#define RGBLIGHT_LAYERS +#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF +#define RGBLIGHT_SLEEP #ifdef AUDIO_ENABLE #define STARTUP_SONG SONG(PLANCK_SOUND) diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c index 757cf188a404..97b2788a6f72 100644 --- a/keyboards/orthodox/keymaps/shaymdev/keymap.c +++ b/keyboards/orthodox/keymaps/shaymdev/keymap.c @@ -44,15 +44,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DVORAK] = LAYOUT( \ - KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ - KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_ENT, KC_LALT, KC_DEL, KC_LGUI, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ - KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, LOWER, KC_LSFT, KC_LCTL, KC_BSPC, KC_SPC, RAISE, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS \ + KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ + KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_ENT, KC_LALT, KC_DEL, KC_LGUI, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ + KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, TT(LOWER), KC_LSFT, KC_LCTL, KC_BSPC, KC_SPC, TT(RAISE), KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS \ ), [_QWERTY] = 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_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ - KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, LOWER, KC_BSPC, KC_ENT, KC_RALT, KC_SPC, RAISE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI \ + 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_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, _______, _______, _______, _______, _______, _______, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT \ ), [_LOWER] = LAYOUT( \ @@ -62,23 +62,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_RAISE] = LAYOUT( \ - _______, KC_PSCR, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,\ - KC_CAPS, KC_INS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX,\ - _______, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX\ + _______, KC_PSCR, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,\ + KC_CAPS, KC_INS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX,\ + _______, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX\ ), [_ADJUST] = LAYOUT( \ - TO_DV, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ - RGB_TOG, RGB_MOD, _______, AU_ON, AU_OFF, AG_NORM, _______, _______, _______, _______, AG_SWAP, QWERTY, DVORAK, _______, _______, _______, \ + TO_DV, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLEP, \ + RGB_TOG, RGB_MOD, VLK_TOG, AU_ON, AU_OFF, AG_NORM, _______, _______, _______, _______, AG_SWAP, QWERTY, DVORAK, _______, _______, _______, \ RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ ) }; -layer_state_t layer_state_set_user(layer_state_t state) { - return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); -} +// void matrix_init_user(void) { +// #ifdef BOOTLOADER_CATERINA +// // This will disable the red LEDs on the ProMicros. UPDATE: I don't think the power LEDs can be turned off. This is for the others I think... and they were already not on... I think. +// setPinInput(D5); +// setPinInput(B0); +// #endif +// }; bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { @@ -97,3 +101,68 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return true; } + +#ifdef RGBLIGHT_ENABLE + +const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS( + {4, 2, HSV_RED} // Light 10 LEDs, starting with LED 0 +); + +const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 3, HSV_CHARTREUSE} // Light 10 LEDs, starting with LED 0 +); + +const rgblight_segment_t PROGMEM my_lower_layer[] = RGBLIGHT_LAYER_SEGMENTS( + {3, 2, HSV_BLUE} // Light LEDs 0-4 +); + +const rgblight_segment_t PROGMEM my_raise_layer[] = RGBLIGHT_LAYER_SEGMENTS( + {5, 2, HSV_ORANGE} // Light LEDs 5-10 +); + +const rgblight_segment_t PROGMEM my_adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS( + {3, 4, HSV_GREEN} // Light 10 LEDs, starting with LED 0 +); + + +// Now define the array of layers. Later layers take precedence +const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( + my_capslock_layer, + my_qwerty_layer, // Overrides other layers + my_lower_layer, // Overrides other layers + my_raise_layer, // Overrides other layers + my_adjust_layer // Overrides other layers +); + +void keyboard_post_init_user(void) { + // Enable the LED layers + rgblight_layers = my_rgb_layers; + rgblight_enable_noeeprom(); // Enables RGB, without saving settings + //rgblight_sethsv_noeeprom(HSV_CYAN); + //rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); + rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL); +} + +bool led_update_user(led_t led_state) { + rgblight_set_layer_state(0, led_state.caps_lock); + return true; +} + +layer_state_t default_layer_state_set_user(layer_state_t state) { + rgblight_set_layer_state(1, layer_state_cmp(state, _QWERTY)); + return state; +} + +#endif + +layer_state_t layer_state_set_user(layer_state_t state) { + state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); + +#ifdef RGBLIGHT_ENABLE + rgblight_set_layer_state(2, layer_state_cmp(state, _LOWER)); + rgblight_set_layer_state(3, layer_state_cmp(state, _RAISE)); + rgblight_set_layer_state(4, layer_state_cmp(state, _ADJUST)); +#endif + + return state; +} diff --git a/keyboards/orthodox/keymaps/shaymdev/rules.mk b/keyboards/orthodox/keymaps/shaymdev/rules.mk index 7ad666d1a383..650a6c3a1f6c 100644 --- a/keyboards/orthodox/keymaps/shaymdev/rules.mk +++ b/keyboards/orthodox/keymaps/shaymdev/rules.mk @@ -1 +1,2 @@ -RGBLIGHT_ENABLE = yes \ No newline at end of file +RGBLIGHT_ENABLE = yes +VELOCIKEY_ENABLE = yes \ No newline at end of file From 75b081ab54e41741cb6c6178de998fbee9ed1b15 Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Fri, 3 Sep 2021 17:10:22 -0600 Subject: [PATCH 19/25] lets split rgb layers --- .../lets_split/keymaps/shaymdev/config.h | 16 +- .../lets_split/keymaps/shaymdev/keymap.c | 180 ++++++++++-------- .../lets_split/keymaps/shaymdev/rules.mk | 1 + 3 files changed, 110 insertions(+), 87 deletions(-) diff --git a/keyboards/lets_split/keymaps/shaymdev/config.h b/keyboards/lets_split/keymaps/shaymdev/config.h index 9395bd40fa6d..18d8438d7844 100644 --- a/keyboards/lets_split/keymaps/shaymdev/config.h +++ b/keyboards/lets_split/keymaps/shaymdev/config.h @@ -18,10 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include "../../config.h" +#pragma once /* Use I2C or Serial, not both */ @@ -40,5 +37,16 @@ along with this program. If not, see . #define RGBLIGHT_ANIMATIONS #define RGBLED_NUM 10 +#define RGBLIGHT_LAYERS +#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF +#define RGBLIGHT_SLEEP + +#ifdef AUDIO_ENABLE + #define STARTUP_SONG SONG(PLANCK_SOUND) + // #define STARTUP_SONG SONG(NO_SOUND) + #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ + SONG(COLEMAK_SOUND), \ + SONG(DVORAK_SOUND) \ + } #endif diff --git a/keyboards/lets_split/keymaps/shaymdev/keymap.c b/keyboards/lets_split/keymaps/shaymdev/keymap.c index a06e67ca0ae5..68dce78f9ade 100644 --- a/keyboards/lets_split/keymaps/shaymdev/keymap.c +++ b/keyboards/lets_split/keymaps/shaymdev/keymap.c @@ -1,8 +1,4 @@ -#include "lets_split.h" -#include "action_layer.h" -#include "eeconfig.h" - -extern keymap_config_t keymap_config; +#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. @@ -16,116 +12,134 @@ extern keymap_config_t keymap_config; enum custom_keycodes { DVORAK = SAFE_RANGE, - QWERTY, - LOWER, - RAISE, - ADJUST, + QWERTY }; -// Fillers to make layering more clear -#define _______ KC_TRNS -#define XXXXXXX KC_NO - #define TO_DV TO(_DVORAK) -#define TO_ADJ TO(_ADJUST) +#define LOWER MO(_LOWER) +#define LWR LOWER +#define RAISE MO(_RAISE) +#define RAS RAISE const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DVORAK] = LAYOUT( \ - KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ - KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ - KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS, \ - ADJUST, KC_ENT, KC_LALT, LOWER, KC_LSFT, KC_LCTL, KC_BSPC, KC_SPC, RAISE, KC_DEL, KC_LGUI, XXXXXXX \ + KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ + KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ + KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS, \ + XXXXXXX, KC_ENT, KC_LALT, TT(LWR), KC_LSFT, KC_LCTL, KC_BSPC, KC_SPC, TT(RAS), KC_DEL, KC_LGUI, XXXXXXX \ ), [_QWERTY] = 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_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ - KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI,\ - _______, KC_ENT, KC_LALT, LOWER, KC_LSFT, KC_LCTL, KC_BSPC, KC_SPC, RAISE, KC_DEL, KC_LGUI, XXXXXXX \ + 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_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI,\ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [_LOWER] = LAYOUT( \ - _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, \ + _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, \ _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, \ _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______, \ - _______, _______, _______, _______, _______, _______, _______, KC_KP_0, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, KC_KP_0, _______, _______, _______, _______ //This kp_0 is blocking the space key.... may want to do something about that. ), [_RAISE] = LAYOUT( \ _______, KC_PSCR, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,\ KC_CAPS, KC_INS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX,\ _______, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX,\ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [_ADJUST] = LAYOUT( \ TO_DV, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ - RGB_TOG, RGB_MOD, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, DVORAK, _______, _______, _______, \ + RGB_TOG, RGB_MOD, VLK_TOG, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, DVORAK, _______, _______, _______, \ RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; -#ifdef AUDIO_ENABLE -float tone_qwerty[][2] = SONG(QWERTY_SOUND); -float tone_dvorak[][2] = SONG(DVORAK_SOUND); -#endif - -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case QWERTY: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_NOTE_ARRAY(tone_qwerty, false, 0); - #endif - persistent_default_layer_set(1UL<<_QWERTY); - } - return false; - break; - case DVORAK: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_NOTE_ARRAY(tone_dvorak, false, 0); - #endif - persistent_default_layer_set(1UL<<_DVORAK); - } - 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 ADJUST: - if (record->event.pressed) { - layer_on(_ADJUST); - } else { - layer_off(_ADJUST); - } - return false; - break; + case QWERTY: + if (record->event.pressed) { + set_single_persistent_default_layer(_QWERTY); + } + return false; + break; + case DVORAK: + if (record->event.pressed) { + set_single_persistent_default_layer(_DVORAK); + } + return false; + break; } return true; } + + +#ifdef RGBLIGHT_ENABLE + +const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS( + {4, 2, HSV_RED} // Light 10 LEDs, starting with LED 0 +); + +const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 3, HSV_CHARTREUSE} // Light 10 LEDs, starting with LED 0 +); + +const rgblight_segment_t PROGMEM my_lower_layer[] = RGBLIGHT_LAYER_SEGMENTS( + {3, 2, HSV_BLUE} // Light LEDs 0-4 +); + +const rgblight_segment_t PROGMEM my_raise_layer[] = RGBLIGHT_LAYER_SEGMENTS( + {5, 2, HSV_ORANGE} // Light LEDs 5-10 +); + +const rgblight_segment_t PROGMEM my_adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS( + {3, 4, HSV_GREEN} // Light 10 LEDs, starting with LED 0 +); + + +// Now define the array of layers. Later layers take precedence +const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( + my_capslock_layer, + my_qwerty_layer, // Overrides other layers + my_lower_layer, // Overrides other layers + my_raise_layer, // Overrides other layers + my_adjust_layer // Overrides other layers +); + +void keyboard_post_init_user(void) { + // Enable the LED layers + rgblight_layers = my_rgb_layers; + rgblight_disable_noeeprom(); // disables RGB, without saving settings + //rgblight_sethsv_noeeprom(HSV_CYAN); + //rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); + // rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL); +} + +bool led_update_user(led_t led_state) { + rgblight_set_layer_state(0, led_state.caps_lock); + return true; +} + +layer_state_t default_layer_state_set_user(layer_state_t state) { + rgblight_set_layer_state(1, layer_state_cmp(state, _QWERTY)); + return state; +} + +#endif + +layer_state_t layer_state_set_user(layer_state_t state) { + state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); + +#ifdef RGBLIGHT_ENABLE + rgblight_set_layer_state(2, layer_state_cmp(state, _LOWER)); + rgblight_set_layer_state(3, layer_state_cmp(state, _RAISE)); + rgblight_set_layer_state(4, layer_state_cmp(state, _ADJUST)); +#endif + + return state; +} diff --git a/keyboards/lets_split/keymaps/shaymdev/rules.mk b/keyboards/lets_split/keymaps/shaymdev/rules.mk index 1e3cebb14515..605328a9daf2 100644 --- a/keyboards/lets_split/keymaps/shaymdev/rules.mk +++ b/keyboards/lets_split/keymaps/shaymdev/rules.mk @@ -1 +1,2 @@ RGBLIGHT_ENABLE = yes +VELOCIKEY_ENABLE = yes From ba7d7226c0d1eb51224cc8f56d71ecb102fea65a Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Thu, 30 Sep 2021 14:35:06 -0600 Subject: [PATCH 20/25] Orthodox combo enter, shft+back=del, etc and smaller space --- keyboards/orthodox/keymaps/shaymdev/config.h | 19 ++++++++- keyboards/orthodox/keymaps/shaymdev/keymap.c | 45 ++++++++++++++++++-- keyboards/orthodox/keymaps/shaymdev/rules.mk | 8 +++- 3 files changed, 66 insertions(+), 6 deletions(-) diff --git a/keyboards/orthodox/keymaps/shaymdev/config.h b/keyboards/orthodox/keymaps/shaymdev/config.h index 17cb670e38d3..496a58d409d6 100644 --- a/keyboards/orthodox/keymaps/shaymdev/config.h +++ b/keyboards/orthodox/keymaps/shaymdev/config.h @@ -32,8 +32,14 @@ along with this program. If not, see . #define EE_HANDS #undef RGBLED_NUM -#define RGBLIGHT_ANIMATIONS #define RGBLED_NUM 10 +// #define RGBLIGHT_ANIMATIONS + +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_KNIGHT + // #define RGBLED_SPLIT { 5, 5 } #undef RGB_DI_PIN #define RGB_DI_PIN D3 @@ -50,3 +56,14 @@ along with this program. If not, see . SONG(DVORAK_SOUND) \ } #endif + +#define COMBO_COUNT 1 + +#define IGNORE_MOD_TAP_INTERRUPT +#define TAPPING_TERM 220 + + +// #define NO_ACTION_MACRO //Drashna, on QMK issue 3224, +// #define NO_ACTION_FUNCTION + + diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c index 97b2788a6f72..c6b85930f7b4 100644 --- a/keyboards/orthodox/keymaps/shaymdev/keymap.c +++ b/keyboards/orthodox/keymaps/shaymdev/keymap.c @@ -31,9 +31,32 @@ along with this program. If not, see . #define _RAISE 4 #define _ADJUST 16 +enum combos //match combo_count in config.h +{ + EU_ENT, +}; + +const uint16_t PROGMEM eu_combo[] = {KC_E, KC_U, COMBO_END}; + +combo_t key_combos[COMBO_COUNT] = { + [EU_ENT] = COMBO_ACTION(eu_combo), +}; + +void process_combo_event(uint16_t combo_index, bool pressed) { + switch(combo_index) { + case EU_ENT: + if (pressed) { + tap_code16(KC_ENT); + } + break; + } +} + + enum custom_keycodes { DVORAK = SAFE_RANGE, QWERTY, + VELOCI }; #define LOWER MO(_LOWER) @@ -44,9 +67,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DVORAK] = LAYOUT( \ - KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ - KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_ENT, KC_LALT, KC_DEL, KC_LGUI, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ - KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, TT(LOWER), KC_LSFT, KC_LCTL, KC_BSPC, KC_SPC, TT(RAISE), KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS \ + KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ + KC_TAB, GUI_T(KC_A), ALT_T(KC_O), KC_E, KC_U, KC_I, KC_ENT, KC_LALT, KC_DEL, KC_LGUI, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ + KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, TT(LOWER), KC_LSFT, KC_LCTL, KC_BSPC, ALT_T(KC_SPC), TT(RAISE), KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS \ ), [_QWERTY] = LAYOUT( \ @@ -69,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( \ TO_DV, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLEP, \ - RGB_TOG, RGB_MOD, VLK_TOG, AU_ON, AU_OFF, AG_NORM, _______, _______, _______, _______, AG_SWAP, QWERTY, DVORAK, _______, _______, _______, \ + RGB_TOG, RGB_MOD, VLK_TOG, AU_ON, AU_OFF, AG_NORM, _______, _______, _______, _______, AG_SWAP, QWERTY, DVORAK, _______, _______, _______, \ RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ ) @@ -84,6 +107,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // #endif // }; +const key_override_t delete_key_override = ko_make_basic(MOD_MASK_SHIFT, KC_BSPACE, KC_DELETE); + +// This globally defines all key overrides to be used +const key_override_t **key_overrides = (const key_override_t *[]){ + &delete_key_override, + NULL // Null terminate the array of overrides! +}; + bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: @@ -98,6 +129,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; break; +// case VELOCI: +// #ifdef VELOCIKEY_ENABLE +// velocikey_toggle(); +// return false; +// #endif +// break; } return true; } diff --git a/keyboards/orthodox/keymaps/shaymdev/rules.mk b/keyboards/orthodox/keymaps/shaymdev/rules.mk index 650a6c3a1f6c..84acbd55c4f4 100644 --- a/keyboards/orthodox/keymaps/shaymdev/rules.mk +++ b/keyboards/orthodox/keymaps/shaymdev/rules.mk @@ -1,2 +1,8 @@ RGBLIGHT_ENABLE = yes -VELOCIKEY_ENABLE = yes \ No newline at end of file +VELOCIKEY_ENABLE = yes +KEY_OVERRIDE_ENABLE = yes +COMBO_ENABLE = yes +#EXTRAFLAGS += -flto #Drashna, on QMK issue 3224, paraphrased, This enables Link Time Optimization, saving a significant amount of space. Because the Macro and Function features are incompatible with Link Time Optimization, disable those features in config.h: +LTO_ENABLE = yes #same as above but includes the others in config for you +CONSOLE_ENABLE = no +MOUSEKEY_ENABLE = no \ No newline at end of file From bddc9526027b71be041731a605fa08ef9506de05 Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Thu, 30 Sep 2021 15:36:30 -0600 Subject: [PATCH 21/25] Remove Shergo since it never recieved qmk (#2) --- keyboards/shergo/Makefile | 18 -- keyboards/shergo/config.h | 190 --------------------- keyboards/shergo/keymaps/default/Makefile | 37 ---- keyboards/shergo/keymaps/default/config.h | 24 --- keyboards/shergo/keymaps/default/keymap.c | 122 ------------- keyboards/shergo/keymaps/default/readme.md | 1 - keyboards/shergo/readme.md | 28 --- keyboards/shergo/rules.mk | 68 -------- keyboards/shergo/shergo.c | 43 ----- keyboards/shergo/shergo.h | 50 ------ 10 files changed, 581 deletions(-) delete mode 100644 keyboards/shergo/Makefile delete mode 100644 keyboards/shergo/config.h delete mode 100644 keyboards/shergo/keymaps/default/Makefile delete mode 100644 keyboards/shergo/keymaps/default/config.h delete mode 100644 keyboards/shergo/keymaps/default/keymap.c delete mode 100644 keyboards/shergo/keymaps/default/readme.md delete mode 100644 keyboards/shergo/readme.md delete mode 100644 keyboards/shergo/rules.mk delete mode 100644 keyboards/shergo/shergo.c delete mode 100644 keyboards/shergo/shergo.h diff --git a/keyboards/shergo/Makefile b/keyboards/shergo/Makefile deleted file mode 100644 index 840dc9a28667..000000000000 --- a/keyboards/shergo/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 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 MAKEFILE_INCLUDED - include ../../Makefile -endif diff --git a/keyboards/shergo/config.h b/keyboards/shergo/config.h deleted file mode 100644 index aa5992215152..000000000000 --- a/keyboards/shergo/config.h +++ /dev/null @@ -1,190 +0,0 @@ -/* -Copyright 2017 REPLACE_WITH_YOUR_NAME - -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 CONFIG_H -#define CONFIG_H - -#include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Shay Merrill -#define PRODUCT shergo v1 -#define DESCRIPTION A custom ergonomic keyboard by Shay Merrill - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 10 - -/* - * 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 { F0, F1, F4, F5, F6 } -#define MATRIX_COL_PINS { D3, D2, D1, D0, C6, B7, B3, B2, B1, B0} -#define UNUSED_PINS - -/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */ -#define DIODE_DIRECTION COL2ROW - -// #define BACKLIGHT_PIN B7 -// #define BACKLIGHT_BREATHING -// #define BACKLIGHT_LEVELS 3 - - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCING_DELAY 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 */ -#define IS_COMMAND() ( \ - keyboard_report->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_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 - -#endif diff --git a/keyboards/shergo/keymaps/default/Makefile b/keyboards/shergo/keymaps/default/Makefile deleted file mode 100644 index b8879076bd46..000000000000 --- a/keyboards/shergo/keymaps/default/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 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 . - - -# QMK 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 -# -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = yes # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = no # Console for debug(+400) -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) -AUDIO_ENABLE = no # Audio output on port C6 -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif diff --git a/keyboards/shergo/keymaps/default/config.h b/keyboards/shergo/keymaps/default/config.h deleted file mode 100644 index f52a97bbc865..000000000000 --- a/keyboards/shergo/keymaps/default/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2017 REPLACE_WITH_YOUR_NAME - * - * 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 CONFIG_USER_H -#define CONFIG_USER_H - -#include "../../config.h" - -// place overrides here - -#endif diff --git a/keyboards/shergo/keymaps/default/keymap.c b/keyboards/shergo/keymaps/default/keymap.c deleted file mode 100644 index b3aa287143b7..000000000000 --- a/keyboards/shergo/keymaps/default/keymap.c +++ /dev/null @@ -1,122 +0,0 @@ -/* Copyright 2017 REPLACE_WITH_YOUR_NAME - * - * 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 "shergo.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = -/***** Layer 0 - dvorak ****** - logically: - KEYMAP( ESC, QUOT, COMM, DOT, P, Y, F, G, C, R, L, SLSH, \ - GRV, A, O, E, U, I, D, H, T, N, S, MINS, \ - EQL, SCLN, Q, J, K, X, B, M, W, V, Z, BSLS, \ - LGUI, FN3, FN2, LSFT, LCTL, SPC, BSPC, DEL, FN3, RGUI \ - ),*/ -KEYMAP( FN25, GRV, X, I, Y, F, D, B, \ - ESC, QUOT, COMM, DOT, P, G, C, R, L, SLSH, \ - TAB, A, O, E, U, H, T, N, S, MINS, \ - EQL, SCLN, Q, J, K, M, W, V, Z, BSLS, \ - LGUI, FN3, FN2, LSFT, LCTL, BSPC, SPC, FN3, FN27, RGUI \ - ), - - -/***** Layer 1 - qwerty ******///TODO: see if when dvorak is default the backslash/minus thing is correct. Not sure how to handle TRNS -KEYMAP( FN25, GRV, B, G, T, Y, H, N, \ - ESC, Q, W, E, R, U, I, O, P, SLSH, \ - TAB, A, S, D, F, J, K, L, SCLN, QUOT, \ - EQL, Z, X, C, V, M, COMM, DOT, BSLS, MINS, \ - LGUI, FN3, FN2, LSFT, LCTL, BSPC, SPC, FN23, DEL, RGUI \ - ), - - -/***** Layer 2 - numbers and symbols ******/ -KEYMAP( TRNS, TRNS, TRNS, FN18, FN17, TRNS, TRNS, TRNS, \ - TRNS, FN11, FN12, FN21, FN22, P7, P8, P9, PMNS, TRNS, \ - FN26, FN13, FN14, FN19, FN10, P4, P5, P6, PPLS, TRNS, \ - TRNS, FN15, FN16, LBRC, RBRC, P1, P2, P3, PENT, TRNS, \ - TRNS, FN4, TRNS, TRNS, TRNS, TRNS, TRNS, P0, TRNS, PDOT \ - ), - -/***** Layer 3 - nav and f-keys ******/ -KEYMAP( TRNS, TRNS, TRNS, PGDN, PGUP, VOLU, VOLD, MUTE, \ - TRNS, TRNS, HOME, UP, END, F7, F8, F9, F10, TRNS, \ - CAPS, TRNS, LEFT, DOWN, RGHT, F4, F5, F6, F11, TRNS, \ - FN8, NLCK, TRNS, TRNS, TRNS, F1, F2, F3, F12, FN9, \ - TRNS, TRNS, FN5, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS \ - ) - -}; - -const uint16_t PROGMEM fn_actions[] = { - [2] = ACTION_LAYER_MOMENTARY(2), - [3] = ACTION_LAYER_MOMENTARY(3), - [4] = ACTION_LAYER_TOGGLE(2), - [5] = ACTION_LAYER_TOGGLE(3), - - [8] = ACTION_DEFAULT_LAYER_SET(0), //default as dvorak - [9] = ACTION_DEFAULT_LAYER_SET(1), //default as qwerty - - - [10] = ACTION_MODS_KEY(MOD_LSFT, KC_0), //) - [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), //( - - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), //{ - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), //} - - [25] = ACTION_MODS_TAP_KEY(MOD_LALT, KC_ENT), - [26] = ACTION_MODS_KEY(MOD_LALT | MOD_LCTL, KC_TAB), - [27] = ACTION_MODS_TAP_KEY(MOD_RALT, KC_DEL), - -}; - -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - // MACRODOWN only works in this function - switch(id) { - case 0: - if (record->event.pressed) { - register_code(KC_RSFT); - } else { - unregister_code(KC_RSFT); - } - break; - } - return MACRO_NONE; -}; - - -void matrix_init_user(void) { - -} - -void matrix_scan_user(void) { - -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} - -void led_set_user(uint8_t usb_led) { - -} diff --git a/keyboards/shergo/keymaps/default/readme.md b/keyboards/shergo/keymaps/default/readme.md deleted file mode 100644 index 4c9b3cf79cfe..000000000000 --- a/keyboards/shergo/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for shergo \ No newline at end of file diff --git a/keyboards/shergo/readme.md b/keyboards/shergo/readme.md deleted file mode 100644 index 261e9629cd0d..000000000000 --- a/keyboards/shergo/readme.md +++ /dev/null @@ -1,28 +0,0 @@ -shergo keyboard firmware -====================== - -## Quantum MK Firmware - -For the full Quantum feature list, see [the parent readme](/). - -## Building - -Download or clone the whole firmware and navigate to the keyboards/shergo folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. - -Depending on which keymap you would like to use, you will have to compile slightly differently. - -### Default - -To build with the default keymap, simply run `make default`. - -### Other Keymaps - -Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant keymap files. - -To build the firmware binary hex file with a keymap just do `make` with a keymap like this: - -``` -$ make [default|jack|] -``` - -Keymaps follow the format **__\.c__** and are stored in the `keymaps` folder. diff --git a/keyboards/shergo/rules.mk b/keyboards/shergo/rules.mk deleted file mode 100644 index ca2a2a5f80be..000000000000 --- a/keyboards/shergo/rules.mk +++ /dev/null @@ -1,68 +0,0 @@ -# MCU name -#MCU = at90usb1286 -MCU = atmega32u4 - -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 16000000 - - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - -# Interrupt driven control endpoint task(+60) -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT - - -# Boot Section Size in *bytes* -# Teensy halfKay 512 -# Teensy++ halfKay 1024 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -# USBaspLoader 2048 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) -EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) -CONSOLE_ENABLE ?= yes # Console for debug(+400) -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 -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 diff --git a/keyboards/shergo/shergo.c b/keyboards/shergo/shergo.c deleted file mode 100644 index e2369cca2c52..000000000000 --- a/keyboards/shergo/shergo.c +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2017 REPLACE_WITH_YOUR_NAME - * - * 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 "shergo.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); -} diff --git a/keyboards/shergo/shergo.h b/keyboards/shergo/shergo.h deleted file mode 100644 index a64507c41114..000000000000 --- a/keyboards/shergo/shergo.h +++ /dev/null @@ -1,50 +0,0 @@ -/* Copyright 2017 REPLACE_WITH_YOUR_NAME - * - * 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 SHERGO_H -#define SHERGO_H - -#include "quantum.h" - -// This a shortcut to help you visually see your layout. -// The following is an example using the Planck MIT layout -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -/* -#define KEYMAP( \ - k00, k01, k02, \ - k10, k11 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k10, KC_NO, k11 }, \ -} -*/ - -#define KEYMAP( \ - K00, K01, K02, K03, K04, K05, K06, K07, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49 \ - ) { \ - { KC_##K00, KC_##K01, KC_##K02, KC_##K04, KC_##K03, KC_##K05, KC_##K06, KC_##K07, KC_NO, KC_NO}, \ - { KC_##K10, KC_##K11, KC_##K12, KC_##K14, KC_##K13, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19 }, \ - { KC_##K20, KC_##K21, KC_##K22, KC_##K24, KC_##K23, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29 }, \ - { KC_##K30, KC_##K31, KC_##K32, KC_##K34, KC_##K33, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39 }, \ - { KC_##K40, KC_##K41, KC_##K42, KC_##K44, KC_##K43, KC_##K45, KC_##K46, KC_##K47, KC_##K48, KC_##K49 } \ -} - -#endif From 4b431506a50a7c3267840beee2b5df059e9ed37c Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Thu, 30 Sep 2021 15:53:18 -0600 Subject: [PATCH 22/25] pull a few of the latest orthodox files from master (#3) --- keyboards/orthodox/rev1/config.h | 7 ++----- keyboards/orthodox/rules.mk | 12 +----------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/keyboards/orthodox/rev1/config.h b/keyboards/orthodox/rev1/config.h index 86b4b614c3cb..1dadae388d25 100644 --- a/keyboards/orthodox/rev1/config.h +++ b/keyboards/orthodox/rev1/config.h @@ -69,11 +69,8 @@ along with this program. If not, see . ) /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 -#define RGBLIGHT_TIMER -#define RGBLED_NUM 16 // Number of LEDs -#define ws2812_PORTREG PORTD -#define ws2812_DDRREG DDRD +//#define RGB_DI_PIN D3 +//#define RGBLED_NUM 16 // Number of LEDs /* * Feature disable options diff --git a/keyboards/orthodox/rules.mk b/keyboards/orthodox/rules.mk index 9097bfd71349..7a8c4f94885f 100644 --- a/keyboards/orthodox/rules.mk +++ b/keyboards/orthodox/rules.mk @@ -17,16 +17,6 @@ RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -CUSTOM_MATRIX = yes - -avrdude: build - ls /dev/tty* > /tmp/1; \ - echo "Reset your Pro Micro now"; \ - while [ -z $$USB ]; do \ - sleep 1; \ - ls /dev/tty* > /tmp/2; \ - USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \ - done; \ - avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex +SPLIT_KEYBOARD = yes DEFAULT_FOLDER = orthodox/rev3 From 980260200a82b8cba0e1ba16759a581d90123631 Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Thu, 30 Sep 2021 16:04:11 -0600 Subject: [PATCH 23/25] Remove meira and lets_split keymaps --- .../lets_split/keymaps/shaymdev/config.h | 52 --- .../lets_split/keymaps/shaymdev/keymap.c | 145 -------- .../lets_split/keymaps/shaymdev/rules.mk | 2 - keyboards/meira/keymaps/shaymdev/config.h | 31 -- keyboards/meira/keymaps/shaymdev/keymap.c | 310 ------------------ keyboards/meira/keymaps/shaymdev/readme.md | 1 - keyboards/meira/keymaps/shaymdev/rules.c | 1 - 7 files changed, 542 deletions(-) delete mode 100644 keyboards/lets_split/keymaps/shaymdev/config.h delete mode 100644 keyboards/lets_split/keymaps/shaymdev/keymap.c delete mode 100644 keyboards/lets_split/keymaps/shaymdev/rules.mk delete mode 100644 keyboards/meira/keymaps/shaymdev/config.h delete mode 100644 keyboards/meira/keymaps/shaymdev/keymap.c delete mode 100644 keyboards/meira/keymaps/shaymdev/readme.md delete mode 100644 keyboards/meira/keymaps/shaymdev/rules.c diff --git a/keyboards/lets_split/keymaps/shaymdev/config.h b/keyboards/lets_split/keymaps/shaymdev/config.h deleted file mode 100644 index 18d8438d7844..000000000000 --- a/keyboards/lets_split/keymaps/shaymdev/config.h +++ /dev/null @@ -1,52 +0,0 @@ -/* -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, not both */ - -#define USE_SERIAL -// #define USE_I2C - -/* Select hand configuration */ - -#define MASTER_LEFT -// #define _MASTER_RIGHT -// #define EE_HANDS - -#undef RGB_DI_PIN -#define RGB_DI_PIN D3 -#undef RGBLED_NUM -#define RGBLIGHT_ANIMATIONS -#define RGBLED_NUM 10 - -#define RGBLIGHT_LAYERS -#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF -#define RGBLIGHT_SLEEP - -#ifdef AUDIO_ENABLE - #define STARTUP_SONG SONG(PLANCK_SOUND) - // #define STARTUP_SONG SONG(NO_SOUND) - - #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ - SONG(COLEMAK_SOUND), \ - SONG(DVORAK_SOUND) \ - } -#endif diff --git a/keyboards/lets_split/keymaps/shaymdev/keymap.c b/keyboards/lets_split/keymaps/shaymdev/keymap.c deleted file mode 100644 index 68dce78f9ade..000000000000 --- a/keyboards/lets_split/keymaps/shaymdev/keymap.c +++ /dev/null @@ -1,145 +0,0 @@ -#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 _DVORAK 0 -#define _QWERTY 1 -#define _LOWER 2 -#define _RAISE 3 -#define _ADJUST 16 - -enum custom_keycodes { - DVORAK = SAFE_RANGE, - QWERTY -}; - -#define TO_DV TO(_DVORAK) -#define LOWER MO(_LOWER) -#define LWR LOWER -#define RAISE MO(_RAISE) -#define RAS RAISE - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -[_DVORAK] = LAYOUT( \ - KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ - KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ - KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS, \ - XXXXXXX, KC_ENT, KC_LALT, TT(LWR), KC_LSFT, KC_LCTL, KC_BSPC, KC_SPC, TT(RAS), KC_DEL, KC_LGUI, XXXXXXX \ -), - -[_QWERTY] = 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_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ - KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI,\ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ -), - -[_LOWER] = LAYOUT( \ - _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, \ - _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, \ - _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______, \ - _______, _______, _______, _______, _______, _______, _______, KC_KP_0, _______, _______, _______, _______ //This kp_0 is blocking the space key.... may want to do something about that. -), - -[_RAISE] = LAYOUT( \ - _______, KC_PSCR, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,\ - KC_CAPS, KC_INS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX,\ - _______, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX,\ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ -), - -[_ADJUST] = LAYOUT( \ - TO_DV, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ - RGB_TOG, RGB_MOD, VLK_TOG, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, DVORAK, _______, _______, _______, \ - RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, 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 DVORAK: - if (record->event.pressed) { - set_single_persistent_default_layer(_DVORAK); - } - return false; - break; - } - return true; -} - - -#ifdef RGBLIGHT_ENABLE - -const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {4, 2, HSV_RED} // Light 10 LEDs, starting with LED 0 -); - -const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {0, 3, HSV_CHARTREUSE} // Light 10 LEDs, starting with LED 0 -); - -const rgblight_segment_t PROGMEM my_lower_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {3, 2, HSV_BLUE} // Light LEDs 0-4 -); - -const rgblight_segment_t PROGMEM my_raise_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {5, 2, HSV_ORANGE} // Light LEDs 5-10 -); - -const rgblight_segment_t PROGMEM my_adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {3, 4, HSV_GREEN} // Light 10 LEDs, starting with LED 0 -); - - -// Now define the array of layers. Later layers take precedence -const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( - my_capslock_layer, - my_qwerty_layer, // Overrides other layers - my_lower_layer, // Overrides other layers - my_raise_layer, // Overrides other layers - my_adjust_layer // Overrides other layers -); - -void keyboard_post_init_user(void) { - // Enable the LED layers - rgblight_layers = my_rgb_layers; - rgblight_disable_noeeprom(); // disables RGB, without saving settings - //rgblight_sethsv_noeeprom(HSV_CYAN); - //rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); - // rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL); -} - -bool led_update_user(led_t led_state) { - rgblight_set_layer_state(0, led_state.caps_lock); - return true; -} - -layer_state_t default_layer_state_set_user(layer_state_t state) { - rgblight_set_layer_state(1, layer_state_cmp(state, _QWERTY)); - return state; -} - -#endif - -layer_state_t layer_state_set_user(layer_state_t state) { - state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); - -#ifdef RGBLIGHT_ENABLE - rgblight_set_layer_state(2, layer_state_cmp(state, _LOWER)); - rgblight_set_layer_state(3, layer_state_cmp(state, _RAISE)); - rgblight_set_layer_state(4, layer_state_cmp(state, _ADJUST)); -#endif - - return state; -} diff --git a/keyboards/lets_split/keymaps/shaymdev/rules.mk b/keyboards/lets_split/keymaps/shaymdev/rules.mk deleted file mode 100644 index 605328a9daf2..000000000000 --- a/keyboards/lets_split/keymaps/shaymdev/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -RGBLIGHT_ENABLE = yes -VELOCIKEY_ENABLE = yes diff --git a/keyboards/meira/keymaps/shaymdev/config.h b/keyboards/meira/keymaps/shaymdev/config.h deleted file mode 100644 index e3776d2eff17..000000000000 --- a/keyboards/meira/keymaps/shaymdev/config.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2017 Cole Markham, WoodKeys.click - * - * 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 - -// place overrides here -#define MUSIC_MASK (keycode != KC_NO) -#ifdef AUDIO_ENABLE - #define STARTUP_SONG SONG(PLANCK_SOUND) - // #define STARTUP_SONG SONG(NO_SOUND) - - #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ - SONG(COLEMAK_SOUND), \ - SONG(DVORAK_SOUND) \ - } -#endif diff --git a/keyboards/meira/keymaps/shaymdev/keymap.c b/keyboards/meira/keymaps/shaymdev/keymap.c deleted file mode 100644 index 02e237d32043..000000000000 --- a/keyboards/meira/keymaps/shaymdev/keymap.c +++ /dev/null @@ -1,310 +0,0 @@ -/* Copyright 2017 Cole Markham - * - * 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 "lighting.h" - -#ifdef RGBLIGHT_ENABLE -//Following line allows macro to read current RGB settings -extern rgblight_config_t rgblight_config; -#endif - -#define _QWERTY 0 -#define _COLEMAK 1 -#define _DVORAK 2 -#define _LOWER 3 -#define _RAISE 4 -#define _ADJUST 16 - -enum custom_keycodes { - QWERTY = SAFE_RANGE, - COLEMAK, - DVORAK, - LOWER, - RAISE, - ADJUST, -}; - -#ifdef AUDIO_ENABLE - -float tone_my_startup[][2] = SONG(ODE_TO_JOY); -float tone_my_goodbye[][2] = SONG(ROCK_A_BYE_BABY); - -float tone_qwerty[][2] = SONG(QWERTY_SOUND); -float tone_dvorak[][2] = SONG(DVORAK_SOUND); -float tone_colemak[][2] = SONG(COLEMAK_SOUND); - -#endif /* AUDIO_ENABLE */ - -// define variables for reactive RGB -bool TOG_STATUS = false; -int RGB_current_mode; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Qwerty - * ,-----------------------------------------------------------------------------------. - * | Esc | Q | W | E | R | T | Y | U | I | O | P | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Tab | A | S | D | F | G | H | J | K | L | ; | ' | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Ctrl |Adjust| Alt | Alt |Lower | Cmd |Space |Raise | Left | Down | Up |Right | - * `-----------------------------------------------------------------------------------' - */ - [_QWERTY] = KEYMAP( \ - 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_LCTL, ADJUST, KC_LALT, KC_LALT, LOWER, KC_LGUI, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ - ), - - /* Colemak - * ,-----------------------------------------------------------------------------------. - * | 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 |Adjust| Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | - * `-----------------------------------------------------------------------------------' - */ - [_COLEMAK] = KEYMAP( \ - 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, ADJUST, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ - ), - - /* Dvorak - * ,-----------------------------------------------------------------------------------. - * | 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 |Adjust| Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | - * `-----------------------------------------------------------------------------------' - */ - [_DVORAK] = KEYMAP( \ - 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, ADJUST, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ - ), - - /* Lower - * ,-----------------------------------------------------------------------------------. - * | | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | ~ | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | | \ | | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | | |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | Next | Vol- | Vol+ | Play | - * `-----------------------------------------------------------------------------------' - */ - [_LOWER] = KEYMAP( \ - _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, \ - KC_TILD, 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_QUOT, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END \ - ), - - /* Raise - * ,-----------------------------------------------------------------------------------. - * | | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | ` | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | | |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | Home | PgUp | PgDn | End | - * `-----------------------------------------------------------------------------------' - */ - [_RAISE] = KEYMAP( \ - _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ - KC_GRV, 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_HOME, KC_PGDN, KC_PGUP, KC_END \ - ), - - /* Adjust (Lower + Raise) - * ,-----------------------------------------------------------------------------------. - * | | Reset| | | | | | | | | | Del | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' - */ - [_ADJUST] = KEYMAP( \ - BL_TOGG, RESET, _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_PSCR, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, \ - BL_STEP, RGB_MOD, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ - ) -}; - -// Setting ADJUST layer RGB back to default -void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) { - if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) { -#ifdef RGBLIGHT_ENABLE - rgblight_mode(RGB_current_mode); -#endif - layer_on(layer3); - } else { - layer_off(layer3); - } -} - -void matrix_init_user(void) { - -} - -void matrix_scan_user(void) { - -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QWERTY: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_SONG(tone_qwerty); - #endif -// persistent_default_layer_set(1UL<<_QWERTY); - } - return false; - break; - case COLEMAK: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_SONG(tone_colemak); - #endif -// persistent_default_layer_set(1UL<<_COLEMAK); - } - return false; - break; - case DVORAK: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_SONG(tone_dvorak); - #endif -// persistent_default_layer_set(1UL<<_DVORAK); - } - return false; - break; - case LOWER: - if (record->event.pressed) { - //not sure how to have keyboard check mode and set it to a variable, so my work around - //uses another variable that would be set to true after the first time a reactive key is pressed. - if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false - } else { - TOG_STATUS = !TOG_STATUS; -#ifdef RGBLIGHT_ENABLE - rgblight_mode(16); -#endif - } - layer_on(_LOWER); - update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST); - } else { -#ifdef RGBLIGHT_ENABLE - rgblight_mode(RGB_current_mode); // revert RGB to initial mode prior to RGB mode change -#endif - TOG_STATUS = false; - layer_off(_LOWER); - update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST); - } - return false; - break; - case RAISE: - if (record->event.pressed) { - //not sure how to have keyboard check mode and set it to a variable, so my work around - //uses another variable that would be set to true after the first time a reactive key is pressed. - if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false - } else { - TOG_STATUS = !TOG_STATUS; -#ifdef RGBLIGHT_ENABLE - rgblight_mode(15); -#endif - } - layer_on(_RAISE); - update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST); - } else { -#ifdef RGBLIGHT_ENABLE - rgblight_mode(RGB_current_mode); // revert RGB to initial mode prior to RGB mode change -#endif - layer_off(_RAISE); - TOG_STATUS = false; - update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST); - } - return false; - break; - case ADJUST: - // FIXME add RGB feedback - if (record->event.pressed) { - layer_on(_ADJUST); - } else { - layer_off(_ADJUST); - } - return false; - break; - case BL_TOGG: -#ifdef BACKLIGHT_ENABLE - if (record->event.pressed) { - print("Enabling backlight\n"); - backlight_init_ports(); - } -#endif - return false; - break; - case BL_STEP: - if (record->event.pressed) { - print("Stepping backlight\n"); -#ifdef BACKLIGHT_ENABLE - print("Really stepping backlight\n"); - backlight_step(); -#endif - - } - return false; - break; - //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released -#ifdef RGBLIGHT_ENABLE - case RGB_MOD: - if (record->event.pressed) { - rgblight_mode(RGB_current_mode); - rgblight_step(); - RGB_current_mode = rgblight_config.mode; - } - return false; - break; -#endif -// case BL_INC: -// meira_inc_backlight_level(); -// return false; -// break; - } - return true; -} - -void led_set_user(uint8_t usb_led) { - -} diff --git a/keyboards/meira/keymaps/shaymdev/readme.md b/keyboards/meira/keymaps/shaymdev/readme.md deleted file mode 100644 index be8404881324..000000000000 --- a/keyboards/meira/keymaps/shaymdev/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for meira diff --git a/keyboards/meira/keymaps/shaymdev/rules.c b/keyboards/meira/keymaps/shaymdev/rules.c deleted file mode 100644 index 15b7f725b26d..000000000000 --- a/keyboards/meira/keymaps/shaymdev/rules.c +++ /dev/null @@ -1 +0,0 @@ -CONSOLE_ENABLE = yes From 4c6d051cabfcc9a24a921685f9014c2dc95b4dc6 Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Thu, 30 Sep 2021 16:42:09 -0600 Subject: [PATCH 24/25] Some cleanup per PR checklist --- keyboards/orthodox/keymaps/shaymdev/config.h | 11 +-- keyboards/orthodox/keymaps/shaymdev/keymap.c | 77 +++++++++----------- keyboards/orthodox/keymaps/shaymdev/rules.mk | 5 +- 3 files changed, 37 insertions(+), 56 deletions(-) diff --git a/keyboards/orthodox/keymaps/shaymdev/config.h b/keyboards/orthodox/keymaps/shaymdev/config.h index 496a58d409d6..749302284a29 100644 --- a/keyboards/orthodox/keymaps/shaymdev/config.h +++ b/keyboards/orthodox/keymaps/shaymdev/config.h @@ -22,17 +22,13 @@ along with this program. If not, see . #pragma once /* Use I2C or Serial, not both */ - #define USE_SERIAL // #define USE_I2C -/* Select hand configuration */ -// #define MASTER_LEFT -// #define MASTER_RIGHT #define EE_HANDS #undef RGBLED_NUM -#define RGBLED_NUM 10 +#define RGBLED_NUM 14 // #define RGBLIGHT_ANIMATIONS #define RGBLIGHT_EFFECT_BREATHING @@ -62,8 +58,3 @@ along with this program. If not, see . #define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 220 - -// #define NO_ACTION_MACRO //Drashna, on QMK issue 3224, -// #define NO_ACTION_FUNCTION - - diff --git a/keyboards/orthodox/keymaps/shaymdev/keymap.c b/keyboards/orthodox/keymaps/shaymdev/keymap.c index c6b85930f7b4..54ae7e397287 100644 --- a/keyboards/orthodox/keymaps/shaymdev/keymap.c +++ b/keyboards/orthodox/keymaps/shaymdev/keymap.c @@ -21,15 +21,14 @@ 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 _DVORAK 0 -#define _QWERTY 1 -#define _LOWER 3 -#define _RAISE 4 -#define _ADJUST 16 +enum orthodox_layers +{ + _DVORAK, + _QWERTY, + _LOWER, + _RAISE, + _ADJUST, +}; enum combos //match combo_count in config.h { @@ -66,47 +65,39 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[_DVORAK] = LAYOUT( \ - KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, \ - KC_TAB, GUI_T(KC_A), ALT_T(KC_O), KC_E, KC_U, KC_I, KC_ENT, KC_LALT, KC_DEL, KC_LGUI, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ - KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, TT(LOWER), KC_LSFT, KC_LCTL, KC_BSPC, ALT_T(KC_SPC), TT(RAISE), KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS \ +[_DVORAK] = LAYOUT( + KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, + KC_TAB, GUI_T(KC_A), ALT_T(KC_O), KC_E, KC_U, KC_I, KC_ENT, KC_LALT, KC_DEL, KC_LGUI, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, + KC_EQL, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, TT(LOWER), KC_LSFT, KC_LCTL, KC_BSPC, ALT_T(KC_SPC), TT(RAISE), KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS ), -[_QWERTY] = 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_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, _______, _______, _______, _______, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ - KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, _______, _______, _______, _______, _______, _______, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT \ +[_QWERTY] = 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_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, _______, _______, _______, _______, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, _______, _______, _______, _______, _______, _______, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT ), -[_LOWER] = LAYOUT( \ - _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, \ - _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, \ - _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV, _______, _______, _______, _______, _______, KC_KP_0, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______ \ +[_LOWER] = LAYOUT( + _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, + _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_ASTR, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, + _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV, _______, _______, _______, _______, _______, KC_KP_0, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______ ), -[_RAISE] = LAYOUT( \ - _______, KC_PSCR, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,\ - KC_CAPS, KC_INS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX,\ - _______, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX\ +[_RAISE] = LAYOUT( + _______, KC_PSCR, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, + KC_CAPS, KC_INS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX, + _______, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_F12, XXXXXXX ), -[_ADJUST] = LAYOUT( \ - TO_DV, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLEP, \ - RGB_TOG, RGB_MOD, VLK_TOG, AU_ON, AU_OFF, AG_NORM, _______, _______, _______, _______, AG_SWAP, QWERTY, DVORAK, _______, _______, _______, \ - RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ +[_ADJUST] = LAYOUT( + TO_DV, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLEP, + RGB_TOG, RGB_MOD, VLK_TOG, AU_ON, AU_OFF, AG_NORM, _______, _______, _______, _______, AG_SWAP, QWERTY, DVORAK, _______, _______, _______, + RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ) }; -// void matrix_init_user(void) { -// #ifdef BOOTLOADER_CATERINA -// // This will disable the red LEDs on the ProMicros. UPDATE: I don't think the power LEDs can be turned off. This is for the others I think... and they were already not on... I think. -// setPinInput(D5); -// setPinInput(B0); -// #endif -// }; - const key_override_t delete_key_override = ko_make_basic(MOD_MASK_SHIFT, KC_BSPACE, KC_DELETE); // This globally defines all key overrides to be used @@ -142,27 +133,27 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef RGBLIGHT_ENABLE const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {4, 2, HSV_RED} // Light 10 LEDs, starting with LED 0 + {4, 6, HSV_RED} // Light 6 LEDs, starting with LED 4 ); const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {0, 3, HSV_CHARTREUSE} // Light 10 LEDs, starting with LED 0 + {0, 3, HSV_CHARTREUSE} // Light 3 LEDs, starting with LED 0 ); const rgblight_segment_t PROGMEM my_lower_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {3, 2, HSV_BLUE} // Light LEDs 0-4 + {4, 3, HSV_BLUE} // Light LEDs 5-6 ); const rgblight_segment_t PROGMEM my_raise_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {5, 2, HSV_ORANGE} // Light LEDs 5-10 + {7, 3, HSV_ORANGE} // Light LEDs 7-8 ); const rgblight_segment_t PROGMEM my_adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {3, 4, HSV_GREEN} // Light 10 LEDs, starting with LED 0 + {4, 6, HSV_GREEN} // Light 10 LEDs, starting with LED 0 ); -// Now define the array of layers. Later layers take precedence +// Later layers take precedence. This array corresponds to the magic numbers used in rgblight_set_layer_state(i, onOff) const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( my_capslock_layer, my_qwerty_layer, // Overrides other layers diff --git a/keyboards/orthodox/keymaps/shaymdev/rules.mk b/keyboards/orthodox/keymaps/shaymdev/rules.mk index 84acbd55c4f4..4f508c7b99e5 100644 --- a/keyboards/orthodox/keymaps/shaymdev/rules.mk +++ b/keyboards/orthodox/keymaps/shaymdev/rules.mk @@ -2,7 +2,6 @@ RGBLIGHT_ENABLE = yes VELOCIKEY_ENABLE = yes KEY_OVERRIDE_ENABLE = yes COMBO_ENABLE = yes -#EXTRAFLAGS += -flto #Drashna, on QMK issue 3224, paraphrased, This enables Link Time Optimization, saving a significant amount of space. Because the Macro and Function features are incompatible with Link Time Optimization, disable those features in config.h: -LTO_ENABLE = yes #same as above but includes the others in config for you +LTO_ENABLE = yes #Link Time Optimization for smaller file size CONSOLE_ENABLE = no -MOUSEKEY_ENABLE = no \ No newline at end of file +MOUSEKEY_ENABLE = no From 1694fa63d3bd4e1a1d6b4b0bc2956701f1665e38 Mon Sep 17 00:00:00 2001 From: Shay Merrill Date: Fri, 1 Oct 2021 10:12:33 -0600 Subject: [PATCH 25/25] Update keyboards/orthodox/keymaps/shaymdev/rules.mk Co-authored-by: Ryan --- keyboards/orthodox/keymaps/shaymdev/rules.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/keyboards/orthodox/keymaps/shaymdev/rules.mk b/keyboards/orthodox/keymaps/shaymdev/rules.mk index 4f508c7b99e5..c6ecb2372fbb 100644 --- a/keyboards/orthodox/keymaps/shaymdev/rules.mk +++ b/keyboards/orthodox/keymaps/shaymdev/rules.mk @@ -1,7 +1,6 @@ +MOUSEKEY_ENABLE = no RGBLIGHT_ENABLE = yes VELOCIKEY_ENABLE = yes KEY_OVERRIDE_ENABLE = yes COMBO_ENABLE = yes -LTO_ENABLE = yes #Link Time Optimization for smaller file size -CONSOLE_ENABLE = no -MOUSEKEY_ENABLE = no +LTO_ENABLE = yes