v2

markjoshwel · Sep 20, 2023 · 6be5388 · 6be5388
1 parent a7ef67d
commit 6be5388
Show file tree

Hide file tree

Showing 3 changed files with 153 additions and 50 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# fluffy58
+# fluffy58 v2
 
 an approachable 60%-like QMK keymap for the [Lily58 Pro RE](https://github.com/kissetfall/Lily58-Pro-RE)
 
@@ -14,16 +14,14 @@ an approachable 60%-like QMK keymap for the [Lily58 Pro RE](https://github.com/k
  - **left encoder**
  - clockwise rotation: scroll wheel down
  - counter-clockwise rotation: scroll wheel up
- - press (default layer): `[`
- - press (lower layer): reset
+ - press (adjust layer): reset
 
  - **right encoder**
  - clockwise rotation: volume up
  - counter-clockwise rotation: volume down
- - press (default layer): `]`
- - press (lower layer): reset
+ - press (adjust layer): reset
 
-- default qwerty layer:
+- **default qwerty layer**
 
  ```text
  ,-----------------------------------------. ,-----------------------------------------.
@@ -40,21 +38,42 @@ an approachable 60%-like QMK keymap for the [Lily58 Pro RE](https://github.com/k
  `----------------------------' '------''--------------------'
  ```
 
-- lower layer:
+- **lower layer**
+
+ different variations of keys, access to escape and adjust layer. some access to function keys.
+
+ ```text
+ ,-----------------------------------------. ,-----------------------------------------.
+ | ESC | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | { | } | DEL |
+ |------+------+------+------+------+------| |------+------+------+------+------+------|
+ | | | | | | | | | | | | | |
+ |------+------+------+------+------+------| |------+------+------+------+------+------|
+ | | | | | | |-------. ,-------| | | | | | |
+ |------+------+------+------+------+------| | | |------+------+------+------+------+------|
+ | | | | | | |-------| |-------| | | | | \ | |
+ `-----------------------------------------/ / \ \-----------------------------------------'
+ | | | | /ADJUST / \ADJUST\ | | | |
+ | | | |/ / \ \ | | | |
+ `----------------------------' '------''--------------------'
+ ```
+
+- **adjust layer**
+
+ full function key access, mouse control, controller reset and numpad.
 
  ```text
  ,-----------------------------------------. ,-----------------------------------------.
- | F1 | F2 | F3 | F4 | F5 | F6 |   | F7 | F8 | F9 | F10 | F11 | DEL |
+ |QWERTY| F1 | F2 | F3 | F4 | F5 |   | F6 | F7 | F8 | F9 | F10 |   |
  |------+------+------+------+------+------| |------+------+------+------+------+------|
- | F12 |  M1 | MUp | M2 |  |   | | | Up | | 7 | 8 | 9 |
+ | Tab | F11 | F12 | M1 | MUp | M2 | | | Up | | 7 | 8 | 9 |
  |------+------+------+------+------+------| |------+------+------+------+------+------|
- |CapsLk|MLeft |Mdown |MRight|  | |-------. ,-------| Left | Down |Right | 4 | 5 | 6 |
+ |CapsLk|LShift|  |MLeft |Mdown |MRight|-------. ,-------| Left | Down |Right | 4 | 5 | 6 |
  |------+------+------+------+------+------| Reset | | Reset |------+------+------+------+------+------|
- |LCTRL |MAccl0|MAccl1|MAccl3| | |-------| |-------| | | | 1 | 2 | 3 |
+ |LCTRL | | |MAccl0|MAccl1|MAccl3|-------| |-------| | | | 1 | 2 | 3 |
  `-----------------------------------------/ / \ \-----------------------------------------'
- | | APP | LAlt | / / \ \ |  | RAlt | 0 |
- | | | |/ / \ \ | | | |
- `----------------------------' '------''--------------------'
+  | MENU | LGUI | LAlt | / / \ \ |Enter | RAlt | 0 |
+  | | | |/ / \ \ | | | |
+  `----------------------------' '------''--------------------'
  ```
 
 ## make it yours

diff --git a/fluffy58.json b/fluffy58.json
@@ -1,13 +1,13 @@
 {
- "version": 1,
+ "version": 2,
  "notes": "",
  "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
  "keyboard": "lily58/rev1",
  "keymap": "fluffy58",
  "layout": "LAYOUT",
  "layers": [
  [
- "KC_ESC",
+ "KC_GRV",
  "KC_1",
  "KC_2",
  "KC_3",
@@ -30,7 +30,7 @@
  "KC_I",
  "KC_O",
  "KC_P",
- "KC_GRV",
+ "KC_EQL",
  "KC_LSFT",
  "KC_A",
  "KC_S",
@@ -49,8 +49,8 @@
  "KC_C",
  "KC_V",
  "KC_B",
- "KC_LBRC",
- "KC_RBRC",
+ "KC_NO",
+ "KC_NO",
  "KC_N",
  "KC_M",
  "KC_COMM",
@@ -67,6 +67,67 @@
  "MO(1)"
  ],
  [
+ "KC_ESC",
+ "KC_F1",
+ "KC_F2",
+ "KC_F3",
+ "KC_F4",
+ "KC_F5",
+ "KC_F6",
+ "KC_F7",
+ "KC_F8",
+ "KC_LBRC",
+ "KC_RBRC",
+ "KC_DEL",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_BSLS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS",
+ "TO(2)",
+ "TO(2)",
+ "KC_TRNS",
+ "KC_TRNS",
+ "KC_TRNS"
+ ],
+ [
+ "TO(0)",
  "KC_F1",
  "KC_F2",
  "KC_F3",
@@ -77,38 +138,37 @@
  "KC_F8",
  "KC_F9",
  "KC_F10",
+ "KC_NO",
+ "KC_TAB",
  "KC_F11",
- "KC_DEL",
  "KC_F12",
  "KC_BTN1",
  "KC_MS_U",
  "KC_BTN2",
  "KC_NO",
- "KC_NO",
- "KC_NO",
  "KC_UP",
  "KC_NO",
  "KC_P7",
  "KC_P8",
  "KC_P9",
  "KC_CAPS",
+ "KC_LSFT",
+ "KC_NO",
  "KC_MS_L",
  "KC_MS_D",
  "KC_MS_R",
- "KC_NO",
- "KC_NO",
  "KC_LEFT",
  "KC_DOWN",
  "KC_RGHT",
  "KC_P4",
  "KC_P5",
  "KC_P6",
  "KC_LCTL",
+ "KC_NO",
+ "KC_NO",
  "KC_ACL0",
  "KC_ACL1",
  "KC_ACL2",
- "KC_NO",
- "KC_NO",
  "QK_BOOT",
  "QK_BOOT",
  "KC_NO",
@@ -117,12 +177,12 @@
  "KC_P1",
  "KC_P2",
  "KC_P3",
- "KC_NO",
  "KC_APP",
+ "KC_RGUI",
  "KC_LALT",
  "KC_NO",
  "KC_NO",
- "KC_NO",
+ "KC_PENT",
  "KC_RALT",
  "KC_P0"
  ]

diff --git a/lily58/keymap.c b/lily58/keymap.c
@@ -19,58 +19,82 @@
 enum layer_number {
  _QWERTY = 0,
  _LOWER,
+ _ADJUST,
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* QWERTY
  * ,-----------------------------------------. ,-----------------------------------------.
- * | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 |  `  |
+ * |  ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bspc |
  * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Tab | Q | W | E | R | T | | Y | U | I | O | P | - |
+ * | Tab | Q | W | E | R | T | | Y | U | I | O | P | = |
  * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |LShift| A | S | D | F | G |-------. ,-------| H | J | K | L | ; | ' |
- * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
- * |LCTRL | Z | X | C | V | B |-------| |-------| N | M | , | . | / |RShift|
+ * |LShift| A | S | D | F | G |-------. ,-------| H | J | K | L | ; | - |
+ * |------+------+------+------+------+------|  | |   |------+------+------+------+------+------|
+ * |LCTRL | Z | X | C | V | B |-------| |-------| N | M | , | . | / | ' |
  * `-----------------------------------------/ / \ \-----------------------------------------'
  * |LOWER | LGUI | LAlt | /Space / \Space \ |Enter | RAlt |LOWER |
  * | | | |/ / \ \ | | | |
  * `----------------------------' '------''--------------------'
  */
  [_QWERTY] = LAYOUT(
- KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5,  KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,  KC_Y, KC_U, KC_I, KC_O, KC_P, KC_GRV,
- KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G,  KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_MINS,
- KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC,  KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT,
- MO(_LOWER), KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_ENT, KC_RALT, MO(_LOWER)
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_EQL,
+ KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_MINS,
+ KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, XXXXXXX, XXXXXXX, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT,
+ MO(_LOWER), KC_LGUI, KC_LALT, KC_SPC,  KC_SPC, KC_ENT, KC_RALT, MO(_LOWER)
  ),
 
 /* LOWER
  * ,-----------------------------------------. ,-----------------------------------------.
- * |  F1 | F2 | F3 | F4 | F5 | F6 |   | F7 | F8 | F9 | F10 | F11 | DEL |
+ * | ESC | F1 | F2 | F3 | F4 | F5 |   | F6 | F7 | F8 | { | }  | DEL |
  * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | F12 | M1 | MUp | M2 | | | | | Up | | 7 | 8 | 9 |
+ * |  |  | |  | | | | |  | |  |  |   |
  * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |CapsLk|MLeft |Mdown |MRight| | |-------. ,-------| Left | Down |Right | 4 | 5 | 6 |
- * |------+------+------+------+------+------| Reset | | Reset |------+------+------+------+------+------|
- * |LCTRL |MAccl0|MAccl1|MAccl3| | |-------| |-------| | | | 1 |  2 | 3 |
+ * | | | | | | |-------. ,-------|  | | |  |  |   |
+ * |------+------+------+------+------+------|  | |   |------+------+------+------+------+------|
+ * | | | | | | |-------| |-------| | | |  | \  |   |
  * `-----------------------------------------/ / \ \-----------------------------------------'
- * | | APP | LAlt | /   / \  \ | | RAlt | 0 |
+ * | |  |  | /ADJUST / \ADJUST\ | | |   |
  * | | | |/ / \ \ | | | |
  * `----------------------------' '------''--------------------'
  */
  [_LOWER] = LAYOUT(
- KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_DEL,
- KC_F12, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______, _______, KC_UP, _______, KC_P7, KC_P8, KC_P9,
- KC_CAPS, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_P4, KC_P5, KC_P6,
- KC_LCTL, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, KC_P1, KC_P2, KC_P3,
- _______, KC_APP, KC_LALT, _______, _______, _______, KC_RALT, KC_P0
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_LBRC, KC_RBRC, KC_DEL,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, _______,
+ _______, _______, _______, TO(_ADJUST), TO(_ADJUST), _______, _______, _______
+ ),
+
+/* ADJUST
+ * ,-----------------------------------------. ,-----------------------------------------.
+ * |QWERTY| F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * | Tab | F11 | F12 | M1 | MUp | M2 | | | Up | | 7 | 8 | 9 |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * |CapsLk|LShift| |MLeft |Mdown |MRight|-------. ,-------| Left | Down |Right | 4 | 5 | 6 |
+ * |------+------+------+------+------+------| Reset | | Reset |------+------+------+------+------+------|
+ * |LCTRL | | |MAccl0|MAccl1|MAccl3|-------| |-------| | | | 1 | 2 | 3 |
+ * `-----------------------------------------/ / \ \-----------------------------------------'
+ * | MENU | LGUI | LAlt | / / \ \ |Enter | RAlt | 0 |
+ * | | | |/ / \ \ | | | |
+ * `----------------------------' '------''--------------------'
+ */
+ [_ADJUST] = LAYOUT(
+ TO(_QWERTY),KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,
+ KC_TAB, KC_F11, KC_F12, KC_BTN1, KC_MS_U, KC_BTN2, XXXXXXX, KC_UP, XXXXXXX, KC_P7, KC_P8, KC_P9,
+ KC_CAPS, KC_LSFT, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, KC_LEFT, KC_DOWN, KC_RGHT, KC_P4, KC_P5, KC_P6,
+ KC_LCTL, XXXXXXX, XXXXXXX, KC_ACL0, KC_ACL1, KC_ACL2, QK_BOOT, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, KC_P1, KC_P2, KC_P3,
+ KC_APP, KC_RGUI, KC_LALT, XXXXXXX, XXXXXXX, KC_PENT, KC_RALT, KC_P0
  )
 };
 
 #if defined(ENCODER_MAP_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
  [_QWERTY] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
- [_LOWER] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS ), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+ [_LOWER] = { ENCODER_CCW_CW(_______, _______ ), ENCODER_CCW_CW(_______, _______) },
+ [_ADJUST] = { ENCODER_CCW_CW(_______, _______ ), ENCODER_CCW_CW(_______, _______) },
 };
 #endif