3x5 dual track done

bullwinkle3000 · Jun 4, 2024 · dd07685 · dd07685
1 parent 19d201a
commit dd07685
Show file tree

Hide file tree

Showing 8 changed files with 140 additions and 353 deletions.
diff --git a/keyboards/handwired/wylderbuilds/trackball/3x5_dual_wyld_track/3x5_dual_wyld_track.c b/keyboards/handwired/wylderbuilds/trackball/3x5_dual_wyld_track/3x5_dual_wyld_track.c
@@ -0,0 +1 @@
+#include "3x5_dual_wyld_track.h"
diff --git a/...trackball/3x5_dual_wyld_track/5x6_track.h → ...3x5_dual_wyld_track/3x5_dual_wyld_track.h b/...trackball/3x5_dual_wyld_track/5x6_track.h → ...3x5_dual_wyld_track/3x5_dual_wyld_track.h
@@ -5,28 +5,20 @@
 #define XXX KC_NO
 
 // MINI AND THREE KEY
-#define LAYOUT_5x6( \
-    L00, L01, L02, L03, L04, L05,                 R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15,                 R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25,  L45,     R40,  R20, R21, R22, R23, R24, R25, \
-    L30, L31, L32, L33, L34, L35,                 R30, R31, R32, R33, R34, R35, \
-              L42, L43,                                     R42, R43, \
-                        L53, L54, L55,      R50, R51, R52, \
-                             L51, L52 \
+#define LAYOUT_split_3x5_3( \
+    L00, L01, L02, L03, L04,         R00, R01, R02, R03, R04, \
+    L10, L11, L12, L13, L14, L31,    R10, R11, R12, R13, R14, \
+    L20, L21, L22, L23, L24,         R20, R21, R22, R23, R24, \
+              L32, L33, L34,         R30, R31, R32 \
 ) { \
-    { L00, L01, L02, L03, L04, L05 }, \
-    { L10, L11, L12, L13, L14, L15 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { L30, L31, L32, L33, L34, L35 }, \
-    { XXX, XXX, L42, L43, XXX, L45 }, \
-    { XXX, L51, L52, L53, L54, L55 }, \
-\
-    { R00, R01, R02, R03, R04, R05 }, \
-    { R10, R11, R12, R13, R14, R15 }, \
-    { R20, R21, R22, R23, R24, R25 }, \
-    { R30, R31, R32, R33, R34, R35 }, \
-    { R40, XXX, R42, R43, XXX, XXX }, \
-    { R50, R51, R52, XXX, XXX, XXX } \
+    { L00, L01, L02, L03, L04 }, \
+    { L10, L11, L12, L13, L14 }, \
+    { L20, L21, L22, L23, L24 }, \
+    { XXX, L31, L32, L33, L34 }, \
+    { R00, R01, R02, R03, R04 }, \
+    { R10, R11, R12, R13, R14 }, \
+    { R20, R21, R22, R23, R24 }, \
+    { R30, R31, R32, XXX, XXX } \
 }
 
 /* STANDARD LAYOUT WITH SKREE CLAW CONFIG

diff --git a/keyboards/handwired/wylderbuilds/trackball/3x5_dual_wyld_track/5x6_track.c b/keyboards/handwired/wylderbuilds/trackball/3x5_dual_wyld_track/5x6_track.c
diff --git a/keyboards/handwired/wylderbuilds/trackball/3x5_dual_wyld_track/config.h b/keyboards/handwired/wylderbuilds/trackball/3x5_dual_wyld_track/config.h
@@ -30,13 +30,13 @@
 
 /* key matrix size */
 // Columns are doubled-up
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 6
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 5
 
-#define MATRIX_COL_PINS { GP7, GP6, GP5, GP4, GP3, GP2 }
+#define MATRIX_COL_PINS { GP7, GP6, GP5, GP4, GP3 }
 //#define MATRIX_COL_PINS_RIGHT { GP8, GP7, GP6, GP5, GP4, GP3, GP2 }
-#define MATRIX_ROW_PINS { GP14, GP13, GP12, GP11, GP10, GP9 }
-//#define MATRIX_ROW_PINS { GP9, GP1, GP12, GP11, GP10, GP9 }
+#define MATRIX_ROW_PINS { GP12, GP11, GP10, GP9 }
+// #define MATRIX_ROW_PINS_RIGHT { GP12, GP11, GP13, GP9 }
 
 #define DIODE_DIRECTION COL2ROW
 
@@ -71,7 +71,7 @@
 
 #ifdef ENCODER_ENABLE
 #define ENCODERS_PAD_A { GP27 }
-#define ENCODERS_PAD_B { GP28 }
+#define ENCODERS_PAD_B { GP22 }
 #define ENCODER_RESOLUTIONS { 2 }
 #define ENCODERS_PAD_A_RIGHT {  }
 #define ENCODERS_PAD_B_RIGHT {  }
@@ -122,7 +122,7 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-#    define RGB_MATRIX_LED_COUNT 60
+#    define RGB_MATRIX_LED_COUNT 36
 #    define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral
 #    define SPLIT_TRANSPORT_MIRROR
 #    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE // Sets the default mode, if none has been set