Skip to content

Commit

Permalink
Make parameters from info.json available to the build system
Browse files Browse the repository at this point in the history
  • Loading branch information
skullydazed committed Oct 31, 2020
1 parent c3221d4 commit 21983f4
Show file tree
Hide file tree
Showing 15 changed files with 592 additions and 113 deletions.
28 changes: 27 additions & 1 deletion build_keyboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,32 @@ ifneq ("$(wildcard $(KEYMAP_PATH)/config.h)","")
CONFIG_H += $(KEYMAP_PATH)/config.h
endif

# Pull in stuff from info.json
INFO_JSON_FILES :=
ifneq ("$(wildcard $(KEYBOARD_PATH_1)/info.json)","")
INFO_JSON_FILES += $(KEYBOARD_PATH_1)/info.json
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_2)/info.json)","")
INFO_JSON_FILES += $(KEYBOARD_PATH_2)/info.json
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_3)/info.json)","")
INFO_JSON_FILES += $(KEYBOARD_PATH_3)/info.json
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_4)/info.json)","")
INFO_JSON_FILES += $(KEYBOARD_PATH_4)/info.json
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_5)/info.json)","")
INFO_JSON_FILES += $(KEYBOARD_PATH_5)/info.json
endif

CONFIG_H += $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/layouts.h

$(KEYBOARD_OUTPUT)/src/info_config.h: $(INFO_JSON_FILES)
bin/qmk generate-config-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/info_config.h

$(KEYBOARD_OUTPUT)/src/layouts.h: $(INFO_JSON_FILES)
bin/qmk generate-layouts --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/layouts.h

# project specific files
SRC += $(KEYBOARD_SRC) \
$(KEYMAP_C) \
Expand Down Expand Up @@ -366,7 +392,7 @@ all:
echo "skipped" >&2
endif

build: elf cpfirmware
build: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/layouts.h elf cpfirmware
check-size: build
objs-size: build

Expand Down
13 changes: 0 additions & 13 deletions keyboards/clueboard/california/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,3 @@
#define MANUFACTURER Clueboard
#define PRODUCT California Macropad
#define DESCRIPTION A 10-key macropad shaped like California

/* key matrix pins */
#define MATRIX_ROWS 6
#define MATRIX_COLS 2
#define DIRECT_PINS { \
{ A10, A9 }, \
{ A0, B8 }, \
{ NO_PIN, B11 }, \
{ B9, A8 }, \
{ A7, B1 }, \
{ NO_PIN, B2 } \
}
#define UNUSED_PINS
27 changes: 26 additions & 1 deletion keyboards/clueboard/california/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,34 @@
"keyboard_name": "Clueboard California",
"url": "",
"maintainer": "skullydazed",
"matrix_size": {
"rows": 6,
"cols": 2
},
"matrix_pins": {
"direct": [
["A10", "A9"],
["A0", "B8"],
[null, "B11"],
["B9", "A8"],
["A7", "B1"],
[null, "B2"]
]
},
"layouts": {
"LAYOUT": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":1, "y":2}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":3.75, "y":5}]
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"x":0, "y":1},
{"x":1, "y":1},
{"x":1, "y":2},
{"x":1.25, "y":3},
{"x":2.25, "y":3},
{"x":2, "y":4},
{"x":3, "y":4},
{"x":3.75, "y":5}
]
}
}
}
3 changes: 2 additions & 1 deletion lib/python/qmk/cli/c2json.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import qmk.keymap
import qmk.path
from qmk.info_json_encoder import InfoJSONEncoder


@cli.argument('--no-cpp', arg_only=True, action='store_false', help='Do not use \'cpp\' on keymap.c')
Expand Down Expand Up @@ -53,7 +54,7 @@ def c2json(cli):
cli.args.output.parent.mkdir(parents=True, exist_ok=True)
if cli.args.output.exists():
cli.args.output.replace(cli.args.output.name + '.bak')
cli.args.output.write_text(json.dumps(keymap_json))
cli.args.output.write_text(json.dumps(keymap_json, cls=InfoJSONEncoder))

if not cli.args.quiet:
cli.log.info('Wrote keymap to %s.', cli.args.output)
Expand Down
8 changes: 4 additions & 4 deletions lib/python/qmk/cli/chibios/confmigrate.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def eprint(*args, **kwargs):
print(*args, file=sys.stderr, **kwargs)


