From ff854565ce012a325ad04b09a7bcb7c8bb9d43c5 Mon Sep 17 00:00:00 2001 From: Jonas Avellana <14019120+ninjonas@users.noreply.github.com> Date: Wed, 25 Sep 2019 22:28:06 -0600 Subject: [PATCH] [Keymap] ninjonas keymap for crkbd & ninjonas userspace updates (#6797) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [keymap(crkbd)] introducing crkbd keymap on ninjonas profile * [keymap(crkbd)] introducing crkbd keymap on ninjonas profile * [refactor(crkbd)] reducing file size by selecting RGB animations * [refactor(crkbd)] added shiftit key * [refactor(crkbd)] added shiftit key * [chore(crkbd)] adding SLEEP_LED_ENABLE on rules.mk * [refactor(crkbd)] added keylog & removed static rainbow RGB * [feat(crkbd)] introduced em-dash '—' keymap * [feat(crkbd)] added screenshot functionality * [refactor(lily58,pinky3)] moving media keys * [refactor(lily58)] Added emdash key * [chore] removing NUMBERS & FUNCTIONS layers as they're useless * [chore] removing NUMBERS & FUNCTIONS layers as they're useless * [chore(crkbd,lily48)] Updating README.md * [feat] added K_LAPP & K_RAPP to mimic command + tab * [feat] added K_LAPP & K_RAPP to mimic command + tab * [fix(#6797)] resolving changes requested by @drashna * [fix(#6797)] first cut on using QMK OLED Driver * [fix(#6797)] cleaning up rules.mk * [fix(#6797)] making scrolling logo work * [fix(#6797)] Using OLED Driver for Lily58 * [fix(#6797)] Moved OLED driver implementation to ninjonas userspace * [fix(#6797)] Bringing back crkbd & lily58 logos * [fix(#6797)] Turning off OLED based off @drashna's workaround in #5982 * [fix(#6797)] whoops! forgot to checkin crkbd/config.h * [fix(#6797)] fixing issue with OLED randomly turning on * [fix(#6797)] using default glcdfont.c for lily58 & crkbd * [fix(#6797)] Using LINK_TIME_OPTIMIZATION_ENABLE rather than EXTRAFLAGS as per code review * [fix(#6797)] updating M_MALL macro as per code review by @fauxpark --- keyboards/crkbd/keymaps/ninjonas/README.md | 99 +++++++++++++++++++ keyboards/crkbd/keymaps/ninjonas/config.h | 48 +++++++++ keyboards/crkbd/keymaps/ninjonas/keymap.c | 89 +++++++++++++++++ keyboards/crkbd/keymaps/ninjonas/rgb.c | 27 +++++ keyboards/crkbd/keymaps/ninjonas/rules.mk | 11 +++ keyboards/hotdox/keymaps/ninjonas/keymap.c | 2 +- keyboards/lily58/keymaps/ninjonas/README.md | 6 +- keyboards/lily58/keymaps/ninjonas/config.h | 6 +- keyboards/lily58/keymaps/ninjonas/keymap.c | 26 ++--- .../keymaps/ninjonas/layer_state_reader.c | 37 ------- keyboards/lily58/keymaps/ninjonas/rules.mk | 6 +- keyboards/pinky/3/keymaps/ninjonas/README.md | 43 ++------ keyboards/pinky/3/keymaps/ninjonas/keymap.c | 90 +++++++---------- keyboards/pinky/3/keymaps/ninjonas/rules.mk | 2 + users/ninjonas/README.md | 24 +++-- users/ninjonas/ninjonas.c | 50 +--------- users/ninjonas/ninjonas.h | 16 ++- users/ninjonas/oled.c | 82 +++++++++++++++ users/ninjonas/process_records.c | 16 ++- users/ninjonas/process_records.h | 1 + users/ninjonas/rules.mk | 9 +- 21 files changed, 460 insertions(+), 230 deletions(-) create mode 100644 keyboards/crkbd/keymaps/ninjonas/README.md create mode 100644 keyboards/crkbd/keymaps/ninjonas/config.h create mode 100644 keyboards/crkbd/keymaps/ninjonas/keymap.c create mode 100644 keyboards/crkbd/keymaps/ninjonas/rgb.c create mode 100644 keyboards/crkbd/keymaps/ninjonas/rules.mk delete mode 100644 keyboards/lily58/keymaps/ninjonas/layer_state_reader.c create mode 100644 keyboards/pinky/3/keymaps/ninjonas/rules.mk create mode 100644 users/ninjonas/oled.c diff --git a/keyboards/crkbd/keymaps/ninjonas/README.md b/keyboards/crkbd/keymaps/ninjonas/README.md new file mode 100644 index 0000000000..24889a221d --- /dev/null +++ b/keyboards/crkbd/keymaps/ninjonas/README.md @@ -0,0 +1,99 @@ +# ninjonas Keymap for [Corne Keyboard (crkbd)](https://github.com/foostan/crkbd) + +## Keymap +This keymap is designed based off my typing habits and is subject to change. Information about custom user macros and tap dances can be found [here](../../../../users/ninjonas). + +More information about the crkbd keyboard can be found [here](https://thomasbaart.nl/2018/11/26/corne-keyboard-helidox-build-log/) + +### QWERTY +```c + //,----------------------------------------------------. ,----------------------------------------------------. + // Tab, Q, W, E, R, T, Y, U, I, O, P, \ + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + // ESC, A, S, D, F, G, H, J, K, L, ;, ' + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + // LShift, Z, X, C, V, B, N, M, ,, ., /, = + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + // , Ctrl, Space, Enter, BackSP, Del + //`---------------------' `---------------------' +``` + +### DVORAK +```c + //,----------------------------------------------------. ,----------------------------------------------------. + // Tab, ', ,, ., P, Y, F, G, C, R, L, \ + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + // ESC, A, O, E, U, I, D, H, T, N, S, / + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + // LShift, ;, Q, J, K, X, B, M, W, V, Z, = + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + // , Ctrl, Space, Enter, BackSP, Del + //`---------------------' `---------------------' +``` + +### COLEMAK +```c + //,----------------------------------------------------. ,----------------------------------------------------. + // Tab, Q, W, F, P, G, J, L, U, Y, ;, \ + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + // ESC, A, R, S, T, D, H, N, E, I, O, ' + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + // LShift, Z, X, C, V, B, K, M, ,, ., /, = + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + // , Ctrl, Space, Enter, BackSP, Del + //`---------------------' `---------------------' +``` + +### LOWER +```c + //,----------------------------------------------------. ,----------------------------------------------------. + // , , KC_BRIU, Play, Mute, K_CSCN, PgUp, Home, Up, End, , K_MDSH + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + // , , KC_BRID, Next, VolUp, , PgDn, Left, Down, Right, K_LOCK, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + // , , , Prev, VolDn, [, ], , , M_CODE, M_ZOOM, M_PYNV, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + // , , , , , + //`---------------------' `---------------------' +``` + +### RAISE +```c + //,----------------------------------------------------. ,----------------------------------------------------. + // `, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, - + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + // ~, !, @, #, $, %, ^, &, *, (, ), _ + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + // F11, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F12 + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + // , , , , , + //`---------------------' `---------------------' +``` + +### ADJUST +```c + //,----------------------------------------------------. ,----------------------------------------------------. + // M_MAKE, EEP_RST, , , , , RGB_TOG, , , COLEMAK, DVORAK, QWERTY, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + // M_VRSN, M_MALL, , RGB_SAI, RGB_HUI, RGB_VAI, , , , , , , + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + // M_FLSH, , , RGB_SAD, RGB_HUD, RGB_VAD, RGB_M_P, RGB_M_B,RGB_M_SW, , , , + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + // , , , , , + //`---------------------' `---------------------' +``` + + \ No newline at end of file diff --git a/keyboards/crkbd/keymaps/ninjonas/config.h b/keyboards/crkbd/keymaps/ninjonas/config.h new file mode 100644 index 0000000000..ef7ff6c556 --- /dev/null +++ b/keyboards/crkbd/keymaps/ninjonas/config.h @@ -0,0 +1,48 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 . +*/ + +#pragma once + +//#define USE_MATRIX_I2C + +/* Select hand configuration */ + +#define MASTER_LEFT +// #define MASTER_RIGHT +// #define EE_HANDS + +#define USE_SERIAL_PD2 + +#define TAPPING_FORCE_HOLD + +#ifdef RGBLIGHT_ENABLE + #undef RGBLED_NUM + #undef RGBLIGHT_ANIMATIONS // https://docs.qmk.fm/#/feature_rgblight?id=effect-and-animation-toggles + #define RGBLIGHT_EFFECT_BREATHING + #define RGBLIGHT_EFFECT_RAINBOW_SWIRL + #define RGBLED_NUM 27 + #define RGBLIGHT_LIMIT_VAL 120 + #define RGBLIGHT_HUE_STEP 10 + #define RGBLIGHT_SAT_STEP 17 + #define RGBLIGHT_VAL_STEP 17 +#endif + +#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c" +#define OLED_DISABLE_TIMEOUT \ No newline at end of file diff --git a/keyboards/crkbd/keymaps/ninjonas/keymap.c b/keyboards/crkbd/keymaps/ninjonas/keymap.c new file mode 100644 index 0000000000..6d19345c44 --- /dev/null +++ b/keyboards/crkbd/keymaps/ninjonas/keymap.c @@ -0,0 +1,89 @@ +#include QMK_KEYBOARD_H +#include "ninjonas.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT_wrapper( + //,----------------------------------------------------. ,----------------------------------------------------. + _____________________QWERTY_L1______________________, _____________________QWERTY_R1______________________, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + _____________________QWERTY_L2______________________, _____________________QWERTY_R2______________________, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + _____________________QWERTY_L3______________________, _____________________QWERTY_R3______________________, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + T_GUI, KC_LCTL,LT_RAI, LT_LOW,KC_BSPC,KC_DEL + //`---------------------' `---------------------' + ), + + [_DVORAK] = LAYOUT_wrapper( + //,----------------------------------------------------. ,----------------------------------------------------. + _____________________DVORAK_L1______________________, _____________________DVORAK_R1______________________, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + _____________________DVORAK_L2______________________, _____________________DVORAK_R2______________________, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + _____________________DVORAK_L3______________________, _____________________DVORAK_R3______________________, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + T_GUI, KC_LCTL,LT_RAI, LT_LOW,KC_BSPC,KC_DEL + //`---------------------' `---------------------' + ), + + [_COLEMAK] = LAYOUT_wrapper( + //,----------------------------------------------------. ,----------------------------------------------------. + _____________________COLEMAK_L1_____________________, _____________________COLEMAK_R1_____________________, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + _____________________COLEMAK_L2_____________________, _____________________COLEMAK_R2_____________________, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + _____________________COLEMAK_L3_____________________, _____________________COLEMAK_R3_____________________, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + T_GUI, KC_LCTL,LT_RAI, LT_LOW,KC_BSPC,KC_DEL + //`---------------------' `---------------------' + ), + + [_LOWER] = LAYOUT_wrapper( + //,----------------------------------------------------. ,----------------------------------------------------. + XXXXXXX, XXXXXXX, _________MEDIA_1_________, K_CSCN, _______________NAV_1______________, XXXXXXX, K_MDSH, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + XXXXXXX, XXXXXXX, _________MEDIA_2_________, XXXXXXX, _______________NAV_2______________, K_LOCK, XXXXXXX, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + _______, M_SHFT, _________MEDIA_3_________, T_LBRC, T_RBRC, _______, XXXXXXX, M_CODE, M_ZOOM, M_PYNV, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + _______,_______,_______, _______,_______,_______ + //`---------------------' `---------------------' + ), + + [_RAISE] = LAYOUT_wrapper( \ + //,----------------------------------------------------. ,----------------------------------------------------. + _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + _____________________SYM_LEFT_______________________, _____________________SYM_RIGHT______________________, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + _____________________FUNC_LEFT______________________, _____________________FUNC_RIGHT_____________________, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + _______,_______,_______, _______,_______,_______ + //`---------------------' `---------------------' + ), + + [_ADJUST] = LAYOUT_wrapper( \ + //,----------------------------------------------------. ,----------------------------------------------------. + M_MAKE, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, COLEMAK, DVORAK, QWERTY, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + M_VRSN, M_MALL, XXXXXXX, RGB_SAI, RGB_HUI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + M_FLSH, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_VAD, RGB_M_P, RGB_M_B,RGB_M_SW, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + _______,_______,_______, _______,_______,_______ + //`---------------------' `---------------------' + ), +/* + [_TEMPLATE] = LAYOUT_wrapper( \ + //,----------------------------------------------------. ,----------------------------------------------------. + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------| + _______,_______,_______, _______,_______,_______ + //`---------------------' `---------------------' + ), +*/ +}; \ No newline at end of file diff --git a/keyboards/crkbd/keymaps/ninjonas/rgb.c b/keyboards/crkbd/keymaps/ninjonas/rgb.c new file mode 100644 index 0000000000..f9ac3a8610 --- /dev/null +++ b/keyboards/crkbd/keymaps/ninjonas/rgb.c @@ -0,0 +1,27 @@ +#include QMK_KEYBOARD_H + +extern keymap_config_t keymap_config; + +#ifdef RGBLIGHT_ENABLE +//Following line allows macro to read current RGB settings +extern rgblight_config_t rgblight_config; +#endif + +extern uint8_t is_master; + +int RGB_current_mode; + +// Setting ADJUST layer RGB back to default +void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) { + if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) { + layer_on(layer3); + } else { + layer_off(layer3); + } +} + +void keyboard_post_init_user(void) { + #ifdef RGBLIGHT_ENABLE + RGB_current_mode = rgblight_config.mode; + #endif +} \ No newline at end of file diff --git a/keyboards/crkbd/keymaps/ninjonas/rules.mk b/keyboards/crkbd/keymaps/ninjonas/rules.mk new file mode 100644 index 0000000000..92e18ed6e2 --- /dev/null +++ b/keyboards/crkbd/keymaps/ninjonas/rules.mk @@ -0,0 +1,11 @@ +RGBLIGHT_ENABLE = yes +MOUSEKEY_ENABLE = no +OLED_DRIVER_ENABLE = yes +LINK_TIME_OPTIMIZATION_ENABLE = yes + +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend + +# If you want to change the display of OLED, you need to change here +SRC += ./lib/rgb_state_reader.c \ + rgb.c diff --git a/keyboards/hotdox/keymaps/ninjonas/keymap.c b/keyboards/hotdox/keymaps/ninjonas/keymap.c index 603cc4c11e..248a4320a1 100644 --- a/keyboards/hotdox/keymaps/ninjonas/keymap.c +++ b/keyboards/hotdox/keymaps/ninjonas/keymap.c @@ -277,7 +277,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //LEFT HAND XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - M_VRSN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + M_VRSN, M_MALL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_FLSH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, // LEFT THUMB diff --git a/keyboards/lily58/keymaps/ninjonas/README.md b/keyboards/lily58/keymaps/ninjonas/README.md index 73f7f9d942..ef6322db4d 100644 --- a/keyboards/lily58/keymaps/ninjonas/README.md +++ b/keyboards/lily58/keymaps/ninjonas/README.md @@ -67,11 +67,11 @@ More information about the Lily58 pro keyboard can be found [here](https://yuchi * ,------------------------------------------. ,------------------------------------------. * | F11 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F12 | * |------+------+------+-------+------+------| |------+------+------+------+-------+------| - * | | | |KC_BRIU| Play | Mute | | PgUp | Home | Up | End | | | + * | | |KC_BRIU| Play | Mute | | | PgUp | Home | Up | End | |K_MDSH| * |------+------+------+-------+------+------| |------+------+------+------+-------+------| - * | | | |KC_BRID| Next |VolUp |-------. ,-------| PgDn | Left | Down |Right |K_LOCK | | + * | | |KC_BRID| Next |VolUp | |-------. ,-------| PgDn | Left | Down |Right |K_LOCK | | * |------+------+------+-------+------+------| | | |------+------+------+------+-------+------| - * | |M_SHFT| | | Prev |VolDn |-------| |-------| | | | |M_ZOOM |M_PYNV| + * |M_SHFT| | | Prev |VolDn | |-------| |-------| | | | |M_ZOOM |M_PYNV| * `------------------------------------------/ / \ \------------------------------------------' * | | | | / / \ \ | |M_CODE| | * | | | |/ / \ \ | | | | diff --git a/keyboards/lily58/keymaps/ninjonas/config.h b/keyboards/lily58/keymaps/ninjonas/config.h index 7a5587d560..19fb5cd92b 100644 --- a/keyboards/lily58/keymaps/ninjonas/config.h +++ b/keyboards/lily58/keymaps/ninjonas/config.h @@ -26,6 +26,8 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#define SSD1306OLED #define USE_SERIAL_PD2 -#define TAPPING_FORCE_HOLD \ No newline at end of file +#define TAPPING_FORCE_HOLD + +#define OLED_FONT_H "keyboards/lily58/lib/glcdfont.c" +#define OLED_DISABLE_TIMEOUT \ No newline at end of file diff --git a/keyboards/lily58/keymaps/ninjonas/keymap.c b/keyboards/lily58/keymaps/ninjonas/keymap.c index 81436aee3e..5ef607564e 100644 --- a/keyboards/lily58/keymaps/ninjonas/keymap.c +++ b/keyboards/lily58/keymaps/ninjonas/keymap.c @@ -88,11 +88,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,------------------------------------------. ,------------------------------------------. * | F11 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F12 | * |------+------+------+-------+------+------| |------+------+------+------+-------+------| - * | | | |KC_BRIU| Play | Mute | | PgUp | Home | Up | End | | | + * | | |KC_BRIU| Play | Mute | | | PgUp | Home | Up | End | |K_MDSH| * |------+------+------+-------+------+------| |------+------+------+------+-------+------| - * | | | |KC_BRID| Next |VolUp |-------. ,-------| PgDn | Left | Down |Right |K_LOCK | | + * | | |KC_BRID| Next |VolUp | |-------. ,-------| PgDn | Left | Down |Right |K_LOCK | | * |------+------+------+-------+------+------| | | |------+------+------+------+-------+------| - * |M_SHFT| | | | Prev |VolDn |-------| |-------| | | | |M_ZOOM |M_PYNV| + * |M_SHFT| | | Prev |VolDn | |-------| |-------| | | | |M_ZOOM |M_PYNV| * `------------------------------------------/ / \ \------------------------------------------' * | | | | / / \ \ | |M_CODE| | * | | | |/ / \ \ | | | | @@ -100,9 +100,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LOWER] = LAYOUT_wrapper( \ _____________________FUNC_LEFT______________________, _____________________FUNC_RIGHT_____________________, \ - _______, _______, _______, _________MEDIA_1_________, _______________NAV_1______________, _______, _______, \ - _______, _______, _______, _________MEDIA_2_________, _______________NAV_2______________, K_LOCK, _______, \ - M_SHFT, _______, _______, _________MEDIA_3_________, _______, _______, _______, _______, _______, _______, M_ZOOM, M_PYNV, \ + _______, _______, _________MEDIA_1_________, _______, _______________NAV_1______________, _______, K_MDSH, \ + _______, _______, _________MEDIA_2_________, _______, _______________NAV_2______________, K_LOCK, _______, \ + M_SHFT, _______, _________MEDIA_3_________, _______, _______, _______, _______, _______, _______, _______, M_ZOOM, M_PYNV, \ __________________________________, _______, _______, M_CODE, _______ \ ), @@ -132,20 +132,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,------------------------------------------. ,-----------------------------------------. * |EEP_RST| | | | | | | | | |COLMAK|DVORAK|QWERTY| * |-------+------+------+------+------+------| |------+------+------+------+------+------| - * | M_MAKE| | | | | | | | | | | | | + * |M_MAKE | | | | | | | | | | | | | * |-------+------+------+------+------+------| |------+------+------+------+------+------| - * | M_VRSN| | | | | |-------. ,-------| | | | | | | + * |M_VRSN |M_MALL| | | | |-------. ,-------| | | | | | | * |-------+------+------+------+------+------| | | |------+------+------+------+------+------| - * | M_FLSH| | | | | |-------| |-------| | | | | | | + * |M_FLSH | | | | | |-------| |-------| | | | | | | * `------------------------------------------/ / \ \-----------------------------------------' - * | | | | / / \ \ | | | | - * | | | |/ / \ \ | | | | - * `----------------------------' '------''--------------------' + * | | | | / / \ \ | | | | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' */ [_ADJUST] = LAYOUT_wrapper( \ EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, DVORAK, QWERTY, \ M_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - M_VRSN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + M_VRSN, M_MALL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ M_FLSH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\ __________________________________, __________________________________ \ ), diff --git a/keyboards/lily58/keymaps/ninjonas/layer_state_reader.c b/keyboards/lily58/keymaps/ninjonas/layer_state_reader.c deleted file mode 100644 index 883eaca036..0000000000 --- a/keyboards/lily58/keymaps/ninjonas/layer_state_reader.c +++ /dev/null @@ -1,37 +0,0 @@ -#include QMK_KEYBOARD_H -#include -#include "lily58.h" -#include "ninjonas.h" - -char layer_state_str[24]; - -const char *read_layer_state(void) { - switch (biton32(layer_state)) - { - case _RAISE: - snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Raise"); - break; - case _LOWER: - snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Lower"); - break; - case _ADJUST: - snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Adjust"); - break; - default: - switch (biton32(default_layer_state)) { - case _COLEMAK: - snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Colemak"); - break; - case _DVORAK: - snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Dvorak"); - break; - case _QWERTY: - snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Qwerty"); - break; - default: - snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%ld", layer_state); - } - } - - return layer_state_str; -} \ No newline at end of file diff --git a/keyboards/lily58/keymaps/ninjonas/rules.mk b/keyboards/lily58/keymaps/ninjonas/rules.mk index 4ea023572f..c582662134 100644 --- a/keyboards/lily58/keymaps/ninjonas/rules.mk +++ b/keyboards/lily58/keymaps/ninjonas/rules.mk @@ -1,5 +1 @@ -# If you want to change the display of OLED, you need to change here -SRC += ./lib/glcdfont.c \ - layer_state_reader.c \ - ./lib/logo_reader.c \ - ./lib/keylogger.c \ +OLED_DRIVER_ENABLE = yes diff --git a/keyboards/pinky/3/keymaps/ninjonas/README.md b/keyboards/pinky/3/keymaps/ninjonas/README.md index 8db995d4eb..4546b164c7 100644 --- a/keyboards/pinky/3/keymaps/ninjonas/README.md +++ b/keyboards/pinky/3/keymaps/ninjonas/README.md @@ -15,7 +15,7 @@ More information about the Pinky3 keyboard can be found [here](https://github.co |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| | Shift| Z| X| C| V| B| Spc/RAI| | Ent/LOW| N| M| ,| .| /| =| `---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------' - | ALT| | CTRL| Spc/NUM| | Ent/FUNC| BckSpace| Del| LOWER| + | ALT| | CTRL| KC_LAPP| | KC_RAPP| BckSpace| Del| LOWER| `---------------------------------------' `---------------------------------------' */ ``` @@ -30,7 +30,7 @@ More information about the Pinky3 keyboard can be found [here](https://github.co |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| | Shift| ;| Q| J| K| X| Spc/RAI| | Ent/LOW| B| M| W| V| Z| =| `---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------' - | ALT| | CTRL| Spc/NUM| | Ent/FUNC| BckSpace| Del| LOWER| + | ALT| | CTRL| KC_LAPP| | KC_RAPP| BckSpace| Del| LOWER| `---------------------------------------' `---------------------------------------' */ ``` @@ -45,7 +45,7 @@ More information about the Pinky3 keyboard can be found [here](https://github.co |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| | Shift| Z| X| C| V| B| Spc/RAI| | Ent/LOW| K| M| ,| .| /| =| `---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------' - | ALT| | CTRL| Spc/NUM| | Ent/FUNC| BckSpace| Del| LOWER| + | ALT| | CTRL| KC_LAPP| | KC_RAPP| BckSpace| Del| LOWER| `---------------------------------------' `---------------------------------------' */ ``` @@ -54,7 +54,7 @@ More information about the Pinky3 keyboard can be found [here](https://github.co ```c /* ,---------------------------------------------------------------------. ,---------------------------------------------------------------------. -| | | | BriUp| Play| Mute| K_CSCN| | | PgUp| Home| Up| End| | | +| | | | BriUp| Play| Mute| K_CSCN| | | PgUp| Home| Up| End| | K_MDSH| |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| | | | | BriDn| Next| VolUp| | | | PgDn| Left| Down| Right| K_LOCK| | |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| @@ -69,11 +69,11 @@ More information about the Pinky3 keyboard can be found [here](https://github.co ```c /* ,---------------------------------------------------------------------. ,---------------------------------------------------------------------. -| | | MS_1| MS_U| MS_2| WH_U| | | | | | | | | | +| `| 1| 2| 3| 4| 5| | | | 6| 7| 8| 9| 0| -| |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| -| | | MS_L| MS_D| MS_R| WH_D| | | | | | | | | | +| ~| !| @| #| $| %| | | | ^| &| *| (| )| _| |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| -| | | | | | | | | | | | | | | | +| F11| F2| F3| F4| F4| F5| | | | F6| F7| F8| F9| F10| F12| `---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------' | | | | | | | | | | `---------------------------------------' `---------------------------------------' @@ -95,35 +95,6 @@ More information about the Pinky3 keyboard can be found [here](https://github.co */ ``` -### NUMBERS -```c -/* -,---------------------------------------------------------------------. ,---------------------------------------------------------------------. -| `| 1| 2| 3| 4| 5| | | | 6| 7| 8| 9| 0| -| -|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| -| ~| !| @| #| $| %| | | | ^| &| *| (| )| _| -|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| -| | | | | | | | | | | | | | | | -`---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------' - | | | | | | | | | | - `---------------------------------------' `---------------------------------------' -*/ -``` - -### FUNCTIONS -```c -/* -,---------------------------------------------------------------------. ,---------------------------------------------------------------------. -| F11| F2| F3| F4| F4| F5| | | | F6| F7| F8| F9| F10| F12| -|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| -| | | | | | | | | | | | | | | | -|---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------| -| | | | | | | | | | | | | | | | -`---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------' - | | | | | | | | | | - `---------------------------------------' `---------------------------------------' -*/ -```