summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2023-12-04 23:30:31 +0000
committerQMK Bot <hello@qmk.fm>2023-12-04 23:30:31 +0000
commit99ab4393deafc39a0cc676efa3abf8079517afef (patch)
tree6d27acc4e60dabebb02e65cec3dd75dfcb839bb3
parentc9d57e9014a19f3274a8cb9418f2354d2393b7df (diff)
parent74ae2286a6d8603394a87f147128053cdcd17270 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/ah/haven65/info.json2
-rw-r--r--keyboards/alhenkb/macropad5x4/info.json2
-rw-r--r--keyboards/custommk/ergostrafer/info.json2
-rw-r--r--keyboards/handwired/scottokeebs/scottosplit/info.json2
-rw-r--r--keyboards/holyswitch/lightweight65/info.json2
-rw-r--r--keyboards/keebio/iris/rev8/info.json2
-rw-r--r--keyboards/kisakeyluxury/qtz/info.json2
-rw-r--r--keyboards/smithrune/magnus/m75h/info.json2
-rw-r--r--keyboards/splitkb/aurora/lily58/rev1/info.json2
-rw-r--r--keyboards/splitkb/kyria/rev3/info.json2
-rw-r--r--keyboards/syenakeyboards/aswagata/info.json2
-rw-r--r--keyboards/takashicompany/baumkuchen/info.json2
-rw-r--r--keyboards/trainpad/info.json2
13 files changed, 13 insertions, 13 deletions
diff --git a/keyboards/ah/haven65/info.json b/keyboards/ah/haven65/info.json
index 1cdc337836..579cbffd7a 100644
--- a/keyboards/ah/haven65/info.json
+++ b/keyboards/ah/haven65/info.json
@@ -24,7 +24,7 @@
"rgblight": true
},
"ws2812": {
- "pin": "C7",
+ "pin": "C7"
},
"rgblight": {
"led_count": 1,
diff --git a/keyboards/alhenkb/macropad5x4/info.json b/keyboards/alhenkb/macropad5x4/info.json
index 29be39249d..1fb472255d 100644
--- a/keyboards/alhenkb/macropad5x4/info.json
+++ b/keyboards/alhenkb/macropad5x4/info.json
@@ -65,7 +65,7 @@
{"label": "K31 (B6,F6)", "matrix": [3, 1], "x": 1, "y": 3},
{"label": "K32 (B6,B1)", "matrix": [3, 2], "x": 2, "y": 3},
{"label": "K40 (B5,F4)", "matrix": [4, 0], "x": 0, "y": 4, "w": 2},
- {"label": "K42 (B5,B1)", "matrix": [4, 2], "x": 2, "y": 4}
+ {"label": "K42 (B5,B1)", "matrix": [4, 2], "x": 2, "y": 4},
{"label": "K43 (B5,B2)", "matrix": [4, 3], "x": 3, "y": 3, "h": 2}
]
}
diff --git a/keyboards/custommk/ergostrafer/info.json b/keyboards/custommk/ergostrafer/info.json
index 92d1fe99e8..a1283114c8 100644
--- a/keyboards/custommk/ergostrafer/info.json
+++ b/keyboards/custommk/ergostrafer/info.json
@@ -67,7 +67,7 @@
{ "matrix": [4, 2], "label":"Z", "x":2.5, "y":5.6 },
{ "matrix": [4, 3], "label":"S", "x":3.5, "y":4.5 },
{ "matrix": [4, 5], "label":"V", "x":5, "y":5.75, "w":1.5 },
- { "matrix": [4, 6], "label":"Space", "x":6.5, "y":6.85, "w":1.75 }
+ { "matrix": [4, 6], "label":"Space", "x":6.5, "y":6.85, "w":1.75 },
{ "matrix": [5, 1], "label":"L Ctrl Duck", "x":0.25, "y":6.75, "w":1.5 },
{ "matrix": [5, 3], "label":"X", "x":3.5, "y":5.6 },
diff --git a/keyboards/handwired/scottokeebs/scottosplit/info.json b/keyboards/handwired/scottokeebs/scottosplit/info.json
index a44ec32976..66d24db0cd 100644
--- a/keyboards/handwired/scottokeebs/scottosplit/info.json
+++ b/keyboards/handwired/scottokeebs/scottosplit/info.json
@@ -14,7 +14,7 @@
},
"matrix_pins": {
// 3, 4, 5, 6, 7, 8, 9, A3, A2, A1
- "cols": ["D0", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6"]
+ "cols": ["D0", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6"],
// 15, 14, 16, 10
"rows": ["B1", "B3", "B2", "B6"]
diff --git a/keyboards/holyswitch/lightweight65/info.json b/keyboards/holyswitch/lightweight65/info.json
index a6252d27b5..16a9f73737 100644
--- a/keyboards/holyswitch/lightweight65/info.json
+++ b/keyboards/holyswitch/lightweight65/info.json
@@ -21,7 +21,7 @@
"extrakey": true,
"console": false,
"command": false,
- "nkro": true,
+ "nkro": true
},
"layout_aliases": {
"LAYOUT": "LAYOUT_65_ansi_blocker"
diff --git a/keyboards/keebio/iris/rev8/info.json b/keyboards/keebio/iris/rev8/info.json
index 998cde201d..d425e8d019 100644
--- a/keyboards/keebio/iris/rev8/info.json
+++ b/keyboards/keebio/iris/rev8/info.json
@@ -238,7 +238,7 @@
{"matrix": [9,3], "flags":4, "x":152, "y":58},
{"flags":2, "x":144, "y":58},
{"matrix": [9,4], "flags":4, "x":134, "y":64},
- {"matrix": [9,5], "flags":4, "x":126, "y":52},
+ {"matrix": [9,5], "flags":4, "x":126, "y":52}
]
}
}
diff --git a/keyboards/kisakeyluxury/qtz/info.json b/keyboards/kisakeyluxury/qtz/info.json
index ba79fc31a2..3225336890 100644
--- a/keyboards/kisakeyluxury/qtz/info.json
+++ b/keyboards/kisakeyluxury/qtz/info.json
@@ -62,7 +62,7 @@
{"matrix": [3, 6], "x": 6.25, "y": 3},
{"matrix": [3, 7], "x": 7.25, "y": 3},
{"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3}
]
}
}
diff --git a/keyboards/smithrune/magnus/m75h/info.json b/keyboards/smithrune/magnus/m75h/info.json
index 10214ee523..0592d2a7a6 100644
--- a/keyboards/smithrune/magnus/m75h/info.json
+++ b/keyboards/smithrune/magnus/m75h/info.json
@@ -39,7 +39,7 @@
"static_gradient": true,
"twinkle": true
}
- }
+ },
"matrix_pins": {
"cols": ["A1" , "A2" , "A4" , "C9" , "A8" , "A10", "B8" , "A15", "C10", "C11", "B5" , "B4", "B3" , "D2" , "C12" ],
"rows": ["C15", "A7" , "C4" , "C5" , "C8" , "C3" , "C1" , "C0" , "C2" , "C14" , "A0" ]
diff --git a/keyboards/splitkb/aurora/lily58/rev1/info.json b/keyboards/splitkb/aurora/lily58/rev1/info.json
index 9a6ad58a14..543f20d263 100644
--- a/keyboards/splitkb/aurora/lily58/rev1/info.json
+++ b/keyboards/splitkb/aurora/lily58/rev1/info.json
@@ -187,7 +187,7 @@
{"flags": 4, "matrix": [9, 5], "x": 137, "y": 64}, // R SW29
{"flags": 4, "matrix": [9, 4], "x": 159, "y": 64}, // R SW28
{"flags": 4, "matrix": [9, 3], "x": 173, "y": 62}, // R SW27
- {"flags": 4, "matrix": [9, 2], "x": 188, "y": 62}, // R SW26
+ {"flags": 4, "matrix": [9, 2], "x": 188, "y": 62} // R SW26
]
}
}
diff --git a/keyboards/splitkb/kyria/rev3/info.json b/keyboards/splitkb/kyria/rev3/info.json
index 81b539c507..84547ce901 100644
--- a/keyboards/splitkb/kyria/rev3/info.json
+++ b/keyboards/splitkb/kyria/rev3/info.json
@@ -185,7 +185,7 @@
{"flags": 4, "matrix": [4, 3], "x": 181, "y": 0}, // R SW03
{"flags": 4, "matrix": [4, 4], "x": 195, "y": 4}, // R SW04
{"flags": 4, "matrix": [4, 5], "x": 210, "y": 11}, // R SW05
- {"flags": 4, "matrix": [4, 6], "x": 224, "y": 11}, // R SW06
+ {"flags": 4, "matrix": [4, 6], "x": 224, "y": 11} // R SW06
]
}
}
diff --git a/keyboards/syenakeyboards/aswagata/info.json b/keyboards/syenakeyboards/aswagata/info.json
index 1f2cf798bb..8c726404ca 100644
--- a/keyboards/syenakeyboards/aswagata/info.json
+++ b/keyboards/syenakeyboards/aswagata/info.json
@@ -22,7 +22,7 @@
"device_version": "1.0.0",
"pid": "0x4173",
"vid": "0x5373"
- }
+ },
"layouts": {
"LAYOUT_ortho_2x2": {
"layout": [
diff --git a/keyboards/takashicompany/baumkuchen/info.json b/keyboards/takashicompany/baumkuchen/info.json
index e231834882..2c8b77851b 100644
--- a/keyboards/takashicompany/baumkuchen/info.json
+++ b/keyboards/takashicompany/baumkuchen/info.json
@@ -40,7 +40,7 @@
"static_gradient": true,
"twinkle": true
},
- "led_count": 6,
+ "led_count": 6
},
"ws2812": {
"pin": "D3"
diff --git a/keyboards/trainpad/info.json b/keyboards/trainpad/info.json
index 99e71bb91a..e7e74b0e91 100644
--- a/keyboards/trainpad/info.json
+++ b/keyboards/trainpad/info.json
@@ -20,7 +20,7 @@
"bootloader": "atmel-dfu",
"matrix_pins": {
"direct": [
- ["C5", "B3", "B4", "B5"],
+ ["C5", "B3", "B4", "B5"]
]
},
"layouts": {