Skip to content

Commit

Permalink
Checking issues with encoders
Browse files Browse the repository at this point in the history
  • Loading branch information
@bullwinkle3000
bullwinkle3000 committed Nov 18, 2024
1 parent fec5750 commit 0f482b0
Show file tree
Hide file tree
Showing 13 changed files with 305 additions and 319 deletions.
8 changes: 4 additions & 4 deletions keyboards/handwired/wylderbuilds/trackball/3x5_dual_wyld_track/3x5_dual_wyld_track.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
// MINI AND THREE KEY
#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, \
L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
L32, L33, L34, R30, R31, R32 \
L32, L31, L30, R34, R33, R32 \
) { \
{ L00, L01, L02, L03, L04 }, \
{ L10, L11, L12, L13, L14 }, \
{ L20, L21, L22, L23, L24 }, \
{ XXX, L31, L32, L33, L34 }, \
{ L30, L31, L32, XXX, XXX }, \
{ R00, R01, R02, R03, R04 }, \
{ R10, R11, R12, R13, R14 }, \
{ R20, R21, R22, R23, R24 }, \
{ R30, R31, R32, XXX, XXX } \
{ XXX, XXX, R32, R33, R34 } \
}

/* STANDARD LAYOUT WITH SKREE CLAW CONFIG
Expand Down
6 changes: 3 additions & 3 deletions keyboards/handwired/wylderbuilds/trackball/3x5_dual_wyld_track/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
#define MATRIX_ROWS 8
#define MATRIX_COLS 5

#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 { GP12, GP11, GP10, GP9 }
#define MATRIX_COL_PINS { GP4, GP5, GP6, GP7, GP8 }
#define MATRIX_COL_PINS_RIGHT { GP8, GP7, GP6, GP5, GP4 }
#define MATRIX_ROW_PINS { GP9, GP10, GP11, GP12 }
// #define MATRIX_ROW_PINS_RIGHT { GP12, GP11, GP13, GP9 }

#define DIODE_DIRECTION COL2ROW
Expand Down
101 changes: 48 additions & 53 deletions keyboards/handwired/wylderbuilds/trackball/3x5_dual_wyld_track/info.json
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"keyboard_name": "Dactyl-Manuform 5x6 Track (5x6_track)",
"keyboard_name": "Dactyl-Manuform 3x5 Dual Track",
"manufacturer": "Wylderbuilds",
"url": "https://wylderbuilds.com",
"maintainer": "qmk",
"bootloader": "rp2040",
"processor": "RP2040",
"usb": {
"vid": "0x9953",
"pid": "0x0212",
"pid": "0x0223",
"device_version": "0.0.1"
},
"width": 18,
Expand All @@ -27,7 +27,7 @@
"mousekey": true,
"nkro": true,
"rgb_matrix": true,
"encoder": true
"encoder": false
},
"matrix_size": {
"cols": 5,
Expand Down Expand Up @@ -230,7 +230,7 @@
"flags": 4,
"matrix": [
3,
3
1
],
"x": 84,
"y": 77
Expand All @@ -239,7 +239,7 @@
"flags": 4,
"matrix": [
3,
4
0
],
"x": 97,
"y": 77
Expand Down Expand Up @@ -382,7 +382,7 @@
{
"flags": 4,
"matrix": [
7,
7,uuiiiooyypphh
2
],
"x": 175,
Expand All @@ -392,7 +392,7 @@
"flags": 4,
"matrix": [
7,
1
3
],
"x": 162,
"y": 77
Expand All @@ -401,7 +401,7 @@
"flags": 4,
"matrix": [
7,
0
4
],
"x": 149,
"y": 77
Expand All @@ -413,187 +413,182 @@
"layout": [
{
"label": "0,1",
"x": 2,
"x": 1,
"y": 0
},
{
"label": "0,2",
"x": 3,
"x": 2,
"y": 0
},
{
"label": "0,3",
"x": 4,
"x": 3,
"y": 0
},
{
"label": "0,4",
"x": 5,
"x": 4,
"y": 0
},
{
"label": "4,0",
"x": 11.25,
"x": 9.25,
"y": 0
},
{
"label": "4,1",
"x": 12.25,
"x": 10.25,
"y": 0
},
{
"label": "4,2",
"x": 13.25,
"x": 11.25,
"y": 0
},
{
"label": "4,3",
"x": 14.25,
"x": 12.25,
"y": 0
},
{
"label": "0,0",
"x": 1,
"x": 0,
"y": 0.5
},
{
"label": "4,4",
"x": 15.25,
"x": 13.25,
"y": 0.5
},
{
"label": "1,1",
"x": 2,
"x": 1,
"y": 1
},
{
"label": "1,2",
"x": 3,
"x": 2,
"y": 1
},
{
"label": "1,3",
"x": 4,
"x": 3,
"y": 1
},
{
"label": "1,4",
"x": 5,
"x": 4,
"y": 1
},
{
"label": "5,0",
"x": 11.25,
"x": 9.25,
"y": 1
},
{
"label": "5,1",
"x": 12.25,
"x": 10.25,
"y": 1
},
{
"label": "5,2",
"x": 13.25,
"x": 11.25,
"y": 1
},
{
"label": "5,3",
"x": 14.25,
"x": 12.25,
"y": 1
},
{
"label": "1,0",
"x": 1,
"x": 0,
"y": 1.5
},
{
"label": "5,4",
"x": 15.25,
"x": 13.25,
"y": 1.5
},
{
"label": "2,1",
"x": 2,
"x": 1,
"y": 2
},
{
"label": "2,2",
"x": 3,
"x": 2,
"y": 2
},
{
"label": "2,3",
"x": 4,
"x": 3,
"y": 2
},
{
"label": "2,4",
"x": 5,
"y": 2
},
{
"label": "3,1",
"x": 6.5,
"x": 4,
"y": 2
},
{
"label": "6,0",
"x": 11.25,
"x": 9.25,
"y": 2
},
{
"label": "6,1",
"x": 12.25,
"x": 10.25,
"y": 2
},
{
"label": "6,2",
"x": 13.25,
"x": 11.25,
"y": 2
},
{
"label": "6,3",
"x": 14.25,
"x": 12.25,
"y": 2
},
{
"label": "2,0",
"x": 1,
"x": 0,
"y": 2.5
},
{
"label": "6,4",
"x": 15.25,
"x": 13.25,
"y": 2.5
},
{
"label": "3,2",
"x": 4.5,
"x": 3.5,
"y": 3.25
},
{
"label": "3,3",
"x": 5.5,
"label": "3,1",
"x": 4.5,
"y": 3.25
},
{
"label": "3,4",
"x": 6.5,
"label": "3,0",
"x": 5.5,
"y": 3.25
},
{
"label": "7,0",
"x": 9.5,
"label": "7,4",
"x": 7.5,
"y": 3.25
},
{
"label": "7,1",
"x": 10.5,
"label": "7,3",
"x": 8.5,
"y": 3.25
},
{
"label": "7,2",
"x": 11.5,
"x": 9.5,
"y": 3.25
}
]
Expand Down
10 changes: 5 additions & 5 deletions keyboards/handwired/wylderbuilds/trackball/3x5_dual_wyld_track/keymaps/vial/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,29 @@ enum wyld_keycodes {

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_split_3x5_3(
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
KC_A, KC_S, KC_D, KC_F, KC_G, KC_MUTE, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
RAISE, KC_SPC, KC_TAB, KC_HOME, KC_ENT, LOWER
),

[_LOWER] = LAYOUT_split_3x5_3(
KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
DPI_RMOD,DPI_MOD,DPI_RST, _______, _______, KC_HOME, WYLD_AUTO_MS_TOG, KC_MINS, KC_EQL, KC_PIPE, QK_BOOT ,
DPI_RMOD,DPI_MOD,DPI_RST, _______, _______, WYLD_AUTO_MS_TOG, KC_MINS, KC_EQL, KC_PIPE, QK_BOOT ,
KC_LPRN, KC_RPRN, _______, SNIPING, DRGSCRL, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
_______, KC_BTN1, KC_BTN3, _______, _______, _______
),

[_RAISE] = LAYOUT_split_3x5_3(
KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
QK_BOOT, S(KC_0), KC_LCBR, KC_RCBR, KC_EQL, KC_MUTE, KC_MINS, KC_4, KC_5, KC_6, KC_QUOT,
QK_BOOT, S(KC_0), KC_LCBR, KC_RCBR, KC_EQL, KC_MINS, KC_4, KC_5, KC_6, KC_QUOT,
KC_LPRN, KC_RPRN, KC_LBRC, KC_RBRC,_______, _______, KC_1, KC_2, KC_3, _______,
_______, _______, _______, _______, _______, _______
),

[_MOUSE] = LAYOUT_split_3x5_3(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, KC_BTN1, KC_BTN2, KC_MUTE, _______, KC_BTN1, KC_BTN2, _______, _______,
_______, _______, _______, KC_BTN1, KC_BTN2, _______, KC_BTN1, KC_BTN2, _______, _______,
_______, _______, _______, SNIPING, DRGSCRL, _______, _______, _______, _______, _______,
_______, KC_BTN1, KC_BTN3, _______, _______, _______
)
Expand Down
Loading

0 comments on commit 0f482b0

Please sign in to comment.