fileHeader = """\
file_header = """\
/* Copyright 2020 QMK
*
* This program is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -77,7 +77,7 @@ def check_diffs(input_defs, reference_defs):


def migrate_chconf_h(to_override, outfile):
print(fileHeader.format(cli.args.input.relative_to(QMK_FIRMWARE), cli.args.reference.relative_to(QMK_FIRMWARE)), file=outfile)
print(file_header.format(cli.args.input.relative_to(QMK_FIRMWARE), cli.args.reference.relative_to(QMK_FIRMWARE)), file=outfile)

for override in to_override:
print("#define %s %s" % (override[0], override[1]), file=outfile)
Expand All @@ -87,7 +87,7 @@ def migrate_chconf_h(to_override, outfile):


def migrate_halconf_h(to_override, outfile):
print(fileHeader.format(cli.args.input.relative_to(QMK_FIRMWARE), cli.args.reference.relative_to(QMK_FIRMWARE)), file=outfile)
print(file_header.format(cli.args.input.relative_to(QMK_FIRMWARE), cli.args.reference.relative_to(QMK_FIRMWARE)), file=outfile)

for override in to_override:
print("#define %s %s" % (override[0], override[1]), file=outfile)
Expand All @@ -97,7 +97,7 @@ def migrate_halconf_h(to_override, outfile):


def migrate_mcuconf_h(to_override, outfile):
print(fileHeader.format(cli.args.input.relative_to(QMK_FIRMWARE), cli.args.reference.relative_to(QMK_FIRMWARE)), file=outfile)
print(file_header.format(cli.args.input.relative_to(QMK_FIRMWARE), cli.args.reference.relative_to(QMK_FIRMWARE)), file=outfile)

print("#include_next <mcuconf.h>\n", file=outfile)

Expand Down
3 changes: 3 additions & 0 deletions lib/python/qmk/cli/generate/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
from . import api
from . import config_h
from . import info_json
from . import layouts
16 changes: 9 additions & 7 deletions lib/python/qmk/cli/generate/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

from qmk.datetime import current_datetime
from qmk.info import info_json
from qmk.info_json_encoder import InfoJSONEncoder
from qmk.keyboard import list_keyboards


Expand Down Expand Up @@ -36,23 +37,24 @@ def generate_api(cli):
keyboard_readme_src = Path('keyboards') / keyboard_name / 'readme.md'

keyboard_dir.mkdir(parents=True, exist_ok=True)
keyboard_info.write_text(json.dumps(kb_all['keyboards'][keyboard_name]))
keyboard_info.write_text(json.dumps(kb_all['keyboards'][keyboard_name], cls=InfoJSONEncoder))

if keyboard_readme_src.exists():
copyfile(keyboard_readme_src, keyboard_readme)

if 'usb' in kb_all['keyboards'][keyboard_name]:
usb = kb_all['keyboards'][keyboard_name]['usb']

if usb['vid'] not in usb_list['devices']:
if 'vid' in usb and usb['vid'] not in usb_list['devices']:
usb_list['devices'][usb['vid']] = {}

if usb['pid'] not in usb_list['devices'][usb['vid']]:
if 'pid' in usb and usb['pid'] not in usb_list['devices'][usb['vid']]:
usb_list['devices'][usb['vid']][usb['pid']] = {}

usb_list['devices'][usb['vid']][usb['pid']][keyboard_name] = usb
if 'vid' in usb and 'pid' in usb:
usb_list['devices'][usb['vid']][usb['pid']][keyboard_name] = usb

# Write the global JSON files
keyboard_list.write_text(json.dumps({'last_updated': current_datetime(), 'keyboards': sorted(kb_all['keyboards'])}))
keyboard_all.write_text(json.dumps(kb_all))
usb_file.write_text(json.dumps(usb_list))
keyboard_list.write_text(json.dumps({'last_updated': current_datetime(), 'keyboards': sorted(kb_all['keyboards'])}, cls=InfoJSONEncoder))
keyboard_all.write_text(json.dumps(kb_all, cls=InfoJSONEncoder))
usb_file.write_text(json.dumps(usb_list, cls=InfoJSONEncoder))
111 changes: 111 additions & 0 deletions lib/python/qmk/cli/generate/config_h.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
"""Used by the make system to generate info_config.h from info.json.
"""
from milc import cli

from qmk.decorators import automagic_keyboard, automagic_keymap
from qmk.info import info_json
from qmk.path import is_keyboard, normpath

usb_properties = {
'vid': 'VENDOR_ID',
'pid': 'PRODUCT_ID',
'device_ver': 'DEVICE_VER',
}


@cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to')
@cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages")
@cli.argument('-kb', '--keyboard', help='Keyboard to generate config.h for.')
@cli.subcommand('Used by the make system to generate info_config.h from info.json', hidden=True)
@automagic_keyboard
@automagic_keymap
def generate_config_h(cli):
"""Generates the info_config.h file.
"""
# Determine our keyboard(s)
if not cli.config.generate_config_h.keyboard:
cli.log.error('Missing paramater: --keyboard')
cli.subcommands['info'].print_help()
return False

if not is_keyboard(cli.config.generate_config_h.keyboard):
cli.log.error('Invalid keyboard: "%s"', cli.config.generate_config_h.keyboard)
return False

# Build the info.json file
kb_info_json = info_json(cli.config.generate_config_h.keyboard)

# Build the info_config.h file.
config_h_lines = ['/* This file was generated by `qmk generate-config-h`. Do not edit or copy.' ' */', '', '#pragma once']

if 'diode_direction' in kb_info_json:
config_h_lines.append('')
config_h_lines.append('#ifndef DIODE_DIRECTION')
config_h_lines.append('# define DIODE_DIRECTION ' + kb_info_json['diode_direction'])
config_h_lines.append('#endif // DIODE_DIRECTION')

