aboutsummaryrefslogtreecommitdiff
path: root/keyboards/qwertyydox
diff options
context:
space:
mode:
authornoroadsleft <18669334+noroadsleft@users.noreply.github.com>2019-08-01 09:33:13 -0700
committerDrashna Jaelre <drashna@live.com>2019-08-01 09:33:13 -0700
commit9609ae60a657dd6ed6e5ba9830f41ed3c0039c09 (patch)
tree22cecd8b016e7cf105f61e91186788f027413c8b /keyboards/qwertyydox
parent2a9856dff01c08fe712e97c8e403ba43df507c79 (diff)
downloadqmk_firmware-9609ae60a657dd6ed6e5ba9830f41ed3c0039c09.tar.gz
qmk_firmware-9609ae60a657dd6ed6e5ba9830f41ed3c0039c09.zip
[Keyboard] QWERTYYdox refactor (#6446)
* Delete null key `__` key in keymap.c doesn't actually exist on the physical hardware. Removed key from keymap.c and removed its argument from the layout macro. * Delete unused keycode aliases * Replace layer index definitions with an enum * Replace redundant numpad keycodes with native aliases * Use native layer change keycodes instead of aliases * Visually align the keycodes It makes the keymap pretty. * Correct Configurator layout data * Clean up header files - convert to pragma once include guard - remove redundant definitions - remove commented code blocks * Delete LAYOUT_kc macro Was copied from ergotravel; not valid for this keyboard. * Consolidate rev1 rules.mk settings to keyboard level Previous codebase enabled Backlight at keyboard level then disabled it at revision level. * Delete unused rules * Consolidate config.h settings from keymap level to keyboard level * Modernize keyboard's config.h file Aligns the keyboard-level config.h file more closely with the current QMK template for AVR keyboards.
Diffstat (limited to 'keyboards/qwertyydox')
-rw-r--r--keyboards/qwertyydox/config.h199
-rw-r--r--keyboards/qwertyydox/info.json58
-rw-r--r--keyboards/qwertyydox/keymaps/default/config.h14
-rw-r--r--keyboards/qwertyydox/keymaps/default/keymap.c40
-rw-r--r--keyboards/qwertyydox/qwertyydox.h23
-rw-r--r--keyboards/qwertyydox/rev1/config.h70
-rw-r--r--keyboards/qwertyydox/rev1/rev1.h15
-rw-r--r--keyboards/qwertyydox/rev1/rules.mk1
-rw-r--r--keyboards/qwertyydox/rules.mk4
9 files changed, 265 insertions, 159 deletions
diff --git a/keyboards/qwertyydox/config.h b/keyboards/qwertyydox/config.h
index 67f5d3c16..346795214 100644
--- a/keyboards/qwertyydox/config.h
+++ b/keyboards/qwertyydox/config.h
@@ -15,8 +15,7 @@ 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 REV1_CONFIG_H 18#pragma once
19#define REV1_CONFIG_H
20 19
21#include "config_common.h" 20#include "config_common.h"
22 21
@@ -33,6 +32,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
33#define MATRIX_ROWS 8 32#define MATRIX_ROWS 8
34#define MATRIX_COLS 7 33#define MATRIX_COLS 7
35 34
35/*
36 * Keyboard Matrix Assignments
37 *
38 * Change this to how you wired your keyboard
39 * COLS: AVR pins used for columns, left to right
40 * ROWS: AVR pins used for rows, top to bottom
41 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
42 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
43 *
44*/
36// wiring of each half 45// wiring of each half
37#define MATRIX_ROW_PINS { B6, B2, B3, B1 } 46#define MATRIX_ROW_PINS { B6, B2, B3, B1 }
38#define MATRIX_COL_PINS { F7, F6, F5, C6, D7, D4, D1 } 47#define MATRIX_COL_PINS { F7, F6, F5, C6, D7, D4, D1 }
@@ -40,30 +49,139 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
40/* COL2ROW or ROW2COL */ 49/* COL2ROW or ROW2COL */
41#define DIODE_DIRECTION COL2ROW 50#define DIODE_DIRECTION COL2ROW
42 51
43/* define if matrix has ghost */ 52/*
44//#define MATRIX_HAS_GHOST 53 * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
54 */
55#define SOFT_SERIAL_PIN D0
45 56
46/* number of backlight levels */ 57// #define BACKLIGHT_PIN E6
47// #define BACKLIGHT_LEVELS 3 58// #define BACKLIGHT_BREATHING
59// #define BACKLIGHT_LEVELS 5
48 60
49/* Set 0 if debouncing isn't needed */ 61#define RGB_DI_PIN D6
62#ifdef RGB_DI_PIN
63 #define RGBLED_NUM 12
64 #define RGBLIGHT_HUE_STEP 8
65 #define RGBLIGHT_SAT_STEP 8
66 #define RGBLIGHT_VAL_STEP 8
67 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
68 #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
69 /*== all animations enable ==*/
70 #define RGBLIGHT_ANIMATIONS
71 // /*== or choose animations ==*/
72 // #define RGBLIGHT_EFFECT_BREATHING
73 // #define RGBLIGHT_EFFECT_RAINBOW_MOOD
74 // #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
75 // #define RGBLIGHT_EFFECT_SNAKE
76 // #define RGBLIGHT_EFFECT_KNIGHT
77 // #define RGBLIGHT_EFFECT_CHRISTMAS
78 // #define RGBLIGHT_EFFECT_STATIC_GRADIENT
79 // #define RGBLIGHT_EFFECT_RGB_TEST
80 // #define RGBLIGHT_EFFECT_ALTERNATING
81 // /*== customize breathing effect ==*/
82 // /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
83 // #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64
84 // /*==== use exp() and sin() ====*/
85 // #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7
86 // #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255
87#endif
88
89/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
50#define DEBOUNCE 5 90#define DEBOUNCE 5
51 91
52/* serial.c configuration for split keyboard */ 92/* define if matrix has ghost (lacks anti-ghosting diodes) */
53#define SOFT_SERIAL_PIN D0 93//#define MATRIX_HAS_GHOST
54 94
55/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ 95/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
56#define LOCKING_SUPPORT_ENABLE 96#define LOCKING_SUPPORT_ENABLE
57/* Locking resynchronize hack */ 97/* Locking resynchronize hack */
58#define LOCKING_RESYNC_ENABLE 98#define LOCKING_RESYNC_ENABLE
59 99
60#define BACKLIGHT_PIN E6 100/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
61#define BACKLIGHT_LEVELS 5 101 * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
102 */
103// #define GRAVE_ESC_CTRL_OVERRIDE
62 104
63/* ws2812 RGB LED */ 105/*
64#define RGB_DI_PIN D6 106 * Force NKRO
107 *
108 * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
109 * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
110 * makefile for this to work.)
111 *
112 * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
113 * until the next keyboard reset.
114 *
115 * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
116 * fully operational during normal computer usage.
117 *
118 * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
119 * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
120 * bootmagic, NKRO mode will always be enabled until it is toggled again during a
121 * power-up.
122 *
123 */
124//#define FORCE_NKRO
125
126/*
127 * Magic Key Options
128 *
129 * Magic keys are hotkey commands that allow control over firmware functions of
130 * the keyboard. They are best used in combination with the HID Listen program,
131 * found here: https://www.pjrc.com/teensy/hid_listen.html
132 *
133 * The options below allow the magic key functionality to be changed. This is
134 * useful if your keyboard/keypad is missing keys and you want magic key support.
135 *
136 */
137
138/* key combination for magic key command */
139/* defined by default; to change, uncomment and set to the combination you want */
140// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)
65 141
66#define RGBLED_NUM 12 // Number of LEDs 142/* control how magic key switches layers */
143//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true
144//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true
145//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
146
147/* override magic key keymap */
148//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
149//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
150//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
151//#define MAGIC_KEY_HELP H
152//#define MAGIC_KEY_HELP_ALT SLASH
153//#define MAGIC_KEY_DEBUG D
154//#define MAGIC_KEY_DEBUG_MATRIX X
155//#define MAGIC_KEY_DEBUG_KBD K
156//#define MAGIC_KEY_DEBUG_MOUSE M
157//#define MAGIC_KEY_VERSION V
158//#define MAGIC_KEY_STATUS S
159//#define MAGIC_KEY_CONSOLE C
160//#define MAGIC_KEY_LAYER0 0
161//#define MAGIC_KEY_LAYER0_ALT GRAVE
162//#define MAGIC_KEY_LAYER1 1
163//#define MAGIC_KEY_LAYER2 2
164//#define MAGIC_KEY_LAYER3 3
165//#define MAGIC_KEY_LAYER4 4
166//#define MAGIC_KEY_LAYER5 5
167//#define MAGIC_KEY_LAYER6 6
168//#define MAGIC_KEY_LAYER7 7
169//#define MAGIC_KEY_LAYER8 8
170//#define MAGIC_KEY_LAYER9 9
171//#define MAGIC_KEY_BOOTLOADER B
172//#define MAGIC_KEY_BOOTLOADER_ALT ESC
173//#define MAGIC_KEY_LOCK CAPS
174//#define MAGIC_KEY_EEPROM E
175//#define MAGIC_KEY_EEPROM_CLEAR BSPACE
176//#define MAGIC_KEY_NKRO N
177//#define MAGIC_KEY_SLEEP_LED Z
178
179#define MOUSEKEY_DELAY 150
180#define MOUSEKEY_INTERVAL 20
181#define MOUSEKEY_MAX_SPEED 10
182#define MOUSEKEY_TIME_TO_MAX 10
183#define MOUSEKEY_WHEEL_MAX_SPEED 8
184#define MOUSEKEY_WHEEL_TIME_TO_MAX 40
67 185
68/* 186/*
69 * Feature disable options 187 * Feature disable options
@@ -83,4 +201,57 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
83//#define NO_ACTION_MACRO 201//#define NO_ACTION_MACRO
84//#define NO_ACTION_FUNCTION 202//#define NO_ACTION_FUNCTION
85 203
204/*
205 * MIDI options
206 */
207
208/* Prevent use of disabled MIDI features in the keymap */
209//#define MIDI_ENABLE_STRICT 1
210
211/* enable basic MIDI features:
212 - MIDI notes can be sent when in Music mode is on
213*/
214//#define MIDI_BASIC
215
216/* enable advanced MIDI features:
217 - MIDI notes can be added to the keymap
218 - Octave shift and transpose
219 - Virtual sustain, portamento, and modulation wheel
220 - etc.
221*/
222//#define MIDI_ADVANCED
223
224/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
225//#define MIDI_TONE_KEYCODE_OCTAVES 1
226
227/*
228 * HD44780 LCD Display Configuration
229 */
230/*
231#define LCD_LINES 2 //< number of visible lines of the display
232#define LCD_DISP_LENGTH 16 //< visibles characters per line of the display
233
234#define LCD_IO_MODE 1 //< 0: memory mapped mode, 1: IO port mode
235
236#if LCD_IO_MODE
237#define LCD_PORT PORTB //< port for the LCD lines
238#define LCD_DATA0_PORT LCD_PORT //< port for 4bit data bit 0
239#define LCD_DATA1_PORT LCD_PORT //< port for 4bit data bit 1
240#define LCD_DATA2_PORT LCD_PORT //< port for 4bit data bit 2
241#define LCD_DATA3_PORT LCD_PORT //< port for 4bit data bit 3
242#define LCD_DATA0_PIN 4 //< pin for 4bit data bit 0
243#define LCD_DATA1_PIN 5 //< pin for 4bit data bit 1
244#define LCD_DATA2_PIN 6 //< pin for 4bit data bit 2
245#define LCD_DATA3_PIN 7 //< pin for 4bit data bit 3
246#define LCD_RS_PORT LCD_PORT //< port for RS line
247#define LCD_RS_PIN 3 //< pin for RS line
248#define LCD_RW_PORT LCD_PORT //< port for RW line
249#define LCD_RW_PIN 2 //< pin for RW line
250#define LCD_E_PORT LCD_PORT //< port for Enable line
251#define LCD_E_PIN 1 //< pin for Enable line
86#endif 252#endif
253*/
254
255/* Bootmagic Lite key configuration */
256// #define BOOTMAGIC_LITE_ROW 0
257// #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/qwertyydox/info.json b/keyboards/qwertyydox/info.json
index 3dd6b3ec7..8616f274e 100644
--- a/keyboards/qwertyydox/info.json
+++ b/keyboards/qwertyydox/info.json
@@ -5,12 +5,66 @@
5 "url": "", 5 "url": "",
6 "maintainer": "qmk", 6 "maintainer": "qmk",
7 "processor": "atmega32u4", 7 "processor": "atmega32u4",
8 "width": 16, 8 "width": 16.25,
9 "height": 5, 9 "height": 5,
10 "layouts": { 10 "layouts": {
11 "LAYOUT": { 11 "LAYOUT": {
12 "key_count": 53, 12 "key_count": 53,
13 "layout": [{"label":"L00", "x":0, "y":0.375}, {"label":"L01", "x":1, "y":0.25}, {"label":"L02", "x":2, "y":0.125}, {"label":"L03", "x":3, "y":0}, {"label":"L04", "x":4, "y":0.125}, {"label":"L05", "x":5, "y":0.25}, {"label":"L06", "x":6, "y":0.5}, {"label":"R00", "x":9, "y":0.5}, {"label":"R01", "x":10, "y":0.25}, {"label":"R02", "x":11, "y":0.125}, {"label":"R03", "x":12, "y":0}, {"label":"R04", "x":13, "y":0.125}, {"label":"R05", "x":14, "y":0.25}, {"label":"R06", "x":15, "y":0.375}, {"label":"L10", "x":0, "y":1.375}, {"label":"L11", "x":1, "y":1.25}, {"label":"L12", "x":2, "y":1.125}, {"label":"L13", "x":3, "y":1}, {"label":"L14", "x":4, "y":1.125}, {"label":"L15", "x":5, "y":1.25}, {"label":"L16", "x":6, "y":1.5}, {"label":"R10", "x":9, "y":1.5}, {"label":"R11", "x":10, "y":1.25}, {"label":"R12", "x":11, "y":1.125}, {"label":"R13", "x":12, "y":1}, {"label":"R14", "x":13, "y":1.125}, {"label":"R15", "x":14, "y":1.25}, {"label":"R16", "x":15, "y":1.375}, {"label":"L20", "x":0, "y":2.375}, {"label":"L21", "x":1, "y":2.25}, {"label":"L22", "x":2, "y":2.125}, {"label":"L23", "x":3, "y":2}, {"label":"L24", "x":4, "y":2.125}, {"label":"L25", "x":5, "y":2.25}, {"label":"L26", "x":6.5, "y":3}, {"label":"R20", "x":8.5, "y":3}, {"label":"R21", "x":10, "y":2.25}, {"label":"R22", "x":11, "y":2.125}, {"label":"R23", "x":12, "y":2}, {"label":"R24", "x":13, "y":2.125}, {"label":"R25", "x":14, "y":2.25}, {"label":"R26", "x":15, "y":2.375}, {"label":"L30", "x":0, "y":3.375}, {"label":"L31", "x":1, "y":3.25}, {"label":"L32", "x":2, "y":3.125}, {"label":"L33", "x":3, "y":3}, {"label":"L34", "x":5.5, "y":4}, {"label":"L35", "x":6.5, "y":4}, {"label":"R30", "x":8.5, "y":4}, {"label":"R31", "x":9.5, "y":4}, {"label":"R32", "x":12, "y":3}, {"label":"R33", "x":13, "y":3.125}, {"label":"R34", "x":14, "y":3.25}, {"label":"R35", "x":15, "y":3.375}] 13 "layout": [
14 {"label":"Tab", "x":0, "y":0},
15 {"label":"Q", "x":1, "y":0},
16 {"label":"W", "x":2, "y":0},
17 {"label":"E", "x":3, "y":0},
18 {"label":"R", "x":4, "y":0},
19 {"label":"T", "x":5, "y":0},
20 {"label":"Y", "x":6, "y":0},
21 {"label":"Y", "x":9, "y":0},
22 {"label":"U", "x":10, "y":0},
23 {"label":"I", "x":11, "y":0},
24 {"label":"O", "x":12, "y":0},
25 {"label":"P", "x":13, "y":0},
26 {"label":"{", "x":14, "y":0},
27 {"label":"}", "x":15, "y":0},
28 {"label":"Caps Lock", "x":0.25, "y":1},
29 {"label":"A", "x":1.25, "y":1},
30 {"label":"S", "x":2.25, "y":1},
31 {"label":"D", "x":3.25, "y":1},
32 {"label":"F", "x":4.25, "y":1},
33 {"label":"G", "x":5.25, "y":1},
34 {"label":"H", "x":9.25, "y":1},
35 {"label":"J", "x":10.25, "y":1},
36 {"label":"K", "x":11.25, "y":1},
37 {"label":"L", "x":12.25, "y":1},
38 {"label":":", "x":13.25, "y":1},
39 {"label":"\"", "x":14.25, "y":1},
40 {"label":"|", "x":15.25, "y":1},
41 {"label":"Shift", "x":0.75, "y":2},
42 {"label":"Z", "x":1.75, "y":2},
43 {"label":"X", "x":2.75, "y":2},
44 {"label":"C", "x":3.75, "y":2},
45 {"label":"V", "x":4.75, "y":2},
46 {"label":"B", "x":5.75, "y":2},
47 {"label":"N", "x":9.75, "y":2},
48 {"label":"M", "x":10.75, "y":2},
49 {"label":"<", "x":11.75, "y":2},
50 {"label":">", "x":12.75, "y":2},
51 {"label":"?", "x":13.75, "y":2},
52 {"label":"Shift", "x":14.75, "y":2},
53 {"label":"Ctrl", "x":0.75, "y":3},
54 {"label":"GUI", "x":1.75, "y":3},
55 {"label":"Alt", "x":2.75, "y":3},
56 {"label":"\"-QWERTY\"", "x":3.75, "y":3},
57 {"label":"Enter", "x":4.75, "y":3.33},
58 {"label":"Delete", "x":5.75, "y":3.67},
59 {"label":"TO(_NUM)", "x":6.75, "y":4},
60 {"label":"TO(_NAV)", "x":8.75, "y":4},
61 {"label":"Space", "x":9.75, "y":3.67},
62 {"label":"Back Space", "x":10.75, "y":3.33},
63 {"label":"Left", "x":11.75, "y":3},
64 {"label":"Alt", "x":12.75, "y":3},
65 {"label":"GUI", "x":13.75, "y":3},
66 {"label":"Ctrl", "x":14.75, "y":3}
67 ]
14 } 68 }
15 } 69 }
16} 70}
diff --git a/keyboards/qwertyydox/keymaps/default/config.h b/keyboards/qwertyydox/keymaps/default/config.h
index 6b4e3fe96..cc85e4e2e 100644
--- a/keyboards/qwertyydox/keymaps/default/config.h
+++ b/keyboards/qwertyydox/keymaps/default/config.h
@@ -27,17 +27,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
27// #define MASTER_LEFT 27// #define MASTER_LEFT
28#define MASTER_RIGHT 28#define MASTER_RIGHT
29// #define EE_HANDS 29// #define EE_HANDS
30
31#undef RGBLED_NUM
32#define RGBLIGHT_ANIMATIONS
33#define RGBLED_NUM 12
34#define RGBLIGHT_HUE_STEP 8
35#define RGBLIGHT_SAT_STEP 8
36#define RGBLIGHT_VAL_STEP 8
37
38#define MOUSEKEY_DELAY 150
39#define MOUSEKEY_INTERVAL 20
40#define MOUSEKEY_MAX_SPEED 10
41#define MOUSEKEY_TIME_TO_MAX 10
42#define MOUSEKEY_WHEEL_MAX_SPEED 8
43#define MOUSEKEY_WHEEL_TIME_TO_MAX 40 \ No newline at end of file
diff --git a/keyboards/qwertyydox/keymaps/default/keymap.c b/keyboards/qwertyydox/keymaps/default/keymap.c
index 5967c5146..f5381bf7d 100644
--- a/keyboards/qwertyydox/keymaps/default/keymap.c
+++ b/keyboards/qwertyydox/keymaps/default/keymap.c
@@ -2,9 +2,12 @@
2 2
3extern keymap_config_t keymap_config; 3extern keymap_config_t keymap_config;
4 4
5#define _QWERTY 0 5enum layer_names {
6#define _NUM 1 6 _QWERTY,
7#define _NAV 2 7 _NUM,
8 _NAV
9};
10
8enum custom_keycodes { 11enum custom_keycodes {
9 qwerty = SAFE_RANGE, 12 qwerty = SAFE_RANGE,
10 nav, 13 nav,
@@ -12,17 +15,6 @@ enum custom_keycodes {
12 EQL 15 EQL
13}; 16};
14 17
15// #define KC_ KC_TRNS
16#define __ KC_NO
17#define NAV TO(2)
18#define NUM TO(1)
19#define ALPHA TO(0)
20#define NPLUS KC_KP_PLUS
21#define NMINUS KC_KP_MINUS
22#define NSTAR KC_KP_ASTERISK
23#define NSLASH KC_KP_SLASH
24
25
26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 18const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
27 19
28 [_QWERTY] = LAYOUT( 20 [_QWERTY] = LAYOUT(
@@ -31,33 +23,33 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
31 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| 23 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
32 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, 24 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS,
33 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| 25 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
34 KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, __, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, 26 KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
35 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| 27 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
36 KC_LCTL, KC_LGUI, KC_LALT, qwerty, KC_ENT, KC_DEL, NUM, NAV, KC_SPC, KC_BSPC, KC_LEFT, KC_RALT, KC_RGUI, KC_RCTL 28 KC_LCTL, KC_LGUI, KC_LALT, qwerty, KC_ENT, KC_DEL, TO(1), TO(2), KC_SPC, KC_BSPC, KC_LEFT, KC_RALT, KC_RGUI, KC_RCTL
37 //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------' 29 //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------'
38 ), 30 ),
39 31
40 [_NUM] = LAYOUT( 32 [_NUM] = LAYOUT(
41 //,--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------. 33 //,--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------.
42 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_NO, 34 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_NO,
43 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| 35 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
44 KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, 36 KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO,
45 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| 37 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
46 KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, __, KC_NO, KC_PPLS, KC_PMNS, EQL, KC_PAST, KC_PSLS, 38 KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PPLS, KC_PMNS, EQL, KC_PAST, KC_PSLS,
47 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| 39 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
48 KC_LCTL, KC_ESC, KC_NO, num, KC_ENT, KC_LSFT, NAV, ALPHA, KC_SPC, KC_BSPC, KC_LEFT, KC_RALT, KC_RGUI, KC_RCTL 40 KC_LCTL, KC_ESC, KC_NO, num, KC_ENT, KC_LSFT, TO(2), TO(0), KC_SPC, KC_BSPC, KC_LEFT, KC_RALT, KC_RGUI, KC_RCTL
49 //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------' 41 //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------'
50 ), 42 ),
51 43
52 [_NAV] = LAYOUT( 44 [_NAV] = LAYOUT(
53 //,--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------. 45 //,--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------.
54 KC_ESC, KC_NO, KC_ACL0, KC_ACL1, KC_ACL2, KC_WH_L, KC_WH_R, KC_ESC, KC_NO, KC_UP, NSLASH, NSTAR, NMINUS, NPLUS, 46 KC_ESC, KC_NO, KC_ACL0, KC_ACL1, KC_ACL2, KC_WH_L, KC_WH_R, KC_ESC, KC_NO, KC_UP, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS,
55 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| 47 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
56 KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_WH_U, KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT,KC_NO, KC_NO, KC_NO, 48 KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_WH_U, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, KC_NO,
57 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| 49 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
58 KC_INS, KC_HOME, KC_PGUP, KC_BTN1, KC_BTN2, KC_WH_D, __, KC_MS_L, KC_MS_U, KC_MS_D, KC_MS_R, KC_NO, KC_NO, 50 KC_INS, KC_HOME, KC_PGUP, KC_BTN1, KC_BTN2, KC_WH_D, KC_MS_L, KC_MS_U, KC_MS_D, KC_MS_R, KC_NO, KC_NO,
59 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| 51 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
60 KC_DEL, KC_END, KC_PGDN, nav, KC_LCTL, KC_SPC, ALPHA, NUM, KC_LSFT, KC_BSPC, KC_NO, KC_NO, KC_NO, RESET 52 KC_DEL, KC_END, KC_PGDN, nav, KC_LCTL, KC_SPC, TO(0), TO(1), KC_LSFT, KC_BSPC, KC_NO, KC_NO, KC_NO, RESET
61 //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------' 53 //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------'
62 ) 54 )
63}; 55};
diff --git a/keyboards/qwertyydox/qwertyydox.h b/keyboards/qwertyydox/qwertyydox.h
index 57bd0dc54..9eb4073df 100644
--- a/keyboards/qwertyydox/qwertyydox.h
+++ b/keyboards/qwertyydox/qwertyydox.h
@@ -1,24 +1,7 @@
1#ifndef QWERTYYDOX_H 1#pragma once
2#define QWERTYYDOX_H 2
3#include "quantum.h"
3 4
4#ifdef KEYBOARD_qwertyydox_rev1 5#ifdef KEYBOARD_qwertyydox_rev1
5 #include "rev1.h" 6 #include "rev1.h"
6#endif 7#endif
7
8#include "quantum.h"
9
10// Used to create a keymap using only KC_ prefixed keys
11#define LAYOUT_kc( \
12 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
13 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
14 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
15 L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
16 ) \
17 LAYOUT( \
18 KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##L06, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, KC_##R06, \
19 KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##L16, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, KC_##R16, \
20 KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##L26, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, KC_##R26, \
21 KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
22 )
23
24#endif \ No newline at end of file
diff --git a/keyboards/qwertyydox/rev1/config.h b/keyboards/qwertyydox/rev1/config.h
index 703d62de7..b749fffcb 100644
--- a/keyboards/qwertyydox/rev1/config.h
+++ b/keyboards/qwertyydox/rev1/config.h
@@ -15,72 +15,4 @@ 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 REV1_CONFIG_H 18#pragma once
19#define REV1_CONFIG_H
20
21#include QMK_KEYBOARD_CONFIG_H
22
23/* USB Device descriptor parameter */
24#define VENDOR_ID 0xCEEB
25#define PRODUCT_ID 0x1256
26#define DEVICE_VER 0x0100
27#define MANUFACTURER AYDENandDAD
28#define PRODUCT QWERTYdox Keyboard
29#define DESCRIPTION Split 40 percent keyboard
30
31/* key matrix size */
32// Rows are doubled-up
33#define MATRIX_ROWS 8
34#define MATRIX_COLS 7
35
36// wiring of each half
37#define MATRIX_ROW_PINS { B6, B2, B3, B1 }
38#define MATRIX_COL_PINS { F7, F6, F5, C6, D7, D4, D1 }
39
40/* COL2ROW or ROW2COL */
41#define DIODE_DIRECTION COL2ROW
42
43/* define if matrix has ghost */
44//#define MATRIX_HAS_GHOST
45
46/* number of backlight levels */
47// #define BACKLIGHT_LEVELS 3
48
49/* Set 0 if debouncing isn't needed */
50#define DEBOUNCE 5
51
52/* serial.c configuration for split keyboard */
53#define SOFT_SERIAL_PIN D0
54
55/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
56#define LOCKING_SUPPORT_ENABLE
57/* Locking resynchronize hack */
58#define LOCKING_RESYNC_ENABLE
59
60#define BACKLIGHT_PIN E6
61#define BACKLIGHT_LEVELS 5
62
63/* ws2812 RGB LED */
64#define RGB_DI_PIN D6
65
66#define RGBLED_NUM 12 // Number of LEDs
67
68/*
69 * Feature disable options
70 * These options are also useful to firmware size reduction.
71 */
72
73/* disable debug print */
74// #define NO_DEBUG
75
76/* disable print */
77// #define NO_PRINT
78
79/* disable action features */
80//#define NO_ACTION_LAYER
81//#define NO_ACTION_TAPPING
82//#define NO_ACTION_ONESHOT
83//#define NO_ACTION_MACRO
84//#define NO_ACTION_FUNCTION
85
86#endif
diff --git a/keyboards/qwertyydox/rev1/rev1.h b/keyboards/qwertyydox/rev1/rev1.h
index d620e6210..a7b30b648 100644
--- a/keyboards/qwertyydox/rev1/rev1.h
+++ b/keyboards/qwertyydox/rev1/rev1.h
@@ -1,12 +1,7 @@
1#ifndef REV1_H 1#pragma once
2#define REV1_H
3 2
4#include "qwertyydox.h" 3#include "qwertyydox.h"
5 4
6//void promicro_bootloader_jmp(bool program);
7#include "quantum.h"
8
9
10#ifdef USE_I2C 5#ifdef USE_I2C
11#include <stddef.h> 6#include <stddef.h>
12#ifdef __AVR__ 7#ifdef __AVR__
@@ -15,12 +10,10 @@
15#endif 10#endif
16#endif 11#endif
17 12
18//void promicro_bootloader_jmp(bool program);
19
20#define LAYOUT( \ 13#define LAYOUT( \
21 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ 14 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
22 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, \ 15 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, \
23 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, \ 16 L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, \
24 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36 \ 17 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36 \
25 ) \ 18 ) \
26 { \ 19 { \
@@ -30,8 +23,6 @@
30 { L30, L31, L32, L33, L34, L35, L36 }, \ 23 { L30, L31, L32, L33, L34, L35, L36 }, \
31 { R06, R05, R04, R03, R02, R01, R00 }, \ 24 { R06, R05, R04, R03, R02, R01, R00 }, \
32 { R16, R15, R14, R13, R12, R11, R10 }, \ 25 { R16, R15, R14, R13, R12, R11, R10 }, \
33 { R26, R25, R24, R23, R22, R21, R20, }, \ 26 { R26, R25, R24, R23, R22, R21, KC_NO, }, \
34 { R36, R35, R34, R33, R32, R31, R30 } \ 27 { R36, R35, R34, R33, R32, R31, R30 } \
35 } 28 }
36
37#endif
diff --git a/keyboards/qwertyydox/rev1/rules.mk b/keyboards/qwertyydox/rev1/rules.mk
index 7b30c0bef..e69de29bb 100644
--- a/keyboards/qwertyydox/rev1/rules.mk
+++ b/keyboards/qwertyydox/rev1/rules.mk
@@ -1 +0,0 @@
1BACKLIGHT_ENABLE = no
diff --git a/keyboards/qwertyydox/rules.mk b/keyboards/qwertyydox/rules.mk
index 7cc070ba5..fcd3d708e 100644
--- a/keyboards/qwertyydox/rules.mk
+++ b/keyboards/qwertyydox/rules.mk
@@ -52,14 +52,12 @@ EXTRAKEY_ENABLE = no # Audio control and System control(+450)
52CONSOLE_ENABLE = no # Console for debug(+400) 52CONSOLE_ENABLE = no # Console for debug(+400)
53COMMAND_ENABLE = no # Commands for debug and configuration 53COMMAND_ENABLE = no # Commands for debug and configuration
54NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 54NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
55BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality 55BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
56MIDI_ENABLE = no # MIDI controls 56MIDI_ENABLE = no # MIDI controls
57AUDIO_ENABLE = no # Audio output on port C6 57AUDIO_ENABLE = no # Audio output on port C6
58UNICODE_ENABLE = no # Unicode 58UNICODE_ENABLE = no # Unicode
59BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID 59BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
60RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. 60RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
61SUBPROJECT_rev1 = yes
62USE_I2C = yes # I2C is used between the sides
63# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 61# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
64SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 62SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
65 63