aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRyan <[email protected]>2024-11-30 16:30:45 +1100
committerGitHub <[email protected]>2024-11-30 05:30:45 +0000
commit1da8aa8259fe624e30f0f2c09a814798caebb9f6 (patch)
tree4f1f58190aa50fd404432ef905fccb0451f71d33 /lib
parent97547ac762a48b343b4b49de4f144f127da3c131 (diff)
downloadqmk_firmware-1da8aa8259fe624e30f0f2c09a814798caebb9f6.tar.gz
qmk_firmware-1da8aa8259fe624e30f0f2c09a814798caebb9f6.zip
Improve "feature/encoder config both specified" warnings (#24641)
Diffstat (limited to 'lib')
-rw-r--r--lib/python/qmk/info.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 5dae353538..74a62721a3 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -292,7 +292,7 @@ def _extract_features(info_data, rules):
info_data['features'] = {}
if key in info_data['features']:
- _log_warning(info_data, 'Feature %s is specified in both info.json and rules.mk, the rules.mk value wins.' % (key,))
+ _log_warning(info_data, 'Feature %s is specified in both info.json (%s) and rules.mk (%s). The rules.mk value wins.' % (key, info_data['features'], value))
info_data['features'][key] = value
info_data['config_h_features'][key] = value
@@ -415,7 +415,7 @@ def _extract_encoders(info_data, config_c):
info_data['encoder'] = {}
if 'rotary' in info_data['encoder']:
- _log_warning(info_data, 'Encoder config is specified in both config.h and info.json (encoder.rotary) (Value: %s), the config.h value wins.' % info_data['encoder']['rotary'])
+ _log_warning(info_data, 'Encoder config is specified in both config.h (%s) and info.json (%s). The config.h value wins.' % (encoders, info_data['encoder']['rotary']))
info_data['encoder']['rotary'] = encoders