Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add userspace pdl and a handwired board #14199

Merged
merged 24 commits into from
Apr 13, 2022
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
9f00f38
Add user pdl, keymap orthodox:pdl
pdl Jun 29, 2018
7df9ed1
Add keymap lets_split:pdl
pdl Jul 3, 2018
4ac77a2
Add handwired keyboard 'reclined'
pdl Aug 10, 2018
ed448a7
Add layout foostan/cornelius:pdl
pdl Aug 15, 2021
95cfe22
Add combos to userspace pdl
pdl Aug 19, 2021
40e4fe7
Updates to follow code style, depracations
pdl Aug 29, 2021
d90b9be
Add GPL copyright headers per @drashna
pdl Aug 29, 2021
1cf5ae4
Always use LAYOUT_wrapper, not KEYMAP_wrapper, per @drashna
pdl Aug 29, 2021
2469b14
Convert layers into enums per @drashna
pdl Aug 29, 2021
0f902c1
Apply fixes per @zvecr
pdl Aug 30, 2021
5cbb885
Replace KEYMAP with LAYOUT per @zvecr
pdl Aug 30, 2021
2260952
Have handwired/reclined use ortho_4x12 layout
pdl Sep 2, 2021
07b62fd
Fix handwired/reclined:pdl due to changes to using ortho_4x12 layout
pdl Sep 3, 2021
fdf8363
Remove redundant declaration of LAYOUTS per @drashna
pdl Sep 12, 2021
6cd1b55
Invoke userspace with USER_NAME instead of SRC
pdl Sep 24, 2021
5a01724
Style/comment changes per code review
pdl Sep 25, 2021
972cc63
Two more style/comment changes per code review
pdl Sep 26, 2021
953f2b7
Add info.json for handwired/reclined
pdl Sep 26, 2021
ec5c705
Remove or comment out lines which info.json makes redundant in handwi…
pdl Oct 17, 2021
b262200
Apply suggestions from code review per @fauxpark
pdl Oct 29, 2021
7f5cf61
Remove redundant line per @noroadsleft
pdl Mar 26, 2022
410e838
Update keyboards/handwired/reclined/info.json per @noroadsleft
pdl Mar 26, 2022
7a4238a
Apply suggestions from code review per @fauxpark
pdl Mar 27, 2022
24f9066
Add user keymap pdl for keyboard crkbd (corne)
pdl Mar 27, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions keyboards/foostan/cornelius/keymaps/pdl/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*
This is the c configuration file for the keymap

Copyright 2012 Jun Wako <wakojun@gmail.com>
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 <http://www.gnu.org/licenses/>.
*/

#pragma once


#define TAPPING_TOGGLE 2
#define TAPPING_TERM 200

#define COMBO_PDL
#define COMBO_COUNT 28
#define COMBO_TERM 100
62 changes: 62 additions & 0 deletions keyboards/foostan/cornelius/keymaps/pdl/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/* 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 <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
#include "pdl.c"
pdl marked this conversation as resolved.
Show resolved Hide resolved

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 \
),
[_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_________________, _______, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
),
[_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_________________, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
pdl marked this conversation as resolved.
Show resolved Hide resolved
)
};
1 change: 1 addition & 0 deletions keyboards/foostan/cornelius/keymaps/pdl/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# A keymap for cornelius used by pdl
113 changes: 113 additions & 0 deletions keyboards/handwired/reclined/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
/*
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 <http://www.gnu.org/licenses/>.
*/

#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

/* 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 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

/* 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.
*
*/

pdl marked this conversation as resolved.
Show resolved Hide resolved

/*
* 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

pdl marked this conversation as resolved.
Show resolved Hide resolved
26 changes: 26 additions & 0 deletions keyboards/handwired/reclined/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/* 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 <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[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 ,
KC_LCTL, KC_LGUI, KC_LALT, RESET, KC_TAB, KC_SPC, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
),
};

1 change: 1 addition & 0 deletions keyboards/handwired/reclined/keymaps/default/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# The default keymap for reclined
23 changes: 23 additions & 0 deletions keyboards/handwired/reclined/keymaps/pdl/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
This is the c configuration file for the keymap

Copyright 2012 Jun Wako <wakojun@gmail.com>
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 <http://www.gnu.org/licenses/>.
*/

#pragma once

#define TAPPING_TERM 200
69 changes: 69 additions & 0 deletions keyboards/handwired/reclined/keymaps/pdl/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
/*
This is the keymap for the reclined keyboard

Copyright 2012 Jun Wako <wakojun@gmail.com>
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 <http://www.gnu.org/licenses/>.
*/

#include QMK_KEYBOARD_H
#include "pdl.c"
pdl marked this conversation as resolved.
Show resolved Hide resolved

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 \
),
[_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_________________, _______, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
),
[_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_________________, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
pdl marked this conversation as resolved.
Show resolved Hide resolved
)
};
4 changes: 4 additions & 0 deletions keyboards/handwired/reclined/keymaps/pdl/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
SRC += pdl.c

LAYOUTS = ortho_4x12
pdl marked this conversation as resolved.
Show resolved Hide resolved

11 changes: 11 additions & 0 deletions keyboards/handwired/reclined/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# 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
pdl marked this conversation as resolved.
Show resolved Hide resolved

Make example for this keyboard (after setting up your build environment):

make handwired/reclined:default
pdl marked this conversation as resolved.
Show resolved Hide resolved
16 changes: 16 additions & 0 deletions keyboards/handwired/reclined/reclined.c
Original file line number Diff line number Diff line change
@@ -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 <http://www.gnu.org/licenses/>.
*/
#include "reclined.h"
Loading