summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/mappings/info_config.hjson5
-rw-r--r--data/mappings/info_rules.hjson1
-rw-r--r--data/mappings/keyboard_aliases.hjson90
-rw-r--r--data/schemas/keyboard.jsonschema16
4 files changed, 46 insertions, 66 deletions
diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson
index e53d90da39..ab9a4a0e45 100644
--- a/data/mappings/info_config.hjson
+++ b/data/mappings/info_config.hjson
@@ -64,13 +64,12 @@
// LED Matrix
"LED_MATRIX_CENTER": {"info_key": "led_matrix.center_point", "value_type": "array.int"},
- "LED_MATRIX_HUE_STEP": {"info_key": "led_matrix.hue_steps", "value_type": "int"},
"LED_MATRIX_MAXIMUM_BRIGHTNESS": {"info_key": "led_matrix.max_brightness", "value_type": "int"},
- "LED_MATRIX_SAT_STEP": {"info_key": "led_matrix.sat_steps", "value_type": "int"},
"LED_MATRIX_SPD_STEP": {"info_key": "led_matrix.speed_steps", "value_type": "int"},
"LED_MATRIX_SPLIT": {"info_key": "led_matrix.split_count", "value_type": "array.int"},
"LED_MATRIX_TIMEOUT": {"info_key": "led_matrix.timeout", "value_type": "int"},
"LED_MATRIX_VAL_STEP": {"info_key": "led_matrix.val_steps", "value_type": "int"},
+ "LED_MATRIX_LED_COUNT": {"info_key": "led_matrix.led_count", "value_type": "int", "to_json": false},
// LUFA Bootloader
"QMK_ESC_INPUT": {"info_key": "qmk_lufa_bootloader.esc_input"},
@@ -109,6 +108,7 @@
"RGB_MATRIX_SPLIT": {"info_key": "rgb_matrix.split_count", "value_type": "array.int"},
"RGB_MATRIX_TIMEOUT": {"info_key": "rgb_matrix.timeout", "value_type": "int"},
"RGB_MATRIX_VAL_STEP": {"info_key": "rgb_matrix.val_steps", "value_type": "int"},
+ "RGB_MATRIX_LED_COUNT": {"info_key": "rgb_matrix.led_count", "value_type": "int", "to_json": false},
// RGBLight
"RGBLED_NUM": {"info_key": "rgblight.led_count", "value_type": "int"},
@@ -117,6 +117,7 @@
"RGBLIGHT_LAYER_BLINK": {"info_key": "rgblight.layers.blink", "value_type": "bool"},
"RGBLIGHT_LAYERS": {"info_key": "rgblight.layers.enabled", "value_type": "bool"},
"RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF": {"info_key": "rgblight.layers.override_rgb", "value_type": "bool"},
+ "RGBLIGHT_LED_MAP": {"info_key": "rgblight.led_map", "value_type": "array.int"},
"RGBLIGHT_LIMIT_VAL": {"info_key": "rgblight.max_brightness", "value_type": "int"},
"RGBLIGHT_MAX_LAYERS": {"info_key": "rgblight.layers.max", "value_type": "int"},
"RGBLIGHT_SAT_STEP": {"info_key": "rgblight.saturation_steps", "value_type": "int"},
diff --git a/data/mappings/info_rules.hjson b/data/mappings/info_rules.hjson
index bf8ec05cb2..07191551da 100644
--- a/data/mappings/info_rules.hjson
+++ b/data/mappings/info_rules.hjson
@@ -35,6 +35,7 @@
"PS2_ENABLE": {"info_key": "ps2.enabled", "value_type": "bool"},
"PS2_MOUSE_ENABLE": {"info_key": "ps2.mouse_enabled", "value_type": "bool"},
"RGB_MATRIX_DRIVER": {"info_key": "rgb_matrix.driver"},
+ "RGBLIGHT_DRIVER": {"info_key": "rgblight.driver"},
"SECURE_ENABLE": {"info_key": "secure.enabled", "value_type": "bool"},
"SPLIT_KEYBOARD": {"info_key": "split.enabled", "value_type": "bool"},
"SPLIT_TRANSPORT": {"info_key": "split.transport.protocol", "to_c": false},
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index f1c1f81e9a..60c5deaad5 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -1,13 +1,9 @@
{
// Format for each entry:
// "<alias>": {
- // "target": "<keyboard_folder>",
- // "layouts": {
- // "<layout_alias>": "<layout_target>"
- // }
+ // "target": "<keyboard_folder>"
// }
//
- // Both target and layouts are optional.
"2_milk": {
"target": "spaceman/2_milk"
},
@@ -140,21 +136,6 @@
"daisy": {
"target": "ktec/daisy"
},
- "doro67/multi": {
- "layouts": {
- "LAYOUT_ansi": "LAYOUT_65_ansi_blocker"
- }
- },
- "doro67/regular": {
- "layouts": {
- "LAYOUT": "LAYOUT_65_ansi_blocker"
- }
- },
- "doro67/rgb": {
- "layouts": {
- "LAYOUT": "LAYOUT_65_ansi_blocker"
- }
- },
"drakon": {
"target": "jagdpietr/drakon"
},
@@ -212,6 +193,12 @@
"gmmk/pro/iso": {
"target": "gmmk/pro/rev1/iso"
},
+ "handwired/dactyl_manuform/3x5_3": {
+ "target": "handwired/dactyl_minidox"
+ },
+ "handwired/dactyl_manuform/6x6_kinesis": {
+ "target": "handwired/dactyl_kinesis"
+ },
"handwired/ferris": {
"target": "ferris/0_1"
},
@@ -221,6 +208,21 @@
"handwired/p1800fl": {
"target": "team0110/p1800fl"
},
+ "handwired/jscotto/scotto9": {
+ "target": "handwired/scottokeebs/scotto9"
+ },
+ "handwired/jscotto/scotto36": {
+ "target": "handwired/scottokeebs/scotto36"
+ },
+ "handwired/jscotto/scotto40": {
+ "target": "handwired/scottokeebs/scotto40"
+ },
+ "handwired/jscotto/scottocmd": {
+ "target": "handwired/scottokeebs/scottocmd"
+ },
+ "handwired/jscotto/scottostarter": {
+ "target": "handwired/scottokeebs/scottostarter"
+ },
"helix/pico/sc/back": {
"target": "helix/pico/sc"
},
@@ -264,10 +266,7 @@
"target": "keyhive/honeycomb"
},
"idb_60": {
- "target": "idb/idb_60",
- "layouts": {
- "LAYOUT": "LAYOUT_all"
- }
+ "target": "idb/idb_60"
},
"idobo": {
"target": "idobao/id75"
@@ -288,19 +287,13 @@
"target": "jones/v03_1"
},
"kamigakushi": {
- "target": "jaykeeb/kamigakushi",
- "layouts": {
- "LAYOUT": "LAYOUT_65_ansi_blocker_tsangan"
- }
+ "target": "jaykeeb/kamigakushi"
},
"katana60": {
"target": "rominronin/katana60/rev1"
},
"kbdfans/kbd67mkiirgb": {
- "target": "kbdfans/kbd67/mkiirgb",
- "layouts": {
- "LAYOUT": "LAYOUT_65_ansi_blocker"
- }
+ "target": "kbdfans/kbd67/mkiirgb"
},
"kbdfans/kbd67/mkiirgb": {
"target": "kbdfans/kbd67/mkiirgb/v1"
@@ -446,11 +439,6 @@
"mschwingen/modelm": {
"target": "ibm/model_m/mschwingen"
},
- "noxary/268_2": {
- "layouts": {
- "LAYOUT": "LAYOUT_65_ansi_blocker"
- }
- },
"oddball": {
"target": "oddball/v1"
},
@@ -475,11 +463,6 @@
"peiorisboards/ixora": {
"target": "coarse/ixora"
},
- "percent/canoe": {
- "layouts": {
- "LAYOUT_iso": "LAYOUT_65_iso_blocker"
- }
- },
"plaid": {
"target": "dm9records/plaid"
},
@@ -492,21 +475,6 @@
"polilla": {
"target": "polilla/rev1"
},
- "preonic/rev1": {
- "layouts": {
- "LAYOUT_preonic_grid": "LAYOUT_ortho_5x12"
- }
- },
- "preonic/rev2": {
- "layouts": {
- "LAYOUT_preonic_grid": "LAYOUT_ortho_5x12"
- }
- },
- "preonic/rev3": {
- "layouts": {
- "LAYOUT_preonic_grid": "LAYOUT_ortho_5x12"
- }
- },
"primekb/prime_l": {
"target": "primekb/prime_l/v1"
},
@@ -598,10 +566,7 @@
"target": "underscore33/rev1"
},
"vinta": {
- "target": "coarse/vinta",
- "layouts": {
- "LAYOUT_67_ansi": "LAYOUT_65_ansi_blocker"
- }
+ "target": "coarse/vinta"
},
"wasdat": {
"target": "maartenwut/wasdat"
@@ -871,6 +836,9 @@
"hecomi/alpha": {
"target": "takashiski/hecomi/alpha"
},
+ "hfdkb/keyboard_sw/k83":{
+ "target": "inland/kb83"
+ },
"hid_liber": {
"target": "bpiphany/hid_liber"
},
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index ba4a7eec55..901caa75fe 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -71,6 +71,8 @@
"STM32F446",
"STM32G431",
"STM32G474",
+ "STM32H723",
+ "STM32H733",
"STM32L412",
"STM32L422",
"STM32L432",
@@ -146,7 +148,7 @@
"properties": {
"driver": {
"type": "string",
- "enum": ["BluefruitLE", "RN42", "custom"]
+ "enum": ["bluefruit_le", "custom", "rn42"]
}
}
},
@@ -174,6 +176,7 @@
"bootloader": {
"type": "string",
"enum": [
+ "apm32-dfu",
"atmel-dfu",
"bootloadhid",
"caterina",
@@ -380,8 +383,6 @@
},
"max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
"timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"},
- "hue_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
- "sat_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
"val_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
"speed_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
"split_count": {
@@ -475,6 +476,10 @@
}
},
"brightness_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
+ "driver": {
+ "type": "string",
+ "enum": ["apa102", "custom", "ws2812"]
+ },
"hue_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
"layers": {
"type": "object",
@@ -491,6 +496,11 @@
}
},
"led_count": {"$ref": "qmk.definitions.v1#/unsigned_int"},
+ "led_map": {
+ "type": "array",
+ "minItems": 2,
+ "items": {"$ref": "qmk.definitions.v1#/unsigned_int"}
+ },
"max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
"pin": {
"$ref": "qmk.definitions.v1#/mcu_pin",