mirror of
https://github.com/qmk/qmk_firmware
synced 2024-12-22 16:36:58 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
QMK Bot
commit
79c6757081
@ -16,19 +16,15 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#ifdef OLED_DRIVER_ENABLE
|
||||
#define OLED_DISPLAY_128X64
|
||||
#endif
|
||||
#define OLED_FONT_H "keyboards/splitkb/kyria/keymaps/john-ezra/glcdfont.c"
|
||||
#define OLED_FONT_END 255
|
||||
#define OLED_TIMEOUT 30000
|
||||
#define OLED_DISPLAY_128X64
|
||||
|
||||
#ifdef RGBLIGHT_ENABLE
|
||||
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
|
||||
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
||||
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
|
||||
#define RGBLIGHT_EFFECT_TWINKLE
|
||||
|
||||
#define RGBLIGHT_HUE_STEP 8
|
||||
#define RGBLIGHT_SAT_STEP 8
|
||||
#define RGBLIGHT_VAL_STEP 8
|
||||
#define RGBLIGHT_HUE_STEP 5
|
||||
#define RGBLIGHT_SAT_STEP 5
|
||||
#define RGBLIGHT_VAL_STEP 5
|
||||
#define RGBLIGHT_LIMIT_VAL 150
|
||||
#endif
|
||||
|
||||
@ -38,3 +34,7 @@
|
||||
#define TAPPING_TERM 125
|
||||
|
||||
#define SPLIT_WPM_ENABLE
|
||||
|
||||
#define USB_POLLING_INTERVAL_MS 1
|
||||
|
||||
#define DEBUG_MATRIX_SCAN_RATE
|
||||
|
||||
276
keyboards/splitkb/kyria/keymaps/john-ezra/glcdfont.c
Normal file
276
keyboards/splitkb/kyria/keymaps/john-ezra/glcdfont.c
Normal file
@ -0,0 +1,276 @@
|
||||
/* 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 "progmem.h"
|
||||
|
||||
static const unsigned char font[] PROGMEM = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
|
||||
0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
|
||||
0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
|
||||
0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
|
||||
0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
|
||||
0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
|
||||
0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
|
||||
0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
|
||||
0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
|
||||
0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
|
||||
0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
|
||||
0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
|
||||
0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
|
||||
0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
|
||||
0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
|
||||
0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
|
||||
0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
|
||||
0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
|
||||
0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
|
||||
0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
|
||||
0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
|
||||
0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
|
||||
0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
|
||||
0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
|
||||
0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
|
||||
0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
|
||||
0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
|
||||
0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
|
||||
0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
|
||||
0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
|
||||
0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
|
||||
0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
|
||||
0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
|
||||
0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
|
||||
0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
|
||||
0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
|
||||
0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
|
||||
0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
|
||||
0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
|
||||
0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
|
||||
0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
|
||||
0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
|
||||
0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
|
||||
0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
|
||||
0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
|
||||
0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
|
||||
0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
|
||||
0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
|
||||
0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
|
||||
0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
|
||||
0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
|
||||
0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
|
||||
0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
|
||||
0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
|
||||
0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
|
||||
0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
|
||||
0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
|
||||
0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
|
||||
0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
|
||||
0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
|
||||
0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
|
||||
0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
|
||||
0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
|
||||
0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
|
||||
0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
|
||||
0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
|
||||
0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
|
||||
0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
|
||||
0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
|
||||
0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
|
||||
0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
|
||||
0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
|
||||
0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
|
||||
0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
|
||||
0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
|
||||
0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
|
||||
0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
|
||||
0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
|
||||
0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
|
||||
0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
|
||||
0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
|
||||
0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
|
||||
0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
|
||||
0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
|
||||
0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
|
||||
0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
|
||||
0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
|
||||
0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
|
||||
0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
|
||||
0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
|
||||
0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
|
||||
0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
|
||||
0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
|
||||
0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
|
||||
0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
|
||||
0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
|
||||
0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
|
||||
0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
|
||||
0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
|
||||
0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
|
||||
0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
|
||||
0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
|
||||
0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
|
||||
0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
|
||||
0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
|
||||
0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
|
||||
0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
|
||||
0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
|
||||
0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
|
||||
0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
|
||||
0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
|
||||
0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
|
||||
0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
|
||||
0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
|
||||
0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
|
||||
0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
|
||||
0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
|
||||
0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
|
||||
0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
|
||||
0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
|
||||
0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
|
||||
0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
|
||||
0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
|
||||
0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
|
||||
0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
|
||||
0x00, 0xF0, 0x08, 0x24, 0x52, 0xE2,
|
||||
0x42, 0x42, 0x42, 0xE2, 0x52, 0x22,
|
||||
0x24, 0x22, 0x42, 0x82, 0x02, 0x02,
|
||||
0x22, 0x22, 0x02, 0x02, 0xFE, 0x00,
|
||||
0x00, 0xF0, 0x08, 0x04, 0x02, 0x82,
|
||||
0x42, 0x22, 0x42, 0x82, 0x02, 0x02,
|
||||
0x04, 0x82, 0x42, 0x22, 0x12, 0x22,
|
||||
0x42, 0x82, 0x02, 0x02, 0xFE, 0x00,
|
||||
0x00, 0xF0, 0x08, 0x84, 0x42, 0x42,
|
||||
0x82, 0x82, 0x42, 0x42, 0x42, 0x82,
|
||||
0x04, 0x82, 0xC2, 0xE2, 0xF2, 0xE2,
|
||||
0xC2, 0x82, 0x02, 0x02, 0xFE, 0x00,
|
||||
0x00, 0xF0, 0x08, 0x44, 0x42, 0xF2,
|
||||
0x42, 0x42, 0x42, 0xF2, 0x42, 0x42,
|
||||
0x04, 0x82, 0xE2, 0x92, 0x92, 0x92,
|
||||
0xE2, 0x82, 0x02, 0x02, 0xFE, 0x00,
|
||||
0x00, 0xF0, 0x08, 0x84, 0x82, 0x02,
|
||||
0x82, 0x02, 0x02, 0x82, 0x82, 0x02,
|
||||
0x02, 0x02, 0x82, 0x82, 0x02, 0x02,
|
||||
0xE2, 0x12, 0x12, 0xE2, 0x02, 0x62,
|
||||
0x92, 0x92, 0x22, 0x02, 0xFE, 0x00,
|
||||
0x00, 0xF0, 0x08, 0x04, 0xF2, 0x02,
|
||||
0x02, 0x02, 0xF2, 0x02, 0x82, 0x02,
|
||||
0x02, 0x02, 0x02, 0x02, 0x02, 0x22,
|
||||
0xF2, 0x02, 0x02, 0xE2, 0x12, 0x12,
|
||||
0x12, 0xE2, 0x02, 0x02, 0xFE, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x02, 0xFE, 0x00, 0x00, 0xF0, 0x08,
|
||||
0x02, 0xFE, 0x00, 0x00, 0xF0, 0xF8,
|
||||
0x00, 0x7F, 0x40, 0x44, 0x4A, 0x47,
|
||||
0x42, 0x42, 0x42, 0x47, 0x4A, 0x44,
|
||||
0x40, 0x40, 0x40, 0x40, 0x41, 0x42,
|
||||
0x44, 0x44, 0x40, 0x40, 0x7F, 0x00,
|
||||
0x00, 0x7F, 0x40, 0x40, 0x41, 0x40,
|
||||
0x40, 0x40, 0x40, 0x40, 0x41, 0x40,
|
||||
0x41, 0x41, 0x4F, 0x48, 0x48, 0x48,
|
||||
0x4F, 0x41, 0x41, 0x40, 0x7F, 0x00,
|
||||
0x00, 0x7F, 0x40, 0x41, 0x42, 0x42,
|
||||
0x42, 0x41, 0x41, 0x42, 0x42, 0x41,
|
||||
0x40, 0x40, 0x40, 0x4B, 0x4B, 0x4B,
|
||||
0x40, 0x40, 0x40, 0x40, 0x7F, 0x00,
|
||||
0x00, 0x7F, 0x40, 0x42, 0x42, 0x4F,
|
||||
0x42, 0x42, 0x42, 0x4F, 0x42, 0x42,
|
||||
0x40, 0x4F, 0x4F, 0x4F, 0x48, 0x4F,
|
||||
0x4F, 0x4F, 0x40, 0x40, 0x7F, 0x00,
|
||||
0x00, 0x7F, 0x40, 0x4F, 0x40, 0x4F,
|
||||
0x40, 0x4F, 0x44, 0x4A, 0x4A, 0x4F,
|
||||
0x48, 0x47, 0x48, 0x48, 0x45, 0x40,
|
||||
0x47, 0x48, 0x48, 0x47, 0x40, 0x44,
|
||||
0x48, 0x48, 0x47, 0x40, 0x7F, 0x00,
|
||||
0x00, 0x7F, 0x40, 0x40, 0x47, 0x48,
|
||||
0x47, 0x48, 0x47, 0x40, 0x4E, 0x40,
|
||||
0x4F, 0x41, 0x41, 0x4E, 0x40, 0x48,
|
||||
0x4F, 0x48, 0x40, 0x47, 0x48, 0x48,
|
||||
0x48, 0x47, 0x40, 0x40, 0x7F, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x40, 0x7F, 0x00, 0x00, 0x7F, 0x40,
|
||||
0x40, 0x7F, 0x00, 0x00, 0x7F, 0x7F,
|
||||
0x00, 0xF0, 0xF8, 0xDC, 0xAE, 0x1E,
|
||||
0xBE, 0xBE, 0xBE, 0x1E, 0xAE, 0xDE,
|
||||
0xDC, 0xDE, 0xBE, 0x7E, 0xFE, 0xFE,
|
||||
0xDE, 0xDE, 0xFE, 0xFE, 0xFE, 0x00,
|
||||
0x00, 0xF0, 0xF8, 0xFC, 0xFE, 0x7E,
|
||||
0xBE, 0xDE, 0xBE, 0x7E, 0xFE, 0xFE,
|
||||
0xFC, 0x7E, 0x3E, 0x1E, 0x0E, 0x1E,
|
||||
0x3E, 0x7E, 0xFE, 0xFE, 0xFE, 0x00,
|
||||
0x00, 0xF0, 0xF8, 0x7C, 0xBE, 0xBE,
|
||||
0x7E, 0x7E, 0xBE, 0xBE, 0xBE, 0x7E,
|
||||
0xFC, 0x7E, 0x3E, 0x1E, 0x0E, 0x1E,
|
||||
0x3E, 0x7E, 0xFE, 0xFE, 0xFE, 0x00,
|
||||
0x00, 0xF0, 0xF8, 0xBC, 0xBE, 0x0E,
|
||||
0xBE, 0xBE, 0xBE, 0x0E, 0xBE, 0xBE,
|
||||
0xFC, 0x7E, 0x1E, 0x6E, 0x6E, 0x6E,
|
||||
0x1E, 0x7E, 0xFE, 0xFE, 0xFE, 0x00,
|
||||
0x00, 0xF0, 0xF8, 0x7C, 0x7E, 0xFE,
|
||||
0x7E, 0xFE, 0xFE, 0x7E, 0x7E, 0xFE,
|
||||
0xFE, 0xFE, 0x7E, 0x7E, 0xFE, 0xFE,
|
||||
0x1E, 0xEE, 0xEE, 0x1E, 0xFE, 0x9E,
|
||||
0x6E, 0x6E, 0xDE, 0xFE, 0xFE, 0x00,
|
||||
0x00, 0xF0, 0xF8, 0xFC, 0x0E, 0xFE,
|
||||
0xFE, 0xFE, 0x0E, 0xFE, 0x7E, 0xFE,
|
||||
0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xDE,
|
||||
0x0E, 0xFE, 0xFE, 0x1E, 0xEE, 0xEE,
|
||||
0xEE, 0x1E, 0xFE, 0xFE, 0xFE, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0xFE, 0xFE, 0x00, 0x00, 0xF0, 0x08,
|
||||
0xFE, 0xFE, 0x00, 0x00, 0xF0, 0xF8,
|
||||
0x00, 0x7F, 0x7F, 0x7B, 0x75, 0x78,
|
||||
0x7D, 0x7D, 0x7D, 0x78, 0x75, 0x7B,
|
||||
0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 0x7D,
|
||||
0x7B, 0x7B, 0x7F, 0x7F, 0x7F, 0x00,
|
||||
0x00, 0x7F, 0x7F, 0x7F, 0x7E, 0x7F,
|
||||
0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 0x7F,
|
||||
0x7E, 0x7E, 0x70, 0x70, 0x70, 0x70,
|
||||
0x70, 0x7E, 0x7E, 0x7F, 0x7F, 0x00,
|
||||
0x00, 0x7F, 0x7F, 0x7E, 0x7D, 0x7D,
|
||||
0x7D, 0x7E, 0x7E, 0x7D, 0x7D, 0x7E,
|
||||
0x7F, 0x7F, 0x7F, 0x74, 0x74, 0x74,
|
||||
0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x00,
|
||||
0x00, 0x7F, 0x7F, 0x7D, 0x7D, 0x70,
|
||||
0x7D, 0x7D, 0x7D, 0x70, 0x7D, 0x7D,
|
||||
0x7F, 0x70, 0x70, 0x70, 0x77, 0x70,
|
||||
0x70, 0x70, 0x7F, 0x7F, 0x7F, 0x00,
|
||||
0x00, 0x7F, 0x7F, 0x70, 0x7F, 0x70,
|
||||
0x7F, 0x70, 0x7B, 0x75, 0x75, 0x70,
|
||||
0x77, 0x78, 0x77, 0x77, 0x7A, 0x7F,
|
||||
0x78, 0x77, 0x77, 0x78, 0x7F, 0x7B,
|
||||
0x77, 0x77, 0x78, 0x7F, 0x7F, 0x00,
|
||||
0x00, 0x7F, 0x7F, 0x7F, 0x78, 0x77,
|
||||
0x78, 0x77, 0x78, 0x7F, 0x71, 0x7F,
|
||||
0x70, 0x7E, 0x7E, 0x71, 0x7F, 0x77,
|
||||
0x70, 0x77, 0x7F, 0x78, 0x77, 0x77,
|
||||
0x77, 0x78, 0x7F, 0x7F, 0x7F, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x7F, 0x7F, 0x00, 0x00, 0x7F, 0x40,
|
||||
0x7F, 0x7F, 0x00, 0x00, 0x7F, 0x7F,
|
||||
};
|
||||
@ -1,23 +1,25 @@
|
||||
/* 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/>.
|
||||
*/
|
||||
*
|
||||
* 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,
|
||||
_GAME,
|
||||
_NUMPAD,
|
||||
_LOWER,
|
||||
_RAISE,
|
||||
_ADJUST
|
||||
@ -25,20 +27,27 @@ enum kyria_layers {
|
||||
|
||||
enum kyria_keycodes {
|
||||
HNTS = SAFE_RANGE,
|
||||
ESC_NUM,
|
||||
LOWER,
|
||||
RAISE,
|
||||
MSS_CTL,
|
||||
CPY_PST,
|
||||
UNDO,
|
||||
FIND
|
||||
};
|
||||
|
||||
#define HNTS DF(_HNTS)
|
||||
#define QWERTY DF(_QWERTY)
|
||||
#define GAME TG(_GAME)
|
||||
#define NUMPAD TG(_NUMPAD)
|
||||
#define MSS_CTL MT(MOD_LCTL, C(KC_UP))
|
||||
#define BSP_CMD MT(MOD_LGUI, KC_BSPC)
|
||||
#define TAB_CMD MT(MOD_LGUI, KC_TAB)
|
||||
#define SFT_ENT MT(MOD_LSFT, KC_ENT)
|
||||
#define ALT_ESC MT(MOD_LALT, KC_ESC)
|
||||
#define ALT_TAB A(KC_TAB)
|
||||
#define UNDO G(KC_Z)
|
||||
#define FIND G(KC_F)
|
||||
#define MSS_CTL C(KC_UP)
|
||||
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
|
||||
@ -52,15 +61,57 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
* |-------+-------+-------+-------+-------+-------+---------------. ,---------------+-------+-------+-------+-------+-------+-------|
|
||||
* | Undo | K | V | M | F | G | Esc |MssnCtl| |MssnCtl| Esc | J | ; : | , < | . > | / ? | ' " |
|
||||
* `-------+-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-----------------------'
|
||||
* | Ctrl | Alt | Lower | Space | BSPC | | Tab | Shift | Raise | Del | Caps |
|
||||
* | Numpad| Enter | Lower | Space | BSPC | | Tab | Shift | Raise | Del | Caps |
|
||||
* `---------------------------------------' `---------------------------------------'
|
||||
*/
|
||||
|
||||
[_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_GRV,
|
||||
UNDO, KC_K, KC_V, KC_M, KC_F, KC_G, KC_ESC, MSS_CTL, MSS_CTL, KC_ESC, KC_J, KC_SCLN, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT,
|
||||
KC_LCTL, KC_LALT, LOWER, KC_SPC, BSP_CMD, KC_TAB, SFT_ENT, RAISE, KC_DEL, KC_CAPS
|
||||
UNDO, KC_K, KC_V, KC_M, KC_F, KC_G, ALT_ESC, MSS_CTL, MSS_CTL, ALT_ESC, KC_J, KC_SCLN, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT,
|
||||
NUMPAD, SFT_ENT, LOWER, KC_SPC, BSP_CMD, TAB_CMD, SFT_ENT, RAISE, KC_DEL, KC_CAPS
|
||||
),
|
||||
|
||||
/*
|
||||
* Game: Gaming Layer
|
||||
*
|
||||
* ,-----------------------------------------------. ,-----------------------------------------------.
|
||||
* | 0 | Z | R | L | D | W | | Y | P | U | X | Q | Esc |
|
||||
* |-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------|
|
||||
* | 1 | H | N | T | S | C | | B | I | E | O | A | Enter |
|
||||
* |-------+-------+-------+-------+-------+-------+---------------. ,---------------+-------+-------+-------+-------+-------+-------|
|
||||
* | 2 | K | V | M | F | G | 8 | 9 | |Default| Esc | J | ; : | , < | . > | / ? |Alt+Tab|
|
||||
* `-------+-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-----------------------'
|
||||
* | 3 | 4 | 5 | 6 | 7 | | Tab | Shift | Raise | Del | Caps |
|
||||
* `---------------------------------------' `---------------------------------------'
|
||||
*/
|
||||
|
||||
[_GAME] = LAYOUT(
|
||||
KC_0, KC_Z, KC_R, KC_L, KC_D, KC_W, KC_Y, KC_P, KC_U, KC_X, KC_Q, KC_ESC,
|
||||
KC_1, KC_H, KC_N, KC_T, KC_S, KC_C, KC_B, KC_I, KC_E, KC_O, KC_A, KC_ENT,
|
||||
KC_2, KC_K, KC_V, KC_M, KC_F, KC_G, KC_8, KC_9, GAME, ALT_ESC, KC_J, KC_SCLN, KC_COMM, KC_DOT, KC_SLSH, ALT_TAB,
|
||||
KC_3, KC_4, KC_5, KC_6, KC_7, TAB_CMD, SFT_ENT, RAISE, KC_DEL, KC_CAPS
|
||||
),
|
||||
|
||||
/*
|
||||
* Numpad
|
||||
*
|
||||
* ,-----------------------------------------------. ,-----------------------------------------------.
|
||||
* | * | + | 7 | 8 | 9 | 0 | | | | | | | |
|
||||
* |-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------|
|
||||
* | / | - | 4 | 5 | 6 | ( | | | Left | Up | Down | Right | |
|
||||
* |-------+-------+-------+-------+-------+-------+---------------. ,---------------+-------+-------+-------+-------+-------+-------|
|
||||
* | = | . | 1 | 2 | 3 | ) | | | | | | | | | | | |
|
||||
* `-------+-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-----------------------'
|
||||
* | | | | | | | | | | | |
|
||||
* `---------------------------------------' `---------------------------------------'
|
||||
*/
|
||||
|
||||
[_NUMPAD] = LAYOUT(
|
||||
KC_ASTR, KC_PLUS, KC_7, KC_8, KC_9, KC_0, _______, _______, _______, _______, _______, _______,
|
||||
KC_SLSH, KC_MINS, KC_4, KC_5, KC_6, KC_LPRN, _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, _______,
|
||||
KC_EQL, KC_DOT, KC_1, KC_2, KC_3, KC_RPRN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||
),
|
||||
|
||||
/*
|
||||
@ -105,26 +156,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||
),
|
||||
|
||||
/*
|
||||
* Adjust: Function Keys & RGB
|
||||
*
|
||||
* ,-----------------------------------------------. ,-----------------------------------------------.
|
||||
* | Reset | | | | | | | | NKRO |CG SWAP| | | HNTS |
|
||||
* |-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------|
|
||||
* | | TOG | SAI | HUI | VAI | MOD | | | | | | | |
|
||||
* |-------+-------+-------+-------+-------+-------+---------------. ,---------------+-------+-------+-------+-------+-------+-------|
|
||||
* | | | SAD | HUD | VAD | RMOD | | | | | | | |Bright+|Bright-| | |
|
||||
* `-------+-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-----------------------'
|
||||
* | | | | | | | | | | | |
|
||||
* `---------------------------------------' `---------------------------------------'
|
||||
*/
|
||||
/*
|
||||
* Adjust: Function Keys & RGB
|
||||
*
|
||||
* ,-----------------------------------------------. ,-----------------------------------------------.
|
||||
* | Reset | | | | | | | | NKRO |CG SWAP| | | HNTS |
|
||||
* |-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------|
|
||||
* | | TOG | SAI | HUI | VAI | MOD | | |Bright+|Bright-| | | |
|
||||
* |-------+-------+-------+-------+-------+-------+---------------. ,---------------+-------+-------+-------+-------+-------+-------|
|
||||
* | | | SAD | HUD | VAD | RMOD | | | | | | | | | | | |
|
||||
* `-------+-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-----------------------'
|
||||
* | | | | | | | | | | | |
|
||||
* `---------------------------------------' `---------------------------------------'
|
||||
*/
|
||||
|
||||
[_ADJUST] = LAYOUT(
|
||||
RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, HNTS,
|
||||
_______, RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, RGB_MOD, CG_TOGG, NK_TOGG, KC_BRID, KC_BRIU, _______, _______,
|
||||
_______, _______, RGB_SAD, RGB_HUD, RGB_VAD,RGB_RMOD,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||
RESET, _______, _______, _______, _______, _______, _______, NK_TOGG, CG_TOGG, _______, GAME, HNTS,
|
||||
_______, RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, RGB_MOD, _______, KC_BRIU, KC_BRID, _______, _______, _______,
|
||||
_______, _______, RGB_SAD, RGB_HUD, RGB_VAD,RGB_RMOD,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||
),
|
||||
|
||||
};
|
||||
|
||||
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
@ -167,6 +219,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
}
|
||||
}
|
||||
break;
|
||||
case MSS_CTL:
|
||||
if (record->event.pressed && record->tap.count) {
|
||||
tap_code16(C(KC_UP));
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case UNDO: // Tap to Undo, Tap with GUI to Redo
|
||||
if (get_mods() & MOD_MASK_GUI) {
|
||||
if (record->event.pressed) {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
20
keyboards/splitkb/kyria/keymaps/john-ezra/readme.md
Normal file
20
keyboards/splitkb/kyria/keymaps/john-ezra/readme.md
Normal file
@ -0,0 +1,20 @@
|
||||
### This Keymap uses the nanoBoot bootloader to maximize available firmware space.
|
||||
|
||||
As is, the firmware will be too large if using the standard bootloader. Removing `DEBOUNCE_TYPE = sym_eager_pk` from the `rules.mk` should get the size under the limit.
|
||||
|
||||
If nanoBoot is not going to be used, delete or comment out the following from your `rules.mk`:
|
||||
```make
|
||||
BOOTLOADER = hid
|
||||
BOOTLOADER_SIZE = 512
|
||||
PROGRAM_CMD = $(HID_BOOTLOADER_CLI) -mmcu=$(MCU) -w -v $(BUILD_DIR)/$(TARGET).hex
|
||||
```
|
||||
|
||||
nanoBoot can be found here: [nanoBoot](https://github.com/sigprof/nanoBoot) I used the string-descriptors branch as it was the latest update.
|
||||
|
||||
To ISP Flash nanoBoot: `avrdude -p atmega32u4 -c avrisp -U flash:w:/Users/DempseyTech/nanoBoot/nanoBoot.hex:i -P /dev/cu.usbmodem123451 -U lfuse:w:0x7F:m -U hfuse:w:0xD6:m -U efuse:w:0xC7:m`
|
||||
|
||||
You will need to change the path in the CLI command to match your file structure.
|
||||
|
||||
QMK Toolbox will not recognize controllers using nanoBoot, instead use the CLI to flash.
|
||||
|
||||
To Flash: `qmk flash -kb splitkb/kyria/rev1 -km john-ezra -bl hid_bootloader`
|
||||
@ -8,5 +8,12 @@ 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)
|
||||
KEY_OVERRIDE_ENABLE = yes # Enable Key Overrides
|
||||
CONSOLE_ENABLE = no
|
||||
|
||||
DEBOUNCE_TYPE = sym_eager_pk
|
||||
|
||||
BOOTLOADER = hid # This Keymap Uses nanoBoot, more info in readme
|
||||
BOOTLOADER_SIZE = 512
|
||||
PROGRAM_CMD = $(HID_BOOTLOADER_CLI) -mmcu=$(MCU) -w -v $(BUILD_DIR)/$(TARGET).hex
|
||||
|
||||
SRC += oled.c
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user