5 files changed, 27 insertions, 137 deletions

diff --git a/keyboards/ploopyco/trackball_nano/config.h b/keyboards/ploopyco/trackball_nano/config.h
index 7450f5574..7d109db99 100644
--- a/keyboards/ploopyco/trackball_nano/config.h
+++ b/keyboards/ploopyco/trackball_nano/config.h
@@ -45,3 +45,9 @@
    a polling rate as possible. */
 #define USB_POLLING_INTERVAL_MS 1
 #define USB_MAX_POWER_CONSUMPTION 100
+
+#define ADNS5050_SCLK_PIN         B7
+#define ADNS5050_SDIO_PIN         C6
+#define ADNS5050_CS_PIN           B4
+
+#define POINTING_DEVICE_ROTATION_90
diff --git a/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c b/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c
index 6f568ecf5..9e33db378 100644
--- a/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c
+++ b/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c
@@ -21,14 +21,14 @@
 // safe range starts at `PLOOPY_SAFE_RANGE` instead.
 uint8_t scroll_enabled = 0;
 uint8_t lock_state = 0;
-int16_t delta_x = 0;
-int16_t delta_y = 0;
+int8_t  delta_x        = 0;
+int8_t  delta_y        = 0;
 
-void process_mouse_user(report_mouse_t *mouse_report, int16_t x, int16_t y) {
-        if (scroll_enabled) {
-                delta_x += x;
+void process_mouse_user(report_mouse_t *mouse_report, int8_t x, int8_t y) {
+    if (scroll_enabled) {
+        delta_x += x;
                 delta_y += y;
-                
+
                 if (delta_x > 60) {
                         mouse_report->h = 1;
                         delta_x = 0;
@@ -44,10 +44,10 @@ void process_mouse_user(report_mouse_t *mouse_report, int16_t x, int16_t y) {
                         mouse_report->v = 1;
                         delta_y = 0;
                 }
-        } else {
-                mouse_report->x = x;
+    } else {
+        mouse_report->x = x;
                 mouse_report->y = y;
-        }
+    }
 }
 
 void keyboard_post_init_user(void) {
@@ -62,7 +62,7 @@ bool led_update_user(led_t led_state) {
                 scroll_timer = timer_read();
                 lock_count = 0;
         }
-    
+
         if (led_state.num_lock != lock_state) {
                 lock_count++;
 
@@ -73,7 +73,7 @@ bool led_update_user(led_t led_state) {
                         delta_y = 0;
                 }
         }
-    
+
         lock_state = led_state.num_lock;
         return true;
 }
diff --git a/keyboards/ploopyco/trackball_nano/rules.mk b/keyboards/ploopyco/trackball_nano/rules.mk
index a26ad93c8..1a29a561e 100644
--- a/keyboards/ploopyco/trackball_nano/rules.mk
+++ b/keyboards/ploopyco/trackball_nano/rules.mk
@@ -1,9 +1,6 @@
 # MCU name
 MCU = atmega32u4
 
-# Processor frequency
-F_CPU = 16000000
-
 # Bootloader selection
 BOOTLOADER = atmel-dfu
 
@@ -22,9 +19,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 POINTING_DEVICE_ENABLE = yes
+POINTING_DEVICE_DRIVER = adns5050
 MOUSEKEY_ENABLE = no        # Mouse keys
 
-QUANTUM_LIB_SRC += analog.c
-SRC += drivers/sensors/adns5050.c opt_encoder.c
-
 DEFAULT_FOLDER = ploopyco/trackball_nano/rev1_001
diff --git a/keyboards/ploopyco/trackball_nano/trackball_nano.c b/keyboards/ploopyco/trackball_nano/trackball_nano.c
index 9bcfa59ef..2702f6055 100644
--- a/keyboards/ploopyco/trackball_nano/trackball_nano.c
+++ b/keyboards/ploopyco/trackball_nano/trackball_nano.c
@@ -37,7 +37,8 @@
 #endif
 
 #ifndef PLOOPY_DPI_OPTIONS
-#    define PLOOPY_DPI_OPTIONS { CPI375, CPI750, CPI1375 }
+#    define PLOOPY_DPI_OPTIONS \
+        { 375, 750, 1375 }
 #    ifndef PLOOPY_DPI_DEFAULT
 #        define PLOOPY_DPI_DEFAULT 2
 #    endif
@@ -49,12 +50,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { };
 
-// Transformation constants for delta-X and delta-Y
-const static float ADNS_X_TRANSFORM = -1.0;
-const static float ADNS_Y_TRANSFORM = 1.0;
-
 keyboard_config_t keyboard_config;
-uint16_t dpi_array[] = PLOOPY_DPI_OPTIONS;
+uint16_t          dpi_array[] = PLOOPY_DPI_OPTIONS;
 #define DPI_OPTION_SIZE (sizeof(dpi_array) / sizeof(uint16_t))
 
 // TODO: Implement libinput profiles
@@ -63,77 +60,13 @@ uint16_t dpi_array[] = PLOOPY_DPI_OPTIONS;
 // Valid options are ACC_NONE, ACC_LINEAR, ACC_CUSTOM, ACC_QUADRATIC
 
 // Trackball State
-bool is_scroll_clicked = false;
-bool BurstState = false;  // init burst state for Trackball module
-uint16_t MotionStart = 0;  // Timer for accel, 0 is resting state
-uint16_t lastScroll = 0;  // Previous confirmed wheel event
-uint16_t lastMidClick = 0;  // Stops scrollwheel from being read if it was pressed
-uint8_t OptLowPin = OPT_ENC1;
-bool debug_encoder = false;
-
-__attribute__((weak)) void process_mouse_user(report_mouse_t* mouse_report, int16_t x, int16_t y) {
-    mouse_report->x = x;
-    mouse_report->y = y;
-}
-
-__attribute__((weak)) void process_mouse(report_mouse_t* mouse_report) {
-    report_adns_t data = adns_read_burst();
-
-    if (data.dx != 0 || data.dy != 0) {
-        if (debug_mouse)
-            dprintf("Raw ] X: %d, Y: %d\n", data.dx, data.dy);
-
-        // Apply delta-X and delta-Y transformations.
-        // x and y are swapped
-        // the sensor is rotated
-        // by 90 degrees
-        float xt = (float) data.dy * ADNS_X_TRANSFORM;
-        float yt = (float) data.dx * ADNS_Y_TRANSFORM;
-
-        int16_t xti = (int16_t)xt;
-        int16_t yti = (int16_t)yt;
-
-        process_mouse_user(mouse_report, xti, yti);
-    }
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
-    xprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed);
-
-    // Update Timer to prevent accidental scrolls
-    if ((record->event.key.col == 1) && (record->event.key.row == 0)) {
-        lastMidClick = timer_read();
-        is_scroll_clicked = record->event.pressed;
-    }
-
-    if (!process_record_user(keycode, record))
-        return false;
-
-    if (keycode == DPI_CONFIG && record->event.pressed) {
-        keyboard_config.dpi_config = (keyboard_config.dpi_config + 1) % DPI_OPTION_SIZE;
-        eeconfig_update_kb(keyboard_config.raw);
-        adns_set_cpi(dpi_array[keyboard_config.dpi_config]);
-    }
+bool     is_scroll_clicked = false;
+bool     BurstState        = false;  // init burst state for Trackball module
+uint16_t MotionStart       = 0;      // Timer for accel, 0 is resting state
 
-/* If Mousekeys is disabled, then use handle the mouse button
- * keycodes.  This makes things simpler, and allows usage of
- * the keycodes in a consistent manner.  But only do this if
- * Mousekeys is not enable, so it's not handled twice.
- */
-#ifndef MOUSEKEY_ENABLE
-    if (IS_MOUSEKEY_BUTTON(keycode)) {
-        report_mouse_t currentReport = pointing_device_get_report();
-        if (record->event.pressed) {
-            currentReport.buttons |= 1 << (keycode - KC_MS_BTN1);
-        } else {
-            currentReport.buttons &= ~(1 << (keycode - KC_MS_BTN1));
-        }
-        pointing_device_set_report(currentReport);
-        pointing_device_send();
-    }
-#endif
-
-    return true;
+void pointing_device_init_kb(void) {
+    // set the DPI.
+    pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]);
 }
 
 // Hardware Setup
