g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keymap: Reformat Iris default keymap (#3534) 

* Reformat default keymap to use LAYOUT, move RGB controls to RAISE layer

* Use set_single_persistent_default_layer instead of old method
daktil_thumb_popravljen
Danny 2018-08-02 16:49:17 -04:00 committed by Drashna Jaelre
parent 62a8603122
commit a057f1ca9e
3 changed files with 51 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
keyboards/iris/keymaps/default/config.h
View File

@ -15,10 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef CONFIG_USER_H #pragma once
#define CONFIG_USER_H
#include "config_common.h"
/* Use I2C or Serial, not both */ /* Use I2C or Serial, not both */
@ -37,5 +34,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_VAL_STEP 8
#endif

125
keyboards/iris/keymaps/default/keymap.c
View File

@ -1,6 +1,4 @@
#include "iris.h" #include QMK_KEYBOARD_H
#include "action_layer.h"
#include "eeconfig.h"
extern keymap_config_t keymap_config; extern keymap_config_t keymap_config;
@ -16,93 +14,70 @@ enum custom_keycodes {
ADJUST, ADJUST,
}; };
#define KC_ KC_TRNS
#define _______ KC_TRNS
#define KC_LOWR LOWER
#define KC_RASE RAISE
#define KC_RST RESET
#define KC_BL_S BL_STEP
#define KC_DBUG DEBUG
#define KC_RTOG RGB_TOG
#define KC_RMOD RGB_MOD
#define KC_RHUI RGB_HUI
#define KC_RHUD RGB_HUD
#define KC_RSAI RGB_SAI
#define KC_RSAD RGB_SAD
#define KC_RVAI RGB_VAI
#define KC_RVAD RGB_VAD
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_kc( [_QWERTY] = LAYOUT(
//,----+----+----+----+----+----. ,----+----+----+----+----+----. //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
ESC , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 ,BSPC, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
//|----+----+----+----+----+----| |----+----+----+----+----+----| //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
TAB , Q , W , E , R , T , Y , U , I , O , P ,DEL , KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL,
//|----+----+----+----+----+----| |----+----+----+----+----+----| //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
LSFT, A , S , D , F , G , H , J , K , L ,SCLN,QUOT, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
//|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----| //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
LCTL, Z , X , C , V , B ,HOME, END , N , M ,COMM,DOT ,SLSH,RSFT, KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_HOME, KC_END, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
//`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----' //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
LGUI,LOWR,ENT , SPC ,RASE,LALT KC_LGUI, LOWER, KC_ENT, KC_SPC, RAISE, KC_LALT
// `----+----+----' `----+----+----' // └────────┴────────┴────────┘ └────────┴────────┴────────┘
), ),
[_LOWER] = LAYOUT_kc( [_LOWER] = LAYOUT(
//,----+----+----+----+----+----. ,----+----+----+----+----+----. //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
TILD,EXLM, AT ,HASH,DLR ,PERC, CIRC,AMPR,ASTR,LPRN,RPRN,BSPC, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
//|----+----+----+----+----+----| |----+----+----+----+----+----| //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
RST , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , , RESET, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
//|----+----+----+----+----+----| |----+----+----+----+----+----| //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
DEL , ,LEFT,RGHT, UP ,LBRC, RBRC, P4 , P5 , P6 ,PLUS,PIPE, KC_DEL, _______, KC_LEFT, KC_RGHT, KC_UP, KC_LBRC, KC_RBRC, KC_P4, KC_P5, KC_P6, KC_PLUS, KC_PIPE,
//|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----| //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
BL_S, , , ,DOWN,LCBR,LPRN, RPRN,RCBR, P1 , P2 , P3 ,MINS, , BL_STEP, _______, _______, _______, KC_DOWN, KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_P1, KC_P2, KC_P3, KC_MINS, _______,
//`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----' //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
, ,DEL , DEL , , P0 _______, _______, KC_DEL, KC_DEL, _______, KC_P0
// `----+----+----' `----+----+----' // └────────┴────────┴────────┘ └────────┴────────┴────────┘
), ),
[_RAISE] = LAYOUT_kc( [_RAISE] = LAYOUT(
//,----+----+----+----+----+----. ,----+----+----+----+----+----. //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
F12 , F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 ,F11 , KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
//|----+----+----+----+----+----| |----+----+----+----+----+----| //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
,EXLM, AT ,HASH,DLR ,PERC, CIRC,AMPR,ASTR,LPRN,RPRN, , RGB_TOG, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
//|----+----+----+----+----+----| |----+----+----+----+----+----| //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
,MPRV,MNXT,VOLU,PGUP,UNDS, EQL ,HOME, , , ,BSLS, RGB_MOD, KC_MPRV, KC_MNXT, KC_VOLU, KC_PGUP, KC_UNDS, KC_EQL, KC_HOME, RGB_HUI, RGB_SAI, RGB_VAI, KC_BSLS,
//|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----| //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
MUTE,MSTP,MPLY,VOLD,PGDN,MINS, , ,PLUS,END , , , , , KC_MUTE, KC_MSTP, KC_MPLY, KC_VOLD, KC_PGDN, KC_MINS, KC_LPRN, _______, KC_PLUS, KC_END, RGB_HUD, RGB_SAD, RGB_VAD, _______,
//`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----' //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
, , , , , _______, _______, _______, _______, _______, _______
// `----+----+----' `----+----+----' // └────────┴────────┴────────┘ └────────┴────────┴────────┘
), ),
[_ADJUST] = LAYOUT_kc( [_ADJUST] = LAYOUT(
//,----+----+----+----+----+----. ,----+----+----+----+----+----. //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
, , , , , , , , , , , , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
//|----+----+----+----+----+----| |----+----+----+----+----+----| //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
RTOG,RMOD,RHUI,RSAI,RVAI, , , , , , , , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
//|----+----+----+----+----+----| |----+----+----+----+----+----| //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
,DBUG,RHUD,RSAD,RVAD, , , , , , , , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
//|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----| //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
BL_S,RST , , , , , , , , , , , , , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
//`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----' //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
, , , , , _______, _______, _______, _______, _______, _______
// `----+----+----' `----+----+----' // └────────┴────────┴────────┘ └────────┴────────┴────────┘
) )
}; };
void persistent_default_layer_set(uint16_t default_layer) {
eeconfig_update_default_layer(default_layer);
default_layer_set(default_layer);
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) { bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) { switch (keycode) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
persistent_default_layer_set(1UL<<_QWERTY); set_single_persistent_default_layer(_QWERTY);
} }
return false; return false;
break; break;

4
keyboards/iris/keymaps/default/rules.mk
View File

@ -1,6 +1,2 @@
RGBLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes
BACKLIGHT_ENABLE = yes BACKLIGHT_ENABLE = yes
ifndef QUANTUM_DIR
include ../../../../Makefile
endif