feb 20225 update

README.md

@@ -11,8 +11,6 @@
 5. Run `make git-submodules && git pull` to get latest changes.
 6. Run `make lily58:lily58minh` to compile the firmware.
 
-*Make sure you use avr-gcc version 8.4 as avr-gcc 12 produces very laggy and buggy builds*
-
 ### Flashing
 
 1. Plug the USB-C cable into your right half, run `make lily58:lily58minh:dfu-split-right` and press the reset button your Elite C controller.

config.h

@@ -26,8 +26,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MASTER_LEFT
 #define EE_HANDS
 #define SPLIT_USB_DETECT
-
-#define TAPPING_FORCE_HOLD
-#define TAPPING_TERM 100
-
 #define NO_ACTION_ONESHOT
+#define SPLIT_LAYER_STATE_ENABLE

keymap.c

@@ -1,5 +1,12 @@
 #include QMK_KEYBOARD_H
 
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[0] = LAYOUT(KC_GESC, 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_QUOT, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, 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_BSLS, KC_LGUI, KC_LAPO, MO(1), KC_SPC, KC_SPC, MO(2), KC_RAPC, KC_RCTL),
+enum layer_number {
-                                                              [1] = LAYOUT(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_GRV, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_BRID, KC_BRIU, KC_MPRV, KC_MNXT, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, KC_NO, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_LPRN, KC_NO, KC_NO, KC_RPRN, KC_EQL, KC_MINS, KC_NO, KC_DEL, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_TRNS),
+    _QWERTY = 0,
-                                                              [2] = LAYOUT(KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F11, KC_F12, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)};
+    _LOWER,
+    _RAISE,
+    _BLANK,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[0] = 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_QUOT, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, 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_BSLS, KC_LGUI, SC_LAPO, MO(1), KC_SPC, KC_SPC, MO(2), SC_RAPC, KC_RCTL),
+                                                              [1] = LAYOUT(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_GRV, KC_HOME, KC_INS, KC_NO, KC_PGUP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_BRID, KC_BRIU, KC_MPRV, KC_MNXT, KC_PGDN, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, KC_NO, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_LPRN, KC_NO, KC_NO, KC_RPRN, KC_EQL, KC_MINS, KC_NO, KC_DEL, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_TRNS),
+                                                              [2] = LAYOUT(KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_NO, KC_F11, KC_F12, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_P0, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)};

nm.json

@@ -3,11 +3,11 @@
   "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": "minhtrannhat",
+  "keymap": "lily58minh-nu",
   "layout": "LAYOUT",
   "layers": [
     [
-      "KC_GESC",
+      "KC_ESC",
       "KC_1",
       "KC_2",
       "KC_3",
@@ -58,12 +58,12 @@
       "KC_SLSH",
       "KC_BSLS",
       "KC_LGUI",
-      "KC_LAPO",
+      "SC_LAPO",
       "MO(1)",
       "KC_SPC",
       "KC_SPC",
       "MO(2)",
-      "KC_RAPC",
+      "SC_RAPC",
       "KC_RCTL"
     ],
     [
@@ -81,10 +81,10 @@
       "KC_TRNS",
       "KC_TRNS",
       "KC_GRV",
+      "KC_HOME",
+      "KC_INS",
       "KC_NO",
-      "KC_NO",
+      "KC_PGUP",
-      "KC_NO",
-      "KC_NO",
       "KC_NO",
       "KC_NO",
       "KC_NO",
@@ -96,7 +96,7 @@
       "KC_BRIU",
       "KC_MPRV",
       "KC_MNXT",
-      "KC_NO",
+      "KC_PGDN",
       "KC_LEFT",
       "KC_DOWN",
       "KC_UP",
@@ -145,9 +145,9 @@
       "KC_NO",
       "KC_NO",
       "KC_NO",
-      "KC_NO",
+      "KC_P7",
-      "KC_NO",
+      "KC_P8",
-      "KC_NO",
+      "KC_P9",
       "KC_NO",
       "KC_F11",
       "KC_F12",
@@ -157,10 +157,10 @@
       "KC_NO",
       "KC_NO",
       "KC_NO",
-      "KC_LEFT",
+      "KC_P4",
-      "KC_DOWN",
+      "KC_P5",
-      "KC_UP",
+      "KC_P6",
-      "KC_RGHT",
+      "KC_NO",
       "KC_NO",
       "KC_TRNS",
       "KC_TRNS",
@@ -171,10 +171,10 @@
       "KC_NO",
       "KC_NO",
       "KC_NO",
-      "KC_NO",
+      "KC_P1",
-      "KC_NO",
+      "KC_P2",
-      "KC_NO",
+      "KC_P3",
-      "KC_NO",
+      "KC_P0",
       "KC_NO",
       "KC_NO",
       "KC_TRNS",

rules.mk

@@ -16,15 +16,12 @@ RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
 SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
-WPM_ENABLE = no
+# WPM_ENABLE = yes
 SPLIT_KEYBOARD = yes
-OLED_ENABLE= no     # OLED display
+# OLED_ENABLE= yes     # OLED display
 EXTRAKEY_ENABLE = yes
 
 EXTRAFLAGS        += -flto
 BOOTLOADER = atmel-dfu
 CONFIG_USB_ACM = yes
-DEBOUNCE_TYPE = sym_eager_pk
+DEBOUNCE_TYPE = sym_defer_g
-
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/layer_state_reader.c