From 794ae2287670c9bd8b152879bec00522f6e3f7a9 Mon Sep 17 00:00:00 2001 From: drewpyun Date: Mon, 8 May 2023 00:33:59 -0400 Subject: [PATCH 01/11] Initial commit for mercury65 --- .../mercury65/.vscode/c_cpp_properties.json | 21 + keyboards/drewkeys/mercury65/config.h | 31 ++ keyboards/drewkeys/mercury65/info.json | 391 ++++++++++++++++++ .../mercury65/keymaps/default/keymap.c | 33 ++ .../mercury65/keymaps/default/readme.md | 1 + .../drewkeys/mercury65/keymaps/via/keymap.c | 47 +++ .../drewkeys/mercury65/keymaps/via/readme.md | 1 + .../drewkeys/mercury65/keymaps/via/rules.mk | 2 + keyboards/drewkeys/mercury65/mercury65.c | 17 + keyboards/drewkeys/mercury65/mercury65.h | 155 +++++++ keyboards/drewkeys/mercury65/readme.md | 22 + keyboards/drewkeys/mercury65/rules.mk | 13 + 12 files changed, 734 insertions(+) create mode 100644 keyboards/drewkeys/mercury65/.vscode/c_cpp_properties.json create mode 100644 keyboards/drewkeys/mercury65/config.h create mode 100644 keyboards/drewkeys/mercury65/info.json create mode 100644 keyboards/drewkeys/mercury65/keymaps/default/keymap.c create mode 100644 keyboards/drewkeys/mercury65/keymaps/default/readme.md create mode 100644 keyboards/drewkeys/mercury65/keymaps/via/keymap.c create mode 100644 keyboards/drewkeys/mercury65/keymaps/via/readme.md create mode 100644 keyboards/drewkeys/mercury65/keymaps/via/rules.mk create mode 100644 keyboards/drewkeys/mercury65/mercury65.c create mode 100644 keyboards/drewkeys/mercury65/mercury65.h create mode 100644 keyboards/drewkeys/mercury65/readme.md create mode 100644 keyboards/drewkeys/mercury65/rules.mk diff --git a/keyboards/drewkeys/mercury65/.vscode/c_cpp_properties.json b/keyboards/drewkeys/mercury65/.vscode/c_cpp_properties.json new file mode 100644 index 000000000000..7d576baaeafd --- /dev/null +++ b/keyboards/drewkeys/mercury65/.vscode/c_cpp_properties.json @@ -0,0 +1,21 @@ +{ + "configurations": [ + { + "name": "Win32", + "includePath": [ + "${workspaceFolder}/**" + ], + "defines": [ + "_DEBUG", + "UNICODE", + "_UNICODE" + ], + "windowsSdkVersion": "10.0.19041.0", + "compilerPath": "cl.exe", + "cStandard": "c17", + "cppStandard": "c++17", + "intelliSenseMode": "windows-msvc-x64" + } + ], + "version": 4 +} \ No newline at end of file diff --git a/keyboards/drewkeys/mercury65/config.h b/keyboards/drewkeys/mercury65/config.h new file mode 100644 index 000000000000..2ec3e71da86e --- /dev/null +++ b/keyboards/drewkeys/mercury65/config.h @@ -0,0 +1,31 @@ +/* +Copyright 2023 Drewkeys + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#pragma once + + + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 +#define MATRIX_ROW_PINS { D6, D7, B4, B5, D4 } +#define MATRIX_COL_PINS { B6, C6, C7, F6, F5, F4, F7, F1, F0, E6, B7, D0, D1, D2, D3, D5 } + +/* COL2ROW, ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/drewkeys/mercury65/info.json b/keyboards/drewkeys/mercury65/info.json new file mode 100644 index 000000000000..fc608ce99273 --- /dev/null +++ b/keyboards/drewkeys/mercury65/info.json @@ -0,0 +1,391 @@ +{ + "keyboard_name": "Mercury65", + "manufacturer": "Drewkeys", + "url": "https://www.rocketkeyboards.com/collections/mercury65/products/gb-mercury65-keyboard", + "maintainer": "Drewkeys", + "usb": { + "vid": "0xDE43", + "pid": "0x1034", + "device_version": "0.0.1" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "Esc 0,0", "x": 0, "y": 0}, + {"label": "1 0,1", "x": 1, "y": 0}, + {"label": "2 0,2", "x": 2, "y": 0}, + {"label": "3 0,3", "x": 3, "y": 0}, + {"label": "4 0,4", "x": 4, "y": 0}, + {"label": "5 0,5", "x": 5, "y": 0}, + {"label": "6 0,6", "x": 6, "y": 0}, + {"label": "7 0,7", "x": 7, "y": 0}, + {"label": "8 0,8", "x": 8, "y": 0}, + {"label": "9 0,9", "x": 9, "y": 0}, + {"label": "0 0,10", "x": 10, "y": 0}, + {"label": "- 0,11", "x": 11, "y": 0}, + {"label": "= 0,12", "x": 12, "y": 0}, + {"label": "bsp extra 0,13", "x": 13, "y": 0}, + {"label": "bsp 0,14", "x": 14, "y": 0}, + {"label": "del 0,15", "x": 15, "y": 0}, + + {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5}, + {"label": "q 1,2", "x": 1.5, "y": 1}, + {"label": "w 1,3", "x": 2.5, "y": 1}, + {"label": "e 1,4", "x": 3.5, "y": 1}, + {"label": "r 1,5", "x": 4.5, "y": 1}, + {"label": "t 1,6", "x": 5.5, "y": 1}, + {"label": "y 1,7", "x": 6.5, "y": 1}, + {"label": "u 1,8", "x": 7.5, "y": 1}, + {"label": "i 1,9", "x": 8.5, "y": 1}, + {"label": "o 1,10", "x": 9.5, "y": 1}, + {"label": "p 1,11", "x": 10.5, "y": 1}, + {"label": "[ 1,12", "x": 11.5, "y": 1}, + {"label": "] 1,13", "x": 12.5, "y": 1}, + {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5}, + {"label": "home 1,15", "x": 15, "y": 1}, + + {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75}, + {"label": "a 2,2", "x": 1.75, "y": 2}, + {"label": "s 2,3", "x": 2.75, "y": 2}, + {"label": "d 2,4", "x": 3.75, "y": 2}, + {"label": "f 2,5", "x": 4.75, "y": 2}, + {"label": "g 2,6", "x": 5.75, "y": 2}, + {"label": "h 2,7", "x": 6.75, "y": 2}, + {"label": "j 2,8", "x": 7.75, "y": 2}, + {"label": "k 2,9", "x": 8.75, "y": 2}, + {"label": "l 2,10", "x": 9.75, "y": 2}, + {"label": "; 2,11", "x": 10.75, "y": 2}, + {"label": "' 2,12", "x": 11.75, "y": 2}, + {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25}, + {"label": "pg up 2,15", "x": 15, "y": 2}, + + {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25}, + {"label": "z 3,2", "x": 2.25, "y": 3}, + {"label": "x 3,3", "x": 3.25, "y": 3}, + {"label": "c 3,4", "x": 4.25, "y": 3}, + {"label": "v 3,5", "x": 5.25, "y": 3}, + {"label": "b 3,6", "x": 6.25, "y": 3}, + {"label": "n 3,7", "x": 7.25, "y": 3}, + {"label": "m 3,8", "x": 8.25, "y": 3}, + {"label": ", 3,9", "x": 9.25, "y": 3}, + {"label": ". 3,10", "x": 10.25, "y": 3}, + {"label": "/ 3,11", "x": 11.25, "y": 3}, + {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75}, + {"label": "up 3,14", "x": 14, "y": 3}, + {"label": "pg dn 3,15", "x": 15, "y": 3}, + + {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.25}, + {"label": "win 4,1", "x": 1.25, "y": 4, "w": 1.25}, + {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.25}, + {"label": "spacebar 4,6", "x": 3.75, "y": 4, "w": 6.25}, + {"label": "fn 4,10", "x": 10, "y": 4, "w": 1.25}, + {"label": "ctrl 4,11", "x": 11.25, "y": 4, "w": 1.25}, + {"label": "left 4,13", "x": 13, "y": 4}, + {"label": "down 4,14", "x": 14, "y": 4}, + {"label": "right 4,15", "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi": { + "layout": [ + {"label": "Esc 0,0", "x": 0, "y": 0}, + {"label": "1 0,1", "x": 1, "y": 0}, + {"label": "2 0,2", "x": 2, "y": 0}, + {"label": "3 0,3", "x": 3, "y": 0}, + {"label": "4 0,4", "x": 4, "y": 0}, + {"label": "5 0,5", "x": 5, "y": 0}, + {"label": "6 0,6", "x": 6, "y": 0}, + {"label": "7 0,7", "x": 7, "y": 0}, + {"label": "8 0,8", "x": 8, "y": 0}, + {"label": "9 0,9", "x": 9, "y": 0}, + {"label": "0 0,10", "x": 10, "y": 0}, + {"label": "- 0,11", "x": 11, "y": 0}, + {"label": "= 0,12", "x": 12, "y": 0}, + {"label": "bsp 0,14", "x": 13, "y": 0, "w": 2}, + {"label": "del 0,15", "x": 15, "y": 0}, + + {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5}, + {"label": "q 1,2", "x": 1.5, "y": 1}, + {"label": "w 1,3", "x": 2.5, "y": 1}, + {"label": "e 1,4", "x": 3.5, "y": 1}, + {"label": "r 1,5", "x": 4.5, "y": 1}, + {"label": "t 1,6", "x": 5.5, "y": 1}, + {"label": "y 1,7", "x": 6.5, "y": 1}, + {"label": "u 1,8", "x": 7.5, "y": 1}, + {"label": "i 1,9", "x": 8.5, "y": 1}, + {"label": "o 1,10", "x": 9.5, "y": 1}, + {"label": "p 1,11", "x": 10.5, "y": 1}, + {"label": "[ 1,12", "x": 11.5, "y": 1}, + {"label": "] 1,13", "x": 12.5, "y": 1}, + {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5}, + {"label": "home 1,15", "x": 15, "y": 1}, + + {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75}, + {"label": "a 2,2", "x": 1.75, "y": 2}, + {"label": "s 2,3", "x": 2.75, "y": 2}, + {"label": "d 2,4", "x": 3.75, "y": 2}, + {"label": "f 2,5", "x": 4.75, "y": 2}, + {"label": "g 2,6", "x": 5.75, "y": 2}, + {"label": "h 2,7", "x": 6.75, "y": 2}, + {"label": "j 2,8", "x": 7.75, "y": 2}, + {"label": "k 2,9", "x": 8.75, "y": 2}, + {"label": "l 2,10", "x": 9.75, "y": 2}, + {"label": "; 2,11", "x": 10.75, "y": 2}, + {"label": "' 2,12", "x": 11.75, "y": 2}, + {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25}, + {"label": "pg up 2,15", "x": 15, "y": 2}, + + {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25}, + {"label": "z 3,2", "x": 2.25, "y": 3}, + {"label": "x 3,3", "x": 3.25, "y": 3}, + {"label": "c 3,4", "x": 4.25, "y": 3}, + {"label": "v 3,5", "x": 5.25, "y": 3}, + {"label": "b 3,6", "x": 6.25, "y": 3}, + {"label": "n 3,7", "x": 7.25, "y": 3}, + {"label": "m 3,8", "x": 8.25, "y": 3}, + {"label": ", 3,9", "x": 9.25, "y": 3}, + {"label": ". 3,10", "x": 10.25, "y": 3}, + {"label": "/ 3,11", "x": 11.25, "y": 3}, + {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75}, + {"label": "up 3,14", "x": 14, "y": 3}, + {"label": "pg dn 3,15", "x": 15, "y": 3}, + + {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.25}, + {"label": "win 4,1", "x": 1.25, "y": 4, "w": 1.25}, + {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.25}, + {"label": "spacebar 4,6", "x": 3.75, "y": 4, "w": 6.25}, + {"label": "fn 4,10", "x": 10, "y": 4, "w": 1.25}, + {"label": "ctrl 4,11", "x": 11.25, "y": 4, "w": 1.25}, + {"label": "left 4,13", "x": 13, "y": 4}, + {"label": "down 4,14", "x": 14, "y": 4}, + {"label": "right 4,15", "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_split_bs": { + "layout": [ + {"label": "Esc 0,0", "x": 0, "y": 0}, + {"label": "1 0,1", "x": 1, "y": 0}, + {"label": "2 0,2", "x": 2, "y": 0}, + {"label": "3 0,3", "x": 3, "y": 0}, + {"label": "4 0,4", "x": 4, "y": 0}, + {"label": "5 0,5", "x": 5, "y": 0}, + {"label": "6 0,6", "x": 6, "y": 0}, + {"label": "7 0,7", "x": 7, "y": 0}, + {"label": "8 0,8", "x": 8, "y": 0}, + {"label": "9 0,9", "x": 9, "y": 0}, + {"label": "0 0,10", "x": 10, "y": 0}, + {"label": "- 0,11", "x": 11, "y": 0}, + {"label": "= 0,12", "x": 12, "y": 0}, + {"label": "bsp extra 0,13", "x": 13, "y": 0}, + {"label": "bsp 0,14", "x": 14, "y": 0}, + {"label": "del 0,15", "x": 15, "y": 0}, + + {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5}, + {"label": "q 1,2", "x": 1.5, "y": 1}, + {"label": "w 1,3", "x": 2.5, "y": 1}, + {"label": "e 1,4", "x": 3.5, "y": 1}, + {"label": "r 1,5", "x": 4.5, "y": 1}, + {"label": "t 1,6", "x": 5.5, "y": 1}, + {"label": "y 1,7", "x": 6.5, "y": 1}, + {"label": "u 1,8", "x": 7.5, "y": 1}, + {"label": "i 1,9", "x": 8.5, "y": 1}, + {"label": "o 1,10", "x": 9.5, "y": 1}, + {"label": "p 1,11", "x": 10.5, "y": 1}, + {"label": "[ 1,12", "x": 11.5, "y": 1}, + {"label": "] 1,13", "x": 12.5, "y": 1}, + {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5}, + {"label": "home 1,15", "x": 15, "y": 1}, + + {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75}, + {"label": "a 2,2", "x": 1.75, "y": 2}, + {"label": "s 2,3", "x": 2.75, "y": 2}, + {"label": "d 2,4", "x": 3.75, "y": 2}, + {"label": "f 2,5", "x": 4.75, "y": 2}, + {"label": "g 2,6", "x": 5.75, "y": 2}, + {"label": "h 2,7", "x": 6.75, "y": 2}, + {"label": "j 2,8", "x": 7.75, "y": 2}, + {"label": "k 2,9", "x": 8.75, "y": 2}, + {"label": "l 2,10", "x": 9.75, "y": 2}, + {"label": "; 2,11", "x": 10.75, "y": 2}, + {"label": "' 2,12", "x": 11.75, "y": 2}, + {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25}, + {"label": "pg up 2,15", "x": 15, "y": 2}, + + {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25}, + {"label": "z 3,2", "x": 2.25, "y": 3}, + {"label": "x 3,3", "x": 3.25, "y": 3}, + {"label": "c 3,4", "x": 4.25, "y": 3}, + {"label": "v 3,5", "x": 5.25, "y": 3}, + {"label": "b 3,6", "x": 6.25, "y": 3}, + {"label": "n 3,7", "x": 7.25, "y": 3}, + {"label": "m 3,8", "x": 8.25, "y": 3}, + {"label": ", 3,9", "x": 9.25, "y": 3}, + {"label": ". 3,10", "x": 10.25, "y": 3}, + {"label": "/ 3,11", "x": 11.25, "y": 3}, + {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75}, + {"label": "up 3,14", "x": 14, "y": 3}, + {"label": "pg dn 3,15", "x": 15, "y": 3}, + + {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.25}, + {"label": "win 4,1", "x": 1.25, "y": 4, "w": 1.25}, + {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.25}, + {"label": "spacebar 4,6", "x": 3.75, "y": 4, "w": 6.25}, + {"label": "fn 4,10", "x": 10, "y": 4, "w": 1.25}, + {"label": "ctrl 4,11", "x": 11.25, "y": 4, "w": 1.25}, + {"label": "left 4,13", "x": 13, "y": 4}, + {"label": "down 4,14", "x": 14, "y": 4}, + {"label": "right 4,15", "x": 15, "y": 4} + ] + }, + "LAYOUT_65_tsangan": { + "layout": [ + {"label": "Esc 0,0", "x": 0, "y": 0}, + {"label": "1 0,1", "x": 1, "y": 0}, + {"label": "2 0,2", "x": 2, "y": 0}, + {"label": "3 0,3", "x": 3, "y": 0}, + {"label": "4 0,4", "x": 4, "y": 0}, + {"label": "5 0,5", "x": 5, "y": 0}, + {"label": "6 0,6", "x": 6, "y": 0}, + {"label": "7 0,7", "x": 7, "y": 0}, + {"label": "8 0,8", "x": 8, "y": 0}, + {"label": "9 0,9", "x": 9, "y": 0}, + {"label": "0 0,10", "x": 10, "y": 0}, + {"label": "- 0,11", "x": 11, "y": 0}, + {"label": "= 0,12", "x": 12, "y": 0}, + {"label": "bsp 0,14", "x": 13, "y": 0, "w": 2}, + {"label": "del 0,15", "x": 15, "y": 0}, + + {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5}, + {"label": "q 1,2", "x": 1.5, "y": 1}, + {"label": "w 1,3", "x": 2.5, "y": 1}, + {"label": "e 1,4", "x": 3.5, "y": 1}, + {"label": "r 1,5", "x": 4.5, "y": 1}, + {"label": "t 1,6", "x": 5.5, "y": 1}, + {"label": "y 1,7", "x": 6.5, "y": 1}, + {"label": "u 1,8", "x": 7.5, "y": 1}, + {"label": "i 1,9", "x": 8.5, "y": 1}, + {"label": "o 1,10", "x": 9.5, "y": 1}, + {"label": "p 1,11", "x": 10.5, "y": 1}, + {"label": "[ 1,12", "x": 11.5, "y": 1}, + {"label": "] 1,13", "x": 12.5, "y": 1}, + {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5}, + {"label": "home 1,15", "x": 15, "y": 1}, + + {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75}, + {"label": "a 2,2", "x": 1.75, "y": 2}, + {"label": "s 2,3", "x": 2.75, "y": 2}, + {"label": "d 2,4", "x": 3.75, "y": 2}, + {"label": "f 2,5", "x": 4.75, "y": 2}, + {"label": "g 2,6", "x": 5.75, "y": 2}, + {"label": "h 2,7", "x": 6.75, "y": 2}, + {"label": "j 2,8", "x": 7.75, "y": 2}, + {"label": "k 2,9", "x": 8.75, "y": 2}, + {"label": "l 2,10", "x": 9.75, "y": 2}, + {"label": "; 2,11", "x": 10.75, "y": 2}, + {"label": "' 2,12", "x": 11.75, "y": 2}, + {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25}, + {"label": "pg up 2,15", "x": 15, "y": 2}, + + {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25}, + {"label": "z 3,2", "x": 2.25, "y": 3}, + {"label": "x 3,3", "x": 3.25, "y": 3}, + {"label": "c 3,4", "x": 4.25, "y": 3}, + {"label": "v 3,5", "x": 5.25, "y": 3}, + {"label": "b 3,6", "x": 6.25, "y": 3}, + {"label": "n 3,7", "x": 7.25, "y": 3}, + {"label": "m 3,8", "x": 8.25, "y": 3}, + {"label": ", 3,9", "x": 9.25, "y": 3}, + {"label": ". 3,10", "x": 10.25, "y": 3}, + {"label": "/ 3,11", "x": 11.25, "y": 3}, + {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75}, + {"label": "up 3,14", "x": 14, "y": 3}, + {"label": "pg dn 3,15", "x": 15, "y": 3}, + + {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.5}, + {"label": "win 4,1", "x": 1.5, "y": 4}, + {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.5}, + {"label": "spacebar 4,6", "x": 4, "y": 4, "w": 7}, + {"label": "ctrl 4,11", "x": 11, "y": 4, "w": 1.5}, + {"label": "left 4,13", "x": 13, "y": 4}, + {"label": "down 4,14", "x": 14, "y": 4}, + {"label": "right 4,15", "x": 15, "y": 4} + ] + }, + "LAYOUT_65_tsangan_split_bs": { + "layout": [ + {"label": "Esc 0,0", "x": 0, "y": 0}, + {"label": "1 0,1", "x": 1, "y": 0}, + {"label": "2 0,2", "x": 2, "y": 0}, + {"label": "3 0,3", "x": 3, "y": 0}, + {"label": "4 0,4", "x": 4, "y": 0}, + {"label": "5 0,5", "x": 5, "y": 0}, + {"label": "6 0,6", "x": 6, "y": 0}, + {"label": "7 0,7", "x": 7, "y": 0}, + {"label": "8 0,8", "x": 8, "y": 0}, + {"label": "9 0,9", "x": 9, "y": 0}, + {"label": "0 0,10", "x": 10, "y": 0}, + {"label": "- 0,11", "x": 11, "y": 0}, + {"label": "= 0,12", "x": 12, "y": 0}, + {"label": "bsp extra 0,13", "x": 13, "y": 0}, + {"label": "bsp 0,14", "x": 14, "y": 0}, + {"label": "del 0,15", "x": 15, "y": 0}, + + {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5}, + {"label": "q 1,2", "x": 1.5, "y": 1}, + {"label": "w 1,3", "x": 2.5, "y": 1}, + {"label": "e 1,4", "x": 3.5, "y": 1}, + {"label": "r 1,5", "x": 4.5, "y": 1}, + {"label": "t 1,6", "x": 5.5, "y": 1}, + {"label": "y 1,7", "x": 6.5, "y": 1}, + {"label": "u 1,8", "x": 7.5, "y": 1}, + {"label": "i 1,9", "x": 8.5, "y": 1}, + {"label": "o 1,10", "x": 9.5, "y": 1}, + {"label": "p 1,11", "x": 10.5, "y": 1}, + {"label": "[ 1,12", "x": 11.5, "y": 1}, + {"label": "] 1,13", "x": 12.5, "y": 1}, + {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5}, + {"label": "home 1,15", "x": 15, "y": 1}, + + {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75}, + {"label": "a 2,2", "x": 1.75, "y": 2}, + {"label": "s 2,3", "x": 2.75, "y": 2}, + {"label": "d 2,4", "x": 3.75, "y": 2}, + {"label": "f 2,5", "x": 4.75, "y": 2}, + {"label": "g 2,6", "x": 5.75, "y": 2}, + {"label": "h 2,7", "x": 6.75, "y": 2}, + {"label": "j 2,8", "x": 7.75, "y": 2}, + {"label": "k 2,9", "x": 8.75, "y": 2}, + {"label": "l 2,10", "x": 9.75, "y": 2}, + {"label": "; 2,11", "x": 10.75, "y": 2}, + {"label": "' 2,12", "x": 11.75, "y": 2}, + {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25}, + {"label": "pg up 2,15", "x": 15, "y": 2}, + + {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25}, + {"label": "z 3,2", "x": 2.25, "y": 3}, + {"label": "x 3,3", "x": 3.25, "y": 3}, + {"label": "c 3,4", "x": 4.25, "y": 3}, + {"label": "v 3,5", "x": 5.25, "y": 3}, + {"label": "b 3,6", "x": 6.25, "y": 3}, + {"label": "n 3,7", "x": 7.25, "y": 3}, + {"label": "m 3,8", "x": 8.25, "y": 3}, + {"label": ", 3,9", "x": 9.25, "y": 3}, + {"label": ". 3,10", "x": 10.25, "y": 3}, + {"label": "/ 3,11", "x": 11.25, "y": 3}, + {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75}, + {"label": "up 3,14", "x": 14, "y": 3}, + {"label": "pg dn 3,15", "x": 15, "y": 3}, + + {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.5}, + {"label": "win 4,1", "x": 1.5, "y": 4}, + {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.5}, + {"label": "spacebar 4,6", "x": 4, "y": 4, "w": 7}, + {"label": "ctrl 4,11", "x": 11, "y": 4, "w": 1.5}, + {"label": "left 4,13", "x": 13, "y": 4}, + {"label": "down 4,14", "x": 14, "y": 4}, + {"label": "right 4,15", "x": 15, "y": 4} + ] + } + } +} diff --git a/keyboards/drewkeys/mercury65/keymaps/default/keymap.c b/keyboards/drewkeys/mercury65/keymaps/default/keymap.c new file mode 100644 index 000000000000..6a9f15ad0de0 --- /dev/null +++ b/keyboards/drewkeys/mercury65/keymaps/default/keymap.c @@ -0,0 +1,33 @@ +/* Copyright 2023 Drewkeys + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + LAYOUT( + QK_GESC, 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_DEL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_INS, + 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_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + LAYOUT( + KC_GRAVE, 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_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; diff --git a/keyboards/drewkeys/mercury65/keymaps/default/readme.md b/keyboards/drewkeys/mercury65/keymaps/default/readme.md new file mode 100644 index 000000000000..4d0f2efda45f --- /dev/null +++ b/keyboards/drewkeys/mercury65/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for mercury65 -- both hotswap and soldered diff --git a/keyboards/drewkeys/mercury65/keymaps/via/keymap.c b/keyboards/drewkeys/mercury65/keymaps/via/keymap.c new file mode 100644 index 000000000000..67c846780fed --- /dev/null +++ b/keyboards/drewkeys/mercury65/keymaps/via/keymap.c @@ -0,0 +1,47 @@ +/* Copyright 2023 Drewkeys + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] LAYOUT( + QK_GESC, 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_DEL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_INS, + 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_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] LAYOUT( + KC_GRAVE, 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_TRNS, QK_BOOT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [2] LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [3] LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; diff --git a/keyboards/drewkeys/mercury65/keymaps/via/readme.md b/keyboards/drewkeys/mercury65/keymaps/via/readme.md new file mode 100644 index 000000000000..e6e65936db2a --- /dev/null +++ b/keyboards/drewkeys/mercury65/keymaps/via/readme.md @@ -0,0 +1 @@ +# The default keymap for mercury65 for via diff --git a/keyboards/drewkeys/mercury65/keymaps/via/rules.mk b/keyboards/drewkeys/mercury65/keymaps/via/rules.mk new file mode 100644 index 000000000000..36b7ba9cbc98 --- /dev/null +++ b/keyboards/drewkeys/mercury65/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/drewkeys/mercury65/mercury65.c b/keyboards/drewkeys/mercury65/mercury65.c new file mode 100644 index 000000000000..5568eee2dedc --- /dev/null +++ b/keyboards/drewkeys/mercury65/mercury65.c @@ -0,0 +1,17 @@ +/* Copyright 2023 Drewkeys + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "mercury65.h" diff --git a/keyboards/drewkeys/mercury65/mercury65.h b/keyboards/drewkeys/mercury65/mercury65.h new file mode 100644 index 000000000000..dfda3f21fa19 --- /dev/null +++ b/keyboards/drewkeys/mercury65/mercury65.h @@ -0,0 +1,155 @@ +/* Copyright 2023 Drewkeys + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#include "quantum.h" +// Corresponding changes to the layout names and/or definitions must also be made to info.json + +/* Standard arrangement / LAYOUT + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤ + * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │1f │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤ + * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │2f │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤ + * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │3f │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤ + * │40 │41 │43 │ 46 │4a │4b │▓│4d │4e │4f │ + * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘ +*/ +#define LAYOUT( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ + k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \ + k40, k41, k42, k46, k4A, k4B, k4D, k4E, k4F \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ + { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ + { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, KC_NO, k2F }, \ + { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, k3E, k3F }, \ + { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E, k4F } \ +} + +/* Standard arrangement / 65 ANSI + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e │0f │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤───┤ + * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │1f │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤ + * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │2f │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤ + * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │3f │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤ + * │40 │41 │43 │ 46 │4a │4b │ │4d │4e │4f │ + * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘ +*/ +#define LAYOUT_65_ansi( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, \ + k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \ + k40, k41, k42, k46, k4A, k4B, k4D, k4E, k4F \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, KC_NO, k0E, k0F }, \ + { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ + { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, KC_NO, k2F }, \ + { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, k3E, k3F }, \ + { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E, k4F } \ +} + +/* Standard arrangement / 65 ANSI SPLIT + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤ + * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │1f │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤ + * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │2f │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤ + * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │3f │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤ + * │40 │41 │43 │ 46 │4a │4b │ │4d │4e │4f │ + * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘ +*/ +#define LAYOUT_65_ansi_split_bs( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ + k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \ + k40, k41, k42, k46, k4A, k4B, k4D, k4E, k4F \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ + { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ + { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, KC_NO, k2F }, \ + { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, k3E, k3F }, \ + { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E, k4F } \ +} + +/* Standard arrangement / 65 TSANGAN + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e │0f │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤───┤ + * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │1f │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤ + * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │2f │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤ + * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │3f │ + * ├─────┬─┴─┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┬┴───┬┴┬───┼───┤───┤ + * │40 │41 │43 │ 46 │4b │ │4d │4e │4f │ + * └─────┴───┴────┴─────────────────────────────┴────┴ ┴───┴───┘───┘ +*/ +#define LAYOUT_65_tsangan( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, \ + k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \ + k40, k41, k42, k46, k4B, k4D, k4E, k4F \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, KC_NO, k0E, k0F }, \ + { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ + { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, KC_NO, k2F }, \ + { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, k3E, k3F }, \ + { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k4B, KC_NO, k4D, k4E, k4F } \ +} + +/* Standard arrangement / 65 TSANGAN SPLIT + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤ + * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │1f │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤ + * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │2f │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤ + * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │3f │ + * ├─────┬─┴─┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┬┴───┬┴┬───┼───┤───┤ + * │40 │41 │43 │ 46 │4b │ │4d │4e │4f │ + * └─────┴───┴────┴─────────────────────────────┴────┴ ┴───┴───┘───┘ +*/ +#define LAYOUT_65_tsangan_split_bs( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ + k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \ + k40, k41, k42, k46, k4B, k4D, k4E, k4F \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ + { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ + { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, KC_NO, k2F }, \ + { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, k3E, k3F }, \ + { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k4B, KC_NO, k4D, k4E, k4F } \ +} diff --git a/keyboards/drewkeys/mercury65/readme.md b/keyboards/drewkeys/mercury65/readme.md new file mode 100644 index 000000000000..cfd46dffc900 --- /dev/null +++ b/keyboards/drewkeys/mercury65/readme.md @@ -0,0 +1,22 @@ +# Mercury65 + +![Mercury65](https://i.imgur.com/rjfARj3.jpeg) + +*65% Form Factor with a Separated Arrow Cluster used for Mercury65* + + +* Keyboard Maintainer: [Drewkeys](https://github.com/drewpyun) +* Hardware Supported: Made specifically for Mercury65, 65% hotswap supported +* Hardware Availability: https://www.rocketkeyboards.com/collections/mercury65/products/gb-mercury65-keyboard + +Make example for this keyboard (after setting up your build environment): + + make drewkeys/mercury65:default + +Flashing example for this keyboard: + + make drewkeys/mercury65:default:flash + +Resetting Board: Press the button on the PCB next to the spacebar to soft reset the board to reflash (bootloader mode). + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/drewkeys/mercury65/rules.mk b/keyboards/drewkeys/mercury65/rules.mk new file mode 100644 index 000000000000..db678d6eadf0 --- /dev/null +++ b/keyboards/drewkeys/mercury65/rules.mk @@ -0,0 +1,13 @@ +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +LTO_ENABLE = yes From 9be8e87d6e5ef94dc2843587bcb9dabf2493a59a Mon Sep 17 00:00:00 2001 From: drewpyun Date: Mon, 8 May 2023 23:02:51 -0400 Subject: [PATCH 02/11] finalized mercury65 for merge into official repo --- .../mercury65/.vscode/c_cpp_properties.json | 21 - keyboards/drewkeys/mercury65/config.h | 38 +- keyboards/drewkeys/mercury65/info.json | 382 +----------------- .../mercury65/keymaps/default/keymap.c | 36 +- .../drewkeys/mercury65/keymaps/via/keymap.c | 72 ++-- .../drewkeys/mercury65/keymaps/via/rules.mk | 3 +- keyboards/drewkeys/mercury65/mercury65.h | 146 +------ keyboards/drewkeys/mercury65/rules.mk | 12 +- 8 files changed, 134 insertions(+), 576 deletions(-) delete mode 100644 keyboards/drewkeys/mercury65/.vscode/c_cpp_properties.json diff --git a/keyboards/drewkeys/mercury65/.vscode/c_cpp_properties.json b/keyboards/drewkeys/mercury65/.vscode/c_cpp_properties.json deleted file mode 100644 index 7d576baaeafd..000000000000 --- a/keyboards/drewkeys/mercury65/.vscode/c_cpp_properties.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "configurations": [ - { - "name": "Win32", - "includePath": [ - "${workspaceFolder}/**" - ], - "defines": [ - "_DEBUG", - "UNICODE", - "_UNICODE" - ], - "windowsSdkVersion": "10.0.19041.0", - "compilerPath": "cl.exe", - "cStandard": "c17", - "cppStandard": "c++17", - "intelliSenseMode": "windows-msvc-x64" - } - ], - "version": 4 -} \ No newline at end of file diff --git a/keyboards/drewkeys/mercury65/config.h b/keyboards/drewkeys/mercury65/config.h index 2ec3e71da86e..cd55392435bb 100644 --- a/keyboards/drewkeys/mercury65/config.h +++ b/keyboards/drewkeys/mercury65/config.h @@ -17,15 +17,43 @@ along with this program. If not, see . #pragma once +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { D5, D4, D6, D0, E6 } +#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D1, D2, D3, D7, B4, B5, B6, C6, C7, F7, F6, F5 } +#define DIODE_DIRECTION COL2ROW - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 -#define MATRIX_ROW_PINS { D6, D7, B4, B5, D4 } -#define MATRIX_COL_PINS { B6, C6, C7, F6, F5, F4, F7, F1, F0, E6, B7, D0, D1, D2, D3, D5 } +/* + * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. + */ +#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT diff --git a/keyboards/drewkeys/mercury65/info.json b/keyboards/drewkeys/mercury65/info.json index fc608ce99273..50adcc6c3c50 100644 --- a/keyboards/drewkeys/mercury65/info.json +++ b/keyboards/drewkeys/mercury65/info.json @@ -1,6 +1,6 @@ { - "keyboard_name": "Mercury65", - "manufacturer": "Drewkeys", + "keyboard_name": "mercury65", + "manufacturer": "RocketKeyboards", "url": "https://www.rocketkeyboards.com/collections/mercury65/products/gb-mercury65-keyboard", "maintainer": "Drewkeys", "usb": { @@ -11,381 +11,9 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { - "LAYOUT": { - "layout": [ - {"label": "Esc 0,0", "x": 0, "y": 0}, - {"label": "1 0,1", "x": 1, "y": 0}, - {"label": "2 0,2", "x": 2, "y": 0}, - {"label": "3 0,3", "x": 3, "y": 0}, - {"label": "4 0,4", "x": 4, "y": 0}, - {"label": "5 0,5", "x": 5, "y": 0}, - {"label": "6 0,6", "x": 6, "y": 0}, - {"label": "7 0,7", "x": 7, "y": 0}, - {"label": "8 0,8", "x": 8, "y": 0}, - {"label": "9 0,9", "x": 9, "y": 0}, - {"label": "0 0,10", "x": 10, "y": 0}, - {"label": "- 0,11", "x": 11, "y": 0}, - {"label": "= 0,12", "x": 12, "y": 0}, - {"label": "bsp extra 0,13", "x": 13, "y": 0}, - {"label": "bsp 0,14", "x": 14, "y": 0}, - {"label": "del 0,15", "x": 15, "y": 0}, - - {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5}, - {"label": "q 1,2", "x": 1.5, "y": 1}, - {"label": "w 1,3", "x": 2.5, "y": 1}, - {"label": "e 1,4", "x": 3.5, "y": 1}, - {"label": "r 1,5", "x": 4.5, "y": 1}, - {"label": "t 1,6", "x": 5.5, "y": 1}, - {"label": "y 1,7", "x": 6.5, "y": 1}, - {"label": "u 1,8", "x": 7.5, "y": 1}, - {"label": "i 1,9", "x": 8.5, "y": 1}, - {"label": "o 1,10", "x": 9.5, "y": 1}, - {"label": "p 1,11", "x": 10.5, "y": 1}, - {"label": "[ 1,12", "x": 11.5, "y": 1}, - {"label": "] 1,13", "x": 12.5, "y": 1}, - {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5}, - {"label": "home 1,15", "x": 15, "y": 1}, - - {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75}, - {"label": "a 2,2", "x": 1.75, "y": 2}, - {"label": "s 2,3", "x": 2.75, "y": 2}, - {"label": "d 2,4", "x": 3.75, "y": 2}, - {"label": "f 2,5", "x": 4.75, "y": 2}, - {"label": "g 2,6", "x": 5.75, "y": 2}, - {"label": "h 2,7", "x": 6.75, "y": 2}, - {"label": "j 2,8", "x": 7.75, "y": 2}, - {"label": "k 2,9", "x": 8.75, "y": 2}, - {"label": "l 2,10", "x": 9.75, "y": 2}, - {"label": "; 2,11", "x": 10.75, "y": 2}, - {"label": "' 2,12", "x": 11.75, "y": 2}, - {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25}, - {"label": "pg up 2,15", "x": 15, "y": 2}, - - {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25}, - {"label": "z 3,2", "x": 2.25, "y": 3}, - {"label": "x 3,3", "x": 3.25, "y": 3}, - {"label": "c 3,4", "x": 4.25, "y": 3}, - {"label": "v 3,5", "x": 5.25, "y": 3}, - {"label": "b 3,6", "x": 6.25, "y": 3}, - {"label": "n 3,7", "x": 7.25, "y": 3}, - {"label": "m 3,8", "x": 8.25, "y": 3}, - {"label": ", 3,9", "x": 9.25, "y": 3}, - {"label": ". 3,10", "x": 10.25, "y": 3}, - {"label": "/ 3,11", "x": 11.25, "y": 3}, - {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75}, - {"label": "up 3,14", "x": 14, "y": 3}, - {"label": "pg dn 3,15", "x": 15, "y": 3}, - - {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.25}, - {"label": "win 4,1", "x": 1.25, "y": 4, "w": 1.25}, - {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.25}, - {"label": "spacebar 4,6", "x": 3.75, "y": 4, "w": 6.25}, - {"label": "fn 4,10", "x": 10, "y": 4, "w": 1.25}, - {"label": "ctrl 4,11", "x": 11.25, "y": 4, "w": 1.25}, - {"label": "left 4,13", "x": 13, "y": 4}, - {"label": "down 4,14", "x": 14, "y": 4}, - {"label": "right 4,15", "x": 15, "y": 4} - ] - }, - "LAYOUT_65_ansi": { - "layout": [ - {"label": "Esc 0,0", "x": 0, "y": 0}, - {"label": "1 0,1", "x": 1, "y": 0}, - {"label": "2 0,2", "x": 2, "y": 0}, - {"label": "3 0,3", "x": 3, "y": 0}, - {"label": "4 0,4", "x": 4, "y": 0}, - {"label": "5 0,5", "x": 5, "y": 0}, - {"label": "6 0,6", "x": 6, "y": 0}, - {"label": "7 0,7", "x": 7, "y": 0}, - {"label": "8 0,8", "x": 8, "y": 0}, - {"label": "9 0,9", "x": 9, "y": 0}, - {"label": "0 0,10", "x": 10, "y": 0}, - {"label": "- 0,11", "x": 11, "y": 0}, - {"label": "= 0,12", "x": 12, "y": 0}, - {"label": "bsp 0,14", "x": 13, "y": 0, "w": 2}, - {"label": "del 0,15", "x": 15, "y": 0}, - - {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5}, - {"label": "q 1,2", "x": 1.5, "y": 1}, - {"label": "w 1,3", "x": 2.5, "y": 1}, - {"label": "e 1,4", "x": 3.5, "y": 1}, - {"label": "r 1,5", "x": 4.5, "y": 1}, - {"label": "t 1,6", "x": 5.5, "y": 1}, - {"label": "y 1,7", "x": 6.5, "y": 1}, - {"label": "u 1,8", "x": 7.5, "y": 1}, - {"label": "i 1,9", "x": 8.5, "y": 1}, - {"label": "o 1,10", "x": 9.5, "y": 1}, - {"label": "p 1,11", "x": 10.5, "y": 1}, - {"label": "[ 1,12", "x": 11.5, "y": 1}, - {"label": "] 1,13", "x": 12.5, "y": 1}, - {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5}, - {"label": "home 1,15", "x": 15, "y": 1}, - - {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75}, - {"label": "a 2,2", "x": 1.75, "y": 2}, - {"label": "s 2,3", "x": 2.75, "y": 2}, - {"label": "d 2,4", "x": 3.75, "y": 2}, - {"label": "f 2,5", "x": 4.75, "y": 2}, - {"label": "g 2,6", "x": 5.75, "y": 2}, - {"label": "h 2,7", "x": 6.75, "y": 2}, - {"label": "j 2,8", "x": 7.75, "y": 2}, - {"label": "k 2,9", "x": 8.75, "y": 2}, - {"label": "l 2,10", "x": 9.75, "y": 2}, - {"label": "; 2,11", "x": 10.75, "y": 2}, - {"label": "' 2,12", "x": 11.75, "y": 2}, - {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25}, - {"label": "pg up 2,15", "x": 15, "y": 2}, - - {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25}, - {"label": "z 3,2", "x": 2.25, "y": 3}, - {"label": "x 3,3", "x": 3.25, "y": 3}, - {"label": "c 3,4", "x": 4.25, "y": 3}, - {"label": "v 3,5", "x": 5.25, "y": 3}, - {"label": "b 3,6", "x": 6.25, "y": 3}, - {"label": "n 3,7", "x": 7.25, "y": 3}, - {"label": "m 3,8", "x": 8.25, "y": 3}, - {"label": ", 3,9", "x": 9.25, "y": 3}, - {"label": ". 3,10", "x": 10.25, "y": 3}, - {"label": "/ 3,11", "x": 11.25, "y": 3}, - {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75}, - {"label": "up 3,14", "x": 14, "y": 3}, - {"label": "pg dn 3,15", "x": 15, "y": 3}, - - {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.25}, - {"label": "win 4,1", "x": 1.25, "y": 4, "w": 1.25}, - {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.25}, - {"label": "spacebar 4,6", "x": 3.75, "y": 4, "w": 6.25}, - {"label": "fn 4,10", "x": 10, "y": 4, "w": 1.25}, - {"label": "ctrl 4,11", "x": 11.25, "y": 4, "w": 1.25}, - {"label": "left 4,13", "x": 13, "y": 4}, - {"label": "down 4,14", "x": 14, "y": 4}, - {"label": "right 4,15", "x": 15, "y": 4} - ] - }, - "LAYOUT_65_ansi_split_bs": { - "layout": [ - {"label": "Esc 0,0", "x": 0, "y": 0}, - {"label": "1 0,1", "x": 1, "y": 0}, - {"label": "2 0,2", "x": 2, "y": 0}, - {"label": "3 0,3", "x": 3, "y": 0}, - {"label": "4 0,4", "x": 4, "y": 0}, - {"label": "5 0,5", "x": 5, "y": 0}, - {"label": "6 0,6", "x": 6, "y": 0}, - {"label": "7 0,7", "x": 7, "y": 0}, - {"label": "8 0,8", "x": 8, "y": 0}, - {"label": "9 0,9", "x": 9, "y": 0}, - {"label": "0 0,10", "x": 10, "y": 0}, - {"label": "- 0,11", "x": 11, "y": 0}, - {"label": "= 0,12", "x": 12, "y": 0}, - {"label": "bsp extra 0,13", "x": 13, "y": 0}, - {"label": "bsp 0,14", "x": 14, "y": 0}, - {"label": "del 0,15", "x": 15, "y": 0}, - - {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5}, - {"label": "q 1,2", "x": 1.5, "y": 1}, - {"label": "w 1,3", "x": 2.5, "y": 1}, - {"label": "e 1,4", "x": 3.5, "y": 1}, - {"label": "r 1,5", "x": 4.5, "y": 1}, - {"label": "t 1,6", "x": 5.5, "y": 1}, - {"label": "y 1,7", "x": 6.5, "y": 1}, - {"label": "u 1,8", "x": 7.5, "y": 1}, - {"label": "i 1,9", "x": 8.5, "y": 1}, - {"label": "o 1,10", "x": 9.5, "y": 1}, - {"label": "p 1,11", "x": 10.5, "y": 1}, - {"label": "[ 1,12", "x": 11.5, "y": 1}, - {"label": "] 1,13", "x": 12.5, "y": 1}, - {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5}, - {"label": "home 1,15", "x": 15, "y": 1}, - - {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75}, - {"label": "a 2,2", "x": 1.75, "y": 2}, - {"label": "s 2,3", "x": 2.75, "y": 2}, - {"label": "d 2,4", "x": 3.75, "y": 2}, - {"label": "f 2,5", "x": 4.75, "y": 2}, - {"label": "g 2,6", "x": 5.75, "y": 2}, - {"label": "h 2,7", "x": 6.75, "y": 2}, - {"label": "j 2,8", "x": 7.75, "y": 2}, - {"label": "k 2,9", "x": 8.75, "y": 2}, - {"label": "l 2,10", "x": 9.75, "y": 2}, - {"label": "; 2,11", "x": 10.75, "y": 2}, - {"label": "' 2,12", "x": 11.75, "y": 2}, - {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25}, - {"label": "pg up 2,15", "x": 15, "y": 2}, - - {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25}, - {"label": "z 3,2", "x": 2.25, "y": 3}, - {"label": "x 3,3", "x": 3.25, "y": 3}, - {"label": "c 3,4", "x": 4.25, "y": 3}, - {"label": "v 3,5", "x": 5.25, "y": 3}, - {"label": "b 3,6", "x": 6.25, "y": 3}, - {"label": "n 3,7", "x": 7.25, "y": 3}, - {"label": "m 3,8", "x": 8.25, "y": 3}, - {"label": ", 3,9", "x": 9.25, "y": 3}, - {"label": ". 3,10", "x": 10.25, "y": 3}, - {"label": "/ 3,11", "x": 11.25, "y": 3}, - {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75}, - {"label": "up 3,14", "x": 14, "y": 3}, - {"label": "pg dn 3,15", "x": 15, "y": 3}, - - {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.25}, - {"label": "win 4,1", "x": 1.25, "y": 4, "w": 1.25}, - {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.25}, - {"label": "spacebar 4,6", "x": 3.75, "y": 4, "w": 6.25}, - {"label": "fn 4,10", "x": 10, "y": 4, "w": 1.25}, - {"label": "ctrl 4,11", "x": 11.25, "y": 4, "w": 1.25}, - {"label": "left 4,13", "x": 13, "y": 4}, - {"label": "down 4,14", "x": 14, "y": 4}, - {"label": "right 4,15", "x": 15, "y": 4} - ] - }, - "LAYOUT_65_tsangan": { - "layout": [ - {"label": "Esc 0,0", "x": 0, "y": 0}, - {"label": "1 0,1", "x": 1, "y": 0}, - {"label": "2 0,2", "x": 2, "y": 0}, - {"label": "3 0,3", "x": 3, "y": 0}, - {"label": "4 0,4", "x": 4, "y": 0}, - {"label": "5 0,5", "x": 5, "y": 0}, - {"label": "6 0,6", "x": 6, "y": 0}, - {"label": "7 0,7", "x": 7, "y": 0}, - {"label": "8 0,8", "x": 8, "y": 0}, - {"label": "9 0,9", "x": 9, "y": 0}, - {"label": "0 0,10", "x": 10, "y": 0}, - {"label": "- 0,11", "x": 11, "y": 0}, - {"label": "= 0,12", "x": 12, "y": 0}, - {"label": "bsp 0,14", "x": 13, "y": 0, "w": 2}, - {"label": "del 0,15", "x": 15, "y": 0}, - - {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5}, - {"label": "q 1,2", "x": 1.5, "y": 1}, - {"label": "w 1,3", "x": 2.5, "y": 1}, - {"label": "e 1,4", "x": 3.5, "y": 1}, - {"label": "r 1,5", "x": 4.5, "y": 1}, - {"label": "t 1,6", "x": 5.5, "y": 1}, - {"label": "y 1,7", "x": 6.5, "y": 1}, - {"label": "u 1,8", "x": 7.5, "y": 1}, - {"label": "i 1,9", "x": 8.5, "y": 1}, - {"label": "o 1,10", "x": 9.5, "y": 1}, - {"label": "p 1,11", "x": 10.5, "y": 1}, - {"label": "[ 1,12", "x": 11.5, "y": 1}, - {"label": "] 1,13", "x": 12.5, "y": 1}, - {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5}, - {"label": "home 1,15", "x": 15, "y": 1}, - - {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75}, - {"label": "a 2,2", "x": 1.75, "y": 2}, - {"label": "s 2,3", "x": 2.75, "y": 2}, - {"label": "d 2,4", "x": 3.75, "y": 2}, - {"label": "f 2,5", "x": 4.75, "y": 2}, - {"label": "g 2,6", "x": 5.75, "y": 2}, - {"label": "h 2,7", "x": 6.75, "y": 2}, - {"label": "j 2,8", "x": 7.75, "y": 2}, - {"label": "k 2,9", "x": 8.75, "y": 2}, - {"label": "l 2,10", "x": 9.75, "y": 2}, - {"label": "; 2,11", "x": 10.75, "y": 2}, - {"label": "' 2,12", "x": 11.75, "y": 2}, - {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25}, - {"label": "pg up 2,15", "x": 15, "y": 2}, - - {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25}, - {"label": "z 3,2", "x": 2.25, "y": 3}, - {"label": "x 3,3", "x": 3.25, "y": 3}, - {"label": "c 3,4", "x": 4.25, "y": 3}, - {"label": "v 3,5", "x": 5.25, "y": 3}, - {"label": "b 3,6", "x": 6.25, "y": 3}, - {"label": "n 3,7", "x": 7.25, "y": 3}, - {"label": "m 3,8", "x": 8.25, "y": 3}, - {"label": ", 3,9", "x": 9.25, "y": 3}, - {"label": ". 3,10", "x": 10.25, "y": 3}, - {"label": "/ 3,11", "x": 11.25, "y": 3}, - {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75}, - {"label": "up 3,14", "x": 14, "y": 3}, - {"label": "pg dn 3,15", "x": 15, "y": 3}, - - {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.5}, - {"label": "win 4,1", "x": 1.5, "y": 4}, - {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.5}, - {"label": "spacebar 4,6", "x": 4, "y": 4, "w": 7}, - {"label": "ctrl 4,11", "x": 11, "y": 4, "w": 1.5}, - {"label": "left 4,13", "x": 13, "y": 4}, - {"label": "down 4,14", "x": 14, "y": 4}, - {"label": "right 4,15", "x": 15, "y": 4} - ] - }, - "LAYOUT_65_tsangan_split_bs": { - "layout": [ - {"label": "Esc 0,0", "x": 0, "y": 0}, - {"label": "1 0,1", "x": 1, "y": 0}, - {"label": "2 0,2", "x": 2, "y": 0}, - {"label": "3 0,3", "x": 3, "y": 0}, - {"label": "4 0,4", "x": 4, "y": 0}, - {"label": "5 0,5", "x": 5, "y": 0}, - {"label": "6 0,6", "x": 6, "y": 0}, - {"label": "7 0,7", "x": 7, "y": 0}, - {"label": "8 0,8", "x": 8, "y": 0}, - {"label": "9 0,9", "x": 9, "y": 0}, - {"label": "0 0,10", "x": 10, "y": 0}, - {"label": "- 0,11", "x": 11, "y": 0}, - {"label": "= 0,12", "x": 12, "y": 0}, - {"label": "bsp extra 0,13", "x": 13, "y": 0}, - {"label": "bsp 0,14", "x": 14, "y": 0}, - {"label": "del 0,15", "x": 15, "y": 0}, - - {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5}, - {"label": "q 1,2", "x": 1.5, "y": 1}, - {"label": "w 1,3", "x": 2.5, "y": 1}, - {"label": "e 1,4", "x": 3.5, "y": 1}, - {"label": "r 1,5", "x": 4.5, "y": 1}, - {"label": "t 1,6", "x": 5.5, "y": 1}, - {"label": "y 1,7", "x": 6.5, "y": 1}, - {"label": "u 1,8", "x": 7.5, "y": 1}, - {"label": "i 1,9", "x": 8.5, "y": 1}, - {"label": "o 1,10", "x": 9.5, "y": 1}, - {"label": "p 1,11", "x": 10.5, "y": 1}, - {"label": "[ 1,12", "x": 11.5, "y": 1}, - {"label": "] 1,13", "x": 12.5, "y": 1}, - {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5}, - {"label": "home 1,15", "x": 15, "y": 1}, - - {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75}, - {"label": "a 2,2", "x": 1.75, "y": 2}, - {"label": "s 2,3", "x": 2.75, "y": 2}, - {"label": "d 2,4", "x": 3.75, "y": 2}, - {"label": "f 2,5", "x": 4.75, "y": 2}, - {"label": "g 2,6", "x": 5.75, "y": 2}, - {"label": "h 2,7", "x": 6.75, "y": 2}, - {"label": "j 2,8", "x": 7.75, "y": 2}, - {"label": "k 2,9", "x": 8.75, "y": 2}, - {"label": "l 2,10", "x": 9.75, "y": 2}, - {"label": "; 2,11", "x": 10.75, "y": 2}, - {"label": "' 2,12", "x": 11.75, "y": 2}, - {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25}, - {"label": "pg up 2,15", "x": 15, "y": 2}, - - {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25}, - {"label": "z 3,2", "x": 2.25, "y": 3}, - {"label": "x 3,3", "x": 3.25, "y": 3}, - {"label": "c 3,4", "x": 4.25, "y": 3}, - {"label": "v 3,5", "x": 5.25, "y": 3}, - {"label": "b 3,6", "x": 6.25, "y": 3}, - {"label": "n 3,7", "x": 7.25, "y": 3}, - {"label": "m 3,8", "x": 8.25, "y": 3}, - {"label": ", 3,9", "x": 9.25, "y": 3}, - {"label": ". 3,10", "x": 10.25, "y": 3}, - {"label": "/ 3,11", "x": 11.25, "y": 3}, - {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75}, - {"label": "up 3,14", "x": 14, "y": 3}, - {"label": "pg dn 3,15", "x": 15, "y": 3}, - - {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.5}, - {"label": "win 4,1", "x": 1.5, "y": 4}, - {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.5}, - {"label": "spacebar 4,6", "x": 4, "y": 4, "w": 7}, - {"label": "ctrl 4,11", "x": 11, "y": 4, "w": 1.5}, - {"label": "left 4,13", "x": 13, "y": 4}, - {"label": "down 4,14", "x": 14, "y": 4}, - {"label": "right 4,15", "x": 15, "y": 4} - ] + "LAYOUT_all": { + "layout": [{"label":"`", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Del", "x":13, "y":0}, {"label":"Bsp", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"PgUp", "x":15.5, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"@", "x":11.75, "y":2}, {"label":"ISO", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Home", "x":15.5, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"\\", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"End", "x":15.5, "y":3}, {"label":"\u2191", "x":14.25, "y":3.25}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"AltGr", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13.25, "y":4.25}, {"label":"\u2193", "x":14.25, "y":4.25}, {"label":"\u2192", "x":15.25, "y":4.25}] } } + } diff --git a/keyboards/drewkeys/mercury65/keymaps/default/keymap.c b/keyboards/drewkeys/mercury65/keymaps/default/keymap.c index 6a9f15ad0de0..c37dac5359c3 100644 --- a/keyboards/drewkeys/mercury65/keymaps/default/keymap.c +++ b/keyboards/drewkeys/mercury65/keymaps/default/keymap.c @@ -15,19 +15,31 @@ */ #include QMK_KEYBOARD_H +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. +enum layer_names { + _BASE, + _FN +}; + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - LAYOUT( - QK_GESC, 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_DEL, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_INS, - 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_ENT, KC_PGUP, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + /* Base https://i.imgur.com/viQdtbB.png */ + [_BASE] = LAYOUT_all( + KC_ESC, 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_BSLS, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + 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_NUHS, KC_ENT, KC_PGUP, + KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT ), - LAYOUT( - KC_GRAVE, 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_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + + [_FN] = LAYOUT_all( + QK_BOOT, 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_BSLS, KC_BSPC, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ ) + }; diff --git a/keyboards/drewkeys/mercury65/keymaps/via/keymap.c b/keyboards/drewkeys/mercury65/keymaps/via/keymap.c index 67c846780fed..b847f7fcefb9 100644 --- a/keyboards/drewkeys/mercury65/keymaps/via/keymap.c +++ b/keyboards/drewkeys/mercury65/keymaps/via/keymap.c @@ -15,33 +15,49 @@ */ #include QMK_KEYBOARD_H +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. +enum layer_names { + _BASE, + _FN1, + _FN2, + _FN3 +}; + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] LAYOUT( - QK_GESC, 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_DEL, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_INS, - 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_ENT, KC_PGUP, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - [1] LAYOUT( - KC_GRAVE, 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_TRNS, QK_BOOT, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [2] LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [3] LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ) + /* Base https://i.imgur.com/viQdtbB.png */ + [_BASE] = LAYOUT_all( + KC_ESC, 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_BSLS, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + 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_NUHS, KC_ENT, KC_PGUP, + KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [_FN1] = LAYOUT_all( + QK_BOOT, 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_BSLS, KC_BSPC, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [_FN2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [_FN3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + }; diff --git a/keyboards/drewkeys/mercury65/keymaps/via/rules.mk b/keyboards/drewkeys/mercury65/keymaps/via/rules.mk index 36b7ba9cbc98..036bd6d1c3ec 100644 --- a/keyboards/drewkeys/mercury65/keymaps/via/rules.mk +++ b/keyboards/drewkeys/mercury65/keymaps/via/rules.mk @@ -1,2 +1 @@ -VIA_ENABLE = yes -LTO_ENABLE = yes +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/drewkeys/mercury65/mercury65.h b/keyboards/drewkeys/mercury65/mercury65.h index dfda3f21fa19..d6ab00288231 100644 --- a/keyboards/drewkeys/mercury65/mercury65.h +++ b/keyboards/drewkeys/mercury65/mercury65.h @@ -17,139 +17,29 @@ #pragma once #include "quantum.h" -// Corresponding changes to the layout names and/or definitions must also be made to info.json - -/* Standard arrangement / LAYOUT - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤ - * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │1f │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤ - * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │2f │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤ - * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │3f │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤ - * │40 │41 │43 │ 46 │4a │4b │▓│4d │4e │4f │ - * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘ -*/ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ - k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \ - k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \ - k40, k41, k42, k46, k4A, k4B, k4D, k4E, k4F \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ - { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ - { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, KC_NO, k2F }, \ - { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, k3E, k3F }, \ - { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E, k4F } \ -} -/* Standard arrangement / 65 ANSI - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e │0f │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤───┤ - * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │1f │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤ - * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │2f │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤ - * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │3f │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤ - * │40 │41 │43 │ 46 │4a │4b │ │4d │4e │4f │ - * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘ -*/ -#define LAYOUT_65_ansi( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, \ - k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \ - k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \ - k40, k41, k42, k46, k4A, k4B, k4D, k4E, k4F \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, KC_NO, k0E, k0F }, \ - { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ - { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, KC_NO, k2F }, \ - { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, k3E, k3F }, \ - { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E, k4F } \ -} +#define ____ KC_NO -/* Standard arrangement / 65 ANSI SPLIT - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤ - * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │1f │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤ - * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │2f │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤ - * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │3f │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤ - * │40 │41 │43 │ 46 │4a │4b │ │4d │4e │4f │ - * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘ -*/ -#define LAYOUT_65_ansi_split_bs( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ - k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \ - k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \ - k40, k41, k42, k46, k4A, k4B, k4D, k4E, k4F \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ - { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ - { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, KC_NO, k2F }, \ - { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, k3E, k3F }, \ - { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E, k4F } \ -} +// Corresponding changes to the layout names and/or definitions must also be made to info.json -/* Standard arrangement / 65 TSANGAN - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e │0f │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤───┤ - * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │1f │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤ - * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │2f │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤ - * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │3f │ - * ├─────┬─┴─┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┬┴───┬┴┬───┼───┤───┤ - * │40 │41 │43 │ 46 │4b │ │4d │4e │4f │ - * └─────┴───┴────┴─────────────────────────────┴────┴ ┴───┴───┘───┘ +/* Standard arrangement / LAYOUT + * https://i.imgur.com/sBNeRr4.png */ -#define LAYOUT_65_tsangan( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, \ - k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \ - k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \ - k40, k41, k42, k46, k4B, k4D, k4E, k4F \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, KC_NO, k0E, k0F }, \ - { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ - { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, KC_NO, k2F }, \ - { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, k3E, k3F }, \ - { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k4B, KC_NO, k4D, k4E, k4F } \ -} -/* Standard arrangement / 65 TSANGAN SPLIT - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤ - * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │1f │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤ - * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │2f │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤ - * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │3f │ - * ├─────┬─┴─┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┬┴───┬┴┬───┼───┤───┤ - * │40 │41 │43 │ 46 │4b │ │4d │4e │4f │ - * └─────┴───┴────┴─────────────────────────────┴────┴ ┴───┴───┘───┘ +/* Standard for hotswap / LAYOUT + * https://i.imgur.com/1n0bL0d.png + * note: hotswap is the same as soldered without ISO support */ -#define LAYOUT_65_tsangan_split_bs( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ - k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \ - k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \ - k40, k41, k42, k46, k4B, k4D, k4E, k4F \ +#define LAYOUT_all( \ + k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \ + k100, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k116, \ + k200, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k216, \ + k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k313, k314, k316, \ + k400, k401, k402, k406, k410, k411, k413, k414, k415 \ ) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ - { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ - { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, KC_NO, k2F }, \ - { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, k3E, k3F }, \ - { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k4B, KC_NO, k4D, k4E, k4F } \ + { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, ____, ____ }, \ + { k100, ____, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, ____, k116 }, \ + { k200, ____, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, ____, k216 }, \ + { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, k313, k314, ____, k316 }, \ + { k400, k401, k402, ____, ____, ____, k406, ____, ____, ____, k410, k411, ____, k413, k414, k415, ____ }, \ } diff --git a/keyboards/drewkeys/mercury65/rules.mk b/keyboards/drewkeys/mercury65/rules.mk index db678d6eadf0..2d64449274af 100644 --- a/keyboards/drewkeys/mercury65/rules.mk +++ b/keyboards/drewkeys/mercury65/rules.mk @@ -1,13 +1,19 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +BOOTMAGIC_ENABLE = yes MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes From dac3b93d4816e051e2402be67a728e450a431c8e Mon Sep 17 00:00:00 2001 From: drewpyun Date: Tue, 4 Jul 2023 17:14:05 -0400 Subject: [PATCH 03/11] removed config.h, mercury65.c, mercury65.h, consolidated removed files into info.json as needed for PR #20811 --- keyboards/drewkeys/mercury65/config.h | 59 ----------- keyboards/drewkeys/mercury65/info.json | 100 +++++++++++++++++- .../mercury65/keymaps/default/keymap.c | 4 +- .../drewkeys/mercury65/keymaps/via/keymap.c | 8 +- keyboards/drewkeys/mercury65/mercury65.c | 17 --- keyboards/drewkeys/mercury65/mercury65.h | 45 -------- keyboards/drewkeys/mercury65/rules.mk | 20 +--- 7 files changed, 102 insertions(+), 151 deletions(-) delete mode 100644 keyboards/drewkeys/mercury65/config.h delete mode 100644 keyboards/drewkeys/mercury65/mercury65.c delete mode 100644 keyboards/drewkeys/mercury65/mercury65.h diff --git a/keyboards/drewkeys/mercury65/config.h b/keyboards/drewkeys/mercury65/config.h deleted file mode 100644 index cd55392435bb..000000000000 --- a/keyboards/drewkeys/mercury65/config.h +++ /dev/null @@ -1,59 +0,0 @@ -/* -Copyright 2023 Drewkeys - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D5, D4, D6, D0, E6 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D1, D2, D3, D7, B4, B5, B6, C6, C7, F7, F6, F5 } -#define DIODE_DIRECTION COL2ROW - -/* - * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. - */ -#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 - - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/drewkeys/mercury65/info.json b/keyboards/drewkeys/mercury65/info.json index 50adcc6c3c50..1f48fde21c20 100644 --- a/keyboards/drewkeys/mercury65/info.json +++ b/keyboards/drewkeys/mercury65/info.json @@ -1,18 +1,108 @@ { "keyboard_name": "mercury65", + "maintainer": "Drewkeys", "manufacturer": "RocketKeyboards", + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", "url": "https://www.rocketkeyboards.com/collections/mercury65/products/gb-mercury65-keyboard", - "maintainer": "Drewkeys", + "keyboard_folder": "drewkeys/mercury65", "usb": { "vid": "0xDE43", "pid": "0x1034", "device_version": "0.0.1" }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", + "features": { + "audio": false, + "backlight": false, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": false + }, + "matrix_size": { + "cols": 17, + "rows": 5 + }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B7", "D1", "D2", "D3", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5"], + "rows": ["D5", "D4", "D6", "D0", "E6"] + }, "layouts": { - "LAYOUT_all": { - "layout": [{"label":"`", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Del", "x":13, "y":0}, {"label":"Bsp", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"PgUp", "x":15.5, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"@", "x":11.75, "y":2}, {"label":"ISO", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Home", "x":15.5, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"\\", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"End", "x":15.5, "y":3}, {"label":"\u2191", "x":14.25, "y":3.25}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"AltGr", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13.25, "y":4.25}, {"label":"\u2193", "x":14.25, "y":4.25}, {"label":"\u2192", "x":15.25, "y":4.25}] + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "label":"`", "x":0, "y":0}, + {"matrix": [0, 1], "label":"!", "x":1, "y":0}, + {"matrix": [0, 2], "label":"@", "x":2, "y":0}, + {"matrix": [0, 3], "label":"#", "x":3, "y":0}, + {"matrix": [0, 4], "label":"$", "x":4, "y":0}, + {"matrix": [0, 5], "label":"%", "x":5, "y":0}, + {"matrix": [0, 6], "label":"^", "x":6, "y":0}, + {"matrix": [0, 7], "label":"&", "x":7, "y":0}, + {"matrix": [0, 8], "label":"*", "x":8, "y":0}, + {"matrix": [0, 9], "label":"(", "x":9, "y":0}, + {"matrix": [0, 10], "label":")", "x":10, "y":0}, + {"matrix": [0, 11], "label":"_", "x":11, "y":0}, + {"matrix": [0, 12], "label":"+", "x":12, "y":0}, + {"matrix": [0, 13], "label":"Del", "x":13, "y":0}, + {"matrix": [0, 14], "label":"Bsp", "x":14, "y":0}, + {"matrix": [1, 0], "label":"Tab", "x":0, "y":1, "w":1.5}, + {"matrix": [1, 2], "label":"Q", "x":1.5, "y":1}, + {"matrix": [1, 3], "label":"W", "x":2.5, "y":1}, + {"matrix": [1, 4], "label":"E", "x":3.5, "y":1}, + {"matrix": [1, 5], "label":"R", "x":4.5, "y":1}, + {"matrix": [1, 6], "label":"T", "x":5.5, "y":1}, + {"matrix": [1, 7], "label":"Y", "x":6.5, "y":1}, + {"matrix": [1, 8], "label":"U", "x":7.5, "y":1}, + {"matrix": [1, 9], "label":"I", "x":8.5, "y":1}, + {"matrix": [1, 10], "label":"O", "x":9.5, "y":1}, + {"matrix": [1, 11], "label":"P", "x":10.5, "y":1}, + {"matrix": [1, 12], "label":"{", "x":11.5, "y":1}, + {"matrix": [1, 13], "label":"}", "x":12.5, "y":1}, + {"matrix": [1, 14], "label":"|", "x":13.5, "y":1, "w":1.5}, + {"matrix": [1, 16], "label":"PgUp", "x":15.5, "y":1}, + {"matrix": [2, 0], "label":"Caps Lock", "x":0, "y":2, "w":1.75}, + {"matrix": [2, 2], "label":"A", "x":1.75, "y":2}, + {"matrix": [2, 3], "label":"S", "x":2.75, "y":2}, + {"matrix": [2, 4], "label":"D", "x":3.75, "y":2}, + {"matrix": [2, 5], "label":"F", "x":4.75, "y":2}, + {"matrix": [2, 6], "label":"G", "x":5.75, "y":2}, + {"matrix": [2, 7], "label":"H", "x":6.75, "y":2}, + {"matrix": [2, 8], "label":"J", "x":7.75, "y":2}, + {"matrix": [2, 9], "label":"K", "x":8.75, "y":2}, + {"matrix": [2, 10], "label":"L", "x":9.75, "y":2}, + {"matrix": [2, 11], "label":":", "x":10.75, "y":2}, + {"matrix": [2, 12], "label":"@", "x":11.75, "y":2}, + {"matrix": [2, 13], "label":"ISO", "x":12.75, "y":2}, + {"matrix": [2, 14], "label":"Enter", "x":13.75, "y":2, "w":1.25}, + {"matrix": [2, 16], "label":"Home", "x":15.5, "y":2}, + {"matrix": [3, 0], "label":"Shift", "x":0, "y":3, "w":1.25}, + {"matrix": [3, 1], "label":"\\", "x":1.25, "y":3}, + {"matrix": [3, 2], "label":"Z", "x":2.25, "y":3}, + {"matrix": [3, 3], "label":"X", "x":3.25, "y":3}, + {"matrix": [3, 4], "label":"C", "x":4.25, "y":3}, + {"matrix": [3, 5], "label":"V", "x":5.25, "y":3}, + {"matrix": [3, 6], "label":"B", "x":6.25, "y":3}, + {"matrix": [3, 7], "label":"N", "x":7.25, "y":3}, + {"matrix": [3, 8], "label":"M", "x":8.25, "y":3}, + {"matrix": [3, 9], "label":"<", "x":9.25, "y":3}, + {"matrix": [3, 10], "label":">", "x":10.25, "y":3}, + {"matrix": [3, 11], "label":"?", "x":11.25, "y":3}, + {"matrix": [3, 13], "label":"Shift", "x":12.25, "y":3, "w":1.75}, + {"matrix": [3, 14], "label":"End", "x":15.5, "y":3}, + {"matrix": [3, 16], "label":"\u2191", "x":14.25, "y":3.25}, + {"matrix": [4, 0], "label":"Ctrl", "x":0, "y":4, "w":1.25}, + {"matrix": [4, 1], "label":"Win", "x":1.25, "y":4, "w":1.25}, + {"matrix": [4, 2], "label":"Alt", "x":2.5, "y":4, "w":1.25}, + {"matrix": [4, 6], "x":3.75, "y":4, "w":6.25}, + {"matrix": [4, 10], "label":"AltGr", "x":10, "y":4, "w":1.25}, + {"matrix": [4, 11], "label":"Win", "x":11.25, "y":4, "w":1.25}, + {"matrix": [4, 13], "label":"\u2190", "x":13.25, "y":4.25}, + {"matrix": [4, 14], "label":"\u2193", "x":14.25, "y":4.25}, + {"matrix": [4, 15], "label":"\u2192", "x":15.25, "y":4.25}] } } diff --git a/keyboards/drewkeys/mercury65/keymaps/default/keymap.c b/keyboards/drewkeys/mercury65/keymaps/default/keymap.c index c37dac5359c3..2f9cc945c9d2 100644 --- a/keyboards/drewkeys/mercury65/keymaps/default/keymap.c +++ b/keyboards/drewkeys/mercury65/keymaps/default/keymap.c @@ -26,7 +26,7 @@ enum layer_names { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base https://i.imgur.com/viQdtbB.png */ - [_BASE] = LAYOUT_all( + [_BASE] = LAYOUT( KC_ESC, 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_BSLS, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, 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_NUHS, KC_ENT, KC_PGUP, @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT ), - [_FN] = LAYOUT_all( + [_FN] = LAYOUT( QK_BOOT, 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_BSLS, KC_BSPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/drewkeys/mercury65/keymaps/via/keymap.c b/keyboards/drewkeys/mercury65/keymaps/via/keymap.c index b847f7fcefb9..4878b44f7d73 100644 --- a/keyboards/drewkeys/mercury65/keymaps/via/keymap.c +++ b/keyboards/drewkeys/mercury65/keymaps/via/keymap.c @@ -28,7 +28,7 @@ enum layer_names { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base https://i.imgur.com/viQdtbB.png */ - [_BASE] = LAYOUT_all( + [_BASE] = LAYOUT( KC_ESC, 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_BSLS, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, 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_NUHS, KC_ENT, KC_PGUP, @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT ), - [_FN1] = LAYOUT_all( + [_FN1] = LAYOUT( QK_BOOT, 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_BSLS, KC_BSPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_FN2] = LAYOUT_all( + [_FN2] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_FN3] = LAYOUT_all( + [_FN3] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/drewkeys/mercury65/mercury65.c b/keyboards/drewkeys/mercury65/mercury65.c deleted file mode 100644 index 5568eee2dedc..000000000000 --- a/keyboards/drewkeys/mercury65/mercury65.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2023 Drewkeys - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "mercury65.h" diff --git a/keyboards/drewkeys/mercury65/mercury65.h b/keyboards/drewkeys/mercury65/mercury65.h deleted file mode 100644 index d6ab00288231..000000000000 --- a/keyboards/drewkeys/mercury65/mercury65.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2023 Drewkeys - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" - -#define ____ KC_NO - -// Corresponding changes to the layout names and/or definitions must also be made to info.json - -/* Standard arrangement / LAYOUT - * https://i.imgur.com/sBNeRr4.png -*/ - -/* Standard for hotswap / LAYOUT - * https://i.imgur.com/1n0bL0d.png - * note: hotswap is the same as soldered without ISO support -*/ -#define LAYOUT_all( \ - k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \ - k100, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k116, \ - k200, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k216, \ - k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k313, k314, k316, \ - k400, k401, k402, k406, k410, k411, k413, k414, k415 \ -) { \ - { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, ____, ____ }, \ - { k100, ____, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, ____, k116 }, \ - { k200, ____, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, ____, k216 }, \ - { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, ____, k313, k314, ____, k316 }, \ - { k400, k401, k402, ____, ____, ____, k406, ____, ____, ____, k410, k411, ____, k413, k414, k415, ____ }, \ -} diff --git a/keyboards/drewkeys/mercury65/rules.mk b/keyboards/drewkeys/mercury65/rules.mk index 2d64449274af..157faf56e1da 100644 --- a/keyboards/drewkeys/mercury65/rules.mk +++ b/keyboards/drewkeys/mercury65/rules.mk @@ -1,19 +1 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output +# all settings within info.json \ No newline at end of file From 49d47af761b6eed8f7b8e6ca7ca5eb05535d5650 Mon Sep 17 00:00:00 2001 From: drewpyun <48503175+drewpyun@users.noreply.github.com> Date: Wed, 5 Jul 2023 10:51:10 -0400 Subject: [PATCH 04/11] Update keyboards/drewkeys/mercury65/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/drewkeys/mercury65/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/drewkeys/mercury65/info.json b/keyboards/drewkeys/mercury65/info.json index 1f48fde21c20..7a57b848972f 100644 --- a/keyboards/drewkeys/mercury65/info.json +++ b/keyboards/drewkeys/mercury65/info.json @@ -6,7 +6,6 @@ "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", "url": "https://www.rocketkeyboards.com/collections/mercury65/products/gb-mercury65-keyboard", - "keyboard_folder": "drewkeys/mercury65", "usb": { "vid": "0xDE43", "pid": "0x1034", From 9066e80b53cc51ac27ba32f49a1e221e226626c1 Mon Sep 17 00:00:00 2001 From: drewpyun <48503175+drewpyun@users.noreply.github.com> Date: Wed, 5 Jul 2023 10:51:26 -0400 Subject: [PATCH 05/11] Update keyboards/drewkeys/mercury65/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/drewkeys/mercury65/info.json | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/keyboards/drewkeys/mercury65/info.json b/keyboards/drewkeys/mercury65/info.json index 7a57b848972f..93f7b2ec3bc7 100644 --- a/keyboards/drewkeys/mercury65/info.json +++ b/keyboards/drewkeys/mercury65/info.json @@ -12,19 +12,10 @@ "device_version": "0.0.1" }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, - "command": false, - "console": false, "extrakey": true, "mousekey": true, - "nkro": true, - "rgblight": false - }, - "matrix_size": { - "cols": 17, - "rows": 5 + "nkro": true }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B7", "D1", "D2", "D3", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5"], From 0a2bef4dc67f2ef13e160a93fe2d2d41e8afec0d Mon Sep 17 00:00:00 2001 From: drewpyun <48503175+drewpyun@users.noreply.github.com> Date: Wed, 5 Jul 2023 10:51:43 -0400 Subject: [PATCH 06/11] Update keyboards/drewkeys/mercury65/keymaps/via/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/drewkeys/mercury65/keymaps/via/keymap.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/drewkeys/mercury65/keymaps/via/keymap.c b/keyboards/drewkeys/mercury65/keymaps/via/keymap.c index 4878b44f7d73..04e9e0d841a1 100644 --- a/keyboards/drewkeys/mercury65/keymaps/via/keymap.c +++ b/keyboards/drewkeys/mercury65/keymaps/via/keymap.c @@ -21,9 +21,7 @@ // entirely and just use numbers. enum layer_names { _BASE, - _FN1, - _FN2, - _FN3 + _FN1 }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From ada7e64a17d0c0b5d77010f9150c43e669987c5a Mon Sep 17 00:00:00 2001 From: drewpyun <48503175+drewpyun@users.noreply.github.com> Date: Wed, 5 Jul 2023 10:52:07 -0400 Subject: [PATCH 07/11] Update keyboards/drewkeys/mercury65/readme.md Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/drewkeys/mercury65/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/drewkeys/mercury65/readme.md b/keyboards/drewkeys/mercury65/readme.md index cfd46dffc900..ba62916633d2 100644 --- a/keyboards/drewkeys/mercury65/readme.md +++ b/keyboards/drewkeys/mercury65/readme.md @@ -1,6 +1,6 @@ # Mercury65 -![Mercury65](https://i.imgur.com/rjfARj3.jpeg) +![Mercury65](https://i.imgur.com/rjfARj3h.jpeg) *65% Form Factor with a Separated Arrow Cluster used for Mercury65* From c114759aa150195d5b1788ed07ddb3593a879f8d Mon Sep 17 00:00:00 2001 From: drewpyun <48503175+drewpyun@users.noreply.github.com> Date: Wed, 5 Jul 2023 10:52:26 -0400 Subject: [PATCH 08/11] Update keyboards/drewkeys/mercury65/readme.md Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/drewkeys/mercury65/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/drewkeys/mercury65/readme.md b/keyboards/drewkeys/mercury65/readme.md index ba62916633d2..be8f4c17843e 100644 --- a/keyboards/drewkeys/mercury65/readme.md +++ b/keyboards/drewkeys/mercury65/readme.md @@ -16,6 +16,7 @@ Make example for this keyboard (after setting up your build environment): Flashing example for this keyboard: make drewkeys/mercury65:default:flash +## Bootloader Resetting Board: Press the button on the PCB next to the spacebar to soft reset the board to reflash (bootloader mode). From f1b408e2b39a590842f8534a7c411647713ae7f4 Mon Sep 17 00:00:00 2001 From: drewpyun <48503175+drewpyun@users.noreply.github.com> Date: Wed, 5 Jul 2023 10:52:34 -0400 Subject: [PATCH 09/11] Update keyboards/drewkeys/mercury65/rules.mk Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/drewkeys/mercury65/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/drewkeys/mercury65/rules.mk b/keyboards/drewkeys/mercury65/rules.mk index 157faf56e1da..7ff128fa692e 100644 --- a/keyboards/drewkeys/mercury65/rules.mk +++ b/keyboards/drewkeys/mercury65/rules.mk @@ -1 +1 @@ -# all settings within info.json \ No newline at end of file +# This file intentionally left blank \ No newline at end of file From 293459e13132e677a9fa424354b8724b7b28d2c1 Mon Sep 17 00:00:00 2001 From: drewpyun <48503175+drewpyun@users.noreply.github.com> Date: Wed, 5 Jul 2023 10:52:40 -0400 Subject: [PATCH 10/11] Update keyboards/drewkeys/mercury65/keymaps/via/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- .../drewkeys/mercury65/keymaps/via/keymap.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/keyboards/drewkeys/mercury65/keymaps/via/keymap.c b/keyboards/drewkeys/mercury65/keymaps/via/keymap.c index 04e9e0d841a1..2af6a064f298 100644 --- a/keyboards/drewkeys/mercury65/keymaps/via/keymap.c +++ b/keyboards/drewkeys/mercury65/keymaps/via/keymap.c @@ -40,22 +40,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - - [_FN2] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - - [_FN3] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - + ) }; From 4485bb0b614b4a80f0c23b273b8f89c6959a3ec2 Mon Sep 17 00:00:00 2001 From: drewpyun Date: Wed, 5 Jul 2023 21:39:04 -0400 Subject: [PATCH 11/11] removed keymap readme.md per pr checklist referencing pr #20811 --- keyboards/drewkeys/mercury65/keymaps/default/readme.md | 1 - keyboards/drewkeys/mercury65/keymaps/via/readme.md | 1 - 2 files changed, 2 deletions(-) delete mode 100644 keyboards/drewkeys/mercury65/keymaps/default/readme.md delete mode 100644 keyboards/drewkeys/mercury65/keymaps/via/readme.md diff --git a/keyboards/drewkeys/mercury65/keymaps/default/readme.md b/keyboards/drewkeys/mercury65/keymaps/default/readme.md deleted file mode 100644 index 4d0f2efda45f..000000000000 --- a/keyboards/drewkeys/mercury65/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for mercury65 -- both hotswap and soldered diff --git a/keyboards/drewkeys/mercury65/keymaps/via/readme.md b/keyboards/drewkeys/mercury65/keymaps/via/readme.md deleted file mode 100644 index e6e65936db2a..000000000000 --- a/keyboards/drewkeys/mercury65/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for mercury65 for via