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.

Sign up for GitHub

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

K-Type refactor #9864

Merged
merged 17 commits into from
Aug 26, 2020
Merged

K-Type refactor #9864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d1e2a92
K-Type refactor
fauxpark Jul 29, 2020
91e0b43
Declare QMK in product name again
fauxpark Jul 29, 2020
b733b59
Hopefully fix matrix scanning
fauxpark Jul 29, 2020
97b497c
Maybe this time
fauxpark Jul 29, 2020
c20e582
Partial (literally) RGB Matrix support
fauxpark Jul 30, 2020
f293225
Put RGB_MATRIX_ENABLE into rgb keymap for now
fauxpark Jul 30, 2020
fb71dcb
Add ifdefs for RGB config
fauxpark Jul 30, 2020
55c78c0
Set layer 1 to actually be layer 1...
fauxpark Jul 31, 2020
d633f18
Update keyboards/k_type/readme.md
fauxpark Jul 31, 2020
0e7f91a
Put all RGB config in keymap for now
fauxpark Jul 31, 2020
93811c0
Set SDB high?
fauxpark Jul 31, 2020
8c8dd78
Before `rgb_matrix_init()` would be best
fauxpark Jul 31, 2020
e2b705c
User level, not keyboard
fauxpark Jul 31, 2020
8ffdc21
Combating dropped keys
fauxpark Jul 31, 2020
cc2e63c
Nope
fauxpark Jul 31, 2020
edc0948
Readme for RGB keymap
fauxpark Aug 8, 2020
3118d77
Remove custom matrix
fauxpark Aug 21, 2020
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
75 changes: 61 additions & 14 deletions keyboards/k_type/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,73 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifndef CONFIG_H
#define CONFIG_H
#pragma once

/* USB Device descriptor parameter */
#define VENDOR_ID 0x1c11
#define PRODUCT_ID 0xb04d
#define DEVICE_VER 0x0001
#define MANUFACTURER Input Club
#define PRODUCT K-Type/QMK
#define VENDOR_ID 0x1C11
#define PRODUCT_ID 0xB04D
#define DEVICE_VER 0x0001
#define MANUFACTURER Input:Club
#define PRODUCT K-Type (QMK)

/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 10

/* define if matrix has ghost */
//#define MATRIX_HAS_GHOST
/*
* 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 { D5, D6, D7, C1, C2, C3, C4, C5, C6, C7 }
#define MATRIX_COL_PINS { B2, B3, B18, B19, C0, C8, C9, D0, D1, D4 }
#define UNUSED_PINS

/* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW

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

/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
* This is useful 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

/*
* Feature disable options
* These options are also useful to firmware size reduction.
Expand All @@ -54,7 +97,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION

#endif
/* disable these deprecated features by default */
#define NO_ACTION_MACRO
#define NO_ACTION_FUNCTION

/* Bootmagic Lite key configuration */
//#define BOOTMAGIC_LITE_ROW 0
//#define BOOTMAGIC_LITE_COLUMN 0
118 changes: 108 additions & 10 deletions keyboards/k_type/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,110 @@
{
"keyboard_name": "K-Type",
"url": "",
"maintainer": "qmk",
"width": 18.25,
"height": 6.5,
"layouts": {
"KEYMAP": {
"layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
}
}
"keyboard_name": "K-Type",
"url": "",
"maintainer": "qmk",
"width": 18.25,
"height": 6.5,
"layouts": {
"LAYOUT_tkl_ansi": {
"layout": [
{"x": 0, "y": 0},
{"x": 2, "y": 0},
{"x": 3, "y": 0},
{"x": 4, "y": 0},
{"x": 5, "y": 0},
{"x": 6.5, "y": 0},
{"x": 7.5, "y": 0},
{"x": 8.5, "y": 0},
{"x": 9.5, "y": 0},
{"x": 11, "y": 0},
{"x": 12, "y": 0},
{"x": 13, "y": 0},
{"x": 14, "y": 0},

{"x": 15.25, "y": 0},
{"x": 16.25, "y": 0},
{"x": 17.25, "y": 0},

{"x": 0, "y": 1.5},
{"x": 1, "y": 1.5},
{"x": 2, "y": 1.5},
{"x": 3, "y": 1.5},
{"x": 4, "y": 1.5},
{"x": 5, "y": 1.5},
{"x": 6, "y": 1.5},
{"x": 7, "y": 1.5},
{"x": 8, "y": 1.5},
{"x": 9, "y": 1.5},
{"x": 10, "y": 1.5},
{"x": 11, "y": 1.5},
{"x": 12, "y": 1.5},
{"x": 13, "y": 1.5, "w": 2},

{"x": 15.25, "y": 1.5},
{"x": 16.25, "y": 1.5},
{"x": 17.25, "y": 1.5},

{"x": 0, "y": 2.5, "w": 1.5},
{"x": 1.5, "y": 2.5},
{"x": 2.5, "y": 2.5},
{"x": 3.5, "y": 2.5},
{"x": 4.5, "y": 2.5},
{"x": 5.5, "y": 2.5},
{"x": 6.5, "y": 2.5},
{"x": 7.5, "y": 2.5},
{"x": 8.5, "y": 2.5},
{"x": 9.5, "y": 2.5},
{"x": 10.5, "y": 2.5},
{"x": 11.5, "y": 2.5},
{"x": 12.5, "y": 2.5},
{"x": 13.5, "y": 2.5, "w": 1.5},

{"x": 15.25, "y": 2.5},
{"x": 16.25, "y": 2.5},
{"x": 17.25, "y": 2.5},

{"x": 0, "y": 3.5, "w": 1.75},
{"x": 1.75, "y": 3.5},
{"x": 2.75, "y": 3.5},
{"x": 3.75, "y": 3.5},
{"x": 4.75, "y": 3.5},
{"x": 5.75, "y": 3.5},
{"x": 6.75, "y": 3.5},
{"x": 7.75, "y": 3.5},
{"x": 8.75, "y": 3.5},
{"x": 9.75, "y": 3.5},
{"x": 10.75, "y": 3.5},
{"x": 11.75, "y": 3.5},
{"x": 12.75, "y": 3.5, "w": 2.25},

{"x": 0, "y": 4.5, "w": 2.25},
{"x": 2.25, "y": 4.5},
{"x": 3.25, "y": 4.5},
{"x": 4.25, "y": 4.5},
{"x": 5.25, "y": 4.5},
{"x": 6.25, "y": 4.5},
{"x": 7.25, "y": 4.5},
{"x": 8.25, "y": 4.5},
{"x": 9.25, "y": 4.5},
{"x": 10.25, "y": 4.5},
{"x": 11.25, "y": 4.5},
{"x": 12.25, "y": 4.5, "w": 2.75},

{"x": 16.25, "y": 4.5},

{"x": 0, "y": 5.5, "w": 1.25},
{"x": 1.25, "y": 5.5, "w": 1.25},
{"x": 2.5, "y": 5.5, "w": 1.25},
{"x": 3.75, "y": 5.5, "w": 6.25},
{"x": 10, "y": 5.5, "w": 1.25},
{"x": 11.25, "y": 5.5, "w": 1.25},
{"x": 12.5, "y": 5.5, "w": 1.25},
{"x": 13.75, "y": 5.5, "w": 1.25},

{"x": 15.25, "y": 5.5},
{"x": 16.25, "y": 5.5},
{"x": 17.25, "y": 5.5}
]
}
}
}
Loading