summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-02-09 14:34:21 +1100
committerGitHub <noreply@github.com>2023-02-09 03:34:21 +0000
commitc67285587c812a3dffb20113c8a270b596156d0e (patch)
tree6630078fcd119e9bb9cb2fb0a7ff5a818aaa445a
parentb0604aca477d0ea010b0ba65364677b179327a1b (diff)
Fix errors flagged by generate-api (#19784)
-rw-r--r--keyboards/baguette/info.json1
-rw-r--r--keyboards/custommk/evo70/info.json1
-rw-r--r--keyboards/dailycraft/stickey4/info.json17
-rw-r--r--keyboards/jacky_studio/bear_65/bear_65.c20
-rw-r--r--keyboards/jacky_studio/bear_65/rev2/info.json2
-rw-r--r--keyboards/jacky_studio/bear_65/rules.mk2
-rw-r--r--keyboards/mode/m80v2/m80v2s/info.json2
-rw-r--r--keyboards/mwstudio/alicekk/info.json89
-rw-r--r--keyboards/ryanbaekr/rb1/info.json2
-rw-r--r--keyboards/ryanbaekr/rb18/info.json2
-rw-r--r--keyboards/ryanbaekr/rb69/info.json2
-rw-r--r--keyboards/ryanbaekr/rb86/info.json2
-rw-r--r--keyboards/splitography/info.json1
-rw-r--r--keyboards/yandrstudio/nz64/info.json1
-rw-r--r--keyboards/yandrstudio/zhou65/info.json1
15 files changed, 107 insertions, 38 deletions
diff --git a/keyboards/baguette/info.json b/keyboards/baguette/info.json
index 4fed73eab9..b89b92aff4 100644
--- a/keyboards/baguette/info.json
+++ b/keyboards/baguette/info.json
@@ -3,7 +3,6 @@
"manufacturer": "Yiancar",
"url": "",
"maintainer": "qmk",
- "bootloader": "atmel-dfu",
"usb": {
"vid": "0xFEED",
"pid": "0x5050",
diff --git a/keyboards/custommk/evo70/info.json b/keyboards/custommk/evo70/info.json
index 63c448d5c8..7c7eb1c5ff 100644
--- a/keyboards/custommk/evo70/info.json
+++ b/keyboards/custommk/evo70/info.json
@@ -17,7 +17,6 @@
"rows": ["D3", "D2", "F7", "F6", "F5", "F0"]
},
- "processor": "atmega32u4",
"rgblight": {
"led_count": 48,
"pin": "B2",
diff --git a/keyboards/dailycraft/stickey4/info.json b/keyboards/dailycraft/stickey4/info.json
index 7e5578fc77..bbe43f8b13 100644
--- a/keyboards/dailycraft/stickey4/info.json
+++ b/keyboards/dailycraft/stickey4/info.json
@@ -9,5 +9,20 @@
"device_version": "0.0.1"
},
"processor": "atmega32u4",
- "bootloader": "atmel-dfu"
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"x": 0, "y": 0},
+ {"x": 1, "y": 0},
+ {"x": 2, "y": 0},
+ {"x": 3, "y": 0},
+
+ {"label": "Encoder 1 CCW", "x": 0, "y": 1},
+ {"label": "Encoder 1 CW", "x": 1, "y": 1},
+ {"label": "Encoder 2 CCW", "x": 2, "y": 1},
+ {"label": "Encoder 2 CW", "x": 3, "y": 1}
+ ]
+ }
+ }
}
diff --git a/keyboards/jacky_studio/bear_65/bear_65.c b/keyboards/jacky_studio/bear_65/bear_65.c
index b4ed1318f0..a2ae572b82 100644
--- a/keyboards/jacky_studio/bear_65/bear_65.c
+++ b/keyboards/jacky_studio/bear_65/bear_65.c
@@ -15,23 +15,3 @@
*/
#include "bear_65.h"
-
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
- // Key Matrix to LED Index
- { NO_LED, 4 , 4 , 4 , 4 , 3 , 3 , 3 , 3 , 2 , 2 , 2 , 2 , 1 , NO_LED},
- { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 6 },
- { 6 , NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 6 , 0 , 6 },
- { 7 , 5 , NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 11 },
- { 7 , NO_LED, NO_LED, 8 , NO_LED, 8 , 9 , NO_LED, 9 , 7 , 10 , 11 , 11 , 11 , 1 },
-}, {
- // LED Index to Physical Position
- {224, 32}, {224, 10}, {192, 10}, {128, 25},
- {70, 10}, {16, 10}, {16, 32}, {16, 64},
- {64, 64}, {112, 64}, {176, 64}, {224, 64}
-}, {
- // LED Index to Flag
- LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL,
- LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL
-} };
-#endif
diff --git a/keyboards/jacky_studio/bear_65/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/info.json
index 661ebecc92..e3d3a31132 100644
--- a/keyboards/jacky_studio/bear_65/rev2/info.json
+++ b/keyboards/jacky_studio/bear_65/rev2/info.json
@@ -168,7 +168,7 @@
{"label":"Left", "x":17.25, "y":4},
{"label":"Down", "x":18.25, "y":4},
{"label":"Right", "x":19.25, "y":4}]
- }
+ },
"LAYOUT_wk_bs": {
"layout": [
{"label":"Esc", "x":0.5, "y":0},
diff --git a/keyboards/jacky_studio/bear_65/rules.mk b/keyboards/jacky_studio/bear_65/rules.mk
index 67e93335d8..91bb6f74b9 100644
--- a/keyboards/jacky_studio/bear_65/rules.mk
+++ b/keyboards/jacky_studio/bear_65/rules.mk
@@ -1 +1 @@
-DEFAULT_FOLDER = jacky_studio/bear65/rev1
+DEFAULT_FOLDER = jacky_studio/bear_65/rev1
diff --git a/keyboards/mode/m80v2/m80v2s/info.json b/keyboards/mode/m80v2/m80v2s/info.json
index 06c106ecdc..0304354325 100644
--- a/keyboards/mode/m80v2/m80v2s/info.json
+++ b/keyboards/mode/m80v2/m80v2s/info.json
@@ -8,7 +8,7 @@
"pid": "0x0082",
"device_version": "0.0.2"
},
- "processor": "F072",
+ "processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT_m80v2s": {
diff --git a/keyboards/mwstudio/alicekk/info.json b/keyboards/mwstudio/alicekk/info.json
index a60e30be8f..19a735ebc5 100644
--- a/keyboards/mwstudio/alicekk/info.json
+++ b/keyboards/mwstudio/alicekk/info.json
@@ -7,5 +7,92 @@
"device_version": "0.0.1"
},
"processor": "STM32F103",
- "bootloader": "stm32duino"
+ "bootloader": "stm32duino",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"x": 0.5, "y": 0},
+
+ {"x": 1.75, "y": 0},
+ {"x": 2.75, "y": 0},
+ {"x": 3.75, "y": 0},
+ {"x": 4.75, "y": 0},
+ {"x": 5.75, "y": 0},
+ {"x": 6.75, "y": 0},
+ {"x": 7.75, "y": 0},
+
+ {"x": 9.25, "y": 0},
+ {"x": 10.25, "y": 0},
+ {"x": 11.25, "y": 0},
+ {"x": 12.25, "y": 0},
+ {"x": 13.25, "y": 0},
+ {"x": 14.25, "y": 0},
+ {"x": 15.25, "y": 0, "w": 2},
+
+ {"x": 0.25, "y": 1},
+
+ {"x": 1.5, "y": 1, "w": 1.5},
+ {"x": 3, "y": 1},
+ {"x": 4, "y": 1},
+ {"x": 5, "y": 1},
+ {"x": 6, "y": 1},
+ {"x": 7, "y": 1},
+
+ {"x": 9, "y": 1},
+ {"x": 10, "y": 1},
+ {"x": 11, "y": 1},
+ {"x": 12, "y": 1},
+ {"x": 13, "y": 1},
+ {"x": 14, "y": 1},
+ {"x": 15, "y": 1},
+ {"x": 16, "y": 1, "w": 1.5},
+
+ {"x": 0, "y": 2},
+
+ {"x": 1.25, "y": 2, "w": 1.75},
+ {"x": 3, "y": 2},
+ {"x": 4, "y": 2},
+ {"x": 5, "y": 2},
+ {"x": 6, "y": 2},
+ {"x": 7, "y": 2},
+
+ {"x": 9.5, "y": 2},
+ {"x": 10.5, "y": 2},
+ {"x": 11.5, "y": 2},
+ {"x": 12.5, "y": 2},
+ {"x": 13.5, "y": 2},
+ {"x": 14.5, "y": 2},
+ {"x": 15.5, "y": 2, "w": 2.25},
+
+ {"x": 1, "y": 3, "w": 2.25},
+ {"x": 3.25, "y": 3},
+ {"x": 4.25, "y": 3},
+ {"x": 5.25, "y": 3},
+ {"x": 6.25, "y": 3},
+ {"x": 7.25, "y": 3},
+
+ {"x": 9.75, "y": 3},
+ {"x": 10.75, "y": 3},
+ {"x": 11.75, "y": 3},
+ {"x": 12.75, "y": 3},
+ {"x": 13.75, "y": 3},
+ {"x": 14.75, "y": 3},
+ {"x": 15.75, "y": 3},
+ {"x": 16.75, "y": 3, "w": 1.25},
+
+ {"x": 1, "y": 4, "w": 1.25},
+ {"x": 2.25, "y": 4, "w": 1.25},
+
+ {"x": 4.75, "y": 4, "w": 1.25},
+ {"x": 6, "y": 4, "w": 2.25},
+
+ {"x": 9.75, "y": 4, "w": 2.75},
+ {"x": 12.5, "y": 4, "w": 1.25},
+
+ {"x": 14.75, "y": 4},
+ {"x": 15.75, "y": 4},
+ {"x": 16.75, "y": 4}
+ ]
+ }
+ }
}
diff --git a/keyboards/ryanbaekr/rb1/info.json b/keyboards/ryanbaekr/rb1/info.json
index 85c7fcafa6..47ee8c7d2b 100644
--- a/keyboards/ryanbaekr/rb1/info.json
+++ b/keyboards/ryanbaekr/rb1/info.json
@@ -3,8 +3,6 @@
"manufacturer": "ryanbaekr",
"url": "",
"maintainer": "ryanbaekr",
- "processor": "atmega32u4",
- "bootloader": "caterina",
"usb": {
"vid": "0x7262",
"pid": "0x0001",
diff --git a/keyboards/ryanbaekr/rb18/info.json b/keyboards/ryanbaekr/rb18/info.json
index 1111ff0bfa..4302522a49 100644
--- a/keyboards/ryanbaekr/rb18/info.json
+++ b/keyboards/ryanbaekr/rb18/info.json
@@ -3,8 +3,6 @@
"manufacturer": "ryanbaekr",
"url": "",
"maintainer": "ryanbaekr",
- "processor": "atmega32u4",
- "bootloader": "caterina",
"usb": {
"vid": "0x7262",
"pid": "0x0018",
diff --git a/keyboards/ryanbaekr/rb69/info.json b/keyboards/ryanbaekr/rb69/info.json
index ddb71149e9..de96dc8aed 100644
--- a/keyboards/ryanbaekr/rb69/info.json
+++ b/keyboards/ryanbaekr/rb69/info.json
@@ -3,8 +3,6 @@
"manufacturer": "ryanbaekr",
"url": "",
"maintainer": "ryanbaekr",
- "processor": "atmega32u4",
- "bootloader": "caterina",
"usb": {
"vid": "0x7262",
"pid": "0x0069",
diff --git a/keyboards/ryanbaekr/rb86/info.json b/keyboards/ryanbaekr/rb86/info.json
index 7d76d59781..771862f612 100644
--- a/keyboards/ryanbaekr/rb86/info.json
+++ b/keyboards/ryanbaekr/rb86/info.json
@@ -3,8 +3,6 @@
"manufacturer": "ryanbaekr",
"url": "",
"maintainer": "ryanbaekr",
- "processor": "atmega32u4",
- "bootloader": "caterina",
"usb": {
"vid": "0x7262",
"pid": "0x0086",
diff --git a/keyboards/splitography/info.json b/keyboards/splitography/info.json
index 7c4afd849e..aab9d3f22f 100644
--- a/keyboards/splitography/info.json
+++ b/keyboards/splitography/info.json
@@ -3,7 +3,6 @@
"keyboard_name": "Splitography",
"url": "https://softhruf.love/collections/writers",
"maintainer": "qmk",
- "processor": "atmega32u4",
"diode_direction": "COL2ROW",
"features": {
"steno": true,
diff --git a/keyboards/yandrstudio/nz64/info.json b/keyboards/yandrstudio/nz64/info.json
index 6e174509db..5aa0c2ae68 100644
--- a/keyboards/yandrstudio/nz64/info.json
+++ b/keyboards/yandrstudio/nz64/info.json
@@ -1,6 +1,5 @@
{
"keyboard_name": "nz64",
- "processor": "STM32F401",
"usb": {
"pid": "0xAAAF",
"device_version": "1.0.0"
diff --git a/keyboards/yandrstudio/zhou65/info.json b/keyboards/yandrstudio/zhou65/info.json
index e0fee4588e..313a0dd3b3 100644
--- a/keyboards/yandrstudio/zhou65/info.json
+++ b/keyboards/yandrstudio/zhou65/info.json
@@ -1,6 +1,5 @@
{
"keyboard_name": "zhou65",
- "processor": "STM32F401",
"usb": {
"pid": "0xAAAD",
"device_version": "1.0.0"