qmk_me

commit f4c5d0af098f9344b747afdddd5599c375fea711
parent 4fd3fd93efb39528f1204931767f8fad64725bc9
Author: Jack Sangdahl <jack@pngu.org>
Date:   Thu, 11 Sep 2025 15:10:55 -0600

Remove some tap dance code, rename colours, misc other changes

Diffstat:
R
jack/color.c -> jack/colour.c
 | 
0

M
jack/config.h
 | 
5
+++--
M
jack/introspection.c
 | 
1
-
M
jack/jack.c
 | 
5
-----
M
jack/jack.h
 | 
20
+++++++++-----------
M
jack/rules.mk
 | 
6
+++---
M
jack/tapping.c
 | 
19
++++---------------

7 files changed, 19 insertions(+), 37 deletions(-)
diff --git a/jack/color.c b/jack/colour.c
diff --git a/jack/config.h b/jack/config.h
@@ -23,13 +23,14 @@
 
 #ifdef SPLIT_KEYBOARD
 #define MASTER_RIGHT
+#ifdef OLED_ENABLE
+#define SPLIT_OLED_ENABLE
 #define SPLIT_MODS_ENABLE
 #define SPLIT_WPM_ENABLE
 #define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_OLED_ENABLE
 #define SPLIT_LED_STATE_ENABLE
 #define SPLIT_ACTIVITY_ENABLE
-#define SPLIT_TRANSACTION_IDS_USER RPC_ID_USER_KEYLOG_STR
+#endif
 #endif
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/jack/introspection.c b/jack/introspection.c
@@ -6,7 +6,6 @@
 tap_dance_action_t tap_dance_actions[] = {
     [EM_DASH_MINS] = ACTION_TAP_DANCE_FN(em_dash_mins),
     [PLY_NXT_PRV] = ACTION_TAP_DANCE_FN(ply_nxt_prv),
-    [PASTE_RAISE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, raise_paste, td_reset),
     [CBRACKET] = ACTION_TAP_DANCE_DOUBLE(KC_LCBR, KC_RCBR),
     [SBRACKET] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC),
 };
diff --git a/jack/jack.c b/jack/jack.c
@@ -12,11 +12,6 @@ void keyboard_post_init_user(void) {
   rgblight_sethsv_noeeprom(HSV_CYAN);
   rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
 #endif
-#ifdef RGB_MATRIX_ENABLE
-  rgb_matrix_enable_noeeprom();
-  rgb_matrix_sethsv_noeeprom(HSV_CYAN);
-  rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR);
-#endif
 #ifdef AUTOCORRECT_ENABLE
   if (!autocorrect_is_enabled())
     autocorrect_enable();
diff --git a/jack/jack.h b/jack/jack.h
@@ -5,7 +5,7 @@
 
 enum layers { _BASE, _LOWER, _RAISE };
 
