From 2271b283863a2201fb5915a6f6aa4970578588d9 Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Tue, 12 Jul 2022 23:19:36 -0600 Subject: [Keyboard] boardsource/the_mark data driven (#17637) --- keyboards/boardsource/the_mark/config.h | 171 +---- keyboards/boardsource/the_mark/info.json | 819 +++++++++++---------- .../boardsource/the_mark/keymaps/default/keymap.c | 2 +- .../the_mark/keymaps/default_ansi/keymap.c | 2 +- .../keymaps/default_ansi_split_bs_space/keymap.c | 2 +- .../the_mark/keymaps/default_iso/keymap.c | 2 +- .../keymaps/default_iso_split_bs_space/keymap.c | 2 +- .../boardsource/the_mark/keymaps/via/keymap.c | 2 +- .../boardsource/the_mark/keymaps/via/readme.md | 3 - keyboards/boardsource/the_mark/rules.mk | 21 +- keyboards/boardsource/the_mark/the_mark.c | 49 -- keyboards/boardsource/the_mark/the_mark.h | 109 --- 12 files changed, 470 insertions(+), 714 deletions(-) delete mode 100644 keyboards/boardsource/the_mark/keymaps/via/readme.md delete mode 100644 keyboards/boardsource/the_mark/the_mark.c delete mode 100644 keyboards/boardsource/the_mark/the_mark.h (limited to 'keyboards/boardsource') diff --git a/keyboards/boardsource/the_mark/config.h b/keyboards/boardsource/the_mark/config.h index 99696e5d28..61628e1821 100644 --- a/keyboards/boardsource/the_mark/config.h +++ b/keyboards/boardsource/the_mark/config.h @@ -1,5 +1,5 @@ /* -Copyright 2020 Boardsource +Copyright 2022 Boardsource 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 @@ -16,141 +16,40 @@ along with this program. If not, see . */ #pragma once - -#include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4273 // "Bs" - Boardsource -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Boardsource -#define PRODUCT The Mark65 - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 16 - -/* - * 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 {B0, B1, B2, B3, B4} -#define MATRIX_COL_PINS {B5, B6, B7, F5, C7, D0, D1, D2, D3, D4, D5, D6, D7,F0, F1, F4} -#define UNUSED_PINS - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW -#define RGBLIGHT_ANIMATIONS -#define RGB_DI_PIN C6 -#ifdef RGBLIGHT_ENABLE -#define RGBLED_NUM 24 // Number of LEDs -#define RGBLIGHT_LIMIT_VAL 200 -#endif - -/* RGB matrix support */ #ifdef RGB_MATRIX_ENABLE -# define DRIVER_LED_TOTAL 24 // Number of LEDs +# define DRIVER_LED_TOTAL 24 # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 -# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended +# define RGB_DISABLE_WHEN_USB_SUSPENDED +# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_BREATHING +# define ENABLE_RGB_MATRIX_BAND_SAT +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +# define ENABLE_RGB_MATRIX_CYCLE_ALL +# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +# define ENABLE_RGB_MATRIX_DUAL_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +# define ENABLE_RGB_MATRIX_RAINDROPS +# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +# define ENABLE_RGB_MATRIX_HUE_BREATHING +# define ENABLE_RGB_MATRIX_HUE_PENDULUM +# define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_PIXEL_RAIN +# define ENABLE_RGB_MATRIX_PIXEL_FLOW +# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +# define ENABLE_RGB_MATRIX_DIGITAL_RAIN +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +# define ENABLE_RGB_MATRIX_SPLASH +# define ENABLE_RGB_MATRIX_MULTISPLASH +# define ENABLE_RGB_MATRIX_SOLID_SPLASH #endif - -/* - * 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 - -//#define BACKLIGHT_PIN B7 -//#define BACKLIGHT_LEVELS 3 -//#define BACKLIGHT_BREATHING - -//#define RGB_DI_PIN E2 -//#ifdef RGB_DI_PIN -//# define RGBLED_NUM 16 -//# define RGBLIGHT_HUE_STEP 8 -//# define RGBLIGHT_SAT_STEP 8 -//# define RGBLIGHT_VAL_STEP 8 -//# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -/*== all animations enable ==*/ -//# define RGBLIGHT_ANIMATIONS -/*== or choose animations ==*/ -//# define RGBLIGHT_EFFECT_BREATHING -//# define RGBLIGHT_EFFECT_RAINBOW_MOOD -//# define RGBLIGHT_EFFECT_RAINBOW_SWIRL -//# define RGBLIGHT_EFFECT_SNAKE -//# define RGBLIGHT_EFFECT_KNIGHT -//# define RGBLIGHT_EFFECT_CHRISTMAS -//# define RGBLIGHT_EFFECT_STATIC_GRADIENT -//# define RGBLIGHT_EFFECT_RGB_TEST -//# define RGBLIGHT_EFFECT_ALTERNATING -/*== customize breathing effect ==*/ -/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -/*==== use exp() and sin() ====*/ -//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 -//#endif - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - -/* 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 - -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is useful for the Windows task manager shortcut (ctrl+shift+esc). - */ -//#define GRAVE_ESC_CTRL_OVERRIDE - -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - * - */ -//#define FORCE_NKRO - -/* - * 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 - -/* Bootmagic Lite key configuration */ -//#define BOOTMAGIC_LITE_ROW 0 -//#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/boardsource/the_mark/info.json b/keyboards/boardsource/the_mark/info.json index 792585d12a..a0fb3de1c9 100644 --- a/keyboards/boardsource/the_mark/info.json +++ b/keyboards/boardsource/the_mark/info.json @@ -1,394 +1,431 @@ { - "keyboard_name": "The Mark: 65", - "url": "", - "maintainer": "daysgobye, Boardsource", - "layouts": { - "LAYOUT_all": { - "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1!", "x":1, "y":0}, - {"label":"2@", "x":2, "y":0}, - {"label":"3#", "x":3, "y":0}, - {"label":"4$", "x":4, "y":0}, - {"label":"5%", "x":5, "y":0}, - {"label":"6^", "x":6, "y":0}, - {"label":"7&", "x":7, "y":0}, - {"label":"8*", "x":8, "y":0}, - {"label":"9(", "x":9, "y":0}, - {"label":"0)", "x":10, "y":0}, - {"label":"-_", "x":11, "y":0}, - {"label":"=+", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0}, - {"label":"Backspace", "x":14, "y":0}, - {"label":"Toggle RGB", "x":15.25, "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":"RGB Mode +", "x":15.25, "y":1}, - - {"label":"Ctrl", "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":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"Fn", "x":15.25, "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":"\u2191", "x":14.25, "y":3.25}, - - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"GUI", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":2.25}, - {"label":"Space", "x":6, "y":4, "w":1.25}, - {"label":"Space", "x":7.25, "y":4, "w":2.75}, - {"label":"Alt", "x":10, "y":4}, - {"label":"Ctrl", "x":11, "y":4}, - {"label":"`~", "x":12, "y":4}, - {"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_ansi": { - "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1!", "x":1, "y":0}, - {"label":"2@", "x":2, "y":0}, - {"label":"3#", "x":3, "y":0}, - {"label":"4$", "x":4, "y":0}, - {"label":"5%", "x":5, "y":0}, - {"label":"6^", "x":6, "y":0}, - {"label":"7&", "x":7, "y":0}, - {"label":"8*", "x":8, "y":0}, - {"label":"9(", "x":9, "y":0}, - {"label":"0)", "x":10, "y":0}, - {"label":"-_", "x":11, "y":0}, - {"label":"=+", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, - {"label":"Toggle RGB", "x":15.25, "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":"RGB Mode +", "x":15.25, "y":1}, - - {"label":"Ctrl", "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":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"Fn", "x":15.25, "y":2}, - - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"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":"\u2191", "x":14.25, "y":3.25}, - - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"GUI", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4}, - {"label":"Ctrl", "x":11, "y":4}, - {"label":"`~", "x":12, "y":4}, - {"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_ansi_split_bs_space": { - "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1!", "x":1, "y":0}, - {"label":"2@", "x":2, "y":0}, - {"label":"3#", "x":3, "y":0}, - {"label":"4$", "x":4, "y":0}, - {"label":"5%", "x":5, "y":0}, - {"label":"6^", "x":6, "y":0}, - {"label":"7&", "x":7, "y":0}, - {"label":"8*", "x":8, "y":0}, - {"label":"9(", "x":9, "y":0}, - {"label":"0)", "x":10, "y":0}, - {"label":"-_", "x":11, "y":0}, - {"label":"=+", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0}, - {"label":"Backspace", "x":14, "y":0}, - {"label":"Toggle RGB", "x":15.25, "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":"RGB Mode +", "x":15.25, "y":1}, - - {"label":"Ctrl", "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":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"Fn", "x":15.25, "y":2}, - - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"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":"\u2191", "x":14.25, "y":3.25}, - - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"GUI", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":2.25}, - {"label":"Space", "x":6, "y":4, "w":1.25}, - {"label":"Space", "x":7.25, "y":4, "w":2.75}, - {"label":"Alt", "x":10, "y":4}, - {"label":"Ctrl", "x":11, "y":4}, - {"label":"`~", "x":12, "y":4}, - {"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_iso": { - "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1!", "x":1, "y":0}, - {"label":"2\"", "x":2, "y":0}, - {"label":"3\u00a3", "x":3, "y":0}, - {"label":"4$", "x":4, "y":0}, - {"label":"5%", "x":5, "y":0}, - {"label":"6^", "x":6, "y":0}, - {"label":"7&", "x":7, "y":0}, - {"label":"8*", "x":8, "y":0}, - {"label":"9(", "x":9, "y":0}, - {"label":"0)", "x":10, "y":0}, - {"label":"-_", "x":11, "y":0}, - {"label":"=+", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, - {"label":"Toggle RGB", "x":15.25, "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":"RGB Mode +", "x":15.25, "y":1}, - - {"label":"Ctrl", "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":"#~", "x":12.75, "y":2}, - {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, - {"label":"Fn", "x":15.25, "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":"\u2191", "x":14.25, "y":3.25}, - - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"GUI", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4}, - {"label":"Ctrl", "x":11, "y":4}, - {"label":"`\u00ac", "x":12, "y":4}, - {"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_iso_split_bs_space": { - "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1!", "x":1, "y":0}, - {"label":"2\"", "x":2, "y":0}, - {"label":"3\u00a3", "x":3, "y":0}, - {"label":"4$", "x":4, "y":0}, - {"label":"5%", "x":5, "y":0}, - {"label":"6^", "x":6, "y":0}, - {"label":"7&", "x":7, "y":0}, - {"label":"8*", "x":8, "y":0}, - {"label":"9(", "x":9, "y":0}, - {"label":"0)", "x":10, "y":0}, - {"label":"-_", "x":11, "y":0}, - {"label":"=+", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0}, - {"label":"Backspace", "x":14, "y":0}, - {"label":"Toggle RGB", "x":15.25, "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":"RGB Mode +", "x":15.25, "y":1}, - - {"label":"Ctrl", "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":"#~", "x":12.75, "y":2}, - {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, - {"label":"Fn", "x":15.25, "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":"\u2191", "x":14.25, "y":3.25}, - - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"GUI", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":2.25}, - {"label":"Space", "x":6, "y":4, "w":1.25}, - {"label":"Space", "x":7.25, "y":4, "w":2.75}, - {"label":"Alt", "x":10, "y":4}, - {"label":"Ctrl", "x":11, "y":4}, - {"label":"`\u00ac", "x":12, "y":4}, - {"label":"\u2190", "x":13.25, "y":4.25}, - {"label":"\u2193", "x":14.25, "y":4.25}, - {"label":"\u2192", "x":15.25, "y":4.25} - ] - } + "manufacturer": "Boardsource", + "keyboard_name": "The Mark65", + "maintainer": "waffle87", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "rgblight": true, + "rgb_matrix": false + }, + "matrix_pins": { + "cols": ["B5", "B6", "B7", "F5", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4"], + "rows": ["B0", "B1", "B2", "B3", "B4"] + }, + "processor": "atmega32u4", + "url": "https://boardsource.xyz/projects/5f46409bdce98063626dcb08", + "usb": { + "device_version": "1.0.0", + "pid": "0x0001", + "vid": "0x4273" + }, + "rgblight": { + "led_count": 24, + "pin": "C6", + "sleep": true, + "max_brightness": 200, + "animations": { + "all": true } + }, + "rgb_matrix": { + "layout": [ + { "flags": 2, "x": 224, "y": 42}, + { "flags": 2, "x": 224, "y": 21}, + { "flags": 2, "x": 209, "y": 21}, + { "flags": 2, "x": 179, "y": 21}, + { "flags": 2, "x": 164, "y": 21}, + { "flags": 2, "x": 134, "y": 21}, + { "flags": 2, "x": 119, "y": 21}, + { "flags": 2, "x": 89, "y": 21}, + { "flags": 2, "x": 74, "y": 21}, + { "flags": 2, "x": 45, "y": 21}, + { "flags": 2, "x": 30, "y": 21}, + { "flags": 2, "x": 30, "y": 42}, + { "flags": 2, "x": 30, "y": 64}, + { "flags": 2, "x": 30, "y": 85}, + { "flags": 2, "x": 45, "y": 85}, + { "flags": 2, "x": 74, "y": 85}, + { "flags": 2, "x": 89, "y": 85}, + { "flags": 2, "x": 119, "y": 85}, + { "flags": 2, "x": 134, "y": 85}, + { "flags": 2, "x": 164, "y": 85}, + { "flags": 2, "x": 179, "y": 85}, + { "flags": 2, "x": 209, "y": 85}, + { "flags": 2, "x": 224, "y": 85}, + { "flags": 2, "x": 224, "y": 64} + ] + }, + "layouts": { + "LAYOUT_all": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0 }, + { "matrix": [0, 11], "x": 11, "y": 0 }, + { "matrix": [0, 12], "x": 12, "y": 0 }, + { "matrix": [0, 13], "x": 13, "y": 0 }, + { "matrix": [0, 14], "x": 14, "y": 0 }, + { "matrix": [0, 15], "x": 15, "y": 0 }, + { "matrix": [1, 0], "x": 16, "y": 0 }, + { "matrix": [1, 2], "x": 17, "y": 0 }, + { "matrix": [1, 3], "x": 18, "y": 0 }, + { "matrix": [1, 4], "x": 19, "y": 0 }, + { "matrix": [1, 5], "x": 20, "y": 0 }, + { "matrix": [1, 6], "x": 21, "y": 0 }, + { "matrix": [1, 7], "x": 22, "y": 0 }, + { "matrix": [1, 8], "x": 23, "y": 0 }, + { "matrix": [1, 9], "x": 24, "y": 0 }, + { "matrix": [1, 10], "x": 25, "y": 0 }, + { "matrix": [1, 11], "x": 26, "y": 0 }, + { "matrix": [1, 12], "x": 27, "y": 0 }, + { "matrix": [1, 13], "x": 28, "y": 0 }, + { "matrix": [1, 14], "x": 29, "y": 0 }, + { "matrix": [1, 15], "x": 30, "y": 0 }, + { "matrix": [2, 0], "x": 31, "y": 0 }, + { "matrix": [2, 2], "x": 32, "y": 0 }, + { "matrix": [2, 3], "x": 33, "y": 0 }, + { "matrix": [2, 4], "x": 34, "y": 0 }, + { "matrix": [2, 5], "x": 35, "y": 0 }, + { "matrix": [2, 6], "x": 36, "y": 0 }, + { "matrix": [2, 7], "x": 37, "y": 0 }, + { "matrix": [2, 8], "x": 38, "y": 0 }, + { "matrix": [2, 9], "x": 39, "y": 0 }, + { "matrix": [2, 10], "x": 40, "y": 0 }, + { "matrix": [2, 11], "x": 41, "y": 0 }, + { "matrix": [2, 12], "x": 42, "y": 0 }, + { "matrix": [2, 13], "x": 43, "y": 0 }, + { "matrix": [2, 15], "x": 44, "y": 0 }, + { "matrix": [3, 1], "x": 45, "y": 0 }, + { "matrix": [3, 0], "x": 46, "y": 0 }, + { "matrix": [3, 2], "x": 47, "y": 0 }, + { "matrix": [3, 3], "x": 48, "y": 0 }, + { "matrix": [3, 4], "x": 49, "y": 0 }, + { "matrix": [3, 5], "x": 50, "y": 0 }, + { "matrix": [3, 6], "x": 51, "y": 0 }, + { "matrix": [3, 7], "x": 52, "y": 0 }, + { "matrix": [3, 8], "x": 53, "y": 0 }, + { "matrix": [3, 9], "x": 54, "y": 0 }, + { "matrix": [3, 10], "x": 55, "y": 0 }, + { "matrix": [3, 11], "x": 56, "y": 0 }, + { "matrix": [3, 13], "x": 57, "y": 0 }, + { "matrix": [3, 14], "x": 58, "y": 0 }, + { "matrix": [4, 0], "x": 59, "y": 0 }, + { "matrix": [4, 1], "x": 60, "y": 0 }, + { "matrix": [4, 3], "x": 61, "y": 0 }, + { "matrix": [4, 4], "x": 62, "y": 0 }, + { "matrix": [4, 6], "x": 63, "y": 0 }, + { "matrix": [4, 8], "x": 64, "y": 0 }, + { "matrix": [4, 10], "x": 65, "y": 0 }, + { "matrix": [4, 11], "x": 66, "y": 0 }, + { "matrix": [4, 12], "x": 67, "y": 0 }, + { "matrix": [4, 13], "x": 68, "y": 0 }, + { "matrix": [4, 14], "x": 69, "y": 0 }, + { "matrix": [4, 15], "x": 70, "y": 0 } + ] + }, + "LAYOUT_ansi": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0 }, + { "matrix": [0, 11], "x": 11, "y": 0 }, + { "matrix": [0, 12], "x": 12, "y": 0 }, + { "matrix": [0, 13], "x": 13, "y": 0 }, + { "matrix": [0, 15], "x": 14, "y": 0 }, + { "matrix": [1, 0], "x": 15, "y": 0 }, + { "matrix": [1, 2], "x": 16, "y": 0 }, + { "matrix": [1, 3], "x": 17, "y": 0 }, + { "matrix": [1, 4], "x": 18, "y": 0 }, + { "matrix": [1, 5], "x": 19, "y": 0 }, + { "matrix": [1, 6], "x": 20, "y": 0 }, + { "matrix": [1, 7], "x": 21, "y": 0 }, + { "matrix": [1, 8], "x": 22, "y": 0 }, + { "matrix": [1, 9], "x": 23, "y": 0 }, + { "matrix": [1, 10], "x": 24, "y": 0 }, + { "matrix": [1, 11], "x": 25, "y": 0 }, + { "matrix": [1, 12], "x": 26, "y": 0 }, + { "matrix": [1, 13], "x": 27, "y": 0 }, + { "matrix": [1, 14], "x": 28, "y": 0 }, + { "matrix": [1, 15], "x": 29, "y": 0 }, + { "matrix": [2, 0], "x": 30, "y": 0 }, + { "matrix": [2, 2], "x": 31, "y": 0 }, + { "matrix": [2, 3], "x": 32, "y": 0 }, + { "matrix": [2, 4], "x": 33, "y": 0 }, + { "matrix": [2, 5], "x": 34, "y": 0 }, + { "matrix": [2, 6], "x": 35, "y": 0 }, + { "matrix": [2, 7], "x": 36, "y": 0 }, + { "matrix": [2, 8], "x": 37, "y": 0 }, + { "matrix": [2, 9], "x": 38, "y": 0 }, + { "matrix": [2, 10], "x": 39, "y": 0 }, + { "matrix": [2, 11], "x": 40, "y": 0 }, + { "matrix": [2, 12], "x": 41, "y": 0 }, + { "matrix": [2, 13], "x": 42, "y": 0 }, + { "matrix": [2, 15], "x": 43, "y": 0 }, + { "matrix": [3, 1], "x": 44, "y": 0 }, + { "matrix": [3, 2], "x": 45, "y": 0 }, + { "matrix": [3, 3], "x": 46, "y": 0 }, + { "matrix": [3, 4], "x": 47, "y": 0 }, + { "matrix": [3, 5], "x": 48, "y": 0 }, + { "matrix": [3, 6], "x": 49, "y": 0 }, + { "matrix": [3, 7], "x": 50, "y": 0 }, + { "matrix": [3, 8], "x": 51, "y": 0 }, + { "matrix": [3, 9], "x": 52, "y": 0 }, + { "matrix": [3, 10], "x": 53, "y": 0 }, + { "matrix": [3, 11], "x": 54, "y": 0 }, + { "matrix": [3, 13], "x": 55, "y": 0 }, + { "matrix": [3, 14], "x": 56, "y": 0 }, + { "matrix": [4, 0], "x": 57, "y": 0 }, + { "matrix": [4, 1], "x": 58, "y": 0 }, + { "matrix": [4, 3], "x": 59, "y": 0 }, + { "matrix": [4, 6], "x": 60, "y": 0 }, + { "matrix": [4, 10], "x": 61, "y": 0 }, + { "matrix": [4, 11], "x": 62, "y": 0 }, + { "matrix": [4, 12], "x": 63, "y": 0 }, + { "matrix": [4, 13], "x": 64, "y": 0 }, + { "matrix": [4, 14], "x": 65, "y": 0 }, + { "matrix": [4, 15], "x": 66, "y": 0 } + ] + }, + "LAYOUT_ansi_split_bs_space": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0 }, + { "matrix": [0, 11], "x": 11, "y": 0 }, + { "matrix": [0, 12], "x": 12, "y": 0 }, + { "matrix": [0, 13], "x": 13, "y": 0 }, + { "matrix": [0, 14], "x": 14, "y": 0 }, + { "matrix": [0, 15], "x": 15, "y": 0 }, + { "matrix": [1, 0], "x": 16, "y": 0 }, + { "matrix": [1, 2], "x": 17, "y": 0 }, + { "matrix": [1, 3], "x": 18, "y": 0 }, + { "matrix": [1, 4], "x": 19, "y": 0 }, + { "matrix": [1, 5], "x": 20, "y": 0 }, + { "matrix": [1, 6], "x": 21, "y": 0 }, + { "matrix": [1, 7], "x": 22, "y": 0 }, + { "matrix": [1, 8], "x": 23, "y": 0 }, + { "matrix": [1, 9], "x": 24, "y": 0 }, + { "matrix": [1, 10], "x": 25, "y": 0 }, + { "matrix": [1, 11], "x": 26, "y": 0 }, + { "matrix": [1, 12], "x": 27, "y": 0 }, + { "matrix": [1, 13], "x": 28, "y": 0 }, + { "matrix": [1, 14], "x": 29, "y": 0 }, + { "matrix": [1, 15], "x": 30, "y": 0 }, + { "matrix": [2, 0], "x": 31, "y": 0 }, + { "matrix": [2, 2], "x": 32, "y": 0 }, + { "matrix": [2, 3], "x": 33, "y": 0 }, + { "matrix": [2, 4], "x": 34, "y": 0 }, + { "matrix": [2, 5], "x": 35, "y": 0 }, + { "matrix": [2, 6], "x": 36, "y": 0 }, + { "matrix": [2, 7], "x": 37, "y": 0 }, + { "matrix": [2, 8], "x": 38, "y": 0 }, + { "matrix": [2, 9], "x": 39, "y": 0 }, + { "matrix": [2, 10], "x": 40, "y": 0 }, + { "matrix": [2, 11], "x": 41, "y": 0 }, + { "matrix": [2, 12], "x": 42, "y": 0 }, + { "matrix": [2, 13], "x": 43, "y": 0 }, + { "matrix": [2, 15], "x": 44, "y": 0 }, + { "matrix": [3, 1], "x": 45, "y": 0 }, + { "matrix": [3, 2], "x": 46, "y": 0 }, + { "matrix": [3, 3], "x": 47, "y": 0 }, + { "matrix": [3, 4], "x": 48, "y": 0 }, + { "matrix": [3, 5], "x": 49, "y": 0 }, + { "matrix": [3, 6], "x": 50, "y": 0 }, + { "matrix": [3, 7], "x": 51, "y": 0 }, + { "matrix": [3, 8], "x": 52, "y": 0 }, + { "matrix": [3, 9], "x": 53, "y": 0 }, + { "matrix": [3, 10], "x": 54, "y": 0 }, + { "matrix": [3, 11], "x": 55, "y": 0 }, + { "matrix": [3, 13], "x": 56, "y": 0 }, + { "matrix": [3, 14], "x": 57, "y": 0 }, + { "matrix": [4, 0], "x": 58, "y": 0 }, + { "matrix": [4, 1], "x": 59, "y": 0 }, + { "matrix": [4, 3], "x": 60, "y": 0 }, + { "matrix": [4, 4], "x": 61, "y": 0 }, + { "matrix": [4, 6], "x": 62, "y": 0 }, + { "matrix": [4, 8], "x": 63, "y": 0 }, + { "matrix": [4, 10], "x": 64, "y": 0 }, + { "matrix": [4, 11], "x": 65, "y": 0 }, + { "matrix": [4, 12], "x": 66, "y": 0 }, + { "matrix": [4, 13], "x": 67, "y": 0 }, + { "matrix": [4, 14], "x": 68, "y": 0 }, + { "matrix": [4, 15], "x": 69, "y": 0 } + ] + }, + "LAYOUT_iso": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0 }, + { "matrix": [0, 11], "x": 11, "y": 0 }, + { "matrix": [0, 12], "x": 12, "y": 0 }, + { "matrix": [0, 13], "x": 13, "y": 0 }, + { "matrix": [0, 15], "x": 14, "y": 0 }, + { "matrix": [1, 0], "x": 15, "y": 0 }, + { "matrix": [1, 2], "x": 16, "y": 0 }, + { "matrix": [1, 3], "x": 17, "y": 0 }, + { "matrix": [1, 4], "x": 18, "y": 0 }, + { "matrix": [1, 5], "x": 19, "y": 0 }, + { "matrix": [1, 6], "x": 20, "y": 0 }, + { "matrix": [1, 7], "x": 21, "y": 0 }, + { "matrix": [1, 8], "x": 22, "y": 0 }, + { "matrix": [1, 9], "x": 23, "y": 0 }, + { "matrix": [1, 10], "x": 24, "y": 0 }, + { "matrix": [1, 11], "x": 25, "y": 0 }, + { "matrix": [1, 12], "x": 26, "y": 0 }, + { "matrix": [1, 13], "x": 27, "y": 0 }, + { "matrix": [1, 15], "x": 28, "y": 0 }, + { "matrix": [2, 0], "x": 29, "y": 0 }, + { "matrix": [2, 2], "x": 30, "y": 0 }, + { "matrix": [2, 3], "x": 31, "y": 0 }, + { "matrix": [2, 4], "x": 32, "y": 0 }, + { "matrix": [2, 5], "x": 33, "y": 0 }, + { "matrix": [2, 6], "x": 34, "y": 0 }, + { "matrix": [2, 7], "x": 35, "y": 0 }, + { "matrix": [2, 8], "x": 36, "y": 0 }, + { "matrix": [2, 9], "x": 37, "y": 0 }, + { "matrix": [2, 10], "x": 38, "y": 0 }, + { "matrix": [2, 11], "x": 39, "y": 0 }, + { "matrix": [2, 12], "x": 40, "y": 0 }, + { "matrix": [1, 14], "x": 41, "y": 0 }, + { "matrix": [2, 13], "x": 42, "y": 0 }, + { "matrix": [2, 15], "x": 43, "y": 0 }, + { "matrix": [3, 1], "x": 44, "y": 0 }, + { "matrix": [3, 0], "x": 45, "y": 0 }, + { "matrix": [3, 2], "x": 46, "y": 0 }, + { "matrix": [3, 3], "x": 47, "y": 0 }, + { "matrix": [3, 4], "x": 48, "y": 0 }, + { "matrix": [3, 5], "x": 49, "y": 0 }, + { "matrix": [3, 6], "x": 50, "y": 0 }, + { "matrix": [3, 7], "x": 51, "y": 0 }, + { "matrix": [3, 8], "x": 52, "y": 0 }, + { "matrix": [3, 9], "x": 53, "y": 0 }, + { "matrix": [3, 10], "x": 54, "y": 0 }, + { "matrix": [3, 11], "x": 55, "y": 0 }, + { "matrix": [3, 13], "x": 56, "y": 0 }, + { "matrix": [3, 14], "x": 57, "y": 0 }, + { "matrix": [4, 0], "x": 58, "y": 0 }, + { "matrix": [4, 1], "x": 59, "y": 0 }, + { "matrix": [4, 3], "x": 60, "y": 0 }, + { "matrix": [4, 6], "x": 61, "y": 0 }, + { "matrix": [4, 10], "x": 62, "y": 0 }, + { "matrix": [4, 11], "x": 63, "y": 0 }, + { "matrix": [4, 12], "x": 64, "y": 0 }, + { "matrix": [4, 13], "x": 65, "y": 0 }, + { "matrix": [4, 14], "x": 66, "y": 0 }, + { "matrix": [4, 15], "x": 67, "y": 0 } + ] + }, + "LAYOUT_iso_split_bs_space": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0 }, + { "matrix": [0, 11], "x": 11, "y": 0 }, + { "matrix": [0, 12], "x": 12, "y": 0 }, + { "matrix": [0, 13], "x": 13, "y": 0 }, + { "matrix": [0, 14], "x": 14, "y": 0 }, + { "matrix": [0, 15], "x": 15, "y": 0 }, + { "matrix": [1, 0], "x": 16, "y": 0 }, + { "matrix": [1, 2], "x": 17, "y": 0 }, + { "matrix": [1, 3], "x": 18, "y": 0 }, + { "matrix": [1, 4], "x": 19, "y": 0 }, + { "matrix": [1, 5], "x": 20, "y": 0 }, + { "matrix": [1, 6], "x": 21, "y": 0 }, + { "matrix": [1, 7], "x": 22, "y": 0 }, + { "matrix": [1, 8], "x": 23, "y": 0 }, + { "matrix": [1, 9], "x": 24, "y": 0 }, + { "matrix": [1, 10], "x": 25, "y": 0 }, + { "matrix": [1, 11], "x": 26, "y": 0 }, + { "matrix": [1, 12], "x": 27, "y": 0 }, + { "matrix": [1, 13], "x": 28, "y": 0 }, + { "matrix": [1, 15], "x": 29, "y": 0 }, + { "matrix": [2, 0], "x": 30, "y": 0 }, + { "matrix": [2, 2], "x": 31, "y": 0 }, + { "matrix": [2, 3], "x": 32, "y": 0 }, + { "matrix": [2, 4], "x": 33, "y": 0 }, + { "matrix": [2, 5], "x": 34, "y": 0 }, + { "matrix": [2, 6], "x": 35, "y": 0 }, + { "matrix": [2, 7], "x": 36, "y": 0 }, + { "matrix": [2, 8], "x": 37, "y": 0 }, + { "matrix": [2, 9], "x": 38, "y": 0 }, + { "matrix": [2, 10], "x": 39, "y": 0 }, + { "matrix": [2, 11], "x": 40, "y": 0 }, + { "matrix": [2, 12], "x": 41, "y": 0 }, + { "matrix": [1, 14], "x": 42, "y": 0 }, + { "matrix": [2, 13], "x": 43, "y": 0 }, + { "matrix": [2, 15], "x": 44, "y": 0 }, + { "matrix": [3, 1], "x": 45, "y": 0 }, + { "matrix": [3, 0], "x": 46, "y": 0 }, + { "matrix": [3, 2], "x": 47, "y": 0 }, + { "matrix": [3, 3], "x": 48, "y": 0 }, + { "matrix": [3, 4], "x": 49, "y": 0 }, + { "matrix": [3, 5], "x": 50, "y": 0 }, + { "matrix": [3, 6], "x": 51, "y": 0 }, + { "matrix": [3, 7], "x": 52, "y": 0 }, + { "matrix": [3, 8], "x": 53, "y": 0 }, + { "matrix": [3, 9], "x": 54, "y": 0 }, + { "matrix": [3, 10], "x": 55, "y": 0 }, + { "matrix": [3, 11], "x": 56, "y": 0 }, + { "matrix": [3, 13], "x": 57, "y": 0 }, + { "matrix": [3, 14], "x": 58, "y": 0 }, + { "matrix": [4, 0], "x": 59, "y": 0 }, + { "matrix": [4, 1], "x": 60, "y": 0 }, + { "matrix": [4, 3], "x": 61, "y": 0 }, + { "matrix": [4, 4], "x": 62, "y": 0 }, + { "matrix": [4, 6], "x": 63, "y": 0 }, + { "matrix": [4, 8], "x": 64, "y": 0 }, + { "matrix": [4, 10], "x": 65, "y": 0 }, + { "matrix": [4, 11], "x": 66, "y": 0 }, + { "matrix": [4, 12], "x": 67, "y": 0 }, + { "matrix": [4, 13], "x": 68, "y": 0 }, + { "matrix": [4, 14], "x": 69, "y": 0 }, + { "matrix": [4, 15], "x": 70, "y": 0 } + ] + } + } } diff --git a/keyboards/boardsource/the_mark/keymaps/default/keymap.c b/keyboards/boardsource/the_mark/keymaps/default/keymap.c index dc689f9bb1..8e4b5caed7 100644 --- a/keyboards/boardsource/the_mark/keymaps/default/keymap.c +++ b/keyboards/boardsource/the_mark/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2020 Boardsource +/* Copyright 2022 Boardsource * * 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 diff --git a/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c b/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c index 6e1bcd2894..75db90f23f 100644 --- a/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c +++ b/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2020 Boardsource +/* Copyright 2022 Boardsource * * 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 diff --git a/keyboards/boardsource/the_mark/keymaps/default_ansi_split_bs_space/keymap.c b/keyboards/boardsource/the_mark/keymaps/default_ansi_split_bs_space/keymap.c index 477685c771..6bef05a7c1 100644 --- a/keyboards/boardsource/the_mark/keymaps/default_ansi_split_bs_space/keymap.c +++ b/keyboards/boardsource/the_mark/keymaps/default_ansi_split_bs_space/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2020 Boardsource +/* Copyright 2022 Boardsource * 2022 QMK / James Young (@noroadsleft) * * This program is free software: you can redistribute it and/or modify diff --git a/keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c b/keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c index 3e29975d37..68c664aa96 100644 --- a/keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c +++ b/keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2020 Boardsource +/* Copyright 2022 Boardsource * * 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 diff --git a/keyboards/boardsource/the_mark/keymaps/default_iso_split_bs_space/keymap.c b/keyboards/boardsource/the_mark/keymaps/default_iso_split_bs_space/keymap.c index 1f61d83225..676b9b4575 100644 --- a/keyboards/boardsource/the_mark/keymaps/default_iso_split_bs_space/keymap.c +++ b/keyboards/boardsource/the_mark/keymaps/default_iso_split_bs_space/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2020 Boardsource +/* Copyright 2022 Boardsource * 2022 QMK / James Young (@noroadsleft) * * This program is free software: you can redistribute it and/or modify diff --git a/keyboards/boardsource/the_mark/keymaps/via/keymap.c b/keyboards/boardsource/the_mark/keymaps/via/keymap.c index dbc3b5b464..3cf3b45d56 100644 --- a/keyboards/boardsource/the_mark/keymaps/via/keymap.c +++ b/keyboards/boardsource/the_mark/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2020 Boardsource +/* Copyright 2022 Boardsource * * 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 diff --git a/keyboards/boardsource/the_mark/keymaps/via/readme.md b/keyboards/boardsource/the_mark/keymaps/via/readme.md deleted file mode 100644 index 5fda80e18b..0000000000 --- a/keyboards/boardsource/the_mark/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# The via keymap for The Mark: 65 - -This folder contains the VIA configuration for the boardsource's The Mark: 65 diff --git a/keyboards/boardsource/the_mark/rules.mk b/keyboards/boardsource/the_mark/rules.mk index e9cb6a2894..32afd21635 100644 --- a/keyboards/boardsource/the_mark/rules.mk +++ b/keyboards/boardsource/the_mark/rules.mk @@ -1,20 +1 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) -RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support +RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/boardsource/the_mark/the_mark.c b/keyboards/boardsource/the_mark/the_mark.c deleted file mode 100644 index 59aff7f9ac..0000000000 --- a/keyboards/boardsource/the_mark/the_mark.c +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2020 Boardsource - * - * 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 "the_mark.h" - -/* Map physical under glow LEDs for RGB matrix support */ -#ifdef RGB_MATRIX_ENABLE -led_config_t g_led_config = { { - // Key Matrix to LED Index - { 10 , NO_LED, 9 , NO_LED, 8 , 7 , NO_LED, 6 , 5 , NO_LED, 4 , 3 , NO_LED, 2 , NO_LED, 1 }, - { 11 , NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 0 }, - { 12 , NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 23 }, - { 13 , NO_LED, 14 , NO_LED, 15 , 16 , NO_LED, 17 , 18 , NO_LED, 19 , 20 , NO_LED, 21 , NO_LED, NO_LED }, - { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 22 }, -}, { - // LED Index to Physical Position - {224, 42}, {224, 21}, {209, 21}, {179, 21}, {164, 21}, {134, 21}, {119, 21}, {89, 21}, {74, 21}, {45, 21}, {30, 21}, {30, 42}, - {30, 64}, {30, 85}, {45, 85}, {74, 85}, {89, 85}, {119, 85}, {134, 85}, {164, 85}, {179, 85}, {209, 85}, {224, 85}, {224, 64} -}, { - // LED Index to Flag - LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, - LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, - LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL -} }; - - -void suspend_power_down_kb(void) { - rgb_matrix_set_suspend_state(true); - suspend_power_down_user(); -} - -void suspend_wakeup_init_kb(void) { - rgb_matrix_set_suspend_state(false); - suspend_wakeup_init_user(); -} -#endif diff --git a/keyboards/boardsource/the_mark/the_mark.h b/keyboards/boardsource/the_mark/the_mark.h deleted file mode 100644 index 163d5c256c..0000000000 --- a/keyboards/boardsource/the_mark/the_mark.h +++ /dev/null @@ -1,109 +0,0 @@ -/* Copyright 2020 Boardsource - * - * 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 - -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┐ ┌───────┐ - * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E ││0F │ │0D │ 2u Backspace - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┤ └─┬─────┤ - * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E ││1F │ │ │ - * 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤├───┤ ┌──┴┐2D │ ISO Enter - * LShift │20 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D ││2F │ │1E │ │ - * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘└───┘ └───┴────┘ - * │31 │ │31 │30 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │┌───┐ - * └────────┘ ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┘│3E │ - * │40 │41 │43 │44 │46 │48 │4A │4B │4C │┌───┼───┼───┐ - * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┘│4D │4E │4F │ - * └───┴───┴───┘ - * ┌────────────────────────┬─────┬─────┐ - * 6.25u Space │46 │4A │4B │ RWKL - * └────────────────────────┴─────┴─────┘ - */ - -#define LAYOUT_all( \ - 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, K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ - K40, K41, K43, K44, K46, K48, K4A, K4B, K4C, K4D, K4E, K4F \ -) { \ - { 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 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___ }, \ - { K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E, K4F } \ -} - -#define LAYOUT_ansi( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, 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, \ - K40, K41, K43, K46, K4A, K4B, K4C, K4D, K4E, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, 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, ___ }, \ - { K40, K41, ___, K43, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E, K4F } \ -} - -#define LAYOUT_ansi_split_bs_space( \ - 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, \ - K40, K41, K43, K44, K46, K48, K4A, K4B, K4C, K4D, K4E, K4F \ -) { \ - { 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, ___ }, \ - { K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E, K4F } \ -} - -#define LAYOUT_iso( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \ - K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1E, K2D, K2F, \ - K31, K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ - K40, K41, K43, K46, K4A, K4B, K4C, K4D, K4E, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, 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 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___ }, \ - { K40, K41, ___, K43, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E, K4F } \ -} - -#define LAYOUT_iso_split_bs_space( \ - 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, K1F, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1E, K2D, K2F, \ - K31, K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ - K40, K41, K43, K44, K46, K48, K4A, K4B, K4C, K4D, K4E, K4F \ -) { \ - { 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 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___ }, \ - { K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E, K4F } \ -} -- cgit v1.2.3