1da8aa8259fe624e30f0f2c09a814798caebb9f6

Author
Ryan <fauxpark@gmail.com>
Committer
GitHub <noreply@github.com>
Date

Message

Improve "feature/encoder config both specified" warnings (#24641)

Diff

 1diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
 2index 5dae353538ad8ccf4fd6d45ef935a9dbf8d42445..74a62721a3d944d8eab433dccf0230531616d010 100644
 3--- a/lib/python/qmk/info.py
 4+++ b/lib/python/qmk/info.py
 5@@ -292,7 +292,7 @@ def _extract_features(info_data, rules):
 6                 info_data['features'] = {}
 7 
 8             if key in info_data['features']:
 9-                _log_warning(info_data, 'Feature %s is specified in both info.json and rules.mk, the rules.mk value wins.' % (key,))
10+                _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))
11 
12             info_data['features'][key] = value
13             info_data['config_h_features'][key] = value
14@@ -415,7 +415,7 @@ def _extract_encoders(info_data, config_c):
15             info_data['encoder'] = {}
16 
17         if 'rotary' in info_data['encoder']:
18-            _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'])
19+            _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']))
20 
21         info_data['encoder']['rotary'] = encoders
22