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

Update mtei's keymap (helix/rev2:five_rows, helix/pico:mtei, helix/rev3_5rows:five_rows) #16966

Merged
merged 23 commits into from
May 18, 2022
Merged

Update mtei's keymap (helix/rev2:five_rows, helix/pico:mtei, helix/rev3_5rows:five_rows) #16966

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
cb96a45
add users/mtei/key_blocks.h
mtei Apr 23, 2022
6121ec8
remove INIT_HELIX_OLED() in helix:five_rows
mtei Apr 23, 2022
f49d9a8
update helix/pico/keymaps/mtei/keymap.c
mtei Apr 23, 2022
15f67d0
Remove old SSD1306OLED code from users/mtei/oled_display.c
mtei Apr 26, 2022
5dd2a20
add options ENABLE_COLEMAK, ENABLE_DVORAK and ENABLE_EUCALYN into fiv…
mtei Apr 26, 2022
0f9bfab
add users/mtei/{config.h,rules.mk,user_featues.mk,user_options.mk}
mtei Apr 26, 2022
b978e1f
move layer_names[] from users/mtei/oled_display.c to keymaps/five_row…
mtei Apr 28, 2022
750b529
Update keyboards/helix/pico/keymaps/mtei/config.h
mtei Apr 30, 2022
24d19b2
Update keyboards/helix/pico/keymaps/mtei/config.h
mtei Apr 30, 2022
4c4c392
Update keyboards/helix/pico/keymaps/mtei/keymap.c
mtei Apr 30, 2022
4e00059
Update keyboards/helix/rev2/keymaps/five_rows/config.h
mtei Apr 30, 2022
3990e9a
Update keyboards/helix/rev2/keymaps/five_rows/config.h
mtei Apr 30, 2022
24da4f5
Update keyboards/helix/rev2/keymaps/five_rows/keymap.c
mtei Apr 30, 2022
2ac51af
Update keyboards/helix/rev3_5rows/keymaps/five_rows/config.h
mtei Apr 30, 2022
5643168
Update keyboards/helix/rev3_5rows/keymaps/five_rows/config.h
mtei Apr 30, 2022
64518b2
Update keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c
mtei Apr 30, 2022
63621b3
Update users/mtei/config.h
mtei Apr 30, 2022
ac8c5fb
Update users/mtei/config.h
mtei Apr 30, 2022
2740002
Update users/mtei/cpp_map.h
mtei Apr 30, 2022
d69c341
Update users/mtei/cpp_map.h
mtei Apr 30, 2022
c03866b
Update users/mtei/debug_config.h
mtei Apr 30, 2022
0e036ed
Update users/mtei/debug_config.h
mtei Apr 30, 2022
e391c4a
Update users/mtei/layer_number_util.h
mtei Apr 30, 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
41 changes: 6 additions & 35 deletions keyboards/helix/pico/keymaps/mtei/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,9 @@
/*
This is the c configuration file for the keymap
// Copyright (c) 2022 Takeshi Ishii (mtei@github)
// SPDX-License-Identifier: GPL-2.0-or-later

Copyright 2012 Jun Wako <[email protected]>
Copyright 2015 Jack Humbert

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

#ifndef CONFIG_USER_H
#define CONFIG_USER_H
#ifndef CONFIG_KEYMAP_H
#define CONFIG_KEYMAP_H
mtei marked this conversation as resolved.
Show resolved Hide resolved
#pragma once

// place overrides here

Expand All @@ -36,17 +20,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

// If you need more program area, try select and reduce rgblight modes to use.

// Selection of RGBLIGHT MODE to use.
#if defined(LED_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
#endif

#endif /* CONFIG_USER_H */
#endif /* CONFIG_KEYMAP_H */
mtei marked this conversation as resolved.
Show resolved Hide resolved
56 changes: 15 additions & 41 deletions keyboards/helix/pico/keymaps/mtei/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
#include <key_blocks.h>
mtei marked this conversation as resolved.
Show resolved Hide resolved

#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
#define kc5(a,b,c,d,e) KC_##a, KC_##b, KC_##c, KC_##d, KC_##e
Expand Down Expand Up @@ -59,12 +60,6 @@ enum custom_keycodes {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

/* Qwerty */
#define Q_____W_____E_____R_____T kc5( Q, W, E, R, T )
#define Y_____U_____I_____O_____P kc5( Y, U, I, O, P )
#define A_____S_____D_____F_____G kc5( A, S, D, F, G )
#define H_____J_____K_____L__SCLN kc5( H, J, K, L, SCLN )
#define Z_____X_____C_____V_____B kc5( Z, X, C, V, B )
#define N_____M__COMM___DOT__SLSH kc5( N, M, COMM, DOT, SLSH )
#define LOWER___LOWER__CAPS__LALT__LGUI__NUML__RABS MO(_LOWER), MO(_LOWER), KC_CAPS, KC_LALT, KC_LGUI, LT_NUML_SP, LT_RA_BSPC
#define RAEN_NUMR__RGUI__RALT___APP_LOWER__LOWER LT_RA_ENT, LT_NUMR_SP, KC_RGUI, KC_RALT, KC_APP, MO(_LOWER), MO(_LOWER)
/* ,-----------------------------------------. ,-----------------------------------------.
Expand All @@ -78,18 +73,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-------------------------------------------------------------------------------------------------'
*/
[_QWERTY] = LAYOUT_wrapper(
KC_ESC, Q_____W_____E_____R_____T, Y_____U_____I_____O_____P, KC_BSLS,
KC_LCTL, A_____S_____D_____F_____G, H_____J_____K_____L__SCLN, KC_RCTL,
KC_LSFT, Z_____X_____C_____V_____B, N_____M__COMM___DOT__SLSH, KC_RSFT,
KC_ESC, Q_____W_____E_____R_____T, Y_____U_____I_____O_____P, KC_BSLS,
KC_LCTL, A_____S_____D_____F_____G, H_____J_____K_____L____SCLN, KC_RCTL,
KC_LSFT, Z_____X_____C_____V_____B, N_____M____COMM__DOT___SLSH, KC_RSFT,
LOWER___LOWER__CAPS__LALT__LGUI__NUML__RABS, RAEN_NUMR__RGUI__RALT___APP_LOWER__LOWER
),

/* Colemak */
#define Q_____W_____F_____P_____G kc5( Q, W, F, P, G )
#define J_____L_____U_____Y__SCLN kc5( J, L, U, Y, SCLN )
#define A_____R_____S_____T_____D kc5( A, R, S, T, D )
#define H_____N_____E_____I_____O kc5( H, N, E, I, O )
#define K_____M__COMM___DOT__SLSH kc5( K, M, COMM, DOT, SLSH )
/* ,-----------------------------------------. ,-----------------------------------------.
* | ESC | Q | W | F | P | G | | J | L | U | Y | ; | \ |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
Expand All @@ -101,19 +91,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-------------------------------------------------------------------------------------------------'
*/
[_COLEMAK] = LAYOUT_wrapper(
KC_ESC, Q_____W_____F_____P_____G, J_____L_____U_____Y__SCLN, KC_BSLS,
KC_LCTL, A_____R_____S_____T_____D, H_____N_____E_____I_____O, KC_RCTL,
KC_LSFT, Z_____X_____C_____V_____B, K_____M__COMM___DOT__SLSH, KC_RSFT,
KC_ESC, Q_____W_____F_____P_____G, J_____L_____U_____Y____SCLN, KC_BSLS,
KC_LCTL, A_____R_____S_____T_____D, H_____N_____E_____I_____O, KC_RCTL,
KC_LSFT, Z_____X_____C_____V_____B, K_____M____COMM__DOT___SLSH, KC_RSFT,
LOWER___LOWER__CAPS__LALT__LGUI__NUML__RABS, RAEN_NUMR__RGUI__RALT___APP_LOWER__LOWER
),

/* Dvorak */
#define QUOT__COMM___DOT_____P_____Y kc5( QUOT, COMM, DOT, P, Y )
#define F_____G_____C_____R_____L kc5( F, G, C, R, L )
#define A_____O_____E_____U_____I kc5( A, O, E, U, I )
#define D_____H_____T_____N_____S kc5( D, H, T, N, S )
#define SCLN_____Q_____J_____K_____X kc5( SCLN, Q, J, K, X )
#define B_____M_____W_____V_____Z kc5( B, M, W, V, Z )
/* ,-----------------------------------------. ,-----------------------------------------.
* | ESC | ' | , | . | P | Y | | F | G | C | R | L | \ |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
Expand All @@ -125,19 +109,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-------------------------------------------------------------------------------------------------'
*/
[_DVORAK] = LAYOUT_wrapper(
KC_ESC, QUOT__COMM___DOT_____P_____Y, F_____G_____C_____R_____L, KC_BSLS,
KC_LCTL, A_____O_____E_____U_____I, D_____H_____T_____N_____S, KC_RCTL,
KC_LSFT, SCLN_____Q_____J_____K_____X, B_____M_____W_____V_____Z, KC_RSFT,
KC_ESC, QUOT_COMM___DOT____P_____Y, F_____G_____C_____R_____L, KC_BSLS,
KC_LCTL, A_____O_____E_____U_____I, D_____H_____T_____N_____S, KC_RCTL,
KC_LSFT, SCLN___Q_____J_____K_____X, B_____M_____W_____V_____Z, KC_RSFT,
LOWER___LOWER__CAPS__LALT__LGUI__NUML__RABS, RAEN_NUMR__RGUI__RALT___APP_LOWER__LOWER
),

/* Eucalyn (http://eucalyn.hatenadiary.jp/entry/about-eucalyn-layout) */
#define Q_____W__COMM___DOT__SCLN kc5( Q, W, COMM, DOT, SCLN )
#define M_____R_____D_____Y_____P kc5( M, R, D, Y, P )
#define A_____O_____E_____I_____U kc5( A, O, E, I, U )
#define G_____T_____K_____S_____N kc5( G, T, K, S, N )
#define Z_____X_____C_____V_____F kc5( Z, X, C, V, F )
#define B_____H_____J_____L__SLSH kc5( B, H, J, L, SLSH )
/* ,-----------------------------------------. ,-----------------------------------------.
* | ESC | Q | W | , | . | ; | | M | R | D | Y | P | \ |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
Expand All @@ -149,19 +127,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-------------------------------------------------------------------------------------------------'
*/
[_EUCALYN] = LAYOUT_wrapper(
KC_ESC, Q_____W__COMM___DOT__SCLN, M_____R_____D_____Y_____P, KC_BSLS,
KC_LCTL, A_____O_____E_____I_____U, G_____T_____K_____S_____N, KC_RCTL,
KC_LSFT, Z_____X_____C_____V_____F, B_____H_____J_____L__SLSH, KC_RSFT,
KC_ESC, Q_____W___COMM___DOT__SCLN, M_____R_____D_____Y_____P, KC_BSLS,
KC_LCTL, A_____O_____E_____I_____U, G_____T_____K_____S_____N, KC_RCTL,
KC_LSFT, Z_____X_____C_____V_____F, B_____H_____J_____L____SLSH, KC_RSFT,
LOWER___LOWER__CAPS__LALT__LGUI__NUML__RABS, RAEN_NUMR__RGUI__RALT___APP_LOWER__LOWER
),

/* Num */
#define EXLM__AT__HASH___DLR__PERC kc5( EXLM, AT, HASH, DLR, PERC )
#define CIRC_AMPR_ASTR__LPRN__RPRN kc5( CIRC, AMPR, ASTR, LPRN, RPRN )
#define _1_____2_____3_____4_____5 kc5( 1, 2, 3, 4, 5 )
#define _6_____7_____8_____9_____0 kc5( 6, 7, 8, 9, 0 )
#define F1____F2____F3____F4____F5 kc5( F1, F2, F3, F4, F5 )
#define F6____F7____F8____F9___F10 kc5( F6, F7, F8, F9, F10 )
#define ____z_____z_____z_____z _______, _______, _______, _______
#define ____z_____z_____z _______, _______, _______
#define ____z_____z _______, _______
Expand All @@ -178,13 +152,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_NUML] = LAYOUT_wrapper(
_______, EXLM__AT__HASH___DLR__PERC, CIRC_AMPR_ASTR__LPRN__RPRN, _______,
_______, _1_____2_____3_____4_____5, _6_____7_____8_____9_____0, KC_F12,
_______, F1____F2____F3____F4____F5, F6____F7____F8____F9___F10, KC_F11,
_______, F1____F2____F3____F4____F5, F6____F7____F8____F9____F10, KC_F11,
_______, ____z_____z_____z_____z,____z_____z_____z,KC_SPC, ____z_____z_____z_____z, _______
),
[_NUMR] = LAYOUT_wrapper(
_______, EXLM__AT__HASH___DLR__PERC, CIRC_AMPR_ASTR__LPRN__RPRN, _______,
_______, _1_____2_____3_____4_____5, _6_____7_____8_____9_____0, KC_F12,
_______, F1____F2____F3____F4____F5, F6____F7____F8____F9___F10, KC_F11,
_______, F1____F2____F3____F4____F5, F6____F7____F8____F9____F10, KC_F11,
_______, ____z_____z_____z_____z,KC_SPC, ____z_____z_____z,____z_____z_____z_____z, _______
),
/* Lower */
Expand Down
75 changes: 6 additions & 69 deletions keyboards/helix/rev2/keymaps/five_rows/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,9 @@
/*
This is the c configuration file for the keymap
// Copyright (c) 2022 Takeshi Ishii (mtei@github)
// SPDX-License-Identifier: GPL-2.0-or-later

Copyright 2012 Jun Wako <[email protected]>
Copyright 2015 Jack Humbert
Copyright 2020 mtei

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

#ifndef CONFIG_USER_H
#define CONFIG_USER_H
#ifndef CONFIG_KEYMAP_H
#define CONFIG_KEYMAP_H
mtei marked this conversation as resolved.
Show resolved Hide resolved
#pragma once

#undef TAPPING_TERM
#define TAPPING_TERM 300
Expand All @@ -35,50 +18,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define OLED_UPDATE_INTERVAL 50
#endif

// place overrides here

// If you need more program area, try select and reduce rgblight modes to use.

#define DISABLE_SYNC_TIMER

// Selection of RGBLIGHT MODE to use.
#undef RGBLIGHT_ANIMATIONS
#undef RGBLIGHT_EFFECT_BREATHING
#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
#undef RGBLIGHT_EFFECT_SNAKE
#undef RGBLIGHT_EFFECT_KNIGHT
#undef RGBLIGHT_EFFECT_CHRISTMAS
#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
#undef RGBLIGHT_EFFECT_RGB_TEST
#undef RGBLIGHT_EFFECT_ALTERNATING

#if defined(LED_ANIMATIONS)
# if LED_ANIMATIONS_LEVEL > 1
#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
# else
#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
# endif
#endif

#endif /* CONFIG_USER_H */

#ifdef DEBUG_CONFIG
# include "debug_config.h"
#endif
#endif /* CONFIG_KEYMAP_H */
mtei marked this conversation as resolved.
Show resolved Hide resolved
Loading