From 4b79d2fa14d7bb3a793e7724a701258d1e55972d Mon Sep 17 00:00:00 2001 From: Jason Chestnut Date: Mon, 13 Feb 2023 14:39:57 -0500 Subject: [PATCH 01/13] Initial pauper userspace commit. --- users/pauper/config.h | 34 ++++++ users/pauper/pauper.c | 16 +++ users/pauper/pauper.h | 91 ++++++++++++++++ users/pauper/readme.md | 22 ++++ users/pauper/rules.mk | 23 ++++ users/pauper/wrappers.h | 226 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 412 insertions(+) create mode 100644 users/pauper/config.h create mode 100644 users/pauper/pauper.c create mode 100644 users/pauper/pauper.h create mode 100644 users/pauper/readme.md create mode 100644 users/pauper/rules.mk create mode 100644 users/pauper/wrappers.h diff --git a/users/pauper/config.h b/users/pauper/config.h new file mode 100644 index 000000000000..db31482af26a --- /dev/null +++ b/users/pauper/config.h @@ -0,0 +1,34 @@ +/* + * Copyright 2023 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 . + */ +#pragma once + +// Tapping term settings +#define COMBO_COUNT 1 +#define TAPPING_TERM 150 +#define IGNORE_MOD_TAP_INTERRUPT + +#ifdef RGBLIGHT_ENABLE +# define RGBLIGHT_SLEEP +# define RBG_HUE_STEP 16 +# define RGB_SAT_STEP 16 +# define RGB_VAL_STEP 16 + +# define RBGLIGHT_EFFECT_BREATHING +# define RBGLIGHT_EFFECT_KNIGHT +# define RBGLIGHT_EFFECT_SNAKE +# define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#endif diff --git a/users/pauper/pauper.c b/users/pauper/pauper.c new file mode 100644 index 000000000000..cae6a2331332 --- /dev/null +++ b/users/pauper/pauper.c @@ -0,0 +1,16 @@ +/* + * Copyright 2023 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 . + */ diff --git a/users/pauper/pauper.h b/users/pauper/pauper.h new file mode 100644 index 000000000000..748c73ccb4b0 --- /dev/null +++ b/users/pauper/pauper.h @@ -0,0 +1,91 @@ +/* + * Copyright 2023 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 . + */ +#pragma once +#include QMK_KEYBOARD_H + +#include "wrappers.h" + +enum userspace_layers { + _BASE, + _NAV, + _MOUSE, + _RSYMBOL, + _LSYMBOL, + _NUMBER, + _FUNCTION, + _ADJUST, + _RGB_CONTROL +}; + +enum userspace_keycodes { + BASE = SAFE_RANGE, + NAV, + MOUSE, + RSYMBOL, + LSYMBOL, + NUMBER, + FUNCTION, + ADJUST, + RGB_CONTROL +}; + +/* + * Mod-taps. + */ +#define KC_SFTA MT(MOD_LSFT, KC_A) +#define KC_GUIZ MT(MOD_LGUI, KC_Z) +#define KC_CTLX MT(MOD_LCTL, KC_X) +#define KC_ALTC MT(MOD_LALT, KC_C) +#define KC_SFTCLN MT(MOD_LSFT, KC_SCLN) +#define KC_ALTCM MT(MOD_LALT, KC_COMM) +#define KC_CTLDT MT(MOD_LCTL, KC_DOT) +#define KC_GUISL MT(MOD_LGUI, KC_SLSH) + +/* + * Layer-taps. + */ +#define LT_NAV LT(_NAV,KC_D) +#define LT_MSE LT(_MOUSE,KC_K) +#define LT_RSYM LT(_RSYMBOL,KC_F) +#define LT_LSYM LT(_LSYMBOL,KC_J) +#define LT_NUM LT(_NUMBER,KC_S) +#define LT_FUNC LT(_FUNCTION,KC_L) +#define LT_ADJ LT(_ADJUST,KC_SPC) +#define LT_RGB LT(_RGB_CONTROL, KC_ENT) + +/* + * Key shortcuts. + */ +#define DT_NXT LCTL(KC_RGHT) +#define DT_PRV LCTL(KC_LEFT) + +/* + * Common key combos used in multiple keymaps. + */ + +#ifdef COMBO_ENABLE +enum combos { + ESC_COMBO +}; + +const uint16_t PROGMEM esc_combo [] = {KC_Q, KC_W, COMBO_END}; + +combo_t key_combos[COMBO_COUNT] = { + [ESC_COMBO] = COMBO(esc_combo, KC_ESC) +}; +#endif + diff --git a/users/pauper/readme.md b/users/pauper/readme.md new file mode 100644 index 000000000000..7d951e6b580c --- /dev/null +++ b/users/pauper/readme.md @@ -0,0 +1,22 @@ +Copyright 2023 Jason Chestnut @pauperboards @shurikai + +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 . + +# Overview + +My user-space sets up a common keymap for use with most of the boards I own. +Extensive reuse from @Drashna as a starting point. + +My usercode utilizes the layout wrappers contained in [wrappers.h](wrappers.h). +All of the keymaps are derivative of the Ferris 34-key keymap. diff --git a/users/pauper/rules.mk b/users/pauper/rules.mk new file mode 100644 index 000000000000..a16cba9380c9 --- /dev/null +++ b/users/pauper/rules.mk @@ -0,0 +1,23 @@ +# * Copyright 2023 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 . + +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically + +MOUSEKEY_ENABLE = yes +COMBO_ENABLE = yes + +SRC += pauper.c diff --git a/users/pauper/wrappers.h b/users/pauper/wrappers.h new file mode 100644 index 000000000000..e0cf22b09774 --- /dev/null +++ b/users/pauper/wrappers.h @@ -0,0 +1,226 @@ +/* + * Copyright 2023 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 . + */ +#pragma once + +#if (!defined(LAYOUT) && defined(KEYMAP)) +# define LAYOUT KEYMAP +#endif + +#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__) +#define LAYOUT_reviung_wrapper(...) LAYOUT_reviung39(__VA_ARGS__) +#define LAYOUT_microdox_wrapper(...) LAYOUT_split_3x5_3(__VA_ARGS__) +#define LAYOUT_corne_wrapper(...) LAYOUT_split_3x6_3(__VA_ARGS__) +#define LAYOUT_preonic_wrapper(...) LAYOUT_preonic_grid(__VA_ARGS__) +#define LAYOUT_niumini_wrapper(...) LAYOUT_ortho_4x12(__VA_ARGS__) + +/* + * My standard keymap is based on a 34-key split ortho board. This includes 5 columns and 2 thumb + * keys per hand. The following macros define the base 34 key map, with any additional keys for a + * given keyboard left to be defined in that specific keymap.c file. + */ + +// Used as a blank number row for huge keyboards like the Preonic. +#define _________________BLANK_ROW_________________ _______, _______, _______, _______, _______ + +/* BASE + * ,----------------------------------+ +----------------------------------. + * | Q | W | E | R | T | | Y | U | I | O | P | + * |------+------+------+------+------| |------+------+------+------+------| + * | sA | S | D | F | G | | H | J | K | L | s; | + * |------+------+------+------+------| |------+------+------+------+------| + * | gZ | cX | aC | V | B | | N | M | a, | c. | g/ | + * `------+------+------+------+------| |------+------+------+------+------' + * | TAB | BSPC | | SPC | ENT | + * `-------------+ +-------------' + */ +#define _________________BASE_L1___________________ KC_Q, KC_W, KC_E, KC_R, KC_T +#define _________________BASE_L2___________________ KC_SFTA, LT_NUM, LT_NAV, LT_RSYM, KC_G +#define _________________BASE_L3___________________ KC_GUIZ, KC_CTLX, KC_ALTC, KC_V, KC_B +#define ____BASE_LT_____ KC_TAB, KC_BSPC + +#define _________________BASE_R1___________________ KC_Y, KC_U, KC_I, KC_O, KC_P +#define _________________BASE_R2___________________ KC_H, LT_LSYM, LT_MSE, LT_FUNC, KC_SFTCLN +#define _________________BASE_R3___________________ KC_N, KC_M, KC_ALTCM, KC_CTLDT, KC_GUISL +#define ____BASE_RT_____ LT_ADJ, LT_RGB + +/* Navigation + * ,----------------------------------+ +----------------------------------. + * | | | | | | | Home | | PgUp | | | + * |------+------+------+------+------- |------+------+------+------+------| + * | | |XXXXXX| LGUI | | | Left | Down | Up |Right | | + * |------+------+------+------+------| |------+------+------+------+------| + * | | | | | | | End | PgDn | | | | + * `------+------+------+------+------| |------+------+------+------+------' + * | | | | | | + * `-------------+ +-------------' + */ +#define _________________NAVI_L1___________________ _______, _______, _______, _______, _______ +#define _________________NAVI_L2___________________ _______, _______, KC_NO, KC_LGUI, _______ +#define _________________NAVI_L3___________________ _______, _______, _______, _______, _______ +#define ____NAVI_LT_____ _______, _______ + +#define _________________NAVI_R1___________________ KC_HOME, _______, KC_PGUP, _______, _______ +#define _________________NAVI_R2___________________ KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______ +#define _________________NAVI_R3___________________ KC_END, KC_PGDN, _______, _______, _______ +#define ____NAVI_RT_____ _______, _______ + +/* Mouse keys + * ,----------------------------------+ +----------------------------------. + * | |Mouse2| MWU |Mouse1| | | | | | | | + * |------+------+------+------+------| |------+------+------+------+------| + * |MouseL|MouseD|MouseU|MouseR| | | |Mouse1|XXXXXX|Mouse2| | + * |------+------+------+------+------| |------+------+------+------+------| + * | | MWL | MWD | MWR | | | | | | | | + * `------+------+------+------+------| |------+------+------+------+------' + * | | | | | | + * `-------------+ +-------------' + */ +#define _________________MSE_L1____________________ _______, KC_BTN2, KC_WH_U, KC_BTN1, _______ +#define _________________MSE_L2____________________ KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______ +#define _________________MSE_L3____________________ _______, KC_WH_L, KC_WH_D, KC_WH_R, _______ +#define ____MSE_LT______ _______, _______ + +#define _________________MSE_R1____________________ _______, _______, _______, _______, _______ +#define _________________MSE_R2____________________ _______, KC_BTN1, _______, KC_BTN2, _______ +#define _________________MSE_R3____________________ _______, _______, _______, _______, _______ +#define ____MSE_RT______ _______, _______ + +/* Right Hand Symbols + * ,----------------------------------+ +----------------------------------. + * | | | | | | | | ~ | | | " | | + * |------+------+------+------+------| |------+------+------+------+------| + * | ^ | * | & |XXXXXX| | | # | - | / | ` | $ | + * |------+------+------+------+------| |------+------+------+------+------| + * | | | | | | | | _ | \ | ' | | + * `------+------+------+------+------| |------+------+------+------+------' + * | | | | | | + * `-------------+ +-------------' + */ +#define _________________RSYM_L1___________________ _______, _______, _______, _______, _______ +#define _________________RSYM_L2___________________ KC_CIRC, KC_ASTR, KC_AMPR, KC_NO, _______ +#define _________________RSYM_L3___________________ _______, _______, _______, _______, _______ +#define ____RSYM_LT_____ _______, _______ + +#define _________________RSYM_R1___________________ _______, KC_TILD, KC_PIPE, KC_DQUO, _______ +#define _________________RSYM_R2___________________ KC_HASH, KC_MINS, KC_SLSH, KC_QUOT, KC_DLR +#define _________________RSYM_R3___________________ _______, KC_UNDS, KC_BSLS, KC_GRV, _______ +#define ____RSYM_RT_____ _______, _______ + +/* Left Hand Symbols + * ,----------------------------------+ +----------------------------------. + * | : | < | > | ; | | | | | | | | + * |------+------+------+------+------| |------+------+------+------+------| + * | { | } | ( | ) | @ | | |XXXXXX| = | + | % | + * |------+------+------+------+------| |------+------+------+------+------| + * | | ! | [ | ] | | | | | | | | + * `------+------+------+------+------| |------+------+------+------+------' + * | | | | | | + * `-------------+ +-------------' + */ +#define _________________LSYM_L1___________________ KC_COLN, KC_LT, KC_GT, KC_SCLN, _______ +#define _________________LSYM_L2___________________ KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN, KC_AT +#define _________________LSYM_L3___________________ _______, KC_EXLM, KC_LBRC, KC_RBRC, _______ +#define ____LSYM_LT_____ _______, _______ + +#define _________________LSYM_R1___________________ _______, _______, _______, _______, _______ +#define _________________LSYM_R2___________________ _______, KC_NO, KC_EQL, KC_PLUS, KC_PERC +#define _________________LSYM_R3___________________ _______, _______, _______, _______, _______ +#define ____LSYM_RT_____ _______, _______ + +/* Numbers (ten-key style) + * ,----------------------------------+ +----------------------------------. + * | | | | | | | + | 7 | 8 | 9 | / | + * |------+------+------+------+------| |------+------+------+------+------| + * |Shift |XXXXXX| | | | | - | 4 | 5 | 6 | 0 | + * |------+------+------+------+------| |------+------+------+------+------| + * | | | | | | | = | 1 | 2 | 3 | * | + * `------+------+------+------+------| |------+------+------+------+------' + * | | | | | | + * `-------------+ +-------------' + */ +#define _________________NUM_L1____________________ _______, _______, _______, _______, _______ +#define _________________NUM_L2____________________ KC_LSFT, KC_NO, _______, _______, _______ +#define _________________NUM_L3____________________ _______, _______, _______, _______, _______ +#define ____NUM_LT______ _______, _______ + +#define _________________NUM_R1____________________ KC_PPLS, KC_7, KC_8, KC_9, KC_PSLS +#define _________________NUM_R2____________________ KC_PMNS, KC_4, KC_5, KC_6, KC_0 +#define _________________NUM_R3____________________ KC_PEQL, KC_1, KC_2, KC_3, KC_PAST +#define ____NUM_RT______ _______, _______ + +/* Function + * ,----------------------------------+ +----------------------------------. + * | F10 | F9 | F8 | F7 | | | | | | | | + * |------+------+------+------+------| |------+------+------+------+------| + * | F11 | F6 | F5 | F4 | | | | | Alt |XXXXXX| | + * |------+------+------+------+------| |------+------+------+------+------| + * | F12 | F3 | F2 | F1 | | | | | | | | + * `------+------+------+------+------| |------+------+------+------+------' + * | | | | | | + * `-------------+ +-------------' + */ +#define _________________FN_L1_____________________ KC_F10, KC_F9, KC_F8, KC_F7, _______ +#define _________________FN_L2_____________________ KC_F11, KC_F6, KC_F5, KC_F4, _______ +#define _________________FN_L3_____________________ KC_F12, KC_F3, KC_F2, KC_F1, _______ +#define ____FN_LT_______ _______, _______ + +#define _________________FN_R1_____________________ _______, _______, _______, _______, _______ +#define _________________FN_R2_____________________ _______, _______, KC_RALT, KC_NO, _______ +#define _________________FN_R3_____________________ _______, _______, _______, _______, _______ +#define ____FN_RT_______ _______, _______ + +/* Adjust + * ,----------------------------------+ +----------------------------------. + * | | | : | Esc | | | | | | | Del | + * |------+------+------+------+------| |------+------+------+------+------| + * | | % | / |Enter | | | | | | | | + * |------+------+------+------+------| |------+------+------+------+------| + * | | | | ! | | | | | | |Reset | + * `------+------+------+------+------| |------+------+------+------+------' + * | | | |XXXXXX| | + * `-------------+ +-------------' + */ +#define _________________ADJ_L1____________________ _______, _______, KC_COLN, KC_ESC, _______ +#define _________________ADJ_L2____________________ _______, KC_PERC, KC_SLSH, KC_ENT, _______ +#define _________________ADJ_L3____________________ _______, _______, _______, KC_EXLM, _______ +#define ____ADJ_LT______ _______, KC_TAB + +#define _________________ADJ_R1____________________ _______, _______, _______, _______, KC_DEL +#define _________________ADJ_R2____________________ _______, _______, _______, _______, _______ +#define _________________ADJ_R3____________________ _______, _______, _______, _______, RESET +#define ____ADJ_RT______ KC_NO, _______ + +/* RGB and Misc + * ,----------------------------------+ +----------------------------------. + * | | | | | | | | | | | | + * |------+------+------+------+------| |------+------+------+------+------| + * | | | | | | | | | | | | + * |------+------+------+------+------| |------+------+------+------+------| + * | | | | | | | | | | |Reset | + * `------+------+------+------+------| |------+------+------+------+------' + * | | | | | | + * `-------------+ +-------------' + */ +#define _________________RGB_L1____________________ _______, _______, _______, _______, RGB_TOG +#define _________________RGB_L2____________________ _______, RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD +#define _________________RGB_L3____________________ _______, RGB_VAD, RGB_SAD, RGB_HUD, RGB_RMOD +#define ____RGB_LT______ _______, _______ + +#define _________________RGB_R1____________________ _______, _______, _______, _______, _______ +#define _________________RGB_R2____________________ _______, RGB_M_P, RGB_M_B, RGB_M_SW, RGB_M_K +#define _________________RGB_R3____________________ _______, _______, _______, _______, RESET +#define ____RGB_RT______ _______, KC_NO From 8bf193f9f53eba5b61b88e1d7700debf56bff051 Mon Sep 17 00:00:00 2001 From: pauperboards Date: Mon, 13 Feb 2023 15:01:01 -0500 Subject: [PATCH 02/13] Test push. --- users/pauper/readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/users/pauper/readme.md b/users/pauper/readme.md index 7d951e6b580c..06e5d93f4014 100644 --- a/users/pauper/readme.md +++ b/users/pauper/readme.md @@ -20,3 +20,5 @@ Extensive reuse from @Drashna as a starting point. My usercode utilizes the layout wrappers contained in [wrappers.h](wrappers.h). All of the keymaps are derivative of the Ferris 34-key keymap. + +more to follow ... From 457c70c273ed8ef53aecac12fc6a14972ad6503a Mon Sep 17 00:00:00 2001 From: pauperboards Date: Tue, 14 Feb 2023 19:29:34 -0500 Subject: [PATCH 03/13] User updates. --- users/pauper/pauper.h | 49 +++++------ users/pauper/wrappers.h | 191 +++++++++++++++------------------------- 2 files changed, 89 insertions(+), 151 deletions(-) diff --git a/users/pauper/pauper.h b/users/pauper/pauper.h index 748c73ccb4b0..3d2bd2fa2359 100644 --- a/users/pauper/pauper.h +++ b/users/pauper/pauper.h @@ -1,5 +1,5 @@ /* - * Copyright 2023 Jason Chestnut + * Copyright 2023 Jason Chestnut @pauperboards * * 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 @@ -22,50 +22,41 @@ enum userspace_layers { _BASE, _NAV, - _MOUSE, - _RSYMBOL, - _LSYMBOL, + _SYMBOL, _NUMBER, - _FUNCTION, - _ADJUST, - _RGB_CONTROL + _ADJUST }; enum userspace_keycodes { BASE = SAFE_RANGE, NAV, - MOUSE, - RSYMBOL, - LSYMBOL, + SYMBOL, NUMBER, - FUNCTION, - ADJUST, - RGB_CONTROL + ADJUST }; /* * Mod-taps. */ -#define KC_SFTA MT(MOD_LSFT, KC_A) -#define KC_GUIZ MT(MOD_LGUI, KC_Z) -#define KC_CTLX MT(MOD_LCTL, KC_X) -#define KC_ALTC MT(MOD_LALT, KC_C) -#define KC_SFTCLN MT(MOD_LSFT, KC_SCLN) -#define KC_ALTCM MT(MOD_LALT, KC_COMM) -#define KC_CTLDT MT(MOD_LCTL, KC_DOT) -#define KC_GUISL MT(MOD_LGUI, KC_SLSH) +#define KC_CTLA MT(MOD_LCTL, KC_A) +#define KC_ALTS MT(MOD_LALT, KC_S) +#define KC_SFTD MT(MOD_LSFT, KC_D) +#define KC_GUIF MT(MOD_LGUI, KC_F) + +#define KC_GUIJ MT(MOD_LGUI, KC_J) +#define KC_SFTK MT(MOD_LSFT, KC_K) +#define KC_ALTL MT(MOD_LALT, KC_L) +#define KC_CTLCLN MT(MOD_LCTL, KC_SCLN) + +#define KC_SFTLP MT(MOD_LSFT, KC_LPRN) /* * Layer-taps. */ -#define LT_NAV LT(_NAV,KC_D) -#define LT_MSE LT(_MOUSE,KC_K) -#define LT_RSYM LT(_RSYMBOL,KC_F) -#define LT_LSYM LT(_LSYMBOL,KC_J) -#define LT_NUM LT(_NUMBER,KC_S) -#define LT_FUNC LT(_FUNCTION,KC_L) -#define LT_ADJ LT(_ADJUST,KC_SPC) -#define LT_RGB LT(_RGB_CONTROL, KC_ENT) +#define LT_NUM LT(_NUMBER, KC_BSPC) +#define LT_NAV LT(_NAV, KC_ESC) +#define LT_SYM LT(_SYMBOL, KC_SPC) +#define LT_ADJ LT(_ADJUST, KC_ENT) /* * Key shortcuts. diff --git a/users/pauper/wrappers.h b/users/pauper/wrappers.h index e0cf22b09774..6f34c85b616b 100644 --- a/users/pauper/wrappers.h +++ b/users/pauper/wrappers.h @@ -16,17 +16,6 @@ */ #pragma once -#if (!defined(LAYOUT) && defined(KEYMAP)) -# define LAYOUT KEYMAP -#endif - -#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__) -#define LAYOUT_reviung_wrapper(...) LAYOUT_reviung39(__VA_ARGS__) -#define LAYOUT_microdox_wrapper(...) LAYOUT_split_3x5_3(__VA_ARGS__) -#define LAYOUT_corne_wrapper(...) LAYOUT_split_3x6_3(__VA_ARGS__) -#define LAYOUT_preonic_wrapper(...) LAYOUT_preonic_grid(__VA_ARGS__) -#define LAYOUT_niumini_wrapper(...) LAYOUT_ortho_4x12(__VA_ARGS__) - /* * My standard keymap is based on a 34-key split ortho board. This includes 5 columns and 2 thumb * keys per hand. The following macros define the base 34 key map, with any additional keys for a @@ -40,127 +29,106 @@ * ,----------------------------------+ +----------------------------------. * | Q | W | E | R | T | | Y | U | I | O | P | * |------+------+------+------+------| |------+------+------+------+------| - * | sA | S | D | F | G | | H | J | K | L | s; | + * | cA | aS | sD | gF | G | | H | gJ | sK | aL | c; | * |------+------+------+------+------| |------+------+------+------+------| - * | gZ | cX | aC | V | B | | N | M | a, | c. | g/ | + * | Z | X | C | V | B | | N | M | , | . | / | * `------+------+------+------+------| |------+------+------+------+------' - * | TAB | BSPC | | SPC | ENT | + * | ESC | BSPC | | SPC | ENT | * `-------------+ +-------------' */ #define _________________BASE_L1___________________ KC_Q, KC_W, KC_E, KC_R, KC_T -#define _________________BASE_L2___________________ KC_SFTA, LT_NUM, LT_NAV, LT_RSYM, KC_G -#define _________________BASE_L3___________________ KC_GUIZ, KC_CTLX, KC_ALTC, KC_V, KC_B -#define ____BASE_LT_____ KC_TAB, KC_BSPC +#define _________________BASE_L2___________________ KC_CTLA, KC_ALTS, KC_SFTD, KC_GUIF, KC_G +#define _________________BASE_L3___________________ KC_Z, KC_X, KC_C, KC_V, KC_B +#define ____BASE_LT_____ LT_NAV, LT_NUM #define _________________BASE_R1___________________ KC_Y, KC_U, KC_I, KC_O, KC_P -#define _________________BASE_R2___________________ KC_H, LT_LSYM, LT_MSE, LT_FUNC, KC_SFTCLN -#define _________________BASE_R3___________________ KC_N, KC_M, KC_ALTCM, KC_CTLDT, KC_GUISL -#define ____BASE_RT_____ LT_ADJ, LT_RGB +#define _________________BASE_R2___________________ KC_H, KC_GUIJ, KC_SFTK, KC_ALTL, KC_CTLCLN +#define _________________BASE_R3___________________ KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH +#define ____BASE_RT_____ LT_SYM, LT_ADJ -/* Navigation +/* QWERTY - For when I get ready to remove the BASE configuration and go with this one. * ,----------------------------------+ +----------------------------------. - * | | | | | | | Home | | PgUp | | | - * |------+------+------+------+------- |------+------+------+------+------| - * | | |XXXXXX| LGUI | | | Left | Down | Up |Right | | - * |------+------+------+------+------| |------+------+------+------+------| - * | | | | | | | End | PgDn | | | | - * `------+------+------+------+------| |------+------+------+------+------' - * | | | | | | - * `-------------+ +-------------' - */ -#define _________________NAVI_L1___________________ _______, _______, _______, _______, _______ -#define _________________NAVI_L2___________________ _______, _______, KC_NO, KC_LGUI, _______ -#define _________________NAVI_L3___________________ _______, _______, _______, _______, _______ -#define ____NAVI_LT_____ _______, _______ - -#define _________________NAVI_R1___________________ KC_HOME, _______, KC_PGUP, _______, _______ -#define _________________NAVI_R2___________________ KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______ -#define _________________NAVI_R3___________________ KC_END, KC_PGDN, _______, _______, _______ -#define ____NAVI_RT_____ _______, _______ - -/* Mouse keys - * ,----------------------------------+ +----------------------------------. - * | |Mouse2| MWU |Mouse1| | | | | | | | + * | Q | W | E | R | T | | Y | U | I | O | P | * |------+------+------+------+------| |------+------+------+------+------| - * |MouseL|MouseD|MouseU|MouseR| | | |Mouse1|XXXXXX|Mouse2| | + * | sA | S | D | F | G | | H | J | K | L | s; | * |------+------+------+------+------| |------+------+------+------+------| - * | | MWL | MWD | MWR | | | | | | | | + * | gZ | cX | aC | V | B | | N | M | a, | c. | g/ | * `------+------+------+------+------| |------+------+------+------+------' - * | | | | | | + * | TAB | BSPC | | SPC | ENT | * `-------------+ +-------------' */ -#define _________________MSE_L1____________________ _______, KC_BTN2, KC_WH_U, KC_BTN1, _______ -#define _________________MSE_L2____________________ KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______ -#define _________________MSE_L3____________________ _______, KC_WH_L, KC_WH_D, KC_WH_R, _______ -#define ____MSE_LT______ _______, _______ +#define _______________QWERTY_L1___________________ KC_Q, KC_W, KC_E, KC_R, KC_T +#define _______________QWERTY_L2___________________ KC_A, KC_S, KC_D, KC_F, KC_G +#define _______________QWERTY_L3___________________ KC_Z, KC_X, KC_C, KC_V, KC_B +#define __QWERTY_LT_____ KC_TAB, KC_BSPC -#define _________________MSE_R1____________________ _______, _______, _______, _______, _______ -#define _________________MSE_R2____________________ _______, KC_BTN1, _______, KC_BTN2, _______ -#define _________________MSE_R3____________________ _______, _______, _______, _______, _______ -#define ____MSE_RT______ _______, _______ +#define _______________QWERTY_R1___________________ KC_Y, KC_U, KC_I, KC_O, KC_P +#define _______________QWERTY_R2___________________ KC_H, KC_J, KC_K, KC_L, KC_SCLN +#define _______________QWERTY_R3___________________ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH +#define __QWERTY_RT_____ KC_SPC, LT_ENT -/* Right Hand Symbols +/* Navigation * ,----------------------------------+ +----------------------------------. - * | | | | | | | | ~ | | | " | | - * |------+------+------+------+------| |------+------+------+------+------| - * | ^ | * | & |XXXXXX| | | # | - | / | ` | $ | + * | | | | | | | | End | Home | | | + * |------+------+------+------+------- |------+------+------+------+------| + * | LCTL | LALT | LSFT | LGUI | | | Left | Down | Up |Right | | * |------+------+------+------+------| |------+------+------+------+------| - * | | | | | | | | _ | \ | ' | | + * | | | | | | | | PgDn | PgDn | | | * `------+------+------+------+------| |------+------+------+------+------' - * | | | | | | + * |XXXXXX| | | | | * `-------------+ +-------------' */ -#define _________________RSYM_L1___________________ _______, _______, _______, _______, _______ -#define _________________RSYM_L2___________________ KC_CIRC, KC_ASTR, KC_AMPR, KC_NO, _______ -#define _________________RSYM_L3___________________ _______, _______, _______, _______, _______ -#define ____RSYM_LT_____ _______, _______ +#define _________________NAVI_L1___________________ _______, _______, _______, _______, _______ +#define _________________NAVI_L2___________________ KC_LCTL, KC_LALT, KC_LSFT, KC_LGUI, _______ +#define _________________NAVI_L3___________________ _______, _______, _______, _______, _______ +#define ____NAVI_LT_____ KC_NO, _______ -#define _________________RSYM_R1___________________ _______, KC_TILD, KC_PIPE, KC_DQUO, _______ -#define _________________RSYM_R2___________________ KC_HASH, KC_MINS, KC_SLSH, KC_QUOT, KC_DLR -#define _________________RSYM_R3___________________ _______, KC_UNDS, KC_BSLS, KC_GRV, _______ -#define ____RSYM_RT_____ _______, _______ +#define _________________NAVI_R1___________________ _______, KC_END, KC_HOME, _______, _______ +#define _________________NAVI_R2___________________ KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______ +#define _________________NAVI_R3___________________ _______, KC_PGDN, KC_PGUP, _______, _______ +#define ____NAVI_RT_____ _______, _______ -/* Left Hand Symbols +/* Symbols * ,----------------------------------+ +----------------------------------. - * | : | < | > | ; | | | | | | | | + * | ~ | ` | { | } | | | | & | * | | | | * |------+------+------+------+------| |------+------+------+------+------| - * | { | } | ( | ) | @ | | |XXXXXX| = | + | % | + * | | | ( | ) | @ | | - | $ | % | ^ | ' " | * |------+------+------+------+------| |------+------+------+------+------| - * | | ! | [ | ] | | | | | | | | + * | | | [ | ] | | | _ | ! | @ | # | \ | * `------+------+------+------+------| |------+------+------+------+------' - * | | | | | | + * | | | |XXXXXX| | * `-------------+ +-------------' */ -#define _________________LSYM_L1___________________ KC_COLN, KC_LT, KC_GT, KC_SCLN, _______ -#define _________________LSYM_L2___________________ KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN, KC_AT -#define _________________LSYM_L3___________________ _______, KC_EXLM, KC_LBRC, KC_RBRC, _______ -#define ____LSYM_LT_____ _______, _______ +#define _________________SYM_L1____________________ KC_TILD, KC_GRV, KC_LCBR, KC_RCBR, _______ +#define _________________SYM_L2____________________ _______, _______, KC_LPRN, KC_RPRN, KC_AT +#define _________________SYM_L3____________________ _______, _______, KC_LBRC, KC_RBRC, _______ +#define _____SYM_LT_____ MOD_LSFT, _______ -#define _________________LSYM_R1___________________ _______, _______, _______, _______, _______ -#define _________________LSYM_R2___________________ _______, KC_NO, KC_EQL, KC_PLUS, KC_PERC -#define _________________LSYM_R3___________________ _______, _______, _______, _______, _______ -#define ____LSYM_RT_____ _______, _______ +#define _________________SYM_R1____________________ _______, KC_AMPR, KC_ASTR, _______, KC_PIPE +#define _________________SYM_R2____________________ KC_MINS, KC_DLR, KC_PERC, KC_CIRC, KC_QUOT +#define _________________SYM_R3____________________ KC_UNDS, KC_EXLM, KC_AT, KC_HASH, KC_BSLS +#define _____SYM_RT_____ KC_NO, _______ /* Numbers (ten-key style) * ,----------------------------------+ +----------------------------------. - * | | | | | | | + | 7 | 8 | 9 | / | + * | | | | | | | + | 7 | 8 | 9 | | * |------+------+------+------+------| |------+------+------+------+------| - * |Shift |XXXXXX| | | | | - | 4 | 5 | 6 | 0 | + * | Ctrl | Alt | Shft | GUI | | | - | 4 | 5 | 6 | * | * |------+------+------+------+------| |------+------+------+------+------| - * | | | | | | | = | 1 | 2 | 3 | * | + * | | | | | | | = | 1 | 2 | 3 | / | * `------+------+------+------+------| |------+------+------+------+------' - * | | | | | | + * | |XXXXXX| | 0 | . | * `-------------+ +-------------' */ #define _________________NUM_L1____________________ _______, _______, _______, _______, _______ -#define _________________NUM_L2____________________ KC_LSFT, KC_NO, _______, _______, _______ +#define _________________NUM_L2____________________ KC_LCTL, KC_LALT, KC_LSFT, KC_LGUI, _______ #define _________________NUM_L3____________________ _______, _______, _______, _______, _______ -#define ____NUM_LT______ _______, _______ +#define ____NUM_LT______ _______, KC_NO -#define _________________NUM_R1____________________ KC_PPLS, KC_7, KC_8, KC_9, KC_PSLS -#define _________________NUM_R2____________________ KC_PMNS, KC_4, KC_5, KC_6, KC_0 -#define _________________NUM_R3____________________ KC_PEQL, KC_1, KC_2, KC_3, KC_PAST -#define ____NUM_RT______ _______, _______ +#define _________________NUM_R1____________________ KC_PPLS, KC_7, KC_8, KC_9, _______ +#define _________________NUM_R2____________________ KC_PMNS, KC_4, KC_5, KC_6, KC_ASTR +#define _________________NUM_R3____________________ KC_PEQL, KC_1, KC_2, KC_3, KC_SLSH +#define ____NUM_RT______ KC_0, KC_DOT /* Function * ,----------------------------------+ +----------------------------------. @@ -185,42 +153,21 @@ /* Adjust * ,----------------------------------+ +----------------------------------. - * | | | : | Esc | | | | | | | Del | + * | Tab | | | | | | | | | | Del | * |------+------+------+------+------| |------+------+------+------+------| - * | | % | / |Enter | | | | | | | | + * | | | | | | | | | | | | * |------+------+------+------+------| |------+------+------+------+------| - * | | | | ! | | | | | | |Reset | + * | | | | | | | | | | |Reset | * `------+------+------+------+------| |------+------+------+------+------' - * | | | |XXXXXX| | + * | Tab | Del | | |XXXXXX| * `-------------+ +-------------' */ -#define _________________ADJ_L1____________________ _______, _______, KC_COLN, KC_ESC, _______ -#define _________________ADJ_L2____________________ _______, KC_PERC, KC_SLSH, KC_ENT, _______ -#define _________________ADJ_L3____________________ _______, _______, _______, KC_EXLM, _______ -#define ____ADJ_LT______ _______, KC_TAB +#define _________________ADJ_L1____________________ KC_TAB, _______, _______, _______, _______ +#define _________________ADJ_L2____________________ _______, _______, _______, _______, _______ +#define _________________ADJ_L3____________________ _______, _______, _______, _______, _______ +#define ____ADJ_LT______ KC_TAB, KC_DEL #define _________________ADJ_R1____________________ _______, _______, _______, _______, KC_DEL #define _________________ADJ_R2____________________ _______, _______, _______, _______, _______ -#define _________________ADJ_R3____________________ _______, _______, _______, _______, RESET -#define ____ADJ_RT______ KC_NO, _______ - -/* RGB and Misc - * ,----------------------------------+ +----------------------------------. - * | | | | | | | | | | | | - * |------+------+------+------+------| |------+------+------+------+------| - * | | | | | | | | | | | | - * |------+------+------+------+------| |------+------+------+------+------| - * | | | | | | | | | | |Reset | - * `------+------+------+------+------| |------+------+------+------+------' - * | | | | | | - * `-------------+ +-------------' - */ -#define _________________RGB_L1____________________ _______, _______, _______, _______, RGB_TOG -#define _________________RGB_L2____________________ _______, RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD -#define _________________RGB_L3____________________ _______, RGB_VAD, RGB_SAD, RGB_HUD, RGB_RMOD -#define ____RGB_LT______ _______, _______ - -#define _________________RGB_R1____________________ _______, _______, _______, _______, _______ -#define _________________RGB_R2____________________ _______, RGB_M_P, RGB_M_B, RGB_M_SW, RGB_M_K -#define _________________RGB_R3____________________ _______, _______, _______, _______, RESET -#define ____RGB_RT______ _______, KC_NO +#define _________________ADJ_R3____________________ _______, _______, _______, _______, QK_BOOT +#define ____ADJ_RT______ _______, KC_NO From fd8ab553e0a0690142a0fcb5fb6077f3b090e4d4 Mon Sep 17 00:00:00 2001 From: pauperboards Date: Tue, 14 Feb 2023 19:59:05 -0500 Subject: [PATCH 04/13] Move brick to pauperboards and update the basic firmware. --- keyboards/brick/readme.md | 24 ----- keyboards/{ => pauperboards}/brick/brick.c | 4 +- keyboards/{ => pauperboards}/brick/brick.h | 2 +- keyboards/{ => pauperboards}/brick/config.h | 4 +- keyboards/{ => pauperboards}/brick/info.json | 4 +- .../brick/keymaps/default/keymap.c | 93 ++++++++++++------- .../brick/keymaps/via/keymap.c | 0 .../brick/keymaps/via/rules.mk | 0 keyboards/pauperboards/brick/readme.md | 28 ++++++ keyboards/{ => pauperboards}/brick/rules.mk | 0 10 files changed, 96 insertions(+), 63 deletions(-) delete mode 100644 keyboards/brick/readme.md rename keyboards/{ => pauperboards}/brick/brick.c (92%) rename keyboards/{ => pauperboards}/brick/brick.h (97%) rename keyboards/{ => pauperboards}/brick/config.h (93%) rename keyboards/{ => pauperboards}/brick/info.json (98%) rename keyboards/{ => pauperboards}/brick/keymaps/default/keymap.c (61%) rename keyboards/{ => pauperboards}/brick/keymaps/via/keymap.c (100%) rename keyboards/{ => pauperboards}/brick/keymaps/via/rules.mk (100%) create mode 100644 keyboards/pauperboards/brick/readme.md rename keyboards/{ => pauperboards}/brick/rules.mk (100%) diff --git a/keyboards/brick/readme.md b/keyboards/brick/readme.md deleted file mode 100644 index c7894743d01d..000000000000 --- a/keyboards/brick/readme.md +++ /dev/null @@ -1,24 +0,0 @@ -# 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/brick.c b/keyboards/pauperboards/brick/brick.c similarity index 92% rename from keyboards/brick/brick.c rename to keyboards/pauperboards/brick/brick.c index 8c97cf97ff79..106fd9b3af0a 100644 --- a/keyboards/brick/brick.c +++ b/keyboards/pauperboards/brick/brick.c @@ -1,4 +1,4 @@ -/* Copyright 2023 Juno Nguyen +/* Copyright 2023 Jason Chestnut @pauperboards * * 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 @@ -28,4 +28,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise) { } return true; } -#endif \ No newline at end of file +#endif diff --git a/keyboards/brick/brick.h b/keyboards/pauperboards/brick/brick.h similarity index 97% rename from keyboards/brick/brick.h rename to keyboards/pauperboards/brick/brick.h index 0e9a7e7c6156..07c32c28dd2e 100644 --- a/keyboards/brick/brick.h +++ b/keyboards/pauperboards/brick/brick.h @@ -1,4 +1,4 @@ -/* Copyright 2023 Juno Nguyen +/* Copyright 2023 Jason Chestnut @pauperboards * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/keyboards/brick/config.h b/keyboards/pauperboards/brick/config.h similarity index 93% rename from keyboards/brick/config.h rename to keyboards/pauperboards/brick/config.h index adb3238c6a7f..47dd0ecc0f89 100644 --- a/keyboards/brick/config.h +++ b/keyboards/pauperboards/brick/config.h @@ -1,4 +1,4 @@ -/* Copyright 2023 Juno Nguyen +/* Copyright 2023 Jason Chestnut @pauperboards * * 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 @@ -41,4 +41,4 @@ #endif #define ENCODERS_PAD_A { F4 } -#define ENCODERS_PAD_B { F5 } \ No newline at end of file +#define ENCODERS_PAD_B { F5 } diff --git a/keyboards/brick/info.json b/keyboards/pauperboards/brick/info.json similarity index 98% rename from keyboards/brick/info.json rename to keyboards/pauperboards/brick/info.json index d20615dbbd06..b33695eb0285 100644 --- a/keyboards/brick/info.json +++ b/keyboards/pauperboards/brick/info.json @@ -1,8 +1,8 @@ { "keyboard_name": "Brick", - "manufacturer": "Pauper", + "manufacturer": "pauperboards", "url": "https://p3dstore.com/products/cervello-pcb-only-group-buy", - "maintainer": "JunoNgx", + "maintainer": "pauper", "usb": { "vid": "0xFEFE", "pid": "0x0001", diff --git a/keyboards/brick/keymaps/default/keymap.c b/keyboards/pauperboards/brick/keymaps/default/keymap.c similarity index 61% rename from keyboards/brick/keymaps/default/keymap.c rename to keyboards/pauperboards/brick/keymaps/default/keymap.c index f488834ea423..9a984f97d068 100644 --- a/keyboards/brick/keymaps/default/keymap.c +++ b/keyboards/pauperboards/brick/keymaps/default/keymap.c @@ -1,19 +1,3 @@ -/* 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] = { @@ -24,16 +8,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+-------------+------+------+------+------+------| * | 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 | - * `-----------------------------------------------------------------------------------' + * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | + * `------+------+------+------+------+------+------+------+------+------+------+------' + * | Caps | Ctrl | Alt | Space L1 | Space L2 | Alt | GUI | Ctrl | + * `---------------------------------------------------------------------' */ - [0] = LAYOUT_ortho_4x12 ( + [0] = LAYOUT_ortho_2x2u ( 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 + KC_CAPS, KC_LCTL, KC_LALT, LT(1,KC_SPC), LT(2,KC_SPC), KC_LALT, KC_LGUI, KC_LCTL ), /* Layer 1 @@ -42,16 +26,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+-------------+------+------+------+------+------| * | | Vol- | Vol+ | Mute | | | | F11 | F12 | | | | * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | | | | | + * | | | | | | | | | | | | RST | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Reset| | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' + * | | | | | | | | | + * `---------------------------------------------------------------------' */ - [1] = LAYOUT_ortho_4x12 ( + [1] = LAYOUT_ortho_2x2u ( 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, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, + _______, _______, _______, _______, _______, _______, _______, _______ ), /* Layer 2 (r_ Indicates RGB Controls) @@ -62,13 +46,58 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------|------+------+------+------+------+------| * | |BL_TOG|BL_STEP| | | | | | | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | - * `-----------------------------------------------------------------------------------' + * | | | | | | | | | + * `---------------------------------------------------------------------' */ - [2] = LAYOUT_ortho_4x12 ( + [2] = LAYOUT_ortho_2x2u ( _______, 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 { + + } + +} diff --git a/keyboards/brick/keymaps/via/keymap.c b/keyboards/pauperboards/brick/keymaps/via/keymap.c similarity index 100% rename from keyboards/brick/keymaps/via/keymap.c rename to keyboards/pauperboards/brick/keymaps/via/keymap.c diff --git a/keyboards/brick/keymaps/via/rules.mk b/keyboards/pauperboards/brick/keymaps/via/rules.mk similarity index 100% rename from keyboards/brick/keymaps/via/rules.mk rename to keyboards/pauperboards/brick/keymaps/via/rules.mk diff --git a/keyboards/pauperboards/brick/readme.md b/keyboards/pauperboards/brick/readme.md new file mode 100644 index 000000000000..fe6d3c0f00f3 --- /dev/null +++ b/keyboards/pauperboards/brick/readme.md @@ -0,0 +1,28 @@ +# Brick + +![Brick, top view](https://imgur.com/BLJ6Tum) +![Brick, layout options](https://imgur.com/HjsWzY7) + +Brick is a 12u, 4 row ortholinear keyboard designed as a drop in replacement for PCBs like the Niu Mini. Brick features a USB-C port, an ATMega32u4, RGB underglow, three possible rotary encoder locations, and multiple ortho layout options. + +* Keyboard Maintainer: [Jason Chestnut](https://github.com/shurikai) +* Hardware Supported: + * Brick v0.1 - prototype first run with red solder mask and needing a bodge wire across the top row encoder location. + * Brick v0.2 - same layout and components as v0.1, but with the bodge fixed. This version was run as part of Cervello group buy by [P3DStore](http://p3dstore.com). +* Hardware Availability: Some remaining pcbs might be available for purchase from [P3D](http://p3dstore.com/collections/pcbs/products/cervello-pcb-only-group-buy). + +Make example for this keyboard (after setting up your build environment): + + make pauper/brick:default + +Flashing example for this keyboard: + + make pauper/brick: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 one of 2 ways: + +* **Physical Reset Button**: Briefly press the button on the underside of the pcb, near the MCU. +* **Keycode**: Press the key mapped to `QK_BOOT` in your keymap, if available. diff --git a/keyboards/brick/rules.mk b/keyboards/pauperboards/brick/rules.mk similarity index 100% rename from keyboards/brick/rules.mk rename to keyboards/pauperboards/brick/rules.mk From c605f11fc1706f1352a2ada7d40987f74ecabbe6 Mon Sep 17 00:00:00 2001 From: pauper <125139481+pauperboards@users.noreply.github.com> Date: Tue, 14 Feb 2023 20:50:47 -0500 Subject: [PATCH 05/13] Correct Readme image links. --- keyboards/pauperboards/brick/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/pauperboards/brick/readme.md b/keyboards/pauperboards/brick/readme.md index fe6d3c0f00f3..3f9f082c35b4 100644 --- a/keyboards/pauperboards/brick/readme.md +++ b/keyboards/pauperboards/brick/readme.md @@ -1,7 +1,7 @@ # Brick -![Brick, top view](https://imgur.com/BLJ6Tum) -![Brick, layout options](https://imgur.com/HjsWzY7) +![Brick, top view](https://i.imgur.com/BLJ6Tum.jpg) +![Brick, layout options](https://i.imgur.com/JhsWzY7.png) Brick is a 12u, 4 row ortholinear keyboard designed as a drop in replacement for PCBs like the Niu Mini. Brick features a USB-C port, an ATMega32u4, RGB underglow, three possible rotary encoder locations, and multiple ortho layout options. From ff9e236689317322c8f5cebec2fdaae5498f619b Mon Sep 17 00:00:00 2001 From: pauper <125139481+pauperboards@users.noreply.github.com> Date: Tue, 14 Feb 2023 20:51:54 -0500 Subject: [PATCH 06/13] Correct the maintainer info in Readme. --- keyboards/pauperboards/brick/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/pauperboards/brick/readme.md b/keyboards/pauperboards/brick/readme.md index 3f9f082c35b4..10f081033690 100644 --- a/keyboards/pauperboards/brick/readme.md +++ b/keyboards/pauperboards/brick/readme.md @@ -5,7 +5,7 @@ Brick is a 12u, 4 row ortholinear keyboard designed as a drop in replacement for PCBs like the Niu Mini. Brick features a USB-C port, an ATMega32u4, RGB underglow, three possible rotary encoder locations, and multiple ortho layout options. -* Keyboard Maintainer: [Jason Chestnut](https://github.com/shurikai) +* Keyboard Maintainer: [pauper](https://github.com/pauperboards) * Hardware Supported: * Brick v0.1 - prototype first run with red solder mask and needing a bodge wire across the top row encoder location. * Brick v0.2 - same layout and components as v0.1, but with the bodge fixed. This version was run as part of Cervello group buy by [P3DStore](http://p3dstore.com). From ca2fb5ce10f1aacb906171f210781af8efc1bd2d Mon Sep 17 00:00:00 2001 From: pauperboards Date: Wed, 15 Feb 2023 11:24:52 -0500 Subject: [PATCH 07/13] Fix PR comments. --- data/mappings/keyboard_aliases.hjson | 3 + keyboards/pauperboards/brick/brick.c | 2 +- keyboards/pauperboards/brick/config.h | 26 -- keyboards/pauperboards/brick/info.json | 234 +++++++++++++++++- .../brick/keymaps/default/keymap.c | 69 ++---- keyboards/pauperboards/brick/readme.md | 8 +- keyboards/pauperboards/brick/rules.mk | 14 -- users/pauper/config.h | 34 --- users/pauper/pauper.c | 16 -- users/pauper/pauper.h | 82 ------ users/pauper/readme.md | 24 -- users/pauper/rules.mk | 23 -- users/pauper/wrappers.h | 173 ------------- 13 files changed, 258 insertions(+), 450 deletions(-) delete mode 100644 users/pauper/config.h delete mode 100644 users/pauper/pauper.c delete mode 100644 users/pauper/pauper.h delete mode 100644 users/pauper/readme.md delete mode 100644 users/pauper/rules.mk delete mode 100644 users/pauper/wrappers.h diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson index 78a85ef6e7c2..36be9c42cbb1 100644 --- a/data/mappings/keyboard_aliases.hjson +++ b/data/mappings/keyboard_aliases.hjson @@ -92,6 +92,9 @@ "bpiphany/pegasushoof": { "target": "bpiphany/pegasushoof/2013" }, + "brick": { + "target": "pauperboards/brick" + }, "chavdai40": { "target": "chavdai40/rev1" }, diff --git a/keyboards/pauperboards/brick/brick.c b/keyboards/pauperboards/brick/brick.c index 106fd9b3af0a..13df995e544f 100644 --- a/keyboards/pauperboards/brick/brick.c +++ b/keyboards/pauperboards/brick/brick.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "brick.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/pauperboards/brick/config.h b/keyboards/pauperboards/brick/config.h index 47dd0ecc0f89..c22cabddbef0 100644 --- a/keyboards/pauperboards/brick/config.h +++ b/keyboards/pauperboards/brick/config.h @@ -16,29 +16,3 @@ #pragma once -#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 RGB_DI_PIN D2 -#ifdef RGB_DI_PIN -# define RGBLED_NUM 8 -# define RGBLIGHT_HUE_STEP 8 -# define RGBLIGHT_SAT_STEP 8 -# define RGBLIGHT_VAL_STEP 8 -# 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 } -#define ENCODERS_PAD_B { F5 } diff --git a/keyboards/pauperboards/brick/info.json b/keyboards/pauperboards/brick/info.json index b33695eb0285..d36e2d38f672 100644 --- a/keyboards/pauperboards/brick/info.json +++ b/keyboards/pauperboards/brick/info.json @@ -6,20 +6,246 @@ "usb": { "vid": "0xFEFE", "pid": "0x0001", - "device_version": "1.0.0" + "device_version": "0.2.0" + }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "rows": [ "D3", "D5", "F0", "F1" ], + "cols": [ "B1", "B3", "F7", "F6", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7" ] }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "audio": false, + "backlight": false, + "bluetooth": false, + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "midi": false, + "mousekey": true, + "nkro": true, + "rgblight": true, + "unicode": false, + "lto": true + }, + "encoder": { + "rotary": [ + { "pin_a": "F4", "pin_b": "F5", "resolution": 1 } + ] + }, + "rgblight": { + "pin": "D2", + "led_count": 8, + "hue_steps": 8, + "brightness_steps": 8, + "saturation_steps": 8, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": false, + "static_gradient": true, + "twinkle": true + } + }, "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}] + "layout": [ + { "matrix": [0,0], "label": "Tab", "x": 0, "y": 0 }, + { "matrix": [0,1], "label": "Q", "x": 1, "y": 0 }, + { "matrix": [0,2], "label": "W", "x": 2, "y": 0 }, + { "matrix": [0,3], "label": "E", "x": 3, "y": 0 }, + { "matrix": [0,4], "label": "R", "x": 4, "y": 0 }, + { "matrix": [0,5], "label": "T", "x": 5, "y": 0 }, + { "matrix": [0,6], "label": "Y", "x": 6, "y": 0 }, + { "matrix": [0,7], "label": "U", "x": 7, "y": 0 }, + { "matrix": [0,8], "label": "I", "x": 8, "y": 0 }, + { "matrix": [0,9], "label": "O", "x": 9, "y": 0 }, + { "matrix": [0,10], "label": "P", "x": 10, "y": 0 }, + { "matrix": [0,11], "label": "BS", "x": 11, "y": 0 }, + { "matrix": [1,0], "label": "Esc", "x": 0, "y": 1 }, + { "matrix": [1,1], "label": "A", "x": 1, "y": 1 }, + { "matrix": [1,2], "label": "S", "x": 2, "y": 1 }, + { "matrix": [1,3], "label": "D", "x": 3, "y": 1 }, + { "matrix": [1,4], "label": "F", "x": 4, "y": 1 }, + { "matrix": [1,5], "label": "G", "x": 5, "y": 1 }, + { "matrix": [1,6], "label": "H", "x": 6, "y": 1 }, + { "matrix": [1,7], "label": "J", "x": 7, "y": 1 }, + { "matrix": [1,8], "label": "K", "x": 8, "y": 1 }, + { "matrix": [1,9], "label": "L", "x": 9, "y": 1 }, + { "matrix": [1,10], "label": ";", "x": 10, "y": 1 }, + { "matrix": [1,11], "label": "'", "x": 11, "y": 1 }, + { "matrix": [2,0], "label": "Shift", "x": 0, "y": 2 }, + { "matrix": [2,1], "label": "Z", "x": 1, "y": 2 }, + { "matrix": [2,2], "label": "X", "x": 2, "y": 2 }, + { "matrix": [2,3], "label": "C", "x": 3, "y": 2 }, + { "matrix": [2,4], "label": "V", "x": 4, "y": 2 }, + { "matrix": [2,5], "label": "B", "x": 5, "y": 2 }, + { "matrix": [2,6], "label": "N", "x": 6, "y": 2 }, + { "matrix": [2,7], "label": "M", "x": 7, "y": 2 }, + { "matrix": [2,8], "label": ",", "x": 8, "y": 2 }, + { "matrix": [2,9], "label": ".", "x": 9, "y": 2 }, + { "matrix": [2,10], "label": "/", "x": 10, "y": 2 }, + { "matrix": [2,11], "label": "Return", "x": 11, "y": 2 }, + { "matrix": [3,1], "label": "Ctrl", "x": 1, "y": 3 }, + { "matrix": [3,2], "label": "Alt", "x": 2, "y": 3 }, + { "matrix": [3,3], "label": "Super", "x": 3, "y": 3 }, + { "matrix": [3,4], "label": "Space", "x": 4, "y": 3, "w": 2 }, + { "matrix": [3,6], "label": "Space", "x": 6, "y": 3, "w": 2 }, + { "matrix": [3,8], "label": "←", "x": 8, "y": 3 }, + { "matrix": [3,9], "label": "↓", "x": 9, "y": 3 }, + { "matrix": [3,10], "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": [ + { "matrix": [0,0], "label": "Tab", "x": 0, "y": 0 }, + { "matrix": [0,1], "label": "Q", "x": 1, "y": 0 }, + { "matrix": [0,2], "label": "W", "x": 2, "y": 0 }, + { "matrix": [0,3], "label": "E", "x": 3, "y": 0 }, + { "matrix": [0,4], "label": "R", "x": 4, "y": 0 }, + { "matrix": [0,5], "label": "T", "x": 5, "y": 0 }, + { "matrix": [0,6], "label": "Y", "x": 6, "y": 0 }, + { "matrix": [0,7], "label": "U", "x": 7, "y": 0 }, + { "matrix": [0,8], "label": "I", "x": 8, "y": 0 }, + { "matrix": [0,9], "label": "O", "x": 9, "y": 0 }, + { "matrix": [0,10], "label": "P", "x": 10, "y": 0 }, + { "matrix": [0,11], "label": "BS", "x": 11, "y": 0 }, + { "matrix": [1,0], "label": "Esc", "x": 0, "y": 1 }, + { "matrix": [1,1], "label": "A", "x": 1, "y": 1 }, + { "matrix": [1,2], "label": "S", "x": 2, "y": 1 }, + { "matrix": [1,3], "label": "D", "x": 3, "y": 1 }, + { "matrix": [1,4], "label": "F", "x": 4, "y": 1 }, + { "matrix": [1,5], "label": "G", "x": 5, "y": 1 }, + { "matrix": [1,6], "label": "H", "x": 6, "y": 1 }, + { "matrix": [1,7], "label": "J", "x": 7, "y": 1 }, + { "matrix": [1,8], "label": "K", "x": 8, "y": 1 }, + { "matrix": [1,9], "label": "L", "x": 9, "y": 1 }, + { "matrix": [1,10], "label": ";", "x": 10, "y": 1 }, + { "matrix": [1,11], "label": "'", "x": 11, "y": 1 }, + { "matrix": [2,0], "label": "Shift", "x": 0, "y": 2 }, + { "matrix": [2,1], "label": "Z", "x": 1, "y": 2 }, + { "matrix": [2,2], "label": "X", "x": 2, "y": 2 }, + { "matrix": [2,3], "label": "C", "x": 3, "y": 2 }, + { "matrix": [2,4], "label": "V", "x": 4, "y": 2 }, + { "matrix": [2,5], "label": "B", "x": 5, "y": 2 }, + { "matrix": [2,6], "label": "N", "x": 6, "y": 2 }, + { "matrix": [2,7], "label": "M", "x": 7, "y": 2 }, + { "matrix": [2,8], "label": ",", "x": 8, "y": 2 }, + { "matrix": [2,9], "label": ".", "x": 9, "y": 2 }, + { "matrix": [2,10], "label": "/", "x": 10, "y": 2 }, + { "matrix": [2,11], "label": "Return", "x": 11, "y": 2 }, + { "matrix": [3,1], "label": "Ctrl", "x": 1, "y": 3 }, + { "matrix": [3,2], "label": "Alt", "x": 2, "y": 3 }, + { "matrix": [3,3], "label": "Super", "x": 3, "y": 3 }, + { "matrix": [3,4], "label": "⇓", "x": 4, "y": 3 }, + { "matrix": [3,5], "label": "Space", "x": 5, "y": 3, "w": 2 }, + { "matrix": [3,7], "label": "⇑", "x": 7, "y": 3 }, + { "matrix": [3,8], "label": "←", "x": 8, "y": 3 }, + { "matrix": [3,9], "label": "↓", "x": 9, "y": 3 }, + { "matrix": [3,10], "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}, {"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}] + "layout": [ + { "matrix": [0,0], "label": "Tab", "x": 0, "y": 0 }, + { "matrix": [0,1], "label": "Q", "x": 1, "y": 0 }, + { "matrix": [0,2], "label": "W", "x": 2, "y": 0 }, + { "matrix": [0,3], "label": "E", "x": 3, "y": 0 }, + { "matrix": [0,4], "label": "R", "x": 4, "y": 0 }, + { "matrix": [0,5], "label": "T", "x": 5, "y": 0 }, + { "matrix": [0,6], "label": "Y", "x": 6, "y": 0 }, + { "matrix": [0,7], "label": "U", "x": 7, "y": 0 }, + { "matrix": [0,8], "label": "I", "x": 8, "y": 0 }, + { "matrix": [0,9], "label": "O", "x": 9, "y": 0 }, + { "matrix": [0,10], "label": "P", "x": 10, "y": 0 }, + { "matrix": [0,11], "label": "BS", "x": 11, "y": 0 }, + { "matrix": [1,0], "label": "Esc", "x": 0, "y": 1 }, + { "matrix": [1,1], "label": "A", "x": 1, "y": 1 }, + { "matrix": [1,2], "label": "S", "x": 2, "y": 1 }, + { "matrix": [1,3], "label": "D", "x": 3, "y": 1 }, + { "matrix": [1,4], "label": "F", "x": 4, "y": 1 }, + { "matrix": [1,5], "label": "G", "x": 5, "y": 1 }, + { "matrix": [1,6], "label": "H", "x": 6, "y": 1 }, + { "matrix": [1,7], "label": "J", "x": 7, "y": 1 }, + { "matrix": [1,8], "label": "K", "x": 8, "y": 1 }, + { "matrix": [1,9], "label": "L", "x": 9, "y": 1 }, + { "matrix": [1,10], "label": ";", "x": 10, "y": 1 }, + { "matrix": [1,11], "label": "'", "x": 11, "y": 1 }, + { "matrix": [2,0], "label": "Shift", "x": 0, "y": 2 }, + { "matrix": [2,1], "label": "Z", "x": 1, "y": 2 }, + { "matrix": [2,2], "label": "X", "x": 2, "y": 2 }, + { "matrix": [2,3], "label": "C", "x": 3, "y": 2 }, + { "matrix": [2,4], "label": "V", "x": 4, "y": 2 }, + { "matrix": [2,5], "label": "B", "x": 5, "y": 2 }, + { "matrix": [2,6], "label": "N", "x": 6, "y": 2 }, + { "matrix": [2,7], "label": "M", "x": 7, "y": 2 }, + { "matrix": [2,8], "label": ",", "x": 8, "y": 2 }, + { "matrix": [2,9], "label": ".", "x": 9, "y": 2 }, + { "matrix": [2,10], "label": "/", "x": 10, "y": 2 }, + { "matrix": [2,11], "label": "Return", "x": 11, "y": 2 }, + { "matrix": [3,1], "label": "Ctrl", "x": 1, "y": 3 }, + { "matrix": [3,2], "label": "Alt", "x": 2, "y": 3 }, + { "matrix": [3,3], "label": "Super", "x": 3, "y": 3 }, + { "matrix": [3,4], "label": "&dArr", "x": 4, "y": 3 }, + { "matrix": [3,5], "label": "Space", "x": 5, "y": 3 }, + { "matrix": [3,6], "label": "Space", "x": 6, "y": 3 }, + { "matrix": [3,7], "label": "⇑", "x": 7, "y": 3 }, + { "matrix": [3,8], "label": "Super", "x": 8, "y": 3 }, + { "matrix": [3,9], "label": "Alt", "x": 9, "y": 3 }, + { "matrix": [3,10], "label": "Ctrl", "x": 10, "y": 3 } + ] + }, + "LAYOUT_ortho_bigbar": { + "layout": [ + { "matrix": [0,0], "label": "Tab", "x": 0, "y": 0 }, + { "matrix": [0,1], "label": "Q", "x": 1, "y": 0 }, + { "matrix": [0,2], "label": "W", "x": 2, "y": 0 }, + { "matrix": [0,3], "label": "E", "x": 3, "y": 0 }, + { "matrix": [0,4], "label": "R", "x": 4, "y": 0 }, + { "matrix": [0,5], "label": "T", "x": 5, "y": 0 }, + { "matrix": [0,6], "label": "Y", "x": 6, "y": 0 }, + { "matrix": [0,7], "label": "U", "x": 7, "y": 0 }, + { "matrix": [0,8], "label": "I", "x": 8, "y": 0 }, + { "matrix": [0,9], "label": "O", "x": 9, "y": 0 }, + { "matrix": [0,10], "label": "P", "x": 10, "y": 0 }, + { "matrix": [0,11], "label": "BS", "x": 11, "y": 0 }, + { "matrix": [1,0], "label": "Esc", "x": 0, "y": 1 }, + { "matrix": [1,1], "label": "A", "x": 1, "y": 1 }, + { "matrix": [1,2], "label": "S", "x": 2, "y": 1 }, + { "matrix": [1,3], "label": "D", "x": 3, "y": 1 }, + { "matrix": [1,4], "label": "F", "x": 4, "y": 1 }, + { "matrix": [1,5], "label": "G", "x": 5, "y": 1 }, + { "matrix": [1,6], "label": "H", "x": 6, "y": 1 }, + { "matrix": [1,7], "label": "J", "x": 7, "y": 1 }, + { "matrix": [1,8], "label": "K", "x": 8, "y": 1 }, + { "matrix": [1,9], "label": "L", "x": 9, "y": 1 }, + { "matrix": [1,10], "label": ";", "x": 10, "y": 1 }, + { "matrix": [1,11], "label": "'", "x": 11, "y": 1 }, + { "matrix": [2,0], "label": "Shift", "x": 0, "y": 2 }, + { "matrix": [2,1], "label": "Z", "x": 1, "y": 2 }, + { "matrix": [2,2], "label": "X", "x": 2, "y": 2 }, + { "matrix": [2,3], "label": "C", "x": 3, "y": 2 }, + { "matrix": [2,4], "label": "V", "x": 4, "y": 2 }, + { "matrix": [2,5], "label": "B", "x": 5, "y": 2 }, + { "matrix": [2,6], "label": "N", "x": 6, "y": 2 }, + { "matrix": [2,7], "label": "M", "x": 7, "y": 2 }, + { "matrix": [2,8], "label": ",", "x": 8, "y": 2 }, + { "matrix": [2,9], "label": ".", "x": 9, "y": 2 }, + { "matrix": [2,10], "label": "/", "x": 10, "y": 2 }, + { "matrix": [2,11], "label": "Return", "x": 11, "y": 2 }, + { "matrix": [3,1], "label": "Ctrl", "x": 1, "y": 3, "w": 1.5 }, + { "matrix": [3,5], "label": "Space", "x": 2.5, "y": 3, "w": 7 }, + { "matrix": [3,10], "label": "Alt", "x": 9.5, "y": 3, "w": 1.5 } + ] } } } diff --git a/keyboards/pauperboards/brick/keymaps/default/keymap.c b/keyboards/pauperboards/brick/keymaps/default/keymap.c index 9a984f97d068..a008d2d8c2b2 100644 --- a/keyboards/pauperboards/brick/keymaps/default/keymap.c +++ b/keyboards/pauperboards/brick/keymaps/default/keymap.c @@ -1,3 +1,19 @@ +/* Copyright 2023 Jason Chestnut @pauperboards + * + * 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] = { @@ -26,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+-------------+------+------+------+------+------| * | | Vol- | Vol+ | Mute | | | | F11 | F12 | | | | * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | | | | RST | + * | | | | | | | | | | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | | * `---------------------------------------------------------------------' @@ -34,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_ortho_2x2u ( 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, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), @@ -44,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+-------------+------+------+------+------+------| * | |r_TOG |r_Mode|r_Hue+|r_Hue-| | | - | = | [ | ] | \ | * |------+------+------+------+------+------|------+------+------+------+------+------| - * | |BL_TOG|BL_STEP| | | | | | | | | | + * | |BL_TOG|BL_STEP| | | | | | | | | BOOT | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | | * `---------------------------------------------------------------------' @@ -52,52 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_ortho_2x2u ( _______, 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, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______ ) }; - - -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 { - - } - -} diff --git a/keyboards/pauperboards/brick/readme.md b/keyboards/pauperboards/brick/readme.md index 10f081033690..1c627a21d0cd 100644 --- a/keyboards/pauperboards/brick/readme.md +++ b/keyboards/pauperboards/brick/readme.md @@ -1,7 +1,7 @@ # Brick -![Brick, top view](https://i.imgur.com/BLJ6Tum.jpg) -![Brick, layout options](https://i.imgur.com/JhsWzY7.png) +![Brick, top view](https://i.imgur.com/BLJ6Tumh.jpg) +![Brick, layout options](https://i.imgur.com/JhsWzY7h.png) Brick is a 12u, 4 row ortholinear keyboard designed as a drop in replacement for PCBs like the Niu Mini. Brick features a USB-C port, an ATMega32u4, RGB underglow, three possible rotary encoder locations, and multiple ortho layout options. @@ -13,11 +13,11 @@ Brick is a 12u, 4 row ortholinear keyboard designed as a drop in replacement for Make example for this keyboard (after setting up your build environment): - make pauper/brick:default + make pauperboards/brick:default Flashing example for this keyboard: - make pauper/brick:default:flash + make pauperboards/brick: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). diff --git a/keyboards/pauperboards/brick/rules.mk b/keyboards/pauperboards/brick/rules.mk index e0c821feb2bc..e69de29bb2d1 100644 --- a/keyboards/pauperboards/brick/rules.mk +++ b/keyboards/pauperboards/brick/rules.mk @@ -1,14 +0,0 @@ -# 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 -LTO_ENABLE = yes diff --git a/users/pauper/config.h b/users/pauper/config.h deleted file mode 100644 index db31482af26a..000000000000 --- a/users/pauper/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2023 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 . - */ -#pragma once - -// Tapping term settings -#define COMBO_COUNT 1 -#define TAPPING_TERM 150 -#define IGNORE_MOD_TAP_INTERRUPT - -#ifdef RGBLIGHT_ENABLE -# define RGBLIGHT_SLEEP -# define RBG_HUE_STEP 16 -# define RGB_SAT_STEP 16 -# define RGB_VAL_STEP 16 - -# define RBGLIGHT_EFFECT_BREATHING -# define RBGLIGHT_EFFECT_KNIGHT -# define RBGLIGHT_EFFECT_SNAKE -# define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#endif diff --git a/users/pauper/pauper.c b/users/pauper/pauper.c deleted file mode 100644 index cae6a2331332..000000000000 --- a/users/pauper/pauper.c +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright 2023 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 . - */ diff --git a/users/pauper/pauper.h b/users/pauper/pauper.h deleted file mode 100644 index 3d2bd2fa2359..000000000000 --- a/users/pauper/pauper.h +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright 2023 Jason Chestnut @pauperboards - * - * 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 QMK_KEYBOARD_H - -#include "wrappers.h" - -enum userspace_layers { - _BASE, - _NAV, - _SYMBOL, - _NUMBER, - _ADJUST -}; - -enum userspace_keycodes { - BASE = SAFE_RANGE, - NAV, - SYMBOL, - NUMBER, - ADJUST -}; - -/* - * Mod-taps. - */ -#define KC_CTLA MT(MOD_LCTL, KC_A) -#define KC_ALTS MT(MOD_LALT, KC_S) -#define KC_SFTD MT(MOD_LSFT, KC_D) -#define KC_GUIF MT(MOD_LGUI, KC_F) - -#define KC_GUIJ MT(MOD_LGUI, KC_J) -#define KC_SFTK MT(MOD_LSFT, KC_K) -#define KC_ALTL MT(MOD_LALT, KC_L) -#define KC_CTLCLN MT(MOD_LCTL, KC_SCLN) - -#define KC_SFTLP MT(MOD_LSFT, KC_LPRN) - -/* - * Layer-taps. - */ -#define LT_NUM LT(_NUMBER, KC_BSPC) -#define LT_NAV LT(_NAV, KC_ESC) -#define LT_SYM LT(_SYMBOL, KC_SPC) -#define LT_ADJ LT(_ADJUST, KC_ENT) - -/* - * Key shortcuts. - */ -#define DT_NXT LCTL(KC_RGHT) -#define DT_PRV LCTL(KC_LEFT) - -/* - * Common key combos used in multiple keymaps. - */ - -#ifdef COMBO_ENABLE -enum combos { - ESC_COMBO -}; - -const uint16_t PROGMEM esc_combo [] = {KC_Q, KC_W, COMBO_END}; - -combo_t key_combos[COMBO_COUNT] = { - [ESC_COMBO] = COMBO(esc_combo, KC_ESC) -}; -#endif - diff --git a/users/pauper/readme.md b/users/pauper/readme.md deleted file mode 100644 index 06e5d93f4014..000000000000 --- a/users/pauper/readme.md +++ /dev/null @@ -1,24 +0,0 @@ -Copyright 2023 Jason Chestnut @pauperboards @shurikai - -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 . - -# Overview - -My user-space sets up a common keymap for use with most of the boards I own. -Extensive reuse from @Drashna as a starting point. - -My usercode utilizes the layout wrappers contained in [wrappers.h](wrappers.h). -All of the keymaps are derivative of the Ferris 34-key keymap. - -more to follow ... diff --git a/users/pauper/rules.mk b/users/pauper/rules.mk deleted file mode 100644 index a16cba9380c9..000000000000 --- a/users/pauper/rules.mk +++ /dev/null @@ -1,23 +0,0 @@ -# * Copyright 2023 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 . - -# Build Options -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically - -MOUSEKEY_ENABLE = yes -COMBO_ENABLE = yes - -SRC += pauper.c diff --git a/users/pauper/wrappers.h b/users/pauper/wrappers.h deleted file mode 100644 index 6f34c85b616b..000000000000 --- a/users/pauper/wrappers.h +++ /dev/null @@ -1,173 +0,0 @@ -/* - * Copyright 2023 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 . - */ -#pragma once - -/* - * My standard keymap is based on a 34-key split ortho board. This includes 5 columns and 2 thumb - * keys per hand. The following macros define the base 34 key map, with any additional keys for a - * given keyboard left to be defined in that specific keymap.c file. - */ - -// Used as a blank number row for huge keyboards like the Preonic. -#define _________________BLANK_ROW_________________ _______, _______, _______, _______, _______ - -/* BASE - * ,----------------------------------+ +----------------------------------. - * | Q | W | E | R | T | | Y | U | I | O | P | - * |------+------+------+------+------| |------+------+------+------+------| - * | cA | aS | sD | gF | G | | H | gJ | sK | aL | c; | - * |------+------+------+------+------| |------+------+------+------+------| - * | Z | X | C | V | B | | N | M | , | . | / | - * `------+------+------+------+------| |------+------+------+------+------' - * | ESC | BSPC | | SPC | ENT | - * `-------------+ +-------------' - */ -#define _________________BASE_L1___________________ KC_Q, KC_W, KC_E, KC_R, KC_T -#define _________________BASE_L2___________________ KC_CTLA, KC_ALTS, KC_SFTD, KC_GUIF, KC_G -#define _________________BASE_L3___________________ KC_Z, KC_X, KC_C, KC_V, KC_B -#define ____BASE_LT_____ LT_NAV, LT_NUM - -#define _________________BASE_R1___________________ KC_Y, KC_U, KC_I, KC_O, KC_P -#define _________________BASE_R2___________________ KC_H, KC_GUIJ, KC_SFTK, KC_ALTL, KC_CTLCLN -#define _________________BASE_R3___________________ KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH -#define ____BASE_RT_____ LT_SYM, LT_ADJ - -/* QWERTY - For when I get ready to remove the BASE configuration and go with this one. - * ,----------------------------------+ +----------------------------------. - * | Q | W | E | R | T | | Y | U | I | O | P | - * |------+------+------+------+------| |------+------+------+------+------| - * | sA | S | D | F | G | | H | J | K | L | s; | - * |------+------+------+------+------| |------+------+------+------+------| - * | gZ | cX | aC | V | B | | N | M | a, | c. | g/ | - * `------+------+------+------+------| |------+------+------+------+------' - * | TAB | BSPC | | SPC | ENT | - * `-------------+ +-------------' - */ -#define _______________QWERTY_L1___________________ KC_Q, KC_W, KC_E, KC_R, KC_T -#define _______________QWERTY_L2___________________ KC_A, KC_S, KC_D, KC_F, KC_G -#define _______________QWERTY_L3___________________ KC_Z, KC_X, KC_C, KC_V, KC_B -#define __QWERTY_LT_____ KC_TAB, KC_BSPC - -#define _______________QWERTY_R1___________________ KC_Y, KC_U, KC_I, KC_O, KC_P -#define _______________QWERTY_R2___________________ KC_H, KC_J, KC_K, KC_L, KC_SCLN -#define _______________QWERTY_R3___________________ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH -#define __QWERTY_RT_____ KC_SPC, LT_ENT - -/* Navigation - * ,----------------------------------+ +----------------------------------. - * | | | | | | | | End | Home | | | - * |------+------+------+------+------- |------+------+------+------+------| - * | LCTL | LALT | LSFT | LGUI | | | Left | Down | Up |Right | | - * |------+------+------+------+------| |------+------+------+------+------| - * | | | | | | | | PgDn | PgDn | | | - * `------+------+------+------+------| |------+------+------+------+------' - * |XXXXXX| | | | | - * `-------------+ +-------------' - */ -#define _________________NAVI_L1___________________ _______, _______, _______, _______, _______ -#define _________________NAVI_L2___________________ KC_LCTL, KC_LALT, KC_LSFT, KC_LGUI, _______ -#define _________________NAVI_L3___________________ _______, _______, _______, _______, _______ -#define ____NAVI_LT_____ KC_NO, _______ - -#define _________________NAVI_R1___________________ _______, KC_END, KC_HOME, _______, _______ -#define _________________NAVI_R2___________________ KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______ -#define _________________NAVI_R3___________________ _______, KC_PGDN, KC_PGUP, _______, _______ -#define ____NAVI_RT_____ _______, _______ - -/* Symbols - * ,----------------------------------+ +----------------------------------. - * | ~ | ` | { | } | | | | & | * | | | | - * |------+------+------+------+------| |------+------+------+------+------| - * | | | ( | ) | @ | | - | $ | % | ^ | ' " | - * |------+------+------+------+------| |------+------+------+------+------| - * | | | [ | ] | | | _ | ! | @ | # | \ | - * `------+------+------+------+------| |------+------+------+------+------' - * | | | |XXXXXX| | - * `-------------+ +-------------' - */ -#define _________________SYM_L1____________________ KC_TILD, KC_GRV, KC_LCBR, KC_RCBR, _______ -#define _________________SYM_L2____________________ _______, _______, KC_LPRN, KC_RPRN, KC_AT -#define _________________SYM_L3____________________ _______, _______, KC_LBRC, KC_RBRC, _______ -#define _____SYM_LT_____ MOD_LSFT, _______ - -#define _________________SYM_R1____________________ _______, KC_AMPR, KC_ASTR, _______, KC_PIPE -#define _________________SYM_R2____________________ KC_MINS, KC_DLR, KC_PERC, KC_CIRC, KC_QUOT -#define _________________SYM_R3____________________ KC_UNDS, KC_EXLM, KC_AT, KC_HASH, KC_BSLS -#define _____SYM_RT_____ KC_NO, _______ - -/* Numbers (ten-key style) - * ,----------------------------------+ +----------------------------------. - * | | | | | | | + | 7 | 8 | 9 | | - * |------+------+------+------+------| |------+------+------+------+------| - * | Ctrl | Alt | Shft | GUI | | | - | 4 | 5 | 6 | * | - * |------+------+------+------+------| |------+------+------+------+------| - * | | | | | | | = | 1 | 2 | 3 | / | - * `------+------+------+------+------| |------+------+------+------+------' - * | |XXXXXX| | 0 | . | - * `-------------+ +-------------' - */ -#define _________________NUM_L1____________________ _______, _______, _______, _______, _______ -#define _________________NUM_L2____________________ KC_LCTL, KC_LALT, KC_LSFT, KC_LGUI, _______ -#define _________________NUM_L3____________________ _______, _______, _______, _______, _______ -#define ____NUM_LT______ _______, KC_NO - -#define _________________NUM_R1____________________ KC_PPLS, KC_7, KC_8, KC_9, _______ -#define _________________NUM_R2____________________ KC_PMNS, KC_4, KC_5, KC_6, KC_ASTR -#define _________________NUM_R3____________________ KC_PEQL, KC_1, KC_2, KC_3, KC_SLSH -#define ____NUM_RT______ KC_0, KC_DOT - -/* Function - * ,----------------------------------+ +----------------------------------. - * | F10 | F9 | F8 | F7 | | | | | | | | - * |------+------+------+------+------| |------+------+------+------+------| - * | F11 | F6 | F5 | F4 | | | | | Alt |XXXXXX| | - * |------+------+------+------+------| |------+------+------+------+------| - * | F12 | F3 | F2 | F1 | | | | | | | | - * `------+------+------+------+------| |------+------+------+------+------' - * | | | | | | - * `-------------+ +-------------' - */ -#define _________________FN_L1_____________________ KC_F10, KC_F9, KC_F8, KC_F7, _______ -#define _________________FN_L2_____________________ KC_F11, KC_F6, KC_F5, KC_F4, _______ -#define _________________FN_L3_____________________ KC_F12, KC_F3, KC_F2, KC_F1, _______ -#define ____FN_LT_______ _______, _______ - -#define _________________FN_R1_____________________ _______, _______, _______, _______, _______ -#define _________________FN_R2_____________________ _______, _______, KC_RALT, KC_NO, _______ -#define _________________FN_R3_____________________ _______, _______, _______, _______, _______ -#define ____FN_RT_______ _______, _______ - -/* Adjust - * ,----------------------------------+ +----------------------------------. - * | Tab | | | | | | | | | | Del | - * |------+------+------+------+------| |------+------+------+------+------| - * | | | | | | | | | | | | - * |------+------+------+------+------| |------+------+------+------+------| - * | | | | | | | | | | |Reset | - * `------+------+------+------+------| |------+------+------+------+------' - * | Tab | Del | | |XXXXXX| - * `-------------+ +-------------' - */ -#define _________________ADJ_L1____________________ KC_TAB, _______, _______, _______, _______ -#define _________________ADJ_L2____________________ _______, _______, _______, _______, _______ -#define _________________ADJ_L3____________________ _______, _______, _______, _______, _______ -#define ____ADJ_LT______ KC_TAB, KC_DEL - -#define _________________ADJ_R1____________________ _______, _______, _______, _______, KC_DEL -#define _________________ADJ_R2____________________ _______, _______, _______, _______, _______ -#define _________________ADJ_R3____________________ _______, _______, _______, _______, QK_BOOT -#define ____ADJ_RT______ _______, KC_NO From 37787e34ce8305f3d11973dd722d1893784675e2 Mon Sep 17 00:00:00 2001 From: pauperboards Date: Wed, 15 Feb 2023 11:34:19 -0500 Subject: [PATCH 08/13] Remove community layout, since brick doesn't actually match it. --- keyboards/pauperboards/brick/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/pauperboards/brick/info.json b/keyboards/pauperboards/brick/info.json index d36e2d38f672..f930053ca9ff 100644 --- a/keyboards/pauperboards/brick/info.json +++ b/keyboards/pauperboards/brick/info.json @@ -55,7 +55,6 @@ "twinkle": true } }, - "community_layouts": [ "ortho_4x12" ], "layouts": { "LAYOUT_ortho_2x2u": { "layout": [ From 23bdfb411318eba03b589dd75364cc393e9607bc Mon Sep 17 00:00:00 2001 From: pauperboards Date: Wed, 15 Feb 2023 11:50:44 -0500 Subject: [PATCH 09/13] Trying to fix lint error. --- keyboards/pauperboards/brick/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/pauperboards/brick/info.json b/keyboards/pauperboards/brick/info.json index f930053ca9ff..c48fea5fbeb9 100644 --- a/keyboards/pauperboards/brick/info.json +++ b/keyboards/pauperboards/brick/info.json @@ -153,7 +153,7 @@ { "matrix": [3,10], "label": "↑", "x": 10, "y": 3 } ] }, - "LAYOUT_ortho_4x12": { + "LAYOUT_ortho_4x12_hhkb": { "layout": [ { "matrix": [0,0], "label": "Tab", "x": 0, "y": 0 }, { "matrix": [0,1], "label": "Q", "x": 1, "y": 0 }, From 86fc2b457033894f30eca3fef2539d221edd8e17 Mon Sep 17 00:00:00 2001 From: pauperboards Date: Wed, 15 Feb 2023 12:03:27 -0500 Subject: [PATCH 10/13] Fix a minor keymap issue I just found during PR. --- keyboards/pauperboards/brick/brick.h | 60 -------------------------- keyboards/pauperboards/brick/info.json | 2 +- 2 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 keyboards/pauperboards/brick/brick.h diff --git a/keyboards/pauperboards/brick/brick.h b/keyboards/pauperboards/brick/brick.h deleted file mode 100644 index 07c32c28dd2e..000000000000 --- a/keyboards/pauperboards/brick/brick.h +++ /dev/null @@ -1,60 +0,0 @@ -/* Copyright 2023 Jason Chestnut @pauperboards - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" -#define 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 } \ -} - diff --git a/keyboards/pauperboards/brick/info.json b/keyboards/pauperboards/brick/info.json index c48fea5fbeb9..e799e506dab1 100644 --- a/keyboards/pauperboards/brick/info.json +++ b/keyboards/pauperboards/brick/info.json @@ -97,7 +97,7 @@ { "matrix": [3,1], "label": "Ctrl", "x": 1, "y": 3 }, { "matrix": [3,2], "label": "Alt", "x": 2, "y": 3 }, { "matrix": [3,3], "label": "Super", "x": 3, "y": 3 }, - { "matrix": [3,4], "label": "Space", "x": 4, "y": 3, "w": 2 }, + { "matrix": [3,5], "label": "Space", "x": 4, "y": 3, "w": 2 }, { "matrix": [3,6], "label": "Space", "x": 6, "y": 3, "w": 2 }, { "matrix": [3,8], "label": "←", "x": 8, "y": 3 }, { "matrix": [3,9], "label": "↓", "x": 9, "y": 3 }, From e81ee4f887593319967ea91d3720228eba01270c Mon Sep 17 00:00:00 2001 From: pauperboards Date: Wed, 15 Feb 2023 15:23:24 -0500 Subject: [PATCH 11/13] Fixing pr comments. --- keyboards/pauperboards/brick/config.h | 18 ------------------ keyboards/pauperboards/brick/info.json | 2 +- keyboards/pauperboards/brick/rules.mk | 1 + 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 keyboards/pauperboards/brick/config.h diff --git a/keyboards/pauperboards/brick/config.h b/keyboards/pauperboards/brick/config.h deleted file mode 100644 index c22cabddbef0..000000000000 --- a/keyboards/pauperboards/brick/config.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2023 Jason Chestnut @pauperboards - * - * 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 - diff --git a/keyboards/pauperboards/brick/info.json b/keyboards/pauperboards/brick/info.json index e799e506dab1..58fdc33da7ed 100644 --- a/keyboards/pauperboards/brick/info.json +++ b/keyboards/pauperboards/brick/info.json @@ -33,7 +33,7 @@ }, "encoder": { "rotary": [ - { "pin_a": "F4", "pin_b": "F5", "resolution": 1 } + { "pin_a": "F4", "pin_b": "F5", "resolution": 4 } ] }, "rgblight": { diff --git a/keyboards/pauperboards/brick/rules.mk b/keyboards/pauperboards/brick/rules.mk index e69de29bb2d1..333c4e59739a 100644 --- a/keyboards/pauperboards/brick/rules.mk +++ b/keyboards/pauperboards/brick/rules.mk @@ -0,0 +1 @@ +# This file intenionally left blank From c0c1072143d5b3563680df9507f2c98c90e8d090 Mon Sep 17 00:00:00 2001 From: pauper <125139481+pauperboards@users.noreply.github.com> Date: Wed, 15 Feb 2023 15:23:29 -0500 Subject: [PATCH 12/13] Update keyboards/pauperboards/brick/info.json Taking suggestion. Co-authored-by: Joel Challis --- keyboards/pauperboards/brick/info.json | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/keyboards/pauperboards/brick/info.json b/keyboards/pauperboards/brick/info.json index 58fdc33da7ed..a5dd2522cd65 100644 --- a/keyboards/pauperboards/brick/info.json +++ b/keyboards/pauperboards/brick/info.json @@ -16,19 +16,14 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "features": { - "audio": false, - "backlight": false, - "bluetooth": false, - "bootmagic": false, + "bootmagic": true, "command": false, "console": false, - "encoder": true, "extrakey": true, - "midi": false, "mousekey": true, "nkro": true, + "encoder": true, "rgblight": true, - "unicode": false, "lto": true }, "encoder": { From f4d5a1d83498c29989734a4d55eb40b82db12199 Mon Sep 17 00:00:00 2001 From: pauperboards Date: Wed, 15 Feb 2023 15:30:52 -0500 Subject: [PATCH 13/13] Fix broken via keymap build. --- .../pauperboards/brick/keymaps/via/keymap.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/keyboards/pauperboards/brick/keymaps/via/keymap.c b/keyboards/pauperboards/brick/keymaps/via/keymap.c index 693cc717528f..e5b8e24e7f3b 100644 --- a/keyboards/pauperboards/brick/keymaps/via/keymap.c +++ b/keyboards/pauperboards/brick/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2023 Juno Nguyen +/* Copyright 2023 Jason Chestnut @pauperboards * * 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 @@ -18,31 +18,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ortho_4x12 ( + [0] = LAYOUT_ortho_4x12_hhkb ( 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 + KC_LGUI, KC_CAPS, KC_LALT, MO(1), KC_SPC, KC_SPC, MO(2), KC_SLSH, KC_LEFT, KC_DOWN ), - [1] = LAYOUT_ortho_4x12 ( + [1] = LAYOUT_ortho_4x12_hhkb ( 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, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT_ortho_4x12 ( + [2] = LAYOUT_ortho_4x12_hhkb ( _______, 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 ( + [3] = LAYOUT_ortho_4x12_hhkb ( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) };