Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[qmk upstream merge] #1

Merged
merged 163 commits into from
May 13, 2022
Merged

[qmk upstream merge] #1

merged 163 commits into from
May 13, 2022

Conversation

mikedecr
Copy link
Owner

No description provided.

zvecr and others added 30 commits April 1, 2022 10:25
@zvecr
Lint keyboard/project name (#16766)
11db29b
@fauxpark
usb-usb converter: fix layout macros (#16769)
1caccca
@zvecr
Automatically approve workflow runs from first time contributors (#16774
4f30b7a 
)
@zvecr
Automatically approve workflow runs from first time contributors (#16775
61bd613 
)

* Automatically approve workflow runs from first time contributors

* Automatically approve workflow runs from first time contributors
@zvecr
Align action workflow filenames (#16776)
27ae37d
@gompa
fix typo in ps2 set_defaults (#16767)
0c8109a
@zvecr
Run auto approve only on qmk/qmk_firmware (#16786)
6822101
@noroadsleft
Hineybush H65 Layout Additions and Configurator Update (#16779)
d59d60f 
* info.json: apply friendly formatting

* h65.h: use QMK 3-character notation

* h65.h: add matrix diagram

* add LAYOUT_65_ansi_blocker

* add LAYOUT_65_ansi_blocker_split_bs

* add LAYOUT_65_ansi_blocker_tsangan

* add LAYOUT_65_ansi_blocker_tsangan_split_bs

* add LAYOUT_65_iso_blocker

* add LAYOUT_65_iso_blocker_split_bs

* add LAYOUT_65_iso_blocker_tsangan

* add LAYOUT_65_iso_blocker_tsangan_split_bs

* grid align keycodes in keymaps

* rules.mk: align inline comments
@noroadsleft
Hineybush H65 Hotswap Layout Additions and Configurator Update (#16780)
6a156cb 
* info.json: apply friendly formatting

* h65_hotswap.h: use QMK 3-character notation

* h65_hotswap.h: add matrix diagram

* rename LAYOUT to LAYOUT_all

* add LAYOUT_65_ansi_blocker

* add LAYOUT_65_ansi_blocker_split_bs

* add LAYOUT_65_iso_blocker

* add LAYOUT_65_iso_blocker_split_bs

* grid align keycodes in keymaps

* rules.mk: align inline comments
@noroadsleft
Wavtype Foundation Layout Macro Refactor and Configurator Update (#16781
8b438a9 
)

* info.json: apply friendly formatting

* info.json: update layout data

- update labels to make them QMK CLI friendly
- update key sizes and dimensions (removes key overlaps and mis-locations)

* foundation.h: edit white space

- convert tabs to spaces
- edit alignment of arrays

* foundation.h: add matrix diagram

* rename LAYOUT to LAYOUT_ansi_split_bs

* rename LAYOUT_tkl_ansi_7u to LAYOUT_ansi_tsangan_split_bs

* rename LAYOUT_tkl_iso to LAYOUT_iso_split_bs_rshift

* rename LAYOUT_tkl_iso_7u to LAYOUT_iso_tsangan_split_bs_rshift

* refactor keymaps

- use definitions from `layer_names` enum
- use grid alignment
- use QMK-native keycode aliases

* add reference keymaps

Add `default_ansi_tsangan_split_bs`, `default_iso_split_bs_rshift`, and `default_iso_tsangan_split_bs_rshift` keymaps.

* refactor ISO layouts

Edits the ISO layout macros so that the keycode for Enter is to the end of the home row.

* info.json: fix LAYOUT_iso_tsangan_split_bs_rshift reference

Thanks to zvecr.
@EasonQian1
add folders and capsule65 (#16687)
aec9942
@Erovia
Fix lineendings for eason/capsule65 (#16801)
69be0dc
@qmk-bot
Format code according to conventions (#16802)
c0216e9
@noroadsleft
Cutie Club Novus Layout Macro Updates (#16792)
2f917dd 
* info.json: apply friendly formatting

* rename LAYOUT_all to LAYOUT_60_ansi_split_bs_rshift

Maintains `LAYOUT_all` as an alias to `LAYOUT_60_ansi_split_bs_rshift`.

* novus.h: use QMK 3-character notation

* novus.h: add matrix diagram

* add LAYOUT_60_ansi

* add LAYOUT_60_ansi_tsangan

* refactor keymaps

- update grid alignment
- use QMK-native keycode aliases

* add LAYOUT_60_ansi_tsangan_split_bs_rshift

* rules.mk: update Community Layouts list
@noroadsleft
RGBKB Sol 3 rev1: Configurator Data and Readme (#16798)
67bb6e1 
* add QMK Configurator data

* add readme file
@nooges
Add Iris Rev 6.1 (#16722)
563c4db
@noroadsleft
QK65 Hotswap Community Layout Support (#16793)
d508988 
* qk65 hotswap: Community Layout support

- renames `LAYOUT_hotswap` to `LAYOUT_65_ansi_blocker`
- adds Community Layouts rule to `rules.mk`

* refactor keymaps

Edits the keymaps to align the keycodes in a grid. Whitespace-only change.
@noroadsleft
QK65 Solder Community Layout Support (#16796)
4a729a7 
* refactor solder.h

- use QMK 3-character notation
- convert tabs to spaces

* solder.h: add matrix diagram

* rename LAYOUT_solder to LAYOUT_all

* rename LAYOUT_iso to LAYOUT_65_iso_blocker

Also adds Community Layouts rule to `rules.mk`.

* info.json: improve formatting

- convert tabs to spaces
- format file to four-space indent

* refactor keymaps

- convert tabs to spaces
- update grid alignment of keycodes
- remove trailing whitespace

* add LAYOUT_65_ansi_blocker

* add LAYOUT_65_ansi_blocker_split_bs

* add LAYOUT_65_iso_blocker_split_bs

* add LAYOUT_65_ansi_blocker_tsangan

* add LAYOUT_65_iso_blocker_tsangan

* add LAYOUT_65_ansi_blocker_tsangan_split_bs

* add LAYOUT_65_iso_blocker_tsangan_split_bs

* remove 65_ansi_blocker_tsangan_split_bs from `LAYOUTS` rule
@noroadsleft
Sandwich Keeb68 Layout Macro Rework and Configurator Data (#16803)
fa97854 
* keeb68.h: use QMK 3-character notation

* physically arrange layout macro

Moves the keycodes for Equals and Right Bracket to their proper places on the Number and Tab rows, respectively.

Also refactors the keymaps to use QMK-native keycode aliases, grid alignment, and four-space indent.

* move `keymaps/grv_esc/readme.md` to `keymaps/default/`

The file contents say "default keymap".

* enable Community Layouts support

* add QMK Configurator data

* touch-up `rules.mk`
@Laneware
Update LW-67 info.json (#16788)
d198d79 
* Update info.json

Fixed:
-ISO Enter Position
-Up Arrow Position
-PgDn Position

Cause of Error:
-Keyboard Layout Editor Places Iso Enter on R1 Rather Than R2 like the ANSI Enter

* Update info.json

Fixed Compile Error to Previous Change

* Update keyboards/lw67/info.json
@noroadsleft
io_mini1800 Configurator Fixes (#16813)
f4c6e76 
* info.json: apply friendly formatting

* info.json: fix key sequence errors

Fixes out-of-sequence issue for the Numpad Plus key on both layouts.
@joedinkle
Header file fixes for all keymaps (#16180)
e2ace19
@mtei
Reduce the size of the keymap helix:fraanrosi (#16717)
98d4112
@nomis
[Bug] Fix matrix scan reporting interval (#16825)
84c9d6f
@mtei
Change helix:froggy keymap to use split_common (#16703)
3bde05c 
* create LAYOUT_half() macro into helix/rev2/keymaps/froggy/keymap.c

* Makes QMK standerd OLED driver used by the helix:froggy keymap switchable.

* Change helix:froggy keymap to use split_common
@daskygit
GMMK Pro return false in encoder user. (#16830)
e13ad14
@Paryz
Fix numbering to match the correct columns (#16831)
0524a82
@pdl @drashna
@zvecr @fauxpark @noroadsleft
[Keyboard] Add userspace pdl and a handwired board (#14199)
a5e4161 
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Ryan <[email protected]>
Co-authored-by: James Young <[email protected]>
@s-ol
[Keyboard] Add s-ol/0xC.pad (#16057)
8cc8649 
* [Keyboard] Add s_ol/0xc_pad

* [Keyboard] add factory testing RGB_MATRIX pattern

Co-authored-by: s-ol <[email protected]>
@hongaaronc @drashna @fauxpark
[Keyboard] Add Synth Labs Solo keyboard (#16103)
e1c777a 
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>
minkezhang and others added 21 commits May 11, 2022 16:09
@minkezhang @zvecr @fauxpark
[Keyboard] Update YMDK Split 64 config (#16979)
df9c266 
Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Ryan <[email protected]>
@4pplet @zvecr @fauxpark
[Keyboard] Yakiimo PCB (#16984)
ddba523 
Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Ryan <[email protected]>
Co-authored-by: 4pplet <[email protected]>
Co-authored-by: 4pplet <[email protected]>
@tominabox1 @fauxpark
[Keyboard] Littlefoot lx dev (#16771)
767e7db 
Co-authored-by: Ryan <[email protected]>
@sauvehoo @fauxpark
[Keyboard] Add ano keyboard (#16885)
fa6fe11 
Co-authored-by: Ryan <[email protected]>
@vinorodrigues
[Keyboard] remove handwired/reddot as per #14211 (#17033)
37417d5
@vinorodrigues @drashna
[Keyboard] Revert "Fix id67 RGB Matrix (#16916)" - on IDOBAO ID67 kb (#…
7fd05af 
…16917)

Co-authored-by: Drashna Jaelre <[email protected]>
@HorrorTroll
[Keyboard] Add Black E6.5 keyboard (#16807)
ffa1b37
@jiaxin96 @drashna
[Keyboard] Cleanup zhou65 and add nz64 keyboard (#17032)
4d1332b 
Co-authored-by: Drashna Jaelre <[email protected]>
@kylemccreery @drashna
[Keyboard] Add Mokulua keyboard (#17055)
d6e1de8 
Co-authored-by: Drashna Jaelre <[email protected]>
@waffle87
initial (#17067)
77aba32
@HorrorTroll
[Keyboard] Move M63 RGB into maker folder (#17061)
8a4ef2b
@ifd3f
Allow overriding Niv inputs in shell.nix (#16602)
c0ab4ed
@waffle87
[Keyboard] Refactor mechwild/mokulua (#17068)
59fa34a
@noroadsleft
[Keyboard] KBIC65 Refactor (#17066)
b26ba52
@noroadsleft
65_iso_split_bs Community Layout keymap bugfix (#17072)
58c37c0 
Fix the layout macro reference in the `keymap.c` file, which caused this keymap to not be able to be compiled.
@kylemccreery
[Bug] Updated Cirque Pinnacle SPI driver to read data correctly (#17074)
c199514
@awkannan
[Keyboard] Add caps and num indicators to Balance keyboard (#17075)
fc3d3ef
@hineybush @drashna @fauxpark
[Keyboard] H60 updates (#16999)
ffe1638 
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>
@stephondoestech @zvecr
@drashna @fauxpark
[Keymap] Contra - QWERTY US basic layout; MechWild Marcuio - EN updat…
e5e7039 
…e layout (#16787)

Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>
Co-authored-by: Stephon Parker <[email protected]>
@HorrorTroll
[Keyboard] Fixed info.json issue, some key got wrong pos for Gas75 (#…
3a80275 
…17070)
@takashicompany @zvecr @drashna
[Keyboard] Add keyboard "Spreadwriter" (#17031)
82828c3 
Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
@mikedecr mikedecr marked this pull request as ready for review May 13, 2022 17:47
@mikedecr mikedecr merged commit 8be6831 into mikedecr:master May 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
CI core documentation Improvements or additions to documentation keyboard keymap translation via
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.