summaryrefslogtreecommitdiff
path: root/keyboards/keebio
diff options
context:
space:
mode:
authorJohn Helveston <john.helveston@gmail.com>2020-07-26 17:35:46 -0400
committerGitHub <noreply@github.com>2020-07-26 22:35:46 +0100
commit688426b50225b1d5b44f3eeaa9b26816d28ba16e (patch)
tree3fd9fcf32bbbd5cf538db2fdc3678b84e10ac71d /keyboards/keebio
parenta6a13f96262ef1e8c91546f24cff5067f8026c23 (diff)
Adding keymaps for iris and kyria keyboards (#9783)
* updated iris and kyria keymaps * added symbols I forgot to add to keymap * Update keyboards/keebio/iris/keymaps/jhelvy/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * condense code Co-authored-by: Ryan <fauxpark@gmail.com> * condense code Co-authored-by: Ryan <fauxpark@gmail.com> * made another small fix to a missing symbol in my iris keymap Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat (limited to 'keyboards/keebio')
-rw-r--r--keyboards/keebio/iris/keymaps/jhelvy/README.md8
-rw-r--r--keyboards/keebio/iris/keymaps/jhelvy/config.h21
-rw-r--r--keyboards/keebio/iris/keymaps/jhelvy/keymap.c144
-rw-r--r--keyboards/keebio/iris/keymaps/jhelvy/rules.mk9
4 files changed, 131 insertions, 51 deletions
diff --git a/keyboards/keebio/iris/keymaps/jhelvy/README.md b/keyboards/keebio/iris/keymaps/jhelvy/README.md
index 5d5ff12471..84b924c379 100644
--- a/keyboards/keebio/iris/keymaps/jhelvy/README.md
+++ b/keyboards/keebio/iris/keymaps/jhelvy/README.md
@@ -1,7 +1 @@
-# jhelvy Keymap for [Iris Rev 2](https://docs.keeb.io/iris-build-guide/)
-
-## Keymap
-
-This is a custom keymap with the following layout:
-
-<img src="https://github.com/jhelvy/qmkJsonConverter/raw/master/keymaps/keebio_iris_rev2_jhelvy.png" width="800">
+Keymap for jhelvy's [Iris Rev 2](https://github.com/jhelvy/iris-rev2)
diff --git a/keyboards/keebio/iris/keymaps/jhelvy/config.h b/keyboards/keebio/iris/keymaps/jhelvy/config.h
index 2285c3f9af..c019234732 100644
--- a/keyboards/keebio/iris/keymaps/jhelvy/config.h
+++ b/keyboards/keebio/iris/keymaps/jhelvy/config.h
@@ -17,17 +17,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// #define USE_I2C
-#define EE_HANDS
-
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
+// Had to swap the master to get the right-side rotary encoder supported
+#define MASTER_RIGHT
#define TAPPING_FORCE_HOLD
#undef TAPPING_TERM
#define TAPPING_TERM 200
#define AUTO_SHIFT_TIMEOUT 150
+
+#define MOUSEKEY_DELAY 100
+#define MOUSEKEY_INTERVAL 16
+#define MOUSEKEY_MAX_SPEED 2
+#define MOUSEKEY_WHEEL_MAX_SPEED 42
+#define MOUSEKEY_WHEEL_TIME_TO_MAX 15
+
+#define ENCODERS_PAD_A { F4 }
+#define ENCODERS_PAD_B { F5 }
+#define ENCODER_RESOLUTION 4
diff --git a/keyboards/keebio/iris/keymaps/jhelvy/keymap.c b/keyboards/keebio/iris/keymaps/jhelvy/keymap.c
index 58ce3206dd..a3d20bed59 100644
--- a/keyboards/keebio/iris/keymaps/jhelvy/keymap.c
+++ b/keyboards/keebio/iris/keymaps/jhelvy/keymap.c
@@ -1,54 +1,134 @@
#include QMK_KEYBOARD_H
-
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
+enum layers {
+ QWERTY = 0,
+ HOTKEYS,
+ TEXT,
+ SELECT,
+ MOUSE,
+};
enum custom_keycodes {
- QWERTY = SAFE_RANGE,
- LOWER,
- RAISE,
+ SIG_PROF = SAFE_RANGE,
+ SIG_JOHN,
+ R_PIPE,
+ R_ASSIGN,
+ R_COLS,
+ R_IN,
+ TEX,
+ E_GMAIL,
+ E_GWU,
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_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_EQL, \
- 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_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, \
- KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO, KC_NO, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, \
- LALT(KC_A),KC_LGUI, MO(1), KC_SPC, MO(2), KC_PGDN),
-
-[_LOWER] = LAYOUT( \
- KC_ESC,LGUI(KC_1),LGUI(KC_2),LGUI(KC_3),LGUI(KC_4),LGUI(KC_5), KC_SCLN, KC_PIPE, KC_COLN,LCTL(KC_9),LCTL(KC_0), KC_F12, \
- LCTL(KC_TAB),LGUI(KC_Q),LGUI(KC_W), KC_ESC,LGUI(KC_R),LGUI(KC_T), LCTL(KC_Y),LGUI(KC_LEFT), KC_UP,LGUI(KC_RGHT), KC_TILD, KC_F11, \
- LGUI(KC_BSPC),MO(2),LGUI(KC_S),LGUI(KC_C),LGUI(KC_V),LGUI(KC_X), KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_GRV, KC_ENT, \
- KC_F15,LGUI(KC_A),LGUI(KC_D), KC_F13,LGUI(KC_Z),LGUI(KC_Y), KC_NO, KC_NO,KC_BSPC,LGUI(KC_F), SGUI(KC_G),LGUI(KC_G), KC_BSLS, KC_F23, \
- KC_LALT,KC_LGUI, KC_TRNS, KC_SPC,KC_RGUI, KC_PGUP),
-
-[_RAISE] = LAYOUT( \
- KC_VOLU,LGUI(LALT(KC_1)),LGUI(LALT(KC_2)), KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PLUS, \
- KC_VOLD, KC_NO, KC_NO, KC_NO,SGUI(KC_R), KC_F14, SGUI(KC_K),SGUI(KC_LEFT),LSFT(KC_UP),SGUI(KC_RGHT), KC_F18, KC_UNDS, \
- KC_MUTE,KC_TRNS, KC_NO, KC_LBRC, KC_RBRC, KC_TAB, KC_F21,LSFT(KC_LEFT),LSFT(KC_DOWN),LSFT(KC_RGHT), KC_F20, KC_F16, \
- KC_LSPO,KC_ASTG, KC_NO, KC_LCBR, KC_RCBR,LCTL(KC_U), KC_NO, KC_NO,KC_F22,LCTL(LGUI(KC_A)),LALT(LSFT(KC_LEFT)),LALT(LSFT(KC_RIGHT)), KC_F17, KC_F19, \
- KC_CAPS,LALT(KC_SPC), KC_LGUI, KC_SPC,KC_TRNS, KC_NO)
+
+[QWERTY] = LAYOUT(LALT(KC_A), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, KC_EQL, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO, KC_NO, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, MO(4), KC_LGUI, MO(2), KC_SPC, MO(1), TG(1)),
+
+[HOTKEYS] = LAYOUT(KC_F5, LGUI(LALT(KC_1)), LGUI(LALT(KC_2)), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F14, KC_F6, KC_NO, KC_NO, LCTL(KC_U), SGUI(KC_R), KC_F2, SGUI(KC_K), LCTL(KC_9), LCTL(KC_0), KC_NO, KC_F11, KC_F15, KC_F7, LGUI(LCTL(KC_A)), KC_F10, KC_LBRC, KC_RBRC, KC_F9, SIG_JOHN, LSFT(KC_TAB), KC_TAB, E_GMAIL, KC_F12, KC_F16, KC_F8, KC_ASTG, KC_NO, KC_LCBR, KC_RCBR, KC_NO, KC_NO, KC_NO, SIG_PROF, KC_F3, KC_F4, E_GWU, KC_F13, KC_F17, LALT(KC_SPC), KC_LGUI, KC_LCTL, KC_SPC, KC_TRNS, KC_TRNS),
+
+[TEXT] = LAYOUT(KC_ESC, LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), LGUI(KC_4), LGUI(KC_5), KC_SCLN, KC_PIPE, KC_COLN, KC_NO, KC_UNDS, KC_PLUS, LGUI(KC_BSPC), LGUI(KC_Q), LGUI(KC_W), KC_ESC, LGUI(KC_R), LGUI(KC_T), LCTL(KC_Y), LGUI(KC_LEFT), KC_UP, LGUI(KC_RGHT), KC_TILD, R_PIPE, KC_BSPC, MO(3), LGUI(KC_S), LGUI(KC_C), LGUI(KC_V), LGUI(KC_X), KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_GRV, KC_ENT, KC_F18, LGUI(KC_A), LGUI(KC_D), KC_F1, LGUI(KC_Z), LGUI(KC_Y), KC_NO, KC_NO, KC_BSPC, LGUI(KC_F), SGUI(KC_G), LGUI(KC_G), KC_BSLS, R_ASSIGN, KC_LALT, KC_LGUI, KC_TRNS, KC_SPC, KC_RGUI, KC_NO),
+
+[SELECT] = LAYOUT(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, SGUI(KC_LEFT), LSFT(KC_UP), SGUI(KC_RGHT), KC_NO, R_COLS, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, LSFT(KC_LEFT), LSFT(KC_DOWN), LSFT(KC_RGHT), KC_NO, R_IN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, LALT(LSFT(KC_LEFT)), LALT(LSFT(KC_RIGHT)), KC_NO, TEX, KC_NO, KC_NO, KC_NO, KC_SPC, KC_TRNS, KC_TRNS),
+
+[MOUSE] = LAYOUT(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LGUI, KC_NO, KC_NO, LGUI(KC_LBRC), KC_MS_U, LGUI(KC_RBRC), KC_NO, KC_NO, LCTL(KC_TAB), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_BTN1, KC_BTN2, KC_NO)
};
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ switch (keycode) {
+ case SIG_PROF:
+ if (record->event.pressed) {
+ SEND_STRING("Cheers,\nProfessor Helveston");
+ } else {
+ }
+ break;
+
+ case SIG_JOHN:
+ if (record->event.pressed) {
+ SEND_STRING("Cheers,\nJohn");
+ } else {
+ }
+ break;
+
+ case R_PIPE:
+ if (record->event.pressed) {
+ SEND_STRING(" %>% ");
+ } else {
+ }
+ break;
+
+ case R_ASSIGN:
+ if (record->event.pressed) {
+ SEND_STRING(" <- ");
+ } else {
+ }
+ break;
+
+ case R_COLS:
+ if (record->event.pressed) {
+ SEND_STRING(".leftcol[\n]\n.rightcol[\n]\n");
+ } else {
+ }
+ break;
+
+ case R_IN:
+ if (record->event.pressed) {
+ SEND_STRING(" %in% ");
+ } else {
+ }
+ break;
+
+ case TEX:
+ if (record->event.pressed) {
+ SEND_STRING("\\text{}");
+ } else {
+ }
+ break;
+
+ case E_GMAIL:
+ if (record->event.pressed) {
+ SEND_STRING("john.helveston@gmail.com");
+ } else {
+ }
+ break;
+
+ case E_GWU:
+ if (record->event.pressed) {
+ SEND_STRING("jph@gwu.edu");
+ } else {
+ }
+ break;
+
+ }
+
+ return true;
+};
+
void encoder_update_user(uint8_t index, bool clockwise) {
- if (index == 0) {
+ if (IS_LAYER_ON(HOTKEYS)) {
if (clockwise) {
tap_code(KC_VOLU);
} else {
tap_code(KC_VOLD);
}
- }
- else if (index == 1) {
+ } else if (IS_LAYER_ON(TEXT)) {
+ if (clockwise) {
+ tap_code(KC_MS_WH_RIGHT);
+ } else {
+ tap_code(KC_MS_WH_LEFT);
+ }
+ } else if (IS_LAYER_ON(MOUSE)) {
+ if (clockwise) {
+ tap_code16(G(KC_EQL));
+ } else {
+ tap_code16(G(KC_MINS));
+ }
+ } else {
if (clockwise) {
- tap_code(KC_PGDN);
+ tap_code(KC_MS_WH_DOWN);
} else {
- tap_code(KC_PGUP);
+ tap_code(KC_MS_WH_UP);
}
}
}
diff --git a/keyboards/keebio/iris/keymaps/jhelvy/rules.mk b/keyboards/keebio/iris/keymaps/jhelvy/rules.mk
index c34fd4b1fa..64d3eb2f18 100644
--- a/keyboards/keebio/iris/keymaps/jhelvy/rules.mk
+++ b/keyboards/keebio/iris/keymaps/jhelvy/rules.mk
@@ -1,3 +1,6 @@
-AUTO_SHIFT_ENABLE = yes # Autoshift by holding down a key
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = yes
+AUTO_SHIFT_ENABLE = yes # Autoshift by holding down a key
+MOUSEKEY_ENABLE = yes
+ENCODER_ENABLE = yes
+EXTRAKEY_ENABLE = yes
+RGBLIGHT_ENABLE = no
+BACKLIGHT_ENABLE = no