Skip to content

Commit

Permalink
[pull] master from the-via:master (#101)
Browse files Browse the repository at this point in the history 
* Update kb12-01.json

* Add files via upload

* PW88 addition

* Compensator VIA json definitions

* Fixed split definitions and added V2 json

* Update kb19-01.json

* Update v3/smoll/pw88.json

Co-authored-by: Xelus22 <17491233+Xelus22@users.noreply.github.com>

* Add files via upload

* Update v3/doio/kb04/kb04-01.json

Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>

* removed v2 definition

* [ Add 6Pad Via Macropad ]

* Add files via upload

* Add files via upload

* feat: add support for marshkeys/flowerpad

* Added SP BAE Support

* Create osav2_topre.json

* Create osav2_numpad_topre.json

* Add MNK 60 EC

* Add MNK 65 EC

* Add EC Type-K

* Fix layout option

* added TechnicPad

* technicpad: reformated <keyboard>.json files

* Update the layout support for XD96

Updates the VIA support for the XD96 keyboard, using matrix data found
in a TMK keymap generator.

* adding CMK11

* Add 60XT

* Update zed60.json

add support lighting keycode

* matrix fix

* Update yd60mq.json

Removal of Stepped Caps option. This option is redundant since both normal and stepped positions share the same Row/Col position. Furthermore, the renderer doesn't handle the stepped caps correctly.

This PR also adds the features proposed in the-via#2182 by @plodah , while also addressing the inherent multilayout index shift that the removal of the step caps option causes.

* Update v3/smoll/pw88.json

Applied correct key colors scheme as per documentation.

* Add sf2040 Support

* Update sf2040.json

* Add SIRIND Brick65

Add SIRIND Brick65

* fixing wkl layout

* Added Swiss support

* Move to v3

* Added km113 keyboard

* Re-structured folders to match QMK structure

* Add EQUATOR

* [ Add zlabkeeb 15pad VIA ]

* added highlight colors to json files

* Adds support for slice65 from pizzakeyboards

* Update via.json colors

* Add werk.technica werk.one config

* Update and rename via.json to swiss.json

* Create t75.json

* Update v3/vertex/t75/t75.json

* renaming files and folders to align with the rest of the repo

* Update v3/rmi_kb/equator/equator.json

* Update posey_split_v5-via.json.json

Added custom menu support for hardware repeat and layer-shifting color choices. Also cleaned up some long decimals.

* Renamed files and added custom menus to V4

* UPDATE

* Update v3/zlabkeeb/15pad/15pad.json

* Update src/pizzakeyboards/slice65/slice65.json

* fix: Moves slice65 to v3 folder

* removed legacy definition

* fixed technicpad v3 definition

* Update v3/technicpad/technicpad.json

* Add files via upload

* added 810e

* Update v3/doio/kb3x/kb3x-01.json

* Added SKILLER SGK50 S2 keyboard

* update key color, remove stepped lock and reformat the json files

* Update v3/neson_design/810e.json

* Update src/pmk/posey_split/v5/posey_split_v5.json

* Update src/pmk/posey_split/v4/posey_split_v4.json

* Move to V3 per @Cipulot request/advice

src is the legacy folder. Moving to the appropriate newer V3 folder.

* add ppr_merro60 (the-via#2173)

* add ppr_merro60

* move v3 files from v2 'src' dir to 'v3'

* Update v3/chlx/ppr_merro60/ppr_merro60.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update v3/chlx/ppr_merro60/ppr_merro60.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update v3/chlx/ppr_merro60/ppr_merro60.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update v3/chlx/ppr_merro60/ppr_merro60.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update v3/chlx/ppr_merro60/ppr_merro60.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update v3/chlx/ppr_merro60/ppr_merro60.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* update key colors for (6,0), (7,0), (6,6), (7,6). tested operational loading in via and running on board.

* remove pipe from modifier color code

* add decal blocks

---------

Co-authored-by: chalex <alejandrelee+magbogbro@gmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* formatting

* formatting

* formatting

* SRC pass

* V3 pass

* Add kb38  via supported

* Add new versions of Sat75 to VIA

* Update v3/doio/kb38/kb38-01.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update v3/doio/kb38/kb38-01.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update v3/doio/kb38/kb38-01.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update v3/doio/kb38/kb38-01.json

* Update v3/cannonkeys/satisfaction75_hs/satisfaction75_hs.json

* Update v3/cannonkeys/satisfaction75_rev2/satisfaction75_rev2.json

* yet another pass

* key order and json formatting script

---------

Co-authored-by: DOIO2022 <116554792+DOIO2022@users.noreply.github.com>
Co-authored-by: smollchungusm <mpamuller@msn.com>
Co-authored-by: Logan <lrfoster03@gmail.com>
Co-authored-by: SmollChungus <38044391+SmollChungus@users.noreply.github.com>
Co-authored-by: Xelus22 <17491233+Xelus22@users.noreply.github.com>
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: Logan Foster <44828794+Lrfoster03@users.noreply.github.com>
Co-authored-by: zlabkeeb <160311066+zlabkeeb@users.noreply.github.com>
Co-authored-by: Vertex-kb <102476474+Vertex-kb@users.noreply.github.com>
Co-authored-by: Ethirallan <ethirallan@gmail.com>
Co-authored-by: blindassassin111 <38090555+blindassassin111@users.noreply.github.com>
Co-authored-by: Cipulot <40441626+Cipulot@users.noreply.github.com>
Co-authored-by: Niclas Hirschfeld <niclas@wonderland.io>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: David Hoelscher <infinityis@users.noreply.github.com>
Co-authored-by: mechlovin <57231893+mechlovin@users.noreply.github.com>
Co-authored-by: hineybush <joshhinnebusch@gmail.com>
Co-authored-by: Strayfade <epicplayvig@gmail.com>
Co-authored-by: era <phyojinbin@gmail.com>
Co-authored-by: 4pplet <mail@4pplet.com>
Co-authored-by: Bregoli <leandercoolen@gmail.com>
Co-authored-by: bingkun.li <bingkun.li@westberrytech.com>
Co-authored-by: joliverMI <joliver@mechingenuity.com>
Co-authored-by: joliverMI <36174681+joliverMI@users.noreply.github.com>
Co-authored-by: Ramon Imbao <ramonimbao@gmail.com>
Co-authored-by: Veriyans <162705394+veriyaniot@users.noreply.github.com>
Co-authored-by: NW <nwhirschfeld@users.noreply.github.com>
Co-authored-by: Chad Skeeters <chad.skeeters@gmail.com>
Co-authored-by: Bregoliii <34028962+Bregoliii@users.noreply.github.com>
Co-authored-by: Moritz Plattner <moritz.plattner@gmx.net>
Co-authored-by: Jacky <128167503+JackyJia73@users.noreply.github.com>
Co-authored-by: Lei Yu <yuleiz@gmail.com>
Co-authored-by: wb <wb@westberrytech.com>
Co-authored-by: chalex <68408520+gaclee3b@users.noreply.github.com>
Co-authored-by: chalex <alejandrelee+magbogbro@gmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Andrew Kannan <andrew.kannan@gmail.com>
  • Loading branch information
@pull @DOIO2022
@SmollChungus @Lrfoster03 @Xelus22 @adophoxia @zlabkeeb @Vertex-kb @Ethirallan @blindassassin111 @Cipulot @nwhirschfeld @noroadsleft @infinityis @mechlovin @hineybush @strayfade @eerraa @4pplet @Bregoliii @joliverMI @ramonimbao @veriyaniot @cskeeters @ebastler @JackyJia73 @yulei @gaclee3b @dunk2k @awkannan
38 people authored Apr 10, 2024
1 parent 8e01636 commit 77e0784
Show file tree
Hide file tree
Showing 3,272 changed files with 319,399 additions and 107,887 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
75 changes: 75 additions & 0 deletions scripts/reorder_and_format.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
#!/usr/bin/env python3

import os
import json
import collections


def reorder_and_format(file_path):
with open(file_path, "r+") as f:
data = json.load(f, object_pairs_hook=collections.OrderedDict)

if "matrix" in data:
matrix = data["matrix"]
if list(matrix.keys()) == ["cols", "rows"]:
matrix = {"rows": matrix["rows"], "cols": matrix["cols"]}
data["matrix"] = matrix

if "layouts" in data:
layouts = data["layouts"]
ordered_layouts = collections.OrderedDict()
layout_order = ["labels", "presets", "keymap"]

for key in layout_order:
if key in layouts:
ordered_layouts[key] = layouts[key]

data["layouts"] = ordered_layouts

ordered_data = collections.OrderedDict()
key_order = [
"name",
"vendorId",
"productId",
"firmwareVersion",
"matrix",
"customFeatures",
"customKeycodes",
"keycodes",
"menus",
"lighting",
"layouts",
]

for key in key_order:
if key in data:
ordered_data[key] = data[key]

f.seek(0)
json.dump(ordered_data, f, indent=2, ensure_ascii=False)
f.write("\n") # insert final newline
f.truncate()


def walk_directory(directory):
for root, dirs, files in os.walk(directory):
for file in files:
if file.endswith(".json"):
reorder_and_format(os.path.join(root, file))


def main():
# Get the directory containing the script
script_dir = os.path.dirname(os.path.realpath(__file__))

# Define the project directories relative to the script directory
src_dir = os.path.join(script_dir, "..", "src")
v3_dir = os.path.join(script_dir, "..", "v3")

# Use the dynamic paths
walk_directory(src_dir)
walk_directory(v3_dir)


if __name__ == "__main__":
main()
16 changes: 14 additions & 2 deletions src/0_sixty/0_sixty.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,22 @@
"name": "0-Sixty by ven0mtr0n",
"vendorId": "0x7654",
"productId": "0x0060",
"matrix": {
"rows": 5,
"cols": 12
},
"lighting": "none",
"matrix": {"rows": 5, "cols": 12},
"layouts": {
"labels": [["Bottom Row", "5x12", "1x2uC", "2x2uC", "1x2uR", "1x2uL"]],
"labels": [
[
"Bottom Row",
"5x12",
"1x2uC",
"2x2uC",
"1x2uR",
"1x2uL"
]
],
"keymap": [
[
{
Expand Down
65 changes: 49 additions & 16 deletions src/0xC7/61key/61key.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
"name": "61Key by 0xC7",
"vendorId": "0xE117",
"productId": "0x6161",
"matrix": {
"rows": 5,
"cols": 14
},
"lighting": "none",
"matrix": {"rows": 5, "cols": 14},
"layouts": {
"keymap": [
[
Expand All @@ -20,11 +23,15 @@
"0,10",
"0,11",
"0,12",
{"w": 2},
{
"w": 2
},
"0,13"
],
[
{"w": 1.5},
{
"w": 1.5
},
"1,0",
"1,1",
"1,2",
Expand All @@ -38,11 +45,15 @@
"1,10",
"1,11",
"1,12",
{"w": 1.5},
{
"w": 1.5
},
"1,13"
],
[
{"w": 1.75},
{
"w": 1.75
},
"2,0",
"2,1",
"2,2",
Expand All @@ -55,11 +66,15 @@
"2,9",
"2,10",
"2,11",
{"w": 2.25},
{
"w": 2.25
},
"2,13"
],
[
{"w": 2.25},
{
"w": 2.25
},
"3,0",
"3,1",
"3,2",
Expand All @@ -71,25 +86,43 @@
"3,8",
"3,9",
"3,10",
{"w": 2.75},
{
"w": 2.75
},
"3,13"
],
[
{"w": 1.25},
{
"w": 1.25
},
"4,0",
{"w": 1.25},
{
"w": 1.25
},
"4,1",
{"w": 1.25},
{
"w": 1.25
},
"4,2",
{"w": 6.25},
{
"w": 6.25
},
"4,5",
{"w": 1.25},
{
"w": 1.25
},
"4,8",
{"w": 1.25},
{
"w": 1.25
},
"4,9",
{"w": 1.25},
{
"w": 1.25
},
"4,11",
{"w": 1.25},
{
"w": 1.25
},
"4,13"
]
]
Expand Down
23 changes: 19 additions & 4 deletions src/0xcb/1337/1337.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,28 @@
"name": "0xCB 1337",
"vendorId": "0xCB00",
"productId": "0x1337",
"matrix": {
"rows": 3,
"cols": 3
},
"lighting": "qmk_backlight_rgblight",
"matrix": {"rows": 3, "cols": 3},
"layouts": {
"keymap": [
["0,0", "0,1", "0,2"],
["1,0", "1,1", "1,2"],
["2,0", "2,1", "2,2"]
[
"0,0",
"0,1",
"0,2"
],
[
"1,0",
"1,1",
"1,2"
],
[
"2,0",
"2,1",
"2,2"
]
]
}
}
10 changes: 8 additions & 2 deletions src/0xcb/static/static.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,19 @@
"name": "0xCB Static",
"vendorId": "0xCB00",
"productId": "0xa455",
"lighting": "none",
"matrix": {
"rows": 8,
"cols": 6
},
"lighting": "none",
"layouts": {
"labels": [["Space", "Split", "6.25U"]],
"labels": [
[
"Space",
"Split",
"6.25U"
]
],
"keymap": [
[
{
Expand Down
25 changes: 22 additions & 3 deletions src/0xcb/tutelpad/tutelpad.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,31 @@
"name": "TutelPad",
"vendorId": "0xCB00",
"productId": "0xF09F",
"matrix": {
"rows": 2,
"cols": 4
},
"lighting": "qmk_backlight_rgblight",
"matrix": {"rows": 2, "cols": 4},
"layouts": {
"keymap": [
["0,0","0,1",{"x":1.5},"0,2","0,3"],
["1,0","1,1",{"x":1.5},"1,2","1,3"]
[
"0,0",
"0,1",
{
"x": 1.5
},
"0,2",
"0,3"
],
[
"1,0",
"1,1",
{
"x": 1.5
},
"1,2",
"1,3"
]
]
}
}
24 changes: 19 additions & 5 deletions src/10bleoledhub/10bleoledhub.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,31 @@
"name": "10bleoledhub",
"vendorId": "0x7C88",
"productId": "0x7C99",
"lighting": "none",
"matrix": {
"rows": 4,
"cols": 3
},
"lighting": "none",
"layouts": {
"keymap": [
["0,0"],
["1,0", "1,1", "1,2"],
["2,0", "2,1", "2,2"],
["3,0", "3,1", "3,2"]
[
"0,0"
],
[
"1,0",
"1,1",
"1,2"
],
[
"2,0",
"2,1",
"2,2"
],
[
"3,0",
"3,1",
"3,2"
]
]
}
}
2 changes: 1 addition & 1 deletion src/1upkeyboards/1up60hse/1up60hse.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"name": "1up60hse",
"vendorId": "0x6F75",
"productId": "0x6873",
"lighting": "qmk_backlight_rgblight",
"matrix": {
"rows": 5,
"cols": 14
},
"lighting": "qmk_backlight_rgblight",
"layouts": {
"keymap": [
[
Expand Down
11 changes: 8 additions & 3 deletions src/1upkeyboards/1up60hte/1up60hte.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,19 @@
"name": "1up60hte",
"vendorId": "0x6F75",
"productId": "0x6874",
"lighting": "qmk_backlight_rgblight",
"matrix": {
"rows": 5,
"cols": 14
},
"lighting": "qmk_backlight_rgblight",
"layouts": {
"labels": [["Bottom Row", "Tsangan", "HHKB"]],

"labels": [
[
"Bottom Row",
"Tsangan",
"HHKB"
]
],
"keymap": [
[
{
Expand Down
Loading

0 comments on commit 77e0784

Please sign in to comment.