From 56555c61e1396a0b1f85105abe78f0a2b3a7c4f3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 10 Jan 2023 13:48:20 +1100 Subject: Migrate `LAYOUTS` to data driven (#19541) * Migrate `LAYOUTS` to data driven, 0-9 * Migrate `LAYOUTS` to data driven, A * Migrate `LAYOUTS` to data driven, B * Migrate `LAYOUTS` to data driven, C * Migrate `LAYOUTS` to data driven, D * Migrate `LAYOUTS` to data driven, E * Migrate `LAYOUTS` to data driven, F * Migrate `LAYOUTS` to data driven, G * Migrate `LAYOUTS` to data driven, H * Migrate `LAYOUTS` to data driven, handwired * Migrate `LAYOUTS` to data driven, I * Migrate `LAYOUTS` to data driven, J * Migrate `LAYOUTS` to data driven, K * Migrate `LAYOUTS` to data driven, L * Migrate `LAYOUTS` to data driven, M * Migrate `LAYOUTS` to data driven, N * Migrate `LAYOUTS` to data driven, O * Migrate `LAYOUTS` to data driven, P * Migrate `LAYOUTS` to data driven, Q * Migrate `LAYOUTS` to data driven, R * Migrate `LAYOUTS` to data driven, S * Migrate `LAYOUTS` to data driven, T * Migrate `LAYOUTS` to data driven, U * Migrate `LAYOUTS` to data driven, V * Migrate `LAYOUTS` to data driven, W * Migrate `LAYOUTS` to data driven, X * Migrate `LAYOUTS` to data driven, Y * Migrate `LAYOUTS` to data driven, Z --- keyboards/kprepublic/bm16s/info.json | 1 + keyboards/kprepublic/bm16s/rules.mk | 2 -- keyboards/kprepublic/bm40hsrgb/info.json | 1 + keyboards/kprepublic/bm40hsrgb/rules.mk | 1 - keyboards/kprepublic/bm60hsrgb/rev1/info.json | 1 + keyboards/kprepublic/bm60hsrgb/rev1/rules.mk | 2 -- keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json | 1 + keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk | 1 - keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json | 1 + keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk | 1 - keyboards/kprepublic/bm65hsrgb/rev1/info.json | 1 + keyboards/kprepublic/bm65hsrgb/rev1/rules.mk | 2 -- keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json | 1 + keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk | 2 -- keyboards/kprepublic/bm68hsrgb/rev1/info.json | 1 + keyboards/kprepublic/bm68hsrgb/rev1/rules.mk | 2 -- keyboards/kprepublic/bm80hsrgb/info.json | 1 + keyboards/kprepublic/bm80hsrgb/rules.mk | 2 -- keyboards/kprepublic/bm80v2/info.json | 1 + keyboards/kprepublic/bm80v2/rules.mk | 1 - keyboards/kprepublic/bm80v2_iso/info.json | 1 + keyboards/kprepublic/bm80v2_iso/rules.mk | 2 -- keyboards/kprepublic/cospad/info.json | 1 + keyboards/kprepublic/cospad/rules.mk | 2 -- keyboards/kprepublic/jj40/info.json | 1 + keyboards/kprepublic/jj40/rules.mk | 2 -- keyboards/kprepublic/jj4x4/info.json | 1 + keyboards/kprepublic/jj4x4/rules.mk | 2 -- keyboards/kprepublic/jj50/info.json | 1 + keyboards/kprepublic/jj50/rules.mk | 2 -- 30 files changed, 15 insertions(+), 26 deletions(-) (limited to 'keyboards/kprepublic') diff --git a/keyboards/kprepublic/bm16s/info.json b/keyboards/kprepublic/bm16s/info.json index 03d0659be0..61e492964d 100644 --- a/keyboards/kprepublic/bm16s/info.json +++ b/keyboards/kprepublic/bm16s/info.json @@ -8,6 +8,7 @@ "pid": "0x016B", "device_version": "0.0.1" }, + "community_layouts": ["ortho_4x4"], "layouts": { "LAYOUT_ortho_4x4": { "layout": [ diff --git a/keyboards/kprepublic/bm16s/rules.mk b/keyboards/kprepublic/bm16s/rules.mk index 9f6dae5604..fced7bef9a 100755 --- a/keyboards/kprepublic/bm16s/rules.mk +++ b/keyboards/kprepublic/bm16s/rules.mk @@ -16,5 +16,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no RGBLIGHT_ENABLE = yes - -LAYOUTS = ortho_4x4 diff --git a/keyboards/kprepublic/bm40hsrgb/info.json b/keyboards/kprepublic/bm40hsrgb/info.json index 2d1dd70df0..02840f56d4 100644 --- a/keyboards/kprepublic/bm40hsrgb/info.json +++ b/keyboards/kprepublic/bm40hsrgb/info.json @@ -8,6 +8,7 @@ "pid": "0x3430", "device_version": "0.0.1" }, + "community_layouts": ["planck_mit"], "layouts": { "LAYOUT_planck_mit": { "layout": [ diff --git a/keyboards/kprepublic/bm40hsrgb/rules.mk b/keyboards/kprepublic/bm40hsrgb/rules.mk index 1731ebde8c..429a9b171d 100755 --- a/keyboards/kprepublic/bm40hsrgb/rules.mk +++ b/keyboards/kprepublic/bm40hsrgb/rules.mk @@ -18,5 +18,4 @@ AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 -LAYOUTS = planck_mit LAYOUTS_HAS_RGB = yes diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/info.json b/keyboards/kprepublic/bm60hsrgb/rev1/info.json index 4c1db804bd..c58b915105 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev1/info.json +++ b/keyboards/kprepublic/bm60hsrgb/rev1/info.json @@ -11,6 +11,7 @@ "layout_aliases": { "LAYOUT": "LAYOUT_60_ansi_arrow" }, + "community_layouts": ["60_ansi_arrow"], "layouts": { "LAYOUT_60_ansi_arrow": { "layout": [ diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk index 9dfa04902e..34784b43ba 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk +++ b/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk @@ -19,5 +19,3 @@ AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 LTO_ENABLE = yes - -LAYOUTS = 60_ansi_arrow diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json index c168002147..a14695e459 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json @@ -8,6 +8,7 @@ "pid": "0xEF8D", "device_version": "0.0.1" }, + "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { "layout": [ diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk index 5b0aeb5b30..e58dc5849a 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk @@ -18,4 +18,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 -LAYOUTS = 60_ansi diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json index 8ec74866f2..dd4fa1ab89 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json @@ -8,6 +8,7 @@ "pid": "0x1122", "device_version": "0.0.2" }, + "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { "layout": [ diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk index cd9c25149a..449c2f6f29 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk @@ -15,7 +15,6 @@ COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output -LAYOUTS = 60_ansi LTO_ENABLE = yes # RGB Matrix is required to support per-key LEDs connected to IS31FL3733. diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/info.json b/keyboards/kprepublic/bm65hsrgb/rev1/info.json index 0d99dd2dc2..b32a18cf32 100644 --- a/keyboards/kprepublic/bm65hsrgb/rev1/info.json +++ b/keyboards/kprepublic/bm65hsrgb/rev1/info.json @@ -8,6 +8,7 @@ "pid": "0xEF6E", "device_version": "0.0.1" }, + "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { "layout": [ diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk b/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk index afd19898de..239ea39a74 100644 --- a/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk +++ b/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk @@ -19,5 +19,3 @@ AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 LTO_ENABLE = yes - -LAYOUTS = 65_ansi_blocker diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json index 02d55f9b0d..1a61ea3647 100644 --- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json +++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json @@ -8,6 +8,7 @@ "pid": "0x0653", "device_version": "0.0.1" }, + "community_layouts": ["65_iso_blocker"], "layouts": { "LAYOUT_65_iso_blocker": { "layout": [ diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk b/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk index c3a6bf1d48..239ea39a74 100644 --- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk +++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk @@ -19,5 +19,3 @@ AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 LTO_ENABLE = yes - -LAYOUTS = 65_iso_blocker diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/info.json b/keyboards/kprepublic/bm68hsrgb/rev1/info.json index c89d5262ba..7fd1dd43d9 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev1/info.json +++ b/keyboards/kprepublic/bm68hsrgb/rev1/info.json @@ -8,6 +8,7 @@ "pid": "0xEF6F", "device_version": "0.0.1" }, + "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { "layout": [ diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk b/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk index 92c37f393b..239ea39a74 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk +++ b/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk @@ -19,5 +19,3 @@ AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 LTO_ENABLE = yes - -LAYOUTS = 65_ansi diff --git a/keyboards/kprepublic/bm80hsrgb/info.json b/keyboards/kprepublic/bm80hsrgb/info.json index d05e4c5c34..fd3d521e2b 100644 --- a/keyboards/kprepublic/bm80hsrgb/info.json +++ b/keyboards/kprepublic/bm80hsrgb/info.json @@ -8,6 +8,7 @@ "pid": "0xEF83", "device_version": "0.0.1" }, + "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/kprepublic/bm80hsrgb/rules.mk b/keyboards/kprepublic/bm80hsrgb/rules.mk index 2fd87508e4..239ea39a74 100644 --- a/keyboards/kprepublic/bm80hsrgb/rules.mk +++ b/keyboards/kprepublic/bm80hsrgb/rules.mk @@ -19,5 +19,3 @@ AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 LTO_ENABLE = yes - -LAYOUTS = tkl_ansi diff --git a/keyboards/kprepublic/bm80v2/info.json b/keyboards/kprepublic/bm80v2/info.json index 38999bf96c..2209fcce1b 100644 --- a/keyboards/kprepublic/bm80v2/info.json +++ b/keyboards/kprepublic/bm80v2/info.json @@ -8,6 +8,7 @@ "pid": "0x1141", "device_version": "0.0.2" }, + "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/kprepublic/bm80v2/rules.mk b/keyboards/kprepublic/bm80v2/rules.mk index 1632311563..f41d45b7ed 100644 --- a/keyboards/kprepublic/bm80v2/rules.mk +++ b/keyboards/kprepublic/bm80v2/rules.mk @@ -19,4 +19,3 @@ AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix RGB_MATRIX_DRIVER = IS31FL3741 LTO_ENABLE = yes -LAYOUTS = tkl_ansi diff --git a/keyboards/kprepublic/bm80v2_iso/info.json b/keyboards/kprepublic/bm80v2_iso/info.json index 71741c126b..18eee3fa32 100644 --- a/keyboards/kprepublic/bm80v2_iso/info.json +++ b/keyboards/kprepublic/bm80v2_iso/info.json @@ -8,6 +8,7 @@ "pid": "0x1142", "device_version": "0.0.2" }, + "community_layouts": ["tkl_iso"], "layouts": { "LAYOUT_tkl_iso": { "layout": [ diff --git a/keyboards/kprepublic/bm80v2_iso/rules.mk b/keyboards/kprepublic/bm80v2_iso/rules.mk index e726773958..eef5beb7f0 100644 --- a/keyboards/kprepublic/bm80v2_iso/rules.mk +++ b/keyboards/kprepublic/bm80v2_iso/rules.mk @@ -21,5 +21,3 @@ RGB_MATRIX_ENABLE = yes # Use RGB matrix RGB_MATRIX_DRIVER = IS31FL3741 LTO_ENABLE = yes - -LAYOUTS = tkl_iso diff --git a/keyboards/kprepublic/cospad/info.json b/keyboards/kprepublic/cospad/info.json index 3009e986fa..d110a78b7d 100644 --- a/keyboards/kprepublic/cospad/info.json +++ b/keyboards/kprepublic/cospad/info.json @@ -8,6 +8,7 @@ "pid": "0xB1E5", "device_version": "0.0.1" }, + "community_layouts": ["numpad_6x4", "ortho_6x4"], "layouts": { "LAYOUT_ortho_6x4": { "layout": [ diff --git a/keyboards/kprepublic/cospad/rules.mk b/keyboards/kprepublic/cospad/rules.mk index c3f218c5d8..38f81fd4dc 100644 --- a/keyboards/kprepublic/cospad/rules.mk +++ b/keyboards/kprepublic/cospad/rules.mk @@ -16,5 +16,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output - -LAYOUTS = numpad_6x4 ortho_6x4 diff --git a/keyboards/kprepublic/jj40/info.json b/keyboards/kprepublic/jj40/info.json index a248f0cee7..5256649ff6 100644 --- a/keyboards/kprepublic/jj40/info.json +++ b/keyboards/kprepublic/jj40/info.json @@ -8,6 +8,7 @@ "pid": "0x0040", "device_version": "2.0.0" }, + "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_planck_mit": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3, "w":2}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] diff --git a/keyboards/kprepublic/jj40/rules.mk b/keyboards/kprepublic/jj40/rules.mk index 3d333bd9a7..aac05cdffe 100644 --- a/keyboards/kprepublic/jj40/rules.mk +++ b/keyboards/kprepublic/jj40/rules.mk @@ -18,7 +18,5 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow WS2812_DRIVER = i2c AUDIO_ENABLE = no # Audio output -LAYOUTS = ortho_4x12 planck_mit - # Disable unsupported hardware AUDIO_SUPPORTED = no diff --git a/keyboards/kprepublic/jj4x4/info.json b/keyboards/kprepublic/jj4x4/info.json index d9b831d2a3..5cb263f3da 100644 --- a/keyboards/kprepublic/jj4x4/info.json +++ b/keyboards/kprepublic/jj4x4/info.json @@ -8,6 +8,7 @@ "pid": "0x0044", "device_version": "2.0.0" }, + "community_layouts": ["ortho_4x4"], "layouts": { "LAYOUT_ortho_4x4": { "layout": [ diff --git a/keyboards/kprepublic/jj4x4/rules.mk b/keyboards/kprepublic/jj4x4/rules.mk index 8492194143..579e99478f 100644 --- a/keyboards/kprepublic/jj4x4/rules.mk +++ b/keyboards/kprepublic/jj4x4/rules.mk @@ -17,5 +17,3 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow WS2812_DRIVER = i2c AUDIO_ENABLE = no # Audio output - -LAYOUTS = ortho_4x4 diff --git a/keyboards/kprepublic/jj50/info.json b/keyboards/kprepublic/jj50/info.json index 40c00718f2..ef243fe6e1 100644 --- a/keyboards/kprepublic/jj50/info.json +++ b/keyboards/kprepublic/jj50/info.json @@ -11,6 +11,7 @@ "layout_aliases": { "LAYOUT": "LAYOUT_ortho_5x12" }, + "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { "layout": [ diff --git a/keyboards/kprepublic/jj50/rules.mk b/keyboards/kprepublic/jj50/rules.mk index faa1a619b9..939bd2fcf6 100644 --- a/keyboards/kprepublic/jj50/rules.mk +++ b/keyboards/kprepublic/jj50/rules.mk @@ -17,5 +17,3 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow WS2812_DRIVER = i2c # This driver powers the RGB Lighting and RGB Matrix features LTO_ENABLE = yes # Enable link time optimization - -LAYOUTS = ortho_5x12 -- cgit v1.2.3