CLI: Lint non-data driven macros in info.json (#16739)
* CLI: Lint non-data driven macros in info.json Macros in info.json should either have the "matrix" key with the matrix data or should should be also present in <keyboard>.h * Add verification of matrix data * Use generic '<keyboard>.h' in output * Add keyboard name to output * Make C layout macro finding more robust The old code missed C macros if they had whitespace between '#' and 'define' or had whitespace before '#'.
This commit is contained in:
		@@ -116,6 +116,13 @@ def lint(cli):
 | 
			
		||||
            if not keymap_check(kb, cli.config.lint.keymap):
 | 
			
		||||
                ok = False
 | 
			
		||||
 | 
			
		||||
        # Check if all non-data driven macros exist in <keyboard.h>
 | 
			
		||||
        for layout, data in keyboard_info['layouts'].items():
 | 
			
		||||
            # Matrix data should be a list with exactly two integers: [0, 1]
 | 
			
		||||
            if not data['c_macro'] and not all('matrix' in key_data.keys() or len(key_data) == 2 or all(isinstance(n, int) for n in key_data) for key_data in data['layout']):
 | 
			
		||||
                cli.log.error(f'{kb}: "{layout}" has no "matrix" definition in either "info.json" or "<keyboard>.h"!')
 | 
			
		||||
                ok = False
 | 
			
		||||
 | 
			
		||||
        # Report status
 | 
			
		||||
        if not ok:
 | 
			
		||||
            failed.append(kb)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user