Merge remote-tracking branch 'origin/master' into develop
1 files changed, 10 insertions(+), 3 deletions(-) M keyboards/ploopyco/trackball_mini/trackball_mini.c
M keyboards/ploopyco/trackball_mini/trackball_mini.c => keyboards/ploopyco/trackball_mini/trackball_mini.c +10 -3
@@ 37,9 37,16 @@ # define OPT_SCALE 1 // Multiplier for wheel #endif #define PLOOPY_DPI_OPTIONS \ { 375, 750, 1375 } #define PLOOPY_DPI_DEFAULT 2 #ifndef PLOOPY_DPI_OPTIONS # define PLOOPY_DPI_OPTIONS \ { 375, 750, 1375 } # ifndef PLOOPY_DPI_DEFAULT # define PLOOPY_DPI_DEFAULT 1 # endif #endif #ifndef PLOOPY_DPI_DEFAULT # define PLOOPY_DPI_DEFAULT 0 #endif #ifndef PLOOPY_DRAGSCROLL_DPI # define PLOOPY_DRAGSCROLL_DPI 375 // Fixed-DPI Drag Scroll