Merge 90233d31376ed3696879d5767c8c3367a15b5c94 into d5a042498770050a3d2f002540413ba14dfaf8d1

[CI] Regenerate Files (#24772 )
Regenerate Files
2025-01-04 22:13:04 +00:00 · 2024-12-31 22:36:16 -08:00 · 2025-01-01 02:22:28 +00:00 · 2025-01-01 02:09:51 +00:00 · 2025-01-01 13:02:16 +11:00 · 2025-01-01 01:59:15 +00:00
77 changed files with 89 additions and 97 deletions
--- a/lib/python/qmk/cli/via2json.py
+++ b/lib/python/qmk/cli/via2json.py
@ -9,19 +9,15 @@ import qmk.keyboard
 import qmk.path
 from qmk.info import info_json
 from qmk.json_encoders import KeymapJSONEncoder
-from qmk.commands import parse_configurator_json, dump_lines
-from qmk.keymap import generate_json, list_keymaps, locate_keymap, parse_keymap_c
+from qmk.commands import dump_lines
+from qmk.keymap import generate_json


-def _find_via_layout_macro(keyboard):
-    keymap_layout = None
-    if 'via' in list_keymaps(keyboard):
-        keymap_path = locate_keymap(keyboard, 'via')
-        if keymap_path.suffix == '.json':
-            keymap_layout = parse_configurator_json(keymap_path)['layout']
-        else:
-            keymap_layout = parse_keymap_c(keymap_path)['layers'][0]['layout']
-    return keymap_layout
+def _find_via_layout_macro(keyboard_data):
+    """Assume layout macro when only 1 is available
+    """
+    layouts = list(keyboard_data['layouts'].keys())
+    return layouts[0] if len(layouts) == 1 else None


 def _convert_macros(via_macros):
@ -130,20 +126,16 @@ def via2json(cli):

    This command uses the `qmk.keymap` module to generate a keymap.json from a VIA backup json. The generated keymap is written to stdout, or to a file if -o is provided.
    """
-    # Find appropriate layout macro
-    keymap_layout = cli.args.layout if cli.args.layout else _find_via_layout_macro(cli.args.keyboard)
-    if not keymap_layout:
-        cli.log.error(f"Couldn't find LAYOUT macro for keyboard {cli.args.keyboard}. Please specify it with the '-l' argument.")
-        return False
-
    # Load the VIA backup json
    with cli.args.filename.open('r') as fd:
        via_backup = json.load(fd)

-    # Generate keyboard metadata
    keyboard_data = info_json(cli.args.keyboard)
-    if not keyboard_data:
-        cli.log.error(f'LAYOUT macro {keymap_layout} is not a valid one for keyboard {cli.args.keyboard}!')
+
+    # Find appropriate layout macro
+    keymap_layout = cli.args.layout if cli.args.layout else _find_via_layout_macro(keyboard_data)
+    if not keymap_layout:
+        cli.log.error(f"Couldn't find LAYOUT macro for keyboard {cli.args.keyboard}. Please specify it with the '-l' argument.")
        return False

    # Get keycode array
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@ -789,8 +789,8 @@ def _extract_led_config(info_data, keyboard):
                                info_data[feature]['layout'] = ret
                        except Exception as e:
                            _log_warning(info_data, f'led_config: {file.name}: {e}')
-                    else:
-                        _log_warning(info_data, 'led_config: matrix size required to parse g_led_config')
+                else:
+                    _log_warning(info_data, 'led_config: matrix size required to parse g_led_config')

            if info_data[feature].get('layout', None) and not info_data[feature].get('led_count', None):
                info_data[feature]['led_count'] = len(info_data[feature]['layout'])
--- a/quantum/keycodes.h
+++ b/quantum/keycodes.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_belgian.h
+++ b/quantum/keymap_extras/keymap_belgian.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_bepo.h
+++ b/quantum/keymap_extras/keymap_bepo.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_brazilian_abnt2.h
+++ b/quantum/keymap_extras/keymap_brazilian_abnt2.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_canadian_french.h
+++ b/quantum/keymap_extras/keymap_canadian_french.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_canadian_multilingual.h
+++ b/quantum/keymap_extras/keymap_canadian_multilingual.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_colemak.h
+++ b/quantum/keymap_extras/keymap_colemak.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_croatian.h
+++ b/quantum/keymap_extras/keymap_croatian.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_czech.h
+++ b/quantum/keymap_extras/keymap_czech.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_czech_mac_ansi.h
+++ b/quantum/keymap_extras/keymap_czech_mac_ansi.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_czech_mac_iso.h
+++ b/quantum/keymap_extras/keymap_czech_mac_iso.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_danish.h
+++ b/quantum/keymap_extras/keymap_danish.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_dvorak.h
+++ b/quantum/keymap_extras/keymap_dvorak.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_dvorak_fr.h
+++ b/quantum/keymap_extras/keymap_dvorak_fr.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_dvorak_programmer.h
+++ b/quantum/keymap_extras/keymap_dvorak_programmer.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_estonian.h
+++ b/quantum/keymap_extras/keymap_estonian.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_eurkey.h
+++ b/quantum/keymap_extras/keymap_eurkey.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_farsi.h
+++ b/quantum/keymap_extras/keymap_farsi.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_finnish.h
+++ b/quantum/keymap_extras/keymap_finnish.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_french.h
+++ b/quantum/keymap_extras/keymap_french.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_french_afnor.h
+++ b/quantum/keymap_extras/keymap_french_afnor.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_french_mac_iso.h
+++ b/quantum/keymap_extras/keymap_french_mac_iso.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_german.h
+++ b/quantum/keymap_extras/keymap_german.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_german_mac_iso.h
+++ b/quantum/keymap_extras/keymap_german_mac_iso.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_greek.h
+++ b/quantum/keymap_extras/keymap_greek.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_hebrew.h
+++ b/quantum/keymap_extras/keymap_hebrew.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_hungarian.h
+++ b/quantum/keymap_extras/keymap_hungarian.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/quantum/keymap_extras/keymap_icelandic.h
+++ b/quantum/keymap_extras/keymap_icelandic.h
@ -1,4 +1,4 @@
-// Copyright 2024 QMK
+// Copyright 2025 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later

 /*******************************************************************************
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Joel Challis	7a7a5c517a	Merge 90233d31376ed3696879d5767c8c3367a15b5c94 into d5a042498770050a3d2f002540413ba14dfaf8d1	2024-12-31 22:36:16 -08:00
QMK Bot	d5a0424987	[CI] Regenerate Files (#24772 ) Regenerate Files	2025-01-01 02:22:28 +00:00
QMK Bot	1e6eb5e35c	Merge remote-tracking branch 'origin/master' into develop	2025-01-01 02:09:51 +00:00
QMK Bot	57f89e5388	[CI] Regenerate Files (#24770 ) Regenerate Files	2025-01-01 13:02:16 +11:00
QMK Bot	4d182ec117	Merge remote-tracking branch 'origin/master' into develop	2025-01-01 01:59:15 +00:00
Joel Challis	53680fa6da	Fix g_led_config parse warning (#24769 )	2025-01-01 01:58:41 +00:00
zvecr	90233d3137	Update via2json layout macro searching	2024-11-25 20:40:22 +00:00