~ruther/qmk_firmware

3adaf6a46ae6bac75997e9f2d2e97f550f1c8e87 — Ryan 3 years ago ac33b7b
Handle escaping of manufacturer/product strings (#18194)

M keyboards/adpenrose/shisaku/info.json => keyboards/adpenrose/shisaku/info.json +1 -0
@@ 1,5 1,6 @@
{
    "keyboard_name": "shisaku",
    "manufacturer": "ADPenrose",
    "url": "https://github.com/ADPenrose/shisaku_keeb",
    "maintainer": "ADPenrose",
    "usb": {

M keyboards/karlb/kbic65/info.json => keyboards/karlb/kbic65/info.json +1 -0
@@ 1,5 1,6 @@
{
    "keyboard_name": "KBIC65",
    "manufacturer": "b-karl",
    "url": "https://karlb.eu/kbic65/",
    "maintainer": "b-karl",
    "diode_direction": "ROW2COL",

M keyboards/keebio/bamfk4/info.json => keyboards/keebio/bamfk4/info.json +1 -0
@@ 1,5 1,6 @@
{
    "keyboard_name": "BAMFK-4",
    "manufacturer": "Keebio",
    "url": "https://keeb.io",
    "maintainer": "nooges",
    "usb": {

M lib/python/qmk/cli/generate/config_h.py => lib/python/qmk/cli/generate/config_h.py +2 -1
@@ 117,9 117,10 @@ def generate_config_items(kb_info_json, config_h_lines):
                config_h_lines.append(f'#   define {key} {value}')
                config_h_lines.append(f'#endif // {key}')
        elif key_type == 'str':
            escaped_str = config_value.replace('\\', '\\\\').replace('"', '\\"')
            config_h_lines.append('')
            config_h_lines.append(f'#ifndef {config_key}')
            config_h_lines.append(f'#   define {config_key} "{config_value}"')
            config_h_lines.append(f'#   define {config_key} "{escaped_str}"')
            config_h_lines.append(f'#endif // {config_key}')
        elif key_type == 'bcd_version':
            (major, minor, revision) = config_value.split('.')

M lib/python/qmk/info.py => lib/python/qmk/info.py +1 -1
@@ 479,7 479,7 @@ def _config_to_json(key_type, config_value):
        return int(config_value)

    elif key_type == 'str':
        return config_value.strip('"')
        return config_value.strip('"').replace('\\"', '"').replace('\\\\', '\\')

    elif key_type == 'bcd_version':
        major = int(config_value[2:4])