Map PRODUCT
define to keyboard_name
(#14372)
* Map `PRODUCT` define to `keyboard_name` * Fix tests * Fix last test
This commit is contained in:
parent
45a8176e32
commit
9401836727
7 changed files with 24 additions and 22 deletions
|
@ -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"},
|
||||
|
|
|
@ -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 }
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
10
keyboards/handwired/pytest/info.json
Normal file
10
keyboards/handwired/pytest/info.json
Normal file
|
@ -0,0 +1,10 @@
|
|||
{
|
||||
"keyboard_name": "pytest",
|
||||
"manufacturer": "none",
|
||||
"maintainer": "qmk",
|
||||
"usb": {
|
||||
"vid": "0xFEED",
|
||||
"pid": "0x6465",
|
||||
"device_ver": "0x0001"
|
||||
}
|
||||
}
|
|
@ -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:
|
||||
|
|
|
@ -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 }
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue