Skip to content

Commit

Permalink
migrating to the new QMK upstream branch
Browse files Browse the repository at this point in the history
  • Loading branch information
@gicappa
gicappa committed Apr 15, 2024
1 parent 3864bfb commit b461bbd
Show file tree
Hide file tree
Showing 5 changed files with 312 additions and 29 deletions.
4 changes: 0 additions & 4 deletions keyboards/dz60/keymaps/60_ansi_gk/config.h
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
#include "config_common.h"

//#define PERMISSIVE_HOLD
#define IGNORE_MOD_TAP_INTERRUPT

#undef TAPPING_TERM
#define TAPPING_TERM 200

Expand Down
68 changes: 43 additions & 25 deletions keyboards/dz60/keymaps/60_ansi_gk/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@
#define _FIND LGUI(KC_F)

// CMD+TAB and CMD+SHIFT+TAB definitions
enum macro_keycodes {
KC_GUI_TAB,
enum custom_keycodes {
KC_GUI_TAB = SAFE_RANGE,
KC_GUI_SHIFT_TAB
};

#define GUI_TAB M(KC_GUI_TAB) // Macro for Alt-Tab
#define G_S_TAB M(KC_GUI_SHIFT_TAB)
#define GUI_TAB MO(KC_GUI_TAB) // Macro for Alt-Tab
#define G_S_TAB MO(KC_GUI_SHIFT_TAB)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

Expand All @@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `----------------------------------------------------------------------------------------------------'
*/
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,
QK_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, _L1_Q, KC_W, _E, _R, KC_T, KC_Y, _U, _I, KC_O, _L1_P, KC_LBRC, KC_RBRC, KC_BSLS,
KC_CAPS, _L4_A, _S, _D, _F, KC_G, KC_H, _J, _K, _L, KC_SCLN, KC_QUOT, KC_ENT,
XXXXXXX, _L2_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, _L2_SLA, XXXXXXX,
Expand All @@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* ,----------------------------------------------------------------------------------------------------.
* | ` ~ | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | DEL |
* |----------------------------------------------------------------------------------------------------+
* | | | | | | | | F1 | F2 | F3 | F4 | | | RESET |
* | | | | | | | | F1 | F2 | F3 | F4 | | |QK_BOOT|
* |----------------------------------------------------------------------------------------------------+
* | | | | | | | | F5 | F6 | F7 | F8 | | |
* |----------------------------------------------------------------------------------------------------+
Expand All @@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
LAYOUT_60_ansi(
KC_GRV, 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,
_______, _______, _______, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, _______, _______, RESET,
_______, _______, _______, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, _______, _______, QK_BOOT,
_______, _______, _______, _______, _______, _______, _______, KC_F5, KC_F6, KC_F7, KC_F8, _______, _______,
_______, _______, _______, _______, _______, _______, _______, KC_F9, KC_F10, KC_F11, KC_F12, _______,
_______, _______, _______, _______, _______, _______, _______, _______
Expand All @@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* ,----------------------------------------------------------------------------------------------------.
* | ` ~ | | | | | | | | | | | | | DEL |
* |----------------------------------------------------------------------------------------------------+
* | | | & | ~ | ` | | | [ | + | ] | | | | RESET |
* | | | & | ~ | ` | | | [ | + | ] | | | |QK_BOOT|
* |----------------------------------------------------------------------------------------------------+
* | | | $ | \ | | | | | ( | = | ) | | | |
* |----------------------------------------------------------------------------------------------------+
Expand All @@ -112,8 +112,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `----------------------------------------------------------------------------------------------------'
*/
LAYOUT_60_ansi(
KC_GESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
_______, _______, KC_AMPR, KC_TILD, KC_GRV, _______, _______, KC_LBRC, KC_PLUS, KC_RBRC, _______, _______, _______, RESET,
QK_GESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
_______, _______, KC_AMPR, KC_TILD, KC_GRV, _______, _______, KC_LBRC, KC_PLUS, KC_RBRC, _______, _______, _______, QK_BOOT,
_______, _______, KC_DLR, KC_BSLS, KC_PIPE, _______, _______, KC_LPRN, KC_EQL, KC_RPRN, _______, _______, _______,
_______, _______, KC_PERC, KC_CIRC, KC_ASTR, _______, _______, KC_LCBR, KC_MINS, KC_RCBR, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
Expand All @@ -123,7 +123,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* ,----------------------------------------------------------------------------------------------------.
* | ` ~ | | | | | | | | | | | | | DEL |
* |----------------------------------------------------------------------------------------------------+
* | |CMD+Q |CMD+W |CS+TAB|CM+TAB| ` | | | | | | | | RESET |
* | |CMD+Q |CMD+W |CS+TAB|CM+TAB| ` | | | | | | | |QK_BOOT|
* |----------------------------------------------------------------------------------------------------+
* | |CMD+A |CMD+S |CMD+O |CMD+F | E | | | | | | | |
* |----------------------------------------------------------------------------------------------------+
Expand All @@ -134,7 +134,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
LAYOUT_60_ansi(
KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
_______, _CMD_Q, _CMD_W, G_S_TAB, GUI_TAB, KC_GRV, _______, _______, _______, _______, _______, _______, _______, RESET,
_______, _CMD_Q, _CMD_W, G_S_TAB, GUI_TAB, KC_GRV, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
_______, _ALL, _SAVE, _OPEN, _FIND, KC_E, _______, _______, _______, _______, _______, _______, _______,
_______, _UNDO, _CUT, _COPY, _PASTE, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
Expand All @@ -155,15 +155,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
LAYOUT_60_ansi(
KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
_______, _______, _______, _______, _______, _______, _______, KC_PGDN, KC_UP, KC_PGUP, KC_PSCR, KC_SLCK, KC_PAUS, _______,
_______, _______, _______, _______, _______, _______, _______, KC_PGDN, KC_UP, KC_PGUP, KC_PSCR, KC_SCRL, KC_PAUS, _______,
_______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_RGHT, _______, _______,
<<<<<<< HEAD
_______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_INS, KC_END, _______, _______,
_______, _______, _______, KC_ENT, _______, _______, _______, _______
=======
_______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_INS, KC_END, _______, _______,
_______, _______, _______, KC_ENT, _______, _______, _______, _______
>>>>>>> ca535c26bdf430463b2f51393abc2bc2e95c1447
),

/* Media/Lights [MEDI] active by 2 taps on CTRL right
Expand All @@ -185,7 +180,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, BL_DEC, BL_TOGG, BL_INC, BL_STEP, _______, _______, _______, _______, _______,
_______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),

Expand All @@ -205,13 +200,36 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

};

const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {

switch (id) {
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch(keycode) {
case KC_GUI_TAB:
return (record->event.pressed ? MACRO( D(LGUI), D(TAB), END ) : MACRO( U(TAB), END ));
if (record->event.pressed) {
register_code(KC_LGUI);
register_code(KC_TAB);
} else {
unregister_code(KC_TAB);
}
return false;
case KC_GUI_SHIFT_TAB:
return (record->event.pressed ? MACRO( D(LGUI), D(LSFT), D(TAB), END ) : MACRO( U(TAB), END ));
if (record->event.pressed) {
register_code(KC_LGUI);
register_code(KC_LSFT);
register_code(KC_TAB);

} else {
unregister_code(KC_TAB);
}
return false;
}
return MACRO_NONE;
return true;
}
// const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {

// switch (id) {
// case KC_GUI_TAB:
// return (record->event.pressed ? MACRO( D(LGUI), D(TAB), END ) : MACRO( U(TAB), END ));
// case KC_GUI_SHIFT_TAB:
// return (record->event.pressed ? MACRO( D(LGUI), D(LSFT), D(TAB), END ) : MACRO( U(TAB), END ));
// }
// return MACRO_NONE;
// }
21 changes: 21 additions & 0 deletions keyboards/keebio/iris/keymaps/gk/config.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/*
Copyright 2017 Danny Nguyen <[email protected]>
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

// #define USE_I2C
#define EE_HANDS
Loading

0 comments on commit b461bbd

Please sign in to comment.