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

Merged with QMK master repo #5

Merged
merged 2,509 commits into from
Nov 24, 2022
Merged

Merged with QMK master repo #5

merged 2,509 commits into from
Nov 24, 2022

Conversation

scottywei
Copy link
Owner

Description

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

noroadsleft and others added 30 commits September 27, 2022 02:16
@noroadsleft
Linworks FAve 87H Layout Refactor (#18497)
492c34f
@noroadsleft
Mechlovin Foundation Configurator Cleanup (#18500)
7d0c133
@jiaxin96
[Keyboard] Add wave75 (#18490)
f8c8005
@ADPenrose
[Keyboard] Updated Kintsugi to support encoder mapping (#18492)
848e1ec
@ramonimbao
Update VID and PID of Abats Keyboard Club Nayeon (#18503)
63c87f5
@mrnoisytiger @drashna @fauxpark
[Keyboard] Add KG60 and KG65 (#17565)
6f10864 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
@rennerom @drashna @fauxpark
[Keymap] Add rennerom planck layout (#17283)
7b72555 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
@lcqs
Update feature_tap_dance.md (#18509)
269600f 
Fixed typo
@rezaadio
[Keyboard] add rart80 (#18287)
d050e68
@justfalter
[Keyboard] dygma/raise: multiple fixes and improvements (#18361[)
d6f7763
@dependabot
Bump anothrNick/github-tag-action from 1.46.0 to 1.49.0 (#18515)
c71bc77 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@noroadsleft
Mechlovin Zed65 Wearhaus66 Configurator Fixes (#18507)
c705f0f
@noroadsleft
Mokey Ibis80 Refactor (#18514)
6b8dfdf
@noroadsleft
Monoflex 60 Layout Refactor and Touch-Up (#18517)
eb55551
@DeflateAwning
Fix typo (#18526)
51f2d27
@TweetyDaBird @fauxpark
Update reference_info_json.md (#18518)
961de3c 
* Update reference_info_json.md

* Update docs/reference_info_json.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update docs/reference_info_json.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update docs/reference_info_json.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update docs/reference_info_json.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update docs/reference_info_json.md

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
@noroadsleft
novelkeys/nk20: rename LAYOUT_all to LAYOUT (#18525)
14e1886 
This board only supports one layout.
@KeychronMacro
Update q0 for keychron (#18522)
bfcbcfe
@lesshonor
[docs] Improve documentation regarding info.json (#18508)
00dc764 
* docs: raise info.json awareness

* docs: note that DD migration is WIP
@dbast
Fix keychron q2 iso default keymaps (#18501)
b51b368
@syntax-magic
Updated documentations. No changes to keymap.c functions. (#18530)
49128d6
@noroadsleft
Neson Design 700E Refactor (#18524)
bad8c67
@fauxpark
Onekey: migrate some stuff to data driven (#18502)
45b5ed5
@dependabot
Bump anothrNick/github-tag-action from 1.49.0 to 1.50.0 (#18536)
94ec64f 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@joe-scotto
[Keyboard] Add ScottoCMD Keyboard (#18520)
43e57ab
@Z1codia @drashna
Fixed layout matrix for TKLFRLNRLMLAO (#18537)
413284a 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@noroadsleft
TKL-FF Community Layout Support (#18538)
96c1ac2
@lesshonor
[Keyboard] tau4 fixup/refactor (#18523)
1dd15a8
@SethBarberee
[Keyboard] Convert most of sinc to data driven info.json (#18481)
26c3e87
@noroadsleft
Plywrks Ahgase Community Layout Support (#18535)
5b2eb4e
zvecr and others added 29 commits November 18, 2022 02:16
@zvecr
Disable onekey console by default (#19104)
5d882ab
@nopunin10did @drashna @fauxpark
[Keyboard] Add Jabberwocky v2 and reorganize (#19014)
0bf72e4 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
@Jels02 @drashna @fauxpark
[Keyboard] Add Boaty (#17378)
e165407 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Jels02 <joah@Joah-Big-PC.localdomain>
@e11i0t23 @drashna
[Keyboard] Add keebsforall freebird75 (#18653)
ede2b41 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@edwardslau @drashna
[Keyboard] GrayStudio Aero75 Hotswap (#18883)
becd7e5 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@coffeeyy
[Keyboard] annepro2: fix bluetooth multi-pairing issue (#17483)
37c2714
@calliah333 @zvecr
[Keyboard] Add WITF (#18922)
e5e186c 
Co-authored-by: Joel Challis <git@zvecr.com>
@doon
Fix Typo in Saevus Cor Matrix (#19073)
525b472
@KeychronMacro @zvecr @drashna
[Keyboard] Keychron Q5 (#18283)
0f6a4ed 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
@Xelus22 @fauxpark
[Keyboard] Add XS108 (#19112)
e172148 
Co-authored-by: Ryan <fauxpark@gmail.com>
@TW59420 @zvecr @drashna
[Keyboard] add mw660 keyboard (#18849)
41399b1 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
@joe-scotto @fauxpark
[Keyboard] Add ScottoStarter Keyboard (#18626)
f0454c9 
Co-authored-by: Ryan <fauxpark@gmail.com>
@bwprobably @drashna @fauxpark
[Keyboard] Add hardwired Dactyl macropad (#18761)
0420a74 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
@Xelus22
[Keyboard] EXT65 rev3 support (#18873)
26db668
@shieldsd
[Keyboard] Add layer tap keys to dshields keymaps. (#18953)
6de4870
@jiaxin96 @drashna
[Keyboard] Add YR80 (#18945)
f5ca828 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@waffle87
[Keyboard] Fix up Boaty (#19117)
0489739
@spbgzh @drashna
[Keyboard] change RGBLED_NUM to 20 for zoom87 (#18930)
6216019 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@hugglesfox
[Keymap] Fix ducky one 2 sf fn layer mappings (#18955)
eb63857
@climent
[Keyboard] Small fixes for the Atreyu rev1 keyboard (#19098)
6f8bbb1
@CoffeeIsLife87
[Keymap] Add home and end keys to coffee's bm40hsrgb keymap (#19108)
ca693d7 
Co-authored-by: Fae <faenkhauser@gmail.com>
@rafal0p
Use modern solution for tri-layer in sofle default layout (#19113)
852952c
@Xelus22 @drashna @fauxpark
[Keyboard] Add Satellite Rev1 (#18869)
127a70b 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
@0xcharly @AlexBaldwin42
Bastard Keyboards: upstream recent changes (#19083)
2b0a3cd 
Co-authored-by: Simian <alex@Mandelbrot>
Co-authored-by: Charly Delay <0xcharly@users.noreply.github.com>
Co-authored-by: Alex Baldwin <alexbaldwin42@gmail.com>
@moyi4681 @fauxpark
[Keyboard] add og60 keyboard (#19114)
9291c8f 
Co-authored-by: Ryan <fauxpark@gmail.com>
@tzarc
Update .gitignore (#19132)
06a3801
@spbgzh @noroadsleft
[Add function] add 'Split Space and ISO and delete RGUI for Promise 87 (
8b1069f 
#18929)

* add split space and ISO

* Update wkl.h

* update ISO

* update

* change KC_LGUI to KC_RGUI

* delete RGUI

* format

* update promise87 readme.md

* update promise87 wkl readme.md

* Update readme.md

* Update readme.md

* change KC_SLCK to KC_SCRL

* wuque/promise87/ansi: standardize Layout Macro names

- rename `LAYOUT_tkl_f13_ansi` to `LAYOUT_tkl_f13_ansi_tsangan`
- convert `LAYOUT_tkl_f13_ansi_iso` to `LAYOUT_tkl_f13_iso_tsangan` (adds position `K41`)
- rename `LAYOUT_tkl_f13_ansi_split_space` to `LAYOUT_tkl_f13_ansi_tsangan_split_space`
- rename `LAYOUT_tkl_f13_ansi_split_bs` to `LAYOUT_tkl_f13_ansi_tsangan_split_bs`
- rename `LAYOUT_tkl_f13_ansi_split_lshift` to `LAYOUT_tkl_f13_ansi_tsangan_split_lshift`
- rename `LAYOUT_tkl_f13_ansi_split_rshift` to `LAYOUT_tkl_f13_ansi_tsangan_split_rshift`
- rename `LAYOUT_tkl_f13_ansi_split_bs_rshift` to `LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift`

* wuque/promise87/wkl: refactor LAYOUT_tkl_f13_ansi_wkl_iso

Refactors `LAYOUT_tkl_f13_ansi_wkl_iso` into `LAYOUT_tkl_f13_iso_wkl` by adding position `K41` (Non-US Backslash) to the layout macro.

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
@leah-splitkb
[Keyboard] Add splitkb.com's Aurora Corne (#18880)
535dd84
@komidore64 @fauxpark
[Keymap] komidore64 planck rev6 (#19036)
558ab18 
Co-authored-by: Ryan <fauxpark@gmail.com>
@scottywei scottywei merged commit 021dfcc into scottywei:master Nov 24, 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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.