summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXyverz <xyverz@gmail.com>2018-09-03 16:57:06 -0700
committerDrashna Jaelre <drashna@live.com>2018-09-03 16:57:06 -0700
commitf48e20c1eb52d7281276025fd1cbaa81e1856f83 (patch)
tree0759c3341cd282324c47722120dcd4185502fde7
parentaa795dc33ee1c854a3ea5a3cb3d15e7e68be89d6 (diff)
Keymap: Updates to xyverz keymaps (#3841)
* fixing ortho_4x12 configs * Using upstream/master version instead * Additions and Corrections Corrected the Kinesis/Stapelberg's .c file to allow LEDs to work Removed excess cruft from my Kinesis keymap to reflect this change Other minor tweaks and adjustments to my ortho_4x12 and 5x12 layouts * Rules for vitamins_included Added a section to disable RGB underglow for the Let's Split Vitamins Included board. * fixing ortho_4x12 configs * Using upstream/master version instead * Additions and Corrections Corrected the Kinesis/Stapelberg's .c file to allow LEDs to work Removed excess cruft from my Kinesis keymap to reflect this change Other minor tweaks and adjustments to my ortho_4x12 and 5x12 layouts * Creating my own userspace * Added Rorschach keymap * renamed userspace folder I renamed my userspace folder since I'm not ready to start using it just yet, and I want to get my keyboards programmed. This is a temporary thing and will be fixed later as I get time. * adding files in "new" folder * Disabling LEDs on Pro Micro * Modifications to Kinesis keymap * More kinesis tweaks * removed userspace from master Created a new branch for my userspace stuff. I'll work on it there. * Moved keymap to separate branch Moved the Rorschach keymap I was working on to a separate branch for development purposes. Not ready to push it up to upstream master.
-rw-r--r--keyboards/atreus62/keymaps/xyverz/keymap.c11
-rw-r--r--keyboards/kinesis/keymaps/xyverz/keymap.c43
-rw-r--r--keyboards/kinesis/keymaps/xyverz/readme.md20
-rw-r--r--keyboards/kinesis/keymaps/xyverz/rules.mk6
4 files changed, 46 insertions, 34 deletions
diff --git a/keyboards/atreus62/keymaps/xyverz/keymap.c b/keyboards/atreus62/keymaps/xyverz/keymap.c
index 3788317378..0f2e8ea08f 100644
--- a/keyboards/atreus62/keymaps/xyverz/keymap.c
+++ b/keyboards/atreus62/keymaps/xyverz/keymap.c
@@ -127,8 +127,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
-const uint16_t PROGMEM fn_actions[] = {
+void matrix_init_user(void) {
+#ifdef BOOTLOADER_CATERINA
+ // This will disable the red LEDs on the ProMicros
+ DDRD &= ~(1<<5);
+ PORTD &= ~(1<<5);
+ DDRB &= ~(1<<0);
+ PORTB &= ~(1<<0);
+#endif
+};
+const uint16_t PROGMEM fn_actions[] = {
};
void persistent_default_layer_set(uint16_t default_layer) {
diff --git a/keyboards/kinesis/keymaps/xyverz/keymap.c b/keyboards/kinesis/keymaps/xyverz/keymap.c
index 1025df0769..2eab62a2bc 100644
--- a/keyboards/kinesis/keymaps/xyverz/keymap.c
+++ b/keyboards/kinesis/keymaps/xyverz/keymap.c
@@ -20,6 +20,11 @@ enum custom_keycodes {
#define _______ KC_TRNS
#define XXXXXXX KC_NO
+// Aliases to make the keymap more uniform
+#define GUI_END GUI_T(KC_END)
+#define MED_DEL LT(_MEDIA, KC_DEL)
+#define KPD_ENT LT(_KEYPAD, KC_ENT)
+
/*
Function Keys on All Layers (Keypad toggles):
@@ -96,9 +101,9 @@ enum custom_keycodes {
|--------+------+------+------+------+------||------+------+------+------+------+--------|
| | | | | | || | | | | | |
|--------+------+------+------+------+------||------+------+------+------+------+--------|
- | | | | | | || | Mute | Vol- | Vol+ | | |
+ | | | Mute | Vol- | Vol+ | || | | | | | |
|--------+------+------+------+------+------||------+------+------+------+------+--------|
- | | | | | | || Stop | Prev | Play | Next | Sel | |
+ | | Stop | Prev | Play | Next | Sel || | | | | | |
`--------+------+------+------+------+------'`------+------+------+------+------+--------'
| | | | | | | | | |
`---------------------------' `---------------------------'
@@ -116,12 +121,12 @@ enum custom_keycodes {
|--------+------+------+------+------+------||------+------+------+------+------+--------|
| Sleep | | | | | || | KP 7 | KP 8 | KP 9 | KP - | |
|--------+------+------+------+------+------||------+------+------+------+------+--------|
- | Wake | |QWERTY|Colemk|Dvorak| || | KP 4 | KP 5 | KP 6 | KP + | |
+ | Wake | | Mute | Vol- | Vol+ | || | KP 4 | KP 5 | KP 6 | KP + | |
|--------+------+------+------+------+------||------+------+------+------+------+--------|
- | | | | | | || | KP 1 | KP 2 | KP 3 |KP Ent| |
+ | | Stop | Prev | Play | Next | Sel || | KP 1 | KP 2 | KP 3 |KP Ent| |
`--------+------+------+------+------+------'`------+------+------+------+------+--------'
- | | | | | | | | KP . |KP Ent| |
- `---------------------------' `----------------------------------'
+ | |QWERTY|Colemk|Dvorak| | | | KP . |KP Ent|
+ `---------------------------' `---------------------------'
,-------------.,-------------.
| | || | |
,------|------|------||------+------+------.
@@ -144,7 +149,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Left Thumb
KC_LCTL, KC_LALT,
KC_HOME,
- KC_BSPC, LT(_MEDIA, KC_DEL), KC_END,
+ KC_BSPC, MED_DEL, GUI_END,
// Right Hand
KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD), RESET,
@@ -156,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Right Thumb
KC_RGUI, KC_RCTL,
KC_PGUP,
- KC_PGDN, LT(_KEYPAD, KC_ENT), KC_SPC
+ KC_PGDN, KPD_ENT, KC_SPC
),
[_QWERTY] = LAYOUT (
@@ -170,7 +175,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Left Thumb
KC_LCTL, KC_LALT,
KC_HOME,
- KC_BSPC, LT(_MEDIA, KC_DEL), KC_END,
+ KC_BSPC, MED_DEL, KC_END,
// Right Hand
KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD), RESET,
@@ -182,7 +187,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Right Thumb
KC_RGUI, KC_RCTL,
KC_PGUP,
- KC_PGDN, LT(_KEYPAD, KC_ENT), KC_SPC
+ KC_PGDN, KPD_ENT, KC_SPC
),
[_COLEMAK] = LAYOUT (
@@ -196,7 +201,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Left Thumb
KC_LCTL, KC_LALT,
KC_HOME,
- KC_BSPC, LT(_MEDIA, KC_DEL), KC_END,
+ KC_BSPC, MED_DEL, KC_END,
// Right Hand
KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, TG(_KEYPAD), RESET,
@@ -208,7 +213,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Right Thumb
KC_RGUI, KC_RCTL,
KC_PGUP,
- KC_PGDN, LT(_KEYPAD, KC_ENT), KC_SPC
+ KC_PGDN, KPD_ENT, KC_SPC
),
[_MEDIA] = LAYOUT (
@@ -216,8 +221,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______,
KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,
_______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______,
+ _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,
+ _______, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSEL,
_______, _______, _______, _______,
// Left Thumb
_______, _______,
@@ -228,8 +233,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______,
KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12,
_______, _______, _______, _______, _______, _______,
- _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
- KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSEL, _______,
+ _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______,
// Right Thumb
_______, _______,
@@ -242,9 +247,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______,
KC_PWR, _______, _______, _______, _______, _______,
KC_SLEP, _______, _______, _______, _______, _______,
- KC_WAKE, _______, QWERTY, COLEMAK, DVORAK, _______,
- _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______,
+ KC_WAKE, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,
+ _______, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSEL,
+ _______, QWERTY, COLEMAK, DVORAK,
// Left Thumb
_______, _______,
_______,
diff --git a/keyboards/kinesis/keymaps/xyverz/readme.md b/keyboards/kinesis/keymaps/xyverz/readme.md
index 4f270445d8..b55100d25b 100644
--- a/keyboards/kinesis/keymaps/xyverz/readme.md
+++ b/keyboards/kinesis/keymaps/xyverz/readme.md
@@ -4,19 +4,17 @@
The Dvorak layout shown here stems from my early Kinesis years, using the Contour PS/2 with a Dvorak software layout. Because of this, the RBRC and LBRC were on opposite sides of the board in the corner keys. I've decided to continue using this layout with my QMK Kinesis.
-~~After a year of using a planck, I've become accustomed to my / and ? being above the - key, so I've decided to move my [, ], and = to the normal Advantage location and set the two keys above the - to new locations. I'll play with it for a while and see how I like it.~~ I didn't like it, so I've switched back.
-
The QWERTY layout shown here is based entirely on the Kinesis Advantage layout. The Colemak layout is merely an adaptation of that.
I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar to the default Planck layouts.
-As of August 4 2018, I've got the LEDs working ... mostly. Caps Lock and Num Lock LEDs work for me. The Scroll Lock LED does work on my keyboard, but I can't get it to work when I use the Scroll Lock key on my keyboard. I also have no idea how to get the Num Pad LED working when I switch to the Numpad layer.
+Depending on the OS, most of the LEDs are now working in this keymap, but I still have yet to get the Num Pad LED working when switching to the Numpad layer.
## Still to do:
- * Figure out how to make the Numpad and ScrLck LEDs work properly.
+ * Figure out how to make the Numpad LED work properly.
-### Function Keys on All Layers (keypad toggles):
+### Function Keys on All Layers (`keypad` toggles to the keypad layer):
,-----------------------------------------------------------------.
| Esc | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 |
`-----------------------------------------------------------------'
@@ -94,9 +92,9 @@ As of August 4 2018, I've got the LEDs working ... mostly. Caps Lock and Num Loc
|--------+------+------+------+------+------||------+------+------+------+------+--------|
| | | | | | || | | | | | |
|--------+------+------+------+------+------||------+------+------+------+------+--------|
- | | | | | | || | Mute | Vol- | Vol+ | | |
+ | | | Mute | Vol- | Vol+ | || | | | | | |
|--------+------+------+------+------+------||------+------+------+------+------+--------|
- | | | | | | || Stop | Prev | Play | Next | Sel | |
+ | | Stop | Prev | Play | Next | Sel || | | | | | |
`--------+------+------+------+------+------'`------+------+------+------+------+--------'
| | | | | | | | | |
`---------------------------' `---------------------------'
@@ -117,12 +115,12 @@ As of August 4 2018, I've got the LEDs working ... mostly. Caps Lock and Num Loc
|--------+------+------+------+------+------||------+------+------+------+------+--------|
| Sleep | | | | | || | KP 7 | KP 8 | KP 9 | KP - | |
|--------+------+------+------+------+------||------+------+------+------+------+--------|
- | Wake | |QWERTY|Colemk|Dvorak| || | KP 4 | KP 5 | KP 6 | KP + | |
+ | Wake | | Mute | Vol- | Vol+ | || | KP 4 | KP 5 | KP 6 | KP + | |
|--------+------+------+------+------+------||------+------+------+------+------+--------|
- | | | | | | || | KP 1 | KP 2 | KP 3 |KP Ent| |
+ | | Stop | Prev | Play | Next | Sel || | KP 1 | KP 2 | KP 3 |KP Ent| |
`--------+------+------+------+------+------'`------+------+------+------+------+--------'
- | | | | | | | | KP . |KP Ent| |
- `---------------------------' `----------------------------------'
+ | |QWERTY|Colemk|Dvorak| | | | KP . |KP Ent|
+ `---------------------------' `---------------------------'
,-------------.,-------------.
| | || | |
,------|------|------||------+------+------.
diff --git a/keyboards/kinesis/keymaps/xyverz/rules.mk b/keyboards/kinesis/keymaps/xyverz/rules.mk
index 1da780b841..c21f8aea67 100644
--- a/keyboards/kinesis/keymaps/xyverz/rules.mk
+++ b/keyboards/kinesis/keymaps/xyverz/rules.mk
@@ -2,11 +2,11 @@
# 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 = yes # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
+BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = no # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE = no # Console for debug(+400)
-COMMAND_ENABLE = yes # Commands for debug and configuration
+COMMAND_ENABLE = no # 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 controls