From 0d9680cad35bc76d84d6e2feeb14f1b16173b41d Mon Sep 17 00:00:00 2001 From: Fabian Wermelinger Date: Sun, 30 Dec 2018 03:32:13 +0100 Subject: [PATCH 1/9] adding my HHKB layouy for TINA-C --- .../dz60/keymaps/fab_tinaC_hhkb/keymap.c | 110 ++++++++++++++++++ .../dz60/keymaps/fab_tinaC_hhkb/rules.mk | 13 +++ 2 files changed, 123 insertions(+) create mode 100644 keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c create mode 100644 keyboards/dz60/keymaps/fab_tinaC_hhkb/rules.mk diff --git a/keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c b/keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c new file mode 100644 index 000000000000..dfa2aacbd480 --- /dev/null +++ b/keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c @@ -0,0 +1,110 @@ +/* File : keymap.c */ +/* Created : Sat 29 Dec 2018 11:39:20 PM CET */ +/* Author : Fabian Wermelinger */ +/* Description: Tina-C HHKB layout */ +/* Copyright 2018 Fabian Wermelinger. All Rights Reserved. */ +#include QMK_KEYBOARD_H + +// layers +enum Layers +{ + _DEFAULT = 0, + _FN, + _LIGHTS +}; + +// special keys +enum CustomKeys +{ + RGB_HALO = SAFE_RANGE +}; + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* BASE LAYER + * + * ,-----------------------------------------------------------------------------------------. + * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \| | ~ ` | + * |-----------------------------------------------------------------------------------------+ + * | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | + * |-----------------------------------------------------------------------------------------+ + * | Ctrl | A | S | D | F | G | H | J | K | L | ; | ' | Enter | + * |-----------------------------------------------------------------------------------------+ + * | LShift | Z | X | C | V | B | N | M | , | . | / | RShift | FN | + * |-----------------------------------------------------------------------------------------+ + * | FN | LAlt | Space | Esc | LIGHTS | + * `-----------------------------------------------------------------------------------------' + */ + [_DEFAULT] = LAYOUT_true_hhkb( + 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, + MT(MOD_LCTL, 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_ENT, + KC_LSPO, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, MO(_FN), + MO(_FN), KC_LALT, KC_SPC, KC_ESC, MO(_LIGHTS) + ), + + +/* FN LAYER + * + * ,------------------------------------------------------------------------------------------------------ + * | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 |INSERT | _ | + * |------------------------------------------------------------------------------------------------------+ + * | | _ | _ | _ | _ | _ | _ | _ | PRSC | SLOCK | PAUSE | HOME | _ | DEL | + * |------------------------------------------------------------------------------------------------------+ + * | Caps | VOLDOWN | VOLUP | VOLMUTE | _ | _ | LEFT | DOWN | UP | RIGHT | PGUP | PGDN | _ | + * |------------------------------------------------------------------------------------------------------+ + * | | _ | PLAY/PAUSE | _ | _ | _ | _ | _ | _ | _ | END | _ | _ | + * |------------------------------------------------------------------------------------------------------+ + * | _ | _ | _ | _ | _ | + * `------------------------------------------------------------------------------------------------------' + */ + [_FN] = LAYOUT_true_hhkb( + _______, 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_PSCR, KC_SLCK, KC_PAUS, KC_HOME, _______, KC_DEL, + KC_CAPS, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_PGUP, KC_PGDN, _______, + _______, _______, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, + _______, _______, _______, _______, _______ + ), + + +/* LIGHTS LAYER + * + * ,---------------------------------------------------------------------------------------------------------------------+ + * | RGB_TOG | STATIC | BREATHE | RAINBOW | SWIRL | SNAKE | KNIGHTRIDER | XMAS | STATIC_GRAD | TEST | _ | _ | _ | _ | _ | + * |----------------------------------------------------------------------------------------------------------------------+ + * | RBG_MOD | HUE_INC | SATURATION_INC | BRIGHT_INC | _ | _ | _ | _ | _ | _ | _ | _ | _ | _ | + * |----------------------------------------------------------------------------------------------------------------------+ + * | | HUE_DEC | SATURATION_DEC | BRIGHT_DEC | _ | _ | _ | _ | _ | _ | _ | _ | _ | + * |----------------------------------------------------------------------------------------------------------------------+ + * | BL_TOGG | BL_DEC | BL_INC | BL_ON | BL_OFF | BL_BREATH_TOGGLE | _ | _ | _ | _ | _ | _ | _ | + * |----------------------------------------------------------------------------------------------------------------------+ + * | _ | _ | _ | _ | _ | + * `----------------------------------------------------------------------------------------------------------------------' + */ + [_LIGHTS] = LAYOUT_true_hhkb( + RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, _______, _______, _______, _______, _______, + RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_HALO, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, + BL_TOGG, _______, BL_DEC, BL_INC, BL_ON , BL_OFF, BL_BRTG, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______ + ), +}; + + +bool process_record_user(uint16_t keycode, keyrecord_t *record) +{ + if (record->event.pressed) + { + switch(keycode) + { + case RGB_HALO: + rgblight_enable(); + rgblight_setrgb(255, 241, 224); + break; + default: + break; + } + } + return true; +}; diff --git a/keyboards/dz60/keymaps/fab_tinaC_hhkb/rules.mk b/keyboards/dz60/keymaps/fab_tinaC_hhkb/rules.mk new file mode 100644 index 000000000000..ce639d219a3a --- /dev/null +++ b/keyboards/dz60/keymaps/fab_tinaC_hhkb/rules.mk @@ -0,0 +1,13 @@ +# Build Options +# comment out to disable the options. +# +BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = no # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = no # Commands for debug and configuration +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality +AUDIO_ENABLE = no +RGBLIGHT_ENABLE = yes From b6834ed73166d0bd30c9e8e84d67a4a589e1ef8c Mon Sep 17 00:00:00 2001 From: Fabian Wermelinger Date: Tue, 8 Jan 2019 23:54:53 +0100 Subject: [PATCH 2/9] switch PGDN and PGUP --- keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c b/keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c index dfa2aacbd480..1fd73ed39136 100644 --- a/keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c +++ b/keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT_true_hhkb( _______, 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_PSCR, KC_SLCK, KC_PAUS, KC_HOME, _______, KC_DEL, - KC_CAPS, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_PGUP, KC_PGDN, _______, + KC_CAPS, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_PGDN, KC_PGUP, _______, _______, _______, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, _______, _______ ), From b872c3d22b1bfcdef63891cd0639fc3face90edd Mon Sep 17 00:00:00 2001 From: Fabian Wermelinger Date: Fri, 18 Jan 2019 01:16:12 +0100 Subject: [PATCH 3/9] adding HHKB --- compile.md | 7 ++++ keyboards/hhkb/keymaps/fab_hhkb/keymap.c | 45 ++++++++++++++++++++++++ keyboards/hhkb/keymaps/fab_hhkb/rules.mk | 12 +++++++ 3 files changed, 64 insertions(+) create mode 100644 compile.md create mode 100644 keyboards/hhkb/keymaps/fab_hhkb/keymap.c create mode 100644 keyboards/hhkb/keymaps/fab_hhkb/rules.mk diff --git a/compile.md b/compile.md new file mode 100644 index 000000000000..fd937056b9b4 --- /dev/null +++ b/compile.md @@ -0,0 +1,7 @@ +# Compile DZ60 + +`sudo make dz60:fab_tinaC_hhkb:dfu` + +# Compile HHKB + +`sudo make hhkb:fab_hhkb:dfu` diff --git a/keyboards/hhkb/keymaps/fab_hhkb/keymap.c b/keyboards/hhkb/keymaps/fab_hhkb/keymap.c new file mode 100644 index 000000000000..6a5d7839e591 --- /dev/null +++ b/keyboards/hhkb/keymaps/fab_hhkb/keymap.c @@ -0,0 +1,45 @@ +/* -*- eval: (turn-on-orgtbl); -*- + * default HHKB Layout + */ +#include QMK_KEYBOARD_H + +// layers +enum Layers +{ + _DEFAULT = 0, + _FN, + _MAC +}; + +// special keys +/* enum CustomKeys */ +/* { */ +/* RGB_HALO = SAFE_RANGE */ +/* }; */ + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_DEFAULT] = LAYOUT( + 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, + MT(MOD_LCTL, 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_ENT, + KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, MO(_FN), + MO(_FN), KC_LALT, LT(_MAC,KC_SPC), KC_ESC, KC_RGUI + ), + + [_FN] = LAYOUT( + _______, 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_PSCR, KC_SLCK, KC_PAUS, KC_HOME, _______, KC_DEL, + KC_CAPS, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_PGDN, KC_PGUP, _______, + _______, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, + _______, _______, _______, _______, _______ + ), + + /* [_MAC] = LAYOUT( */ + /* _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, */ + /* _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_HOME, _______, KC_DEL, */ + /* KC_CAPS, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_PGDN, KC_PGUP, _______, */ + /* _______, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, */ + /* KC_LGUI, _______, _______, _______, _______ */ + /* ), */ +}; diff --git a/keyboards/hhkb/keymaps/fab_hhkb/rules.mk b/keyboards/hhkb/keymaps/fab_hhkb/rules.mk new file mode 100644 index 000000000000..9d89d0696791 --- /dev/null +++ b/keyboards/hhkb/keymaps/fab_hhkb/rules.mk @@ -0,0 +1,12 @@ +# Build Options +# comment out to disable the options. +# +BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = no # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = no # Commands for debug and configuration +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +AUDIO_ENABLE = no +CUSTOM_MATRIX = yes # Custom matrix file for the HHKB From e6ab33f40a7685273110727cadd00ee836ea25fb Mon Sep 17 00:00:00 2001 From: Fabian Wermelinger Date: Sat, 19 Jan 2019 00:43:48 +0100 Subject: [PATCH 4/9] remove unnecessary layer --- keyboards/hhkb/keymaps/fab_hhkb/keymap.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/keyboards/hhkb/keymaps/fab_hhkb/keymap.c b/keyboards/hhkb/keymaps/fab_hhkb/keymap.c index 6a5d7839e591..a739471feb36 100644 --- a/keyboards/hhkb/keymaps/fab_hhkb/keymap.c +++ b/keyboards/hhkb/keymaps/fab_hhkb/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, MT(MOD_LCTL, 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_ENT, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, MO(_FN), - MO(_FN), KC_LALT, LT(_MAC,KC_SPC), KC_ESC, KC_RGUI + MO(_FN), KC_LALT, KC_SPC, KC_ESC, KC_RGUI ), [_FN] = LAYOUT( @@ -34,12 +34,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, _______, _______ ), - - /* [_MAC] = LAYOUT( */ - /* _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, */ - /* _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_HOME, _______, KC_DEL, */ - /* KC_CAPS, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_PGDN, KC_PGUP, _______, */ - /* _______, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, */ - /* KC_LGUI, _______, _______, _______, _______ */ - /* ), */ }; From b5a5e8cb6e2cbffe0aea4fccb529c37be4552697 Mon Sep 17 00:00:00 2001 From: Fabian Wermelinger Date: Sat, 18 May 2019 01:03:36 +0200 Subject: [PATCH 5/9] add symlinks to current keymaps --- fab_hhkb | 1 + fab_tinaC_hhkb | 1 + 2 files changed, 2 insertions(+) create mode 120000 fab_hhkb create mode 120000 fab_tinaC_hhkb diff --git a/fab_hhkb b/fab_hhkb new file mode 120000 index 000000000000..67d859f63764 --- /dev/null +++ b/fab_hhkb @@ -0,0 +1 @@ +keyboards/hhkb/keymaps/fab_hhkb \ No newline at end of file diff --git a/fab_tinaC_hhkb b/fab_tinaC_hhkb new file mode 120000 index 000000000000..9afeda5e703e --- /dev/null +++ b/fab_tinaC_hhkb @@ -0,0 +1 @@ +keyboards/dz60/keymaps/fab_tinaC_hhkb \ No newline at end of file From 6b99822da6863caf5cb5ce9bbd369cdcd69bd6ff Mon Sep 17 00:00:00 2001 From: Fabian Wermelinger Date: Sat, 18 May 2019 01:07:57 +0200 Subject: [PATCH 6/9] add README.md with flash instructions --- README.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 000000000000..f6b82e7ca3a9 --- /dev/null +++ b/README.md @@ -0,0 +1,17 @@ +# DZ60 + +New version of the new product with Atmel32u4 AU, no reset button, enter +BootLoader mode by holding down the spacebar + B and then insert the USB into +the Computer + +# HHKB (hasu controller) + +Press red button on the backside of the keyboard + +# Compile DZ60 + +`sudo make dz60:fab_tinaC_hhkb:dfu` + +# Compile HHKB + +`sudo make hhkb:fab_hhkb:dfu` From a3eee620ac74d95bfc97b26e906a94442bed2ee9 Mon Sep 17 00:00:00 2001 From: Fabian Wermelinger Date: Sat, 18 May 2019 01:12:06 +0200 Subject: [PATCH 7/9] add ctrl, alt and shift on FN layer for TTY switch --- keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c | 2 +- keyboards/hhkb/keymaps/fab_hhkb/keymap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c b/keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c index 1fd73ed39136..4f06879897a5 100644 --- a/keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c +++ b/keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FN] = LAYOUT_true_hhkb( _______, 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_PSCR, KC_SLCK, KC_PAUS, KC_HOME, _______, KC_DEL, + _______, KC_LCTL, KC_LALT, KC_LSFT, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_HOME, _______, KC_DEL, KC_CAPS, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_PGDN, KC_PGUP, _______, _______, _______, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/hhkb/keymaps/fab_hhkb/keymap.c b/keyboards/hhkb/keymaps/fab_hhkb/keymap.c index a739471feb36..0f3710437ea4 100644 --- a/keyboards/hhkb/keymaps/fab_hhkb/keymap.c +++ b/keyboards/hhkb/keymaps/fab_hhkb/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT( _______, 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_PSCR, KC_SLCK, KC_PAUS, KC_HOME, _______, KC_DEL, + _______, KC_LCTL, KC_LALT, KC_LSFT, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_HOME, _______, KC_DEL, KC_CAPS, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_PGDN, KC_PGUP, _______, _______, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, _______, _______ From 78ecdf716914402b468328549a2458539f7de594 Mon Sep 17 00:00:00 2001 From: Fabian Wermelinger Date: Thu, 2 Apr 2020 22:23:35 +0200 Subject: [PATCH 8/9] Fix second layer --- keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c | 12 ++++++------ keyboards/hhkb/keymaps/fab_hhkb/keymap.c | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c b/keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c index 4f06879897a5..a5988d095e77 100644 --- a/keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c +++ b/keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* FN LAYER - * + * outdated * ,------------------------------------------------------------------------------------------------------ * | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 |INSERT | _ | * |------------------------------------------------------------------------------------------------------+ @@ -60,11 +60,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `------------------------------------------------------------------------------------------------------' */ [_FN] = LAYOUT_true_hhkb( - _______, 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_LCTL, KC_LALT, KC_LSFT, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_HOME, _______, KC_DEL, - KC_CAPS, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_PGDN, KC_PGUP, _______, - _______, _______, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, - _______, _______, _______, _______, _______ + _______, 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_DEL, + KC_CAPS, KC_LCTL, KC_LALT, KC_LSFT, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_HOME, KC_END, KC_BSPC, + MT(MOD_LCTL, KC_ESC), KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_PGDN, KC_PGUP, _______, + KC_LSPO, _______, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LALT, KC_SPC, KC_ESC, _______ ), diff --git a/keyboards/hhkb/keymaps/fab_hhkb/keymap.c b/keyboards/hhkb/keymaps/fab_hhkb/keymap.c index 0f3710437ea4..b4bca31dfe7e 100644 --- a/keyboards/hhkb/keymaps/fab_hhkb/keymap.c +++ b/keyboards/hhkb/keymaps/fab_hhkb/keymap.c @@ -28,10 +28,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT( - _______, 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_LCTL, KC_LALT, KC_LSFT, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_HOME, _______, KC_DEL, - KC_CAPS, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_PGDN, KC_PGUP, _______, - _______, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, - _______, _______, _______, _______, _______ + _______, 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_DEL, + KC_CAPS, KC_LCTL, KC_LALT, KC_LSFT, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_HOME, KC_END, KC_BSPC, + MT(MOD_LCTL, KC_ESC), KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_PGDN, KC_PGUP, _______, + KC_LSPO, _______, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LALT, KC_SPC, KC_ESC, _______ ), }; From e0cf46cac56c0e154b7adb5c5dfae580be89fe2e Mon Sep 17 00:00:00 2001 From: Fabian Wermelinger Date: Tue, 13 Apr 2021 09:45:04 +0200 Subject: [PATCH 9/9] Add RGUI key to tina layout --- compile.md | 2 ++ keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/compile.md b/compile.md index fd937056b9b4..2c96041b2e9f 100644 --- a/compile.md +++ b/compile.md @@ -2,6 +2,8 @@ `sudo make dz60:fab_tinaC_hhkb:dfu` +Enter bootloader by pressing SPC+B + # Compile HHKB `sudo make hhkb:fab_hhkb:dfu` diff --git a/keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c b/keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c index a5988d095e77..181225853a16 100644 --- a/keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c +++ b/keyboards/dz60/keymaps/fab_tinaC_hhkb/keymap.c @@ -40,8 +40,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, MT(MOD_LCTL, 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_ENT, - KC_LSPO, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, MO(_FN), - MO(_FN), KC_LALT, KC_SPC, KC_ESC, MO(_LIGHTS) + KC_LSPO, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, MO(_LIGHTS), + MO(_FN), KC_LALT, KC_SPC, KC_ESC, KC_RGUI ),