From 99ddf284b94452bb747f32312a12ffaab28319bc Mon Sep 17 00:00:00 2001 From: Charly Delay Date: Wed, 16 Nov 2022 10:48:25 +0900 Subject: [PATCH] Specify `DEFAULT_FOLDER` for `v2/splinky` QMK's `list-keyboards` infer a keyboard directory by looking for a `rules.mk` file. Because `v2/splinky/v2` and `v2/splinky/v3` share some `rules.mk` definition in `v2/splinky/rules.mk`, `multibuild` attempts to build them, which fails because `POINTING_DEVICE_CS_PIN` is only defined for the leaf folders. This commit allows us to default to `v3` by specifying `DEFAULT_FOLDER` in `v2/splinky/rules.mk` --- keyboards/bastardkb/charybdis/3x5/v2/splinky/rules.mk | 2 ++ keyboards/bastardkb/charybdis/3x6/v2/splinky/rules.mk | 2 ++ keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk | 2 ++ keyboards/bastardkb/scylla/v2/splinky/rules.mk | 2 ++ keyboards/bastardkb/skeletyl/v2/splinky/rules.mk | 2 ++ keyboards/bastardkb/tbkmini/v2/splinky/rules.mk | 2 ++ 6 files changed, 12 insertions(+) diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky/rules.mk index 21a950607716..7e38f33d5d49 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky/rules.mk @@ -35,3 +35,5 @@ POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor WS2812_DRIVER = vendor + +DEFAULT_FOLDER = bastardkb/charybdis/3x5/v2/splinky/v3 diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky/rules.mk index 6ab474a76fcf..4dfff6dfd6ac 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky/rules.mk @@ -35,3 +35,5 @@ POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor WS2812_DRIVER = vendor + +DEFAULT_FOLDER = bastardkb/charybdis/3x6/v2/splinky/v3 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk index 13c1b399610f..34ef782d2f64 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk @@ -34,3 +34,5 @@ POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor WS2812_DRIVER = vendor + +DEFAULT_FOLDER = bastardkb/charybdis/4x6/v2/splinky/v3 diff --git a/keyboards/bastardkb/scylla/v2/splinky/rules.mk b/keyboards/bastardkb/scylla/v2/splinky/rules.mk index 8dfc0256ab59..67846c1ab388 100644 --- a/keyboards/bastardkb/scylla/v2/splinky/rules.mk +++ b/keyboards/bastardkb/scylla/v2/splinky/rules.mk @@ -31,3 +31,5 @@ SPLIT_KEYBOARD = yes SERIAL_DRIVER = vendor WS2812_DRIVER = vendor + +DEFAULT_FOLDER = bastardkb/scylla/v2/splinky/v3 diff --git a/keyboards/bastardkb/skeletyl/v2/splinky/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky/rules.mk index 1ce16352ddea..2749d4fc2cbb 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/splinky/rules.mk @@ -32,3 +32,5 @@ LAYOUTS = split_3x5_3 SERIAL_DRIVER = vendor WS2812_DRIVER = vendor + +DEFAULT_FOLDER = bastardkb/skeletyl/v2/splinky/v3 diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky/rules.mk index 6b55f6e59549..7bf3459d045d 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/splinky/rules.mk @@ -32,3 +32,5 @@ LAYOUTS = split_3x6_3 SERIAL_DRIVER = vendor WS2812_DRIVER = vendor + +DEFAULT_FOLDER = bastardkb/tbkmini/v2/splinky/v3