From a364ed38e0af77596902fe851eb13b161487b815 Mon Sep 17 00:00:00 2001 From: zykrah <23428162+zykrah@users.noreply.github.com> Date: Wed, 12 Apr 2023 17:02:54 +1000 Subject: [PATCH 1/6] Add Kalakos Bahrnob65 --- keyboards/kalakos/bahrnob/config.h | 22 ++++ keyboards/kalakos/bahrnob/info.json | 107 ++++++++++++++++++ .../kalakos/bahrnob/keymaps/default/keymap.c | 63 +++++++++++ .../kalakos/bahrnob/keymaps/via/keymap.c | 63 +++++++++++ .../kalakos/bahrnob/keymaps/via/rules.mk | 2 + keyboards/kalakos/bahrnob/readme.md | 27 +++++ keyboards/kalakos/bahrnob/rules.mk | 2 + 7 files changed, 286 insertions(+) create mode 100644 keyboards/kalakos/bahrnob/config.h create mode 100644 keyboards/kalakos/bahrnob/info.json create mode 100644 keyboards/kalakos/bahrnob/keymaps/default/keymap.c create mode 100644 keyboards/kalakos/bahrnob/keymaps/via/keymap.c create mode 100644 keyboards/kalakos/bahrnob/keymaps/via/rules.mk create mode 100644 keyboards/kalakos/bahrnob/readme.md create mode 100644 keyboards/kalakos/bahrnob/rules.mk diff --git a/keyboards/kalakos/bahrnob/config.h b/keyboards/kalakos/bahrnob/config.h new file mode 100644 index 000000000000..f97171b9cb14 --- /dev/null +++ b/keyboards/kalakos/bahrnob/config.h @@ -0,0 +1,22 @@ +/* +Copyright 2023 Zykrah + +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" + +/* This file is empty and unrequired */ diff --git a/keyboards/kalakos/bahrnob/info.json b/keyboards/kalakos/bahrnob/info.json new file mode 100644 index 000000000000..8991dd6fe081 --- /dev/null +++ b/keyboards/kalakos/bahrnob/info.json @@ -0,0 +1,107 @@ +{ + "keyboard_name": "Bahrnob65", + "manufacturer": "Kalakos", + "maintainer": "zykrah", + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "usb": { + "vid": "0x7A79", + "pid": "0x4261", + "device_version": "0.0.1" + }, + "encoder": { + "rotary": [ + {"pin_a": "D4", "pin_b": "D6"} + ] + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true + }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "rows": ["D7", "B4", "B5", "B6", "C6"], + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5"] + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "matrix": [0, 0], "x": 0.0, "y": 0.0 }, + { "matrix": [0, 1], "x": 1.0, "y": 0.0 }, + { "matrix": [0, 2], "x": 2.0, "y": 0.0 }, + { "matrix": [0, 3], "x": 3.0, "y": 0.0 }, + { "matrix": [0, 4], "x": 4.0, "y": 0.0 }, + { "matrix": [0, 5], "x": 5.0, "y": 0.0 }, + { "matrix": [0, 6], "x": 6.0, "y": 0.0 }, + { "matrix": [0, 7], "x": 7.0, "y": 0.0 }, + { "matrix": [0, 8], "x": 8.0, "y": 0.0 }, + { "matrix": [0, 9], "x": 9.0, "y": 0.0 }, + { "matrix": [0, 10], "x": 10.0, "y": 0.0 }, + { "matrix": [0, 11], "x": 11.0, "y": 0.0 }, + { "matrix": [0, 12], "x": 12.0, "y": 0.0 }, + { "matrix": [0, 13], "x": 13.0, "y": 0.0 }, + { "matrix": [1, 14], "x": 14.0, "y": 0.0 }, + { "matrix": [0, 14], "x": 15.75, "y": 0.0 }, + { "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 }, + { "matrix": [1, 1], "x": 1.5, "y": 1.0 }, + { "matrix": [1, 2], "x": 2.5, "y": 1.0 }, + { "matrix": [1, 3], "x": 3.5, "y": 1.0 }, + { "matrix": [1, 4], "x": 4.5, "y": 1.0 }, + { "matrix": [1, 5], "x": 5.5, "y": 1.0 }, + { "matrix": [1, 6], "x": 6.5, "y": 1.0 }, + { "matrix": [1, 7], "x": 7.5, "y": 1.0 }, + { "matrix": [1, 8], "x": 8.5, "y": 1.0 }, + { "matrix": [1, 9], "x": 9.5, "y": 1.0 }, + { "matrix": [1, 10], "x": 10.5, "y": 1.0 }, + { "matrix": [1, 11], "x": 11.5, "y": 1.0 }, + { "matrix": [1, 12], "x": 12.5, "y": 1.0 }, + { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0 }, + { "matrix": [2, 14], "x": 15.5, "y": 1.5 }, + { "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 }, + { "matrix": [2, 1], "x": 1.75, "y": 2.0 }, + { "matrix": [2, 2], "x": 2.75, "y": 2.0 }, + { "matrix": [2, 3], "x": 3.75, "y": 2.0 }, + { "matrix": [2, 4], "x": 4.75, "y": 2.0 }, + { "matrix": [2, 5], "x": 5.75, "y": 2.0 }, + { "matrix": [2, 6], "x": 6.75, "y": 2.0 }, + { "matrix": [2, 7], "x": 7.75, "y": 2.0 }, + { "matrix": [2, 8], "x": 8.75, "y": 2.0 }, + { "matrix": [2, 9], "x": 9.75, "y": 2.0 }, + { "matrix": [2, 10], "x": 10.75, "y": 2.0 }, + { "matrix": [2, 11], "x": 11.75, "y": 2.0 }, + { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2.0 }, + { "matrix": [3, 14], "x": 15.5, "y": 2.5 }, + { "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 }, + { "matrix": [3, 1], "x": 1.25, "y": 3.0 }, + { "matrix": [4, 4], "x": 2.25, "y": 3.0 }, + { "matrix": [3, 2], "x": 3.25, "y": 3.0 }, + { "matrix": [3, 3], "x": 4.25, "y": 3.0 }, + { "matrix": [3, 4], "x": 5.25, "y": 3.0 }, + { "matrix": [3, 5], "x": 6.25, "y": 3.0 }, + { "matrix": [3, 6], "x": 7.25, "y": 3.0 }, + { "matrix": [3, 7], "x": 8.25, "y": 3.0 }, + { "matrix": [3, 8], "x": 9.25, "y": 3.0 }, + { "matrix": [3, 9], "x": 10.25, "y": 3.0 }, + { "matrix": [3, 10], "x": 11.25, "y": 3.0 }, + { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 }, + { "matrix": [2, 13], "x": 14.25, "y": 3.25 }, + { "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.0 }, + { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4.0 }, + { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4.0 }, + { "matrix": [4, 3], "w": 3, "x": 3.75, "y": 4.0 }, + { "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4.0 }, + { "matrix": [4, 6], "w": 3.25, "x": 6.75, "y": 4.0 }, + { "matrix": [4, 10], "x": 10.0, "y": 4.0 }, + { "matrix": [4, 11], "x": 11.0, "y": 4.0 }, + { "matrix": [4, 12], "x": 12.0, "y": 4.0 }, + { "matrix": [3, 13], "x": 13.25, "y": 4.25 }, + { "matrix": [4, 13], "x": 14.25, "y": 4.25 }, + { "matrix": [4, 14], "x": 15.25, "y": 4.25 } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/kalakos/bahrnob/keymaps/default/keymap.c b/keyboards/kalakos/bahrnob/keymaps/default/keymap.c new file mode 100644 index 000000000000..d6a413b834fe --- /dev/null +++ b/keyboards/kalakos/bahrnob/keymaps/default/keymap.c @@ -0,0 +1,63 @@ +/* +Copyright 2023 Zykrah + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + 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_MUTE, + 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_HOME, + 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_END, + KC_LSFT, KC_NUBS, 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, MO(0), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [2] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [3] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, +}; +#endif diff --git a/keyboards/kalakos/bahrnob/keymaps/via/keymap.c b/keyboards/kalakos/bahrnob/keymaps/via/keymap.c new file mode 100644 index 000000000000..d6a413b834fe --- /dev/null +++ b/keyboards/kalakos/bahrnob/keymaps/via/keymap.c @@ -0,0 +1,63 @@ +/* +Copyright 2023 Zykrah + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + 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_MUTE, + 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_HOME, + 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_END, + KC_LSFT, KC_NUBS, 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, MO(0), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [2] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [3] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, +}; +#endif diff --git a/keyboards/kalakos/bahrnob/keymaps/via/rules.mk b/keyboards/kalakos/bahrnob/keymaps/via/rules.mk new file mode 100644 index 000000000000..36b7ba9cbc98 --- /dev/null +++ b/keyboards/kalakos/bahrnob/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/kalakos/bahrnob/readme.md b/keyboards/kalakos/bahrnob/readme.md new file mode 100644 index 000000000000..a12abddc2a97 --- /dev/null +++ b/keyboards/kalakos/bahrnob/readme.md @@ -0,0 +1,27 @@ +# BAHRNOB65 + +![BAHRNOB65](https://i.imgur.com/AK1ksQEh.jpeg) + +Bahrnob 65: Gasket Mount 65% + +* Keyboard Maintainer: [Zykrah](https://github.com/zykrah) +* Hardware Supported: Bahrnob65 Solder PCB +* Hardware Availability: N/A + +Make example for this keyboard (after setting up your build environment): + + make kalakos/bahrnob65:default + +Flashing example for this keyboard: + + make kalakos/bahrnob65: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 reset button on the back of the pcb +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/kalakos/bahrnob/rules.mk b/keyboards/kalakos/bahrnob/rules.mk new file mode 100644 index 000000000000..376fe3d8dcd8 --- /dev/null +++ b/keyboards/kalakos/bahrnob/rules.mk @@ -0,0 +1,2 @@ +ENCODER_ENABLE = yes +ENCODER_MAP_ENABLE = yes From 3ed82fd1fbbe2303292d88fcccfad220505eb66d Mon Sep 17 00:00:00 2001 From: zykrah <23428162+zykrah@users.noreply.github.com> Date: Wed, 12 Apr 2023 17:05:21 +1000 Subject: [PATCH 2/6] Remove unrequired config.h --- keyboards/kalakos/bahrnob/config.h | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 keyboards/kalakos/bahrnob/config.h diff --git a/keyboards/kalakos/bahrnob/config.h b/keyboards/kalakos/bahrnob/config.h deleted file mode 100644 index f97171b9cb14..000000000000 --- a/keyboards/kalakos/bahrnob/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2023 Zykrah - -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" - -/* This file is empty and unrequired */ From 6a83dc48105f0384f2bd17e5fba99b349060feae Mon Sep 17 00:00:00 2001 From: zykrah <23428162+zykrah@users.noreply.github.com> Date: Wed, 12 Apr 2023 17:18:42 +1000 Subject: [PATCH 3/6] Minor key change/fix --- keyboards/kalakos/bahrnob/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kalakos/bahrnob/info.json b/keyboards/kalakos/bahrnob/info.json index 8991dd6fe081..f1e2c3fa519b 100644 --- a/keyboards/kalakos/bahrnob/info.json +++ b/keyboards/kalakos/bahrnob/info.json @@ -76,8 +76,8 @@ { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2.0 }, { "matrix": [3, 14], "x": 15.5, "y": 2.5 }, { "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 }, - { "matrix": [3, 1], "x": 1.25, "y": 3.0 }, { "matrix": [4, 4], "x": 2.25, "y": 3.0 }, + { "matrix": [3, 1], "x": 1.25, "y": 3.0 }, { "matrix": [3, 2], "x": 3.25, "y": 3.0 }, { "matrix": [3, 3], "x": 4.25, "y": 3.0 }, { "matrix": [3, 4], "x": 5.25, "y": 3.0 }, From 47d5c4835486a48d431ab0d74d4821ce1a03b512 Mon Sep 17 00:00:00 2001 From: zykrah <23428162+zykrah@users.noreply.github.com> Date: Wed, 12 Apr 2023 17:31:02 +1000 Subject: [PATCH 4/6] Requested changes --- keyboards/kalakos/bahrnob/info.json | 134 ++++++++++++++-------------- keyboards/kalakos/bahrnob/rules.mk | 3 +- 2 files changed, 69 insertions(+), 68 deletions(-) diff --git a/keyboards/kalakos/bahrnob/info.json b/keyboards/kalakos/bahrnob/info.json index f1e2c3fa519b..92b9677c32f9 100644 --- a/keyboards/kalakos/bahrnob/info.json +++ b/keyboards/kalakos/bahrnob/info.json @@ -20,7 +20,9 @@ "extrakey": true, "console": false, "command": false, - "nkro": true + "nkro": true, + "encoder": true, + "encoder_map": true }, "diode_direction": "COL2ROW", "matrix_pins": { @@ -30,74 +32,74 @@ "layouts": { "LAYOUT": { "layout": [ - { "matrix": [0, 0], "x": 0.0, "y": 0.0 }, - { "matrix": [0, 1], "x": 1.0, "y": 0.0 }, - { "matrix": [0, 2], "x": 2.0, "y": 0.0 }, - { "matrix": [0, 3], "x": 3.0, "y": 0.0 }, - { "matrix": [0, 4], "x": 4.0, "y": 0.0 }, - { "matrix": [0, 5], "x": 5.0, "y": 0.0 }, - { "matrix": [0, 6], "x": 6.0, "y": 0.0 }, - { "matrix": [0, 7], "x": 7.0, "y": 0.0 }, - { "matrix": [0, 8], "x": 8.0, "y": 0.0 }, - { "matrix": [0, 9], "x": 9.0, "y": 0.0 }, - { "matrix": [0, 10], "x": 10.0, "y": 0.0 }, - { "matrix": [0, 11], "x": 11.0, "y": 0.0 }, - { "matrix": [0, 12], "x": 12.0, "y": 0.0 }, - { "matrix": [0, 13], "x": 13.0, "y": 0.0 }, - { "matrix": [1, 14], "x": 14.0, "y": 0.0 }, - { "matrix": [0, 14], "x": 15.75, "y": 0.0 }, - { "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 }, - { "matrix": [1, 1], "x": 1.5, "y": 1.0 }, - { "matrix": [1, 2], "x": 2.5, "y": 1.0 }, - { "matrix": [1, 3], "x": 3.5, "y": 1.0 }, - { "matrix": [1, 4], "x": 4.5, "y": 1.0 }, - { "matrix": [1, 5], "x": 5.5, "y": 1.0 }, - { "matrix": [1, 6], "x": 6.5, "y": 1.0 }, - { "matrix": [1, 7], "x": 7.5, "y": 1.0 }, - { "matrix": [1, 8], "x": 8.5, "y": 1.0 }, - { "matrix": [1, 9], "x": 9.5, "y": 1.0 }, - { "matrix": [1, 10], "x": 10.5, "y": 1.0 }, - { "matrix": [1, 11], "x": 11.5, "y": 1.0 }, - { "matrix": [1, 12], "x": 12.5, "y": 1.0 }, - { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0 }, + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0 }, + { "matrix": [0, 11], "x": 11, "y": 0 }, + { "matrix": [0, 12], "x": 12, "y": 0 }, + { "matrix": [0, 13], "x": 13, "y": 0 }, + { "matrix": [1, 14], "x": 14, "y": 0 }, + { "matrix": [0, 14], "x": 15.75, "y": 0 }, + { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "matrix": [1, 12], "x": 12.5, "y": 1 }, + { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, { "matrix": [2, 14], "x": 15.5, "y": 1.5 }, - { "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 }, - { "matrix": [2, 1], "x": 1.75, "y": 2.0 }, - { "matrix": [2, 2], "x": 2.75, "y": 2.0 }, - { "matrix": [2, 3], "x": 3.75, "y": 2.0 }, - { "matrix": [2, 4], "x": 4.75, "y": 2.0 }, - { "matrix": [2, 5], "x": 5.75, "y": 2.0 }, - { "matrix": [2, 6], "x": 6.75, "y": 2.0 }, - { "matrix": [2, 7], "x": 7.75, "y": 2.0 }, - { "matrix": [2, 8], "x": 8.75, "y": 2.0 }, - { "matrix": [2, 9], "x": 9.75, "y": 2.0 }, - { "matrix": [2, 10], "x": 10.75, "y": 2.0 }, - { "matrix": [2, 11], "x": 11.75, "y": 2.0 }, - { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2.0 }, + { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "matrix": [2, 11], "x": 11.75, "y": 2 }, + { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 }, { "matrix": [3, 14], "x": 15.5, "y": 2.5 }, - { "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 }, - { "matrix": [4, 4], "x": 2.25, "y": 3.0 }, - { "matrix": [3, 1], "x": 1.25, "y": 3.0 }, - { "matrix": [3, 2], "x": 3.25, "y": 3.0 }, - { "matrix": [3, 3], "x": 4.25, "y": 3.0 }, - { "matrix": [3, 4], "x": 5.25, "y": 3.0 }, - { "matrix": [3, 5], "x": 6.25, "y": 3.0 }, - { "matrix": [3, 6], "x": 7.25, "y": 3.0 }, - { "matrix": [3, 7], "x": 8.25, "y": 3.0 }, - { "matrix": [3, 8], "x": 9.25, "y": 3.0 }, - { "matrix": [3, 9], "x": 10.25, "y": 3.0 }, - { "matrix": [3, 10], "x": 11.25, "y": 3.0 }, - { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 }, + { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, + { "matrix": [4, 4], "x": 2.25, "y": 3 }, + { "matrix": [3, 1], "x": 1.25, "y": 3 }, + { "matrix": [3, 2], "x": 3.25, "y": 3 }, + { "matrix": [3, 3], "x": 4.25, "y": 3 }, + { "matrix": [3, 4], "x": 5.25, "y": 3 }, + { "matrix": [3, 5], "x": 6.25, "y": 3 }, + { "matrix": [3, 6], "x": 7.25, "y": 3 }, + { "matrix": [3, 7], "x": 8.25, "y": 3 }, + { "matrix": [3, 8], "x": 9.25, "y": 3 }, + { "matrix": [3, 9], "x": 10.25, "y": 3 }, + { "matrix": [3, 10], "x": 11.25, "y": 3 }, + { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 }, { "matrix": [2, 13], "x": 14.25, "y": 3.25 }, - { "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.0 }, - { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4.0 }, - { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4.0 }, - { "matrix": [4, 3], "w": 3, "x": 3.75, "y": 4.0 }, - { "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4.0 }, - { "matrix": [4, 6], "w": 3.25, "x": 6.75, "y": 4.0 }, - { "matrix": [4, 10], "x": 10.0, "y": 4.0 }, - { "matrix": [4, 11], "x": 11.0, "y": 4.0 }, - { "matrix": [4, 12], "x": 12.0, "y": 4.0 }, + { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, + { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, + { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, + { "matrix": [4, 3], "w": 3, "x": 3.75, "y": 4 }, + { "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4 }, + { "matrix": [4, 6], "w": 3.25, "x": 6.75, "y": 4 }, + { "matrix": [4, 10], "x": 10, "y": 4 }, + { "matrix": [4, 11], "x": 11, "y": 4 }, + { "matrix": [4, 12], "x": 12, "y": 4 }, { "matrix": [3, 13], "x": 13.25, "y": 4.25 }, { "matrix": [4, 13], "x": 14.25, "y": 4.25 }, { "matrix": [4, 14], "x": 15.25, "y": 4.25 } diff --git a/keyboards/kalakos/bahrnob/rules.mk b/keyboards/kalakos/bahrnob/rules.mk index 376fe3d8dcd8..6e7633bfe015 100644 --- a/keyboards/kalakos/bahrnob/rules.mk +++ b/keyboards/kalakos/bahrnob/rules.mk @@ -1,2 +1 @@ -ENCODER_ENABLE = yes -ENCODER_MAP_ENABLE = yes +# This file intentionally left blank From ad9a27a4b772cb10f0274b0a26dc85e0fc519e8a Mon Sep 17 00:00:00 2001 From: zykrah <23428162+zykrah@users.noreply.github.com> Date: Wed, 12 Apr 2023 18:09:56 +1000 Subject: [PATCH 5/6] Move encoder map enable to keymap level --- keyboards/kalakos/bahrnob/info.json | 3 +-- keyboards/kalakos/bahrnob/keymaps/default/keymap.c | 9 --------- keyboards/kalakos/bahrnob/keymaps/via/rules.mk | 1 + 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/keyboards/kalakos/bahrnob/info.json b/keyboards/kalakos/bahrnob/info.json index 92b9677c32f9..d1fe26f5dd34 100644 --- a/keyboards/kalakos/bahrnob/info.json +++ b/keyboards/kalakos/bahrnob/info.json @@ -21,8 +21,7 @@ "console": false, "command": false, "nkro": true, - "encoder": true, - "encoder_map": true + "encoder": true }, "diode_direction": "COL2ROW", "matrix_pins": { diff --git a/keyboards/kalakos/bahrnob/keymaps/default/keymap.c b/keyboards/kalakos/bahrnob/keymaps/default/keymap.c index d6a413b834fe..36a274748496 100644 --- a/keyboards/kalakos/bahrnob/keymaps/default/keymap.c +++ b/keyboards/kalakos/bahrnob/keymaps/default/keymap.c @@ -52,12 +52,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, -}; -#endif diff --git a/keyboards/kalakos/bahrnob/keymaps/via/rules.mk b/keyboards/kalakos/bahrnob/keymaps/via/rules.mk index 36b7ba9cbc98..1189f4ad1927 100644 --- a/keyboards/kalakos/bahrnob/keymaps/via/rules.mk +++ b/keyboards/kalakos/bahrnob/keymaps/via/rules.mk @@ -1,2 +1,3 @@ VIA_ENABLE = yes LTO_ENABLE = yes +ENCODER_MAP_ENABLE = yes From ac663c156392690d1700172589b88c0217a1c449 Mon Sep 17 00:00:00 2001 From: Zykrah <23428162+zykrah@users.noreply.github.com> Date: Wed, 12 Apr 2023 21:36:08 +1000 Subject: [PATCH 6/6] Apply suggestions from code review Co-authored-by: Joel Challis --- .../kalakos/bahrnob/keymaps/default/keymap.c | 23 +++---------------- .../kalakos/bahrnob/keymaps/via/keymap.c | 4 ++-- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/keyboards/kalakos/bahrnob/keymaps/default/keymap.c b/keyboards/kalakos/bahrnob/keymaps/default/keymap.c index 36a274748496..08ed92c0a822 100644 --- a/keyboards/kalakos/bahrnob/keymaps/default/keymap.c +++ b/keyboards/kalakos/bahrnob/keymaps/default/keymap.c @@ -24,31 +24,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_HOME, 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_END, KC_LSFT, KC_NUBS, 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, MO(0), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = 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, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [2] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [3] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - + ) }; diff --git a/keyboards/kalakos/bahrnob/keymaps/via/keymap.c b/keyboards/kalakos/bahrnob/keymaps/via/keymap.c index d6a413b834fe..eff227ff296b 100644 --- a/keyboards/kalakos/bahrnob/keymaps/via/keymap.c +++ b/keyboards/kalakos/bahrnob/keymaps/via/keymap.c @@ -24,11 +24,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_HOME, 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_END, KC_LSFT, KC_NUBS, 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, MO(0), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = 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, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,