mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-03-13 23:14:09 +00:00
Merge branch 'master' into tkl_nofrow_ansi_tsangan
This commit is contained in:
yuezp
GitHub
commit
3bb0ee7a04
@ -13,6 +13,74 @@
|
||||
"sat_steps": 8,
|
||||
"val_steps": 8,
|
||||
"speed_steps": 10
|
||||
"layout": [
|
||||
{"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
|
||||
{"matrix": [0, 4], "x": 64, "y": 0, "flags": 4},
|
||||
{"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
|
||||
{"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
|
||||
{"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
|
||||
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
|
||||
{"matrix": [1, 0], "x": 0, "y": 16, "flags": 4},
|
||||
{"matrix": [1, 1], "x": 16, "y": 16, "flags": 4},
|
||||
{"matrix": [1, 2], "x": 32, "y": 16, "flags": 4},
|
||||
{"matrix": [1, 3], "x": 48, "y": 16, "flags": 4},
|
||||
{"matrix": [1, 4], "x": 64, "y": 16, "flags": 4},
|
||||
{"matrix": [1, 5], "x": 80, "y": 16, "flags": 4},
|
||||
{"matrix": [2, 5], "x": 80, "y": 32, "flags": 4},
|
||||
{"matrix": [2, 4], "x": 64, "y": 32, "flags": 4},
|
||||
{"matrix": [2, 3], "x": 48, "y": 32, "flags": 4},
|
||||
{"matrix": [2, 2], "x": 32, "y": 32, "flags": 4},
|
||||
{"matrix": [2, 1], "x": 16, "y": 32, "flags": 4},
|
||||
{"matrix": [2, 0], "x": 0, "y": 32, "flags": 4},
|
||||
{"matrix": [3, 0], "x": 0, "y": 48, "flags": 4},
|
||||
{"matrix": [3, 1], "x": 16, "y": 48, "flags": 4},
|
||||
{"matrix": [3, 2], "x": 32, "y": 48, "flags": 4},
|
||||
{"matrix": [3, 3], "x": 48, "y": 48, "flags": 4},
|
||||
{"matrix": [3, 4], "x": 64, "y": 48, "flags": 4},
|
||||
{"matrix": [3, 5], "x": 80, "y": 48, "flags": 4},
|
||||
{"matrix": [3, 6], "x": 96, "y": 48, "flags": 4},
|
||||
{"matrix": [4, 6], "x": 96, "y": 64, "flags": 4},
|
||||
{"matrix": [4, 5], "x": 80, "y": 64, "flags": 4},
|
||||
{"matrix": [4, 4], "x": 64, "y": 64, "flags": 4},
|
||||
{"matrix": [4, 3], "x": 48, "y": 64, "flags": 4},
|
||||
{"matrix": [4, 2], "x": 32, "y": 64, "flags": 4},
|
||||
{"matrix": [4, 1], "x": 16, "y": 64, "flags": 4},
|
||||
{"matrix": [4, 0], "x": 0, "y": 64, "flags": 4},
|
||||
{"matrix": [5, 5], "x": 144, "y": 0, "flags": 4},
|
||||
{"matrix": [5, 4], "x": 160, "y": 0, "flags": 4},
|
||||
{"matrix": [5, 3], "x": 176, "y": 0, "flags": 4},
|
||||
{"matrix": [5, 2], "x": 192, "y": 0, "flags": 4},
|
||||
{"matrix": [5, 1], "x": 208, "y": 0, "flags": 4},
|
||||
{"matrix": [5, 0], "x": 224, "y": 0, "flags": 4},
|
||||
{"matrix": [6, 0], "x": 224, "y": 16, "flags": 4},
|
||||
{"matrix": [6, 1], "x": 208, "y": 16, "flags": 4},
|
||||
{"matrix": [6, 2], "x": 192, "y": 16, "flags": 4},
|
||||
{"matrix": [6, 3], "x": 176, "y": 16, "flags": 4},
|
||||
{"matrix": [6, 4], "x": 160, "y": 16, "flags": 4},
|
||||
{"matrix": [6, 5], "x": 144, "y": 16, "flags": 4},
|
||||
{"matrix": [7, 5], "x": 144, "y": 32, "flags": 4},
|
||||
{"matrix": [7, 4], "x": 160, "y": 32, "flags": 4},
|
||||
{"matrix": [7, 3], "x": 176, "y": 32, "flags": 4},
|
||||
{"matrix": [7, 2], "x": 192, "y": 32, "flags": 4},
|
||||
{"matrix": [7, 1], "x": 208, "y": 32, "flags": 4},
|
||||
{"matrix": [7, 0], "x": 224, "y": 32, "flags": 4},
|
||||
{"matrix": [8, 0], "x": 224, "y": 48, "flags": 4},
|
||||
{"matrix": [8, 1], "x": 208, "y": 48, "flags": 4},
|
||||
{"matrix": [8, 2], "x": 192, "y": 48, "flags": 4},
|
||||
{"matrix": [8, 3], "x": 176, "y": 48, "flags": 4},
|
||||
{"matrix": [8, 4], "x": 160, "y": 48, "flags": 4},
|
||||
{"matrix": [8, 5], "x": 144, "y": 48, "flags": 4},
|
||||
{"matrix": [8, 6], "x": 128, "y": 48, "flags": 4},
|
||||
{"matrix": [9, 6], "x": 128, "y": 64, "flags": 4},
|
||||
{"matrix": [9, 5], "x": 144, "y": 64, "flags": 4},
|
||||
{"matrix": [9, 4], "x": 160, "y": 64, "flags": 4},
|
||||
{"matrix": [9, 3], "x": 176, "y": 64, "flags": 4},
|
||||
{"matrix": [9, 2], "x": 192, "y": 64, "flags": 4},
|
||||
{"matrix": [9, 1], "x": 208, "y": 64, "flags": 4},
|
||||
{"matrix": [9, 0], "x": 224, "y": 64, "flags": 4}
|
||||
],
|
||||
"max_brightness": 128,
|
||||
"split_count": [32, 32]
|
||||
},
|
||||
"dip_switch": {
|
||||
"matrix_grid": [ [0,6], [1,6], [5,6], [6,6] ]
|
||||
|
||||
@ -217,8 +217,8 @@ if int(milc_version[0]) < 2 and int(milc_version[1]) < 4:
|
||||
# Make sure we can run binaries in the same directory as our Python interpreter
|
||||
python_dir = os.path.dirname(sys.executable)
|
||||
|
||||
if python_dir not in os.environ['PATH'].split(':'):
|
||||
os.environ['PATH'] = ":".join((python_dir, os.environ['PATH']))
|
||||
if python_dir not in os.environ['PATH'].split(os.pathsep):
|
||||
os.environ['PATH'] = os.pathsep.join((python_dir, os.environ['PATH']))
|
||||
|
||||
# Check to make sure we have all our dependencies
|
||||
msg_install = f'\nPlease run `{sys.executable} -m pip install -r %s` to install required python dependencies.'
|
||||
|
||||
@ -743,6 +743,9 @@ def _check_matrix(info_data):
|
||||
elif 'cols' in info_data['matrix_pins'] and 'rows' in info_data['matrix_pins']:
|
||||
col_count = len(info_data['matrix_pins']['cols'])
|
||||
row_count = len(info_data['matrix_pins']['rows'])
|
||||
elif 'cols' not in info_data['matrix_pins'] and 'rows' not in info_data['matrix_pins']:
|
||||
# This case caters for custom matrix implementations where normal rows/cols are specified
|
||||
return
|
||||
|
||||
if col_count != actual_col_count and col_count != (actual_col_count / 2):
|
||||
# FIXME: once we can we should detect if split is enabled to do the actual_col_count/2 check.
|
||||
|
||||
@ -12,29 +12,29 @@ from qmk.json_encoders import UserspaceJSONEncoder
|
||||
|
||||
|
||||
def qmk_userspace_paths():
|
||||
test_dirs = []
|
||||
test_dirs = {}
|
||||
|
||||
# If we're already in a directory with a qmk.json and a keyboards or layouts directory, interpret it as userspace
|
||||
if environ.get('ORIG_CWD') is not None:
|
||||
current_dir = Path(environ['ORIG_CWD'])
|
||||
while len(current_dir.parts) > 1:
|
||||
if (current_dir / 'qmk.json').is_file():
|
||||
test_dirs.append(current_dir)
|
||||
test_dirs[current_dir] = True
|
||||
current_dir = current_dir.parent
|
||||
|
||||
# If we have a QMK_USERSPACE environment variable, use that
|
||||
if environ.get('QMK_USERSPACE') is not None:
|
||||
current_dir = Path(environ['QMK_USERSPACE'])
|
||||
if current_dir.is_dir():
|
||||
test_dirs.append(current_dir)
|
||||
test_dirs[current_dir] = True
|
||||
|
||||
# If someone has configured a directory, use that
|
||||
if cli.config.user.overlay_dir is not None:
|
||||
current_dir = Path(cli.config.user.overlay_dir)
|
||||
if current_dir.is_dir():
|
||||
test_dirs.append(current_dir)
|
||||
test_dirs[current_dir] = True
|
||||
|
||||
return test_dirs
|
||||
return list(test_dirs.keys())
|
||||
|
||||
|
||||
def qmk_userspace_validate(path):
|
||||
|
||||
Loading…
Reference in New Issue
Block a user