add tap code delay and format the encoder behever

Oh-My-Mechanical-Keyboard · May 22, 2021 · 6f71392 · 6f71392
1 parent 93e889d
commit 6f71392
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 56 deletions.
diff --git a/keyboards/yandrstudio/r65ble/config.h b/keyboards/yandrstudio/r65ble/config.h
@@ -98,7 +98,7 @@
 
 /* Others */
 #define TAP_HOLD_CAPS_DELAY 20
-
+#define TAP_CODE_DELAY 10
 #ifdef CONSOLE_ENABLE
 # define DEBUG_MATRIX_SCAN_RATE
 #endif

diff --git a/keyboards/yandrstudio/r65ble/keymaps/test_oled/keymap.c b/keyboards/yandrstudio/r65ble/keymaps/test_oled/keymap.c
@@ -80,18 +80,14 @@ void encoder_update_user(uint8_t index, bool clockwise) {
  if (keycode >= MACRO00 && keycode <= MACRO15) {
  dynamic_keymap_macro_send(keycode - MACRO00);
  } else {
- register_code16(keycode);
- wait_ms(10);
- unregister_code16(keycode);
+ tap_code16(keycode);
  }
  } else {
  uint16_t keycode = dynamic_keymap_get_keycode(biton32(layer_state), 4, 4);
  if (keycode >= MACRO00 && keycode <= MACRO15) {
  dynamic_keymap_macro_send(keycode - MACRO00);
  } else {
- register_code16(keycode);
- wait_ms(10);
- unregister_code16(keycode);
+ tap_code16(keycode);
  }
  }
 }

diff --git a/keyboards/yandrstudio/r65ble/keymaps/test_rgb/keymap.c b/keyboards/yandrstudio/r65ble/keymaps/test_rgb/keymap.c
@@ -48,18 +48,14 @@ void encoder_update_user(uint8_t index, bool clockwise) {
  if (keycode >= MACRO00 && keycode <= MACRO15) {
  dynamic_keymap_macro_send(keycode - MACRO00);
  } else {
- register_code16(keycode);
- wait_ms(10);
- unregister_code16(keycode);
+ tap_code16(keycode);
  }
  } else {
  uint16_t keycode = dynamic_keymap_get_keycode(biton32(layer_state), 4, 4);
  if (keycode >= MACRO00 && keycode <= MACRO15) {
  dynamic_keymap_macro_send(keycode - MACRO00);
  } else {
- register_code16(keycode);
- wait_ms(10);
- unregister_code16(keycode);
+ tap_code16(keycode);
  }
  }
 }

diff --git a/keyboards/yandrstudio/r65ble/keymaps/test_uart/keymap.c b/keyboards/yandrstudio/r65ble/keymaps/test_uart/keymap.c
@@ -43,18 +43,14 @@ void encoder_update_user(uint8_t index, bool clockwise) {
  if (keycode >= MACRO00 && keycode <= MACRO15) {
  dynamic_keymap_macro_send(keycode - MACRO00);
  } else {
- register_code16(keycode);
- wait_ms(10);
- unregister_code16(keycode);
+ tap_code16(keycode);
  }
  } else {
  uint16_t keycode = dynamic_keymap_get_keycode(biton32(layer_state), 4, 4);
  if (keycode >= MACRO00 && keycode <= MACRO15) {
  dynamic_keymap_macro_send(keycode - MACRO00);
  } else {
- register_code16(keycode);
- wait_ms(10);
- unregister_code16(keycode);
+ tap_code16(keycode);
  }
  }
 }

diff --git a/keyboards/yandrstudio/r65ble/keymaps/test_via/keymap.c b/keyboards/yandrstudio/r65ble/keymaps/test_via/keymap.c
@@ -42,18 +42,14 @@ void encoder_update_user(uint8_t index, bool clockwise) {
  if (keycode >= MACRO00 && keycode <= MACRO15) {
  dynamic_keymap_macro_send(keycode - MACRO00);
  } else {
- register_code16(keycode);
- wait_ms(10);
- unregister_code16(keycode);
+ tap_code16(keycode);
  }
  } else {
  uint16_t keycode = dynamic_keymap_get_keycode(biton32(layer_state), 4, 4);
  if (keycode >= MACRO00 && keycode <= MACRO15) {
  dynamic_keymap_macro_send(keycode - MACRO00);
  } else {
- register_code16(keycode);
- wait_ms(10);
- unregister_code16(keycode);
+ tap_code16(keycode);
  }
  }
 }

diff --git a/keyboards/yandrstudio/r65ble/keymaps/via/keymap.c b/keyboards/yandrstudio/r65ble/keymaps/via/keymap.c
@@ -80,18 +80,14 @@ void encoder_update_user(uint8_t index, bool clockwise) {
  if (keycode >= MACRO00 && keycode <= MACRO15) {
  dynamic_keymap_macro_send(keycode - MACRO00);
  } else {
- register_code16(keycode);
- wait_ms(10);
- unregister_code16(keycode);
+ tap_code16(keycode);
  }
  } else {
  uint16_t keycode = dynamic_keymap_get_keycode(biton32(layer_state), 4, 4);
  if (keycode >= MACRO00 && keycode <= MACRO15) {
  dynamic_keymap_macro_send(keycode - MACRO00);
  } else {
- register_code16(keycode);
- wait_ms(10);
- unregister_code16(keycode);
+ tap_code16(keycode);
  }
  }
 }

