From e4c88c812cfb62c58b8a0a57de0093187f94d31e Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Tue, 31 Jan 2023 23:41:49 +0800 Subject: [PATCH 01/28] Add new keyboard: brick --- keyboards/brick/brick.c | 18 ++++ keyboards/brick/brick.h | 60 +++++++++++ keyboards/brick/config.h | 44 ++++++++ keyboards/brick/info.json | 12 +++ keyboards/brick/keymaps/default/keymap.c | 113 ++++++++++++++++++++ keyboards/brick/keymaps/default/rules.mk | 0 keyboards/brick/keymaps/shurikai/config.h | 37 +++++++ keyboards/brick/keymaps/shurikai/keymap.c | 115 +++++++++++++++++++++ keyboards/brick/keymaps/shurikai/readme.md | 2 + keyboards/brick/keymaps/shurikai/rules.mk | 2 + keyboards/brick/keymaps/via/keymap.c | 52 ++++++++++ keyboards/brick/keymaps/via/rules.mk | 1 + keyboards/brick/readme.md | 26 +++++ keyboards/brick/rules.mk | 28 +++++ 14 files changed, 510 insertions(+) create mode 100644 keyboards/brick/brick.c create mode 100644 keyboards/brick/brick.h create mode 100644 keyboards/brick/config.h create mode 100644 keyboards/brick/info.json create mode 100644 keyboards/brick/keymaps/default/keymap.c create mode 100644 keyboards/brick/keymaps/default/rules.mk create mode 100644 keyboards/brick/keymaps/shurikai/config.h create mode 100644 keyboards/brick/keymaps/shurikai/keymap.c create mode 100644 keyboards/brick/keymaps/shurikai/readme.md create mode 100644 keyboards/brick/keymaps/shurikai/rules.mk create mode 100644 keyboards/brick/keymaps/via/keymap.c create mode 100644 keyboards/brick/keymaps/via/rules.mk create mode 100644 keyboards/brick/readme.md create mode 100644 keyboards/brick/rules.mk diff --git a/keyboards/brick/brick.c b/keyboards/brick/brick.c new file mode 100644 index 000000000000..109f2a351ead --- /dev/null +++ b/keyboards/brick/brick.c @@ -0,0 +1,18 @@ +/* + * Copyright 2020 Jason Chestnut + * + * 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 "brick.h" diff --git a/keyboards/brick/brick.h b/keyboards/brick/brick.h new file mode 100644 index 000000000000..63769205a7f1 --- /dev/null +++ b/keyboards/brick/brick.h @@ -0,0 +1,60 @@ +#pragma once + +#include "quantum.h" +#define XXX KC_NO + +#define LAYOUT_ortho_2x2u( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ + k31, k32, k33, k35, k36, k38, k39, k3a \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ + { XXX, k31, k32, k33, XXX, k35, k36, XXX, k38, k39, k3a, XXX } \ +} + +#define LAYOUT_mit( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ + k31, k32, k33, k34, k35, k37, k38, k39, k3a \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ + { XXX, k31, k32, k33, k34, k35, XXX, k37, k38, k39, k3a, XXX } \ +} + +#define LAYOUT_ortho_4x12( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \ +} + +// Used to create a keymap using only KC_ prefixed keys +#define LAYOUT_kc( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \ + ) \ + LAYOUT_ortho_4x12( \ + KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b, \ + KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b, \ + KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b, \ + KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b \ + ) + +#define LAYOUT LAYOUT_ortho_4x12 +#define LAYOUT_kc_ortho_4x12 LAYOUT_kc diff --git a/keyboards/brick/config.h b/keyboards/brick/config.h new file mode 100644 index 000000000000..7202472527b0 --- /dev/null +++ b/keyboards/brick/config.h @@ -0,0 +1,44 @@ +/* Copyright 2018 Jack Humbert + * + * 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 */ + +/* key matrix size */ +#define MATRIX_ROWS 4 +#define MATRIX_COLS 12 +#define MATRIX_ROW_PINS { D3, D5, F0, F1 } +#define MATRIX_COL_PINS { B1, B3, F7, F6, D4, D6, D7, B4, B5, B6, C6, C7 } + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +#define DEBOUNCE 5 + +#define RGB_DI_PIN D2 +#ifdef RGB_DI_PIN + #define RGBLIGHT_ANIMATIONS + #define RGBLED_NUM 8 + #define RGBLIGHT_HUE_STEP 8 + #define RGBLIGHT_SAT_STEP 8 + #define RGBLIGHT_VAL_STEP 8 +#endif + +#define ENCODERS_PAD_A { F4 } +#define ENCODERS_PAD_B { F5 } \ No newline at end of file diff --git a/keyboards/brick/info.json b/keyboards/brick/info.json new file mode 100644 index 000000000000..2624c30c94b0 --- /dev/null +++ b/keyboards/brick/info.json @@ -0,0 +1,12 @@ +{ + "keyboard_name": "Brick", + "manufacturer": "Pauper", + "url": "https://p3dstore.com/products/cervello-pcb-only-group-buy", + "maintainer": "JunoNgx", + "usb": { + "vid": "0xFEFE", + "pid": "0x0001", + "device_version": "1.0.0" + } +} + \ No newline at end of file diff --git a/keyboards/brick/keymaps/default/keymap.c b/keyboards/brick/keymaps/default/keymap.c new file mode 100644 index 000000000000..11801d8f2264 --- /dev/null +++ b/keyboards/brick/keymaps/default/keymap.c @@ -0,0 +1,113 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* Layer 0 + * ,-----------------------------------------------------------------------------------. + * | Esc | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Tab | A | S | D | F | G | H | J | K | L | ; | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | Up |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Ctrl | GUI | Caps | Alt |Layer1| Space |Layer2| / | Left | Down |Right | + * `-----------------------------------------------------------------------------------' + */ + [0] = LAYOUT_ortho_4x12 ( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, 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_UP, KC_ENT, + KC_LCTL, KC_LGUI, KC_CAPS, KC_LALT, MO(1), KC_SPC, KC_SPC, MO(2), KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT + ), + + /* Layer 1 + * ,-----------------------------------------------------------------------------------. + * | ` | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | Vol- | Vol+ | Mute | | | | F11 | F12 | | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Reset| | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ + [1] = LAYOUT_ortho_4x12 ( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, KC_F11, KC_F12, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + + /* Layer 2 (r_ Indicates RGB Controls) + * ,-----------------------------------------------------------------------------------. + * | | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | |r_TOG |r_Mode|r_Hue+|r_Hue-| | | - | = | [ | ] | \ | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | |BL_TOG|BL_STEP| | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ + [2] = LAYOUT_ortho_4x12 ( + _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, + _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; + + +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 (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) { + + } else { + + } + + if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) { + + } else { + + } + + if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) { + + } else { + + } + + if (IS_LED_ON(usb_led, USB_LED_COMPOSE)) { + + } else { + + } + + if (IS_LED_ON(usb_led, USB_LED_KANA)) { + + } else { + + } + +} + +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { return false; } + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + return true; +} \ No newline at end of file diff --git a/keyboards/brick/keymaps/default/rules.mk b/keyboards/brick/keymaps/default/rules.mk new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/keyboards/brick/keymaps/shurikai/config.h b/keyboards/brick/keymaps/shurikai/config.h new file mode 100644 index 000000000000..40a9524b469d --- /dev/null +++ b/keyboards/brick/keymaps/shurikai/config.h @@ -0,0 +1,37 @@ +#pragma once + +#ifdef AUDIO_ENABLE + #define STARTUP_SONG SONG(PREONIC_SOUND) + // #define STARTUP_SONG SONG(NO_SOUND) + + #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ + SONG(COLEMAK_SOUND), \ + SONG(DVORAK_SOUND) \ + } +#endif + +#define MUSIC_MASK (keycode != KC_NO) + +/* + * MIDI options + */ + +/* Prevent use of disabled MIDI features in the keymap */ +//#define MIDI_ENABLE_STRICT 1 + +/* enable basic MIDI features: + - MIDI notes can be sent when in Music mode is on +*/ + +#define MIDI_BASIC + +/* enable advanced MIDI features: + - MIDI notes can be added to the keymap + - Octave shift and transpose + - Virtual sustain, portamento, and modulation wheel + - etc. +*/ +//#define MIDI_ADVANCED + +/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ +//#define MIDI_TONE_KEYCODE_OCTAVES 2 diff --git a/keyboards/brick/keymaps/shurikai/keymap.c b/keyboards/brick/keymaps/shurikai/keymap.c new file mode 100644 index 000000000000..10010761ef7f --- /dev/null +++ b/keyboards/brick/keymaps/shurikai/keymap.c @@ -0,0 +1,115 @@ +/* Copyright 2015-2017 Jack Humbert + * + * 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 "shurikai.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Qwerty + * ,-----------------------------------------------------------------------------------. + * | | Q | W | E | R | T | Y | U | I | O | P | | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | sftA | S | D | F | G | H | J | K | L | sft; | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | Z | X | C | V | B | N | M | , | . | / | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | Tab | Bspc | Space|Enter | | | | | + * `-----------------------------------------------------------------------------------' + */ +[_BASE] = LAYOUT_brick_wrapper ( \ + _________________BASE_L1___________________, _______, _______, _________________BASE_R1___________________, \ + _________________BASE_L2___________________, _______, _______, _________________BASE_R2___________________, \ + _________________BASE_L3___________________, _______, _______, _________________BASE_R3___________________, \ + _______, KC_ESC, ____BASE_LT_____, ____BASE_RT_____, _______, DT_NXT \ +), + +/* Nav + * ,-----------------------------------------------------------------------------------. + * | | | | | | | Home | | PgUp | | | | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | |CtlAlt| | LGUI | | | Left | Down | Up |Right | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | | | | | | End | PgDn | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[_NAV] = LAYOUT_brick_wrapper ( \ + _________________NAVI_L1___________________, _______, _______, _________________NAVI_R1___________________, \ + _________________NAVI_L2___________________, _______, _______, _________________NAVI_R2___________________, \ + _________________NAVI_R3___________________, _______, _______, _________________NAVI_R3___________________, \ + _______, _______, ____NAVI_LT_____, ____NAVI_RT_____, _______, _______ \ +), + +/* Symbols + * ,-----------------------------------------------------------------------------------. + * | | | | | | | | ~ | | | " | | | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | ^ | * | & | | | # | - | / | ` | $ | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | | | | | | | _ | \ | ' | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[_SYMBOL] = LAYOUT_brick_wrapper ( \ + _________________SYM_L1____________________, _______, _______, _________________SYM_R1____________________, \ + _________________SYM_L2____________________, _______, _______, _________________SYM_R2____________________, \ + _________________SYM_L3____________________, _______, _______, _________________SYM_R3____________________, \ + _______, _______, _____SYM_LT_____, _____SYM_RT_____, _______, _______ \ +), + +/* NUMBER + * ,-----------------------------------------------------------------------------------. + * | | | | | | | + | 7 | 8 | 9 | / | | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | |Shift | | | | | - | 4 | 5 | 6 | 0 | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | | | | | | = | 1 | 2 | 3 | * | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[_NUMBER] = LAYOUT_brick_wrapper ( \ + _________________NUM_L1____________________, _______, _______, _________________NUM_R1____________________, \ + _________________NUM_L2____________________, _______, _______, _________________NUM_R2____________________, \ + _________________NUM_L3____________________, _______, _______, _________________NUM_R3____________________, \ + _______, _______, ____NUM_LT______, ____NUM_RT______, _______, _______\ +), + +/* ADJUST + * ,-----------------------------------------------------------------------------------. + * | | | | : | Esc | | | | | | Del | | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | | % | / |Enter | | Df1 | Gui | | | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | | | | ! | | Df0 | | Ralt,| Rctl.|Reset | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | Tab | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[_ADJUST] = LAYOUT_brick_wrapper ( \ + _________________ADJ_L1____________________, _______, _______, _________________ADJ_R1____________________, \ + _________________ADJ_L2____________________, _______, _______, _________________ADJ_R2____________________, \ + _________________ADJ_L3____________________, _______, _______, _________________ADJ_R3____________________, \ + _______, _______, ____ADJ_LT______, ____ADJ_RT______, _______, _______ \ +), + + +}; + diff --git a/keyboards/brick/keymaps/shurikai/readme.md b/keyboards/brick/keymaps/shurikai/readme.md new file mode 100644 index 000000000000..a2f2aa2f4686 --- /dev/null +++ b/keyboards/brick/keymaps/shurikai/readme.md @@ -0,0 +1,2 @@ +# Default layout +Default layout that shipped with the NIU mini diff --git a/keyboards/brick/keymaps/shurikai/rules.mk b/keyboards/brick/keymaps/shurikai/rules.mk new file mode 100644 index 000000000000..3a551bd429bc --- /dev/null +++ b/keyboards/brick/keymaps/shurikai/rules.mk @@ -0,0 +1,2 @@ +SRC += muse.c +MOUSEKEY_ENABLE = yes diff --git a/keyboards/brick/keymaps/via/keymap.c b/keyboards/brick/keymaps/via/keymap.c new file mode 100644 index 000000000000..765c4fc19494 --- /dev/null +++ b/keyboards/brick/keymaps/via/keymap.c @@ -0,0 +1,52 @@ +/* Copyright 2018 Jack Humbert + * + * 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 + +#define _BL 0 +#define _FL 1 +#define _AL 2 +#define _LL 3 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Keymap _BL: Base Layer (Default Layer) + */ +[_BL] = LAYOUT( + KC_ESC,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_DEL,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_PAST, \ + KC_TAB,KC_A,KC_S,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_ENT,KC_P4,KC_P5,KC_P6,KC_PMNS, \ + KC_LSFT,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_RSFT,KC_UP,KC_P1,KC_P2,KC_P3,KC_PPLS, \ + KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_LEFT,KC_DOWN,KC_RGHT,KC_P0,KC_PDOT,KC_PENT), + + /* Keymap _FL: Function Layer + */ +[_FL] = LAYOUT( + QK_BOOT,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU, \ + KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \ + KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \ + KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT), + + [_AL] = LAYOUT( + QK_BOOT,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU, \ + KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \ + KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \ + KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT), + + [_LL] = LAYOUT( + QK_BOOT,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU, \ + KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \ + KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \ + KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT), +}; diff --git a/keyboards/brick/keymaps/via/rules.mk b/keyboards/brick/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/brick/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/brick/readme.md b/keyboards/brick/readme.md new file mode 100644 index 000000000000..b57964754f38 --- /dev/null +++ b/keyboards/brick/readme.md @@ -0,0 +1,26 @@ + +Brick +=== + +A 40% ortholinear Planck-shaped keyboard with bottom blockers for Cervello. Created by Pauper. + +Keyboard Maintainer: [Juno Nguyen](https://github.com/JunoNgx) +Hardware Availability: [P3D Store](https://p3dstore.com/collections/invisibolt-acrylic-cases/products/cervello-invisibolt-acrylic-keyboard-case-and-pcb) + +Make example for this keyboard (after setting up your build environment): + + make brick:default + +Flashing example for this keyboard: + + make brick:default:flash + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down Escape and plug in the keyboard. +* **Physical reset button**: Briefly press the reset button below the pro-micro. +* **Keycode in layout**: The `QK_BOOT` key can be found by holding `FUNC` in between the space bars and pressing `ESC`. + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/brick/rules.mk b/keyboards/brick/rules.mk new file mode 100644 index 000000000000..0336c6f82cd4 --- /dev/null +++ b/keyboards/brick/rules.mk @@ -0,0 +1,28 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +# comment out to disable the options. +# +# EXTRAFLAGS+=-flto +LTO_ENABLE = yes +BACKLIGHT_ENABLE = no +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +NKRO_ENABLE = yes # USB Nkey Rollover +RGBLIGHT_ENABLE = yes # RGB lighting +ENCODER_ENABLE = yes +AUDIO_ENABLE = no + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE + +# Extra compatibility with standard Planck's layouts +LAYOUTS += ortho_4x12 From 2a32011da94a414005d833ff48cec612d39419a3 Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Tue, 31 Jan 2023 23:51:13 +0800 Subject: [PATCH 02/28] Add new layouts to json.info --- keyboards/brick/info.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/keyboards/brick/info.json b/keyboards/brick/info.json index 2624c30c94b0..343dcfbf1293 100644 --- a/keyboards/brick/info.json +++ b/keyboards/brick/info.json @@ -7,6 +7,16 @@ "vid": "0xFEFE", "pid": "0x0001", "device_version": "1.0.0" + }, + "layouts": { + "LAYOUT_ortho_2x2u": { + "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"x":4, "y":3, "w":2}, {"x":6, "y":3, "w":2}, {"label":"←", "x":8, "y":3}, {"label":"↓", "x":9, "y":3}, {"label":"↑", "x":10, "y":3}] + }, + "LAYOUT_mit": { + "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"⇓", "x":4, "y":3}, {"x":5, "y":3, "w":2}, {"label":"⇑", "x":7, "y":3}, {"label":"←", "x":8, "y":3}, {"label":"↓", "x":9, "y":3}, {"label":"↑", "x":10, "y":3}] + }, + "LAYOUT_ortho_4x12": { + "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"⇓", "x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"label":"⇑", "x":7, "y":3}, {"label":"←", "x":8, "y":3}, {"label":"↓", "x":9, "y":3}, {"label":"↑", "x":10, "y":3}] + } } } - \ No newline at end of file From 16e4a1695a3cbe791043994509fdc08520b8360d Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Wed, 1 Feb 2023 00:04:47 +0800 Subject: [PATCH 03/28] Fix rgb light config --- keyboards/brick/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/brick/config.h b/keyboards/brick/config.h index 7202472527b0..14b6bdde63e8 100644 --- a/keyboards/brick/config.h +++ b/keyboards/brick/config.h @@ -33,7 +33,7 @@ #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN - #define RGBLIGHT_ANIMATIONS + #define RGBLIGHT_EFFECT_BREATHING #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 From 6a40a641d4446ea0dfb1155f9bca1732fe1af716 Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Wed, 1 Feb 2023 00:05:54 +0800 Subject: [PATCH 04/28] Add license header --- keyboards/brick/brick.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/keyboards/brick/brick.h b/keyboards/brick/brick.h index 63769205a7f1..020e425806b1 100644 --- a/keyboards/brick/brick.h +++ b/keyboards/brick/brick.h @@ -1,3 +1,19 @@ +/* Copyright 2023 Juno Nguyen + * + * 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" From 08655bf513cb4bb147d73a4074e902f6c0065bb3 Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Wed, 1 Feb 2023 00:07:48 +0800 Subject: [PATCH 05/28] Add license header --- keyboards/brick/keymaps/default/keymap.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/keyboards/brick/keymaps/default/keymap.c b/keyboards/brick/keymaps/default/keymap.c index 11801d8f2264..4bd1f0f6a98b 100644 --- a/keyboards/brick/keymaps/default/keymap.c +++ b/keyboards/brick/keymaps/default/keymap.c @@ -1,3 +1,19 @@ +/* Copyright 2023 Juno Nguyen + * + * 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] = { From ea9a2732df8c791c6a62cf13bce742e17c6b3432 Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Wed, 1 Feb 2023 00:10:09 +0800 Subject: [PATCH 06/28] Update layout --- keyboards/brick/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/brick/info.json b/keyboards/brick/info.json index 343dcfbf1293..a09b4a9abd60 100644 --- a/keyboards/brick/info.json +++ b/keyboards/brick/info.json @@ -16,7 +16,7 @@ "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"⇓", "x":4, "y":3}, {"x":5, "y":3, "w":2}, {"label":"⇑", "x":7, "y":3}, {"label":"←", "x":8, "y":3}, {"label":"↓", "x":9, "y":3}, {"label":"↑", "x":10, "y":3}] }, "LAYOUT_ortho_4x12": { - "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"⇓", "x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"label":"⇑", "x":7, "y":3}, {"label":"←", "x":8, "y":3}, {"label":"↓", "x":9, "y":3}, {"label":"↑", "x":10, "y":3}] + "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"⇓", "x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"label":"⇑", "x":7, "y":3}, {"label":"←", "x":8, "y":3}, {"label":"↓", "x":9, "y":3}, {"label":"↑", "x":10, "y":3}, {"label":"→", "x":11, "y":3}] } } } From c50e5e7add2d3f657438b6dc14f3914dad80abd6 Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Wed, 1 Feb 2023 23:07:10 +0800 Subject: [PATCH 07/28] Remove brick/default/rules.mk --- keyboards/brick/keymaps/default/rules.mk | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 keyboards/brick/keymaps/default/rules.mk diff --git a/keyboards/brick/keymaps/default/rules.mk b/keyboards/brick/keymaps/default/rules.mk deleted file mode 100644 index e69de29bb2d1..000000000000 From e4c6f6ff7687fdb9f8e8aae2dd1296c081b128e1 Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Wed, 1 Feb 2023 23:08:02 +0800 Subject: [PATCH 08/28] Remove brick/keymaps/shurikai --- keyboards/brick/keymaps/shurikai/config.h | 37 ------- keyboards/brick/keymaps/shurikai/keymap.c | 115 --------------------- keyboards/brick/keymaps/shurikai/readme.md | 2 - keyboards/brick/keymaps/shurikai/rules.mk | 2 - 4 files changed, 156 deletions(-) delete mode 100644 keyboards/brick/keymaps/shurikai/config.h delete mode 100644 keyboards/brick/keymaps/shurikai/keymap.c delete mode 100644 keyboards/brick/keymaps/shurikai/readme.md delete mode 100644 keyboards/brick/keymaps/shurikai/rules.mk diff --git a/keyboards/brick/keymaps/shurikai/config.h b/keyboards/brick/keymaps/shurikai/config.h deleted file mode 100644 index 40a9524b469d..000000000000 --- a/keyboards/brick/keymaps/shurikai/config.h +++ /dev/null @@ -1,37 +0,0 @@ -#pragma once - -#ifdef AUDIO_ENABLE - #define STARTUP_SONG SONG(PREONIC_SOUND) - // #define STARTUP_SONG SONG(NO_SOUND) - - #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ - SONG(COLEMAK_SOUND), \ - SONG(DVORAK_SOUND) \ - } -#endif - -#define MUSIC_MASK (keycode != KC_NO) - -/* - * MIDI options - */ - -/* Prevent use of disabled MIDI features in the keymap */ -//#define MIDI_ENABLE_STRICT 1 - -/* enable basic MIDI features: - - MIDI notes can be sent when in Music mode is on -*/ - -#define MIDI_BASIC - -/* enable advanced MIDI features: - - MIDI notes can be added to the keymap - - Octave shift and transpose - - Virtual sustain, portamento, and modulation wheel - - etc. -*/ -//#define MIDI_ADVANCED - -/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ -//#define MIDI_TONE_KEYCODE_OCTAVES 2 diff --git a/keyboards/brick/keymaps/shurikai/keymap.c b/keyboards/brick/keymaps/shurikai/keymap.c deleted file mode 100644 index 10010761ef7f..000000000000 --- a/keyboards/brick/keymaps/shurikai/keymap.c +++ /dev/null @@ -1,115 +0,0 @@ -/* Copyright 2015-2017 Jack Humbert - * - * 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 "shurikai.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -/* Qwerty - * ,-----------------------------------------------------------------------------------. - * | | Q | W | E | R | T | Y | U | I | O | P | | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | sftA | S | D | F | G | H | J | K | L | sft; | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | Z | X | C | V | B | N | M | , | . | / | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | Tab | Bspc | Space|Enter | | | | | - * `-----------------------------------------------------------------------------------' - */ -[_BASE] = LAYOUT_brick_wrapper ( \ - _________________BASE_L1___________________, _______, _______, _________________BASE_R1___________________, \ - _________________BASE_L2___________________, _______, _______, _________________BASE_R2___________________, \ - _________________BASE_L3___________________, _______, _______, _________________BASE_R3___________________, \ - _______, KC_ESC, ____BASE_LT_____, ____BASE_RT_____, _______, DT_NXT \ -), - -/* Nav - * ,-----------------------------------------------------------------------------------. - * | | | | | | | Home | | PgUp | | | | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | |CtlAlt| | LGUI | | | Left | Down | Up |Right | | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | End | PgDn | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' - */ -[_NAV] = LAYOUT_brick_wrapper ( \ - _________________NAVI_L1___________________, _______, _______, _________________NAVI_R1___________________, \ - _________________NAVI_L2___________________, _______, _______, _________________NAVI_R2___________________, \ - _________________NAVI_R3___________________, _______, _______, _________________NAVI_R3___________________, \ - _______, _______, ____NAVI_LT_____, ____NAVI_RT_____, _______, _______ \ -), - -/* Symbols - * ,-----------------------------------------------------------------------------------. - * | | | | | | | | ~ | | | " | | | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | ^ | * | & | | | # | - | / | ` | $ | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | _ | \ | ' | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' - */ -[_SYMBOL] = LAYOUT_brick_wrapper ( \ - _________________SYM_L1____________________, _______, _______, _________________SYM_R1____________________, \ - _________________SYM_L2____________________, _______, _______, _________________SYM_R2____________________, \ - _________________SYM_L3____________________, _______, _______, _________________SYM_R3____________________, \ - _______, _______, _____SYM_LT_____, _____SYM_RT_____, _______, _______ \ -), - -/* NUMBER - * ,-----------------------------------------------------------------------------------. - * | | | | | | | + | 7 | 8 | 9 | / | | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | |Shift | | | | | - | 4 | 5 | 6 | 0 | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | = | 1 | 2 | 3 | * | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' - */ -[_NUMBER] = LAYOUT_brick_wrapper ( \ - _________________NUM_L1____________________, _______, _______, _________________NUM_R1____________________, \ - _________________NUM_L2____________________, _______, _______, _________________NUM_R2____________________, \ - _________________NUM_L3____________________, _______, _______, _________________NUM_R3____________________, \ - _______, _______, ____NUM_LT______, ____NUM_RT______, _______, _______\ -), - -/* ADJUST - * ,-----------------------------------------------------------------------------------. - * | | | | : | Esc | | | | | | Del | | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | % | / |Enter | | Df1 | Gui | | | | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | ! | | Df0 | | Ralt,| Rctl.|Reset | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | Tab | | | | | | | - * `-----------------------------------------------------------------------------------' - */ -[_ADJUST] = LAYOUT_brick_wrapper ( \ - _________________ADJ_L1____________________, _______, _______, _________________ADJ_R1____________________, \ - _________________ADJ_L2____________________, _______, _______, _________________ADJ_R2____________________, \ - _________________ADJ_L3____________________, _______, _______, _________________ADJ_R3____________________, \ - _______, _______, ____ADJ_LT______, ____ADJ_RT______, _______, _______ \ -), - - -}; - diff --git a/keyboards/brick/keymaps/shurikai/readme.md b/keyboards/brick/keymaps/shurikai/readme.md deleted file mode 100644 index a2f2aa2f4686..000000000000 --- a/keyboards/brick/keymaps/shurikai/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# Default layout -Default layout that shipped with the NIU mini diff --git a/keyboards/brick/keymaps/shurikai/rules.mk b/keyboards/brick/keymaps/shurikai/rules.mk deleted file mode 100644 index 3a551bd429bc..000000000000 --- a/keyboards/brick/keymaps/shurikai/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -SRC += muse.c -MOUSEKEY_ENABLE = yes From 4380f24e7a2204078b2428738dff50db1f3cb845 Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Wed, 1 Feb 2023 23:10:12 +0800 Subject: [PATCH 09/28] Replace layout kc with #define Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/brick/brick.h | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/keyboards/brick/brick.h b/keyboards/brick/brick.h index 020e425806b1..eeb84ebbd027 100644 --- a/keyboards/brick/brick.h +++ b/keyboards/brick/brick.h @@ -58,19 +58,4 @@ { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \ } -// Used to create a keymap using only KC_ prefixed keys -#define LAYOUT_kc( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \ - ) \ - LAYOUT_ortho_4x12( \ - KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b, \ - KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b, \ - KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b, \ - KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b \ - ) - #define LAYOUT LAYOUT_ortho_4x12 -#define LAYOUT_kc_ortho_4x12 LAYOUT_kc From 700a4d5dcf45eb76e8807cb8fabb045d29a1ec41 Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Wed, 1 Feb 2023 23:10:51 +0800 Subject: [PATCH 10/28] Remove unnecessary codes in brick default keymap Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/brick/keymaps/default/keymap.c | 46 ------------------------ 1 file changed, 46 deletions(-) diff --git a/keyboards/brick/keymaps/default/keymap.c b/keyboards/brick/keymaps/default/keymap.c index 4bd1f0f6a98b..aa58afc32f11 100644 --- a/keyboards/brick/keymaps/default/keymap.c +++ b/keyboards/brick/keymaps/default/keymap.c @@ -72,52 +72,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; - - -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 (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) { - - } else { - - } - - if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) { - - } else { - - } - - if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) { - - } else { - - } - - if (IS_LED_ON(usb_led, USB_LED_COMPOSE)) { - - } else { - - } - - if (IS_LED_ON(usb_led, USB_LED_KANA)) { - - } else { - - } - -} - bool encoder_update_kb(uint8_t index, bool clockwise) { if (!encoder_update_user(index, clockwise)) { return false; } if (clockwise) { From d79319cfbf818e783d7c77a98d0b6f8fbf5ea11d Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Wed, 1 Feb 2023 23:11:22 +0800 Subject: [PATCH 11/28] Remove unnecessary config in brick Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/brick/config.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/keyboards/brick/config.h b/keyboards/brick/config.h index 14b6bdde63e8..5f7c15227de9 100644 --- a/keyboards/brick/config.h +++ b/keyboards/brick/config.h @@ -16,13 +16,6 @@ #pragma once -#include "config_common.h" - -/* USB Device descriptor parameter */ - -/* key matrix size */ -#define MATRIX_ROWS 4 -#define MATRIX_COLS 12 #define MATRIX_ROW_PINS { D3, D5, F0, F1 } #define MATRIX_COL_PINS { B1, B3, F7, F6, D4, D6, D7, B4, B5, B6, C6, C7 } From 5670523025327c4b9e9ec4f80357eb5f5ae57fe9 Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Wed, 1 Feb 2023 23:13:15 +0800 Subject: [PATCH 12/28] Move brick rotary encoder code to brick.c --- keyboards/brick/brick.c | 12 ++++++++++++ keyboards/brick/keymaps/default/keymap.c | 9 --------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/keyboards/brick/brick.c b/keyboards/brick/brick.c index 109f2a351ead..a75d186fa5dc 100644 --- a/keyboards/brick/brick.c +++ b/keyboards/brick/brick.c @@ -16,3 +16,15 @@ */ #include "brick.h" + +#ifdef ENCODER_ENABLE + bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { return false; } + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + return true; + } +#endif \ No newline at end of file diff --git a/keyboards/brick/keymaps/default/keymap.c b/keyboards/brick/keymaps/default/keymap.c index aa58afc32f11..f488834ea423 100644 --- a/keyboards/brick/keymaps/default/keymap.c +++ b/keyboards/brick/keymaps/default/keymap.c @@ -72,12 +72,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { return false; } - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - return true; -} \ No newline at end of file From cad6f20f48bb7641cee952129d9313eb61c99756 Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Wed, 1 Feb 2023 23:14:14 +0800 Subject: [PATCH 13/28] Refactor brick/keymaps/via layer declaration Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/brick/keymaps/via/keymap.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/keyboards/brick/keymaps/via/keymap.c b/keyboards/brick/keymaps/via/keymap.c index 765c4fc19494..5e4989a45c64 100644 --- a/keyboards/brick/keymaps/via/keymap.c +++ b/keyboards/brick/keymaps/via/keymap.c @@ -16,10 +16,12 @@ #include QMK_KEYBOARD_H -#define _BL 0 -#define _FL 1 -#define _AL 2 -#define _LL 3 +enum layers { + _BL, + _FL, + _AL, + _LL +}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap _BL: Base Layer (Default Layer) From 1a3e145ccfcbab4f57c20ac77128a5a0e3624410 Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Wed, 1 Feb 2023 23:15:53 +0800 Subject: [PATCH 14/28] Remove unnecessary brick/rules.mk declaration Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/brick/rules.mk | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/keyboards/brick/rules.mk b/keyboards/brick/rules.mk index 0336c6f82cd4..077825a22a6f 100644 --- a/keyboards/brick/rules.mk +++ b/keyboards/brick/rules.mk @@ -1,13 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - -# Build Options -# comment out to disable the options. -# -# EXTRAFLAGS+=-flto LTO_ENABLE = yes BACKLIGHT_ENABLE = no BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration From 3823e581d4e51daf41457cf17eed3a6d2c520f40 Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Wed, 1 Feb 2023 23:17:18 +0800 Subject: [PATCH 15/28] Remove unnecessary brick/rules.mk declaration Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/brick/rules.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/keyboards/brick/rules.mk b/keyboards/brick/rules.mk index 077825a22a6f..7a92d9f7f6ad 100644 --- a/keyboards/brick/rules.mk +++ b/keyboards/brick/rules.mk @@ -10,9 +10,3 @@ NKRO_ENABLE = yes # USB Nkey Rollover RGBLIGHT_ENABLE = yes # RGB lighting ENCODER_ENABLE = yes AUDIO_ENABLE = no - -# Enter lower-power sleep mode when on the ChibiOS idle thread -OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE - -# Extra compatibility with standard Planck's layouts -LAYOUTS += ortho_4x12 From 7f0c12ab9e5a7f3ceaa5f7e54b152ee2e0a7029c Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Wed, 1 Feb 2023 23:17:53 +0800 Subject: [PATCH 16/28] Update keyboards/brick/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/brick/info.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/brick/info.json b/keyboards/brick/info.json index a09b4a9abd60..d20615dbbd06 100644 --- a/keyboards/brick/info.json +++ b/keyboards/brick/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "community_layouts": [ "ortho_4x12" ], "layouts": { "LAYOUT_ortho_2x2u": { "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"x":4, "y":3, "w":2}, {"x":6, "y":3, "w":2}, {"label":"←", "x":8, "y":3}, {"label":"↓", "x":9, "y":3}, {"label":"↑", "x":10, "y":3}] From 820d82dc64e1bfaf402dba6e153ce7638fc0dbb3 Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Thu, 2 Feb 2023 02:02:48 +0800 Subject: [PATCH 17/28] brick: update keymaps/via Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/brick/keymaps/via/keymap.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/keyboards/brick/keymaps/via/keymap.c b/keyboards/brick/keymaps/via/keymap.c index 5e4989a45c64..90072b9f410c 100644 --- a/keyboards/brick/keymaps/via/keymap.c +++ b/keyboards/brick/keymaps/via/keymap.c @@ -27,28 +27,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap _BL: Base Layer (Default Layer) */ [_BL] = LAYOUT( - KC_ESC,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_DEL,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_PAST, \ - KC_TAB,KC_A,KC_S,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_ENT,KC_P4,KC_P5,KC_P6,KC_PMNS, \ - KC_LSFT,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_RSFT,KC_UP,KC_P1,KC_P2,KC_P3,KC_PPLS, \ + KC_ESC,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_DEL,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_PAST, + KC_TAB,KC_A,KC_S,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_ENT,KC_P4,KC_P5,KC_P6,KC_PMNS, + KC_LSFT,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_RSFT,KC_UP,KC_P1,KC_P2,KC_P3,KC_PPLS, KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_LEFT,KC_DOWN,KC_RGHT,KC_P0,KC_PDOT,KC_PENT), /* Keymap _FL: Function Layer */ [_FL] = LAYOUT( - QK_BOOT,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU, \ - KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \ - KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \ + QK_BOOT,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU, + KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, + KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT), [_AL] = LAYOUT( - QK_BOOT,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU, \ - KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \ - KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \ + QK_BOOT,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU, + KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, + KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT), [_LL] = LAYOUT( - QK_BOOT,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU, \ - KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \ - KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \ + QK_BOOT,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU, + KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, + KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT), }; From 0c064fdfdc160b61b5e6adf6c66a839f1429432b Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Thu, 2 Feb 2023 02:52:01 +0800 Subject: [PATCH 18/28] brick: fix the via keymap --- keyboards/brick/keymaps/via/keymap.c | 62 +++++++++++++--------------- 1 file changed, 28 insertions(+), 34 deletions(-) diff --git a/keyboards/brick/keymaps/via/keymap.c b/keyboards/brick/keymaps/via/keymap.c index 5e4989a45c64..693cc717528f 100644 --- a/keyboards/brick/keymaps/via/keymap.c +++ b/keyboards/brick/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2018 Jack Humbert +/* Copyright 2023 Juno Nguyen * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,39 +16,33 @@ #include QMK_KEYBOARD_H -enum layers { - _BL, - _FL, - _AL, - _LL -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Keymap _BL: Base Layer (Default Layer) - */ -[_BL] = LAYOUT( - KC_ESC,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_DEL,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_PAST, \ - KC_TAB,KC_A,KC_S,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_ENT,KC_P4,KC_P5,KC_P6,KC_PMNS, \ - KC_LSFT,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_RSFT,KC_UP,KC_P1,KC_P2,KC_P3,KC_PPLS, \ - KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_LEFT,KC_DOWN,KC_RGHT,KC_P0,KC_PDOT,KC_PENT), - /* Keymap _FL: Function Layer - */ -[_FL] = LAYOUT( - QK_BOOT,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU, \ - KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \ - KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \ - KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT), - - [_AL] = LAYOUT( - QK_BOOT,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU, \ - KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \ - KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \ - KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT), - - [_LL] = LAYOUT( - QK_BOOT,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU, \ - KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \ - KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \ - KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT), + [0] = LAYOUT_ortho_4x12 ( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, 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_UP, KC_ENT, + KC_LCTL, KC_LGUI, KC_CAPS, KC_LALT, MO(1), KC_SPC, KC_SPC, MO(2), KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT_ortho_4x12 ( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, KC_F11, KC_F12, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [2] = LAYOUT_ortho_4x12 ( + _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, + _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [3] = LAYOUT_ortho_4x12 ( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) }; From b7cefe5ad35a6fcf0be8abb6f77a69fa4b524d1a Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Thu, 2 Feb 2023 11:42:12 +0800 Subject: [PATCH 19/28] brick: update readme format Co-authored-by: Ryan --- keyboards/brick/readme.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/brick/readme.md b/keyboards/brick/readme.md index b57964754f38..332d75b77ab2 100644 --- a/keyboards/brick/readme.md +++ b/keyboards/brick/readme.md @@ -1,6 +1,4 @@ - -Brick -=== +# Brick A 40% ortholinear Planck-shaped keyboard with bottom blockers for Cervello. Created by Pauper. From 80e7e96922c00a71363ab032df8ce6e2c2d8fb42 Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Thu, 2 Feb 2023 11:42:31 +0800 Subject: [PATCH 20/28] brick: update readme format Co-authored-by: Ryan --- keyboards/brick/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/brick/readme.md b/keyboards/brick/readme.md index 332d75b77ab2..c7894743d01d 100644 --- a/keyboards/brick/readme.md +++ b/keyboards/brick/readme.md @@ -2,8 +2,8 @@ A 40% ortholinear Planck-shaped keyboard with bottom blockers for Cervello. Created by Pauper. -Keyboard Maintainer: [Juno Nguyen](https://github.com/JunoNgx) -Hardware Availability: [P3D Store](https://p3dstore.com/collections/invisibolt-acrylic-cases/products/cervello-invisibolt-acrylic-keyboard-case-and-pcb) +* Keyboard Maintainer: [Juno Nguyen](https://github.com/JunoNgx) +* Hardware Availability: [P3D Store](https://p3dstore.com/collections/invisibolt-acrylic-cases/products/cervello-invisibolt-acrylic-keyboard-case-and-pcb) Make example for this keyboard (after setting up your build environment): From d94581bdd30f11d3448ea316aa784d070c55f783 Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Thu, 2 Feb 2023 11:43:01 +0800 Subject: [PATCH 21/28] Update keyboards/brick/rules.mk Co-authored-by: Ryan --- keyboards/brick/rules.mk | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/keyboards/brick/rules.mk b/keyboards/brick/rules.mk index 7a92d9f7f6ad..e0c821feb2bc 100644 --- a/keyboards/brick/rules.mk +++ b/keyboards/brick/rules.mk @@ -1,12 +1,14 @@ -LTO_ENABLE = yes -BACKLIGHT_ENABLE = no -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -NKRO_ENABLE = yes # USB Nkey Rollover -RGBLIGHT_ENABLE = yes # RGB lighting +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes -AUDIO_ENABLE = no +LTO_ENABLE = yes From 293f8d30c9f016ec8d1694a6f3f2797e72d58e84 Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Fri, 3 Feb 2023 07:38:58 +0800 Subject: [PATCH 22/28] Update keyboards/brick/brick.c Co-authored-by: Drashna Jaelre --- keyboards/brick/brick.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/keyboards/brick/brick.c b/keyboards/brick/brick.c index a75d186fa5dc..e0290c3296fd 100644 --- a/keyboards/brick/brick.c +++ b/keyboards/brick/brick.c @@ -18,13 +18,15 @@ #include "brick.h" #ifdef ENCODER_ENABLE - bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { return false; } - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - return true; +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { + return false; } + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + return true; +} #endif \ No newline at end of file From 34e5de32a402b6b5d90e4c83838502e846061870 Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Fri, 3 Feb 2023 07:39:17 +0800 Subject: [PATCH 23/28] Update keyboards/brick/brick.h Co-authored-by: Drashna Jaelre --- keyboards/brick/brick.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/brick/brick.h b/keyboards/brick/brick.h index eeb84ebbd027..0e9a7e7c6156 100644 --- a/keyboards/brick/brick.h +++ b/keyboards/brick/brick.h @@ -58,4 +58,3 @@ { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \ } -#define LAYOUT LAYOUT_ortho_4x12 From 233f30e77981cfde37e4b368d54a9da71ffaaef6 Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Fri, 3 Feb 2023 07:39:33 +0800 Subject: [PATCH 24/28] Update keyboards/brick/config.h Co-authored-by: Drashna Jaelre --- keyboards/brick/config.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/brick/config.h b/keyboards/brick/config.h index 5f7c15227de9..fa36fc6b2175 100644 --- a/keyboards/brick/config.h +++ b/keyboards/brick/config.h @@ -26,11 +26,11 @@ #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN - #define RGBLIGHT_EFFECT_BREATHING - #define RGBLED_NUM 8 - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 +# define RGBLIGHT_EFFECT_BREATHING +# define RGBLED_NUM 8 +# define RGBLIGHT_HUE_STEP 8 +# define RGBLIGHT_SAT_STEP 8 +# define RGBLIGHT_VAL_STEP 8 #endif #define ENCODERS_PAD_A { F4 } From 8b2f59ab13f4ea7eec475a52719e9dc4a7abf5f5 Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Sun, 5 Feb 2023 14:04:21 +0800 Subject: [PATCH 25/28] brick: enable rgb animations --- keyboards/brick/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/brick/config.h b/keyboards/brick/config.h index fa36fc6b2175..d1344865af82 100644 --- a/keyboards/brick/config.h +++ b/keyboards/brick/config.h @@ -26,11 +26,11 @@ #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN -# define RGBLIGHT_EFFECT_BREATHING # define RGBLED_NUM 8 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 +# define RGBLIGHT_ANIMATIONS #endif #define ENCODERS_PAD_A { F4 } From c15229e983e56929e6dea1e01dbc73b43ee2d44d Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Mon, 6 Feb 2023 00:55:38 +0800 Subject: [PATCH 26/28] brick: Remove debounce Co-authored-by: Ryan --- keyboards/brick/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/brick/config.h b/keyboards/brick/config.h index d1344865af82..b9f8fc40fd83 100644 --- a/keyboards/brick/config.h +++ b/keyboards/brick/config.h @@ -22,8 +22,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define DEBOUNCE 5 - #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN # define RGBLED_NUM 8 From 5a74f9df39a0e156b095ef2e6cbe586ddf4bb647 Mon Sep 17 00:00:00 2001 From: Juno Nguyen Date: Mon, 6 Feb 2023 00:57:12 +0800 Subject: [PATCH 27/28] brick: fix deprecated defines --- keyboards/brick/config.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/keyboards/brick/config.h b/keyboards/brick/config.h index b9f8fc40fd83..de011da9aa32 100644 --- a/keyboards/brick/config.h +++ b/keyboards/brick/config.h @@ -28,7 +28,16 @@ # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 -# define RGBLIGHT_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 +# define RGBLIGHT_EFFECT_TWINKLE #endif #define ENCODERS_PAD_A { F4 } From 82a9d4b6d13c1600cab46294f0be93a4a3aebbdd Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 5 Feb 2023 20:43:46 +0000 Subject: [PATCH 28/28] Apply suggestions from code review --- keyboards/brick/brick.c | 5 ++--- keyboards/brick/config.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/keyboards/brick/brick.c b/keyboards/brick/brick.c index e0290c3296fd..8c97cf97ff79 100644 --- a/keyboards/brick/brick.c +++ b/keyboards/brick/brick.c @@ -1,5 +1,4 @@ -/* - * Copyright 2020 Jason Chestnut +/* Copyright 2023 Juno Nguyen * * 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 @@ -13,7 +12,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - */ + */ #include "brick.h" diff --git a/keyboards/brick/config.h b/keyboards/brick/config.h index de011da9aa32..adb3238c6a7f 100644 --- a/keyboards/brick/config.h +++ b/keyboards/brick/config.h @@ -1,4 +1,4 @@ -/* Copyright 2018 Jack Humbert +/* Copyright 2023 Juno Nguyen * * 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