From 7b4312ecfe749b031d1238577538d81764e7955f Mon Sep 17 00:00:00 2001 From: fdawans <53601011+fdawans@users.noreply.github.com> Date: Tue, 11 Aug 2020 18:29:07 +0200 Subject: [PATCH] Revert "keymap for squiggle goldberg. (#9909)" This reverts commit 336d91bab8a3f48d139b1a364eef02a7d1f944d3. --- .../keymaps/rick-complicated/config.h | 8 - .../keymaps/rick-complicated/keymap.c | 195 ------------------ .../keymaps/rick-complicated/readme.md | 3 - .../keymaps/rick-complicated/rules.mk | 2 - 4 files changed, 208 deletions(-) delete mode 100644 keyboards/squiggle/keymaps/rick-complicated/config.h delete mode 100644 keyboards/squiggle/keymaps/rick-complicated/keymap.c delete mode 100644 keyboards/squiggle/keymaps/rick-complicated/readme.md delete mode 100644 keyboards/squiggle/keymaps/rick-complicated/rules.mk diff --git a/keyboards/squiggle/keymaps/rick-complicated/config.h b/keyboards/squiggle/keymaps/rick-complicated/config.h deleted file mode 100644 index 5b97451890f6..000000000000 --- a/keyboards/squiggle/keymaps/rick-complicated/config.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -#define COMBO_TERM 100 -#define COMBO_COUNT 38 -#define IGNORE_MOD_TAP_INTERRUPT -#define PERMISSIVE_HOLD - -#define LEADER_TIMEOUT 300 diff --git a/keyboards/squiggle/keymaps/rick-complicated/keymap.c b/keyboards/squiggle/keymaps/rick-complicated/keymap.c deleted file mode 100644 index eb5853e90e1d..000000000000 --- a/keyboards/squiggle/keymaps/rick-complicated/keymap.c +++ /dev/null @@ -1,195 +0,0 @@ -/* Copyright 2020 Ibnu D. Aji - * - * 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 - -// enum for combos. -enum combos { - // left hand combinations. - COLON_COMMA, - COMMA_DOT, - DOT_P, - P_Y, - COMMA_P, - QUOT_Q, - Q_J, - J_K, - Q_K, - K_X, - - // right hand combinations. - L_R, - R_C, - C_G, - R_G, - G_F, - V_W, - W_M, - V_M, - M_B, - - // both hands combinations. - J_W, -}; - -enum { - _BASE, - _LOWER, - _RAISE, - _ADJUST, -}; - -enum custom_keycodes { - BASE = SAFE_RANGE, - LOWER, - RAISE, - ADJUST, -}; - -// thumb keys. -#define ALT_ENT ALT_T(KC_ENT) -#define SFT_ESC SFT_T(KC_ESC) - -// home row mods. -#define CT_O LCTL_T(KC_O) -#define CT_N RCTL_T(KC_N) -#define SH_A LSFT_T(KC_A) -#define SH_S RSFT_T(KC_S) -#define AL_E LALT_T(KC_E) -#define AL_T RALT_T(KC_T) -#define GU_I LGUI_T(KC_I) -#define GU_D RGUI_T(KC_D) - -// layer toggle. -#define LW_BSPC LT(_LOWER, KC_BSPC) -#define RS_SPC LT(_RAISE, KC_SPC) -#define RS_D LT(_RAISE, KC_D) -#define LW_I LT(_LOWER, KC_I) - -// idk, man. not used, i guess. -#define ADDDD MO(_ADJUST) - -// common shortcuts for windows and linux that i use. -#define NXTTAB LCTL(KC_PGDN) -#define PRVTAB LCTL(KC_PGUP) -#define UPTAB LCTL(LSFT(KC_PGUP)) -#define DNTAB LCTL(LSFT(KC_PGDN)) -#define NXTWIN LALT(KC_TAB) -#define PRVWIN LALT(LSFT(KC_TAB)) -#define CALDL LCTL(LALT(KC_DELT)) -#define TSKMGR LCTL(LSFT(KC_ESC)) -#define EXPLR LGUI(KC_E) -#define LCKGUI LGUI(KC_L) -#define CONPST LSFT(KC_INS) -#define CLSGUI LALT(KC_F4) - -// left hand combinations. -const uint16_t PROGMEM colon_comma_combo[] = {KC_SCLN, KC_COMM, COMBO_END}; -const uint16_t PROGMEM comma_dot_combo[] = {KC_COMM, KC_DOT, COMBO_END}; -const uint16_t PROGMEM dot_p_combo[] = {KC_DOT, KC_P, COMBO_END}; -const uint16_t PROGMEM p_y_combo[] = {KC_P, KC_Y, COMBO_END}; -const uint16_t PROGMEM comma_p_combo[] = {KC_COMM, KC_P, COMBO_END}; -const uint16_t PROGMEM quot_q_combo[] = {KC_QUOT, KC_Q, COMBO_END}; -const uint16_t PROGMEM q_j_combo[] = {KC_Q, KC_J, COMBO_END}; -const uint16_t PROGMEM j_k_combo[] = {KC_J, KC_K, COMBO_END}; -const uint16_t PROGMEM q_k_combo[] = {KC_Q, KC_K, COMBO_END}; -const uint16_t PROGMEM k_x_combo[] = {KC_K, KC_X, COMBO_END}; - -// right hand combinations. -const uint16_t PROGMEM l_r_combo[] = {KC_L, KC_R, COMBO_END}; -const uint16_t PROGMEM r_c_combo[] = {KC_R, KC_C, COMBO_END}; -const uint16_t PROGMEM c_g_combo[] = {KC_C, KC_G, COMBO_END}; -const uint16_t PROGMEM r_g_combo[] = {KC_R, KC_G, COMBO_END}; -const uint16_t PROGMEM g_f_combo[] = {KC_G, KC_F, COMBO_END}; -const uint16_t PROGMEM v_w_combo[] = {KC_V, KC_W, COMBO_END}; -const uint16_t PROGMEM w_m_combo[] = {KC_W, KC_M, COMBO_END}; -const uint16_t PROGMEM v_m_combo[] = {KC_V, KC_M, COMBO_END}; -const uint16_t PROGMEM m_b_combo[] = {KC_M, KC_B, COMBO_END}; - -// both hand combinations. -const uint16_t PROGMEM j_w_combo[] = {KC_J, KC_W, COMBO_END}; - -combo_t key_combos[COMBO_COUNT] = { - // left hand combinations. - [COLON_COMMA] = COMBO(colon_comma_combo, KC_TAB), - [COMMA_DOT] = COMBO(comma_dot_combo, KC_QUES), - [DOT_P] = COMBO(dot_p_combo, KC_UNDS), - [P_Y] = COMBO(p_y_combo, KC_PIPE), - [COMMA_P] = COMBO(comma_p_combo, PRVTAB), - [QUOT_Q] = COMBO(quot_q_combo, KC_ENT), - [Q_J] = COMBO(q_j_combo, LCTL(KC_W)), - [J_K] = COMBO(j_k_combo, KC_DELT), - [Q_K] = COMBO(q_k_combo, KC_TAB), - [K_X] = COMBO(k_x_combo, KC_TILD), - - // right hand combinations. - [L_R] = COMBO(l_r_combo, KC_BSPC), - [R_C] = COMBO(r_c_combo, KC_SLSH), - [C_G] = COMBO(c_g_combo, KC_MINS), - [R_G] = COMBO(r_g_combo, NXTTAB), - [G_F] = COMBO(g_f_combo, KC_BSLS), - [V_W] = COMBO(v_w_combo, KC_APP), - [W_M] = COMBO(w_m_combo, KC_DELT), - [V_M] = COMBO(v_m_combo, LSFT(KC_TAB)), - [M_B] = COMBO(m_b_combo, KC_GRV), - - // both hand combinations. - [J_W] = COMBO(j_w_combo, KC_ENT), -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[_BASE] = LAYOUT_complicated( - KC_SCLN,KC_COMM,KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, - SH_A, CT_O, AL_E, KC_U, GU_I, GU_D, KC_H, AL_T, CT_N, SH_S, - KC_QUOT,KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, - LW_BSPC,KC_LEAD, ALT_ENT,RS_SPC, - LW_BSPC,SFT_ESC, ALT_ENT,RS_SPC -), - -[_RAISE] = LAYOUT_complicated( - KC_EXLM,KC_AT, KC_UP, KC_LCBR,KC_RCBR, KC_BSLS,KC_7, KC_8, KC_9, KC_ASTR , - KC_HASH,KC_LEFT,KC_DOWN,KC_RGHT,KC_DLR, KC_EQL, KC_4, KC_5, KC_6, KC_0 , - KC_LBRC,KC_RBRC,KC_LPRN,KC_RPRN,KC_AMPR, KC_GRV, KC_1, KC_2, KC_3, KC_PLUS , - ADDDD ,_______, _______,_______, - ADDDD ,_______, _______,_______ -), -[_LOWER] = LAYOUT_complicated( - _______,_______,_______,KC_F1, KC_F2, KC_F3, KC_F4, _______,_______,_______ , - KC_LSFT,KC_TAB, KC_PGUP,KC_F5, KC_F6, KC_F7, KC_F8, KC_HOME,KC_LALT,KC_ENT , - KC_CLCK,KC_SLCK,KC_PGDN,KC_F9, KC_F10, KC_F11, KC_F12, KC_END, KC_INS, _______ , - _______,_______, _______,ADDDD, - _______,_______, _______,ADDDD -), -[_ADJUST] = LAYOUT_complicated( - _______,EXPLR, KC_UP, PRVTAB, PRVWIN, NXTWIN, NXTTAB, _______,_______,LCKGUI, - TSKMGR, KC_LEFT,KC_DOWN,KC_RGHT,UPTAB, DNTAB, KC_ENT, KC_LGUI,_______,CALDL, - _______,CLSGUI, _______,CONPST, RESET, _______,_______,_______,_______,_______, - _______,_______, _______,_______, - _______,_______, _______,_______ -), -}; - -LEADER_EXTERNS(); - -void matrix_scan_user() { - LEADER_DICTIONARY() { - leading = false; - leader_end(); - - SEQ_ONE_KEY(KC_U) { - SEND_STRING(":luvu:\n"); - } - } -} diff --git a/keyboards/squiggle/keymaps/rick-complicated/readme.md b/keyboards/squiggle/keymaps/rick-complicated/readme.md deleted file mode 100644 index d14eb193c05b..000000000000 --- a/keyboards/squiggle/keymaps/rick-complicated/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# goldberg keymap - -ricky rick's keymap on squiggle goldberg. ayyy. diff --git a/keyboards/squiggle/keymaps/rick-complicated/rules.mk b/keyboards/squiggle/keymaps/rick-complicated/rules.mk deleted file mode 100644 index 00c78275d97f..000000000000 --- a/keyboards/squiggle/keymaps/rick-complicated/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -COMBO_ENABLE = yes -LEADER_ENABLE = yes