diff --git a/keyboards/yandrstudio/rainbow65/config.h b/keyboards/yandrstudio/rainbow65/config.h
@@ -98,6 +98,7 @@
 
 /* Others */
 #define TAP_HOLD_CAPS_DELAY 20
+#define TAP_CODE_DELAY 10
 
 #ifdef CONSOLE_ENABLE
 # define DEBUG_MATRIX_SCAN_RATE

diff --git a/keyboards/yandrstudio/rainbow65/keymaps/test_oled/keymap.c b/keyboards/yandrstudio/rainbow65/keymaps/test_oled/keymap.c
@@ -80,18 +80,14 @@ void encoder_update_user(uint8_t index, bool clockwise) {
  if (keycode >= MACRO00 && keycode <= MACRO15) {
  dynamic_keymap_macro_send(keycode - MACRO00);
  } else {
- register_code16(keycode);
- wait_ms(10);
- unregister_code16(keycode);
+ tap_code16(keycode);
  }
  } else {
  uint16_t keycode = dynamic_keymap_get_keycode(biton32(layer_state), 4, 4);
  if (keycode >= MACRO00 && keycode <= MACRO15) {
  dynamic_keymap_macro_send(keycode - MACRO00);
  } else {
- register_code16(keycode);
- wait_ms(10);
- unregister_code16(keycode);
+ tap_code16(keycode);
  }
  }
 }

diff --git a/keyboards/yandrstudio/rainbow65/keymaps/test_rgb/keymap.c b/keyboards/yandrstudio/rainbow65/keymaps/test_rgb/keymap.c
@@ -48,18 +48,14 @@ void encoder_update_user(uint8_t index, bool clockwise) {
  if (keycode >= MACRO00 && keycode <= MACRO15) {
  dynamic_keymap_macro_send(keycode - MACRO00);
  } else {
- register_code16(keycode);
- wait_ms(10);
- unregister_code16(keycode);
+ tap_code16(keycode);
  }
  } else {
  uint16_t keycode = dynamic_keymap_get_keycode(biton32(layer_state), 4, 4);
  if (keycode >= MACRO00 && keycode <= MACRO15) {
  dynamic_keymap_macro_send(keycode - MACRO00);
  } else {
- register_code16(keycode);
- wait_ms(10);
- unregister_code16(keycode);
+ tap_code16(keycode);
  }
  }
 }

diff --git a/keyboards/yandrstudio/rainbow65/keymaps/test_via/keymap.c b/keyboards/yandrstudio/rainbow65/keymaps/test_via/keymap.c
@@ -42,18 +42,14 @@ void encoder_update_user(uint8_t index, bool clockwise) {
  if (keycode >= MACRO00 && keycode <= MACRO15) {
  dynamic_keymap_macro_send(keycode - MACRO00);
  } else {
- register_code16(keycode);
- wait_ms(10);
- unregister_code16(keycode);
+ tap_code16(keycode);
  }
  } else {
  uint16_t keycode = dynamic_keymap_get_keycode(biton32(layer_state), 4, 4);
  if (keycode >= MACRO00 && keycode <= MACRO15) {
  dynamic_keymap_macro_send(keycode - MACRO00);
  } else {
- register_code16(keycode);
- wait_ms(10);
- unregister_code16(keycode);
+ tap_code16(keycode);
  }
  }
 }

diff --git a/keyboards/yandrstudio/rainbow65/keymaps/via/keymap.c b/keyboards/yandrstudio/rainbow65/keymaps/via/keymap.c
@@ -80,18 +80,14 @@ void encoder_update_user(uint8_t index, bool clockwise) {
  if (keycode >= MACRO00 && keycode <= MACRO15) {
  dynamic_keymap_macro_send(keycode - MACRO00);
  } else {
- register_code16(keycode);
- wait_ms(10);
- unregister_code16(keycode);
+ tap_code16(keycode);
  }
  } else {
  uint16_t keycode = dynamic_keymap_get_keycode(biton32(layer_state), 4, 4);
  if (keycode >= MACRO00 && keycode <= MACRO15) {
  dynamic_keymap_macro_send(keycode - MACRO00);
  } else {
- register_code16(keycode);
- wait_ms(10);
- unregister_code16(keycode);
+ tap_code16(keycode);
  }
  }
 }

diff --git a/keyboards/yandrstudio/sb65p/config.h b/keyboards/yandrstudio/sb65p/config.h
@@ -21,7 +21,7 @@
 #define PRODUCT_ID 0xAA02
 #define DEVICE_VER 0x0001
 #define MANUFACTURER Jason Ren and Student WTF
-#define PRODUCT SB-65P
+#define PRODUCT SB65P
 
 /* key matrix size */
 #define MATRIX_ROWS 10