aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/lily58
diff options
context:
space:
mode:
authorJonas Avellana <14019120+ninjonas@users.noreply.github.com>2020-02-17 02:30:03 -0700
committerGitHub <noreply@github.com>2020-02-17 01:30:03 -0800
commit79e6b7866988f3cfc1c5b6746e5f400b50704ce8 (patch)
tree79b72d2c165198fbd1715ac42b625dae1ab1e1a4 /keyboards/lily58
parent5e79da9f321a7b50fc82201ad51b1f1bfa0e0114 (diff)
downloadfirmware-79e6b7866988f3cfc1c5b6746e5f400b50704ce8.tar.gz
firmware-79e6b7866988f3cfc1c5b6746e5f400b50704ce8.tar.bz2
firmware-79e6b7866988f3cfc1c5b6746e5f400b50704ce8.zip
[Keymap] ninjonas keymap updates (#8170)
* [keymap] ninjonas keymap updates * [refactor(kyria)] updating keymap for numpad layer to be transparent rather than ignores * [keymap(lily58)] added numpad layer * [keymap(crkbd)] added numpad layer activated through tapdance * [fix(8170)] fixing code review changes requested by noroadsleft * [fix(8170)] updating comments and .md files to use 'Cmd' instead of  and &#8984;
Diffstat (limited to 'keyboards/lily58')
-rw-r--r--keyboards/lily58/keymaps/ninjonas/README.md6
-rw-r--r--keyboards/lily58/keymaps/ninjonas/keymap.c112
2 files changed, 81 insertions, 37 deletions
diff --git a/keyboards/lily58/keymaps/ninjonas/README.md b/keyboards/lily58/keymaps/ninjonas/README.md
index 862252840..6ef9361f6 100644
--- a/keyboards/lily58/keymaps/ninjonas/README.md
+++ b/keyboards/lily58/keymaps/ninjonas/README.md
@@ -17,7 +17,7 @@ More information about the Lily58 pro keyboard can be found [here](https://yuchi
* |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
* |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / | = |
* `-----------------------------------------/ / \ \-----------------------------------------'
- * | Alt |  | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
+ * | Alt | Cmd | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
* | | | |/ / \ \ | | | |
* `----------------------------' '------''--------------------'
*/
@@ -35,7 +35,7 @@ More information about the Lily58 pro keyboard can be found [here](https://yuchi
* |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
* |LShift| ; | Q | J | K | X |-------| |-------| B | M | W | V | Z | = |
* `-----------------------------------------/ / \ \-----------------------------------------'
- * | Alt |  | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
+ * | Alt | Cmd | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
* | | | |/ / \ \ | | | |
* `----------------------------' '------''--------------------'
*/
@@ -53,7 +53,7 @@ More information about the Lily58 pro keyboard can be found [here](https://yuchi
* |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
* |LShift| Z | X | C | V | B |-------| |-------| K | M | , | . | / | = |
* `-----------------------------------------/ / \ \-----------------------------------------'
- * | Alt |  | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
+ * | Alt | Cmd | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
* | | | |/ / \ \ | | | |
* `----------------------------' '------''--------------------'
*/
diff --git a/keyboards/lily58/keymaps/ninjonas/keymap.c b/keyboards/lily58/keymaps/ninjonas/keymap.c
index 0bd330a76..2976f9eaf 100644
--- a/keyboards/lily58/keymaps/ninjonas/keymap.c
+++ b/keyboards/lily58/keymaps/ninjonas/keymap.c
@@ -28,16 +28,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
* |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / | = |
* `-----------------------------------------/ / \ \-----------------------------------------'
- * | Alt |  | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
+ * | Alt | Cmd | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
* | | | |/ / \ \ | | | |
* `----------------------------' '------''--------------------'
*/
[_QWERTY] = LAYOUT_wrapper(
- _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________, \
- _____________________QWERTY_L1______________________, _____________________QWERTY_R1______________________, \
- _____________________QWERTY_L2______________________, _____________________QWERTY_R2______________________, \
- _____________________QWERTY_L3______________________, T_LBRC, T_RBRC, _____________________QWERTY_R3______________________, \
- _____________MOD_LEFT_____________, _____________MOD_RIGHT____________ \
+ _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________,
+ _____________________QWERTY_L1______________________, _____________________QWERTY_R1______________________,
+ _____________________QWERTY_L2______________________, _____________________QWERTY_R2______________________,
+ _____________________QWERTY_L3______________________, T_LBRC, T_RBRC, _____________________QWERTY_R3______________________,
+ _____________MOD_LEFT_____________, _____________MOD_RIGHT____________
),
/* DVORAK
@@ -50,16 +50,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
* |LShift| ; | Q | J | K | X |-------| |-------| B | M | W | V | Z | = |
* `-----------------------------------------/ / \ \-----------------------------------------'
- * | Alt |  | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
+ * | Alt | Cmd | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
* | | | |/ / \ \ | | | |
* `----------------------------' '------''--------------------'
*/
[_DVORAK] = LAYOUT_wrapper(
- _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________, \
- _____________________DVORAK_L1______________________, _____________________DVORAK_R1______________________, \
- _____________________DVORAK_L2______________________, _____________________DVORAK_R2______________________, \
- _____________________DVORAK_L3______________________, T_LBRC, T_RBRC, _____________________DVORAK_R3______________________, \
- _____________MOD_LEFT_____________, _____________MOD_RIGHT____________ \
+ _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________,
+ _____________________DVORAK_L1______________________, _____________________DVORAK_R1______________________,
+ _____________________DVORAK_L2______________________, _____________________DVORAK_R2______________________,
+ _____________________DVORAK_L3______________________, T_LBRC, T_RBRC, _____________________DVORAK_R3______________________,
+ _____________MOD_LEFT_____________, _____________MOD_RIGHT____________
),
/* COLEMAK
@@ -72,16 +72,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
* |LShift| Z | X | C | V | B |-------| |-------| K | M | , | . | / | = |
* `-----------------------------------------/ / \ \-----------------------------------------'
- * | Alt |  | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
+ * | Alt | Cmd | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER |
* | | | |/ / \ \ | | | |
* `----------------------------' '------''--------------------'
*/
[_COLEMAK] = LAYOUT_wrapper(
- _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________, \
- _____________________COLEMAK_L1_____________________, _____________________COLEMAK_R1_____________________, \
- _____________________COLEMAK_L2_____________________, _____________________COLEMAK_R2_____________________, \
- _____________________COLEMAK_L3_____________________, T_LBRC, T_RBRC, _____________________COLEMAK_R3_____________________, \
- _____________MOD_LEFT_____________, _____________MOD_RIGHT____________ \
+ _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________,
+ _____________________COLEMAK_L1_____________________, _____________________COLEMAK_R1_____________________,
+ _____________________COLEMAK_L2_____________________, _____________________COLEMAK_R2_____________________,
+ _____________________COLEMAK_L3_____________________, T_LBRC, T_RBRC, _____________________COLEMAK_R3_____________________,
+ _____________MOD_LEFT_____________, _____________MOD_RIGHT____________
),
/* LOWER
@@ -99,11 +99,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `----------------------------' '------''--------------------'
*/
[_LOWER] = LAYOUT_wrapper( \
- _____________________FUNC_LEFT______________________, _____________________FUNC_RIGHT_____________________, \
- _____________________LOWER_L1_______________________, _____________________LOWER_R1_______________________, \
- _____________________LOWER_L2_______________________, _____________________LOWER_R2_______________________, \
- _____________________LOWER_L3_______________________, _______, _______, _____________________LOWER_R3_______________________, \
- __________________________________, _______, _______, M_CODE, _______ \
+ _____________________FUNC_LEFT______________________, _____________________FUNC_RIGHT_____________________,
+ _____________________LOWER_L1_______________________, _____________________LOWER_R1_______________________,
+ _____________________LOWER_L2_______________________, _____________________LOWER_R2_______________________,
+ _____________________LOWER_L3_______________________, _______, _______, _____________________LOWER_R3_______________________,
+ __________________________________, _______, _______, M_CODE, _______
),
/* RAISE
@@ -121,11 +121,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `----------------------------' '------''--------------------'
*/
[_RAISE] = LAYOUT_wrapper( \
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
- XXXXXXX, XXXXXXX, _____________MOUSE_1______________, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
- XXXXXXX, XXXXXXX, _____________MOUSE_2______________, 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, _____________MOUSE_1______________, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ XXXXXXX, XXXXXXX, _____________MOUSE_2______________, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ __________________________________, __________________________________
),
/* ADJUST
@@ -143,10 +143,54 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `----------------------------' '------''--------------------'
*/
[_ADJUST] = LAYOUT_wrapper( \
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
- _____________________ADJUST_L1______________________, _____________________ADJUST_R1______________________, \
- _____________________ADJUST_L2______________________, _____________________ADJUST_R2______________________, \
- _____________________ADJUST_L3______________________, XXXXXXX, XXXXXXX, _____________________ADJUST_R3______________________,\
- __________________________________, __________________________________ \
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ _____________________ADJUST_L1______________________, _____________________ADJUST_R1______________________,
+ _____________________ADJUST_L2______________________, _____________________ADJUST_R2______________________,
+ _____________________ADJUST_L3______________________, XXXXXXX, XXXXXXX, _____________________ADJUST_R3______________________,
+ __________________________________, __________________________________
),
-}; \ No newline at end of file
+ /* TEMPLATE
+ * ,-----------------------------------------. ,-----------------------------------------.
+ * | | | | | | | | | | | | | |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * | | | | | | | | | | | | | |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * | | | | | | |-------. ,-------| | | | | | |
+ * |------+------+------+------+------+------| | | |------+------+------+------+------+------|
+ * | | | | | | |-------| |-------| | | | | | |
+ * `-----------------------------------------/ / \ \-----------------------------------------'
+ * | | | | / / \ \ | | | |
+ * | | | |/ / \ \ | | | |
+ * `----------------------------' '------''--------------------'
+ */
+[_NUMPAD] = LAYOUT_wrapper( \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _____________________NUMPAD_1_______________________,
+ _______, _______, _______, _______, _______, _______, _____________________NUMPAD_2_______________________,
+ _______, _______, _______, _______, _______, _______, _______, _______, _____________________NUMPAD_3_______________________,
+ __________________________________, __________________________________
+ ),
+};
+
+/* TEMPLATE
+ * ,-----------------------------------------. ,-----------------------------------------.
+ * | | | | | | | | | | | | | |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * | | | | | | | | | | | | | |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * | | | | | | |-------. ,-------| | | | | | |
+ * |------+------+------+------+------+------| | | |------+------+------+------+------+------|
+ * | | | | | | |-------| |-------| | | | | | |
+ * `-----------------------------------------/ / \ \-----------------------------------------'
+ * | | | | / / \ \ | | | |
+ * | | | |/ / \ \ | | | |
+ * `----------------------------' '------''--------------------'
+ *
+[_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,
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ __________________________________, __________________________________
+ ),
+*/ \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 23:39:43 +0000