Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into mgor
Browse files Browse the repository at this point in the history
  • Loading branch information
mgor committed Aug 20, 2024
2 parents 60377f0 + 557e4e7 commit 6b82e86
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ core:
- Makefile
- '*.mk'
dependencies:
- all:
- changed-files:
- any-glob-to-any-file: lib/**
- all-globs-to-all-files: '!lib/python/**'
- changed-files:
- all-globs-to-any-file:
- lib/**
- '!lib/python/**'
keyboard:
- all:
- changed-files:
- any-glob-to-any-file: keyboards/**
- all-globs-to-all-files: '!keyboards/**/keymaps/**'
- changed-files:
- all-globs-to-any-file:
- keyboards/**
- '!keyboards/**/keymaps/**'
keymap:
- changed-files:
- any-glob-to-any-file:
Expand Down
2 changes: 1 addition & 1 deletion docs/porting_your_keyboard_to_qmk.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ Next is configuring Layout Macro(s). These define the physical arrangement of ke
In the above example,

* `LAYOUT_ortho_4x4` defines the name of the layout macro
* It must conform to the [layout guidelines](hardware_keyboard_guidelines#ltkeyboard_namehgt)
* It must conform to the [layout guidelines](hardware_keyboard_guidelines#keyboard-name-h)
* `"matrix": [0, 0]` defines the electrical position

::: tip
Expand Down

0 comments on commit 6b82e86

Please sign in to comment.