summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
diff options
context:
space:
mode:
authorluc wastiaux <luc.wastiaux@airpost.net>2017-02-13 00:44:28 +0100
committerluc wastiaux <luc.wastiaux@airpost.net>2017-02-13 00:44:28 +0100
commit352d79e1fbbd7eea65793abb261dd544fec7bb1c (patch)
treee006ee8098826054d93939b2a59521f6c032e10d /keyboards/ergodox
parent5f8535b356e66975e20f1a573ab104db75f8b33c (diff)
parent4505db5d0e0c2423645cc9117f29b942d4841c5b (diff)
downloadqmk_firmware-352d79e1fbbd7eea65793abb261dd544fec7bb1c.tar.gz
qmk_firmware-352d79e1fbbd7eea65793abb261dd544fec7bb1c.tar.xz
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'keyboards/ergodox')
-rw-r--r--keyboards/ergodox/keymaps/ab/readme.md2
-rw-r--r--keyboards/ergodox/keymaps/albert/Makefile5
-rw-r--r--keyboards/ergodox/keymaps/albert/config.h12
-rw-r--r--keyboards/ergodox/keymaps/albert/keymap.c661
-rw-r--r--keyboards/ergodox/keymaps/albert/readme.md188
-rw-r--r--keyboards/ergodox/keymaps/algernon/readme.md4
-rw-r--r--keyboards/ergodox/keymaps/deadcyclo/Makefile1
-rw-r--r--keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-base-layout.pngbin79741 -> 79488 bytes
-rw-r--r--keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-layer-1-symbols.pngbin55349 -> 79904 bytes
-rw-r--r--keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-layer-2-media-and-mouse.pngbin50926 -> 62258 bytes
-rw-r--r--keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-layer-3-navigation.pngbin43551 -> 58886 bytes
-rw-r--r--keyboards/ergodox/keymaps/deadcyclo/keymap.c426
-rw-r--r--keyboards/ergodox/keymaps/deadcyclo/readme.md60
-rw-r--r--keyboards/ergodox/keymaps/german-kinergo/readme.md2
-rw-r--r--keyboards/ergodox/keymaps/mclennon_osx/README.md2
-rw-r--r--keyboards/ergodox/keymaps/ordinary/keymap.c1
-rw-r--r--keyboards/ergodox/keymaps/pvinis/Readme.md2
-rw-r--r--keyboards/ergodox/keymaps/robot_test_layout/keymap.c8
-rw-r--r--keyboards/ergodox/keymaps/software_neo2/keymap.c64
-rw-r--r--keyboards/ergodox/keymaps/supercoder/readme.md2
-rw-r--r--keyboards/ergodox/keymaps/win10_writers-block/readme.md2
-rw-r--r--keyboards/ergodox/readme.md2
22 files changed, 1298 insertions, 146 deletions
diff --git a/keyboards/ergodox/keymaps/ab/readme.md b/keyboards/ergodox/keymaps/ab/readme.md
index 6b1ac2be3..4ad80efe6 100644
--- a/keyboards/ergodox/keymaps/ab/readme.md
+++ b/keyboards/ergodox/keymaps/ab/readme.md
@@ -8,7 +8,7 @@ Beginner's keymap emulates standard QWERTY keyboard for beginners. Once you get
* Easy on beginners. It has everything you need for your day to day usage.
#### Cons
-* Keys are not ergonomically placed to take full advantage of Ergodox-EZ. Take a look at this [Default Keymap](https://github.com/jackhumbert/qmk_firmware/blob/master/keyboards/ergodox_ez/keymaps/default/readme.md)
+* Keys are not ergonomically placed to take full advantage of Ergodox-EZ. Take a look at this [Default Keymap](https://github.com/qmk/qmk_firmware/blob/master/keyboards/ergodox/keymaps/default/readme.md)
* While multiple layers are possible, beginner's keymap only uses one additional layer for mouse, function and volume keys.
#### Notes
diff --git a/keyboards/ergodox/keymaps/albert/Makefile b/keyboards/ergodox/keymaps/albert/Makefile
new file mode 100644
index 000000000..eb8544afe
--- /dev/null
+++ b/keyboards/ergodox/keymaps/albert/Makefile
@@ -0,0 +1,5 @@
+COMMAND_ENABLE = no # Commands for debug and configuration
+
+ifndef QUANTUM_DIR
+ include ../../../../Makefile
+endif
diff --git a/keyboards/ergodox/keymaps/albert/config.h b/keyboards/ergodox/keymaps/albert/config.h
new file mode 100644
index 000000000..e6d363117
--- /dev/null
+++ b/keyboards/ergodox/keymaps/albert/config.h
@@ -0,0 +1,12 @@
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include "../../config.h"
+
+/* using UK layout for space-cadet-shift */
+#define LSPO_KEY KC_9
+#define RSPC_KEY KC_0
+
+#define LEADER_TIMEOUT 800 // leader key sequence timeout in millis
+
+#endif
diff --git a/keyboards/ergodox/keymaps/albert/keymap.c b/keyboards/ergodox/keymaps/albert/keymap.c
new file mode 100644
index 000000000..dfbb311bd
--- /dev/null
+++ b/keyboards/ergodox/keymaps/albert/keymap.c
@@ -0,0 +1,661 @@
+#include "ergodox.h"
+#include "debug.h"
+#include "action_layer.h"
+#include "version.h"
+
+#include <stdarg.h>
+
+/* use UK keymap */
+
+#define UK_HASH KC_NONUS_HASH
+#define UK_BSLS KC_NONUS_BSLASH
+#define UK_PIPE LSFT(UK_BSLS)
+
+#define BASE 0 // default layer
+#define SYMB 1 // symbols
+#define NUMB 2 // numbers and hex
+#define CRSR 3 // cursor keys
+#define MOUS 4 // mouse keys
+#define KEYW 5 // keyword macros
+#define EMAC 6 // emacs
+
+// my macros
+#define UM_ECET M(0) // { }
+#define UM_0x M(1)
+#define UM_PUB M(2)
+#define UM_PRO M(3)
+#define UM_PRV M(4)
+#define UM_CLS M(5)
+#define UM_STR M(6)
+#define UM_RET M(7)
+#define UM_INC M(8)
+#define UM_OBJ M(9)
+#define UM_GITLOG M(10)
+#define UM_GOODM M(11)
+#define UM_NAMESP M(12)
+#define UM_EMTR M(14) // emacs toggle read-only
+#define UM_EMWR M(15) // emacs write buffer (save)
+#define UM_EMUN M(16) // emacs undo
+#define UM_EMRE M(17) // emacs redo
+#define UM_EMPB M(18) // emacs previous buffer
+#define UM_EMNB M(19) // emacs next buffer
+#define UM_GOODN M(20)
+#define UM_ECETS M(22) // { };
+#define UM_TMPL M(23)
+#define UM_TYPN M(24)
+#define UM_CONT M(25)
+#define UM_BREAK M(26)
+#define UM_CONST M(27)
+#define UM_SMILY M(28)
+#define UM_SADF M(29)
+#define UM_SCARF M(30)
+#define UM_DECAF M(31)
+#define UM_OPER M(32)
+#define UM_NULP M(33)
+#define UM_EXTR M(34)
+#define UM_VIRT M(35)
+#define UM_EMFB M(36) // emacs font bigger
+#define UM_EMFS M(37) // emacs font smaller
+#define UM_VOLAT M(38)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Keymap 0: Base layer
+ *
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | ESC | 1 | 2 | 3 | 4 | 5 | SfLt | | SfRt | 6 | 7 | 8 | 9 | 0 | BkSp |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | Tab | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | Del |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | Caps/L2| A | S | D | F | G |------| |------| H | J | K | L | ; |Enter/L2|
+ * |--------+------+------+------+------+------| L6 | | L6 |------+------+------+------+------+--------|
+ * | LSft/( | Z | X | C | V/L3 | B/L4 | | | | N/L4 | M/L3 | , | . | / | RSft/) |
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * |Ctrl/[| Alt/]| # | Left |Right | | Up | Down | - | Alt/[|Ctrl/]|
+ * `----------------------------------' `----------------------------------'
+ * ,-------------. ,-------------.
+ * | L2 | lead | | lead | Ins |
+ * ,------|------|------| |------+------+------.
+ * | Space| BkSp | Home | | PgUp | Enter|Space |
+ * | / | / |------| |------| / | / |
+ * | Ctrl | Alt |End/L5| |PDn/L5| Alt | Ctrl |
+ * `--------------------' `--------------------'
+ */
+[BASE] = KEYMAP( // layer 0 : default
+ // left hand
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, LSFT(KC_LEFT),
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, MO(SYMB),
+ LT(NUMB, KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G,
+ KC_LSPO, KC_Z, KC_X, KC_C, LT(CRSR, KC_V), LT(MOUS, KC_B), MO(EMAC),
+ CTL_T(KC_LBRC), ALT_T(KC_RBRC), UK_HASH, KC_LEFT, KC_RGHT,
+ TG(NUMB), KC_LEAD,
+ KC_HOME,
+ CTL_T(KC_SPC), ALT_T(KC_BSPC), LT(KEYW, KC_END),
+ // right hand
+ LSFT(KC_RGHT), KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
+ MO(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DELT,
+ KC_H, KC_J, KC_K, KC_L, KC_SCLN, LT(NUMB, KC_ENT),
+ MO(EMAC), LT(MOUS, KC_N), LT(CRSR, KC_M), KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
+ KC_UP, KC_DOWN, KC_MINS, ALT_T(KC_LBRC), CTL_T(KC_RBRC),
+ KC_LEAD, KC_INS,
+ KC_PGUP,
+ LT(KEYW, KC_PGDN), ALT_T(KC_ENT), CTL_T(KC_SPC)
+ ),
+/* Keymap 1: Symbol Layer with F keys
+ *
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | ## | F1 | F2 | F3 | F4 | F5 | ## | | ## | F6 | F7 | F8 | F9 | F10 | F11 |
+ * |--------+------+------+------+------+------+------| |------+------+------+------+------+------+--------|
+ * | ## | ! | " | £ | $ | % | ## | | ## | - | + | = | @ | ~ | F12 |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | ## | ^ | & | * | _ | # |------| |------| { | } | ; | ' | # | ## |
+ * |--------+------+------+------+------+------| ## | | ## |------+------+------+------+------+--------|
+ * | ## | \ | | | ` | - | / | | | | [ | ] | < | > | ? | ## |
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | ## | ## | ## | ## | ## | | ## | ## | ## | ## | ## |
+ * `----------------------------------' `----------------------------------'
+ * ,-------------. ,-------------.
+ * | ## | ## | | ## | ## |
+ * ,------|------|------| |------+------+------.
+ * | | | ## | | ## | | |
+ * | ## | ## |------| |------| ## | ## |
+ * | | | ## | | ## | | |
+ * `--------------------' `--------------------'
+ */
+[SYMB] = KEYMAP(
+ // left hand
+ KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
+ KC_TRNS, KC_EXLM, LSFT(KC_2), LSFT(KC_3), LSFT(KC_4), LSFT(KC_5), KC_TRNS,
+ KC_TRNS, LSFT(KC_6), LSFT(KC_7), LSFT(KC_8), LSFT(KC_MINS), UK_HASH,
+ KC_TRNS, UK_BSLS, UK_PIPE, KC_GRV, KC_MINS, KC_SLSH, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS,
+ KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS,
+ // right hand
+ KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+ KC_TRNS, KC_MINS, KC_PLUS, KC_EQL, LSFT(KC_QUOT), LSFT(UK_HASH), KC_F12,
+ KC_LCBR, KC_RCBR, KC_SCLN, KC_QUOT, UK_HASH, KC_TRNS,
+ KC_TRNS, KC_LBRC, KC_RBRC, LSFT(KC_COMM), LSFT(KC_DOT), LSFT(KC_SLSH), KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS,
+ KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+/* Keymap 2: Numerics and hex
+ *
+ * ,---------------------------------------------------. ,--------------------------------------------------.
+ * | ## | A | B | C | D | E | F | | A | B | C | D | E | F | ## |
+ * |---------+------+------+------+------+------+------| |------+------+------+------+------+------+--------|
+ * | ## | * | 7 | 8 | 9 | * | 0x | | 0x | * | 7 | 8 | 9 | * | ## |
+ * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | ## | / | 4 | 5 | 6 | / |------| |------| / | 4 | 5 | 6 | / | ## |
+ * |---------+------+------+------+------+------| ## | | ## |------+------+------+------+------+--------|
+ * | ## | - | 1 | 2 | 3 | - | | | | - | 1 | 2 | 3 | - | ## |
+ * `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | = | + | 0 | , | . | | 0 | , | . | + | = |
+ * `-----------------------------------' `----------------------------------'
+ * ,-------------. ,-------------.
+ * | ## | ## | | ## | ## |
+ * ,------|------|------| |------+------+------.
+ * | | | ## | | ## | | |
+ * | ## | ## |------| |------| ## | ## |
+ * | | | ## | | ## | | |
+ * `--------------------' `--------------------'
+ */
+[NUMB] = KEYMAP(
+ // left hand
+ KC_TRNS, KC_A, KC_B, KC_C, KC_D, KC_E, KC_F,
+ KC_TRNS, KC_ASTR, KC_7, KC_8, KC_9, KC_ASTR, UM_0x,
+ KC_TRNS, KC_SLSH, KC_4, KC_5, KC_6, KC_SLSH,
+ KC_TRNS, KC_MINS, KC_1, KC_2, KC_3, KC_MINS, KC_TRNS,
+ KC_EQL, KC_PLUS, KC_0, KC_COMM, KC_DOT,
+ KC_TRNS, KC_TRNS,
+ KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS,
+ // right hand
+ KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_TRNS,
+ UM_0x, KC_ASTR, KC_7, KC_8, KC_9, KC_ASTR, KC_TRNS,
+ KC_SLSH, KC_4, KC_5, KC_6, KC_SLSH, KC_TRNS,
+ KC_TRNS, KC_MINS, KC_1, KC_2, KC_3, KC_MINS, KC_TRNS,
+ KC_0, KC_COMM, KC_DOT, KC_PLUS, KC_EQL,
+ KC_TRNS, KC_TRNS,
+ KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+/* Keymap 3: Cursor movement
+ *
+ * ,---------------------------------------------------. ,--------------------------------------------------.
+ * | | | | | | | | | | | | | | | |
+ * |---------+------+------+------+------+------+------| |------+------+------+------+------+------+--------|
+ * | | Home | | Up | | PgUp | | | | PgUp | | Up | | Home | |
+ * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | End | Left | Down | Right| PgDn |------| |------| PgDn | Left | Down | Right| End | |
+ * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | ## | Up | | Down | ## | | | | | | ## | Down | | Up | ## |
+ * `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | Left | Down | Right| | | | | | Left | Down | Right|
+ * `-----------------------------------' `----------------------------------'
+ * ,-------------. ,-------------.
+ * | | | | | |
+ * ,------|------|------| |------+------+------.
+ * | | | | | | | |
+ * | ## | ## |------| |------| ## | ## |
+ * | | | | | | | |
+ * `--------------------' `--------------------'
+ */
+[CRSR] = KEYMAP(
+ // left hand
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_HOME, KC_NO, KC_UP, KC_NO, KC_PGUP, KC_NO,
+ KC_NO, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
+ KC_TRNS, KC_UP, KC_NO, KC_DOWN, KC_TRNS, KC_NO, KC_NO,
+ KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO,
+ KC_NO, KC_NO,
+ KC_NO,
+ KC_TRNS, KC_TRNS, KC_NO,
+ // right hand
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_PGUP, KC_NO, KC_UP, KC_NO, KC_HOME, KC_NO,
+ KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_NO,
+ KC_NO, KC_NO, KC_TRNS, KC_DOWN, KC_NO, KC_UP, KC_TRNS,
+ KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT,
+ KC_NO, KC_NO,
+ KC_NO,
+ KC_NO, KC_TRNS, KC_TRNS
+ ),
+/* Keymap 4: Media and mouse keys
+ *
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | | | | | | | | | | | | | | | |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | | | Lclk | MsUp | Rclk | | | | | | Lclk | MsUp | Rclk | | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | |MsLeft|MsDown|MsRght| |------| |------| |MsLeft|MsDown|MsRght| | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | Lclk | MsUp | Rclk |MsDown| | ## | | | | ## | |MsDown| Lclk | MsUp | Rclk |
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * |MsLeft|MsDown|MsRight | | | | |MsLeft|MsDown|MsRght|
+ * `----------------------------------' `----------------------------------'
+ * ,-------------. ,-------------.
+ * | | | | | |
+ * ,------|------|------| |------+------+------.
+ * | | | | | | | |
+ * | | |------| |------| | |
+ * | | | | | | | |
+ * `--------------------' `--------------------'
+ */
+[MOUS] = KEYMAP(
+ // left hand
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO, KC_BTN1, KC_MS_U, KC_BTN2, KC_NO, KC_NO,
+ KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO,
+ KC_BTN1, KC_MS_U, KC_BTN2, KC_MS_D, KC_NO, KC_TRNS, KC_NO,
+ KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO,
+ KC_NO, KC_NO,
+ KC_NO,
+ KC_NO, KC_NO, KC_NO,
+ // right hand
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO, KC_BTN1, KC_MS_U, KC_BTN2, KC_NO, KC_NO,
+ KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO,
+ KC_NO, KC_TRNS, KC_NO, KC_MS_D, KC_BTN1, KC_MS_U, KC_BTN2,
+ KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R,
+ KC_NO, KC_NO,
+ KC_NO,
+ KC_NO, KC_NO, KC_NO
+ ),
+/* Keymap 5: Keywords
+ *
+ * ,---------------------------------------------------. ,--------------------------------------------------.
+ * | | | | scarf| sadf | smily| | | | decaf| | | | | |
+ * |---------+------+------+------+------+------+------| |------+------+------+------+------+------+--------|
+ * | | const| volat| oper | ret | tmpl | | | | typen| cont | prv | pro | pub | |
+ * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | | str | obj | | gitl |------| |------| | | | nulp | | |
+ * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | | extr | cls | virt | break| | | |namesp| goodm| goodn| | | |
+ * `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | | | inc | | | | | | | | |
+ * `-----------------------------------' `----------------------------------'
+ * ,-------------. ,-------------.
+ * | | | | ecet | ecets|
+ * ,------|------|------| |------+------+------.
+ * | | | | | | | |
+ * | | |------| |------| | |
+ * | | | ## | | ## | | |
+ * `--------------------' `--------------------'
+ */
+[KEYW] = KEYMAP(
+ // left hand
+ KC_NO, KC_NO, KC_NO, UM_SCARF, UM_SADF, UM_SMILY, KC_NO,
+ KC_NO, UM_CONST, UM_VOLAT, UM_OPER, UM_RET, UM_TMPL, KC_NO,
+ KC_NO, KC_NO, UM_STR, UM_OBJ, KC_NO, UM_GITLOG,
+ KC_NO, KC_NO, UM_EXTR, UM_CLS, UM_VIRT, UM_BREAK, KC_NO,
+ KC_NO, KC_NO, UM_INC, KC_NO, KC_NO,
+ KC_NO, KC_NO,
+ KC_NO,
+ KC_NO, KC_NO, KC_TRNS,
+ // right hand
+ KC_NO, UM_DECAF, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, UM_TYPN, UM_CONT, UM_PRV, UM_PRO, UM_PUB, KC_NO,
+ KC_NO, KC_NO, KC_NO, UM_NULP, KC_NO, KC_NO,
+ KC_NO, UM_NAMESP, UM_GOODM, UM_GOODN, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ UM_ECET, UM_ECETS,
+ KC_NO,
+ KC_TRNS, KC_NO, KC_NO
+ ),
+/* Keymap 6: emacs
+ *
+ * ,---------------------------------------------------. ,--------------------------------------------------.
+ * | | | | | | | empb | | emnb | emfs | emfb | | | | |
+ * |---------+------+------+------+------+------+------| |------+------+------+------+------+------+--------|
+ * | | emtr | | | | | | | | emun | emre | w-up | | | |
+ * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | | emwr | | | |------| |------| |w-left|w-down|w-rght| | |
+ * |---------+------+------+------+------+------| ## | | ## |------+------+------+------+------+--------|
+ * | | | | | | | | | | | |w-down| | | |
+ * `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | | | | | | | | | | | |
+ * `-----------------------------------' `----------------------------------'
+ * ,-------------. ,-------------.
+ * | | | | | |
+ * ,------|------|------| |------+------+------.
+ * | | | | | | | |
+ * | | |------| |------| | |
+ * | | | | | | | |
+ * `--------------------' `--------------------'
+ */
+[EMAC] = KEYMAP(
+ // left hand
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, UM_EMPB,
+ KC_NO, UM_EMTR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO, UM_EMWR, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO,
+ KC_NO,
+ KC_NO, KC_NO, KC_NO,
+ // right hand
+ UM_EMNB, UM_EMFS, UM_EMFB, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, UM_EMUN, UM_EMRE, LSFT(KC_UP), KC_NO, KC_NO, KC_NO,
+ KC_NO, LSFT(KC_LEFT), LSFT(KC_DOWN), LSFT(KC_RGHT), KC_NO, KC_NO,
+ KC_TRNS, KC_NO, KC_NO, LSFT(KC_DOWN), KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO,
+ KC_NO,
+ KC_NO, KC_NO, KC_NO
+ ),
+};
+
+enum next_key_down_up {
+ NK_DOWN_UP,
+ NK_DOWN,
+ NK_UP // a bit of a hack, this works as long as NK_UP < KC_A
+};
+
+void send_keystrokes(uint8_t key, ...)
+{
+ va_list vl;
+ va_start(vl, key);
+ enum next_key_down_up nkdu = NK_DOWN_UP;
+ while (key != KC_NO) {
+ if (key < KC_A) {
+ nkdu = key;
+ } else {
+ switch (nkdu) {
+ case NK_DOWN_UP:
+ register_code(key);
+ case NK_UP:
+ unregister_code(key);
+ break;
+ case NK_DOWN:
+ register_code(key);
+ }
+ nkdu = NK_DOWN_UP;
+ }
+ key = va_arg(vl, int);
+ }
+ va_end(vl);
+}
+
+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) {
+ return MACRO(T(ENT), D(LSFT), T(LBRC), U(LSFT), T(ENT),
+ D(LSFT), T(RBRC), U(LSFT), T(UP),
+ T(TAB), END);
+ }
+ break;
+ case 1:
+ if (record->event.pressed) {
+ return MACRO(T(0), T(X), END);
+ }
+ break;
+ case 2:
+ if (record->event.pressed) {
+ SEND_STRING("public");
+ }
+ break;
+ case 3:
+ if (record->event.pressed) {
+ SEND_STRING("protected");
+ }
+ break;
+ case 4:
+ if (record->event.pressed) {
+ SEND_STRING("private");
+ }
+ break;
+ case 5: // class
+ if (record->event.pressed) {
+ return MACRO(T(C), T(L), T(A), T(S), T(S), T(ENT),
+ D(LSFT), T(LBRC), U(LSFT), T(ENT),
+ T(P), T(U), T(B), T(L), T(I), T(C),
+ D(LSFT), T(SCLN), U(LSFT), T(ENT), T(ENT),
+ T(P), T(R), T(I), T(V), T(A), T(T), T(E),
+ D(LSFT), T(SCLN), U(LSFT), T(ENT),
+ D(LSFT), T(RBRC), U(LSFT), T(SCLN), T(ENT),
+ T(UP), T(UP), T(UP), T(UP), T(UP), T(UP), T(UP),
+ T(END), T(SPC), END);
+ }
+ break;
+ case 6: // struct
+ if (record->event.pressed) {
+ return MACRO(T(S), T(T), T(R), T(U), T(C), T(T), T(ENT),
+ D(LSFT), T(LBRC), U(LSFT), T(ENT),
+ D(LSFT), T(RBRC), U(LSFT), T(SCLN), T(ENT),
+ T(UP), T(UP), T(UP), T(UP),
+ T(END), T(SPC), END);
+ }
+ break;
+ case 7:
+ if (record->event.pressed) {
+ SEND_STRING("return");
+ }
+ break;
+ case 8: // #include
+ if (record->event.pressed) {
+ return MACRO(T(NONUS_HASH), T(I), T(N), T(C), T(L), T(U), T(D), T(E), END);
+ }
+ break;
+ case 9:
+ if (record->event.pressed) {
+ SEND_STRING("objdump -CT -x -d");
+ }
+ break;
+ case 10:
+ if (record->event.pressed) {
+ SEND_STRING("git log --oneline --graph --decorate=short");
+ }
+ break;
+ case 11:
+ if (record->event.pressed) {
+ SEND_STRING("good morning");
+ }
+ break;
+ case 12:
+ if (record->event.pressed) {
+ SEND_STRING("namespace");
+ }
+ break;
+ case 14: // emacs toggle read-only
+ if (record->event.pressed) {
+ return MACRO(D(LCTL), T(X), T(Q), U(LCTL), END);
+ }
+ break;
+ case 15: // emacs write buffer
+ if (record->event.pressed) {
+ return MACRO(D(LCTL), T(X), T(S), U(LCTL), END);
+ }
+ break;
+ case 16: // emacs undo
+ if (record->event.pressed) {
+ return MACRO(D(LCTL), D(LSFT), T(MINS), U(LSFT), U(LCTL), END);
+ }
+ break;
+ case 17: // emacs redo
+ if (record->event.pressed) {
+ return MACRO(D(LALT), D(LSFT), T(MINS), U(LSFT), U(LALT), END);
+ }
+ break;
+ case 18: // emacs previous buffer
+ if (record->event.pressed) {
+ return MACRO(D(LCTL), T(X), U(LCTL), T(LEFT), END);
+ }
+ break;
+ case 19: // emacs next buffer
+ if (record->event.pressed) {
+ return MACRO(D(LCTL), T(X), U(LCTL), T(RGHT), END);
+ }
+ break;
+ case 20:
+ if (record->event.pressed) {
+ SEND_STRING("good night");
+ }
+ break;
+ case 22: // { };
+ if (record->event.pressed) {
+ return MACRO(T(ENT), D(LSFT), T(LBRC), U(LSFT), T(ENT),
+ D(LSFT), T(RBRC), U(LSFT), T(SCLN), T(UP),
+ T(TAB), END);
+ }
+ break;
+ case 23:
+ if (record->event.pressed) {
+ SEND_STRING("template");
+ }
+ break;
+ case 24:
+ if (record->event.pressed) {
+ SEND_STRING("typename");
+ }
+ break;
+ case 25:
+ if (record->event.pressed) {
+ SEND_STRING("continue");
+ return MACRO(T(SCLN), END);
+ }
+ break;
+ case 26:
+ if (record->event.pressed) {
+ SEND_STRING("break");
+ return MACRO(T(SCLN), END);
+ }
+ break;
+ case 27:
+ if (record->event.pressed) {
+ SEND_STRING("const");
+ }
+ break;
+ case 28:
+ if (record->event.pressed) {
+ SEND_STRING(":-)");
+ }
+ break;
+ case 29:
+ if (record->event.pressed) {
+ SEND_STRING(":-(");
+ }
+ break;
+ case 30: // dazed
+ if (record->event.pressed) {
+ send_keystrokes(NK_DOWN, KC_LSFT, KC_8, KC_MINS, KC_8, NK_UP, KC_LSFT, KC_NO);
+ }
+ break;
+ case 31: // decaf
+ if (record->event.pressed) {
+ send_keystrokes(NK_DOWN, KC_LSFT, KC_C, KC_9, KC_MINS, KC_0, NK_UP, KC_LSFT, KC_NO);
+ }
+ break;
+ case 32:
+ if (record->event.pressed) {
+ SEND_STRING("operator");
+ }
+ break;
+ case 33:
+ if (record->event.pressed) {
+ SEND_STRING("nullptr");
+ }
+ break;
+ case 34:
+ if (record->event.pressed) {
+ SEND_STRING("extern");
+ }
+ break;
+ case 35:
+ if (record->event.pressed) {
+ SEND_STRING("virtual");
+ }
+ break;
+ case 36: // emacs font smaller
+ if (record->event.pressed) {
+ return MACRO(D(LCTL), T(X), T(EQL), U(LCTL), END);
+ }
+ break;
+ case 37: // emacs font bigger
+ if (record->event.pressed) {
+ return MACRO(D(LCTL), T(X), T(MINS), U(LCTL), END);
+ }
+ break;
+ case 38:
+ if (record->event.pressed) {
+ SEND_STRING("volatile");
+ }
+ break;
+ }
+ return MACRO_NONE;
+}
+
+LEADER_EXTERNS();
+
+// Runs constantly in the background, in a loop.
+void matrix_scan_user(void) {
+
+ LEADER_DICTIONARY() {
+ leading = false;
+ leader_end();
+
+ SEQ_TWO_KEYS(KC_G, KC_A) {
+ SEND_STRING("git add .");
+ }
+ SEQ_TWO_KEYS(KC_G, KC_D) {
+ SEND_STRING("git diff");
+ }
+ SEQ_THREE_KEYS(KC_G, KC_D, KC_S) {
+ SEND_STRING("git diff --staged");
+ }
+ SEQ_TWO_KEYS(KC_G, KC_L) {
+ SEND_STRING("git log");
+ }
+ SEQ_THREE_KEYS(KC_G, KC_L, KC_O) {
+ SEND_STRING("git log --oneline");
+ }
+ SEQ_TWO_KEYS(KC_G, KC_F) {
+ SEND_STRING("git fetch");
+ }
+ SEQ_TWO_KEYS(KC_G, KC_O) {
+ SEND_STRING("git checkout");
+ }
+ SEQ_TWO_KEYS(KC_G, KC_P) {
+ SEND_STRING("git pull");
+ }
+ SEQ_TWO_KEYS(KC_G, KC_S) {
+ SEND_STRING("git status");
+ }
+ SEQ_TWO_KEYS(KC_G, KC_C) {
+ SEND_STRING("git commit -m ''");
+ send_keystrokes(KC_LEFT, KC_NO);
+ }
+ SEQ_THREE_KEYS(KC_G, KC_C, KC_A) {
+ SEND_STRING("git commit --amend");
+ }
+
+ SEQ_TWO_KEYS(KC_C, KC_C) {
+ SEND_STRING("const_cast<>");
+ send_keystrokes(KC_LEFT, KC_NO);
+ }
+ SEQ_TWO_KEYS(KC_C, KC_D) {
+ SEND_STRING("dynamic_cast<>");
+ send_keystrokes(KC_LEFT, KC_NO);
+ }
+ SEQ_TWO_KEYS(KC_C, KC_R) {
+ SEND_STRING("reinterpret_cast<>");
+ send_keystrokes(KC_LEFT, KC_NO);
+ }
+ SEQ_TWO_KEYS(KC_C, KC_S) {
+ SEND_STRING("static_cast<>");
+ send_keystrokes(KC_LEFT, KC_NO);
+ }
+
+ SEQ_ONE_KEY(KC_SLSH) {
+ send_keystrokes(KC_SLSH, NK_DOWN, KC_LSFT, KC_8, KC_8, NK_UP, KC_LSFT, KC_ENT,
+ NK_DOWN, KC_LSFT, KC_8, NK_UP, KC_LSFT, KC_ENT,
+ NK_DOWN, KC_LSFT, KC_8, NK_UP, KC_LSFT, KC_SLSH, KC_UP, KC_END, KC_SPC,
+ KC_NO);
+ }
+ }
+}
diff --git a/keyboards/ergodox/keymaps/albert/readme.md b/keyboards/ergodox/keymaps/albert/readme.md
new file mode 100644
index 000000000..e20e047ac
--- /dev/null
+++ b/keyboards/ergodox/keymaps/albert/readme.md
@@ -0,0 +1,188 @@
+# ErgoDox EZ Configuration for typing like a boss.
+
+This layout has 7 layers:
+0. Base layers
+1. Symbols and F-keys
+2. Number pad (with hexadecimal)
+3. Cursor keys
+4. Mouse movement and clicks
+5. Keyword macros
+6. Emacs
+
+There are also some leader keys defined for frequently used commands (git etc).
+
+## The layers
+
+Double hashes (`##`) indicate transparent keys (`KC_TRNS`) and blanks indicate no key (`KC_NO`).
+
+### 0. Base layer
+
+```
+,--------------------------------------------------. ,--------------------------------------------------.
+| ESC | 1 | 2 | 3 | 4 | 5 | SfLt | | SfRt | 6 | 7 | 8 | 9 | 0 | BkSp |
+|--------|------|------|------|------|-------------| |------|------|------|------|------|------|--------|
+| Tab | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | Del |
+|--------|------|------|------|------|------| | | |------|------|------|------|------|--------|
+| Caps/L2| A | S | D | F | G |------| |------| H | J | K | L | ; |Enter/L2|
+|--------|------|------|------|------|------| L6 | | L6 |------|------|------|------|------|--------|
+| LSft/( | Z | X | C | V/L3 | B/L4 | | | | N/L4 | M/L3 | , | . | / | RSft/) |
+`--------|------|------|------|------|-------------' `-------------|------|------|------|------|--------'
+ |Ctrl/[| Alt/]| # | Left |Right | | Up | Down | - | Alt/[|Ctrl/]|
+ `----------------------------------' `----------------------------------'
+ ,-------------. ,-------------.
+ | L2 | lead | | lead | Ins |
+ ,------|------|------| |------|------|------.
+ | Space| BkSp | Home | | PgUp | Enter|Space |
+ | / | / |------| |------| / | / |
+ | Ctrl | Alt |End/L5| |PDn/L5| Alt | Ctrl |
+ `--------------------' `--------------------'
+```
+
+Space Cadet shift is enabled. Ctrl and Alt doubles up as normal keys when tapped.
+SfLt and SfRt sends Shift + left and Shift + Right respectively - for use with emacs with `windmove-default-keybindings`.
+Caps and Enter may be held down to activate layer 2 (hexadecimal number pad).
+Please see `matrix_scan_user` function in `keymap.c` for list of commands available via `lead` key.
+
+### 1. Symbols and F-keys
+
+```
+,--------------------------------------------------. ,--------------------------------------------------.
+| ## | F1 | F2 | F3 | F4 | F5 | ## | | ## | F6 | F7 | F8 | F9 | F10 | F11 |
+|--------|------|------|------|------|------|------| |------|------|------|------|------|------|--------|
+| ## | ! | " | £ | $ | % | ## | | ## | - | + | = | @ | ~ | F12 |
+|--------|------|------|------|------|------| | | |------|------|------|------|------|--------|
+| ## | ^ | & | * | _ | # |------| |------| { | } | ; | ' | # | ## |
+|--------|------|------|------|------|------| ## | | ## |------|------|------|------|------|--------|
+| ## | \ | | | ` | - | / | | | | [ | ] | < | > | ? | ## |
+`--------|------|------|------|------|-------------' `-------------|------|------|------|------|--------'
+ | ## | ## | ## | ## | ## | | ## | ## | ## | ## | ## |
+ `----------------------------------' `----------------------------------'
+ ,-------------. ,-------------.
+ | ## | ## | | ## | ## |
+ ,------|------|------| |------|------|------.
+ | | | ## | | ## | | |
+ | ## | ## |------| |------| ## | ## |
+ | | | ## | | ## | | |
+ `--------------------' `--------------------'
+```
+
+### 2. Number pad (with hexadecimal)
+
+```
+,---------------------------------------------------. ,--------------------------------------------------.
+| ## | A | B | C | D | E | F | | A | B | C | D | E | F | ## |
+|---------|------|------|------|------|------|------| |------|------|------|------|------|------|--------|
+| ## | * | 7 | 8 | 9 | * | 0x | | 0x | * | 7 | 8 | 9 | * | ## |
+|---------|------|------|------|------|------| | | |------|------|------|------|------|--------|
+| ## | / | 4 | 5 | 6 | / |------| |------| / | 4 | 5 | 6 | / | ## |
+|---------|------|------|------|------|------| ## | | ## |------|------|------|------|------|--------|
+| ## | - | 1 | 2 | 3 | - | | | | - | 1 | 2 | 3 | - | ## |
+`---------|------|------|------|------|-------------' `-------------|------|------|------|------|--------'
+ | = | + | 0 | , | . | | 0 | , | . | + | = |
+ `-----------------------------------' `----------------------------------'
+ ,-------------. ,-------------.
+ | ## | ## | | ## | ## |
+ ,------|------|------| |------|------|------.
+ | | | ## | | ## | | |
+ | ## | ## |------| |------| ## | ## |
+ | | | ## | | ## | | |
+ `--------------------' `--------------------'
+```
+
+### 3. Cursor keys
+
+```
+,---------------------------------------------------. ,--------------------------------------------------.
+| | | | | | | | | | | | | | | |
+|---------|------|------|------|------|------|------| |------|------|------|------|------|------|--------|
+| | Home | | Up | | PgUp | | | | PgUp | | Up | | Home | |
+|---------|------|------|------|------|------| | | |------|------|------|------|------|--------|
+| | End | Left | Down | Right| PgDn |------| |------| PgDn | Left | Down | Right| End | |
+|---------|------|------|------|------|------| | | |------|------|------|------|------|--------|
+| ## | Up | | Down | ## | | | | | | ## | Down | | Up | ## |
+`---------|------|------|------|------|-------------' `-------------|------|------|------|------|--------'
+ | Left | Down | Right| | | | | | Left | Down | Right|
+ `-----------------------------------' `----------------------------------'
+ ,-------------. ,-------------.
+ | | | | | |
+ ,------|------|------| |------|------|------.
+ | | | | | | | |
+ | ## | ## |------| |------| ## | ## |
+ | | | | | | | |
+ `--------------------' `--------------------'
+```
+
+### 4. Mouse movement and clicks
+
+```
+,--------------------------------------------------. ,--------------------------------------------------.
+| | | | | | | | | | | | | | | |
+|--------|------|------|------|------|-------------| |------|------|------|------|------|------|--------|
+| | | Lclk | MsUp | Rclk | | | | | | Lclk | MsUp | Rclk | | |
+|--------|------|------|------|------|------| | | |------|------|------|------|------|--------|
+| | |MsLeft|MsDown|MsRght| |------| |------| |MsLeft|MsDown|MsRght| | |
+|--------|------|------|------|------|------| | | |------|------|------|------|------|--------|
+| Lclk | MsUp | Rclk |MsDown| | ## | | | | ## | |MsDown| Lclk | MsUp | Rclk |
+`--------|------|------|------|------|-------------' `-------------|------|------|------|------|--------'
+ |MsLeft|MsDown|MsRight | | | | |MsLeft|MsDown|MsRght|
+ `----------------------------------' `----------------------------------'
+ ,-------------. ,-------------.
+ | | | | | |
+ ,------|------|------| |------|------|------.
+ | | | | | | | |
+ | | |------| |------| | |
+ | | | | | | | |
+ `--------------------' `--------------------'
+```
+
+### 5. Keyword macros
+
+```
+,---------------------------------------------------. ,--------------------------------------------------.
+| | | | scarf| sadf | smily| | | | decaf| | | | | |
+|---------|------|------|------|------|------|------| |------|------|------|------|------|------|--------|
+| | const| volat| oper | ret | tmpl | | | | typen| cont | prv | pro | pub | |
+|---------|------|------|------|------|------| | | |------|------|------|------|------|--------|
+| | | str | obj | | gitl |------| |------| | | | nulp | | |
+|---------|------|------|------|------|------| | | |------|------|------|------|------|--------|
+| | | extr | cls | virt | break| | | |namesp| goodm| goodn| | | |
+`---------|------|------|------|------|-------------' `-------------|------|------|------|------|--------'
+ | | | inc | | | | | | | | |
+ `-----------------------------------' `----------------------------------'
+ ,-------------. ,-------------.
+ | | | | ecet | ecets|
+ ,------|------|------| |------|------|------.
+ | | | | | | | |
+ | | |------| |------| | |
+ | | | ## | | ## | | |
+ `--------------------' `--------------------'
+```
+Please see `keymap.c` for the keywords/commands.
+Some are const, volatile, operator, return, template, typename, continue, private,
+protected, public, struct, class, extern, virtual, break, namespace.
+Also a git log command I use a lot (`git log --oneline --graph --decorate=short` (I know git can be configured but that is boring)).
+
+### 6. Emacs
+
+```
+,---------------------------------------------------. ,--------------------------------------------------.
+| | | | | | | empb | | emnb | emfs | emfb | | | | |
+|---------|------|------|------|------|------|------| |------|------|------|------|------|------|--------|
+| | emtr | | | | | | | | emun | emre | w-up | | | |
+|---------|------|------|------|------|------| | | |------|------|------|------|------|--------|
+| | | emwr | | | |------| |------| |w-left|w-down|w-rght| | |
+|---------|------|------|------|------|------| ## | | ## |------|------|------|------|------|--------|
+| | | | | | | | | | | |w-down| | | |
+`---------|------|------|------|------|-------------' `-------------|------|------|------|------|--------'
+ | | | | | | | | | | | |
+ `-----------------------------------' `----------------------------------'
+ ,-------------. ,-------------.
+ | | | | | |
+ ,------|------|------| |------|------|------.
+ | | | | | | | |
+ | | |------| |------| | |
+ | | | | | | | |
+ `--------------------' `--------------------'
+```
+Some emacs shortcuts like toggle read/write mode (emtr), write file (emwr), previous-buffer (empb),
+next-buffer (emnb), smaller font(emfs), larger font (emfb), undo (emun), redo (emre) and switching between windows in a frame.
diff --git a/keyboards/ergodox/keymaps/algernon/readme.md b/keyboards/ergodox/keymaps/algernon/readme.md
index 015bd7cd3..3783eadf1 100644
--- a/keyboards/ergodox/keymaps/algernon/readme.md
+++ b/keyboards/ergodox/keymaps/algernon/readme.md
@@ -121,10 +121,10 @@ There is a very small tool in `tools/layer-notify`, that listens to the HID cons
To make my workflow easier, this layout is maintained in [its own repository][algernon:ez-layout]. To build it, you will need the [QMK][qmk] firmware checked out, and this repo either checked out to something like `keyboards/ergodox_ez/algernon-master`. One way to achieve that is this:
[algernon:ez-layout]: https://github.com/algernon/ergodox-layout
- [qmk]: https://github.com/jackhumbert/qmk_firmware
+ [qmk]: https://github.com/qmk/qmk_firmware
```
-$ git clone https://github.com/jackhumbert/qmk_firmware.git
+$ git clone https://github.com/qmk/qmk_firmware.git
$ cd qmk_firmware
$ git clone https://github.com/algernon/ergodox-layout.git \
keyboards/ergodox/keymaps/algernon-master
diff --git a/keyboards/ergodox/keymaps/deadcyclo/Makefile b/keyboards/ergodox/keymaps/deadcyclo/Makefile
new file mode 100644
index 000000000..039f07c8e
--- /dev/null
+++ b/keyboards/ergodox/keymaps/deadcyclo/Makefile
@@ -0,0 +1 @@
+UNICODE_ENABLE = yes
diff --git a/keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-base-layout.png b/keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-base-layout.png
index 4208c5189..2c03af581 100644
--- a/keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-base-layout.png
+++ b/keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-base-layout.png
Binary files differ
diff --git a/keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-layer-1-symbols.png b/keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-layer-1-symbols.png
index ccda70e39..5adb7ac77 100644
--- a/keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-layer-1-symbols.png
+++ b/keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-layer-1-symbols.png
Binary files differ
diff --git a/keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-layer-2-media-and-mouse.png b/keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-layer-2-media-and-mouse.png
index 481e63e32..a267ff23d 100644
--- a/keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-layer-2-media-and-mouse.png
+++ b/keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-layer-2-media-and-mouse.png
Binary files differ
diff --git a/keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-layer-3-navigation.png b/keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-layer-3-navigation.png
index 9ebba6734..c8c90cf5c 100644
--- a/keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-layer-3-navigation.png
+++ b/keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-layer-3-navigation.png
Binary files differ
diff --git a/keyboards/ergodox/keymaps/deadcyclo/keymap.c b/keyboards/ergodox/keymaps/deadcyclo/keymap.c
index d75c805bf..5774511cc 100644
--- a/keyboards/ergodox/keymaps/deadcyclo/keymap.c
+++ b/keyboards/ergodox/keymaps/deadcyclo/keymap.c
@@ -8,15 +8,86 @@
#define MDIA 2 // media keys
#define NAVG 3 // navigation
-enum custom_keycodes {
- PLACEHOLDER = SAFE_RANGE, // can always be here
+enum macros {
+ RUN
+};
+
+enum function_ids {
+ EMOJI,
+ EMOJI2,
EPRM,
VRSN,
- RGB_SLD
+ RGB_SLD,
+ GO_GROUP
};
-// TODO: Get rid of of keys I don't want. Make others that I do. Set up lots of makros (Using hyper (and meh)) keys (where to put them?)
+/* opt can only be 0-15 */
+enum emojis {
+ SHRUG,
+ YAY,
+ HUG,
+ SMILE,
+ SMILE2,
+ HMM1,
+ HMM2,
+ BEAR1,
+ BEAR2,
+ FUU,
+ EGGY1,
+ EGGY2,
+ FACE1,
+ FACE2,
+ UHU,
+ SMRK1
+};
+
+enum emojis2 {
+ SMRK2,
+ LOVE
+};
+
+enum progmem_ids {
+ EMOJI_SHRUG,
+ EMOJI_YAY,
+ EMOJI_HUG,
+ EMOJI_SMILE,
+ EMOJI_SMILE2,
+ EMOJI_HMM1,
+ EMOJI_HMM2,
+ EMOJI_BEAR1,
+ EMOJI_BEAR2,
+ EMOJI_FUU,
+ EMOJI_EGGY1,
+ EMOJI_EGGY2,
+ EMOJI_FACE1,
+ EMOJI_FACE2,
+ EMOJI_UHU,
+ EMOJI_SMRK1,
+ EMOJI_SMRK2,
+ EMOJI_LOVE,
+ F_EPRM,
+ F_VRSN,
+ F_RGB_SLD,
+ I3_GO_GROUP_10,
+ I3_GO_GROUP_1,
+ I3_GO_GROUP_2,
+ I3_GO_GROUP_3,
+ I3_GO_GROUP_4,
+ I3_GO_GROUP_5,
+ I3_GO_GROUP_6,
+ I3_GO_GROUP_7,
+ I3_GO_GROUP_8,
+ I3_GO_GROUP_9,
+};
+
+// TODO: Finish the macros for i3 (Macros should potentially be own function instead to make things easier? some of them at least, f. ex. the ones that use 1-0 keys so we can have a single switch)
+
+// TODO: Do stuff with hyper and meh keys
+// TODO: Add macros for lots of stuff. (Lastpass cli, pushbullet cli, other push service cli, linode cli, more?)
+// TODO: Make macros for gnu screen and i3wm
// TODO: Need to change hotkeys for lastpass, and potentially make my own keys for them on one of my layers
+// TODO: Look into using tap dance
+// TODO: Use leader key for stuff. See https://github.com/qmk/qmk_firmware/wiki
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap 0: Basic layer
*
@@ -29,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------|
* | LShift |Z/Ctrl| X | C | V | B | | | | N | M | , | . |//Ctrl| RShift |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * |Grv/L1| '" |AltShf| Lalt | Ralt | | Lalt | Ralt | [ | ] | ~/L1 |
+ * |Grv/L1| UNI |AltShf| Lalt | Ralt | | Lalt | Ralt | LEAD | UNI | ~/L1 |
* `----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
* | App | Home | | PgUp | Ins |
@@ -43,11 +114,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Otherwise, it needs KC_*
[BASE] = KEYMAP( // layer 0 : default
// left hand
- LT(NAVG,KC_ESC), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6,
+ LT(NAVG,KC_ESC), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6,
LT(SYMB,KC_TAB), KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB),
- KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G,
+ KC_LCTL, LT(MDIA, KC_A), KC_S, KC_D, KC_F, KC_G,
KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO),
- LT(SYMB,KC_GRV),KC_QUOT, LALT(KC_LSFT), KC_RALT,KC_LALT,
+ LT(SYMB,KC_GRV),LCTL(LSFT(KC_U)), LALT(KC_LSFT), KC_RALT,KC_LALT,
ALT_T(KC_APP), KC_HOME,
KC_END,
KC_SPC,KC_TAB,KC_LBRC,
@@ -56,12 +127,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, LT(SYMB, KC_BSLS),
KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN),CTL_T(KC_QUOT),
MEH_T(KC_NO),KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), KC_RSFT,
- KC_LALT, KC_RALT,KC_LBRC,KC_RBRC, LT(SYMB,KC_TILD),
+ KC_LALT, KC_RALT,KC_LEAD,LCTL(LSFT(KC_U)), LT(SYMB,KC_TILD),
KC_PGUP, KC_INS,
KC_PGDN,
KC_RBRC,KC_BSPC, KC_ENT
),
-/* Keymap 1: Symbol Layer
+/* Keymap 1: Symbol Layer LCTL(LSFT(KC_U))
*
* ,--------------------------------------------------. ,--------------------------------------------------.
* | | F1 | F2 | F3 | F4 | F5 | F6 | | F6 | F7 | F8 | F9 | F10 | F11 | F12 |
@@ -75,11 +146,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | . | 0 | = | |
* `----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
- * | | | | | |
+ * |Toggle|Animat| | Hue+ | Hue- |
* ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| DEL | |
- * | | | | | | | |
+ * |Bright|Bright|Solid | | | | |
+ * |ness- |ness+ |------| |------| DEL | |
+ * | | | | | EPRM | | |
* `--------------------' `--------------------'
*/
// SYMBOLS
@@ -90,27 +161,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,
- KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,
+ RGB_TOG,RGB_MOD,
+ F(F_RGB_SLD),
+ RGB_VAD,RGB_VAI,KC_TRNS,
// right hand
KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_TRNS,
KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS,
KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS,
KC_TRNS,KC_DOT, KC_0, KC_EQL, KC_TRNS,
- KC_TRNS, KC_TRNS,
+ RGB_HUD, RGB_HUI,
KC_TRNS,
- KC_TRNS, KC_DEL, KC_TRNS
+ F(F_EPRM), KC_DEL, KC_TRNS
),
-/* Keymap 2: Media and mouse keys
+/* Keymap 2: Media, mouse and navigation
*
* ,--------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | | | | | | | | | | |
+ * | | gg(1)| | | | | | | | | | | | | |
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | MsUp | | | | | | | | | | | |
+ * | | | | MsUp | RUN | | | | | | | Up | | | |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | Play |
+ * | | |MsLeft|MsDown|MsRght| |------| |------| | Left | Down | Right| | Play |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | | | | | | | | | | | | Prev | Next | | |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
@@ -124,10 +195,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | |
* `--------------------' `--------------------'
*/
-// MEDIA AND MOUSE
+// MEDIA , MOUSE and NAVIGATION
[MDIA] = KEYMAP(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, F(I3_GO_GROUP_1), F(I3_GO_GROUP_2), F(I3_GO_GROUP_3), F(I3_GO_GROUP_4), F(I3_GO_GROUP_5), F(I3_GO_GROUP_6),
+KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, M(RUN), KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
@@ -135,116 +206,280 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
// right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
- KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
+ F(I3_GO_GROUP_6), F(I3_GO_GROUP_7), F(I3_GO_GROUP_8), F(I3_GO_GROUP_9), F(I3_GO_GROUP_10), KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_MPLY,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
+ KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS,
KC_TRNS,
KC_TRNS, KC_TRNS, KC_WBAK
),
-/* Keymap 3: Navigation TODO: Printscreen, pg up down, home, end, others? Insert for example
+/* Keymap 3: Unicode
*
* ,--------------------------------------------------. ,--------------------------------------------------.
- * | | VER | | | | | | | | | | | | | |
+ * | | ┌ | ┐ | └ | ┘ | │ | ─ | | ╔ | ╗ | ╚ | ╝ | ║ | ═ | |
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | up | | | | | | | | | | | |
+ * | | shrug| yay | hug | smile|smile2| | | | ■ | λ | → | ➙ | ▻ | █ |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | left | down | right| |------| |------| | | | | | |
+ * | | hmm1 | hmm2 | bear1| bear2| fuu |------| |------| ☺ | ☻ | ☹ | ♡ | ♥ | ░ |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | | | | | | | | | | |
+ * | | eggy1| eggy2| face1| face2| uhu | | | | ❤ | ☐ | ☑ | ☒ | ✓ | ▄ |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | | | | |
+ * | | smrk1| smrk2| love | VER | | ✔ | ✗ | ✘ | ● | ▀ |
* `----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
- * | | | | | |
+ * | | | | ▒ | ▓ |
* ,------|------|------| |------+------+------.
- * | | | | | | | |
+ * | | | | | | | |
* | | |------| |------| | |
* | | | | | | | |
* `--------------------' `--------------------'
*/
-// NAVIGATION
+// Unicode
[NAVG] = KEYMAP(
- KC_TRNS, VRSN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
+ KC_TRNS, UC(0x250c), UC(0x2510), UC(0x2514), UC(0x2518), UC(0x2502), UC(0x2500),
+ KC_TRNS, F(EMOJI_SHRUG), F(EMOJI_YAY), F(EMOJI_HUG), F(EMOJI_SMILE), F(EMOJI_SMILE2), KC_TRNS,
+ KC_TRNS, F(EMOJI_HMM1), F(EMOJI_HMM2), F(EMOJI_BEAR1), F(EMOJI_BEAR2), F(EMOJI_FUU),
+ KC_TRNS, F(EMOJI_EGGY1), F(EMOJI_EGGY2), F(EMOJI_FACE1), F(EMOJI_FACE2), F(EMOJI_UHU), KC_TRNS,
+ KC_TRNS, F(EMOJI_SMRK1), F(EMOJI_SMRK2), F(EMOJI_LOVE), F(F_VRSN),
+ KC_TRNS, KC_TRNS,
KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
// right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
+ UC(0x2554), UC(0x2557), UC(0x255a), UC(0x255d), UC(0x2551), UC(0x2550), KC_TRNS,
+ KC_TRNS, UC(0x25a0), UC(0x03bb), UC(0x2192), UC(0x2799), UC(0x25bb), UC(0x2588),
+ UC(0x263a), UC(0x263b), UC(0x2639), UC(0x2661), UC(0x2665), UC(0x2591),
+ KC_TRNS, UC(0x2764), UC(0x2610), UC(0x2611), UC(0x2612), UC(0x2713), UC(0x2584),
+ UC(0x2714), UC(0x2717), UC(0x2718), UC(0x25cf), UC(0x2580),
+ UC(0x2592), UC(0x2593),
+ KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS
),
};
const uint16_t PROGMEM fn_actions[] = {
- [1] = ACTION_LAYER_TAP_TOGGLE(SYMB) // FN1 - Momentary Layer 1 (Symbols)
+ [EMOJI_SHRUG] = ACTION_FUNCTION_OPT(EMOJI, SHRUG),
+ [EMOJI_YAY] = ACTION_FUNCTION_OPT(EMOJI, YAY),
+ [EMOJI_HUG] = ACTION_FUNCTION_OPT(EMOJI,HUG),
+ [EMOJI_SMILE] = ACTION_FUNCTION_OPT(EMOJI,SMILE),
+ [EMOJI_SMILE2] = ACTION_FUNCTION_OPT(EMOJI,SMILE2),
+ [EMOJI_HMM1] = ACTION_FUNCTION_OPT(EMOJI,HMM1),
+ [EMOJI_HMM2] = ACTION_FUNCTION_OPT(EMOJI,HMM2),
+ [EMOJI_BEAR1] = ACTION_FUNCTION_OPT(EMOJI,BEAR1),
+ [EMOJI_BEAR2] = ACTION_FUNCTION_OPT(EMOJI,BEAR2),
+ [EMOJI_FUU] = ACTION_FUNCTION_OPT(EMOJI,FUU),
+ [EMOJI_EGGY1] = ACTION_FUNCTION_OPT(EMOJI,EGGY1),
+ [EMOJI_EGGY2] = ACTION_FUNCTION_OPT(EMOJI,EGGY2),
+ [EMOJI_FACE1] = ACTION_FUNCTION_OPT(EMOJI,FACE1),
+ [EMOJI_FACE2] = ACTION_FUNCTION_OPT(EMOJI,FACE2),
+ [EMOJI_UHU] = ACTION_FUNCTION_OPT(EMOJI,UHU),
+ [EMOJI_SMRK1] = ACTION_FUNCTION_OPT(EMOJI,SMRK1),
+ [EMOJI_SMRK2] = ACTION_FUNCTION_OPT(EMOJI2,SMRK2),
+ [EMOJI_LOVE] = ACTION_FUNCTION_OPT(EMOJI2,LOVE),
+ [F_EPRM] = ACTION_FUNCTION(EPRM),
+ [F_VRSN] = ACTION_FUNCTION(VRSN),
+ [F_RGB_SLD] = ACTION_FUNCTION(RGB_SLD),
+ [I3_GO_GROUP_10]= ACTION_FUNCTION_OPT(GO_GROUP,0),
+ [I3_GO_GROUP_1] = ACTION_FUNCTION_OPT(GO_GROUP,1),
+ [I3_GO_GROUP_2] = ACTION_FUNCTION_OPT(GO_GROUP,2),
+ [I3_GO_GROUP_3] = ACTION_FUNCTION_OPT(GO_GROUP,3),
+ [I3_GO_GROUP_4] = ACTION_FUNCTION_OPT(GO_GROUP,4),
+ [I3_GO_GROUP_5] = ACTION_FUNCTION_OPT(GO_GROUP,5),
+ [I3_GO_GROUP_6] = ACTION_FUNCTION_OPT(GO_GROUP,6),
+ [I3_GO_GROUP_7] = ACTION_FUNCTION_OPT(GO_GROUP,7),
+ [I3_GO_GROUP_8] = ACTION_FUNCTION_OPT(GO_GROUP,8),
+ [I3_GO_GROUP_9] = ACTION_FUNCTION_OPT(GO_GROUP,9),
};
-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;
- case 1:
- if (record->event.pressed) { // For resetting EEPROM
- eeconfig_init();
- }
- break;
- }
- return MACRO_NONE;
-};
+#define TAP_ONCE(code) \
+ register_code (code); \
+ unregister_code (code)
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- // dynamically generate these.
+void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
+ if (record->event.pressed) {
+ switch(id) {
case EPRM:
- if (record->event.pressed) {
- eeconfig_init();
- }
- return false;
+ eeconfig_init();
break;
case VRSN:
- if (record->event.pressed) {
- SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
- }
- return false;
+ SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
break;
case RGB_SLD:
- if (record->event.pressed) {
- #ifdef RGBLIGHT_ENABLE
- rgblight_mode(1);
- #endif
+#ifdef RGBLIGHT_ENABLE
+ rgblight_mode(1);
+#endif
+ break;
+ case GO_GROUP:
+ register_code(KC_LCTL); TAP_ONCE(KC_I); unregister_code(KC_LCTL);
+ TAP_ONCE(KC_G);
+ if (opt == 0) {
+ TAP_ONCE(39);
+ } else {
+ TAP_ONCE(29+opt);
+ }
+ break;
+ case EMOJI:
+ switch(opt) {
+ case SHRUG:
+ unicode_input_start(); register_hex(0xaf); unicode_input_finish();
+ TAP_ONCE (KC_BSLS);
+ register_code (KC_RSFT); TAP_ONCE (KC_MINS); TAP_ONCE (KC_9); unregister_code (KC_RSFT);
+ unicode_input_start (); register_hex(0x30c4); unicode_input_finish();
+ register_code (KC_RSFT); TAP_ONCE (KC_0); TAP_ONCE (KC_MINS); unregister_code (KC_RSFT);
+ TAP_ONCE (KC_SLSH);
+ unicode_input_start (); register_hex(0xaf); unicode_input_finish();
+ break;
+ case YAY:
+ SEND_STRING ("\\o/");
+ break;
+ case HUG:
+ unicode_input_start(); register_hex(0x0f3c); unicode_input_finish();
+ TAP_ONCE (KC_SPC);
+ unicode_input_start(); register_hex(0x3064); unicode_input_finish();
+ TAP_ONCE (KC_SPC);
+ unicode_input_start(); register_hex(0x25d5); unicode_input_finish();
+ unicode_input_start(); register_hex(0x005f); unicode_input_finish();
+ unicode_input_start(); register_hex(0x25d5); unicode_input_finish();
+ TAP_ONCE (KC_SPC);
+ unicode_input_start(); register_hex(0x0f3d); unicode_input_finish();
+ unicode_input_start(); register_hex(0x3064); unicode_input_finish();
+ break;
+ case SMILE:
+ unicode_input_start(); register_hex(0x0298); unicode_input_finish();
+ unicode_input_start(); register_hex(0x203f); unicode_input_finish();
+ unicode_input_start(); register_hex(0x0298); unicode_input_finish();
+ break;
+ case SMILE2:
+ unicode_input_start(); register_hex(0x0028); unicode_input_finish();
+ unicode_input_start(); register_hex(0x0298); unicode_input_finish();
+ unicode_input_start(); register_hex(0x203f); unicode_input_finish();
+ unicode_input_start(); register_hex(0x0298); unicode_input_finish();
+ unicode_input_start(); register_hex(0x0029); unicode_input_finish();
+ break;
+ case HMM1:
+ unicode_input_start(); register_hex(0x0ca0); unicode_input_finish();
+ unicode_input_start(); register_hex(0x005f); unicode_input_finish();
+ unicode_input_start(); register_hex(0x0ca0); unicode_input_finish();
+ break;
+ case HMM2:
+ unicode_input_start(); register_hex(0x0028); unicode_input_finish();
+ unicode_input_start(); register_hex(0x0ca0); unicode_input_finish();
+ unicode_input_start(); register_hex(0x005f); unicode_input_finish();
+ unicode_input_start(); register_hex(0x0ca0); unicode_input_finish();
+ unicode_input_start(); register_hex(0x0029); unicode_input_finish();
+ break;
+ case BEAR1:
+ unicode_input_start(); register_hex(0x0295); unicode_input_finish();
+ unicode_input_start(); register_hex(0x2022); unicode_input_finish();
+ unicode_input_start(); register_hex(0x1d25); unicode_input_finish();
+ unicode_input_start(); register_hex(0x2022); unicode_input_finish();
+ unicode_input_start(); register_hex(0x0294); unicode_input_finish();
+ break;
+ case BEAR2:
+ unicode_input_start(); register_hex(0x0028); unicode_input_finish();
+ unicode_input_start(); register_hex(0x1d54); unicode_input_finish();
+ unicode_input_start(); register_hex(0x1d25); unicode_input_finish();
+ unicode_input_start(); register_hex(0x1d54); unicode_input_finish();
+ unicode_input_start(); register_hex(0x0029); unicode_input_finish();
+ break;
+ case FUU:
+ unicode_input_start(); register_hex(0x256d); unicode_input_finish();
+ unicode_input_start(); register_hex(0x2229); unicode_input_finish();
+ unicode_input_start(); register_hex(0x256e); unicode_input_finish();
+ unicode_input_start(); register_hex(0x0028); unicode_input_finish();
+ unicode_input_start(); register_hex(0x002d); unicode_input_finish();
+ unicode_input_start(); register_hex(0x005f); unicode_input_finish();
+ unicode_input_start(); register_hex(0x002d); unicode_input_finish();
+ unicode_input_start(); register_hex(0x0029); unicode_input_finish();
+ unicode_input_start(); register_hex(0x256d); unicode_input_finish();
+ unicode_input_start(); register_hex(0x2229); unicode_input_finish();
+ unicode_input_start(); register_hex(0x256e); unicode_input_finish();
+ break;
+ case EGGY1:
+ unicode_input_start(); register_hex(0x0028); unicode_input_finish();
+ unicode_input_start(); register_hex(0x256f); unicode_input_finish();
+ unicode_input_start(); register_hex(0x00b0); unicode_input_finish();
+ unicode_input_start(); register_hex(0x25a1); unicode_input_finish();
+ unicode_input_start(); register_hex(0x00b0); unicode_input_finish();
+ unicode_input_start(); register_hex(0xff09); unicode_input_finish();
+ unicode_input_start(); register_hex(0x256f); unicode_input_finish();
+ break;
+ case EGGY2:
+ unicode_input_start(); register_hex(0x30ce); unicode_input_finish();
+ unicode_input_start(); register_hex(0x0028); unicode_input_finish();
+ unicode_input_start(); register_hex(0x0020); unicode_input_finish();
+ unicode_input_start(); register_hex(0x309c); unicode_input_finish();
+ unicode_input_start(); register_hex(0x002d); unicode_input_finish();
+ unicode_input_start(); register_hex(0x309c); unicode_input_finish();
+ unicode_input_start(); register_hex(0x30ce); unicode_input_finish();
+ unicode_input_start(); register_hex(0x0029); unicode_input_finish();
+ break;
+ case FACE1:
+ unicode_input_start(); register_hex(0x0028); unicode_input_finish();
+ unicode_input_start(); register_hex(0x002d); unicode_input_finish();
+ unicode_input_start(); register_hex(0x005f); unicode_input_finish();
+ unicode_input_start(); register_hex(0x002d); unicode_input_finish();
+ unicode_input_start(); register_hex(0x0029); unicode_input_finish();
+ break;
+ case FACE2:
+ unicode_input_start(); register_hex(0x0028); unicode_input_finish();
+ unicode_input_start(); register_hex(0x2022); unicode_input_finish();
+ unicode_input_start(); register_hex(0x005f); unicode_input_finish();
+ unicode_input_start(); register_hex(0x2022); unicode_input_finish();
+ unicode_input_start(); register_hex(0x0029); unicode_input_finish();
+ break;
+ case UHU:
+ unicode_input_start(); register_hex(0x2299); unicode_input_finish();
+ unicode_input_start(); register_hex(0xfe4f); unicode_input_finish();
+ unicode_input_start(); register_hex(0x2299); unicode_input_finish();
+ break;
+ case SMRK1:
+ unicode_input_start(); register_hex(0x005e); unicode_input_finish();
+ unicode_input_start(); register_hex(0x032e); unicode_input_finish();
+ unicode_input_start(); register_hex(0x005e); unicode_input_finish();
+ break;
}
- return false;
break;
+ case EMOJI2:
+ switch(opt) {
+ case SMRK2:
+ unicode_input_start(); register_hex(0x0028); unicode_input_finish();
+ unicode_input_start(); register_hex(0x005e); unicode_input_finish();
+ unicode_input_start(); register_hex(0x032e); unicode_input_finish();
+ unicode_input_start(); register_hex(0x005e); unicode_input_finish();
+ unicode_input_start(); register_hex(0x0029); unicode_input_finish();
+ break;
+ case LOVE:
+ unicode_input_start(); register_hex(0x2665); unicode_input_finish();
+ unicode_input_start(); register_hex(0x203f); unicode_input_finish();
+ unicode_input_start(); register_hex(0x2665); unicode_input_finish();
+ break;
+ }
+ break;
+ }
}
- return true;
}
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
+ if (record->event.pressed) {
+ switch(id) {
+ case RUN:
+ return MACRO( D(LCTL), T(I), U(LCTL), T(R), END );
+ break;
+ }
+ }
+ return MACRO_NONE;
+};
+
// Runs just one time when the keyboard initializes.
void matrix_init_user(void) {
-
+ set_unicode_input_mode(UC_LNX);
};
// Runs constantly in the background, in a loop.
void matrix_scan_user(void) {
-
uint8_t layer = biton32(layer_state);
ergodox_board_led_off();
@@ -254,12 +489,21 @@ void matrix_scan_user(void) {
switch (layer) {
case 1:
ergodox_right_led_1_on();
+ #ifdef RGBLIGHT_ENABLE
+ rgblight_setrgb(0xff,0x00,0x00);
+ #endif
break;
case 2:
ergodox_right_led_2_on();
+ #ifdef RGBLIGHT_ENABLE
+ rgblight_setrgb(0x00,0xff,0x00);
+ #endif
break;
case 3:
ergodox_right_led_3_on();
+ #ifdef RGBLIGHT_ENABLE
+ rgblight_setrgb(0x00,0x00,0xff);
+ #endif
break;
case 4:
ergodox_right_led_1_on(); // TODO: Make a fourth layer
diff --git a/keyboards/ergodox/keymaps/deadcyclo/readme.md b/keyboards/ergodox/keymaps/deadcyclo/readme.md
index 809dd6eb5..fa41f0ec1 100644
--- a/keyboards/ergodox/keymaps/deadcyclo/readme.md
+++ b/keyboards/ergodox/keymaps/deadcyclo/readme.md
@@ -1,9 +1,11 @@
# ErgoDox EZ 1337 configuration
-Custom layout based on the default layout. Intended for interational users of us intl-altgr layout. Note that
-some common keys might be missing, as this layout is intented to be used on *nix systems by users familiar
-with their system. The layout is geared towards avoiding using the rat (mouse for those of you who are
-unfamiliar with tiling window managers) as much as possibly.
+Custom layout based on the default layout. Intended for interational
+users of us intl-altgr layout. Note that some common keys might be
+missing, as this layout is intented to be used on *nix systems by
+users familiar with their system. The layout is geared towards
+avoiding using the rat (mouse for those of you who are unfamiliar with
+tiling window managers) as much as possibly.
# Layouts
@@ -13,24 +15,58 @@ All layer images created using [keyboard-layout-editor](http://www.keyboard-layo
[![Base layer](images/deadcyclo-base-layout.png)](http://www.keyboard-layout-editor.com/#/gists/0321b18620180a3e46c498206eb65366)
-## Layer 1 - Symbols
+The base layer here is marked with the us international alt-gr layout,
+including characters bound to what on an iso keyboard would be alt-gr
+and on an ansi keyboard right alt.
-[![Layer 1 - Symbols](images/deadcyclo-layer-1-symbols.png)](http://www.keyboard-layout-editor.com/#/gists/96714e198054c9115bafb5267cc6bc73)
+Regular (and irregular) modifier keys are marked with a yellowish
+gray. Layer moderators are marked with blue, red and green, which are
+the same colors each layer displays on the LEDs when active.
-## Layer 2 - Media and Mouse
+All of the layer switch keys, except for the two center keys marked L1
+TOG, are dual purpose. Hence for example the top left key produces ESC
+if tapped, and temporarilly toggles L3 when hold down. The two center
+L1 TOG keys toggle L1 on and off for more permanent layer toggling.
-[![Layer 2 - Media and Mouse](images/deadcyclo-layer-2-media-and-mouse.png)](http://www.keyboard-layout-editor.com/#/gists/824759486e378bcec30784309a7e5731)
+The UNI keys enter the linux ibus unicode composer mode
+(ie. Ctrl+Shift+u). Use this to enter unicode characters. Hit the key,
+type in the unicode hex value, and hit enter.
-## Layer 3 - Navigation
+## Layer 1 - Symbols and RGB
-[![Layer 3 - Navigation](images/deadcyclo-layer-3-navigation.png)](http://www.keyboard-layout-editor.com/#/gists/67d9613dcd873c68693d11863d0fd289)
+[![Layer 1 - Symbols and RGB](images/deadcyclo-layer-1-symbols.png)](http://www.keyboard-layout-editor.com/#/gists/96714e198054c9115bafb5267cc6bc73)
+
+The Symbols and RGB layer contains function keys, commonly used
+symbols, a numpad and if you have the new Ergodox Ez shine keys for
+controlling various RGB-led functions. In addition, it provides an up
+and a down key for easy scrolling. RGB controller keys are yellow.
+
+## Layer 2 - Media, Mouse and Navigation
+
+[![Layer 2 - Media, Mouse and Navigation](images/deadcyclo-layer-2-media-and-mouse.png)](http://www.keyboard-layout-editor.com/#/gists/824759486e378bcec30784309a7e5731)
+
+The Media, Mouse and unicode layer contains special keys for moving
+the mouse and clicking on it with the keyboard. In addition it
+provides standard media control keys, and default arrow keys.
+
+## Layer 3 - Unicode
+
+[![Layer 3 - Unicode](images/deadcyclo-layer-3-navigation.png)](http://www.keyboard-layout-editor.com/#/gists/67d9613dcd873c68693d11863d0fd289)
+
+The unicode layer provides keys for directly typing unicode (utf-8)
# Changelog
- 02.01.2017 Added delete key on second layer
- 10.01.2017 Added layer images to readme
+- 24.01.2017 Added support for Ergodox Shine. Added secondary L2 switch key on left hand
+- 24.01.2017 Added unicode keys. Added shrug hug and yay. Moved Navigation to layer 2
+- 25.01.2017 Added lots of new emojis and some unicode keys
+- 27.01.2017 Added new unicode keys and shortcut for ibus unicode composer key (CTRL+SHIFT+U)
# TODO
-- Add unicode support (direct input and indirect? see algernon layout for examples)
-- Add descriptions below each layer image of any special functions/keys
+- Add macros for lots of stuff. (Lastpass cli, pushbullet cli, other push service cli, linode cli, more?)
+- Make macros for gnu screen and i3wm
+- Look into the app launch macros in algernon keymap
+
diff --git a/keyboards/ergodox/keymaps/german-kinergo/readme.md b/keyboards/ergodox/keymaps/german-kinergo/readme.md
index 557d85a8a..beb74cf75 100644
--- a/keyboards/ergodox/keymaps/german-kinergo/readme.md
+++ b/keyboards/ergodox/keymaps/german-kinergo/readme.md
@@ -2,7 +2,7 @@
This layout is inspired by the "kinesis-qwerty-mod" from benblazak's
[ergodox-firmware](https://github.com/benblazak/ergodox-firmware), as well as by the "german" layout from the
-[qmk_firmware](https://github.com/jackhumbert/qmk_firmware).
+[qmk_firmware](https://github.com/qmk/qmk_firmware).
The goal was to have a layout that is pretty close to an ordinary German
keyboard, so I don't have to make adjustments on the operating system level
and I keep some of the muscle memory to use a regular keyboard.
diff --git a/keyboards/ergodox/keymaps/mclennon_osx/README.md b/keyboards/ergodox/keymaps/mclennon_osx/README.md
index 60980d043..28cdb7c10 100644
--- a/keyboards/ergodox/keymaps/mclennon_osx/README.md
+++ b/keyboards/ergodox/keymaps/mclennon_osx/README.md
@@ -2,4 +2,4 @@
This keymapping is designed to be reasonably familiar to an ordinary Mac keyboard while taking advantage of the Ergodox EZ's features. Caps lock instead enables a layer which allows a user to use HJKL as arrow keys and to control media. Shift and control have additional mappings on S and D to provide easier access while holding down caps lock.
-If you choose to compile this yourself, be sure to compile with `#define PREVENT_STUCK_MODIFIERS` in your `config.h`. Firmware built using [qmk_firmware](https://github.com/jackhumbert/qmk_firmware/).
+If you choose to compile this yourself, be sure to compile with `#define PREVENT_STUCK_MODIFIERS` in your `config.h`. Firmware built using [qmk_firmware](https://github.com/qmk/qmk_firmware/).
diff --git a/keyboards/ergodox/keymaps/ordinary/keymap.c b/keyboards/ergodox/keymaps/ordinary/keymap.c
index 302c41cc8..5c01d9678 100644
--- a/keyboards/ergodox/keymaps/ordinary/keymap.c
+++ b/keyboards/ergodox/keymaps/ordinary/keymap.c
@@ -1,5 +1,6 @@
#include "ergodox.h"
#include "led.h"
+#include "mousekey.h"
#include "debug.h"
#include "action_layer.h"
#include "action_util.h"
diff --git a/keyboards/ergodox/keymaps/pvinis/Readme.md b/keyboards/ergodox/keymaps/pvinis/Readme.md
index 2a4a0c8f3..af2721054 100644
--- a/keyboards/ergodox/keymaps/pvinis/Readme.md
+++ b/keyboards/ergodox/keymaps/pvinis/Readme.md
@@ -59,7 +59,7 @@ I have two commented out layers that are just templates, so I can easily create
# Building
```
-$ git clone https://github.com/jackhumbert/qmk_firmware.git
+$ git clone https://github.com/qmk/qmk_firmware.git
$ cd qmk_firmware/keyboards/ergodox/keymaps/pvinis
$ make
```
diff --git a/keyboards/ergodox/keymaps/robot_test_layout/keymap.c b/keyboards/ergodox/keymaps/robot_test_layout/keymap.c
index 480be177f..e9e2597d7 100644
--- a/keyboards/ergodox/keymaps/robot_test_layout/keymap.c
+++ b/keyboards/ergodox/keymaps/robot_test_layout/keymap.c
@@ -68,7 +68,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case RGB_FF0000:
if (record->event.pressed) {
#ifdef RGBLIGHT_ENABLE
- EZ_RGB(0xff0000);
+ EZ_RGB(0xff0000UL);
register_code(KC_1); unregister_code(KC_1);
#endif
}
@@ -77,7 +77,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case RGB_00FF00:
if (record->event.pressed) {
#ifdef RGBLIGHT_ENABLE
- EZ_RGB(0x00ff00);
+ EZ_RGB(0x00ff00UL);
register_code(KC_2); unregister_code(KC_2);
#endif
}
@@ -86,7 +86,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case RGB_0000FF:
if (record->event.pressed) {
#ifdef RGBLIGHT_ENABLE
- EZ_RGB(0x0000ff);
+ EZ_RGB(0x0000ffUL);
register_code(KC_3); unregister_code(KC_3);
#endif
}
@@ -95,7 +95,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case RGB_FFFFFF:
if (record->event.pressed) {
#ifdef RGBLIGHT_ENABLE
- EZ_RGB(0xffffff);
+ EZ_RGB(0xffffffUL);
register_code(KC_4); unregister_code(KC_4);
#endif
}
diff --git a/keyboards/ergodox/keymaps/software_neo2/keymap.c b/keyboards/ergodox/keymaps/software_neo2/keymap.c
index 41ace403d..571ca062c 100644
--- a/keyboards/ergodox/keymaps/software_neo2/keymap.c
+++ b/keyboards/ergodox/keymaps/software_neo2/keymap.c
@@ -1,7 +1,8 @@
#include "ergodox.h"
#include "debug.h"
+#include "led.h"
#include "action_layer.h"
-#include "keymap_neo2.h"
+#include "keymap_extras/keymap_neo2.h"
// Layer names
#define BASE 0 // default layer
@@ -11,45 +12,45 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap 0: Basic layer
*
* ,--------------------------------------------------. ,--------------------------------------------------.
- * | ^ | 1 | 2 | 3 | 4 | 5 | Play | | Next | 6 | 7 | 8 | 9 | 0 |BackSpce|
+ * | Del | 1 | 2 | 3 | 4 | 5 | Play | | Next | 6 | 7 | 8 | 9 | 0 | ß |
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | Del | X | V | L | C | W | L1 | | L1 | K | H | G | F | Q | ß |
+ * | Tab | X | V | L | C | W | Esc | | Esc | K | H | G | F | Q | Y |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | Caps | U | I | A | E | O |------| |------| S | N | R | T | D | Y |
- * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------|
- * | LShift |Ü/Ctrl| Ö/C-S| Ä/Alt| P | Z | | | | B | M | , | . | J | RShift |
+ * | NeoL1 | U | I | A | E | O |------| |------| S | N | R | T | D | NeoR1 |
+ * |--------+------+------+------+------+------| L1 | | L1 |------+------+------+------+------+--------|
+ * | LShift |Ü/Ctrl| Ö/Win| Ä/Alt| P | Z | | | | B | M | , | . | J | RShift |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | L1 | Home | PgDn | PgUp | End | | Right| Down | Up | Left | Esc |
+ * |NeoL2 | Home | PgDn | PgUp | End | | Right| Down | Up | Left | NeoR2|
* `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
+ * ,-------------. ,---------------.
* | App | LGui | | Alt |Ctrl/Esc|
* ,------+------+------| |------+--------+------.
- * | | |NeoL2 | |NeoL2 | | |
- * | Tab |Backsp|------| |------| Space |Enter |
- * | |ace |NeoL1 | |NeoL1 | | |
+ * | | | Enter| |Delete| | |
+ * | Space|Backsp|------| |------| Enter |Space |
+ * | |ace | Tab | | Esc | | |
* `--------------------' `----------------------'
*/
// If it accepts an argument (i.e, is a function), it doesn't need KC_.
// Otherwise, it needs KC_*
[BASE] = KEYMAP( // layer 0 : default
// left hand
- KC_CIRC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MPLY,
- KC_DELT, NEO_X, NEO_V, NEO_L, NEO_C, NEO_W, TG(1),
- KC_CAPS, NEO_U, NEO_I, NEO_A, NEO_E, NEO_O,
- KC_LSFT, CTL_T(NEO_UE), C_S_T(NEO_OE), ALT_T(NEO_AE), NEO_P, NEO_Z, ALL_T(KC_NO),
- DE_LESS, KC_HOME, KC_PGDN, KC_PGUP, KC_END,
- ALT_T(KC_APP),KC_LGUI,
- NEO_L2_L,
- KC_TAB,KC_BSPC,NEO_L1_L,
+ KC_DELT, NEO_1, NEO_2, NEO_3, NEO_4, NEO_5, KC_MPLY,
+ KC_TAB, NEO_X, NEO_V, NEO_L, NEO_C, NEO_W, KC_ESC,
+ NEO_L1_L, NEO_U, NEO_I, NEO_A, NEO_E, NEO_O,
+ KC_LSFT, CTL_T(NEO_UE), GUI_T(NEO_OE), ALT_T(NEO_AE), NEO_P, NEO_Z, TG(1),
+ NEO_L2_L, KC_HOME, KC_PGDN, KC_PGUP, KC_END,
+ C_S_T(KC_ESC),KC_LGUI,
+ KC_ENT,
+ KC_SPC,KC_BSPC,KC_TAB,
// right hand
- KC_MNXT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
- TG(1), NEO_K, NEO_H, NEO_G, NEO_F, NEO_Q, NEO_SS,
- NEO_S, NEO_N, NEO_R, NEO_T, NEO_D, NEO_Y,
- MEH_T(KC_NO),NEO_B, NEO_M, KC_COMM, KC_DOT, NEO_J, KC_RSFT,
- KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_ESC,
- KC_LALT,CTL_T(KC_ESC),
- NEO_L2_R,
- NEO_L1_R,KC_SPC, KC_ENT
+ KC_MNXT, NEO_6, NEO_7, NEO_8, NEO_9, NEO_0, NEO_SS,
+ KC_ESC, NEO_K, NEO_H, NEO_G, NEO_F, NEO_Q, NEO_Y,
+ NEO_S, NEO_N, NEO_R, NEO_T, NEO_D, NEO_L1_R,
+ TG(1), NEO_B, NEO_M, NEO_COMM, NEO_DOT, NEO_J, KC_RSFT,
+ KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, NEO_L2_R,
+ KC_LALT,KC_RGUI,
+ KC_DELT,
+ KC_ESC,KC_ENT, KC_SPC
),
/* Keymap 1: Media and mouse keys
*
@@ -127,13 +128,16 @@ void matrix_scan_user(void) {
ergodox_right_led_1_off();
ergodox_right_led_2_off();
ergodox_right_led_3_off();
+ ergodox_board_led_off();
+
+ if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
+ ergodox_right_led_3_on();
+ }
+
switch (layer) {
case MDIA:
ergodox_right_led_2_on();
break;
- default:
- ergodox_board_led_off();
- break;
}
};
diff --git a/keyboards/ergodox/keymaps/supercoder/readme.md b/keyboards/ergodox/keymaps/supercoder/readme.md
index 8ef96eddf..df39ac7a9 100644
--- a/keyboards/ergodox/keymaps/supercoder/readme.md
+++ b/keyboards/ergodox/keymaps/supercoder/readme.md
@@ -22,7 +22,7 @@ your own:
[hex]: https://raw.githubusercontent.com/algernon/ergodox-supercoder/master/supercoder.hex
```
-$ git clone https://github.com/jackhumbert/qmk_firmware.git
+$ git clone https://github.com/qmk/qmk_firmware.git
$ cd qmk_firmware/keyboards/ergodox
$ git clone https://github.com/algernon/ergodox-supercoder.git keymaps/supercoder
$ make KEYMAP=supercoder
diff --git a/keyboards/ergodox/keymaps/win10_writers-block/readme.md b/keyboards/ergodox/keymaps/win10_writers-block/readme.md
index e51e3c48f..83f91bce2 100644
--- a/keyboards/ergodox/keymaps/win10_writers-block/readme.md
+++ b/keyboards/ergodox/keymaps/win10_writers-block/readme.md
@@ -90,7 +90,7 @@ Your LEDs will change to indicate your layer. You'll know you are in the base la
To build, you will need the [QMK][qmk] firmware checked out. from there, dive into `keyboards/ergodox/keymaps/win10_writers-block/`
-[qmk]: https://github.com/jackhumbert/qmk_firmware
+[qmk]: https://github.com/qmk/qmk_firmware
```
$ make keyboard=ergodox keymap=win10_writers-block
diff --git a/keyboards/ergodox/readme.md b/keyboards/ergodox/readme.md
index ca3eeba59..45b3354c1 100644
--- a/keyboards/ergodox/readme.md
+++ b/keyboards/ergodox/readme.md
@@ -25,7 +25,7 @@ If none of the existing keymaps suit you, you can create your own custom
keymap. This will require some experience with coding. Follow these steps
to customize a keymap:
- - Read the [qmk firmware README](https://github.com/jackhumbert/qmk_firmware) from top to bottom. Then come back here. :)
+ - Read the [qmk firmware README](https://github.com/qmk/qmk_firmware) from top to bottom. Then come back here. :)
- Clone the qmk_firmware repository