4 files changed, 410 insertions, 0 deletions
diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/config.h b/keyboards/splitkb/kyria/keymaps/john-ezra/config.h
new file mode 100644
index 000000000..3602b560c
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/john-ezra/config.h
@@ -0,0 +1,43 @@
+/* Copyright 2021 John Ezra
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#ifdef OLED_DRIVER_ENABLE
+  #define OLED_DISPLAY_128X64
+#endif
+#ifdef RGBLIGHT_ENABLE
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+  #define RGBLIGHT_HUE_STEP 8
+  #define RGBLIGHT_SAT_STEP 8
+  #define RGBLIGHT_VAL_STEP 8
+  #define RGBLIGHT_LIMIT_VAL 150
+#endif
+#undef DEBOUNCE
+#define DEBOUNCE 1
+#define SPLIT_WPM_ENABLE
diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/keymap.c b/keyboards/splitkb/kyria/keymaps/john-ezra/keymap.c
new file mode 100644
index 000000000..3664fdfac
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/john-ezra/keymap.c
@@ -0,0 +1,213 @@
+/* Copyright 2021 John Ezra
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+enum kyria_layers {
+  _HNTS,
+  _QWERTY,
+  _LOWER,
+  _RAISE,
+  _ADJUST
+};
+enum kyria_keycodes {
+  HNTS = SAFE_RANGE,
+  QWERTY,
+  LOWER,
+  RAISE,
+  CPY_PST,
+  UNDO
+};
+#define BSP_CMD MT(MOD_LGUI, KC_BSPC)
+#define SFT_ENT MT(MOD_LSFT, KC_ENT)
+#define UNDO G(KC_Z)
+#define FIND G(KC_F)
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/*
+ * Default: HNTS
+ *
+ * ,-----------------------------------------------.                                  ,-----------------------------------------------.
+ * |   `   |   Z   |   R   |   L   |   D   |   W   |                                  |   Y   |   P   |   U   |   X   |   Q   |  | \  |
+ * |-------+-------+-------+-------+-------+-------|                                  |-------+-------+-------+-------+-------+-------|
+ * |  Esc  |   H   |   N   |   T   |   S   |   C   |                                  |   B   |   I   |   E   |   O   |   A   |  Esc  |
+ * |-------+-------+-------+-------+-------+-------+---------------.  ,---------------+-------+-------+-------+-------+-------+-------|
+ * |Cpy/Pst|   K   |   V   |   M   |   F   |   G   | Ctrl  |  Alt  |  |  Caps |  Del  |   J   |  ; :  |  , <  |  . >  |  / ?  |  ' "  |
+ * `-------+-------+-------+-------+-------+-------+-------+-------|  |-------+-------+-------+-------+-------+-----------------------'
+ *                         |  Up   | Down  | Lower | Space | BSPC  |  |  Tab  | Shift | Raise |  Left | Right |
+ *                         `---------------------------------------'  `---------------------------------------'
+ */
+[_HNTS] = LAYOUT(
+       FIND,    KC_Z,    KC_R,    KC_L,    KC_D,    KC_W,                                         KC_Y,    KC_P,    KC_U,    KC_X,    KC_Q, KC_BSLS,
+    CPY_PST,    KC_H,    KC_N,    KC_T,    KC_S,    KC_C,                                         KC_B,    KC_I,    KC_E,    KC_O,    KC_A,  KC_ESC,
+       UNDO,    KC_K,    KC_V,    KC_M,    KC_F,    KC_G, KC_LCTL, KC_LALT,  KC_CAPS,  KC_DEL,    KC_J, KC_SCLN, KC_COMM,  KC_DOT, KC_SLSH, KC_QUOT,
+                                 KC_UP, KC_DOWN,   LOWER,  KC_SPC, BSP_CMD,   KC_TAB, SFT_ENT,   RAISE, KC_LEFT, KC_RGHT
+),
+/*
+ * Default: QWERTY
+ *
+ * ,-----------------------------------------------.                                  ,-----------------------------------------------.
+ * |   `   |   Q   |   W   |   E   |   R   |   T   |                                  |   Y   |   U   |   I   |   O   |   P   |  | \  |
+ * |-------+-------+-------+-------+-------+-------|                                  |-------+-------+-------+-------+-------+-------|
+ * |  Esc  |   A   |   S   |   D   |   F   |   G   |                                  |   H   |   J   |   K   |   L   |   ;   |  ' "  |
+ * |-------+-------+-------+-------+-------+-------+---------------.  ,---------------+-------+-------+-------+-------+-------+-------|
+ * |Cpy/Pst|   Z   |   X   |   C   |   V   |   B   | Ctrl  |  Alt  |  |  Caps |  Del  |   N   |   M   |  , <  |  . >  |  / ?  |Cpy/Pst|
+ * `-------+-------+-------+-------+-------+-------+-------+-------|  |-------+-------+-------+-------+-------+-----------------------'
+ *                         |  Up   | Down  | Lower | Space | BSPC  |  |  Tab  | Shift | Raise |  Left | Right |
+ *                         `---------------------------------------'  `---------------------------------------'
+ */
+[_QWERTY] = LAYOUT(
+     KC_GRV,    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,
+    CPY_PST,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B, KC_LCTL, KC_LALT,  KC_CAPS,  KC_DEL,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, CPY_PST,
+                                 KC_UP, KC_DOWN,   LOWER,  KC_SPC, BSP_CMD,   KC_TAB, SFT_ENT,   RAISE, KC_LEFT, KC_RGHT
+),
+/*
+ * Lower: Symbols
+ *
+ * ,-----------------------------------------------.                                  ,-----------------------------------------------.
+ * |       |   !   |   @   |   {   |   }   |   |   |                                  |       |       |       |       |       |  | \  |
+ * |-------+-------+-------+-------+-------+-------|                                  |-------+-------+-------+-------+-------+-------|
+ * |       |   #   |   $   |   (   |   )   |  ` ~  |                                  |   +   |   -   |   *   |   /   |   =   |       |
+ * |-------+-------+-------+-------+-------+-------+---------------.  ,---------------+-------+-------+-------+-------+-------+-------|
+ * |       |   %   |   ^   |   [   |   ]   |   &   |       |       |  |       |       |      |       |       |       |       |        |
+ * `-------+-------+-------+-------+-------+-------+-------+-------|  |-------+-------+-------+-------+-------+-----------------------'
+ *                         |       |       |       |       |       |  |       |       |       |       |       |
+ *                         `---------------------------------------'  `---------------------------------------'
+ */
+[_LOWER] = LAYOUT(
+     KC_GRV, KC_EXLM,   KC_AT, KC_LCBR, KC_RCBR, KC_PIPE,                                      _______, _______, _______, _______, _______, _______,
+    KC_TILD, KC_HASH,  KC_DLR, KC_LPRN, KC_RPRN, KC_BSLS,                                      KC_PLUS, KC_MINS, KC_ASTR, KC_SLSH,  KC_EQL, _______,
+    KC_AMPR, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_UNDS, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______,
+                               _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______
+),
+/*
+ * Raise: Numbers & Media
+ *
+ * ,-----------------------------------------------.                                  ,-----------------------------------------------.
+ * |       |   1   |   2   |   3   |   4   |   5   |                                  |   6   |   7   |   8   |   9   |   0   |       |
+ * |-------+-------+-------+-------+-------+-------|                                  |-------+-------+-------+-------+-------+-------|
+ * |       | Prev  | Play  | Next  | VolUp | Mute  |                                  |Bright+|  Left |  Down |  Up   | Right |       |
+ * |-------+-------+-------+-------+-------+-------+---------------.  ,---------------+-------+-------+-------+-------+-------+-------|
+ * |       |       |       |       | VolDn |       |       |       |  |       |       |Bright-|       |       |       |       |       |
+ * `-------+-------+-------+-------+-------+-------+-------+-------|  |-------+-------+-------+-------+-------+-----------------------'
+ *                         |       |       |       |       |       |  |       |       |       |       |       |
+ *                         `---------------------------------------'  `---------------------------------------'
+ */
+[_RAISE] = LAYOUT(
+    _______, _______, _______, _______, _______, _______,                                      _______, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, _______,
+    _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______,
+    KC_VOLD, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______,
+                               _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______
+),
+ /*
+  * Adjust: Function Keys & RGB
+  *
+  * ,-----------------------------------------------.                                  ,-----------------------------------------------.
+  * |       |  F1   |  F2   |  F3   |  F4   |  F5   |                                  |   F6  |   F7  |   F8  |   F9  |  F10  |       |
+  * |-------+-------+-------+-------+-------+-------|                                  |-------+-------+-------+-------+-------+-------|
+  * |       |  TOG  |  SAI  |  HUI  |  VAI  |  MOD  |                                  |       |       |       |  F11  |  F12  |  NKRO |
+  * |-------+-------+-------+-------+-------+-------+---------------.  ,---------------+-------+-------+-------+-------+-------+-------|
+  * |       |       |  SAD  |  HUD  |  VAD  | RMOD  |       |       |  |       |       |       |       |       |       |       |       |
+  * `-------+-------+-------+-------+-------+-------+-------+-------|  |-------+-------+-------+-------+-------+-----------------------'
+  *                         |       |       |       |       |       |  |       |       |       |       |       |
+  *                         `---------------------------------------'  `---------------------------------------'
+  */
+[_ADJUST] = LAYOUT(
+    _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                       KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, NK_TOGG,
+    _______, RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, RGB_MOD,                                     KC_BRIU, _______, _______,  KC_F11,  KC_F12, CG_TOGG,
+    _______, _______, RGB_SAD, RGB_HUD, RGB_VAD,RGB_RMOD,_______, _______,  _______, _______, KC_BRID, _______, _______, _______,  QWERTY,    HNTS,
+                              _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______
+),
+};
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+        case HNTS:  //Layer Control
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_HNTS);
+          }
+          return false;
+          break;
+        case QWERTY:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_QWERTY);
+          }
+          return false;
+          break;
+        case LOWER:
+          if (record->event.pressed) {
+            layer_on(_LOWER);
+            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+          } else {
+            layer_off(_LOWER);
+            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+          }
+          return false;
+          break;
+        case RAISE:
+          if (record->event.pressed) {
+            layer_on(_RAISE);
+            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+          } else {
+            layer_off(_RAISE);
+            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+          }
+          return false;
+          break;
+        case CPY_PST:  // One key copy/paste
+          {
+            static uint16_t copy_paste_timer;
+              if (record->event.pressed) {
+                copy_paste_timer = timer_read();
+              } else {
+                if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) {  // Hold, copy
+                  register_mods(mod_config(MOD_LGUI));
+                  tap_code(KC_C);
+                  unregister_mods(mod_config(MOD_LGUI));
+                } else {  // Tap, paste
+                  register_mods(mod_config(MOD_LGUI));
+                  tap_code(KC_V);
+                  unregister_mods(mod_config(MOD_LGUI));
+                }
+              }
+          }
+          break;
+        case UNDO:  // Undo Redo
+          if ((get_mods() & MOD_BIT(KC_LGUI)) == MOD_BIT(KC_LGUI)) {
+            if (record->event.pressed) {
+              register_code(KC_Y);
+            } else {
+              unregister_code(KC_Y);
+            }
+          return false;
+          }
+          return true;
+    }
+  return true;
+};
diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c b/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c
new file mode 100644
index 000000000..d98cd598b
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c
@@ -0,0 +1,143 @@
+/* Copyright 2021 John Ezra
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+//Sets up what the OLED screens display.
+#include QMK_KEYBOARD_H
+int timer = 0;
+char wpm_counter[5];
+int x = 31;
+int currwpm = 0;
+int vert_count = 0;
+//=============  USER CONFIG PARAMS  ===============
+float max_wpm = 150.0f; //WPM value at the top of the graph window
+int graph_refresh_interval = 80; //in milliseconds
+int graph_area_fill_interval = 3; //determines how dense the horizontal lines under the graph line are; lower = more dense
+int vert_interval = 3; //determines frequency of vertical lines under the graph line
+bool vert_line = false; //determines whether to draw vertical lines
+int graph_line_thickness = 2; //determines thickness of graph line in pixels
+//=============  END USER PARAMS  ===============
+#ifdef OLED_ENABLE
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+        return OLED_ROTATION_180;
+}
+static void render_qmk_logo(void) {
+  static const char PROGMEM qmk_logo[] = {
+    0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
+    0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
+    0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
+  oled_write_P(qmk_logo, false);
+}
+void render_bootmagic_status(void) {
+                oled_write_P((keymap_config.swap_lctl_lgui) ? PSTR("OS:    Windows\n\n") : PSTR("OS:    MacOS\n\n"), false);
+                oled_write_P((keymap_config.nkro) ? PSTR("NKRO   ") : PSTR("       "), false);
+}
+void render_wpm(void) {
+                //get current WPM value
+                currwpm = get_current_wpm();
+                //check if it's been long enough before refreshing graph
+                if(timer_elapsed(timer) > graph_refresh_interval){
+                        // main calculation to plot graph line
+                        x = 64 - ((currwpm / max_wpm) * 64);
+                        //first draw actual value line
+                        for(int i = 0; i <= graph_line_thickness - 1; i++){
+                                oled_write_pixel(1, x + i, true);
+                        }
+                        //then fill in area below the value line
+                        if(vert_line){
+                                if(vert_count == vert_interval){
+                                        vert_count = 0;
+                                        while(x <= 64){
+                                                oled_write_pixel(1, x, true);
+                                                x++;
+                                        }
+                                } else {
+                                        for(int i = 64; i > x; i--){
+                                                if(i % graph_area_fill_interval == 0){
+                                                        oled_write_pixel(1, i, true);
+                                                }
+                                        }
+                                        vert_count++;
+                                }
+                        } else {
+                                for(int i = 64; i > x; i--){
+                                        if(i % graph_area_fill_interval == 0){
+                                                oled_write_pixel(1, i, true);
+                                        }
+                                }
+                        }
+                        //then move the entire graph one pixel to the right
+                        oled_pan(false);
+                        //refresh the timer for the next iteration
+                        timer = timer_read();
+                }
+                //format current WPM value into a printable string
+                char buf[4];
+                oled_set_cursor(14, 0);
+                oled_write("WPM:", false);
+                buf[0] = currwpm >= 100 ? ((currwpm/100) + '0') : ' ';
+                buf[1] = currwpm >= 10 ? (((currwpm/10) % 10) + '0') : ' ';
+                buf[2] = (currwpm % 10) + '0';
+                buf[3] = 0;
+                oled_write(buf, false);
+}
+static void render_status(void) {
+    // QMK Logo and version information
+                render_qmk_logo();
+    oled_write_P(PSTR("Kyria: Rev1.0\n"), false);
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("Layer: "), false);
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            oled_write_P(PSTR("Default\n"), false);
+            break;
+        case 2:
+            oled_write_P(PSTR("Lower\n"), false);
+            break;
+        case 3:
+            oled_write_P(PSTR("Raise\n"), false);
+            break;
+        case 4:
+            oled_write_P(PSTR("Adjust\n"), false);
+            break;
+        default:
+            oled_write_P(PSTR("Undefined\n"), false);
+    }
+                render_bootmagic_status();
+// Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(led_state.caps_lock ? PSTR("CAPLCK ") : PSTR("       "), false);
+}
+void oled_task_user(void) {
+    if (is_keyboard_master()) {
+                                render_status();
+    } else {
+                                render_wpm();
+    }
+}
+#endif
diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk b/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk
new file mode 100644
index 000000000..7fca028d2
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk
@@ -0,0 +1,11 @@
+OLED_ENABLE = yes          # Enables the use of OLED displays
+OLED_DRIVER = SSD1306
+RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
+NKRO_ENABLE = yes          # Enable N-Key Rollover
+ENCODER_ENABLE = no        # Disable Rotary Encoder
+SPACE_CADET_ENABLE = no    # Disable Space Cadet Shift
+GRAVE_ESC_ENABLE = no      # Disable Grave Escape
+MOUSEKEY_ENABLE =  no      # Disable Mousekeys
+WPM_ENABLE = yes           # Enable WPM Counter (Works with default wpm files, but works better with vectorstorm updated wpm.c and wpm.h -> https://github.com/vectorstorm/qmk_firmware/tree/wpm_exact)
+SRC += oled.c

diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/config.h b/keyboards/splitkb/kyria/keymaps/john-ezra/config.h new file mode 100644 index 000000000..3602b560c --- /dev/null +++ b/keyboards/splitkb/kyria/keymaps/john-ezra/config.h
@@ -0,0 +1,43 @@
	1	/* Copyright 2021 John Ezra
	2	*
	3	* This program is free software: you can redistribute it and/or modify
	4	* it under the terms of the GNU General Public License as published by
	5	* the Free Software Foundation, either version 2 of the License, or
	6	* (at your option) any later version.
	7	*
	8	* This program is distributed in the hope that it will be useful,
	9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	11	* GNU General Public License for more details.
	12	*
	13	* You should have received a copy of the GNU General Public License
	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
	15	*/
	16
	17	#pragma once
	18
	19	#ifdef OLED_DRIVER_ENABLE
	20	#define OLED_DISPLAY_128X64
	21	#endif
	22
	23	#ifdef RGBLIGHT_ENABLE
	24	#define RGBLIGHT_EFFECT_BREATHING
	25	#define RGBLIGHT_EFFECT_RAINBOW_MOOD
	26	#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
	27	#define RGBLIGHT_EFFECT_SNAKE
	28	#define RGBLIGHT_EFFECT_KNIGHT
	29	#define RGBLIGHT_EFFECT_CHRISTMAS
	30	#define RGBLIGHT_EFFECT_STATIC_GRADIENT
	31	#define RGBLIGHT_EFFECT_RGB_TEST
	32	#define RGBLIGHT_EFFECT_ALTERNATING
	33	#define RGBLIGHT_EFFECT_TWINKLE
	34	#define RGBLIGHT_HUE_STEP 8
	35	#define RGBLIGHT_SAT_STEP 8
	36	#define RGBLIGHT_VAL_STEP 8
	37	#define RGBLIGHT_LIMIT_VAL 150
	38	#endif
	39
	40	#undef DEBOUNCE
	41	#define DEBOUNCE 1
	42
	43	#define SPLIT_WPM_ENABLE


diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/keymap.c b/keyboards/splitkb/kyria/keymaps/john-ezra/keymap.c new file mode 100644 index 000000000..3664fdfac --- /dev/null +++ b/keyboards/splitkb/kyria/keymaps/john-ezra/keymap.c
@@ -0,0 +1,213 @@
	1	/* Copyright 2021 John Ezra
	2	*
	3	* This program is free software: you can redistribute it and/or modify
	4	* it under the terms of the GNU General Public License as published by
	5	* the Free Software Foundation, either version 2 of the License, or
	6	* (at your option) any later version.
	7	*
	8	* This program is distributed in the hope that it will be useful,
	9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	11	* GNU General Public License for more details.
	12	*
	13	* You should have received a copy of the GNU General Public License
	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
	15	*/
	16
	17	#include QMK_KEYBOARD_H
	18
	19	enum kyria_layers {
	20	_HNTS,
	21	_QWERTY,
	22	_LOWER,
	23	_RAISE,
	24	_ADJUST
	25	};
	26
	27	enum kyria_keycodes {
	28	HNTS = SAFE_RANGE,
	29	QWERTY,
	30	LOWER,
	31	RAISE,
	32	CPY_PST,
	33	UNDO
	34	};
	35
	36	#define BSP_CMD MT(MOD_LGUI, KC_BSPC)
	37	#define SFT_ENT MT(MOD_LSFT, KC_ENT)
	38	#define UNDO G(KC_Z)
	39	#define FIND G(KC_F)
	40
	41	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
	42
	43	/*
	44	* Default: HNTS
	45	*
	46	* ,-----------------------------------------------. ,-----------------------------------------------.
	47	* \| ` \| Z \| R \| L \| D \| W \| \| Y \| P \| U \| X \| Q \| \| \ \|
	48	* \|-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-------\|
	49	* \| Esc \| H \| N \| T \| S \| C \| \| B \| I \| E \| O \| A \| Esc \|
	50	* \|-------+-------+-------+-------+-------+-------+---------------. ,---------------+-------+-------+-------+-------+-------+-------\|
	51	* \|Cpy/Pst\| K \| V \| M \| F \| G \| Ctrl \| Alt \| \| Caps \| Del \| J \| ; : \| , < \| . > \| / ? \| ' " \|
	52	* `-------+-------+-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-----------------------'
	53	* \| Up \| Down \| Lower \| Space \| BSPC \| \| Tab \| Shift \| Raise \| Left \| Right \|
	54	* `---------------------------------------' `---------------------------------------'
	55	*/
	56
	57	[_HNTS] = LAYOUT(
	58	FIND, KC_Z, KC_R, KC_L, KC_D, KC_W, KC_Y, KC_P, KC_U, KC_X, KC_Q, KC_BSLS,
	59	CPY_PST, KC_H, KC_N, KC_T, KC_S, KC_C, KC_B, KC_I, KC_E, KC_O, KC_A, KC_ESC,
	60	UNDO, KC_K, KC_V, KC_M, KC_F, KC_G, KC_LCTL, KC_LALT, KC_CAPS, KC_DEL, KC_J, KC_SCLN, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT,
	61	KC_UP, KC_DOWN, LOWER, KC_SPC, BSP_CMD, KC_TAB, SFT_ENT, RAISE, KC_LEFT, KC_RGHT
	62	),
	63
	64	/*
	65	* Default: QWERTY
	66	*
	67	* ,-----------------------------------------------. ,-----------------------------------------------.
	68	* \| ` \| Q \| W \| E \| R \| T \| \| Y \| U \| I \| O \| P \| \| \ \|
	69	* \|-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-------\|
	70	* \| Esc \| A \| S \| D \| F \| G \| \| H \| J \| K \| L \| ; \| ' " \|
	71	* \|-------+-------+-------+-------+-------+-------+---------------. ,---------------+-------+-------+-------+-------+-------+-------\|
	72	* \|Cpy/Pst\| Z \| X \| C \| V \| B \| Ctrl \| Alt \| \| Caps \| Del \| N \| M \| , < \| . > \| / ? \|Cpy/Pst\|
	73	* `-------+-------+-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-----------------------'
	74	* \| Up \| Down \| Lower \| Space \| BSPC \| \| Tab \| Shift \| Raise \| Left \| Right \|
	75	* `---------------------------------------' `---------------------------------------'
	76	*/
	77
	78	[_QWERTY] = LAYOUT(
	79	KC_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
	80	KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
	81	CPY_PST, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LCTL, KC_LALT, KC_CAPS, KC_DEL, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, CPY_PST,
	82	KC_UP, KC_DOWN, LOWER, KC_SPC, BSP_CMD, KC_TAB, SFT_ENT, RAISE, KC_LEFT, KC_RGHT
	83	),
	84
	85	/*
	86	* Lower: Symbols
	87	*
	88	* ,-----------------------------------------------. ,-----------------------------------------------.
	89	* \| \| ! \| @ \| { \| } \| \| \| \| \| \| \| \| \| \| \ \|
	90	* \|-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-------\|
	91	* \| \| # \| $ \| ( \| ) \| ` ~ \| \| + \| - \| * \| / \| = \| \|
	92	* \|-------+-------+-------+-------+-------+-------+---------------. ,---------------+-------+-------+-------+-------+-------+-------\|
	93	* \| \| % \| ^ \| [ \| ] \| & \| \| \| \| \| \| \| \| \| \| \| \|
	94	* `-------+-------+-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-----------------------'
	95	* \| \| \| \| \| \| \| \| \| \| \| \|
	96	* `---------------------------------------' `---------------------------------------'
	97	*/
	98
	99	[_LOWER] = LAYOUT(
	100	KC_GRV, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, _______, _______, _______, _______, _______, _______,
	101	KC_TILD, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_BSLS, KC_PLUS, KC_MINS, KC_ASTR, KC_SLSH, KC_EQL, _______,
	102	KC_AMPR, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_UNDS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
	103	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
	104	),
	105
	106	/*
	107	* Raise: Numbers & Media
	108	*
	109	* ,-----------------------------------------------. ,-----------------------------------------------.
	110	* \| \| 1 \| 2 \| 3 \| 4 \| 5 \| \| 6 \| 7 \| 8 \| 9 \| 0 \| \|
	111	* \|-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-------\|
	112	* \| \| Prev \| Play \| Next \| VolUp \| Mute \| \|Bright+\| Left \| Down \| Up \| Right \| \|
	113	* \|-------+-------+-------+-------+-------+-------+---------------. ,---------------+-------+-------+-------+-------+-------+-------\|
	114	* \| \| \| \| \| VolDn \| \| \| \| \| \| \|Bright-\| \| \| \| \| \|
	115	* `-------+-------+-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-----------------------'
	116	* \| \| \| \| \| \| \| \| \| \| \| \|
	117	* `---------------------------------------' `---------------------------------------'
	118	*/
	119
	120	[_RAISE] = LAYOUT(
	121	_______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______,
	122	_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
	123	KC_VOLD, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
	124	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
	125	),
	126
	127	/*
	128	* Adjust: Function Keys & RGB
	129	*
	130	* ,-----------------------------------------------. ,-----------------------------------------------.
	131	* \| \| F1 \| F2 \| F3 \| F4 \| F5 \| \| F6 \| F7 \| F8 \| F9 \| F10 \| \|
	132	* \|-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-------\|
	133	* \| \| TOG \| SAI \| HUI \| VAI \| MOD \| \| \| \| \| F11 \| F12 \| NKRO \|
	134	* \|-------+-------+-------+-------+-------+-------+---------------. ,---------------+-------+-------+-------+-------+-------+-------\|
	135	* \| \| \| SAD \| HUD \| VAD \| RMOD \| \| \| \| \| \| \| \| \| \| \| \|
	136	* `-------+-------+-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-----------------------'
	137	* \| \| \| \| \| \| \| \| \| \| \| \|
	138	* `---------------------------------------' `---------------------------------------'
	139	*/
	140
	141	[_ADJUST] = LAYOUT(
	142	_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, NK_TOGG,
	143	_______, RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, RGB_MOD, KC_BRIU, _______, _______, KC_F11, KC_F12, CG_TOGG,
	144	_______, _______, RGB_SAD, RGB_HUD, RGB_VAD,RGB_RMOD,_______, _______, _______, _______, KC_BRID, _______, _______, _______, QWERTY, HNTS,
	145	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
	146	),
	147	};
	148
	149	bool process_record_user(uint16_t keycode, keyrecord_t *record) {
	150	switch (keycode) {
	151	case HNTS: //Layer Control
	152	if (record->event.pressed) {
	153	set_single_persistent_default_layer(_HNTS);
	154	}
	155	return false;
	156	break;
	157	case QWERTY:
	158	if (record->event.pressed) {
	159	set_single_persistent_default_layer(_QWERTY);
	160	}
	161	return false;
	162	break;
	163	case LOWER:
	164	if (record->event.pressed) {
	165	layer_on(_LOWER);
	166	update_tri_layer(_LOWER, _RAISE, _ADJUST);
	167	} else {
	168	layer_off(_LOWER);
	169	update_tri_layer(_LOWER, _RAISE, _ADJUST);
	170	}
	171	return false;
	172	break;
	173	case RAISE:
	174	if (record->event.pressed) {
	175	layer_on(_RAISE);
	176	update_tri_layer(_LOWER, _RAISE, _ADJUST);
	177	} else {
	178	layer_off(_RAISE);
	179	update_tri_layer(_LOWER, _RAISE, _ADJUST);
	180	}
	181	return false;
	182	break;
	183	case CPY_PST: // One key copy/paste
	184	{
	185	static uint16_t copy_paste_timer;
	186	if (record->event.pressed) {
	187	copy_paste_timer = timer_read();
	188	} else {
	189	if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) { // Hold, copy
	190	register_mods(mod_config(MOD_LGUI));
	191	tap_code(KC_C);
	192	unregister_mods(mod_config(MOD_LGUI));
	193	} else { // Tap, paste
	194	register_mods(mod_config(MOD_LGUI));
	195	tap_code(KC_V);
	196	unregister_mods(mod_config(MOD_LGUI));
	197	}
	198	}
	199	}
	200	break;
	201	case UNDO: // Undo Redo
	202	if ((get_mods() & MOD_BIT(KC_LGUI)) == MOD_BIT(KC_LGUI)) {
	203	if (record->event.pressed) {
	204	register_code(KC_Y);
	205	} else {
	206	unregister_code(KC_Y);
	207	}
	208	return false;
	209	}
	210	return true;
	211	}
	212	return true;
	213	};


diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c b/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c new file mode 100644 index 000000000..d98cd598b --- /dev/null +++ b/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c
@@ -0,0 +1,143 @@
	1	/* Copyright 2021 John Ezra
	2	*
	3	* This program is free software: you can redistribute it and/or modify
	4	* it under the terms of the GNU General Public License as published by
	5	* the Free Software Foundation, either version 2 of the License, or
	6	* (at your option) any later version.
	7	*
	8	* This program is distributed in the hope that it will be useful,
	9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	11	* GNU General Public License for more details.
	12	*
	13	* You should have received a copy of the GNU General Public License
	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
	15	*/
	16
	17	//Sets up what the OLED screens display.
	18
	19	#include QMK_KEYBOARD_H
	20
	21	int timer = 0;
	22	char wpm_counter[5];
	23	int x = 31;
	24	int currwpm = 0;
	25	int vert_count = 0;
	26
	27	//============= USER CONFIG PARAMS ===============
	28	float max_wpm = 150.0f; //WPM value at the top of the graph window
	29	int graph_refresh_interval = 80; //in milliseconds
	30	int graph_area_fill_interval = 3; //determines how dense the horizontal lines under the graph line are; lower = more dense
	31	int vert_interval = 3; //determines frequency of vertical lines under the graph line
	32	bool vert_line = false; //determines whether to draw vertical lines
	33	int graph_line_thickness = 2; //determines thickness of graph line in pixels
	34	//============= END USER PARAMS ===============
	35
	36	#ifdef OLED_ENABLE
	37	oled_rotation_t oled_init_user(oled_rotation_t rotation) {
	38	return OLED_ROTATION_180;
	39	}
	40
	41	static void render_qmk_logo(void) {
	42	static const char PROGMEM qmk_logo[] = {
	43	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
	44	0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
	45	0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
	46
	47	oled_write_P(qmk_logo, false);
	48	}
	49
	50	void render_bootmagic_status(void) {
	51	oled_write_P((keymap_config.swap_lctl_lgui) ? PSTR("OS: Windows\n\n") : PSTR("OS: MacOS\n\n"), false);
	52	oled_write_P((keymap_config.nkro) ? PSTR("NKRO ") : PSTR(" "), false);
	53	}
	54
	55	void render_wpm(void) {
	56	//get current WPM value
	57	currwpm = get_current_wpm();
	58	//check if it's been long enough before refreshing graph
	59	if(timer_elapsed(timer) > graph_refresh_interval){
	60	// main calculation to plot graph line
	61	x = 64 - ((currwpm / max_wpm) * 64);
	62	//first draw actual value line
	63	for(int i = 0; i <= graph_line_thickness - 1; i++){
	64	oled_write_pixel(1, x + i, true);
	65	}
	66	//then fill in area below the value line
	67	if(vert_line){
	68	if(vert_count == vert_interval){
	69	vert_count = 0;
	70	while(x <= 64){
	71	oled_write_pixel(1, x, true);
	72	x++;
	73	}
	74	} else {
	75	for(int i = 64; i > x; i--){
	76	if(i % graph_area_fill_interval == 0){
	77	oled_write_pixel(1, i, true);
	78	}
	79	}
	80	vert_count++;
	81	}
	82	} else {
	83	for(int i = 64; i > x; i--){
	84	if(i % graph_area_fill_interval == 0){
	85	oled_write_pixel(1, i, true);
	86	}
	87	}
	88	}
	89	//then move the entire graph one pixel to the right
	90	oled_pan(false);
	91	//refresh the timer for the next iteration
	92	timer = timer_read();
	93	}
	94	//format current WPM value into a printable string
	95	char buf[4];
	96	oled_set_cursor(14, 0);
	97	oled_write("WPM:", false);
	98	buf[0] = currwpm >= 100 ? ((currwpm/100) + '0') : ' ';
	99	buf[1] = currwpm >= 10 ? (((currwpm/10) % 10) + '0') : ' ';
	100	buf[2] = (currwpm % 10) + '0';
	101	buf[3] = 0;
	102	oled_write(buf, false);
	103	}
	104
	105	static void render_status(void) {
	106	// QMK Logo and version information
	107	render_qmk_logo();
	108	oled_write_P(PSTR("Kyria: Rev1.0\n"), false);
	109
	110	// Host Keyboard Layer Status
	111	oled_write_P(PSTR("Layer: "), false);
	112	switch (get_highest_layer(layer_state)) {
	113	case 0:
	114	oled_write_P(PSTR("Default\n"), false);
	115	break;
	116	case 2:
	117	oled_write_P(PSTR("Lower\n"), false);
	118	break;
	119	case 3:
	120	oled_write_P(PSTR("Raise\n"), false);
	121	break;
	122	case 4:
	123	oled_write_P(PSTR("Adjust\n"), false);
	124	break;
	125	default:
	126	oled_write_P(PSTR("Undefined\n"), false);
	127	}
	128
	129	render_bootmagic_status();
	130
	131	// Host Keyboard LED Status
	132	led_t led_state = host_keyboard_led_state();
	133	oled_write_P(led_state.caps_lock ? PSTR("CAPLCK ") : PSTR(" "), false);
	134	}
	135
	136	void oled_task_user(void) {
	137	if (is_keyboard_master()) {
	138	render_status();
	139	} else {
	140	render_wpm();
	141	}
	142	}
	143	#endif


diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk b/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk new file mode 100644 index 000000000..7fca028d2 --- /dev/null +++ b/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk
@@ -0,0 +1,11 @@
	1	OLED_ENABLE = yes # Enables the use of OLED displays
	2	OLED_DRIVER = SSD1306
	3	RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
	4	NKRO_ENABLE = yes # Enable N-Key Rollover
	5	ENCODER_ENABLE = no # Disable Rotary Encoder
	6	SPACE_CADET_ENABLE = no # Disable Space Cadet Shift
	7	GRAVE_ESC_ENABLE = no # Disable Grave Escape
	8	MOUSEKEY_ENABLE = no # Disable Mousekeys
	9	WPM_ENABLE = yes # Enable WPM Counter (Works with default wpm files, but works better with vectorstorm updated wpm.c and wpm.h -> https://github.com/vectorstorm/qmk_firmware/tree/wpm_exact)
	10
	11	SRC += oled.c