Reallocate SAFE_RANGE (#19909)

2023-02-22 22:49:07 +00:00
parent ea77246865
commit 961f0b7b2d
50 changed files with 31 additions and 132 deletions
--- a/keyboards/ploopyco/mouse/keymaps/default/keymap.c
+++ b/keyboards/ploopyco/mouse/keymaps/default/keymap.c
@@ -17,8 +17,6 @@
 */
 #include QMK_KEYBOARD_H

-// safe range starts at `PLOOPY_SAFE_RANGE` instead.
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT(/* Base */
                 C(KC_C), KC_BTN1, KC_BTN3, KC_BTN2, C(KC_V), KC_BTN4, KC_BTN5, DPI_CONFIG)
--- a/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c
+++ b/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c
@@ -17,8 +17,6 @@
 */
 #include QMK_KEYBOARD_H

-// safe range starts at `PLOOPY_SAFE_RANGE` instead.
-
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT(
--- a/keyboards/ploopyco/mouse/mouse.h
+++ b/keyboards/ploopyco/mouse/mouse.h
@@ -43,7 +43,6 @@ extern uint16_t          dpi_array[];
 enum ploopy_keycodes {
    DPI_CONFIG = QK_KB_0,
    DRAG_SCROLL,
-    PLOOPY_SAFE_RANGE,
 };

 bool encoder_update_user(uint8_t index, bool clockwise);
--- a/keyboards/ploopyco/trackball/keymaps/default/keymap.c
+++ b/keyboards/ploopyco/trackball/keymaps/default/keymap.c
@@ -17,8 +17,6 @@
 */
 #include QMK_KEYBOARD_H

-// safe range starts at `PLOOPY_SAFE_RANGE` instead.
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT( /* Base */
        KC_BTN1, KC_BTN3, KC_BTN2,
--- a/keyboards/ploopyco/trackball/trackball.h
+++ b/keyboards/ploopyco/trackball/trackball.h
@@ -46,7 +46,6 @@ extern uint16_t          dpi_array[];
 enum ploopy_keycodes {
    DPI_CONFIG = QK_KB_0,
    DRAG_SCROLL,
-    PLOOPY_SAFE_RANGE,
 };

 bool encoder_update_user(uint8_t index, bool clockwise);
--- a/keyboards/ploopyco/trackball_mini/keymaps/default/keymap.c
+++ b/keyboards/ploopyco/trackball_mini/keymaps/default/keymap.c
@@ -18,8 +18,6 @@
 */
 #include QMK_KEYBOARD_H

-// safe range starts at `PLOOPY_SAFE_RANGE` instead.
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT( /* Base */
        KC_BTN1, KC_BTN3, KC_BTN2,
--- a/keyboards/ploopyco/trackball_mini/keymaps/drag_scroll/keymap.c
+++ b/keyboards/ploopyco/trackball_mini/keymaps/drag_scroll/keymap.c
@@ -21,7 +21,7 @@
 bool is_drag_scroll = false;

 enum custom_keycodes {
-    DRAG_SCROLL = PLOOPY_SAFE_RANGE,
+    DRAG_SCROLL = SAFE_RANGE,
 };

 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
--- a/keyboards/ploopyco/trackball_mini/trackball_mini.h
+++ b/keyboards/ploopyco/trackball_mini/trackball_mini.h
@@ -43,7 +43,6 @@ extern keyboard_config_t keyboard_config;
 enum ploopy_keycodes {
    DPI_CONFIG = QK_KB_0,
    DRAG_SCROLL,
-    PLOOPY_SAFE_RANGE,
 };

 bool encoder_update_user(uint8_t index, bool clockwise);
--- a/keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c
+++ b/keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c
@@ -18,7 +18,5 @@
 */
 #include QMK_KEYBOARD_H

-// safe range starts at `PLOOPY_SAFE_RANGE` instead.
-
 // Dummy
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{{ KC_NO }}};
--- a/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c
+++ b/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c
@@ -23,7 +23,6 @@
 #define DELTA_X_THRESHOLD 60
 #define DELTA_Y_THRESHOLD 15

-// safe range starts at `PLOOPY_SAFE_RANGE` instead.
 bool scroll_enabled = false;
 bool lock_state     = false;

--- a/keyboards/ploopyco/trackball_nano/trackball_nano.h
+++ b/keyboards/ploopyco/trackball_nano/trackball_nano.h
@@ -31,8 +31,7 @@ typedef union {
 extern keyboard_config_t keyboard_config;

 enum ploopy_keycodes {
-    DPI_CONFIG = SAFE_RANGE,
-    PLOOPY_SAFE_RANGE,
+    DPI_CONFIG = QK_KB_0,
 };

 void cycle_dpi(void);
--- a/keyboards/ploopyco/trackball_thumb/keymaps/default/keymap.c
+++ b/keyboards/ploopyco/trackball_thumb/keymaps/default/keymap.c
@@ -17,8 +17,6 @@
 */
 #include QMK_KEYBOARD_H

-// safe range starts at `PLOOPY_SAFE_RANGE` instead.
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT( /* Base */
        KC_BTN4, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN5,
--- a/keyboards/ploopyco/trackball_thumb/trackball_thumb.h
+++ b/keyboards/ploopyco/trackball_thumb/trackball_thumb.h
@@ -48,5 +48,4 @@ extern uint16_t          dpi_array[];
 enum ploopy_keycodes {
    DPI_CONFIG = QK_KB_0,
    DRAG_SCROLL,
-    PLOOPY_SAFE_RANGE,
 };