aboutsummaryrefslogtreecommitdiff
path: root/keyboards/ploopyco
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ploopyco')
-rw-r--r--keyboards/ploopyco/madromys/keymaps/default/keymap.c2
-rw-r--r--keyboards/ploopyco/mouse/keymaps/default/keymap.c2
-rw-r--r--keyboards/ploopyco/ploopyco.c5
-rw-r--r--keyboards/ploopyco/trackball/keymaps/default/keymap.c4
-rw-r--r--keyboards/ploopyco/trackball_mini/keymaps/default/keymap.c4
-rw-r--r--keyboards/ploopyco/trackball_thumb/keymaps/default/keymap.c2
6 files changed, 10 insertions, 9 deletions
diff --git a/keyboards/ploopyco/madromys/keymaps/default/keymap.c b/keyboards/ploopyco/madromys/keymaps/default/keymap.c
index bc8265b39d..a4e46efc87 100644
--- a/keyboards/ploopyco/madromys/keymaps/default/keymap.c
+++ b/keyboards/ploopyco/madromys/keymaps/default/keymap.c
@@ -18,5 +18,5 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT( KC_BTN4, KC_BTN5, DRAG_SCROLL, KC_BTN2, KC_BTN1, KC_BTN3 )
+ [0] = LAYOUT( MS_BTN4, MS_BTN5, DRAG_SCROLL, MS_BTN2, MS_BTN1, MS_BTN3 )
};
diff --git a/keyboards/ploopyco/mouse/keymaps/default/keymap.c b/keyboards/ploopyco/mouse/keymaps/default/keymap.c
index 29d81b8061..d2ed79a774 100644
--- a/keyboards/ploopyco/mouse/keymaps/default/keymap.c
+++ b/keyboards/ploopyco/mouse/keymaps/default/keymap.c
@@ -19,5 +19,5 @@
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)
+ C(KC_C), MS_BTN1, MS_BTN3, MS_BTN2, C(KC_V), MS_BTN4, MS_BTN5, DPI_CONFIG)
};
diff --git a/keyboards/ploopyco/ploopyco.c b/keyboards/ploopyco/ploopyco.c
index 57f2a26b8c..642696be0f 100644
--- a/keyboards/ploopyco/ploopyco.c
+++ b/keyboards/ploopyco/ploopyco.c
@@ -80,7 +80,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
return false;
}
# ifdef MOUSEKEY_ENABLE
- tap_code(clockwise ? KC_WH_U : KC_WH_D);
+ tap_code(clockwise ? MS_WHLU : MS_WHLD);
# else
report_mouse_t mouse_report = pointing_device_get_report();
mouse_report.v = clockwise ? 1 : -1;
@@ -139,6 +139,7 @@ void cycle_dpi(void) {
}
report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
+ mouse_report = pointing_device_task_user(mouse_report);
if (is_drag_scroll) {
scroll_accumulated_h += (float)mouse_report.x / PLOOPY_DRAGSCROLL_DIVISOR_H;
scroll_accumulated_v += (float)mouse_report.y / PLOOPY_DRAGSCROLL_DIVISOR_V;
@@ -163,7 +164,7 @@ report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
mouse_report.y = 0;
}
- return pointing_device_task_user(mouse_report);
+ return mouse_report;
}
bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
diff --git a/keyboards/ploopyco/trackball/keymaps/default/keymap.c b/keyboards/ploopyco/trackball/keymaps/default/keymap.c
index 83a4a16847..e330a2efff 100644
--- a/keyboards/ploopyco/trackball/keymaps/default/keymap.c
+++ b/keyboards/ploopyco/trackball/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT( /* Base */
- KC_BTN1, KC_BTN3, KC_BTN2,
- KC_BTN4, KC_BTN5
+ MS_BTN1, MS_BTN3, MS_BTN2,
+ MS_BTN4, MS_BTN5
),
};
diff --git a/keyboards/ploopyco/trackball_mini/keymaps/default/keymap.c b/keyboards/ploopyco/trackball_mini/keymaps/default/keymap.c
index 3659076bec..ac51e8b89a 100644
--- a/keyboards/ploopyco/trackball_mini/keymaps/default/keymap.c
+++ b/keyboards/ploopyco/trackball_mini/keymaps/default/keymap.c
@@ -20,7 +20,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT( /* Base */
- KC_BTN1, KC_BTN3, KC_BTN2,
- KC_BTN4, KC_BTN5
+ MS_BTN1, MS_BTN3, MS_BTN2,
+ MS_BTN4, MS_BTN5
),
};
diff --git a/keyboards/ploopyco/trackball_thumb/keymaps/default/keymap.c b/keyboards/ploopyco/trackball_thumb/keymaps/default/keymap.c
index 8729deabc1..eb50542ce4 100644
--- a/keyboards/ploopyco/trackball_thumb/keymaps/default/keymap.c
+++ b/keyboards/ploopyco/trackball_thumb/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT( /* Base */
- KC_BTN4, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN5,
+ MS_BTN4, MS_BTN1, MS_BTN3, MS_BTN2, MS_BTN5,
DPI_CONFIG
),
};