aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/mappings/info_config.hjson2
-rw-r--r--data/mappings/keyboard_aliases.hjson24
-rw-r--r--data/schemas/keyboard.jsonschema10
3 files changed, 32 insertions, 4 deletions
diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson
index 356dd6ba52..a160e490c7 100644
--- a/data/mappings/info_config.hjson
+++ b/data/mappings/info_config.hjson
@@ -184,7 +184,7 @@
// Split Keyboard
"SOFT_SERIAL_PIN": {"info_key": "split.serial.pin"},
- "SOFT_SERIAL_SPEED": {"info_key": "split.soft_serial_speed"},
+ "SELECT_SOFT_SERIAL_SPEED": {"info_key": "split.serial.speed"},
"SPLIT_HAND_MATRIX_GRID": {"info_key": "split.handedness.matrix_grid", "value_type": "array", "to_c": false},
"SPLIT_HAND_PIN": {"info_key": "split.handedness.pin"},
"SPLIT_USB_DETECT": {"info_key": "split.usb_detect.enabled", "value_type": "flag"},
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 73339a2c56..cd5ce6e9ab 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -80,6 +80,30 @@
"bastardkb/charybdis/3x5/v2/stemcell": {
"target": "bastardkb/charybdis/3x5/elitec"
},
+ "bastardkb/charybdis/3x6/v2/elitec": {
+ "target": "bastardkb/charybdis/3x6/elitec"
+ },
+ "bastardkb/charybdis/3x6/v2/splinky_2": {
+ "target": "bastardkb/charybdis/3x6/elitec"
+ },
+ "bastardkb/charybdis/3x6/v2/splinky_3": {
+ "target": "bastardkb/charybdis/3x6/elitec"
+ },
+ "bastardkb/charybdis/3x6/v2/stemcell": {
+ "target": "bastardkb/charybdis/3x6/elitec"
+ },
+ "bastardkb/charybdis/4x6/v2/elitec": {
+ "target": "bastardkb/charybdis/4x6/elitec"
+ },
+ "bastardkb/charybdis/4x6/v2/splinky_2": {
+ "target": "bastardkb/charybdis/4x6/elitec"
+ },
+ "bastardkb/charybdis/4x6/v2/splinky_3": {
+ "target": "bastardkb/charybdis/4x6/elitec"
+ },
+ "bastardkb/charybdis/4x6/v2/stemcell": {
+ "target": "bastardkb/charybdis/4x6/elitec"
+ },
"bastardkb/dilemma/3x5_2/splinky": {
"target": "bastardkb/dilemma/3x5_2/promicro"
},
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 13ceec5afa..3775b66c1a 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -864,8 +864,7 @@
},
"soft_serial_speed": {
"type": "integer",
- "minimum": 0,
- "maximum": 5
+ "$comment": "Deprecated: use split.serial.speed instead"
},
"serial": {
"type": "object",
@@ -875,7 +874,12 @@
"type": "string",
"enum": ["bitbang", "usart", "vendor"]
},
- "pin": {"$ref": "./definitions.jsonschema#/mcu_pin"}
+ "pin": {"$ref": "./definitions.jsonschema#/mcu_pin"},
+ "speed": {
+ "type": "integer",
+ "minimum": 0,
+ "maximum": 5
+ }
}
},
"transport": {