-
-
Notifications
You must be signed in to change notification settings - Fork 39.7k
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 support for KBDPAD MKII #6034
Merged
Merged
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
355dcfd
Build some testing keymaps
e2862fe
Match naming convention to 8x
343ca22
Add configurator json
f6c6d37
Forgot to build the readme
bebe9d3
Apply suggestions from code review
b9f5f6f
Update keyboards/kbdfans/kbdpad_mk2/rules.mk
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,251 @@ | ||
/* | ||
Copyright 2019 Ryota Goto | ||
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 0xA103 | ||
#define PRODUCT_ID 0x0006 | ||
#define DEVICE_VER 0x0001 | ||
#define MANUFACTURER KBDfans | ||
#define PRODUCT KBDPAD-MKII | ||
#define DESCRIPTION Numpad | ||
|
||
/* key matrix size */ | ||
#define MATRIX_ROWS 6 | ||
#define MATRIX_COLS 4 | ||
|
||
/* | ||
* 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, D1, D2, C6, C7, B6 } | ||
#define MATRIX_COL_PINS { C4, C5, B3, B2 } | ||
#define UNUSED_PINS | ||
|
||
/* COL2ROW, ROW2COL*/ | ||
#define DIODE_DIRECTION COL2ROW | ||
|
||
/* | ||
* Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. | ||
*/ | ||
#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 | ||
|
||
#define BACKLIGHT_PIN B7 | ||
#define BACKLIGHT_BREATHING | ||
#define BACKLIGHT_LEVELS 5 | ||
|
||
#define RGB_DI_PIN B5 | ||
#ifdef RGB_DI_PIN | ||
#define RGBLED_NUM 16 | ||
#define RGBLIGHT_HUE_STEP 8 | ||
#define RGBLIGHT_SAT_STEP 8 | ||
#define RGBLIGHT_VAL_STEP 8 | ||
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ | ||
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ | ||
/*== all animations enable ==*/ | ||
#define RGBLIGHT_ANIMATIONS | ||
// /*== or choose animations ==*/ | ||
// #define RGBLIGHT_EFFECT_BREATHING | ||
// #define RGBLIGHT_EFFECT_RAINBOW_MOOD | ||
// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL | ||
// #define RGBLIGHT_EFFECT_SNAKE | ||
// #define RGBLIGHT_EFFECT_KNIGHT | ||
// #define RGBLIGHT_EFFECT_CHRISTMAS | ||
// #define RGBLIGHT_EFFECT_STATIC_GRADIENT | ||
// #define RGBLIGHT_EFFECT_RGB_TEST | ||
// #define RGBLIGHT_EFFECT_ALTERNATING | ||
// /*== customize breathing effect ==*/ | ||
// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ | ||
// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 | ||
// /*==== use exp() and sin() ====*/ | ||
// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 | ||
// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 | ||
#endif | ||
|
||
/* 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 | ||
|
||
/* number of backlight levels */ | ||
|
||
/* 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 | ||
|
||
/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. | ||
* This is userful for the Windows task manager shortcut (ctrl+shift+esc). | ||
*/ | ||
// #define GRAVE_ESC_CTRL_OVERRIDE | ||
|
||
/* | ||
* 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 */ | ||
/* defined by default; to change, uncomment and set to the combination you want */ | ||
// #define IS_COMMAND() (get_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_HELP H | ||
//#define MAGIC_KEY_HELP_ALT 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 0 | ||
//#define MAGIC_KEY_LAYER0_ALT GRAVE | ||
//#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 B | ||
//#define MAGIC_KEY_BOOTLOADER_ALT ESC | ||
//#define MAGIC_KEY_LOCK CAPS | ||
//#define MAGIC_KEY_EEPROM E | ||
//#define MAGIC_KEY_EEPROM_CLEAR BSPACE | ||
//#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 | ||
|
||
/* | ||
* HD44780 LCD Display Configuration | ||
*/ | ||
/* | ||
#define LCD_LINES 2 //< number of visible lines of the display | ||
#define LCD_DISP_LENGTH 16 //< visibles characters per line of the display | ||
#define LCD_IO_MODE 1 //< 0: memory mapped mode, 1: IO port mode | ||
#if LCD_IO_MODE | ||
#define LCD_PORT PORTB //< port for the LCD lines | ||
#define LCD_DATA0_PORT LCD_PORT //< port for 4bit data bit 0 | ||
#define LCD_DATA1_PORT LCD_PORT //< port for 4bit data bit 1 | ||
#define LCD_DATA2_PORT LCD_PORT //< port for 4bit data bit 2 | ||
#define LCD_DATA3_PORT LCD_PORT //< port for 4bit data bit 3 | ||
#define LCD_DATA0_PIN 4 //< pin for 4bit data bit 0 | ||
#define LCD_DATA1_PIN 5 //< pin for 4bit data bit 1 | ||
#define LCD_DATA2_PIN 6 //< pin for 4bit data bit 2 | ||
#define LCD_DATA3_PIN 7 //< pin for 4bit data bit 3 | ||
#define LCD_RS_PORT LCD_PORT //< port for RS line | ||
#define LCD_RS_PIN 3 //< pin for RS line | ||
#define LCD_RW_PORT LCD_PORT //< port for RW line | ||
#define LCD_RW_PIN 2 //< pin for RW line | ||
#define LCD_E_PORT LCD_PORT //< port for Enable line | ||
#define LCD_E_PIN 1 //< pin for Enable line | ||
#endif | ||
*/ | ||
|
||
/* Bootmagic Lite key configuration */ | ||
// #define BOOTMAGIC_LITE_ROW 0 | ||
// #define BOOTMAGIC_LITE_COLUMN 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
{ | ||
"keyboard_name": "kbdpad_mk2", | ||
"url": "https://kb.ai03.me/projects/kbdpad-mkii.html", | ||
"maintainer": "ai03", | ||
"width": 4, | ||
"height": 6.25, | ||
"layouts": { | ||
"LAYOUT_ortho_6x4": { | ||
"layout": [ | ||
{"x":0, "y":0}, | ||
{"x":1, "y":0}, | ||
{"x":2, "y":0}, | ||
{"x":3, "y":0}, | ||
{"x":0, "y":1.25}, | ||
{"x":1, "y":1.25}, | ||
{"x":2, "y":1.25}, | ||
{"x":3, "y":1.25}, | ||
{"x":0, "y":2.25}, | ||
{"x":1, "y":2.25}, | ||
{"x":2, "y":2.25}, | ||
{"x":3, "y":2.25}, | ||
{"x":0, "y":3.25}, | ||
{"x":1, "y":3.25}, | ||
{"x":2, "y":3.25}, | ||
{"x":3, "y":3.25}, | ||
{"x":0, "y":4.25}, | ||
{"x":1, "y":4.25}, | ||
{"x":2, "y":4.25}, | ||
{"x":3, "y":4.25}, | ||
{"x":0, "y":5.25}, | ||
{"x":1, "y":5.25}, | ||
{"x":2, "y":5.25}, | ||
{"x":3, "y":5.25} | ||
] | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
/* Copyright 2019 Ryota Goto | ||
* | ||
* 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 "kbdpad_mk2.h" | ||
|
||
void matrix_init_kb(void) { | ||
|
||
// Num Lock LED = B4 | ||
// Sinking setup (5V -> LED/Res -> Pin) | ||
|
||
setPinOutput(B4); | ||
|
||
matrix_init_user(); | ||
} | ||
|
||
void led_set_kb(uint8_t usb_led) { | ||
|
||
// Sinking setup. Write HIGH to turn OFF, LOW to turn ON. | ||
|
||
if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) { | ||
writePinLow(B4); | ||
} else { | ||
writePinHigh(B4); | ||
} | ||
|
||
led_set_user(usb_led); | ||
} | ||
|
||
// Optional override functions below. | ||
// You can leave any or all of these undefined. | ||
// These are only required if you want to perform custom actions. | ||
|
||
/* | ||
void matrix_scan_kb(void) { | ||
// put your looping keyboard code here | ||
// runs every cycle (a lot) | ||
matrix_scan_user(); | ||
} | ||
bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||
// put your per-action keyboard code here | ||
// runs for every action, just before processing by the firmware | ||
return process_record_user(keycode, record); | ||
} | ||
*/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/* Copyright 2019 Ryota Goto | ||
* | ||
* 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 "quantum.h" | ||
|
||
/* This a shortcut to help you visually see your layout. | ||
* | ||
* The first section contains all of the arguments representing the physical | ||
* layout of the board and position of the keys. | ||
* | ||
* The second converts the arguments into a two-dimensional array which | ||
* represents the switch matrix. | ||
*/ | ||
#define LAYOUT_ortho_6x4( \ | ||
K00, K01, K02, K03, \ | ||
K10, K11, K12, K13, \ | ||
K20, K21, K22, K23, \ | ||
K30, K31, K32, K33, \ | ||
K40, K41, K42, K43, \ | ||
K50, K51, K52, K53 \ | ||
) \ | ||
{ \ | ||
{ K00, K01, K02, K03 }, \ | ||
{ K10, K11, K12, K13 }, \ | ||
{ K20, K21, K22, K23 }, \ | ||
{ K30, K31, K32, K33 }, \ | ||
{ K40, K41, K42, K43 }, \ | ||
{ K50, K51, K52, K53 } \ | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
curious why you decided to go Kxy here and for the kbd8x mkii you went with Kxyz.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking back at it, I have no idea. Probably either extreme fatigue, or too long of a gap between the pad and 8x's revised PCB that I forgot how I labeled it on the 8x.