From a336c2c5005251e4cb0f3a62ccabdb4cfccad915 Mon Sep 17 00:00:00 2001 From: lokher Date: Tue, 6 Dec 2022 17:10:48 +0800 Subject: Merge upstream master to 2022 Q4 breaking change --- keyboards/keebio/iris/keymaps/impstyle/config.h | 41 --------- keyboards/keebio/iris/keymaps/impstyle/keymap.c | 110 ------------------------ 2 files changed, 151 deletions(-) delete mode 100644 keyboards/keebio/iris/keymaps/impstyle/config.h delete mode 100644 keyboards/keebio/iris/keymaps/impstyle/keymap.c (limited to 'keyboards/keebio/iris/keymaps/impstyle') diff --git a/keyboards/keebio/iris/keymaps/impstyle/config.h b/keyboards/keebio/iris/keymaps/impstyle/config.h deleted file mode 100644 index 68b45c217d..0000000000 --- a/keyboards/keebio/iris/keymaps/impstyle/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2017 Danny Nguyen - -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 . -*/ - -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include "config_common.h" - -#define USE_I2C - -/* Select hand configuration */ -#define MASTER_LEFT -// #define MASTER_RIGHT -// #define EE_HANDS - -#define MOUSEKEY_DELAY 300 -#define MOUSEKEY_INTERVAL 50 -#define MOUSEKEY_MAX_SPEED 10 -#define MOUSEKEY_TIME_TO_MAX 20 -#define MOUSEKEY_WHEEL_MAX_SPEED 8 -#define MOUSEKEY_WHEEL_TIME_TO_MAX 40 - -#define TAPPING_TOGGLE 2 // double tab - -#include "../../config.h" - -#endif diff --git a/keyboards/keebio/iris/keymaps/impstyle/keymap.c b/keyboards/keebio/iris/keymaps/impstyle/keymap.c deleted file mode 100644 index 0d3d6b640a..0000000000 --- a/keyboards/keebio/iris/keymaps/impstyle/keymap.c +++ /dev/null @@ -1,110 +0,0 @@ -// iris qwerty layout with mouse layer. -// double tab to toggle is not working atm - -#include QMK_KEYBOARD_H - -extern keymap_config_t keymap_config; - -#define _QWERTY 0 -#define _LOWER 1 -#define _RAISE 2 -#define _MOUSE 3 - -enum custom_keycodes { - QWERTY = SAFE_RANGE, - LOWER, - RAISE, - MOUSE, -}; - -#define KC_ KC_TRNS -#define KC_LOWR MO(_LOWER) // Lower layer -#define KC_RASE MO(_RAISE) // Raise layer -#define KC_TGLW TG(_LOWER) // toggle lower -#define KC_TGRS TG(_RAISE) // toggle raise -#define KC_MOUS TT(_MOUSE) // double tab toggle mouse layer - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - // QUERTY LAYER - //,----+----+----+----+----+----. ,----+----+----+----+----+----. - // ESC , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 ,BSPC, - //|----+----+----+----+----+----| |----+----+----+----+----+----| - // TAB , Q , W , E , R , T , Y , U , I , O , P ,MINS , - //|----+----+----+----+----+----| |----+----+----+----+----+----| - // LSFT, A , S , D , F , G , H , J , K , L ,SCLN,QUOT, - //|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----| - // LCTL, Z , X , C , V , B ,PLUS , MOUS , N , M ,COMM,DOT ,SLSH,BSLASH, - //`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----' - // LGUI,RASE,SPC , ENT ,LOWR,LALT - // `----+----+----' `----+----+----' - - [_QWERTY] = LAYOUT( - KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,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_MINS, - KC_LSFT, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN,KC_QUOT, - KC_LCTL, KC_Z , KC_X , KC_C , KC_V , KC_B ,KC_PLUS, KC_MOUS,KC_N , KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS, - KC_LGUI,KC_RASE,KC_SPC , KC_ENT ,KC_LOWR,KC_LALT - ), - - // LOWER Layer - //,----+----+----+----+----+----. ,----+----+----+----+----+----. - // TILD,EXLM, AT ,HASH,DLR ,PERC, CIRC,AMPR,ASTR,LPRN,RPRN,BSPC, - //|----+----+----+----+----+----| |----+----+----+----+----+----| - // , , , , ,LBRC, RBRC, P7 , P8 , P9 , ,PLUS, - //|----+----+----+----+----+----| |----+----+----+----+----+----| - // ,HOME,PGUP,PGDN,END,LPRN, RPRN, P4 , P5 , P6 ,MINS,PIPE, - //|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----| - // , , , , , , , , , P1 , P2 , P3 ,EQL ,UNDS , - //`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----' - // , ,DEL , BSPC , , P0 - // `----+----+----' `----+----+----' - - [_LOWER] = LAYOUT( - KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL, - _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS, - _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN, KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE, - _______,_______,_______,_______,_______,_______,_______, _______,_______, KC_P1 , KC_P2 , KC_P3 ,KC_EQL ,KC_UNDS , - _______ ,_______,KC_PSCR , _______,_______, KC_P0 -), - // RAISE LAYER - //,----+----+----+----+----+----. ,----+----+----+----+----+----. - // F12 , F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 ,F11 , - //|----+----+----+----+----+----| |----+----+----+----+----+----| - // , , , , ,LBRC, RBRC, ,NLCK,INS ,SLCK,MUTE, - //|----+----+----+----+----+----| |----+----+----+----+----+----| - // ,LEFT,UP ,DOWN,RGHT,LPRN, RPRN,MPRV,MPLY,MNXT, ,VOLU, - //|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----| - // , , , , , , , PLUS , , , , , ,VOLD, - //`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----' - // , , , EQL, , - // `----+----+----' `----+----+----' - - [_RAISE] = LAYOUT( - KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 , - _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC,_______,KC_NUM ,KC_INS ,KC_SCRL,KC_MUTE, - _______,KC_LEFT,KC_UP ,KC_DOWN,KC_RGHT,KC_LPRN, KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU, - _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,KC_VOLD, - _______ ,_______,_______, KC_EQL ,_______,_______ - ), - // MOUSE LAYER - //,----+----+----+----+----+----. ,----+----+----+----+----+----. - // , , , , , , , , , , , , - //|----+----+----+----+----+----| |----+----+----+----+----+----| - // , , , , , , MS_WH_UP, , , , , , - //|----+----+----+----+----+----| |----+----+----+----+----+----| - // ,,MS_LEFT,MS_UP,MS_DOWN,MS_RGHT,, MS_WH_DN,MS_BT1,MS_BT2,MS_BT3, , , - //|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----| - // , , , , , , , , , , ,MS_ACC0,MS_ACC1MS_ACC2 - //`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----' - // , , , , , - // `----+----+----' `----+----+----' - [_MOUSE] = LAYOUT( - _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, - _______,_______,_______,_______,_______,_______, KC_MS_WH_UP,_______,_______,_______,_______,_______, - _______,KC_MS_LEFT,KC_MS_UP,KC_MS_DOWN,KC_MS_RIGHT,_______, KC_MS_WH_DOWN,KC_MS_BTN1,KC_MS_BTN2,KC_MS_BTN3,_______,_______, - _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,KC_MS_ACCEL0,KC_MS_ACCEL1,KC_MS_ACCEL2, - _______,_______,_______, _______,_______,_______ - ), - -}; -- cgit v1.2.3