aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny <nooges@users.noreply.github.com>2018-08-02 16:49:17 -0400
committerDrashna Jaelre <drashna@live.com>2018-08-02 13:49:17 -0700
commita057f1ca9e38bd06f88bc3370be6454f026fac0a (patch)
tree4e70c9652bffacf9d60ceb27a5781dae4d50a5d6
parent62a86031223fcbfbed437493c69b27493c52206d (diff)
downloadqmk_firmware-a057f1ca9e38bd06f88bc3370be6454f026fac0a.tar.gz
qmk_firmware-a057f1ca9e38bd06f88bc3370be6454f026fac0a.zip
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
Diffstat
-rw-r--r--keyboards/iris/keymaps/default/config.h7
-rw-r--r--keyboards/iris/keymaps/default/keymap.c125
-rw-r--r--keyboards/iris/keymaps/default/rules.mk4
3 files changed, 51 insertions, 85 deletions
diff --git a/keyboards/iris/keymaps/default/config.h b/keyboards/iris/keymaps/default/config.h
index 72e35c472..7986b5041 100644
--- a/keyboards/iris/keymaps/default/config.h
+++ b/keyboards/iris/keymaps/default/config.h
@@ -15,10 +15,7 @@ You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>. 15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/ 16*/
17 17
18#ifndef CONFIG_USER_H 18#pragma once
19#define CONFIG_USER_H
20
21#include "config_common.h"
22 19
23/* Use I2C or Serial, not both */ 20/* Use I2C or Serial, not both */
24 21
@@ -37,5 +34,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
37#define RGBLIGHT_HUE_STEP 8 34#define RGBLIGHT_HUE_STEP 8
38#define RGBLIGHT_SAT_STEP 8 35#define RGBLIGHT_SAT_STEP 8
39#define RGBLIGHT_VAL_STEP 8 36#define RGBLIGHT_VAL_STEP 8
40
41#endif
diff --git a/keyboards/iris/keymaps/default/keymap.c b/keyboards/iris/keymaps/default/keymap.c
index 9367c163e..4644c3d9b 100644
--- a/keyboards/iris/keymaps/default/keymap.c
+++ b/keyboards/iris/keymaps/default/keymap.c
@@ -1,6 +1,4 @@
1#include "iris.h" 1#include QMK_KEYBOARD_H
2#include "action_layer.h"
3#include "eeconfig.h"
4 2
5extern keymap_config_t keymap_config; 3extern keymap_config_t keymap_config;
6 4
@@ -16,93 +14,70 @@ enum custom_keycodes {
16 ADJUST, 14 ADJUST,
17}; 15};
18 16
19#define KC_ KC_TRNS
20#define _______ KC_TRNS
21
22#define KC_LOWR LOWER
23#define KC_RASE RAISE
24#define KC_RST RESET
25#define KC_BL_S BL_STEP
26#define KC_DBUG DEBUG
27#define KC_RTOG RGB_TOG
28#define KC_RMOD RGB_MOD
29#define KC_RHUI RGB_HUI
30#define KC_RHUD RGB_HUD
31#define KC_RSAI RGB_SAI
32#define KC_RSAD RGB_SAD
33#define KC_RVAI RGB_VAI
34#define KC_RVAD RGB_VAD
35
36const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 17const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
37 18
38 [_QWERTY] = LAYOUT_kc( 19 [_QWERTY] = LAYOUT(
39 //,----+----+----+----+----+----. ,----+----+----+----+----+----. 20 //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
40 ESC , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 ,BSPC, 21 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
41 //|----+----+----+----+----+----| |----+----+----+----+----+----| 22 //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
42 TAB , Q , W , E , R , T , Y , U , I , O , P ,DEL , 23 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL,
43 //|----+----+----+----+----+----| |----+----+----+----+----+----| 24 //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
44 LSFT, A , S , D , F , G , H , J , K , L ,SCLN,QUOT, 25 KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
45 //|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----| 26 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
46 LCTL, Z , X , C , V , B ,HOME, END , N , M ,COMM,DOT ,SLSH,RSFT, 27 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,
47 //`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----' 28 //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
48 LGUI,LOWR,ENT , SPC ,RASE,LALT 29 KC_LGUI, LOWER, KC_ENT, KC_SPC, RAISE, KC_LALT
49 // `----+----+----' `----+----+----' 30 // └────────┴────────┴────────┘ └────────┴────────┴────────┘
50 ), 31 ),
51 32
52 [_LOWER] = LAYOUT_kc( 33 [_LOWER] = LAYOUT(
53 //,----+----+----+----+----+----. ,----+----+----+----+----+----. 34 //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
54 TILD,EXLM, AT ,HASH,DLR ,PERC, CIRC,AMPR,ASTR,LPRN,RPRN,BSPC, 35 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
55 //|----+----+----+----+----+----| |----+----+----+----+----+----| 36 //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
56 RST , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , , 37 RESET, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
57 //|----+----+----+----+----+----| |----+----+----+----+----+----| 38 //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
58 DEL , ,LEFT,RGHT, UP ,LBRC, RBRC, P4 , P5 , P6 ,PLUS,PIPE, 39 KC_DEL, _______, KC_LEFT, KC_RGHT, KC_UP, KC_LBRC, KC_RBRC, KC_P4, KC_P5, KC_P6, KC_PLUS, KC_PIPE,
59 //|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----| 40 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
60 BL_S, , , ,DOWN,LCBR,LPRN, RPRN,RCBR, P1 , P2 , P3 ,MINS, , 41 BL_STEP, _______, _______, _______, KC_DOWN, KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_P1, KC_P2, KC_P3, KC_MINS, _______,
61 //`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----' 42 //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
62 , ,DEL , DEL , , P0 43 _______, _______, KC_DEL, KC_DEL, _______, KC_P0
63 // `----+----+----' `----+----+----' 44 // └────────┴────────┴────────┘ └────────┴────────┴────────┘
64 ), 45 ),
65 46
66 [_RAISE] = LAYOUT_kc( 47 [_RAISE] = LAYOUT(
67 //,----+----+----+----+----+----. ,----+----+----+----+----+----. 48 //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
68 F12 , F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 ,F11 , 49 KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
69 //|----+----+----+----+----+----| |----+----+----+----+----+----| 50 //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
70 ,EXLM, AT ,HASH,DLR ,PERC, CIRC,AMPR,ASTR,LPRN,RPRN, , 51 RGB_TOG, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
71 //|----+----+----+----+----+----| |----+----+----+----+----+----| 52 //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
72 ,MPRV,MNXT,VOLU,PGUP,UNDS, EQL ,HOME, , , ,BSLS, 53 RGB_MOD, KC_MPRV, KC_MNXT, KC_VOLU, KC_PGUP, KC_UNDS, KC_EQL, KC_HOME, RGB_HUI, RGB_SAI, RGB_VAI, KC_BSLS,
73 //|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----| 54 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
74 MUTE,MSTP,MPLY,VOLD,PGDN,MINS, , ,PLUS,END , , , , , 55 KC_MUTE, KC_MSTP, KC_MPLY, KC_VOLD, KC_PGDN, KC_MINS, KC_LPRN, _______, KC_PLUS, KC_END, RGB_HUD, RGB_SAD, RGB_VAD, _______,
75 //`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----' 56 //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
76 , , , , , 57 _______, _______, _______, _______, _______, _______
77 // `----+----+----' `----+----+----' 58 // └────────┴────────┴────────┘ └────────┴────────┴────────┘
78 ), 59 ),
79 60
80 [_ADJUST] = LAYOUT_kc( 61 [_ADJUST] = LAYOUT(
81 //,----+----+----+----+----+----. ,----+----+----+----+----+----. 62 //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
82 , , , , , , , , , , , , 63 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
83 //|----+----+----+----+----+----| |----+----+----+----+----+----| 64 //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
84 RTOG,RMOD,RHUI,RSAI,RVAI, , , , , , , , 65 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
85 //|----+----+----+----+----+----| |----+----+----+----+----+----| 66 //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
86 ,DBUG,RHUD,RSAD,RVAD, , , , , , , , 67 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
87 //|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----| 68 //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
88 BL_S,RST , , , , , , , , , , , , , 69 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
89 //`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----' 70 //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
90 , , , , , 71 _______, _______, _______, _______, _______, _______
91 // `----+----+----' `----+----+----' 72 // └────────┴────────┴────────┘ └────────┴────────┴────────┘
92 ) 73 )
93
94}; 74};
95 75
96void persistent_default_layer_set(uint16_t default_layer) {
97 eeconfig_update_default_layer(default_layer);
98 default_layer_set(default_layer);
99}
100
101bool process_record_user(uint16_t keycode, keyrecord_t *record) { 76bool process_record_user(uint16_t keycode, keyrecord_t *record) {
102 switch (keycode) { 77 switch (keycode) {
103 case QWERTY: 78 case QWERTY:
104 if (record->event.pressed) { 79 if (record->event.pressed) {
105 persistent_default_layer_set(1UL<<_QWERTY); 80 set_single_persistent_default_layer(_QWERTY);
106 } 81 }
107 return false; 82 return false;
108 break; 83 break;
diff --git a/keyboards/iris/keymaps/default/rules.mk b/keyboards/iris/keymaps/default/rules.mk
index 22b6ec476..d7463419b 100644
--- a/keyboards/iris/keymaps/default/rules.mk
+++ b/keyboards/iris/keymaps/default/rules.mk
@@ -1,6 +1,2 @@
1RGBLIGHT_ENABLE = yes 1RGBLIGHT_ENABLE = yes
2BACKLIGHT_ENABLE = yes 2BACKLIGHT_ENABLE = yes
3
4ifndef QUANTUM_DIR
5 include ../../../../Makefile
6endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-03 14:03:09 +0000