diff options
Diffstat (limited to 'keyboards/ploopyco/mouse')
-rw-r--r-- | keyboards/ploopyco/mouse/config.h | 3 | ||||
-rw-r--r-- | keyboards/ploopyco/mouse/info.json | 22 | ||||
-rw-r--r-- | keyboards/ploopyco/mouse/keymaps/drashna/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/ploopyco/mouse/mouse.c | 2 |
4 files changed, 15 insertions, 14 deletions
diff --git a/keyboards/ploopyco/mouse/config.h b/keyboards/ploopyco/mouse/config.h index c7fcc504e3..9747969db4 100644 --- a/keyboards/ploopyco/mouse/config.h +++ b/keyboards/ploopyco/mouse/config.h @@ -23,14 +23,11 @@ #define UNUSABLE_PINS \ { B4, D6, F1, F5, F6, F7 } -#define USB_MAX_POWER_CONSUMPTION 100 - /* disable action features */ //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -#define RGB_DI_PIN B5 #define RGBLED_NUM 4 #define RGBLIGHT_LIMIT_VAL 40 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/ploopyco/mouse/info.json b/keyboards/ploopyco/mouse/info.json index c8889f59f9..0edad55f2d 100644 --- a/keyboards/ploopyco/mouse/info.json +++ b/keyboards/ploopyco/mouse/info.json @@ -6,11 +6,15 @@ "usb": { "vid": "0x5043", "pid": "0x4D6F", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "bootmagic": { "matrix": [0, 3] }, + "ws2812": { + "pin": "B5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "matrix_pins": { @@ -21,14 +25,14 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":1, "y":0, "h":2, "matrix": [0, 6]}, - {"x":2, "y":0, "h":2, "matrix": [0, 0]}, - {"x":3, "y":0.25, "h":1.25, "matrix": [0, 1]}, - {"x":4, "y":0, "h":2, "matrix": [0, 2]}, - {"x":5, "y":0, "h":2, "matrix": [0, 5]}, - {"x":0, "y":0, "matrix": [0, 3]}, - {"x":0, "y":1, "matrix": [0, 4]}, - {"x":3, "y":1.5, "matrix": [0, 7]} + {"x": 1, "y": 0, "h": 2, "matrix": [0, 6]}, + {"x": 2, "y": 0, "h": 2, "matrix": [0, 0]}, + {"x": 3, "y": 0.25, "h": 1.25, "matrix": [0, 1]}, + {"x": 4, "y": 0, "h": 2, "matrix": [0, 2]}, + {"x": 5, "y": 0, "h": 2, "matrix": [0, 5]}, + {"x": 0, "y": 0, "matrix": [0, 3]}, + {"x": 0, "y": 1, "matrix": [0, 4]}, + {"x": 3, "y": 1.5, "matrix": [0, 7]} ] } } diff --git a/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c b/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c index a249ebdfd9..12b0458143 100644 --- a/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c +++ b/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #ifdef ENCODER_MAP_ENABLE -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +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 ) }, }; diff --git a/keyboards/ploopyco/mouse/mouse.c b/keyboards/ploopyco/mouse/mouse.c index 275c02214e..e2dada4a15 100644 --- a/keyboards/ploopyco/mouse/mouse.c +++ b/keyboards/ploopyco/mouse/mouse.c @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include QMK_KEYBOARD_H +#include "mouse.h" #ifndef OPT_DEBOUNCE # define OPT_DEBOUNCE 5 // (ms) Time between scroll events |