summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-05-08 16:35:59 +0000
committerQMK Bot <hello@qmk.fm>2021-05-08 16:35:59 +0000
commitfd5da75bddd3b29d022fc4b8a6ae1c92dc430124 (patch)
tree9ad1ecdd326070c7ddc997cbd062bf24f7c09b42
parentfca7cc1747642d077898e301945df86bfdea0784 (diff)
parent067a6f017477938f965b1c4af4dace288d906730 (diff)
downloadqmk_firmware-fd5da75bddd3b29d022fc4b8a6ae1c92dc430124.tar.gz
qmk_firmware-fd5da75bddd3b29d022fc4b8a6ae1c92dc430124.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/keebio/iris/keymaps/hbbisenieks/config.h3
-rw-r--r--keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c75
2 files changed, 40 insertions, 38 deletions
diff --git a/keyboards/keebio/iris/keymaps/hbbisenieks/config.h b/keyboards/keebio/iris/keymaps/hbbisenieks/config.h
index 48f448fa22..bb3fe25085 100644
--- a/keyboards/keebio/iris/keymaps/hbbisenieks/config.h
+++ b/keyboards/keebio/iris/keymaps/hbbisenieks/config.h
@@ -17,6 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
+#include "config_common.h"
+
+
/* Use I2C or Serial, not both */
#define USE_SERIAL
diff --git a/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c b/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c
index 9916fc5ee5..a886bf7a30 100644
--- a/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c
+++ b/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c
@@ -16,8 +16,6 @@ enum custom_keycodes {
CHUS,
};
-#define KC_ KC_TRNS
-
#define KC_CAPW LGUI(LSFT(KC_3)) // Capture whole screen
#define KC_CPYW LGUI(LSFT(LCTL(KC_3))) // Copy whole screen
#define KC_CAPP LGUI(LSFT(KC_4)) // Capture portion of screen
@@ -49,46 +47,47 @@ enum custom_keycodes {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_QWERTY] = LAYOUT_kc(
- //,----+----+----+----+----+----. ,----+----+----+----+----+----.
- GRV , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 ,BSPC,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
- TAB , Q , W , E , R , T , Y , U , I , O , P ,BSLS,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
- ESC , A , S , D , F , G , H , J , K , L ,SCLN,QUOT,
- //|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----|
- LSBR, Z , X , C , V , B ,TT_L, TT_R, N , M ,COMM,DOT ,SLSH,RSBR,
- //`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----'
- LCTL,SMIN,LGUI, ENT ,SPC ,LALT
- // `----+----+----' `----+----+----'
+ [_QWERTY] = LAYOUT(
+ //,-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------.
+ KC_GRV , 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_BSLS,
+ //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------|
+ KC_ESC , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN,KC_QUOT,
+ //|-------+-------+-------+-------+-------+-------+-------. ,-------|-------+-------+-------+-------+-------+-------|
+ KC_LSBR, KC_Z , KC_X , KC_C , KC_V , KC_B ,KC_TT_L, KC_TT_R, KC_N , KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSBR,
+ //`-------+-------+-------+---+---+-------+-------+-------/ \-------+-------+-------+---+---+-------+-------+-------'
+ KC_LCTL,KC_SMIN,KC_LGUI, KC_ENT ,KC_SPC ,KC_LALT
+ // `-------+-------+-------' `-------+-------+-------'
),
- [_LOWER] = LAYOUT_kc(
- //,----+----+----+----+----+----. ,----+----+----+----+----+----.
- TILD,EXLM, AT ,HASH,DLR ,PERC, CIRC,AMPR,ASTR,MINS,EQL , ,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
- ,SLOK, , UP , ,RGBT, P7 , P8 , P9 , E , F ,LPRN,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
- DEL , ,LEFT,DOWN,RGHT,GUSR, P4 , P5 , P6 , C , D ,RPRN,
- //|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----|
- BL_S, , , ,HGRP,CHUS, , , P1 , P2 , P3 , A , B , ,
- //`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----'
- , , , DOT , P0 ,COLN
- // `----+----+----' `----+----+----'
+ [_LOWER] = LAYOUT(
+ //,-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------.
+ KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_MINS,KC_EQL ,_______,
+ //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------|
+ _______,KC_SLOK,_______, KC_UP ,_______,KC_RGBT, KC_P7 , KC_P8 , KC_P9 , KC_E , KC_F ,KC_LPRN,
+ //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------|
+ KC_DEL ,_______,KC_LEFT,KC_DOWN,KC_RGHT,KC_GUSR, KC_P4 , KC_P5 , KC_P6 , KC_C , KC_D ,KC_RPRN,
+ //|-------+-------+-------+-------+-------+-------+-------. ,-------|-------+-------+-------+-------+-------+-------|
+ KC_BL_S,_______,_______,_______,KC_HGRP,KC_CHUS,_______, _______, KC_P1 , KC_P2 , KC_P3 , KC_A , KC_B ,_______,
+ //`-------+-------+-------+---+---+-------+-------+-------/ \-------+-------+-------+---+---+-------+-------+-------'
+ _______,_______,_______, KC_DOT , KC_P0 ,KC_COLN
+ // `-------+-------+-------' `-------+-------+-------'
),
- [_RAISE] = LAYOUT_kc(
- //,----+----+----+----+----+----. ,----+----+----+----+----+----.
- F12 , F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 ,F11 ,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
- ,RGBT,RGBM, , , , ,AMPR,MUTE, , , ,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
- ,CAPW,CPYW,CAPP,CPYP,PGUP, EQL ,HOME,VOLU,MRWD,MFFD, ,
- //|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----|
- , , , , ,PGDN, , ,PLUS,END ,VOLD,MPLY,MSTP, ,
- //`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----'
- , , , , ,
- // `----+----+----' `----+----+----'
+ [_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_RGBT,KC_RGBM,_______,_______,_______, _______,KC_AMPR,KC_MUTE,_______,_______,_______,
+ //|-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------|
+ _______,KC_CAPW,KC_CPYW,KC_CAPP,KC_CPYP,KC_PGUP, KC_EQL ,KC_HOME,KC_VOLU,KC_MRWD,KC_MFFD,_______,
+ //|-------+-------+-------+-------+-------+-------+-------. ,-------|-------+-------+-------+-------+-------+-------|
+ _______,_______,_______,_______,_______,KC_PGDN,_______, _______,KC_PLUS,KC_END ,KC_VOLD,KC_MPLY,KC_MSTP,_______,
+ //`-------+-------+-------+---+---+-------+-------+-------/ \-------+-------+-------+---+---+-------+-------+-------'
+ _______,_______,_______, _______,_______,_______
+ // `-------+-------+-------' `-------+-------+-------'
+
),
[_ADJUST] = LAYOUT(