From 419002a63b1824e6da61d802bcb6f6ab5b35def6 Mon Sep 17 00:00:00 2001 From: "Blake C. Lewis" Date: Wed, 19 Feb 2020 03:12:52 -0600 Subject: [Keyboard] KC60SE cleanup (#8171) * coding style cleanup, enable/disable misconfigured/broken features * add SCLN missing, compile with backlight PWM warning * edit json * new info.json from KLE * new info.json from KLE using QMK converter * changes notes * notes in pull request * missing line in comments * line wrap * Update keyboards/kc60se/config.h Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/kc60se/keymaps/default/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/kc60se/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/kc60se/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/kc60se/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/kc60se/kc60se.h Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/kc60se/rules.mk Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/kc60se/info.json Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/kc60se/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/kc60se/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/kc60se/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * comment back in rules.mk * add 2 iso layouts and keymaps, 1 ansi kemap, compiled and tested * keymaps and info * Delete keymap.c not ready, I need to get a few iso characters corrected * Delete keymap.c not ready, need to get a few iso character define correctly * Update info.json Bspc to Backspace * no unicode * gui_on and gui_off in readme * Update keyboards/kc60se/rules.mk Co-Authored-By: fauxpark * remove is_command * Update keyboards/kc60se/config.h remove comment Co-Authored-By: fauxpark * Update keyboards/kc60se/config.h Co-Authored-By: fauxpark * Update keyboards/kc60se/readme.md Co-Authored-By: fauxpark * remove \\ in keymaps * Update keyboards/kc60se/info.json Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/kc60se/info.json Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/kc60se/info.json Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/kc60se/info.json Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/kc60se/kc60se.h Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/kc60se/kc60se.h Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/kc60se/kc60se.h Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/kc60se/kc60se.h Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/kc60se/info.json Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * set led pin b2 to output mode in matrix_init_kb(), toggle it in led_update_kb() * Update config.h I had commented FORCE_NKRO out.. WHy did it com back? Co-authored-by: Check your git settings! Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Ryan --- keyboards/kc60se/keymaps/60_ansi/keymap.c | 66 ++++++++++++++++++++++++++++++ keyboards/kc60se/keymaps/default/config.h | 19 --------- keyboards/kc60se/keymaps/default/keymap.c | 50 +++++++++++----------- keyboards/kc60se/keymaps/default/readme.md | 47 ++++++++++++++++----- 4 files changed, 128 insertions(+), 54 deletions(-) create mode 100644 keyboards/kc60se/keymaps/60_ansi/keymap.c delete mode 100644 keyboards/kc60se/keymaps/default/config.h (limited to 'keyboards/kc60se/keymaps') diff --git a/keyboards/kc60se/keymaps/60_ansi/keymap.c b/keyboards/kc60se/keymaps/60_ansi/keymap.c new file mode 100644 index 0000000000..d59a8b95d2 --- /dev/null +++ b/keyboards/kc60se/keymaps/60_ansi/keymap.c @@ -0,0 +1,66 @@ +/* Copyright 2020 Blake C. Lewis + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +/* ANSI */ + +enum my_layers { _BL, _FL }; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [_BL] = LAYOUT_60_ansi( + KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LGUI, KC_LALT, MO(_FL), KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + ), + [_FL] = LAYOUT_60_ansi( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + _______, _______, _______, _______, _______, _______, BL_ON, BL_STEP, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, KC_INS, + _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, NK_TOGG, _______, KC_END, KC_PGDN, KC_DOWN, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ) + // clang-format on +}; + +/* BL + *.--------------------------------------------------------------------------. + *| esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |backspace| + *|--------------------------------------------------------------------------| + *| tab | q | w | e | r | t | y | u | i | o | p | [ | ] | \ | + *|--------------------------------------------------------------------------| + *| caps | a | s | d | f | g | h | j | k | l | ; | ' | enter | + *|--------------------------------------------------------------------------| + *| lshift | z | x | c | v | b | n | m | , | . | / | rshift | + *|--------------------------------------------------------------------------| + *| lgui| lalt|mo(FL)| space |ralt |rgui | app |rctl | + *'--------------------------------------------------------------------------' + * FL + *.--------------------------------------------------------------------------. + *| | f1 | f2 | f3 | f4 | f5 | f6 | f7 | f8 | f9 | f10| f11| f12| del | + *|--------------------------------------------------------------------------| + *| | | | | | |blon|blup| psc|slck|paus| up | |insert | + *|--------------------------------------------------------------------------| + *| | | | | | | | |home|pgup|left|rght| | + *|--------------------------------------------------------------------------| + *| |vol-|vol+|mute| | |NKRO| |end |pgdn|down| | + *|--------------------------------------------------------------------------| + *| | | | | | | | | + *'--------------------------------------------------------------------------' + */ diff --git a/keyboards/kc60se/keymaps/default/config.h b/keyboards/kc60se/keymaps/default/config.h deleted file mode 100644 index 4496c59100..0000000000 --- a/keyboards/kc60se/keymaps/default/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2018 REPLACE_WITH_YOUR_NAME - * - * 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 . - */ - -#pragma once - -// place overrides here diff --git a/keyboards/kc60se/keymaps/default/keymap.c b/keyboards/kc60se/keymaps/default/keymap.c index aecf0b5a16..77ac63aee9 100644 --- a/keyboards/kc60se/keymaps/default/keymap.c +++ b/keyboards/kc60se/keymaps/default/keymap.c @@ -13,16 +13,34 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + #include QMK_KEYBOARD_H -#define _DEFAULT 0 -#define _FN 1 +/* Happy Hacker Keyboard */ + +enum layer_names { _BL, _FL }; -#define xxxxxx KC_TRNS const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* hhkb - layer 0 - * split_bs/split_rshift/+ctrl-caplock +// clang-format off + [_BL] = LAYOUT_60_ansi_split_bs_rshift( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FL), + KC_NO, KC_LALT, MO(_FL), KC_SPC, KC_NO, KC_RGUI, KC_RALT, KC_NO + ), + [_FL] = LAYOUT_60_ansi_split_bs_rshift( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_INS, + KC_CAPS, BL_ON, BL_STEP, _______, _______, NK_TOGG, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, KC_DEL, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, + _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, + _______, _______, _______, _______, _______, KC_MSTP, _______, _______ + ) +// clang-format on +}; + +/* BL *,--------------------------------------------------------------------------. *| esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \ | ` | *|--------------------------------------------------------------------------+ @@ -34,21 +52,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { *|--------------------------------------------------------------------------+ * |lalt| fn1 | space | rgui |ralt| * `-----------------------------------------------------------' - */ - [_DEFAULT] = LAYOUT_60_ansi_split_bs_rshift( /* Basic QWERTY */ - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \ - KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN), \ - xxxxxx, KC_LALT, MO(_FN), KC_SPC, xxxxxx, KC_RGUI, KC_RALT, xxxxxx \ - ), - -/* split_bs/split_rshift/+ctrl-caplock - Layer 1 - * + * FL *,--------------------------------------------------------------------------. *| | f1 | f2 | f3 | f4 | f5 | f6 | f7 | f8 | f9 | f10| f11| f12| | ins| *|--------------------------------------------------------------------------+ - *| caps |blon|blup| | | | | | psc|slck|paus| up | | del | + *| caps |blon|blup| | |NKRO| | | psc|slck|paus| up | | del | *|--------------------------------------------------------------------------+ *| |vol-|vol+|mute| | | * | / |home|pgup|left|rght| penter | *|--------------------------------------------------------------------------+ @@ -57,11 +65,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | stop | | * `----------------------------------------------------------' */ - [_FN] = LAYOUT_60_ansi_split_bs_rshift( /* Layer 1 */ - xxxxxx, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, xxxxxx,KC_INS, \ - KC_CAPS, BL_ON, BL_STEP, xxxxxx, xxxxxx, xxxxxx, xxxxxx, xxxxxx, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, xxxxxx, KC_DEL, \ - xxxxxx, KC_VOLD, KC_VOLU, KC_MUTE, xxxxxx, xxxxxx, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,xxxxxx, \ - xxxxxx, KC_MPRV, KC_MPLY, KC_MNXT, xxxxxx, xxxxxx, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, xxxxxx, xxxxxx, \ - xxxxxx, xxxxxx, xxxxxx, xxxxxx, xxxxxx, KC_MSTP, xxxxxx, xxxxxx \ - ) -}; diff --git a/keyboards/kc60se/keymaps/default/readme.md b/keyboards/kc60se/keymaps/default/readme.md index 901428686c..85b8d0147b 100644 --- a/keyboards/kc60se/keymaps/default/readme.md +++ b/keyboards/kc60se/keymaps/default/readme.md @@ -1,9 +1,32 @@ -# The default keymap for kc60se +# HHKB: The default keymap for KC60SE -# hhkb-qwerty-wkl -======================== - ### layer 0 - default - ``` +## Happy Hacker Keyboard (US layout): +* [Esc] moves down replacing [ ~ ] +* 2u [Backspace] split into [ \ ] and [ ~ ] +* move [Backspace] down a row to replace [ \ ] +* a dip switch toggles the default: Delete or Backspace, [Fn ] invokes non-default +* 2.75u [ Shift ] split into 1.75u [Shift] & [Fn ] +* Control replaces Caplock, [FN ] [ Tab ] toggles Caplock, led under Control toggles w/Caplock +* the botom row is configurable, the Meta key could be assigned a few values with dip switches, +* HHKB Lite2 + +``` + |Fn |Alt |Meta| Space |Meta|Alt | + |Fn |Meta|Alt | Space |ALt |Meta| +``` +* HHKB Professional2 + +``` + |Alt |Fn | Space |Meta|Alt | + |Meta|Alt | Space |Alt |Meta| + |Fn |Alt | Space |Alt |Meta| +``` +* this PCB and keymap will support up to 8 keys on the bottom row with minimal editing. + + +## Base Layer + +``` ,--------------------------------------------------------------------------. | esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \ | ` | |--------------------------------------------------------------------------| @@ -15,13 +38,16 @@ `--------------------------------------------------------------------------' |lalt| fn0 | space | rgui |ralt| `------------------------------------------------------------' - ``` - ### layer 1 - Q/W backlight controls: BL_ON & BL_STEP - ``` +``` +## Function Layer +* Extra keys: (mprv, mply, mnxt) +* I think the number pad * / - and + did not come on the Professional, but did on Lite + +``` ,--------------------------------------------------------------------------. | | f1 | f2 | f3 | f4 | f5 | f6 | f7 | f8 | f9 | f10| f11| f12| | ins| |--------------------------------------------------------------------------| - | caps |blon|blup| | | | | | psc|slck|paus| up | | del | + | caps |blon|blup| | |NKRO| | | psc|slck|paus| up | | del | |--------------------------------------------------------------------------| | |vol-|vol+|mute| | | * | / |home|pgup|left|rght| penter | |--------------------------------------------------------------------------| @@ -29,4 +55,5 @@ `--------------------------------------------------------------------------' | | | | mstop | | `-----------------------------------------------------------' - ``` \ No newline at end of file +``` + -- cgit v1.2.3