aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/ergodox_ez/info.json2
-rw-r--r--keyboards/ergodox_ez/matrix.c12
-rw-r--r--keyboards/ergotaco/matrix.c12
-rw-r--r--keyboards/georgi/matrix.c10
-rw-r--r--keyboards/gergo/matrix.c4
-rw-r--r--keyboards/handwired/frenchdev/matrix.c5
-rw-r--r--keyboards/readme.md15
-rw-r--r--keyboards/sixkeyboard/matrix.c5
-rw-r--r--layouts/community/ergodox/erez_experimental/config.h13
-rw-r--r--layouts/community/ergodox/erez_experimental/keymap.c217
-rw-r--r--layouts/community/ergodox/erez_experimental/readme.md55
-rw-r--r--layouts/community/ergodox/erez_experimental/rules.mk6
-rw-r--r--readme.md2
13 files changed, 20 insertions, 338 deletions
diff --git a/keyboards/ergodox_ez/info.json b/keyboards/ergodox_ez/info.json
index 6f7a94157..e543206fe 100644
--- a/keyboards/ergodox_ez/info.json
+++ b/keyboards/ergodox_ez/info.json
@@ -1,7 +1,7 @@
1{ 1{
2 "keyboard_name": "ErgoDox EZ", 2 "keyboard_name": "ErgoDox EZ",
3 "url": "ergodox-ez.com", 3 "url": "ergodox-ez.com",
4 "maintainer": "erez", 4 "maintainer": "ZSA",
5 "width": 17, 5 "width": 17,
6 "height": 8, 6 "height": 8,
7 7
diff --git a/keyboards/ergodox_ez/matrix.c b/keyboards/ergodox_ez/matrix.c
index 6f604ae2b..2bfe27b9a 100644
--- a/keyboards/ergodox_ez/matrix.c
+++ b/keyboards/ergodox_ez/matrix.c
@@ -1,9 +1,5 @@
1/* 1/*
2 2
3Note for ErgoDox EZ customizers: Here be dragons!
4This is not a file you want to be messing with.
5All of the interesting stuff for you is under keymaps/ :)
6Love, Erez
7 3
8Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com> 4Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
9 5
@@ -95,7 +91,7 @@ void matrix_init(void) {
95 // initialize matrix state: all keys off 91 // initialize matrix state: all keys off
96 for (uint8_t i = 0; i < MATRIX_ROWS; i++) { 92 for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
97 matrix[i] = 0; 93 matrix[i] = 0;
98 raw_matrix[i] = 0; 94 raw_matrix[i] = 0;
99 } 95 }
100 96
101#ifdef DEBUG_MATRIX_SCAN_RATE 97#ifdef DEBUG_MATRIX_SCAN_RATE
@@ -168,7 +164,7 @@ uint8_t matrix_scan(void) {
168#ifdef LEFT_LEDS 164#ifdef LEFT_LEDS
169 mcp23018_status = ergodox_left_leds_update(); 165 mcp23018_status = ergodox_left_leds_update();
170#endif // LEFT_LEDS 166#endif // LEFT_LEDS
171 bool changed = false; 167 bool changed = false;
172 for (uint8_t i = 0; i < MATRIX_ROWS_PER_SIDE; i++) { 168 for (uint8_t i = 0; i < MATRIX_ROWS_PER_SIDE; i++) {
173 // select rows from left and right hands 169 // select rows from left and right hands
174 uint8_t left_index = i; 170 uint8_t left_index = i;
@@ -178,13 +174,13 @@ uint8_t matrix_scan(void) {
178 174
179 // we don't need a 30us delay anymore, because selecting a 175 // we don't need a 30us delay anymore, because selecting a
180 // left-hand row requires more than 30us for i2c. 176 // left-hand row requires more than 30us for i2c.
181 177
182 changed |= store_raw_matrix_row(left_index); 178 changed |= store_raw_matrix_row(left_index);
183 changed |= store_raw_matrix_row(right_index); 179 changed |= store_raw_matrix_row(right_index);
184 180
185 unselect_rows(); 181 unselect_rows();
186 } 182 }
187 183
188 debounce(raw_matrix, matrix, MATRIX_ROWS, changed); 184 debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
189 matrix_scan_quantum(); 185 matrix_scan_quantum();
190 186
diff --git a/keyboards/ergotaco/matrix.c b/keyboards/ergotaco/matrix.c
index e4fd6902f..f7ceb194a 100644
--- a/keyboards/ergotaco/matrix.c
+++ b/keyboards/ergotaco/matrix.c
@@ -1,8 +1,4 @@
1/* 1/*
2Note for ErgoDox EZ customizers: Here be dragons!
3This is not a file you want to be messing with.
4All of the interesting stuff for you is under keymaps/ :)
5Love, Erez
6 2
7Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com> 3Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
8 4
@@ -226,8 +222,8 @@ uint8_t matrix_scan(void)
226 matrix_scan_quantum(); 222 matrix_scan_quantum();
227 223
228#ifdef DEBUG_MATRIX 224#ifdef DEBUG_MATRIX
229 for (uint8_t c = 0; c < MATRIX_COLS; c++) 225 for (uint8_t c = 0; c < MATRIX_COLS; c++)
230 for (uint8_t r = 0; r < MATRIX_ROWS; r++) 226 for (uint8_t r = 0; r < MATRIX_ROWS; r++)
231 if (matrix_is_on(r, c)) xprintf("r:%d c:%d \n", r, c); 227 if (matrix_is_on(r, c)) xprintf("r:%d c:%d \n", r, c);
232#endif 228#endif
233 229
@@ -324,10 +320,10 @@ static void unselect_rows(void)
324static void select_row(uint8_t row) 320static void select_row(uint8_t row)
325{ 321{
326 if (row < 6) { 322 if (row < 6) {
327 // select on mcp23018 323 // select on mcp23018
328 if (mcp23018_status) { // do nothing on error 324 if (mcp23018_status) { // do nothing on error
329 // Read using bitmask 325 // Read using bitmask
330 } else { // set active row low : 0 // set other rows hi-Z : 1 326 } else { // set active row low : 0 // set other rows hi-Z : 1
331 mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out; 327 mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
332 mcp23018_status = i2c_write(GPIOA, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out; 328 mcp23018_status = i2c_write(GPIOA, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
333 mcp23018_status = i2c_write(~(1<<row), ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out; 329 mcp23018_status = i2c_write(~(1<<row), ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
diff --git a/keyboards/georgi/matrix.c b/keyboards/georgi/matrix.c
index 22079ac61..58f0776c4 100644
--- a/keyboards/georgi/matrix.c
+++ b/keyboards/georgi/matrix.c
@@ -1,8 +1,4 @@
1/* 1/*
2Note for ErgoDox EZ customizers: Here be dragons!
3This is not a file you want to be messing with.
4All of the interesting stuff for you is under keymaps/ :)
5Love, Erez
6 2
7Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com> 3Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
8 4
@@ -248,8 +244,8 @@ uint8_t matrix_scan(void)
248 matrix_scan_quantum(); 244 matrix_scan_quantum();
249 245
250#ifdef DEBUG_MATRIX 246#ifdef DEBUG_MATRIX
251 for (uint8_t c = 0; c < MATRIX_COLS; c++) 247 for (uint8_t c = 0; c < MATRIX_COLS; c++)
252 for (uint8_t r = 0; r < MATRIX_ROWS; r++) 248 for (uint8_t r = 0; r < MATRIX_ROWS; r++)
253 if (matrix_is_on(r, c)) xprintf("r:%d c:%d \n", r, c); 249 if (matrix_is_on(r, c)) xprintf("r:%d c:%d \n", r, c);
254#endif 250#endif
255 251
@@ -359,7 +355,7 @@ static void select_row(uint8_t row)
359 if (row < 7) { 355 if (row < 7) {
360 // select on mcp23018 356 // select on mcp23018
361 if (mcp23018_status) { // do nothing on error 357 if (mcp23018_status) { // do nothing on error
362 } else { // set active row low : 0 // set other rows hi-Z : 1 358 } else { // set active row low : 0 // set other rows hi-Z : 1
363 mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out; 359 mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
364 mcp23018_status = i2c_write(GPIOA, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out; 360 mcp23018_status = i2c_write(GPIOA, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
365 mcp23018_status = i2c_write(0xFF & ~(1<<row), ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out; 361 mcp23018_status = i2c_write(0xFF & ~(1<<row), ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
diff --git a/keyboards/gergo/matrix.c b/keyboards/gergo/matrix.c
index 234160326..9ef1f6b5c 100644
--- a/keyboards/gergo/matrix.c
+++ b/keyboards/gergo/matrix.c
@@ -1,8 +1,4 @@
1/* 1/*
2Note for ErgoDox EZ customizers: Here be dragons!
3This is not a file you want to be messing with.
4All of the interesting stuff for you is under keymaps/ :)
5Love, Erez
6 2
7Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com> 3Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
8 4
diff --git a/keyboards/handwired/frenchdev/matrix.c b/keyboards/handwired/frenchdev/matrix.c
index 4263555e9..26c2b3126 100644
--- a/keyboards/handwired/frenchdev/matrix.c
+++ b/keyboards/handwired/frenchdev/matrix.c
@@ -5,11 +5,6 @@ The "column" and "row" in here actually refers to the opposite on the keyboard
5see definition of KEYMAP in v1.h, the grid is transposed so that a "row" in here is actually a "column" on the physical keyboard 5see definition of KEYMAP in v1.h, the grid is transposed so that a "row" in here is actually a "column" on the physical keyboard
6Nicolas 6Nicolas
7 7
8Note for ErgoDox EZ customizers: Here be dragons!
9This is not a file you want to be messing with.
10All of the interesting stuff for you is under keymaps/ :)
11Love, Erez
12
13Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com> 8Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
14Copyright 2013 Nicolas Poirey <nicolas.poirey@gmail.com> 9Copyright 2013 Nicolas Poirey <nicolas.poirey@gmail.com>
15 10
diff --git a/keyboards/readme.md b/keyboards/readme.md
index 81284755f..8b6e40721 100644
--- a/keyboards/readme.md
+++ b/keyboards/readme.md
@@ -3,8 +3,6 @@ QMK runs on a diverse range of keyboards. Some of these keyboards are officially
3 3
4## Official QMK Keyboards 4## Official QMK Keyboards
5 5
6These keyboards are manufactured by the maintainers of QMK.
7
8### Ortholinear Keyboards - Jack Humbert 6### Ortholinear Keyboards - Jack Humbert
9 7
10What makes OLKB keyboards shine is a combo of lean aesthetics, compact size, and killer tactile feel. These are available through [olkb.com](http://olkb.com) as well as through [Massdrop](http://massdrop.com) from time to time, as easy to assemble kits. 8What makes OLKB keyboards shine is a combo of lean aesthetics, compact size, and killer tactile feel. These are available through [olkb.com](http://olkb.com) as well as through [Massdrop](http://massdrop.com) from time to time, as easy to assemble kits.
@@ -13,12 +11,6 @@ What makes OLKB keyboards shine is a combo of lean aesthetics, compact size, and
13* [Preonic](/keyboards/preonic/) &mdash; Like the Planck, but bigger. 50%. 11* [Preonic](/keyboards/preonic/) &mdash; Like the Planck, but bigger. 50%.
14* [Atomic](/keyboards/atomic/) &mdash; Imagine the size of the Planck. Now imagine the size of the Preonic. Now imagine _bigger_. That is the Atomic. A 60% keyboard. 12* [Atomic](/keyboards/atomic/) &mdash; Imagine the size of the Planck. Now imagine the size of the Preonic. Now imagine _bigger_. That is the Atomic. A 60% keyboard.
15 13
16### ErgoDox EZ - Erez Zukerman
17
18Made in Taiwan using advanced robotic manufacturing, the ErgoDox EZ is a fully-assembled, premium ergonomic keyboard. Its split design allows you to place both halves shoulder width, and its custom-made wrist rests and tilt/tent kit make for incredibly comfortable typing. Available on [ergodox-ez.com](https://ergodox-ez.com).
19
20* [ErgoDox EZ](/keyboards/ergodox_ez/) &mdash; Our one and only product. Yes, it's that awesome. Comes with either printed or blank keycaps, and 7 different keyswitch types.
21
22### Clueboard - Zach White 14### Clueboard - Zach White
23 15
24Designed and built in Felton, CA, Clueboards keyboard emphasize quality and locally sourced components, available on [clueboard.co](http://clueboard.co) 16Designed and built in Felton, CA, Clueboards keyboard emphasize quality and locally sourced components, available on [clueboard.co](http://clueboard.co)
@@ -27,6 +19,13 @@ Designed and built in Felton, CA, Clueboards keyboard emphasize quality and loca
27* [Cluecard](/keyboards/clueboard/card/) &mdash; A small board to help you hack on QMK. 19* [Cluecard](/keyboards/clueboard/card/) &mdash; A small board to help you hack on QMK.
28* [Cluepad](/keyboards/clueboard/17/) &mdash; A mechanical numpad with QMK superpowers. 20* [Cluepad](/keyboards/clueboard/17/) &mdash; A mechanical numpad with QMK superpowers.
29 21
22### ErgoDox EZ and Planck EZ - ZSA Technology Labs
23
24[ZSA Technology Labs](https://ergodox-ez.com) maintains its own [fork of QMK](https://github.com/zsa/qmk_firmware) which feeds its [configurator](https://configure.ergodox-ez.com), for stability and legal purposes. The ZSA boards are:
25
26* [ErgoDox EZ](/keyboards/ergodox_ez/) &mdash; A powerful split mechanical keyboard.
27* [Planck EZ](/keyboards/planck/ez) &mdash; A 40% DIY powerhouse of customizability and modification capability. It's a lean, mean, typing machine, which ships fully assembled with a two-year warranty.
28
30 29
31## Community-supported QMK Keyboards 30## Community-supported QMK Keyboards
32 31
diff --git a/keyboards/sixkeyboard/matrix.c b/keyboards/sixkeyboard/matrix.c
index 860452ebd..64b46e9b0 100644
--- a/keyboards/sixkeyboard/matrix.c
+++ b/keyboards/sixkeyboard/matrix.c
@@ -1,10 +1,5 @@
1/* 1/*
2 2
3Note for ErgoDox EZ customizers: Here be dragons!
4This is not a file you want to be messing with.
5All of the interesting stuff for you is under keymaps/ :)
6Love, Erez
7
8Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com> 3Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
9 4
10This program is free software: you can redistribute it and/or modify 5This program is free software: you can redistribute it and/or modify
diff --git a/layouts/community/ergodox/erez_experimental/config.h b/layouts/community/ergodox/erez_experimental/config.h
deleted file mode 100644
index 4b9c29c94..000000000
--- a/layouts/community/ergodox/erez_experimental/config.h
+++ /dev/null
@@ -1,13 +0,0 @@
1#ifndef CONFIG_USER_H
2#define CONFIG_USER_H
3
4#include QMK_KEYBOARD_CONFIG_H
5
6#define ONESHOT_TAP_TOGGLE 2
7#define ONESHOT_TIMEOUT 300
8
9#undef LEADER_TIMEOUT
10#define LEADER_TIMEOUT 300
11
12
13#endif
diff --git a/layouts/community/ergodox/erez_experimental/keymap.c b/layouts/community/ergodox/erez_experimental/keymap.c
deleted file mode 100644
index 1270188f9..000000000
--- a/layouts/community/ergodox/erez_experimental/keymap.c
+++ /dev/null
@@ -1,217 +0,0 @@
1#include <keymap_extras/keymap_colemak.h>
2#include QMK_KEYBOARD_H
3#include "debug.h"
4#include "action_layer.h"
5
6#define BASE 0 // default layer
7#define SYMB 1 // symbols
8#define MDIA 2 // media keys
9
10enum custom_keycodes {
11 PLACEHOLDER = SAFE_RANGE, // can always be here
12 RGB_FF00BB // always start with RGB_
13};
14
15
16const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
17/* Keymap 0: Basic layer
18 *
19 * ,--------------------------------------------------. ,--------------------------------------------------.
20 * | = | 1 | 2 | 3 | 4 | 5 |Ctrl- | | Ctrl+| 6 | 7 | 8 | 9 | 0 | - |
21 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
22 * | Del | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | \ |
23 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
24 * | BkSp | A | S | D | F | G |------| |------| H | Alt/J| K | L |; / L2| LGui/' |
25 * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------|
26 * |LShift/(|Z/Ctrl| X | C | V | B | [ | | ] | N | M | , | . |//Ctrl|RShift/)|
27 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
28 * |Grv/L1| '" |AltShf| Left | Right| | Up | Down | [ | ] | -/L1 |
29 * `----------------------------------' `----------------------------------'
30 * ,-------------. ,-------------.
31 * | App | LGui | | Alt |Ctrl/Esc|
32 * ,------|------|------| |------+--------+------.
33 * | | | Home | | PgUp | | |
34 * | Space|Leader|------| |------| Tab/L1 |Enter |
35 * | | | End | | PgDn | | |
36 * `--------------------' `----------------------'
37 */
38// If it accepts an argument (i.e, is a function), it doesn't need KC_.
39// Otherwise, it needs KC_*
40[BASE] = LAYOUT_ergodox( // layer 0 : default
41 // left hand
42 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, LCTL(KC_MINS),
43 KC_DELT, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB),
44 KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G,
45 KC_LSPO, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_LBRC),
46 LT(SYMB,KC_GRV),KC_QUOT, LALT(KC_LSFT), KC_LEFT, KC_RGHT,
47 ALT_T(KC_APP), KC_LGUI,
48 KC_HOME,
49 KC_SPC,KC_LEAD,KC_END,
50 // right hand
51 LCTL(KC_EQL), KC_6,KC_7, KC_8, KC_9, KC_0, KC_MINS,
52 TG(SYMB), KC_Y,KC_U, KC_I, KC_O, KC_P, KC_BSLS,
53 KC_H,ALT_T(KC_J),KC_K, KC_L, LT(MDIA,KC_SCLN),GUI_T(KC_QUOT),
54 MEH_T(KC_RBRC),KC_N,KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), KC_RSPC,
55 KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, LT(SYMB,KC_MINS),
56 KC_LALT, CTL_T(KC_ESC),
57 KC_PGUP,
58 KC_PGDN,LT(SYMB, KC_TAB), KC_ENT
59 ),
60/* Keymap 1: Symbol Layer
61 *
62 * ,--------------------------------------------------. ,--------------------------------------------------.
63 * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 |
64 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
65 * | | | | | | | | | | | | | | | F12 |
66 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
67 * | | 1 | 2 | 3 | 4 | 5 |------| |------| & | _ | - | ; | + | |
68 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
69 * | | 6 | 7 | 8 | 9 | 0 | | | | | | @ | = | % | | |
70 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
71 * | | | |NxtTab|PrvTab| | | | | | |
72 * `----------------------------------' `----------------------------------'
73 * ,-------------. ,-------------.
74 * | | | |TOG |
75 * ,------|------|------| |------+------+------.
76 * |VAI |VAD |HUI | |SAI | |MOD |
77 * | | |------| |------| | |
78 * | | |HUD | |SAD | | |
79 * `--------------------' `--------------------'
80 */
81// SYMBOLS
82[SYMB] = LAYOUT_ergodox(
83 // left hand
84 RGB_FF00BB, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
85 KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
86 KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5,
87 KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
88 KC_TRNS, KC_TRNS,KC_TRNS,LCTL(KC_PGUP), LCTL(KC_PGDN),
89 KC_TRNS,KC_TRNS,
90 RGB_HUI,
91 RGB_VAI,RGB_VAD,RGB_HUD,
92 // right hand
93 KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
94 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F12,
95 KC_AMPR, KC_UNDS, KC_MINS, CM_SCLN, KC_PLUS, KC_TRNS,
96 KC_TRNS, KC_PIPE, KC_AT, KC_EQL, KC_PERC, KC_TRNS, KC_TRNS,
97 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
98 RGB_TOG, KC_TRNS,
99 RGB_SAI,
100 RGB_SAD, KC_TRNS, RGB_MOD
101),
102/* Keymap 2: Media and mouse keys
103 *
104 * ,--------------------------------------------------. ,--------------------------------------------------.
105 * | | | | | | | | | | | | | | | |
106 * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
107 * | | | | | | | | | | | | | | | |
108 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
109 * | | PgUp | Home | End | PgDn | |------| |------| | | | | | Play |
110 * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
111 * | | | | | | | | | | | | Prev | Next | | |
112 * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
113 * | | | | | | |VolUp |VolDn | Mute | | |
114 * `----------------------------------' `----------------------------------'
115 * ,-------------. ,-------------.
116 * | | | | | |
117 * ,------|------|------| |------+------+------.
118 * | | | | | | |Brwser|
119 * | | |------| |------| |Back |
120 * | | | | | | | |
121 * `--------------------' `--------------------'
122 */
123// MEDIA AND MOUSE
124[MDIA] = LAYOUT_ergodox(
125 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
126 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
127 KC_TRNS, KC_PGUP, KC_HOME, KC_END, KC_PGDN, KC_TRNS,
128 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
129 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
130 KC_TRNS, KC_TRNS,
131 KC_TRNS,
132 KC_TRNS, KC_TRNS, KC_TRNS,
133 // right hand
134 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
135 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
136 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
137 KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
138 KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
139 KC_TRNS, KC_TRNS,
140 KC_TRNS,
141 KC_TRNS, KC_TRNS, KC_WBAK
142),
143};
144
145const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
146{
147 return MACRO_NONE;
148};
149
150// Runs just one time when the keyboard initializes.
151void matrix_init_user(void) {
152
153};
154
155
156bool process_record_user(uint16_t keycode, keyrecord_t *record) {
157 switch (keycode) {
158 // dynamically generate these.
159 case RGB_FF00BB:
160 if (record->event.pressed) {
161 #ifdef RGBLIGHT_ENABLE
162 rgblight_enable();
163 rgblight_mode(1);
164 rgblight_setrgb(0xff,0x00,0xbb);
165 #endif
166 }
167 return false;
168 break;
169 }
170 return true;
171}
172
173LEADER_EXTERNS();
174
175// Runs constantly in the background, in a loop.
176void matrix_scan_user(void) {
177
178 uint8_t layer = biton32(layer_state);
179
180 ergodox_board_led_off();
181 ergodox_right_led_1_off();
182 ergodox_right_led_2_off();
183 ergodox_right_led_3_off();
184 switch (layer) {
185 // TODO: Make this relevant to the ErgoDox EZ.
186 case 1:
187 ergodox_right_led_1_on();
188 break;
189 case 2:
190 ergodox_right_led_2_on();
191 break;
192 default:
193 // none
194 break;
195 }
196
197 LEADER_DICTIONARY() {
198 leading = false;
199 leader_end();
200
201 SEQ_ONE_KEY(KC_W) {
202 register_code(KC_LALT);
203 register_code(KC_F4);
204 unregister_code(KC_F4);
205 unregister_code(KC_LALT);
206 }
207 SEQ_ONE_KEY(KC_O) {
208 register_code(KC_LCTL);
209 register_code(KC_LSFT);
210 register_code(KC_O);
211 unregister_code(KC_O);
212 unregister_code(KC_LSFT);
213 unregister_code(KC_LCTL);
214 }
215 }
216}
217
diff --git a/layouts/community/ergodox/erez_experimental/readme.md b/layouts/community/ergodox/erez_experimental/readme.md
deleted file mode 100644
index f0738d9a7..000000000
--- a/layouts/community/ergodox/erez_experimental/readme.md
+++ /dev/null
@@ -1,55 +0,0 @@
1# Erez's experimental layout
2
3This is my personal layout which I use to test out ideas which may or may not make it onto the default layout we ship with. It's based off the default layout, with various tweaks.
4
5Changelog:
6
7## Nov 1, 2016:
8
9* Adds dedicated text zooming keys in inner corners
10
11## May 24, 2016:
12
13* Implements Leader key example
14 * Leader, W sends Alt-F4
15 * Leader, O sends Ctrl-shift-o (a shortcut I use in FrontApp)
16
17## May 8, 2016:
18
19* Makes bottom-right key send minus/underscore when tapped, L1 temporary toggle when held
20* Tweaked the positions of the numbers on the symbol layer. Basically, 12345 are now directly under their number-row counterparts in layer 0. You can imagine pulling the number row down to the home row. And 67890 are directly under 12345 - so it's a matter of just adding 5 and going to the next row (1+5 = 6, 2+5 = 7 and so on).
21* Tweaks media/nav layer
22 * Removes mouse control, as I don't use it
23 * Makes left home row keys PgUp, Home, End, PgDn
24
25## Apr 29, 2016:
26
27* Tweaks the Hyper and Meh key to send brackets when tapped
28* Turns bottom-right key into a minus/underscore (easy to reach with the right pinky)
29
30## Apr 25, 2016:
31
32* Made it so that the right and left Shift keys send opening and closing parens ( ) when tapped
33
34## Feb 11, 2016:
35
36* Updated ASCII legend for thumb clusters
37* Made it so outer left-hand thumb key is L1 momentary toggle
38* Added % and @ to L1
39* Swapped positions for _ and - on L1
40
41## Feb 5, 2016:
42
43* A whole new design for the symbol layer. Specifically:
44 * Put the minus, underscore, and semicolon right in the homerow for the right hand
45 * Parens are in better places for me
46 * The arrow keys now send Ctrl-PgUp and Ctrl-PgDn, for switching browser tabs with the arrows when in symbol layer
47 * Tab (right-hand outer thumb key) now does double duty to toggle symbol layer when held down
48 * Backspace (left-hand outer thumb key) now just toggles symbol layer (I wasn't using it as a backspace)
49
50
51## Jan 19, 2016:
52
53* Made J into dual-action key (Alt when held down), to make Alt-tab more ergonomic.
54* Made ' into dual-action key (Win/Cmd when held down).
55
diff --git a/layouts/community/ergodox/erez_experimental/rules.mk b/layouts/community/ergodox/erez_experimental/rules.mk
deleted file mode 100644
index f68b56f87..000000000
--- a/layouts/community/ergodox/erez_experimental/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
1# Having a file like this allows you to override Makefile definitions
2# for your own particular keymap
3
4SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
5COMMAND_ENABLE = no # Commands for debug and configuration
6LEADER_ENABLE = yes
diff --git a/readme.md b/readme.md
index 86cce5a99..b08c675e4 100644
--- a/readme.md
+++ b/readme.md
@@ -28,7 +28,7 @@ The project also includes community support for [lots of other keyboards](/keybo
28 28
29## Maintainers 29## Maintainers
30 30
31QMK is developed and maintained by Jack Humbert of OLKB with contributions from the community, and of course, [Hasu](https://github.com/tmk). The OLKB product firmwares are maintained by [Jack Humbert](https://github.com/jackhumbert), the Ergodox EZ by [Erez Zukerman](https://github.com/ezuk), the Clueboard by [Zach White](https://github.com/skullydazed), and the Atreus by [Phil Hagelberg](https://github.com/technomancy). 31QMK is developed and maintained by Jack Humbert of OLKB with contributions from the community, and of course, [Hasu](https://github.com/tmk). The OLKB product firmwares are maintained by [Jack Humbert](https://github.com/jackhumbert), the Ergodox EZ by [ZSA Technology Labs](https://github.com/zsa), the Clueboard by [Zach White](https://github.com/skullydazed), and the Atreus by [Phil Hagelberg](https://github.com/technomancy).
32 32
33## Official Website 33## Official Website
34 34