diff --git a/package-lock.json b/package-lock.json index 948e87120a..eba889747b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "0.0.1", "license": "GPL-3.0", "dependencies": { + "@the-via/reader": "^1.5.5", "@types/glob": "^7.1.1", "@types/rimraf": "^2.0.3", "fs-extra": "^9.1.0", @@ -2018,6 +2019,14 @@ "string.prototype.matchall": "^4.0.6" } }, + "node_modules/@the-via/reader": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@the-via/reader/-/reader-1.5.5.tgz", + "integrity": "sha512-GKyniuD+7ZYu8dZ3vwL1OQY6LKaTkLffqkA4h10wmS481vGTVi1MvFdiQ2BlsIEeJSp9dDjZgRabxaHLNHO0mA==", + "dependencies": { + "invariant": "^2.2.4" + } + }, "node_modules/@trysound/sax": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", @@ -8561,6 +8570,14 @@ "string.prototype.matchall": "^4.0.6" } }, + "@the-via/reader": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@the-via/reader/-/reader-1.5.5.tgz", + "integrity": "sha512-GKyniuD+7ZYu8dZ3vwL1OQY6LKaTkLffqkA4h10wmS481vGTVi1MvFdiQ2BlsIEeJSp9dDjZgRabxaHLNHO0mA==", + "requires": { + "invariant": "^2.2.4" + } + }, "@trysound/sax": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", diff --git a/package.json b/package.json index 17bc014976..5f3ed07688 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "prettier": "^2.2.1" }, "dependencies": { + "@the-via/reader": "^1.5.5", "@types/glob": "^7.1.1", "@types/rimraf": "^2.0.3", "fs-extra": "^9.1.0", diff --git a/scripts/build-isolated-definitions.ts b/scripts/build-isolated-definitions.ts index e203e56240..e38ad4e1b2 100644 --- a/scripts/build-isolated-definitions.ts +++ b/scripts/build-isolated-definitions.ts @@ -6,8 +6,8 @@ import { VIADefinitionV2, VIADefinitionV3, DefinitionVersion, -} from 'via-reader'; -import {ValidateFunction} from 'via-reader/dist/validated-types/via-definition-v3.validator'; +} from '@the-via/reader'; +import {ValidateFunction} from '@the-via/reader/dist/validated-types/via-definition-v3.validator'; import {getDefinitionsPath, getOutputPath, getRelativePath} from './get-path'; import {hashJSON} from './hash-json'; /** @@ -61,10 +61,8 @@ export const buildIsolatedDefinitions = async < .map((key) => { const vendorID = (parseInt(key) >> 16).toString(16).padStart(4, '0'); const productID = (parseInt(key) & 0xffff).toString(16).padStart(4, '0'); - return ( - `Duplicate ID vendorId=0x${vendorID} productId=0x${productID} in: - ${IDsToPaths[key].join(',\n')}` - ); + return `Duplicate ID vendorId=0x${vendorID} productId=0x${productID} in: + ${IDsToPaths[key].join(',\n')}`; }); if (conflictingVIADefinitions.length) { diff --git a/scripts/build-names.ts b/scripts/build-names.ts index 8729af195b..904303d105 100644 --- a/scripts/build-names.ts +++ b/scripts/build-names.ts @@ -1,7 +1,7 @@ import stringify from 'json-stringify-pretty-compact'; import * as glob from 'glob'; import * as fs from 'fs'; -import {keyboardDefinitionV3ToVIADefinitionV3} from 'via-reader'; +import {keyboardDefinitionV3ToVIADefinitionV3} from '@the-via/reader'; import process from 'process'; import {getDefinitionsPath, getOutputPath} from './get-path'; diff --git a/scripts/build-v2.ts b/scripts/build-v2.ts index b19b69fd06..b771d6b1e8 100644 --- a/scripts/build-v2.ts +++ b/scripts/build-v2.ts @@ -1,7 +1,7 @@ import stringify from 'json-stringify-pretty-compact'; import * as glob from 'glob'; import * as fs from 'fs'; -import {getTheme, keyboardDefinitionV2ToVIADefinitionV2} from 'via-reader'; +import {getTheme, keyboardDefinitionV2ToVIADefinitionV2} from '@the-via/reader'; import process from 'process'; import path from 'path'; import {getDefinitionsPath, getOutputPath} from './get-path'; diff --git a/scripts/build-v3.ts b/scripts/build-v3.ts index 08469e7561..6ce756ed5c 100644 --- a/scripts/build-v3.ts +++ b/scripts/build-v3.ts @@ -8,7 +8,7 @@ import { keyboardDefinitionV3ToVIADefinitionV3, isVIADefinitionV2, isVIADefinitionV3, -} from 'via-reader'; +} from '@the-via/reader'; import stringify from 'json-stringify-pretty-compact'; import {buildIsolatedDefinitions} from './build-isolated-definitions'; import {getCommonMenusPath, getOutputPath} from './get-path'; diff --git a/scripts/v2-to-v3.ts b/scripts/v2-to-v3.ts index 1ebb798def..8d9cbb6454 100644 --- a/scripts/v2-to-v3.ts +++ b/scripts/v2-to-v3.ts @@ -9,7 +9,7 @@ import { LightingTypeDefinition, LightingTypeDefinitionV2, VIAMenu, -} from 'via-reader'; +} from '@the-via/reader'; import fs from 'fs-extra'; import stringify from 'json-stringify-pretty-compact'; @@ -25,7 +25,7 @@ const OMITTED_V2_KEYS = [ type SUPPORTED_V2_KEYS = Omit< KeyboardDefinitionV2, - typeof OMITTED_V2_KEYS[number] + (typeof OMITTED_V2_KEYS)[number] >; const isLightingTypeDefinition = ( @@ -106,7 +106,7 @@ const resolveKeycodes = ( enum coreMenus { QMKRGBLight = 'qmk_rgblight', QMKBacklight = 'qmk_backlight', - QMKBacklightRGBLight = 'qmk_backlight_rgblight' + QMKBacklightRGBLight = 'qmk_backlight_rgblight', } const WilbaPlsHalp = '!!!WILBA!!!'; @@ -150,10 +150,11 @@ const resolveMenus = ( }; const cleanObject = (obj: any) => { - return Object.keys(obj).reduce((acc,key) => - (obj[key].length ? {...acc, [key]:obj[key]} : acc) - , {}) -} + return Object.keys(obj).reduce( + (acc, key) => (obj[key].length ? {...acc, [key]: obj[key]} : acc), + {} + ); +}; async function convertV2ToV3() { const definitionFiles = await glob('src/**/*.json'); @@ -188,13 +189,13 @@ async function convertV2ToV3() { name, vendorId, productId, - ...cleanObject({keycodes,menus}), + ...cleanObject({keycodes, menus}), ...supportedJson, }; try { //if ( ! v3Definition.menus?.includes(WilbaPlsHalp) ) { - fs.outputFile(`v3/${definition.path}`, stringify(v3Definition)); + fs.outputFile(`v3/${definition.path}`, stringify(v3Definition)); //} } catch (e) { console.error(e); diff --git a/src/0xC7/61key/61key.json b/src/0xC7/61key/61key.json index 860004e8c3..6f17ec2daf 100644 --- a/src/0xC7/61key/61key.json +++ b/src/0xC7/61key/61key.json @@ -1,16 +1,97 @@ { - "name": "61Key by 0xC7", - "vendorId": "0xE117", - "productId": "0x6161", - "lighting": "none", - "matrix": {"rows": 5, "cols": 14}, - "layouts": { - "keymap": [ - ["0,0","0,1","0,2","0,3","0,4","0,5","0,6","0,7","0,8","0,9","0,10","0,11","0,12",{"w":2},"0,13"], - [{"w":1.5},"1,0","1,1","1,2","1,3","1,4","1,5","1,6","1,7","1,8","1,9","1,10","1,11","1,12",{"w":1.5},"1,13"], - [{"w":1.75},"2,0","2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8","2,9","2,10","2,11",{"w":2.25},"2,13"], - [{"w":2.25},"3,0","3,1","3,2","3,3","3,4","3,5","3,6","3,7","3,8","3,9","3,10",{"w":2.75},"3,13"], - [{"w":1.25},"4,0",{"w":1.25},"4,1",{"w":1.25},"4,2",{"a":7,"w":6.25},"4,5",{"a":4,"w":1.25},"4,8",{"w":1.25},"4,9",{"w":1.25},"4,11",{"w":1.25},"4,13"] - ] - } + "name": "61Key by 0xC7", + "vendorId": "0xE117", + "productId": "0x6161", + "lighting": "none", + "matrix": {"rows": 5, "cols": 14}, + "layouts": { + "keymap": [ + [ + "0,0", + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + {"w": 2}, + "0,13" + ], + [ + {"w": 1.5}, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + {"w": 1.5}, + "1,13" + ], + [ + {"w": 1.75}, + "2,0", + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + {"w": 2.25}, + "2,13" + ], + [ + {"w": 2.25}, + "3,0", + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + {"w": 2.75}, + "3,13" + ], + [ + {"w": 1.25}, + "4,0", + {"w": 1.25}, + "4,1", + {"w": 1.25}, + "4,2", + {"w": 6.25}, + "4,5", + {"w": 1.25}, + "4,8", + {"w": 1.25}, + "4,9", + {"w": 1.25}, + "4,11", + {"w": 1.25}, + "4,13" + ] + ] + } } diff --git a/src/4pplet/eagle_viper_rep_rev_a.json b/src/4pplet/eagle_viper_rep_rev_a.json index 400aeb373b..da574b4465 100644 --- a/src/4pplet/eagle_viper_rep_rev_a.json +++ b/src/4pplet/eagle_viper_rep_rev_a.json @@ -1,256 +1,248 @@ { - "name": "Eagle Viper Rep, Rev A", - "vendorId": "0x4444", - "productId": "0x0007", - "lighting": "qmk_backlight_rgblight", - "matrix": {"rows": 10, "cols": 7}, - "layouts": { - "labels": [ - "Unified Backspace", + "name": "Eagle Viper Rep, Rev A", + "vendorId": "0x4444", + "productId": "0x0007", + "lighting": "qmk_backlight_rgblight", + "matrix": {"rows": 10, "cols": 7}, + "layouts": { + "labels": [ + "Unified Backspace", "ISO Enter", - "Split Left Shift", + "Split Left Shift", "Unified Right Shift", - ["Bottom row", "Tsangan","HHKB", "Standard"] + ["Bottom row", "Tsangan", "HHKB", "Standard"] ], - "keymap": - - -[ - { - "css": "" - }, - [ - { - "x": 3, - "c": "#aaaaaa" - }, - "0,0", - { - "c": "#cccccc" - }, - "1,0", - "0,1", - "1,1", - "0,2", - "1,2", - "0,3", - "1,3", - "0,4", - "1,4", - "0,5", - "1,5", - "0,6", - "1,6\n\n\n0,0", - { - "c": "#aaaaaa" - }, - "3,6\n\n\n0,0", - { - "x": 1.5, - "w": 2 - }, - "2,6\n\n\n0,1" - ], - [ - { - "x": 3, - "w": 1.5 - }, - "2,0", - { - "c": "#cccccc" - }, - "3,0", - "2,1", - "3,1", - "2,2", - "3,2", - "2,3", - "3,3", - "2,4", - "3,4", - "2,5", - "3,5", - "2,6", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "5,6\n\n\n1,0", - { - "x": 2.25, - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, - "7,6\n\n\n1,1" - ], - [ - { - "x": 3, - "w": 1.75 - }, - "4,0", - { - "c": "#cccccc" - }, - "5,0", - "4,1", - "5,1", - "4,2", - "5,2", - "4,3", - "5,3", - "4,4", - "5,4", - "4,5", - "5,5", - { - "c": "#aaaaaa", - "w": 2.25 - }, - "7,6\n\n\n1,0", - { - "x": 1.25, - "c": "#cccccc" - }, - "4,6\n\n\n1,1" - ], - [ - { - "c": "#aaaaaa", - "w": 1.25 - }, - "6,0\n\n\n2,1", - "7,0\n\n\n2,1", - { - "x": 0.75, - "w": 2.25 - }, - "6,0\n\n\n2,0", - { - "c": "#cccccc" - }, - "6,1", - "7,1", - "6,2", - "7,2", - "6,3", - "7,3", - "6,4", - "7,4", - "6,5", - "7,5", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "6,6\n\n\n3,0", - "9,6\n\n\n3,0", - { - "x": 0.75, - "w": 2.75 - }, - "6,6\n\n\n3,1" - ], - [ - { - "x": 3, - "w": 1.5 - }, - "8,0\n\n\n4,0", - "9,0\n\n\n4,0", - { - "w": 1.5 - }, - "9,1\n\n\n4,0", - { - "c": "#cccccc", - "w": 7 - }, - "9,3\n\n\n4,0", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "8,5\n\n\n4,0", - "9,5\n\n\n4,0", - { - "w": 1.5 - }, - "8,6\n\n\n4,0" - ], - [ - { - "y": 0.75, - "x": 3, - "w": 1.5, - "d": true - }, - "8,0\n\n\n4,1", - "9,0\n\n\n4,1", - { - "w": 1.5 - }, - "9,1\n\n\n4,1", - { - "c": "#cccccc", - "w": 7 - }, - "9,3\n\n\n4,1", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "8,5\n\n\n4,1", - "9,5\n\n\n4,1", - { - "w": 1.5, - "d": true - }, - "8,6\n\n\n4,1" - ], - [ - { - "x": 3, - "w": 1.25 - }, - "8,0\n\n\n4,2", - { - "w": 1.25 - }, - "9,0\n\n\n4,2", - { - "w": 1.25 - }, - "9,1\n\n\n4,2", - { - "c": "#cccccc", - "w": 6.25 - }, - "9,3\n\n\n4,2", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "9,4\n\n\n4,2", - { - "w": 1.25 - }, - "8,5\n\n\n4,2", - { - "w": 1.25 - }, - "9,5\n\n\n4,2", - { - "w": 1.25 - }, - "8,6\n\n\n4,2" - ] -] - - + "keymap": [ + [ + { + "x": 3, + "c": "#aaaaaa" + }, + "0,0", + { + "c": "#cccccc" + }, + "1,0", + "0,1", + "1,1", + "0,2", + "1,2", + "0,3", + "1,3", + "0,4", + "1,4", + "0,5", + "1,5", + "0,6", + "1,6\n\n\n0,0", + { + "c": "#aaaaaa" + }, + "3,6\n\n\n0,0", + { + "x": 1.5, + "w": 2 + }, + "2,6\n\n\n0,1" + ], + [ + { + "x": 3, + "w": 1.5 + }, + "2,0", + { + "c": "#cccccc" + }, + "3,0", + "2,1", + "3,1", + "2,2", + "3,2", + "2,3", + "3,3", + "2,4", + "3,4", + "2,5", + "3,5", + "2,6", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,6\n\n\n1,0", + { + "x": 2.25, + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "7,6\n\n\n1,1" + ], + [ + { + "x": 3, + "w": 1.75 + }, + "4,0", + { + "c": "#cccccc" + }, + "5,0", + "4,1", + "5,1", + "4,2", + "5,2", + "4,3", + "5,3", + "4,4", + "5,4", + "4,5", + "5,5", + { + "c": "#aaaaaa", + "w": 2.25 + }, + "7,6\n\n\n1,0", + { + "x": 1.25, + "c": "#cccccc" + }, + "4,6\n\n\n1,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "6,0\n\n\n2,1", + "7,0\n\n\n2,1", + { + "x": 0.75, + "w": 2.25 + }, + "6,0\n\n\n2,0", + { + "c": "#cccccc" + }, + "6,1", + "7,1", + "6,2", + "7,2", + "6,3", + "7,3", + "6,4", + "7,4", + "6,5", + "7,5", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "6,6\n\n\n3,0", + "9,6\n\n\n3,0", + { + "x": 0.75, + "w": 2.75 + }, + "6,6\n\n\n3,1" + ], + [ + { + "x": 3, + "w": 1.5 + }, + "8,0\n\n\n4,0", + "9,0\n\n\n4,0", + { + "w": 1.5 + }, + "9,1\n\n\n4,0", + { + "c": "#cccccc", + "w": 7 + }, + "9,3\n\n\n4,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "8,5\n\n\n4,0", + "9,5\n\n\n4,0", + { + "w": 1.5 + }, + "8,6\n\n\n4,0" + ], + [ + { + "y": 0.75, + "x": 3, + "w": 1.5, + "d": true + }, + "8,0\n\n\n4,1", + "9,0\n\n\n4,1", + { + "w": 1.5 + }, + "9,1\n\n\n4,1", + { + "c": "#cccccc", + "w": 7 + }, + "9,3\n\n\n4,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "8,5\n\n\n4,1", + "9,5\n\n\n4,1", + { + "w": 1.5, + "d": true + }, + "8,6\n\n\n4,1" + ], + [ + { + "x": 3, + "w": 1.25 + }, + "8,0\n\n\n4,2", + { + "w": 1.25 + }, + "9,0\n\n\n4,2", + { + "w": 1.25 + }, + "9,1\n\n\n4,2", + { + "c": "#cccccc", + "w": 6.25 + }, + "9,3\n\n\n4,2", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "9,4\n\n\n4,2", + { + "w": 1.25 + }, + "8,5\n\n\n4,2", + { + "w": 1.25 + }, + "9,5\n\n\n4,2", + { + "w": 1.25 + }, + "8,6\n\n\n4,2" + ] + ] } -} \ No newline at end of file +} diff --git a/src/ai03/andromeda/andromeda.json b/src/ai03/andromeda/andromeda.json index 58a9630b07..d124a65c99 100644 --- a/src/ai03/andromeda/andromeda.json +++ b/src/ai03/andromeda/andromeda.json @@ -7,47 +7,30 @@ "layouts": { "keymap": [ [ - { - "c": "#777777" - }, + {"c": "#777777"}, "0,0", - { - "x": 1, - "c": "#cccccc" - }, + {"x": 1, "c": "#cccccc"}, "0,2", "0,3", "0,4", "0,5", - { - "x": 0.5, - "c": "#aaaaaa" - }, + {"x": 0.5, "c": "#aaaaaa"}, "0,6", "0,7", "0,8", "0,9", - { - "x": 0.5, - "c": "#cccccc" - }, + {"x": 0.5, "c": "#cccccc"}, "0,10", "0,11", "0,12", "0,13", - { - "x": 0.25, - "c": "#aaaaaa" - }, + {"x": 0.25, "c": "#aaaaaa"}, "0,14", "0,15", "0,16" ], [ - { - "y": 0.5, - "c": "#cccccc" - }, + {"y": 0.5, "c": "#cccccc"}, "1,0", "1,1", "1,2", @@ -61,26 +44,17 @@ "1,10", "1,11", "1,12", - { - "c": "#aaaaaa", - "w": 2 - }, + {"c": "#aaaaaa", "w": 2}, "1,13", - { - "x": 0.25 - }, + {"x": 0.25}, "1,14", "1,15", "1,16" ], [ - { - "w": 1.5 - }, + {"w": 1.5}, "2,0", - { - "c": "#cccccc" - }, + {"c": "#cccccc"}, "2,1", "2,2", "2,3", @@ -93,26 +67,17 @@ "2,10", "2,11", "2,12", - { - "w": 1.5 - }, + {"w": 1.5}, "2,13", - { - "x": 0.25, - "c": "#aaaaaa" - }, + {"x": 0.25, "c": "#aaaaaa"}, "2,14", "2,15", "2,16" ], [ - { - "w": 1.75 - }, + {"w": 1.75}, "3,0", - { - "c": "#cccccc" - }, + {"c": "#cccccc"}, "3,1", "3,2", "3,3", @@ -124,20 +89,13 @@ "3,9", "3,10", "3,11", - { - "c": "#aaaaaa", - "w": 2.25 - }, + {"c": "#aaaaaa", "w": 2.25}, "3,13" ], [ - { - "w": 2.25 - }, + {"w": 2.25}, "4,0", - { - "c": "#cccccc" - }, + {"c": "#cccccc"}, "4,2", "4,3", "4,4", @@ -148,53 +106,27 @@ "4,9", "4,10", "4,11", - { - "c": "#aaaaaa", - "w": 2.75 - }, + {"c": "#aaaaaa", "w": 2.75}, "4,13", - { - "x": 1.25, - "c": "#777777" - }, + {"x": 1.25, "c": "#777777"}, "4,15" ], [ - { - "c": "#aaaaaa", - "w": 1.5 - }, + {"c": "#aaaaaa", "w": 1.5}, "5,0", - { - "x": 1, - "w": 1.5 - }, + {"x": 1, "w": 1.5}, "5,2", - { - "c": "#777777", - "a": 7, - "w": 7 - }, + {"c": "#777777", "w": 7}, "5,7", - { - "c": "#aaaaaa", - "a": 4, - "w": 1.5 - }, + {"c": "#aaaaaa", "w": 1.5}, "5,11", - { - "x": 1, - "w": 1.5 - }, + {"x": 1, "w": 1.5}, "5,13", - { - "x": 0.25, - "c": "#777777" - }, + {"x": 0.25, "c": "#777777"}, "5,14", "5,15", "5,16" ] ] } -} \ No newline at end of file +} diff --git a/src/cannonkeys/rekt1800/rekt1800.json b/src/cannonkeys/rekt1800/rekt1800.json index d6500d2563..0b889933bc 100644 --- a/src/cannonkeys/rekt1800/rekt1800.json +++ b/src/cannonkeys/rekt1800/rekt1800.json @@ -1,243 +1,155 @@ { - "name": "Rekt1800", - "vendorId": "0xCA04", - "productId": "0x2377", - "lighting": "none", - "matrix": { - "rows": 6, - "cols": 19 - }, - "layouts": { - "keymap": [ - [ - { - "c": "#777777" - }, - "0,0", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "0,1", - "0,2", - "0,3", - "0,4", - { - "x": 0.25, - "c": "#777777" - }, - "0,5", - "0,6", - "0,7", - "0,8", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "0,9", - "0,10", - "0,11", - "0,12", - { - "x": 0.25 - }, - "0,14", - { - "x": 0.5 - }, - "0,15", - "0,16", - "0,17", - "0,18" - ], - [ - { - "y": 0.25, - "c": "#cccccc" - }, - "1,0", - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "1,9", - "1,10", - "1,11", - "1,12", - { - "c": "#aaaaaa" - }, - "1,13", - "1,14", - { - "x": 0.5 - }, - "1,15", - "1,16", - "1,17", - "1,18" - ], - [ - { - "w": 1.5 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - "2,12", - { - "w": 1.5 - }, - "2,14", - { - "x": 0.5, - "c": "#aaaaaa" - }, - "2,15", - "2,16", - "2,17", - "2,18" - ], - [ - { - "w": 1.75 - }, - "3,0", - { - "c": "#cccccc" - }, - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - "3,11", - "3,12", - { - "c": "#777777", - "w": 1.25 - }, - "3,14", - { - "x": 0.5, - "c": "#aaaaaa" - }, - "3,15", - "3,16", - "3,17", - "3,18" - ], - [ - { - "w": 1.25 - }, - "4,0", - { - "c": "#cccccc" - }, - "4,1", - "4,2", - "4,3", - "4,4", - "4,5", - "4,6", - "4,7", - "4,8", - "4,9", - "4,10", - "4,11", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "4,12", - { - "x": 1.5 - }, - "4,15", - "4,16", - "4,17", - { - "c": "#777777", - "h": 2 - }, - "4,18" - ], - [ - { - "y": -0.75, - "x": 14.25 - }, - "4,14" - ], - [ - { - "y": -0.25, - "c": "#aaaaaa", - "w": 1.25 - }, - "5,0", - { - "w": 1.25 - }, - "5,1", - { - "w": 1.25 - }, - "5,2", - { - "c": "#cccccc", - "a": 7, - "w": 6.25 - }, - "5,6", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "5,10", - { - "w": 1.5 - }, - "5,11", - { - "x": 3.5 - }, - "5,16", - "5,17" - ], - [ - { - "y": -0.75, - "x": 13.25, - "c": "#777777" - }, - "5,12", - "5,14", - "5,15" - ] + "name": "Rekt1800", + "vendorId": "0xCA04", + "productId": "0x2377", + "lighting": "none", + "matrix": { + "rows": 6, + "cols": 19 + }, + "layouts": { + "keymap": [ + [ + {"c": "#777777"}, + "0,0", + {"x": 0.25, "c": "#aaaaaa"}, + "0,1", + "0,2", + "0,3", + "0,4", + {"x": 0.25, "c": "#777777"}, + "0,5", + "0,6", + "0,7", + "0,8", + {"x": 0.25, "c": "#aaaaaa"}, + "0,9", + "0,10", + "0,11", + "0,12", + {"x": 0.25}, + "0,14", + {"x": 0.5}, + "0,15", + "0,16", + "0,17", + "0,18" + ], + [ + {"y": 0.25, "c": "#cccccc"}, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + {"c": "#aaaaaa"}, + "1,13", + "1,14", + {"x": 0.5}, + "1,15", + "1,16", + "1,17", + "1,18" + ], + [ + {"w": 1.5}, + "2,0", + {"c": "#cccccc"}, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + {"w": 1.5}, + "2,14", + {"x": 0.5, "c": "#aaaaaa"}, + "2,15", + "2,16", + "2,17", + "2,18" + ], + [ + {"w": 1.75}, + "3,0", + {"c": "#cccccc"}, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + "3,12", + {"c": "#777777", "w": 1.25}, + "3,14", + {"x": 0.5, "c": "#aaaaaa"}, + "3,15", + "3,16", + "3,17", + "3,18" + ], + [ + {"w": 1.25}, + "4,0", + {"c": "#cccccc"}, + "4,1", + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "4,9", + "4,10", + "4,11", + {"c": "#aaaaaa", "w": 1.75}, + "4,12", + {"x": 1.5}, + "4,15", + "4,16", + "4,17", + {"c": "#777777", "h": 2}, + "4,18" + ], + [{"y": -0.75, "x": 14.25}, "4,14"], + [ + {"y": -0.25, "c": "#aaaaaa", "w": 1.25}, + "5,0", + {"w": 1.25}, + "5,1", + {"w": 1.25}, + "5,2", + {"c": "#cccccc", "w": 6.25}, + "5,6", + {"c": "#aaaaaa", "w": 1.5}, + "5,10", + {"w": 1.5}, + "5,11", + {"x": 3.5}, + "5,16", + "5,17" + ], + [{"y": -0.75, "x": 13.25, "c": "#777777"}, "5,12", "5,14", "5,15"] ] - - } - } \ No newline at end of file + } +} diff --git a/src/dmqdesign/spin.json b/src/dmqdesign/spin.json index 8c2b8cd80f..bf928adc39 100644 --- a/src/dmqdesign/spin.json +++ b/src/dmqdesign/spin.json @@ -1,65 +1,61 @@ { - "name": "SPIN Macropad", - "vendorId": "0xA455", - "productId": "0x0001", - "lighting": "qmk_rgblight", - "matrix": { - "rows": 3, - "cols": 5 - }, - "layouts": { - "keymap": [ - { - "name": "SPIN Macropad", - "author": "adamkraus6" - }, - [ - "0,0", - "1,0", - "2,0", - { - "x": 0.25 - }, - "2,4", - { - "f": 4, - "w": 14, - "h": 5, - "d": true - } - ], - [ - { - "f": 3 - }, - "0,1", - "1,1", - "2,1" - ], - [ - { - "y": -0.5, - "x": 3.25 - }, - "1,4" - ], - [ - { - "y": -0.5 - }, - "0,2", - "1,2", - "2,2" - ], - [ - "0,3", - "1,3", - "2,3", - { - "x": 0.25 - }, - "0,4" - ] - ] - } + "name": "SPIN Macropad", + "vendorId": "0xA455", + "productId": "0x0001", + "lighting": "qmk_rgblight", + "matrix": { + "rows": 3, + "cols": 5 + }, + "layouts": { + "keymap": [ + [ + "0,0", + "1,0", + "2,0", + { + "x": 0.25 + }, + "2,4", + { + "f": 4, + "w": 14, + "h": 5, + "d": true + } + ], + [ + { + "f": 3 + }, + "0,1", + "1,1", + "2,1" + ], + [ + { + "y": -0.5, + "x": 3.25 + }, + "1,4" + ], + [ + { + "y": -0.5 + }, + "0,2", + "1,2", + "2,2" + ], + [ + "0,3", + "1,3", + "2,3", + { + "x": 0.25 + }, + "0,4" + ] + ] + } } diff --git a/src/duck/octagon/v2/Octagon v2.json b/src/duck/octagon/v2/Octagon v2.json index 2d0ac4d90e..44afc7e832 100644 --- a/src/duck/octagon/v2/Octagon v2.json +++ b/src/duck/octagon/v2/Octagon v2.json @@ -1,308 +1,310 @@ { - "name": "OctagonV2", - "vendorId": "0x444b", - "productId": "0x4f32", - "lighting": "qmk_rgblight", - "matrix": { - "rows": 6, - "cols": 17 - }, - "layouts": { - "labels": [ - "Split L-Shift", - "Split Backspace", - ["Enter Key", "ANSI", "ISO"], - "Split R-Shift", - ["Bottom Row","1.25U+6.25U+1U","1.5U+7U+1U","1.5U+7U+2x1.5U", "1.25U+6.25U+2x1.5U"] - ], - "keymap": [ - { - "name": "Duck Octagon V3", - "author": "u/tk89yt" + "name": "OctagonV2", + "vendorId": "0x444b", + "productId": "0x4f32", + "lighting": "qmk_rgblight", + "matrix": { + "rows": 6, + "cols": 17 }, - [ - { - "y": 1.25, - "x": 2.75, - "c": "#777777" - }, - "0,0", - { - "c": "#cccccc" - }, - "0,1", - "0,2", - "0,3", - "0,4", - "0,5", - "0,6", - "0,7", - "0,8", - "0,9", - "0,10", - "0,11", - "0,12", - "0,13", - "0,14", - "0,16" - ], - [ - { - "x": 2.75, - "c": "#aaaaaa" - }, - "1,0", - { - "c": "#cccccc" - }, - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "1,9", - "1,10", - "1,11", - "1,12", - { - "c": "#aaaaaa", - "w": 2 - }, - "1,14\n\n\n1,0", - { - "c": "#cccccc" - }, - "1,15", - { - "x": 1.25, - "c": "#aaaaaa" - }, - "1,13\n\n\n1,1", - "1,14\n\n\n1,1" - ], - [ - { - "x": 2.75, - "w": 1.5 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - "2,12", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "2,14\n\n\n2,0", - { - "c": "#cccccc" - }, - "2,15", - { - "x": 2, - "c": "#777777", - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, - "3,14\n\n\n2,1" - ], - [ - { - "x": 2.75, - "c": "#aaaaaa", - "w": 1.75 - }, - "3,0", - { - "c": "#cccccc" - }, - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - "3,11", - { - "c": "#777777", - "w": 2.25 - }, - "3,14\n\n\n2,0", - { - "c": "#cccccc" - }, - "3,15", - { - "x": 1, - "c": "#aaaaaa" - }, - "3,12\n\n\n2,1" - ], - [ - { - "x": 0.25, - "w": 1.25 - }, - "4,0\n\n\n0,1", - "4,1\n\n\n0,1", - { - "x": 0.25, - "w": 2.25 - }, - "4,0\n\n\n0,0", - { - "c": "#cccccc" - }, - "4,2", - "4,3", - "4,4", - "4,5", - "4,6", - "4,7", - "4,8", - "4,9", - "4,10", - "4,12", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "4,13\n\n\n3,0", - { - "c": "#777777" - }, - "4,14\n\n\n3,0", - { - "c": "#cccccc" - }, - "4,15", - { - "x": 0.5, - "c": "#aaaaaa", - "w": 2.75 - }, - "4,14\n\n\n3,1" - ], - [ - { - "x": 2.75, - "w": 1.25 - }, - "5,0\n\n\n4,0", - { - "w": 1.25 - }, - "5,1\n\n\n4,0", - { - "w": 1.25 - }, - "5,2\n\n\n4,0", - { - "w": 6.25 - }, - "5,8\n\n\n4,0", - "5,10\n\n\n4,0", - "5,11\n\n\n4,0", - "5,12\n\n\n4,0", - { - "c": "#777777" - }, - "5,13", - "5,14", - "5,15" - ], - [ - { - "y": 0.25, - "x": 2.75, - "c": "#aaaaaa", - "w": 1.5 - }, - "5,0\n\n\n4,1", - { - "w": 1.5 - }, - "5,1\n\n\n4,1", - { - "w": 7 - }, - "5,8\n\n\n4,1", - "5,10\n\n\n4,1", - "5,11\n\n\n4,1", - "5,12\n\n\n4,1" - ], - [ - { - "x": 2.75, - "w": 1.5 - }, - "5,0\n\n\n4,2", - { - "w": 1.5 - }, - "5,1\n\n\n4,2", - { - "w": 7 - }, - "5,8\n\n\n4,2", - { - "w": 1.5 - }, - "5,10\n\n\n4,2", - { - "w": 1.5 - }, - "5,12\n\n\n4,2" - ], - [ - { - "x": 2.75, - "w": 1.25 - }, - "5,0\n\n\n4,3", - { - "w": 1.25 - }, - "5,1\n\n\n4,3", - { - "w": 1.25 - }, - "5,2\n\n\n4,3", - { - "w": 6.25 - }, - "5,8\n\n\n4,3", - { - "w": 1.5 - }, - "5,10\n\n\n4,3", - { - "w": 1.5 - }, - "5,12\n\n\n4,3" - ] -] - } + "layouts": { + "labels": [ + "Split L-Shift", + "Split Backspace", + ["Enter Key", "ANSI", "ISO"], + "Split R-Shift", + [ + "Bottom Row", + "1.25U+6.25U+1U", + "1.5U+7U+1U", + "1.5U+7U+2x1.5U", + "1.25U+6.25U+2x1.5U" + ] + ], + "keymap": [ + [ + { + "y": 1.25, + "x": 2.75, + "c": "#777777" + }, + "0,0", + { + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + "0,13", + "0,14", + "0,16" + ], + [ + { + "x": 2.75, + "c": "#aaaaaa" + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "1,14\n\n\n1,0", + { + "c": "#cccccc" + }, + "1,15", + { + "x": 1.25, + "c": "#aaaaaa" + }, + "1,13\n\n\n1,1", + "1,14\n\n\n1,1" + ], + [ + { + "x": 2.75, + "w": 1.5 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "2,14\n\n\n2,0", + { + "c": "#cccccc" + }, + "2,15", + { + "x": 2, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "3,14\n\n\n2,1" + ], + [ + { + "x": 2.75, + "c": "#aaaaaa", + "w": 1.75 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "c": "#777777", + "w": 2.25 + }, + "3,14\n\n\n2,0", + { + "c": "#cccccc" + }, + "3,15", + { + "x": 1, + "c": "#aaaaaa" + }, + "3,12\n\n\n2,1" + ], + [ + { + "x": 0.25, + "w": 1.25 + }, + "4,0\n\n\n0,1", + "4,1\n\n\n0,1", + { + "x": 0.25, + "w": 2.25 + }, + "4,0\n\n\n0,0", + { + "c": "#cccccc" + }, + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "4,9", + "4,10", + "4,12", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "4,13\n\n\n3,0", + { + "c": "#777777" + }, + "4,14\n\n\n3,0", + { + "c": "#cccccc" + }, + "4,15", + { + "x": 0.5, + "c": "#aaaaaa", + "w": 2.75 + }, + "4,14\n\n\n3,1" + ], + [ + { + "x": 2.75, + "w": 1.25 + }, + "5,0\n\n\n4,0", + { + "w": 1.25 + }, + "5,1\n\n\n4,0", + { + "w": 1.25 + }, + "5,2\n\n\n4,0", + { + "w": 6.25 + }, + "5,8\n\n\n4,0", + "5,10\n\n\n4,0", + "5,11\n\n\n4,0", + "5,12\n\n\n4,0", + { + "c": "#777777" + }, + "5,13", + "5,14", + "5,15" + ], + [ + { + "y": 0.25, + "x": 2.75, + "c": "#aaaaaa", + "w": 1.5 + }, + "5,0\n\n\n4,1", + { + "w": 1.5 + }, + "5,1\n\n\n4,1", + { + "w": 7 + }, + "5,8\n\n\n4,1", + "5,10\n\n\n4,1", + "5,11\n\n\n4,1", + "5,12\n\n\n4,1" + ], + [ + { + "x": 2.75, + "w": 1.5 + }, + "5,0\n\n\n4,2", + { + "w": 1.5 + }, + "5,1\n\n\n4,2", + { + "w": 7 + }, + "5,8\n\n\n4,2", + { + "w": 1.5 + }, + "5,10\n\n\n4,2", + { + "w": 1.5 + }, + "5,12\n\n\n4,2" + ], + [ + { + "x": 2.75, + "w": 1.25 + }, + "5,0\n\n\n4,3", + { + "w": 1.25 + }, + "5,1\n\n\n4,3", + { + "w": 1.25 + }, + "5,2\n\n\n4,3", + { + "w": 6.25 + }, + "5,8\n\n\n4,3", + { + "w": 1.5 + }, + "5,10\n\n\n4,3", + { + "w": 1.5 + }, + "5,12\n\n\n4,3" + ] + ] + } } diff --git a/src/durgod/galaxy/galaxy.json b/src/durgod/galaxy/galaxy.json index 8a8aa3e5e5..f495618836 100644 --- a/src/durgod/galaxy/galaxy.json +++ b/src/durgod/galaxy/galaxy.json @@ -1,69 +1,67 @@ { - "name": "DURGOD Galaxy", - "vendorId": "0xD60D", - "productId": "0x6A1A", - "matrix": { - "rows": 6, - "cols": 16 - }, - "lighting": { - "extends":"qmk_rgblight", - "underglowEffects": [ - ["None", 0], - ["SOLID_COLOR", 1], - ["ALPHAS_MODS", 1], - ["GRADIENT_UP_DOWN", 1], - ["GRADIENT_LEFT_RIGHT", 1], - ["BREATHING", 1], - ["BAND_SAT", 1], - ["BAND_VAL", 1], - ["BAND_PINWHEEL_SAT", 1], - ["BAND_PINWHEEL_VAL", 1], - ["BAND_SPIRAL_SAT", 1], - ["BAND_SPIRAL_VAL", 1], - ["CYCLE_ALL", 1], - ["CYCLE_LEFT_RIGHT", 1], - ["CYCLE_UP_DOWN", 1], - ["RAINBOW_MOVING_CHEVRON", 1], - ["CYCLE_OUT_IN", 1], - ["CYCLE_OUT_IN_DUAL", 1], - ["CYCLE_PINWHEEL", 1], - ["CYCLE_SPIRAL", 1], - ["DUAL_BEACON", 1], - ["RAINBOW_BEACON", 1], - ["RAINBOW_PINWHEELS", 1], - ["RAINDROPS", 1], - ["JELLYBEAN_RAINDROPS", 1], - ["TYPING_HEATMAP", 1], - ["DIGITAL_RAIN", 1], - ["SOLID_REACTIVE_SIMPLE", 1], - ["SOLID_REACTIVE", 1], - ["SOLID_REACTIVE_WIDE", 1], - ["SOLID_REACTIVE_MULTIWIDE", 1], - ["SOLID_REACTIVE_CROSS", 1], - ["SOLID_REACTIVE_MULTICROSS", 1], - ["SOLID_REACTIVE_NEXUS", 1], - ["SOLID_REACTIVE_MULTINEXUS", 1], - ["SPLASH", 1], - ["MULTISPLASH", 1], - ["SOLID_SPLASH", 1], - ["SOLID_MULTISPLASH", 1] - ], - "supportedLightingValues": [ - 128, - 129, - 131 - ] - }, - "customKeycodes": [ - {"name": "Toggle WinKey Lock", "title": "Toggle WinKey Lock", "shortName": "WinLock"} + "name": "DURGOD Galaxy", + "vendorId": "0xD60D", + "productId": "0x6A1A", + "matrix": { + "rows": 6, + "cols": 16 + }, + "lighting": { + "extends": "qmk_rgblight", + "underglowEffects": [ + ["None", 0], + ["SOLID_COLOR", 1], + ["ALPHAS_MODS", 1], + ["GRADIENT_UP_DOWN", 1], + ["GRADIENT_LEFT_RIGHT", 1], + ["BREATHING", 1], + ["BAND_SAT", 1], + ["BAND_VAL", 1], + ["BAND_PINWHEEL_SAT", 1], + ["BAND_PINWHEEL_VAL", 1], + ["BAND_SPIRAL_SAT", 1], + ["BAND_SPIRAL_VAL", 1], + ["CYCLE_ALL", 1], + ["CYCLE_LEFT_RIGHT", 1], + ["CYCLE_UP_DOWN", 1], + ["RAINBOW_MOVING_CHEVRON", 1], + ["CYCLE_OUT_IN", 1], + ["CYCLE_OUT_IN_DUAL", 1], + ["CYCLE_PINWHEEL", 1], + ["CYCLE_SPIRAL", 1], + ["DUAL_BEACON", 1], + ["RAINBOW_BEACON", 1], + ["RAINBOW_PINWHEELS", 1], + ["RAINDROPS", 1], + ["JELLYBEAN_RAINDROPS", 1], + ["TYPING_HEATMAP", 1], + ["DIGITAL_RAIN", 1], + ["SOLID_REACTIVE_SIMPLE", 1], + ["SOLID_REACTIVE", 1], + ["SOLID_REACTIVE_WIDE", 1], + ["SOLID_REACTIVE_MULTIWIDE", 1], + ["SOLID_REACTIVE_CROSS", 1], + ["SOLID_REACTIVE_MULTICROSS", 1], + ["SOLID_REACTIVE_NEXUS", 1], + ["SOLID_REACTIVE_MULTINEXUS", 1], + ["SPLASH", 1], + ["MULTISPLASH", 1], + ["SOLID_SPLASH", 1], + ["SOLID_MULTISPLASH", 1] ], + "supportedLightingValues": [128, 129, 131] + }, + "customKeycodes": [ + { + "name": "Toggle WinKey Lock", + "title": "Toggle WinKey Lock", + "shortName": "WinLock" + } + ], "layouts": { "keymap": [ [ - { - "c": "#ffffff" - }, + {"c": "#ffffff"}, "0,0", "0,1", "0,2", @@ -95,16 +93,12 @@ "1,10", "1,11", "1,12", - { - "w": 2 - }, + {"w": 2}, "1,13", "1,14" ], [ - { - "w": 1.5 - }, + {"w": 1.5}, "2,0", "2,1", "2,2", @@ -118,16 +112,12 @@ "2,10", "2,11", "2,12", - { - "w": 1.5 - }, + {"w": 1.5}, "2,13", "2,14" ], [ - { - "w": 1.75 - }, + {"w": 1.75}, "3,0", "3,1", "3,2", @@ -140,16 +130,12 @@ "3,9", "3,10", "3,11", - { - "w": 2.25 - }, + {"w": 2.25}, "3,13", "3,14" ], [ - { - "w": 2.25 - }, + {"w": 2.25}, "4,0", "4,2", "4,3", @@ -161,34 +147,20 @@ "4,9", "4,10", "4,11", - { - "w": 1.75 - }, + {"w": 1.75}, "4,12", "4,13", "4,14" ], [ - { - "w": 1.25 - }, + {"w": 1.25}, "5,0", - { - "w": 1.25 - }, + {"w": 1.25}, "5,1", - { - "w": 1.25 - }, + {"w": 1.25}, "5,2", - { - "a": 7, - "w": 6.25 - }, + {"w": 6.25}, "5,6", - { - "a": 4 - }, "5,9", "5,10", "5,11", diff --git a/src/durgod/hades/hades.json b/src/durgod/hades/hades.json index 94fdc4de3e..a414138b1f 100644 --- a/src/durgod/hades/hades.json +++ b/src/durgod/hades/hades.json @@ -1,69 +1,67 @@ { - "name": "DURGOD Hades", - "vendorId": "0xD60D", - "productId": "0x4AD3", - "matrix": { - "rows": 5, - "cols": 15 - }, - "lighting": { - "extends":"qmk_rgblight", - "underglowEffects": [ - ["None", 0], - ["SOLID_COLOR", 1], - ["ALPHAS_MODS", 1], - ["GRADIENT_UP_DOWN", 1], - ["GRADIENT_LEFT_RIGHT", 1], - ["BREATHING", 1], - ["BAND_SAT", 1], - ["BAND_VAL", 1], - ["BAND_PINWHEEL_SAT", 1], - ["BAND_PINWHEEL_VAL", 1], - ["BAND_SPIRAL_SAT", 1], - ["BAND_SPIRAL_VAL", 1], - ["CYCLE_ALL", 1], - ["CYCLE_LEFT_RIGHT", 1], - ["CYCLE_UP_DOWN", 1], - ["RAINBOW_MOVING_CHEVRON", 1], - ["CYCLE_OUT_IN", 1], - ["CYCLE_OUT_IN_DUAL", 1], - ["CYCLE_PINWHEEL", 1], - ["CYCLE_SPIRAL", 1], - ["DUAL_BEACON", 1], - ["RAINBOW_BEACON", 1], - ["RAINBOW_PINWHEELS", 1], - ["RAINDROPS", 1], - ["JELLYBEAN_RAINDROPS", 1], - ["TYPING_HEATMAP", 1], - ["DIGITAL_RAIN", 1], - ["SOLID_REACTIVE_SIMPLE", 1], - ["SOLID_REACTIVE", 1], - ["SOLID_REACTIVE_WIDE", 1], - ["SOLID_REACTIVE_MULTIWIDE", 1], - ["SOLID_REACTIVE_CROSS", 1], - ["SOLID_REACTIVE_MULTICROSS", 1], - ["SOLID_REACTIVE_NEXUS", 1], - ["SOLID_REACTIVE_MULTINEXUS", 1], - ["SPLASH", 1], - ["MULTISPLASH", 1], - ["SOLID_SPLASH", 1], - ["SOLID_MULTISPLASH", 1] - ], - "supportedLightingValues": [ - 128, - 129, - 131 - ] - }, - "customKeycodes": [ - {"name": "Toggle WinKey Lock", "title": "Toggle WinKey Lock", "shortName": "WinLock"} + "name": "DURGOD Hades", + "vendorId": "0xD60D", + "productId": "0x4AD3", + "matrix": { + "rows": 5, + "cols": 15 + }, + "lighting": { + "extends": "qmk_rgblight", + "underglowEffects": [ + ["None", 0], + ["SOLID_COLOR", 1], + ["ALPHAS_MODS", 1], + ["GRADIENT_UP_DOWN", 1], + ["GRADIENT_LEFT_RIGHT", 1], + ["BREATHING", 1], + ["BAND_SAT", 1], + ["BAND_VAL", 1], + ["BAND_PINWHEEL_SAT", 1], + ["BAND_PINWHEEL_VAL", 1], + ["BAND_SPIRAL_SAT", 1], + ["BAND_SPIRAL_VAL", 1], + ["CYCLE_ALL", 1], + ["CYCLE_LEFT_RIGHT", 1], + ["CYCLE_UP_DOWN", 1], + ["RAINBOW_MOVING_CHEVRON", 1], + ["CYCLE_OUT_IN", 1], + ["CYCLE_OUT_IN_DUAL", 1], + ["CYCLE_PINWHEEL", 1], + ["CYCLE_SPIRAL", 1], + ["DUAL_BEACON", 1], + ["RAINBOW_BEACON", 1], + ["RAINBOW_PINWHEELS", 1], + ["RAINDROPS", 1], + ["JELLYBEAN_RAINDROPS", 1], + ["TYPING_HEATMAP", 1], + ["DIGITAL_RAIN", 1], + ["SOLID_REACTIVE_SIMPLE", 1], + ["SOLID_REACTIVE", 1], + ["SOLID_REACTIVE_WIDE", 1], + ["SOLID_REACTIVE_MULTIWIDE", 1], + ["SOLID_REACTIVE_CROSS", 1], + ["SOLID_REACTIVE_MULTICROSS", 1], + ["SOLID_REACTIVE_NEXUS", 1], + ["SOLID_REACTIVE_MULTINEXUS", 1], + ["SPLASH", 1], + ["MULTISPLASH", 1], + ["SOLID_SPLASH", 1], + ["SOLID_MULTISPLASH", 1] ], + "supportedLightingValues": [128, 129, 131] + }, + "customKeycodes": [ + { + "name": "Toggle WinKey Lock", + "title": "Toggle WinKey Lock", + "shortName": "WinLock" + } + ], "layouts": { "keymap": [ [ - { - "c": "#ffffff" - }, + {"c": "#ffffff"}, "0,0", "0,1", "0,2", @@ -77,16 +75,12 @@ "0,10", "0,11", "0,12", - { - "w": 2 - }, + {"w": 2}, "0,13", "0,14" ], [ - { - "w": 1.5 - }, + {"w": 1.5}, "1,0", "1,1", "1,2", @@ -100,16 +94,12 @@ "1,10", "1,11", "1,12", - { - "w": 1.5 - }, + {"w": 1.5}, "1,13", "1,14" ], [ - { - "w": 1.75 - }, + {"w": 1.75}, "2,0", "2,1", "2,2", @@ -122,16 +112,12 @@ "2,9", "2,10", "2,11", - { - "w": 2.25 - }, + {"w": 2.25}, "2,13", "2,14" ], [ - { - "w": 2.25 - }, + {"w": 2.25}, "3,0", "3,1", "3,2", @@ -143,34 +129,20 @@ "3,8", "3,9", "3,10", - { - "w": 1.75 - }, + {"w": 1.75}, "3,11", "3,13", "3,14" ], [ - { - "w": 1.25 - }, + {"w": 1.25}, "4,0", - { - "w": 1.25 - }, + {"w": 1.25}, "4,1", - { - "w": 1.25 - }, + {"w": 1.25}, "4,2", - { - "a": 7, - "w": 6.25 - }, + {"w": 6.25}, "4,5", - { - "a": 4 - }, "4,9", "4,10", "4,11", diff --git a/src/ergotravel/ergotravel.json b/src/ergotravel/ergotravel.json index 5e811f4260..0c76571ce8 100644 --- a/src/ergotravel/ergotravel.json +++ b/src/ergotravel/ergotravel.json @@ -1,16 +1,79 @@ { - "name": "ErgoTravel", - "vendorId": "0x4A50", - "productId": "0x4554", - "lighting": "none", - "matrix": {"rows": 8, "cols": 7}, - "layouts": { - - "keymap":[ - [{"a": 7}, "0,0","0,1","0,2","0,3","0,4","0,5","0,6",{ "x": 2},"4,6","4,5","4,4","4,3","4,2","4,1","4,0" ], - ["1,0","1,1","1,2","1,3","1,4","1,5","1,6",{ "x": 2},"5,6","5,5","5,4","5,3","5,2","5,1","5,0" ], - ["2,0","2,1","2,2","2,3","2,4","2,5","2,6",{ "x": 2},"6,6","6,5","6,4","6,3","6,2","6,1","6,0" ], - ["3,0","3,1","3,2","3,3",{ "x": 1},"3,4","3,5",{ "x": 2},"7,5","7,4",{ "x": 1},"7,3","7,2","7,1","7,0" ] - ] - } -} \ No newline at end of file + "name": "ErgoTravel", + "vendorId": "0x4A50", + "productId": "0x4554", + "lighting": "none", + "matrix": {"rows": 8, "cols": 7}, + "layouts": { + "keymap": [ + [ + "0,0", + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + {"x": 2}, + "4,6", + "4,5", + "4,4", + "4,3", + "4,2", + "4,1", + "4,0" + ], + [ + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + {"x": 2}, + "5,6", + "5,5", + "5,4", + "5,3", + "5,2", + "5,1", + "5,0" + ], + [ + "2,0", + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + {"x": 2}, + "6,6", + "6,5", + "6,4", + "6,3", + "6,2", + "6,1", + "6,0" + ], + [ + "3,0", + "3,1", + "3,2", + "3,3", + {"x": 1}, + "3,4", + "3,5", + {"x": 2}, + "7,5", + "7,4", + {"x": 1}, + "7,3", + "7,2", + "7,1", + "7,0" + ] + ] + } +} diff --git a/src/frooastboard/nano/nano.json b/src/frooastboard/nano/nano.json index d1978e9db6..1d6f397bb1 100644 --- a/src/frooastboard/nano/nano.json +++ b/src/frooastboard/nano/nano.json @@ -9,7 +9,7 @@ }, "layouts": { "keymap": [ - [{"c": "#cccccc", "a": 7}, "0,0", {"c": "#cccccc"}, "0,1"], + [{"c": "#cccccc"}, "0,0", {"c": "#cccccc"}, "0,1"], [{"c": "#777777"}, "1,0", {"c": "#cccccc"}, "1,1"] ] } diff --git a/src/handwired/dactyl_manuform/5x7/5x7.json b/src/handwired/dactyl_manuform/5x7/5x7.json index 021bea4a4d..0653faff29 100644 --- a/src/handwired/dactyl_manuform/5x7/5x7.json +++ b/src/handwired/dactyl_manuform/5x7/5x7.json @@ -6,21 +6,100 @@ "matrix": {"rows": 12, "cols": 7}, "layouts": { "keymap": [ - [{"a":7,"w":1.5},"0,0","0,1","0,2","0,3","0,4","0,5","0,6",{"x":4.5},"6,0","6,1","6,2","6,3","6,4","6,5",{"w":1.5},"6,6"], - [{"a":7,"w":1.5},"1,0","1,1","1,2","1,3","1,4","1,5","1,6",{"x":4.5},"7,0","7,1","7,2","7,3","7,4","7,5",{"w":1.5},"7,6"], - [{"a":7,"w":1.5},"2,0","2,1","2,2","2,3","2,4","2,5","2,6",{"x":4.5},"8,0","8,1","8,2","8,3","8,4","8,5",{"w":1.5},"8,6"], - [{"a":7,"w":1.5},"3,0","3,1","3,2","3,3","3,4","3,5",{"x":6.5},"9,1","9,2","9,3","9,4","9,5",{"w":1.5},"9,6"], - [{"x": 0.5},"4,0","4,1","4,2","4,3",{"x":10.5},"10,3","10,4","10,5","10,6"], - [{"r":30,"rx":6.5,"ry":4.25,"y":-0.25,"x":1,"h":1.5},"4,5"], - [{"y":-0.5,"h":1.5},"4,4"], - [{"r":75,"y":-2.5,"x":2.5},"5,5","5,3"], - [{"x":2.5},"5,4","5,2"], - [{"r":-75,"rx":13,"y":-1.25,"x":-4.5},"11,3","11,1"], - [{"x":-4.5},"11,4","11,2"], - [{"r":-30,"y":-1,"x":-2,"h":1.5},"10,1"], - [{"y":-0.5,"x":-1,"h":1.5},"10,2"] - + [ + {"w": 1.5}, + "0,0", + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + {"x": 4.5}, + "6,0", + "6,1", + "6,2", + "6,3", + "6,4", + "6,5", + {"w": 1.5}, + "6,6" + ], + [ + {"w": 1.5}, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + {"x": 4.5}, + "7,0", + "7,1", + "7,2", + "7,3", + "7,4", + "7,5", + {"w": 1.5}, + "7,6" + ], + [ + {"w": 1.5}, + "2,0", + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + {"x": 4.5}, + "8,0", + "8,1", + "8,2", + "8,3", + "8,4", + "8,5", + {"w": 1.5}, + "8,6" + ], + [ + {"w": 1.5}, + "3,0", + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + {"x": 6.5}, + "9,1", + "9,2", + "9,3", + "9,4", + "9,5", + {"w": 1.5}, + "9,6" + ], + [ + {"x": 0.5}, + "4,0", + "4,1", + "4,2", + "4,3", + {"x": 10.5}, + "10,3", + "10,4", + "10,5", + "10,6" + ], + [{"r": 30, "rx": 6.5, "ry": 4.25, "y": -0.25, "x": 1, "h": 1.5}, "4,5"], + [{"y": -0.5, "h": 1.5}, "4,4"], + [{"r": 75, "y": -2.5, "x": 2.5}, "5,5", "5,3"], + [{"x": 2.5}, "5,4", "5,2"], + [{"r": -75, "rx": 13, "y": -1.25, "x": -4.5}, "11,3", "11,1"], + [{"x": -4.5}, "11,4", "11,2"], + [{"r": -30, "y": -1, "x": -2, "h": 1.5}, "10,1"], + [{"y": -0.5, "x": -1, "h": 1.5}, "10,2"] ] } } - diff --git a/src/handwired/marauder/marauder.json b/src/handwired/marauder/marauder.json index 4856873cf8..fd642a8242 100644 --- a/src/handwired/marauder/marauder.json +++ b/src/handwired/marauder/marauder.json @@ -1,12 +1,145 @@ { - "name": "Minshara Marauder", - "vendorId": "0x4D52", - "productId": "0x0001", - "lighting": "qmk_rgblight", - "matrix": {"rows": 12, "cols": 9}, - "layouts":{ - "keymap": [ - [{"c":"#777777"},"0,0",{"x":1,"c":"#cccccc"},"0,1","0,2","0,3","0,4",{"x":0.5,"c":"#777777"},"0,5","0,6","0,7","0,8",{"x":0.5,"c":"#cccccc"},"6,8","6,7","6,6","6,5",{"x":0.25,"c":"#777777"},"6,3","6,2","6,1","6,0"],[{"y":0.5,"c":"#cccccc"},"1,0","1,1","1,2","1,3","1,4","1,5","1,6","1,7","1,8","7,8","7,7","7,6","7,5",{"c":"#aaaaaa","w":2},"7,4",{"x":0.25,"c":"#cccccc"},"7,3","7,2","7,1","7,0"],[{"c":"#aaaaaa","w":1.5},"2,0",{"c":"#cccccc"},"2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8","8,8","8,7","8,6","8,5",{"w":1.5},"8,4",{"x":0.25},"8,3","8,2","8,1",{"h":2},"8,0"],[{"c":"#aaaaaa","w":1.75},"3,0",{"c":"#cccccc"},"3,1","3,2","3,3","3,4","3,5","3,6","3,7","3,8","9,8","9,7","9,6",{"c":"#777777","w":2.25},"9,5",{"x":0.25,"c":"#cccccc"},"9,3","9,2","9,1"],[{"c":"#aaaaaa","w":2.25},"4,0",{"c":"#cccccc"},"4,1","4,2","4,3","4,4","4,5","4,6","4,7","4,8","10,8","10,7",{"c":"#aaaaaa","w":2.75},"10,6",{"x":0.25,"c":"#cccccc"},"10,3","10,2","10,1",{"h":2},"10,0"],[{"c":"#aaaaaa","w":1.5},"5,0","5,1",{"w":1.5},"5,2",{"c":"#cccccc","a":7,"w":7},"5,6",{"c":"#aaaaaa","a":4,"w":1.5},"11,7","11,6",{"w":1.5},"11,4",{"x":0.25,"c":"#cccccc","w":2},"11,3","11,1"] - ] - } -} \ No newline at end of file + "name": "Minshara Marauder", + "vendorId": "0x4D52", + "productId": "0x0001", + "lighting": "qmk_rgblight", + "matrix": {"rows": 12, "cols": 9}, + "layouts": { + "keymap": [ + [ + {"c": "#777777"}, + "0,0", + {"x": 1, "c": "#cccccc"}, + "0,1", + "0,2", + "0,3", + "0,4", + {"x": 0.5, "c": "#777777"}, + "0,5", + "0,6", + "0,7", + "0,8", + {"x": 0.5, "c": "#cccccc"}, + "6,8", + "6,7", + "6,6", + "6,5", + {"x": 0.25, "c": "#777777"}, + "6,3", + "6,2", + "6,1", + "6,0" + ], + [ + {"y": 0.5, "c": "#cccccc"}, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "7,8", + "7,7", + "7,6", + "7,5", + {"c": "#aaaaaa", "w": 2}, + "7,4", + {"x": 0.25, "c": "#cccccc"}, + "7,3", + "7,2", + "7,1", + "7,0" + ], + [ + {"c": "#aaaaaa", "w": 1.5}, + "2,0", + {"c": "#cccccc"}, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "8,8", + "8,7", + "8,6", + "8,5", + {"w": 1.5}, + "8,4", + {"x": 0.25}, + "8,3", + "8,2", + "8,1", + {"h": 2}, + "8,0" + ], + [ + {"c": "#aaaaaa", "w": 1.75}, + "3,0", + {"c": "#cccccc"}, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "9,8", + "9,7", + "9,6", + {"c": "#777777", "w": 2.25}, + "9,5", + {"x": 0.25, "c": "#cccccc"}, + "9,3", + "9,2", + "9,1" + ], + [ + {"c": "#aaaaaa", "w": 2.25}, + "4,0", + {"c": "#cccccc"}, + "4,1", + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "10,8", + "10,7", + {"c": "#aaaaaa", "w": 2.75}, + "10,6", + {"x": 0.25, "c": "#cccccc"}, + "10,3", + "10,2", + "10,1", + {"h": 2}, + "10,0" + ], + [ + {"c": "#aaaaaa", "w": 1.5}, + "5,0", + "5,1", + {"w": 1.5}, + "5,2", + {"c": "#cccccc", "w": 7}, + "5,6", + {"c": "#aaaaaa", "w": 1.5}, + "11,7", + "11,6", + {"w": 1.5}, + "11,4", + {"x": 0.25, "c": "#cccccc", "w": 2}, + "11,3", + "11,1" + ] + ] + } +} diff --git a/src/hhkb_lite_2/hhkb_lite_2.json b/src/hhkb_lite_2/hhkb_lite_2.json index a98c2d7534..8ff07361ce 100644 --- a/src/hhkb_lite_2/hhkb_lite_2.json +++ b/src/hhkb_lite_2/hhkb_lite_2.json @@ -1,49 +1,106 @@ { - "name": "HHKB Lite 2", - "vendorId": "0x88b2", - "productId": "0x88b2", - "keyboard": "hhkb_lite_2", - "lighting": "none", - "matrix": { "rows": 8, "cols": 14 }, - "keymap": "via", - "layout": "LAYOUT", - "layouts": { - "keymap": [ - [{"y": 1.5, "c": "#777777", "f": 4}, "5,9", {"c": "#cccccc", "f": 5}, "1,9", "1,8", "1,7", "1,6", "0,6", "0,5", "1,5", "1,4", "1,3", "1,2", "0,2", "0,4", "4,13", {"f": 4}, "0,9"], - [{"c": "#777777", "w": 1.5}, "3,9", {"c": "#cccccc", "f": 5}, "2,9", "2,8", "2,7", "2,6", "3,6", "3,5", "2,5", "2,4", "2,3", "2,2", "3,2", "3,4", {"c": "#777777", "w": 1.5}, "3,13"], - [{"c": "#aaaaaa", "f": 4, "w": 1.75}, "0,10", {"c": "#cccccc", "f": 5}, "4,9", "4,8", "4,7", "4,6", "5,6", "5,5", "4,5", "4,4", "4,3", "4,2", "5,2", {"c": "#777777", "w": 2.25}, "6,13"], - [{"c": "#aaaaaa", "f": 4, "w": 2.25}, "3,11", {"c": "#cccccc", "f": 5}, "6,9", "6,8", "6,7", "6,6", "7,6", "7,5", "6,5", "6,0", "6,3", "7,2", {"c": "#aaaaaa", "w": 1.75}, "6,11"], - [{"x": 1, "f": 4}, "0,1", "5,12", "4,0", {"c": "#cccccc", "f": 5, "w": 6}, "7,13", {"c": "#aaaaaa", "f": 4}, "3,0", "7,12", {"x": 1, "c": "#777777", "f": 3, "h": 0.75}, "0,0"], - [{"y": -0.25, "x": 12, "h": 0.75}, "3,3", {"h": 0.75}, "1,0", {"h": 0.75}, "2,0"] - ] - }, - "layers": [ - [ - "KC_ESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSLS", "KC_GRV", - "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSPC", - "KC_LCTL", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_ENT", - "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", - "MO(1)", "KC_LALT", "KC_LGUI", "KC_SPC", "KC_RGUI", "KC_RALT", - "KC_UP", - "KC_LEFT", "KC_DOWN", "KC_RGHT" - ], - [ - "RESET", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_INS", "KC_DEL", - "KC_CAPS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_SLCK", "KC_PAUS", "KC_UP", "KC_NO", "KC_TRNS", - "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "KC_PGUP", "KC_LEFT", "KC_RIGHT", "KC_TRNS", - "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_END", "KC_PGDN", "KC_DOWN", "KC_TRNS", - "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_PGUP", - "KC_HOME", "KC_PGDN", "KC_END" - ], - [ - "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", - "KC_TRNS", "KC_TRNS", "KC_TRNS" - ] + "name": "HHKB Lite 2", + "vendorId": "0x88b2", + "productId": "0x88b2", + "lighting": "none", + "matrix": {"rows": 8, "cols": 14}, + "layouts": { + "keymap": [ + [ + {"y": 1.5, "c": "#777777", "f": 4}, + "5,9", + {"c": "#cccccc", "f": 5}, + "1,9", + "1,8", + "1,7", + "1,6", + "0,6", + "0,5", + "1,5", + "1,4", + "1,3", + "1,2", + "0,2", + "0,4", + "4,13", + {"f": 4}, + "0,9" + ], + [ + {"c": "#777777", "w": 1.5}, + "3,9", + {"c": "#cccccc", "f": 5}, + "2,9", + "2,8", + "2,7", + "2,6", + "3,6", + "3,5", + "2,5", + "2,4", + "2,3", + "2,2", + "3,2", + "3,4", + {"c": "#777777", "w": 1.5}, + "3,13" + ], + [ + {"c": "#aaaaaa", "f": 4, "w": 1.75}, + "0,10", + {"c": "#cccccc", "f": 5}, + "4,9", + "4,8", + "4,7", + "4,6", + "5,6", + "5,5", + "4,5", + "4,4", + "4,3", + "4,2", + "5,2", + {"c": "#777777", "w": 2.25}, + "6,13" + ], + [ + {"c": "#aaaaaa", "f": 4, "w": 2.25}, + "3,11", + {"c": "#cccccc", "f": 5}, + "6,9", + "6,8", + "6,7", + "6,6", + "7,6", + "7,5", + "6,5", + "6,0", + "6,3", + "7,2", + {"c": "#aaaaaa", "w": 1.75}, + "6,11" + ], + [ + {"x": 1, "f": 4}, + "0,1", + "5,12", + "4,0", + {"c": "#cccccc", "f": 5, "w": 6}, + "7,13", + {"c": "#aaaaaa", "f": 4}, + "3,0", + "7,12", + {"x": 1, "c": "#777777", "f": 3, "h": 0.75}, + "0,0" + ], + [ + {"y": -0.25, "x": 12, "h": 0.75}, + "3,3", + {"h": 0.75}, + "1,0", + {"h": 0.75}, + "2,0" + ] ] + } } diff --git a/src/jacky_studio/piggy60/via.json b/src/jacky_studio/piggy60/via.json index 742e613f55..ec8362d6ca 100644 --- a/src/jacky_studio/piggy60/via.json +++ b/src/jacky_studio/piggy60/via.json @@ -1,34 +1,162 @@ { - "name": "Piggy60", - "manufacturer": "Jacky", - "vendorId": "0xA13B", - "productId": "0x1001", - "lighting": "qmk_backlight_rgblight", - "matrix": { - "rows": 5, - "cols": 15 - }, - "layouts": { - "labels": [ - "Full Backspace", - "ISO Enter", - "Split Left Shift", - "Full Right Shift", - [ - "Bottom Row", - "Blockerless", - "MX HHKB", - "ANSI" - ] - ], - "keymap": [ - [{"x":2.5,"c":"#777777"},"0,0",{"c":"#cccccc"},"0,1","0,2","0,3","0,4","0,5","0,6","0,7","0,8","0,9","0,10","0,11","0,12","0,13\n\n\n0,0","0,14\n\n\n0,0",{"x":0.5,"c":"#aaaaaa","w":2},"0,14\n\n\n0,1"], - [{"x":2.5,"w":1.5},"1,0",{"c":"#cccccc"},"1,1","1,2","1,3","1,4","1,5","1,6","1,7","1,8","1,9","1,10","1,11","1,12",{"c":"#aaaaaa","w":1.5},"1,13\n\n\n1,0",{"x":1.25,"c":"#777777","w":1.25,"h":2,"w2":1.5,"h2":1,"x2":-0.25},"2,13\n\n\n1,1"], - [{"x":2.5,"c":"#aaaaaa","w":1.75},"2,0",{"c":"#cccccc"},"2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8","2,9","2,10","2,11",{"c":"#777777","w":2.25},"2,13\n\n\n1,0",{"x":0.25,"c":"#cccccc"},"2,12\n\n\n1,1"], - [{"c":"#aaaaaa","w":1.25},"3,0\n\n\n2,1",{"c":"#cccccc"},"3,1\n\n\n2,1",{"x":0.25,"c":"#aaaaaa","w":2.25},"3,0\n\n\n2,0",{"c":"#cccccc"},"3,2","3,3","3,4","3,5","3,6","3,7","3,8","3,9","3,10","3,11",{"c":"#aaaaaa","w":1.75},"3,13\n\n\n3,0","3,14\n\n\n3,0",{"x":0.25,"w":2.75},"3,13\n\n\n3,1"], - [{"x":2.5,"w":1.5},"4,0\n\n\n4,0","4,1\n\n\n4,0",{"w":1.5},"4,2\n\n\n4,0",{"c":"#cccccc","w":7},"4,7\n\n\n4,0",{"c":"#aaaaaa","w":1.5},"4,10\n\n\n4,0","4,12\n\n\n4,0",{"w":1.5},"4,13\n\n\n4,0"], - [{"x":2.5,"c":"#cccccc","w":1.5,"d":true},"4,0\n\n\n4,1",{"c":"#aaaaaa"},"4,1\n\n\n4,1",{"w":1.5},"4,2\n\n\n4,1",{"c":"#cccccc","w":7},"4,7\n\n\n4,1",{"c":"#aaaaaa","w":1.5},"4,10\n\n\n4,1","4,12\n\n\n4,1",{"c":"#cccccc","w":1.5,"d":true},"4,13\n\n\n4,1"], - [{"x":2.5,"c":"#aaaaaa","w":1.25},"4,0\n\n\n4,2",{"w":1.25},"4,1\n\n\n4,2",{"w":1.25},"4,2\n\n\n4,2",{"c":"#cccccc","w":6.25},"4,7\n\n\n4,2",{"c":"#aaaaaa","w":1.25},"4,9\n\n\n4,2",{"w":1.25},"4,10\n\n\n4,2",{"w":1.25},"4,12\n\n\n4,2",{"w":1.25},"4,13\n\n\n4,2"] - ] - } + "name": "Piggy60", + "vendorId": "0xA13B", + "productId": "0x1001", + "lighting": "qmk_backlight_rgblight", + "matrix": { + "rows": 5, + "cols": 15 + }, + "layouts": { + "labels": [ + "Full Backspace", + "ISO Enter", + "Split Left Shift", + "Full Right Shift", + ["Bottom Row", "Blockerless", "MX HHKB", "ANSI"] + ], + "keymap": [ + [ + {"x": 2.5, "c": "#777777"}, + "0,0", + {"c": "#cccccc"}, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + "0,13\n\n\n0,0", + "0,14\n\n\n0,0", + {"x": 0.5, "c": "#aaaaaa", "w": 2}, + "0,14\n\n\n0,1" + ], + [ + {"x": 2.5, "w": 1.5}, + "1,0", + {"c": "#cccccc"}, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + {"c": "#aaaaaa", "w": 1.5}, + "1,13\n\n\n1,0", + { + "x": 1.25, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "2,13\n\n\n1,1" + ], + [ + {"x": 2.5, "c": "#aaaaaa", "w": 1.75}, + "2,0", + {"c": "#cccccc"}, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + {"c": "#777777", "w": 2.25}, + "2,13\n\n\n1,0", + {"x": 0.25, "c": "#cccccc"}, + "2,12\n\n\n1,1" + ], + [ + {"c": "#aaaaaa", "w": 1.25}, + "3,0\n\n\n2,1", + {"c": "#cccccc"}, + "3,1\n\n\n2,1", + {"x": 0.25, "c": "#aaaaaa", "w": 2.25}, + "3,0\n\n\n2,0", + {"c": "#cccccc"}, + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + {"c": "#aaaaaa", "w": 1.75}, + "3,13\n\n\n3,0", + "3,14\n\n\n3,0", + {"x": 0.25, "w": 2.75}, + "3,13\n\n\n3,1" + ], + [ + {"x": 2.5, "w": 1.5}, + "4,0\n\n\n4,0", + "4,1\n\n\n4,0", + {"w": 1.5}, + "4,2\n\n\n4,0", + {"c": "#cccccc", "w": 7}, + "4,7\n\n\n4,0", + {"c": "#aaaaaa", "w": 1.5}, + "4,10\n\n\n4,0", + "4,12\n\n\n4,0", + {"w": 1.5}, + "4,13\n\n\n4,0" + ], + [ + {"x": 2.5, "c": "#cccccc", "w": 1.5, "d": true}, + "4,0\n\n\n4,1", + {"c": "#aaaaaa"}, + "4,1\n\n\n4,1", + {"w": 1.5}, + "4,2\n\n\n4,1", + {"c": "#cccccc", "w": 7}, + "4,7\n\n\n4,1", + {"c": "#aaaaaa", "w": 1.5}, + "4,10\n\n\n4,1", + "4,12\n\n\n4,1", + {"c": "#cccccc", "w": 1.5, "d": true}, + "4,13\n\n\n4,1" + ], + [ + {"x": 2.5, "c": "#aaaaaa", "w": 1.25}, + "4,0\n\n\n4,2", + {"w": 1.25}, + "4,1\n\n\n4,2", + {"w": 1.25}, + "4,2\n\n\n4,2", + {"c": "#cccccc", "w": 6.25}, + "4,7\n\n\n4,2", + {"c": "#aaaaaa", "w": 1.25}, + "4,9\n\n\n4,2", + {"w": 1.25}, + "4,10\n\n\n4,2", + {"w": 1.25}, + "4,12\n\n\n4,2", + {"w": 1.25}, + "4,13\n\n\n4,2" + ] + ] + } } diff --git a/src/kbparadise/v60_type_r.json b/src/kbparadise/v60_type_r.json index b202b4abda..688c4e5fb6 100644 --- a/src/kbparadise/v60_type_r.json +++ b/src/kbparadise/v60_type_r.json @@ -8,8 +8,7 @@ "keymap": [ [ { - "c": "#777777", - "a": 7 + "c": "#777777" }, "0,0", { diff --git a/src/keebzdotnet/wazowski2319/wazowski-23-19-rev0.json b/src/keebzdotnet/wazowski2319/wazowski-23-19-rev0.json index a3aab90dba..b49d7dbcb5 100644 --- a/src/keebzdotnet/wazowski2319/wazowski-23-19-rev0.json +++ b/src/keebzdotnet/wazowski2319/wazowski-23-19-rev0.json @@ -8,7 +8,6 @@ "keymap": [ [ { - "a": 7, "w": 2.25 }, "0,0", diff --git a/src/keychron/s1/ansi_white.json b/src/keychron/s1/ansi_white.json index e9f6acc63f..2111364c9b 100644 --- a/src/keychron/s1/ansi_white.json +++ b/src/keychron/s1/ansi_white.json @@ -3,20 +3,43 @@ "vendorId": "0x3434", "productId": "0x0411", "lighting": {"extends": "none"}, - "keycode" : "qmk_lighting", "matrix": {"rows": 6, "cols": 15}, "customKeycodes": [ - {"name": "Mission Control", "title": "Mission Control in macOS", "shortName": "MCtrl"}, - {"name": "Launch Pad", "title": "Launch Pad in macOS", "shortName": "LPad"}, - {"name": "Left Option", "title": "Left Option in macOS", "shortName": "LOpt"}, - {"name": "Right Option", "title": "Right Option in macOS", "shortName": "ROpt"}, - {"name": "Left Cmd", "title": "Left Command in macOS", "shortName": "LCmd"}, - {"name": "Right Cmd", "title": "Right Command in macOS", "shortName": "RCmd"}, - {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, - {"name": "Task View", "title": "Task View in windows", "shortName": "Task"}, - {"name": "File Explorer", "title": "File Explorer in windows", "shortName": "File"}, - {"name": "Screen Shot", "title": "Screenshot in macOS", "shortName": "SShot"}, - {"name": "Cortana", "title": "Cortana in windows", "shortName": "Cortana"} + { + "name": "Mission Control", + "title": "Mission Control in macOS", + "shortName": "MCtrl" + }, + {"name": "Launch Pad", "title": "Launch Pad in macOS", "shortName": "LPad"}, + { + "name": "Left Option", + "title": "Left Option in macOS", + "shortName": "LOpt" + }, + { + "name": "Right Option", + "title": "Right Option in macOS", + "shortName": "ROpt" + }, + {"name": "Left Cmd", "title": "Left Command in macOS", "shortName": "LCmd"}, + { + "name": "Right Cmd", + "title": "Right Command in macOS", + "shortName": "RCmd" + }, + {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, + {"name": "Task View", "title": "Task View in windows", "shortName": "Task"}, + { + "name": "File Explorer", + "title": "File Explorer in windows", + "shortName": "File" + }, + { + "name": "Screen Shot", + "title": "Screenshot in macOS", + "shortName": "SShot" + }, + {"name": "Cortana", "title": "Cortana in windows", "shortName": "Cortana"} ], "layouts": { "keymap": [ diff --git a/src/keychron/v1/jis.json b/src/keychron/v1/jis.json index a871ae0aea..2b4517609f 100644 --- a/src/keychron/v1/jis.json +++ b/src/keychron/v1/jis.json @@ -32,20 +32,44 @@ }, "matrix": {"rows": 6, "cols": 16}, "customKeycodes": [ - {"name": "Mission Control", "title": "Mission Control in macOS", "shortName": "MCtrl"}, - {"name": "Launch Pad", "title": "Launch Pad in macOS", "shortName": "LPad"}, - {"name": "Left Option", "title": "Left Option in macOS", "shortName": "LOpt"}, - {"name": "Right Option", "title": "Right Option in macOS", "shortName": "ROpt"}, - {"name": "Left Cmd", "title": "Left Command in macOS", "shortName": "LCmd"}, - {"name": "Right Cmd", "title": "Right Command in macOS", "shortName": "RCmd"}, - {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, - {"name": "Task View", "title": "Task View in windows", "shortName": "Task"}, - {"name": "File Explorer", "title": "File Explorer in windows", "shortName": "File"}, - {"name": "Screen Shot", "title": "Screenshot in macOS", "shortName": "SShot"}, - {"name": "Cortana", "title": "Cortana in windows", "shortName": "Cortana"} + { + "name": "Mission Control", + "title": "Mission Control in macOS", + "shortName": "MCtrl" + }, + {"name": "Launch Pad", "title": "Launch Pad in macOS", "shortName": "LPad"}, + { + "name": "Left Option", + "title": "Left Option in macOS", + "shortName": "LOpt" + }, + { + "name": "Right Option", + "title": "Right Option in macOS", + "shortName": "ROpt" + }, + {"name": "Left Cmd", "title": "Left Command in macOS", "shortName": "LCmd"}, + { + "name": "Right Cmd", + "title": "Right Command in macOS", + "shortName": "RCmd" + }, + {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, + {"name": "Task View", "title": "Task View in windows", "shortName": "Task"}, + { + "name": "File Explorer", + "title": "File Explorer in windows", + "shortName": "File" + }, + { + "name": "Screen Shot", + "title": "Screenshot in macOS", + "shortName": "SShot" + }, + {"name": "Cortana", "title": "Cortana in windows", "shortName": "Cortana"} ], "layouts": { - "keymap":[ + "keymap": [ [ { "c": "#777777" @@ -220,7 +244,6 @@ "5,6", { "c": "#aaaaaa", - "a": 7, "w": 1.25 }, "5,9", diff --git a/src/keychron/v1/jis_encoder.json b/src/keychron/v1/jis_encoder.json index b6491b2064..8d41d53662 100644 --- a/src/keychron/v1/jis_encoder.json +++ b/src/keychron/v1/jis_encoder.json @@ -32,20 +32,44 @@ }, "matrix": {"rows": 6, "cols": 16}, "customKeycodes": [ - {"name": "Mission Control", "title": "Mission Control in macOS", "shortName": "MCtrl"}, - {"name": "Launch Pad", "title": "Launch Pad in macOS", "shortName": "LPad"}, - {"name": "Left Option", "title": "Left Option in macOS", "shortName": "LOpt"}, - {"name": "Right Option", "title": "Right Option in macOS", "shortName": "ROpt"}, - {"name": "Left Cmd", "title": "Left Command in macOS", "shortName": "LCmd"}, - {"name": "Right Cmd", "title": "Right Command in macOS", "shortName": "RCmd"}, - {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, - {"name": "Task View", "title": "Task View in windows", "shortName": "Task"}, - {"name": "File Explorer", "title": "File Explorer in windows", "shortName": "File"}, - {"name": "Screen Shot", "title": "Screenshot in macOS", "shortName": "SShot"}, - {"name": "Cortana", "title": "Cortana in windows", "shortName": "Cortana"} + { + "name": "Mission Control", + "title": "Mission Control in macOS", + "shortName": "MCtrl" + }, + {"name": "Launch Pad", "title": "Launch Pad in macOS", "shortName": "LPad"}, + { + "name": "Left Option", + "title": "Left Option in macOS", + "shortName": "LOpt" + }, + { + "name": "Right Option", + "title": "Right Option in macOS", + "shortName": "ROpt" + }, + {"name": "Left Cmd", "title": "Left Command in macOS", "shortName": "LCmd"}, + { + "name": "Right Cmd", + "title": "Right Command in macOS", + "shortName": "RCmd" + }, + {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, + {"name": "Task View", "title": "Task View in windows", "shortName": "Task"}, + { + "name": "File Explorer", + "title": "File Explorer in windows", + "shortName": "File" + }, + { + "name": "Screen Shot", + "title": "Screenshot in macOS", + "shortName": "SShot" + }, + {"name": "Cortana", "title": "Cortana in windows", "shortName": "Cortana"} ], "layouts": { - "keymap":[ + "keymap": [ [ { "c": "#777777" @@ -220,7 +244,6 @@ "5,6", { "c": "#aaaaaa", - "a": 7, "w": 1.25 }, "5,9", diff --git a/src/kprepublic/bm980.json b/src/kprepublic/bm980.json index e3a9bb1bbf..74e582bedb 100644 --- a/src/kprepublic/bm980.json +++ b/src/kprepublic/bm980.json @@ -13,51 +13,33 @@ "layouts": { "keymap": [ [ - { - "c": "#777777" - }, + {"c": "#777777"}, "0,0", - { - "x": 1, - "c": "#cccccc" - }, + {"x": 1, "c": "#cccccc"}, "0,1", "0,2", "0,3", "0,4", - { - "x": 0.5, - "c": "#aaaaaa" - }, + {"x": 0.5, "c": "#aaaaaa"}, "0,5", "0,6", "0,7", "0,8", - { - "x": 0.5, - "c": "#cccccc" - }, + {"x": 0.5, "c": "#cccccc"}, "0,9", "0,10", "0,11", "0,12", - { - "x": 1, - "c": "#aaaaaa" - }, + {"x": 1, "c": "#aaaaaa"}, "0,13", "1,14", "1,10", "1,6" ], [ - { - "y": 0.5 - }, + {"y": 0.5}, "2,0", - { - "c": "#cccccc" - }, + {"c": "#cccccc"}, "2,1", "2,2", "2,3", @@ -70,27 +52,18 @@ "2,10", "2,11", "2,12", - { - "c": "#aaaaaa", - "w": 2 - }, + {"c": "#aaaaaa", "w": 2}, "2,14", - { - "x": 1 - }, + {"x": 1}, "2,13", "1,11", "1,9", "1,2" ], [ - { - "w": 1.5 - }, + {"w": 1.5}, "3,0", - { - "c": "#cccccc" - }, + {"c": "#cccccc"}, "3,1", "3,2", "3,3", @@ -103,32 +76,19 @@ "3,10", "3,11", "3,12", - { - "c": "#aaaaaa", - "w": 1.5 - }, + {"c": "#aaaaaa", "w": 1.5}, "3,14", - { - "x": 1, - "c": "#cccccc" - }, + {"x": 1, "c": "#cccccc"}, "3,13", "1,3", "1,4", - { - "c": "#aaaaaa", - "h": 2 - }, + {"c": "#aaaaaa", "h": 2}, "1,5" ], [ - { - "w": 1.75 - }, + {"w": 1.75}, "4,0", - { - "c": "#cccccc" - }, + {"c": "#cccccc"}, "4,1", "4,2", "4,3", @@ -140,28 +100,17 @@ "4,9", "4,10", "4,11", - { - "c": "#777777", - "w": 2.25 - }, + {"c": "#777777", "w": 2.25}, "4,14", - { - "x": 1, - "c": "#cccccc" - }, + {"x": 1, "c": "#cccccc"}, "4,13", "1,8", "1,7" ], [ - { - "c": "#aaaaaa", - "w": 2.25 - }, + {"c": "#aaaaaa", "w": 2.25}, "5,0", - { - "c": "#cccccc" - }, + {"c": "#cccccc"}, "5,2", "5,3", "5,4", @@ -172,77 +121,34 @@ "5,9", "5,10", "5,11", - { - "c": "#aaaaaa", - "w": 1.75 - }, + {"c": "#aaaaaa", "w": 1.75}, "5,12", - { - "x": 2, - "c": "#cccccc" - }, + {"x": 2, "c": "#cccccc"}, "5,13", "6,8", "6,7", - { - "c": "#aaaaaa", - "h": 2 - }, + {"c": "#aaaaaa", "h": 2}, "6,5" ], + [{"y": -0.75, "x": 14.5, "c": "#777777"}, "5,14"], [ - { - "y": -0.75, - "x": 14.5, - "c": "#777777" - }, - "5,14" - ], - [ - { - "y": -0.25, - "c": "#aaaaaa", - "w": 1.25 - }, + {"y": -0.25, "c": "#aaaaaa", "w": 1.25}, "6,0", - { - "w": 1.25 - }, + {"w": 1.25}, "6,1", - { - "w": 1.25 - }, + {"w": 1.25}, "6,2", - { - "c": "#777777", - "a": 6, - "w": 6.25 - }, + {"c": "#777777", "w": 6.25}, "6,6", - { - "c": "#aaaaaa", - "a": 4 - }, + {"c": "#aaaaaa"}, "6,9", "6,10", "6,11", - { - "x": 4, - "c": "#cccccc" - }, + {"x": 4, "c": "#cccccc"}, "6,3", "6,4" ], - [ - { - "y": -0.75, - "x": 13.5, - "c": "#777777" - }, - "6,12", - "6,14", - "6,13" - ] + [{"y": -0.75, "x": 13.5, "c": "#777777"}, "6,12", "6,14", "6,13"] ] } } diff --git a/src/mechbrewery/mb65h.json b/src/mechbrewery/mb65h.json index 895158cdbb..c02eba4eec 100644 --- a/src/mechbrewery/mb65h.json +++ b/src/mechbrewery/mb65h.json @@ -2,9 +2,8 @@ "name": "Mechbrewery MB-65H", "vendorId": "0x4252", "productId": "0x0002", - "firmwareVersion": 0, "lighting": "none", - "matrix": { "rows": 5, "cols": 16 }, + "matrix": {"rows": 5, "cols": 16}, "layouts": { "keymap": [ [ @@ -50,7 +49,7 @@ "1,15" ], [ - {"c": "#aaaaaa","w": 1.75}, + {"c": "#aaaaaa", "w": 1.75}, "2,0", {"c": "#cccccc"}, "2,2", diff --git a/src/mechbrewery/mb65s.json b/src/mechbrewery/mb65s.json index ba07a91b31..96ae116b46 100644 --- a/src/mechbrewery/mb65s.json +++ b/src/mechbrewery/mb65s.json @@ -2,9 +2,8 @@ "name": "Mechbrewery MB-65S", "vendorId": "0x4252", "productId": "0x3635", - "firmwareVersion": 0, "lighting": "none", - "matrix": { "rows": 5, "cols": 16 }, + "matrix": {"rows": 5, "cols": 16}, "layouts": { "labels": [ ["Backspace", "Default", "Split"], @@ -68,7 +67,7 @@ "2,13\n\n\n1,1" ], [ - {"x": 3, "c": "#aaaaaa","w": 1.75}, + {"x": 3, "c": "#aaaaaa", "w": 1.75}, "2,0", {"c": "#cccccc"}, "2,2", @@ -144,7 +143,8 @@ ], [ { - "y": 0.25, "x": 3, + "y": 0.25, + "x": 3, "w": 1.5 }, "4,0\n\n\n3,1", @@ -159,7 +159,8 @@ }, "4,6\n\n\n3,1", { - "w": 1.5, "c": "#aaaaaa" + "w": 1.5, + "c": "#aaaaaa" }, "4,11\n\n\n3,1" ] diff --git a/src/mesa/mesa_tkl/mesa_tkl.json b/src/mesa/mesa_tkl/mesa_tkl.json index 605ba024bc..ddad8379a9 100644 --- a/src/mesa/mesa_tkl/mesa_tkl.json +++ b/src/mesa/mesa_tkl/mesa_tkl.json @@ -1,30 +1,182 @@ { - "name": "Mesa TKL", - "vendorId": "0x4E5A", - "productId": "0x8001", - "lighting": "none", - "matrix": { - "cols": 17, - "rows": 6 - }, - "layouts": { - "width": 18.25, - "height": 6.25, - "labels": [ - "Split Backspace", - "Split Right Shift", - "Split Left Shift", - "ISO Enter", - "WKL" - ], - "keymap": [ - [{"x":2.5,"c":"#777777"},"0,0",{"x":1,"c":"#cccccc"},"0,1","0,2","0,3","0,4",{"x":0.5,"c":"#aaaaaa"},"0,5","0,6","0,7","0,8",{"x":0.5,"c":"#cccccc"},"0,9","0,10","0,11","0,12",{"x":0.25,"c":"#aaaaaa"},"0,14","0,15","0,16"], - [{"y":0.25,"x":2.5,"c":"#cccccc"},"1,0","1,1","1,2","1,3","1,4","1,5","1,6","1,7","1,8","1,9","1,10","1,11","1,12",{"c":"#aaaaaa","w":2},"1,13\n\n\n0,0",{"x":0.25},"1,14","1,15","1,16",{"x":1,"c":"#cccccc"},"1,13\n\n\n0,1","0,13\n\n\n0,1"], - [{"x":2.5,"c":"#aaaaaa","w":1.5},"2,0",{"c":"#cccccc"},"2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8","2,9","2,10","2,11","2,12",{"w":1.5},"2,13\n\n\n3,0",{"x":0.25,"c":"#aaaaaa"},"2,14","2,15","2,16",{"x":1.75,"c":"#777777","w":1.25,"h":2,"w2":1.5,"h2":1,"x2":-0.25},"2,13\n\n\n3,1"], - [{"x":2.5,"c":"#aaaaaa","w":1.75},"3,0",{"c":"#cccccc"},"3,1","3,2","3,3","3,4","3,5","3,6","3,7","3,8","3,9","3,10","3,11",{"c":"#777777","w":2.25},"3,13\n\n\n3,0",{"x":4,"c":"#cccccc"},"3,13\n\n\n3,1"], - [{"c":"#aaaaaa","w":1.25},"4,0\n\n\n2,1",{"c":"#cccccc"},"4,1\n\n\n2,1",{"x":0.25,"c":"#aaaaaa","w":2.25},"4,0\n\n\n2,0",{"c":"#cccccc"},"4,2","4,3","4,4","4,5","4,6","4,7","4,8","4,9","4,10","4,11",{"c":"#aaaaaa","w":2.75},"4,12\n\n\n1,0",{"x":1.25},"4,15",{"x":1.25,"w":1.75},"4,12\n\n\n1,1","4,13\n\n\n1,1"], - [{"x":2.5,"w":1.5},"5,0\n\n\n4,0","5,1\n\n\n4,0",{"w":1.5},"5,2\n\n\n4,0",{"c":"#cccccc","w":7},"5,6\n\n\n4,0",{"c":"#aaaaaa","w":1.5},"5,10\n\n\n4,0","5,11\n\n\n4,0",{"w":1.5},"5,13\n\n\n4,0",{"x":0.25},"5,14","5,15","5,16"], - [{"y":0.25,"x":2.5,"w":1.5},"5,0\n\n\n4,1",{"d":true},"5,1\n\n\n4,1",{"w":1.5},"5,2\n\n\n4,1",{"c":"#cccccc","w":7},"5,6\n\n\n4,1",{"c":"#aaaaaa","w":1.5},"5,10\n\n\n4,1",{"d":true},"5,11\n\n\n4,1",{"w":1.5},"5,13\n\n\n4,1"] - ] - } + "name": "Mesa TKL", + "vendorId": "0x4E5A", + "productId": "0x8001", + "lighting": "none", + "matrix": { + "cols": 17, + "rows": 6 + }, + "layouts": { + "labels": [ + "Split Backspace", + "Split Right Shift", + "Split Left Shift", + "ISO Enter", + "WKL" + ], + "keymap": [ + [ + {"x": 2.5, "c": "#777777"}, + "0,0", + {"x": 1, "c": "#cccccc"}, + "0,1", + "0,2", + "0,3", + "0,4", + {"x": 0.5, "c": "#aaaaaa"}, + "0,5", + "0,6", + "0,7", + "0,8", + {"x": 0.5, "c": "#cccccc"}, + "0,9", + "0,10", + "0,11", + "0,12", + {"x": 0.25, "c": "#aaaaaa"}, + "0,14", + "0,15", + "0,16" + ], + [ + {"y": 0.25, "x": 2.5, "c": "#cccccc"}, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + {"c": "#aaaaaa", "w": 2}, + "1,13\n\n\n0,0", + {"x": 0.25}, + "1,14", + "1,15", + "1,16", + {"x": 1, "c": "#cccccc"}, + "1,13\n\n\n0,1", + "0,13\n\n\n0,1" + ], + [ + {"x": 2.5, "c": "#aaaaaa", "w": 1.5}, + "2,0", + {"c": "#cccccc"}, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + {"w": 1.5}, + "2,13\n\n\n3,0", + {"x": 0.25, "c": "#aaaaaa"}, + "2,14", + "2,15", + "2,16", + { + "x": 1.75, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "2,13\n\n\n3,1" + ], + [ + {"x": 2.5, "c": "#aaaaaa", "w": 1.75}, + "3,0", + {"c": "#cccccc"}, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + {"c": "#777777", "w": 2.25}, + "3,13\n\n\n3,0", + {"x": 4, "c": "#cccccc"}, + "3,13\n\n\n3,1" + ], + [ + {"c": "#aaaaaa", "w": 1.25}, + "4,0\n\n\n2,1", + {"c": "#cccccc"}, + "4,1\n\n\n2,1", + {"x": 0.25, "c": "#aaaaaa", "w": 2.25}, + "4,0\n\n\n2,0", + {"c": "#cccccc"}, + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "4,9", + "4,10", + "4,11", + {"c": "#aaaaaa", "w": 2.75}, + "4,12\n\n\n1,0", + {"x": 1.25}, + "4,15", + {"x": 1.25, "w": 1.75}, + "4,12\n\n\n1,1", + "4,13\n\n\n1,1" + ], + [ + {"x": 2.5, "w": 1.5}, + "5,0\n\n\n4,0", + "5,1\n\n\n4,0", + {"w": 1.5}, + "5,2\n\n\n4,0", + {"c": "#cccccc", "w": 7}, + "5,6\n\n\n4,0", + {"c": "#aaaaaa", "w": 1.5}, + "5,10\n\n\n4,0", + "5,11\n\n\n4,0", + {"w": 1.5}, + "5,13\n\n\n4,0", + {"x": 0.25}, + "5,14", + "5,15", + "5,16" + ], + [ + {"y": 0.25, "x": 2.5, "w": 1.5}, + "5,0\n\n\n4,1", + {"d": true}, + "5,1\n\n\n4,1", + {"w": 1.5}, + "5,2\n\n\n4,1", + {"c": "#cccccc", "w": 7}, + "5,6\n\n\n4,1", + {"c": "#aaaaaa", "w": 1.5}, + "5,10\n\n\n4,1", + {"d": true}, + "5,11\n\n\n4,1", + {"w": 1.5}, + "5,13\n\n\n4,1" + ] + ] + } } diff --git a/src/mincedshon/ecila/ecila.json b/src/mincedshon/ecila/ecila.json index 64564f13eb..675eaf1bfd 100644 --- a/src/mincedshon/ecila/ecila.json +++ b/src/mincedshon/ecila/ecila.json @@ -2,8 +2,7 @@ "vendorId": "0x534B", "productId": "0x534B", "name": "ecila", - "maintainer": "mincedshon", - "matrix": { "rows": 5, "cols": 15 }, + "matrix": {"rows": 5, "cols": 15}, "lighting": "qmk_rgblight", "layouts": { "keymap": [ diff --git a/src/nopunin10did/jabberwocky/v2/jabberwocky_v2.json b/src/nopunin10did/jabberwocky/v2/jabberwocky_v2.json index fd4ceb784a..bd1a083ce9 100644 --- a/src/nopunin10did/jabberwocky/v2/jabberwocky_v2.json +++ b/src/nopunin10did/jabberwocky/v2/jabberwocky_v2.json @@ -1,576 +1,572 @@ { - "name": "Jabberwocky v2", - "manufacturer": "NoPunIn10Did", - "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/nopunin10did/jabberwocky/v2", - "maintainer": "NoPunIn10Did", - "vendorId": "0x4E50", - "productId": "0x4A58", - "lighting": "qmk_backlight", - "menus": ["qmk_backlight"], - "matrix": { - "rows": 12, - "cols": 10 - }, - "layouts": { - "labels": [ - "Split Backspace", - "ISO Enter", - "Split Left Shift", - "Split Right Shift", - "Split Num 0 and 00", - "Split Num +", - "Split Num Enter" - ], - "keymap": [ - [ - { - "y": 0.25, - "x": 0.75, - "c": "#777777" - }, - "0,2", - { - "x": 0.5, - "c": "#cccccc" - }, - "1,2", - "0,3", - { - "x": 8.75 - }, - "1,7", - "0,8", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "1,8", - "0,9", - "1,9", - "5,9", - { - "x": 0.25 - }, - "0,0", - "1,0", - "0,1", - "1,1" - ], - [ - { - "y": 0.25, - "x": 2, - "c": "#cccccc" - }, - "3,2", - "2,3", - { - "x": 9.25 - }, - "3,7", - "2,8", - "3,8", - { - "c": "#aaaaaa", - "w": 2 - }, - "2,9\n\n\n0,0", - { - "x": 1.25 - }, - "2,0", - "3,0", - "2,1", - "3,1", - { - "x": 0.5, - "c": "#cccccc" - }, - "2,9\n\n\n0,1", - "3,9\n\n\n0,1" - ], - [ - { - "x": 1.25, - "c": "#aaaaaa", - "w": 1.5 - }, - "5,2", - { - "c": "#cccccc" - }, - "4,3", - { - "x": 9.75 - }, - "5,7", - "4,8", - "5,8", - { - "w": 1.5 - }, - "4,9\n\n\n1,0", - { - "x": 1.5 - }, - "4,0", - "5,0", - "4,1", - { - "c": "#aaaaaa", - "h": 2 - }, - "5,1\n\n\n5,0", - { - "x": 1.25, - "c": "#777777", - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, - "7,9\n\n\n1,1", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "5,1\n\n\n5,1" - ], - [ - { - "x": 0.75, - "w": 1.75 - }, - "7,2", - { - "c": "#cccccc" - }, - "6,3", - { - "x": 10.25 - }, - "7,7", - "6,8", - { - "c": "#777777", - "w": 2.25 - }, - "7,9\n\n\n1,0", - { - "x": 1.5, - "c": "#cccccc" - }, - "6,0", - "7,0", - "6,1", - { - "x": 1.25 - }, - "7,8\n\n\n1,1", - { - "x": 1.5, - "c": "#aaaaaa" - }, - "7,1\n\n\n5,1" - ], - [ - { - "w": 2.25 - }, - "8,2\n\n\n2,0", - { - "c": "#cccccc" - }, - "8,3", - { - "x": 10.75 - }, - "9,7", - { - "c": "#aaaaaa", - "w": 2.25 - }, - "9,8\n\n\n3,0", - { - "c": "#777777" - }, - "8,9", - { - "x": 1.25, - "c": "#cccccc" - }, - "8,0", - "9,0", - "8,1", - { - "c": "#777777", - "h": 2 - }, - "11,1\n\n\n6,0", - { - "x": 2.75, - "c": "#aaaaaa" - }, - "9,1\n\n\n6,1" - ], - [ - { - "x": 0.5, - "w": 1.25 - }, - "11,2", - { - "w": 1.25 - }, - "10,3", - { - "x": 10.75, - "w": 1.25 - }, - "11,7", - { - "w": 1.25 - }, - "10,8", - { - "c": "#777777" - }, - "11,8", - "10,9", - "11,9", - { - "x": 0.25, - "c": "#cccccc", - "w": 2 - }, - "11,0\n\n\n4,0", - "10,1", - { - "x": 3.75, - "c": "#777777" - }, - "11,1\n\n\n6,1" - ], - [ - { - "y": 0.25, - "c": "#aaaaaa", - "w": 1.25 - }, - "8,2\n\n\n2,1", - "9,2\n\n\n2,1", - { - "x": 12.75 - }, - "8,8\n\n\n3,1", - { - "w": 1.25 - }, - "9,8\n\n\n3,1", - { - "x": 2.25, - "c": "#cccccc" - }, - "10,0\n\n\n4,1", - "11,0\n\n\n4,1" - ], - [ - { - "r": 14, - "rx": 4, - "ry": 2.5, - "y": -2.37, - "x": 1 - }, - "0,4" - ], - [ - { - "y": -0.8799999999999999 - }, - "1,3", - { - "x": 1, - "c": "#aaaaaa" - }, - "1,4" - ], - [ - { - "y": -0.87, - "x": 3 - }, - "0,5" - ], - [ - { - "x": 1, - "c": "#cccccc" - }, - "2,4" - ], - [ - { - "y": -0.8799999999999999 - }, - "3,3", - { - "x": 1 - }, - "3,4" - ], - [ - { - "y": -0.8700000000000001, - "x": 3 - }, - "2,5" - ], - [ - { - "y": -0.25, - "x": 1 - }, - "4,4" - ], - [ - { - "y": -0.8799999999999999 - }, - "5,3", - { - "x": 1 - }, - "5,4" - ], - [ - { - "y": -0.8700000000000001, - "x": 3 - }, - "4,5" - ], - [ - { - "y": -0.25, - "x": 1 - }, - "6,4" - ], - [ - { - "y": -0.8799999999999999 - }, - "7,3", - { - "x": 1 - }, - "7,4" - ], - [ - { - "y": -0.8700000000000001, - "x": 3 - }, - "6,5" - ], - [ - { - "y": -0.25, - "x": 1 - }, - "8,4" - ], - [ - { - "y": -0.8799999999999999 - }, - "9,3", - { - "x": 1 - }, - "9,4" - ], - [ - { - "y": -0.8700000000000001, - "x": 3 - }, - "8,5", - "10,5" - ], - [ - { - "y": -0.1299999999999999, - "x": 0.5, - "c": "#aaaaaa", - "w": 1.25 - }, - "11,3", - { - "c": "#cccccc", - "w": 1.25 - }, - "10,4" - ], - [ - { - "y": -0.8700000000000001, - "x": 3, - "w": 2 - }, - "11,4" - ], - [ - { - "r": -14, - "rx": 13.25, - "y": -2.37, - "x": -2 - }, - "1,6" - ], - [ - { - "y": -0.8799999999999999, - "x": -3, - "c": "#aaaaaa" - }, - "0,6", - { - "x": 1, - "c": "#cccccc" - }, - "0,7" - ], - [ - { - "y": -0.87, - "x": -4, - "c": "#aaaaaa" - }, - "1,5" - ], - [ - { - "x": -2, - "c": "#cccccc" - }, - "3,6" - ], - [ - { - "y": -0.8799999999999999, - "x": -3 - }, - "2,6", - { - "x": 1 - }, - "2,7" - ], - [ - { - "y": -0.8700000000000001, - "x": -4 - }, - "3,5" - ], - [ - { - "y": -0.25, - "x": -2 - }, - "5,6" - ], - [ - { - "y": -0.8799999999999999, - "x": -3 - }, - "4,6", - { - "x": 1 - }, - "4,7" - ], - [ - { - "y": -0.8700000000000001, - "x": -4 - }, - "5,5" - ], - [ - { - "y": -0.25, - "x": -2 - }, - "7,6" - ], - [ - { - "y": -0.8799999999999999, - "x": -3 - }, - "6,6", - { - "x": 1 - }, - "6,7" - ], - [ - { - "y": -0.8700000000000001, - "x": -4 - }, - "7,5" - ], - [ - { - "y": -0.25, - "x": -2 - }, - "9,6" - ], - [ - { - "y": -0.8799999999999999, - "x": -3 - }, - "8,6", - { - "x": 1 - }, - "8,7" - ], - [ - { - "y": -0.8700000000000001, - "x": -5 - }, - "11,5", - "9,5" - ], - [ - { - "y": -0.1299999999999999, - "x": -2.25, - "c": "#aaaaaa", - "w": 1.25 - }, - "11,6" - ], - [ - { - "y": -0.8700000000000001, - "x": -5, - "c": "#cccccc", - "w": 2.75 - }, - "10,6" - ] -] - } -} \ No newline at end of file + "name": "Jabberwocky v2", + "vendorId": "0x4E50", + "productId": "0x4A58", + "lighting": "qmk_backlight", + "matrix": { + "rows": 12, + "cols": 10 + }, + "layouts": { + "labels": [ + "Split Backspace", + "ISO Enter", + "Split Left Shift", + "Split Right Shift", + "Split Num 0 and 00", + "Split Num +", + "Split Num Enter" + ], + "keymap": [ + [ + { + "y": 0.25, + "x": 0.75, + "c": "#777777" + }, + "0,2", + { + "x": 0.5, + "c": "#cccccc" + }, + "1,2", + "0,3", + { + "x": 8.75 + }, + "1,7", + "0,8", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "1,8", + "0,9", + "1,9", + "5,9", + { + "x": 0.25 + }, + "0,0", + "1,0", + "0,1", + "1,1" + ], + [ + { + "y": 0.25, + "x": 2, + "c": "#cccccc" + }, + "3,2", + "2,3", + { + "x": 9.25 + }, + "3,7", + "2,8", + "3,8", + { + "c": "#aaaaaa", + "w": 2 + }, + "2,9\n\n\n0,0", + { + "x": 1.25 + }, + "2,0", + "3,0", + "2,1", + "3,1", + { + "x": 0.5, + "c": "#cccccc" + }, + "2,9\n\n\n0,1", + "3,9\n\n\n0,1" + ], + [ + { + "x": 1.25, + "c": "#aaaaaa", + "w": 1.5 + }, + "5,2", + { + "c": "#cccccc" + }, + "4,3", + { + "x": 9.75 + }, + "5,7", + "4,8", + "5,8", + { + "w": 1.5 + }, + "4,9\n\n\n1,0", + { + "x": 1.5 + }, + "4,0", + "5,0", + "4,1", + { + "c": "#aaaaaa", + "h": 2 + }, + "5,1\n\n\n5,0", + { + "x": 1.25, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "7,9\n\n\n1,1", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "5,1\n\n\n5,1" + ], + [ + { + "x": 0.75, + "w": 1.75 + }, + "7,2", + { + "c": "#cccccc" + }, + "6,3", + { + "x": 10.25 + }, + "7,7", + "6,8", + { + "c": "#777777", + "w": 2.25 + }, + "7,9\n\n\n1,0", + { + "x": 1.5, + "c": "#cccccc" + }, + "6,0", + "7,0", + "6,1", + { + "x": 1.25 + }, + "7,8\n\n\n1,1", + { + "x": 1.5, + "c": "#aaaaaa" + }, + "7,1\n\n\n5,1" + ], + [ + { + "w": 2.25 + }, + "8,2\n\n\n2,0", + { + "c": "#cccccc" + }, + "8,3", + { + "x": 10.75 + }, + "9,7", + { + "c": "#aaaaaa", + "w": 2.25 + }, + "9,8\n\n\n3,0", + { + "c": "#777777" + }, + "8,9", + { + "x": 1.25, + "c": "#cccccc" + }, + "8,0", + "9,0", + "8,1", + { + "c": "#777777", + "h": 2 + }, + "11,1\n\n\n6,0", + { + "x": 2.75, + "c": "#aaaaaa" + }, + "9,1\n\n\n6,1" + ], + [ + { + "x": 0.5, + "w": 1.25 + }, + "11,2", + { + "w": 1.25 + }, + "10,3", + { + "x": 10.75, + "w": 1.25 + }, + "11,7", + { + "w": 1.25 + }, + "10,8", + { + "c": "#777777" + }, + "11,8", + "10,9", + "11,9", + { + "x": 0.25, + "c": "#cccccc", + "w": 2 + }, + "11,0\n\n\n4,0", + "10,1", + { + "x": 3.75, + "c": "#777777" + }, + "11,1\n\n\n6,1" + ], + [ + { + "y": 0.25, + "c": "#aaaaaa", + "w": 1.25 + }, + "8,2\n\n\n2,1", + "9,2\n\n\n2,1", + { + "x": 12.75 + }, + "8,8\n\n\n3,1", + { + "w": 1.25 + }, + "9,8\n\n\n3,1", + { + "x": 2.25, + "c": "#cccccc" + }, + "10,0\n\n\n4,1", + "11,0\n\n\n4,1" + ], + [ + { + "r": 14, + "rx": 4, + "ry": 2.5, + "y": -2.37, + "x": 1 + }, + "0,4" + ], + [ + { + "y": -0.8799999999999999 + }, + "1,3", + { + "x": 1, + "c": "#aaaaaa" + }, + "1,4" + ], + [ + { + "y": -0.87, + "x": 3 + }, + "0,5" + ], + [ + { + "x": 1, + "c": "#cccccc" + }, + "2,4" + ], + [ + { + "y": -0.8799999999999999 + }, + "3,3", + { + "x": 1 + }, + "3,4" + ], + [ + { + "y": -0.8700000000000001, + "x": 3 + }, + "2,5" + ], + [ + { + "y": -0.25, + "x": 1 + }, + "4,4" + ], + [ + { + "y": -0.8799999999999999 + }, + "5,3", + { + "x": 1 + }, + "5,4" + ], + [ + { + "y": -0.8700000000000001, + "x": 3 + }, + "4,5" + ], + [ + { + "y": -0.25, + "x": 1 + }, + "6,4" + ], + [ + { + "y": -0.8799999999999999 + }, + "7,3", + { + "x": 1 + }, + "7,4" + ], + [ + { + "y": -0.8700000000000001, + "x": 3 + }, + "6,5" + ], + [ + { + "y": -0.25, + "x": 1 + }, + "8,4" + ], + [ + { + "y": -0.8799999999999999 + }, + "9,3", + { + "x": 1 + }, + "9,4" + ], + [ + { + "y": -0.8700000000000001, + "x": 3 + }, + "8,5", + "10,5" + ], + [ + { + "y": -0.1299999999999999, + "x": 0.5, + "c": "#aaaaaa", + "w": 1.25 + }, + "11,3", + { + "c": "#cccccc", + "w": 1.25 + }, + "10,4" + ], + [ + { + "y": -0.8700000000000001, + "x": 3, + "w": 2 + }, + "11,4" + ], + [ + { + "r": -14, + "rx": 13.25, + "y": -2.37, + "x": -2 + }, + "1,6" + ], + [ + { + "y": -0.8799999999999999, + "x": -3, + "c": "#aaaaaa" + }, + "0,6", + { + "x": 1, + "c": "#cccccc" + }, + "0,7" + ], + [ + { + "y": -0.87, + "x": -4, + "c": "#aaaaaa" + }, + "1,5" + ], + [ + { + "x": -2, + "c": "#cccccc" + }, + "3,6" + ], + [ + { + "y": -0.8799999999999999, + "x": -3 + }, + "2,6", + { + "x": 1 + }, + "2,7" + ], + [ + { + "y": -0.8700000000000001, + "x": -4 + }, + "3,5" + ], + [ + { + "y": -0.25, + "x": -2 + }, + "5,6" + ], + [ + { + "y": -0.8799999999999999, + "x": -3 + }, + "4,6", + { + "x": 1 + }, + "4,7" + ], + [ + { + "y": -0.8700000000000001, + "x": -4 + }, + "5,5" + ], + [ + { + "y": -0.25, + "x": -2 + }, + "7,6" + ], + [ + { + "y": -0.8799999999999999, + "x": -3 + }, + "6,6", + { + "x": 1 + }, + "6,7" + ], + [ + { + "y": -0.8700000000000001, + "x": -4 + }, + "7,5" + ], + [ + { + "y": -0.25, + "x": -2 + }, + "9,6" + ], + [ + { + "y": -0.8799999999999999, + "x": -3 + }, + "8,6", + { + "x": 1 + }, + "8,7" + ], + [ + { + "y": -0.8700000000000001, + "x": -5 + }, + "11,5", + "9,5" + ], + [ + { + "y": -0.1299999999999999, + "x": -2.25, + "c": "#aaaaaa", + "w": 1.25 + }, + "11,6" + ], + [ + { + "y": -0.8700000000000001, + "x": -5, + "c": "#cccccc", + "w": 2.75 + }, + "10,6" + ] + ] + } +} diff --git a/src/noxary/268_2/noxary_268.2.json b/src/noxary/268_2/noxary_268.2.json index b056328d85..3c6417977f 100755 --- a/src/noxary/268_2/noxary_268.2.json +++ b/src/noxary/268_2/noxary_268.2.json @@ -94,9 +94,9 @@ "4,1", {"w": 1.25}, "4,2", - {"c": "#DEBFB3", "t": "#363636", "a": 7, "w": 6.25}, + {"c": "#DEBFB3", "t": "#363636", "w": 6.25}, "4,6", - {"c": "#363636", "t": "#DEBFB3", "a": 4, "w": 1.25}, + {"c": "#363636", "t": "#DEBFB3", "w": 1.25}, "4,9", {"w": 1.25}, "4,10", @@ -107,4 +107,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/src/other/aanzee/aanzee.json b/src/other/aanzee/aanzee.json index bf41e09c61..55bd7d587b 100755 --- a/src/other/aanzee/aanzee.json +++ b/src/other/aanzee/aanzee.json @@ -7,9 +7,9 @@ "layouts": { "keymap": [ [ - {"c": "", "t": "", "p": "GMK", "a": 6}, + {"c": "", "t": "", "p": "GMK"}, "0,0", - {"a": 4, "f": 5}, + {"f": 5}, "0,1", "0,2", "0,3", @@ -22,14 +22,13 @@ "0,10", "0,11", "0,12", - {"a": 7, "f": 3}, + {"f": 3}, "0,15", "0,13", - {"a": 6}, "0,14" ], [ - {"a": 4, "w": 1.5}, + {"w": 1.5}, "1,0", {"f": 7}, "1,1", @@ -47,13 +46,12 @@ "1,12", {"f": 3, "w": 1.5}, "1,13", - {"a": 6}, "1,14" ], [ {"w": 1.75}, "2,0", - {"a": 4, "f": 7}, + {"f": 7}, "2,1", "2,2", "2,3", @@ -66,14 +64,14 @@ {"f": 5}, "2,10", "2,11", - {"a": 6, "f": 3, "w": 2.25}, + {"f": 3, "w": 2.25}, "2,13", "2,14" ], [ {"w": 2.25}, "3,0", - {"a": 4, "f": 7}, + {"f": 7}, "3,2", "3,3", "3,4", @@ -85,11 +83,11 @@ "3,9", "3,10", "3,11", - {"a": 6, "f": 3, "w": 1.75}, + {"f": 3, "w": 1.75}, "3,12", - {"a": 4, "f": 9}, + {"f": 9}, "3,13", - {"a": 6, "f": 3}, + {"f": 3}, "3,14" ], [ @@ -99,17 +97,17 @@ "4,1", {"w": 1.25}, "4,2", - {"a": 7, "w": 6.25}, + {"w": 6.25}, "4,6", - {"a": 6, "w": 1.25}, + {"w": 1.25}, "4,9", {"w": 1.25}, "4,10", - {"x": 0.5, "a": 4, "f": 9}, + {"x": 0.5, "f": 9}, "4,12", "4,13", "4,14" ] ] } -} \ No newline at end of file +} diff --git a/src/other/lunar/lunar.json b/src/other/lunar/lunar.json index 84fb5c604e..9f8a685588 100755 --- a/src/other/lunar/lunar.json +++ b/src/other/lunar/lunar.json @@ -7,7 +7,6 @@ "layouts": { "keymap": [ [ - {"a": 7}, "0,0", "0,1", "0,2", @@ -102,4 +101,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/src/other/snagpad/snagpad.json b/src/other/snagpad/snagpad.json index bd4c85c4f6..d3d5255df0 100755 --- a/src/other/snagpad/snagpad.json +++ b/src/other/snagpad/snagpad.json @@ -6,11 +6,11 @@ "matrix": {"rows": 5, "cols": 4}, "layouts": { "keymap": [ - [{"c": "#505557", "t": "#d9d7d7", "a": 7}, "0,0", "0,1", "0,2", "0,3"], + [{"c": "#505557", "t": "#d9d7d7"}, "0,0", "0,1", "0,2", "0,3"], ["1,0", "1,1", "1,2", "1,3"], ["2,0", "2,1", "2,2", "2,3"], ["3,0", "3,1", "3,2", "3,3"], ["4,0", "4,1", "4,2", "4,3"] ] } -} \ No newline at end of file +} diff --git a/src/percent/canoe_gen2/canoe_gen2.json b/src/percent/canoe_gen2/canoe_gen2.json index 66cebc67bc..9d8026220f 100644 --- a/src/percent/canoe_gen2/canoe_gen2.json +++ b/src/percent/canoe_gen2/canoe_gen2.json @@ -5,12 +5,7 @@ "lighting": { "extends": "none", "keycodes": "qmk", - "supportedBacklightValues": [ - 128, - 129, - 130, - 131 - ] + "supportedLightingValues": [128, 129, 130, 131] }, "matrix": { "rows": 5, @@ -18,18 +13,10 @@ }, "layouts": { "labels": [ - [ - "Enter Key", - "ANSI", - "ISO" - ], + ["Enter Key", "ANSI", "ISO"], "Split Left Shift", "Split Backspace", - [ - "Bottom row", - "7u", - "6.25u" - ] + ["Bottom row", "7u", "6.25u"] ], "keymap": [ [ @@ -252,4 +239,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/src/pjb/eros.json b/src/pjb/eros.json index 1299221de8..f56ce619a0 100644 --- a/src/pjb/eros.json +++ b/src/pjb/eros.json @@ -1,260 +1,259 @@ { - "name": "Eros", - "vendorId": "0x5042", - "productId": "0x4552", - "maintainer": "PJB", - "lighting": "none", - "matrix": { - "rows": 6, - "cols": 17 - }, - "layouts": { - "labels": [ - ["Backspace", "Full Backspace", "Split Backspace"], - ["Right Shift", "Full Right Shift", "Split Right Shift"], - ["Bottom Row", "6.25u", "7u"] - ], - "keymap": [ - [ - { - "c": "#777777" - }, - "0,0", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "0,1", - "0,2", - "0,3", - "0,4", - { - "x": 0.25 - }, - "0,5", - "0,6", - "0,7", - "0,8", - { - "x": 0.25 - }, - "0,9", - "0,10", - "0,11", - "0,12", - { - "x": 0.25 - }, - "0,13", - { - "x": 0.25 - }, - "0,14", - "0,15", - "0,16" - ], - [ - { - "y": 0.25, - "c": "#cccccc" - }, - "1,0", - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "1,9", - "1,10", - "1,11", - "1,12", - { - "c": "#aaaaaa", - "w": 2 - }, - "1,13\n\n\n0,0", - { - "x": 0.25 - }, - "1,14", - "1,15", - "1,16", - { - "x": 0.25, - "c": "#cccccc" - }, - "3,12\n\n\n0,1", - "1,13\n\n\n0,1" - ], - [ - { - "c": "#aaaaaa", - "w": 1.5 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - "2,12", - { - "w": 1.5 - }, - "2,13", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "2,14", - "2,15", - "2,16" - ], - [ - { - "w": 1.75 - }, - "3,0", - { - "c": "#cccccc" - }, - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - "3,11", - { - "c": "#777777", - "w": 2.25 - }, - "3,13" - ], - [ - { - "c": "#aaaaaa", - "w": 2.25 - }, - "4,0", - { - "c": "#cccccc" - }, - "4,1", - "4,2", - "4,3", - "4,4", - "4,5", - "4,6", - "4,7", - "4,8", - "4,9", - "4,10", - { - "c": "#aaaaaa", - "w": 2.75 - }, - "4,11\n\n\n1,0", - { - "x": 1.25, - "c": "#777777" - }, - "4,15", - { - "x": 1.25, - "c": "#aaaaaa", - "w": 1.75 - }, - "4,11\n\n\n1,1", - "4,13\n\n\n1,1" - ], - [ - { - "w": 1.25 - }, - "5,0\n\n\n2,0", - { - "w": 1.25 - }, - "5,1\n\n\n2,0", - { - "w": 1.25 - }, - "5,2\n\n\n2,0", - { - "c": "#777777", - "w": 6.25 - }, - "5,5\n\n\n2,0", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "5,9\n\n\n2,0", - { - "w": 1.25 - }, - "5,10\n\n\n2,0", - { - "w": 1.25 - }, - "5,11\n\n\n2,0", - { - "w": 1.25 - }, - "5,13\n\n\n2,0", - { - "x": 0.25, - "c": "#777777" - }, - "5,14", - "5,15", - "5,16" - ], - [ - { - "y": 0.25, - "c": "#aaaaaa", - "w": 1.5 - }, - "5,0\n\n\n2,1", - "5,1\n\n\n2,1", - { - "w": 1.5 - }, - "5,2\n\n\n2,1", - { - "c": "#777777", - "w": 7 - }, - "5,5\n\n\n2,1", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "5,10\n\n\n2,1", - "5,11\n\n\n2,1", - { - "w": 1.5 - }, - "5,13\n\n\n2,1" - ] -] - } + "name": "Eros", + "vendorId": "0x5042", + "productId": "0x4552", + "lighting": "none", + "matrix": { + "rows": 6, + "cols": 17 + }, + "layouts": { + "labels": [ + ["Backspace", "Full Backspace", "Split Backspace"], + ["Right Shift", "Full Right Shift", "Split Right Shift"], + ["Bottom Row", "6.25u", "7u"] + ], + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "0,1", + "0,2", + "0,3", + "0,4", + { + "x": 0.25 + }, + "0,5", + "0,6", + "0,7", + "0,8", + { + "x": 0.25 + }, + "0,9", + "0,10", + "0,11", + "0,12", + { + "x": 0.25 + }, + "0,13", + { + "x": 0.25 + }, + "0,14", + "0,15", + "0,16" + ], + [ + { + "y": 0.25, + "c": "#cccccc" + }, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "1,13\n\n\n0,0", + { + "x": 0.25 + }, + "1,14", + "1,15", + "1,16", + { + "x": 0.25, + "c": "#cccccc" + }, + "3,12\n\n\n0,1", + "1,13\n\n\n0,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.5 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + { + "w": 1.5 + }, + "2,13", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "2,14", + "2,15", + "2,16" + ], + [ + { + "w": 1.75 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "c": "#777777", + "w": 2.25 + }, + "3,13" + ], + [ + { + "c": "#aaaaaa", + "w": 2.25 + }, + "4,0", + { + "c": "#cccccc" + }, + "4,1", + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "4,9", + "4,10", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "4,11\n\n\n1,0", + { + "x": 1.25, + "c": "#777777" + }, + "4,15", + { + "x": 1.25, + "c": "#aaaaaa", + "w": 1.75 + }, + "4,11\n\n\n1,1", + "4,13\n\n\n1,1" + ], + [ + { + "w": 1.25 + }, + "5,0\n\n\n2,0", + { + "w": 1.25 + }, + "5,1\n\n\n2,0", + { + "w": 1.25 + }, + "5,2\n\n\n2,0", + { + "c": "#777777", + "w": 6.25 + }, + "5,5\n\n\n2,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "5,9\n\n\n2,0", + { + "w": 1.25 + }, + "5,10\n\n\n2,0", + { + "w": 1.25 + }, + "5,11\n\n\n2,0", + { + "w": 1.25 + }, + "5,13\n\n\n2,0", + { + "x": 0.25, + "c": "#777777" + }, + "5,14", + "5,15", + "5,16" + ], + [ + { + "y": 0.25, + "c": "#aaaaaa", + "w": 1.5 + }, + "5,0\n\n\n2,1", + "5,1\n\n\n2,1", + { + "w": 1.5 + }, + "5,2\n\n\n2,1", + { + "c": "#777777", + "w": 7 + }, + "5,5\n\n\n2,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,10\n\n\n2,1", + "5,11\n\n\n2,1", + { + "w": 1.5 + }, + "5,13\n\n\n2,1" + ] + ] + } } diff --git a/src/qwertlekeys/calice.json b/src/qwertlekeys/calice.json index 9a7bd806fe..7df2d1e513 100644 --- a/src/qwertlekeys/calice.json +++ b/src/qwertlekeys/calice.json @@ -1,38 +1,104 @@ -{"name": "Calice", - "vendorId": "0x716b", - "productId": "0x0001", - "lighting": "none", - "matrix": {"rows": 12, "cols": 8}, - "layouts": { - "labels": [ - "Split Backspace" - ], - "keymap": [ - [{"y":1.25,"x":2},"1,0",{"x":0.25},"0,0","1,1","0,1","1,2",{"x":5},"0,5","1,5","0,6","1,6",{"x":0.25},"0,7",{"x":0.75},"1,7"], - [{"x":18.5},"3,7"], - [{"y":-0.85,"x":4.75},"3,1",{"x":8.5},"2,6"], - [{"y":-0.9,"x":2.75},"3,0","2,0",{"x":10.5},"3,6",{"c":"#aaaaaa","w":2},"5,6\n\n\n0,0",{"c":"#cccccc"},"5,6\n\n\n0,1","2,7\n\n\n0,1"], - [{"y":-0.25,"x":18.75},"5,7"], - [{"y":-0.8,"x":14},"5,5"], - [{"y":-0.95,"x":2.5,"c":"#aaaaaa","w":1.5},"5,0",{"c":"#cccccc"},"4,0",{"x":10},"4,6","7,6",{"w":1.5},"4,7"], - [{"y":-0.25,"x":19},"7,7"], - [{"y":-0.75,"x":2.25,"c":"#aaaaaa","w":1.75},"7,0",{"c":"#cccccc"},"6,0",{"x":9.5},"7,5","6,6",{"c":"#aaaaaa","w":2.25},"6,7"], - [{"x":2,"w":2.25},"9,0",{"c":"#cccccc"},"8,0",{"x":9},"9,5","8,6",{"c":"#aaaaaa","w":1.75},"9,6",{"c":"#cccccc"},"8,7"], - [{"x":2,"c":"#aaaaaa","w":1.5},"11,0",{"x":13.5,"c":"#cccccc"},"11,6","10,7","11,7"], - [{"r":10,"y":-7.5,"x":7.75},"0,2","1,3"], - [{"y":0.5,"x":6.25},"2,1","3,2","2,2","3,3"], - [{"x":5.7},"5,1","4,1","5,2","4,2"], - [{"x":5.85},"7,1","6,1","7,2","6,2"], - [{"x":6.35},"9,1","8,1","9,2","8,2"], - [{"x":7.5,"a":7,"w":2.25},"11,2",{"c":"#aaaaaa","a":4},"10,2"], - [{"y":-0.95,"x":6,"w":1.5},"10,0"], - [{"r":-10,"y":-3.15,"x":9.5,"c":"#cccccc"},"0,4","1,4"], - [{"y":0.45,"x":9.4},"2,4","3,4","2,5","3,5"], - [{"x":9},"5,3","4,4","5,4","4,5"], - [{"x":9.35},"7,3","6,4","7,4","6,5"], - [{"x":8.9},"9,3","8,4","9,4","8,5"], - [{"x":9,"a":7,"w":2.75},"10,4"], - [{"y":-0.9,"x":11.75,"c":"#aaaaaa","a":4,"w":1.5},"10,5"] - ] - } - } +{ + "name": "Calice", + "vendorId": "0x716b", + "productId": "0x0001", + "lighting": "none", + "matrix": {"rows": 12, "cols": 8}, + "layouts": { + "labels": ["Split Backspace"], + "keymap": [ + [ + {"y": 1.25, "x": 2}, + "1,0", + {"x": 0.25}, + "0,0", + "1,1", + "0,1", + "1,2", + {"x": 5}, + "0,5", + "1,5", + "0,6", + "1,6", + {"x": 0.25}, + "0,7", + {"x": 0.75}, + "1,7" + ], + [{"x": 18.5}, "3,7"], + [{"y": -0.85, "x": 4.75}, "3,1", {"x": 8.5}, "2,6"], + [ + {"y": -0.9, "x": 2.75}, + "3,0", + "2,0", + {"x": 10.5}, + "3,6", + {"c": "#aaaaaa", "w": 2}, + "5,6\n\n\n0,0", + {"c": "#cccccc"}, + "5,6\n\n\n0,1", + "2,7\n\n\n0,1" + ], + [{"y": -0.25, "x": 18.75}, "5,7"], + [{"y": -0.8, "x": 14}, "5,5"], + [ + {"y": -0.95, "x": 2.5, "c": "#aaaaaa", "w": 1.5}, + "5,0", + {"c": "#cccccc"}, + "4,0", + {"x": 10}, + "4,6", + "7,6", + {"w": 1.5}, + "4,7" + ], + [{"y": -0.25, "x": 19}, "7,7"], + [ + {"y": -0.75, "x": 2.25, "c": "#aaaaaa", "w": 1.75}, + "7,0", + {"c": "#cccccc"}, + "6,0", + {"x": 9.5}, + "7,5", + "6,6", + {"c": "#aaaaaa", "w": 2.25}, + "6,7" + ], + [ + {"x": 2, "w": 2.25}, + "9,0", + {"c": "#cccccc"}, + "8,0", + {"x": 9}, + "9,5", + "8,6", + {"c": "#aaaaaa", "w": 1.75}, + "9,6", + {"c": "#cccccc"}, + "8,7" + ], + [ + {"x": 2, "c": "#aaaaaa", "w": 1.5}, + "11,0", + {"x": 13.5, "c": "#cccccc"}, + "11,6", + "10,7", + "11,7" + ], + [{"r": 10, "y": -7.5, "x": 7.75}, "0,2", "1,3"], + [{"y": 0.5, "x": 6.25}, "2,1", "3,2", "2,2", "3,3"], + [{"x": 5.7}, "5,1", "4,1", "5,2", "4,2"], + [{"x": 5.85}, "7,1", "6,1", "7,2", "6,2"], + [{"x": 6.35}, "9,1", "8,1", "9,2", "8,2"], + [{"x": 7.5, "w": 2.25}, "11,2", {"c": "#aaaaaa"}, "10,2"], + [{"y": -0.95, "x": 6, "w": 1.5}, "10,0"], + [{"r": -10, "y": -3.15, "x": 9.5, "c": "#cccccc"}, "0,4", "1,4"], + [{"y": 0.45, "x": 9.4}, "2,4", "3,4", "2,5", "3,5"], + [{"x": 9}, "5,3", "4,4", "5,4", "4,5"], + [{"x": 9.35}, "7,3", "6,4", "7,4", "6,5"], + [{"x": 8.9}, "9,3", "8,4", "9,4", "8,5"], + [{"x": 9, "w": 2.75}, "10,4"], + [{"y": -0.9, "x": 11.75, "c": "#aaaaaa", "w": 1.5}, "10,5"] + ] + } +} diff --git a/src/redox/redox.json b/src/redox/redox.json index ce9fd12a3f..e8731c4360 100644 --- a/src/redox/redox.json +++ b/src/redox/redox.json @@ -1,382 +1,380 @@ { - "name": "Redox", - "vendorId": "0x4D44", - "productId": "0x5244", - "lighting": "qmk_rgblight", - "matrix": {"rows": 10, "cols": 7}, - "layouts": { - - "keymap":[ - [ - { - "x": 3.5, - "a": 7 - }, - "0,3", - { - "x": 10.5 - }, - "5,3" - ], - [ - { - "y": -0.875, - "x": 2.5 - }, - "0,2", - { - "x": 1 - }, - "0,4", - { - "x": 8.5 - }, - "5,4", - { - "x": 1 - }, - "5,2" - ], - [ - { - "y": -0.875, - "x": 5.5 - }, - "0,5", - { - "x": 6.5 - }, - "5,5" - ], - [ - { - "y": -0.875, - "c": "#777777", - "w": 1.5 - }, - "0,0", - { - "c": "#cccccc" - }, - "0,1", - { - "x": 14.5 - }, - "5,1", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "5,0" - ], - [ - { - "y": -0.625, - "x": 6.5, - "c": "#cccccc" - }, - "0,6", - { - "x": 4.5 - }, - "5,6" - ], - [ - { - "y": -0.75, - "x": 3.5 - }, - "1,3", - { - "x": 10.5 - }, - "6,3" - ], - [ - { - "y": -0.875, - "x": 2.5 - }, - "1,2", - { - "x": 1 - }, - "1,4", - { - "x": 8.5 - }, - "6,4", - { - "x": 1 - }, - "6,2" - ], - [ - { - "y": -0.875, - "x": 5.5 - }, - "1,5", - { - "x": 6.5 - }, - "6,5" - ], - [ - { - "y": -0.875, - "c": "#aaaaaa", - "w": 1.5 - }, - "1,0", - { - "c": "#cccccc" - }, - "1,1", - { - "x": 14.5 - }, - "6,1", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "6,0" - ], - [ - { - "y": -0.625, - "x": 6.5, - "c": "#cccccc", - "h": 1.5 - }, - "1,6", - { - "x": 4.5, - "h": 1.5 - }, - "6,6" - ], - [ - { - "y": -0.75, - "x": 3.5 - }, - "2,3", - { - "x": 10.5 - }, - "7,3" - ], - [ - { - "y": -0.875, - "x": 2.5 - }, - "2,2", - { - "x": 1 - }, - "2,4", - { - "x": 8.5 - }, - "7,4", - { - "x": 1 - }, - "7,2" - ], - [ - { - "y": -0.875, - "x": 5.5 - }, - "2,5", - { - "x": 6.5 - }, - "7,5" - ], - [ - { - "y": -0.875, - "c": "#aaaaaa", - "w": 1.5 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - { - "x": 14.5 - }, - "7,1", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "7,0" - ], - [ - { - "y": -0.375, - "x": 3.5, - "c": "#cccccc" - }, - "3,3", - { - "x": 10.5 - }, - "8,3" - ], - [ - { - "y": -0.875, - "x": 2.5 - }, - "3,2", - { - "x": 1 - }, - "3,4", - { - "x": 8.5 - }, - "8,4", - { - "x": 1 - }, - "8,2" - ], - [ - { - "y": -0.875, - "x": 5.5 - }, - "3,5", - { - "x": 6.5 - }, - "8,5" - ], - [ - { - "y": -0.875, - "c": "#aaaaaa", - "w": 1.5 - }, - "3,0", - { - "c": "#cccccc" - }, - "3,1", - { - "x": 14.5 - }, - "8,1", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "8,0" - ], - [ - { - "y": -0.375, - "x": 3.5 - }, - "4,3", - { - "x": 10.5 - }, - "9,3" - ], - [ - { - "y": -0.875, - "x": 2.5 - }, - "4,2", - { - "x": 12.5 - }, - "9,2" - ], - [ - { - "y": -0.75, - "x": 0.5 - }, - "4,0", - "4,1", - { - "x": 14.5 - }, - "9,1", - "9,0" - ], - [ - { - "y": -0.7450000000000001, - "x": 13.5 - }, - "9,4" - ], - [ - { - "y": -0.75, - "x": 5.25 - }, - "4,4" - ], - [ - { - "r": 30, - "rx": 6.5, - "ry": 4.25, - "y": -1, - "x": 1 - }, - "2,6", - "3,6" - ], - [ - { - "x": 1, - "c": "#777777", - "h": 2 - }, - "4,5", - { - "c": "#aaaaaa", - "h": 2 - }, - "4,6" - ], - [ - { - "r": -30, - "rx": 13, - "y": -1, - "x": -3 - }, - "8,6", - "7,6" - ], - [ - { - "x": -3, - "h": 2 - }, - "9,6", - { - "c": "#777777", - "h": 2 - }, - "9,5" - ] - ] - } -} \ No newline at end of file + "name": "Redox", + "vendorId": "0x4D44", + "productId": "0x5244", + "lighting": "qmk_rgblight", + "matrix": {"rows": 10, "cols": 7}, + "layouts": { + "keymap": [ + [ + { + "x": 3.5 + }, + "0,3", + { + "x": 10.5 + }, + "5,3" + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "0,2", + { + "x": 1 + }, + "0,4", + { + "x": 8.5 + }, + "5,4", + { + "x": 1 + }, + "5,2" + ], + [ + { + "y": -0.875, + "x": 5.5 + }, + "0,5", + { + "x": 6.5 + }, + "5,5" + ], + [ + { + "y": -0.875, + "c": "#777777", + "w": 1.5 + }, + "0,0", + { + "c": "#cccccc" + }, + "0,1", + { + "x": 14.5 + }, + "5,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,0" + ], + [ + { + "y": -0.625, + "x": 6.5, + "c": "#cccccc" + }, + "0,6", + { + "x": 4.5 + }, + "5,6" + ], + [ + { + "y": -0.75, + "x": 3.5 + }, + "1,3", + { + "x": 10.5 + }, + "6,3" + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "1,2", + { + "x": 1 + }, + "1,4", + { + "x": 8.5 + }, + "6,4", + { + "x": 1 + }, + "6,2" + ], + [ + { + "y": -0.875, + "x": 5.5 + }, + "1,5", + { + "x": 6.5 + }, + "6,5" + ], + [ + { + "y": -0.875, + "c": "#aaaaaa", + "w": 1.5 + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + { + "x": 14.5 + }, + "6,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "6,0" + ], + [ + { + "y": -0.625, + "x": 6.5, + "c": "#cccccc", + "h": 1.5 + }, + "1,6", + { + "x": 4.5, + "h": 1.5 + }, + "6,6" + ], + [ + { + "y": -0.75, + "x": 3.5 + }, + "2,3", + { + "x": 10.5 + }, + "7,3" + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "2,2", + { + "x": 1 + }, + "2,4", + { + "x": 8.5 + }, + "7,4", + { + "x": 1 + }, + "7,2" + ], + [ + { + "y": -0.875, + "x": 5.5 + }, + "2,5", + { + "x": 6.5 + }, + "7,5" + ], + [ + { + "y": -0.875, + "c": "#aaaaaa", + "w": 1.5 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + { + "x": 14.5 + }, + "7,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "7,0" + ], + [ + { + "y": -0.375, + "x": 3.5, + "c": "#cccccc" + }, + "3,3", + { + "x": 10.5 + }, + "8,3" + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "3,2", + { + "x": 1 + }, + "3,4", + { + "x": 8.5 + }, + "8,4", + { + "x": 1 + }, + "8,2" + ], + [ + { + "y": -0.875, + "x": 5.5 + }, + "3,5", + { + "x": 6.5 + }, + "8,5" + ], + [ + { + "y": -0.875, + "c": "#aaaaaa", + "w": 1.5 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + { + "x": 14.5 + }, + "8,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "8,0" + ], + [ + { + "y": -0.375, + "x": 3.5 + }, + "4,3", + { + "x": 10.5 + }, + "9,3" + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "4,2", + { + "x": 12.5 + }, + "9,2" + ], + [ + { + "y": -0.75, + "x": 0.5 + }, + "4,0", + "4,1", + { + "x": 14.5 + }, + "9,1", + "9,0" + ], + [ + { + "y": -0.7450000000000001, + "x": 13.5 + }, + "9,4" + ], + [ + { + "y": -0.75, + "x": 5.25 + }, + "4,4" + ], + [ + { + "r": 30, + "rx": 6.5, + "ry": 4.25, + "y": -1, + "x": 1 + }, + "2,6", + "3,6" + ], + [ + { + "x": 1, + "c": "#777777", + "h": 2 + }, + "4,5", + { + "c": "#aaaaaa", + "h": 2 + }, + "4,6" + ], + [ + { + "r": -30, + "rx": 13, + "y": -1, + "x": -3 + }, + "8,6", + "7,6" + ], + [ + { + "x": -3, + "h": 2 + }, + "9,6", + { + "c": "#777777", + "h": 2 + }, + "9,5" + ] + ] + } +} diff --git a/src/redox_w/redox_w.json b/src/redox_w/redox_w.json index f696a60286..cbf19c62a4 100644 --- a/src/redox_w/redox_w.json +++ b/src/redox_w/redox_w.json @@ -1,382 +1,380 @@ { - "name": "Redox-W", - "vendorId": "0x4D44", - "productId": "0x5257", - "lighting": "none", - "matrix": {"rows": 5, "cols": 14}, - "layouts": { - - "keymap":[ - [ - { - "x": 3.5, - "a": 7 - }, - "0,3", - { - "x": 10.5 - }, - "0,10" - ], - [ - { - "y": -0.875, - "x": 2.5 - }, - "0,2", - { - "x": 1 - }, - "0,4", - { - "x": 8.5 - }, - "0,9", - { - "x": 1 - }, - "0,11" - ], - [ - { - "y": -0.875, - "x": 5.5 - }, - "0,5", - { - "x": 6.5 - }, - "0,8" - ], - [ - { - "y": -0.875, - "c": "#777777", - "w": 1.5 - }, - "0,0", - { - "c": "#cccccc" - }, - "0,1", - { - "x": 14.5 - }, - "0,12", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "0,13" - ], - [ - { - "y": -0.625, - "x": 6.5, - "c": "#cccccc" - }, - "0,6", - { - "x": 4.5 - }, - "0,7" - ], - [ - { - "y": -0.75, - "x": 3.5 - }, - "1,3", - { - "x": 10.5 - }, - "1,10" - ], - [ - { - "y": -0.875, - "x": 2.5 - }, - "1,2", - { - "x": 1 - }, - "1,4", - { - "x": 8.5 - }, - "1,9", - { - "x": 1 - }, - "1,11" - ], - [ - { - "y": -0.875, - "x": 5.5 - }, - "1,5", - { - "x": 6.5 - }, - "1,8" - ], - [ - { - "y": -0.875, - "c": "#aaaaaa", - "w": 1.5 - }, - "1,0", - { - "c": "#cccccc" - }, - "1,1", - { - "x": 14.5 - }, - "1,12", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "1,13" - ], - [ - { - "y": -0.625, - "x": 6.5, - "c": "#cccccc", - "h": 1.5 - }, - "1,6", - { - "x": 4.5, - "h": 1.5 - }, - "1,7" - ], - [ - { - "y": -0.75, - "x": 3.5 - }, - "2,3", - { - "x": 10.5 - }, - "2,10" - ], - [ - { - "y": -0.875, - "x": 2.5 - }, - "2,2", - { - "x": 1 - }, - "2,4", - { - "x": 8.5 - }, - "2,9", - { - "x": 1 - }, - "2,11" - ], - [ - { - "y": -0.875, - "x": 5.5 - }, - "2,5", - { - "x": 6.5 - }, - "2,8" - ], - [ - { - "y": -0.875, - "c": "#aaaaaa", - "w": 1.5 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - { - "x": 14.5 - }, - "2,12", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "2,13" - ], - [ - { - "y": -0.375, - "x": 3.5, - "c": "#cccccc" - }, - "3,3", - { - "x": 10.5 - }, - "3,10" - ], - [ - { - "y": -0.875, - "x": 2.5 - }, - "3,2", - { - "x": 1 - }, - "3,4", - { - "x": 8.5 - }, - "3,9", - { - "x": 1 - }, - "3,11" - ], - [ - { - "y": -0.875, - "x": 5.5 - }, - "3,5", - { - "x": 6.5 - }, - "3,8" - ], - [ - { - "y": -0.875, - "c": "#aaaaaa", - "w": 1.5 - }, - "3,0", - { - "c": "#cccccc" - }, - "3,1", - { - "x": 14.5 - }, - "3,12", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "3,13" - ], - [ - { - "y": -0.375, - "x": 3.5 - }, - "4,3", - { - "x": 10.5 - }, - "4,10" - ], - [ - { - "y": -0.875, - "x": 2.5 - }, - "4,2", - { - "x": 12.5 - }, - "4,11" - ], - [ - { - "y": -0.75, - "x": 0.5 - }, - "4,0", - "4,1", - { - "x": 14.5 - }, - "4,12", - "4,13" - ], - [ - { - "y": -0.7450000000000001, - "x": 13.5 - }, - "4,9" - ], - [ - { - "y": -0.75, - "x": 5.25 - }, - "4,4" - ], - [ - { - "r": 30, - "rx": 6.5, - "ry": 4.25, - "y": -1, - "x": 1 - }, - "2,6", - "3,6" - ], - [ - { - "x": 1, - "c": "#777777", - "h": 2 - }, - "4,5", - { - "c": "#aaaaaa", - "h": 2 - }, - "4,6" - ], - [ - { - "r": -30, - "rx": 13, - "y": -1, - "x": -3 - }, - "3,7", - "2,7" - ], - [ - { - "x": -3, - "h": 2 - }, - "4,7", - { - "c": "#777777", - "h": 2 - }, - "4,8" - ] - ] - } -} \ No newline at end of file + "name": "Redox-W", + "vendorId": "0x4D44", + "productId": "0x5257", + "lighting": "none", + "matrix": {"rows": 5, "cols": 14}, + "layouts": { + "keymap": [ + [ + { + "x": 3.5 + }, + "0,3", + { + "x": 10.5 + }, + "0,10" + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "0,2", + { + "x": 1 + }, + "0,4", + { + "x": 8.5 + }, + "0,9", + { + "x": 1 + }, + "0,11" + ], + [ + { + "y": -0.875, + "x": 5.5 + }, + "0,5", + { + "x": 6.5 + }, + "0,8" + ], + [ + { + "y": -0.875, + "c": "#777777", + "w": 1.5 + }, + "0,0", + { + "c": "#cccccc" + }, + "0,1", + { + "x": 14.5 + }, + "0,12", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "0,13" + ], + [ + { + "y": -0.625, + "x": 6.5, + "c": "#cccccc" + }, + "0,6", + { + "x": 4.5 + }, + "0,7" + ], + [ + { + "y": -0.75, + "x": 3.5 + }, + "1,3", + { + "x": 10.5 + }, + "1,10" + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "1,2", + { + "x": 1 + }, + "1,4", + { + "x": 8.5 + }, + "1,9", + { + "x": 1 + }, + "1,11" + ], + [ + { + "y": -0.875, + "x": 5.5 + }, + "1,5", + { + "x": 6.5 + }, + "1,8" + ], + [ + { + "y": -0.875, + "c": "#aaaaaa", + "w": 1.5 + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + { + "x": 14.5 + }, + "1,12", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "1,13" + ], + [ + { + "y": -0.625, + "x": 6.5, + "c": "#cccccc", + "h": 1.5 + }, + "1,6", + { + "x": 4.5, + "h": 1.5 + }, + "1,7" + ], + [ + { + "y": -0.75, + "x": 3.5 + }, + "2,3", + { + "x": 10.5 + }, + "2,10" + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "2,2", + { + "x": 1 + }, + "2,4", + { + "x": 8.5 + }, + "2,9", + { + "x": 1 + }, + "2,11" + ], + [ + { + "y": -0.875, + "x": 5.5 + }, + "2,5", + { + "x": 6.5 + }, + "2,8" + ], + [ + { + "y": -0.875, + "c": "#aaaaaa", + "w": 1.5 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + { + "x": 14.5 + }, + "2,12", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "2,13" + ], + [ + { + "y": -0.375, + "x": 3.5, + "c": "#cccccc" + }, + "3,3", + { + "x": 10.5 + }, + "3,10" + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "3,2", + { + "x": 1 + }, + "3,4", + { + "x": 8.5 + }, + "3,9", + { + "x": 1 + }, + "3,11" + ], + [ + { + "y": -0.875, + "x": 5.5 + }, + "3,5", + { + "x": 6.5 + }, + "3,8" + ], + [ + { + "y": -0.875, + "c": "#aaaaaa", + "w": 1.5 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + { + "x": 14.5 + }, + "3,12", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "3,13" + ], + [ + { + "y": -0.375, + "x": 3.5 + }, + "4,3", + { + "x": 10.5 + }, + "4,10" + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "4,2", + { + "x": 12.5 + }, + "4,11" + ], + [ + { + "y": -0.75, + "x": 0.5 + }, + "4,0", + "4,1", + { + "x": 14.5 + }, + "4,12", + "4,13" + ], + [ + { + "y": -0.7450000000000001, + "x": 13.5 + }, + "4,9" + ], + [ + { + "y": -0.75, + "x": 5.25 + }, + "4,4" + ], + [ + { + "r": 30, + "rx": 6.5, + "ry": 4.25, + "y": -1, + "x": 1 + }, + "2,6", + "3,6" + ], + [ + { + "x": 1, + "c": "#777777", + "h": 2 + }, + "4,5", + { + "c": "#aaaaaa", + "h": 2 + }, + "4,6" + ], + [ + { + "r": -30, + "rx": 13, + "y": -1, + "x": -3 + }, + "3,7", + "2,7" + ], + [ + { + "x": -3, + "h": 2 + }, + "4,7", + { + "c": "#777777", + "h": 2 + }, + "4,8" + ] + ] + } +} diff --git a/src/sauce/mild/mild.json b/src/sauce/mild/mild.json index 174520e5cb..d4d17f7983 100644 --- a/src/sauce/mild/mild.json +++ b/src/sauce/mild/mild.json @@ -12,11 +12,6 @@ "Split Right Shift" ], "keymap": [ - { - "x": 13, - "c": "#aaaaaa", - "w": 2 - }, [ { "x": 2.5, diff --git a/src/senselessclay/ck60/ck60.json b/src/senselessclay/ck60/ck60.json index 9dc2c02839..39934a4e74 100644 --- a/src/senselessclay/ck60/ck60.json +++ b/src/senselessclay/ck60/ck60.json @@ -1,18 +1,109 @@ { - "name": "CK60", - "url": "https://candykeys.com/", - "vendorId": "0x4849", - "productId": "0x0601", - "maintainer": "hadi", - "lighting": "qmk_rgblight", - "matrix": { "rows": 5, "cols": 14 }, - "layouts": { - "keymap": [ - [ { "c": "#777777" }, "0,0", { "c": "#cccccc" }, "0,1", "0,2", "0,3", "0,4", "0,5", "0,6", "0,7", "0,8", "0,9", "0,10", "0,11", "0,12", { "c": "#aaaaaa", "w": 2 }, "0,13" ], - [ { "w": 1.5 }, "1,0", { "c": "#cccccc" }, "1,1", "1,2", "1,3", "1,4", "1,5", "1,6", "1,7", "1,8", "1,9", "1,10", "1,11", "1,12", { "x": 0.25, "c": "#777777", "w": 1.25, "h": 2, "w2": 1.5, "h2": 1, "x2": -0.25 }, "1,13" ], - [ { "c": "#cccccc", "w": 1.75 }, "2,0", "2,1", "2,2", "2,3", "2,4", "2,5", "2,6", "2,7", "2,8", "2,9", "2,10", "2,11", "2,12" ], - [ { "w": 1.25 }, "3,0", { "c": "#cccccc" }, "3,1", "3,2", "3,3", "3,4", "3,5", "3,6", "3,7", "3,8", "3,9", "3,10", "3,11", { "c": "#aaaaaa", "w": 2.75 }, "3,12" ], - [ { "w": 1.25 }, "4,0", { "w": 1.25 }, "4,1", { "w": 1.25 }, "4,2", { "c": "#cccccc", "w": 6.25 }, "4,6", { "w": 1.25 }, "4,10", { "w": 1.25 }, "4,11", { "w": 1.25 }, "4,12", { "w": 1.25 }, "4,13" ] + "name": "CK60", + "vendorId": "0x4849", + "productId": "0x0601", + "lighting": "qmk_rgblight", + "matrix": {"rows": 5, "cols": 14}, + "layouts": { + "keymap": [ + [ + {"c": "#777777"}, + "0,0", + {"c": "#cccccc"}, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + {"c": "#aaaaaa", "w": 2}, + "0,13" + ], + [ + {"w": 1.5}, + "1,0", + {"c": "#cccccc"}, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "x": 0.25, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "1,13" + ], + [ + {"c": "#cccccc", "w": 1.75}, + "2,0", + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12" + ], + [ + {"w": 1.25}, + "3,0", + {"c": "#cccccc"}, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + {"c": "#aaaaaa", "w": 2.75}, + "3,12" + ], + [ + {"w": 1.25}, + "4,0", + {"w": 1.25}, + "4,1", + {"w": 1.25}, + "4,2", + {"c": "#cccccc", "w": 6.25}, + "4,6", + {"w": 1.25}, + "4,10", + {"w": 1.25}, + "4,11", + {"w": 1.25}, + "4,12", + {"w": 1.25}, + "4,13" ] - } - } \ No newline at end of file + ] + } +} diff --git a/src/senselessclay/ck65/ck65.json b/src/senselessclay/ck65/ck65.json index 703ba52cb9..b96399aa3a 100644 --- a/src/senselessclay/ck65/ck65.json +++ b/src/senselessclay/ck65/ck65.json @@ -1,18 +1,119 @@ { - "name": "CK65", - "url": "https://candykeys.com/", - "vendorId": "0x4849", - "productId": "0x0651", - "maintainer": "hadi", - "lighting": "qmk_rgblight", - "matrix": { "rows": 5, "cols": 15 }, - "layouts": { - "keymap": [ - [ { "c": "#777777" }, "0,0", { "c": "#cccccc" }, "0,1", "0,2", "0,3", "0,4", "0,5", "0,6", "0,7", "0,8", "0,9", "0,10", "0,11", "0,12", { "c": "#aaaaaa", "w": 2 }, "0,13", "0,14" ], - [ { "w": 1.5 }, "1,0", { "c": "#cccccc" }, "1,1", "1,2", "1,3", "1,4", "1,5", "1,6", "1,7", "1,8", "1,9", "1,10", "1,11", "1,12", { "x": 0.25, "c": "#777777", "w": 1.25, "h": 2, "w2": 1.5, "h2": 1, "x2": -0.25 }, "1,13", { "c": "#aaaaaa" }, "1,14" ], - [ { "w": 1.75 }, "2,0", { "c": "#cccccc" }, "2,1", "2,2", "2,3", "2,4", "2,5", "2,6", "2,7", "2,8", "2,9", "2,10", "2,11", "2,12", { "x": 1.25, "c": "#aaaaaa" }, "2,14" ], - [ { "w": 1.25 }, "3,0", { "c": "#cccccc" }, "3,1", "3,2", "3,3", "3,4", "3,5", "3,6", "3,7", "3,8", "3,9", "3,10", "3,11", { "c": "#aaaaaa", "w": 1.75 }, "3,12", { "c": "#777777" }, "3,13", { "c": "#aaaaaa" }, "3,14" ], - [ { "w": 1.25 }, "4,0", { "w": 1.25 }, "4,1", { "w": 1.25 }, "4,2", { "c": "#cccccc", "w": 6.25 }, "4,6", { "c": "#aaaaaa" }, "4,9", "4,10", "4,11", { "c": "#777777" }, "4,12", "4,13", "4,14" ] + "name": "CK65", + "vendorId": "0x4849", + "productId": "0x0651", + "lighting": "qmk_rgblight", + "matrix": {"rows": 5, "cols": 15}, + "layouts": { + "keymap": [ + [ + {"c": "#777777"}, + "0,0", + {"c": "#cccccc"}, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + {"c": "#aaaaaa", "w": 2}, + "0,13", + "0,14" + ], + [ + {"w": 1.5}, + "1,0", + {"c": "#cccccc"}, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "x": 0.25, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "1,13", + {"c": "#aaaaaa"}, + "1,14" + ], + [ + {"w": 1.75}, + "2,0", + {"c": "#cccccc"}, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + {"x": 1.25, "c": "#aaaaaa"}, + "2,14" + ], + [ + {"w": 1.25}, + "3,0", + {"c": "#cccccc"}, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + {"c": "#aaaaaa", "w": 1.75}, + "3,12", + {"c": "#777777"}, + "3,13", + {"c": "#aaaaaa"}, + "3,14" + ], + [ + {"w": 1.25}, + "4,0", + {"w": 1.25}, + "4,1", + {"w": 1.25}, + "4,2", + {"c": "#cccccc", "w": 6.25}, + "4,6", + {"c": "#aaaaaa"}, + "4,9", + "4,10", + "4,11", + {"c": "#777777"}, + "4,12", + "4,13", + "4,14" ] - } - } \ No newline at end of file + ] + } +} diff --git a/src/senselessclay/had60/had60.json b/src/senselessclay/had60/had60.json index 8231e90235..5461845bad 100644 --- a/src/senselessclay/had60/had60.json +++ b/src/senselessclay/had60/had60.json @@ -1,28 +1,175 @@ { - "name": "had60", - "url": "https://senselessclay.com/", - "vendorId": "0x4849", - "productId": "0x060F", - "maintainer": "hadi", - "lighting": "none", - "matrix": { "rows": 5, "cols": 14 }, - "layouts": { - "labels": [ - "Split Backspace", - "ISO Enter", - "Split Left Shift", - "Split Right Shift", - ["Bottom Row", "STANDARD (6.25U)", "TSANGAN (7U)", "HHKB", "WKL"] - ], - "keymap": [ - [{"x":2.5,"c":"#777777"},"0,0",{"c":"#cccccc"},"0,1","0,2","0,3","0,4","0,5","0,6","0,7","0,8","0,9","0,10","0,11","0,12",{"c":"#aaaaaa","w":2},"0,13\n\n\n0,0",{"x":0.5,"c":"#cccccc"},"0,13\n\n\n0,1","2,13\n\n\n0,1"], - [{"x":2.5,"c":"#aaaaaa","w":1.5},"1,0",{"c":"#cccccc"},"1,1","1,2","1,3","1,4","1,5","1,6","1,7","1,8","1,9","1,10","1,11","1,12",{"w":1.5},"1,13\n\n\n1,0",{"x":1.25,"c":"#777777","w":1.25,"h":2,"w2":1.5,"h2":1,"x2":-0.25},"1,13\n\n\n1,1"], - [{"x":2.5,"c":"#aaaaaa","w":1.75},"2,0",{"c":"#cccccc"},"2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8","2,9","2,10","2,11",{"c":"#777777","w":2.25},"2,12\n\n\n1,0",{"x":0.25,"c":"#cccccc"},"2,12\n\n\n1,1"], - [{"c":"#aaaaaa","w":1.25},"3,0\n\n\n2,1",{"c":"#cccccc"},"3,1\n\n\n2,1",{"x":0.25,"c":"#aaaaaa","w":2.25},"3,0\n\n\n2,0",{"c":"#cccccc"},"3,2","3,3","3,4","3,5","3,6","3,7","3,8","3,9","3,10","3,11",{"c":"#aaaaaa","w":2.75},"3,12\n\n\n3,0",{"x":0.25,"w":1.75},"3,12\n\n\n3,1","3,13\n\n\n3,1"], - [{"x":2.5,"w":1.25},"4,0\n\n\n4,0",{"w":1.25},"4,1\n\n\n4,0",{"w":1.25},"4,2\n\n\n4,0",{"c":"#cccccc","w":6.25},"4,3\n\n\n4,0",{"c":"#aaaaaa","w":1.25},"4,10\n\n\n4,0",{"w":1.25},"4,11\n\n\n4,0",{"w":1.25},"4,12\n\n\n4,0",{"w":1.25},"4,13\n\n\n4,0"], - [{"y":0.25,"x":2.5,"w":1.5},"4,0\n\n\n4,1","4,1\n\n\n4,1",{"w":1.5},"4,2\n\n\n4,1",{"c":"#cccccc","w":7},"4,3\n\n\n4,1",{"c":"#aaaaaa","w":1.5},"4,11\n\n\n4,1","4,12\n\n\n4,1",{"w":1.5},"4,13\n\n\n4,1"], - [{"x":2.5,"w":1.5,"d":true},"\n\n\n4,2","4,1\n\n\n4,2",{"w":1.5},"4,2\n\n\n4,2",{"c":"#cccccc","w":7},"4,3\n\n\n4,2",{"c":"#aaaaaa","w":1.5},"4,11\n\n\n4,2","4,12\n\n\n4,2",{"w":1.5,"d":true},"\n\n\n4,2"], - [{"x":2.5,"w":1.5},"4,0\n\n\n4,3",{"d":true},"\n\n\n4,3",{"w":1.5},"4,2\n\n\n4,3",{"c":"#cccccc","w":7},"4,3\n\n\n4,3",{"c":"#aaaaaa","w":1.5},"4,11\n\n\n4,3",{"d":true},"\n\n\n4,3",{"w":1.5},"4,13\n\n\n4,3"] - ] - } - } \ No newline at end of file + "name": "had60", + "vendorId": "0x4849", + "productId": "0x060F", + "lighting": "none", + "matrix": {"rows": 5, "cols": 14}, + "layouts": { + "labels": [ + "Split Backspace", + "ISO Enter", + "Split Left Shift", + "Split Right Shift", + ["Bottom Row", "STANDARD (6.25U)", "TSANGAN (7U)", "HHKB", "WKL"] + ], + "keymap": [ + [ + {"x": 2.5, "c": "#777777"}, + "0,0", + {"c": "#cccccc"}, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + {"c": "#aaaaaa", "w": 2}, + "0,13\n\n\n0,0", + {"x": 0.5, "c": "#cccccc"}, + "0,13\n\n\n0,1", + "2,13\n\n\n0,1" + ], + [ + {"x": 2.5, "c": "#aaaaaa", "w": 1.5}, + "1,0", + {"c": "#cccccc"}, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + {"w": 1.5}, + "1,13\n\n\n1,0", + { + "x": 1.25, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "1,13\n\n\n1,1" + ], + [ + {"x": 2.5, "c": "#aaaaaa", "w": 1.75}, + "2,0", + {"c": "#cccccc"}, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + {"c": "#777777", "w": 2.25}, + "2,12\n\n\n1,0", + {"x": 0.25, "c": "#cccccc"}, + "2,12\n\n\n1,1" + ], + [ + {"c": "#aaaaaa", "w": 1.25}, + "3,0\n\n\n2,1", + {"c": "#cccccc"}, + "3,1\n\n\n2,1", + {"x": 0.25, "c": "#aaaaaa", "w": 2.25}, + "3,0\n\n\n2,0", + {"c": "#cccccc"}, + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + {"c": "#aaaaaa", "w": 2.75}, + "3,12\n\n\n3,0", + {"x": 0.25, "w": 1.75}, + "3,12\n\n\n3,1", + "3,13\n\n\n3,1" + ], + [ + {"x": 2.5, "w": 1.25}, + "4,0\n\n\n4,0", + {"w": 1.25}, + "4,1\n\n\n4,0", + {"w": 1.25}, + "4,2\n\n\n4,0", + {"c": "#cccccc", "w": 6.25}, + "4,3\n\n\n4,0", + {"c": "#aaaaaa", "w": 1.25}, + "4,10\n\n\n4,0", + {"w": 1.25}, + "4,11\n\n\n4,0", + {"w": 1.25}, + "4,12\n\n\n4,0", + {"w": 1.25}, + "4,13\n\n\n4,0" + ], + [ + {"y": 0.25, "x": 2.5, "w": 1.5}, + "4,0\n\n\n4,1", + "4,1\n\n\n4,1", + {"w": 1.5}, + "4,2\n\n\n4,1", + {"c": "#cccccc", "w": 7}, + "4,3\n\n\n4,1", + {"c": "#aaaaaa", "w": 1.5}, + "4,11\n\n\n4,1", + "4,12\n\n\n4,1", + {"w": 1.5}, + "4,13\n\n\n4,1" + ], + [ + {"x": 2.5, "w": 1.5, "d": true}, + "\n\n\n4,2", + "4,1\n\n\n4,2", + {"w": 1.5}, + "4,2\n\n\n4,2", + {"c": "#cccccc", "w": 7}, + "4,3\n\n\n4,2", + {"c": "#aaaaaa", "w": 1.5}, + "4,11\n\n\n4,2", + "4,12\n\n\n4,2", + {"w": 1.5, "d": true}, + "\n\n\n4,2" + ], + [ + {"x": 2.5, "w": 1.5}, + "4,0\n\n\n4,3", + {"d": true}, + "\n\n\n4,3", + {"w": 1.5}, + "4,2\n\n\n4,3", + {"c": "#cccccc", "w": 7}, + "4,3\n\n\n4,3", + {"c": "#aaaaaa", "w": 1.5}, + "4,11\n\n\n4,3", + {"d": true}, + "\n\n\n4,3", + {"w": 1.5}, + "4,13\n\n\n4,3" + ] + ] + } +} diff --git a/src/skmt/15k/15k.json b/src/skmt/15k/15k.json index 3e1963387a..3af23e10e9 100644 --- a/src/skmt/15k/15k.json +++ b/src/skmt/15k/15k.json @@ -3,10 +3,10 @@ "vendorId": "0xFEFE", "productId": "0x3488", "lighting": "qmk_rgblight", - "matrix": { "rows": 3, "cols": 5 }, + "matrix": {"rows": 3, "cols": 5}, "layouts": { "keymap": [ - [{"c": "#505557", "t": "#d9d7d7", "a": 7},"0,0", "0,1", "0,2", "0,3", "0,4"], + [{"c": "#505557", "t": "#d9d7d7"}, "0,0", "0,1", "0,2", "0,3", "0,4"], ["1,0", "1,1", "1,2", "1,3", "1,4"], ["2,0", "2,1", "2,2", "2,3", "2,4"] ] diff --git a/src/sneakbox/aliceclone/aliceclone.json b/src/sneakbox/aliceclone/aliceclone.json index 8f2cd470d8..02231c43a9 100644 --- a/src/sneakbox/aliceclone/aliceclone.json +++ b/src/sneakbox/aliceclone/aliceclone.json @@ -2,353 +2,350 @@ "vendorId": "0x5342", "productId": "0x0001", "name": "Sneakbox Alice Clone", - "url": "https://sneakbox.design", - "maintainer": "mujimanic", - "matrix": { "rows": 10, "cols": 8 }, + "matrix": {"rows": 10, "cols": 8}, "lighting": "qmk_rgblight", "layouts": { - "keymap": -[ - [ - { - "y": 0.0185, - "x": 0.4445, - "c": "#777777" - }, - "2,0", - { - "x": 2.1806, - "c": "#cccccc" - }, - "0,2", - { - "x": 8.4812, - "c": "#cccccc" - }, - "1,4" - ], - [ - { - "y": -0.8885, - "x": 15.08, - "c": "#cccccc" - }, - "1,6", - "1,7" - ], - [ - { - "y": -0.9996, - "x": 14.0823, - "c": "#cccccc" - }, - "1,5" - ], - [ - { - "y": -0.9998, - "x": 2.6484, - "c": "#cccccc" - }, - "0,1" - ], - [ - { - "y": -0.9999, - "x": 1.6506, - "c": "#cccccc" - }, - "0,0" - ], - [ - { - "y": -0.11430000000000007, - "x": 0.2262, - "c": "#cccccc" - }, - "4,0" - ], - [ - { - "y": -0.9432, - "x": 12.8254, - "c": "#cccccc" - }, - "3,4" - ], - [ - { - "y": -0.9445999999999999, - "x": 13.8015, - "c": "#cccccc" - }, - "3,5", - { - "x": 0.9962, - "w": 1.5, - "c": "#cccccc" - }, - "3,7" - ], - [ - { - "y": -0.9999, - "x": 14.7998, - "c": "#cccccc" - }, - "3,6" - ], - [ - { - "y": -0.9999, - "x": 2.9292, - "c": "#cccccc" - }, - "2,2" - ], - [ - { - "y": -0.9997, - "x": 1.4317, - "w": 1.5, - "c": "#cccccc" - }, - "2,1" - ], - [ - { - "y": -0.11439999999999984, - "c": "#cccccc" - }, - "6,0" - ], - [ - { - "y": -0.8881000000000001, - "x": 15.2718, - "w": 2.25, - "c": "#777777" - }, - "5,6" - ], - [ - { - "y": -0.9998, - "x": 1.2183, - "w": 1.75, - "c": "#cccccc" - }, - "4,1", - { - "x": 10.308700000000002, - "c": "#cccccc" - }, - "5,4" - ], - [ - { - "y": -0.9999000000000002, - "x": 2.9659, - "c": "#cccccc" - }, - "4,2", - { - "x": 10.3093, - "c": "#cccccc" - }, - "5,5" - ], - [ - { - "y": -0.0019999999999997797, - "x": 3.2462, - "c": "#cccccc" - }, - "6,2" - ], - [ - { - "y": -0.9999000000000002, - "x": 12.9967, - "c": "#cccccc" - }, - "7,4", - { - "x": -0.0024999999999995026, - "c": "#cccccc" - }, - "7,5", - { - "x": -0.0024999999999995026, - "w": 1.75, - "c": "#cccccc" - }, - "7,6", - { - "x": -0.002600000000001046, - "c": "#cccccc" - }, - "7,7" - ], - [ - { - "y": -0.9996, - "x": 0.9996, - "w": 2.25, - "c": "#aaaaaa" -}, - "6,1" - ], - [ - { - "y": -0.002500000000000391, - "x": 1.0005, - "w": 1.5, - "c": "#aaaaaa" - }, - "8,1" - ], - [ - { - "y": -0.9973000000000001, - "x": 16.0468, - "w": 1.5, - "c": "#aaaaaa" - }, - "9,7" - ], - [ - { - "r": 12, - "rx": 3.9386, - "ry": 4.109, - "w": 1.5, - "c": "#aaaaaa" - }, - "8,3" - ], - [ - { - "rx": 4.6991, - "ry": 0.2258, - "y": -0.093, - "x": 0.11490000000000045, - "c": "#cccccc" - }, - "0,3", - "0,4", - "0,5", - "0,6" - ], - [ - { - "y": -0.0027999999999999137, - "x": -0.4490999999999996, - "c": "#cccccc" - }, - "2,3", - "2,4", - "2,5", - "2,6" - ], - [ - { - "x": -0.1990999999999996, - "c": "#cccccc" - }, - "4,3", - "4,4", - "4,5", - "4,6" - ], - [ - { - "x": 0.3009000000000004, - "c": "#cccccc" - }, - "6,3", - "6,4", - "6,5", - "6,6" - ], - [ - { - "rx": 5.4334, - "ry": 4.3492, - "w": 2.25, - "c": "#cccccc" - }, - "8,5" - ], - [ - { - "rx": 7.6342, - "ry": 4.817, - "c": "#cccccc" - }, - "8,6" - ], - [ - { - "r": -12, - "rx": 9.0102, - "ry": 0.8597, - "c": "#cccccc" - }, - "1,0", - "1,1", - "1,2", - "1,3" - ], - [ - { - "y": 0.00029999999999996696, - "x": -0.5001999999999995, - "c": "#cccccc" - }, - "3,0", - "3,1", - "3,2", - "3,3" - ], - [ - { - "x": -0.25019999999999953, - "c": "#cccccc" - }, - "5,0", - "5,1", - "5,2", - "5,3" - ], - [ - { - "x": -0.7501999999999995, - "c": "#cccccc" - }, - "7,0", - "7,1", - "7,2", - "7,3" - ], - [ - { - "rx": 9.1085, - "ry": 4.9223, - "w": 2.75, - "c": "#cccccc" - }, - "9,1" - ], - [ - { - "rx": 11.8366, - "ry": 4.4209, - "w": 1.5, - "c": "#aaaaaa" - }, - "9,3" - ] -] + "keymap": [ + [ + { + "y": 0.0185, + "x": 0.4445, + "c": "#777777" + }, + "2,0", + { + "x": 2.1806, + "c": "#cccccc" + }, + "0,2", + { + "x": 8.4812, + "c": "#cccccc" + }, + "1,4" + ], + [ + { + "y": -0.8885, + "x": 15.08, + "c": "#cccccc" + }, + "1,6", + "1,7" + ], + [ + { + "y": -0.9996, + "x": 14.0823, + "c": "#cccccc" + }, + "1,5" + ], + [ + { + "y": -0.9998, + "x": 2.6484, + "c": "#cccccc" + }, + "0,1" + ], + [ + { + "y": -0.9999, + "x": 1.6506, + "c": "#cccccc" + }, + "0,0" + ], + [ + { + "y": -0.11430000000000007, + "x": 0.2262, + "c": "#cccccc" + }, + "4,0" + ], + [ + { + "y": -0.9432, + "x": 12.8254, + "c": "#cccccc" + }, + "3,4" + ], + [ + { + "y": -0.9445999999999999, + "x": 13.8015, + "c": "#cccccc" + }, + "3,5", + { + "x": 0.9962, + "w": 1.5, + "c": "#cccccc" + }, + "3,7" + ], + [ + { + "y": -0.9999, + "x": 14.7998, + "c": "#cccccc" + }, + "3,6" + ], + [ + { + "y": -0.9999, + "x": 2.9292, + "c": "#cccccc" + }, + "2,2" + ], + [ + { + "y": -0.9997, + "x": 1.4317, + "w": 1.5, + "c": "#cccccc" + }, + "2,1" + ], + [ + { + "y": -0.11439999999999984, + "c": "#cccccc" + }, + "6,0" + ], + [ + { + "y": -0.8881000000000001, + "x": 15.2718, + "w": 2.25, + "c": "#777777" + }, + "5,6" + ], + [ + { + "y": -0.9998, + "x": 1.2183, + "w": 1.75, + "c": "#cccccc" + }, + "4,1", + { + "x": 10.308700000000002, + "c": "#cccccc" + }, + "5,4" + ], + [ + { + "y": -0.9999000000000002, + "x": 2.9659, + "c": "#cccccc" + }, + "4,2", + { + "x": 10.3093, + "c": "#cccccc" + }, + "5,5" + ], + [ + { + "y": -0.0019999999999997797, + "x": 3.2462, + "c": "#cccccc" + }, + "6,2" + ], + [ + { + "y": -0.9999000000000002, + "x": 12.9967, + "c": "#cccccc" + }, + "7,4", + { + "x": -0.0024999999999995026, + "c": "#cccccc" + }, + "7,5", + { + "x": -0.0024999999999995026, + "w": 1.75, + "c": "#cccccc" + }, + "7,6", + { + "x": -0.002600000000001046, + "c": "#cccccc" + }, + "7,7" + ], + [ + { + "y": -0.9996, + "x": 0.9996, + "w": 2.25, + "c": "#aaaaaa" + }, + "6,1" + ], + [ + { + "y": -0.002500000000000391, + "x": 1.0005, + "w": 1.5, + "c": "#aaaaaa" + }, + "8,1" + ], + [ + { + "y": -0.9973000000000001, + "x": 16.0468, + "w": 1.5, + "c": "#aaaaaa" + }, + "9,7" + ], + [ + { + "r": 12, + "rx": 3.9386, + "ry": 4.109, + "w": 1.5, + "c": "#aaaaaa" + }, + "8,3" + ], + [ + { + "rx": 4.6991, + "ry": 0.2258, + "y": -0.093, + "x": 0.11490000000000045, + "c": "#cccccc" + }, + "0,3", + "0,4", + "0,5", + "0,6" + ], + [ + { + "y": -0.0027999999999999137, + "x": -0.4490999999999996, + "c": "#cccccc" + }, + "2,3", + "2,4", + "2,5", + "2,6" + ], + [ + { + "x": -0.1990999999999996, + "c": "#cccccc" + }, + "4,3", + "4,4", + "4,5", + "4,6" + ], + [ + { + "x": 0.3009000000000004, + "c": "#cccccc" + }, + "6,3", + "6,4", + "6,5", + "6,6" + ], + [ + { + "rx": 5.4334, + "ry": 4.3492, + "w": 2.25, + "c": "#cccccc" + }, + "8,5" + ], + [ + { + "rx": 7.6342, + "ry": 4.817, + "c": "#cccccc" + }, + "8,6" + ], + [ + { + "r": -12, + "rx": 9.0102, + "ry": 0.8597, + "c": "#cccccc" + }, + "1,0", + "1,1", + "1,2", + "1,3" + ], + [ + { + "y": 0.00029999999999996696, + "x": -0.5001999999999995, + "c": "#cccccc" + }, + "3,0", + "3,1", + "3,2", + "3,3" + ], + [ + { + "x": -0.25019999999999953, + "c": "#cccccc" + }, + "5,0", + "5,1", + "5,2", + "5,3" + ], + [ + { + "x": -0.7501999999999995, + "c": "#cccccc" + }, + "7,0", + "7,1", + "7,2", + "7,3" + ], + [ + { + "rx": 9.1085, + "ry": 4.9223, + "w": 2.75, + "c": "#cccccc" + }, + "9,1" + ], + [ + { + "rx": 11.8366, + "ry": 4.4209, + "w": 1.5, + "c": "#aaaaaa" + }, + "9,3" + ] + ] } } diff --git a/src/sneakbox/aliceclonergb/alicecloneRGB.json b/src/sneakbox/aliceclonergb/alicecloneRGB.json index 2dc45e7762..10200048fa 100644 --- a/src/sneakbox/aliceclonergb/alicecloneRGB.json +++ b/src/sneakbox/aliceclonergb/alicecloneRGB.json @@ -2,353 +2,350 @@ "vendorId": "0x5342", "productId": "0x0006", "name": "Sneakbox Alice Clone", - "url": "https://sneakbox.design", - "maintainer": "mujimanic", - "matrix": { "rows": 10, "cols": 8 }, + "matrix": {"rows": 10, "cols": 8}, "lighting": "qmk_rgblight", "layouts": { - "keymap": -[ - [ - { - "y": 0.0185, - "x": 0.4445, - "c": "#777777" - }, - "2,0", - { - "x": 2.1806, - "c": "#cccccc" - }, - "0,2", - { - "x": 8.4812, - "c": "#cccccc" - }, - "1,4" - ], - [ - { - "y": -0.8885, - "x": 15.08, - "c": "#cccccc" - }, - "1,6", - "1,7" - ], - [ - { - "y": -0.9996, - "x": 14.0823, - "c": "#cccccc" - }, - "1,5" - ], - [ - { - "y": -0.9998, - "x": 2.6484, - "c": "#cccccc" - }, - "0,1" - ], - [ - { - "y": -0.9999, - "x": 1.6506, - "c": "#cccccc" - }, - "0,0" - ], - [ - { - "y": -0.11430000000000007, - "x": 0.2262, - "c": "#cccccc" - }, - "4,0" - ], - [ - { - "y": -0.9432, - "x": 12.8254, - "c": "#cccccc" - }, - "3,4" - ], - [ - { - "y": -0.9445999999999999, - "x": 13.8015, - "c": "#cccccc" - }, - "3,5", - { - "x": 0.9962, - "w": 1.5, - "c": "#cccccc" - }, - "3,7" - ], - [ - { - "y": -0.9999, - "x": 14.7998, - "c": "#cccccc" - }, - "3,6" - ], - [ - { - "y": -0.9999, - "x": 2.9292, - "c": "#cccccc" - }, - "2,2" - ], - [ - { - "y": -0.9997, - "x": 1.4317, - "w": 1.5, - "c": "#cccccc" - }, - "2,1" - ], - [ - { - "y": -0.11439999999999984, - "c": "#cccccc" - }, - "6,0" - ], - [ - { - "y": -0.8881000000000001, - "x": 15.2718, - "w": 2.25, - "c": "#777777" - }, - "5,6" - ], - [ - { - "y": -0.9998, - "x": 1.2183, - "w": 1.75, - "c": "#cccccc" - }, - "4,1", - { - "x": 10.308700000000002, - "c": "#cccccc" - }, - "5,4" - ], - [ - { - "y": -0.9999000000000002, - "x": 2.9659, - "c": "#cccccc" - }, - "4,2", - { - "x": 10.3093, - "c": "#cccccc" - }, - "5,5" - ], - [ - { - "y": -0.0019999999999997797, - "x": 3.2462, - "c": "#cccccc" - }, - "6,2" - ], - [ - { - "y": -0.9999000000000002, - "x": 12.9967, - "c": "#cccccc" - }, - "7,4", - { - "x": -0.0024999999999995026, - "c": "#cccccc" - }, - "7,5", - { - "x": -0.0024999999999995026, - "w": 1.75, - "c": "#cccccc" - }, - "7,6", - { - "x": -0.002600000000001046, - "c": "#cccccc" - }, - "7,7" - ], - [ - { - "y": -0.9996, - "x": 0.9996, - "w": 2.25, - "c": "#aaaaaa" -}, - "6,1" - ], - [ - { - "y": -0.002500000000000391, - "x": 1.0005, - "w": 1.5, - "c": "#aaaaaa" - }, - "8,1" - ], - [ - { - "y": -0.9973000000000001, - "x": 16.0468, - "w": 1.5, - "c": "#aaaaaa" - }, - "9,7" - ], - [ - { - "r": 12, - "rx": 3.9386, - "ry": 4.109, - "w": 1.5, - "c": "#aaaaaa" - }, - "8,3" - ], - [ - { - "rx": 4.6991, - "ry": 0.2258, - "y": -0.093, - "x": 0.11490000000000045, - "c": "#cccccc" - }, - "0,3", - "0,4", - "0,5", - "0,6" - ], - [ - { - "y": -0.0027999999999999137, - "x": -0.4490999999999996, - "c": "#cccccc" - }, - "2,3", - "2,4", - "2,5", - "2,6" - ], - [ - { - "x": -0.1990999999999996, - "c": "#cccccc" - }, - "4,3", - "4,4", - "4,5", - "4,6" - ], - [ - { - "x": 0.3009000000000004, - "c": "#cccccc" - }, - "6,3", - "6,4", - "6,5", - "6,6" - ], - [ - { - "rx": 5.4334, - "ry": 4.3492, - "w": 2.25, - "c": "#cccccc" - }, - "8,5" - ], - [ - { - "rx": 7.6342, - "ry": 4.817, - "c": "#cccccc" - }, - "8,6" - ], - [ - { - "r": -12, - "rx": 9.0102, - "ry": 0.8597, - "c": "#cccccc" - }, - "1,0", - "1,1", - "1,2", - "1,3" - ], - [ - { - "y": 0.00029999999999996696, - "x": -0.5001999999999995, - "c": "#cccccc" - }, - "3,0", - "3,1", - "3,2", - "3,3" - ], - [ - { - "x": -0.25019999999999953, - "c": "#cccccc" - }, - "5,0", - "5,1", - "5,2", - "5,3" - ], - [ - { - "x": -0.7501999999999995, - "c": "#cccccc" - }, - "7,0", - "7,1", - "7,2", - "7,3" - ], - [ - { - "rx": 9.1085, - "ry": 4.9223, - "w": 2.75, - "c": "#cccccc" - }, - "9,1" - ], - [ - { - "rx": 11.8366, - "ry": 4.4209, - "w": 1.5, - "c": "#aaaaaa" - }, - "9,3" - ] -] + "keymap": [ + [ + { + "y": 0.0185, + "x": 0.4445, + "c": "#777777" + }, + "2,0", + { + "x": 2.1806, + "c": "#cccccc" + }, + "0,2", + { + "x": 8.4812, + "c": "#cccccc" + }, + "1,4" + ], + [ + { + "y": -0.8885, + "x": 15.08, + "c": "#cccccc" + }, + "1,6", + "1,7" + ], + [ + { + "y": -0.9996, + "x": 14.0823, + "c": "#cccccc" + }, + "1,5" + ], + [ + { + "y": -0.9998, + "x": 2.6484, + "c": "#cccccc" + }, + "0,1" + ], + [ + { + "y": -0.9999, + "x": 1.6506, + "c": "#cccccc" + }, + "0,0" + ], + [ + { + "y": -0.11430000000000007, + "x": 0.2262, + "c": "#cccccc" + }, + "4,0" + ], + [ + { + "y": -0.9432, + "x": 12.8254, + "c": "#cccccc" + }, + "3,4" + ], + [ + { + "y": -0.9445999999999999, + "x": 13.8015, + "c": "#cccccc" + }, + "3,5", + { + "x": 0.9962, + "w": 1.5, + "c": "#cccccc" + }, + "3,7" + ], + [ + { + "y": -0.9999, + "x": 14.7998, + "c": "#cccccc" + }, + "3,6" + ], + [ + { + "y": -0.9999, + "x": 2.9292, + "c": "#cccccc" + }, + "2,2" + ], + [ + { + "y": -0.9997, + "x": 1.4317, + "w": 1.5, + "c": "#cccccc" + }, + "2,1" + ], + [ + { + "y": -0.11439999999999984, + "c": "#cccccc" + }, + "6,0" + ], + [ + { + "y": -0.8881000000000001, + "x": 15.2718, + "w": 2.25, + "c": "#777777" + }, + "5,6" + ], + [ + { + "y": -0.9998, + "x": 1.2183, + "w": 1.75, + "c": "#cccccc" + }, + "4,1", + { + "x": 10.308700000000002, + "c": "#cccccc" + }, + "5,4" + ], + [ + { + "y": -0.9999000000000002, + "x": 2.9659, + "c": "#cccccc" + }, + "4,2", + { + "x": 10.3093, + "c": "#cccccc" + }, + "5,5" + ], + [ + { + "y": -0.0019999999999997797, + "x": 3.2462, + "c": "#cccccc" + }, + "6,2" + ], + [ + { + "y": -0.9999000000000002, + "x": 12.9967, + "c": "#cccccc" + }, + "7,4", + { + "x": -0.0024999999999995026, + "c": "#cccccc" + }, + "7,5", + { + "x": -0.0024999999999995026, + "w": 1.75, + "c": "#cccccc" + }, + "7,6", + { + "x": -0.002600000000001046, + "c": "#cccccc" + }, + "7,7" + ], + [ + { + "y": -0.9996, + "x": 0.9996, + "w": 2.25, + "c": "#aaaaaa" + }, + "6,1" + ], + [ + { + "y": -0.002500000000000391, + "x": 1.0005, + "w": 1.5, + "c": "#aaaaaa" + }, + "8,1" + ], + [ + { + "y": -0.9973000000000001, + "x": 16.0468, + "w": 1.5, + "c": "#aaaaaa" + }, + "9,7" + ], + [ + { + "r": 12, + "rx": 3.9386, + "ry": 4.109, + "w": 1.5, + "c": "#aaaaaa" + }, + "8,3" + ], + [ + { + "rx": 4.6991, + "ry": 0.2258, + "y": -0.093, + "x": 0.11490000000000045, + "c": "#cccccc" + }, + "0,3", + "0,4", + "0,5", + "0,6" + ], + [ + { + "y": -0.0027999999999999137, + "x": -0.4490999999999996, + "c": "#cccccc" + }, + "2,3", + "2,4", + "2,5", + "2,6" + ], + [ + { + "x": -0.1990999999999996, + "c": "#cccccc" + }, + "4,3", + "4,4", + "4,5", + "4,6" + ], + [ + { + "x": 0.3009000000000004, + "c": "#cccccc" + }, + "6,3", + "6,4", + "6,5", + "6,6" + ], + [ + { + "rx": 5.4334, + "ry": 4.3492, + "w": 2.25, + "c": "#cccccc" + }, + "8,5" + ], + [ + { + "rx": 7.6342, + "ry": 4.817, + "c": "#cccccc" + }, + "8,6" + ], + [ + { + "r": -12, + "rx": 9.0102, + "ry": 0.8597, + "c": "#cccccc" + }, + "1,0", + "1,1", + "1,2", + "1,3" + ], + [ + { + "y": 0.00029999999999996696, + "x": -0.5001999999999995, + "c": "#cccccc" + }, + "3,0", + "3,1", + "3,2", + "3,3" + ], + [ + { + "x": -0.25019999999999953, + "c": "#cccccc" + }, + "5,0", + "5,1", + "5,2", + "5,3" + ], + [ + { + "x": -0.7501999999999995, + "c": "#cccccc" + }, + "7,0", + "7,1", + "7,2", + "7,3" + ], + [ + { + "rx": 9.1085, + "ry": 4.9223, + "w": 2.75, + "c": "#cccccc" + }, + "9,1" + ], + [ + { + "rx": 11.8366, + "ry": 4.4209, + "w": 1.5, + "c": "#aaaaaa" + }, + "9,3" + ] + ] } } diff --git a/src/sneakbox/ava/ava.json b/src/sneakbox/ava/ava.json index 6c13358262..ec2938d38c 100644 --- a/src/sneakbox/ava/ava.json +++ b/src/sneakbox/ava/ava.json @@ -2,313 +2,309 @@ "vendorId": "0x5342", "productId": "0x0004", "name": "AVA", - "url": "https://sneakbox.com", - "maintainer": "mujimanic", - "matrix": { "rows": 9, "cols": 8 }, + "matrix": {"rows": 9, "cols": 8}, "lighting": "qmk_rgblight", "layouts": { - "labels": [ - "Split Backspace" - ], + "labels": ["Split Backspace"], "keymap": [ - [ - { - "y": 0.02, - "x": 0.69, - "c": "#777777" - }, - "2,0", - { - "x": 2.19, - "c": "#cccccc" - }, - "0,2", - { - "x": 8.48 - }, - "1,4" - ], - [ - { - "y": -0.89, - "x": 1.9 - }, - "0,0", - "0,1", - { - "x": 10.43 - }, - "1,5", - { - "c": "#aaaaaa", - "w": 2 - }, - "1,6\n\n\n0,0", - { - "x": 0.25 - }, - "1,6\n\n\n0,1", - "1,7\n\n\n0,1" - ], - [ - { - "y": -0.1100000000000001, - "x": 0.48, - "c": "#cccccc" - }, - "4,0" - ], - [ - { - "y": -0.95, - "x": 13.08 - }, - "3,4" - ], - [ - { - "y": -0.94, - "x": 1.68, - "c": "#aaaaaa", - "w": 1.5 - }, - "2,1", - { - "c": "#cccccc" - }, - "2,2", - { - "x": 9.87 - }, - "3,5", - "3,6", - { - "w": 1.5 - }, - "3,7" - ], - [ - { - "y": -0.1200000000000001, - "x": 0.25 - }, - "6,0" - ], - [ - { - "y": -0.8799999999999999, - "x": 1.47, - "c": "#aaaaaa", - "w": 1.75 - }, - "4,1", - { - "c": "#cccccc" - }, - "4,2", - { - "x": 9.310000000000002 - }, - "5,4", - "5,5", - { - "x": -0.009999999999999787, - "c": "#777777", - "w": 2.25 - }, - "5,6" - ], - [ - { - "y": -0.1200000000000001, - "x": 0.1, - "c": "#cccccc" - }, - "0,7" - ], - [ - { - "y": -0.8900000000000001, - "x": 3.5 - }, - "6,2" - ], - [ - { - "y": -0.9900000000000002, - "x": 1.25, - "c": "#aaaaaa", - "w": 2.25 - }, - "6,1", - { - "x": 9.75, - "c": "#cccccc" - }, - "7,4", - { - "x": -0.009999999999999787 - }, - "7,5", - { - "x": 1.5000000000000018, - "c": "#aaaaaa", - "w": 1.5 - }, - "7,7" - ], - [ - { - "y": -0.75, - "x": 15.49, - "c": "#777777" - }, - "7,6" - ], - [ - { - "y": -0.2599999999999998, - "x": 1.25, - "c": "#aaaaaa", - "w": 1.5 - }, - "2,7" - ], - [ - { - "y": -0.9900000000000002, - "x": 2.75 - }, - "4,7" - ], - [ - { - "y": -0.75, - "x": 14.5, - "c": "#777777" - }, - "8,5", - { - "x": -0.009999999999999787 - }, - "8,6", - { - "x": 0.010000000000001563 - }, - "8,7" - ], - [ - { - "r": 12, - "rx": 4.6991, - "ry": 0.2258, - "y": -0.0958, - "x": 0.3609, - "c": "#cccccc" - }, - "0,3", - "0,4", - "0,5", - "0,6" - ], - [ - { - "x": -0.1990999999999996 - }, - "2,3", - "2,4", - "2,5", - "2,6" - ], - [ - { - "x": 0.05090000000000039 - }, - "4,3", - "4,4", - "4,5", - "4,6" - ], - [ - { - "x": 0.5509000000000004 - }, - "6,3", - "6,4", - "6,5", - "6,6" - ], - [ - { - "rx": 5.4334, - "ry": 4.3492, - "y": 0.0007999999999999119, - "x": -0.25340000000000007, - "w": 1.5 - }, - "5,7" - ], - [ - { - "rx": 7.6342, - "ry": 4.817, - "y": 0.0030000000000001137, - "x": -1.0042, - "w": 2.25 - }, - "6,7" - ], - [ - { - "r": -12, - "rx": 9.0102, - "ry": 0.8597, - "y": 0.00029999999999996696, - "x": 0.24980000000000047 - }, - "1,0", - "1,1", - "1,2", - "1,3" - ], - [ - { - "x": -0.25019999999999953 - }, - "3,0", - "3,1", - "3,2", - "3,3" - ], - [ - { - "x": -0.00019999999999953388 - }, - "5,0", - "5,1", - "5,2", - "5,3" - ], - [ - { - "x": -0.5001999999999995 - }, - "7,0", - "7,1", - "7,2", - "7,3" - ], - [ - { - "rx": 9.1085, - "ry": 4.9223, - "y": -0.0022999999999999687, - "x": 0.25150000000000006, - "w": 2.75 - }, - "8,1", - "8,3" - ] -] + [ + { + "y": 0.02, + "x": 0.69, + "c": "#777777" + }, + "2,0", + { + "x": 2.19, + "c": "#cccccc" + }, + "0,2", + { + "x": 8.48 + }, + "1,4" + ], + [ + { + "y": -0.89, + "x": 1.9 + }, + "0,0", + "0,1", + { + "x": 10.43 + }, + "1,5", + { + "c": "#aaaaaa", + "w": 2 + }, + "1,6\n\n\n0,0", + { + "x": 0.25 + }, + "1,6\n\n\n0,1", + "1,7\n\n\n0,1" + ], + [ + { + "y": -0.1100000000000001, + "x": 0.48, + "c": "#cccccc" + }, + "4,0" + ], + [ + { + "y": -0.95, + "x": 13.08 + }, + "3,4" + ], + [ + { + "y": -0.94, + "x": 1.68, + "c": "#aaaaaa", + "w": 1.5 + }, + "2,1", + { + "c": "#cccccc" + }, + "2,2", + { + "x": 9.87 + }, + "3,5", + "3,6", + { + "w": 1.5 + }, + "3,7" + ], + [ + { + "y": -0.1200000000000001, + "x": 0.25 + }, + "6,0" + ], + [ + { + "y": -0.8799999999999999, + "x": 1.47, + "c": "#aaaaaa", + "w": 1.75 + }, + "4,1", + { + "c": "#cccccc" + }, + "4,2", + { + "x": 9.310000000000002 + }, + "5,4", + "5,5", + { + "x": -0.009999999999999787, + "c": "#777777", + "w": 2.25 + }, + "5,6" + ], + [ + { + "y": -0.1200000000000001, + "x": 0.1, + "c": "#cccccc" + }, + "0,7" + ], + [ + { + "y": -0.8900000000000001, + "x": 3.5 + }, + "6,2" + ], + [ + { + "y": -0.9900000000000002, + "x": 1.25, + "c": "#aaaaaa", + "w": 2.25 + }, + "6,1", + { + "x": 9.75, + "c": "#cccccc" + }, + "7,4", + { + "x": -0.009999999999999787 + }, + "7,5", + { + "x": 1.5000000000000018, + "c": "#aaaaaa", + "w": 1.5 + }, + "7,7" + ], + [ + { + "y": -0.75, + "x": 15.49, + "c": "#777777" + }, + "7,6" + ], + [ + { + "y": -0.2599999999999998, + "x": 1.25, + "c": "#aaaaaa", + "w": 1.5 + }, + "2,7" + ], + [ + { + "y": -0.9900000000000002, + "x": 2.75 + }, + "4,7" + ], + [ + { + "y": -0.75, + "x": 14.5, + "c": "#777777" + }, + "8,5", + { + "x": -0.009999999999999787 + }, + "8,6", + { + "x": 0.010000000000001563 + }, + "8,7" + ], + [ + { + "r": 12, + "rx": 4.6991, + "ry": 0.2258, + "y": -0.0958, + "x": 0.3609, + "c": "#cccccc" + }, + "0,3", + "0,4", + "0,5", + "0,6" + ], + [ + { + "x": -0.1990999999999996 + }, + "2,3", + "2,4", + "2,5", + "2,6" + ], + [ + { + "x": 0.05090000000000039 + }, + "4,3", + "4,4", + "4,5", + "4,6" + ], + [ + { + "x": 0.5509000000000004 + }, + "6,3", + "6,4", + "6,5", + "6,6" + ], + [ + { + "rx": 5.4334, + "ry": 4.3492, + "y": 0.0007999999999999119, + "x": -0.25340000000000007, + "w": 1.5 + }, + "5,7" + ], + [ + { + "rx": 7.6342, + "ry": 4.817, + "y": 0.0030000000000001137, + "x": -1.0042, + "w": 2.25 + }, + "6,7" + ], + [ + { + "r": -12, + "rx": 9.0102, + "ry": 0.8597, + "y": 0.00029999999999996696, + "x": 0.24980000000000047 + }, + "1,0", + "1,1", + "1,2", + "1,3" + ], + [ + { + "x": -0.25019999999999953 + }, + "3,0", + "3,1", + "3,2", + "3,3" + ], + [ + { + "x": -0.00019999999999953388 + }, + "5,0", + "5,1", + "5,2", + "5,3" + ], + [ + { + "x": -0.5001999999999995 + }, + "7,0", + "7,1", + "7,2", + "7,3" + ], + [ + { + "rx": 9.1085, + "ry": 4.9223, + "y": -0.0022999999999999687, + "x": 0.25150000000000006, + "w": 2.75 + }, + "8,1", + "8,3" + ] + ] } } diff --git a/src/sneakbox/disarray/disarrayortho.json b/src/sneakbox/disarray/disarrayortho.json index 5fa5d24f5b..e10a46bc51 100644 --- a/src/sneakbox/disarray/disarrayortho.json +++ b/src/sneakbox/disarray/disarrayortho.json @@ -2,106 +2,101 @@ "vendorId": "0x5342", "productId": "0x0003", "name": "Disarray Ortholinear", - "url": "https://sneakbox.com", - "maintainer": "mujimanic", - "matrix": { "rows": 6, "cols": 16 }, + "matrix": {"rows": 6, "cols": 16}, "lighting": "none", "layouts": { - "keymap": -[ - [ - "0,0" - ], - [ - "1,0", - "0,1", - "0,2", - "0,3", - "0,4", - "0,5", - "0,6", - "0,7", - "0,8", - "0,9", - "0,10", - "0,11", - "0,12", - "0,13", - "0,14", - "0,15" - ], - [ - "2,0", - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "1,9", - "1,10", - "1,11", - "1,12", - "1,13", - "1,14", - "1,15" - ], - [ - "3,0", - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - "2,12", - "2,13", - "2,14", - "2,15" - ], - [ - "4,0", - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - "3,11", - "3,12", - "3,13", - "3,14", - "3,15" - ], - [ - "5,0", - "4,1", - "4,2", - "4,3", - "4,4", - "4,5", - "4,6", - "4,7", - "4,8", - "4,9", - "4,10", - "4,11", - "4,12", - "4,13", - "4,14", - "4,15" - ] -] + "keymap": [ + ["0,0"], + [ + "1,0", + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + "0,13", + "0,14", + "0,15" + ], + [ + "2,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + "1,13", + "1,14", + "1,15" + ], + [ + "3,0", + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + "2,13", + "2,14", + "2,15" + ], + [ + "4,0", + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + "3,12", + "3,13", + "3,14", + "3,15" + ], + [ + "5,0", + "4,1", + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "4,9", + "4,10", + "4,11", + "4,12", + "4,13", + "4,14", + "4,15" + ] + ] } } diff --git a/src/sneakbox/disarray/disarraystaggered.json b/src/sneakbox/disarray/disarraystaggered.json index b5e93dfe37..0a192cf379 100644 --- a/src/sneakbox/disarray/disarraystaggered.json +++ b/src/sneakbox/disarray/disarraystaggered.json @@ -2,165 +2,164 @@ "vendorId": "0x5342", "productId": "0x0002", "name": "Disarray Staggered", - "url": "https://sneakbox.com", - "maintainer": "mujimanic", - "matrix": { "rows": 5, "cols": 15 }, + "matrix": {"rows": 5, "cols": 15}, "lighting": "none", "layouts": { - "keymap": -[ - [ { - "c": "#777777" - }, - "0,0" - ], - [ { - "c": "#cccccc" - }, - "1,0", - "0,1", - "0,2", - "0,3", - "0,4", - "0,5", - "0,6", - "0,7", - "0,8", - "0,9", - "0,10", - "0,11", - "0,12", - { - "c": "#aaaaaa" - }, - "0,13", - { - "c": "#aaaaaa" - }, - "0,14", - "1,14" - ], - [ - { - "w": 1.5, - "c": "#aaaaaa" - }, - "2,0", - { - "c": "#cccccc" - }, - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "1,9", - "1,10", - "1,11", - "1,12", - { - "w": 1.5 - }, - "1,13", - "2,14" - ], - [ - { - "w": 1.75, - "c": "#aaaaaa" - }, - "2,1", - { - "c": "#cccccc" - }, - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - "2,12", - { - "w": 2.25, - "c": "#aaaaaa" - }, - "2,13", - { - "c": "#cccccc" - }, - "3,14" - ], - [ - { - "w": 1.25, - "c": "#aaaaaa" - }, - "3,0", - { - "c": "#cccccc" - }, - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - "3,11", - { - "w": 1.75, - "c": "#aaaaaa" - }, - "3,12", - { - "c": "#cccccc" - }, - "3,13", - "4,14" - ], - [ - { - "w": 1.25, - "c": "#aaaaaa" - }, - "4,1", - { - "w": 1.25 - }, - "4,2", - { - "w": 1.25 - }, - "4,3", - { - "w": 1.25 - }, - "4,4", - { - "w": 2.25 - }, - "4,5", - { - "w": 2.75 - }, - "4,6", - "4,8", - "4,9", - "4,10", - "4,11", - "4,12", - "4,13" - ] -] + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0" + ], + [ + { + "c": "#cccccc" + }, + "1,0", + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + { + "c": "#aaaaaa" + }, + "0,13", + { + "c": "#aaaaaa" + }, + "0,14", + "1,14" + ], + [ + { + "w": 1.5, + "c": "#aaaaaa" + }, + "2,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "w": 1.5 + }, + "1,13", + "2,14" + ], + [ + { + "w": 1.75, + "c": "#aaaaaa" + }, + "2,1", + { + "c": "#cccccc" + }, + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + { + "w": 2.25, + "c": "#aaaaaa" + }, + "2,13", + { + "c": "#cccccc" + }, + "3,14" + ], + [ + { + "w": 1.25, + "c": "#aaaaaa" + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "w": 1.75, + "c": "#aaaaaa" + }, + "3,12", + { + "c": "#cccccc" + }, + "3,13", + "4,14" + ], + [ + { + "w": 1.25, + "c": "#aaaaaa" + }, + "4,1", + { + "w": 1.25 + }, + "4,2", + { + "w": 1.25 + }, + "4,3", + { + "w": 1.25 + }, + "4,4", + { + "w": 2.25 + }, + "4,5", + { + "w": 2.75 + }, + "4,6", + "4,8", + "4,9", + "4,10", + "4,11", + "4,12", + "4,13" + ] + ] } } diff --git a/src/switchplate/switchplate910/switchplate910.json b/src/switchplate/switchplate910/switchplate910.json index 92de62ac61..02e0250d63 100644 --- a/src/switchplate/switchplate910/switchplate910.json +++ b/src/switchplate/switchplate910/switchplate910.json @@ -94,9 +94,9 @@ "4,1", {"w": 1.25}, "4,2", - {"c": "#DEBFB3", "t": "#363636", "a": 7, "w": 6.25}, + {"c": "#DEBFB3", "t": "#363636", "w": 6.25}, "4,5", - {"c": "#363636", "t": "#DEBFB3", "a": 4, "w": 1.25}, + {"c": "#363636", "t": "#DEBFB3", "w": 1.25}, "4,8", {"w": 1.25}, "4,9", diff --git a/src/the_royal/romac/romac.json b/src/the_royal/romac/romac.json index 6a0cfa2b88..2c4d706bcc 100755 --- a/src/the_royal/romac/romac.json +++ b/src/the_royal/romac/romac.json @@ -6,7 +6,7 @@ "matrix": {"rows": 4, "cols": 3}, "layouts": { "keymap": [ - [{"c": "#505557", "t": "#d9d7d7", "a": 7}, "0,0", "0,1", "0,2"], + [{"c": "#505557", "t": "#d9d7d7"}, "0,0", "0,1", "0,2"], ["1,0", "1,1", "1,2"], ["2,0", "2,1", "2,2"], ["3,0", "3,1", "3,2"] diff --git a/src/the_royal/romac_plus/romac_plus.json b/src/the_royal/romac_plus/romac_plus.json index ae485decc3..f84f14cf4d 100644 --- a/src/the_royal/romac_plus/romac_plus.json +++ b/src/the_royal/romac_plus/romac_plus.json @@ -6,7 +6,7 @@ "matrix": {"rows": 4, "cols": 3}, "layouts": { "keymap": [ - [{"c": "#505557", "t": "#d9d7d7", "a": 7}, "0,0", "0,1", "0,2"], + [{"c": "#505557", "t": "#d9d7d7"}, "0,0", "0,1", "0,2"], ["1,0", "1,1", "1,2"], ["2,0", "2,1", "2,2"], ["3,0", "3,1", "3,2"] diff --git a/src/wilba_tech/rama_works_kara/rama_works_kara.json b/src/wilba_tech/rama_works_kara/rama_works_kara.json index 9983f05489..b25bff1bae 100644 --- a/src/wilba_tech/rama_works_kara/rama_works_kara.json +++ b/src/wilba_tech/rama_works_kara/rama_works_kara.json @@ -87,12 +87,12 @@ "4,1", {"w": 1.5}, "4,2", - {"c": "#e2e2e2", "t": "#363636", "a": 7, "w": 7}, + {"c": "#e2e2e2", "t": "#363636", "w": 7}, "4,7", - {"c": "#4d525a", "t": "#e2e2e2", "a": 4, "w": 1.5}, + {"c": "#4d525a", "t": "#e2e2e2", "w": 1.5}, "4,11", "4,12" ] ] } -} \ No newline at end of file +} diff --git a/src/wilba_tech/rama_works_koyu/rama_works_koyu.json b/src/wilba_tech/rama_works_koyu/rama_works_koyu.json index 5e34b66c01..99ddceafec 100755 --- a/src/wilba_tech/rama_works_koyu/rama_works_koyu.json +++ b/src/wilba_tech/rama_works_koyu/rama_works_koyu.json @@ -93,9 +93,9 @@ "4,1", {"w": 1.5}, "4,2", - {"c": "#DEBFB3", "t": "#363636", "a": 7, "w": 7}, + {"c": "#DEBFB3", "t": "#363636", "w": 7}, "4,7", - {"c": "#363636", "t": "#DEBFB3", "a": 4, "w": 1.5}, + {"c": "#363636", "t": "#DEBFB3", "w": 1.5}, "4,11", {"x": 0.5, "c": "#DEBFB3", "t": "#363636"}, "4,12", @@ -104,4 +104,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/src/wilba_tech/rama_works_m10_b/rama_works_m10_b.json b/src/wilba_tech/rama_works_m10_b/rama_works_m10_b.json index 1f21a851cb..a97f0ee0ee 100755 --- a/src/wilba_tech/rama_works_m10_b/rama_works_m10_b.json +++ b/src/wilba_tech/rama_works_m10_b/rama_works_m10_b.json @@ -6,10 +6,10 @@ "matrix": {"rows": 1, "cols": 10}, "layouts": { "keymap": [ - [{"c": "#505557", "t": "#d9d7d7", "a": 7}, "0,0", "0,1", "0,2"], + [{"c": "#505557", "t": "#d9d7d7"}, "0,0", "0,1", "0,2"], ["0,3", "0,4", "0,5"], ["0,6", "0,7", "0,8"], [{"x": 1, "w": 2}, "0,9"] ] } -} \ No newline at end of file +} diff --git a/src/wilba_tech/rama_works_m10_c/rama_works_m10_c.json b/src/wilba_tech/rama_works_m10_c/rama_works_m10_c.json index 0f5293e579..929420d568 100644 --- a/src/wilba_tech/rama_works_m10_c/rama_works_m10_c.json +++ b/src/wilba_tech/rama_works_m10_c/rama_works_m10_c.json @@ -17,34 +17,15 @@ ["Radial All Hues", 0], ["Radial Color 1", 1] ], - "supportedLightingValues": [ - 9, - 10, - 11, - 12, - 13, - 7, - 8, - 23 - ], - "supportedBacklightValues": [ - 9, - 10, - 11, - 12, - 13, - 7, - 8, - 23 - ] + "supportedLightingValues": [9, 10, 11, 12, 13, 7, 8, 23] }, "matrix": {"rows": 1, "cols": 10}, "layouts": { "keymap": [ - [{"c": "#505557", "t": "#d9d7d7", "a": 7}, "0,0", "0,1", "0,2"], + [{"c": "#505557", "t": "#d9d7d7"}, "0,0", "0,1", "0,2"], ["0,3", "0,4", "0,5"], ["0,6", "0,7", "0,8"], [{"x": 1, "w": 2}, "0,9"] ] } -} \ No newline at end of file +} diff --git a/src/wilba_tech/rama_works_m60_a/rama_works_m60_a.json b/src/wilba_tech/rama_works_m60_a/rama_works_m60_a.json index ef5e034f10..79cd1fafb7 100755 --- a/src/wilba_tech/rama_works_m60_a/rama_works_m60_a.json +++ b/src/wilba_tech/rama_works_m60_a/rama_works_m60_a.json @@ -87,12 +87,12 @@ "4,1", {"w": 1.5}, "4,2", - {"c": "#e2e2e2", "t": "#363636", "a": 7, "w": 7}, + {"c": "#e2e2e2", "t": "#363636", "w": 7}, "4,7", - {"c": "#4d525a", "t": "#e2e2e2", "a": 4, "w": 1.5}, + {"c": "#4d525a", "t": "#e2e2e2", "w": 1.5}, "4,11", "4,12" ] ] } -} \ No newline at end of file +} diff --git a/src/wilba_tech/rama_works_m6_a/rama_works_m6_a.json b/src/wilba_tech/rama_works_m6_a/rama_works_m6_a.json index 4132e29754..9f12468142 100755 --- a/src/wilba_tech/rama_works_m6_a/rama_works_m6_a.json +++ b/src/wilba_tech/rama_works_m6_a/rama_works_m6_a.json @@ -6,8 +6,8 @@ "matrix": {"rows": 1, "cols": 6}, "layouts": { "keymap": [ - [{"c": "#505557", "t": "#d9d7d7", "a": 7}, "0,0", "0,1", "0,2"], + [{"c": "#505557", "t": "#d9d7d7"}, "0,0", "0,1", "0,2"], ["0,3", "0,4", "0,5"] ] } -} \ No newline at end of file +} diff --git a/src/wilba_tech/rama_works_m6_b/rama_works_m6_b.json b/src/wilba_tech/rama_works_m6_b/rama_works_m6_b.json index dee5d9e8f8..7b28933c2a 100755 --- a/src/wilba_tech/rama_works_m6_b/rama_works_m6_b.json +++ b/src/wilba_tech/rama_works_m6_b/rama_works_m6_b.json @@ -17,31 +17,12 @@ ["Radial All Hues", 0], ["Radial Color 1", 1] ], - "supportedLightingValues": [ - 9, - 10, - 11, - 12, - 13, - 7, - 8, - 23 - ], - "supportedBacklightValues": [ - 9, - 10, - 11, - 12, - 13, - 7, - 8, - 23 - ] + "supportedLightingValues": [9, 10, 11, 12, 13, 7, 8, 23] }, "matrix": {"rows": 1, "cols": 6}, "layouts": { "keymap": [ - [{"c": "#505557", "t": "#d9d7d7", "a": 7}, "0,0", "0,1", "0,2"], + [{"c": "#505557", "t": "#d9d7d7"}, "0,0", "0,1", "0,2"], ["0,3", "0,4", "0,5"] ] } diff --git a/src/wilba_tech/wt60_h1/wt60_h1.json b/src/wilba_tech/wt60_h1/wt60_h1.json index bda5ce22c4..cfe2865425 100644 --- a/src/wilba_tech/wt60_h1/wt60_h1.json +++ b/src/wilba_tech/wt60_h1/wt60_h1.json @@ -5,15 +5,8 @@ "lighting": "none", "matrix": {"rows": 5, "cols": 14}, "layouts": { - "labels": [ - ["Bottom Row", "7U", "HHKB", "WKL"] - ], + "labels": [["Bottom Row", "7U", "HHKB", "WKL"]], "keymap": [ - { - "x": 13, - "c": "#aaaaaa", - "w": 2 - }, [ { "c": "#777777" @@ -204,4 +197,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/src/wilba_tech/wt60_h2/wt60_h2.json b/src/wilba_tech/wt60_h2/wt60_h2.json index 86b0276fab..a037ee9701 100644 --- a/src/wilba_tech/wt60_h2/wt60_h2.json +++ b/src/wilba_tech/wt60_h2/wt60_h2.json @@ -6,11 +6,6 @@ "matrix": {"rows": 5, "cols": 14}, "layouts": { "keymap": [ - { - "x": 13, - "c": "#aaaaaa", - "w": 2 - }, [ { "c": "#777777" @@ -142,4 +137,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/src/wilba_tech/wt60_h3/wt60_h3.json b/src/wilba_tech/wt60_h3/wt60_h3.json index 46e887d908..66d029f3cc 100644 --- a/src/wilba_tech/wt60_h3/wt60_h3.json +++ b/src/wilba_tech/wt60_h3/wt60_h3.json @@ -6,11 +6,6 @@ "matrix": {"rows": 5, "cols": 14}, "layouts": { "keymap": [ - { - "x": 13, - "c": "#aaaaaa", - "w": 2 - }, [ { "c": "#777777" @@ -145,4 +140,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/src/wilba_tech/wt60_kh1/wt60_kh1.json b/src/wilba_tech/wt60_kh1/wt60_kh1.json index 511d945151..bc4a52b0d1 100644 --- a/src/wilba_tech/wt60_kh1/wt60_kh1.json +++ b/src/wilba_tech/wt60_kh1/wt60_kh1.json @@ -5,15 +5,8 @@ "lighting": "wt_rgb_backlight", "matrix": {"rows": 5, "cols": 14}, "layouts": { - "labels": [ - ["Bottom Row", "7U", "HHKB", "WKL"] - ], + "labels": [["Bottom Row", "7U", "HHKB", "WKL"]], "keymap": [ - { - "x": 13, - "c": "#aaaaaa", - "w": 2 - }, [ { "c": "#777777" @@ -204,4 +197,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/src/wilba_tech/wt65_b/wt65_b.json b/src/wilba_tech/wt65_b/wt65_b.json index ef5f27c968..0734f0cc7a 100755 --- a/src/wilba_tech/wt65_b/wt65_b.json +++ b/src/wilba_tech/wt65_b/wt65_b.json @@ -5,18 +5,12 @@ "lighting": "wt_mono_backlight", "matrix": {"rows": 5, "cols": 15}, "layouts": { - "labels": [ - "Split Backspace" - ], + "labels": ["Split Backspace"], "keymap": [ [ - { - "c": "#777777" - }, + {"c": "#777777"}, "0,0", - { - "c": "#cccccc" - }, + {"c": "#cccccc"}, "0,1", "0,2", "0,3", @@ -29,28 +23,17 @@ "0,10", "0,11", "0,12", - { - "c": "#aaaaaa", - "w": 2 - }, + {"c": "#aaaaaa", "w": 2}, "0,13\n\n\n0,0", "0,14", - { - "x": 0.25, - "c": "#cccccc" - }, + {"x": 0.25, "c": "#cccccc"}, "0,13\n\n\n0,1", "2,13\n\n\n0,1" ], [ - { - "c": "#aaaaaa", - "w": 1.5 - }, + {"c": "#aaaaaa", "w": 1.5}, "1,0", - { - "c": "#cccccc" - }, + {"c": "#cccccc"}, "1,1", "1,2", "1,3", @@ -63,23 +46,15 @@ "1,10", "1,11", "1,12", - { - "w": 1.5 - }, + {"w": 1.5}, "1,13", - { - "c": "#aaaaaa" - }, + {"c": "#aaaaaa"}, "1,14" ], [ - { - "w": 1.75 - }, + {"w": 1.75}, "2,0", - { - "c": "#cccccc" - }, + {"c": "#cccccc"}, "2,1", "2,2", "2,3", @@ -91,21 +66,14 @@ "2,9", "2,10", "2,11", - { - "c": "#aaaaaa", - "w": 2.25 - }, + {"c": "#aaaaaa", "w": 2.25}, "2,12", "2,14" ], [ - { - "w": 2.25 - }, + {"w": 2.25}, "3,0", - { - "c": "#cccccc" - }, + {"c": "#cccccc"}, "3,2", "3,3", "3,4", @@ -116,50 +84,27 @@ "3,9", "3,10", "3,11", - { - "c": "#aaaaaa", - "w": 1.75 - }, + {"c": "#aaaaaa", "w": 1.75}, "3,12", - { - "c": "#777777" - }, + {"c": "#777777"}, "3,13", - { - "c": "#aaaaaa" - }, + {"c": "#aaaaaa"}, "3,14" ], [ - { - "w": 1.5 - }, + {"w": 1.5}, "4,0", - { - "x": 0.75, - "w": 1.5 - }, + {"x": 0.75, "w": 1.5}, "4,2", - { - "c": "#cccccc", - "a": 7, - "w": 7 - }, + {"c": "#cccccc", "w": 7}, "4,6", - { - "c": "#aaaaaa", - "a": 4, - "w": 1.5 - }, + {"c": "#aaaaaa", "w": 1.5}, "4,11", - { - "x": 0.75, - "c": "#777777" - }, + {"x": 0.75, "c": "#777777"}, "4,12", "4,13", "4,14" ] ] } -} \ No newline at end of file +} diff --git a/src/wilba_tech/wt65_cx/wt65_cx.json b/src/wilba_tech/wt65_cx/wt65_cx.json index 742ef8376a..a3caa8ae1d 100644 --- a/src/wilba_tech/wt65_cx/wt65_cx.json +++ b/src/wilba_tech/wt65_cx/wt65_cx.json @@ -5,15 +5,8 @@ "lighting": "wt_rgb_backlight", "matrix": {"rows": 5, "cols": 15}, "layouts": { - "labels": [ - "Full Backspace" - ], + "labels": ["Full Backspace"], "keymap": [ - { - "x": 13, - "c": "#aaaaaa", - "w": 2 - }, [ { "c": "#888888" @@ -170,4 +163,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/src/wilba_tech/wt65_d/wt65_d.json b/src/wilba_tech/wt65_d/wt65_d.json index 401e3bdf47..2ef264f4f1 100644 --- a/src/wilba_tech/wt65_d/wt65_d.json +++ b/src/wilba_tech/wt65_d/wt65_d.json @@ -12,11 +12,6 @@ ["Bottom Row", "7U", "6U"] ], "keymap": [ - { - "x": 13, - "c": "#aaaaaa", - "w": 2 - }, [ { "x": 2.5, @@ -223,4 +218,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/src/wilba_tech/wt65_f/wt65_f.json b/src/wilba_tech/wt65_f/wt65_f.json index 9bd464d719..4da6a68fc0 100644 --- a/src/wilba_tech/wt65_f/wt65_f.json +++ b/src/wilba_tech/wt65_f/wt65_f.json @@ -6,11 +6,6 @@ "matrix": {"rows": 5, "cols": 15}, "layouts": { "keymap": [ - { - "x": 13, - "c": "#aaaaaa", - "w": 2 - }, [ { "c": "#777777" @@ -162,4 +157,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/src/wilba_tech/wt65_fx/wt65_fx.json b/src/wilba_tech/wt65_fx/wt65_fx.json index 1452710087..5adc7fd904 100644 --- a/src/wilba_tech/wt65_fx/wt65_fx.json +++ b/src/wilba_tech/wt65_fx/wt65_fx.json @@ -5,16 +5,8 @@ "lighting": "none", "matrix": {"rows": 5, "cols": 15}, "layouts": { - "labels": [ - "Split Backspace", - ["Bottom Row", "6.25U", "7U"] - ], + "labels": ["Split Backspace", ["Bottom Row", "6.25U", "7U"]], "keymap": [ - { - "x": 13, - "c": "#aaaaaa", - "w": 2 - }, [ { "c": "#777777" @@ -201,4 +193,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/src/wilba_tech/wt65_g/wt65_g.json b/src/wilba_tech/wt65_g/wt65_g.json index aa9a000e85..a43ed288c6 100644 --- a/src/wilba_tech/wt65_g/wt65_g.json +++ b/src/wilba_tech/wt65_g/wt65_g.json @@ -12,11 +12,6 @@ ["Bottom Row", "ANSI", "7U"] ], "keymap": [ - { - "x": 13, - "c": "#aaaaaa", - "w": 2 - }, [ { "x": 2.5, @@ -228,4 +223,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/src/wilba_tech/wt65_g2/wt65_g2.json b/src/wilba_tech/wt65_g2/wt65_g2.json index 3aa8e7fffe..5cbf3cc2af 100644 --- a/src/wilba_tech/wt65_g2/wt65_g2.json +++ b/src/wilba_tech/wt65_g2/wt65_g2.json @@ -5,17 +5,8 @@ "lighting": "none", "matrix": {"rows": 5, "cols": 15}, "layouts": { - "labels": [ - "2U Backspace", - "ISO Enter", - "Split Left Shift" - ], + "labels": ["2U Backspace", "ISO Enter", "Split Left Shift"], "keymap": [ - { - "x": 13, - "c": "#aaaaaa", - "w": 2 - }, [ { "x": 2.5, @@ -191,4 +182,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/src/wilba_tech/wt65_h1/wt65_h1.json b/src/wilba_tech/wt65_h1/wt65_h1.json index 613c6e530b..85cc17fea6 100644 --- a/src/wilba_tech/wt65_h1/wt65_h1.json +++ b/src/wilba_tech/wt65_h1/wt65_h1.json @@ -6,11 +6,6 @@ "matrix": {"rows": 5, "cols": 15}, "layouts": { "keymap": [ - { - "x": 13, - "c": "#aaaaaa", - "w": 2 - }, [ { "c": "#777777" @@ -155,4 +150,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/src/wilba_tech/wt65_h2/wt65_h2.json b/src/wilba_tech/wt65_h2/wt65_h2.json index e3f70236ae..709070bf9a 100644 --- a/src/wilba_tech/wt65_h2/wt65_h2.json +++ b/src/wilba_tech/wt65_h2/wt65_h2.json @@ -5,15 +5,8 @@ "lighting": "none", "matrix": {"rows": 5, "cols": 15}, "layouts": { - "labels": [ - "2U Backspace" - ], + "labels": ["2U Backspace"], "keymap": [ - { - "x": 13, - "c": "#aaaaaa", - "w": 2 - }, [ { "x": 13, @@ -164,4 +157,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/src/wilba_tech/wt65_h3/wt65_h3.json b/src/wilba_tech/wt65_h3/wt65_h3.json index 64727a8e29..c98a03da27 100644 --- a/src/wilba_tech/wt65_h3/wt65_h3.json +++ b/src/wilba_tech/wt65_h3/wt65_h3.json @@ -5,16 +5,8 @@ "lighting": "none", "matrix": {"rows": 5, "cols": 15}, "layouts": { - "labels": [ - "Split Backspace", - ["Bottom Row", "6.25U", "7U"] - ], + "labels": ["Split Backspace", ["Bottom Row", "6.25U", "7U"]], "keymap": [ - { - "x": 13, - "c": "#aaaaaa", - "w": 2 - }, [ { "x": 13 @@ -195,4 +187,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/src/wilba_tech/wt65_h4/wt65_h4.json b/src/wilba_tech/wt65_h4/wt65_h4.json index c4cb707631..369be5e8c3 100644 --- a/src/wilba_tech/wt65_h4/wt65_h4.json +++ b/src/wilba_tech/wt65_h4/wt65_h4.json @@ -5,16 +5,8 @@ "lighting": "none", "matrix": {"rows": 5, "cols": 15}, "layouts": { - "labels": [ - "Split Backspace", - ["Bottom Row", "6.25U", "7U"] - ], + "labels": ["Split Backspace", ["Bottom Row", "6.25U", "7U"]], "keymap": [ - { - "x": 13, - "c": "#aaaaaa", - "w": 2 - }, [ { "x": 13 @@ -201,4 +193,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/src/wilba_tech/wt69_a/wt69_a.json b/src/wilba_tech/wt69_a/wt69_a.json index 2c3f0f2d62..978c57f7fd 100755 --- a/src/wilba_tech/wt69_a/wt69_a.json +++ b/src/wilba_tech/wt69_a/wt69_a.json @@ -5,24 +5,15 @@ "lighting": "none", "matrix": {"rows": 5, "cols": 17}, "layouts": { - "labels": [ - "Split Backspace" - ], + "labels": ["Split Backspace"], "keymap": [ [ - { - "c": "#aaaaaa" - }, + {"c": "#aaaaaa"}, "0,0", "0,1", - { - "x": 0.25, - "c": "#777777" - }, + {"x": 0.25, "c": "#777777"}, "0,2", - { - "c": "#cccccc" - }, + {"c": "#cccccc"}, "0,3", "0,4", "0,5", @@ -35,33 +26,20 @@ "0,12", "0,13", "0,14", - { - "c": "#aaaaaa", - "w": 2 - }, + {"c": "#aaaaaa", "w": 2}, "0,15\n\n\n0,0", "0,16", - { - "x": 0.25, - "c": "#cccccc" - }, + {"x": 0.25, "c": "#cccccc"}, "0,15\n\n\n0,1", "2,15\n\n\n0,1" ], [ - { - "c": "#aaaaaa" - }, + {"c": "#aaaaaa"}, "1,0", "1,1", - { - "x": 0.25, - "w": 1.5 - }, + {"x": 0.25, "w": 1.5}, "1,2", - { - "c": "#cccccc" - }, + {"c": "#cccccc"}, "1,3", "1,4", "1,5", @@ -74,26 +52,17 @@ "1,12", "1,13", "1,14", - { - "w": 1.5 - }, + {"w": 1.5}, "1,15", - { - "c": "#aaaaaa" - }, + {"c": "#aaaaaa"}, "1,16" ], [ "2,0", "2,1", - { - "x": 0.25, - "w": 1.75 - }, + {"x": 0.25, "w": 1.75}, "2,2", - { - "c": "#cccccc" - }, + {"c": "#cccccc"}, "2,3", "2,4", "2,5", @@ -105,24 +74,16 @@ "2,11", "2,12", "2,13", - { - "c": "#aaaaaa", - "w": 2.25 - }, + {"c": "#aaaaaa", "w": 2.25}, "2,14", "2,16" ], [ "3,0", "3,1", - { - "x": 0.25, - "w": 2.25 - }, + {"x": 0.25, "w": 2.25}, "3,2", - { - "c": "#cccccc" - }, + {"c": "#cccccc"}, "3,4", "3,5", "3,6", @@ -133,53 +94,30 @@ "3,11", "3,12", "3,13", - { - "c": "#aaaaaa", - "w": 1.75 - }, + {"c": "#aaaaaa", "w": 1.75}, "3,14", - { - "c": "#777777" - }, + {"c": "#777777"}, "3,15", - { - "c": "#aaaaaa" - }, + {"c": "#aaaaaa"}, "3,16" ], [ "4,0", "4,1", - { - "x": 0.25, - "w": 1.5 - }, + {"x": 0.25, "w": 1.5}, "4,2", "4,3", - { - "w": 1.5 - }, + {"w": 1.5}, "4,4", - { - "c": "#cccccc", - "a": 7, - "w": 7 - }, + {"c": "#cccccc", "w": 7}, "4,8", - { - "c": "#aaaaaa", - "a": 4, - "w": 1.5 - }, + {"c": "#aaaaaa", "w": 1.5}, "4,13", - { - "x": 0.5, - "c": "#777777" - }, + {"x": 0.5, "c": "#777777"}, "4,14", "4,15", "4,16" ] ] } -} \ No newline at end of file +} diff --git a/src/wilba_tech/wt80_g/wt80_g.json b/src/wilba_tech/wt80_g/wt80_g.json index 954070e281..0038bfa121 100644 --- a/src/wilba_tech/wt80_g/wt80_g.json +++ b/src/wilba_tech/wt80_g/wt80_g.json @@ -13,11 +13,6 @@ ["Bottom Row", "6.25U", "7U", "7U WKL"] ], "keymap": [ - { - "x": 13, - "c": "#aaaaaa", - "w": 2 - }, [ { "x": 2.5, diff --git a/src/wilba_tech/wt8_a/wt8_a.json b/src/wilba_tech/wt8_a/wt8_a.json index fa27cea244..88fde838e7 100755 --- a/src/wilba_tech/wt8_a/wt8_a.json +++ b/src/wilba_tech/wt8_a/wt8_a.json @@ -6,8 +6,8 @@ "matrix": {"rows": 1, "cols": 8}, "layouts": { "keymap": [ - [{"c": "#505557", "t": "#d9d7d7", "a": 7}, "0,0", "0,1", "0,2", "0,3"], + [{"c": "#505557", "t": "#d9d7d7"}, "0,0", "0,1", "0,2", "0,3"], ["0,4", "0,5", "0,6", "0,7"] ] } -} \ No newline at end of file +} diff --git a/src/wilba_tech/zeal60/zeal60.json b/src/wilba_tech/zeal60/zeal60.json index 76667c2619..f8dbc06ec7 100755 --- a/src/wilba_tech/zeal60/zeal60.json +++ b/src/wilba_tech/zeal60/zeal60.json @@ -5,50 +5,7 @@ "lighting": { "extends": "wt_rgb_backlight", "supportedLightingValues": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21 - ], - "supportedBacklightValues": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21 + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21 ] }, "matrix": {"rows": 5, "cols": 14}, diff --git a/src/wilba_tech/zeal65/zeal65.json b/src/wilba_tech/zeal65/zeal65.json index e9a90d7d75..ba92fd6202 100755 --- a/src/wilba_tech/zeal65/zeal65.json +++ b/src/wilba_tech/zeal65/zeal65.json @@ -5,40 +5,7 @@ "lighting": { "extends": "wt_rgb_backlight", "supportedLightingValues": [ - 1, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21 - ], - "supportedBacklightValues": [ - 1, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21 + 1, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21 ] }, "matrix": {"rows": 5, "cols": 15}, @@ -46,13 +13,9 @@ "labels": ["Split Backspace"], "keymap": [ [ - { - "c": "#777777" - }, + {"c": "#777777"}, "0,0", - { - "c": "#cccccc" - }, + {"c": "#cccccc"}, "0,1", "0,2", "0,3", @@ -65,28 +28,17 @@ "0,10", "0,11", "0,12", - { - "c": "#aaaaaa", - "w": 2 - }, + {"c": "#aaaaaa", "w": 2}, "0,13\n\n\n0,0", "0,14", - { - "x": 0.25, - "c": "#cccccc" - }, + {"x": 0.25, "c": "#cccccc"}, "0,13\n\n\n0,1", "2,13\n\n\n0,1" ], [ - { - "c": "#aaaaaa", - "w": 1.5 - }, + {"c": "#aaaaaa", "w": 1.5}, "1,0", - { - "c": "#cccccc" - }, + {"c": "#cccccc"}, "1,1", "1,2", "1,3", @@ -99,23 +51,15 @@ "1,10", "1,11", "1,12", - { - "w": 1.5 - }, + {"w": 1.5}, "1,13", - { - "c": "#aaaaaa" - }, + {"c": "#aaaaaa"}, "1,14" ], [ - { - "w": 1.75 - }, + {"w": 1.75}, "2,0", - { - "c": "#cccccc" - }, + {"c": "#cccccc"}, "2,1", "2,2", "2,3", @@ -127,21 +71,14 @@ "2,9", "2,10", "2,11", - { - "c": "#aaaaaa", - "w": 2.25 - }, + {"c": "#aaaaaa", "w": 2.25}, "2,12", "2,14" ], [ - { - "w": 2.25 - }, + {"w": 2.25}, "3,0", - { - "c": "#cccccc" - }, + {"c": "#cccccc"}, "3,2", "3,3", "3,4", @@ -152,48 +89,25 @@ "3,9", "3,10", "3,11", - { - "c": "#aaaaaa", - "w": 1.75 - }, + {"c": "#aaaaaa", "w": 1.75}, "3,12", - { - "c": "#777777" - }, + {"c": "#777777"}, "3,13", - { - "c": "#aaaaaa" - }, + {"c": "#aaaaaa"}, "3,14" ], [ - { - "w": 1.5 - }, + {"w": 1.5}, "4,0", - { - "w": 1.5 - }, + {"w": 1.5}, "4,1", - { - "c": "#cccccc", - "a": 7, - "w": 7 - }, + {"c": "#cccccc", "w": 7}, "4,7", - { - "c": "#aaaaaa", - "a": 4, - "w": 1.5 - }, + {"c": "#aaaaaa", "w": 1.5}, "4,10", - { - "w": 1.5 - }, + {"w": 1.5}, "4,11", - { - "c": "#777777" - }, + {"c": "#777777"}, "4,12", "4,13", "4,14" diff --git a/src/xd/xd87.json b/src/xd/xd87.json index dac9ce3ff5..b091866173 100644 --- a/src/xd/xd87.json +++ b/src/xd/xd87.json @@ -6,24 +6,133 @@ "matrix": {"rows": 6, "cols": 17}, "layouts": { "keymap": [ - [ - {"c":"#777777"},"0,0",{"x":1},"0,2","0,3","0,4","0,5",{"x":0.5},"0,6","0,7","0,8","0,9",{"x":0.5},"0,10","0,11","0,12","0,13",{"x":0.25},"0,14","0,15","0,16" - ], - [ - {"y":0.5,"c":"#cccccc"},"1,0","1,1","1,2","1,3","1,4","1,5","1,6","1,7","1,8","1,9","1,10","1,11","1,12",{"c":"#aaaaaa","w":2},"1,13",{"x":0.25,"c":"#777777"},"1,14","1,15","1,16" - ], - [ - {"c":"#aaaaaa","w":1.5},"2,0",{"c":"#cccccc"},"2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8","2,9","2,10","2,11", "2,12",{"w":1.5},"2,13",{"x":0.25,"c":"#777777"},"2,14","2,15","2,16" - ], - [ - {"c":"#aaaaaa","w":1.75},"3,0",{"c":"#cccccc"},"3,1","3,2","3,3","3,4","3,5","3,6","3,7","3,8","3,9","3,10","3,11",{"c":"#777777","w":2.25},"3,13" - ], - [ - {"c":"#aaaaaa","w":2.25},"4,0",{"c":"#cccccc"},"4,2","4,3","4,4","4,5","4,6","4,7","4,8","4,9","4,10","4,11",{"c":"#aaaaaa","w":2.75},"4,12",{"x":1.25,"c":"#777777"},"4,15" - ], - [ - {"c":"#aaaaaa","w":1.25},"5,0",{"w":1.25},"5,1",{"w":1.25},"5,2",{"c":"#cccccc","a":7,"w":6.25},"5,8",{"c":"#aaaaaa","a":4,"w":1.25},"5,10",{"w":1.25},"5,11",{"w":1.25},"5,12",{"w":1.25},"5,13",{"x":0.25,"c":"#777777"},"5,14","5,15","5,16" - ] + [ + {"c": "#777777"}, + "0,0", + {"x": 1}, + "0,2", + "0,3", + "0,4", + "0,5", + {"x": 0.5}, + "0,6", + "0,7", + "0,8", + "0,9", + {"x": 0.5}, + "0,10", + "0,11", + "0,12", + "0,13", + {"x": 0.25}, + "0,14", + "0,15", + "0,16" + ], + [ + {"y": 0.5, "c": "#cccccc"}, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + {"c": "#aaaaaa", "w": 2}, + "1,13", + {"x": 0.25, "c": "#777777"}, + "1,14", + "1,15", + "1,16" + ], + [ + {"c": "#aaaaaa", "w": 1.5}, + "2,0", + {"c": "#cccccc"}, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + {"w": 1.5}, + "2,13", + {"x": 0.25, "c": "#777777"}, + "2,14", + "2,15", + "2,16" + ], + [ + {"c": "#aaaaaa", "w": 1.75}, + "3,0", + {"c": "#cccccc"}, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + {"c": "#777777", "w": 2.25}, + "3,13" + ], + [ + {"c": "#aaaaaa", "w": 2.25}, + "4,0", + {"c": "#cccccc"}, + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "4,9", + "4,10", + "4,11", + {"c": "#aaaaaa", "w": 2.75}, + "4,12", + {"x": 1.25, "c": "#777777"}, + "4,15" + ], + [ + {"c": "#aaaaaa", "w": 1.25}, + "5,0", + {"w": 1.25}, + "5,1", + {"w": 1.25}, + "5,2", + {"c": "#cccccc", "w": 6.25}, + "5,8", + {"c": "#aaaaaa", "w": 1.25}, + "5,10", + {"w": 1.25}, + "5,11", + {"w": 1.25}, + "5,12", + {"w": 1.25}, + "5,13", + {"x": 0.25, "c": "#777777"}, + "5,14", + "5,15", + "5,16" + ] ] } } diff --git a/src/xelus/dawn60/xelus_dawn60.json b/src/xelus/dawn60/xelus_dawn60.json index 562360611c..5cf128c1ed 100755 --- a/src/xelus/dawn60/xelus_dawn60.json +++ b/src/xelus/dawn60/xelus_dawn60.json @@ -1,51 +1,27 @@ { - "name":"DAWN60", - "vendorId":"0x5845", - "productId":"0x0060", - "lighting":{ - "extends":"wt_rgb_backlight", - "supportedBacklightValues":[ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21 + "name": "DAWN60", + "vendorId": "0x5845", + "productId": "0x0060", + "lighting": { + "extends": "wt_rgb_backlight", + "supportedLightingValues": [ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21 ] }, - "matrix":{ - "rows":5, - "cols":14 + "matrix": { + "rows": 5, + "cols": 14 }, - "layouts":{ - "labels":[ - "Split Backspace", - "Right Shift", - "Bottom Row Arrows/7U" - ], - "keymap":[ + "layouts": { + "labels": ["Split Backspace", "Right Shift", "Bottom Row Arrows/7U"], + "keymap": [ [ { - "c":"#777777" + "c": "#777777" }, "0,0", { - "c":"#cccccc" + "c": "#cccccc" }, "0,1", "0,2", @@ -60,23 +36,23 @@ "0,11", "0,12", { - "c":"#aaaaaa", - "w":2 + "c": "#aaaaaa", + "w": 2 }, "0,13\n\n\n0,0", { - "x":0.5 + "x": 0.5 }, "0,13\n\n\n0,1", "2,13\n\n\n0,1" ], [ { - "w":1.5 + "w": 1.5 }, "1,0", { - "c":"#cccccc" + "c": "#cccccc" }, "1,1", "1,2", @@ -91,18 +67,18 @@ "1,11", "1,12", { - "w":1.5 + "w": 1.5 }, "1,13" ], [ { - "c":"#aaaaaa", - "w":1.75 + "c": "#aaaaaa", + "w": 1.75 }, "2,0", { - "c":"#cccccc" + "c": "#cccccc" }, "2,1", "2,2", @@ -116,19 +92,19 @@ "2,10", "2,11", { - "c":"#777777", - "w":2.25 + "c": "#777777", + "w": 2.25 }, "2,12" ], [ { - "c":"#aaaaaa", - "w":2.25 + "c": "#aaaaaa", + "w": 2.25 }, "3,0", { - "c":"#cccccc" + "c": "#cccccc" }, "3,1", "3,2", @@ -141,14 +117,14 @@ "3,9", "3,11\n\n\n1,0", { - "c":"#aaaaaa", - "w":1.75 + "c": "#aaaaaa", + "w": 1.75 }, "3,12\n\n\n1,0", "3,13\n\n\n1,0", { - "x":0.5, - "w":1.75 + "x": 0.5, + "w": 1.75 }, "3,11\n\n\n1,1", "3,12\n\n\n1,1", @@ -156,24 +132,24 @@ ], [ { - "w":1.25 + "w": 1.25 }, "4,0\n\n\n2,0", { - "w":1.25 + "w": 1.25 }, "4,1\n\n\n2,0", { - "w":1.25 + "w": 1.25 }, "4,2\n\n\n2,0", { - "c":"#cccccc", - "w":6.25 + "c": "#cccccc", + "w": 6.25 }, "4,5\n\n\n2,0", { - "c":"#aaaaaa" + "c": "#aaaaaa" }, "4,9\n\n\n2,0", "4,10\n\n\n2,0", @@ -183,31 +159,31 @@ ], [ { - "y":0.5, - "w":1.5 + "y": 0.5, + "w": 1.5 }, "4,0\n\n\n2,1", "4,1\n\n\n2,1", { - "w":1.5 + "w": 1.5 }, "4,2\n\n\n2,1", { - "c":"#cccccc", - "w":7 + "c": "#cccccc", + "w": 7 }, "4,5\n\n\n2,1", { - "c":"#aaaaaa", - "w":1.5 + "c": "#aaaaaa", + "w": 1.5 }, "4,10\n\n\n2,1", "4,12\n\n\n2,1", { - "w":1.5 + "w": 1.5 }, "4,13\n\n\n2,1" ] ] } -} \ No newline at end of file +} diff --git a/src/yiancardesigns/hs60/ansi/hs60_v2_ansi.json b/src/yiancardesigns/hs60/ansi/hs60_v2_ansi.json index 5af826d082..0df9a99bae 100755 --- a/src/yiancardesigns/hs60/ansi/hs60_v2_ansi.json +++ b/src/yiancardesigns/hs60/ansi/hs60_v2_ansi.json @@ -86,9 +86,9 @@ "4,1", {"w": 1.25}, "4,2", - {"c": "#DEBFB3", "t": "#363636", "a": 7, "w": 6.25}, + {"c": "#DEBFB3", "t": "#363636", "w": 6.25}, "4,6", - {"c": "#363636", "t": "#DEBFB3", "a": 4, "w": 1.25}, + {"c": "#363636", "t": "#DEBFB3", "w": 1.25}, "4,10", {"w": 1.25}, "4,11", @@ -99,4 +99,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/src/yiancardesigns/hs60/hhkb/hs60_v2_hhkb.json b/src/yiancardesigns/hs60/hhkb/hs60_v2_hhkb.json index 09e29099b9..036461de6d 100755 --- a/src/yiancardesigns/hs60/hhkb/hs60_v2_hhkb.json +++ b/src/yiancardesigns/hs60/hhkb/hs60_v2_hhkb.json @@ -87,9 +87,9 @@ "4,1", {"w": 1.5}, "4,2", - {"c": "#DEBFB3", "t": "#363636", "a": 7, "w": 7}, + {"c": "#DEBFB3", "t": "#363636", "w": 7}, "4,6", - {"c": "#363636", "t": "#DEBFB3", "a": 4, "w": 1.5}, + {"c": "#363636", "t": "#DEBFB3", "w": 1.5}, "4,11", "4,12", {"w": 1.5}, @@ -97,4 +97,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/src/yiancardesigns/hs60/iso/hs60_v2_iso.json b/src/yiancardesigns/hs60/iso/hs60_v2_iso.json index 4dd8549032..bb6de61604 100755 --- a/src/yiancardesigns/hs60/iso/hs60_v2_iso.json +++ b/src/yiancardesigns/hs60/iso/hs60_v2_iso.json @@ -95,9 +95,9 @@ "4,1", {"w": 1.25}, "4,2", - {"c": "#DEBFB3", "t": "#363636", "a": 7, "w": 6.25}, + {"c": "#DEBFB3", "t": "#363636", "w": 6.25}, "4,6", - {"c": "#363636", "t": "#DEBFB3", "a": 4, "w": 1.25}, + {"c": "#363636", "t": "#DEBFB3", "w": 1.25}, "4,10", {"w": 1.25}, "4,11", diff --git a/src/yiancardesigns/nk65/nk65.json b/src/yiancardesigns/nk65/nk65.json index 7a9e01ae36..15e8b91ed9 100755 --- a/src/yiancardesigns/nk65/nk65.json +++ b/src/yiancardesigns/nk65/nk65.json @@ -93,9 +93,9 @@ "4,1", {"w": 1.25}, "4,2", - {"c": "#DEBFB3", "t": "#363636", "a": 7, "w": 6.25}, + {"c": "#DEBFB3", "t": "#363636", "w": 6.25}, "4,6", - {"c": "#363636", "t": "#DEBFB3", "a": 4}, + {"c": "#363636", "t": "#DEBFB3"}, "4,9", "4,10", "4,11", @@ -106,4 +106,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/src/zx60/zx60_via.json b/src/zx60/zx60_via.json index 70bb882bd4..ec570bc2a7 100644 --- a/src/zx60/zx60_via.json +++ b/src/zx60/zx60_via.json @@ -38,680 +38,676 @@ ] ], "keymap": [ - { - "name": "zx60_pre_via", - "author": "sets3n" - }, - [ - { - "x": 2.5, - "c": "#777777" - }, - "0,0", - { - "c": "#cccccc" - }, - "0,1", - "0,2", - "0,3", - "0,4", - "0,5", - "0,6", - "0,7", - "0,8", - "0,9", - "0,10", - "0,11", - "0,12", - { - "c": "#aaaaaa", - "w": 2 - }, - "0,13\n\n\n0,0", - { - "x": 0.5, - "c": "#cccccc" - }, - "0,13\n\n\n0,1", - "0,14\n\n\n0,1" - ], - [ - { - "x": 2.5, - "c": "#aaaaaa", - "w": 1.5 - }, - "1,0", - { - "c": "#cccccc" - }, - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "1,9", - "1,10", - "1,11", - "1,12", - { - "w": 1.5 - }, - "1,13\n\n\n1,0", - { - "x": 1.25, - "c": "#777777", - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, - "2,13\n\n\n1,1" - ], - [ - { - "x": 2.5, - "c": "#aaaaaa", - "w": 1.75 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - { - "c": "#777777", - "w": 2.25 - }, - "2,13\n\n\n1,0", - { - "x": 0.25, - "c": "#cccccc" - }, - "1,13\n\n\n1,1" - ], - [ - { - "x": 2.5, - "c": "#aaaaaa", - "w": 2.25 - }, - "3,0\n\n\n2,0", - { - "c": "#cccccc" - }, - "3,2\n\n\n2,0", - "3,3\n\n\n2,0", - "3,4\n\n\n2,0", - "3,5\n\n\n2,0", - "3,6\n\n\n2,0", - "3,7\n\n\n2,0", - "3,8\n\n\n2,0", - "3,9\n\n\n2,0", - "3,10\n\n\n2,0", - "3,11\n\n\n2,0", - { - "c": "#aaaaaa", - "w": 2.75 - }, - "3,13\n\n\n2,0" - ], - [ - { - "x": 2.5, - "w": 1.25 - }, - "4,0\n\n\n3,0", - { - "w": 1.25 - }, - "4,1\n\n\n3,0", - { - "w": 1.25 - }, - "4,2\n\n\n3,0", - { - "c": "#cccccc", - "w": 6.25 - }, - "4,6\n\n\n3,0", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "4,10\n\n\n3,0", - { - "w": 1.25 - }, - "4,11\n\n\n3,0", - { - "w": 1.25 - }, - "4,13\n\n\n3,0", - { - "w": 1.25 - }, - "4,14\n\n\n3,0" - ], - [ - { - "y": 0.5, - "x": 2.5, - "w": 2.25 - }, - "3,0\n\n\n2,1", - { - "c": "#cccccc" - }, - "3,2\n\n\n2,1", - "3,3\n\n\n2,1", - "3,4\n\n\n2,1", - "3,5\n\n\n2,1", - "3,6\n\n\n2,1", - "3,7\n\n\n2,1", - "3,8\n\n\n2,1", - "3,9\n\n\n2,1", - "3,10\n\n\n2,1", - "3,11\n\n\n2,1", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,13\n\n\n2,1", - "3,14\n\n\n2,1" - ], - [ - { - "x": 2.5, - "w": 2.25 - }, - "3,0\n\n\n2,2", - { - "c": "#cccccc" - }, - "3,2\n\n\n2,2", - "3,3\n\n\n2,2", - "3,4\n\n\n2,2", - "3,5\n\n\n2,2", - "3,6\n\n\n2,2", - "3,7\n\n\n2,2", - "3,8\n\n\n2,2", - "3,9\n\n\n2,2", - "3,10\n\n\n2,2", - { - "w": 1.75 - }, - "3,11\n\n\n2,2", - "3,13\n\n\n2,2", - "3,12\n\n\n2,2" - ], - [ - { - "x": 2.5, - "c": "#aaaaaa", - "w": 1.25 - }, - "3,0\n\n\n2,3", - "3,1\n\n\n2,3", - { - "c": "#cccccc" - }, - "3,2\n\n\n2,3", - "3,3\n\n\n2,3", - "3,4\n\n\n2,3", - "3,5\n\n\n2,3", - "3,6\n\n\n2,3", - "3,7\n\n\n2,3", - "3,8\n\n\n2,3", - "3,9\n\n\n2,3", - "3,10\n\n\n2,3", - "3,11\n\n\n2,3", - { - "c": "#aaaaaa", - "w": 2.75 - }, - "3,13\n\n\n2,3" - ], - [ - { - "x": 2.5, - "w": 1.25 - }, - "3,0\n\n\n2,4", - "3,1\n\n\n2,4", - { - "c": "#cccccc" - }, - "3,2\n\n\n2,4", - "3,3\n\n\n2,4", - "3,4\n\n\n2,4", - "3,5\n\n\n2,4", - "3,6\n\n\n2,4", - "3,7\n\n\n2,4", - "3,8\n\n\n2,4", - "3,9\n\n\n2,4", - "3,10\n\n\n2,4", - "3,11\n\n\n2,4", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,13\n\n\n2,4", - "3,14\n\n\n2,4" - ], - [ - { - "x": 2.5, - "w": 1.25 - }, - "3,0\n\n\n2,5", - "3,1\n\n\n2,5", - { - "c": "#cccccc" - }, - "3,2\n\n\n2,5", - "3,3\n\n\n2,5", - "3,4\n\n\n2,5", - "3,5\n\n\n2,5", - "3,6\n\n\n2,5", - "3,7\n\n\n2,5", - "3,8\n\n\n2,5", - "3,9\n\n\n2,5", - "3,10\n\n\n2,5", - { - "w": 1.75 - }, - "3,11\n\n\n2,5", - "3,13\n\n\n2,5", - "3,14\n\n\n2,5" - ], - [ - { - "x": 2.5, - "c": "#aaaaaa", - "w": 2 - }, - "3,0\n\n\n2,6", - { - "c": "#cccccc" - }, - "3,2\n\n\n2,6", - "3,3\n\n\n2,6", - "3,4\n\n\n2,6", - "3,5\n\n\n2,6", - "3,6\n\n\n2,6", - "3,7\n\n\n2,6", - "3,8\n\n\n2,6", - "3,9\n\n\n2,6", - "3,10\n\n\n2,6", - "3,11\n\n\n2,6", - "3,13\n\n\n2,6", - { - "c": "#aaaaaa", - "w": 2 - }, - "3,14\n\n\n2,6" - ], - [ - { - "x": 2.5 - }, - "3,0\n\n\n2,7", - "3,1\n\n\n2,7", - { - "c": "#cccccc" - }, - "3,2\n\n\n2,7", - "3,3\n\n\n2,7", - "3,4\n\n\n2,7", - "3,5\n\n\n2,7", - "3,6\n\n\n2,7", - "3,7\n\n\n2,7", - "3,8\n\n\n2,7", - "3,9\n\n\n2,7", - "3,10\n\n\n2,7", - "3,11\n\n\n2,7", - "3,12\n\n\n2,7", - { - "c": "#aaaaaa", - "w": 2 - }, - "3,13\n\n\n2,7" - ], - [ - { - "x": 2.5, - "w": 2 - }, - "3,0\n\n\n2,8", - { - "c": "#cccccc" - }, - "3,2\n\n\n2,8", - "3,3\n\n\n2,8", - "3,4\n\n\n2,8", - "3,5\n\n\n2,8", - "3,6\n\n\n2,8", - "3,7\n\n\n2,8", - "3,8\n\n\n2,8", - "3,9\n\n\n2,8", - "3,10\n\n\n2,8", - "3,11\n\n\n2,8", - "3,12\n\n\n2,8", - { - "c": "#aaaaaa" - }, - "3,13\n\n\n2,8", - "3,14\n\n\n2,8" - ], - [ - { - "x": 2.5 - }, - "3,0\n\n\n2,9", - "3,1\n\n\n2,9", - { - "c": "#cccccc" - }, - "3,2\n\n\n2,9", - "3,3\n\n\n2,9", - "3,4\n\n\n2,9", - "3,5\n\n\n2,9", - "3,6\n\n\n2,9", - "3,7\n\n\n2,9", - "3,8\n\n\n2,9", - "3,9\n\n\n2,9", - "3,10\n\n\n2,9", - "3,11\n\n\n2,9", - "3,12\n\n\n2,9", - { - "c": "#aaaaaa" - }, - "3,13\n\n\n2,9", - "3,14\n\n\n2,9" - ], - [ - { - "y": 0.5, - "x": 2.5, - "w": 1.5 - }, - "4,0\n\n\n3,1", - "4,1\n\n\n3,1", - { - "w": 1.5 - }, - "4,2\n\n\n3,1", - { - "c": "#cccccc", - "w": 7 - }, - "4,6\n\n\n3,1", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,11\n\n\n3,1", - "4,13\n\n\n3,1", - { - "w": 1.5 - }, - "4,14\n\n\n3,1" - ], - [ - { - "x": 2.5, - "w": 1.25 - }, - "4,0\n\n\n3,2", - { - "w": 1.25 - }, - "4,1\n\n\n3,2", - { - "w": 1.25 - }, - "4,2\n\n\n3,2", - { - "c": "#cccccc", - "w": 6.25 - }, - "4,6\n\n\n3,2", - { - "c": "#aaaaaa" - }, - "4,10\n\n\n3,2", - "4,11\n\n\n3,2", - "4,12\n\n\n3,2", - "4,13\n\n\n3,2", - "4,14\n\n\n3,2" - ], - [ - { - "x": 2.5, - "w": 1.5 - }, - "4,0\n\n\n3,3", - "4,1\n\n\n3,3", - { - "w": 1.25 - }, - "4,2\n\n\n3,3", - { - "c": "#cccccc", - "w": 6.25 - }, - "4,6\n\n\n3,3", - { - "c": "#aaaaaa" - }, - "4,10\n\n\n3,3", - "4,11\n\n\n3,3", - "4,12\n\n\n3,3", - "4,13\n\n\n3,3", - "4,14\n\n\n3,3" - ], - [ - { - "x": 2.5, - "w": 1.5, - "d": true - }, - "4,0\n\n\n3,4", - "4,1\n\n\n3,4", - { - "w": 1.5 - }, - "4,2\n\n\n3,4", - { - "c": "#cccccc", - "w": 7 - }, - "4,6\n\n\n3,4", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,11\n\n\n3,4", - "4,12\n\n\n3,4", - { - "w": 1.5, - "d": true - }, - "4,13\n\n\n3,4" - ], - [ - { - "x": 2.5, - "w": 1.5 - }, - "4,0\n\n\n3,5", - { - "d": true - }, - "\n\n\n3,5", - { - "w": 1.5 - }, - "4,2\n\n\n3,5", - { - "c": "#cccccc", - "w": 7 - }, - "4,6\n\n\n3,5", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,11\n\n\n3,5", - { - "d": true - }, - "\n\n\n3,5", - { - "w": 1.5 - }, - "4,13\n\n\n3,5" - ], - [ - { - "x": 2.5, - "w": 1.5, - "d": true - }, - "4,0\n\n\n3,6", - "4,1\n\n\n3,6", - { - "w": 1.5 - }, - "4,2\n\n\n3,6", - { - "c": "#cccccc", - "w": 6.25 - }, - "4,6\n\n\n3,6", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "4,11\n\n\n3,6", - "4,12\n\n\n3,6", - { - "w": 2.25, - "d": true - }, - "4,13\n\n\n3,6" - ], - [ - { - "x": 2.5, - "w": 1.25 - }, - "4,0\n\n\n3,7", - { - "w": 1.25 - }, - "4,1\n\n\n3,7", - { - "w": 1.25 - }, - "4,2\n\n\n3,7", - { - "c": "#cccccc", - "w": 2.25 - }, - "4,4\n\n\n3,7", - { - "w": 1.25 - }, - "4,6\n\n\n3,7", - { - "w": 2.75 - }, - "4,8\n\n\n3,7", - { - "c": "#aaaaaa", - "w": 1.256 - }, - "4,10\n\n\n3,7", - { - "x": -0.006000000000000227, - "w": 1.256 - }, - "4,11\n\n\n3,7", - { - "x": -0.006000000000000227, - "w": 1.256 - }, - "4,13\n\n\n3,7", - { - "x": -0.006000000000000227, - "w": 1.256 - }, - "4,14\n\n\n3,7" - ], - [ - { - "x": 2.5, - "w": 1.25 - }, - "4,0\n\n\n3,8", - { - "w": 1.25 - }, - "4,1\n\n\n3,8", - { - "w": 1.25 - }, - "4,2\n\n\n3,8", - { - "c": "#cccccc", - "w": 2.75 - }, - "4,8\n\n\n3,8", - { - "w": 1.25 - }, - "4,6\n\n\n3,8", - { - "w": 2.25 - }, - "4,4\n\n\n3,8", - { - "c": "#aaaaaa", - "w": 1.256 - }, - "4,10\n\n\n3,8", - { - "x": -0.006000000000000227, - "w": 1.256 - }, - "4,11\n\n\n3,8", - { - "x": -0.006000000000000227, - "w": 1.256 - }, - "4,13\n\n\n3,8", - { - "x": -0.006000000000000227, - "w": 1.256 - }, - "4,14\n\n\n3,8" - ] -] + [ + { + "x": 2.5, + "c": "#777777" + }, + "0,0", + { + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "0,13\n\n\n0,0", + { + "x": 0.5, + "c": "#cccccc" + }, + "0,13\n\n\n0,1", + "0,14\n\n\n0,1" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", + "w": 1.5 + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "w": 1.5 + }, + "1,13\n\n\n1,0", + { + "x": 1.25, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "2,13\n\n\n1,1" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", + "w": 1.75 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "c": "#777777", + "w": 2.25 + }, + "2,13\n\n\n1,0", + { + "x": 0.25, + "c": "#cccccc" + }, + "1,13\n\n\n1,1" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", + "w": 2.25 + }, + "3,0\n\n\n2,0", + { + "c": "#cccccc" + }, + "3,2\n\n\n2,0", + "3,3\n\n\n2,0", + "3,4\n\n\n2,0", + "3,5\n\n\n2,0", + "3,6\n\n\n2,0", + "3,7\n\n\n2,0", + "3,8\n\n\n2,0", + "3,9\n\n\n2,0", + "3,10\n\n\n2,0", + "3,11\n\n\n2,0", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "3,13\n\n\n2,0" + ], + [ + { + "x": 2.5, + "w": 1.25 + }, + "4,0\n\n\n3,0", + { + "w": 1.25 + }, + "4,1\n\n\n3,0", + { + "w": 1.25 + }, + "4,2\n\n\n3,0", + { + "c": "#cccccc", + "w": 6.25 + }, + "4,6\n\n\n3,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,10\n\n\n3,0", + { + "w": 1.25 + }, + "4,11\n\n\n3,0", + { + "w": 1.25 + }, + "4,13\n\n\n3,0", + { + "w": 1.25 + }, + "4,14\n\n\n3,0" + ], + [ + { + "y": 0.5, + "x": 2.5, + "w": 2.25 + }, + "3,0\n\n\n2,1", + { + "c": "#cccccc" + }, + "3,2\n\n\n2,1", + "3,3\n\n\n2,1", + "3,4\n\n\n2,1", + "3,5\n\n\n2,1", + "3,6\n\n\n2,1", + "3,7\n\n\n2,1", + "3,8\n\n\n2,1", + "3,9\n\n\n2,1", + "3,10\n\n\n2,1", + "3,11\n\n\n2,1", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,13\n\n\n2,1", + "3,14\n\n\n2,1" + ], + [ + { + "x": 2.5, + "w": 2.25 + }, + "3,0\n\n\n2,2", + { + "c": "#cccccc" + }, + "3,2\n\n\n2,2", + "3,3\n\n\n2,2", + "3,4\n\n\n2,2", + "3,5\n\n\n2,2", + "3,6\n\n\n2,2", + "3,7\n\n\n2,2", + "3,8\n\n\n2,2", + "3,9\n\n\n2,2", + "3,10\n\n\n2,2", + { + "w": 1.75 + }, + "3,11\n\n\n2,2", + "3,13\n\n\n2,2", + "3,12\n\n\n2,2" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", + "w": 1.25 + }, + "3,0\n\n\n2,3", + "3,1\n\n\n2,3", + { + "c": "#cccccc" + }, + "3,2\n\n\n2,3", + "3,3\n\n\n2,3", + "3,4\n\n\n2,3", + "3,5\n\n\n2,3", + "3,6\n\n\n2,3", + "3,7\n\n\n2,3", + "3,8\n\n\n2,3", + "3,9\n\n\n2,3", + "3,10\n\n\n2,3", + "3,11\n\n\n2,3", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "3,13\n\n\n2,3" + ], + [ + { + "x": 2.5, + "w": 1.25 + }, + "3,0\n\n\n2,4", + "3,1\n\n\n2,4", + { + "c": "#cccccc" + }, + "3,2\n\n\n2,4", + "3,3\n\n\n2,4", + "3,4\n\n\n2,4", + "3,5\n\n\n2,4", + "3,6\n\n\n2,4", + "3,7\n\n\n2,4", + "3,8\n\n\n2,4", + "3,9\n\n\n2,4", + "3,10\n\n\n2,4", + "3,11\n\n\n2,4", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,13\n\n\n2,4", + "3,14\n\n\n2,4" + ], + [ + { + "x": 2.5, + "w": 1.25 + }, + "3,0\n\n\n2,5", + "3,1\n\n\n2,5", + { + "c": "#cccccc" + }, + "3,2\n\n\n2,5", + "3,3\n\n\n2,5", + "3,4\n\n\n2,5", + "3,5\n\n\n2,5", + "3,6\n\n\n2,5", + "3,7\n\n\n2,5", + "3,8\n\n\n2,5", + "3,9\n\n\n2,5", + "3,10\n\n\n2,5", + { + "w": 1.75 + }, + "3,11\n\n\n2,5", + "3,13\n\n\n2,5", + "3,14\n\n\n2,5" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", + "w": 2 + }, + "3,0\n\n\n2,6", + { + "c": "#cccccc" + }, + "3,2\n\n\n2,6", + "3,3\n\n\n2,6", + "3,4\n\n\n2,6", + "3,5\n\n\n2,6", + "3,6\n\n\n2,6", + "3,7\n\n\n2,6", + "3,8\n\n\n2,6", + "3,9\n\n\n2,6", + "3,10\n\n\n2,6", + "3,11\n\n\n2,6", + "3,13\n\n\n2,6", + { + "c": "#aaaaaa", + "w": 2 + }, + "3,14\n\n\n2,6" + ], + [ + { + "x": 2.5 + }, + "3,0\n\n\n2,7", + "3,1\n\n\n2,7", + { + "c": "#cccccc" + }, + "3,2\n\n\n2,7", + "3,3\n\n\n2,7", + "3,4\n\n\n2,7", + "3,5\n\n\n2,7", + "3,6\n\n\n2,7", + "3,7\n\n\n2,7", + "3,8\n\n\n2,7", + "3,9\n\n\n2,7", + "3,10\n\n\n2,7", + "3,11\n\n\n2,7", + "3,12\n\n\n2,7", + { + "c": "#aaaaaa", + "w": 2 + }, + "3,13\n\n\n2,7" + ], + [ + { + "x": 2.5, + "w": 2 + }, + "3,0\n\n\n2,8", + { + "c": "#cccccc" + }, + "3,2\n\n\n2,8", + "3,3\n\n\n2,8", + "3,4\n\n\n2,8", + "3,5\n\n\n2,8", + "3,6\n\n\n2,8", + "3,7\n\n\n2,8", + "3,8\n\n\n2,8", + "3,9\n\n\n2,8", + "3,10\n\n\n2,8", + "3,11\n\n\n2,8", + "3,12\n\n\n2,8", + { + "c": "#aaaaaa" + }, + "3,13\n\n\n2,8", + "3,14\n\n\n2,8" + ], + [ + { + "x": 2.5 + }, + "3,0\n\n\n2,9", + "3,1\n\n\n2,9", + { + "c": "#cccccc" + }, + "3,2\n\n\n2,9", + "3,3\n\n\n2,9", + "3,4\n\n\n2,9", + "3,5\n\n\n2,9", + "3,6\n\n\n2,9", + "3,7\n\n\n2,9", + "3,8\n\n\n2,9", + "3,9\n\n\n2,9", + "3,10\n\n\n2,9", + "3,11\n\n\n2,9", + "3,12\n\n\n2,9", + { + "c": "#aaaaaa" + }, + "3,13\n\n\n2,9", + "3,14\n\n\n2,9" + ], + [ + { + "y": 0.5, + "x": 2.5, + "w": 1.5 + }, + "4,0\n\n\n3,1", + "4,1\n\n\n3,1", + { + "w": 1.5 + }, + "4,2\n\n\n3,1", + { + "c": "#cccccc", + "w": 7 + }, + "4,6\n\n\n3,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,11\n\n\n3,1", + "4,13\n\n\n3,1", + { + "w": 1.5 + }, + "4,14\n\n\n3,1" + ], + [ + { + "x": 2.5, + "w": 1.25 + }, + "4,0\n\n\n3,2", + { + "w": 1.25 + }, + "4,1\n\n\n3,2", + { + "w": 1.25 + }, + "4,2\n\n\n3,2", + { + "c": "#cccccc", + "w": 6.25 + }, + "4,6\n\n\n3,2", + { + "c": "#aaaaaa" + }, + "4,10\n\n\n3,2", + "4,11\n\n\n3,2", + "4,12\n\n\n3,2", + "4,13\n\n\n3,2", + "4,14\n\n\n3,2" + ], + [ + { + "x": 2.5, + "w": 1.5 + }, + "4,0\n\n\n3,3", + "4,1\n\n\n3,3", + { + "w": 1.25 + }, + "4,2\n\n\n3,3", + { + "c": "#cccccc", + "w": 6.25 + }, + "4,6\n\n\n3,3", + { + "c": "#aaaaaa" + }, + "4,10\n\n\n3,3", + "4,11\n\n\n3,3", + "4,12\n\n\n3,3", + "4,13\n\n\n3,3", + "4,14\n\n\n3,3" + ], + [ + { + "x": 2.5, + "w": 1.5, + "d": true + }, + "4,0\n\n\n3,4", + "4,1\n\n\n3,4", + { + "w": 1.5 + }, + "4,2\n\n\n3,4", + { + "c": "#cccccc", + "w": 7 + }, + "4,6\n\n\n3,4", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,11\n\n\n3,4", + "4,12\n\n\n3,4", + { + "w": 1.5, + "d": true + }, + "4,13\n\n\n3,4" + ], + [ + { + "x": 2.5, + "w": 1.5 + }, + "4,0\n\n\n3,5", + { + "d": true + }, + "\n\n\n3,5", + { + "w": 1.5 + }, + "4,2\n\n\n3,5", + { + "c": "#cccccc", + "w": 7 + }, + "4,6\n\n\n3,5", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,11\n\n\n3,5", + { + "d": true + }, + "\n\n\n3,5", + { + "w": 1.5 + }, + "4,13\n\n\n3,5" + ], + [ + { + "x": 2.5, + "w": 1.5, + "d": true + }, + "4,0\n\n\n3,6", + "4,1\n\n\n3,6", + { + "w": 1.5 + }, + "4,2\n\n\n3,6", + { + "c": "#cccccc", + "w": 6.25 + }, + "4,6\n\n\n3,6", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,11\n\n\n3,6", + "4,12\n\n\n3,6", + { + "w": 2.25, + "d": true + }, + "4,13\n\n\n3,6" + ], + [ + { + "x": 2.5, + "w": 1.25 + }, + "4,0\n\n\n3,7", + { + "w": 1.25 + }, + "4,1\n\n\n3,7", + { + "w": 1.25 + }, + "4,2\n\n\n3,7", + { + "c": "#cccccc", + "w": 2.25 + }, + "4,4\n\n\n3,7", + { + "w": 1.25 + }, + "4,6\n\n\n3,7", + { + "w": 2.75 + }, + "4,8\n\n\n3,7", + { + "c": "#aaaaaa", + "w": 1.256 + }, + "4,10\n\n\n3,7", + { + "x": -0.006000000000000227, + "w": 1.256 + }, + "4,11\n\n\n3,7", + { + "x": -0.006000000000000227, + "w": 1.256 + }, + "4,13\n\n\n3,7", + { + "x": -0.006000000000000227, + "w": 1.256 + }, + "4,14\n\n\n3,7" + ], + [ + { + "x": 2.5, + "w": 1.25 + }, + "4,0\n\n\n3,8", + { + "w": 1.25 + }, + "4,1\n\n\n3,8", + { + "w": 1.25 + }, + "4,2\n\n\n3,8", + { + "c": "#cccccc", + "w": 2.75 + }, + "4,8\n\n\n3,8", + { + "w": 1.25 + }, + "4,6\n\n\n3,8", + { + "w": 2.25 + }, + "4,4\n\n\n3,8", + { + "c": "#aaaaaa", + "w": 1.256 + }, + "4,10\n\n\n3,8", + { + "x": -0.006000000000000227, + "w": 1.256 + }, + "4,11\n\n\n3,8", + { + "x": -0.006000000000000227, + "w": 1.256 + }, + "4,13\n\n\n3,8", + { + "x": -0.006000000000000227, + "w": 1.256 + }, + "4,14\n\n\n3,8" + ] + ] } -} \ No newline at end of file +} diff --git a/v3/0xC7/61key/61key.json b/v3/0xC7/61key/61key.json index 9dfeb6c80d..2fd9a1f90c 100644 --- a/v3/0xC7/61key/61key.json +++ b/v3/0xC7/61key/61key.json @@ -80,9 +80,9 @@ "4,1", {"w": 1.25}, "4,2", - {"a": 7, "w": 6.25}, + {"w": 6.25}, "4,5", - {"a": 4, "w": 1.25}, + {"w": 1.25}, "4,8", {"w": 1.25}, "4,9", @@ -93,4 +93,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/4pplet/eagle_viper_rep_rev_a.json b/v3/4pplet/eagle_viper_rep_rev_a.json index bdc95052b6..a8a258f87d 100644 --- a/v3/4pplet/eagle_viper_rep_rev_a.json +++ b/v3/4pplet/eagle_viper_rep_rev_a.json @@ -14,7 +14,6 @@ ["Bottom row", "Tsangan", "HHKB", "Standard"] ], "keymap": [ - {"css": ""}, [ {"x": 3, "c": "#aaaaaa"}, "0,0", @@ -149,4 +148,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/ai03/andromeda/andromeda.json b/v3/ai03/andromeda/andromeda.json index 791653e766..fd8fb1c4d4 100644 --- a/v3/ai03/andromeda/andromeda.json +++ b/v3/ai03/andromeda/andromeda.json @@ -115,9 +115,9 @@ "5,0", {"x": 1, "w": 1.5}, "5,2", - {"c": "#777777", "a": 7, "w": 7}, + {"c": "#777777", "w": 7}, "5,7", - {"c": "#aaaaaa", "a": 4, "w": 1.5}, + {"c": "#aaaaaa", "w": 1.5}, "5,11", {"x": 1, "w": 1.5}, "5,13", @@ -128,4 +128,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/aidansmithdotdev/fine40/fine40.json b/v3/aidansmithdotdev/fine40/fine40.json index b0316adf22..191c5f2e2b 100644 --- a/v3/aidansmithdotdev/fine40/fine40.json +++ b/v3/aidansmithdotdev/fine40/fine40.json @@ -2,7 +2,6 @@ "name": "fine!40", "vendorId": "0xA059", "productId": "0x4564", - "lighting": "none", "matrix": { "rows": 8, "cols": 6 @@ -191,4 +190,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/argo_works/ishi/80/mk0/mk0.json b/v3/argo_works/ishi/80/mk0/mk0.json index 3a3558091f..21b7257ac8 100644 --- a/v3/argo_works/ishi/80/mk0/mk0.json +++ b/v3/argo_works/ishi/80/mk0/mk0.json @@ -2,16 +2,129 @@ "name": "Argo Works Ishi 80 Mk0", "vendorId": "0x4157", "productId": "0x4930", - "lighting": "none", - "matrix": { "rows": 9, "cols": 9 }, + "matrix": {"rows": 9, "cols": 9}, "layouts": { "labels": ["Encoder"], "keymap": [ - [{"c":"#aaaaaa"}, "1,0", "0,0", "1,1", "0,1", {"x":0.5}, "1,2", {"c":"#cccccc"}, "0,2", "1,3", "0,3", "1,4", "0,4", "1,5", "0,5", "1,6", "0,6", "1,7", "0,7", "1,8", {"w":2, "c":"#aaaaaa"}, "0,8"], - [{"h":2, "c":"#aaaaaa"}, "3,0", {"c":"#cccccc"}, "2,0", "3,1", "2,1", {"x":0.5,"w":1.5, "c":"#aaaaaa"}, "3,2", {"c":"#cccccc"}, "2,2", "3,3", "2,3", "3,4", "2,4", "3,5", "2,5", "3,6", "2,6", "3,7", "2,7", "3,8", {"w":1.5, "c":"#aaaaaa"}, "2,8"], - [{"x":1, "c":"#cccccc"}, "4,0", "5,1", "4,1", {"x":0.5,"w":1.75, "c":"#aaaaaa"}, "5,2", {"c":"#cccccc"}, "4,2", "5,3", "4,3", "5,4", "4,4", "5,5", "4,5", "5,6", "4,6", "5,7", "4,7", {"w":2.25, "c":"#aaaaaa"}, "4,8"], - [{"c":"#aaaaaa", "h":2}, "7,0", {"c":"#cccccc"}, "6,0", "7,1", "6,1", {"x":0.5,"w":2.25, "c":"#aaaaaa"}, "7,2", {"c":"#cccccc"}, "7,3", "6,3", "7,4", "6,4", "7,5", "6,5", "7,6", "6,6", "7,7", "6,7", {"w":2.75, "c":"#aaaaaa"}, "6,8"], - [{"x":1, "c":"#cccccc"}, "8,0", {"w":2}, "8,1", {"x":0.5,"w":1.25, "c":"#aaaaaa"}, "8,2", {"w":1.25}, "6,2", {"w":1.25}, "8,3", {"w":6.25}, "8,4", {"w":1.25}, "8,5", {"w":1.25}, "8,6", {"w":1.25}, "8,7", {"w":1.25}, "7,8", {"x":0.5, "c":"#777777"}, "8,8\n\n\n0,0", "8,8\n\n\n0,1\n\n\n\n\n\ne0"] + [ + {"c": "#aaaaaa"}, + "1,0", + "0,0", + "1,1", + "0,1", + {"x": 0.5}, + "1,2", + {"c": "#cccccc"}, + "0,2", + "1,3", + "0,3", + "1,4", + "0,4", + "1,5", + "0,5", + "1,6", + "0,6", + "1,7", + "0,7", + "1,8", + {"w": 2, "c": "#aaaaaa"}, + "0,8" + ], + [ + {"h": 2, "c": "#aaaaaa"}, + "3,0", + {"c": "#cccccc"}, + "2,0", + "3,1", + "2,1", + {"x": 0.5, "w": 1.5, "c": "#aaaaaa"}, + "3,2", + {"c": "#cccccc"}, + "2,2", + "3,3", + "2,3", + "3,4", + "2,4", + "3,5", + "2,5", + "3,6", + "2,6", + "3,7", + "2,7", + "3,8", + {"w": 1.5, "c": "#aaaaaa"}, + "2,8" + ], + [ + {"x": 1, "c": "#cccccc"}, + "4,0", + "5,1", + "4,1", + {"x": 0.5, "w": 1.75, "c": "#aaaaaa"}, + "5,2", + {"c": "#cccccc"}, + "4,2", + "5,3", + "4,3", + "5,4", + "4,4", + "5,5", + "4,5", + "5,6", + "4,6", + "5,7", + "4,7", + {"w": 2.25, "c": "#aaaaaa"}, + "4,8" + ], + [ + {"c": "#aaaaaa", "h": 2}, + "7,0", + {"c": "#cccccc"}, + "6,0", + "7,1", + "6,1", + {"x": 0.5, "w": 2.25, "c": "#aaaaaa"}, + "7,2", + {"c": "#cccccc"}, + "7,3", + "6,3", + "7,4", + "6,4", + "7,5", + "6,5", + "7,6", + "6,6", + "7,7", + "6,7", + {"w": 2.75, "c": "#aaaaaa"}, + "6,8" + ], + [ + {"x": 1, "c": "#cccccc"}, + "8,0", + {"w": 2}, + "8,1", + {"x": 0.5, "w": 1.25, "c": "#aaaaaa"}, + "8,2", + {"w": 1.25}, + "6,2", + {"w": 1.25}, + "8,3", + {"w": 6.25}, + "8,4", + {"w": 1.25}, + "8,5", + {"w": 1.25}, + "8,6", + {"w": 1.25}, + "8,7", + {"w": 1.25}, + "7,8", + {"x": 0.5, "c": "#777777"}, + "8,8\n\n\n0,0", + "8,8\n\n\n0,1\n\n\n\n\n\ne0" + ] ] } } diff --git a/v3/cannonkeys/rekt1800/rekt1800.json b/v3/cannonkeys/rekt1800/rekt1800.json index 01466c4346..4905f0764c 100644 --- a/v3/cannonkeys/rekt1800/rekt1800.json +++ b/v3/cannonkeys/rekt1800/rekt1800.json @@ -135,7 +135,7 @@ "5,1", {"w": 1.25}, "5,2", - {"c": "#cccccc", "a": 7, "w": 6.25}, + {"c": "#cccccc", "w": 6.25}, "5,6", {"c": "#aaaaaa", "w": 1.5}, "5,10", @@ -148,4 +148,4 @@ [{"y": -0.75, "x": 13.25, "c": "#777777"}, "5,12", "5,14", "5,15"] ] } -} \ No newline at end of file +} diff --git a/v3/dmqdesign/spin.json b/v3/dmqdesign/spin.json index 9743c91d8f..0f2c8ac0c2 100644 --- a/v3/dmqdesign/spin.json +++ b/v3/dmqdesign/spin.json @@ -7,7 +7,6 @@ "matrix": {"rows": 3, "cols": 5}, "layouts": { "keymap": [ - {"name": "SPIN Macropad", "author": "adamkraus6"}, [ "0,0", "1,0", @@ -22,4 +21,4 @@ ["0,3", "1,3", "2,3", {"x": 0.25}, "0,4"] ] } -} \ No newline at end of file +} diff --git a/v3/duck/octagon/v2/Octagon v2.json b/v3/duck/octagon/v2/Octagon v2.json index 047be5e1d2..afdbcbc448 100644 --- a/v3/duck/octagon/v2/Octagon v2.json +++ b/v3/duck/octagon/v2/Octagon v2.json @@ -20,7 +20,6 @@ ] ], "keymap": [ - {"name": "Duck Octagon V3", "author": "u/tk89yt"}, [ {"y": 1.25, "x": 2.75, "c": "#777777"}, "0,0", @@ -200,4 +199,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/durgod/galaxy/galaxy.json b/v3/durgod/galaxy/galaxy.json index ce6ea184a7..9cdfa86211 100644 --- a/v3/durgod/galaxy/galaxy.json +++ b/v3/durgod/galaxy/galaxy.json @@ -113,9 +113,8 @@ "5,1", {"w": 1.25}, "5,2", - {"a": 7, "w": 6.25}, + {"w": 6.25}, "5,6", - {"a": 4}, "5,9", "5,10", "5,11", @@ -125,4 +124,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/durgod/hades/hades.json b/v3/durgod/hades/hades.json index 06cc48eac9..aaaaf6c95d 100644 --- a/v3/durgod/hades/hades.json +++ b/v3/durgod/hades/hades.json @@ -95,9 +95,8 @@ "4,1", {"w": 1.25}, "4,2", - {"a": 7, "w": 6.25}, + {"w": 6.25}, "4,5", - {"a": 4}, "4,9", "4,10", "4,11", @@ -107,4 +106,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/ergotravel/ergotravel.json b/v3/ergotravel/ergotravel.json index 6c68217870..568f068ae8 100644 --- a/v3/ergotravel/ergotravel.json +++ b/v3/ergotravel/ergotravel.json @@ -6,7 +6,6 @@ "layouts": { "keymap": [ [ - {"a": 7}, "0,0", "0,1", "0,2", @@ -76,4 +75,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/frooastboard/nano/nano.json b/v3/frooastboard/nano/nano.json index c16948b0fd..710920583b 100644 --- a/v3/frooastboard/nano/nano.json +++ b/v3/frooastboard/nano/nano.json @@ -7,8 +7,8 @@ "matrix": {"rows": 2, "cols": 2}, "layouts": { "keymap": [ - [{"c": "#cccccc", "a": 7}, "0,0", {"c": "#cccccc"}, "0,1"], + [{"c": "#cccccc"}, "0,0", {"c": "#cccccc"}, "0,1"], [{"c": "#777777"}, "1,0", {"c": "#cccccc"}, "1,1"] ] } -} \ No newline at end of file +} diff --git a/v3/gl516/xr63gl/xr63gl.json b/v3/gl516/xr63gl/xr63gl.json index 276afa5010..e8ff9d83c7 100644 --- a/v3/gl516/xr63gl/xr63gl.json +++ b/v3/gl516/xr63gl/xr63gl.json @@ -2,13 +2,10 @@ "name": "XR63GL", "vendorId": "0x8686", "productId": "0x0001", - "lighting": "none", - "matrix": { "rows": 9, "cols": 9 }, - "layouts": - { - "keymap": - [ - [ + "matrix": {"rows": 9, "cols": 9}, + "layouts": { + "keymap": [ + [ {"c": "#777777"}, "0,1", {"c": "#cccccc"}, @@ -24,11 +21,11 @@ "1,3", "1,4", "1,5", - {"c": "#aaaaaa","w":2}, + {"c": "#aaaaaa", "w": 2}, "1,6" ], - [ - {"w":1.5}, + [ + {"w": 1.5}, "2,0", {"c": "#cccccc"}, "2,1", @@ -43,11 +40,11 @@ "3,2", "3,4", "3,5", - {"w":1.5}, - "3,6"] - , - [ - {"c": "#aaaaaa","w":1.75}, + {"w": 1.5}, + "3,6" + ], + [ + {"c": "#aaaaaa", "w": 1.75}, "4,0", {"c": "#cccccc"}, "4,1", @@ -61,11 +58,11 @@ "5,1", "5,2", "5,3", - {"c": "#aaaaaa","w":2.25}, + {"c": "#aaaaaa", "w": 2.25}, "5,4" ], - [ - {"w":2.25}, + [ + {"w": 2.25}, "6,0", {"c": "#cccccc"}, "6,1", @@ -78,25 +75,25 @@ "7,0", "7,1", "7,2", - {"c": "#aaaaaa","w":1.25}, + {"c": "#aaaaaa", "w": 1.25}, "7,3", - {"x":0.5}, + {"x": 0.5}, "7,4" ], - [ - {"w":1.25}, + [ + {"w": 1.25}, "8,0", - {"w":1.25}, + {"w": 1.25}, "8,1", - {"w":1.25}, + {"w": 1.25}, "8,2", - {"w":6.25}, + {"w": 6.25}, "8,3", - {"w":1.25}, + {"w": 1.25}, "8,4", - {"w":1.25}, + {"w": 1.25}, "8,5", - {"x":0.5}, + {"x": 0.5}, "8,6", "8,7", "7,5" diff --git a/v3/handwired/dactyl_manuform/5x7/5x7.json b/v3/handwired/dactyl_manuform/5x7/5x7.json index cce7df9c00..37062918d7 100644 --- a/v3/handwired/dactyl_manuform/5x7/5x7.json +++ b/v3/handwired/dactyl_manuform/5x7/5x7.json @@ -6,7 +6,7 @@ "layouts": { "keymap": [ [ - {"a": 7, "w": 1.5}, + {"w": 1.5}, "0,0", "0,1", "0,2", @@ -25,7 +25,7 @@ "6,6" ], [ - {"a": 7, "w": 1.5}, + {"w": 1.5}, "1,0", "1,1", "1,2", @@ -44,7 +44,7 @@ "7,6" ], [ - {"a": 7, "w": 1.5}, + {"w": 1.5}, "2,0", "2,1", "2,2", @@ -63,7 +63,7 @@ "8,6" ], [ - {"a": 7, "w": 1.5}, + {"w": 1.5}, "3,0", "3,1", "3,2", @@ -101,4 +101,4 @@ [{"y": -0.5, "x": -1, "h": 1.5}, "10,2"] ] } -} \ No newline at end of file +} diff --git a/v3/handwired/marauder/marauder.json b/v3/handwired/marauder/marauder.json index e121cd9f99..d6f5c43925 100644 --- a/v3/handwired/marauder/marauder.json +++ b/v3/handwired/marauder/marauder.json @@ -130,9 +130,9 @@ "5,1", {"w": 1.5}, "5,2", - {"c": "#cccccc", "a": 7, "w": 7}, + {"c": "#cccccc", "w": 7}, "5,6", - {"c": "#aaaaaa", "a": 4, "w": 1.5}, + {"c": "#aaaaaa", "w": 1.5}, "11,7", "11,6", {"w": 1.5}, @@ -143,4 +143,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/hhkb_lite_2/hhkb_lite_2.json b/v3/hhkb_lite_2/hhkb_lite_2.json index eb3d7e5ba4..77526ebe56 100644 --- a/v3/hhkb_lite_2/hhkb_lite_2.json +++ b/v3/hhkb_lite_2/hhkb_lite_2.json @@ -2,10 +2,7 @@ "name": "HHKB Lite 2", "vendorId": "0x88b2", "productId": "0x88b2", - "keyboard": "hhkb_lite_2", "matrix": {"rows": 8, "cols": 14}, - "keymap": "via", - "layout": "LAYOUT", "layouts": { "keymap": [ [ @@ -104,205 +101,5 @@ "2,0" ] ] - }, - "layers": [ - [ - "KC_ESC", - "KC_1", - "KC_2", - "KC_3", - "KC_4", - "KC_5", - "KC_6", - "KC_7", - "KC_8", - "KC_9", - "KC_0", - "KC_MINS", - "KC_EQL", - "KC_BSLS", - "KC_GRV", - "KC_TAB", - "KC_Q", - "KC_W", - "KC_E", - "KC_R", - "KC_T", - "KC_Y", - "KC_U", - "KC_I", - "KC_O", - "KC_P", - "KC_LBRC", - "KC_RBRC", - "KC_BSPC", - "KC_LCTL", - "KC_A", - "KC_S", - "KC_D", - "KC_F", - "KC_G", - "KC_H", - "KC_J", - "KC_K", - "KC_L", - "KC_SCLN", - "KC_QUOT", - "KC_ENT", - "KC_LSFT", - "KC_Z", - "KC_X", - "KC_C", - "KC_V", - "KC_B", - "KC_N", - "KC_M", - "KC_COMM", - "KC_DOT", - "KC_SLSH", - "KC_RSFT", - "MO(1)", - "KC_LALT", - "KC_LGUI", - "KC_SPC", - "KC_RGUI", - "KC_RALT", - "KC_UP", - "KC_LEFT", - "KC_DOWN", - "KC_RGHT" - ], - [ - "RESET", - "KC_F1", - "KC_F2", - "KC_F3", - "KC_F4", - "KC_F5", - "KC_F6", - "KC_F7", - "KC_F8", - "KC_F9", - "KC_F10", - "KC_F11", - "KC_F12", - "KC_INS", - "KC_DEL", - "KC_CAPS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_PSCR", - "KC_SLCK", - "KC_PAUS", - "KC_UP", - "KC_NO", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_HOME", - "KC_PGUP", - "KC_LEFT", - "KC_RIGHT", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_END", - "KC_PGDN", - "KC_DOWN", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_PGUP", - "KC_HOME", - "KC_PGDN", - "KC_END" - ], - [ - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS" - ] - ] -} \ No newline at end of file + } +} diff --git a/v3/jacky_studio/piggy60/via.json b/v3/jacky_studio/piggy60/via.json index dfe6d7b5f1..723491e559 100644 --- a/v3/jacky_studio/piggy60/via.json +++ b/v3/jacky_studio/piggy60/via.json @@ -4,7 +4,6 @@ "productId": "0x1001", "keycodes": ["qmk_lighting"], "menus": ["qmk_backlight_rgblight"], - "manufacturer": "Jacky", "matrix": {"rows": 5, "cols": 15}, "layouts": { "labels": [ @@ -158,4 +157,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/kbparadise/v60_type_r.json b/v3/kbparadise/v60_type_r.json index d6442885ea..a9fbb2d415 100644 --- a/v3/kbparadise/v60_type_r.json +++ b/v3/kbparadise/v60_type_r.json @@ -6,7 +6,7 @@ "layouts": { "keymap": [ [ - {"c": "#777777", "a": 7}, + {"c": "#777777"}, "0,0", {"c": "#cccccc"}, "0,1", @@ -98,4 +98,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/keebzdotnet/wazowski2319/wazowski-23-19-rev0.json b/v3/keebzdotnet/wazowski2319/wazowski-23-19-rev0.json index f69b09834c..c1c01894d7 100644 --- a/v3/keebzdotnet/wazowski2319/wazowski-23-19-rev0.json +++ b/v3/keebzdotnet/wazowski2319/wazowski-23-19-rev0.json @@ -5,11 +5,11 @@ "matrix": {"rows": 3, "cols": 5}, "layouts": { "keymap": [ - [{"a": 7, "w": 2.25}, "0,0", {"x": 3.75}, "2,3"], + [{"w": 2.25}, "0,0", {"x": 3.75}, "2,3"], [{"y": -0.5, "x": 2.25}, "0,1", "0,2", "0,3"], [{"y": -0.25, "h": 2.25}, "1,0", {"x": 4.5}, "1,4", "2,4"], [{"y": -0.75, "x": 1.5, "w": 1.75}, "1,1", "1,2", "1,3"], [{"x": 1}, "2,0", {"w": 1.75}, "2,1", {"x": 2.25}, "0,4"] ] } -} \ No newline at end of file +} diff --git a/v3/keychron/s1/ansi_white.json b/v3/keychron/s1/ansi_white.json index 379a7f9a64..f1470f6f86 100644 --- a/v3/keychron/s1/ansi_white.json +++ b/v3/keychron/s1/ansi_white.json @@ -2,20 +2,43 @@ "name": "Keychron S1", "vendorId": "0x3434", "productId": "0x0411", - "keycode" : "qmk_lighting", "matrix": {"rows": 6, "cols": 15}, "customKeycodes": [ - {"name": "Mission Control", "title": "Mission Control in macOS", "shortName": "MCtrl"}, - {"name": "Launch Pad", "title": "Launch Pad in macOS", "shortName": "LPad"}, - {"name": "Left Option", "title": "Left Option in macOS", "shortName": "LOpt"}, - {"name": "Right Option", "title": "Right Option in macOS", "shortName": "ROpt"}, - {"name": "Left Cmd", "title": "Left Command in macOS", "shortName": "LCmd"}, - {"name": "Right Cmd", "title": "Right Command in macOS", "shortName": "RCmd"}, - {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, - {"name": "Task View", "title": "Task View in windows", "shortName": "Task"}, - {"name": "File Explorer", "title": "File Explorer in windows", "shortName": "File"}, - {"name": "Screen Shot", "title": "Screenshot in macOS", "shortName": "SShot"}, - {"name": "Cortana", "title": "Cortana in windows", "shortName": "Cortana"} + { + "name": "Mission Control", + "title": "Mission Control in macOS", + "shortName": "MCtrl" + }, + {"name": "Launch Pad", "title": "Launch Pad in macOS", "shortName": "LPad"}, + { + "name": "Left Option", + "title": "Left Option in macOS", + "shortName": "LOpt" + }, + { + "name": "Right Option", + "title": "Right Option in macOS", + "shortName": "ROpt" + }, + {"name": "Left Cmd", "title": "Left Command in macOS", "shortName": "LCmd"}, + { + "name": "Right Cmd", + "title": "Right Command in macOS", + "shortName": "RCmd" + }, + {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, + {"name": "Task View", "title": "Task View in windows", "shortName": "Task"}, + { + "name": "File Explorer", + "title": "File Explorer in windows", + "shortName": "File" + }, + { + "name": "Screen Shot", + "title": "Screenshot in macOS", + "shortName": "SShot" + }, + {"name": "Cortana", "title": "Cortana in windows", "shortName": "Cortana"} ], "layouts": { "keymap": [ diff --git a/v3/keychron/v1/jis.json b/v3/keychron/v1/jis.json index af65304495..d185bbcd40 100644 --- a/v3/keychron/v1/jis.json +++ b/v3/keychron/v1/jis.json @@ -66,20 +66,44 @@ ], "matrix": {"rows": 6, "cols": 16}, "customKeycodes": [ - {"name": "Mission Control", "title": "Mission Control in macOS", "shortName": "MCtrl"}, - {"name": "Launch Pad", "title": "Launch Pad in macOS", "shortName": "LPad"}, - {"name": "Left Option", "title": "Left Option in macOS", "shortName": "LOpt"}, - {"name": "Right Option", "title": "Right Option in macOS", "shortName": "ROpt"}, - {"name": "Left Cmd", "title": "Left Command in macOS", "shortName": "LCmd"}, - {"name": "Right Cmd", "title": "Right Command in macOS", "shortName": "RCmd"}, - {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, - {"name": "Task View", "title": "Task View in windows", "shortName": "Task"}, - {"name": "File Explorer", "title": "File Explorer in windows", "shortName": "File"}, - {"name": "Screen Shot", "title": "Screenshot in macOS", "shortName": "SShot"}, - {"name": "Cortana", "title": "Cortana in windows", "shortName": "Cortana"} + { + "name": "Mission Control", + "title": "Mission Control in macOS", + "shortName": "MCtrl" + }, + {"name": "Launch Pad", "title": "Launch Pad in macOS", "shortName": "LPad"}, + { + "name": "Left Option", + "title": "Left Option in macOS", + "shortName": "LOpt" + }, + { + "name": "Right Option", + "title": "Right Option in macOS", + "shortName": "ROpt" + }, + {"name": "Left Cmd", "title": "Left Command in macOS", "shortName": "LCmd"}, + { + "name": "Right Cmd", + "title": "Right Command in macOS", + "shortName": "RCmd" + }, + {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, + {"name": "Task View", "title": "Task View in windows", "shortName": "Task"}, + { + "name": "File Explorer", + "title": "File Explorer in windows", + "shortName": "File" + }, + { + "name": "Screen Shot", + "title": "Screenshot in macOS", + "shortName": "SShot" + }, + {"name": "Cortana", "title": "Cortana in windows", "shortName": "Cortana"} ], "layouts": { - "keymap":[ + "keymap": [ [ { "c": "#777777" @@ -254,7 +278,6 @@ "5,6", { "c": "#aaaaaa", - "a": 7, "w": 1.25 }, "5,9", diff --git a/v3/keychron/v1/jis_encoder.json b/v3/keychron/v1/jis_encoder.json index 4b9f7e2af8..fffcbeef1e 100644 --- a/v3/keychron/v1/jis_encoder.json +++ b/v3/keychron/v1/jis_encoder.json @@ -66,20 +66,44 @@ ], "matrix": {"rows": 6, "cols": 16}, "customKeycodes": [ - {"name": "Mission Control", "title": "Mission Control in macOS", "shortName": "MCtrl"}, - {"name": "Launch Pad", "title": "Launch Pad in macOS", "shortName": "LPad"}, - {"name": "Left Option", "title": "Left Option in macOS", "shortName": "LOpt"}, - {"name": "Right Option", "title": "Right Option in macOS", "shortName": "ROpt"}, - {"name": "Left Cmd", "title": "Left Command in macOS", "shortName": "LCmd"}, - {"name": "Right Cmd", "title": "Right Command in macOS", "shortName": "RCmd"}, - {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, - {"name": "Task View", "title": "Task View in windows", "shortName": "Task"}, - {"name": "File Explorer", "title": "File Explorer in windows", "shortName": "File"}, - {"name": "Screen Shot", "title": "Screenshot in macOS", "shortName": "SShot"}, - {"name": "Cortana", "title": "Cortana in windows", "shortName": "Cortana"} + { + "name": "Mission Control", + "title": "Mission Control in macOS", + "shortName": "MCtrl" + }, + {"name": "Launch Pad", "title": "Launch Pad in macOS", "shortName": "LPad"}, + { + "name": "Left Option", + "title": "Left Option in macOS", + "shortName": "LOpt" + }, + { + "name": "Right Option", + "title": "Right Option in macOS", + "shortName": "ROpt" + }, + {"name": "Left Cmd", "title": "Left Command in macOS", "shortName": "LCmd"}, + { + "name": "Right Cmd", + "title": "Right Command in macOS", + "shortName": "RCmd" + }, + {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, + {"name": "Task View", "title": "Task View in windows", "shortName": "Task"}, + { + "name": "File Explorer", + "title": "File Explorer in windows", + "shortName": "File" + }, + { + "name": "Screen Shot", + "title": "Screenshot in macOS", + "shortName": "SShot" + }, + {"name": "Cortana", "title": "Cortana in windows", "shortName": "Cortana"} ], "layouts": { - "keymap":[ + "keymap": [ [ { "c": "#777777" @@ -254,7 +278,6 @@ "5,6", { "c": "#aaaaaa", - "a": 7, "w": 1.25 }, "5,9", diff --git a/v3/kprepublic/bm980.json b/v3/kprepublic/bm980.json index ee49ffb40f..a4830014b4 100644 --- a/v3/kprepublic/bm980.json +++ b/v3/kprepublic/bm980.json @@ -132,9 +132,9 @@ "6,1", {"w": 1.25}, "6,2", - {"c": "#777777", "a": 6, "w": 6.25}, + {"c": "#777777", "w": 6.25}, "6,6", - {"c": "#aaaaaa", "a": 4}, + {"c": "#aaaaaa"}, "6,9", "6,10", "6,11", @@ -145,4 +145,4 @@ [{"y": -0.75, "x": 13.5, "c": "#777777"}, "6,12", "6,14", "6,13"] ] } -} \ No newline at end of file +} diff --git a/v3/mechlovin/dolch65/zed65-monoLED-dolch65.json b/v3/mechlovin/dolch65/zed65-monoLED-dolch65.json index 6f2cf9cd48..a66caab174 100644 --- a/v3/mechlovin/dolch65/zed65-monoLED-dolch65.json +++ b/v3/mechlovin/dolch65/zed65-monoLED-dolch65.json @@ -1,224 +1,223 @@ { - "name": "Zed65 Mono LED - Dolch65", - "vendorId": "0x4D4C", - "productId": "0x6503", - "lighting": "none", - "matrix": {"rows": 5, "cols": 16}, - "layouts": { - "labels": [ - "Split Backspace", - "Left Shift ISO", - "Enter ISO", - "Space 7U Blocker" + "name": "Zed65 Mono LED - Dolch65", + "vendorId": "0x4D4C", + "productId": "0x6503", + "matrix": {"rows": 5, "cols": 16}, + "layouts": { + "labels": [ + "Split Backspace", + "Left Shift ISO", + "Enter ISO", + "Space 7U Blocker" + ], + "keymap": [ + [ + { + "x": 2.5, + "c": "#777777" + }, + "0,0", + { + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "0,13\n\n\n0,0", + { + "c": "#cccccc" + }, + "0,15", + { + "x": 0.5, + "c": "#aaaaaa" + }, + "0,13\n\n\n0,1", + "0,14\n\n\n0,1" ], - "keymap": [ - [ - { - "x": 2.5, - "c": "#777777" - }, - "0,0", - { - "c": "#cccccc" - }, - "0,1", - "0,2", - "0,3", - "0,4", - "0,5", - "0,6", - "0,7", - "0,8", - "0,9", - "0,10", - "0,11", - "0,12", - { - "c": "#aaaaaa", - "w": 2 - }, - "0,13\n\n\n0,0", - { - "c": "#cccccc" - }, - "0,15", - { - "x": 0.5, - "c": "#aaaaaa" - }, - "0,13\n\n\n0,1", - "0,14\n\n\n0,1" - ], - [ - { - "x": 2.5, - "w": 1.5 - }, - "1,0", - { - "c": "#cccccc" - }, - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "1,9", - "1,10", - "1,11", - "1,12", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "1,14\n\n\n2,0", - { - "c": "#cccccc" - }, - "1,15", - { - "x": 1.25, - "c": "#777777", - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, - "1,14\n\n\n2,1" - ], - [ - { - "x": 2.5, - "c": "#aaaaaa", - "w": 1.75 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - { - "c": "#777777", - "w": 2.25 - }, - "2,13\n\n\n2,0", - { - "c": "#cccccc" - }, - "2,15", - { - "x": 0.25, - "c": "#777777" - }, - "2,12\n\n\n2,1" - ], - [ - { - "c": "#aaaaaa", - "w": 1.25 - }, - "3,0\n\n\n1,1", - "3,1\n\n\n1,1", - { - "x": 0.25, - "w": 2.25 - }, - "3,0\n\n\n1,0", - { - "c": "#cccccc" - }, - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - "3,11", - { - "w": 1.75 - }, - "3,12", - "3,14", - "3,15" - ], - [ - { - "x": 2.5, - "c": "#aaaaaa", - "w": 1.25 - }, - "4,0\n\n\n3,0", - { - "w": 1.25 - }, - "4,1\n\n\n3,0", - { - "w": 1.25 - }, - "4,2\n\n\n3,0", - { - "c": "#cccccc", - "w": 6.25 - }, - "4,6\n\n\n3,0", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "4,10\n\n\n3,0", - { - "w": 1.25 - }, - "4,11\n\n\n3,0", - { - "x": 0.5, - "c": "#cccccc" - }, - "4,13", - "4,14", - "4,15" - ], - [ - { - "y": 0.25, - "x": 2.5, - "c": "#aaaaaa", - "w": 1.25 - }, - "4,0\n\n\n3,1", - "4,1\n\n\n3,1", - { - "w": 1.25 - }, - "4,2\n\n\n3,1", - { - "c": "#cccccc", - "w": 7 - }, - "4,6\n\n\n3,1", - { - "c": "#aaaaaa" - }, - "4,10\n\n\n3,1", - "4,11\n\n\n3,1" - ] + [ + { + "x": 2.5, + "w": 1.5 + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "1,14\n\n\n2,0", + { + "c": "#cccccc" + }, + "1,15", + { + "x": 1.25, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "1,14\n\n\n2,1" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", + "w": 1.75 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "c": "#777777", + "w": 2.25 + }, + "2,13\n\n\n2,0", + { + "c": "#cccccc" + }, + "2,15", + { + "x": 0.25, + "c": "#777777" + }, + "2,12\n\n\n2,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "3,0\n\n\n1,1", + "3,1\n\n\n1,1", + { + "x": 0.25, + "w": 2.25 + }, + "3,0\n\n\n1,0", + { + "c": "#cccccc" + }, + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "w": 1.75 + }, + "3,12", + "3,14", + "3,15" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", + "w": 1.25 + }, + "4,0\n\n\n3,0", + { + "w": 1.25 + }, + "4,1\n\n\n3,0", + { + "w": 1.25 + }, + "4,2\n\n\n3,0", + { + "c": "#cccccc", + "w": 6.25 + }, + "4,6\n\n\n3,0", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,10\n\n\n3,0", + { + "w": 1.25 + }, + "4,11\n\n\n3,0", + { + "x": 0.5, + "c": "#cccccc" + }, + "4,13", + "4,14", + "4,15" + ], + [ + { + "y": 0.25, + "x": 2.5, + "c": "#aaaaaa", + "w": 1.25 + }, + "4,0\n\n\n3,1", + "4,1\n\n\n3,1", + { + "w": 1.25 + }, + "4,2\n\n\n3,1", + { + "c": "#cccccc", + "w": 7 + }, + "4,6\n\n\n3,1", + { + "c": "#aaaaaa" + }, + "4,10\n\n\n3,1", + "4,11\n\n\n3,1" ] - } - } \ No newline at end of file + ] + } +} diff --git a/v3/mechlovin/olly/olly_octagon.json b/v3/mechlovin/olly/olly_octagon.json index b2ad1ca5ec..418da98436 100644 --- a/v3/mechlovin/olly/olly_octagon.json +++ b/v3/mechlovin/olly/olly_octagon.json @@ -1,274 +1,278 @@ { - "name": "Olly Octagon", - "vendorId": "0x4D4C", - "productId": "0xD750", - "lighting": "qmk_backlight_rgblight", - "matrix": {"rows": 6, "cols": 16}, - "layouts": { - "labels": [ - "Split Backspace", - "ISO Enter", - "ISO Left Shift", - ["Bottom Row", "Space 7U", "1.25U-1U-1.25U-6.25U-1.25U-1U-1U", "1.25U-1.25U-1.25U-6.25U-1U-1U-1U"] - ], - "keymap": [ - [ - { - "x": 2.5, - "c": "#777777" - }, - "0,0", - { - "c": "#cccccc" - }, - "0,1", - "0,2", - "0,3", - "0,4", - "0,5", - "0,6", - "0,7", - "0,8", - "0,9", - "0,10", - "0,11", - "0,12", - "0,13", - "0,14", - "0,15" - ], - [ - { - "x": 2.5 - }, - "1,0", - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "1,9", - "1,10", - "1,11", - "1,12", - { - "c": "#aaaaaa", - "w": 2 - }, - "1,13\n\n\n0,0", - { - "c": "#cccccc" - }, - "1,15", - { - "x": 1, - "c": "#aaaaaa" - }, - "1,13\n\n\n0,1", - "1,14\n\n\n0,1" - ], - [ - { - "x": 2.5, - "w": 1.5 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - "2,12", - { - "w": 1.5 - }, - "2,14\n\n\n1,0", - "2,15", - { - "x": 1.75, - "c": "#777777", - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, - "2,14\n\n\n1,1" - ], - [ - { - "x": 2.5, - "c": "#aaaaaa", - "w": 1.75 - }, - "3,0", - { - "c": "#cccccc" - }, - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - "3,11", - { - "c": "#777777", - "w": 2.25 - }, - "3,13\n\n\n1,0", - { - "c": "#cccccc" - }, - "3,15", - { - "x": 0.75 - }, - "3,12\n\n\n1,1" - ], - [ - { - "c": "#aaaaaa", - "w": 1.25 - }, - "4,0\n\n\n2,1", - { - "c": "#cccccc" - }, - "4,1\n\n\n2,1", - { - "x": 0.25, - "c": "#aaaaaa", - "w": 2.25 - }, - "4,0\n\n\n2,0", - { - "c": "#cccccc" - }, - "4,2", - "4,3", - "4,4", - "4,5", - "4,6", - "4,7", - "4,8", - "4,9", - "4,10", - "4,11", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "4,12", - { - "c": "#777777" - }, - "4,14", - { - "c": "#cccccc" - }, - "4,15" - ], - [ - { - "x": 2.5, - "c": "#aaaaaa", - "w": 1.5 - }, - "5,0\n\n\n3,0", - { - "w": 1.5 - }, - "5,2\n\n\n3,0", - { - "c": "#cccccc", - "w": 7 - }, - "5,6\n\n\n3,0", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "5,10\n\n\n3,0", - { - "w": 1.5 - }, - "5,12\n\n\n3,0", - { - "c": "#777777" - }, - "5,13", - "5,14", - "5,15" - ], - [ - { - "y": 0.25, - "x": 2.5, - "c": "#aaaaaa", - "w": 1.25 - }, - "5,0\n\n\n3,1", - "5,1\n\n\n3,1", - { - "w": 1.25 - }, - "5,2\n\n\n3,1", - { - "c": "#cccccc", - "w": 6.25 - }, - "5,6\n\n\n3,1", - { - "c": "#aaaaaa", - "w": 1.25 - }, - "5,10\n\n\n3,1", - "5,11\n\n\n3,1", - "5,12\n\n\n3,1" - ], - [ - { - "x": 2.5, - "w": 1.25 - }, - "5,0\n\n\n3,2", - { - "w": 1.25 - }, - "5,1\n\n\n3,2", - { - "w": 1.25 - }, - "5,2\n\n\n3,2", - { - "c": "#cccccc", - "w": 6.25 - }, - "5,6\n\n\n3,2", - { - "c": "#aaaaaa" - }, - "5,10\n\n\n3,2", - "5,11\n\n\n3,2", - "5,12\n\n\n3,2" - ] + "name": "Olly Octagon", + "vendorId": "0x4D4C", + "productId": "0xD750", + "matrix": {"rows": 6, "cols": 16}, + "layouts": { + "labels": [ + "Split Backspace", + "ISO Enter", + "ISO Left Shift", + [ + "Bottom Row", + "Space 7U", + "1.25U-1U-1.25U-6.25U-1.25U-1U-1U", + "1.25U-1.25U-1.25U-6.25U-1U-1U-1U" ] - } - } \ No newline at end of file + ], + "keymap": [ + [ + { + "x": 2.5, + "c": "#777777" + }, + "0,0", + { + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + "0,13", + "0,14", + "0,15" + ], + [ + { + "x": 2.5 + }, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "1,13\n\n\n0,0", + { + "c": "#cccccc" + }, + "1,15", + { + "x": 1, + "c": "#aaaaaa" + }, + "1,13\n\n\n0,1", + "1,14\n\n\n0,1" + ], + [ + { + "x": 2.5, + "w": 1.5 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + { + "w": 1.5 + }, + "2,14\n\n\n1,0", + "2,15", + { + "x": 1.75, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "2,14\n\n\n1,1" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", + "w": 1.75 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "c": "#777777", + "w": 2.25 + }, + "3,13\n\n\n1,0", + { + "c": "#cccccc" + }, + "3,15", + { + "x": 0.75 + }, + "3,12\n\n\n1,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,0\n\n\n2,1", + { + "c": "#cccccc" + }, + "4,1\n\n\n2,1", + { + "x": 0.25, + "c": "#aaaaaa", + "w": 2.25 + }, + "4,0\n\n\n2,0", + { + "c": "#cccccc" + }, + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "4,9", + "4,10", + "4,11", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "4,12", + { + "c": "#777777" + }, + "4,14", + { + "c": "#cccccc" + }, + "4,15" + ], + [ + { + "x": 2.5, + "c": "#aaaaaa", + "w": 1.5 + }, + "5,0\n\n\n3,0", + { + "w": 1.5 + }, + "5,2\n\n\n3,0", + { + "c": "#cccccc", + "w": 7 + }, + "5,6\n\n\n3,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "5,10\n\n\n3,0", + { + "w": 1.5 + }, + "5,12\n\n\n3,0", + { + "c": "#777777" + }, + "5,13", + "5,14", + "5,15" + ], + [ + { + "y": 0.25, + "x": 2.5, + "c": "#aaaaaa", + "w": 1.25 + }, + "5,0\n\n\n3,1", + "5,1\n\n\n3,1", + { + "w": 1.25 + }, + "5,2\n\n\n3,1", + { + "c": "#cccccc", + "w": 6.25 + }, + "5,6\n\n\n3,1", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "5,10\n\n\n3,1", + "5,11\n\n\n3,1", + "5,12\n\n\n3,1" + ], + [ + { + "x": 2.5, + "w": 1.25 + }, + "5,0\n\n\n3,2", + { + "w": 1.25 + }, + "5,1\n\n\n3,2", + { + "w": 1.25 + }, + "5,2\n\n\n3,2", + { + "c": "#cccccc", + "w": 6.25 + }, + "5,6\n\n\n3,2", + { + "c": "#aaaaaa" + }, + "5,10\n\n\n3,2", + "5,11\n\n\n3,2", + "5,12\n\n\n3,2" + ] + ] + } +} diff --git a/v3/mesa/mesa_tkl/mesa_tkl.json b/v3/mesa/mesa_tkl/mesa_tkl.json index 8b3b35e711..08a5f716b9 100644 --- a/v3/mesa/mesa_tkl/mesa_tkl.json +++ b/v3/mesa/mesa_tkl/mesa_tkl.json @@ -4,8 +4,6 @@ "productId": "0x8001", "matrix": {"cols": 17, "rows": 6}, "layouts": { - "width": 18.25, - "height": 6.25, "labels": [ "Split Backspace", "Split Right Shift", @@ -177,4 +175,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/mincedshon/ecila/ecila.json b/v3/mincedshon/ecila/ecila.json index da1f43e597..d47701b039 100644 --- a/v3/mincedshon/ecila/ecila.json +++ b/v3/mincedshon/ecila/ecila.json @@ -4,7 +4,6 @@ "productId": "0x534B", "keycodes": ["qmk_lighting"], "menus": ["qmk_rgblight"], - "maintainer": "mincedshon", "matrix": {"rows": 5, "cols": 15}, "layouts": { "keymap": [ @@ -109,4 +108,4 @@ [{"y": -0.75, "x": 14.65, "c": "#777777"}, "4,12", "4,13", "4,14"] ] } -} \ No newline at end of file +} diff --git a/v3/nasp/G_IDB60.json b/v3/nasp/G_IDB60.json index f204d6cbed..9109f49d5b 100644 --- a/v3/nasp/G_IDB60.json +++ b/v3/nasp/G_IDB60.json @@ -101,4 +101,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/nopunin10did/jabberwocky/v2/jabberwocky_v2.json b/v3/nopunin10did/jabberwocky/v2/jabberwocky_v2.json index fd4ceb784a..44ba95fc01 100644 --- a/v3/nopunin10did/jabberwocky/v2/jabberwocky_v2.json +++ b/v3/nopunin10did/jabberwocky/v2/jabberwocky_v2.json @@ -1,576 +1,572 @@ { - "name": "Jabberwocky v2", - "manufacturer": "NoPunIn10Did", - "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/nopunin10did/jabberwocky/v2", - "maintainer": "NoPunIn10Did", - "vendorId": "0x4E50", - "productId": "0x4A58", - "lighting": "qmk_backlight", - "menus": ["qmk_backlight"], - "matrix": { - "rows": 12, - "cols": 10 - }, - "layouts": { - "labels": [ - "Split Backspace", - "ISO Enter", - "Split Left Shift", - "Split Right Shift", - "Split Num 0 and 00", - "Split Num +", - "Split Num Enter" - ], - "keymap": [ - [ - { - "y": 0.25, - "x": 0.75, - "c": "#777777" - }, - "0,2", - { - "x": 0.5, - "c": "#cccccc" - }, - "1,2", - "0,3", - { - "x": 8.75 - }, - "1,7", - "0,8", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "1,8", - "0,9", - "1,9", - "5,9", - { - "x": 0.25 - }, - "0,0", - "1,0", - "0,1", - "1,1" - ], - [ - { - "y": 0.25, - "x": 2, - "c": "#cccccc" - }, - "3,2", - "2,3", - { - "x": 9.25 - }, - "3,7", - "2,8", - "3,8", - { - "c": "#aaaaaa", - "w": 2 - }, - "2,9\n\n\n0,0", - { - "x": 1.25 - }, - "2,0", - "3,0", - "2,1", - "3,1", - { - "x": 0.5, - "c": "#cccccc" - }, - "2,9\n\n\n0,1", - "3,9\n\n\n0,1" - ], - [ - { - "x": 1.25, - "c": "#aaaaaa", - "w": 1.5 - }, - "5,2", - { - "c": "#cccccc" - }, - "4,3", - { - "x": 9.75 - }, - "5,7", - "4,8", - "5,8", - { - "w": 1.5 - }, - "4,9\n\n\n1,0", - { - "x": 1.5 - }, - "4,0", - "5,0", - "4,1", - { - "c": "#aaaaaa", - "h": 2 - }, - "5,1\n\n\n5,0", - { - "x": 1.25, - "c": "#777777", - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, - "7,9\n\n\n1,1", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "5,1\n\n\n5,1" - ], - [ - { - "x": 0.75, - "w": 1.75 - }, - "7,2", - { - "c": "#cccccc" - }, - "6,3", - { - "x": 10.25 - }, - "7,7", - "6,8", - { - "c": "#777777", - "w": 2.25 - }, - "7,9\n\n\n1,0", - { - "x": 1.5, - "c": "#cccccc" - }, - "6,0", - "7,0", - "6,1", - { - "x": 1.25 - }, - "7,8\n\n\n1,1", - { - "x": 1.5, - "c": "#aaaaaa" - }, - "7,1\n\n\n5,1" - ], - [ - { - "w": 2.25 - }, - "8,2\n\n\n2,0", - { - "c": "#cccccc" - }, - "8,3", - { - "x": 10.75 - }, - "9,7", - { - "c": "#aaaaaa", - "w": 2.25 - }, - "9,8\n\n\n3,0", - { - "c": "#777777" - }, - "8,9", - { - "x": 1.25, - "c": "#cccccc" - }, - "8,0", - "9,0", - "8,1", - { - "c": "#777777", - "h": 2 - }, - "11,1\n\n\n6,0", - { - "x": 2.75, - "c": "#aaaaaa" - }, - "9,1\n\n\n6,1" - ], - [ - { - "x": 0.5, - "w": 1.25 - }, - "11,2", - { - "w": 1.25 - }, - "10,3", - { - "x": 10.75, - "w": 1.25 - }, - "11,7", - { - "w": 1.25 - }, - "10,8", - { - "c": "#777777" - }, - "11,8", - "10,9", - "11,9", - { - "x": 0.25, - "c": "#cccccc", - "w": 2 - }, - "11,0\n\n\n4,0", - "10,1", - { - "x": 3.75, - "c": "#777777" - }, - "11,1\n\n\n6,1" - ], - [ - { - "y": 0.25, - "c": "#aaaaaa", - "w": 1.25 - }, - "8,2\n\n\n2,1", - "9,2\n\n\n2,1", - { - "x": 12.75 - }, - "8,8\n\n\n3,1", - { - "w": 1.25 - }, - "9,8\n\n\n3,1", - { - "x": 2.25, - "c": "#cccccc" - }, - "10,0\n\n\n4,1", - "11,0\n\n\n4,1" - ], - [ - { - "r": 14, - "rx": 4, - "ry": 2.5, - "y": -2.37, - "x": 1 - }, - "0,4" - ], - [ - { - "y": -0.8799999999999999 - }, - "1,3", - { - "x": 1, - "c": "#aaaaaa" - }, - "1,4" - ], - [ - { - "y": -0.87, - "x": 3 - }, - "0,5" - ], - [ - { - "x": 1, - "c": "#cccccc" - }, - "2,4" - ], - [ - { - "y": -0.8799999999999999 - }, - "3,3", - { - "x": 1 - }, - "3,4" - ], - [ - { - "y": -0.8700000000000001, - "x": 3 - }, - "2,5" - ], - [ - { - "y": -0.25, - "x": 1 - }, - "4,4" - ], - [ - { - "y": -0.8799999999999999 - }, - "5,3", - { - "x": 1 - }, - "5,4" - ], - [ - { - "y": -0.8700000000000001, - "x": 3 - }, - "4,5" - ], - [ - { - "y": -0.25, - "x": 1 - }, - "6,4" - ], - [ - { - "y": -0.8799999999999999 - }, - "7,3", - { - "x": 1 - }, - "7,4" - ], - [ - { - "y": -0.8700000000000001, - "x": 3 - }, - "6,5" - ], - [ - { - "y": -0.25, - "x": 1 - }, - "8,4" - ], - [ - { - "y": -0.8799999999999999 - }, - "9,3", - { - "x": 1 - }, - "9,4" - ], - [ - { - "y": -0.8700000000000001, - "x": 3 - }, - "8,5", - "10,5" - ], - [ - { - "y": -0.1299999999999999, - "x": 0.5, - "c": "#aaaaaa", - "w": 1.25 - }, - "11,3", - { - "c": "#cccccc", - "w": 1.25 - }, - "10,4" - ], - [ - { - "y": -0.8700000000000001, - "x": 3, - "w": 2 - }, - "11,4" - ], - [ - { - "r": -14, - "rx": 13.25, - "y": -2.37, - "x": -2 - }, - "1,6" - ], - [ - { - "y": -0.8799999999999999, - "x": -3, - "c": "#aaaaaa" - }, - "0,6", - { - "x": 1, - "c": "#cccccc" - }, - "0,7" - ], - [ - { - "y": -0.87, - "x": -4, - "c": "#aaaaaa" - }, - "1,5" - ], - [ - { - "x": -2, - "c": "#cccccc" - }, - "3,6" - ], - [ - { - "y": -0.8799999999999999, - "x": -3 - }, - "2,6", - { - "x": 1 - }, - "2,7" - ], - [ - { - "y": -0.8700000000000001, - "x": -4 - }, - "3,5" - ], - [ - { - "y": -0.25, - "x": -2 - }, - "5,6" - ], - [ - { - "y": -0.8799999999999999, - "x": -3 - }, - "4,6", - { - "x": 1 - }, - "4,7" - ], - [ - { - "y": -0.8700000000000001, - "x": -4 - }, - "5,5" - ], - [ - { - "y": -0.25, - "x": -2 - }, - "7,6" - ], - [ - { - "y": -0.8799999999999999, - "x": -3 - }, - "6,6", - { - "x": 1 - }, - "6,7" - ], - [ - { - "y": -0.8700000000000001, - "x": -4 - }, - "7,5" - ], - [ - { - "y": -0.25, - "x": -2 - }, - "9,6" - ], - [ - { - "y": -0.8799999999999999, - "x": -3 - }, - "8,6", - { - "x": 1 - }, - "8,7" - ], - [ - { - "y": -0.8700000000000001, - "x": -5 - }, - "11,5", - "9,5" - ], - [ - { - "y": -0.1299999999999999, - "x": -2.25, - "c": "#aaaaaa", - "w": 1.25 - }, - "11,6" - ], - [ - { - "y": -0.8700000000000001, - "x": -5, - "c": "#cccccc", - "w": 2.75 - }, - "10,6" - ] -] - } -} \ No newline at end of file + "name": "Jabberwocky v2", + "vendorId": "0x4E50", + "productId": "0x4A58", + "menus": ["qmk_backlight"], + "matrix": { + "rows": 12, + "cols": 10 + }, + "layouts": { + "labels": [ + "Split Backspace", + "ISO Enter", + "Split Left Shift", + "Split Right Shift", + "Split Num 0 and 00", + "Split Num +", + "Split Num Enter" + ], + "keymap": [ + [ + { + "y": 0.25, + "x": 0.75, + "c": "#777777" + }, + "0,2", + { + "x": 0.5, + "c": "#cccccc" + }, + "1,2", + "0,3", + { + "x": 8.75 + }, + "1,7", + "0,8", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "1,8", + "0,9", + "1,9", + "5,9", + { + "x": 0.25 + }, + "0,0", + "1,0", + "0,1", + "1,1" + ], + [ + { + "y": 0.25, + "x": 2, + "c": "#cccccc" + }, + "3,2", + "2,3", + { + "x": 9.25 + }, + "3,7", + "2,8", + "3,8", + { + "c": "#aaaaaa", + "w": 2 + }, + "2,9\n\n\n0,0", + { + "x": 1.25 + }, + "2,0", + "3,0", + "2,1", + "3,1", + { + "x": 0.5, + "c": "#cccccc" + }, + "2,9\n\n\n0,1", + "3,9\n\n\n0,1" + ], + [ + { + "x": 1.25, + "c": "#aaaaaa", + "w": 1.5 + }, + "5,2", + { + "c": "#cccccc" + }, + "4,3", + { + "x": 9.75 + }, + "5,7", + "4,8", + "5,8", + { + "w": 1.5 + }, + "4,9\n\n\n1,0", + { + "x": 1.5 + }, + "4,0", + "5,0", + "4,1", + { + "c": "#aaaaaa", + "h": 2 + }, + "5,1\n\n\n5,0", + { + "x": 1.25, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "7,9\n\n\n1,1", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "5,1\n\n\n5,1" + ], + [ + { + "x": 0.75, + "w": 1.75 + }, + "7,2", + { + "c": "#cccccc" + }, + "6,3", + { + "x": 10.25 + }, + "7,7", + "6,8", + { + "c": "#777777", + "w": 2.25 + }, + "7,9\n\n\n1,0", + { + "x": 1.5, + "c": "#cccccc" + }, + "6,0", + "7,0", + "6,1", + { + "x": 1.25 + }, + "7,8\n\n\n1,1", + { + "x": 1.5, + "c": "#aaaaaa" + }, + "7,1\n\n\n5,1" + ], + [ + { + "w": 2.25 + }, + "8,2\n\n\n2,0", + { + "c": "#cccccc" + }, + "8,3", + { + "x": 10.75 + }, + "9,7", + { + "c": "#aaaaaa", + "w": 2.25 + }, + "9,8\n\n\n3,0", + { + "c": "#777777" + }, + "8,9", + { + "x": 1.25, + "c": "#cccccc" + }, + "8,0", + "9,0", + "8,1", + { + "c": "#777777", + "h": 2 + }, + "11,1\n\n\n6,0", + { + "x": 2.75, + "c": "#aaaaaa" + }, + "9,1\n\n\n6,1" + ], + [ + { + "x": 0.5, + "w": 1.25 + }, + "11,2", + { + "w": 1.25 + }, + "10,3", + { + "x": 10.75, + "w": 1.25 + }, + "11,7", + { + "w": 1.25 + }, + "10,8", + { + "c": "#777777" + }, + "11,8", + "10,9", + "11,9", + { + "x": 0.25, + "c": "#cccccc", + "w": 2 + }, + "11,0\n\n\n4,0", + "10,1", + { + "x": 3.75, + "c": "#777777" + }, + "11,1\n\n\n6,1" + ], + [ + { + "y": 0.25, + "c": "#aaaaaa", + "w": 1.25 + }, + "8,2\n\n\n2,1", + "9,2\n\n\n2,1", + { + "x": 12.75 + }, + "8,8\n\n\n3,1", + { + "w": 1.25 + }, + "9,8\n\n\n3,1", + { + "x": 2.25, + "c": "#cccccc" + }, + "10,0\n\n\n4,1", + "11,0\n\n\n4,1" + ], + [ + { + "r": 14, + "rx": 4, + "ry": 2.5, + "y": -2.37, + "x": 1 + }, + "0,4" + ], + [ + { + "y": -0.8799999999999999 + }, + "1,3", + { + "x": 1, + "c": "#aaaaaa" + }, + "1,4" + ], + [ + { + "y": -0.87, + "x": 3 + }, + "0,5" + ], + [ + { + "x": 1, + "c": "#cccccc" + }, + "2,4" + ], + [ + { + "y": -0.8799999999999999 + }, + "3,3", + { + "x": 1 + }, + "3,4" + ], + [ + { + "y": -0.8700000000000001, + "x": 3 + }, + "2,5" + ], + [ + { + "y": -0.25, + "x": 1 + }, + "4,4" + ], + [ + { + "y": -0.8799999999999999 + }, + "5,3", + { + "x": 1 + }, + "5,4" + ], + [ + { + "y": -0.8700000000000001, + "x": 3 + }, + "4,5" + ], + [ + { + "y": -0.25, + "x": 1 + }, + "6,4" + ], + [ + { + "y": -0.8799999999999999 + }, + "7,3", + { + "x": 1 + }, + "7,4" + ], + [ + { + "y": -0.8700000000000001, + "x": 3 + }, + "6,5" + ], + [ + { + "y": -0.25, + "x": 1 + }, + "8,4" + ], + [ + { + "y": -0.8799999999999999 + }, + "9,3", + { + "x": 1 + }, + "9,4" + ], + [ + { + "y": -0.8700000000000001, + "x": 3 + }, + "8,5", + "10,5" + ], + [ + { + "y": -0.1299999999999999, + "x": 0.5, + "c": "#aaaaaa", + "w": 1.25 + }, + "11,3", + { + "c": "#cccccc", + "w": 1.25 + }, + "10,4" + ], + [ + { + "y": -0.8700000000000001, + "x": 3, + "w": 2 + }, + "11,4" + ], + [ + { + "r": -14, + "rx": 13.25, + "y": -2.37, + "x": -2 + }, + "1,6" + ], + [ + { + "y": -0.8799999999999999, + "x": -3, + "c": "#aaaaaa" + }, + "0,6", + { + "x": 1, + "c": "#cccccc" + }, + "0,7" + ], + [ + { + "y": -0.87, + "x": -4, + "c": "#aaaaaa" + }, + "1,5" + ], + [ + { + "x": -2, + "c": "#cccccc" + }, + "3,6" + ], + [ + { + "y": -0.8799999999999999, + "x": -3 + }, + "2,6", + { + "x": 1 + }, + "2,7" + ], + [ + { + "y": -0.8700000000000001, + "x": -4 + }, + "3,5" + ], + [ + { + "y": -0.25, + "x": -2 + }, + "5,6" + ], + [ + { + "y": -0.8799999999999999, + "x": -3 + }, + "4,6", + { + "x": 1 + }, + "4,7" + ], + [ + { + "y": -0.8700000000000001, + "x": -4 + }, + "5,5" + ], + [ + { + "y": -0.25, + "x": -2 + }, + "7,6" + ], + [ + { + "y": -0.8799999999999999, + "x": -3 + }, + "6,6", + { + "x": 1 + }, + "6,7" + ], + [ + { + "y": -0.8700000000000001, + "x": -4 + }, + "7,5" + ], + [ + { + "y": -0.25, + "x": -2 + }, + "9,6" + ], + [ + { + "y": -0.8799999999999999, + "x": -3 + }, + "8,6", + { + "x": 1 + }, + "8,7" + ], + [ + { + "y": -0.8700000000000001, + "x": -5 + }, + "11,5", + "9,5" + ], + [ + { + "y": -0.1299999999999999, + "x": -2.25, + "c": "#aaaaaa", + "w": 1.25 + }, + "11,6" + ], + [ + { + "y": -0.8700000000000001, + "x": -5, + "c": "#cccccc", + "w": 2.75 + }, + "10,6" + ] + ] + } +} diff --git a/v3/noxary/268_2/noxary_268.2.json b/v3/noxary/268_2/noxary_268.2.json index d4810faba8..bc82046915 100644 --- a/v3/noxary/268_2/noxary_268.2.json +++ b/v3/noxary/268_2/noxary_268.2.json @@ -93,9 +93,9 @@ "4,1", {"w": 1.25}, "4,2", - {"c": "#DEBFB3", "t": "#363636", "a": 7, "w": 6.25}, + {"c": "#DEBFB3", "t": "#363636", "w": 6.25}, "4,6", - {"c": "#363636", "t": "#DEBFB3", "a": 4, "w": 1.25}, + {"c": "#363636", "t": "#DEBFB3", "w": 1.25}, "4,9", {"w": 1.25}, "4,10", @@ -106,4 +106,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/other/aanzee/aanzee.json b/v3/other/aanzee/aanzee.json index c200f679e3..740463dc4c 100644 --- a/v3/other/aanzee/aanzee.json +++ b/v3/other/aanzee/aanzee.json @@ -6,9 +6,9 @@ "layouts": { "keymap": [ [ - {"c": "", "t": "", "p": "GMK", "a": 6}, + {"c": "", "t": "", "p": "GMK"}, "0,0", - {"a": 4, "f": 5}, + {"f": 5}, "0,1", "0,2", "0,3", @@ -21,14 +21,13 @@ "0,10", "0,11", "0,12", - {"a": 7, "f": 3}, + {"f": 3}, "0,15", "0,13", - {"a": 6}, "0,14" ], [ - {"a": 4, "w": 1.5}, + {"w": 1.5}, "1,0", {"f": 7}, "1,1", @@ -46,13 +45,12 @@ "1,12", {"f": 3, "w": 1.5}, "1,13", - {"a": 6}, "1,14" ], [ {"w": 1.75}, "2,0", - {"a": 4, "f": 7}, + {"f": 7}, "2,1", "2,2", "2,3", @@ -65,14 +63,14 @@ {"f": 5}, "2,10", "2,11", - {"a": 6, "f": 3, "w": 2.25}, + {"f": 3, "w": 2.25}, "2,13", "2,14" ], [ {"w": 2.25}, "3,0", - {"a": 4, "f": 7}, + {"f": 7}, "3,2", "3,3", "3,4", @@ -84,11 +82,11 @@ "3,9", "3,10", "3,11", - {"a": 6, "f": 3, "w": 1.75}, + {"f": 3, "w": 1.75}, "3,12", - {"a": 4, "f": 9}, + {"f": 9}, "3,13", - {"a": 6, "f": 3}, + {"f": 3}, "3,14" ], [ @@ -98,17 +96,17 @@ "4,1", {"w": 1.25}, "4,2", - {"a": 7, "w": 6.25}, + {"w": 6.25}, "4,6", - {"a": 6, "w": 1.25}, + {"w": 1.25}, "4,9", {"w": 1.25}, "4,10", - {"x": 0.5, "a": 4, "f": 9}, + {"x": 0.5, "f": 9}, "4,12", "4,13", "4,14" ] ] } -} \ No newline at end of file +} diff --git a/v3/other/lunar/lunar.json b/v3/other/lunar/lunar.json index a1ba19e186..d799451620 100644 --- a/v3/other/lunar/lunar.json +++ b/v3/other/lunar/lunar.json @@ -6,7 +6,6 @@ "layouts": { "keymap": [ [ - {"a": 7}, "0,0", "0,1", "0,2", @@ -101,4 +100,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/other/snagpad/snagpad.json b/v3/other/snagpad/snagpad.json index 24ec809795..0e9c89f9d6 100644 --- a/v3/other/snagpad/snagpad.json +++ b/v3/other/snagpad/snagpad.json @@ -5,11 +5,11 @@ "matrix": {"rows": 5, "cols": 4}, "layouts": { "keymap": [ - [{"c": "#505557", "t": "#d9d7d7", "a": 7}, "0,0", "0,1", "0,2", "0,3"], + [{"c": "#505557", "t": "#d9d7d7"}, "0,0", "0,1", "0,2", "0,3"], ["1,0", "1,1", "1,2", "1,3"], ["2,0", "2,1", "2,2", "2,3"], ["3,0", "3,1", "3,2", "3,3"], ["4,0", "4,1", "4,2", "4,3"] ] } -} \ No newline at end of file +} diff --git a/v3/pjb/eros.json b/v3/pjb/eros.json index ac8d36c694..9ea6acd744 100644 --- a/v3/pjb/eros.json +++ b/v3/pjb/eros.json @@ -2,7 +2,6 @@ "name": "Eros", "vendorId": "0x5042", "productId": "0x4552", - "maintainer": "PJB", "matrix": {"rows": 6, "cols": 17}, "layouts": { "labels": [ @@ -162,4 +161,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/qwertlekeys/calice.json b/v3/qwertlekeys/calice.json index f857829f44..0daecfcfb6 100644 --- a/v3/qwertlekeys/calice.json +++ b/v3/qwertlekeys/calice.json @@ -89,15 +89,15 @@ [{"x": 5.7}, "5,1", "4,1", "5,2", "4,2"], [{"x": 5.85}, "7,1", "6,1", "7,2", "6,2"], [{"x": 6.35}, "9,1", "8,1", "9,2", "8,2"], - [{"x": 7.5, "a": 7, "w": 2.25}, "11,2", {"c": "#aaaaaa", "a": 4}, "10,2"], + [{"x": 7.5, "w": 2.25}, "11,2", {"c": "#aaaaaa"}, "10,2"], [{"y": -0.95, "x": 6, "w": 1.5}, "10,0"], [{"r": -10, "y": -3.15, "x": 9.5, "c": "#cccccc"}, "0,4", "1,4"], [{"y": 0.45, "x": 9.4}, "2,4", "3,4", "2,5", "3,5"], [{"x": 9}, "5,3", "4,4", "5,4", "4,5"], [{"x": 9.35}, "7,3", "6,4", "7,4", "6,5"], [{"x": 8.9}, "9,3", "8,4", "9,4", "8,5"], - [{"x": 9, "a": 7, "w": 2.75}, "10,4"], - [{"y": -0.9, "x": 11.75, "c": "#aaaaaa", "a": 4, "w": 1.5}, "10,5"] + [{"x": 9, "w": 2.75}, "10,4"], + [{"y": -0.9, "x": 11.75, "c": "#aaaaaa", "w": 1.5}, "10,5"] ] } -} \ No newline at end of file +} diff --git a/v3/redox/redox.json b/v3/redox/redox.json index e2673ddd75..41ff28e353 100644 --- a/v3/redox/redox.json +++ b/v3/redox/redox.json @@ -7,7 +7,7 @@ "matrix": {"rows": 10, "cols": 7}, "layouts": { "keymap": [ - [{"x": 3.5, "a": 7}, "0,3", {"x": 10.5}, "5,3"], + [{"x": 3.5}, "0,3", {"x": 10.5}, "5,3"], [ {"y": -0.875, "x": 2.5}, "0,2", @@ -118,4 +118,4 @@ [{"x": -3, "h": 2}, "9,6", {"c": "#777777", "h": 2}, "9,5"] ] } -} \ No newline at end of file +} diff --git a/v3/redox_w/redox_w.json b/v3/redox_w/redox_w.json index 9361269755..a947e82b91 100644 --- a/v3/redox_w/redox_w.json +++ b/v3/redox_w/redox_w.json @@ -5,7 +5,7 @@ "matrix": {"rows": 5, "cols": 14}, "layouts": { "keymap": [ - [{"x": 3.5, "a": 7}, "0,3", {"x": 10.5}, "0,10"], + [{"x": 3.5}, "0,3", {"x": 10.5}, "0,10"], [ {"y": -0.875, "x": 2.5}, "0,2", @@ -116,4 +116,4 @@ [{"x": -3, "h": 2}, "4,7", {"c": "#777777", "h": 2}, "4,8"] ] } -} \ No newline at end of file +} diff --git a/v3/sauce/mild/mild.json b/v3/sauce/mild/mild.json index c443c732b1..92b12aaf60 100644 --- a/v3/sauce/mild/mild.json +++ b/v3/sauce/mild/mild.json @@ -11,7 +11,6 @@ "Split Right Shift" ], "keymap": [ - {"x": 13, "c": "#aaaaaa", "w": 2}, [ {"x": 2.5, "c": "#777777"}, "0,0", @@ -149,4 +148,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/senselessclay/ck60/ck60.json b/v3/senselessclay/ck60/ck60.json index 4dd887cc3d..9dd5da257e 100644 --- a/v3/senselessclay/ck60/ck60.json +++ b/v3/senselessclay/ck60/ck60.json @@ -4,8 +4,6 @@ "productId": "0x0601", "keycodes": ["qmk_lighting"], "menus": ["qmk_rgblight"], - "url": "https://candykeys.com/", - "maintainer": "hadi", "matrix": {"rows": 5, "cols": 14}, "layouts": { "keymap": [ @@ -109,4 +107,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/senselessclay/ck65/ck65.json b/v3/senselessclay/ck65/ck65.json index 3d23688520..d1a7f8ef6f 100644 --- a/v3/senselessclay/ck65/ck65.json +++ b/v3/senselessclay/ck65/ck65.json @@ -4,8 +4,6 @@ "productId": "0x0651", "keycodes": ["qmk_lighting"], "menus": ["qmk_rgblight"], - "url": "https://candykeys.com/", - "maintainer": "hadi", "matrix": {"rows": 5, "cols": 15}, "layouts": { "keymap": [ @@ -119,4 +117,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/senselessclay/had60/had60.json b/v3/senselessclay/had60/had60.json index 4416f336c3..a85d35e15e 100644 --- a/v3/senselessclay/had60/had60.json +++ b/v3/senselessclay/had60/had60.json @@ -2,8 +2,6 @@ "name": "had60", "vendorId": "0x4849", "productId": "0x060F", - "url": "https://senselessclay.com/", - "maintainer": "hadi", "matrix": {"rows": 5, "cols": 14}, "layouts": { "labels": [ @@ -173,4 +171,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/skmt/15k/15k.json b/v3/skmt/15k/15k.json index c82d0059de..afed3f422a 100644 --- a/v3/skmt/15k/15k.json +++ b/v3/skmt/15k/15k.json @@ -7,16 +7,9 @@ "matrix": {"rows": 3, "cols": 5}, "layouts": { "keymap": [ - [ - {"c": "#505557", "t": "#d9d7d7", "a": 7}, - "0,0", - "0,1", - "0,2", - "0,3", - "0,4" - ], + [{"c": "#505557", "t": "#d9d7d7"}, "0,0", "0,1", "0,2", "0,3", "0,4"], ["1,0", "1,1", "1,2", "1,3", "1,4"], ["2,0", "2,1", "2,2", "2,3", "2,4"] ] } -} \ No newline at end of file +} diff --git a/v3/sneakbox/aliceclone/aliceclone.json b/v3/sneakbox/aliceclone/aliceclone.json index 81fb6720eb..5fb88d7a45 100644 --- a/v3/sneakbox/aliceclone/aliceclone.json +++ b/v3/sneakbox/aliceclone/aliceclone.json @@ -4,8 +4,6 @@ "productId": "0x0001", "keycodes": ["qmk_lighting"], "menus": ["qmk_rgblight"], - "url": "https://sneakbox.design", - "maintainer": "mujimanic", "matrix": {"rows": 10, "cols": 8}, "layouts": { "keymap": [ @@ -114,4 +112,4 @@ [{"rx": 11.8366, "ry": 4.4209, "w": 1.5, "c": "#aaaaaa"}, "9,3"] ] } -} \ No newline at end of file +} diff --git a/v3/sneakbox/aliceclonergb/alicecloneRGB.json b/v3/sneakbox/aliceclonergb/alicecloneRGB.json index 4b323fb9e7..65551f8776 100644 --- a/v3/sneakbox/aliceclonergb/alicecloneRGB.json +++ b/v3/sneakbox/aliceclonergb/alicecloneRGB.json @@ -4,8 +4,6 @@ "productId": "0x0006", "keycodes": ["qmk_lighting"], "menus": ["qmk_rgblight"], - "url": "https://sneakbox.design", - "maintainer": "mujimanic", "matrix": {"rows": 10, "cols": 8}, "layouts": { "keymap": [ @@ -114,4 +112,4 @@ [{"rx": 11.8366, "ry": 4.4209, "w": 1.5, "c": "#aaaaaa"}, "9,3"] ] } -} \ No newline at end of file +} diff --git a/v3/sneakbox/ava/ava.json b/v3/sneakbox/ava/ava.json index 7ef232db95..adc797491d 100644 --- a/v3/sneakbox/ava/ava.json +++ b/v3/sneakbox/ava/ava.json @@ -4,8 +4,6 @@ "productId": "0x0004", "keycodes": ["qmk_lighting"], "menus": ["qmk_rgblight"], - "url": "https://sneakbox.com", - "maintainer": "mujimanic", "matrix": {"rows": 9, "cols": 8}, "layouts": { "labels": ["Split Backspace"], @@ -144,4 +142,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/sneakbox/disarray/disarrayortho.json b/v3/sneakbox/disarray/disarrayortho.json index 0f4ff1c358..88192078bd 100644 --- a/v3/sneakbox/disarray/disarrayortho.json +++ b/v3/sneakbox/disarray/disarrayortho.json @@ -2,8 +2,6 @@ "name": "Disarray Ortholinear", "vendorId": "0x5342", "productId": "0x0003", - "url": "https://sneakbox.com", - "maintainer": "mujimanic", "matrix": {"rows": 6, "cols": 16}, "layouts": { "keymap": [ @@ -100,4 +98,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/sneakbox/disarray/disarraystaggered.json b/v3/sneakbox/disarray/disarraystaggered.json index 3d3aed0f1b..d6f845932c 100644 --- a/v3/sneakbox/disarray/disarraystaggered.json +++ b/v3/sneakbox/disarray/disarraystaggered.json @@ -2,8 +2,6 @@ "name": "Disarray Staggered", "vendorId": "0x5342", "productId": "0x0002", - "url": "https://sneakbox.com", - "maintainer": "mujimanic", "matrix": {"rows": 5, "cols": 15}, "layouts": { "keymap": [ @@ -112,4 +110,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/switchplate/switchplate910/switchplate910.json b/v3/switchplate/switchplate910/switchplate910.json index 5800990758..c0524ecc21 100644 --- a/v3/switchplate/switchplate910/switchplate910.json +++ b/v3/switchplate/switchplate910/switchplate910.json @@ -93,9 +93,9 @@ "4,1", {"w": 1.25}, "4,2", - {"c": "#DEBFB3", "t": "#363636", "a": 7, "w": 6.25}, + {"c": "#DEBFB3", "t": "#363636", "w": 6.25}, "4,5", - {"c": "#363636", "t": "#DEBFB3", "a": 4, "w": 1.25}, + {"c": "#363636", "t": "#DEBFB3", "w": 1.25}, "4,8", {"w": 1.25}, "4,9", @@ -106,4 +106,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/the_royal/romac/romac.json b/v3/the_royal/romac/romac.json index 5a0178e825..d8607afde1 100644 --- a/v3/the_royal/romac/romac.json +++ b/v3/the_royal/romac/romac.json @@ -5,10 +5,10 @@ "matrix": {"rows": 4, "cols": 3}, "layouts": { "keymap": [ - [{"c": "#505557", "t": "#d9d7d7", "a": 7}, "0,0", "0,1", "0,2"], + [{"c": "#505557", "t": "#d9d7d7"}, "0,0", "0,1", "0,2"], ["1,0", "1,1", "1,2"], ["2,0", "2,1", "2,2"], ["3,0", "3,1", "3,2"] ] } -} \ No newline at end of file +} diff --git a/v3/the_royal/romac_plus/romac_plus.json b/v3/the_royal/romac_plus/romac_plus.json index 27c9bab712..d1cec5c573 100644 --- a/v3/the_royal/romac_plus/romac_plus.json +++ b/v3/the_royal/romac_plus/romac_plus.json @@ -7,10 +7,10 @@ "matrix": {"rows": 4, "cols": 3}, "layouts": { "keymap": [ - [{"c": "#505557", "t": "#d9d7d7", "a": 7}, "0,0", "0,1", "0,2"], + [{"c": "#505557", "t": "#d9d7d7"}, "0,0", "0,1", "0,2"], ["1,0", "1,1", "1,2"], ["2,0", "2,1", "2,2"], ["3,0", "3,1", "3,2"] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/rama_works_kara/rama_works_kara.json b/v3/wilba_tech/rama_works_kara/rama_works_kara.json index 1746592f84..397af1854b 100644 --- a/v3/wilba_tech/rama_works_kara/rama_works_kara.json +++ b/v3/wilba_tech/rama_works_kara/rama_works_kara.json @@ -226,12 +226,12 @@ "4,1", {"w": 1.5}, "4,2", - {"c": "#e2e2e2", "t": "#363636", "a": 7, "w": 7}, + {"c": "#e2e2e2", "t": "#363636", "w": 7}, "4,7", - {"c": "#4d525a", "t": "#e2e2e2", "a": 4, "w": 1.5}, + {"c": "#4d525a", "t": "#e2e2e2", "w": 1.5}, "4,11", "4,12" ] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/rama_works_koyu/rama_works_koyu.json b/v3/wilba_tech/rama_works_koyu/rama_works_koyu.json index 09715ee334..788086901a 100644 --- a/v3/wilba_tech/rama_works_koyu/rama_works_koyu.json +++ b/v3/wilba_tech/rama_works_koyu/rama_works_koyu.json @@ -232,9 +232,9 @@ "4,1", {"w": 1.5}, "4,2", - {"c": "#DEBFB3", "t": "#363636", "a": 7, "w": 7}, + {"c": "#DEBFB3", "t": "#363636", "w": 7}, "4,7", - {"c": "#363636", "t": "#DEBFB3", "a": 4, "w": 1.5}, + {"c": "#363636", "t": "#DEBFB3", "w": 1.5}, "4,11", {"x": 0.5, "c": "#DEBFB3", "t": "#363636"}, "4,12", @@ -243,4 +243,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/rama_works_m10_b/rama_works_m10_b.json b/v3/wilba_tech/rama_works_m10_b/rama_works_m10_b.json index 09aaf804e7..256bb408e7 100644 --- a/v3/wilba_tech/rama_works_m10_b/rama_works_m10_b.json +++ b/v3/wilba_tech/rama_works_m10_b/rama_works_m10_b.json @@ -5,10 +5,10 @@ "matrix": {"rows": 1, "cols": 10}, "layouts": { "keymap": [ - [{"c": "#505557", "t": "#d9d7d7", "a": 7}, "0,0", "0,1", "0,2"], + [{"c": "#505557", "t": "#d9d7d7"}, "0,0", "0,1", "0,2"], ["0,3", "0,4", "0,5"], ["0,6", "0,7", "0,8"], [{"x": 1, "w": 2}, "0,9"] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/rama_works_m10_c/rama_works_m10_c.json b/v3/wilba_tech/rama_works_m10_c/rama_works_m10_c.json index 658f55ff96..1241991d58 100644 --- a/v3/wilba_tech/rama_works_m10_c/rama_works_m10_c.json +++ b/v3/wilba_tech/rama_works_m10_c/rama_works_m10_c.json @@ -140,10 +140,10 @@ "matrix": {"rows": 1, "cols": 10}, "layouts": { "keymap": [ - [{"c": "#505557", "t": "#d9d7d7", "a": 7}, "0,0", "0,1", "0,2"], + [{"c": "#505557", "t": "#d9d7d7"}, "0,0", "0,1", "0,2"], ["0,3", "0,4", "0,5"], ["0,6", "0,7", "0,8"], [{"x": 1, "w": 2}, "0,9"] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/rama_works_m60_a/rama_works_m60_a.json b/v3/wilba_tech/rama_works_m60_a/rama_works_m60_a.json index 0393db5827..698f3e727b 100644 --- a/v3/wilba_tech/rama_works_m60_a/rama_works_m60_a.json +++ b/v3/wilba_tech/rama_works_m60_a/rama_works_m60_a.json @@ -226,9 +226,9 @@ "4,1", {"w": 1.5}, "4,2", - {"c": "#e2e2e2", "t": "#363636", "a": 7, "w": 7}, + {"c": "#e2e2e2", "t": "#363636", "w": 7}, "4,7", - {"c": "#4d525a", "t": "#e2e2e2", "a": 4, "w": 1.5}, + {"c": "#4d525a", "t": "#e2e2e2", "w": 1.5}, "4,11", "4,12" ] diff --git a/v3/wilba_tech/rama_works_m6_a/rama_works_m6_a.json b/v3/wilba_tech/rama_works_m6_a/rama_works_m6_a.json index fc7f143828..aeeda449ec 100644 --- a/v3/wilba_tech/rama_works_m6_a/rama_works_m6_a.json +++ b/v3/wilba_tech/rama_works_m6_a/rama_works_m6_a.json @@ -5,8 +5,8 @@ "matrix": {"rows": 1, "cols": 6}, "layouts": { "keymap": [ - [{"c": "#505557", "t": "#d9d7d7", "a": 7}, "0,0", "0,1", "0,2"], + [{"c": "#505557", "t": "#d9d7d7"}, "0,0", "0,1", "0,2"], ["0,3", "0,4", "0,5"] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/rama_works_m6_b/rama_works_m6_b.json b/v3/wilba_tech/rama_works_m6_b/rama_works_m6_b.json index 4c9cda043e..337e280365 100644 --- a/v3/wilba_tech/rama_works_m6_b/rama_works_m6_b.json +++ b/v3/wilba_tech/rama_works_m6_b/rama_works_m6_b.json @@ -120,8 +120,8 @@ "matrix": {"rows": 1, "cols": 6}, "layouts": { "keymap": [ - [{"c": "#505557", "t": "#d9d7d7", "a": 7}, "0,0", "0,1", "0,2"], + [{"c": "#505557", "t": "#d9d7d7"}, "0,0", "0,1", "0,2"], ["0,3", "0,4", "0,5"] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/wt60_h1/wt60_h1.json b/v3/wilba_tech/wt60_h1/wt60_h1.json index e6e63a7eb8..ffbc399378 100644 --- a/v3/wilba_tech/wt60_h1/wt60_h1.json +++ b/v3/wilba_tech/wt60_h1/wt60_h1.json @@ -6,7 +6,6 @@ "layouts": { "labels": [["Bottom Row", "7U", "HHKB", "WKL"]], "keymap": [ - {"x": 13, "c": "#aaaaaa", "w": 2}, [ {"c": "#777777"}, "0,0", @@ -127,4 +126,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/wt60_h2/wt60_h2.json b/v3/wilba_tech/wt60_h2/wt60_h2.json index 93a5d25f3c..235bb74136 100644 --- a/v3/wilba_tech/wt60_h2/wt60_h2.json +++ b/v3/wilba_tech/wt60_h2/wt60_h2.json @@ -5,7 +5,6 @@ "matrix": {"rows": 5, "cols": 14}, "layouts": { "keymap": [ - {"x": 13, "c": "#aaaaaa", "w": 2}, [ {"c": "#777777"}, "0,0", @@ -96,4 +95,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/wt60_h3/wt60_h3.json b/v3/wilba_tech/wt60_h3/wt60_h3.json index 6daaebc1ab..2a7e9b4724 100644 --- a/v3/wilba_tech/wt60_h3/wt60_h3.json +++ b/v3/wilba_tech/wt60_h3/wt60_h3.json @@ -5,7 +5,6 @@ "matrix": {"rows": 5, "cols": 14}, "layouts": { "keymap": [ - {"x": 13, "c": "#aaaaaa", "w": 2}, [ {"c": "#777777"}, "0,0", @@ -104,4 +103,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/wt60_kh1/wt60_kh1.json b/v3/wilba_tech/wt60_kh1/wt60_kh1.json index af8c32bfd9..3e08b18732 100644 --- a/v3/wilba_tech/wt60_kh1/wt60_kh1.json +++ b/v3/wilba_tech/wt60_kh1/wt60_kh1.json @@ -6,15 +6,8 @@ "menus": ["wt_rgb_backlight"], "matrix": {"rows": 5, "cols": 14}, "layouts": { - "labels": [ - ["Bottom Row", "7U", "HHKB", "WKL"] - ], + "labels": [["Bottom Row", "7U", "HHKB", "WKL"]], "keymap": [ - { - "x": 13, - "c": "#aaaaaa", - "w": 2 - }, [ { "c": "#777777" @@ -205,4 +198,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/wt65_b/wt65_b.json b/v3/wilba_tech/wt65_b/wt65_b.json index 963382e378..ae00a62d06 100644 --- a/v3/wilba_tech/wt65_b/wt65_b.json +++ b/v3/wilba_tech/wt65_b/wt65_b.json @@ -147,9 +147,9 @@ "4,0", {"x": 0.75, "w": 1.5}, "4,2", - {"c": "#cccccc", "a": 7, "w": 7}, + {"c": "#cccccc", "w": 7}, "4,6", - {"c": "#aaaaaa", "a": 4, "w": 1.5}, + {"c": "#aaaaaa", "w": 1.5}, "4,11", {"x": 0.75, "c": "#777777"}, "4,12", @@ -158,4 +158,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/wt65_cx/wt65_cx.json b/v3/wilba_tech/wt65_cx/wt65_cx.json index ed337be2e8..c1078d79ce 100644 --- a/v3/wilba_tech/wt65_cx/wt65_cx.json +++ b/v3/wilba_tech/wt65_cx/wt65_cx.json @@ -146,7 +146,6 @@ "layouts": { "labels": ["Full Backspace"], "keymap": [ - {"x": 13, "c": "#aaaaaa", "w": 2}, [ {"c": "#888888"}, "0,0", @@ -250,4 +249,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/wt65_d/wt65_d.json b/v3/wilba_tech/wt65_d/wt65_d.json index 74e47348f2..1fbb28acdd 100644 --- a/v3/wilba_tech/wt65_d/wt65_d.json +++ b/v3/wilba_tech/wt65_d/wt65_d.json @@ -11,7 +11,6 @@ ["Bottom Row", "7U", "6U"] ], "keymap": [ - {"x": 13, "c": "#aaaaaa", "w": 2}, [ {"x": 2.5, "c": "#777777"}, "0,0", @@ -135,4 +134,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/wt65_f/wt65_f.json b/v3/wilba_tech/wt65_f/wt65_f.json index ed4ff27a53..5308cc8924 100644 --- a/v3/wilba_tech/wt65_f/wt65_f.json +++ b/v3/wilba_tech/wt65_f/wt65_f.json @@ -5,7 +5,6 @@ "matrix": {"rows": 5, "cols": 15}, "layouts": { "keymap": [ - {"x": 13, "c": "#aaaaaa", "w": 2}, [ {"c": "#777777"}, "0,0", @@ -107,4 +106,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/wt65_fx/wt65_fx.json b/v3/wilba_tech/wt65_fx/wt65_fx.json index 42b6937d9f..5461aa4556 100644 --- a/v3/wilba_tech/wt65_fx/wt65_fx.json +++ b/v3/wilba_tech/wt65_fx/wt65_fx.json @@ -6,7 +6,6 @@ "layouts": { "labels": ["Split Backspace", ["Bottom Row", "6.25U", "7U"]], "keymap": [ - {"x": 13, "c": "#aaaaaa", "w": 2}, [ {"c": "#777777"}, "0,0", @@ -124,4 +123,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/wt65_g/wt65_g.json b/v3/wilba_tech/wt65_g/wt65_g.json index 36f7236f90..e9ec1da5a6 100644 --- a/v3/wilba_tech/wt65_g/wt65_g.json +++ b/v3/wilba_tech/wt65_g/wt65_g.json @@ -11,7 +11,6 @@ ["Bottom Row", "ANSI", "7U"] ], "keymap": [ - {"x": 13, "c": "#aaaaaa", "w": 2}, [ {"x": 2.5, "c": "#777777"}, "0,0", @@ -135,4 +134,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/wt65_g2/wt65_g2.json b/v3/wilba_tech/wt65_g2/wt65_g2.json index c841ca3f4a..1209c5f73a 100644 --- a/v3/wilba_tech/wt65_g2/wt65_g2.json +++ b/v3/wilba_tech/wt65_g2/wt65_g2.json @@ -6,7 +6,6 @@ "layouts": { "labels": ["2U Backspace", "ISO Enter", "Split Left Shift"], "keymap": [ - {"x": 13, "c": "#aaaaaa", "w": 2}, [ {"x": 2.5, "c": "#777777"}, "0,0", @@ -114,4 +113,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/wt65_h1/wt65_h1.json b/v3/wilba_tech/wt65_h1/wt65_h1.json index 998c5e8dc2..0ecce4087e 100644 --- a/v3/wilba_tech/wt65_h1/wt65_h1.json +++ b/v3/wilba_tech/wt65_h1/wt65_h1.json @@ -5,7 +5,6 @@ "matrix": {"rows": 5, "cols": 15}, "layouts": { "keymap": [ - {"x": 13, "c": "#aaaaaa", "w": 2}, [ {"c": "#777777"}, "0,0", @@ -104,4 +103,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/wt65_h2/wt65_h2.json b/v3/wilba_tech/wt65_h2/wt65_h2.json index dbc95c5e64..c44bc68e57 100644 --- a/v3/wilba_tech/wt65_h2/wt65_h2.json +++ b/v3/wilba_tech/wt65_h2/wt65_h2.json @@ -6,7 +6,6 @@ "layouts": { "labels": ["2U Backspace"], "keymap": [ - {"x": 13, "c": "#aaaaaa", "w": 2}, [{"x": 13, "c": "#aaaaaa", "w": 2}, "0,13\n\n\n0,1"], [ {"c": "#777777"}, @@ -105,4 +104,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/wt65_h3/wt65_h3.json b/v3/wilba_tech/wt65_h3/wt65_h3.json index 3bfd4fef74..f6d5442f7e 100644 --- a/v3/wilba_tech/wt65_h3/wt65_h3.json +++ b/v3/wilba_tech/wt65_h3/wt65_h3.json @@ -6,7 +6,6 @@ "layouts": { "labels": ["Split Backspace", ["Bottom Row", "6.25U", "7U"]], "keymap": [ - {"x": 13, "c": "#aaaaaa", "w": 2}, [{"x": 13}, "0,13\n\n\n0,1", "2,13\n\n\n0,1"], [ {"c": "#777777"}, @@ -120,4 +119,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/wt65_h4/wt65_h4.json b/v3/wilba_tech/wt65_h4/wt65_h4.json index 45328be06f..8aa93767ce 100644 --- a/v3/wilba_tech/wt65_h4/wt65_h4.json +++ b/v3/wilba_tech/wt65_h4/wt65_h4.json @@ -6,7 +6,6 @@ "layouts": { "labels": ["Split Backspace", ["Bottom Row", "6.25U", "7U"]], "keymap": [ - {"x": 13, "c": "#aaaaaa", "w": 2}, [{"x": 13}, "0,13\n\n\n0,1", "2,13\n\n\n0,1"], [ {"c": "#777777"}, @@ -129,4 +128,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/wt69_a/wt69_a.json b/v3/wilba_tech/wt69_a/wt69_a.json index d1611aa770..3c9e5916f1 100644 --- a/v3/wilba_tech/wt69_a/wt69_a.json +++ b/v3/wilba_tech/wt69_a/wt69_a.json @@ -108,9 +108,9 @@ "4,3", {"w": 1.5}, "4,4", - {"c": "#cccccc", "a": 7, "w": 7}, + {"c": "#cccccc", "w": 7}, "4,8", - {"c": "#aaaaaa", "a": 4, "w": 1.5}, + {"c": "#aaaaaa", "w": 1.5}, "4,13", {"x": 0.5, "c": "#777777"}, "4,14", @@ -119,4 +119,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/wt80_g/wt80_g.json b/v3/wilba_tech/wt80_g/wt80_g.json index 920ec914ab..3e6f202d7e 100644 --- a/v3/wilba_tech/wt80_g/wt80_g.json +++ b/v3/wilba_tech/wt80_g/wt80_g.json @@ -12,7 +12,6 @@ ["Bottom Row", "6.25U", "7U", "7U WKL"] ], "keymap": [ - {"x": 13, "c": "#aaaaaa", "w": 2}, [ {"x": 2.5, "c": "#777777"}, "0,0", @@ -186,4 +185,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/wt8_a/wt8_a.json b/v3/wilba_tech/wt8_a/wt8_a.json index 9e9a8bd7e2..4dd0898526 100644 --- a/v3/wilba_tech/wt8_a/wt8_a.json +++ b/v3/wilba_tech/wt8_a/wt8_a.json @@ -5,8 +5,8 @@ "matrix": {"rows": 1, "cols": 8}, "layouts": { "keymap": [ - [{"c": "#505557", "t": "#d9d7d7", "a": 7}, "0,0", "0,1", "0,2", "0,3"], + [{"c": "#505557", "t": "#d9d7d7"}, "0,0", "0,1", "0,2", "0,3"], ["0,4", "0,5", "0,6", "0,7"] ] } -} \ No newline at end of file +} diff --git a/v3/wilba_tech/zeal65/zeal65.json b/v3/wilba_tech/zeal65/zeal65.json index b8673bbccb..15edda02c3 100644 --- a/v3/wilba_tech/zeal65/zeal65.json +++ b/v3/wilba_tech/zeal65/zeal65.json @@ -235,9 +235,9 @@ "4,0", {"w": 1.5}, "4,1", - {"c": "#cccccc", "a": 7, "w": 7}, + {"c": "#cccccc", "w": 7}, "4,7", - {"c": "#aaaaaa", "a": 4, "w": 1.5}, + {"c": "#aaaaaa", "w": 1.5}, "4,10", {"w": 1.5}, "4,11", @@ -248,4 +248,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/xd/xd87.json b/v3/xd/xd87.json index f3f30afc29..5038c3f993 100644 --- a/v3/xd/xd87.json +++ b/v3/xd/xd87.json @@ -119,9 +119,9 @@ "5,1", {"w": 1.25}, "5,2", - {"c": "#cccccc", "a": 7, "w": 6.25}, + {"c": "#cccccc", "w": 6.25}, "5,8", - {"c": "#aaaaaa", "a": 4, "w": 1.25}, + {"c": "#aaaaaa", "w": 1.25}, "5,10", {"w": 1.25}, "5,11", @@ -136,4 +136,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/yiancardesigns/hs60/ansi/hs60_v2_ansi.json b/v3/yiancardesigns/hs60/ansi/hs60_v2_ansi.json index 643745eb52..5106cd4acc 100644 --- a/v3/yiancardesigns/hs60/ansi/hs60_v2_ansi.json +++ b/v3/yiancardesigns/hs60/ansi/hs60_v2_ansi.json @@ -225,9 +225,9 @@ "4,1", {"w": 1.25}, "4,2", - {"c": "#DEBFB3", "t": "#363636", "a": 7, "w": 6.25}, + {"c": "#DEBFB3", "t": "#363636", "w": 6.25}, "4,6", - {"c": "#363636", "t": "#DEBFB3", "a": 4, "w": 1.25}, + {"c": "#363636", "t": "#DEBFB3", "w": 1.25}, "4,10", {"w": 1.25}, "4,11", @@ -238,4 +238,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/yiancardesigns/hs60/hhkb/hs60_v2_hhkb.json b/v3/yiancardesigns/hs60/hhkb/hs60_v2_hhkb.json index c41b865ea5..de3f7553b4 100644 --- a/v3/yiancardesigns/hs60/hhkb/hs60_v2_hhkb.json +++ b/v3/yiancardesigns/hs60/hhkb/hs60_v2_hhkb.json @@ -226,9 +226,9 @@ "4,1", {"w": 1.5}, "4,2", - {"c": "#DEBFB3", "t": "#363636", "a": 7, "w": 7}, + {"c": "#DEBFB3", "t": "#363636", "w": 7}, "4,6", - {"c": "#363636", "t": "#DEBFB3", "a": 4, "w": 1.5}, + {"c": "#363636", "t": "#DEBFB3", "w": 1.5}, "4,11", "4,12", {"w": 1.5}, @@ -236,4 +236,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/yiancardesigns/hs60/iso/hs60_v2_iso.json b/v3/yiancardesigns/hs60/iso/hs60_v2_iso.json index 5a1c6456b4..f1fd32b984 100644 --- a/v3/yiancardesigns/hs60/iso/hs60_v2_iso.json +++ b/v3/yiancardesigns/hs60/iso/hs60_v2_iso.json @@ -234,9 +234,9 @@ "4,1", {"w": 1.25}, "4,2", - {"c": "#DEBFB3", "t": "#363636", "a": 7, "w": 6.25}, + {"c": "#DEBFB3", "t": "#363636", "w": 6.25}, "4,6", - {"c": "#363636", "t": "#DEBFB3", "a": 4, "w": 1.25}, + {"c": "#363636", "t": "#DEBFB3", "w": 1.25}, "4,10", {"w": 1.25}, "4,11", @@ -247,4 +247,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/yiancardesigns/nk65/nk65.json b/v3/yiancardesigns/nk65/nk65.json index 157ec89fe9..c576e96906 100644 --- a/v3/yiancardesigns/nk65/nk65.json +++ b/v3/yiancardesigns/nk65/nk65.json @@ -232,9 +232,9 @@ "4,1", {"w": 1.25}, "4,2", - {"c": "#DEBFB3", "t": "#363636", "a": 7, "w": 6.25}, + {"c": "#DEBFB3", "t": "#363636", "w": 6.25}, "4,6", - {"c": "#363636", "t": "#DEBFB3", "a": 4}, + {"c": "#363636", "t": "#DEBFB3"}, "4,9", "4,10", "4,11", @@ -245,4 +245,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/v3/zx60/zx60_via.json b/v3/zx60/zx60_via.json index fb6961ce24..7ee2321e13 100644 --- a/v3/zx60/zx60_via.json +++ b/v3/zx60/zx60_via.json @@ -36,7 +36,6 @@ ] ], "keymap": [ - {"name": "zx60_pre_via", "author": "sets3n"}, [ {"x": 2.5, "c": "#777777"}, "0,0", @@ -446,4 +445,4 @@ ] ] } -} \ No newline at end of file +}