if 'keyboard_name' in kb_info_json:
config_h_lines.append('')
config_h_lines.append('#ifndef DESCRIPTION')
config_h_lines.append('# define DESCRIPTION ' + kb_info_json['keyboard_name'])
config_h_lines.append('#endif // DESCRIPTION')
config_h_lines.append('')
config_h_lines.append('#ifndef PRODUCT')
config_h_lines.append('# define PRODUCT ' + kb_info_json['keyboard_name'])
config_h_lines.append('#endif // PRODUCT')

if 'manufacturer' in kb_info_json:
config_h_lines.append('')
config_h_lines.append('#ifndef MANUFACTURER')
config_h_lines.append('# define MANUFACTURER ' + kb_info_json['manufacturer'])
config_h_lines.append('#endif // MANUFACTURER')

if 'matrix_pins' in kb_info_json:
if 'cols' in kb_info_json['matrix_pins']:
cols = ','.join(kb_info_json['matrix_pins']['cols'])
col_num = len(kb_info_json['matrix_pins']['cols'])

config_h_lines.append('')
config_h_lines.append('#ifndef MATRIX_COLS')
config_h_lines.append('# define MATRIX_COLS ' + str(col_num))
config_h_lines.append('#endif // MATRIX_COLS')
config_h_lines.append('')
config_h_lines.append('#ifndef MATRIX_COL_PINS')
config_h_lines.append('# define MATRIX_COL_PINS { %s }' % (cols,))
config_h_lines.append('#endif // MATRIX_COL_PINS')

if 'rows' in kb_info_json['matrix_pins']:
rows = ','.join(kb_info_json['matrix_pins']['rows'])
row_num = len(kb_info_json['matrix_pins']['rows'])

config_h_lines.append('')
config_h_lines.append('#ifndef MATRIX_ROWS')
config_h_lines.append('# define MATRIX_ROWS ' + str(row_num))
config_h_lines.append('#endif // MATRIX_ROWS')
config_h_lines.append('')
config_h_lines.append('#ifndef MATRIX_ROW_PINS')
config_h_lines.append('# define MATRIX_ROW_PINS { %s }' % (rows,))
config_h_lines.append('#endif // MATRIX_ROW_PINS')

if 'usb' in kb_info_json:
for info_name, config_name in usb_properties.items():
if info_name in kb_info_json['usb']:
config_h_lines.append('')
config_h_lines.append('#ifndef ' + config_name)
config_h_lines.append('# define %s %s' % (config_name, kb_info_json['usb'][info_name]))
config_h_lines.append('#endif // ' + config_name)

# Show the results
config_h = '\n'.join(config_h_lines)

if cli.args.output:
cli.args.output.parent.mkdir(parents=True, exist_ok=True)
if cli.args.output.exists():
cli.args.output.replace(cli.args.output.name + '.bak')
cli.args.output.write_text(config_h)

if not cli.args.quiet:
cli.log.info('Wrote info_config.h to %s.', cli.args.output)

else:
print(config_h)
49 changes: 49 additions & 0 deletions lib/python/qmk/cli/generate/info_json.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
"""Keyboard information script.
Compile an info.json for a particular keyboard and pretty-print it.
"""
import json

from milc import cli

from qmk.info_json_encoder import InfoJSONEncoder
from qmk.decorators import automagic_keyboard, automagic_keymap
from qmk.info import info_json
from qmk.path import is_keyboard


@cli.argument('-kb', '--keyboard', help='Keyboard to show info for.')
@cli.argument('-km', '--keymap', help='Show the layers for a JSON keymap too.')
@cli.subcommand('Generate an info.json file for a keyboard.', hidden=False if cli.config.user.developer else True)
@automagic_keyboard
@automagic_keymap
def generate_info_json(cli):
"""Generate an info.json file for a keyboard
"""
# Determine our keyboard(s)
if not cli.config.generate_info_json.keyboard:
cli.log.error('Missing paramater: --keyboard')
cli.subcommands['info'].print_help()
return False

if not is_keyboard(cli.config.generate_info_json.keyboard):
cli.log.error('Invalid keyboard: "%s"', cli.config.generate_info_json.keyboard)
return False

# Build the info.json file
kb_info_json = info_json(cli.config.generate_info_json.keyboard)
pared_down_json = {}

for key in ('manufacturer', 'maintainer', 'usb', 'keyboard_name', 'width', 'height', 'diode_direction', 'matrix_pins', 'url'):
if key in kb_info_json:
pared_down_json[key] = kb_info_json[key]

pared_down_json['layouts'] = {}
if 'layouts' in pared_down_json:
for layout_name, layout in kb_info_json['layouts'].items():
pared_down_json['layouts'][layout_name] = {}
pared_down_json['layouts'][layout_name]['key_count'] = layout.get('key_count', len(layout['layout']))
pared_down_json['layouts'][layout_name]['layout'] = layout['layout']

# Display the results
print(json.dumps(pared_down_json, indent=2, cls=InfoJSONEncoder))
Loading

0 comments on commit 21983f4

Please sign in to comment.