Merge remote-tracking branch 'origin/master' into develop

2021-06-26 03:58:15 +00:00 · 2021-06-26 03:58:15 +00:00 · e64705d2f4
commit e64705d2f4
parent d6592d8988 79cc6ce2d0
8 changed files with 87 additions and 39 deletions
--- a/keyboards/ploopyco/trackball_mini/trackball_mini.h
+++ b/keyboards/ploopyco/trackball_mini/trackball_mini.h
@ -49,6 +49,15 @@ typedef union {
 extern keyboard_config_t keyboard_config;

 enum ploopy_keycodes {
+#ifdef VIA_ENABLE
+    DPI_CONFIG = USER00,
+#else
    DPI_CONFIG = SAFE_RANGE,
+#endif
+    DRAG_SCROLL,
+#ifdef VIA_ENABLE
+    PLOOPY_SAFE_RANGE = SAFE_RANGE,
+#else
    PLOOPY_SAFE_RANGE,
+#endif
 };