Remove references to info.json `width` and `height` in CLI (#13728)
Ryan
GitHub
parent
441914e0ad
commit
25f43837d2
|
|
@ -29,8 +29,6 @@
|
|||
"enum": ["COL2ROW", "ROW2COL"]
|
||||
},
|
||||
"debounce": {"$ref": "qmk.definitions.v1#/unsigned_int"},
|
||||
"height": {"$ref": "qmk.definitions.v1#/key_unit"},
|
||||
"width": {"$ref": "qmk.definitions.v1#/key_unit"},
|
||||
"community_layouts": {
|
||||
"type": "array",
|
||||
"items": {"$ref": "qmk.definitions.v1#/filename"}
|
||||
|
|
|
|||
|
|
@ -104,8 +104,6 @@ JSON ファイルをビルドする最も簡単な方法は、[Keyboard Layout E
|
|||
"tags": {
|
||||
"form_factor": "numpad"
|
||||
},
|
||||
"width": 4,
|
||||
"height": 5,
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
|
|
|
|||
|
|
@ -20,10 +20,6 @@
|
|||
* キーボードの製品ページ、[QMK.fm/keyboards](https://qmk.fm/keyboards) のページ、あるいはキーボードに関する情報を説明する他のページの URL。
|
||||
* `maintainer`
|
||||
* メンテナの GitHub のユーザ名、あるいはコミュニティが管理するキーボードの場合は `qmk`
|
||||
* `width`
|
||||
* キー単位でのキーボードの幅
|
||||
* `height`
|
||||
* キー単位でのキーボードの高さ
|
||||
* `layouts`
|
||||
* 物理的なレイアウト表現。詳細は以下のセクションを見てください。
|
||||
|
||||
|
|
|
|||
|
|
@ -99,8 +99,6 @@ Use the `keyboard_name` object to set the name of the keyboard. For instruction
|
|||
"tags": {
|
||||
"form_factor": "numpad"
|
||||
},
|
||||
"width": 4,
|
||||
"height": 5,
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
|
|
|
|||
|
|
@ -15,10 +15,6 @@ The `info.json` file is a JSON formatted dictionary with the following keys avai
|
|||
* A URL to the keyboard's product page, [QMK.fm/keyboards](https://qmk.fm/keyboards) page, or other page describing information about the keyboard.
|
||||
* `maintainer`
|
||||
* GitHub username of the maintainer, or `qmk` for community maintained boards
|
||||
* `width`
|
||||
* Width of the board in Key Units
|
||||
* `height`
|
||||
* Height of the board in Key Units
|
||||
* `debounce`
|
||||
* How many milliseconds (ms) to wait for debounce to happen. (Default: 5)
|
||||
* `diode_direction`
|
||||
|
|
|
|||
|
|
@ -87,8 +87,6 @@ def print_friendly_output(kb_info_json):
|
|||
cli.echo('{fg_blue}Maintainer{fg_reset}: %s', kb_info_json['maintainer'])
|
||||
cli.echo('{fg_blue}Keyboard Folder{fg_reset}: %s', kb_info_json.get('keyboard_folder', 'Unknown'))
|
||||
cli.echo('{fg_blue}Layouts{fg_reset}: %s', ', '.join(sorted(kb_info_json['layouts'].keys())))
|
||||
if 'width' in kb_info_json and 'height' in kb_info_json:
|
||||
cli.echo('{fg_blue}Size{fg_reset}: %s x %s' % (kb_info_json['width'], kb_info_json['height']))
|
||||
cli.echo('{fg_blue}Processor{fg_reset}: %s', kb_info_json.get('processor', 'Unknown'))
|
||||
cli.echo('{fg_blue}Bootloader{fg_reset}: %s', kb_info_json.get('bootloader', 'Unknown'))
|
||||
if 'layout_aliases' in kb_info_json:
|
||||
|
|
|
|||
|
|
@ -44,8 +44,6 @@ def kle2json(cli):
|
|||
'keyboard_name': kle.name,
|
||||
'url': '',
|
||||
'maintainer': 'qmk',
|
||||
'width': kle.columns,
|
||||
'height': kle.rows,
|
||||
'layouts': {
|
||||
'LAYOUT': {
|
||||
'layout': kle2qmk(kle)
|
||||
|
|
|
|||
|
|
@ -102,9 +102,6 @@ class InfoJSONEncoder(QMKJSONEncoder):
|
|||
elif key == 'maintainer':
|
||||
return '12maintainer'
|
||||
|
||||
elif key in ('height', 'width'):
|
||||
return '40' + str(key)
|
||||
|
||||
elif key == 'community_layouts':
|
||||
return '97community_layouts'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
{
|
||||
"keyboard_name": "tester",
|
||||
"maintainer": "qmk",
|
||||
"height": 5,
|
||||
"width": 15,
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
|
|
|
|||
|
|
@ -273,7 +273,7 @@ def test_generate_layouts():
|
|||
def test_format_json_keyboard():
|
||||
result = check_subcommand('format-json', '--format', 'keyboard', 'lib/python/qmk/tests/minimal_info.json')
|
||||
check_returncode(result)
|
||||
assert result.stdout == '{\n "keyboard_name": "tester",\n "maintainer": "qmk",\n "height": 5,\n "width": 15,\n "layouts": {\n "LAYOUT": {\n "layout": [\n { "label": "KC_A", "matrix": [0, 0], "x": 0, "y": 0 }\n ]\n }\n }\n}\n'
|
||||
assert result.stdout == '{\n "keyboard_name": "tester",\n "maintainer": "qmk",\n "layouts": {\n "LAYOUT": {\n "layout": [\n { "label": "KC_A", "matrix": [0, 0], "x": 0, "y": 0 }\n ]\n }\n }\n}\n'
|
||||
|
||||
|
||||
def test_format_json_keymap():
|
||||
|
|
@ -285,7 +285,7 @@ def test_format_json_keymap():
|
|||
def test_format_json_keyboard_auto():
|
||||
result = check_subcommand('format-json', '--format', 'auto', 'lib/python/qmk/tests/minimal_info.json')
|
||||
check_returncode(result)
|
||||
assert result.stdout == '{\n "keyboard_name": "tester",\n "maintainer": "qmk",\n "height": 5,\n "width": 15,\n "layouts": {\n "LAYOUT": {\n "layout": [\n { "label": "KC_A", "matrix": [0, 0], "x": 0, "y": 0 }\n ]\n }\n }\n}\n'
|
||||
assert result.stdout == '{\n "keyboard_name": "tester",\n "maintainer": "qmk",\n "layouts": {\n "LAYOUT": {\n "layout": [\n { "label": "KC_A", "matrix": [0, 0], "x": 0, "y": 0 }\n ]\n }\n }\n}\n'
|
||||
|
||||
|
||||
def test_format_json_keymap_auto():
|
||||
|
|
|
|||
Loading…
Reference in New Issue