From 9f00f38ba77a88bfce78609247df1e08f726259a Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Fri, 29 Jun 2018 21:48:02 +0100 Subject: [PATCH 01/24] Add user pdl, keymap orthodox:pdl --- keyboards/orthodox/keymaps/pdl/config.h | 36 ++++++++ keyboards/orthodox/keymaps/pdl/keymap.c | 68 +++++++++++++++ keyboards/orthodox/keymaps/pdl/rules.mk | 2 + users/pdl/pdl.c | 87 +++++++++++++++++++ users/pdl/pdl.h | 107 ++++++++++++++++++++++++ users/pdl/rules.mk | 0 6 files changed, 300 insertions(+) create mode 100644 keyboards/orthodox/keymaps/pdl/config.h create mode 100644 keyboards/orthodox/keymaps/pdl/keymap.c create mode 100644 keyboards/orthodox/keymaps/pdl/rules.mk create mode 100644 users/pdl/pdl.c create mode 100644 users/pdl/pdl.h create mode 100644 users/pdl/rules.mk diff --git a/keyboards/orthodox/keymaps/pdl/config.h b/keyboards/orthodox/keymaps/pdl/config.h new file mode 100644 index 000000000000..2e061a28ff39 --- /dev/null +++ b/keyboards/orthodox/keymaps/pdl/config.h @@ -0,0 +1,36 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert +Copyright 2017 Art Ortenburger +Copyright 2018 Daniel Perrett + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#pragma once + +#include "config_common.h" + +/* Use I2C or Serial, not both */ + +#define USE_SERIAL +// #define USE_I2C + +/* Select hand configuration */ + +// #define MASTER_LEFT +// #define MASTER_RIGHT +#define EE_HANDS diff --git a/keyboards/orthodox/keymaps/pdl/keymap.c b/keyboards/orthodox/keymaps/pdl/keymap.c new file mode 100644 index 000000000000..1e96ef4232b9 --- /dev/null +++ b/keyboards/orthodox/keymaps/pdl/keymap.c @@ -0,0 +1,68 @@ +/* +This is the keymap for the keyboard + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert +Copyright 2017 Art Ortenburger + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H +#include "pdl.c" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT_wrapper( \ + KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, \ + MY_SESC, _________________QWERTY_L2_________________, KC_LALT, KC_LGUI, FUNCTN, MY_AMNU, _________________QWERTY_R2_________________, MY_SQUO, \ + MY_CBSL, _________________QWERTY_L3_________________, NAVIGN, KC_SPC, NUMBRS, NUMBRS, MY_SSPC, NAVIGN, _________________QWERTY_R3_________________, MY_CENT \ + ), + + [_PROXIM] = LAYOUT_wrapper( \ + MY_SESC, _________________PROXIM_L1_________________, _________________PROXIM_R1_________________, KC_BSPC, \ + KC_TAB, _________________PROXIM_L2_________________, KC_LALT, KC_LGUI, FUNCTN, MY_AMNU, _________________PROXIM_R2_________________, MY_SSCL, \ + MY_CBSL, _________________PROXIM_L3_________________, NAVIGN, KC_SPC, NUMBRS, NUMBRS, MY_SSPC, NAVIGN, _________________PROXIM_R3_________________, MY_CENT \ + ), + + [_NAVIGN] = LAYOUT_wrapper( \ + _______, _________________NAVIGN_L1_________________, _______, _______, _______, _______, _______, _______, \ + _______, _________________NAVIGN_L2_________________, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _________________NAVIGN_L3_________________, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), + + [_PUNCTN] = LAYOUT_wrapper( \ + _______, _______, _______, _______, _______, _______, _________________PUNCTN_R1_________________, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _________________PUNCTN_R2_________________, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _________________PUNCTN_R3_________________, _______ \ + ), + + [_NUMBRS] = LAYOUT_wrapper( \ + _______, _________________NUMBRS_L1_________________, _______, _______, _______, _______, _______, _______, \ + _______, _________________NUMBRS_L2_________________, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _________________NUMBRS_L3_________________, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), + + [_CODING] = LAYOUT_wrapper( \ + _______, _______, _______, _______, _______, _______, _________________CODING_R1_________________, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _________________CODING_R2_________________, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _________________CODING_R3_________________, _______ \ + ), + + [_FUNCTN] = LAYOUT_wrapper( \ + _______, _________________FUNCTN_L1_________________, _________________FUNCTN_L1_________________, MY_CAD, \ + _______, _________________FUNCTN_L2_________________, _______, _______, _______, _______, _________________FUNCTN_L2_________________, KC_PSCR, \ + _______, _________________FUNCTN_L3_________________, _______, _______, _______, _______, _______, _______, _________________FUNCTN_L3_________________, _______ \ + ) +}; + diff --git a/keyboards/orthodox/keymaps/pdl/rules.mk b/keyboards/orthodox/keymaps/pdl/rules.mk new file mode 100644 index 000000000000..ebdbd8adca40 --- /dev/null +++ b/keyboards/orthodox/keymaps/pdl/rules.mk @@ -0,0 +1,2 @@ +SRC += pdl.c + diff --git a/users/pdl/pdl.c b/users/pdl/pdl.c new file mode 100644 index 000000000000..bd91a8bde5a7 --- /dev/null +++ b/users/pdl/pdl.c @@ -0,0 +1,87 @@ +#include "pdl.h" + +// unshifted +// +// regardless of current mods, send this character in an unshifted state + +__attribute__ ((weak)) +bool unshifted (uint16_t keycode, keyrecord_t *record) { + uint8_t mods; + + if (record->event.pressed) { + mods = keyboard_report->mods & EITHER_SHIFT; + + if (mods) { + unregister_mods(mods); + register_code(keycode); + register_mods(mods); + } else { + register_code(keycode); + } + + return false; + } else { + return true; + } +} + +/* + * update_punctn_coding_layer_state + * + * Check NAVIGN and NUMBRS layers. If one is activated, also activate PUNCTN. If both are activated, also activate CODING. + */ + +__attribute__ ((weak)) +uint32_t update_punctn_coding_layer_state(uint32_t state) { + uint32_t maskEither = (1UL << _NAVIGN) | (1UL << _NUMBRS); + uint32_t maskPunctn = 1UL << _PUNCTN; + uint32_t maskCoding = 1UL << _CODING; + + return ( + (state & maskEither) + ? (state & maskEither) == maskEither + ? (state & ~maskPunctn) | maskCoding // both => coding + : (state | maskPunctn) & ~maskCoding // either => punctn + : (state & ~maskCoding) & ~maskPunctn // neither => neither + ); +} + +__attribute__ ((weak)) +uint32_t layer_state_set_user(uint32_t state) { + return update_punctn_coding_layer_state(state); +} + +__attribute__ ((weak)) +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE_MAX: + if (record->event.pressed) { + // ensure that the toggled layer is switched off by a single tap + layer_off(keycode & 0xFF); + } + break; + case QWERTY: + if (record->event.pressed) { + set_single_persistent_default_layer(_QWERTY); + } + return false; + break; + case PROXIM: + if (record->event.pressed) { + set_single_persistent_default_layer(_PROXIM); + } + return false; + break; + // KC_LBRC, KC_NUHS, KC_GRV, KC_RBRC [&#`] + // These four keys are unshifted in the UK layout and should be sent as such. + case KC_LBRC: + return unshifted(keycode, record); + case KC_NUHS: + return unshifted(keycode, record); + case KC_GRV: + return unshifted(keycode, record); + case KC_RBRC: + return unshifted(keycode, record); + } + return true; +} diff --git a/users/pdl/pdl.h b/users/pdl/pdl.h new file mode 100644 index 000000000000..626a0dd51c65 --- /dev/null +++ b/users/pdl/pdl.h @@ -0,0 +1,107 @@ +#pragma once + +#include "quantum.h" + +enum userspace_layer_codes { + QWERTY = SAFE_RANGE, + PROXIM, + PUNCTN, + CODING, + NEW_SAFE_RANGE +}; + +#define _QWERTY 2 +#define _PROXIM 0 +#define _NUMBRS 4 +#define _NAVIGN 5 +#define _PUNCTN 6 +#define _CODING 7 +#define _FUNCTN 8 + +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO + +#define MY_SSPC MT(MOD_RSFT, KC_SPC) +#define MY_SESC MT(MOD_LSFT, KC_ESC) +#define MY_CBSL MT(MOD_LCTL, KC_NUBS) +#define MY_SSCL MT(MOD_RSFT, KC_SCLN) +#define MY_SQUO MT(MOD_RSFT, KC_QUOT) +#define MY_CENT MT(MOD_RCTL, KC_ENT) +#define MY_AMNU MT(MOD_RALT, KC_APP) + +#define MY_TILD S(KC_NUHS) +#define MY_SEQL MT(MOD_RALT, KC_PEQL) +#define MY_CMIN MT(MOD_RALT, KC_MINS) +#define MY_ASLS MT(MOD_RALT, KC_SLSH) + +#define MY_UNDO LCTL(KC_Z) +#define MY_CUT LCTL(KC_X) +#define MY_COPY LCTL(KC_C) +#define MY_PASTE LCTL(KC_V) + +#define MY_AF4 LALT(KC_F4) +#define MY_CF4 LCTL(KC_F4) +#define MY_CF5 LCTL(KC_F5) +#define MY_CAD LCTL(LALT(KC_DEL)) + +#define NUMBRS TT(_NUMBRS) +#define NAVIGN TT(_NAVIGN) +#define FUNCTN TT(_FUNCTN) + +#define EITHER_SHIFT (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) + +// Cannot redefine this here +// #define TAPPING_TOGGLE 2 + +// Taken from drashna: +// Since our quirky block definitions are basically a list of comma separated +// arguments, we need a wrapper in order for these definitions to be +// expanded before being used as arguments to the LAYOUT_xxx macro. +#if (!defined(LAYOUT) && defined(KEYMAP)) +#define LAYOUT KEYMAP +#endif +#define KEYMAP_wrapper(...) LAYOUT(__VA_ARGS__) +#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__) + +#define ___________________________________________ _______, _______, _______, _______, _______ + +#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_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_SLASH + +#define _________________PROXIM_L1_________________ KC_Q, KC_W, KC_F, KC_R, KC_B +#define _________________PROXIM_L2_________________ KC_A, KC_S, KC_D, KC_T, KC_G +#define _________________PROXIM_L3_________________ KC_Z, KC_X, KC_C, KC_V, KC_K + +#define _________________PROXIM_R1_________________ KC_J, KC_Y, KC_O, KC_U, KC_QUOT +#define _________________PROXIM_R2_________________ KC_P, KC_N, KC_E, KC_I, KC_L +#define _________________PROXIM_R3_________________ KC_M, KC_H, KC_COMM, KC_DOT, KC_SLASH + +#define _________________PUNCTN_R1_________________ KC_LT, KC_GT, KC_LPRN, KC_RPRN, _______ +#define _________________PUNCTN_R2_________________ KC_ASTR, KC_EQL, KC_MINS, KC_PLUS, KC_SLSH +#define _________________PUNCTN_R3_________________ KC_LCBR, KC_RCBR, _______, _______, _______ + +#define _________________CODING_R1_________________ KC_GRV, KC_PERC, KC_DLR, KC_AT, _______ +#define _________________CODING_R2_________________ KC_CIRC, KC_UNDS, MY_TILD, KC_AMPR, KC_NUHS +#define _________________CODING_R3_________________ KC_LBRC, KC_RBRC, _______, _______, _______ + +#define _________________NAVIGN_L1_________________ KC_DEL, KC_PGUP, KC_UP, KC_PGDN, KC_BSPC +#define _________________NAVIGN_L2_________________ KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END +#define _________________NAVIGN_L3_________________ MY_UNDO, MY_CUT, MY_COPY, MY_PASTE, KC_ENT + +#define _________________NUMBRS_L1_________________ KC_1, KC_2, KC_3, KC_4, KC_5 +#define _________________NUMBRS_L2_________________ KC_6, KC_7, KC_8, KC_9, KC_0 +#define _________________NUMBRS_L3_________________ KC_UNDO, KC_MINS, KC_EQL, KC_PDOT, KC_ENT + +#define _________________FUNCTN_L1_________________ KC_ESC, KC_F1, KC_F2, KC_F3, MY_AF4 +#define _________________FUNCTN_L2_________________ KC_APP, KC_F4, KC_F5, KC_F6, MY_CF5 +#define _________________FUNCTN_L3_________________ RESET, KC_F7, KC_F8, KC_F9, MY_CF4 + +#define _________________FUNCTN_R1_________________ KC_VOLU, KC_F10, KC_F11, KC_F12, KC_INS +#define _________________FUNCTN_R2_________________ KC_VOLD, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT +#define _________________FUNCTN_R3_________________ KC_MUTE, KC_PAUS, QWERTY, PROXIM, DEBUG diff --git a/users/pdl/rules.mk b/users/pdl/rules.mk new file mode 100644 index 000000000000..e69de29bb2d1 From 7df9ed1fc48037a18d6a911d066b515cdb0ad152 Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Tue, 3 Jul 2018 08:22:54 +0100 Subject: [PATCH 02/24] Add keymap lets_split:pdl --- keyboards/lets_split/keymaps/pdl/config.h | 38 ++++++++++++ keyboards/lets_split/keymaps/pdl/keymap.c | 70 +++++++++++++++++++++++ keyboards/lets_split/keymaps/pdl/rules.mk | 1 + 3 files changed, 109 insertions(+) create mode 100644 keyboards/lets_split/keymaps/pdl/config.h create mode 100644 keyboards/lets_split/keymaps/pdl/keymap.c create mode 100644 keyboards/lets_split/keymaps/pdl/rules.mk diff --git a/keyboards/lets_split/keymaps/pdl/config.h b/keyboards/lets_split/keymaps/pdl/config.h new file mode 100644 index 000000000000..74c1b7be6712 --- /dev/null +++ b/keyboards/lets_split/keymaps/pdl/config.h @@ -0,0 +1,38 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert +Copyright 2018 Daniel Perrett + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#pragma once + +#include "../../config.h" + +#define TAPPING_TERM 200 +#define PREVENT_STUCK_MODIFIERS + +/* Use I2C or Serial, not both */ + +#define USE_SERIAL +// #define USE_I2C + +/* Select hand configuration */ + +//#define MASTER_LEFT +#define MASTER_RIGHT +// #define EE_HANDS diff --git a/keyboards/lets_split/keymaps/pdl/keymap.c b/keyboards/lets_split/keymaps/pdl/keymap.c new file mode 100644 index 000000000000..5497b79fedce --- /dev/null +++ b/keyboards/lets_split/keymaps/pdl/keymap.c @@ -0,0 +1,70 @@ +/* +This is the keymap for the keyboard + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert +Copyright 2017 Art Ortenburger +Copyright 2018 Daniel Perrett + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H +#include "pdl.c" +extern keymap_config_t keymap_config; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = KEYMAP_wrapper( \ + KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, \ + MY_SESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, MY_SQUO, \ + MY_CBSL, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, MY_SQUO, \ + KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT \ + ), + [_PROXIM] = KEYMAP_wrapper( \ + MY_FESC, _________________PROXIM_L1_________________, _________________PROXIM_R1_________________, KC_BSPC, \ + KC_TAB, _________________PROXIM_L2_________________, _________________PROXIM_R2_________________, MY_ASCL, \ + MY_SBSL, _________________PROXIM_L3_________________, _________________PROXIM_R3_________________, MY_SENT, \ + KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT \ + ), + [_NAVIGN] = KEYMAP_wrapper( \ + _______, _________________NAVIGN_L1_________________, _______, _______, _______, _______, _______, _______, \ + _______, _________________NAVIGN_L2_________________, _______, _______, _______, _______, _______, _______, \ + _______, _________________NAVIGN_L3_________________, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), + [_PUNCTN] = KEYMAP_wrapper( \ + _______, _______, _______, _______, _______, _______, _________________PUNCTN_R1_________________, _______, \ + _______, _______, _______, _______, _______, _______, _________________PUNCTN_R2_________________, _______, \ + _______, _______, _______, _______, _______, _______, _________________PUNCTN_R3_________________, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), + [_NUMBRS] = KEYMAP_wrapper( \ + _______, _________________NUMBRS_L1_________________, _______, _______, _______, _______, _______, _______, \ + _______, _________________NUMBRS_L2_________________, _______, _______, _______, _______, _______, _______, \ + _______, _________________NUMBRS_L3_________________, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), + [_CODING] = KEYMAP_wrapper( \ + _______, _______, _______, _______, _______, _______, _________________CODING_R1_________________, _______, \ + _______, _______, _______, _______, _______, _______, _________________CODING_R2_________________, _______, \ + _______, _______, _______, _______, _______, _______, _________________CODING_R3_________________, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), + [_FUNCTN] = KEYMAP_wrapper( \ + _______, _________________FUNCTN_L1_________________, _________________FUNCTN_R1_________________, MY_CAD, \ + _______, _________________FUNCTN_L2_________________, _________________FUNCTN_R2_________________, KC_PSCR, \ + _______, _________________FUNCTN_L3_________________, _________________FUNCTN_R3_________________, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ) +}; diff --git a/keyboards/lets_split/keymaps/pdl/rules.mk b/keyboards/lets_split/keymaps/pdl/rules.mk new file mode 100644 index 000000000000..7b06c839c5c1 --- /dev/null +++ b/keyboards/lets_split/keymaps/pdl/rules.mk @@ -0,0 +1 @@ +SRC += pdl.c From 4ac77a260793665472ce3380499ad9a6fdab887c Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Fri, 10 Aug 2018 17:54:15 +0100 Subject: [PATCH 03/24] Add handwired keyboard 'reclined' --- keyboards/handwired/reclined/config.h | 176 ++++++++++++++++++ keyboards/handwired/reclined/info.json | 0 .../reclined/keymaps/default/config.h | 19 ++ .../reclined/keymaps/default/keymap.c | 61 ++++++ .../reclined/keymaps/default/readme.md | 1 + .../handwired/reclined/keymaps/pdl/config.h | 29 +++ .../handwired/reclined/keymaps/pdl/keymap.c | 70 +++++++ .../handwired/reclined/keymaps/pdl/rules.mk | 1 + keyboards/handwired/reclined/readme.md | 12 ++ keyboards/handwired/reclined/reclined.c | 16 ++ keyboards/handwired/reclined/reclined.h | 35 ++++ keyboards/handwired/reclined/rules.mk | 48 +++++ users/pdl/pdl.h | 4 + 13 files changed, 472 insertions(+) create mode 100644 keyboards/handwired/reclined/config.h create mode 100644 keyboards/handwired/reclined/info.json create mode 100644 keyboards/handwired/reclined/keymaps/default/config.h create mode 100644 keyboards/handwired/reclined/keymaps/default/keymap.c create mode 100644 keyboards/handwired/reclined/keymaps/default/readme.md create mode 100644 keyboards/handwired/reclined/keymaps/pdl/config.h create mode 100644 keyboards/handwired/reclined/keymaps/pdl/keymap.c create mode 100644 keyboards/handwired/reclined/keymaps/pdl/rules.mk create mode 100644 keyboards/handwired/reclined/readme.md create mode 100644 keyboards/handwired/reclined/reclined.c create mode 100644 keyboards/handwired/reclined/reclined.h create mode 100644 keyboards/handwired/reclined/rules.mk diff --git a/keyboards/handwired/reclined/config.h b/keyboards/handwired/reclined/config.h new file mode 100644 index 000000000000..8d643009008c --- /dev/null +++ b/keyboards/handwired/reclined/config.h @@ -0,0 +1,176 @@ +/* +Copyright 2018 Daniel Perrett + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x0000 +#define DEVICE_VER 0x0001 +#define MANUFACTURER pdl +#define PRODUCT reclined +#define DESCRIPTION A custom staggered 40 percent keyboard split at 22.5 degrees + +/* key matrix size */ +#define MATRIX_ROWS 4 +#define MATRIX_COLS 12 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * +*/ +#define MATRIX_ROW_PINS { D3, C6, B6, B5 } +#define MATRIX_COL_PINS { B2, F4, B3, F5, B1, F6, D4, D7, D0, E6, D1, B4 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */ +#define DIODE_DIRECTION ROW2COL + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCING_DELAY 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE + +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Magic Key Options + * + * Magic keys are hotkey commands that allow control over firmware functions of + * the keyboard. They are best used in combination with the HID Listen program, + * found here: https://www.pjrc.com/teensy/hid_listen.html + * + * The options below allow the magic key functionality to be changed. This is + * useful if your keyboard/keypad is missing keys and you want magic key support. + * + */ + +/* key combination for magic key command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + +/* control how magic key switches layers */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false + +/* override magic key keymap */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM +//#define MAGIC_KEY_HELP1 H +//#define MAGIC_KEY_HELP2 SLASH +//#define MAGIC_KEY_DEBUG D +//#define MAGIC_KEY_DEBUG_MATRIX X +//#define MAGIC_KEY_DEBUG_KBD K +//#define MAGIC_KEY_DEBUG_MOUSE M +//#define MAGIC_KEY_VERSION V +//#define MAGIC_KEY_STATUS S +//#define MAGIC_KEY_CONSOLE C +//#define MAGIC_KEY_LAYER0_ALT1 ESC +//#define MAGIC_KEY_LAYER0_ALT2 GRAVE +//#define MAGIC_KEY_LAYER0 0 +//#define MAGIC_KEY_LAYER1 1 +//#define MAGIC_KEY_LAYER2 2 +//#define MAGIC_KEY_LAYER3 3 +//#define MAGIC_KEY_LAYER4 4 +//#define MAGIC_KEY_LAYER5 5 +//#define MAGIC_KEY_LAYER6 6 +//#define MAGIC_KEY_LAYER7 7 +//#define MAGIC_KEY_LAYER8 8 +//#define MAGIC_KEY_LAYER9 9 +//#define MAGIC_KEY_BOOTLOADER PAUSE +//#define MAGIC_KEY_LOCK CAPS +//#define MAGIC_KEY_EEPROM E +//#define MAGIC_KEY_NKRO N +//#define MAGIC_KEY_SLEEP_LED Z + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION + +/* + * MIDI options + */ + +/* Prevent use of disabled MIDI features in the keymap */ +//#define MIDI_ENABLE_STRICT 1 + +/* enable basic MIDI features: + - MIDI notes can be sent when in Music mode is on +*/ +//#define MIDI_BASIC + +/* enable advanced MIDI features: + - MIDI notes can be added to the keymap + - Octave shift and transpose + - Virtual sustain, portamento, and modulation wheel + - etc. +*/ +//#define MIDI_ADVANCED + +/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ +//#define MIDI_TONE_KEYCODE_OCTAVES 1 diff --git a/keyboards/handwired/reclined/info.json b/keyboards/handwired/reclined/info.json new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/keyboards/handwired/reclined/keymaps/default/config.h b/keyboards/handwired/reclined/keymaps/default/config.h new file mode 100644 index 000000000000..4aeea801d140 --- /dev/null +++ b/keyboards/handwired/reclined/keymaps/default/config.h @@ -0,0 +1,19 @@ +/* Copyright 2018 Daniel Perrett + * + * 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 + +// place overrides here diff --git a/keyboards/handwired/reclined/keymaps/default/keymap.c b/keyboards/handwired/reclined/keymaps/default/keymap.c new file mode 100644 index 000000000000..793496916656 --- /dev/null +++ b/keyboards/handwired/reclined/keymaps/default/keymap.c @@ -0,0 +1,61 @@ +/* Copyright 2018 Daniel Perrett + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = KEYMAP( /* Base */ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , + KC_LCTL, KC_LGUI, KC_LALT, RESET, KC_TAB, KC_SPC, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT +), +}; + +const uint16_t PROGMEM fn_actions[] = { + +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + // MACRODOWN only works in this function + switch(id) { + case 0: + if (record->event.pressed) { + register_code(KC_RSFT); + } else { + unregister_code(KC_RSFT); + } + break; + } + return MACRO_NONE; +}; + + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + return true; +} + +void led_set_user(uint8_t usb_led) { + +} diff --git a/keyboards/handwired/reclined/keymaps/default/readme.md b/keyboards/handwired/reclined/keymaps/default/readme.md new file mode 100644 index 000000000000..3818217ad373 --- /dev/null +++ b/keyboards/handwired/reclined/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for reclined \ No newline at end of file diff --git a/keyboards/handwired/reclined/keymaps/pdl/config.h b/keyboards/handwired/reclined/keymaps/pdl/config.h new file mode 100644 index 000000000000..fb8a2aac659b --- /dev/null +++ b/keyboards/handwired/reclined/keymaps/pdl/config.h @@ -0,0 +1,29 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +#define TAPPING_TERM 200 +#define PREVENT_STUCK_MODIFIERS + +#endif diff --git a/keyboards/handwired/reclined/keymaps/pdl/keymap.c b/keyboards/handwired/reclined/keymaps/pdl/keymap.c new file mode 100644 index 000000000000..d435082cca83 --- /dev/null +++ b/keyboards/handwired/reclined/keymaps/pdl/keymap.c @@ -0,0 +1,70 @@ +/* +This is the keymap for the reclined keyboard + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert +Copyright 2017 Art Ortenburger +Copyright 2018 Daniel Perrett + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H +#include "pdl.c" +extern keymap_config_t keymap_config; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = KEYMAP_wrapper( \ + KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, \ + MY_SESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, MY_SQUO, \ + MY_CBSL, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, MY_SQUO, \ + KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT \ + ), + [_PROXIM] = KEYMAP_wrapper( \ + MY_FESC, _________________PROXIM_L1_________________, _________________PROXIM_R1_________________, KC_BSPC, \ + KC_TAB, _________________PROXIM_L2_________________, _________________PROXIM_R2_________________, MY_ASCL, \ + MY_SBSL, _________________PROXIM_L3_________________, _________________PROXIM_R3_________________, MY_SENT, \ + KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT \ + ), + [_NAVIGN] = KEYMAP_wrapper( \ + _______, _________________NAVIGN_L1_________________, _______, _______, _______, _______, _______, _______, \ + _______, _________________NAVIGN_L2_________________, _______, _______, _______, _______, _______, _______, \ + _______, _________________NAVIGN_L3_________________, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), + [_PUNCTN] = KEYMAP_wrapper( \ + _______, _______, _______, _______, _______, _______, _________________PUNCTN_R1_________________, _______, \ + _______, _______, _______, _______, _______, _______, _________________PUNCTN_R2_________________, _______, \ + _______, _______, _______, _______, _______, _______, _________________PUNCTN_R3_________________, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), + [_NUMBRS] = KEYMAP_wrapper( \ + _______, _________________NUMBRS_L1_________________, _______, _______, _______, _______, _______, _______, \ + _______, _________________NUMBRS_L2_________________, _______, _______, _______, _______, _______, _______, \ + _______, _________________NUMBRS_L3_________________, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), + [_CODING] = KEYMAP_wrapper( \ + _______, _______, _______, _______, _______, _______, _________________CODING_R1_________________, _______, \ + _______, _______, _______, _______, _______, _______, _________________CODING_R2_________________, _______, \ + _______, _______, _______, _______, _______, _______, _________________CODING_R3_________________, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), + [_FUNCTN] = KEYMAP_wrapper( \ + _______, _________________FUNCTN_L1_________________, _________________FUNCTN_R1_________________, MY_CAD, \ + _______, _________________FUNCTN_L2_________________, _________________FUNCTN_R2_________________, KC_PSCR, \ + _______, _________________FUNCTN_L3_________________, _________________FUNCTN_R3_________________, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ) +}; diff --git a/keyboards/handwired/reclined/keymaps/pdl/rules.mk b/keyboards/handwired/reclined/keymaps/pdl/rules.mk new file mode 100644 index 000000000000..7b06c839c5c1 --- /dev/null +++ b/keyboards/handwired/reclined/keymaps/pdl/rules.mk @@ -0,0 +1 @@ +SRC += pdl.c diff --git a/keyboards/handwired/reclined/readme.md b/keyboards/handwired/reclined/readme.md new file mode 100644 index 000000000000..0a57de50ad09 --- /dev/null +++ b/keyboards/handwired/reclined/readme.md @@ -0,0 +1,12 @@ +# reclined + +A custom staggered 40 percent keyboard split at 22.5 degrees. + +Keyboard Maintainer: [pdl](https://github.com/pdl) +Hardware Supported: Just one device +Hardware Availability: None + +Make example for this keyboard (after setting up your build environment): + + make reclined:default + make reclined:pdl diff --git a/keyboards/handwired/reclined/reclined.c b/keyboards/handwired/reclined/reclined.c new file mode 100644 index 000000000000..ca6da9de6d1e --- /dev/null +++ b/keyboards/handwired/reclined/reclined.c @@ -0,0 +1,16 @@ +/* Copyright 2018 Daniel Perrett + * + * 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 "reclined.h" \ No newline at end of file diff --git a/keyboards/handwired/reclined/reclined.h b/keyboards/handwired/reclined/reclined.h new file mode 100644 index 000000000000..5d8187d3d23c --- /dev/null +++ b/keyboards/handwired/reclined/reclined.h @@ -0,0 +1,35 @@ +/* Copyright 2018 Daniel Perrett + * + * 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" + +// This a shortcut to help you visually see your layout. +// The following is an example using the Planck MIT layout +// The first section contains all of the arguments +// The second converts the arguments into a two-dimensional array +#define LAYOUT( \ + 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/handwired/reclined/rules.mk b/keyboards/handwired/reclined/rules.mk new file mode 100644 index 000000000000..8769f09053d7 --- /dev/null +++ b/keyboards/handwired/reclined/rules.mk @@ -0,0 +1,48 @@ +# MCU name +MCU = atmega32u4 + +# Processor frequency. +# This will define a symbol, F_CPU, in all source code files equal to the +# processor frequency in Hz. You can then use this symbol in your source code to +# calculate timings. Do NOT tack on a 'UL' at the end, this will be done +# automatically to create a 32-bit value in your source code. +# +# This will be an integer division of F_USB below, as it is sourced by +# F_USB after it has run through any CPU prescalers. Note that this value +# does not *change* the processor frequency - it should merely be updated to +# reflect the processor speed set externally so that the code can use accurate +# software delays. +F_CPU = 16000000 + + +# +# LUFA specific +# +# Target architecture (see library "Board Types" documentation). +ARCH = AVR8 + +# Input clock frequency. +F_USB = $(F_CPU) + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + +# Boot Section Size in *bytes* +OPT_DEFS += -DBOOTLOADER_SIZE=4096 + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 diff --git a/users/pdl/pdl.h b/users/pdl/pdl.h index 626a0dd51c65..5de77d638b5d 100644 --- a/users/pdl/pdl.h +++ b/users/pdl/pdl.h @@ -22,12 +22,16 @@ enum userspace_layer_codes { #define _______ KC_TRNS #define XXXXXXX KC_NO +#define MY_FESC LT(_FUNCTN, KC_ESC) #define MY_SSPC MT(MOD_RSFT, KC_SPC) #define MY_SESC MT(MOD_LSFT, KC_ESC) +#define MY_SBSL MT(MOD_LSFT, KC_NUBS) #define MY_CBSL MT(MOD_LCTL, KC_NUBS) #define MY_SSCL MT(MOD_RSFT, KC_SCLN) +#define MY_ASCL MT(MOD_LALT, KC_SCLN) #define MY_SQUO MT(MOD_RSFT, KC_QUOT) #define MY_CENT MT(MOD_RCTL, KC_ENT) +#define MY_SENT MT(MOD_RSFT, KC_ENT) #define MY_AMNU MT(MOD_RALT, KC_APP) #define MY_TILD S(KC_NUHS) From ed448a7252cdc43bd7618c10891f287863965a3c Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Sun, 15 Aug 2021 19:18:08 +0100 Subject: [PATCH 04/24] Add layout foostan/cornelius:pdl --- .../foostan/cornelius/keymaps/pdl/config.h | 27 ++++++++ .../foostan/cornelius/keymaps/pdl/keymap.c | 63 +++++++++++++++++++ .../foostan/cornelius/keymaps/pdl/readme.md | 1 + 3 files changed, 91 insertions(+) create mode 100644 keyboards/foostan/cornelius/keymaps/pdl/config.h create mode 100644 keyboards/foostan/cornelius/keymaps/pdl/keymap.c create mode 100644 keyboards/foostan/cornelius/keymaps/pdl/readme.md diff --git a/keyboards/foostan/cornelius/keymaps/pdl/config.h b/keyboards/foostan/cornelius/keymaps/pdl/config.h new file mode 100644 index 000000000000..e567a16ff0ef --- /dev/null +++ b/keyboards/foostan/cornelius/keymaps/pdl/config.h @@ -0,0 +1,27 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert +Copyright 2021 Daniel Perrett + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#pragma once + +#include "../../config.h" + +#define TAPPING_TERM 200 +#define PREVENT_STUCK_MODIFIERS diff --git a/keyboards/foostan/cornelius/keymaps/pdl/keymap.c b/keyboards/foostan/cornelius/keymaps/pdl/keymap.c new file mode 100644 index 000000000000..bf56880910b4 --- /dev/null +++ b/keyboards/foostan/cornelius/keymaps/pdl/keymap.c @@ -0,0 +1,63 @@ +/* Copyright 2021 Daniel Perrett + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H +#include "pdl.c" +extern keymap_config_t keymap_config; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = KEYMAP_wrapper( \ + MY_FESC, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, \ + KC_TAB, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, MY_SQUO, \ + MY_SBSL, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, MY_SENT, \ + KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, KC_UNDS, MY_CENT \ + ), + [_PROXIM] = KEYMAP_wrapper( \ + MY_FESC, _________________PROXIM_L1_________________, _________________PROXIM_R1_________________, KC_BSPC, \ + KC_TAB, _________________PROXIM_L2_________________, _________________PROXIM_R2_________________, MY_ASCL, \ + MY_SBSL, _________________PROXIM_L3_________________, _________________PROXIM_R3_________________, MY_SENT, \ + KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, KC_UNDS, MY_CENT \ + ), + [_NAVIGN] = KEYMAP_wrapper( \ + _______, _________________NAVIGN_L1_________________, _______, _______, _______, _______, _______, _______, \ + _______, _________________NAVIGN_L2_________________, _______, _______, _______, _______, _______, _______, \ + _______, _________________NAVIGN_L3_________________, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), + [_PUNCTN] = KEYMAP_wrapper( \ + _______, _______, _______, _______, _______, _______, _________________PUNCTN_R1_________________, _______, \ + _______, _______, _______, _______, _______, _______, _________________PUNCTN_R2_________________, _______, \ + _______, _______, _______, _______, _______, _______, _________________PUNCTN_R3_________________, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), + [_NUMBRS] = KEYMAP_wrapper( \ + _______, _________________NUMBRS_L1_________________, _______, _______, _______, _______, _______, _______, \ + _______, _________________NUMBRS_L2_________________, _______, _______, _______, _______, _______, _______, \ + _______, _________________NUMBRS_L3_________________, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), + [_CODING] = KEYMAP_wrapper( \ + _______, _______, _______, _______, _______, _______, _________________CODING_R1_________________, _______, \ + _______, _______, _______, _______, _______, _______, _________________CODING_R2_________________, _______, \ + _______, _______, _______, _______, _______, _______, _________________CODING_R3_________________, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), + [_FUNCTN] = KEYMAP_wrapper( \ + _______, _________________FUNCTN_L1_________________, _________________FUNCTN_R1_________________, MY_CAD, \ + _______, _________________FUNCTN_L2_________________, _________________FUNCTN_R2_________________, KC_PSCR, \ + _______, _________________FUNCTN_L3_________________, _________________FUNCTN_R3_________________, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ) +}; diff --git a/keyboards/foostan/cornelius/keymaps/pdl/readme.md b/keyboards/foostan/cornelius/keymaps/pdl/readme.md new file mode 100644 index 000000000000..59bb03d18bb8 --- /dev/null +++ b/keyboards/foostan/cornelius/keymaps/pdl/readme.md @@ -0,0 +1 @@ +# A keymap for cornelius used by pdl From 95cfe22c21f08b2acdceb553dccc1e4fa05ab153 Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Thu, 19 Aug 2021 22:09:35 +0100 Subject: [PATCH 05/24] Add combos to userspace pdl --- .../foostan/cornelius/keymaps/pdl/config.h | 5 + .../foostan/cornelius/keymaps/pdl/keymap.c | 8 +- users/pdl/pdl.c | 130 ++++++++++++++++-- users/pdl/pdl.h | 18 ++- users/pdl/rules.mk | 1 + 5 files changed, 142 insertions(+), 20 deletions(-) diff --git a/keyboards/foostan/cornelius/keymaps/pdl/config.h b/keyboards/foostan/cornelius/keymaps/pdl/config.h index e567a16ff0ef..0fab21685ea2 100644 --- a/keyboards/foostan/cornelius/keymaps/pdl/config.h +++ b/keyboards/foostan/cornelius/keymaps/pdl/config.h @@ -23,5 +23,10 @@ along with this program. If not, see . #include "../../config.h" +#define TAPPING_TOGGLE 2 #define TAPPING_TERM 200 #define PREVENT_STUCK_MODIFIERS + +#define COMBO_PDL +#define COMBO_COUNT 28 +#define COMBO_TERM 100 diff --git a/keyboards/foostan/cornelius/keymaps/pdl/keymap.c b/keyboards/foostan/cornelius/keymaps/pdl/keymap.c index bf56880910b4..e2ff9fbf961c 100644 --- a/keyboards/foostan/cornelius/keymaps/pdl/keymap.c +++ b/keyboards/foostan/cornelius/keymaps/pdl/keymap.c @@ -21,14 +21,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = KEYMAP_wrapper( \ MY_FESC, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, \ KC_TAB, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, MY_SQUO, \ - MY_SBSL, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, MY_SENT, \ - KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, KC_UNDS, MY_CENT \ + MY_SBSL, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT, \ + KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT \ ), [_PROXIM] = KEYMAP_wrapper( \ MY_FESC, _________________PROXIM_L1_________________, _________________PROXIM_R1_________________, KC_BSPC, \ KC_TAB, _________________PROXIM_L2_________________, _________________PROXIM_R2_________________, MY_ASCL, \ - MY_SBSL, _________________PROXIM_L3_________________, _________________PROXIM_R3_________________, MY_SENT, \ - KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, KC_UNDS, MY_CENT \ + MY_SBSL, _________________PROXIM_L3_________________, _________________PROXIM_R3_________________, KC_RSFT, \ + KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT \ ), [_NAVIGN] = KEYMAP_wrapper( \ _______, _________________NAVIGN_L1_________________, _______, _______, _______, _______, _______, _______, \ diff --git a/users/pdl/pdl.c b/users/pdl/pdl.c index bd91a8bde5a7..acc68f66d639 100644 --- a/users/pdl/pdl.c +++ b/users/pdl/pdl.c @@ -37,6 +37,14 @@ uint32_t update_punctn_coding_layer_state(uint32_t state) { uint32_t maskPunctn = 1UL << _PUNCTN; uint32_t maskCoding = 1UL << _CODING; +#ifdef COMBO_PDL + return ( + (state & maskEither) + ? (state | maskPunctn) & ~maskCoding // either => punctn + : (state & ~maskCoding) & ~maskPunctn // neither => neither + ); +#endif + return ( (state & maskEither) ? (state & maskEither) == maskEither @@ -72,16 +80,120 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; break; - // KC_LBRC, KC_NUHS, KC_GRV, KC_RBRC [&#`] + // KC_LBRC, KC_NUHS, KC_GRV, KC_RBRC [#`] // These four keys are unshifted in the UK layout and should be sent as such. - case KC_LBRC: - return unshifted(keycode, record); - case KC_NUHS: - return unshifted(keycode, record); - case KC_GRV: - return unshifted(keycode, record); - case KC_RBRC: - return unshifted(keycode, record); + case KU_LBRC: + return unshifted(KC_LBRC, record); + case KU_NUHS: + return unshifted(KC_NUHS, record); + case KU_GRV: + return unshifted(KC_GRV, record); + case KU_RBRC: + return unshifted(KC_RBRC, record); + case KC_ESC: + if (!record->event.pressed) { + layer_off(_NUMBRS); + layer_off(_NAVIGN); + layer_off(_PUNCTN); + layer_off(_CODING); + } + return true; } return true; } + +#ifdef COMBO_PDL +enum combos { + VCOMBO_PU, + VCOMBO_NU, + VCOMBO_EU, + VCOMBO_IU, + VCOMBO_LU, + VCOMBO_PD, + VCOMBO_ND, + VCOMBO_ED, + VCOMBO_ID, + VCOMBO_LD, + HCOMBO_JR, + HCOMBO_UR, + HCOMBO_PR, + HCOMBO_MR, + HCOMBO_HR, + XCOMBO_LEFT, + XCOMBO_RIGHT, + XCOMBO_UP, + XCOMBO_DOWN, + XCOMBO_ENTER, + XCOMBO_DEL, + XCOMBO_BKSP, + XCOMBO_MINS, + XCOMBO_TAB, + XCOMBO_UNDO, + XCOMBO_REDO, + XCOMBO_PGUP, + XCOMBO_PGDN +}; + +const uint16_t PROGMEM vcombo_pu[] = {KC_J, KC_P, COMBO_END}; +const uint16_t PROGMEM vcombo_nu[] = {KC_Y, KC_N, COMBO_END}; +const uint16_t PROGMEM vcombo_eu[] = {KC_O, KC_E, COMBO_END}; +const uint16_t PROGMEM vcombo_iu[] = {KC_U, KC_I, COMBO_END}; +const uint16_t PROGMEM vcombo_lu[] = {KC_QUOT, KC_L, COMBO_END}; +const uint16_t PROGMEM vcombo_pd[] = {KC_M, KC_P, COMBO_END}; +const uint16_t PROGMEM vcombo_nd[] = {KC_H, KC_N, COMBO_END}; +const uint16_t PROGMEM vcombo_ed[] = {KC_COMM, KC_E, COMBO_END}; +const uint16_t PROGMEM vcombo_id[] = {KC_DOT, KC_I, COMBO_END}; +const uint16_t PROGMEM vcombo_ld[] = {KC_SLSH, KC_L, COMBO_END}; +const uint16_t PROGMEM hcombo_jr[] = {KC_J, KC_Y, COMBO_END}; +const uint16_t PROGMEM hcombo_ur[] = {KC_QUOT, KC_U, COMBO_END}; +const uint16_t PROGMEM hcombo_pr[] = {KC_P, KC_N, COMBO_END}; +const uint16_t PROGMEM hcombo_mr[] = {KC_M, KC_H, COMBO_END}; +const uint16_t PROGMEM hcombo_hr[] = {KC_COMM, KC_H, COMBO_END}; + +const uint16_t PROGMEM xcombo_left[] = {KC_K, KC_P, COMBO_END}; +const uint16_t PROGMEM xcombo_right[] = {KC_M, KC_G, COMBO_END}; +const uint16_t PROGMEM xcombo_up[] = {KC_B, KC_J, COMBO_END}; +const uint16_t PROGMEM xcombo_down[] = {KC_K, KC_M, COMBO_END}; +const uint16_t PROGMEM xcombo_enter[] = {KC_G, KC_P, COMBO_END}; +const uint16_t PROGMEM xcombo_del[] = {KC_M, KC_B, COMBO_END}; +const uint16_t PROGMEM xcombo_bksp[] = {KC_K, KC_J, COMBO_END}; +const uint16_t PROGMEM xcombo_mins[] = {KC_V, KC_H, COMBO_END}; +const uint16_t PROGMEM xcombo_tab[] = {KC_V, KC_K, COMBO_END}; +const uint16_t PROGMEM xcombo_undo[] = {KC_V, KC_J, COMBO_END}; +const uint16_t PROGMEM xcombo_redo[] = {KC_B, KC_H, COMBO_END}; +const uint16_t PROGMEM xcombo_pgup[] = {KC_G, KC_B, COMBO_END}; +const uint16_t PROGMEM xcombo_pgdn[] = {KC_G, KC_K, COMBO_END}; + +combo_t key_combos[COMBO_COUNT] = { + [VCOMBO_PU] = COMBO(vcombo_pu, KC_CIRC), + [VCOMBO_NU] = COMBO(vcombo_nu, KC_LBRC), + [VCOMBO_EU] = COMBO(vcombo_eu, LSFT(KC_9)), + [VCOMBO_IU] = COMBO(vcombo_iu, LSFT(KC_0)), + [VCOMBO_LU] = COMBO(vcombo_lu, KC_RBRC), + [VCOMBO_PD] = COMBO(vcombo_pd, LSFT(KC_7)), + [VCOMBO_ND] = COMBO(vcombo_nd, KC_EQL), + [VCOMBO_ED] = COMBO(vcombo_ed, KC_MINS), + [VCOMBO_ID] = COMBO(vcombo_id, LSFT(KC_1)), + [VCOMBO_LD] = COMBO(vcombo_ld, LSFT(KC_5)), + [HCOMBO_JR] = COMBO(hcombo_jr, KC_GRV), + [HCOMBO_UR] = COMBO(hcombo_ur, LSFT(KC_2)), + [HCOMBO_PR] = COMBO(hcombo_pr, LSFT(KC_8)), + [HCOMBO_MR] = COMBO(hcombo_mr, KC_NUHS), + [HCOMBO_HR] = COMBO(hcombo_hr, KC_NUBS), + + [XCOMBO_LEFT] = COMBO(xcombo_left, KC_LEFT), + [XCOMBO_RIGHT] = COMBO(xcombo_right, KC_RGHT), + [XCOMBO_UP] = COMBO(xcombo_up, KC_UP), + [XCOMBO_DOWN] = COMBO(xcombo_down, KC_DOWN), + [XCOMBO_ENTER] = COMBO(xcombo_enter, KC_ENT), + [XCOMBO_DEL] = COMBO(xcombo_del, KC_DEL), + [XCOMBO_BKSP] = COMBO(xcombo_bksp, KC_BSPC), + [XCOMBO_MINS] = COMBO(xcombo_mins, KC_MINS), + [XCOMBO_TAB] = COMBO(xcombo_tab, KC_TAB), + [XCOMBO_UNDO] = COMBO(xcombo_undo, LCTL(KC_Y)), + [XCOMBO_REDO] = COMBO(xcombo_redo, LCTL(KC_Z)), + [XCOMBO_PGUP] = COMBO(xcombo_pgup, KC_PGUP), + [XCOMBO_PGDN] = COMBO(xcombo_pgdn, KC_PGDN) +}; + +#endif \ No newline at end of file diff --git a/users/pdl/pdl.h b/users/pdl/pdl.h index 5de77d638b5d..db2b42af7271 100644 --- a/users/pdl/pdl.h +++ b/users/pdl/pdl.h @@ -7,6 +7,10 @@ enum userspace_layer_codes { PROXIM, PUNCTN, CODING, + KU_LBRC, + KU_NUHS, + KU_GRV, + KU_RBRC, NEW_SAFE_RANGE }; @@ -86,15 +90,15 @@ enum userspace_layer_codes { #define _________________PROXIM_R2_________________ KC_P, KC_N, KC_E, KC_I, KC_L #define _________________PROXIM_R3_________________ KC_M, KC_H, KC_COMM, KC_DOT, KC_SLASH -#define _________________PUNCTN_R1_________________ KC_LT, KC_GT, KC_LPRN, KC_RPRN, _______ -#define _________________PUNCTN_R2_________________ KC_ASTR, KC_EQL, KC_MINS, KC_PLUS, KC_SLSH -#define _________________PUNCTN_R3_________________ KC_LCBR, KC_RCBR, _______, _______, _______ +#define _________________PUNCTN_R1_________________ KC_NUBS, KC_NUHS, KC_LPRN, KC_RPRN, _______ +#define _________________PUNCTN_R2_________________ KC_GRV, KC_EQL, KC_MINS, KC_PLUS, KC_SLSH +#define _________________PUNCTN_R3_________________ KC_LBRC, KC_RBRC, _______, _______, _______ -#define _________________CODING_R1_________________ KC_GRV, KC_PERC, KC_DLR, KC_AT, _______ -#define _________________CODING_R2_________________ KC_CIRC, KC_UNDS, MY_TILD, KC_AMPR, KC_NUHS -#define _________________CODING_R3_________________ KC_LBRC, KC_RBRC, _______, _______, _______ +#define _________________CODING_R1_________________ KU_GRV, KC_PERC, KC_DLR, KC_AT, _______ +#define _________________CODING_R2_________________ KC_CIRC, KC_UNDS, MY_TILD, KC_AMPR, KU_NUHS +#define _________________CODING_R3_________________ KU_LBRC, KU_RBRC, _______, _______, _______ -#define _________________NAVIGN_L1_________________ KC_DEL, KC_PGUP, KC_UP, KC_PGDN, KC_BSPC +#define _________________NAVIGN_L1_________________ KC_DEL, KC_PGUP, KC_UP, KC_PGDN, KC_BSPC #define _________________NAVIGN_L2_________________ KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END #define _________________NAVIGN_L3_________________ MY_UNDO, MY_CUT, MY_COPY, MY_PASTE, KC_ENT diff --git a/users/pdl/rules.mk b/users/pdl/rules.mk index e69de29bb2d1..ff681299e4e9 100644 --- a/users/pdl/rules.mk +++ b/users/pdl/rules.mk @@ -0,0 +1 @@ +COMBO_ENABLE = yes \ No newline at end of file From 40e4fe7e2007972338cfa80a17cdc2ffe63f3709 Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Sun, 29 Aug 2021 21:28:03 +0100 Subject: [PATCH 06/24] Updates to follow code style, depracations This includes all of @drashna's suggestions on a pull request to include `pdl` layouts which can be accepted and added automatically. Suggestions given in text will require a separate commit. Co-authored-by: Drashna Jaelre --- .../foostan/cornelius/keymaps/pdl/config.h | 2 - .../foostan/cornelius/keymaps/pdl/keymap.c | 1 - keyboards/handwired/reclined/config.h | 65 +------------------ .../reclined/keymaps/default/keymap.c | 35 ---------- .../handwired/reclined/keymaps/pdl/config.h | 8 +-- .../handwired/reclined/keymaps/pdl/keymap.c | 1 - keyboards/handwired/reclined/rules.mk | 34 ++-------- keyboards/lets_split/keymaps/pdl/config.h | 2 - keyboards/lets_split/keymaps/pdl/keymap.c | 1 - keyboards/orthodox/keymaps/pdl/config.h | 1 - users/pdl/pdl.h | 3 - 11 files changed, 6 insertions(+), 147 deletions(-) diff --git a/keyboards/foostan/cornelius/keymaps/pdl/config.h b/keyboards/foostan/cornelius/keymaps/pdl/config.h index 0fab21685ea2..b25d48de0235 100644 --- a/keyboards/foostan/cornelius/keymaps/pdl/config.h +++ b/keyboards/foostan/cornelius/keymaps/pdl/config.h @@ -21,11 +21,9 @@ along with this program. If not, see . #pragma once -#include "../../config.h" #define TAPPING_TOGGLE 2 #define TAPPING_TERM 200 -#define PREVENT_STUCK_MODIFIERS #define COMBO_PDL #define COMBO_COUNT 28 diff --git a/keyboards/foostan/cornelius/keymaps/pdl/keymap.c b/keyboards/foostan/cornelius/keymaps/pdl/keymap.c index e2ff9fbf961c..9b0a67fe8b60 100644 --- a/keyboards/foostan/cornelius/keymaps/pdl/keymap.c +++ b/keyboards/foostan/cornelius/keymaps/pdl/keymap.c @@ -15,7 +15,6 @@ */ #include QMK_KEYBOARD_H #include "pdl.c" -extern keymap_config_t keymap_config; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = KEYMAP_wrapper( \ diff --git a/keyboards/handwired/reclined/config.h b/keyboards/handwired/reclined/config.h index 8d643009008c..c8425194cbb4 100644 --- a/keyboards/handwired/reclined/config.h +++ b/keyboards/handwired/reclined/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . #define DEVICE_VER 0x0001 #define MANUFACTURER pdl #define PRODUCT reclined -#define DESCRIPTION A custom staggered 40 percent keyboard split at 22.5 degrees /* key matrix size */ #define MATRIX_ROWS 4 @@ -49,7 +48,7 @@ along with this program. If not, see . #define DIODE_DIRECTION ROW2COL /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCING_DELAY 5 +#define DEBOUNCE 5 /* define if matrix has ghost (lacks anti-ghosting diodes) */ //#define MATRIX_HAS_GHOST @@ -93,46 +92,6 @@ along with this program. If not, see . * */ -/* key combination for magic key command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - -/* control how magic key switches layers */ -//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true -//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true -//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false - -/* override magic key keymap */ -//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS -//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS -//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM -//#define MAGIC_KEY_HELP1 H -//#define MAGIC_KEY_HELP2 SLASH -//#define MAGIC_KEY_DEBUG D -//#define MAGIC_KEY_DEBUG_MATRIX X -//#define MAGIC_KEY_DEBUG_KBD K -//#define MAGIC_KEY_DEBUG_MOUSE M -//#define MAGIC_KEY_VERSION V -//#define MAGIC_KEY_STATUS S -//#define MAGIC_KEY_CONSOLE C -//#define MAGIC_KEY_LAYER0_ALT1 ESC -//#define MAGIC_KEY_LAYER0_ALT2 GRAVE -//#define MAGIC_KEY_LAYER0 0 -//#define MAGIC_KEY_LAYER1 1 -//#define MAGIC_KEY_LAYER2 2 -//#define MAGIC_KEY_LAYER3 3 -//#define MAGIC_KEY_LAYER4 4 -//#define MAGIC_KEY_LAYER5 5 -//#define MAGIC_KEY_LAYER6 6 -//#define MAGIC_KEY_LAYER7 7 -//#define MAGIC_KEY_LAYER8 8 -//#define MAGIC_KEY_LAYER9 9 -//#define MAGIC_KEY_BOOTLOADER PAUSE -//#define MAGIC_KEY_LOCK CAPS -//#define MAGIC_KEY_EEPROM E -//#define MAGIC_KEY_NKRO N -//#define MAGIC_KEY_SLEEP_LED Z /* * Feature disable options @@ -152,25 +111,3 @@ along with this program. If not, see . //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION -/* - * MIDI options - */ - -/* Prevent use of disabled MIDI features in the keymap */ -//#define MIDI_ENABLE_STRICT 1 - -/* enable basic MIDI features: - - MIDI notes can be sent when in Music mode is on -*/ -//#define MIDI_BASIC - -/* enable advanced MIDI features: - - MIDI notes can be added to the keymap - - Octave shift and transpose - - Virtual sustain, portamento, and modulation wheel - - etc. -*/ -//#define MIDI_ADVANCED - -/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ -//#define MIDI_TONE_KEYCODE_OCTAVES 1 diff --git a/keyboards/handwired/reclined/keymaps/default/keymap.c b/keyboards/handwired/reclined/keymaps/default/keymap.c index 793496916656..80ac9b22360c 100644 --- a/keyboards/handwired/reclined/keymaps/default/keymap.c +++ b/keyboards/handwired/reclined/keymaps/default/keymap.c @@ -24,38 +24,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -const uint16_t PROGMEM fn_actions[] = { - -}; - -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - // MACRODOWN only works in this function - switch(id) { - case 0: - if (record->event.pressed) { - register_code(KC_RSFT); - } else { - unregister_code(KC_RSFT); - } - break; - } - return MACRO_NONE; -}; - - -void matrix_init_user(void) { - -} - -void matrix_scan_user(void) { - -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} - -void led_set_user(uint8_t usb_led) { - -} diff --git a/keyboards/handwired/reclined/keymaps/pdl/config.h b/keyboards/handwired/reclined/keymaps/pdl/config.h index fb8a2aac659b..3a89a0a4d2d4 100644 --- a/keyboards/handwired/reclined/keymaps/pdl/config.h +++ b/keyboards/handwired/reclined/keymaps/pdl/config.h @@ -18,12 +18,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include "../../config.h" +#pragma once #define TAPPING_TERM 200 -#define PREVENT_STUCK_MODIFIERS - -#endif diff --git a/keyboards/handwired/reclined/keymaps/pdl/keymap.c b/keyboards/handwired/reclined/keymaps/pdl/keymap.c index d435082cca83..d96430071458 100644 --- a/keyboards/handwired/reclined/keymaps/pdl/keymap.c +++ b/keyboards/handwired/reclined/keymaps/pdl/keymap.c @@ -22,7 +22,6 @@ along with this program. If not, see . #include QMK_KEYBOARD_H #include "pdl.c" -extern keymap_config_t keymap_config; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = KEYMAP_wrapper( \ diff --git a/keyboards/handwired/reclined/rules.mk b/keyboards/handwired/reclined/rules.mk index 8769f09053d7..847d9d5f962c 100644 --- a/keyboards/handwired/reclined/rules.mk +++ b/keyboards/handwired/reclined/rules.mk @@ -1,34 +1,8 @@ # MCU name MCU = atmega32u4 -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 16000000 - - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -F_USB = $(F_CPU) - -# Interrupt driven control endpoint task(+60) -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT - -# Boot Section Size in *bytes* -OPT_DEFS += -DBOOTLOADER_SIZE=4096 +# Bootloader selection +BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable @@ -44,5 +18,5 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE = no # Audio output on port C6 +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output diff --git a/keyboards/lets_split/keymaps/pdl/config.h b/keyboards/lets_split/keymaps/pdl/config.h index 74c1b7be6712..e79e132c64a8 100644 --- a/keyboards/lets_split/keymaps/pdl/config.h +++ b/keyboards/lets_split/keymaps/pdl/config.h @@ -21,10 +21,8 @@ along with this program. If not, see . #pragma once -#include "../../config.h" #define TAPPING_TERM 200 -#define PREVENT_STUCK_MODIFIERS /* Use I2C or Serial, not both */ diff --git a/keyboards/lets_split/keymaps/pdl/keymap.c b/keyboards/lets_split/keymaps/pdl/keymap.c index 5497b79fedce..1241da778b57 100644 --- a/keyboards/lets_split/keymaps/pdl/keymap.c +++ b/keyboards/lets_split/keymaps/pdl/keymap.c @@ -22,7 +22,6 @@ along with this program. If not, see . #include QMK_KEYBOARD_H #include "pdl.c" -extern keymap_config_t keymap_config; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = KEYMAP_wrapper( \ diff --git a/keyboards/orthodox/keymaps/pdl/config.h b/keyboards/orthodox/keymaps/pdl/config.h index 2e061a28ff39..5fd46b41c653 100644 --- a/keyboards/orthodox/keymaps/pdl/config.h +++ b/keyboards/orthodox/keymaps/pdl/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* Use I2C or Serial, not both */ diff --git a/users/pdl/pdl.h b/users/pdl/pdl.h index db2b42af7271..84964816904c 100644 --- a/users/pdl/pdl.h +++ b/users/pdl/pdl.h @@ -22,9 +22,6 @@ enum userspace_layer_codes { #define _CODING 7 #define _FUNCTN 8 -// Fillers to make layering more clear -#define _______ KC_TRNS -#define XXXXXXX KC_NO #define MY_FESC LT(_FUNCTN, KC_ESC) #define MY_SSPC MT(MOD_RSFT, KC_SPC) From d90b9be437bba42ba21e9b6823ac31060fa45a59 Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Sun, 29 Aug 2021 21:42:48 +0100 Subject: [PATCH 07/24] Add GPL copyright headers per @drashna --- keyboards/handwired/reclined/info.json | 0 .../reclined/keymaps/default/config.h | 19 ------------------- users/pdl/pdl.c | 19 ++++++++++++++++++- users/pdl/pdl.h | 17 +++++++++++++++++ 4 files changed, 35 insertions(+), 20 deletions(-) delete mode 100644 keyboards/handwired/reclined/info.json delete mode 100644 keyboards/handwired/reclined/keymaps/default/config.h diff --git a/keyboards/handwired/reclined/info.json b/keyboards/handwired/reclined/info.json deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/keyboards/handwired/reclined/keymaps/default/config.h b/keyboards/handwired/reclined/keymaps/default/config.h deleted file mode 100644 index 4aeea801d140..000000000000 --- a/keyboards/handwired/reclined/keymaps/default/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2018 Daniel Perrett - * - * 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 - -// place overrides here diff --git a/users/pdl/pdl.c b/users/pdl/pdl.c index acc68f66d639..5b90a0b3102d 100644 --- a/users/pdl/pdl.c +++ b/users/pdl/pdl.c @@ -1,3 +1,20 @@ +/* +Copyright 2018-2021 Daniel Perrett + +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 "pdl.h" // unshifted @@ -196,4 +213,4 @@ combo_t key_combos[COMBO_COUNT] = { [XCOMBO_PGDN] = COMBO(xcombo_pgdn, KC_PGDN) }; -#endif \ No newline at end of file +#endif diff --git a/users/pdl/pdl.h b/users/pdl/pdl.h index 84964816904c..b5c0c41b7105 100644 --- a/users/pdl/pdl.h +++ b/users/pdl/pdl.h @@ -1,3 +1,20 @@ +/* +Copyright 2018-2021 Daniel Perrett + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + #pragma once #include "quantum.h" From 1cf5ae45453042b29a222cf3b27cb42ea2622769 Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Sun, 29 Aug 2021 21:43:34 +0100 Subject: [PATCH 08/24] Always use LAYOUT_wrapper, not KEYMAP_wrapper, per @drashna --- keyboards/foostan/cornelius/keymaps/pdl/keymap.c | 14 +++++++------- keyboards/handwired/reclined/keymaps/pdl/keymap.c | 14 +++++++------- keyboards/lets_split/keymaps/pdl/keymap.c | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/keyboards/foostan/cornelius/keymaps/pdl/keymap.c b/keyboards/foostan/cornelius/keymaps/pdl/keymap.c index 9b0a67fe8b60..87e32dce9a3e 100644 --- a/keyboards/foostan/cornelius/keymaps/pdl/keymap.c +++ b/keyboards/foostan/cornelius/keymaps/pdl/keymap.c @@ -17,43 +17,43 @@ #include "pdl.c" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = KEYMAP_wrapper( \ + [_QWERTY] = LAYOUT_wrapper( \ MY_FESC, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, \ KC_TAB, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, MY_SQUO, \ MY_SBSL, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT, \ KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT \ ), - [_PROXIM] = KEYMAP_wrapper( \ + [_PROXIM] = LAYOUT_wrapper( \ MY_FESC, _________________PROXIM_L1_________________, _________________PROXIM_R1_________________, KC_BSPC, \ KC_TAB, _________________PROXIM_L2_________________, _________________PROXIM_R2_________________, MY_ASCL, \ MY_SBSL, _________________PROXIM_L3_________________, _________________PROXIM_R3_________________, KC_RSFT, \ KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT \ ), - [_NAVIGN] = KEYMAP_wrapper( \ + [_NAVIGN] = LAYOUT_wrapper( \ _______, _________________NAVIGN_L1_________________, _______, _______, _______, _______, _______, _______, \ _______, _________________NAVIGN_L2_________________, _______, _______, _______, _______, _______, _______, \ _______, _________________NAVIGN_L3_________________, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), - [_PUNCTN] = KEYMAP_wrapper( \ + [_PUNCTN] = LAYOUT_wrapper( \ _______, _______, _______, _______, _______, _______, _________________PUNCTN_R1_________________, _______, \ _______, _______, _______, _______, _______, _______, _________________PUNCTN_R2_________________, _______, \ _______, _______, _______, _______, _______, _______, _________________PUNCTN_R3_________________, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), - [_NUMBRS] = KEYMAP_wrapper( \ + [_NUMBRS] = LAYOUT_wrapper( \ _______, _________________NUMBRS_L1_________________, _______, _______, _______, _______, _______, _______, \ _______, _________________NUMBRS_L2_________________, _______, _______, _______, _______, _______, _______, \ _______, _________________NUMBRS_L3_________________, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), - [_CODING] = KEYMAP_wrapper( \ + [_CODING] = LAYOUT_wrapper( \ _______, _______, _______, _______, _______, _______, _________________CODING_R1_________________, _______, \ _______, _______, _______, _______, _______, _______, _________________CODING_R2_________________, _______, \ _______, _______, _______, _______, _______, _______, _________________CODING_R3_________________, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), - [_FUNCTN] = KEYMAP_wrapper( \ + [_FUNCTN] = LAYOUT_wrapper( \ _______, _________________FUNCTN_L1_________________, _________________FUNCTN_R1_________________, MY_CAD, \ _______, _________________FUNCTN_L2_________________, _________________FUNCTN_R2_________________, KC_PSCR, \ _______, _________________FUNCTN_L3_________________, _________________FUNCTN_R3_________________, _______, \ diff --git a/keyboards/handwired/reclined/keymaps/pdl/keymap.c b/keyboards/handwired/reclined/keymaps/pdl/keymap.c index d96430071458..1c4fc62829ab 100644 --- a/keyboards/handwired/reclined/keymaps/pdl/keymap.c +++ b/keyboards/handwired/reclined/keymaps/pdl/keymap.c @@ -24,43 +24,43 @@ along with this program. If not, see . #include "pdl.c" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = KEYMAP_wrapper( \ + [_QWERTY] = LAYOUT_wrapper( \ KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, \ MY_SESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, MY_SQUO, \ MY_CBSL, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, MY_SQUO, \ KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT \ ), - [_PROXIM] = KEYMAP_wrapper( \ + [_PROXIM] = LAYOUT_wrapper( \ MY_FESC, _________________PROXIM_L1_________________, _________________PROXIM_R1_________________, KC_BSPC, \ KC_TAB, _________________PROXIM_L2_________________, _________________PROXIM_R2_________________, MY_ASCL, \ MY_SBSL, _________________PROXIM_L3_________________, _________________PROXIM_R3_________________, MY_SENT, \ KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT \ ), - [_NAVIGN] = KEYMAP_wrapper( \ + [_NAVIGN] = LAYOUT_wrapper( \ _______, _________________NAVIGN_L1_________________, _______, _______, _______, _______, _______, _______, \ _______, _________________NAVIGN_L2_________________, _______, _______, _______, _______, _______, _______, \ _______, _________________NAVIGN_L3_________________, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), - [_PUNCTN] = KEYMAP_wrapper( \ + [_PUNCTN] = LAYOUT_wrapper( \ _______, _______, _______, _______, _______, _______, _________________PUNCTN_R1_________________, _______, \ _______, _______, _______, _______, _______, _______, _________________PUNCTN_R2_________________, _______, \ _______, _______, _______, _______, _______, _______, _________________PUNCTN_R3_________________, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), - [_NUMBRS] = KEYMAP_wrapper( \ + [_NUMBRS] = LAYOUT_wrapper( \ _______, _________________NUMBRS_L1_________________, _______, _______, _______, _______, _______, _______, \ _______, _________________NUMBRS_L2_________________, _______, _______, _______, _______, _______, _______, \ _______, _________________NUMBRS_L3_________________, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), - [_CODING] = KEYMAP_wrapper( \ + [_CODING] = LAYOUT_wrapper( \ _______, _______, _______, _______, _______, _______, _________________CODING_R1_________________, _______, \ _______, _______, _______, _______, _______, _______, _________________CODING_R2_________________, _______, \ _______, _______, _______, _______, _______, _______, _________________CODING_R3_________________, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), - [_FUNCTN] = KEYMAP_wrapper( \ + [_FUNCTN] = LAYOUT_wrapper( \ _______, _________________FUNCTN_L1_________________, _________________FUNCTN_R1_________________, MY_CAD, \ _______, _________________FUNCTN_L2_________________, _________________FUNCTN_R2_________________, KC_PSCR, \ _______, _________________FUNCTN_L3_________________, _________________FUNCTN_R3_________________, _______, \ diff --git a/keyboards/lets_split/keymaps/pdl/keymap.c b/keyboards/lets_split/keymaps/pdl/keymap.c index 1241da778b57..fcbbdc778ad0 100644 --- a/keyboards/lets_split/keymaps/pdl/keymap.c +++ b/keyboards/lets_split/keymaps/pdl/keymap.c @@ -24,43 +24,43 @@ along with this program. If not, see . #include "pdl.c" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = KEYMAP_wrapper( \ + [_QWERTY] = LAYOUT_wrapper( \ KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, \ MY_SESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, MY_SQUO, \ MY_CBSL, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, MY_SQUO, \ KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT \ ), - [_PROXIM] = KEYMAP_wrapper( \ + [_PROXIM] = LAYOUT_wrapper( \ MY_FESC, _________________PROXIM_L1_________________, _________________PROXIM_R1_________________, KC_BSPC, \ KC_TAB, _________________PROXIM_L2_________________, _________________PROXIM_R2_________________, MY_ASCL, \ MY_SBSL, _________________PROXIM_L3_________________, _________________PROXIM_R3_________________, MY_SENT, \ KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT \ ), - [_NAVIGN] = KEYMAP_wrapper( \ + [_NAVIGN] = LAYOUT_wrapper( \ _______, _________________NAVIGN_L1_________________, _______, _______, _______, _______, _______, _______, \ _______, _________________NAVIGN_L2_________________, _______, _______, _______, _______, _______, _______, \ _______, _________________NAVIGN_L3_________________, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), - [_PUNCTN] = KEYMAP_wrapper( \ + [_PUNCTN] = LAYOUT_wrapper( \ _______, _______, _______, _______, _______, _______, _________________PUNCTN_R1_________________, _______, \ _______, _______, _______, _______, _______, _______, _________________PUNCTN_R2_________________, _______, \ _______, _______, _______, _______, _______, _______, _________________PUNCTN_R3_________________, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), - [_NUMBRS] = KEYMAP_wrapper( \ + [_NUMBRS] = LAYOUT_wrapper( \ _______, _________________NUMBRS_L1_________________, _______, _______, _______, _______, _______, _______, \ _______, _________________NUMBRS_L2_________________, _______, _______, _______, _______, _______, _______, \ _______, _________________NUMBRS_L3_________________, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), - [_CODING] = KEYMAP_wrapper( \ + [_CODING] = LAYOUT_wrapper( \ _______, _______, _______, _______, _______, _______, _________________CODING_R1_________________, _______, \ _______, _______, _______, _______, _______, _______, _________________CODING_R2_________________, _______, \ _______, _______, _______, _______, _______, _______, _________________CODING_R3_________________, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), - [_FUNCTN] = KEYMAP_wrapper( \ + [_FUNCTN] = LAYOUT_wrapper( \ _______, _________________FUNCTN_L1_________________, _________________FUNCTN_R1_________________, MY_CAD, \ _______, _________________FUNCTN_L2_________________, _________________FUNCTN_R2_________________, KC_PSCR, \ _______, _________________FUNCTN_L3_________________, _________________FUNCTN_R3_________________, _______, \ From 2469b14760ed22a6ab72235e3efed53195c67c2a Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Sun, 29 Aug 2021 21:58:24 +0100 Subject: [PATCH 09/24] Convert layers into enums per @drashna --- users/pdl/pdl.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/users/pdl/pdl.h b/users/pdl/pdl.h index b5c0c41b7105..23fadc51198d 100644 --- a/users/pdl/pdl.h +++ b/users/pdl/pdl.h @@ -31,14 +31,15 @@ enum userspace_layer_codes { NEW_SAFE_RANGE }; -#define _QWERTY 2 -#define _PROXIM 0 -#define _NUMBRS 4 -#define _NAVIGN 5 -#define _PUNCTN 6 -#define _CODING 7 -#define _FUNCTN 8 - +enum userspace_layers { + _PROXIM, + _QWERTY, + _NUMBRS, + _NAVIGN, + _PUNCTN, + _CODING, + _FUNCTN +}; #define MY_FESC LT(_FUNCTN, KC_ESC) #define MY_SSPC MT(MOD_RSFT, KC_SPC) From 0f902c16bbbffbabf43d2abbfb2a3e4b0372b89a Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Mon, 30 Aug 2021 17:26:48 +0100 Subject: [PATCH 10/24] Apply fixes per @zvecr As part of a pull request review, @zvecr suggested these two fixes. Co-authored-by: Joel Challis --- keyboards/handwired/reclined/readme.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/handwired/reclined/readme.md b/keyboards/handwired/reclined/readme.md index 0a57de50ad09..40d1aac66516 100644 --- a/keyboards/handwired/reclined/readme.md +++ b/keyboards/handwired/reclined/readme.md @@ -8,5 +8,4 @@ Hardware Availability: None Make example for this keyboard (after setting up your build environment): - make reclined:default - make reclined:pdl + make handwired/reclined:default From 5cbb885a8ee8ed2421a8fee269ea8a009d390fdf Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Mon, 30 Aug 2021 17:49:48 +0100 Subject: [PATCH 11/24] Replace KEYMAP with LAYOUT per @zvecr Update keyboards/handwired/reclined/keymaps/default/keymap.c per @zvecr's suggestion on #14199 pull request review Co-authored-by: Joel Challis --- keyboards/handwired/reclined/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/reclined/keymaps/default/keymap.c b/keyboards/handwired/reclined/keymaps/default/keymap.c index 80ac9b22360c..d8e4cf79b09a 100644 --- a/keyboards/handwired/reclined/keymaps/default/keymap.c +++ b/keyboards/handwired/reclined/keymaps/default/keymap.c @@ -16,7 +16,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = KEYMAP( /* Base */ +[0] = LAYOUT( /* Base */ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , From 22609526ef569147bae3927fe9aa4f217828d906 Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Thu, 2 Sep 2021 22:18:50 +0100 Subject: [PATCH 12/24] Have handwired/reclined use ortho_4x12 layout As recommended by @drashna in code review for pull #14199 Co-authored-by: Drashna Jaelre --- keyboards/handwired/reclined/keymaps/default/keymap.c | 2 +- keyboards/handwired/reclined/reclined.h | 2 +- keyboards/handwired/reclined/rules.mk | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/keyboards/handwired/reclined/keymaps/default/keymap.c b/keyboards/handwired/reclined/keymaps/default/keymap.c index d8e4cf79b09a..d814d568c766 100644 --- a/keyboards/handwired/reclined/keymaps/default/keymap.c +++ b/keyboards/handwired/reclined/keymaps/default/keymap.c @@ -16,7 +16,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT( /* Base */ +[0] = LAYOUT_ortho_4x12( /* Base */ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , diff --git a/keyboards/handwired/reclined/reclined.h b/keyboards/handwired/reclined/reclined.h index 5d8187d3d23c..9a665f3a9bdf 100644 --- a/keyboards/handwired/reclined/reclined.h +++ b/keyboards/handwired/reclined/reclined.h @@ -21,7 +21,7 @@ // The following is an example using the Planck MIT layout // The first section contains all of the arguments // The second converts the arguments into a two-dimensional array -#define LAYOUT( \ +#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, \ diff --git a/keyboards/handwired/reclined/rules.mk b/keyboards/handwired/reclined/rules.mk index 847d9d5f962c..eec2eaf28f6f 100644 --- a/keyboards/handwired/reclined/rules.mk +++ b/keyboards/handwired/reclined/rules.mk @@ -20,3 +20,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by d UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output + +LAYOUTS = ortho_4x12 From 07b62fd3854b8f8e28cc79cbdf9e0d87e9f96a54 Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Fri, 3 Sep 2021 06:52:44 +0100 Subject: [PATCH 13/24] Fix handwired/reclined:pdl due to changes to using ortho_4x12 layout For pull #14199 --- keyboards/handwired/reclined/keymaps/pdl/rules.mk | 3 +++ users/pdl/pdl.h | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/keyboards/handwired/reclined/keymaps/pdl/rules.mk b/keyboards/handwired/reclined/keymaps/pdl/rules.mk index 7b06c839c5c1..2900e5dc37fa 100644 --- a/keyboards/handwired/reclined/keymaps/pdl/rules.mk +++ b/keyboards/handwired/reclined/keymaps/pdl/rules.mk @@ -1 +1,4 @@ SRC += pdl.c + +LAYOUTS = ortho_4x12 + diff --git a/users/pdl/pdl.h b/users/pdl/pdl.h index 23fadc51198d..a976c714740d 100644 --- a/users/pdl/pdl.h +++ b/users/pdl/pdl.h @@ -81,9 +81,14 @@ enum userspace_layers { // Since our quirky block definitions are basically a list of comma separated // arguments, we need a wrapper in order for these definitions to be // expanded before being used as arguments to the LAYOUT_xxx macro. -#if (!defined(LAYOUT) && defined(KEYMAP)) +#if !defined(LAYOUT) +#if defined(LAYOUT_ortho_4x12) +#define LAYOUT_wrapper_ortho_4x12(...) LAYOUT_ortho_4x12(__VA_ARGS__) +#define LAYOUT LAYOUT_ortho_4x12 +#elif defined(KEYMAP) #define LAYOUT KEYMAP #endif +#endif #define KEYMAP_wrapper(...) LAYOUT(__VA_ARGS__) #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__) From fdf8363b27ee2853881431e78224c8bdf91fcfeb Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Sun, 12 Sep 2021 17:11:39 +0100 Subject: [PATCH 14/24] Remove redundant declaration of LAYOUTS per @drashna Co-authored-by: Drashna Jaelre --- keyboards/handwired/reclined/keymaps/pdl/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/handwired/reclined/keymaps/pdl/rules.mk b/keyboards/handwired/reclined/keymaps/pdl/rules.mk index 2900e5dc37fa..7075ef8cc74c 100644 --- a/keyboards/handwired/reclined/keymaps/pdl/rules.mk +++ b/keyboards/handwired/reclined/keymaps/pdl/rules.mk @@ -1,4 +1,3 @@ SRC += pdl.c -LAYOUTS = ortho_4x12 From 6cd1b558aff2413f5c28aad445477593037c6d13 Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Fri, 24 Sep 2021 21:00:18 +0100 Subject: [PATCH 15/24] Invoke userspace with USER_NAME instead of SRC Implemented suggestions in code review by @fauxpark Co-authored-by: Ryan --- keyboards/foostan/cornelius/keymaps/pdl/keymap.c | 2 +- keyboards/handwired/reclined/keymaps/pdl/keymap.c | 2 +- keyboards/handwired/reclined/keymaps/pdl/rules.mk | 4 +--- keyboards/lets_split/keymaps/pdl/keymap.c | 2 +- keyboards/lets_split/keymaps/pdl/rules.mk | 2 +- keyboards/orthodox/keymaps/pdl/keymap.c | 2 +- keyboards/orthodox/keymaps/pdl/rules.mk | 3 +-- 7 files changed, 7 insertions(+), 10 deletions(-) diff --git a/keyboards/foostan/cornelius/keymaps/pdl/keymap.c b/keyboards/foostan/cornelius/keymaps/pdl/keymap.c index 87e32dce9a3e..ba0166c1be44 100644 --- a/keyboards/foostan/cornelius/keymaps/pdl/keymap.c +++ b/keyboards/foostan/cornelius/keymaps/pdl/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "pdl.c" +#include "pdl.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_wrapper( \ diff --git a/keyboards/handwired/reclined/keymaps/pdl/keymap.c b/keyboards/handwired/reclined/keymaps/pdl/keymap.c index 1c4fc62829ab..7f0820a44cb7 100644 --- a/keyboards/handwired/reclined/keymaps/pdl/keymap.c +++ b/keyboards/handwired/reclined/keymaps/pdl/keymap.c @@ -21,7 +21,7 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "pdl.c" +#include "pdl.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_wrapper( \ diff --git a/keyboards/handwired/reclined/keymaps/pdl/rules.mk b/keyboards/handwired/reclined/keymaps/pdl/rules.mk index 7075ef8cc74c..ae71cbf49136 100644 --- a/keyboards/handwired/reclined/keymaps/pdl/rules.mk +++ b/keyboards/handwired/reclined/keymaps/pdl/rules.mk @@ -1,3 +1 @@ -SRC += pdl.c - - +USER_NAME = pdl diff --git a/keyboards/lets_split/keymaps/pdl/keymap.c b/keyboards/lets_split/keymaps/pdl/keymap.c index fcbbdc778ad0..38c5f56adc41 100644 --- a/keyboards/lets_split/keymaps/pdl/keymap.c +++ b/keyboards/lets_split/keymaps/pdl/keymap.c @@ -21,7 +21,7 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "pdl.c" +#include "pdl.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_wrapper( \ diff --git a/keyboards/lets_split/keymaps/pdl/rules.mk b/keyboards/lets_split/keymaps/pdl/rules.mk index 7b06c839c5c1..ae71cbf49136 100644 --- a/keyboards/lets_split/keymaps/pdl/rules.mk +++ b/keyboards/lets_split/keymaps/pdl/rules.mk @@ -1 +1 @@ -SRC += pdl.c +USER_NAME = pdl diff --git a/keyboards/orthodox/keymaps/pdl/keymap.c b/keyboards/orthodox/keymaps/pdl/keymap.c index 1e96ef4232b9..dac65cd33b67 100644 --- a/keyboards/orthodox/keymaps/pdl/keymap.c +++ b/keyboards/orthodox/keymaps/pdl/keymap.c @@ -20,7 +20,7 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "pdl.c" +#include "pdl.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_wrapper( \ diff --git a/keyboards/orthodox/keymaps/pdl/rules.mk b/keyboards/orthodox/keymaps/pdl/rules.mk index ebdbd8adca40..ae71cbf49136 100644 --- a/keyboards/orthodox/keymaps/pdl/rules.mk +++ b/keyboards/orthodox/keymaps/pdl/rules.mk @@ -1,2 +1 @@ -SRC += pdl.c - +USER_NAME = pdl From 5a01724a240ce2ddd9b9934f85b69ad761189eb8 Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Sat, 25 Sep 2021 11:51:16 +0100 Subject: [PATCH 16/24] Style/comment changes per code review As suggested by @fauxpark Co-authored-by: Ryan Co-authored-by: Drashna Jaelre --- .../foostan/cornelius/keymaps/pdl/keymap.c | 70 +++++++++---------- .../handwired/reclined/keymaps/pdl/keymap.c | 70 +++++++++---------- keyboards/handwired/reclined/readme.md | 12 +++- keyboards/handwired/reclined/rules.mk | 3 +- keyboards/lets_split/keymaps/pdl/keymap.c | 70 +++++++++---------- keyboards/orthodox/keymaps/pdl/keymap.c | 56 +++++++-------- 6 files changed, 143 insertions(+), 138 deletions(-) diff --git a/keyboards/foostan/cornelius/keymaps/pdl/keymap.c b/keyboards/foostan/cornelius/keymaps/pdl/keymap.c index ba0166c1be44..3b71280ad8bd 100644 --- a/keyboards/foostan/cornelius/keymaps/pdl/keymap.c +++ b/keyboards/foostan/cornelius/keymaps/pdl/keymap.c @@ -17,46 +17,46 @@ #include "pdl.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT_wrapper( \ - MY_FESC, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, \ - KC_TAB, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, MY_SQUO, \ - MY_SBSL, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT, \ - KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT \ + [_QWERTY] = LAYOUT_wrapper( + MY_FESC, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, + KC_TAB, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, MY_SQUO, + MY_SBSL, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT ), - [_PROXIM] = LAYOUT_wrapper( \ - MY_FESC, _________________PROXIM_L1_________________, _________________PROXIM_R1_________________, KC_BSPC, \ - KC_TAB, _________________PROXIM_L2_________________, _________________PROXIM_R2_________________, MY_ASCL, \ - MY_SBSL, _________________PROXIM_L3_________________, _________________PROXIM_R3_________________, KC_RSFT, \ - KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT \ + [_PROXIM] = LAYOUT_wrapper( + MY_FESC, _________________PROXIM_L1_________________, _________________PROXIM_R1_________________, KC_BSPC, + KC_TAB, _________________PROXIM_L2_________________, _________________PROXIM_R2_________________, MY_ASCL, + MY_SBSL, _________________PROXIM_L3_________________, _________________PROXIM_R3_________________, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT ), - [_NAVIGN] = LAYOUT_wrapper( \ - _______, _________________NAVIGN_L1_________________, _______, _______, _______, _______, _______, _______, \ - _______, _________________NAVIGN_L2_________________, _______, _______, _______, _______, _______, _______, \ - _______, _________________NAVIGN_L3_________________, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + [_NAVIGN] = LAYOUT_wrapper( + _______, _________________NAVIGN_L1_________________, _______, _______, _______, _______, _______, _______, + _______, _________________NAVIGN_L2_________________, _______, _______, _______, _______, _______, _______, + _______, _________________NAVIGN_L3_________________, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_PUNCTN] = LAYOUT_wrapper( \ - _______, _______, _______, _______, _______, _______, _________________PUNCTN_R1_________________, _______, \ - _______, _______, _______, _______, _______, _______, _________________PUNCTN_R2_________________, _______, \ - _______, _______, _______, _______, _______, _______, _________________PUNCTN_R3_________________, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + [_PUNCTN] = LAYOUT_wrapper( + _______, _______, _______, _______, _______, _______, _________________PUNCTN_R1_________________, _______, + _______, _______, _______, _______, _______, _______, _________________PUNCTN_R2_________________, _______, + _______, _______, _______, _______, _______, _______, _________________PUNCTN_R3_________________, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_NUMBRS] = LAYOUT_wrapper( \ - _______, _________________NUMBRS_L1_________________, _______, _______, _______, _______, _______, _______, \ - _______, _________________NUMBRS_L2_________________, _______, _______, _______, _______, _______, _______, \ - _______, _________________NUMBRS_L3_________________, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + [_NUMBRS] = LAYOUT_wrapper( + _______, _________________NUMBRS_L1_________________, _______, _______, _______, _______, _______, _______, + _______, _________________NUMBRS_L2_________________, _______, _______, _______, _______, _______, _______, + _______, _________________NUMBRS_L3_________________, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_CODING] = LAYOUT_wrapper( \ - _______, _______, _______, _______, _______, _______, _________________CODING_R1_________________, _______, \ - _______, _______, _______, _______, _______, _______, _________________CODING_R2_________________, _______, \ - _______, _______, _______, _______, _______, _______, _________________CODING_R3_________________, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + [_CODING] = LAYOUT_wrapper( + _______, _______, _______, _______, _______, _______, _________________CODING_R1_________________, _______, + _______, _______, _______, _______, _______, _______, _________________CODING_R2_________________, _______, + _______, _______, _______, _______, _______, _______, _________________CODING_R3_________________, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_FUNCTN] = LAYOUT_wrapper( \ - _______, _________________FUNCTN_L1_________________, _________________FUNCTN_R1_________________, MY_CAD, \ - _______, _________________FUNCTN_L2_________________, _________________FUNCTN_R2_________________, KC_PSCR, \ - _______, _________________FUNCTN_L3_________________, _________________FUNCTN_R3_________________, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + [_FUNCTN] = LAYOUT_wrapper( + _______, _________________FUNCTN_L1_________________, _________________FUNCTN_R1_________________, MY_CAD, + _______, _________________FUNCTN_L2_________________, _________________FUNCTN_R2_________________, KC_PSCR, + _______, _________________FUNCTN_L3_________________, _________________FUNCTN_R3_________________, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/handwired/reclined/keymaps/pdl/keymap.c b/keyboards/handwired/reclined/keymaps/pdl/keymap.c index 7f0820a44cb7..bb6976de9bb8 100644 --- a/keyboards/handwired/reclined/keymaps/pdl/keymap.c +++ b/keyboards/handwired/reclined/keymaps/pdl/keymap.c @@ -24,46 +24,46 @@ along with this program. If not, see . #include "pdl.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT_wrapper( \ - KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, \ - MY_SESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, MY_SQUO, \ - MY_CBSL, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, MY_SQUO, \ - KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT \ + [_QWERTY] = LAYOUT_wrapper( + KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, + MY_SESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, MY_SQUO, + MY_CBSL, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, MY_SQUO, + KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT ), - [_PROXIM] = LAYOUT_wrapper( \ - MY_FESC, _________________PROXIM_L1_________________, _________________PROXIM_R1_________________, KC_BSPC, \ - KC_TAB, _________________PROXIM_L2_________________, _________________PROXIM_R2_________________, MY_ASCL, \ - MY_SBSL, _________________PROXIM_L3_________________, _________________PROXIM_R3_________________, MY_SENT, \ - KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT \ + [_PROXIM] = LAYOUT_wrapper( + MY_FESC, _________________PROXIM_L1_________________, _________________PROXIM_R1_________________, KC_BSPC, + KC_TAB, _________________PROXIM_L2_________________, _________________PROXIM_R2_________________, MY_ASCL, + MY_SBSL, _________________PROXIM_L3_________________, _________________PROXIM_R3_________________, MY_SENT, + KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT ), - [_NAVIGN] = LAYOUT_wrapper( \ - _______, _________________NAVIGN_L1_________________, _______, _______, _______, _______, _______, _______, \ - _______, _________________NAVIGN_L2_________________, _______, _______, _______, _______, _______, _______, \ - _______, _________________NAVIGN_L3_________________, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + [_NAVIGN] = LAYOUT_wrapper( + _______, _________________NAVIGN_L1_________________, _______, _______, _______, _______, _______, _______, + _______, _________________NAVIGN_L2_________________, _______, _______, _______, _______, _______, _______, + _______, _________________NAVIGN_L3_________________, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_PUNCTN] = LAYOUT_wrapper( \ - _______, _______, _______, _______, _______, _______, _________________PUNCTN_R1_________________, _______, \ - _______, _______, _______, _______, _______, _______, _________________PUNCTN_R2_________________, _______, \ - _______, _______, _______, _______, _______, _______, _________________PUNCTN_R3_________________, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + [_PUNCTN] = LAYOUT_wrapper( + _______, _______, _______, _______, _______, _______, _________________PUNCTN_R1_________________, _______, + _______, _______, _______, _______, _______, _______, _________________PUNCTN_R2_________________, _______, + _______, _______, _______, _______, _______, _______, _________________PUNCTN_R3_________________, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_NUMBRS] = LAYOUT_wrapper( \ - _______, _________________NUMBRS_L1_________________, _______, _______, _______, _______, _______, _______, \ - _______, _________________NUMBRS_L2_________________, _______, _______, _______, _______, _______, _______, \ - _______, _________________NUMBRS_L3_________________, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + [_NUMBRS] = LAYOUT_wrapper( + _______, _________________NUMBRS_L1_________________, _______, _______, _______, _______, _______, _______, + _______, _________________NUMBRS_L2_________________, _______, _______, _______, _______, _______, _______, + _______, _________________NUMBRS_L3_________________, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_CODING] = LAYOUT_wrapper( \ - _______, _______, _______, _______, _______, _______, _________________CODING_R1_________________, _______, \ - _______, _______, _______, _______, _______, _______, _________________CODING_R2_________________, _______, \ - _______, _______, _______, _______, _______, _______, _________________CODING_R3_________________, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + [_CODING] = LAYOUT_wrapper( + _______, _______, _______, _______, _______, _______, _________________CODING_R1_________________, _______, + _______, _______, _______, _______, _______, _______, _________________CODING_R2_________________, _______, + _______, _______, _______, _______, _______, _______, _________________CODING_R3_________________, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_FUNCTN] = LAYOUT_wrapper( \ - _______, _________________FUNCTN_L1_________________, _________________FUNCTN_R1_________________, MY_CAD, \ - _______, _________________FUNCTN_L2_________________, _________________FUNCTN_R2_________________, KC_PSCR, \ - _______, _________________FUNCTN_L3_________________, _________________FUNCTN_R3_________________, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + [_FUNCTN] = LAYOUT_wrapper( + _______, _________________FUNCTN_L1_________________, _________________FUNCTN_R1_________________, MY_CAD, + _______, _________________FUNCTN_L2_________________, _________________FUNCTN_R2_________________, KC_PSCR, + _______, _________________FUNCTN_L3_________________, _________________FUNCTN_R3_________________, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/handwired/reclined/readme.md b/keyboards/handwired/reclined/readme.md index 40d1aac66516..d7594798ef55 100644 --- a/keyboards/handwired/reclined/readme.md +++ b/keyboards/handwired/reclined/readme.md @@ -2,10 +2,16 @@ A custom staggered 40 percent keyboard split at 22.5 degrees. -Keyboard Maintainer: [pdl](https://github.com/pdl) -Hardware Supported: Just one device -Hardware Availability: None +* Keyboard Maintainer: [pdl](https://github.com/pdl) +* Hardware Supported: Just one device +* Hardware Availability: None Make example for this keyboard (after setting up your build environment): make handwired/reclined:default + +Flashing example for this keyboard: + + make handwired/reclined: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/handwired/reclined/rules.mk b/keyboards/handwired/reclined/rules.mk index eec2eaf28f6f..ee771b1e64af 100644 --- a/keyboards/handwired/reclined/rules.mk +++ b/keyboards/handwired/reclined/rules.mk @@ -16,9 +16,8 @@ COMMAND_ENABLE = yes # Commands for debug and configuration SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = no # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output LAYOUTS = ortho_4x12 diff --git a/keyboards/lets_split/keymaps/pdl/keymap.c b/keyboards/lets_split/keymaps/pdl/keymap.c index 38c5f56adc41..b112e2270f7e 100644 --- a/keyboards/lets_split/keymaps/pdl/keymap.c +++ b/keyboards/lets_split/keymaps/pdl/keymap.c @@ -24,46 +24,46 @@ along with this program. If not, see . #include "pdl.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT_wrapper( \ - KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, \ - MY_SESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, MY_SQUO, \ - MY_CBSL, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, MY_SQUO, \ - KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT \ + [_QWERTY] = LAYOUT_wrapper( + KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, + MY_SESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, MY_SQUO, + MY_CBSL, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, MY_SQUO, + KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT ), - [_PROXIM] = LAYOUT_wrapper( \ - MY_FESC, _________________PROXIM_L1_________________, _________________PROXIM_R1_________________, KC_BSPC, \ - KC_TAB, _________________PROXIM_L2_________________, _________________PROXIM_R2_________________, MY_ASCL, \ - MY_SBSL, _________________PROXIM_L3_________________, _________________PROXIM_R3_________________, MY_SENT, \ - KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT \ + [_PROXIM] = LAYOUT_wrapper( + MY_FESC, _________________PROXIM_L1_________________, _________________PROXIM_R1_________________, KC_BSPC, + KC_TAB, _________________PROXIM_L2_________________, _________________PROXIM_R2_________________, MY_ASCL, + MY_SBSL, _________________PROXIM_L3_________________, _________________PROXIM_R3_________________, MY_SENT, + KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN, MY_CENT ), - [_NAVIGN] = LAYOUT_wrapper( \ - _______, _________________NAVIGN_L1_________________, _______, _______, _______, _______, _______, _______, \ - _______, _________________NAVIGN_L2_________________, _______, _______, _______, _______, _______, _______, \ - _______, _________________NAVIGN_L3_________________, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + [_NAVIGN] = LAYOUT_wrapper( + _______, _________________NAVIGN_L1_________________, _______, _______, _______, _______, _______, _______, + _______, _________________NAVIGN_L2_________________, _______, _______, _______, _______, _______, _______, + _______, _________________NAVIGN_L3_________________, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_PUNCTN] = LAYOUT_wrapper( \ - _______, _______, _______, _______, _______, _______, _________________PUNCTN_R1_________________, _______, \ - _______, _______, _______, _______, _______, _______, _________________PUNCTN_R2_________________, _______, \ - _______, _______, _______, _______, _______, _______, _________________PUNCTN_R3_________________, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + [_PUNCTN] = LAYOUT_wrapper( + _______, _______, _______, _______, _______, _______, _________________PUNCTN_R1_________________, _______, + _______, _______, _______, _______, _______, _______, _________________PUNCTN_R2_________________, _______, + _______, _______, _______, _______, _______, _______, _________________PUNCTN_R3_________________, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_NUMBRS] = LAYOUT_wrapper( \ - _______, _________________NUMBRS_L1_________________, _______, _______, _______, _______, _______, _______, \ - _______, _________________NUMBRS_L2_________________, _______, _______, _______, _______, _______, _______, \ - _______, _________________NUMBRS_L3_________________, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + [_NUMBRS] = LAYOUT_wrapper( + _______, _________________NUMBRS_L1_________________, _______, _______, _______, _______, _______, _______, + _______, _________________NUMBRS_L2_________________, _______, _______, _______, _______, _______, _______, + _______, _________________NUMBRS_L3_________________, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_CODING] = LAYOUT_wrapper( \ - _______, _______, _______, _______, _______, _______, _________________CODING_R1_________________, _______, \ - _______, _______, _______, _______, _______, _______, _________________CODING_R2_________________, _______, \ - _______, _______, _______, _______, _______, _______, _________________CODING_R3_________________, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + [_CODING] = LAYOUT_wrapper( + _______, _______, _______, _______, _______, _______, _________________CODING_R1_________________, _______, + _______, _______, _______, _______, _______, _______, _________________CODING_R2_________________, _______, + _______, _______, _______, _______, _______, _______, _________________CODING_R3_________________, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_FUNCTN] = LAYOUT_wrapper( \ - _______, _________________FUNCTN_L1_________________, _________________FUNCTN_R1_________________, MY_CAD, \ - _______, _________________FUNCTN_L2_________________, _________________FUNCTN_R2_________________, KC_PSCR, \ - _______, _________________FUNCTN_L3_________________, _________________FUNCTN_R3_________________, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + [_FUNCTN] = LAYOUT_wrapper( + _______, _________________FUNCTN_L1_________________, _________________FUNCTN_R1_________________, MY_CAD, + _______, _________________FUNCTN_L2_________________, _________________FUNCTN_R2_________________, KC_PSCR, + _______, _________________FUNCTN_L3_________________, _________________FUNCTN_R3_________________, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/orthodox/keymaps/pdl/keymap.c b/keyboards/orthodox/keymaps/pdl/keymap.c index dac65cd33b67..42b9e7e48542 100644 --- a/keyboards/orthodox/keymaps/pdl/keymap.c +++ b/keyboards/orthodox/keymaps/pdl/keymap.c @@ -23,46 +23,46 @@ along with this program. If not, see . #include "pdl.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT_wrapper( \ - KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, \ - MY_SESC, _________________QWERTY_L2_________________, KC_LALT, KC_LGUI, FUNCTN, MY_AMNU, _________________QWERTY_R2_________________, MY_SQUO, \ - MY_CBSL, _________________QWERTY_L3_________________, NAVIGN, KC_SPC, NUMBRS, NUMBRS, MY_SSPC, NAVIGN, _________________QWERTY_R3_________________, MY_CENT \ + [_QWERTY] = LAYOUT_wrapper( + KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, + MY_SESC, _________________QWERTY_L2_________________, KC_LALT, KC_LGUI, FUNCTN, MY_AMNU, _________________QWERTY_R2_________________, MY_SQUO, + MY_CBSL, _________________QWERTY_L3_________________, NAVIGN, KC_SPC, NUMBRS, NUMBRS, MY_SSPC, NAVIGN, _________________QWERTY_R3_________________, MY_CENT ), - [_PROXIM] = LAYOUT_wrapper( \ - MY_SESC, _________________PROXIM_L1_________________, _________________PROXIM_R1_________________, KC_BSPC, \ - KC_TAB, _________________PROXIM_L2_________________, KC_LALT, KC_LGUI, FUNCTN, MY_AMNU, _________________PROXIM_R2_________________, MY_SSCL, \ - MY_CBSL, _________________PROXIM_L3_________________, NAVIGN, KC_SPC, NUMBRS, NUMBRS, MY_SSPC, NAVIGN, _________________PROXIM_R3_________________, MY_CENT \ + [_PROXIM] = LAYOUT_wrapper( + MY_SESC, _________________PROXIM_L1_________________, _________________PROXIM_R1_________________, KC_BSPC, + KC_TAB, _________________PROXIM_L2_________________, KC_LALT, KC_LGUI, FUNCTN, MY_AMNU, _________________PROXIM_R2_________________, MY_SSCL, + MY_CBSL, _________________PROXIM_L3_________________, NAVIGN, KC_SPC, NUMBRS, NUMBRS, MY_SSPC, NAVIGN, _________________PROXIM_R3_________________, MY_CENT ), - [_NAVIGN] = LAYOUT_wrapper( \ - _______, _________________NAVIGN_L1_________________, _______, _______, _______, _______, _______, _______, \ - _______, _________________NAVIGN_L2_________________, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _________________NAVIGN_L3_________________, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + [_NAVIGN] = LAYOUT_wrapper( + _______, _________________NAVIGN_L1_________________, _______, _______, _______, _______, _______, _______, + _______, _________________NAVIGN_L2_________________, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _________________NAVIGN_L3_________________, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_PUNCTN] = LAYOUT_wrapper( \ - _______, _______, _______, _______, _______, _______, _________________PUNCTN_R1_________________, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _________________PUNCTN_R2_________________, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _________________PUNCTN_R3_________________, _______ \ + [_PUNCTN] = LAYOUT_wrapper( + _______, _______, _______, _______, _______, _______, _________________PUNCTN_R1_________________, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _________________PUNCTN_R2_________________, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _________________PUNCTN_R3_________________, _______ ), - [_NUMBRS] = LAYOUT_wrapper( \ - _______, _________________NUMBRS_L1_________________, _______, _______, _______, _______, _______, _______, \ - _______, _________________NUMBRS_L2_________________, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _________________NUMBRS_L3_________________, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + [_NUMBRS] = LAYOUT_wrapper( + _______, _________________NUMBRS_L1_________________, _______, _______, _______, _______, _______, _______, + _______, _________________NUMBRS_L2_________________, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _________________NUMBRS_L3_________________, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_CODING] = LAYOUT_wrapper( \ - _______, _______, _______, _______, _______, _______, _________________CODING_R1_________________, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _________________CODING_R2_________________, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _________________CODING_R3_________________, _______ \ + [_CODING] = LAYOUT_wrapper( + _______, _______, _______, _______, _______, _______, _________________CODING_R1_________________, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _________________CODING_R2_________________, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _________________CODING_R3_________________, _______ ), - [_FUNCTN] = LAYOUT_wrapper( \ - _______, _________________FUNCTN_L1_________________, _________________FUNCTN_L1_________________, MY_CAD, \ - _______, _________________FUNCTN_L2_________________, _______, _______, _______, _______, _________________FUNCTN_L2_________________, KC_PSCR, \ - _______, _________________FUNCTN_L3_________________, _______, _______, _______, _______, _______, _______, _________________FUNCTN_L3_________________, _______ \ + [_FUNCTN] = LAYOUT_wrapper( + _______, _________________FUNCTN_L1_________________, _________________FUNCTN_L1_________________, MY_CAD, + _______, _________________FUNCTN_L2_________________, _______, _______, _______, _______, _________________FUNCTN_L2_________________, KC_PSCR, + _______, _________________FUNCTN_L3_________________, _______, _______, _______, _______, _______, _______, _________________FUNCTN_L3_________________, _______ ) }; From 972cc6335f117d766119230e82804f3590e67a7c Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Sun, 26 Sep 2021 20:57:12 +0100 Subject: [PATCH 17/24] Two more style/comment changes per code review Per @fauxpark Co-authored-by: Ryan --- keyboards/handwired/reclined/rules.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/handwired/reclined/rules.mk b/keyboards/handwired/reclined/rules.mk index ee771b1e64af..fdddb5615129 100644 --- a/keyboards/handwired/reclined/rules.mk +++ b/keyboards/handwired/reclined/rules.mk @@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = yes # Console for debug @@ -17,7 +17,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -UNICODE_ENABLE = no # Unicode AUDIO_ENABLE = no # Audio output LAYOUTS = ortho_4x12 From 953f2b7a5def986117a359a5017a164c9fd52cdf Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Sun, 26 Sep 2021 21:59:06 +0100 Subject: [PATCH 18/24] Add info.json for handwired/reclined --- keyboards/handwired/reclined/info.json | 88 ++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 keyboards/handwired/reclined/info.json diff --git a/keyboards/handwired/reclined/info.json b/keyboards/handwired/reclined/info.json new file mode 100644 index 000000000000..2662f7a079ba --- /dev/null +++ b/keyboards/handwired/reclined/info.json @@ -0,0 +1,88 @@ +{ + "manufacturer": "pdl", + "keyboard_name": "handwired/reclined", + "maintainer": "qmk", + "bootloader": "atmel-dfu", + "debounce": 5, + "diode_direction": "ROW2COL", + "features": { + "audio": false, + "backlight": false, + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "sleep_led": false, + "unicode": false + }, + "matrix_pins": { + "cols": ["B2", "F4", "B3", "F5", "B1", "F6", "D4", "D7", "D0", "E6", "D1", "B4"], + "rows": ["D3", "C6", "B6", "B5"] + }, + "processor": "atmega32u4", + "usb": { + "device_ver": "0x0001", + "pid": "0x0000", + "vid": "0xFEED" + }, + "community_layouts": ["ortho_4x12"], + "layouts": { + "LAYOUT_ortho_4x12": { + "c_macro": true, + "filename": "keyboards/handwired/reclined/reclined.h", + "key_count": 48, + "layout": [ + { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, + { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, + { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, + { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, + { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, + { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, + { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, + { "label": "k07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, + { "label": "k08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, + { "label": "k09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, + { "label": "k0a", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, + { "label": "k0b", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, + { "label": "k10", "matrix": [1, 0], "w": 1, "x": 12, "y": 0 }, + { "label": "k11", "matrix": [1, 1], "w": 1, "x": 13, "y": 0 }, + { "label": "k12", "matrix": [1, 2], "w": 1, "x": 14, "y": 0 }, + { "label": "k13", "matrix": [1, 3], "w": 1, "x": 15, "y": 0 }, + { "label": "k14", "matrix": [1, 4], "w": 1, "x": 16, "y": 0 }, + { "label": "k15", "matrix": [1, 5], "w": 1, "x": 17, "y": 0 }, + { "label": "k16", "matrix": [1, 6], "w": 1, "x": 18, "y": 0 }, + { "label": "k17", "matrix": [1, 7], "w": 1, "x": 19, "y": 0 }, + { "label": "k18", "matrix": [1, 8], "w": 1, "x": 20, "y": 0 }, + { "label": "k19", "matrix": [1, 9], "w": 1, "x": 21, "y": 0 }, + { "label": "k1a", "matrix": [1, 10], "w": 1, "x": 22, "y": 0 }, + { "label": "k1b", "matrix": [1, 11], "w": 1, "x": 23, "y": 0 }, + { "label": "k20", "matrix": [2, 0], "w": 1, "x": 24, "y": 0 }, + { "label": "k21", "matrix": [2, 1], "w": 1, "x": 25, "y": 0 }, + { "label": "k22", "matrix": [2, 2], "w": 1, "x": 26, "y": 0 }, + { "label": "k23", "matrix": [2, 3], "w": 1, "x": 27, "y": 0 }, + { "label": "k24", "matrix": [2, 4], "w": 1, "x": 28, "y": 0 }, + { "label": "k25", "matrix": [2, 5], "w": 1, "x": 29, "y": 0 }, + { "label": "k26", "matrix": [2, 6], "w": 1, "x": 30, "y": 0 }, + { "label": "k27", "matrix": [2, 7], "w": 1, "x": 31, "y": 0 }, + { "label": "k28", "matrix": [2, 8], "w": 1, "x": 32, "y": 0 }, + { "label": "k29", "matrix": [2, 9], "w": 1, "x": 33, "y": 0 }, + { "label": "k2a", "matrix": [2, 10], "w": 1, "x": 34, "y": 0 }, + { "label": "k2b", "matrix": [2, 11], "w": 1, "x": 35, "y": 0 }, + { "label": "k30", "matrix": [3, 0], "w": 1, "x": 36, "y": 0 }, + { "label": "k31", "matrix": [3, 1], "w": 1, "x": 37, "y": 0 }, + { "label": "k32", "matrix": [3, 2], "w": 1, "x": 38, "y": 0 }, + { "label": "k33", "matrix": [3, 3], "w": 1, "x": 39, "y": 0 }, + { "label": "k34", "matrix": [3, 4], "w": 1, "x": 40, "y": 0 }, + { "label": "k35", "matrix": [3, 5], "w": 1, "x": 41, "y": 0 }, + { "label": "k36", "matrix": [3, 6], "w": 1, "x": 42, "y": 0 }, + { "label": "k37", "matrix": [3, 7], "w": 1, "x": 43, "y": 0 }, + { "label": "k38", "matrix": [3, 8], "w": 1, "x": 44, "y": 0 }, + { "label": "k39", "matrix": [3, 9], "w": 1, "x": 45, "y": 0 }, + { "label": "k3a", "matrix": [3, 10], "w": 1, "x": 46, "y": 0 }, + { "label": "k3b", "matrix": [3, 11], "w": 1, "x": 47, "y": 0 } + ] + } + } +} From ec5c7059c44d15391e01a8aa372f46e64f07947a Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Sun, 17 Oct 2021 21:31:39 +0100 Subject: [PATCH 19/24] Remove or comment out lines which info.json makes redundant in handwired/reclined --- keyboards/handwired/reclined/config.h | 21 +++++++-------------- keyboards/handwired/reclined/rules.mk | 23 +++++++++-------------- 2 files changed, 16 insertions(+), 28 deletions(-) diff --git a/keyboards/handwired/reclined/config.h b/keyboards/handwired/reclined/config.h index c8425194cbb4..4cd471a24da9 100644 --- a/keyboards/handwired/reclined/config.h +++ b/keyboards/handwired/reclined/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER pdl -#define PRODUCT reclined - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 @@ -33,25 +26,25 @@ along with this program. If not, see . /* * Keyboard Matrix Assignments * - * Change this to how you wired your keyboard + * Change this to how you wired your keyboard (to overwrite info.json) * COLS: AVR pins used for columns, left to right * ROWS: AVR pins used for rows, top to bottom * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) * */ -#define MATRIX_ROW_PINS { D3, C6, B6, B5 } -#define MATRIX_COL_PINS { B2, F4, B3, F5, B1, F6, D4, D7, D0, E6, D1, B4 } -#define UNUSED_PINS +// #define MATRIX_ROW_PINS { D3, C6, B6, B5 } +// #define MATRIX_COL_PINS { B2, F4, B3, F5, B1, F6, D4, D7, D0, E6, D1, B4 } +// #define UNUSED_PINS /* COL2ROW, ROW2COL, or CUSTOM_MATRIX */ -#define DIODE_DIRECTION ROW2COL +// #define DIODE_DIRECTION ROW2COL /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 +// #define DEBOUNCE 5 /* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST +// #define MATRIX_HAS_GHOST /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/handwired/reclined/rules.mk b/keyboards/handwired/reclined/rules.mk index fdddb5615129..16f259c2be22 100644 --- a/keyboards/handwired/reclined/rules.mk +++ b/keyboards/handwired/reclined/rules.mk @@ -5,18 +5,13 @@ MCU = atmega32u4 BOOTLOADER = atmel-dfu # Build Options -# change yes to no to disable +# change yes to no to disable, overwriting info.json # -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = no # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output - -LAYOUTS = ortho_4x12 +# BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +# MOUSEKEY_ENABLE = yes # Mouse keys +# EXTRAKEY_ENABLE = yes # Audio control and System control +# CONSOLE_ENABLE = yes # Console for debug +# COMMAND_ENABLE = yes # Commands for debug and configuration +# NKRO_ENABLE = no # USB Nkey Rollover +# BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +# AUDIO_ENABLE = no # Audio output From b262200afe9849bf06c249a7e7d73b556d0fa9d7 Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Fri, 29 Oct 2021 12:30:18 +0100 Subject: [PATCH 20/24] Apply suggestions from code review per @fauxpark I'm not fussy about where this stuff goes and happy to be guided on what the correct location for it is. Co-authored-by: Ryan --- keyboards/handwired/reclined/info.json | 1 - keyboards/handwired/reclined/rules.mk | 22 +++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/keyboards/handwired/reclined/info.json b/keyboards/handwired/reclined/info.json index 2662f7a079ba..edd4c36c5cd0 100644 --- a/keyboards/handwired/reclined/info.json +++ b/keyboards/handwired/reclined/info.json @@ -32,7 +32,6 @@ "LAYOUT_ortho_4x12": { "c_macro": true, "filename": "keyboards/handwired/reclined/reclined.h", - "key_count": 48, "layout": [ { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, diff --git a/keyboards/handwired/reclined/rules.mk b/keyboards/handwired/reclined/rules.mk index 16f259c2be22..f30d1c1edd27 100644 --- a/keyboards/handwired/reclined/rules.mk +++ b/keyboards/handwired/reclined/rules.mk @@ -5,13 +5,17 @@ MCU = atmega32u4 BOOTLOADER = atmel-dfu # Build Options -# change yes to no to disable, overwriting info.json +# change yes to no to disable # -# BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -# MOUSEKEY_ENABLE = yes # Mouse keys -# EXTRAKEY_ENABLE = yes # Audio control and System control -# CONSOLE_ENABLE = yes # Console for debug -# COMMAND_ENABLE = yes # Commands for debug and configuration -# NKRO_ENABLE = no # USB Nkey Rollover -# BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -# AUDIO_ENABLE = no # Audio output +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = no # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output From 7f5cf618916b8f6e84cd71fe5bfada0f5c9c6d0d Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Sat, 26 Mar 2022 17:53:09 +0000 Subject: [PATCH 21/24] Remove redundant line per @noroadsleft Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/handwired/reclined/keymaps/pdl/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/handwired/reclined/keymaps/pdl/rules.mk b/keyboards/handwired/reclined/keymaps/pdl/rules.mk index ae71cbf49136..e69de29bb2d1 100644 --- a/keyboards/handwired/reclined/keymaps/pdl/rules.mk +++ b/keyboards/handwired/reclined/keymaps/pdl/rules.mk @@ -1 +0,0 @@ -USER_NAME = pdl From 410e8382c031bd133d810cc8764058ea4720af3c Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Sat, 26 Mar 2022 17:53:56 +0000 Subject: [PATCH 22/24] Update keyboards/handwired/reclined/info.json per @noroadsleft Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/handwired/reclined/info.json | 72 +++++++++++++------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/keyboards/handwired/reclined/info.json b/keyboards/handwired/reclined/info.json index edd4c36c5cd0..1398a9a2df6d 100644 --- a/keyboards/handwired/reclined/info.json +++ b/keyboards/handwired/reclined/info.json @@ -45,42 +45,42 @@ { "label": "k09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, { "label": "k0a", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, { "label": "k0b", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "label": "k10", "matrix": [1, 0], "w": 1, "x": 12, "y": 0 }, - { "label": "k11", "matrix": [1, 1], "w": 1, "x": 13, "y": 0 }, - { "label": "k12", "matrix": [1, 2], "w": 1, "x": 14, "y": 0 }, - { "label": "k13", "matrix": [1, 3], "w": 1, "x": 15, "y": 0 }, - { "label": "k14", "matrix": [1, 4], "w": 1, "x": 16, "y": 0 }, - { "label": "k15", "matrix": [1, 5], "w": 1, "x": 17, "y": 0 }, - { "label": "k16", "matrix": [1, 6], "w": 1, "x": 18, "y": 0 }, - { "label": "k17", "matrix": [1, 7], "w": 1, "x": 19, "y": 0 }, - { "label": "k18", "matrix": [1, 8], "w": 1, "x": 20, "y": 0 }, - { "label": "k19", "matrix": [1, 9], "w": 1, "x": 21, "y": 0 }, - { "label": "k1a", "matrix": [1, 10], "w": 1, "x": 22, "y": 0 }, - { "label": "k1b", "matrix": [1, 11], "w": 1, "x": 23, "y": 0 }, - { "label": "k20", "matrix": [2, 0], "w": 1, "x": 24, "y": 0 }, - { "label": "k21", "matrix": [2, 1], "w": 1, "x": 25, "y": 0 }, - { "label": "k22", "matrix": [2, 2], "w": 1, "x": 26, "y": 0 }, - { "label": "k23", "matrix": [2, 3], "w": 1, "x": 27, "y": 0 }, - { "label": "k24", "matrix": [2, 4], "w": 1, "x": 28, "y": 0 }, - { "label": "k25", "matrix": [2, 5], "w": 1, "x": 29, "y": 0 }, - { "label": "k26", "matrix": [2, 6], "w": 1, "x": 30, "y": 0 }, - { "label": "k27", "matrix": [2, 7], "w": 1, "x": 31, "y": 0 }, - { "label": "k28", "matrix": [2, 8], "w": 1, "x": 32, "y": 0 }, - { "label": "k29", "matrix": [2, 9], "w": 1, "x": 33, "y": 0 }, - { "label": "k2a", "matrix": [2, 10], "w": 1, "x": 34, "y": 0 }, - { "label": "k2b", "matrix": [2, 11], "w": 1, "x": 35, "y": 0 }, - { "label": "k30", "matrix": [3, 0], "w": 1, "x": 36, "y": 0 }, - { "label": "k31", "matrix": [3, 1], "w": 1, "x": 37, "y": 0 }, - { "label": "k32", "matrix": [3, 2], "w": 1, "x": 38, "y": 0 }, - { "label": "k33", "matrix": [3, 3], "w": 1, "x": 39, "y": 0 }, - { "label": "k34", "matrix": [3, 4], "w": 1, "x": 40, "y": 0 }, - { "label": "k35", "matrix": [3, 5], "w": 1, "x": 41, "y": 0 }, - { "label": "k36", "matrix": [3, 6], "w": 1, "x": 42, "y": 0 }, - { "label": "k37", "matrix": [3, 7], "w": 1, "x": 43, "y": 0 }, - { "label": "k38", "matrix": [3, 8], "w": 1, "x": 44, "y": 0 }, - { "label": "k39", "matrix": [3, 9], "w": 1, "x": 45, "y": 0 }, - { "label": "k3a", "matrix": [3, 10], "w": 1, "x": 46, "y": 0 }, - { "label": "k3b", "matrix": [3, 11], "w": 1, "x": 47, "y": 0 } + { "label": "k10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 }, + { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 }, + { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 }, + { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 }, + { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4, "y": 1 }, + { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5, "y": 1 }, + { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6, "y": 1 }, + { "label": "k17", "matrix": [1, 7], "w": 1, "x": 7, "y": 1 }, + { "label": "k18", "matrix": [1, 8], "w": 1, "x": 8, "y": 1 }, + { "label": "k19", "matrix": [1, 9], "w": 1, "x": 9, "y": 1 }, + { "label": "k1a", "matrix": [1, 10], "w": 1, "x": 10, "y": 1 }, + { "label": "k1b", "matrix": [1, 11], "w": 1, "x": 11, "y": 1 }, + { "label": "k20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 }, + { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 }, + { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 }, + { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 }, + { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4, "y": 2 }, + { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5, "y": 2 }, + { "label": "k26", "matrix": [2, 6], "w": 1, "x": 6, "y": 2 }, + { "label": "k27", "matrix": [2, 7], "w": 1, "x": 7, "y": 2 }, + { "label": "k28", "matrix": [2, 8], "w": 1, "x": 8, "y": 2 }, + { "label": "k29", "matrix": [2, 9], "w": 1, "x": 9, "y": 2 }, + { "label": "k2a", "matrix": [2, 10], "w": 1, "x": 10, "y": 2 }, + { "label": "k2b", "matrix": [2, 11], "w": 1, "x": 11, "y": 2 }, + { "label": "k30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 }, + { "label": "k31", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 }, + { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 }, + { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3, "y": 3 }, + { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4, "y": 3 }, + { "label": "k35", "matrix": [3, 5], "w": 1, "x": 5, "y": 3 }, + { "label": "k36", "matrix": [3, 6], "w": 1, "x": 6, "y": 3 }, + { "label": "k37", "matrix": [3, 7], "w": 1, "x": 7, "y": 3 }, + { "label": "k38", "matrix": [3, 8], "w": 1, "x": 8, "y": 3 }, + { "label": "k39", "matrix": [3, 9], "w": 1, "x": 9, "y": 3 }, + { "label": "k3a", "matrix": [3, 10], "w": 1, "x": 10, "y": 3 }, + { "label": "k3b", "matrix": [3, 11], "w": 1, "x": 11, "y": 3 } ] } } From 7a4238af4d0d8a3c8fda91b105e19e89e77d109e Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Sun, 27 Mar 2022 20:06:03 +0100 Subject: [PATCH 23/24] Apply suggestions from code review per @fauxpark Co-authored-by: Ryan --- keyboards/handwired/reclined/config.h | 41 --------------------------- keyboards/handwired/reclined/rules.mk | 5 +--- 2 files changed, 1 insertion(+), 45 deletions(-) diff --git a/keyboards/handwired/reclined/config.h b/keyboards/handwired/reclined/config.h index 4cd471a24da9..6f8159a2368f 100644 --- a/keyboards/handwired/reclined/config.h +++ b/keyboards/handwired/reclined/config.h @@ -19,32 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* key matrix size */ -#define MATRIX_ROWS 4 -#define MATRIX_COLS 12 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard (to overwrite info.json) - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -// #define MATRIX_ROW_PINS { D3, C6, B6, B5 } -// #define MATRIX_COL_PINS { B2, F4, B3, F5, B1, F6, D4, D7, D0, E6, D1, B4 } -// #define UNUSED_PINS - -/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */ -// #define DIODE_DIRECTION ROW2COL - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -// #define DEBOUNCE 5 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -// #define MATRIX_HAS_GHOST /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE @@ -73,18 +47,6 @@ along with this program. If not, see . */ //#define FORCE_NKRO -/* - * Magic Key Options - * - * Magic keys are hotkey commands that allow control over firmware functions of - * the keyboard. They are best used in combination with the HID Listen program, - * found here: https://www.pjrc.com/teensy/hid_listen.html - * - * The options below allow the magic key functionality to be changed. This is - * useful if your keyboard/keypad is missing keys and you want magic key support. - * - */ - /* * Feature disable options @@ -101,6 +63,3 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -//#define NO_ACTION_MACRO -//#define NO_ACTION_FUNCTION - diff --git a/keyboards/handwired/reclined/rules.mk b/keyboards/handwired/reclined/rules.mk index f30d1c1edd27..64e496d03021 100644 --- a/keyboards/handwired/reclined/rules.mk +++ b/keyboards/handwired/reclined/rules.mk @@ -12,10 +12,7 @@ MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = no # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = no # USB Nkey Rollover +NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output From 24f9066bfd90e1eaf48391235f74745cdbc12c10 Mon Sep 17 00:00:00 2001 From: Daniel Perrett Date: Sun, 27 Mar 2022 20:25:29 +0100 Subject: [PATCH 24/24] Add user keymap pdl for keyboard crkbd (corne) --- keyboards/crkbd/keymaps/pdl/config.h | 30 ++++++++++++++ keyboards/crkbd/keymaps/pdl/keymap.c | 62 ++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 keyboards/crkbd/keymaps/pdl/config.h create mode 100644 keyboards/crkbd/keymaps/pdl/keymap.c diff --git a/keyboards/crkbd/keymaps/pdl/config.h b/keyboards/crkbd/keymaps/pdl/config.h new file mode 100644 index 000000000000..b25d48de0235 --- /dev/null +++ b/keyboards/crkbd/keymaps/pdl/config.h @@ -0,0 +1,30 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert +Copyright 2021 Daniel Perrett + +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 + + +#define TAPPING_TOGGLE 2 +#define TAPPING_TERM 200 + +#define COMBO_PDL +#define COMBO_COUNT 28 +#define COMBO_TERM 100 diff --git a/keyboards/crkbd/keymaps/pdl/keymap.c b/keyboards/crkbd/keymaps/pdl/keymap.c new file mode 100644 index 000000000000..1060a92650d4 --- /dev/null +++ b/keyboards/crkbd/keymaps/pdl/keymap.c @@ -0,0 +1,62 @@ +/* Copyright 2022 Daniel Perrett + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H +#include "pdl.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT_wrapper( + MY_FESC, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, + KC_TAB, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, MY_SQUO, + MY_SBSL, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, MY_CENT, + KC_LCTL, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN + ), + [_PROXIM] = LAYOUT_wrapper( + MY_FESC, _________________PROXIM_L1_________________, _________________PROXIM_R1_________________, KC_BSPC, + KC_TAB, _________________PROXIM_L2_________________, _________________PROXIM_R2_________________, MY_ASCL, + MY_SBSL, _________________PROXIM_L3_________________, _________________PROXIM_R3_________________, MY_CENT, + KC_LCTL, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN + ), + [_NAVIGN] = LAYOUT_wrapper( + _______, _________________NAVIGN_L1_________________, _______, _______, _______, _______, _______, _______, + _______, _________________NAVIGN_L2_________________, _______, _______, _______, _______, _______, _______, + _______, _________________NAVIGN_L3_________________, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ + ), + [_PUNCTN] = LAYOUT_wrapper( + _______, _______, _______, _______, _______, _______, _________________PUNCTN_R1_________________, _______, + _______, _______, _______, _______, _______, _______, _________________PUNCTN_R2_________________, _______, + _______, _______, _______, _______, _______, _______, _________________PUNCTN_R3_________________, _______, + _______, _______, _______, _______, _______, _______ + ), + [_NUMBRS] = LAYOUT_wrapper( + _______, _________________NUMBRS_L1_________________, _______, _______, _______, _______, _______, _______, + _______, _________________NUMBRS_L2_________________, _______, _______, _______, _______, _______, _______, + _______, _________________NUMBRS_L3_________________, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ + ), + [_CODING] = LAYOUT_wrapper( + _______, _______, _______, _______, _______, _______, _________________CODING_R1_________________, _______, + _______, _______, _______, _______, _______, _______, _________________CODING_R2_________________, _______, + _______, _______, _______, _______, _______, _______, _________________CODING_R3_________________, _______, + _______, _______, _______, _______, _______, _______ + ), + [_FUNCTN] = LAYOUT_wrapper( + _______, _________________FUNCTN_L1_________________, _________________FUNCTN_R1_________________, MY_CAD, + _______, _________________FUNCTN_L2_________________, _________________FUNCTN_R2_________________, KC_PSCR, + _______, _________________FUNCTN_L3_________________, _________________FUNCTN_R3_________________, _______, + _______, _______, _______, _______, _______, _______ + ) +};