diff options
author | Nick Brassel <nick@tzarc.org> | 2023-11-28 16:39:48 +1100 |
---|---|---|
committer | Nick Brassel <nick@tzarc.org> | 2023-11-28 16:40:47 +1100 |
commit | 0115951de12bd4c798a43a380651c34552552e85 (patch) | |
tree | 62999011ae782d93aa6dc9c889615db2a840cafc /keyboards/ploopyco | |
parent | 0379d1f59e58cefa18cdb72ba1b77507d1108ae6 (diff) | |
parent | 4d99e0a23cff02f4c6e55e093b5de08a9be0df7c (diff) |
`develop` -> `master`, 2023q4 edition
Diffstat (limited to 'keyboards/ploopyco')
-rw-r--r-- | keyboards/ploopyco/mouse/keymaps/drashna/config.h | 31 | ||||
-rw-r--r-- | keyboards/ploopyco/mouse/keymaps/drashna/keymap.c | 48 | ||||
-rw-r--r-- | keyboards/ploopyco/mouse/keymaps/drashna/rules.mk | 6 | ||||
-rw-r--r-- | keyboards/ploopyco/mouse/keymaps/uqs/keymap.c | 36 | ||||
-rw-r--r-- | keyboards/ploopyco/mouse/keymaps/uqs/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/ploopyco/mouse/rules.mk | 3 | ||||
-rw-r--r-- | keyboards/ploopyco/trackball/rules.mk | 3 | ||||
-rw-r--r-- | keyboards/ploopyco/trackball_mini/rules.mk | 3 | ||||
-rw-r--r-- | keyboards/ploopyco/trackball_thumb/rules.mk | 3 |
9 files changed, 8 insertions, 126 deletions
diff --git a/keyboards/ploopyco/mouse/keymaps/drashna/config.h b/keyboards/ploopyco/mouse/keymaps/drashna/config.h deleted file mode 100644 index 1dc1b7695f..0000000000 --- a/keyboards/ploopyco/mouse/keymaps/drashna/config.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com> - * Copyright 2019 Sunjun Kim - * Copyright 2020 Ploopy Corporation - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#undef RGBLIGHT_LIMIT_VAL -#define RGBLIGHT_LIMIT_VAL 255 -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLIGHT_SLEEP - -#define MOUSE_EXTENDED_REPORT diff --git a/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c b/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c deleted file mode 100644 index 12b0458143..0000000000 --- a/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com> - * Copyright 2019 Sunjun Kim - * Copyright 2020 Ploopy Corporation - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -#include QMK_KEYBOARD_H - -// safe range starts at `USER_SAFE_RANGE` instead. - -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - C(KC_C), KC_BTN1, KC_BTN3, KC_BTN2, MO(1), KC_BTN4, KC_BTN5, DPI_CONFIG), - [1] = LAYOUT( - RGB_HUI, RGB_MOD, RGB_TOG, RGB_RMOD, MO(1), KC_VOLU, KC_VOLD, QK_BOOT) -}; -// clang-format on - -#ifdef ENCODER_MAP_ENABLE -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [0] = { ENCODER_CCW_CW( KC_WH_D, KC_WH_U ) }, - [1] = { ENCODER_CCW_CW( RGB_HUD, RGB_HUI ) }, -}; -#endif - -#ifdef RGBLIGHT_ENABLE -void eeconkfig_init_user(void) { - rgblight_enable(); -# ifdef RGBLIGHT_EFFECT_TWINKLE - rgblight_mode(RGBLIGHT_MODE_TWINKLE + 5); -# else - rgblight_mode(RGBLIGHT_MODE_BREATHING + 5); -# endif - rgblight_sethsv(HSV_MAGENTA); -} -#endif diff --git a/keyboards/ploopyco/mouse/keymaps/drashna/rules.mk b/keyboards/ploopyco/mouse/keymaps/drashna/rules.mk deleted file mode 100644 index bd3927a4b1..0000000000 --- a/keyboards/ploopyco/mouse/keymaps/drashna/rules.mk +++ /dev/null @@ -1,6 +0,0 @@ -USER_NAME := not_drashna -BOOTLOADER = qmk-hid - -RGBLIGHT_ENABLE = yes -CONSOLE_ENABLE = no -LTO_ENABLE = yes diff --git a/keyboards/ploopyco/mouse/keymaps/uqs/keymap.c b/keyboards/ploopyco/mouse/keymaps/uqs/keymap.c deleted file mode 100644 index 564dad13df..0000000000 --- a/keyboards/ploopyco/mouse/keymaps/uqs/keymap.c +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2022 Ulrich Spörlein (@uqs) -// SPDX-License-Identifier: GPL-2.0-or-later -// vi:et sw=4: - -#include QMK_KEYBOARD_H - -enum custom_keycodes { - DBL_CLK_NO = SAFE_RANGE, -}; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - // This works fine in xev(1) or a browser, but not in the game where I - // would want it. Maybe need to increase the delay? Also needs to be - // rewritten to use Deferred Execution. - case DBL_CLK_NO: - if (record->event.pressed) { - tap_code(KC_BTN2); - wait_ms(150); - tap_code(KC_BTN2); - wait_ms(300); - tap_code(KC_N); - } - return false; - } - return true; -} - - -// Layout is: -// left-most, M1, M3, M2, right-most, fwd, back (on side), tiny middle one - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT(KC_E, KC_BTN1, KC_BTN3, KC_BTN2, KC_LSFT, KC_BTN4, KC_BTN5, DF(1)), // shooters - [1] = LAYOUT(KC_1, KC_BTN1, KC_Y, KC_BTN2, DBL_CLK_NO, KC_N, KC_Y, DF(0)), // stardew valley, sword on 1 -}; diff --git a/keyboards/ploopyco/mouse/keymaps/uqs/rules.mk b/keyboards/ploopyco/mouse/keymaps/uqs/rules.mk deleted file mode 100644 index 59222a688a..0000000000 --- a/keyboards/ploopyco/mouse/keymaps/uqs/rules.mk +++ /dev/null @@ -1 +0,0 @@ -#VIA_ENABLE = yes diff --git a/keyboards/ploopyco/mouse/rules.mk b/keyboards/ploopyco/mouse/rules.mk index 8d62f78ed7..17df9cc3c9 100644 --- a/keyboards/ploopyco/mouse/rules.mk +++ b/keyboards/ploopyco/mouse/rules.mk @@ -19,5 +19,6 @@ MOUSEKEY_ENABLE = yes # Mouse keys ENCODER_ENABLE := no OPTS_DEF += -DENCODER_ENABLE -QUANTUM_LIB_SRC += analog.c +ANALOG_DRIVER_REQUIRED = yes + SRC += opt_encoder.c diff --git a/keyboards/ploopyco/trackball/rules.mk b/keyboards/ploopyco/trackball/rules.mk index 0f5f3f648f..ce7c4f29c8 100644 --- a/keyboards/ploopyco/trackball/rules.mk +++ b/keyboards/ploopyco/trackball/rules.mk @@ -19,7 +19,8 @@ MOUSEKEY_ENABLE = yes # Mouse keys ENCODER_ENABLE := no OPTS_DEF += -DENCODER_ENABLE -QUANTUM_LIB_SRC += analog.c +ANALOG_DRIVER_REQUIRED = yes + SRC += opt_encoder.c DEFAULT_FOLDER = ploopyco/trackball/rev1_005 diff --git a/keyboards/ploopyco/trackball_mini/rules.mk b/keyboards/ploopyco/trackball_mini/rules.mk index d7016929c9..bcede0676c 100644 --- a/keyboards/ploopyco/trackball_mini/rules.mk +++ b/keyboards/ploopyco/trackball_mini/rules.mk @@ -16,7 +16,8 @@ MOUSEKEY_ENABLE = yes # Mouse keys ENCODER_ENABLE := no OPTS_DEF += -DENCODER_ENABLE -QUANTUM_LIB_SRC += analog.c +ANALOG_DRIVER_REQUIRED = yes + SRC += opt_encoder.c DEFAULT_FOLDER = ploopyco/trackball_mini/rev1_001 diff --git a/keyboards/ploopyco/trackball_thumb/rules.mk b/keyboards/ploopyco/trackball_thumb/rules.mk index 4a16c0abfb..6b82d7734b 100644 --- a/keyboards/ploopyco/trackball_thumb/rules.mk +++ b/keyboards/ploopyco/trackball_thumb/rules.mk @@ -3,7 +3,8 @@ F_CPU = 8000000 POINTING_DEVICE_DRIVER = pmw3360 -QUANTUM_LIB_SRC += analog.c +ANALOG_DRIVER_REQUIRED = yes + SRC += opt_encoder.c DEFAULT_FOLDER = ploopyco/trackball_thumb/rev1_001 |