Merge pull request #11 from yuanw/update-lock

Update lock
yuanw · Jan 1, 2024 · 382a024 · 382a024
2 parents 6bc14c6 + e4c1581
commit 382a024
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 42 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/qmk/yuanw/config.h b/qmk/yuanw/config.h
@@ -27,7 +27,6 @@
 #endif // __arm__
 
 
-
 /* Charybdis-specific features. */
 
 #ifdef POINTING_DEVICE_ENABLE

diff --git a/qmk/yuanw/keymap.c b/qmk/yuanw/keymap.c
@@ -24,6 +24,14 @@
 #endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
 #include "repeat.h"
 
+enum my_keycodes { RDO = SAFE_RANGE,
+                   PST,
+                   CPY,
+                   CUT,
+                   UND,
+                   REPEAT,
+                   REV_REP };
+
 // Automatically enable sniping-mode on the pointer layer.
 #define CHARYBDIS_AUTO_SNIPING_ON_LAYER LAYER_POINTER
 
@@ -96,7 +104,7 @@ enum my_keycodes {RDO = SAFE_RANGE, PST, CPY, CUT, UND, REPEAT, REV_REP,};
 #define LAYOUT_LAYER_MEDIA                                                                    \
     XXXXXXX,RGB_RMOD, RGB_TOG, RGB_MOD, XXXXXXX, XXXXXXX, KC_V, KC_LBRC, KC_RBRC, KC_SLSH, \
     KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, QK_CAPS_WORD_TOGGLE, KC_H, KC_J, KC_K, KC_L, \
-    XXXXXXX, XXXXXXX, XXXXXXX,  EE_CLR, QK_BOOT, QK_BOOT, KC_HOME, KC_PGDN, KC_PGUP, KC_END, \
+    XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR,  QK_BOOT, QK_BOOT, KC_HOME, KC_PGDN, KC_PGUP, KC_END, \
                       _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_TAB
 
 /** \brief Mouse emulation and pointer functions. */
@@ -247,17 +255,17 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 void rgb_matrix_update_pwm_buffers(void);
 #endif
 
-void shutdown_user(void) {
-#ifdef RGBLIGHT_ENABLE
-    rgblight_enable_noeeprom();
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-    rgblight_setrgb(RGB_RED);
-#endif // RGBLIGHT_ENABLE
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_set_color_all(RGB_RED);
-    rgb_matrix_update_pwm_buffers();
-#endif // RGB_MATRIX_ENABLE
-}
+/* void shutdown_user(void) { */
+/* #ifdef RGBLIGHT_ENABLE */
+/*     rgblight_enable_noeeprom(); */
+/*     rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); */
+/*     rgblight_setrgb(RGB_RED); */
+/* #endif // RGBLIGHT_ENABLE */
+/* #ifdef RGB_MATRIX_ENABLE */
+/*     rgb_matrix_set_color_all(RGB_RED); */
+/*     rgb_matrix_update_pwm_buffers(); */
+/* #endif // RGB_MATRIX_ENABLE */
+/* } */
 
 // Thumb Combos
 /* #define EXTRA_SHORT_COMBOS */
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,7 +27,6 @@
		#endif // __arm__



		/* Charybdis-specific features. */

		#ifdef POINTING_DEVICE_ENABLE
Expand Down