From e1db7e4857a23bdb8c889d39a63d963ab8a2f2a5 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Tue, 5 Nov 2024 15:55:18 +0100 Subject: [PATCH 01/27] Added a default firmware and layout for the WindStudio Wind X R1 keyboard. --- keyboards/windstudio/wind_x/keyboard.json | 368 ++++++++++++++++++ .../wind_x/keymaps/default/keymap.c | 25 ++ 2 files changed, 393 insertions(+) create mode 100644 keyboards/windstudio/wind_x/keyboard.json create mode 100644 keyboards/windstudio/wind_x/keymaps/default/keymap.c diff --git a/keyboards/windstudio/wind_x/keyboard.json b/keyboards/windstudio/wind_x/keyboard.json new file mode 100644 index 00000000000..e7d6d90e3af --- /dev/null +++ b/keyboards/windstudio/wind_x/keyboard.json @@ -0,0 +1,368 @@ +{ + "keyboard_name": "Wind X", + "manufacturer": "Wind", + "url": "", + "maintainer": "chrisgve", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": false, + "rgblight": false + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "usb": { + "vid": "0x6F75", + "pid": "0x6801", + "device_version": "0.0.1" + }, + "matrix_pins": { + "cols": [ + "C7", + "C6", + "B6", + "E6", + "F6", + "D6", + "D7", + "B4", + "B5", + "F7", + "B7", + "F4", + "F5", + "D4", + "B0", + "B1", + "B2", + "B3" + ], + "rows": ["F0", "F1", "D2", "D1", "D0"] + }, + "diode_direction": "COL2ROW", + "layout_aliases": { + "LAYOUT_tsangan": "LAYOUT_7u_space_bar_split_bs" + }, + "layouts": { + "LAYOUT_default": { + "layout": [ + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "-", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "=", "matrix": [0, 12], "x": 12, "y": 0 }, + { + "label": "Backspace", + "matrix": [0, 13], + "x": 13, + "y": 0, + "w": 2 + }, + + { "label": "Del", "matrix": [4, 11], "x": 16, "y": 0 }, + + { "label": "NumLock", "matrix": [0, 14], "x": 18, "y": 0 }, + { "label": "KP/", "matrix": [0, 15], "x": 19, "y": 0 }, + { "label": "KP*", "matrix": [0, 16], "x": 20, "y": 0 }, + { "label": "KP-", "matrix": [0, 17], "x": 21, "y": 0 }, + + { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "label": "[", "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "label": "]", "matrix": [1, 12], "x": 12.5, "y": 1 }, + { + "label": "\\", + "matrix": [2, 12], + "x": 13.5, + "y": 1, + "w": 1.5 + }, + + { "label": "PgUp", "matrix": [4, 12], "x": 16, "y": 1 }, + + { "label": "KP7", "matrix": [1, 14], "x": 18, "y": 1 }, + { "label": "KP8", "matrix": [1, 15], "x": 19, "y": 1 }, + { "label": "KP9", "matrix": [1, 16], "x": 20, "y": 1 }, + { "label": "KP+", "matrix": [1, 17], "x": 21, "y": 1 }, + + { + "label": "Caps", + "matrix": [2, 0], + "x": 0, + "y": 2, + "w": 1.75 + }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "label": ";", "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "label": "'", "matrix": [2, 11], "x": 11.75, "y": 2 }, + { + "label": "Return", + "matrix": [2, 13], + "x": 12.75, + "y": 2, + "w": 2.25 + }, + + { "label": "PgDn", "matrix": [4, 13], "x": 16, "y": 2 }, + + { "label": "KP4", "matrix": [2, 14], "x": 18, "y": 2 }, + { "label": "KP5", "matrix": [2, 15], "x": 19, "y": 2 }, + { "label": "KP6", "matrix": [2, 16], "x": 20, "y": 2 }, + { "label": "KP+", "matrix": [2, 17], "x": 21, "y": 2 }, + + { + "label": "Shift", + "matrix": [3, 0], + "x": 0, + "y": 3, + "w": 2.25 + }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "label": ",", "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "label": ".", "matrix": [3, 10], "x": 10.25, "y": 3 }, + { "label": "/", "matrix": [3, 11], "x": 11.25, "y": 3 }, + { + "label": "Shift", + "matrix": [3, 12], + "x": 12.25, + "y": 3, + "w": 1.75 + }, + { "label": "Up", "matrix": [3, 13], "x": 13, "y": 3 }, + + { "label": "KP1", "matrix": [3, 14], "x": 18, "y": 3 }, + { "label": "KP2", "matrix": [3, 15], "x": 19, "y": 3 }, + { "label": "KP3", "matrix": [3, 16], "x": 20, "y": 3 }, + { "label": "Enter", "matrix": [3, 17], "x": 21, "y": 3 }, + + { + "label": "Ctrl", + "matrix": [4, 0], + "x": 0, + "y": 4, + "w": 1.25 + }, + { + "label": "GUI", + "matrix": [4, 1], + "x": 1.25, + "y": 4, + "w": 1.25 + }, + { + "label": "Alt", + "matrix": [4, 2], + "x": 2.5, + "y": 4, + "w": 1.25 + }, + { + "label": "Space", + "matrix": [4, 5], + "x": 3.75, + "y": 4, + "w": 6.25 + }, + { + "label": "GUI", + "matrix": [4, 6], + "x": 10, + "y": 4, + "w": 1.25 + }, + { + "label": "Ctrl", + "matrix": [4, 7], + "x": 11.25, + "y": 4, + "w": 1.25 + }, + + { "label": "Left", "matrix": [4, 8], "x": 14, "y": 4 }, + { "label": "Down", "matrix": [4, 9], "x": 15, "y": 4 }, + { "label": "Right", "matrix": [4, 10], "x": 16, "y": 4 }, + + { "label": "KP0", "matrix": [4, 16], "x": 18, "y": 4 }, + { "label": "KP.", "matrix": [4, 17], "x": 19, "y": 4 } + ] + }, + "LAYOUT_7u_space_bar_split_bs": { + "layout": [ + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "-", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "=", "matrix": [0, 12], "x": 12, "y": 0 }, + { "label": "\\", "matrix": [0, 13], "x": 13, "y": 0 }, + { "label": "`", "matrix": [1, 13], "x": 14, "y": 0 }, + + { "label": "PgUp", "matrix": [4, 11], "x": 16, "y": 0 }, + + { "label": "NumLock", "matrix": [0, 14], "x": 18, "y": 0 }, + { "label": "KP/", "matrix": [0, 15], "x": 19, "y": 0 }, + { "label": "KP*", "matrix": [0, 16], "x": 20, "y": 0 }, + { "label": "KP-", "matrix": [0, 17], "x": 21, "y": 0 }, + + { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 }, + { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "label": "[", "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "label": "]", "matrix": [1, 12], "x": 12.5, "y": 1 }, + { + "label": "Backspace", + "matrix": [2, 12], + "x": 13.5, + "y": 1, + "w": 1.5 + }, + + { "label": "PgDn", "matrix": [4, 12], "x": 16, "y": 1 }, + + { "label": "KP7", "matrix": [1, 14], "x": 18, "y": 1 }, + { "label": "KP8", "matrix": [1, 15], "x": 19, "y": 1 }, + { "label": "KP9", "matrix": [1, 16], "x": 20, "y": 1 }, + { "label": "KP+", "matrix": [1, 17], "x": 21, "y": 1 }, + + { + "label": "Ctrl", + "matrix": [2, 0], + "x": 0, + "y": 2, + "w": 1.75 + }, + { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "label": ";", "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "label": "'", "matrix": [2, 11], "x": 11.75, "y": 2 }, + { + "label": "Return", + "matrix": [2, 13], + "x": 12.75, + "y": 2, + "w": 2.25 + }, + + { "label": "End", "matrix": [4, 13], "x": 16, "y": 2 }, + + { "label": "KP4", "matrix": [2, 14], "x": 18, "y": 2 }, + { "label": "KP5", "matrix": [2, 15], "x": 19, "y": 2 }, + { "label": "KP6", "matrix": [2, 16], "x": 20, "y": 2 }, + { "label": "KP+", "matrix": [2, 17], "x": 21, "y": 2 }, + + { + "label": "Shift", + "matrix": [3, 0], + "x": 0, + "y": 3, + "w": 2.25 + }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "label": ",", "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "label": ".", "matrix": [3, 10], "x": 10.25, "y": 3 }, + { "label": "/", "matrix": [3, 11], "x": 11.25, "y": 3 }, + { + "label": "Shift", + "matrix": [3, 12], + "x": 12.25, + "y": 3, + "w": 1.75 + }, + { "label": "Up", "matrix": [3, 13], "x": 13, "y": 3 }, + + { "label": "KP1", "matrix": [3, 14], "x": 18, "y": 3 }, + { "label": "KP2", "matrix": [3, 15], "x": 19, "y": 3 }, + { "label": "KP3", "matrix": [3, 16], "x": 20, "y": 3 }, + { "label": "Enter", "matrix": [3, 17], "x": 21, "y": 3 }, + + { "label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5 }, + { "label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4 }, + { + "label": "Alt", + "matrix": [4, 2], + "x": 2.5, + "y": 4, + "w": 1.5 + }, + { "label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7 }, + { + "label": "Ctrl", + "matrix": [4, 7], + "x": 11, + "y": 4, + "w": 1.5 + }, + + { "label": "Left", "matrix": [4, 8], "x": 13, "y": 4 }, + { "label": "Down", "matrix": [4, 9], "x": 14, "y": 4 }, + { "label": "Right", "matrix": [4, 10], "x": 15, "y": 4 }, + + { "label": "KP0", "matrix": [4, 16], "x": 18, "y": 4 }, + { "label": "KP.", "matrix": [4, 17], "x": 19, "y": 4 } + ] + } + } +} diff --git a/keyboards/windstudio/wind_x/keymaps/default/keymap.c b/keyboards/windstudio/wind_x/keymaps/default/keymap.c new file mode 100644 index 00000000000..3fef87a8405 --- /dev/null +++ b/keyboards/windstudio/wind_x/keymaps/default/keymap.c @@ -0,0 +1,25 @@ +#include QMK_KEYBOARD_H + +#include "quantum.h" +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_default( + 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_BSPC, KC_DEL, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + 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_PGUP, KC_P7, KC_P8, KC_P9, KC_PPLS, + 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_PGDN, KC_P4, KC_P5, KC_P6, KC_PPLS, + 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_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT + ), + + [1] = LAYOUT_default( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + +}; + +// clang-format on From 084a28b523632eb49f5ebc33f6a7cd7cce38534a Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Tue, 5 Nov 2024 16:06:44 +0100 Subject: [PATCH 02/27] Wind X R1: cleaned-up the folders to make clear that this firmware is for the release 1 of this keyboard. --- keyboards/windstudio/wind_x/{ => R1}/keyboard.json | 4 ++-- keyboards/windstudio/wind_x/{ => R1}/keymaps/default/keymap.c | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename keyboards/windstudio/wind_x/{ => R1}/keyboard.json (99%) rename keyboards/windstudio/wind_x/{ => R1}/keymaps/default/keymap.c (100%) diff --git a/keyboards/windstudio/wind_x/keyboard.json b/keyboards/windstudio/wind_x/R1/keyboard.json similarity index 99% rename from keyboards/windstudio/wind_x/keyboard.json rename to keyboards/windstudio/wind_x/R1/keyboard.json index e7d6d90e3af..e2d0b9ec6eb 100644 --- a/keyboards/windstudio/wind_x/keyboard.json +++ b/keyboards/windstudio/wind_x/R1/keyboard.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Wind X", - "manufacturer": "Wind", + "manufacturer": "Windstudio", "url": "", "maintainer": "chrisgve", + "keyboard_name": "Wind X R1", "features": { "bootmagic": true, "command": false, diff --git a/keyboards/windstudio/wind_x/keymaps/default/keymap.c b/keyboards/windstudio/wind_x/R1/keymaps/default/keymap.c similarity index 100% rename from keyboards/windstudio/wind_x/keymaps/default/keymap.c rename to keyboards/windstudio/wind_x/R1/keymaps/default/keymap.c From cc9b828ba5055e4e733b2f6e3b13c0302c2803e1 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Tue, 5 Nov 2024 16:27:33 +0100 Subject: [PATCH 03/27] Added rules.mk to the default layout --- keyboards/windstudio/wind_x/R1/keymaps/default/rules.mk | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/windstudio/wind_x/R1/keymaps/default/rules.mk diff --git a/keyboards/windstudio/wind_x/R1/keymaps/default/rules.mk b/keyboards/windstudio/wind_x/R1/keymaps/default/rules.mk new file mode 100644 index 00000000000..9d2c49d933e --- /dev/null +++ b/keyboards/windstudio/wind_x/R1/keymaps/default/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = no From 91a48c4a96187b010a7784cdd79d08d45005d1d9 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Tue, 5 Nov 2024 16:30:59 +0100 Subject: [PATCH 04/27] Renamed the folder R1 into r1. --- keyboards/windstudio/wind_x/{R1 => r1}/keyboard.json | 0 keyboards/windstudio/wind_x/{R1 => r1}/keymaps/default/keymap.c | 0 keyboards/windstudio/wind_x/{R1 => r1}/keymaps/default/rules.mk | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/windstudio/wind_x/{R1 => r1}/keyboard.json (100%) rename keyboards/windstudio/wind_x/{R1 => r1}/keymaps/default/keymap.c (100%) rename keyboards/windstudio/wind_x/{R1 => r1}/keymaps/default/rules.mk (100%) diff --git a/keyboards/windstudio/wind_x/R1/keyboard.json b/keyboards/windstudio/wind_x/r1/keyboard.json similarity index 100% rename from keyboards/windstudio/wind_x/R1/keyboard.json rename to keyboards/windstudio/wind_x/r1/keyboard.json diff --git a/keyboards/windstudio/wind_x/R1/keymaps/default/keymap.c b/keyboards/windstudio/wind_x/r1/keymaps/default/keymap.c similarity index 100% rename from keyboards/windstudio/wind_x/R1/keymaps/default/keymap.c rename to keyboards/windstudio/wind_x/r1/keymaps/default/keymap.c diff --git a/keyboards/windstudio/wind_x/R1/keymaps/default/rules.mk b/keyboards/windstudio/wind_x/r1/keymaps/default/rules.mk similarity index 100% rename from keyboards/windstudio/wind_x/R1/keymaps/default/rules.mk rename to keyboards/windstudio/wind_x/r1/keymaps/default/rules.mk From 550673a3792e6ac8c0253e334233633202b23ad6 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Tue, 5 Nov 2024 16:44:42 +0100 Subject: [PATCH 05/27] Added readme.md files for the keyboard and default layout. --- .../wind_x/r1/keymaps/default/readme.md | 6 +++++ keyboards/windstudio/wind_x/r1/readme.md | 26 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 keyboards/windstudio/wind_x/r1/keymaps/default/readme.md create mode 100644 keyboards/windstudio/wind_x/r1/readme.md diff --git a/keyboards/windstudio/wind_x/r1/keymaps/default/readme.md b/keyboards/windstudio/wind_x/r1/keymaps/default/readme.md new file mode 100644 index 00000000000..2fa0952a830 --- /dev/null +++ b/keyboards/windstudio/wind_x/r1/keymaps/default/readme.md @@ -0,0 +1,6 @@ +# Default Wind X R1 Layout + +This is the default layout that comes flashed on every Wind X R1. For the most +part it's a straightforward and easy to follow layout. The only unusual key is +the key in the upper left, which sends Escape normally, but Grave when any of +the Ctrl, Alt, or GUI modifiers are held down. diff --git a/keyboards/windstudio/wind_x/r1/readme.md b/keyboards/windstudio/wind_x/r1/readme.md new file mode 100644 index 00000000000..8ad488fa5d6 --- /dev/null +++ b/keyboards/windstudio/wind_x/r1/readme.md @@ -0,0 +1,26 @@ +# WindX R1 by Windstudio + +![Windstudio](https://windstudio.store) + +A large layout keyboard without the function keys. [More info on geekhack.org](https://geekhack.org/index.php?topic=114767.0) + +- Keyboard Maintainer: [Christian C. Berclaz](https://github.com/chrisgve) +- Hardware Supported: Wind X R1 + +Make example for this keyboard (after setting up your build environment): + + make windstudio/wind_x/r1:default + +Flashing example for this keyboard: + + make windstudio/wind_x/r1:default:flash + +See the [build environment setup](getting_started_build_tools) and the [make instructions](getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +- **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +- **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +- **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 1b8428326d27af27d6d06df307306b951843d0fd Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Tue, 5 Nov 2024 17:03:04 +0100 Subject: [PATCH 06/27] Added a license header to keymap.c --- .../wind_x/r1/keymaps/default/keymap.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/keyboards/windstudio/wind_x/r1/keymaps/default/keymap.c b/keyboards/windstudio/wind_x/r1/keymaps/default/keymap.c index 3fef87a8405..09ce776954f 100644 --- a/keyboards/windstudio/wind_x/r1/keymaps/default/keymap.c +++ b/keyboards/windstudio/wind_x/r1/keymaps/default/keymap.c @@ -1,6 +1,21 @@ +/* Copyright 2024 chrisgve + * + * 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 -#include "quantum.h" // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From 0d7d756722206021db0c43920e87812c6d4bcc98 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Thu, 7 Nov 2024 12:03:55 +0100 Subject: [PATCH 07/27] Update keyboards/windstudio/wind_x/r1/keyboard.json Co-authored-by: jack --- keyboards/windstudio/wind_x/r1/keyboard.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/keyboards/windstudio/wind_x/r1/keyboard.json b/keyboards/windstudio/wind_x/r1/keyboard.json index e2d0b9ec6eb..1fc401bf581 100644 --- a/keyboards/windstudio/wind_x/r1/keyboard.json +++ b/keyboards/windstudio/wind_x/r1/keyboard.json @@ -5,13 +5,9 @@ "keyboard_name": "Wind X R1", "features": { "bootmagic": true, - "command": false, - "console": false, "extrakey": true, "mousekey": true, - "nkro": true, - "rgb_matrix": false, - "rgblight": false + "nkro": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", From 8a9530ad51db893a44d9069f12b692d1df8ae5b2 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Thu, 7 Nov 2024 12:04:16 +0100 Subject: [PATCH 08/27] Update keyboards/windstudio/wind_x/r1/keyboard.json Co-authored-by: jack --- keyboards/windstudio/wind_x/r1/keyboard.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/windstudio/wind_x/r1/keyboard.json b/keyboards/windstudio/wind_x/r1/keyboard.json index 1fc401bf581..14e8e241adc 100644 --- a/keyboards/windstudio/wind_x/r1/keyboard.json +++ b/keyboards/windstudio/wind_x/r1/keyboard.json @@ -44,7 +44,7 @@ "LAYOUT_tsangan": "LAYOUT_7u_space_bar_split_bs" }, "layouts": { - "LAYOUT_default": { + "LAYOUT": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 }, From c94912dabf6fad5dc8f40d20c2be40a0dd596180 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Thu, 7 Nov 2024 12:04:37 +0100 Subject: [PATCH 09/27] Update keyboards/windstudio/wind_x/r1/keymaps/default/keymap.c Co-authored-by: jack --- .../wind_x/r1/keymaps/default/keymap.c | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/keyboards/windstudio/wind_x/r1/keymaps/default/keymap.c b/keyboards/windstudio/wind_x/r1/keymaps/default/keymap.c index 09ce776954f..7f05ed1097b 100644 --- a/keyboards/windstudio/wind_x/r1/keymaps/default/keymap.c +++ b/keyboards/windstudio/wind_x/r1/keymaps/default/keymap.c @@ -19,21 +19,21 @@ // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_default( - 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_BSPC, KC_DEL, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - 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_PGUP, KC_P7, KC_P8, KC_P9, KC_PPLS, - 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_PGDN, KC_P4, KC_P5, KC_P6, KC_PPLS, - 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_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT + [0] = 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_BSPC, KC_DEL, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + 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_PGUP, KC_P7, KC_P8, KC_P9, KC_PPLS, + 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_PGDN, KC_P4, KC_P5, KC_P6, KC_PPLS, + 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_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - [1] = LAYOUT_default( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), + [1] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) }; From 9c7271f940d05e0bc3bb148d85206b092090499e Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Thu, 7 Nov 2024 12:05:13 +0100 Subject: [PATCH 10/27] Update keyboards/windstudio/wind_x/r1/readme.md Co-authored-by: jack --- keyboards/windstudio/wind_x/r1/readme.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/keyboards/windstudio/wind_x/r1/readme.md b/keyboards/windstudio/wind_x/r1/readme.md index 8ad488fa5d6..9735c75de0f 100644 --- a/keyboards/windstudio/wind_x/r1/readme.md +++ b/keyboards/windstudio/wind_x/r1/readme.md @@ -4,8 +4,9 @@ A large layout keyboard without the function keys. [More info on geekhack.org](https://geekhack.org/index.php?topic=114767.0) -- Keyboard Maintainer: [Christian C. Berclaz](https://github.com/chrisgve) -- Hardware Supported: Wind X R1 +* Keyboard Maintainer: [Christian C. Berclaz](https://github.com/chrisgve) +* Hardware Supported: Wind X R1 w/ ATmega32U4 microcontroller +* Hardware Availability: [windstudio.store](https://windstudio.store/collections/wind-x) Make example for this keyboard (after setting up your build environment): From 115bd7b0a3bad7d42ce22a130b017e3520325538 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Thu, 7 Nov 2024 12:15:10 +0100 Subject: [PATCH 11/27] Added a proper link to the image (logo of windstudio) --- keyboards/windstudio/wind_x/r1/readme.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/windstudio/wind_x/r1/readme.md b/keyboards/windstudio/wind_x/r1/readme.md index 9735c75de0f..858467941a8 100644 --- a/keyboards/windstudio/wind_x/r1/readme.md +++ b/keyboards/windstudio/wind_x/r1/readme.md @@ -1,12 +1,12 @@ # WindX R1 by Windstudio -![Windstudio](https://windstudio.store) +![Windstudio](https://windstudio.store/cdn/shop/files/20220831191615_4833cd38-da74-4ed2-bd46-80bcb02336b8.jpg?v=1679464964&width=240) A large layout keyboard without the function keys. [More info on geekhack.org](https://geekhack.org/index.php?topic=114767.0) -* Keyboard Maintainer: [Christian C. Berclaz](https://github.com/chrisgve) -* Hardware Supported: Wind X R1 w/ ATmega32U4 microcontroller -* Hardware Availability: [windstudio.store](https://windstudio.store/collections/wind-x) +- Keyboard Maintainer: [Christian C. Berclaz](https://github.com/chrisgve) +- Hardware Supported: Wind X R1 w/ ATmega32U4 microcontroller +- Hardware Availability: [windstudio.store](https://windstudio.store/collections/wind-x) Make example for this keyboard (after setting up your build environment): From 1dbe38d4e9d2eb4e2df04adcd06a552a81956867 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Thu, 7 Nov 2024 12:18:29 +0100 Subject: [PATCH 12/27] Wind X R1 - Corrected the default keymap with the QK_GESC key instead of the KC_ESC. - Removed the unnecessary rules.mk in the default layout --- keyboards/windstudio/wind_x/r1/keymaps/default/keymap.c | 2 +- keyboards/windstudio/wind_x/r1/keymaps/default/rules.mk | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 keyboards/windstudio/wind_x/r1/keymaps/default/rules.mk diff --git a/keyboards/windstudio/wind_x/r1/keymaps/default/keymap.c b/keyboards/windstudio/wind_x/r1/keymaps/default/keymap.c index 7f05ed1097b..dd3134e2a0f 100644 --- a/keyboards/windstudio/wind_x/r1/keymaps/default/keymap.c +++ b/keyboards/windstudio/wind_x/r1/keymaps/default/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = 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_BSPC, KC_DEL, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + 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_BSPC, KC_DEL, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 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_PGUP, KC_P7, KC_P8, KC_P9, KC_PPLS, 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_PGDN, KC_P4, KC_P5, KC_P6, KC_PPLS, 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_P1, KC_P2, KC_P3, KC_PENT, diff --git a/keyboards/windstudio/wind_x/r1/keymaps/default/rules.mk b/keyboards/windstudio/wind_x/r1/keymaps/default/rules.mk deleted file mode 100644 index 9d2c49d933e..00000000000 --- a/keyboards/windstudio/wind_x/r1/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = no From 7a9a6c72b0b1cf440ad978bb88de83e4c881c93e Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Thu, 7 Nov 2024 12:22:01 +0100 Subject: [PATCH 13/27] Wind X R1: applied `qmk format-json -i` on keyboard.json to conform with the project formatt standards. --- keyboards/windstudio/wind_x/r1/keyboard.json | 517 +++++++------------ 1 file changed, 179 insertions(+), 338 deletions(-) diff --git a/keyboards/windstudio/wind_x/r1/keyboard.json b/keyboards/windstudio/wind_x/r1/keyboard.json index 14e8e241adc..1b5f34fe3e8 100644 --- a/keyboards/windstudio/wind_x/r1/keyboard.json +++ b/keyboards/windstudio/wind_x/r1/keyboard.json @@ -1,363 +1,204 @@ { "manufacturer": "Windstudio", - "url": "", - "maintainer": "chrisgve", "keyboard_name": "Wind X R1", + "maintainer": "chrisgve", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", "features": { "bootmagic": true, "extrakey": true, "mousekey": true, "nkro": true }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "usb": { - "vid": "0x6F75", - "pid": "0x6801", - "device_version": "0.0.1" - }, "matrix_pins": { - "cols": [ - "C7", - "C6", - "B6", - "E6", - "F6", - "D6", - "D7", - "B4", - "B5", - "F7", - "B7", - "F4", - "F5", - "D4", - "B0", - "B1", - "B2", - "B3" - ], + "cols": ["C7", "C6", "B6", "E6", "F6", "D6", "D7", "B4", "B5", "F7", "B7", "F4", "F5", "D4", "B0", "B1", "B2", "B3"], "rows": ["F0", "F1", "D2", "D1", "D0"] }, - "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "url": "", + "usb": { + "device_version": "0.0.1", + "pid": "0x6801", + "vid": "0x6F75" + }, "layout_aliases": { "LAYOUT_tsangan": "LAYOUT_7u_space_bar_split_bs" }, "layouts": { "LAYOUT": { "layout": [ - { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, - { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 }, - { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 }, - { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 }, - { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 }, - { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 }, - { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 }, - { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 }, - { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 }, - { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 }, - { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 }, - { "label": "-", "matrix": [0, 11], "x": 11, "y": 0 }, - { "label": "=", "matrix": [0, 12], "x": 12, "y": 0 }, - { - "label": "Backspace", - "matrix": [0, 13], - "x": 13, - "y": 0, - "w": 2 - }, - - { "label": "Del", "matrix": [4, 11], "x": 16, "y": 0 }, - - { "label": "NumLock", "matrix": [0, 14], "x": 18, "y": 0 }, - { "label": "KP/", "matrix": [0, 15], "x": 19, "y": 0 }, - { "label": "KP*", "matrix": [0, 16], "x": 20, "y": 0 }, - { "label": "KP-", "matrix": [0, 17], "x": 21, "y": 0 }, - - { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 }, - { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, - { "label": "[", "matrix": [1, 11], "x": 11.5, "y": 1 }, - { "label": "]", "matrix": [1, 12], "x": 12.5, "y": 1 }, - { - "label": "\\", - "matrix": [2, 12], - "x": 13.5, - "y": 1, - "w": 1.5 - }, - - { "label": "PgUp", "matrix": [4, 12], "x": 16, "y": 1 }, - - { "label": "KP7", "matrix": [1, 14], "x": 18, "y": 1 }, - { "label": "KP8", "matrix": [1, 15], "x": 19, "y": 1 }, - { "label": "KP9", "matrix": [1, 16], "x": 20, "y": 1 }, - { "label": "KP+", "matrix": [1, 17], "x": 21, "y": 1 }, - - { - "label": "Caps", - "matrix": [2, 0], - "x": 0, - "y": 2, - "w": 1.75 - }, - { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, - { "label": ";", "matrix": [2, 10], "x": 10.75, "y": 2 }, - { "label": "'", "matrix": [2, 11], "x": 11.75, "y": 2 }, - { - "label": "Return", - "matrix": [2, 13], - "x": 12.75, - "y": 2, - "w": 2.25 - }, - - { "label": "PgDn", "matrix": [4, 13], "x": 16, "y": 2 }, - - { "label": "KP4", "matrix": [2, 14], "x": 18, "y": 2 }, - { "label": "KP5", "matrix": [2, 15], "x": 19, "y": 2 }, - { "label": "KP6", "matrix": [2, 16], "x": 20, "y": 2 }, - { "label": "KP+", "matrix": [2, 17], "x": 21, "y": 2 }, - - { - "label": "Shift", - "matrix": [3, 0], - "x": 0, - "y": 3, - "w": 2.25 - }, - { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 }, - { "label": ",", "matrix": [3, 9], "x": 9.25, "y": 3 }, - { "label": ".", "matrix": [3, 10], "x": 10.25, "y": 3 }, - { "label": "/", "matrix": [3, 11], "x": 11.25, "y": 3 }, - { - "label": "Shift", - "matrix": [3, 12], - "x": 12.25, - "y": 3, - "w": 1.75 - }, - { "label": "Up", "matrix": [3, 13], "x": 13, "y": 3 }, - - { "label": "KP1", "matrix": [3, 14], "x": 18, "y": 3 }, - { "label": "KP2", "matrix": [3, 15], "x": 19, "y": 3 }, - { "label": "KP3", "matrix": [3, 16], "x": 20, "y": 3 }, - { "label": "Enter", "matrix": [3, 17], "x": 21, "y": 3 }, - - { - "label": "Ctrl", - "matrix": [4, 0], - "x": 0, - "y": 4, - "w": 1.25 - }, - { - "label": "GUI", - "matrix": [4, 1], - "x": 1.25, - "y": 4, - "w": 1.25 - }, - { - "label": "Alt", - "matrix": [4, 2], - "x": 2.5, - "y": 4, - "w": 1.25 - }, - { - "label": "Space", - "matrix": [4, 5], - "x": 3.75, - "y": 4, - "w": 6.25 - }, - { - "label": "GUI", - "matrix": [4, 6], - "x": 10, - "y": 4, - "w": 1.25 - }, - { - "label": "Ctrl", - "matrix": [4, 7], - "x": 11.25, - "y": 4, - "w": 1.25 - }, - - { "label": "Left", "matrix": [4, 8], "x": 14, "y": 4 }, - { "label": "Down", "matrix": [4, 9], "x": 15, "y": 4 }, - { "label": "Right", "matrix": [4, 10], "x": 16, "y": 4 }, - - { "label": "KP0", "matrix": [4, 16], "x": 18, "y": 4 }, - { "label": "KP.", "matrix": [4, 17], "x": 19, "y": 4 } + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"label": "Del", "matrix": [4, 11], "x": 16, "y": 0}, + {"label": "NumLock", "matrix": [0, 14], "x": 18, "y": 0}, + {"label": "KP/", "matrix": [0, 15], "x": 19, "y": 0}, + {"label": "KP*", "matrix": [0, 16], "x": 20, "y": 0}, + {"label": "KP-", "matrix": [0, 17], "x": 21, "y": 0}, + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "\\", "matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "PgUp", "matrix": [4, 12], "x": 16, "y": 1}, + {"label": "KP7", "matrix": [1, 14], "x": 18, "y": 1}, + {"label": "KP8", "matrix": [1, 15], "x": 19, "y": 1}, + {"label": "KP9", "matrix": [1, 16], "x": 20, "y": 1}, + {"label": "KP+", "matrix": [1, 17], "x": 21, "y": 1}, + {"label": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Return", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "PgDn", "matrix": [4, 13], "x": 16, "y": 2}, + {"label": "KP4", "matrix": [2, 14], "x": 18, "y": 2}, + {"label": "KP5", "matrix": [2, 15], "x": 19, "y": 2}, + {"label": "KP6", "matrix": [2, 16], "x": 20, "y": 2}, + {"label": "KP+", "matrix": [2, 17], "x": 21, "y": 2}, + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "Up", "matrix": [3, 13], "x": 13, "y": 3}, + {"label": "KP1", "matrix": [3, 14], "x": 18, "y": 3}, + {"label": "KP2", "matrix": [3, 15], "x": 19, "y": 3}, + {"label": "KP3", "matrix": [3, 16], "x": 20, "y": 3}, + {"label": "Enter", "matrix": [3, 17], "x": 21, "y": 3}, + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "GUI", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25}, + {"label": "Left", "matrix": [4, 8], "x": 14, "y": 4}, + {"label": "Down", "matrix": [4, 9], "x": 15, "y": 4}, + {"label": "Right", "matrix": [4, 10], "x": 16, "y": 4}, + {"label": "KP0", "matrix": [4, 16], "x": 18, "y": 4}, + {"label": "KP.", "matrix": [4, 17], "x": 19, "y": 4} ] }, "LAYOUT_7u_space_bar_split_bs": { "layout": [ - { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, - { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 }, - { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 }, - { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 }, - { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 }, - { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 }, - { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 }, - { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 }, - { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 }, - { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 }, - { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 }, - { "label": "-", "matrix": [0, 11], "x": 11, "y": 0 }, - { "label": "=", "matrix": [0, 12], "x": 12, "y": 0 }, - { "label": "\\", "matrix": [0, 13], "x": 13, "y": 0 }, - { "label": "`", "matrix": [1, 13], "x": 14, "y": 0 }, - - { "label": "PgUp", "matrix": [4, 11], "x": 16, "y": 0 }, - - { "label": "NumLock", "matrix": [0, 14], "x": 18, "y": 0 }, - { "label": "KP/", "matrix": [0, 15], "x": 19, "y": 0 }, - { "label": "KP*", "matrix": [0, 16], "x": 20, "y": 0 }, - { "label": "KP-", "matrix": [0, 17], "x": 21, "y": 0 }, - - { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 }, - { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, - { "label": "[", "matrix": [1, 11], "x": 11.5, "y": 1 }, - { "label": "]", "matrix": [1, 12], "x": 12.5, "y": 1 }, - { - "label": "Backspace", - "matrix": [2, 12], - "x": 13.5, - "y": 1, - "w": 1.5 - }, - - { "label": "PgDn", "matrix": [4, 12], "x": 16, "y": 1 }, - - { "label": "KP7", "matrix": [1, 14], "x": 18, "y": 1 }, - { "label": "KP8", "matrix": [1, 15], "x": 19, "y": 1 }, - { "label": "KP9", "matrix": [1, 16], "x": 20, "y": 1 }, - { "label": "KP+", "matrix": [1, 17], "x": 21, "y": 1 }, - - { - "label": "Ctrl", - "matrix": [2, 0], - "x": 0, - "y": 2, - "w": 1.75 - }, - { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, - { "label": ";", "matrix": [2, 10], "x": 10.75, "y": 2 }, - { "label": "'", "matrix": [2, 11], "x": 11.75, "y": 2 }, - { - "label": "Return", - "matrix": [2, 13], - "x": 12.75, - "y": 2, - "w": 2.25 - }, - - { "label": "End", "matrix": [4, 13], "x": 16, "y": 2 }, - - { "label": "KP4", "matrix": [2, 14], "x": 18, "y": 2 }, - { "label": "KP5", "matrix": [2, 15], "x": 19, "y": 2 }, - { "label": "KP6", "matrix": [2, 16], "x": 20, "y": 2 }, - { "label": "KP+", "matrix": [2, 17], "x": 21, "y": 2 }, - - { - "label": "Shift", - "matrix": [3, 0], - "x": 0, - "y": 3, - "w": 2.25 - }, - { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 }, - { "label": ",", "matrix": [3, 9], "x": 9.25, "y": 3 }, - { "label": ".", "matrix": [3, 10], "x": 10.25, "y": 3 }, - { "label": "/", "matrix": [3, 11], "x": 11.25, "y": 3 }, - { - "label": "Shift", - "matrix": [3, 12], - "x": 12.25, - "y": 3, - "w": 1.75 - }, - { "label": "Up", "matrix": [3, 13], "x": 13, "y": 3 }, - - { "label": "KP1", "matrix": [3, 14], "x": 18, "y": 3 }, - { "label": "KP2", "matrix": [3, 15], "x": 19, "y": 3 }, - { "label": "KP3", "matrix": [3, 16], "x": 20, "y": 3 }, - { "label": "Enter", "matrix": [3, 17], "x": 21, "y": 3 }, - - { "label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5 }, - { "label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4 }, - { - "label": "Alt", - "matrix": [4, 2], - "x": 2.5, - "y": 4, - "w": 1.5 - }, - { "label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7 }, - { - "label": "Ctrl", - "matrix": [4, 7], - "x": 11, - "y": 4, - "w": 1.5 - }, - - { "label": "Left", "matrix": [4, 8], "x": 13, "y": 4 }, - { "label": "Down", "matrix": [4, 9], "x": 14, "y": 4 }, - { "label": "Right", "matrix": [4, 10], "x": 15, "y": 4 }, - - { "label": "KP0", "matrix": [4, 16], "x": 18, "y": 4 }, - { "label": "KP.", "matrix": [4, 17], "x": 19, "y": 4 } + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0}, + {"label": "`", "matrix": [1, 13], "x": 14, "y": 0}, + {"label": "PgUp", "matrix": [4, 11], "x": 16, "y": 0}, + {"label": "NumLock", "matrix": [0, 14], "x": 18, "y": 0}, + {"label": "KP/", "matrix": [0, 15], "x": 19, "y": 0}, + {"label": "KP*", "matrix": [0, 16], "x": 20, "y": 0}, + {"label": "KP-", "matrix": [0, 17], "x": 21, "y": 0}, + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "Backspace", "matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "PgDn", "matrix": [4, 12], "x": 16, "y": 1}, + {"label": "KP7", "matrix": [1, 14], "x": 18, "y": 1}, + {"label": "KP8", "matrix": [1, 15], "x": 19, "y": 1}, + {"label": "KP9", "matrix": [1, 16], "x": 20, "y": 1}, + {"label": "KP+", "matrix": [1, 17], "x": 21, "y": 1}, + {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Return", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "End", "matrix": [4, 13], "x": 16, "y": 2}, + {"label": "KP4", "matrix": [2, 14], "x": 18, "y": 2}, + {"label": "KP5", "matrix": [2, 15], "x": 19, "y": 2}, + {"label": "KP6", "matrix": [2, 16], "x": 20, "y": 2}, + {"label": "KP+", "matrix": [2, 17], "x": 21, "y": 2}, + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "Up", "matrix": [3, 13], "x": 13, "y": 3}, + {"label": "KP1", "matrix": [3, 14], "x": 18, "y": 3}, + {"label": "KP2", "matrix": [3, 15], "x": 19, "y": 3}, + {"label": "KP3", "matrix": [3, 16], "x": 20, "y": 3}, + {"label": "Enter", "matrix": [3, 17], "x": 21, "y": 3}, + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7}, + {"label": "Ctrl", "matrix": [4, 7], "x": 11, "y": 4, "w": 1.5}, + {"label": "Left", "matrix": [4, 8], "x": 13, "y": 4}, + {"label": "Down", "matrix": [4, 9], "x": 14, "y": 4}, + {"label": "Right", "matrix": [4, 10], "x": 15, "y": 4}, + {"label": "KP0", "matrix": [4, 16], "x": 18, "y": 4}, + {"label": "KP.", "matrix": [4, 17], "x": 19, "y": 4} ] } } From 6d06fdc610c0322a5874a10ca92f35137ef7e068 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Thu, 7 Nov 2024 13:48:42 +0100 Subject: [PATCH 14/27] Cleaning this branch to keep only the zlant_xl files. --- keyboards/windstudio/wind_x/r1/keyboard.json | 205 ------------------ .../wind_x/r1/keymaps/default/keymap.c | 40 ---- .../wind_x/r1/keymaps/default/readme.md | 6 - keyboards/windstudio/wind_x/r1/readme.md | 27 --- 4 files changed, 278 deletions(-) delete mode 100644 keyboards/windstudio/wind_x/r1/keyboard.json delete mode 100644 keyboards/windstudio/wind_x/r1/keymaps/default/keymap.c delete mode 100644 keyboards/windstudio/wind_x/r1/keymaps/default/readme.md delete mode 100644 keyboards/windstudio/wind_x/r1/readme.md diff --git a/keyboards/windstudio/wind_x/r1/keyboard.json b/keyboards/windstudio/wind_x/r1/keyboard.json deleted file mode 100644 index 1b5f34fe3e8..00000000000 --- a/keyboards/windstudio/wind_x/r1/keyboard.json +++ /dev/null @@ -1,205 +0,0 @@ -{ - "manufacturer": "Windstudio", - "keyboard_name": "Wind X R1", - "maintainer": "chrisgve", - "bootloader": "atmel-dfu", - "diode_direction": "COL2ROW", - "features": { - "bootmagic": true, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "matrix_pins": { - "cols": ["C7", "C6", "B6", "E6", "F6", "D6", "D7", "B4", "B5", "F7", "B7", "F4", "F5", "D4", "B0", "B1", "B2", "B3"], - "rows": ["F0", "F1", "D2", "D1", "D0"] - }, - "processor": "atmega32u4", - "url": "", - "usb": { - "device_version": "0.0.1", - "pid": "0x6801", - "vid": "0x6F75" - }, - "layout_aliases": { - "LAYOUT_tsangan": "LAYOUT_7u_space_bar_split_bs" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, - {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, - {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, - {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, - {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, - {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, - {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, - {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, - {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, - {"label": "9", "matrix": [0, 9], "x": 9, "y": 0}, - {"label": "0", "matrix": [0, 10], "x": 10, "y": 0}, - {"label": "-", "matrix": [0, 11], "x": 11, "y": 0}, - {"label": "=", "matrix": [0, 12], "x": 12, "y": 0}, - {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"label": "Del", "matrix": [4, 11], "x": 16, "y": 0}, - {"label": "NumLock", "matrix": [0, 14], "x": 18, "y": 0}, - {"label": "KP/", "matrix": [0, 15], "x": 19, "y": 0}, - {"label": "KP*", "matrix": [0, 16], "x": 20, "y": 0}, - {"label": "KP-", "matrix": [0, 17], "x": 21, "y": 0}, - {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, - {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, - {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, - {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, - {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, - {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, - {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, - {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, - {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, - {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, - {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1}, - {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1}, - {"label": "\\", "matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5}, - {"label": "PgUp", "matrix": [4, 12], "x": 16, "y": 1}, - {"label": "KP7", "matrix": [1, 14], "x": 18, "y": 1}, - {"label": "KP8", "matrix": [1, 15], "x": 19, "y": 1}, - {"label": "KP9", "matrix": [1, 16], "x": 20, "y": 1}, - {"label": "KP+", "matrix": [1, 17], "x": 21, "y": 1}, - {"label": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, - {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, - {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, - {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, - {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, - {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, - {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, - {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, - {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, - {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, - {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2}, - {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, - {"label": "Return", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - {"label": "PgDn", "matrix": [4, 13], "x": 16, "y": 2}, - {"label": "KP4", "matrix": [2, 14], "x": 18, "y": 2}, - {"label": "KP5", "matrix": [2, 15], "x": 19, "y": 2}, - {"label": "KP6", "matrix": [2, 16], "x": 20, "y": 2}, - {"label": "KP+", "matrix": [2, 17], "x": 21, "y": 2}, - {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, - {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, - {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, - {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, - {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, - {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, - {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, - {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, - {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3}, - {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3}, - {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3}, - {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, - {"label": "Up", "matrix": [3, 13], "x": 13, "y": 3}, - {"label": "KP1", "matrix": [3, 14], "x": 18, "y": 3}, - {"label": "KP2", "matrix": [3, 15], "x": 19, "y": 3}, - {"label": "KP3", "matrix": [3, 16], "x": 20, "y": 3}, - {"label": "Enter", "matrix": [3, 17], "x": 21, "y": 3}, - {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, - {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, - {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, - {"label": "GUI", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25}, - {"label": "Ctrl", "matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25}, - {"label": "Left", "matrix": [4, 8], "x": 14, "y": 4}, - {"label": "Down", "matrix": [4, 9], "x": 15, "y": 4}, - {"label": "Right", "matrix": [4, 10], "x": 16, "y": 4}, - {"label": "KP0", "matrix": [4, 16], "x": 18, "y": 4}, - {"label": "KP.", "matrix": [4, 17], "x": 19, "y": 4} - ] - }, - "LAYOUT_7u_space_bar_split_bs": { - "layout": [ - {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, - {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, - {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, - {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, - {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, - {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, - {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, - {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, - {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, - {"label": "9", "matrix": [0, 9], "x": 9, "y": 0}, - {"label": "0", "matrix": [0, 10], "x": 10, "y": 0}, - {"label": "-", "matrix": [0, 11], "x": 11, "y": 0}, - {"label": "=", "matrix": [0, 12], "x": 12, "y": 0}, - {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0}, - {"label": "`", "matrix": [1, 13], "x": 14, "y": 0}, - {"label": "PgUp", "matrix": [4, 11], "x": 16, "y": 0}, - {"label": "NumLock", "matrix": [0, 14], "x": 18, "y": 0}, - {"label": "KP/", "matrix": [0, 15], "x": 19, "y": 0}, - {"label": "KP*", "matrix": [0, 16], "x": 20, "y": 0}, - {"label": "KP-", "matrix": [0, 17], "x": 21, "y": 0}, - {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, - {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, - {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, - {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, - {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, - {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, - {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, - {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, - {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, - {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, - {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1}, - {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1}, - {"label": "Backspace", "matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5}, - {"label": "PgDn", "matrix": [4, 12], "x": 16, "y": 1}, - {"label": "KP7", "matrix": [1, 14], "x": 18, "y": 1}, - {"label": "KP8", "matrix": [1, 15], "x": 19, "y": 1}, - {"label": "KP9", "matrix": [1, 16], "x": 20, "y": 1}, - {"label": "KP+", "matrix": [1, 17], "x": 21, "y": 1}, - {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, - {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, - {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, - {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, - {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, - {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, - {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, - {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, - {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, - {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, - {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2}, - {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, - {"label": "Return", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - {"label": "End", "matrix": [4, 13], "x": 16, "y": 2}, - {"label": "KP4", "matrix": [2, 14], "x": 18, "y": 2}, - {"label": "KP5", "matrix": [2, 15], "x": 19, "y": 2}, - {"label": "KP6", "matrix": [2, 16], "x": 20, "y": 2}, - {"label": "KP+", "matrix": [2, 17], "x": 21, "y": 2}, - {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, - {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, - {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, - {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, - {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, - {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, - {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, - {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, - {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3}, - {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3}, - {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3}, - {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, - {"label": "Up", "matrix": [3, 13], "x": 13, "y": 3}, - {"label": "KP1", "matrix": [3, 14], "x": 18, "y": 3}, - {"label": "KP2", "matrix": [3, 15], "x": 19, "y": 3}, - {"label": "KP3", "matrix": [3, 16], "x": 20, "y": 3}, - {"label": "Enter", "matrix": [3, 17], "x": 21, "y": 3}, - {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, - {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4}, - {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, - {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7}, - {"label": "Ctrl", "matrix": [4, 7], "x": 11, "y": 4, "w": 1.5}, - {"label": "Left", "matrix": [4, 8], "x": 13, "y": 4}, - {"label": "Down", "matrix": [4, 9], "x": 14, "y": 4}, - {"label": "Right", "matrix": [4, 10], "x": 15, "y": 4}, - {"label": "KP0", "matrix": [4, 16], "x": 18, "y": 4}, - {"label": "KP.", "matrix": [4, 17], "x": 19, "y": 4} - ] - } - } -} diff --git a/keyboards/windstudio/wind_x/r1/keymaps/default/keymap.c b/keyboards/windstudio/wind_x/r1/keymaps/default/keymap.c deleted file mode 100644 index dd3134e2a0f..00000000000 --- a/keyboards/windstudio/wind_x/r1/keymaps/default/keymap.c +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2024 chrisgve - * - * 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 - -// clang-format off -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_BSPC, KC_DEL, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - 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_PGUP, KC_P7, KC_P8, KC_P9, KC_PPLS, - 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_PGDN, KC_P4, KC_P5, KC_P6, KC_PPLS, - 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_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT - ), - - [1] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) - -}; - -// clang-format on diff --git a/keyboards/windstudio/wind_x/r1/keymaps/default/readme.md b/keyboards/windstudio/wind_x/r1/keymaps/default/readme.md deleted file mode 100644 index 2fa0952a830..00000000000 --- a/keyboards/windstudio/wind_x/r1/keymaps/default/readme.md +++ /dev/null @@ -1,6 +0,0 @@ -# Default Wind X R1 Layout - -This is the default layout that comes flashed on every Wind X R1. For the most -part it's a straightforward and easy to follow layout. The only unusual key is -the key in the upper left, which sends Escape normally, but Grave when any of -the Ctrl, Alt, or GUI modifiers are held down. diff --git a/keyboards/windstudio/wind_x/r1/readme.md b/keyboards/windstudio/wind_x/r1/readme.md deleted file mode 100644 index 858467941a8..00000000000 --- a/keyboards/windstudio/wind_x/r1/readme.md +++ /dev/null @@ -1,27 +0,0 @@ -# WindX R1 by Windstudio - -![Windstudio](https://windstudio.store/cdn/shop/files/20220831191615_4833cd38-da74-4ed2-bd46-80bcb02336b8.jpg?v=1679464964&width=240) - -A large layout keyboard without the function keys. [More info on geekhack.org](https://geekhack.org/index.php?topic=114767.0) - -- Keyboard Maintainer: [Christian C. Berclaz](https://github.com/chrisgve) -- Hardware Supported: Wind X R1 w/ ATmega32U4 microcontroller -- Hardware Availability: [windstudio.store](https://windstudio.store/collections/wind-x) - -Make example for this keyboard (after setting up your build environment): - - make windstudio/wind_x/r1:default - -Flashing example for this keyboard: - - make windstudio/wind_x/r1:default:flash - -See the [build environment setup](getting_started_build_tools) and the [make instructions](getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](newbs). - -## Bootloader - -Enter the bootloader in 3 ways: - -- **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard -- **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead -- **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 88691e9d69cb7f17b9eff6377aa87387fe0f3ef8 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Fri, 8 Nov 2024 08:25:12 +0100 Subject: [PATCH 15/27] Added the Zlant_XL keyboard (legacy) --- keyboards/zlant_xl/config.h | 69 +++++++++ keyboards/zlant_xl/info.json | 75 +++++++++ keyboards/zlant_xl/keymaps/chrisgve/config.h | 4 + keyboards/zlant_xl/keymaps/chrisgve/keymap.c | 153 +++++++++++++++++++ keyboards/zlant_xl/keymaps/chrisgve/rules.mk | 13 ++ keyboards/zlant_xl/keymaps/default/keymap.c | 99 ++++++++++++ keyboards/zlant_xl/rules.mk | 27 ++++ keyboards/zlant_xl/zlant_xl.c | 20 +++ keyboards/zlant_xl/zlant_xl.h | 41 +++++ 9 files changed, 501 insertions(+) create mode 100644 keyboards/zlant_xl/config.h create mode 100644 keyboards/zlant_xl/info.json create mode 100644 keyboards/zlant_xl/keymaps/chrisgve/config.h create mode 100644 keyboards/zlant_xl/keymaps/chrisgve/keymap.c create mode 100644 keyboards/zlant_xl/keymaps/chrisgve/rules.mk create mode 100644 keyboards/zlant_xl/keymaps/default/keymap.c create mode 100644 keyboards/zlant_xl/rules.mk create mode 100644 keyboards/zlant_xl/zlant_xl.c create mode 100644 keyboards/zlant_xl/zlant_xl.h diff --git a/keyboards/zlant_xl/config.h b/keyboards/zlant_xl/config.h new file mode 100644 index 00000000000..e8514fd762f --- /dev/null +++ b/keyboards/zlant_xl/config.h @@ -0,0 +1,69 @@ +/* Copyright 2021 Christian C. Berclaz + * + * 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 "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x0000 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Christian C. Berclaz +#define PRODUCT Zlant XL + +/* key matrix size */ +#define MATRIX_ROWS 10 +#define MATRIX_COLS 6 + +/* + * 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 { C4, C6, B1, B0, B3, B2, B5, B4, B7, B6 } +#define MATRIX_COL_PINS { D6, D5, C7, C5, D3, D4 } + +#define DIODE_DIRECTION COL2ROW + +#define RGB_DI_PIN C2 +#ifdef RGB_DI_PIN + #define RGBLED_NUM 12 + #define RGBLIGHT_HUE_STEP 8 + #define RGBLIGHT_SAT_STEP 8 + #define RGBLIGHT_VAL_STEP 8 + #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 +#endif + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/zlant_xl/info.json b/keyboards/zlant_xl/info.json new file mode 100644 index 00000000000..289ac4f389f --- /dev/null +++ b/keyboards/zlant_xl/info.json @@ -0,0 +1,75 @@ +{ + "keyboard_name": "zlantxl_chrisgve", + "url": "", + "maintainer": "qmk", + "width": 13, + "height": 5, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"K00 (C4,D6)", "x":0, "y":0}, + {"label":"K10 (C6,D6)", "x":1, "y":0}, + {"label":"K01 (C4,D5)", "x":2, "y":0}, + {"label":"K11 (C6,D5)", "x":3, "y":0}, + {"label":"K02 (C4,C7)", "x":4, "y":0}, + {"label":"K12 (C6,C7)", "x":5, "y":0}, + {"label":"K03 (C4,C5)", "x":6, "y":0}, + {"label":"K13 (C6,C5)", "x":7, "y":0}, + {"label":"K04 (C4,D3)", "x":8, "y":0}, + {"label":"K14 (C6,D3)", "x":9, "y":0}, + {"label":"K05 (C4,D4)", "x":10, "y":0}, + {"label":"K15 (C6,D4)", "x":11, "y":0}, + {"label":"K20 (B1,D6)", "x":0.25, "y":1}, + {"label":"K30 (B0,D6)", "x":1.25, "y":1}, + {"label":"K21 (B1,D5)", "x":2.25, "y":1}, + {"label":"K31 (B0,D5)", "x":3.25, "y":1}, + {"label":"K22 (B1,C7)", "x":4.25, "y":1}, + {"label":"K32 (B0,C7)", "x":5.25, "y":1}, + {"label":"K23 (B1,C5)", "x":6.25, "y":1}, + {"label":"K33 (B0,C5)", "x":7.25, "y":1}, + {"label":"K24 (B1,D3)", "x":8.25, "y":1}, + {"label":"K34 (B0,D3)", "x":9.25, "y":1}, + {"label":"K25 (B1,D4)", "x":10.25, "y":1}, + {"label":"K35 (B0,D4)", "x":11.25, "y":1}, + {"label":"K40 (B3,D6)", "x":0.5, "y":2}, + {"label":"K50 (B2,D6)", "x":1.5, "y":2}, + {"label":"K41 (B3,D5)", "x":2.5, "y":2}, + {"label":"K51 (B2,D5)", "x":3.5, "y":2}, + {"label":"K42 (B3,C7)", "x":4.5, "y":2}, + {"label":"K52 (B2,C7)", "x":5.5, "y":2}, + {"label":"K43 (B3,C5)", "x":6.5, "y":2}, + {"label":"K53 (B2,C5)", "x":7.5, "y":2}, + {"label":"K44 (B3,D3)", "x":8.5, "y":2}, + {"label":"K54 (B2,D3)", "x":9.5, "y":2}, + {"label":"K45 (B3,D4)", "x":10.5, "y":2}, + {"label":"K55 (B2,D4)", "x":11.5, "y":2}, + {"label":"K60 (B5,D6)", "x":0.75, "y":3}, + {"label":"K70 (B4,D6)", "x":1.75, "y":3}, + {"label":"K61 (B5,D5)", "x":2.75, "y":3}, + {"label":"K71 (B4,D5)", "x":3.75, "y":3}, + {"label":"K62 (B5,C7)", "x":4.75, "y":3}, + {"label":"K72 (B4,C7)", "x":5.75, "y":3}, + {"label":"K63 (B5,C5)", "x":6.75, "y":3}, + {"label":"K73 (B4,C5)", "x":7.75, "y":3}, + {"label":"K64 (B5,D3)", "x":8.75, "y":3}, + {"label":"K74 (B4,D3)", "x":9.75, "y":3}, + {"label":"K65 (B5,D4)", "x":10.75, "y":3}, + {"label":"K75 (B4,D4)", "x":11.75, "y":3}, + {"label":"K80 (B7,D6)", "x":1, "y":4}, + {"label":"K90 (B6,D6)", "x":2, "y":4}, + {"label":"K81 (B7,D5)", "x":3, "y":4}, + {"label":"K91 (B6,D5)", "x":4, "y":4}, + {"label":"K82 (B7,C7)", "x":5, "y":4}, + {"label":"K92 (B6,C7)", "x":6, "y":4}, + {"label":"K83 (B7,C5)", "x":7, "y":4}, + {"label":"K93 (B6,C5)", "x":8, "y":4}, + {"label":"K84 (B7,D3)", "x":9, "y":4}, + {"label":"K94 (B6,D3)", "x":10, "y":4}, + {"label":"K85 (B7,D4)", "x":11, "y":4}, + {"label":"K95 (B6,D4)", "x":12, "y":4} + ] + } + } + ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/" +} + diff --git a/keyboards/zlant_xl/keymaps/chrisgve/config.h b/keyboards/zlant_xl/keymaps/chrisgve/config.h new file mode 100644 index 00000000000..bf261e1e6ed --- /dev/null +++ b/keyboards/zlant_xl/keymaps/chrisgve/config.h @@ -0,0 +1,4 @@ +#define DEBOUNCE 5 + +#define PERMISSIVE_HOLD + diff --git a/keyboards/zlant_xl/keymaps/chrisgve/keymap.c b/keyboards/zlant_xl/keymaps/chrisgve/keymap.c new file mode 100644 index 00000000000..7be949e1a7b --- /dev/null +++ b/keyboards/zlant_xl/keymaps/chrisgve/keymap.c @@ -0,0 +1,153 @@ +/* Copyright 2021 Christian C. Berclaz + * + * 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 + +#include "chrisgve.h" + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_GAMING] = LAYOUT( + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, QUT_SFT, + ADJUST, TD_ADJ, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + ), + + [_QWERTY_MAC] = LAYOUT( + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, CU_BSPC, + CPS_CTL, A_MOUSE, KC_S, M_NAV_1, M_F_NAV, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, + SFT_MSE, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, QUT_SFT, + ADJUST, TD_ADJ, KC_LALT, KC_LGUI, LOWER, SPC_RSE, SPC_RSE, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + ), + + [_MAC_NAV_1] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, M_F_WRD, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, A_SHIFT, S_SHIFT, _______, M_NAV_2, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, + _______, _______, _______, _______, _______, M_B_WRD, KC_HOME, KC_END, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [_MAC_NAV_2] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END + ), + + [_QWERTY_LINUX] = LAYOUT( + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, CU_BSPC, + CPS_CTL, A_MOUSE, KC_S, L_NAV_1, L_F_NAV, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, + SFT_MSE, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, QUT_SFT, + ADJUST, TD_ADJ, KC_LGUI, KC_LALT, LOWER, SPC_RSE, SPC_RSE, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + ), + + [_LINUX_NAV_1] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, L_F_WRD, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, A_SHIFT, S_SHIFT, _______, L_NAV_2, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, + _______, _______, _______, _______, _______, L_B_WRD, KC_HOME, KC_END, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [_LINUX_NAV_2] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END + ), + + [_QWERTY_WIN] = LAYOUT( + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, CU_BSPC, + CPS_CTL, A_MOUSE, KC_S, W_NAV_1, W_F_NAV, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, + SFT_MSE, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, QUT_SFT, + ADJUST, TD_ADJ, KC_LGUI, KC_LALT, LOWER, SPC_RSE, SPC_RSE, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + ), + + [_WIN_NAV_1] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, W_F_WRD, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, A_SHIFT, S_SHIFT, _______, W_NAV_2, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, + _______, _______, _______, _______, _______, W_B_WRD, KC_HOME, KC_END, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [_WIN_NAV_2] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END + ), + + [_LOWER] = LAYOUT( + KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END + ), + + [_RAISE] = LAYOUT( + KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LCBR, KC_RCBR, _______, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END + ), + + [_ADJUST] = LAYOUT( + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + QK_BOOT, MAC_SWT, _______, WIN_SWT, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + KC_CAPS, DF_M_P, DF_L_P, DF_W_P, _______, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, _______, _______, + _______, DF_MAC, DF_LNX, DF_WIN, DF_GMG, _______, _______, KC_MUTE, _______, _______, _______, _______, + _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT + ), + + [_NUM] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, + _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, + _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PAST, KC_PENT, + _______, _______, _______, _______, _______, _______, _______, KC_P0, KC_P0, KC_PDOT, KC_PSLS, _______, + _______, TG_NUM, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [_MOUSE] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_ACL2, KC_ACL1, KC_ACL0, KC_BTN2, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______, + _______, _______, _______, _______, _______, _______, KC_WH_U, KC_WH_D, _______, _______, _______, _______, + _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R + ), + + [_EX_MOUSE] = LAYOUT( + TG_MSE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, KC_ACL2, KC_ACL1, KC_ACL0, KC_BTN2, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, XXXXXXX, XXXXXXX, + TG_MSE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_U, KC_WH_D, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN1, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R + ), + +}; +// clang-format on diff --git a/keyboards/zlant_xl/keymaps/chrisgve/rules.mk b/keyboards/zlant_xl/keymaps/chrisgve/rules.mk new file mode 100644 index 00000000000..adea30be664 --- /dev/null +++ b/keyboards/zlant_xl/keymaps/chrisgve/rules.mk @@ -0,0 +1,13 @@ +USER_NAME := chrisgve +SRC += chrisgve.c + +NKRO_ENABLE = yes +MOUSEKEY_ENABLE = yes +TAP_DANCE_ENABLE = yes + +CONSOLE_ENABLE = no + +<<<<<<< HEAD +======= +MODIFIERS_ENABLE = yes +>>>>>>> f5fdfaf18b (rebased repo) diff --git a/keyboards/zlant_xl/keymaps/default/keymap.c b/keyboards/zlant_xl/keymaps/default/keymap.c new file mode 100644 index 00000000000..3f627d96eb2 --- /dev/null +++ b/keyboards/zlant_xl/keymaps/default/keymap.c @@ -0,0 +1,99 @@ +/* Copyright 2021 Christian C. Berclaz + * + * 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 "kb.h" + +#define BASE 0 +#define FN 1 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [BASE] = LAYOUT(KC_ESC, KC_2, KC_4, KC_6, KC_8, KC_0, + KC_1, KC_3, KC_5, KC_7, KC_9, KC_DEL, + KC_TAB, KC_W, KC_R, KC_Y, KC_I, KC_P, + KC_Q, KC_E, KC_T, KC_U, KC_O, KC_BSPC, + KC_CAPS, KC_S, KC_F, KC_H, KC_K, KC_SCLN, + KC_A, KC_D, KC_G, KC_J, KC_L, KC_QUOT, + KC_LSFT, KC_X, KC_V, KC_N, KC_COMM, KC_SLSH, + KC_Z, KC_C, KC_B, KC_M, KC_DOT, KC_ENT, + KC_NO, KC_LALT, MO(2), KC_SPC, KC_LEFT, KC_UP, + KC_LCTL, KC_LGUI, KC_SPC, MO(1), KC_DOWN, KC_RGHT), + + [FN] = 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_F2, KC_F4, KC_F6, KC_PLUS, KC_RCBR, + KC_F1, KC_F3, KC_F5, KC_UNDS, KC_LCBR, KC_PIPE, + KC_TRNS, KC_F8, KC_F10, KC_F12, KC_TRNS, KC_END, + KC_F7, KC_F9, KC_F11, KC_TRNS, KC_HOME, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLU, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_MPLY), +}; + +/*const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {*/ + /*keyevent_t event = record->event;*/ + + /*switch (id) {*/ + + /*}*/ + /*return MACRO_NONE;*/ +/*}*/ + +/*void matrix_init_user(void) {*/ +/*}*/ + +/*void matrix_scan_user(void) {*/ +/*}*/ + +/*bool process_record_user(uint16_t keycode, keyrecord_t *record) {*/ + /*return true;*/ +/*}*/ + +/*void led_set_user(uint8_t usb_led) {*/ + + /*if (usb_led & (1 << USB_LED_NUM_LOCK)) {*/ + + /*} else {*/ + + /*}*/ + + /*if (usb_led & (1 << USB_LED_CAPS_LOCK)) {*/ + + /*} else {*/ + + /*}*/ + + /*if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {*/ + + /*} else {*/ + + /*}*/ + + /*if (usb_led & (1 << USB_LED_COMPOSE)) {*/ + + /*} else {*/ + + /*}*/ + + /*if (usb_led & (1 << USB_LED_KANA)) {*/ + + /*} else {*/ + + /*}*/ + +/*}*/ diff --git a/keyboards/zlant_xl/rules.mk b/keyboards/zlant_xl/rules.mk new file mode 100644 index 00000000000..862d3fd9826 --- /dev/null +++ b/keyboards/zlant_xl/rules.mk @@ -0,0 +1,27 @@ +src = zlant_xl.c + +# MCU name +MCU = atmega32u2 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output + +# generated by KBFirmware JSON to QMK Parser +# https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/zlant_xl/zlant_xl.c b/keyboards/zlant_xl/zlant_xl.c new file mode 100644 index 00000000000..fbe014c9f7e --- /dev/null +++ b/keyboards/zlant_xl/zlant_xl.c @@ -0,0 +1,20 @@ +/* Copyright 2021 Christian C. Berclaz + * + * 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 "zlant_xl.h" + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/zlant_xl/zlant_xl.h b/keyboards/zlant_xl/zlant_xl.h new file mode 100644 index 00000000000..ff1cf762a47 --- /dev/null +++ b/keyboards/zlant_xl/zlant_xl.h @@ -0,0 +1,41 @@ +/* Copyright 2021 Christian C. Berclaz + * + * 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 LAYOUT( \ + K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, \ + K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, \ + K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, \ + K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, \ + K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95 \ +) { \ + { K00, K01, K02, K03, K04, K05 }, \ + { K10, K11, K12, K13, K14, K15 }, \ + { K20, K21, K22, K23, K24, K25 }, \ + { K30, K31, K32, K33, K34, K35 }, \ + { K40, K41, K42, K43, K44, K45 }, \ + { K50, K51, K52, K53, K54, K55 }, \ + { K60, K61, K62, K63, K64, K65 }, \ + { K70, K71, K72, K73, K74, K75 }, \ + { K80, K81, K82, K83, K84, K85 }, \ + { K90, K91, K92, K93, K94, K95 }, \ +} + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ From c00d849cf73056f42c27bfa48c862dec80212d49 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Sat, 9 Nov 2024 22:21:11 +0100 Subject: [PATCH 16/27] zlant_xl: Reconfigured the keyboard now fully data driven. TODO: add support for RGB lighting --- keyboards/zlant_xl/config.h | 69 --------- keyboards/zlant_xl/info.json | 75 --------- keyboards/zlant_xl/keymaps/chrisgve/config.h | 4 - keyboards/zlant_xl/keymaps/chrisgve/keymap.c | 153 ------------------- keyboards/zlant_xl/keymaps/chrisgve/rules.mk | 13 -- keyboards/zlant_xl/keymaps/default/keymap.c | 118 ++++---------- keyboards/zlant_xl/rules.mk | 27 ---- keyboards/zlant_xl/zlant_xl.c | 20 --- keyboards/zlant_xl/zlant_xl.h | 41 ----- 9 files changed, 29 insertions(+), 491 deletions(-) delete mode 100644 keyboards/zlant_xl/config.h delete mode 100644 keyboards/zlant_xl/info.json delete mode 100644 keyboards/zlant_xl/keymaps/chrisgve/config.h delete mode 100644 keyboards/zlant_xl/keymaps/chrisgve/keymap.c delete mode 100644 keyboards/zlant_xl/keymaps/chrisgve/rules.mk delete mode 100644 keyboards/zlant_xl/rules.mk delete mode 100644 keyboards/zlant_xl/zlant_xl.c delete mode 100644 keyboards/zlant_xl/zlant_xl.h diff --git a/keyboards/zlant_xl/config.h b/keyboards/zlant_xl/config.h deleted file mode 100644 index e8514fd762f..00000000000 --- a/keyboards/zlant_xl/config.h +++ /dev/null @@ -1,69 +0,0 @@ -/* Copyright 2021 Christian C. Berclaz - * - * 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 "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Christian C. Berclaz -#define PRODUCT Zlant XL - -/* key matrix size */ -#define MATRIX_ROWS 10 -#define MATRIX_COLS 6 - -/* - * 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 { C4, C6, B1, B0, B3, B2, B5, B4, B7, B6 } -#define MATRIX_COL_PINS { D6, D5, C7, C5, D3, D4 } - -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN C2 -#ifdef RGB_DI_PIN - #define RGBLED_NUM 12 - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 - #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 -#endif - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/zlant_xl/info.json b/keyboards/zlant_xl/info.json deleted file mode 100644 index 289ac4f389f..00000000000 --- a/keyboards/zlant_xl/info.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "keyboard_name": "zlantxl_chrisgve", - "url": "", - "maintainer": "qmk", - "width": 13, - "height": 5, - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"K00 (C4,D6)", "x":0, "y":0}, - {"label":"K10 (C6,D6)", "x":1, "y":0}, - {"label":"K01 (C4,D5)", "x":2, "y":0}, - {"label":"K11 (C6,D5)", "x":3, "y":0}, - {"label":"K02 (C4,C7)", "x":4, "y":0}, - {"label":"K12 (C6,C7)", "x":5, "y":0}, - {"label":"K03 (C4,C5)", "x":6, "y":0}, - {"label":"K13 (C6,C5)", "x":7, "y":0}, - {"label":"K04 (C4,D3)", "x":8, "y":0}, - {"label":"K14 (C6,D3)", "x":9, "y":0}, - {"label":"K05 (C4,D4)", "x":10, "y":0}, - {"label":"K15 (C6,D4)", "x":11, "y":0}, - {"label":"K20 (B1,D6)", "x":0.25, "y":1}, - {"label":"K30 (B0,D6)", "x":1.25, "y":1}, - {"label":"K21 (B1,D5)", "x":2.25, "y":1}, - {"label":"K31 (B0,D5)", "x":3.25, "y":1}, - {"label":"K22 (B1,C7)", "x":4.25, "y":1}, - {"label":"K32 (B0,C7)", "x":5.25, "y":1}, - {"label":"K23 (B1,C5)", "x":6.25, "y":1}, - {"label":"K33 (B0,C5)", "x":7.25, "y":1}, - {"label":"K24 (B1,D3)", "x":8.25, "y":1}, - {"label":"K34 (B0,D3)", "x":9.25, "y":1}, - {"label":"K25 (B1,D4)", "x":10.25, "y":1}, - {"label":"K35 (B0,D4)", "x":11.25, "y":1}, - {"label":"K40 (B3,D6)", "x":0.5, "y":2}, - {"label":"K50 (B2,D6)", "x":1.5, "y":2}, - {"label":"K41 (B3,D5)", "x":2.5, "y":2}, - {"label":"K51 (B2,D5)", "x":3.5, "y":2}, - {"label":"K42 (B3,C7)", "x":4.5, "y":2}, - {"label":"K52 (B2,C7)", "x":5.5, "y":2}, - {"label":"K43 (B3,C5)", "x":6.5, "y":2}, - {"label":"K53 (B2,C5)", "x":7.5, "y":2}, - {"label":"K44 (B3,D3)", "x":8.5, "y":2}, - {"label":"K54 (B2,D3)", "x":9.5, "y":2}, - {"label":"K45 (B3,D4)", "x":10.5, "y":2}, - {"label":"K55 (B2,D4)", "x":11.5, "y":2}, - {"label":"K60 (B5,D6)", "x":0.75, "y":3}, - {"label":"K70 (B4,D6)", "x":1.75, "y":3}, - {"label":"K61 (B5,D5)", "x":2.75, "y":3}, - {"label":"K71 (B4,D5)", "x":3.75, "y":3}, - {"label":"K62 (B5,C7)", "x":4.75, "y":3}, - {"label":"K72 (B4,C7)", "x":5.75, "y":3}, - {"label":"K63 (B5,C5)", "x":6.75, "y":3}, - {"label":"K73 (B4,C5)", "x":7.75, "y":3}, - {"label":"K64 (B5,D3)", "x":8.75, "y":3}, - {"label":"K74 (B4,D3)", "x":9.75, "y":3}, - {"label":"K65 (B5,D4)", "x":10.75, "y":3}, - {"label":"K75 (B4,D4)", "x":11.75, "y":3}, - {"label":"K80 (B7,D6)", "x":1, "y":4}, - {"label":"K90 (B6,D6)", "x":2, "y":4}, - {"label":"K81 (B7,D5)", "x":3, "y":4}, - {"label":"K91 (B6,D5)", "x":4, "y":4}, - {"label":"K82 (B7,C7)", "x":5, "y":4}, - {"label":"K92 (B6,C7)", "x":6, "y":4}, - {"label":"K83 (B7,C5)", "x":7, "y":4}, - {"label":"K93 (B6,C5)", "x":8, "y":4}, - {"label":"K84 (B7,D3)", "x":9, "y":4}, - {"label":"K94 (B6,D3)", "x":10, "y":4}, - {"label":"K85 (B7,D4)", "x":11, "y":4}, - {"label":"K95 (B6,D4)", "x":12, "y":4} - ] - } - } - ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/" -} - diff --git a/keyboards/zlant_xl/keymaps/chrisgve/config.h b/keyboards/zlant_xl/keymaps/chrisgve/config.h deleted file mode 100644 index bf261e1e6ed..00000000000 --- a/keyboards/zlant_xl/keymaps/chrisgve/config.h +++ /dev/null @@ -1,4 +0,0 @@ -#define DEBOUNCE 5 - -#define PERMISSIVE_HOLD - diff --git a/keyboards/zlant_xl/keymaps/chrisgve/keymap.c b/keyboards/zlant_xl/keymaps/chrisgve/keymap.c deleted file mode 100644 index 7be949e1a7b..00000000000 --- a/keyboards/zlant_xl/keymaps/chrisgve/keymap.c +++ /dev/null @@ -1,153 +0,0 @@ -/* Copyright 2021 Christian C. Berclaz - * - * 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 - -#include "chrisgve.h" - -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [_GAMING] = LAYOUT( - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, QUT_SFT, - ADJUST, TD_ADJ, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT - ), - - [_QWERTY_MAC] = LAYOUT( - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, CU_BSPC, - CPS_CTL, A_MOUSE, KC_S, M_NAV_1, M_F_NAV, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, - SFT_MSE, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, QUT_SFT, - ADJUST, TD_ADJ, KC_LALT, KC_LGUI, LOWER, SPC_RSE, SPC_RSE, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT - ), - - [_MAC_NAV_1] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, M_F_WRD, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, A_SHIFT, S_SHIFT, _______, M_NAV_2, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, - _______, _______, _______, _______, _______, M_B_WRD, KC_HOME, KC_END, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - - [_MAC_NAV_2] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END - ), - - [_QWERTY_LINUX] = LAYOUT( - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, CU_BSPC, - CPS_CTL, A_MOUSE, KC_S, L_NAV_1, L_F_NAV, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, - SFT_MSE, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, QUT_SFT, - ADJUST, TD_ADJ, KC_LGUI, KC_LALT, LOWER, SPC_RSE, SPC_RSE, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT - ), - - [_LINUX_NAV_1] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, L_F_WRD, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, A_SHIFT, S_SHIFT, _______, L_NAV_2, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, - _______, _______, _______, _______, _______, L_B_WRD, KC_HOME, KC_END, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - - [_LINUX_NAV_2] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END - ), - - [_QWERTY_WIN] = LAYOUT( - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, CU_BSPC, - CPS_CTL, A_MOUSE, KC_S, W_NAV_1, W_F_NAV, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, - SFT_MSE, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, QUT_SFT, - ADJUST, TD_ADJ, KC_LGUI, KC_LALT, LOWER, SPC_RSE, SPC_RSE, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT - ), - - [_WIN_NAV_1] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, W_F_WRD, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, A_SHIFT, S_SHIFT, _______, W_NAV_2, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, - _______, _______, _______, _______, _______, W_B_WRD, KC_HOME, KC_END, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - - [_WIN_NAV_2] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END - ), - - [_LOWER] = LAYOUT( - KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, - KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END - ), - - [_RAISE] = LAYOUT( - KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LCBR, KC_RCBR, _______, - KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END - ), - - [_ADJUST] = LAYOUT( - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - QK_BOOT, MAC_SWT, _______, WIN_SWT, _______, _______, _______, _______, _______, _______, _______, KC_DEL, - KC_CAPS, DF_M_P, DF_L_P, DF_W_P, _______, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, _______, _______, - _______, DF_MAC, DF_LNX, DF_WIN, DF_GMG, _______, _______, KC_MUTE, _______, _______, _______, _______, - _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT - ), - - [_NUM] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, - _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, - _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PAST, KC_PENT, - _______, _______, _______, _______, _______, _______, _______, KC_P0, KC_P0, KC_PDOT, KC_PSLS, _______, - _______, TG_NUM, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - - [_MOUSE] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, KC_ACL2, KC_ACL1, KC_ACL0, KC_BTN2, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______, - _______, _______, _______, _______, _______, _______, KC_WH_U, KC_WH_D, _______, _______, _______, _______, - _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R - ), - - [_EX_MOUSE] = LAYOUT( - TG_MSE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, KC_ACL2, KC_ACL1, KC_ACL0, KC_BTN2, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, XXXXXXX, XXXXXXX, - TG_MSE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_U, KC_WH_D, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN1, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R - ), - -}; -// clang-format on diff --git a/keyboards/zlant_xl/keymaps/chrisgve/rules.mk b/keyboards/zlant_xl/keymaps/chrisgve/rules.mk deleted file mode 100644 index adea30be664..00000000000 --- a/keyboards/zlant_xl/keymaps/chrisgve/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -USER_NAME := chrisgve -SRC += chrisgve.c - -NKRO_ENABLE = yes -MOUSEKEY_ENABLE = yes -TAP_DANCE_ENABLE = yes - -CONSOLE_ENABLE = no - -<<<<<<< HEAD -======= -MODIFIERS_ENABLE = yes ->>>>>>> f5fdfaf18b (rebased repo) diff --git a/keyboards/zlant_xl/keymaps/default/keymap.c b/keyboards/zlant_xl/keymaps/default/keymap.c index 3f627d96eb2..3456fce69f4 100644 --- a/keyboards/zlant_xl/keymaps/default/keymap.c +++ b/keyboards/zlant_xl/keymaps/default/keymap.c @@ -1,99 +1,39 @@ /* Copyright 2021 Christian C. Berclaz - * - * 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 . - */ + * + * 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 "kb.h" +#include QMK_KEYBOARD_H #define BASE 0 -#define FN 1 +#define FN 1 +// clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [BASE] = LAYOUT(KC_ESC, KC_2, KC_4, KC_6, KC_8, KC_0, - KC_1, KC_3, KC_5, KC_7, KC_9, KC_DEL, - KC_TAB, KC_W, KC_R, KC_Y, KC_I, KC_P, - KC_Q, KC_E, KC_T, KC_U, KC_O, KC_BSPC, - KC_CAPS, KC_S, KC_F, KC_H, KC_K, KC_SCLN, - KC_A, KC_D, KC_G, KC_J, KC_L, KC_QUOT, - KC_LSFT, KC_X, KC_V, KC_N, KC_COMM, KC_SLSH, - KC_Z, KC_C, KC_B, KC_M, KC_DOT, KC_ENT, - KC_NO, KC_LALT, MO(2), KC_SPC, KC_LEFT, KC_UP, - KC_LCTL, KC_LGUI, KC_SPC, MO(1), KC_DOWN, KC_RGHT), + [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_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, + _______, KC_LCTL, KC_LALT, KC_LGUI, KC_LSFT, KC_SPC, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT), [FN] = 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_F2, KC_F4, KC_F6, KC_PLUS, KC_RCBR, - KC_F1, KC_F3, KC_F5, KC_UNDS, KC_LCBR, KC_PIPE, - KC_TRNS, KC_F8, KC_F10, KC_F12, KC_TRNS, KC_END, - KC_F7, KC_F9, KC_F11, KC_TRNS, KC_HOME, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_MPLY), + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, KC_END, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY), }; - -/*const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {*/ - /*keyevent_t event = record->event;*/ - - /*switch (id) {*/ - - /*}*/ - /*return MACRO_NONE;*/ -/*}*/ - -/*void matrix_init_user(void) {*/ -/*}*/ - -/*void matrix_scan_user(void) {*/ -/*}*/ - -/*bool process_record_user(uint16_t keycode, keyrecord_t *record) {*/ - /*return true;*/ -/*}*/ - -/*void led_set_user(uint8_t usb_led) {*/ - - /*if (usb_led & (1 << USB_LED_NUM_LOCK)) {*/ - - /*} else {*/ - - /*}*/ - - /*if (usb_led & (1 << USB_LED_CAPS_LOCK)) {*/ - - /*} else {*/ - - /*}*/ - - /*if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {*/ - - /*} else {*/ - - /*}*/ - - /*if (usb_led & (1 << USB_LED_COMPOSE)) {*/ - - /*} else {*/ - - /*}*/ - - /*if (usb_led & (1 << USB_LED_KANA)) {*/ - - /*} else {*/ - - /*}*/ - -/*}*/ +// clang-format on diff --git a/keyboards/zlant_xl/rules.mk b/keyboards/zlant_xl/rules.mk deleted file mode 100644 index 862d3fd9826..00000000000 --- a/keyboards/zlant_xl/rules.mk +++ /dev/null @@ -1,27 +0,0 @@ -src = zlant_xl.c - -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = no # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth -AUDIO_ENABLE = no # Audio output - -# generated by KBFirmware JSON to QMK Parser -# https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/zlant_xl/zlant_xl.c b/keyboards/zlant_xl/zlant_xl.c deleted file mode 100644 index fbe014c9f7e..00000000000 --- a/keyboards/zlant_xl/zlant_xl.c +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2021 Christian C. Berclaz - * - * 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 "zlant_xl.h" - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/zlant_xl/zlant_xl.h b/keyboards/zlant_xl/zlant_xl.h deleted file mode 100644 index ff1cf762a47..00000000000 --- a/keyboards/zlant_xl/zlant_xl.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 Christian C. Berclaz - * - * 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 LAYOUT( \ - K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, \ - K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, \ - K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, \ - K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95 \ -) { \ - { K00, K01, K02, K03, K04, K05 }, \ - { K10, K11, K12, K13, K14, K15 }, \ - { K20, K21, K22, K23, K24, K25 }, \ - { K30, K31, K32, K33, K34, K35 }, \ - { K40, K41, K42, K43, K44, K45 }, \ - { K50, K51, K52, K53, K54, K55 }, \ - { K60, K61, K62, K63, K64, K65 }, \ - { K70, K71, K72, K73, K74, K75 }, \ - { K80, K81, K82, K83, K84, K85 }, \ - { K90, K91, K92, K93, K94, K95 }, \ -} - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ From 6df80c2f4306a5be87ab6486cfe4fd42b1b4ebd3 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Wed, 13 Nov 2024 19:33:28 +0100 Subject: [PATCH 17/27] ADDED: keyboard.json for Xlant XL --- keyboards/zlant_xl/keyboard.json | 89 ++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 keyboards/zlant_xl/keyboard.json diff --git a/keyboards/zlant_xl/keyboard.json b/keyboards/zlant_xl/keyboard.json new file mode 100644 index 00000000000..ab5987f7c30 --- /dev/null +++ b/keyboards/zlant_xl/keyboard.json @@ -0,0 +1,89 @@ +{ + "manufacturer": "Ziptyze", + "keyboard_name": "ZlantXL", + "maintainer": "chrisgve", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["D6", "D5", "C7", "C5", "D3", "D4"], + "rows": ["C4", "C6", "B1", "B0", "B3", "B2", "B5", "B4", "B7", "B6"] + }, + "processor": "atmega32u2", + "usb": { + "device_version": "0.0.1", + "pid": "0x6800", + "vid": "0xFEED" + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "1", "matrix": [1, 0], "x": 1, "y": 0 }, + { "label": "2", "matrix": [0, 1], "x": 2, "y": 0 }, + { "label": "3", "matrix": [1, 1], "x": 3, "y": 0 }, + { "label": "4", "matrix": [0, 2], "x": 4, "y": 0 }, + { "label": "5", "matrix": [1, 2], "x": 5, "y": 0 }, + { "label": "6", "matrix": [0, 3], "x": 6, "y": 0 }, + { "label": "7", "matrix": [1, 3], "x": 7, "y": 0 }, + { "label": "8", "matrix": [0, 4], "x": 8, "y": 0 }, + { "label": "9", "matrix": [1, 4], "x": 9, "y": 0 }, + { "label": "0", "matrix": [0, 5], "x": 10, "y": 0 }, + { "label": "Del", "matrix": [1, 5], "x": 11, "y": 0 }, + { "label": "Tab", "matrix": [2, 0], "x": 0, "y": 1 }, + { "label": "Q", "matrix": [3, 0], "x": 1, "y": 1 }, + { "label": "W", "matrix": [2, 1], "x": 2, "y": 1 }, + { "label": "E", "matrix": [3, 1], "x": 3, "y": 1 }, + { "label": "R", "matrix": [2, 2], "x": 4, "y": 1 }, + { "label": "T", "matrix": [3, 2], "x": 5, "y": 1 }, + { "label": "Y", "matrix": [2, 3], "x": 6, "y": 1 }, + { "label": "U", "matrix": [3, 3], "x": 7, "y": 1 }, + { "label": "I", "matrix": [2, 4], "x": 8, "y": 1 }, + { "label": "O", "matrix": [3, 4], "x": 9, "y": 1 }, + { "label": "P", "matrix": [2, 5], "x": 10, "y": 1 }, + { "label": "Backspace", "matrix": [3, 5], "x": 11, "y": 1 }, + { "label": "Keycaps", "matrix": [4, 0], "x": 0, "y": 2 }, + { "label": "A", "matrix": [5, 0], "x": 1, "y": 2 }, + { "label": "S", "matrix": [4, 1], "x": 2, "y": 2 }, + { "label": "D", "matrix": [5, 1], "x": 3, "y": 2 }, + { "label": "F", "matrix": [4, 2], "x": 4, "y": 2 }, + { "label": "G", "matrix": [5, 2], "x": 5, "y": 2 }, + { "label": "H", "matrix": [4, 3], "x": 6, "y": 2 }, + { "label": "J", "matrix": [5, 3], "x": 7, "y": 2 }, + { "label": "K", "matrix": [4, 4], "x": 8, "y": 2 }, + { "label": "L", "matrix": [5, 4], "x": 9, "y": 2 }, + { "label": ";", "matrix": [4, 5], "x": 10, "y": 2 }, + { "label": "'", "matrix": [5, 5], "x": 11, "y": 2 }, + { "label": "Shift", "matrix": [6, 0], "x": 0, "y": 3 }, + { "label": "Z", "matrix": [7, 0], "x": 1, "y": 3 }, + { "label": "X", "matrix": [6, 1], "x": 2, "y": 3 }, + { "label": "C", "matrix": [7, 1], "x": 3, "y": 3 }, + { "label": "V", "matrix": [6, 2], "x": 4, "y": 3 }, + { "label": "B", "matrix": [7, 2], "x": 5, "y": 3 }, + { "label": "N", "matrix": [6, 3], "x": 6, "y": 3 }, + { "label": "M", "matrix": [7, 3], "x": 7, "y": 3 }, + { "label": ",", "matrix": [6, 4], "x": 8, "y": 3 }, + { "label": ".", "matrix": [7, 4], "x": 9, "y": 3 }, + { "label": "/", "matrix": [6, 5], "x": 10, "y": 3 }, + { "label": "Enter", "matrix": [7, 5], "x": 11, "y": 3 }, + { "label": "", "matrix": [8, 0], "x": 0, "y": 4 }, + { "label": "Ctrl", "matrix": [9, 0], "x": 1, "y": 4 }, + { "label": "Alt", "matrix": [8, 1], "x": 2, "y": 4 }, + { "label": "GUI", "matrix": [9, 1], "x": 3, "y": 4 }, + { "label": "MO(2)", "matrix": [8, 2], "x": 4, "y": 4 }, + { "label": " ", "matrix": [9, 2], "x": 5, "y": 4 }, + { "label": " ", "matrix": [8, 3], "x": 6, "y": 4 }, + { "label": "MO(1)", "matrix": [9, 3], "x": 7, "y": 4 }, + { "label": "Left", "matrix": [8, 4], "x": 8, "y": 4 }, + { "label": "Down", "matrix": [9, 4], "x": 9, "y": 4 }, + { "label": "Up", "matrix": [8, 5], "x": 10, "y": 4 }, + { "label": "Right", "matrix": [9, 5], "x": 11, "y": 4 } + ] + } + } +} From d29b667c136d6d135ce7aee2a59b7d1f8896a952 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Sat, 16 Nov 2024 14:38:03 +0100 Subject: [PATCH 18/27] docs(zlant_xl): add readme.md, updated keymap.c with correct year --- keyboards/zlant_xl/keymaps/default/keymap.c | 2 +- keyboards/zlant_xl/readme.md | 26 +++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 keyboards/zlant_xl/readme.md diff --git a/keyboards/zlant_xl/keymaps/default/keymap.c b/keyboards/zlant_xl/keymaps/default/keymap.c index 3456fce69f4..397635fd383 100644 --- a/keyboards/zlant_xl/keymaps/default/keymap.c +++ b/keyboards/zlant_xl/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2021 Christian C. Berclaz +/* Copyright 2024 Christian C. Berclaz * * 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/zlant_xl/readme.md b/keyboards/zlant_xl/readme.md new file mode 100644 index 00000000000..3177e15f2d8 --- /dev/null +++ b/keyboards/zlant_xl/readme.md @@ -0,0 +1,26 @@ +# ZLANT XL + +![ZLANT XL]( +_A unique 50% mechanical keyboard that uses a slanted ortholinear layout_ + +- Keyboard Maintainer: [chrisgve](https://github.com/chrisgve) +- Hardware Supported: Zlant XL w/Ziptyze's atmega32u2 powered controller [The Rune](https://1upkeyboards.com/shop/controllers/the-rune-by-ziptyze/) +- Hardware Availability: [1UP Keyboards](https://1upkeyboards.com/shop/keyboard-kits/diy-40-kits/zlantxl-50-mechanical-keyboard-kit/) + +Make example for this keyboard (after setting up your build environment): + + make zlant_xl:default + +Flashing example for this keyboard: + + make zlant_xl:default:flash + +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). + +## Bootloader + +Enter the bootloader in 3 ways: + +- **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +- **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +- **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From b448690e67b69ef33bf65fddba36c5076a741443 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Sat, 16 Nov 2024 14:45:16 +0100 Subject: [PATCH 19/27] fix(zlant_xl): fixed a wrong link in readme.md --- keyboards/zlant_xl/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/zlant_xl/readme.md b/keyboards/zlant_xl/readme.md index 3177e15f2d8..ba2f2079a57 100644 --- a/keyboards/zlant_xl/readme.md +++ b/keyboards/zlant_xl/readme.md @@ -1,6 +1,6 @@ # ZLANT XL -![ZLANT XL]( +![ZLANT XL](https://1upkeyboards.com/wp-content/uploads/2021/06/ZlantXL-scaled.jpeg) _A unique 50% mechanical keyboard that uses a slanted ortholinear layout_ - Keyboard Maintainer: [chrisgve](https://github.com/chrisgve) From f381765f080ada621cd87f365fa2bfc37f31b1c0 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Sat, 16 Nov 2024 14:49:11 +0100 Subject: [PATCH 20/27] docs(zlant_xl): update readme with correct position of the reset button. --- keyboards/zlant_xl/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/zlant_xl/readme.md b/keyboards/zlant_xl/readme.md index ba2f2079a57..99cf546e14b 100644 --- a/keyboards/zlant_xl/readme.md +++ b/keyboards/zlant_xl/readme.md @@ -22,5 +22,5 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 3 ways: - **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard -- **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +- **Physical reset button**: Briefly press the button on the back of the board (button on The Rune) - **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 689e117024f4ff0d0a2eb3618f49146eabd7355d Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Sat, 16 Nov 2024 14:53:07 +0100 Subject: [PATCH 21/27] chore(zlant_xl): run qmk format-json on keyboard.json --- keyboards/zlant_xl/keyboard.json | 120 +++++++++++++++---------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/keyboards/zlant_xl/keyboard.json b/keyboards/zlant_xl/keyboard.json index ab5987f7c30..540f1e75069 100644 --- a/keyboards/zlant_xl/keyboard.json +++ b/keyboards/zlant_xl/keyboard.json @@ -23,66 +23,66 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, - { "label": "1", "matrix": [1, 0], "x": 1, "y": 0 }, - { "label": "2", "matrix": [0, 1], "x": 2, "y": 0 }, - { "label": "3", "matrix": [1, 1], "x": 3, "y": 0 }, - { "label": "4", "matrix": [0, 2], "x": 4, "y": 0 }, - { "label": "5", "matrix": [1, 2], "x": 5, "y": 0 }, - { "label": "6", "matrix": [0, 3], "x": 6, "y": 0 }, - { "label": "7", "matrix": [1, 3], "x": 7, "y": 0 }, - { "label": "8", "matrix": [0, 4], "x": 8, "y": 0 }, - { "label": "9", "matrix": [1, 4], "x": 9, "y": 0 }, - { "label": "0", "matrix": [0, 5], "x": 10, "y": 0 }, - { "label": "Del", "matrix": [1, 5], "x": 11, "y": 0 }, - { "label": "Tab", "matrix": [2, 0], "x": 0, "y": 1 }, - { "label": "Q", "matrix": [3, 0], "x": 1, "y": 1 }, - { "label": "W", "matrix": [2, 1], "x": 2, "y": 1 }, - { "label": "E", "matrix": [3, 1], "x": 3, "y": 1 }, - { "label": "R", "matrix": [2, 2], "x": 4, "y": 1 }, - { "label": "T", "matrix": [3, 2], "x": 5, "y": 1 }, - { "label": "Y", "matrix": [2, 3], "x": 6, "y": 1 }, - { "label": "U", "matrix": [3, 3], "x": 7, "y": 1 }, - { "label": "I", "matrix": [2, 4], "x": 8, "y": 1 }, - { "label": "O", "matrix": [3, 4], "x": 9, "y": 1 }, - { "label": "P", "matrix": [2, 5], "x": 10, "y": 1 }, - { "label": "Backspace", "matrix": [3, 5], "x": 11, "y": 1 }, - { "label": "Keycaps", "matrix": [4, 0], "x": 0, "y": 2 }, - { "label": "A", "matrix": [5, 0], "x": 1, "y": 2 }, - { "label": "S", "matrix": [4, 1], "x": 2, "y": 2 }, - { "label": "D", "matrix": [5, 1], "x": 3, "y": 2 }, - { "label": "F", "matrix": [4, 2], "x": 4, "y": 2 }, - { "label": "G", "matrix": [5, 2], "x": 5, "y": 2 }, - { "label": "H", "matrix": [4, 3], "x": 6, "y": 2 }, - { "label": "J", "matrix": [5, 3], "x": 7, "y": 2 }, - { "label": "K", "matrix": [4, 4], "x": 8, "y": 2 }, - { "label": "L", "matrix": [5, 4], "x": 9, "y": 2 }, - { "label": ";", "matrix": [4, 5], "x": 10, "y": 2 }, - { "label": "'", "matrix": [5, 5], "x": 11, "y": 2 }, - { "label": "Shift", "matrix": [6, 0], "x": 0, "y": 3 }, - { "label": "Z", "matrix": [7, 0], "x": 1, "y": 3 }, - { "label": "X", "matrix": [6, 1], "x": 2, "y": 3 }, - { "label": "C", "matrix": [7, 1], "x": 3, "y": 3 }, - { "label": "V", "matrix": [6, 2], "x": 4, "y": 3 }, - { "label": "B", "matrix": [7, 2], "x": 5, "y": 3 }, - { "label": "N", "matrix": [6, 3], "x": 6, "y": 3 }, - { "label": "M", "matrix": [7, 3], "x": 7, "y": 3 }, - { "label": ",", "matrix": [6, 4], "x": 8, "y": 3 }, - { "label": ".", "matrix": [7, 4], "x": 9, "y": 3 }, - { "label": "/", "matrix": [6, 5], "x": 10, "y": 3 }, - { "label": "Enter", "matrix": [7, 5], "x": 11, "y": 3 }, - { "label": "", "matrix": [8, 0], "x": 0, "y": 4 }, - { "label": "Ctrl", "matrix": [9, 0], "x": 1, "y": 4 }, - { "label": "Alt", "matrix": [8, 1], "x": 2, "y": 4 }, - { "label": "GUI", "matrix": [9, 1], "x": 3, "y": 4 }, - { "label": "MO(2)", "matrix": [8, 2], "x": 4, "y": 4 }, - { "label": " ", "matrix": [9, 2], "x": 5, "y": 4 }, - { "label": " ", "matrix": [8, 3], "x": 6, "y": 4 }, - { "label": "MO(1)", "matrix": [9, 3], "x": 7, "y": 4 }, - { "label": "Left", "matrix": [8, 4], "x": 8, "y": 4 }, - { "label": "Down", "matrix": [9, 4], "x": 9, "y": 4 }, - { "label": "Up", "matrix": [8, 5], "x": 10, "y": 4 }, - { "label": "Right", "matrix": [9, 5], "x": 11, "y": 4 } + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [1, 0], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "3", "matrix": [1, 1], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 2], "x": 4, "y": 0}, + {"label": "5", "matrix": [1, 2], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 3], "x": 6, "y": 0}, + {"label": "7", "matrix": [1, 3], "x": 7, "y": 0}, + {"label": "8", "matrix": [0, 4], "x": 8, "y": 0}, + {"label": "9", "matrix": [1, 4], "x": 9, "y": 0}, + {"label": "0", "matrix": [0, 5], "x": 10, "y": 0}, + {"label": "Del", "matrix": [1, 5], "x": 11, "y": 0}, + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1}, + {"label": "Q", "matrix": [3, 0], "x": 1, "y": 1}, + {"label": "W", "matrix": [2, 1], "x": 2, "y": 1}, + {"label": "E", "matrix": [3, 1], "x": 3, "y": 1}, + {"label": "R", "matrix": [2, 2], "x": 4, "y": 1}, + {"label": "T", "matrix": [3, 2], "x": 5, "y": 1}, + {"label": "Y", "matrix": [2, 3], "x": 6, "y": 1}, + {"label": "U", "matrix": [3, 3], "x": 7, "y": 1}, + {"label": "I", "matrix": [2, 4], "x": 8, "y": 1}, + {"label": "O", "matrix": [3, 4], "x": 9, "y": 1}, + {"label": "P", "matrix": [2, 5], "x": 10, "y": 1}, + {"label": "Backspace", "matrix": [3, 5], "x": 11, "y": 1}, + {"label": "Keycaps", "matrix": [4, 0], "x": 0, "y": 2}, + {"label": "A", "matrix": [5, 0], "x": 1, "y": 2}, + {"label": "S", "matrix": [4, 1], "x": 2, "y": 2}, + {"label": "D", "matrix": [5, 1], "x": 3, "y": 2}, + {"label": "F", "matrix": [4, 2], "x": 4, "y": 2}, + {"label": "G", "matrix": [5, 2], "x": 5, "y": 2}, + {"label": "H", "matrix": [4, 3], "x": 6, "y": 2}, + {"label": "J", "matrix": [5, 3], "x": 7, "y": 2}, + {"label": "K", "matrix": [4, 4], "x": 8, "y": 2}, + {"label": "L", "matrix": [5, 4], "x": 9, "y": 2}, + {"label": ";", "matrix": [4, 5], "x": 10, "y": 2}, + {"label": "'", "matrix": [5, 5], "x": 11, "y": 2}, + {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3}, + {"label": "Z", "matrix": [7, 0], "x": 1, "y": 3}, + {"label": "X", "matrix": [6, 1], "x": 2, "y": 3}, + {"label": "C", "matrix": [7, 1], "x": 3, "y": 3}, + {"label": "V", "matrix": [6, 2], "x": 4, "y": 3}, + {"label": "B", "matrix": [7, 2], "x": 5, "y": 3}, + {"label": "N", "matrix": [6, 3], "x": 6, "y": 3}, + {"label": "M", "matrix": [7, 3], "x": 7, "y": 3}, + {"label": ",", "matrix": [6, 4], "x": 8, "y": 3}, + {"label": ".", "matrix": [7, 4], "x": 9, "y": 3}, + {"label": "/", "matrix": [6, 5], "x": 10, "y": 3}, + {"label": "Enter", "matrix": [7, 5], "x": 11, "y": 3}, + {"label": "", "matrix": [8, 0], "x": 0, "y": 4}, + {"label": "Ctrl", "matrix": [9, 0], "x": 1, "y": 4}, + {"label": "Alt", "matrix": [8, 1], "x": 2, "y": 4}, + {"label": "GUI", "matrix": [9, 1], "x": 3, "y": 4}, + {"label": "MO(2)", "matrix": [8, 2], "x": 4, "y": 4}, + {"label": " ", "matrix": [9, 2], "x": 5, "y": 4}, + {"label": " ", "matrix": [8, 3], "x": 6, "y": 4}, + {"label": "MO(1)", "matrix": [9, 3], "x": 7, "y": 4}, + {"label": "Left", "matrix": [8, 4], "x": 8, "y": 4}, + {"label": "Down", "matrix": [9, 4], "x": 9, "y": 4}, + {"label": "Up", "matrix": [8, 5], "x": 10, "y": 4}, + {"label": "Right", "matrix": [9, 5], "x": 11, "y": 4} ] } } From 768f01e4f68c519cdb2c97a7a7193c9db2e4b2aa Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Sat, 16 Nov 2024 18:38:50 +0100 Subject: [PATCH 22/27] Update keyboards/zlant_xl/keymaps/default/keymap.c Co-authored-by: jack --- keyboards/zlant_xl/keymaps/default/keymap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/keyboards/zlant_xl/keymaps/default/keymap.c b/keyboards/zlant_xl/keymaps/default/keymap.c index 397635fd383..cdffc0316c3 100644 --- a/keyboards/zlant_xl/keymaps/default/keymap.c +++ b/keyboards/zlant_xl/keymaps/default/keymap.c @@ -16,8 +16,10 @@ #include QMK_KEYBOARD_H -#define BASE 0 -#define FN 1 +enum layers { + BASE, + FN +}; // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From 65a0055409dbd6ebb6cad74202374b16811b7822 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Sat, 16 Nov 2024 18:39:17 +0100 Subject: [PATCH 23/27] Update keyboards/zlant_xl/keymaps/default/keymap.c Co-authored-by: jack --- keyboards/zlant_xl/keymaps/default/keymap.c | 25 +++++++++++---------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/keyboards/zlant_xl/keymaps/default/keymap.c b/keyboards/zlant_xl/keymaps/default/keymap.c index cdffc0316c3..c92960048f6 100644 --- a/keyboards/zlant_xl/keymaps/default/keymap.c +++ b/keyboards/zlant_xl/keymaps/default/keymap.c @@ -24,18 +24,19 @@ enum layers { // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [BASE] = LAYOUT( + [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_DEL, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - _______, KC_LCTL, KC_LALT, KC_LGUI, KC_LSFT, KC_SPC, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT), - - [FN] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, - _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, KC_END, _______, - _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY), + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, + _______, KC_LCTL, KC_LALT, KC_LGUI, KC_LSFT, KC_SPC, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + ), + [FN] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME, KC_END, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + ) }; // clang-format on From 91f17ac8ceb2fe8886716bce4b9b64e4d7b0e2c2 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Sat, 16 Nov 2024 18:39:43 +0100 Subject: [PATCH 24/27] Update keyboards/zlant_xl/readme.md Co-authored-by: jack --- keyboards/zlant_xl/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/zlant_xl/readme.md b/keyboards/zlant_xl/readme.md index 99cf546e14b..6ca486ee1d8 100644 --- a/keyboards/zlant_xl/readme.md +++ b/keyboards/zlant_xl/readme.md @@ -3,9 +3,9 @@ ![ZLANT XL](https://1upkeyboards.com/wp-content/uploads/2021/06/ZlantXL-scaled.jpeg) _A unique 50% mechanical keyboard that uses a slanted ortholinear layout_ -- Keyboard Maintainer: [chrisgve](https://github.com/chrisgve) -- Hardware Supported: Zlant XL w/Ziptyze's atmega32u2 powered controller [The Rune](https://1upkeyboards.com/shop/controllers/the-rune-by-ziptyze/) -- Hardware Availability: [1UP Keyboards](https://1upkeyboards.com/shop/keyboard-kits/diy-40-kits/zlantxl-50-mechanical-keyboard-kit/) +* Keyboard Maintainer: [chrisgve](https://github.com/chrisgve) +* Hardware Supported: Zlant XL w/Ziptyze's atmega32u2 powered controller [The Rune](https://1upkeyboards.com/shop/controllers/the-rune-by-ziptyze/) +* Hardware Availability: [1UP Keyboards](https://1upkeyboards.com/shop/keyboard-kits/diy-40-kits/zlantxl-50-mechanical-keyboard-kit/) Make example for this keyboard (after setting up your build environment): From f8c5832e96e5d9efce93b67c80436c9ac8aa7b0c Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Sat, 16 Nov 2024 18:51:49 +0100 Subject: [PATCH 25/27] chore(zlant_zl): changed image link to imgur.com --- keyboards/zlant_xl/readme.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/zlant_xl/readme.md b/keyboards/zlant_xl/readme.md index 6ca486ee1d8..12784234d49 100644 --- a/keyboards/zlant_xl/readme.md +++ b/keyboards/zlant_xl/readme.md @@ -1,11 +1,11 @@ # ZLANT XL -![ZLANT XL](https://1upkeyboards.com/wp-content/uploads/2021/06/ZlantXL-scaled.jpeg) +![ZLANT XL](https://imgur.com/a/svezYN9) _A unique 50% mechanical keyboard that uses a slanted ortholinear layout_ -* Keyboard Maintainer: [chrisgve](https://github.com/chrisgve) -* Hardware Supported: Zlant XL w/Ziptyze's atmega32u2 powered controller [The Rune](https://1upkeyboards.com/shop/controllers/the-rune-by-ziptyze/) -* Hardware Availability: [1UP Keyboards](https://1upkeyboards.com/shop/keyboard-kits/diy-40-kits/zlantxl-50-mechanical-keyboard-kit/) +- Keyboard Maintainer: [chrisgve](https://github.com/chrisgve) +- Hardware Supported: Zlant XL w/Ziptyze's atmega32u2 powered controller [The Rune](https://1upkeyboards.com/shop/controllers/the-rune-by-ziptyze/) +- Hardware Availability: [1UP Keyboards](https://1upkeyboards.com/shop/keyboard-kits/diy-40-kits/zlantxl-50-mechanical-keyboard-kit/) Make example for this keyboard (after setting up your build environment): From 47a618dfc6e758b59d46fd2137ca2026ab6e80de Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Sat, 16 Nov 2024 18:55:45 +0100 Subject: [PATCH 26/27] fix(zlant_xl): fixed the wrong link to imgur.com --- keyboards/zlant_xl/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/zlant_xl/readme.md b/keyboards/zlant_xl/readme.md index 12784234d49..58a2ee0bbc6 100644 --- a/keyboards/zlant_xl/readme.md +++ b/keyboards/zlant_xl/readme.md @@ -1,6 +1,6 @@ # ZLANT XL -![ZLANT XL](https://imgur.com/a/svezYN9) +![ZLANT XL](https://imgur.com/Vcmjwro) _A unique 50% mechanical keyboard that uses a slanted ortholinear layout_ - Keyboard Maintainer: [chrisgve](https://github.com/chrisgve) From 0c6aed510ffaf9a8b53168ec16929b68cdf6da97 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Sat, 16 Nov 2024 19:03:42 +0100 Subject: [PATCH 27/27] fix(zlant_xl): added the forgotten extension .jpg to the imgur link. --- keyboards/zlant_xl/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/zlant_xl/readme.md b/keyboards/zlant_xl/readme.md index 58a2ee0bbc6..aab5746096f 100644 --- a/keyboards/zlant_xl/readme.md +++ b/keyboards/zlant_xl/readme.md @@ -1,6 +1,6 @@ # ZLANT XL -![ZLANT XL](https://imgur.com/Vcmjwro) +![ZLANT XL](https://imgur.com/Vcmjwro.jpg) _A unique 50% mechanical keyboard that uses a slanted ortholinear layout_ - Keyboard Maintainer: [chrisgve](https://github.com/chrisgve)