From a30c1884c7ccbdc5a454cedbed61f465f6c275ba Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 4 Aug 2022 08:53:46 +1000 Subject: Move keyboard USB IDs and strings to data driven: U (#17900) --- keyboards/uk78/config.h | 7 ------- keyboards/uk78/info.json | 6 ++++++ keyboards/ungodly/launch_pad/config.h | 7 ------- keyboards/ungodly/launch_pad/info.json | 6 ++++++ keyboards/ungodly/nines/config.h | 7 ------- keyboards/ungodly/nines/info.json | 6 ++++++ keyboards/unikeyboard/diverge3/config.h | 7 ------- keyboards/unikeyboard/diverge3/info.json | 6 ++++++ keyboards/unikeyboard/divergetm2/config.h | 7 ------- keyboards/unikeyboard/divergetm2/info.json | 8 +++++++- keyboards/unikeyboard/felix/config.h | 7 ------- keyboards/unikeyboard/felix/info.json | 6 ++++++ keyboards/unikorn/config.h | 6 ------ keyboards/unikorn/info.json | 8 +++++++- keyboards/unison/v04/config.h | 7 ------- keyboards/unison/v04/info.json | 6 ++++++ keyboards/uranuma/config.h | 7 ------- keyboards/uranuma/info.json | 8 +++++++- keyboards/utd80/config.h | 7 ------- keyboards/utd80/info.json | 6 ++++++ 20 files changed, 63 insertions(+), 72 deletions(-) (limited to 'keyboards') diff --git a/keyboards/uk78/config.h b/keyboards/uk78/config.h index 4ac138a9b5..9413f09528 100644 --- a/keyboards/uk78/config.h +++ b/keyboards/uk78/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x554B // "UK" -#define PRODUCT_ID 0x004E // 78 -#define DEVICE_VER 0x0002 -#define MANUFACTURER UK Keyboards -#define PRODUCT UK78 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 19 diff --git a/keyboards/uk78/info.json b/keyboards/uk78/info.json index 0d7c103d6a..0481c33081 100644 --- a/keyboards/uk78/info.json +++ b/keyboards/uk78/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "UK78", + "manufacturer": "UK Keyboards", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x554B", + "pid": "0x004E", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":1, "y":0}, {"label":"K002", "x":2, "y":0}, {"label":"K003", "x":3, "y":0}, {"label":"K004", "x":4, "y":0}, {"label":"K005", "x":5, "y":0}, {"label":"K006", "x":6, "y":0}, {"label":"K007", "x":7, "y":0}, {"label":"K008", "x":8, "y":0}, {"label":"K009", "x":9, "y":0}, {"label":"K010", "x":10, "y":0}, {"label":"K011", "x":11, "y":0}, {"label":"K012", "x":12, "y":0}, {"label":"K013", "x":13, "y":0}, {"label":"K014", "x":14, "y":0}, {"label":"K015", "x":15, "y":0}, {"label":"K016", "x":16, "y":0}, {"label":"K017", "x":17, "y":0}, {"label":"K018", "x":18, "y":0}, {"label":"K100", "x":0, "y":1, "w":1.5}, {"label":"K101", "x":1.5, "y":1}, {"label":"K102", "x":2.5, "y":1}, {"label":"K103", "x":3.5, "y":1}, {"label":"K104", "x":4.5, "y":1}, {"label":"K105", "x":5.5, "y":1}, {"label":"K106", "x":6.5, "y":1}, {"label":"K107", "x":7.5, "y":1}, {"label":"K108", "x":8.5, "y":1}, {"label":"K109", "x":9.5, "y":1}, {"label":"K110", "x":10.5, "y":1}, {"label":"K111", "x":11.5, "y":1}, {"label":"K112", "x":12.5, "y":1}, {"label":"K114", "x":13.5, "y":1, "w":1.5}, {"label":"K115", "x":15, "y":1}, {"label":"K116", "x":16, "y":1}, {"label":"K117", "x":17, "y":1}, {"label":"K118", "x":18, "y":1}, {"label":"K200", "x":0, "y":2, "w":1.75}, {"label":"K201", "x":1.75, "y":2}, {"label":"K202", "x":2.75, "y":2}, {"label":"K203", "x":3.75, "y":2}, {"label":"K204", "x":4.75, "y":2}, {"label":"K205", "x":5.75, "y":2}, {"label":"K206", "x":6.75, "y":2}, {"label":"K207", "x":7.75, "y":2}, {"label":"K208", "x":8.75, "y":2}, {"label":"K209", "x":9.75, "y":2}, {"label":"K210", "x":10.75, "y":2}, {"label":"K211", "x":11.75, "y":2}, {"label":"K212", "x":12.75, "y":2}, {"label":"K214", "x":13.75, "y":2, "w":1.25}, {"label":"K215", "x":15, "y":2}, {"label":"K216", "x":16, "y":2}, {"label":"K217", "x":17, "y":2}, {"label":"K218", "x":18, "y":2}, {"label":"K300", "x":0, "y":3, "w":1.25}, {"label":"K301", "x":1.25, "y":3}, {"label":"K302", "x":2.25, "y":3}, {"label":"K303", "x":3.25, "y":3}, {"label":"K304", "x":4.25, "y":3}, {"label":"K305", "x":5.25, "y":3}, {"label":"K306", "x":6.25, "y":3}, {"label":"K307", "x":7.25, "y":3}, {"label":"K308", "x":8.25, "y":3}, {"label":"K309", "x":9.25, "y":3}, {"label":"K310", "x":10.25, "y":3}, {"label":"K311", "x":11.25, "y":3}, {"label":"K312", "x":12.25, "y":3}, {"label":"K313", "x":13.25, "y":3, "w":0.75}, {"label":"K314", "x":14, "y":3}, {"label":"K315", "x":15, "y":3}, {"label":"K316", "x":16, "y":3}, {"label":"K317", "x":17, "y":3}, {"label":"K318", "x":18, "y":3}, {"label":"K400", "x":0, "y":4, "w":1.25}, {"label":"K401", "x":1.25, "y":4, "w":1.25}, {"label":"K402", "x":2.5, "y":4, "w":1.25}, {"label":"K406", "x":3.75, "y":4, "w":6.25}, {"label":"K410", "x":10, "y":4}, {"label":"K411", "x":11, "y":4}, {"label":"K412", "x":12, "y":4}, {"label":"K413", "x":13, "y":4}, {"label":"K414", "x":14, "y":4}, {"label":"K415", "x":15, "y":4}, {"label":"K416", "x":16, "y":4}, {"label":"K417", "x":17, "y":4}, {"label":"K418", "x":18, "y":4}] diff --git a/keyboards/ungodly/launch_pad/config.h b/keyboards/ungodly/launch_pad/config.h index cf639a4f28..d641bab9cd 100644 --- a/keyboards/ungodly/launch_pad/config.h +++ b/keyboards/ungodly/launch_pad/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5544 // "UD" = Ungodly Design -#define PRODUCT_ID 0x4C50 // "LP" = Launch Pad -#define DEVICE_VER 0x9999 -#define MANUFACTURER Ungodly Design -#define PRODUCT Launch Pad - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 4 diff --git a/keyboards/ungodly/launch_pad/info.json b/keyboards/ungodly/launch_pad/info.json index 767fef5e44..bc562186f4 100644 --- a/keyboards/ungodly/launch_pad/info.json +++ b/keyboards/ungodly/launch_pad/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Launch Pad", + "manufacturer": "Ungodly Design", "url": "https://ungodly.design/products/launch-pad", "maintainer": "Ungodly Design", + "usb": { + "vid": "0x5544", + "pid": "0x4C50", + "device_version": "99.9.9" + }, "layouts": { "LAYOUT_ortho_5x4": { "layout": [ diff --git a/keyboards/ungodly/nines/config.h b/keyboards/ungodly/nines/config.h index a2f874bda9..221ee0cf0a 100644 --- a/keyboards/ungodly/nines/config.h +++ b/keyboards/ungodly/nines/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5544 // "UD" = Ungodly Design -#define PRODUCT_ID 0x544E // "TN" = The Nines -#define DEVICE_VER 0x9999 -#define MANUFACTURER Ungodly Design -#define PRODUCT The Nines - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 3 diff --git a/keyboards/ungodly/nines/info.json b/keyboards/ungodly/nines/info.json index fc93e94a1d..1a15a069e6 100644 --- a/keyboards/ungodly/nines/info.json +++ b/keyboards/ungodly/nines/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "The Nines", + "manufacturer": "Ungodly Design", "url": "https://www.qlavier.com/", "maintainer": "Ungodly Design", + "usb": { + "vid": "0x5544", + "pid": "0x544E", + "device_version": "99.9.9" + }, "layouts": { "LAYOUT_ortho_3x3": { "layout": [ diff --git a/keyboards/unikeyboard/diverge3/config.h b/keyboards/unikeyboard/diverge3/config.h index 502e97bd91..72544405c2 100644 --- a/keyboards/unikeyboard/diverge3/config.h +++ b/keyboards/unikeyboard/diverge3/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x1257 -#define DEVICE_VER 0x0001 -#define MANUFACTURER UniKeyboard -#define PRODUCT diverge3 - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/unikeyboard/diverge3/info.json b/keyboards/unikeyboard/diverge3/info.json index fc678b40bc..74dc2641a1 100644 --- a/keyboards/unikeyboard/diverge3/info.json +++ b/keyboards/unikeyboard/diverge3/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Diverge3", + "manufacturer": "UniKeyboard", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x1257", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0.75}, {"x":2, "y":0.25}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0.25}, {"x":6, "y":0.5}, {"x":10, "y":0.5}, {"x":11, "y":0.25}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0.25}, {"x":15, "y":0.75}, {"x":16, "y":0}, {"x":0, "y":1}, {"x":1, "y":1.75}, {"x":2, "y":1.25}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1.25}, {"x":6, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.25}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1.25}, {"x":15, "y":1.75}, {"x":16, "y":1}, {"x":0, "y":2}, {"x":1, "y":2.75}, {"x":2, "y":2.25}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2.25}, {"x":6, "y":2.5}, {"x":10, "y":2.5}, {"x":11, "y":2.25}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2.25}, {"x":15, "y":2.75}, {"x":16, "y":2}, {"x":0, "y":3}, {"x":1, "y":3.75}, {"x":2, "y":3.25}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3.25}, {"x":6, "y":3.5}, {"x":10, "y":3.5}, {"x":11, "y":3.25}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3.25}, {"x":15, "y":3.75}, {"x":16, "y":3}, {"x":0, "y":4}, {"x":1, "y":4.75}, {"x":2, "y":4.25}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4.75, "h":1.25}, {"x":6, "y":5, "h":1.25}, {"x":7, "y":5.25}, {"x":9, "y":5.25}, {"x":10, "y":5, "h":1.25}, {"x":11, "y":4.75, "h":1.25}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4.25}, {"x":15, "y":4.75}, {"x":16, "y":4}] diff --git a/keyboards/unikeyboard/divergetm2/config.h b/keyboards/unikeyboard/divergetm2/config.h index ee8372aa7e..bfebd4563a 100644 --- a/keyboards/unikeyboard/divergetm2/config.h +++ b/keyboards/unikeyboard/divergetm2/config.h @@ -19,13 +19,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x1256 -#define DEVICE_VER 0x0001 -#define MANUFACTURER UniKeyboard -#define PRODUCT diverge tm2 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 6 diff --git a/keyboards/unikeyboard/divergetm2/info.json b/keyboards/unikeyboard/divergetm2/info.json index fc64e57906..4d707c944c 100644 --- a/keyboards/unikeyboard/divergetm2/info.json +++ b/keyboards/unikeyboard/divergetm2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "UniKeyboard Diverge TM 2", + "keyboard_name": "Diverge TM 2", + "manufacturer": "UniKeyboard", "url": "", "maintainer": "islandman93, xton", + "usb": { + "vid": "0xFEED", + "pid": "0x1256", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/unikeyboard/felix/config.h b/keyboards/unikeyboard/felix/config.h index 64319f029f..e199d0792c 100644 --- a/keyboards/unikeyboard/felix/config.h +++ b/keyboards/unikeyboard/felix/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Unikeyboard -#define PRODUCT Felix - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 4 diff --git a/keyboards/unikeyboard/felix/info.json b/keyboards/unikeyboard/felix/info.json index f81d56f340..74b923206d 100644 --- a/keyboards/unikeyboard/felix/info.json +++ b/keyboards/unikeyboard/felix/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Felix", + "manufacturer": "UniKeyboard", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_5x4": { "layout": [ diff --git a/keyboards/unikorn/config.h b/keyboards/unikorn/config.h index 1029a777bb..0c6e5a9457 100644 --- a/keyboards/unikorn/config.h +++ b/keyboards/unikorn/config.h @@ -19,12 +19,6 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0x5354 // Singa x TGR (ST) -#define PRODUCT_ID 0x556B // UK -#define DEVICE_VER 0x0200 -#define MANUFACTURER Singa x TGR -#define PRODUCT Unikorn60 - #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/unikorn/info.json b/keyboards/unikorn/info.json index a93ca49205..671bb1870e 100644 --- a/keyboards/unikorn/info.json +++ b/keyboards/unikorn/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Unikorn 60", + "keyboard_name": "Unikorn60", + "manufacturer": "Singa x TGR", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x5354", + "pid": "0x556B", + "device_version": "2.0.0" + }, "layouts": { "LAYOUT_all": { "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":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}] diff --git a/keyboards/unison/v04/config.h b/keyboards/unison/v04/config.h index 93c1ae2e4b..49cbbd9ce5 100644 --- a/keyboards/unison/v04/config.h +++ b/keyboards/unison/v04/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xB9DD -#define PRODUCT_ID 0x176A -#define DEVICE_VER 0x0040 -#define MANUFACTURER jpskenn -#define PRODUCT Unison - /* key matrix size */ /* NOTE: With Round-Robin matrix, set same size for both. */ #define MATRIX_ROWS 10 diff --git a/keyboards/unison/v04/info.json b/keyboards/unison/v04/info.json index 31b3f1e93b..00de673b9e 100644 --- a/keyboards/unison/v04/info.json +++ b/keyboards/unison/v04/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Unison", + "manufacturer": "jpskenn", "url": "https://github.com/jpskenn/Unison", "maintainer": "jpskenn", + "usb": { + "vid": "0xB9DD", + "pid": "0x176A", + "device_version": "0.4.0" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/uranuma/config.h b/keyboards/uranuma/config.h index 2c304012d3..a8a9d4ab7f 100644 --- a/keyboards/uranuma/config.h +++ b/keyboards/uranuma/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x112D -#define DEVICE_VER 0x0001 -#define MANUFACTURER yohewi -#define PRODUCT UraNuma - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 10 diff --git a/keyboards/uranuma/info.json b/keyboards/uranuma/info.json index ffdef726a0..74968e3e12 100644 --- a/keyboards/uranuma/info.json +++ b/keyboards/uranuma/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Uranuma", + "keyboard_name": "UraNuma", + "manufacturer": "yohewi", "url": "", "maintainer": "yohewi", + "usb": { + "vid": "0xFEED", + "pid": "0x112D", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/utd80/config.h b/keyboards/utd80/config.h index c5a9697f54..9379432dab 100644 --- a/keyboards/utd80/config.h +++ b/keyboards/utd80/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x001C -#define DEVICE_VER 0x0001 -#define MANUFACTURER UTD -#define PRODUCT UTD80 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 16 diff --git a/keyboards/utd80/info.json b/keyboards/utd80/info.json index 360ccf4f87..bdc877ae3d 100644 --- a/keyboards/utd80/info.json +++ b/keyboards/utd80/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "UTD80", + "manufacturer": "UTD", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x001C", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_tkl_ansi_wkl": { "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":0, "y":4.5, "w":2.25}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"x":11, "y":5.5, "w":1.5}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}] -- cgit v1.2.3