aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-06-28 00:26:05 -0400
committerJack Humbert <jack.humb@gmail.com>2017-06-28 10:42:23 -0400
commitf5f7dfa0647bac09c60cbf0247d46f3fedb43a9c (patch)
tree8859facd60e20cc668d59526bcd36f00d1301c28
parent4ea247e673f821549cac1a51ac8874870304249d (diff)
downloadqmk_firmware-f5f7dfa0647bac09c60cbf0247d46f3fedb43a9c.tar.gz
qmk_firmware-f5f7dfa0647bac09c60cbf0247d46f3fedb43a9c.zip
cleanup lets_split
-rw-r--r--keyboards/lets_split/config.h4
-rw-r--r--keyboards/lets_split/keymaps/OLED_sample/config.h27
-rw-r--r--keyboards/lets_split/keymaps/adam/config.h35
-rw-r--r--keyboards/lets_split/keymaps/default/Makefile3
-rw-r--r--keyboards/lets_split/keymaps/default/config.h17
-rw-r--r--keyboards/lets_split/keymaps/default/keymap.c (renamed from keyboards/lets_split/keymaps/i2c/keymap.c)0
-rw-r--r--keyboards/lets_split/keymaps/hexwire/config.h33
-rw-r--r--keyboards/lets_split/keymaps/i2c/config.h31
-rw-r--r--keyboards/lets_split/keymaps/khord/config.h36
-rw-r--r--keyboards/lets_split/keymaps/serial/config.h34
-rw-r--r--keyboards/lets_split/keymaps/serial/keymap.c214
-rw-r--r--keyboards/lets_split/keymaps/smt/config.h31
-rw-r--r--keyboards/lets_split/keymaps/xyverz/config.h34
-rw-r--r--keyboards/lets_split/lets_split.h3
-rw-r--r--keyboards/lets_split/readme.md11
-rw-r--r--keyboards/lets_split/rev1/config.h6
-rw-r--r--keyboards/lets_split/rev2/config.h6
-rw-r--r--keyboards/orthodox/keymaps/default/Makefile3
-rw-r--r--keyboards/orthodox/keymaps/default/config.h17
-rw-r--r--keyboards/orthodox/keymaps/default/keymap.c132
20 files changed, 250 insertions, 427 deletions
diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h
index 008fb0978..116a7f803 100644
--- a/keyboards/lets_split/config.h
+++ b/keyboards/lets_split/config.h
@@ -26,7 +26,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
26#ifdef SUBPROJECT_rev2 26#ifdef SUBPROJECT_rev2
27 #include "rev2/config.h" 27 #include "rev2/config.h"
28#endif 28#endif
29#ifdef SUBPROJECT_rev2fliphalf 29
30 #include "../../rev2fliphalf/config.h"
31#endif
32#endif 30#endif
diff --git a/keyboards/lets_split/keymaps/OLED_sample/config.h b/keyboards/lets_split/keymaps/OLED_sample/config.h
index 8389ba111..89ecc904b 100644
--- a/keyboards/lets_split/keymaps/OLED_sample/config.h
+++ b/keyboards/lets_split/keymaps/OLED_sample/config.h
@@ -1,23 +1,18 @@
1/* 1#ifndef CONFIG_USER_H
2Copyright 2012 Jun Wako <wakojun@gmail.com> 2#define CONFIG_USER_H
3 3
4This program is free software: you can redistribute it and/or modify 4#include "../../config.h"
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8 5
9This program is distributed in the hope that it will be useful, 6/* Use I2C or Serial, not both */
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17 7
18#define USE_I2C 8#define USE_I2C
19//#define USE_SERIAL 9//#define USE_SERIAL
20//#define MASTER_RIGHT 10
11/* Select hand configuration */
12
13#define MASTER_LEFT
14// #define _MASTER_RIGHT
15// #define EE_HANDS
21#define FLIP_HALF 16#define FLIP_HALF
22 17
23#define SSD1306OLED 18#define SSD1306OLED
@@ -40,3 +35,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
40#define RGBLIGHT_HUE_STEP 10 35#define RGBLIGHT_HUE_STEP 10
41#define RGBLIGHT_SAT_STEP 17 36#define RGBLIGHT_SAT_STEP 17
42#define RGBLIGHT_VAL_STEP 17 37#define RGBLIGHT_VAL_STEP 17
38
39#endif \ No newline at end of file
diff --git a/keyboards/lets_split/keymaps/adam/config.h b/keyboards/lets_split/keymaps/adam/config.h
index 177dd22d7..736e6efe3 100644
--- a/keyboards/lets_split/keymaps/adam/config.h
+++ b/keyboards/lets_split/keymaps/adam/config.h
@@ -1,43 +1,30 @@
1/* 1#ifndef CONFIG_USER_H
2Copyright 2012 Jun Wako <wakojun@gmail.com> 2#define CONFIG_USER_H
3 3
4This program is free software: you can redistribute it and/or modify 4#include "../../config.h"
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17 5
6/* Use I2C or Serial, not both */
18 7
19#define USE_SERIAL 8#define USE_SERIAL
9// #define USE_I2C
10
11/* Select hand configuration */
20 12
21//#define MASTER_LEFT 13// #define MASTER_LEFT
22// #define MASTER_RIGHT 14// #define _MASTER_RIGHT
23#define EE_HANDS 15#define EE_HANDS
24 16
25#ifdef SUBPROJECT_rev1
26 #include "../../rev1/config.h"
27#endif
28#ifdef SUBPROJECT_rev2 17#ifdef SUBPROJECT_rev2
29 #include "../../rev2/config.h"
30 /* RGB Underglow */ 18 /* RGB Underglow */
31 #undef RGBLED_NUM 19 #undef RGBLED_NUM
32 #define RGBLIGHT_ANIMATIONS 20 #define RGBLIGHT_ANIMATIONS
33 #define RGBLED_NUM 8 21 #define RGBLED_NUM 8
34#endif 22#endif
35#ifdef SUBPROJECT_rev2fliphalf
36 #include "../../rev2fliphalf/config.h"
37#endif
38 23
39#undef TAPPING_TERM 24#undef TAPPING_TERM
40#define TAPPING_TERM 200 //At 500 some bad logic takes hold 25#define TAPPING_TERM 200 //At 500 some bad logic takes hold
41#define PREVENT_STUCK_MODIFIERS 26#define PREVENT_STUCK_MODIFIERS
42#define IGNORE_MOD_TAP_INTERRUPT 27#define IGNORE_MOD_TAP_INTERRUPT
43#define PERMISSIVE_HOLD 28#define PERMISSIVE_HOLD
29
30#endif \ No newline at end of file
diff --git a/keyboards/lets_split/keymaps/default/Makefile b/keyboards/lets_split/keymaps/default/Makefile
new file mode 100644
index 000000000..457a3d01d
--- /dev/null
+++ b/keyboards/lets_split/keymaps/default/Makefile
@@ -0,0 +1,3 @@
1ifndef QUANTUM_DIR
2 include ../../../../Makefile
3endif
diff --git a/keyboards/lets_split/keymaps/default/config.h b/keyboards/lets_split/keymaps/default/config.h
new file mode 100644
index 000000000..77ab02dee
--- /dev/null
+++ b/keyboards/lets_split/keymaps/default/config.h
@@ -0,0 +1,17 @@
1#ifndef CONFIG_USER_H
2#define CONFIG_USER_H
3
4#include "../../config.h"
5
6/* Use I2C or Serial, not both */
7
8#define USE_SERIAL
9// #define USE_I2C
10
11/* Select hand configuration */
12
13#define MASTER_LEFT
14// #define _MASTER_RIGHT
15// #define EE_HANDS
16
17#endif \ No newline at end of file
diff --git a/keyboards/lets_split/keymaps/i2c/keymap.c b/keyboards/lets_split/keymaps/default/keymap.c
index 936312b2e..936312b2e 100644
--- a/keyboards/lets_split/keymaps/i2c/keymap.c
+++ b/keyboards/lets_split/keymaps/default/keymap.c
diff --git a/keyboards/lets_split/keymaps/hexwire/config.h b/keyboards/lets_split/keymaps/hexwire/config.h
index e315d8c0c..e29b40c98 100644
--- a/keyboards/lets_split/keymaps/hexwire/config.h
+++ b/keyboards/lets_split/keymaps/hexwire/config.h
@@ -1,35 +1,26 @@
1/* 1#ifndef CONFIG_USER_H
2Copyright 2012 Jun Wako <wakojun@gmail.com> 2#define CONFIG_USER_H
3 3
4This program is free software: you can redistribute it and/or modify 4#include "../../config.h"
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8 5
9This program is distributed in the hope that it will be useful, 6/* Use I2C or Serial, not both */
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13 7
14You should have received a copy of the GNU General Public License 8#define USE_SERIAL
15along with this program. If not, see <http://www.gnu.org/licenses/>. 9// #define USE_I2C
16*/
17 10
11/* Select hand configuration */
18 12
19#define USE_SERIAL 13#define MASTER_LEFT
14// #define _MASTER_RIGHT
15// #define EE_HANDS
20 16
21#define TAPPING_TERM 150 17#define TAPPING_TERM 150
22 18
23#ifdef SUBPROJECT_rev1
24 #include "../../rev1/config.h"
25#endif
26#ifdef SUBPROJECT_rev2
27 #include "../../rev2/config.h"
28#endif
29
30#undef RGBLED_NUM 19#undef RGBLED_NUM
31#define RGBLIGHT_ANIMATIONS 20#define RGBLIGHT_ANIMATIONS
32#define RGBLED_NUM 8 21#define RGBLED_NUM 8
33#define RGBLIGHT_HUE_STEP 8 22#define RGBLIGHT_HUE_STEP 8
34#define RGBLIGHT_SAT_STEP 8 23#define RGBLIGHT_SAT_STEP 8
35#define RGBLIGHT_VAL_STEP 8 24#define RGBLIGHT_VAL_STEP 8
25
26#endif \ No newline at end of file
diff --git a/keyboards/lets_split/keymaps/i2c/config.h b/keyboards/lets_split/keymaps/i2c/config.h
deleted file mode 100644
index 013542731..000000000
--- a/keyboards/lets_split/keymaps/i2c/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
1/*
2Copyright 2012 Jun Wako <wakojun@gmail.com>
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17#define USE_I2C
18
19#define MASTER_LEFT
20// #define _MASTER_RIGHT
21// #define EE_HANDS
22
23#ifdef SUBPROJECT_rev1
24 #include "../../rev1/config.h"
25#endif
26#ifdef SUBPROJECT_rev2
27 #include "../../rev2/config.h"
28#endif
29#ifdef SUBPROJECT_rev2fliphalf
30 #include "../../rev2fliphalf/config.h"
31#endif
diff --git a/keyboards/lets_split/keymaps/khord/config.h b/keyboards/lets_split/keymaps/khord/config.h
index 2d845827b..e3bd2c72e 100644
--- a/keyboards/lets_split/keymaps/khord/config.h
+++ b/keyboards/lets_split/keymaps/khord/config.h
@@ -1,33 +1,21 @@
1/* 1#ifndef CONFIG_USER_H
2Copyright 2012 Jun Wako <wakojun@gmail.com> 2#define CONFIG_USER_H
3 3
4This program is free software: you can redistribute it and/or modify 4#include "../../config.h"
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17 5
18#define TAPPING_TERM 150 6#define TAPPING_TERM 150
19 7
8/* Use I2C or Serial, not both */
9
20#define USE_SERIAL 10#define USE_SERIAL
11// #define USE_I2C
12
13/* Select hand configuration */
14
15//#define MASTER_LEFT
16// #define _MASTER_RIGHT
21#define EE_HANDS 17#define EE_HANDS
22 18
23#define RGBLIGHT_ANIMATIONS 19#define RGBLIGHT_ANIMATIONS
24 20
25#ifdef SUBPROJECT_rev1 21#endif \ No newline at end of file
26 #include "../../rev1/config.h"
27#endif
28#ifdef SUBPROJECT_rev2
29 #include "../../rev2/config.h"
30#endif
31#ifdef SUBPROJECT_rev2fliphalf
32 #include "../../rev2fliphalf/config.h"
33#endif
diff --git a/keyboards/lets_split/keymaps/serial/config.h b/keyboards/lets_split/keymaps/serial/config.h
deleted file mode 100644
index ba271d1ac..000000000
--- a/keyboards/lets_split/keymaps/serial/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
1/*
2Copyright 2012 Jun Wako <wakojun@gmail.com>
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18
19#define USE_SERIAL
20
21#define MASTER_LEFT
22// #define _MASTER_RIGHT
23// #define EE_HANDS
24
25
26#ifdef SUBPROJECT_rev1
27 #include "../../rev1/config.h"
28#endif
29#ifdef SUBPROJECT_rev2
30 #include "../../rev2/config.h"
31#endif
32#ifdef SUBPROJECT_rev2fliphalf
33 #include "../../rev2fliphalf/config.h"
34#endif
diff --git a/keyboards/lets_split/keymaps/serial/keymap.c b/keyboards/lets_split/keymaps/serial/keymap.c
deleted file mode 100644
index 936312b2e..000000000
--- a/keyboards/lets_split/keymaps/serial/keymap.c
+++ /dev/null
@@ -1,214 +0,0 @@
1#include "lets_split.h"
2#include "action_layer.h"
3#include "eeconfig.h"
4
5extern keymap_config_t keymap_config;
6
7// Each layer gets a name for readability, which is then used in the keymap matrix below.
8// The underscores don't mean anything - you can have a layer called STUFF or any other name.
9// Layer names don't all need to be of the same length, obviously, and you can also skip them
10// entirely and just use numbers.
11#define _QWERTY 0
12#define _COLEMAK 1
13#define _DVORAK 2
14#define _LOWER 3
15#define _RAISE 4
16#define _ADJUST 16
17
18enum custom_keycodes {
19 QWERTY = SAFE_RANGE,
20 COLEMAK,
21 DVORAK,
22 LOWER,
23 RAISE,
24 ADJUST,
25};
26
27// Fillers to make layering more clear
28#define _______ KC_TRNS
29#define XXXXXXX KC_NO
30
31const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
32
33/* Qwerty
34 * ,-----------------------------------------------------------------------------------.
35 * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp |
36 * |------+------+------+------+------+-------------+------+------+------+------+------|
37 * | Esc | A | S | D | F | G | H | J | K | L | ; | " |
38 * |------+------+------+------+------+------|------+------+------+------+------+------|
39 * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter |
40 * |------+------+------+------+------+------+------+------+------+------+------+------|
41 * |Adjust| Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right |
42 * `-----------------------------------------------------------------------------------'
43 */
44[_QWERTY] = KEYMAP( \
45 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \
46 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
47 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \
48 ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
49),
50
51/* Colemak
52 * ,-----------------------------------------------------------------------------------.
53 * | Tab | Q | W | F | P | G | J | L | U | Y | ; | Bksp |
54 * |------+------+------+------+------+-------------+------+------+------+------+------|
55 * | Esc | A | R | S | T | D | H | N | E | I | O | " |
56 * |------+------+------+------+------+------|------+------+------+------+------+------|
57 * | Shift| Z | X | C | V | B | K | M | , | . | / |Enter |
58 * |------+------+------+------+------+------+------+------+------+------+------+------|
59 * |Adjust| Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right |
60 * `-----------------------------------------------------------------------------------'
61 */
62[_COLEMAK] = KEYMAP( \
63 KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \
64 KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \
65 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \
66 ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
67),
68
69/* Dvorak
70 * ,-----------------------------------------------------------------------------------.
71 * | Tab | " | , | . | P | Y | F | G | C | R | L | Bksp |
72 * |------+------+------+------+------+-------------+------+------+------+------+------|
73 * | Esc | A | O | E | U | I | D | H | T | N | S | / |
74 * |------+------+------+------+------+------|------+------+------+------+------+------|
75 * | Shift| ; | Q | J | K | X | B | M | W | V | Z |Enter |
76 * |------+------+------+------+------+------+------+------+------+------+------+------|
77 * |Adjust| Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right |
78 * `-----------------------------------------------------------------------------------'
79 */
80[_DVORAK] = KEYMAP( \
81 KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \
82 KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, \
83 KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT , \
84 ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
85),
86
87/* Lower
88 * ,-----------------------------------------------------------------------------------.
89 * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp |
90 * |------+------+------+------+------+-------------+------+------+------+------+------|
91 * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | | \ | | |
92 * |------+------+------+------+------+------|------+------+------+------+------+------|
93 * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | | |Enter |
94 * |------+------+------+------+------+------+------+------+------+------+------+------|
95 * | | | | | | | | Next | Vol- | Vol+ | Play |
96 * `-----------------------------------------------------------------------------------'
97 */
98[_LOWER] = KEYMAP( \
99 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
100 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
101 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \
102 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
103),
104
105/* Raise
106 * ,-----------------------------------------------------------------------------------.
107 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp |
108 * |------+------+------+------+------+-------------+------+------+------+------+------|
109 * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ |
110 * |------+------+------+------+------+------|------+------+------+------+------+------|
111 * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | | |Enter |
112 * |------+------+------+------+------+------+------+------+------+------+------+------|
113 * | | | | | | | | Next | Vol- | Vol+ | Play |
114 * `-----------------------------------------------------------------------------------'
115 */
116[_RAISE] = KEYMAP( \
117 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \
118 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \
119 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, \
120 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
121),
122
123/* Adjust (Lower + Raise)
124 * ,-----------------------------------------------------------------------------------.
125 * | | Reset| | | | | | | | | | Del |
126 * |------+------+------+------+------+-------------+------+------+------+------+------|
127 * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | |
128 * |------+------+------+------+------+------|------+------+------+------+------+------|
129 * | | | | | | | | | | | | |
130 * |------+------+------+------+------+------+------+------+------+------+------+------|
131 * | | | | | | | | | | | |
132 * `-----------------------------------------------------------------------------------'
133 */
134[_ADJUST] = KEYMAP( \
135 _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
136 _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \
137 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
138 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
139)
140
141
142};
143
144#ifdef AUDIO_ENABLE
145float tone_qwerty[][2] = SONG(QWERTY_SOUND);
146float tone_dvorak[][2] = SONG(DVORAK_SOUND);
147float tone_colemak[][2] = SONG(COLEMAK_SOUND);
148#endif
149
150void persistent_default_layer_set(uint16_t default_layer) {
151 eeconfig_update_default_layer(default_layer);
152 default_layer_set(default_layer);
153}
154
155bool process_record_user(uint16_t keycode, keyrecord_t *record) {
156 switch (keycode) {
157 case QWERTY:
158 if (record->event.pressed) {
159 #ifdef AUDIO_ENABLE
160 PLAY_NOTE_ARRAY(tone_qwerty, false, 0);
161 #endif
162 persistent_default_layer_set(1UL<<_QWERTY);
163 }
164 return false;
165 break;
166 case COLEMAK:
167 if (record->event.pressed) {
168 #ifdef AUDIO_ENABLE
169 PLAY_NOTE_ARRAY(tone_colemak, false, 0);
170 #endif
171 persistent_default_layer_set(1UL<<_COLEMAK);
172 }
173 return false;
174 break;
175 case DVORAK:
176 if (record->event.pressed) {
177 #ifdef AUDIO_ENABLE
178 PLAY_NOTE_ARRAY(tone_dvorak, false, 0);
179 #endif
180 persistent_default_layer_set(1UL<<_DVORAK);
181 }
182 return false;
183 break;
184 case LOWER:
185 if (record->event.pressed) {
186 layer_on(_LOWER);
187 update_tri_layer(_LOWER, _RAISE, _ADJUST);
188 } else {
189 layer_off(_LOWER);
190 update_tri_layer(_LOWER, _RAISE, _ADJUST);
191 }
192 return false;
193 break;
194 case RAISE:
195 if (record->event.pressed) {
196 layer_on(_RAISE);
197 update_tri_layer(_LOWER, _RAISE, _ADJUST);
198 } else {
199 layer_off(_RAISE);
200 update_tri_layer(_LOWER, _RAISE, _ADJUST);
201 }
202 return false;
203 break;
204 case ADJUST:
205 if (record->event.pressed) {
206 layer_on(_ADJUST);
207 } else {
208 layer_off(_ADJUST);
209 }
210 return false;
211 break;
212 }
213 return true;
214} \ No newline at end of file
diff --git a/keyboards/lets_split/keymaps/smt/config.h b/keyboards/lets_split/keymaps/smt/config.h
index ba271d1ac..ddc98415d 100644
--- a/keyboards/lets_split/keymaps/smt/config.h
+++ b/keyboards/lets_split/keymaps/smt/config.h
@@ -1,34 +1,17 @@
1/* 1#ifndef CONFIG_USER_H
2Copyright 2012 Jun Wako <wakojun@gmail.com> 2#define CONFIG_USER_H
3 3
4This program is free software: you can redistribute it and/or modify 4#include "../../config.h"
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17 5
6/* Use I2C or Serial, not both */
18 7
19#define USE_SERIAL 8#define USE_SERIAL
9// #define USE_I2C
10
11/* Select hand configuration */
20 12
21#define MASTER_LEFT 13#define MASTER_LEFT
22// #define _MASTER_RIGHT 14// #define _MASTER_RIGHT
23// #define EE_HANDS 15// #define EE_HANDS
24 16
25
26#ifdef SUBPROJECT_rev1
27 #include "../../rev1/config.h"
28#endif
29#ifdef SUBPROJECT_rev2
30 #include "../../rev2/config.h"
31#endif
32#ifdef SUBPROJECT_rev2fliphalf
33 #include "../../rev2fliphalf/config.h"
34#endif 17#endif
diff --git a/keyboards/lets_split/keymaps/xyverz/config.h b/keyboards/lets_split/keymaps/xyverz/config.h
index 1b5be030e..a03ea5084 100644
--- a/keyboards/lets_split/keymaps/xyverz/config.h
+++ b/keyboards/lets_split/keymaps/xyverz/config.h
@@ -1,37 +1,25 @@
1/* 1#ifndef CONFIG_USER_H
2Copyright 2012 Jun Wako <wakojun@gmail.com> 2#define CONFIG_USER_H
3 3
4This program is free software: you can redistribute it and/or modify 4#include "../../config.h"
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17 5
6/* Use I2C or Serial, not both */
18 7
19#define USE_SERIAL 8#define USE_SERIAL
9// #define USE_I2C
10
11/* Select hand configuration */
20 12
21#define MASTER_LEFT 13#define MASTER_LEFT
22// #define MASTER_RIGHT 14// #define _MASTER_RIGHT
23// #define EE_HANDS 15// #define EE_HANDS
24 16
25#ifdef SUBPROJECT_rev1 17
26 #include "../../rev1/config.h"
27#endif
28#ifdef SUBPROJECT_rev2 18#ifdef SUBPROJECT_rev2
29 #include "../../rev2/config.h"
30 /* RGB Underglow */ 19 /* RGB Underglow */
31 #undef RGBLED_NUM 20 #undef RGBLED_NUM
32 #define RGBLIGHT_ANIMATIONS 21 #define RGBLIGHT_ANIMATIONS
33 #define RGBLED_NUM 8 22 #define RGBLED_NUM 8
34#endif 23#endif
35#ifdef SUBPROJECT_rev2fliphalf 24
36 #include "../../rev2fliphalf/config.h" 25#endif \ No newline at end of file
37#endif
diff --git a/keyboards/lets_split/lets_split.h b/keyboards/lets_split/lets_split.h
index 1892bf2cb..f7dc24a44 100644
--- a/keyboards/lets_split/lets_split.h
+++ b/keyboards/lets_split/lets_split.h
@@ -7,9 +7,6 @@
7#ifdef SUBPROJECT_rev2 7#ifdef SUBPROJECT_rev2
8 #include "rev2.h" 8 #include "rev2.h"
9#endif 9#endif
10#ifdef SUBPROJECT_rev2fliphalf
11 #include "rev2fliphalf.h"
12#endif
13 10
14// Used to create a keymap using only KC_ prefixed keys 11// Used to create a keymap using only KC_ prefixed keys
15#define KC_KEYMAP( \ 12#define KC_KEYMAP( \
diff --git a/keyboards/lets_split/readme.md b/keyboards/lets_split/readme.md
index d665d013e..610b776ee 100644
--- a/keyboards/lets_split/readme.md
+++ b/keyboards/lets_split/readme.md
@@ -19,14 +19,13 @@ There is additional information there about flashing and adding RGB underglow.
19Download or clone the whole firmware and navigate to the keyboards/lets_split directory. Once your dev env is setup, you'll be able to generate the default .hex using: 19Download or clone the whole firmware and navigate to the keyboards/lets_split directory. Once your dev env is setup, you'll be able to generate the default .hex using:
20 20
21``` 21```
22$ make rev2 22$ make rev2-default
23``` 23```
24 24
25You will see a lot of output and if everything worked correctly you will see the built hex files: 25You will see a lot of output and if everything worked correctly you will see the built hex file:
26 26
27``` 27```
28lets_split_rev2_serial.hex 28lets_split_rev2_default.hex
29lets_split_rev2_i2c.hex
30``` 29```
31 30
32If you would like to use one of the alternative keymaps, or create your own, copy one of the existing [keymaps](keymaps/) and run make like so: 31If you would like to use one of the alternative keymaps, or create your own, copy one of the existing [keymaps](keymaps/) and run make like so:
@@ -101,6 +100,8 @@ The pull-up resistors may be placed on either half. It is also possible
101to use 4 resistors and have the pull-ups in both halves, but this is 100to use 4 resistors and have the pull-ups in both halves, but this is
102unnecessary in simple use cases. 101unnecessary in simple use cases.
103 102
103You can change your configuration between serial and i2c by modifying your `config.h` file.
104
104Notes on Software Configuration 105Notes on Software Configuration
105------------------------------- 106-------------------------------
106 107
@@ -115,7 +116,7 @@ not be very difficult to adapt it to support more if required.
115Flashing 116Flashing
116------- 117-------
117From the keymap directory run `make SUBPROJECT-KEYMAP-avrdude` for automatic serial port resolution and flashing. 118From the keymap directory run `make SUBPROJECT-KEYMAP-avrdude` for automatic serial port resolution and flashing.
118Example: `make rev2-serial-avrdude` 119Example: `make rev2-default-avrdude`
119 120
120 121
121Choosing which board to plug the USB cable into (choosing Master) 122Choosing which board to plug the USB cable into (choosing Master)
diff --git a/keyboards/lets_split/rev1/config.h b/keyboards/lets_split/rev1/config.h
index bc6872807..d1de65ed8 100644
--- a/keyboards/lets_split/rev1/config.h
+++ b/keyboards/lets_split/rev1/config.h
@@ -15,10 +15,10 @@ You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>. 15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/ 16*/
17 17
18#ifndef CONFIG_H 18#ifndef REV1_CONFIG_H
19#define CONFIG_H 19#define REV1_CONFIG_H
20 20
21#include "config_common.h" 21#include "../config.h"
22 22
23/* USB Device descriptor parameter */ 23/* USB Device descriptor parameter */
24#define VENDOR_ID 0xFEED 24#define VENDOR_ID 0xFEED
diff --git a/keyboards/lets_split/rev2/config.h b/keyboards/lets_split/rev2/config.h
index ca268cd6c..531f69cb1 100644
--- a/keyboards/lets_split/rev2/config.h
+++ b/keyboards/lets_split/rev2/config.h
@@ -15,10 +15,10 @@ You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>. 15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/ 16*/
17 17
18#ifndef CONFIG_H 18#ifndef REV2_CONFIG_H
19#define CONFIG_H 19#define REV2_CONFIG_H
20 20
21#include "config_common.h" 21#include "../config.h"
22 22
23/* USB Device descriptor parameter */ 23/* USB Device descriptor parameter */
24#define VENDOR_ID 0xFEED 24#define VENDOR_ID 0xFEED
diff --git a/keyboards/orthodox/keymaps/default/Makefile b/keyboards/orthodox/keymaps/default/Makefile
new file mode 100644
index 000000000..457a3d01d
--- /dev/null
+++ b/keyboards/orthodox/keymaps/default/Makefile
@@ -0,0 +1,3 @@
1ifndef QUANTUM_DIR
2 include ../../../../Makefile
3endif
diff --git a/keyboards/orthodox/keymaps/default/config.h b/keyboards/orthodox/keymaps/default/config.h
new file mode 100644
index 000000000..af3b9afb0
--- /dev/null
+++ b/keyboards/orthodox/keymaps/default/config.h
@@ -0,0 +1,17 @@
1#ifndef CONFIG_USER_H
2#define CONFIG_USER_H
3
4#include "../../config.h"
5
6/* Use I2C or Serial, not both */
7
8#define USE_SERIAL
9// #define USE_I2C
10
11/* Select hand configuration */
12
13// #define MASTER_LEFT
14// #define _MASTER_RIGHT
15#define EE_HANDS
16
17#endif \ No newline at end of file
diff --git a/keyboards/orthodox/keymaps/default/keymap.c b/keyboards/orthodox/keymaps/default/keymap.c
new file mode 100644
index 000000000..ed24a3a1f
--- /dev/null
+++ b/keyboards/orthodox/keymaps/default/keymap.c
@@ -0,0 +1,132 @@
1#include "orthodox.h"
2#include "action_layer.h"
3#include "eeconfig.h"
4
5extern keymap_config_t keymap_config;
6
7// Each layer gets a name for readability, which is then used in the keymap matrix below.
8// The underscores don't mean anything - you can have a layer called STUFF or any other name.
9// Layer names don't all need to be of the same length, obviously, and you can also skip them
10// entirely and just use numbers.
11#define _QWERTY 0
12#define _COLEMAK 1
13#define _DVORAK 2
14#define _LOWER 3
15#define _RAISE 4
16#define _ADJUST 16
17
18enum custom_keycodes {
19 QWERTY = SAFE_RANGE,
20 COLEMAK,
21 DVORAK,
22 LOWER,
23 RAISE,
24 ADJUST,
25};
26
27// Fillers to make layering more clear
28#define _______ KC_TRNS
29#define XXXXXXX KC_NO
30
31#define LS__SPC MT(MOD_LSFT, KC_SPC)
32
33const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
34
35[_QWERTY] = KEYMAP( \
36 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \
37 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LEFT, XXXXXXX, KC_DOWN, KC_UP, XXXXXXX, KC_RIGHT,KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
38 KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, LOWER, KC_BSPC, KC_ENT, KC_RALT, LS__SPC, RAISE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI \
39),
40
41[_LOWER] = KEYMAP( \
42 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
43 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_LCTL, XXXXXXX, _______, _______, XXXXXXX, KC_RCTL, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
44 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, _______, _______, _______, _______, _______, KC_F12, KC_HOME, KC_COMM, KC_DOT, KC_END, _______ \
45),
46
47[_RAISE] = KEYMAP( \
48 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \
49 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, XXXXXXX, _______, _______, XXXXXXX, _______, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \
50 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, _______, _______, _______, _______, _______, KC_F12, KC_PGUP, KC_COMM, KC_DOT, KC_PGDN, _______ \
51),
52
53[_ADJUST] = KEYMAP( \
54 _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
55 _______, _______, _______, AU_ON, AU_OFF, AG_NORM, _______, XXXXXXX, _______, _______, XXXXXXX, _______, AG_SWAP, QWERTY , COLEMAK, DVORAK, _______, _______, \
56 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
57)
58
59
60};
61
62#ifdef AUDIO_ENABLE
63float tone_qwerty[][2] = SONG(QWERTY_SOUND);
64float tone_dvorak[][2] = SONG(DVORAK_SOUND);
65float tone_colemak[][2] = SONG(COLEMAK_SOUND);
66#endif
67
68void persistent_default_layer_set(uint16_t default_layer) {
69 eeconfig_update_default_layer(default_layer);
70 default_layer_set(default_layer);
71}
72
73bool process_record_user(uint16_t keycode, keyrecord_t *record) {
74 switch (keycode) {
75 case QWERTY:
76 if (record->event.pressed) {
77 #ifdef AUDIO_ENABLE
78 PLAY_NOTE_ARRAY(tone_qwerty, false, 0);
79 #endif
80 persistent_default_layer_set(1UL<<_QWERTY);
81 }
82 return false;
83 break;
84 case COLEMAK:
85 if (record->event.pressed) {
86 #ifdef AUDIO_ENABLE
87 PLAY_NOTE_ARRAY(tone_colemak, false, 0);
88 #endif
89 persistent_default_layer_set(1UL<<_COLEMAK);
90 }
91 return false;
92 break;
93 case DVORAK:
94 if (record->event.pressed) {
95 #ifdef AUDIO_ENABLE
96 PLAY_NOTE_ARRAY(tone_dvorak, false, 0);
97 #endif
98 persistent_default_layer_set(1UL<<_DVORAK);
99 }
100 return false;
101 break;
102 case LOWER:
103 if (record->event.pressed) {
104 layer_on(_LOWER);
105 update_tri_layer(_LOWER, _RAISE, _ADJUST);
106 } else {
107 layer_off(_LOWER);
108 update_tri_layer(_LOWER, _RAISE, _ADJUST);
109 }
110 return false;
111 break;
112 case RAISE:
113 if (record->event.pressed) {
114 layer_on(_RAISE);
115 update_tri_layer(_LOWER, _RAISE, _ADJUST);
116 } else {
117 layer_off(_RAISE);
118 update_tri_layer(_LOWER, _RAISE, _ADJUST);
119 }
120 return false;
121 break;
122 case ADJUST:
123 if (record->event.pressed) {
124 layer_on(_ADJUST);
125 } else {
126 layer_off(_ADJUST);
127 }
128 return false;
129 break;
130 }
131 return true;
132}