diff --git a/keyboards/ergodox_infinity/keymaps/dudeofawesome/README.md b/keyboards/ergodox_infinity/keymaps/dudeofawesome/README.md
index 98eb7abb2..a0e4565b1 100644
--- a/keyboards/ergodox_infinity/keymaps/dudeofawesome/README.md
+++ b/keyboards/ergodox_infinity/keymaps/dudeofawesome/README.md
@@ -2,14 +2,19 @@
A basic ErgoDox layout with Planck-like tri-layer support.
-
+
## Features
+- Base Layers
+ - QWERTY
+ - Workman
+ - Dvorak
+ - Colemak
- Planck-like tri-layer
-- Workman layout
- In-progress gaming layer
-- Numpad
+- Numpad layer
+ 
- LCD colors are linked together, like the default KLL firmware
## Building and flashing
diff --git a/keyboards/ergodox_infinity/keymaps/dudeofawesome/config.h b/keyboards/ergodox_infinity/keymaps/dudeofawesome/config.h
new file mode 100644
index 000000000..161958233
--- /dev/null
+++ b/keyboards/ergodox_infinity/keymaps/dudeofawesome/config.h
@@ -0,0 +1,11 @@
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#undef TAPPING_TOGGLE
+
+#include "../../config.h"
+#include "dudeofawesome.h"
+
+#include "./visualizer.h"
+
+#endif
diff --git a/keyboards/ergodox_infinity/keymaps/dudeofawesome/keymap.c b/keyboards/ergodox_infinity/keymaps/dudeofawesome/keymap.c
index 7d76b25a4..cf0b452bd 100644
--- a/keyboards/ergodox_infinity/keymaps/dudeofawesome/keymap.c
+++ b/keyboards/ergodox_infinity/keymaps/dudeofawesome/keymap.c
@@ -4,40 +4,41 @@
#include "version.h"
enum custom_layers {
- _QWERTY,
- _DVORAK,
- _WORKMAN,
- _GAME,
- _MOUSE,
- _NUM,
- _LOWER,
- _RAISE,
- _ADJUST,
+ _QWERTY,
+ _WORKMAN,
+ _DVORAK,
+ _COLEMAK,
+ _LOWER,
+ _RAISE,
+ _ADJUST,
+ _GAME,
+ _MOUSE,
+ _NUM,
};
enum custom_keycodes {
- QWERTY = SAFE_RANGE,
- DVORAK,
- WORKMAN,
- LOWER,
- RAISE,
- GAME,
- MOUSE,
- NUM,
- EPRM,
- VRSN,
- RGB_SLD
+ QWERTY = SAFE_RANGE,
+ WORKMAN,
+ DVORAK,
+ COLEMAK,
+ LOWER,
+ RAISE,
+ GAME,
+ MOUSE,
+ EPRM,
+ VRSN,
+ RGB_SLD,
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap 0: Basic QWERTY layer
*
* ,---------------------------------------------. ,---------------------------------------------.
- * | - | 1 | 2 | 3 | 4 | 5 | Esc | | Esc | 6 | 7 | 8 | 9 | 0 | = |
+ * | ` | 1 | 2 | 3 | 4 | 5 | Esc | | Esc | 6 | 7 | 8 | 9 | 0 | Del |
* |--------+-----+-----+-----+-----+------------| |------+-----+-----+-----+-----+-----+--------|
* | Tab | Q | W | E | R | T | [{ | | ]} | Y | U | I | O | P | BSPC |
* |--------+-----+-----+-----+-----+-----| | | |-----+-----+-----+-----+-----+--------|
- * | ESC | A | S | D | F | G |------| |------| H | J | K | L | ; | '" |
+ * | ESC | A | S | D | F | G |------| |------| H | J | K | L | ; | ' |
* |--------+-----+-----+-----+-----+-----| L1 | | L1 |-----+-----+-----+-----+-----+--------|
* | LShift | Z | X | C | V | B | | | | N | M | , | . | / | Enter |
* `--------+-----+-----+-----+-----+------------' `------------+-----+-----+-----+-----+--------'
@@ -53,32 +54,77 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_QWERTY] = LAYOUT_ergodox(
// left hand
- KC_MINUS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC,
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRACKET,
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_FN1,
- TG(_NUM), KC_LCTL, KC_LALT, KC_LGUI, LOWER,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_FN1,
+ TT(_NUM), KC_LCTL, KC_LALT, KC_LGUI, LOWER,
- KC_MPLY, TG(_MOUSE),
- KC_LALT,
- LOWER, KC_BSPACE, KC_LGUI,
+ KC_MPLY, TG(_MOUSE),
+ KC_LALT,
+ KC_BSPACE, LOWER, KC_LGUI,
// right hand
- KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQUAL,
+ KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
KC_RBRACKET, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPACE,
KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE,
- KC_FN1, KC_N, KC_M, KC_COMM, KC_DOT, LT(_MOUSE, KC_SLSH), KC_ENTER,
+ KC_FN1, KC_N, KC_M, KC_COMM, KC_DOT, LT(_MOUSE, KC_SLSH), RSFT_T(KC_ENT),
RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,
- TG(_NUM), TG(_MOUSE),
+ TT(_NUM), TG(_MOUSE),
KC_LALT,
- KC_LGUI, KC_SPACE, RAISE
+ KC_LGUI, RAISE, KC_SPACE
+),
+
+/* Keymap 0: Basic Workman layer
+ *
+ * ,---------------------------------------------. ,--------------------------------------------.
+ * | ` | 1 | 2 | 3 | 4 | 5 | Esc | | Esc | 6 | 7 | 8 | 9 | 0 | Del |
+ * |--------+-----+-----+-----+-----+------------| |------+-----+-----+-----+-----+-----+--------|
+ * | Tab | Q | D | R | W | B | [{ | | ]} | J | F | U | P | ; | BSPC |
+ * |--------+-----+-----+-----+-----+-----| | | |-----+-----+-----+-----+-----+--------|
+ * | ESC | A | S | H | T | G |------| |------| Y | N | E | O | I | ' |
+ * |--------+-----+-----+-----+-----+-----| L1 | | L1 |-----+-----+-----+-----+-----+--------|
+ * | LShift | Z | X | M | C | V | | | | K | L | , | . | / | Enter |
+ * `--------+-----+-----+-----+-----+------------' `------------+-----+-----+-----+-----+--------'
+ * | Num |Ctrl | Alt |LGUI |Lower| |Raise|Left |Down | Up |Right |
+ * `------------------------------' `------------------------------'
+ * ,------------. ,------------.
+ * |Play |Mouse | | Num |Mouse|
+ * ,----|-----|------| |------+-----+-----.
+ * | | | Alt | | Alt | | |
+ * |BSPC|LOWER|------| |------|RAISE|Space|
+ * | | | LGUI | | LGUI | | |
+ * `-----------------' `------------------'
+ */
+[_WORKMAN] = LAYOUT_ergodox(
+ // left hand
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC,
+ KC_TAB, KC_Q, KC_D, KC_R, KC_W, KC_B, KC_LBRACKET,
+ KC_ESC, KC_A, KC_S, KC_H, KC_T, KC_G,
+ KC_LSFT, KC_Z, KC_X, KC_M, KC_C, KC_V, KC_FN1,
+ TT(_NUM), KC_LCTL, KC_LALT, KC_LGUI, LOWER,
+
+ KC_MPLY, TG(_MOUSE),
+ KC_LALT,
+ KC_BSPACE, LOWER, KC_LGUI,
+
+ // right hand
+ KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
+ KC_RBRACKET, KC_J, KC_F, KC_U, KC_P, KC_SCOLON, KC_BSPACE,
+ KC_Y, KC_N, KC_E, KC_O, KC_I, KC_QUOTE,
+ KC_FN1, KC_K, KC_L, KC_COMM, KC_DOT, LT(_MOUSE, KC_SLSH), RSFT_T(KC_ENT),
+ RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,
+
+ TT(_NUM), TG(_MOUSE),
+ KC_LALT,
+ KC_LGUI, RAISE, KC_SPACE
),
/* Keymap 0: Basic Dvorak layer
*
* ,---------------------------------------------. ,--------------------------------------------.
- * | - | 1 | 2 | 3 | 4 | 5 | Esc | | Esc | 6 | 7 | 8 | 9 | 0 | = |
+ * | ` | 1 | 2 | 3 | 4 | 5 | Esc | | Esc | 6 | 7 | 8 | 9 | 0 | Del |
* |--------+-----+-----+-----+-----+------------| |------+-----+-----+-----+-----+-----+--------|
* | Tab | ' | , | . | P | Y | [{ | | ]} | F | G | C | R | L | BSPC |
* |--------+-----+-----+-----+-----+-----| | | |-----+-----+-----+-----+-----+--------|
@@ -98,38 +144,38 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_DVORAK] = LAYOUT_ergodox(
// left hand
- KC_MINUS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC,
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC,
KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_LBRACKET,
KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I,
- KC_LSPO, KC_SCOLON, KC_Q, KC_J, KC_K, KC_X, KC_FN1,
- TG(_NUM), KC_LCTL, KC_LALT, KC_LGUI, LOWER,
+ KC_LSFT, KC_SCOLON, KC_Q, KC_J, KC_K, KC_X, KC_FN1,
+ TT(_NUM), KC_LCTL, KC_LALT, KC_LGUI, LOWER,
- KC_MPLY, TG(_MOUSE),
- KC_LALT,
- KC_BSPACE, LOWER, KC_LGUI,
+ KC_MPLY, TG(_MOUSE),
+ KC_LALT,
+ KC_BSPACE, LOWER, KC_LGUI,
// right hand
- KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQUAL,
+ KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
KC_RBRACKET, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPACE,
KC_D, KC_H, KC_T, KC_N, KC_S, LT(MOUSE, KC_SLSH),
- KC_FN1, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENTER,
+ KC_FN1, KC_B, KC_M, KC_W, KC_V, KC_Z, RSFT_T(KC_ENT),
RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,
- TG(_NUM), TG(_MOUSE),
+ TT(_NUM), TG(_MOUSE),
KC_LALT,
KC_LGUI, RAISE, KC_SPACE
),
-/* Keymap 0: Basic Workman layer
+/* Keymap 0: Basic Colemak layer
*
* ,---------------------------------------------. ,--------------------------------------------.
- * | - | 1 | 2 | 3 | 4 | 5 | Esc | | Esc | 6 | 7 | 8 | 9 | 0 | = |
+ * | ` | 1 | 2 | 3 | 4 | 5 | Esc | | Esc | 6 | 7 | 8 | 9 | 0 | Del |
* |--------+-----+-----+-----+-----+------------| |------+-----+-----+-----+-----+-----+--------|
- * | Tab | Q | D | R | W | B | [{ | | ]} | J | F | U | P | ; | BSPC |
+ * | Tab | Q | W | F | P | G | [{ | | ]} | J | L | U | Y | ; | BSPC |
* |--------+-----+-----+-----+-----+-----| | | |-----+-----+-----+-----+-----+--------|
- * | ESC | A | S | H | T | G |------| |------| Y | N | E | O | I | '" |
+ * | ESC | A | R | S | T | D |------| |------| H | N | E | I | O | ' |
* |--------+-----+-----+-----+-----+-----| L1 | | L1 |-----+-----+-----+-----+-----+--------|
- * | LShift | Z | X | M | C | V | | | | K | L | , | . | / | Enter |
+ * | LShift | Z | X | C | V | B | | | | K | M | , | . | / | Enter |
* `--------+-----+-----+-----+-----+------------' `------------+-----+-----+-----+-----+--------'
* | Num |Ctrl | Alt |LGUI |Lower| |Raise|Left |Down | Up |Right |
* `------------------------------' `------------------------------'
@@ -141,28 +187,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | LGUI | | LGUI | | |
* `-----------------' `------------------'
*/
-[_WORKMAN] = LAYOUT_ergodox(
+[_COLEMAK] = LAYOUT_ergodox(
// left hand
- KC_MINUS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC,
- KC_TAB, KC_Q, KC_D, KC_R, KC_W, KC_B, KC_LBRACKET,
- KC_ESC, KC_A, KC_S, KC_H, KC_T, KC_G,
- KC_LSPO, KC_Z, KC_X, KC_M, KC_C, KC_V, KC_FN1,
- TG(_NUM), KC_LCTL, KC_LALT, KC_LGUI, LOWER,
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC,
+ KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_LBRACKET,
+ KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_FN1,
+ TT(_NUM), KC_LCTL, KC_LALT, KC_LGUI, LOWER,
- KC_MPLY, TG(_MOUSE),
+ KC_MPLY, TG(_MOUSE),
KC_LALT,
- KC_BSPACE, LOWER, KC_LGUI,
+ KC_BSPACE, LOWER, KC_LGUI,
// right hand
- KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQUAL,
- KC_RBRACKET, KC_J, KC_F, KC_U, KC_P, KC_SCOLON, KC_BSPACE,
- KC_Y, KC_N, KC_E, KC_O, KC_I, KC_QUOTE,
- KC_FN1, KC_K, KC_L, KC_COMM, KC_DOT, LT(_MOUSE, KC_SLSH), KC_ENTER,
+ KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
+ KC_RBRACKET, KC_J, KC_L, KC_U, KC_Y, KC_SCOLON, KC_BSPACE,
+ KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOTE,
+ KC_FN1, KC_K, KC_M, KC_COMM, KC_DOT, LT(_MOUSE, KC_SLSH), RSFT_T(KC_ENT),
RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,
- NUM, TG(_MOUSE),
+ TT(_NUM), TG(_MOUSE),
KC_LALT,
- KC_LGUI, RAISE, KC_SPACE
+ KC_LGUI, RAISE, KC_SPACE
),
/* Lower
@@ -176,7 +222,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |---------+------+------+------+------+------| L2 | | L2 |------+------+------+------+------+--------|
* | | F7 | F8 | F9 | F10 | F11 | | | | F12 |ISO ~ |ISO | | Home | End | |
* `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | Next | Vol- | Vol+ | Play |
+ * | | | | | | | | Play | Vol- | Vol+ | Next |
* `-----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
* |Animat| | |Toggle|Solid |
@@ -189,9 +235,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_LOWER] = LAYOUT_ergodox(
// left hand
VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11,
- KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______,
+ KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_F6,
KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,
- _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______,
+ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
_______, _______, _______, _______, _______,
_______, _______,
@@ -199,11 +245,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______,
// right hand
- KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
- KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
- _______, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______,
- _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
+ KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+ KC_F5, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
+ KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+ KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______,
+ _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_MNXT,
_______, _______,
_______,
@@ -221,7 +267,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |---------+------+------+------+------+------| L2 | | L2 |------+------+------+------+------+--------|
* | | F7 | F8 | F9 | F10 | F11 | | | | F12 |ISO # |ISO / |Pg Up |Pg Dn | |
* `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | Next | Vol- | Vol+ | Play |
+ * | | | | | | | | Play | Vol- | Vol+ | Next |
* `-----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
* |Animat| | |Toggle|Solid |
@@ -234,9 +280,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_RAISE] = LAYOUT_ergodox(
// left hand
VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11,
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, _______,
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_F6,
KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,
- _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______,
+ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
_______, _______, _______, _______, _______,
_______, _______,
@@ -244,11 +290,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______,
// right hand
- KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- _______, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
- KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
- _______, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
- _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
+ KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+ KC_F5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
+ KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
+ KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
+ _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_MNXT,
_______, _______,
_______,
@@ -262,7 +308,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
* | |Reset |Debug | | | | | | | |TRM on|TRMoff| | | Del |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | |AG Nrm|------| |------|AG Swp|QWERTY|Wrkman|Dvorak| | |
+ * | CPSLCK | | | | |AG Nrm|------| |------|AG Swp|QWERTY|Wrkman|Dvorak| | |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | | | | | | | | | | | | Prev | Next | | |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
@@ -280,7 +326,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// left hand
VRSN, _______, _______, _______, _______, _______, _______,
_______, RESET, DEBUG, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, AG_NORM,
+ KC_CAPS, _______, _______, _______, _______, AG_NORM,
_______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______,
@@ -291,7 +337,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// right hand
_______, _______, _______, _______, _______, _______, _______,
_______, _______, TERM_ON, TERM_OFF, _______, _______, KC_DEL,
- AG_SWAP, QWERTY, WORKMAN, DVORAK, _______, _______,
+ AG_SWAP, QWERTY, WORKMAN, DVORAK, COLEMAK, _______,
_______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______,
@@ -386,24 +432,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______,
- TG(_MOUSE), TG(_NUM),
+ TG(_MOUSE), TT(_NUM),
_______,
_______, _______, _______
),
-
/* Keymap 2: NUMPAD
*
* ,--------------------------------------------------. ,--------------------------------------------------.
- * | | F1 | F2 | F3 | F4 | F5 | F11 | | F12 | F6 | F7 | F8 | F9 | F10 | |
+ * | | ✗ | ✗ | ✗ | ✗ | ✗ | ✗ | | ✗ | ✗ | ✗ | / | * | - | |
* |--------+------+------+------+------+------+------| |------+------+------+------+------+------+--------|
- * | | ! | @ | { | } | | | | | | | 7 | 8 | 9 | * | |
+ * | | ✗ | Home | Up | End | PgUp | | | | ✗ | 7 | 8 | 9 | + | |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | # | $ | ( | ) | ` |------| |------| | 4 | 5 | 6 | + | |
+ * | | ✗ | Left | Down | Right| PgDn |------| |------| ✗ | 4 | 5 | 6 | + | ✗ |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | % | ^ | [ | ] | ~ | | | | | 1 | 2 | 3 | \ | |
+ * | | / | * | - | + | Enter| | | | ✗ | 1 | 2 | 3 | Enter| Enter |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | . | 0 | 0 | = | |
+ * | | | | | ✗ | | 0 | 0 | . | Enter| = |
* `----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
* | | | | | |
@@ -415,22 +460,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_NUM] = LAYOUT_ergodox(
// left hand
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11,
- _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, _______,
- _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV,
- _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, _______,
- _______, _______, _______, _______, _______,
+ _______, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ _______, KC_NO, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_NO,
+ _______, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
+ _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, KC_PENT, KC_NO,
+ _______, _______, _______, _______, KC_NO,
_______, _______,
_______,
_______, _______, _______,
// right hand
- KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- _______, _______, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_ASTERISK, _______,
- _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_PLUS, _______,
- _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_SLASH, _______,
- KC_KP_DOT, KC_KP_0, KC_KP_0, KC_KP_EQUAL, _______,
+ KC_NO, KC_NO, KC_NO, KC_PSLS, KC_PAST, KC_PMNS, _______,
+ KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_PPLS, _______,
+ KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_NO,
+ KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_PENT,
+ KC_P0, KC_P0, KC_PDOT, KC_PENT, KC_PEQL,
_______, _______,
_______,
@@ -444,15 +489,15 @@ 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) {
- SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
- }
- break;
+ if (record->event.pressed) {
+ SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
+ }
+ break;
case 1:
- if (record->event.pressed) { // For resetting EEPROM
- eeconfig_init();
- }
- break;
+ if (record->event.pressed) { // For resetting EEPROM
+ eeconfig_init();
+ }
+ break;
}
return MACRO_NONE;
};
@@ -461,23 +506,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case QWERTY:
if (record->event.pressed) {
- print("mode just switched to qwerty and this is a huge string\n");
set_single_persistent_default_layer(_QWERTY);
}
return false;
- break;
case WORKMAN:
if (record->event.pressed) {
set_single_persistent_default_layer(_WORKMAN);
}
return false;
- break;
case DVORAK:
if (record->event.pressed) {
set_single_persistent_default_layer(_DVORAK);
}
return false;
- break;
+ case COLEMAK:
+ if (record->event.pressed) {
+ set_single_persistent_default_layer(_COLEMAK);
+ }
+ return false;
case LOWER:
if (record->event.pressed) {
layer_on(_LOWER);
@@ -494,7 +540,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
}
return false;
- break;
case RAISE:
if (record->event.pressed) {
layer_on(_RAISE);
@@ -511,19 +556,16 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
}
return false;
- break;
case EPRM:
if (record->event.pressed) {
eeconfig_init();
}
return false;
- break;
case VRSN:
if (record->event.pressed) {
SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
}
return false;
- break;
case RGB_SLD:
if (record->event.pressed) {
#ifdef RGBLIGHT_ENABLE
@@ -531,7 +573,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#endif
}
return false;
- break;
}
return true;
}
@@ -550,19 +591,19 @@ void matrix_scan_user(void) {
uint8_t layer = biton32(layer_state);
ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
+ ergodox_led_lower_off();
+ ergodox_led_raise_off();
+ ergodox_led_adjust_off();
switch (layer) {
case _LOWER:
- ergodox_right_led_1_on();
+ ergodox_led_lower_on();
break;
case _RAISE:
- ergodox_right_led_2_on();
+ ergodox_led_raise_on();
break;
case _ADJUST:
- ergodox_right_led_3_on();
+ ergodox_led_adjust_on();
break;
}
};
diff --git a/keyboards/ergodox_infinity/keymaps/dudeofawesome/visualizer.c b/keyboards/ergodox_infinity/keymaps/dudeofawesome/visualizer.c
index 034f15270..d339ecc97 100644
--- a/keyboards/ergodox_infinity/keymaps/dudeofawesome/visualizer.c
+++ b/keyboards/ergodox_infinity/keymaps/dudeofawesome/visualizer.c
@@ -28,7 +28,7 @@ along with this program. If not, see .
#error This visualizer needs that LCD is enabled
#endif
-#include "visualizer.h"
+#include "./visualizer.h"
#include "visualizer_keyframes.h"
#include "lcd_keyframes.h"
#include "lcd_backlight_keyframes.h"
@@ -295,17 +295,17 @@ void ergodox_board_led_on(void){
// No board led support
}
-void ergodox_right_led_1_on(void){
+void ergodox_led_lower_on(void){
user_data_keyboard.led_on |= (1u << 0);
visualizer_set_user_data(&user_data_keyboard);
}
-void ergodox_right_led_2_on(void){
+void ergodox_led_raise_on(void){
user_data_keyboard.led_on |= (1u << 1);
visualizer_set_user_data(&user_data_keyboard);
}
-void ergodox_right_led_3_on(void){
+void ergodox_led_adjust_on(void){
user_data_keyboard.led_on |= (1u << 2);
visualizer_set_user_data(&user_data_keyboard);
}
@@ -314,32 +314,32 @@ void ergodox_board_led_off(void){
// No board led support
}
-void ergodox_right_led_1_off(void){
+void ergodox_led_lower_off(void){
user_data_keyboard.led_on &= ~(1u << 0);
visualizer_set_user_data(&user_data_keyboard);
}
-void ergodox_right_led_2_off(void){
+void ergodox_led_raise_off(void){
user_data_keyboard.led_on &= ~(1u << 1);
visualizer_set_user_data(&user_data_keyboard);
}
-void ergodox_right_led_3_off(void){
+void ergodox_led_adjust_off(void){
user_data_keyboard.led_on &= ~(1u << 2);
visualizer_set_user_data(&user_data_keyboard);
}
-void ergodox_right_led_1_set(uint8_t n) {
+void ergodox_led_lower_set(uint8_t n) {
user_data_keyboard.led1 = n;
visualizer_set_user_data(&user_data_keyboard);
}
-void ergodox_right_led_2_set(uint8_t n) {
+void ergodox_led_raise_set(uint8_t n) {
user_data_keyboard.led2 = n;
visualizer_set_user_data(&user_data_keyboard);
}
-void ergodox_right_led_3_set(uint8_t n) {
+void ergodox_led_adjust_set(uint8_t n) {
user_data_keyboard.led3 = n;
visualizer_set_user_data(&user_data_keyboard);
}
diff --git a/keyboards/ergodox_infinity/keymaps/dudeofawesome/visualizer.h b/keyboards/ergodox_infinity/keymaps/dudeofawesome/visualizer.h
new file mode 100644
index 000000000..740a951ec
--- /dev/null
+++ b/keyboards/ergodox_infinity/keymaps/dudeofawesome/visualizer.h
@@ -0,0 +1,35 @@
+/* Copyright 2017 Fred Sundvik
+ *
+ * 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 VISUALIZER_H_
+#define VISUALIZER_H_
+
+#include "visualizer.h"
+#include "led.h"
+
+void ergodox_led_lower_on (void);
+void ergodox_led_raise_on (void);
+void ergodox_led_adjust_on (void);
+
+void ergodox_led_lower_off (void);
+void ergodox_led_raise_off (void);
+void ergodox_led_adjust_off (void);
+
+void ergodox_led_lower_set (uint8_t n);
+void ergodox_led_raise_set (uint8_t n);
+void ergodox_led_adjust_set (uint8_t n);
+
+#endif /* VISUALIZER_H_ */