@@ -143,9 +76,6 @@ void keyboard_pre_init_kb(void) {
     // debug_mouse = true;
     // debug_encoder = true;
 
-    setPinInput(OPT_ENC1);
-    setPinInput(OPT_ENC2);
-
     /* Ground all output pins connected to ground. This provides additional
      * pathways to ground. If you're messing with this, know this: driving ANY
      * of these pins high will cause a short. On the MCU. Ka-blooey.
@@ -162,34 +92,6 @@ void keyboard_pre_init_kb(void) {
     keyboard_pre_init_user();
 }
 
-void pointing_device_init(void) {
-    adns_init();
-    opt_encoder_init();
-
-    // reboot the adns.
-    // if the adns hasn't initialized yet, this is harmless.
-    adns_write_reg(REG_CHIP_RESET, 0x5a);
-
-    // wait maximum time before adns is ready.
-    // this ensures that the adns is actuall ready after reset.
-    wait_ms(55);
-
-    // read a burst from the adns and then discard it.
-    // gets the adns ready for write commands
-    // (for example, setting the dpi).
-    adns_read_burst();
-
-    // set the DPI.
-    adns_set_cpi(dpi_array[keyboard_config.dpi_config]);
-}
-
-void pointing_device_task(void) {
-    report_mouse_t mouse_report = pointing_device_get_report();
-    process_mouse(&mouse_report);
-    pointing_device_set_report(mouse_report);
-    pointing_device_send();
-}
-
 void eeconfig_init_kb(void) {
     keyboard_config.dpi_config = PLOOPY_DPI_DEFAULT;
     eeconfig_update_kb(keyboard_config.raw);
diff --git a/keyboards/ploopyco/trackball_nano/trackball_nano.h b/keyboards/ploopyco/trackball_nano/trackball_nano.h
index 6c8ecace7..88725eab6 100644
--- a/keyboards/ploopyco/trackball_nano/trackball_nano.h
+++ b/keyboards/ploopyco/trackball_nano/trackball_nano.h
@@ -20,19 +20,6 @@
 #pragma once
 
 #include "quantum.h"
-#include "drivers/sensors/adns5050.h"
-#include "analog.h"
-#include "opt_encoder.h"
-#include "pointing_device.h"
-
-// Sensor defs
-#define OPT_ENC1 F0
-#define OPT_ENC2 F4
-#define OPT_ENC1_MUX 0
-#define OPT_ENC2_MUX 4
-
-void process_mouse(report_mouse_t* mouse_report);
-void process_mouse_user(report_mouse_t* mouse_report, int16_t x, int16_t y);
 
 #define LAYOUT(k00) {{ KC_NO }}