Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DD extra configs for Split Keyboard #21600

Closed
wants to merge 3 commits into from
Closed

DD extra configs for Split Keyboard #21600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59ed640
add more split `config.h` translation
dunk2k Jul 24, 2023
6de402d
mcu_pin_array to array of mcu_pins
dunk2k Jul 24, 2023
7123e19
fix main being primary in `config_h.py`
dunk2k Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions data/mappings/info_config.hjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,11 @@
// Split Keyboard
"SOFT_SERIAL_PIN": {"info_key": "split.soft_serial_pin"},
"SOFT_SERIAL_SPEED": {"info_key": "split.soft_serial_speed"},
"SPLIT_HAND_MATRIX_GRID": {"info_key": "split.matrix_grid.pins"},
"SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT": {"info_key": "split.matrix_grid.low_right", "value_type": "bool"},
"SPLIT_HAND_PIN": {"info_key": "split.split_pin.pin"},
"SPLIT_HAND_PIN_LOW_IS_LEFT": {"info_key": "split.split_pin.low_left", "value_type": "bool"},
"SPLIT_HAPTIC_ENABLE": {"info_key": "split.haptic", "value_type": "bool"},
"SPLIT_MODS_ENABLE": {"info_key": "split.transport.sync_modifiers", "value_type": "bool"},
"SPLIT_TRANSPORT_MIRROR": {"info_key": "split.transport.sync_matrix_state", "value_type": "bool"},
"SPLIT_USB_DETECT": {"info_key": "split.usb_detect.enabled", "value_type": "bool"},
Expand Down
22 changes: 20 additions & 2 deletions data/schemas/keyboard.jsonschema
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,8 +577,25 @@
}
},
"matrix_grid": {
"type": "array",
"items": {"$ref": "qmk.definitions.v1#/mcu_pin"}
"type": "object",
"additionalProperties": false,
"properties": {
"pins": {
"type": "array",
"minItems": 2,
"maxItems": 2,
"items": {"$ref": "qmk.definitions.v1#/mcu_pin"}
},
"low_right: {"type": "boolean"}
}
},
"split_pin": {
"type": "object",
"additionalProperties": false,
"properties": {
"pin": {"$ref": "qmk.definitions.v1#/mcu_pin"},
"low_left: {"type": "boolean"}
}
},
"matrix_pins": {
"type": "object",
Expand Down Expand Up @@ -608,6 +625,7 @@
}
}
},
"haptic": {"type": "boolean"},
"main": {
"type": "string",
"enum": ["eeprom", "left", "matrix_grid", "pin", "right"]
Expand Down
14 changes: 7 additions & 7 deletions lib/python/qmk/cli/generate/config_h.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,22 +130,22 @@ def generate_encoder_config(encoder_json, config_h_lines, postfix=''):

def generate_split_config(kb_info_json, config_h_lines):
"""Generate the config.h lines for split boards."""
if 'primary' in kb_info_json['split']:
if kb_info_json['split']['primary'] in ('left', 'right'):
if 'main' in kb_info_json['split']:
if kb_info_json['split']['main'] in ('left', 'right'):
config_h_lines.append('')
config_h_lines.append('#ifndef MASTER_LEFT')
config_h_lines.append('# ifndef MASTER_RIGHT')
if kb_info_json['split']['primary'] == 'left':
if kb_info_json['split']['main'] == 'left':
config_h_lines.append('# define MASTER_LEFT')
elif kb_info_json['split']['primary'] == 'right':
elif kb_info_json['split']['main'] == 'right':
config_h_lines.append('# define MASTER_RIGHT')
config_h_lines.append('# endif // MASTER_RIGHT')
config_h_lines.append('#endif // MASTER_LEFT')
elif kb_info_json['split']['primary'] == 'pin':
elif kb_info_json['split']['main'] == 'pin':
config_h_lines.append(generate_define('SPLIT_HAND_PIN'))
elif kb_info_json['split']['primary'] == 'matrix_grid':
elif kb_info_json['split']['main'] == 'matrix_grid':
config_h_lines.append(generate_define('SPLIT_HAND_MATRIX_GRID', f'{{ {",".join(kb_info_json["split"]["matrix_grid"])} }}'))
elif kb_info_json['split']['primary'] == 'eeprom':
elif kb_info_json['split']['main'] == 'eeprom':
config_h_lines.append(generate_define('EE_HANDS'))

if 'protocol' in kb_info_json['split'].get('transport', {}):
Expand Down