aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/lily58
diff options
context:
space:
mode:
authorJonas Avellana <14019120+ninjonas@users.noreply.github.com>2019-09-30 11:50:27 -0600
committerDrashna Jaelre <drashna@live.com>2019-09-30 10:50:27 -0700
commitcffe671a61e8187b39a508556c7a5b5f04835d24 (patch)
tree071199e57f8c1db1c18af28aa19dda78595a1c67 /keyboards/lily58
parentf418efcaf5d681e87bd23b4d28621b87ff61fcb9 (diff)
downloadfirmware-cffe671a61e8187b39a508556c7a5b5f04835d24.tar.gz
firmware-cffe671a61e8187b39a508556c7a5b5f04835d24.tar.bz2
firmware-cffe671a61e8187b39a508556c7a5b5f04835d24.zip
[Keymap] Updating crkbd RGB keymap implementation & ninjonas userspace updates (#6834)
* [keymap] Updating crkbd RGB implementation & ninjonas userspace updates * [chore] adding process_record_oled method to process_records.h
Diffstat (limited to 'keyboards/lily58')
-rw-r--r--keyboards/lily58/keymaps/ninjonas/README.md4
-rw-r--r--keyboards/lily58/keymaps/ninjonas/keymap.c8
2 files changed, 5 insertions, 7 deletions
diff --git a/keyboards/lily58/keymaps/ninjonas/README.md b/keyboards/lily58/keymaps/ninjonas/README.md
index ef6322db4..862252840 100644
--- a/keyboards/lily58/keymaps/ninjonas/README.md
+++ b/keyboards/lily58/keymaps/ninjonas/README.md
@@ -3,8 +3,6 @@
## 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).
-> Make sure you update QMK's lily58 config.h TAPPING_TERM to 200ms or this won't compile
-
More information about the Lily58 pro keyboard can be found [here](https://yuchi-kbd.hatenablog.com/entry/2018/12/23/214342)
### QWERTY
@@ -71,7 +69,7 @@ More information about the Lily58 pro keyboard can be found [here](https://yuchi
* |------+------+------+-------+------+------| |------+------+------+------+-------+------|
* | | |KC_BRID| Next |VolUp | |-------. ,-------| PgDn | Left | Down |Right |K_LOCK | |
* |------+------+------+-------+------+------| | | |------+------+------+------+-------+------|
- * |M_SHFT| | | Prev |VolDn | |-------| |-------| | | | |M_ZOOM |M_PYNV|
+ * |M_SHFT| | | Prev |VolDn | |-------| |-------| | | | | |M_PYNV|
* `------------------------------------------/ / \ \------------------------------------------'
* | | | | / / \ \ | |M_CODE| |
* | | | |/ / \ \ | | | |
diff --git a/keyboards/lily58/keymaps/ninjonas/keymap.c b/keyboards/lily58/keymaps/ninjonas/keymap.c
index 5ef607564..6c6a41b3b 100644
--- a/keyboards/lily58/keymaps/ninjonas/keymap.c
+++ b/keyboards/lily58/keymaps/ninjonas/keymap.c
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+-------+------+------| |------+------+------+------+-------+------|
* | | |KC_BRID| Next |VolUp | |-------. ,-------| PgDn | Left | Down |Right |K_LOCK | |
* |------+------+------+-------+------+------| | | |------+------+------+------+-------+------|
- * |M_SHFT| | | Prev |VolDn | |-------| |-------| | | | |M_ZOOM |M_PYNV|
+ * | |M_SHFT| | Prev |VolDn | |-------| |-------| | M | | | |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______________, _______, K_MDSH, \
- _______, _______, _________MEDIA_2_________, _______, _______________NAV_2______________, K_LOCK, _______, \
- M_SHFT, _______, _________MEDIA_3_________, _______, _______, _______, _______, _______, _______, _______, M_ZOOM, M_PYNV, \
+ M_XXX2, M_XXX3, _________MEDIA_1_________, _______, _______________NAV_1______________, _______, K_MDSH, \
+ M_XXX4, M_XXX5, _________MEDIA_2_________, _______, _______________NAV_2______________, K_LOCK, _______, \
+ _______, M_SHFT, _________MEDIA_3_________, _______, _______, _______, _______, KC_M, _______, _______, M_XXX1, M_PYNV, \
__________________________________, _______, _______, M_CODE, _______ \
),