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 5 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
32 changes: 32 additions & 0 deletions keyboards/foostan/cornelius/keymaps/pdl/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*
This is the c configuration file for the keymap

Copyright 2012 Jun Wako <[email protected]>
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:https://www.gnu.org/licenses/>.
*/

#pragma once

#include "../../config.h"
pdl marked this conversation as resolved.
Show resolved Hide resolved

#define TAPPING_TOGGLE 2
#define TAPPING_TERM 200
#define PREVENT_STUCK_MODIFIERS
pdl marked this conversation as resolved.
Show resolved Hide resolved

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

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = KEYMAP_wrapper( \
pdl marked this conversation as resolved.
Show resolved Hide resolved
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( \
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_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_________________, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
)
};
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
176 changes: 176 additions & 0 deletions keyboards/handwired/reclined/config.h
Original file line number Diff line number Diff line change
@@ -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 <http:https://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
#define DESCRIPTION A custom staggered 40 percent keyboard split at 22.5 degrees
pdl marked this conversation as resolved.
Show resolved Hide resolved

/* 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
pdl marked this conversation as resolved.
Show resolved Hide resolved

/* 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
/* 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
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
/*
* 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
pdl marked this conversation as resolved.
Show resolved Hide resolved
Empty file.
19 changes: 19 additions & 0 deletions keyboards/handwired/reclined/keymaps/default/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/* Copyright 2018 Daniel Perrett
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file should be removed, along with the info.json

*
* 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:https://www.gnu.org/licenses/>.
*/

#pragma once

// place overrides here
61 changes: 61 additions & 0 deletions keyboards/handwired/reclined/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -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 <http:https://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = KEYMAP( /* Base */
pdl marked this conversation as resolved.
Show resolved Hide resolved
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) {

}
pdl marked this conversation as resolved.
Show resolved Hide resolved
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
29 changes: 29 additions & 0 deletions keyboards/handwired/reclined/keymaps/pdl/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/*
This is the c configuration file for the keymap

Copyright 2012 Jun Wako <[email protected]>
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:https://www.gnu.org/licenses/>.
*/

#ifndef CONFIG_USER_H
#define CONFIG_USER_H

#include "../../config.h"

#define TAPPING_TERM 200
#define PREVENT_STUCK_MODIFIERS

#endif
pdl marked this conversation as resolved.
Show resolved Hide resolved
Loading