From 961f0b7b2de54f988daf4ce7b791f91a33e55612 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 22 Feb 2023 22:49:07 +0000 Subject: Reallocate SAFE_RANGE (#19909) --- keyboards/ploopyco/mouse/keymaps/default/keymap.c | 2 -- keyboards/ploopyco/mouse/keymaps/drashna/keymap.c | 2 -- keyboards/ploopyco/mouse/mouse.h | 1 - keyboards/ploopyco/trackball/keymaps/default/keymap.c | 2 -- keyboards/ploopyco/trackball/trackball.h | 1 - keyboards/ploopyco/trackball_mini/keymaps/default/keymap.c | 2 -- keyboards/ploopyco/trackball_mini/keymaps/drag_scroll/keymap.c | 2 +- keyboards/ploopyco/trackball_mini/trackball_mini.h | 1 - keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c | 2 -- keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c | 1 - keyboards/ploopyco/trackball_nano/trackball_nano.h | 3 +-- keyboards/ploopyco/trackball_thumb/keymaps/default/keymap.c | 2 -- keyboards/ploopyco/trackball_thumb/trackball_thumb.h | 1 - 13 files changed, 2 insertions(+), 20 deletions(-) (limited to 'keyboards/ploopyco') diff --git a/keyboards/ploopyco/mouse/keymaps/default/keymap.c b/keyboards/ploopyco/mouse/keymaps/default/keymap.c index 8145ffb1c3..29d81b8061 100644 --- 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) diff --git a/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c b/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c index 056a1f7903..cf0b57d433 100644 --- 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( diff --git a/keyboards/ploopyco/mouse/mouse.h b/keyboards/ploopyco/mouse/mouse.h index 906b6c9308..9123315fd4 100644 --- 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); diff --git a/keyboards/ploopyco/trackball/keymaps/default/keymap.c b/keyboards/ploopyco/trackball/keymaps/default/keymap.c index 40f70ab99b..83a4a16847 100644 --- 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, diff --git a/keyboards/ploopyco/trackball/trackball.h b/keyboards/ploopyco/trackball/trackball.h index d6c4b0f985..4cdae526aa 100644 --- 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); diff --git a/keyboards/ploopyco/trackball_mini/keymaps/default/keymap.c b/keyboards/ploopyco/trackball_mini/keymaps/default/keymap.c index 5e7c684d19..3659076bec 100644 --- 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, diff --git a/keyboards/ploopyco/trackball_mini/keymaps/drag_scroll/keymap.c b/keyboards/ploopyco/trackball_mini/keymaps/drag_scroll/keymap.c index 7eb973216b..b6c71c6ece 100644 --- 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) { diff --git a/keyboards/ploopyco/trackball_mini/trackball_mini.h b/keyboards/ploopyco/trackball_mini/trackball_mini.h index cbd84cc4b4..f212ec17ca 100644 --- 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); diff --git a/keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c b/keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c index dfc19787a6..871f8006ea 100644 --- 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 }}}; diff --git a/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c b/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c index 5e9b3e8e19..370eb95aa0 100644 --- 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; diff --git a/keyboards/ploopyco/trackball_nano/trackball_nano.h b/keyboards/ploopyco/trackball_nano/trackball_nano.h index 4cdbc7f11f..e3bd0cb351 100644 --- 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); diff --git a/keyboards/ploopyco/trackball_thumb/keymaps/default/keymap.c b/keyboards/ploopyco/trackball_thumb/keymaps/default/keymap.c index 897a5761c7..8729deabc1 100644 --- 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, diff --git a/keyboards/ploopyco/trackball_thumb/trackball_thumb.h b/keyboards/ploopyco/trackball_thumb/trackball_thumb.h index 9a01944282..356b8902db 100644 --- 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, }; -- cgit v1.2.3