From 8dd85f73b37417d73f6cbdbacde6bc56467d1124 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Wed, 4 Jul 2018 23:08:29 -0700 Subject: [PATCH] Updates to Xyverz keymaps (#3315) * Adding Rama M10-A Macropad * ch-ch-ch changes... * Major overhaul based on SMT's keymap. * more changes. * Moved the FKeys to the ADJUST layer. * More rearranging. * Alias in Atreus62 keymap to make it more legible Added config.h to fix tapping_term issue for Caps Lock key in OSX * Added OrthoDox layout. * More layout changes. * Fixing things with the keyboard. * Finishing touches. Set left-hand master in config.h Embedded the arrow keys in keymap.c * Revised keymap making this easier to use. * additions and changes. * changes to various keymaps. * Minor adjustments to OrthoDox layout. * Added Eco keymap. Updated Let's Split keymap. * Added gherkin * Removed my M10A keymap * Planck Keymap Updates Updated my Planck keymap and created a simple keymap for Seph's Preonic. * Added readme * readme fixes * Update readme.md more clarification * Keymap Tweaks Removed the Power button setting from the keymap. It was in a horrible location. I'll work on getting it setup somewhere else sometime later. * Added Readme I finally got around to adding a readme to this keymap. I've also added minor changes to the layout. * Fixed Keymap Error * Fixed Readme * adding iris and levinson keymaps * Tweaks to keymap * added youngJZ keymap * Changes to keymap Added a readme.md * Levinson changes Added the readme.md and rules.mk files. Configured RGB underglow and backlighting. * fixed readme * changes to keymaps * Updated keymap * Updated readme.md * Updated Readme (again) * Updated Readme Fixed formatting. Again. * Updated readme This is the last readme update for this keyboard update. I hope. * Added Contra keymap * Kinesis Keymap Update * Updated Keymaps I've updated my Kinesis (Stapelberg) layout and my Clueboard 66 layout. I've also updated my Kinesis Readme. * Clueboard Keymap update Added media keys to my Clueboard 66 Rev2 layout. * Added keymap Added Minidox keymap & rules. Added user function to Let's Split keymap that turns off the red LEDs on the Pro Micros. * New Zen keymap Added Zen keyboard to my list of keyboards, so had to generate a new keymap for it. Also adding some changes to my MiniDox keymap and config.h, as well as my Levinson's config.h. The config.h file changes enable ee_hands. * A few changes for useability I made a few changes to the Minidox keymap to see if I can't make it more useable. I'm also working on streamlining the Zen keyboard keymap to reduce layers. * Re-vamped Iris keymap. * changes * minor keymap change This was a minor keymap change to use mod_tap for the backspace key: ALT when held, BSPC when tapped. * Added Fourier keymap * Keymap Cleanup Moved KC_ESC to KC_CAPS, and changed KC_ESC to KC_GRV This is because of muscle memory, I kept hitting ESC when trying to hit TAB. * Keymap Adjustments Swapped Caps/Esc, put Caps in Raise/Lower layers, put Grv in normal Esc position. Adjusted the readme.md to reflect these changes. * minor tweaks Added code to disable red ProMicro LEDs after flashing. * Clean-up * Corrections to keymap. Fixed a foul-up in the Zen keymap where the lctrl was where the LOWER should have been. * Changes to make this fall in line with the new Layout features * Moving to LAYOUTs for 4x12 boards * fixed config.h file * standardization changes * Reverted Atreus62 keymap to LAYOUT format * Switch Preonic and Nyquist to ortho_5x12 * Corrections to config.h * config.h file tweaks * config.h file tweaks * Added missing integers. * Updated Seph's keymap to LAYOUT standard. * Keymap tweaks & changes * Bringing keymap up to LAYOUT standard * Trying to get LEDs working * Fixes for Stapelberg Updated my keymap to confirm to the new LAYOUT standard. Updated the stapelberg.h to reflect this LAYOUT standard. Updated the stapelberg.c files to hopefully get the LEDs working. * Getting closer to Kinesis LED functionality. * NKRO Fix Disabled NKRO for VUSB ortho_5x12 boards --- keyboards/clueboard/keymaps/xyverz/config.h | 3 + keyboards/fourier/keymaps/xyverz/keymap.c | 1 + keyboards/kinesis/keymaps/xyverz/keymap.c | 104 +++++++++++++------ keyboards/kinesis/stapelberg/stapelberg.c | 53 +++++++++- keyboards/preonic/keymaps/seph/config.h | 4 +- keyboards/preonic/keymaps/seph/keymap.c | 50 ++++----- keyboards/preonic/keymaps/seph/rules.mk | 4 +- layouts/community/ortho_4x12/xyverz/config.h | 4 +- layouts/community/ortho_5x12/xyverz/rules.mk | 8 +- 9 files changed, 165 insertions(+), 66 deletions(-) create mode 100644 keyboards/clueboard/keymaps/xyverz/config.h diff --git a/keyboards/clueboard/keymaps/xyverz/config.h b/keyboards/clueboard/keymaps/xyverz/config.h new file mode 100644 index 0000000000..4999e4ff6c --- /dev/null +++ b/keyboards/clueboard/keymaps/xyverz/config.h @@ -0,0 +1,3 @@ +#include "../config.h" + +#define TAPPING_TERM 600 // ms diff --git a/keyboards/fourier/keymaps/xyverz/keymap.c b/keyboards/fourier/keymaps/xyverz/keymap.c index 3dd191be51..09aaa97f7d 100644 --- a/keyboards/fourier/keymaps/xyverz/keymap.c +++ b/keyboards/fourier/keymaps/xyverz/keymap.c @@ -21,6 +21,7 @@ enum custom_keycodes { #define XXXXXXX KC_NO #define KC_FN1 MO(_FN1) #define KC_FN2 MO(_FN2) +#define KC_ESFN1 LT(_FN1, KC_ESC) #define KC_SPFN1 LT(_FN1, KC_SPACE) #define KC_SPFN2 LT(_FN2, KC_SPACE) #define KC_BSFN1 LT(_FN1, KC_BSPC) diff --git a/keyboards/kinesis/keymaps/xyverz/keymap.c b/keyboards/kinesis/keymaps/xyverz/keymap.c index 4f3dbf83eb..533047b156 100644 --- a/keyboards/kinesis/keymaps/xyverz/keymap.c +++ b/keyboards/kinesis/keymaps/xyverz/keymap.c @@ -2,16 +2,19 @@ extern keymap_config_t keymap_config; -#define _DV 0 // Dvorak layer -#define _QW 1 // Qwerty layer -#define _CM 2 // Colemak layer -#define _MD 3 // Media Layer -#define _KP 4 // Keypad Layer +#define _DVORAK 0 // Dvorak layer +#define _QWERTY 1 // Qwerty layer +#define _COLEMAK 2 // Colemak layer +#define _MEDIA 3 // Media Layer +#define _KEYPAD 4 // Keypad Layer -// Macro name shortcuts -#define DVORAK M(_DV) -#define QWERTY M(_QW) -#define COLEMAK M(_CM) +enum custom_keycodes { + DVORAK = SAFE_RANGE, + QWERTY, + COLEMAK, + MEDIA, + KEYPAD +}; // Fillers to make layering more clear #define _______ KC_TRNS @@ -130,7 +133,7 @@ extern keymap_config_t keymap_config; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[_DV] = LAYOUT ( +[_DVORAK] = LAYOUT ( // Left Hand KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_RBRC, KC_1, KC_2, KC_3, KC_4, KC_5, @@ -141,10 +144,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Left Thumb KC_LCTL, KC_LALT, KC_HOME, - KC_BSPC, LT(_MD, KC_DEL), KC_END, + KC_BSPC, LT(_MEDIA, KC_DEL), KC_END, // Right Hand - KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KP), RESET, + KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD), RESET, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSLS, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, @@ -153,10 +156,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Right Thumb KC_RGUI, KC_RCTL, KC_PGUP, - KC_PGDN, LT(_KP, KC_ENT), KC_SPC + KC_PGDN, LT(_KEYPAD, KC_ENT), KC_SPC ), -[_QW] = LAYOUT ( +[_QWERTY] = LAYOUT ( // Left Hand KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, @@ -167,10 +170,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Left Thumb KC_LCTL, KC_LALT, KC_HOME, - KC_BSPC, LT(_MD, KC_DEL), KC_END, + KC_BSPC, LT(_MEDIA, KC_DEL), KC_END, // Right Hand - KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KP), RESET, + KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD), RESET, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL , KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, @@ -179,10 +182,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Right Thumb KC_RGUI, KC_RCTL, KC_PGUP, - KC_PGDN, LT(_KP, KC_ENT), KC_SPC + KC_PGDN, LT(_KEYPAD, KC_ENT), KC_SPC ), -[_CM] = LAYOUT ( +[_COLEMAK] = LAYOUT ( // Left Hand KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, @@ -193,10 +196,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Left Thumb KC_LCTL, KC_LALT, KC_HOME, - KC_BSPC, LT(_MD, KC_DEL), KC_END, + KC_BSPC, LT(_MEDIA, KC_DEL), KC_END, // Right Hand - KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KP), RESET, + KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD), RESET, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, @@ -205,10 +208,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Right Thumb KC_RGUI, KC_RCTL, KC_PGUP, - KC_PGDN, LT(_KP, KC_ENT), KC_SPC + KC_PGDN, LT(_KEYPAD, KC_ENT), KC_SPC ), -[_MD] = LAYOUT ( +[_MEDIA] = LAYOUT ( // Left Hand _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, @@ -234,7 +237,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______ ), -[_KP] = LAYOUT ( +[_KEYPAD] = LAYOUT ( // Left Hand _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PWR, _______, _______, _______, _______, _______, @@ -272,28 +275,63 @@ void persistent_default_layer_set(uint16_t default_layer) { default_layer_set(default_layer); } -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - switch(id) { - case _DV: +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case DVORAK: if (record->event.pressed) { - persistent_default_layer_set(1UL<<_DV); + persistent_default_layer_set(1UL<<_DVORAK); } + return false; break; - case _QW: + case QWERTY: if (record->event.pressed) { - persistent_default_layer_set(1UL<<_QW); + persistent_default_layer_set(1UL<<_QWERTY); } + return false; break; - case _CM: + case COLEMAK: if (record->event.pressed) { - persistent_default_layer_set(1UL<<_CM); + persistent_default_layer_set(1UL<<_COLEMAK); } + return false; break; } - return MACRO_NONE; + return true; }; +// getting the LEDs working... +void led_set_user(uint8_t usb_led) { + + DDRF |= (1<<0); // Keypad LED + if (usb_led & (1<