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 1 commit
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
Prev Previous commit
Next Next commit
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 <[email protected]>
  • Loading branch information
pdl and drashna committed Aug 29, 2021
commit 40e4fe7e2007972338cfa80a17cdc2ffe63f3709
2 changes: 0 additions & 2 deletions keyboards/foostan/cornelius/keymaps/pdl/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.

#pragma once

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

#define TAPPING_TOGGLE 2
#define TAPPING_TERM 200
#define PREVENT_STUCK_MODIFIERS

#define COMBO_PDL
#define COMBO_COUNT 28
Expand Down
1 change: 0 additions & 1 deletion keyboards/foostan/cornelius/keymaps/pdl/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
#include QMK_KEYBOARD_H
#include "pdl.c"
pdl marked this conversation as resolved.
Show resolved Hide resolved
extern keymap_config_t keymap_config;

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = KEYMAP_wrapper( \
pdl marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
65 changes: 1 addition & 64 deletions keyboards/handwired/reclined/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
#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
Expand All @@ -49,7 +48,7 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
#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
Expand Down Expand Up @@ -93,46 +92,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
*
*/

/* 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
Expand All @@ -152,25 +111,3 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
//#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
35 changes: 0 additions & 35 deletions keyboards/handwired/reclined/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {

}
8 changes: 1 addition & 7 deletions keyboards/handwired/reclined/keymaps/pdl/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@ 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"
#pragma once

#define TAPPING_TERM 200
#define PREVENT_STUCK_MODIFIERS

#endif
1 change: 0 additions & 1 deletion keyboards/handwired/reclined/keymaps/pdl/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ 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;

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = KEYMAP_wrapper( \
Expand Down
34 changes: 4 additions & 30 deletions keyboards/handwired/reclined/rules.mk
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
pdl marked this conversation as resolved.
Show resolved Hide resolved
UNICODE_ENABLE = no # Unicode
pdl marked this conversation as resolved.
Show resolved Hide resolved
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
AUDIO_ENABLE = no # Audio output on port C6
BLUETOOTH_ENABLE = no # Enable Bluetooth
pdl marked this conversation as resolved.
Show resolved Hide resolved
AUDIO_ENABLE = no # Audio output
pdl marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 0 additions & 2 deletions keyboards/lets_split/keymaps/pdl/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.

#pragma once

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

#define TAPPING_TERM 200
#define PREVENT_STUCK_MODIFIERS

/* Use I2C or Serial, not both */

Expand Down
1 change: 0 additions & 1 deletion keyboards/lets_split/keymaps/pdl/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ 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;

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = KEYMAP_wrapper( \
Expand Down
1 change: 0 additions & 1 deletion keyboards/orthodox/keymaps/pdl/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.

#pragma once

#include "config_common.h"

/* Use I2C or Serial, not both */

Expand Down
3 changes: 0 additions & 3 deletions users/pdl/pdl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down