diff options
| -rw-r--r-- | data/mappings/info_config.json | 2 | ||||
| -rw-r--r-- | keyboards/handwired/pytest/basic/info.json | 13 | ||||
| -rw-r--r-- | keyboards/handwired/pytest/config.h | 7 | ||||
| -rw-r--r-- | keyboards/handwired/pytest/info.json | 10 | ||||
| -rw-r--r-- | lib/python/qmk/cli/generate/dfu_header.py | 2 | ||||
| -rw-r--r-- | lib/python/qmk/tests/minimal_info.json | 2 | ||||
| -rw-r--r-- | lib/python/qmk/tests/test_cli_commands.py | 10 | 
7 files changed, 24 insertions, 22 deletions
| diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json index 72bb0f4a1c..f1e06dfea1 100644 --- a/data/mappings/info_config.json +++ b/data/mappings/info_config.json @@ -68,7 +68,7 @@      "RGBLIGHT_SLEEP": {"info_key": "rgblight.sleep", "value_type": "bool"},      "RGBLIGHT_SPLIT": {"info_key": "rgblight.split", "value_type": "bool"},      "RGBW": {"info_key": "rgblight.rgbw", "value_type": "bool"}, -    "PRODUCT": {"info_key": "keyboard_folder", "to_json": false}, +    "PRODUCT": {"info_key": "keyboard_name"},      "PRODUCT_ID": {"info_key": "usb.pid", "value_type": "hex"},      "VENDOR_ID": {"info_key": "usb.vid", "value_type": "hex"},      "QMK_ESC_OUTPUT": {"info_key": "qmk_lufa_bootloader.esc_output"}, diff --git a/keyboards/handwired/pytest/basic/info.json b/keyboards/handwired/pytest/basic/info.json index ed052a14a3..af57447d30 100644 --- a/keyboards/handwired/pytest/basic/info.json +++ b/keyboards/handwired/pytest/basic/info.json @@ -1,10 +1,9 @@  { -  "maintainer": "qmk", -  "layouts": { -    "LAYOUT_custom": { -      "layout": [ -        { "label": "KC_Q", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 } -      ] +    "layouts": { +        "LAYOUT_custom": { +            "layout": [ +                { "label": "KC_Q", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 } +            ] +        }      } -  }  } diff --git a/keyboards/handwired/pytest/config.h b/keyboards/handwired/pytest/config.h index 64cf353126..f03597a7d4 100644 --- a/keyboards/handwired/pytest/config.h +++ b/keyboards/handwired/pytest/config.h @@ -2,13 +2,6 @@  #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID       0xFEED -#define PRODUCT_ID      0x6465 -#define DEVICE_VER      0x0001 -#define MANUFACTURER    none -#define PRODUCT         pytest -  /* key matrix size */  #define MATRIX_ROWS 1  #define MATRIX_COLS 1 diff --git a/keyboards/handwired/pytest/info.json b/keyboards/handwired/pytest/info.json new file mode 100644 index 0000000000..5c941af9bf --- /dev/null +++ b/keyboards/handwired/pytest/info.json @@ -0,0 +1,10 @@ +{ +    "keyboard_name": "pytest", +    "manufacturer": "none", +    "maintainer": "qmk", +    "usb": { +        "vid": "0xFEED", +        "pid": "0x6465", +        "device_ver": "0x0001" +    } +} diff --git a/lib/python/qmk/cli/generate/dfu_header.py b/lib/python/qmk/cli/generate/dfu_header.py index 5a1b109f1e..7fb585fc7d 100644 --- a/lib/python/qmk/cli/generate/dfu_header.py +++ b/lib/python/qmk/cli/generate/dfu_header.py @@ -32,7 +32,7 @@ def generate_dfu_header(cli):      keyboard_h_lines = ['/* This file was generated by `qmk generate-dfu-header`. Do not edit or copy.', ' */', '', '#pragma once']      keyboard_h_lines.append(f'#define MANUFACTURER {kb_info_json["manufacturer"]}') -    keyboard_h_lines.append(f'#define PRODUCT {cli.config.generate_dfu_header.keyboard} Bootloader') +    keyboard_h_lines.append(f'#define PRODUCT {kb_info_json["keyboard_name"]} Bootloader')      # Optional      if 'qmk_lufa_bootloader.esc_output' in kb_info_json: diff --git a/lib/python/qmk/tests/minimal_info.json b/lib/python/qmk/tests/minimal_info.json index 11ef12fefe..3aae4722bf 100644 --- a/lib/python/qmk/tests/minimal_info.json +++ b/lib/python/qmk/tests/minimal_info.json @@ -4,7 +4,7 @@      "layouts": {          "LAYOUT": {              "layout": [ -                { "label": "KC_A", "x": 0, "y": 0, "matrix": [0, 0] } +                { "label": "KC_A", "matrix": [0, 0], "x": 0, "y": 0 }              ]          }      } diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py index e4eaef899a..9f2c258ab4 100644 --- a/lib/python/qmk/tests/test_cli_commands.py +++ b/lib/python/qmk/tests/test_cli_commands.py @@ -151,7 +151,7 @@ def test_json2c_stdin():  def test_info():      result = check_subcommand('info', '-kb', 'handwired/pytest/basic')      check_returncode(result) -    assert 'Keyboard Name: handwired/pytest/basic' in result.stdout +    assert 'Keyboard Name: pytest' in result.stdout      assert 'Processor: atmega32u4' in result.stdout      assert 'Layout:' not in result.stdout      assert 'k0' not in result.stdout @@ -160,7 +160,7 @@ def test_info():  def test_info_keyboard_render():      result = check_subcommand('info', '-kb', 'handwired/pytest/basic', '-l')      check_returncode(result) -    assert 'Keyboard Name: handwired/pytest/basic' in result.stdout +    assert 'Keyboard Name: pytest' in result.stdout      assert 'Processor: atmega32u4' in result.stdout      assert 'Layouts:' in result.stdout      assert 'k0' in result.stdout @@ -169,7 +169,7 @@ def test_info_keyboard_render():  def test_info_keymap_render():      result = check_subcommand('info', '-kb', 'handwired/pytest/basic', '-km', 'default_json')      check_returncode(result) -    assert 'Keyboard Name: handwired/pytest/basic' in result.stdout +    assert 'Keyboard Name: pytest' in result.stdout      assert 'Processor: atmega32u4' in result.stdout      if is_windows: @@ -181,7 +181,7 @@ def test_info_keymap_render():  def test_info_matrix_render():      result = check_subcommand('info', '-kb', 'handwired/pytest/basic', '-m')      check_returncode(result) -    assert 'Keyboard Name: handwired/pytest/basic' in result.stdout +    assert 'Keyboard Name: pytest' in result.stdout      assert 'Processor: atmega32u4' in result.stdout      assert 'LAYOUT_ortho_1x1' in result.stdout @@ -242,7 +242,7 @@ def test_generate_config_h():      assert '#   define DESCRIPTION handwired/pytest/basic' in result.stdout      assert '#   define DIODE_DIRECTION COL2ROW' in result.stdout      assert '#   define MANUFACTURER none' in result.stdout -    assert '#   define PRODUCT handwired/pytest/basic' in result.stdout +    assert '#   define PRODUCT pytest' in result.stdout      assert '#   define PRODUCT_ID 0x6465' in result.stdout      assert '#   define VENDOR_ID 0xFEED' in result.stdout      assert '#   define MATRIX_COLS 1' in result.stdout | 