-enum tapdances { EM_DASH_MINS, PLY_NXT_PRV, PASTE_RAISE, CBRACKET, SBRACKET };
+enum tapdances { EM_DASH_MINS, PLY_NXT_PRV, CBRACKET, SBRACKET };
 
 enum custom_keycodes {
   UPDIR = QK_USER,
@@ -31,10 +31,8 @@ enum combos {
 bool process_record_unicode(uint16_t keycode, keyrecord_t *record);
 
 #ifdef TAP_DANCE_ENABLE
-void td_reset(tap_dance_state_t *state, void *user_data);
 void em_dash_mins(tap_dance_state_t *state, void *user_data);
 void ply_nxt_prv(tap_dance_state_t *state, void *user_data);
-void raise_paste(tap_dance_state_t *state, void *user_data);
 #endif
 
 void oled_timer_reset(void);
@@ -50,14 +48,6 @@ void keyboard_post_init_keymap(void);
 void housekeeping_task_keymap(void);
 bool oled_task_keymap(void);
 
-#define PNP TD(PLY_NXT_PRV)
-#define PSTRSE TD(PASTE_RAISE)
-#define ESCLWR LT(_LOWER, KC_ESC)
-#define LWRSPC LT(_LOWER, KC_SPC)
-#define RSEBSP LT(_RAISE, KC_BSPC)
-#define HRML(k1, k2, k3, k4) LALT_T(k1), LGUI_T(k2), LCTL_T(k3), LSFT_T(k4)
-#define HRMR(k1, k2, k3, k4) RSFT_T(k1), RCTL_T(k2), RGUI_T(k3), RALT_T(k4)
-
 #ifdef RGB_MATRIX_ENABLE
 #define XRGB_TOG RM_TOGG
 #define XRGB_NXT RM_NEXT
@@ -90,6 +80,14 @@ bool oled_task_keymap(void);
 #define XRGB_VAD _______
 #endif
 
+#define ESCLWR LT(_LOWER, KC_ESC)
+#define PSTRSE LT(_RAISE, KC_PSTE)
+#define LWRSPC LT(_LOWER, KC_SPC)
+#define RSEBSP LT(_RAISE, KC_BSPC)
+#define PNP TD(PLY_NXT_PRV)
+#define HRML(k1, k2, k3, k4) LALT_T(k1), LGUI_T(k2), LCTL_T(k3), LSFT_T(k4)
+#define HRMR(k1, k2, k3, k4) RSFT_T(k1), RCTL_T(k2), RGUI_T(k3), RALT_T(k4)
+
 // clang-format off
 #define ___BASE1___ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P
 #define ___BASE2___ HRML(KC_A, KC_S, KC_D, KC_F), KC_G, KC_H, HRMR(KC_J, KC_K, KC_L, KC_SCLN)
diff --git a/jack/rules.mk b/jack/rules.mk
@@ -21,13 +21,13 @@ INTROSPECTION_KEYMAP_C = introspection.c
 SRC += $(USER_PATH)/jack.c $(USER_PATH)/tapping.c
 
 ifeq ($(strip $(OLED_ENABLE)), yes)
-       SRC += $(USER_PATH)/oled.c
-       WPM_ENABLE = yes
+  SRC += $(USER_PATH)/oled.c
+  WPM_ENABLE = yes
 endif
 
 ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
 	RGB_MATRIX_CUSTOM_USER = yes
-	SRC += $(USER_PATH)/color.c
+	SRC += $(USER_PATH)/colour.c
 endif
 
 ifeq ($(strip $(UNICODE_COMMON)), yes)
diff --git a/jack/tapping.c b/jack/tapping.c
@@ -12,8 +12,9 @@
 
 uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
-  case LWRSPC:
   case ESCLWR:
+  case PSTRSE:
+  case LWRSPC:
   case RSEBSP:
     return TAPPING_TERM - 40;
   case TD(EM_DASH_MINS):
@@ -27,11 +28,6 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
 }
 
 #ifdef TAP_DANCE_ENABLE
-void td_reset(tap_dance_state_t *state, void *user_data) {
-  clear_keyboard();
-  layer_clear();
-}
-
 void em_dash_mins(tap_dance_state_t *state, void *user_data) {
   switch (state->count) {
   case 3:
@@ -60,13 +56,6 @@ void ply_nxt_prv(tap_dance_state_t *state, void *user_data) {
     break;
   }
 }
-
-void raise_paste(tap_dance_state_t *state, void *user_data) {
-  if (state->pressed && !state->interrupted)
-    layer_on(_RAISE);
-  else if (state->count == 1)
-    tap_code16(C(S(KC_V)));
-}
 #endif
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
@@ -106,11 +95,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
   case UPDIR:
     if (record->event.pressed)
-      tap_string(PSTR("../"));
+      SEND_STRING("../");
     break;
   case REMOVE:
     if (record->event.pressed) {
-      tap_string(PSTR("```suggestion\n```"));
+      SEND_STRING("```suggestion\n```");
       tap_code(KC_UP);
       tap_code(KC_UP);
       tap_code(KC_ENT);