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.

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

[Docs] zh-cn document translate: git parts #15576

Merged
merged 5 commits into from
Apr 22, 2022
Merged

Conversation

epiciskandar
Copy link

  • git best practices parts

Description

following after PR #14924

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).

@epiciskandar epiciskandar changed the title zh-cn document translate: git parts [Docs] zh-cn document translate: git parts Dec 25, 2021
docs/zh-cn/newbs_git_resynchronize_a_branch.md Outdated Show resolved Hide resolved
docs/zh-cn/newbs_git_using_your_master_branch.md Outdated Show resolved Hide resolved
epiciskandar and others added 3 commits January 23, 2022 23:59
* git best practices parts
gramma fixing

Co-authored-by: peepeetee <[email protected]>
Thanks!

Co-authored-by: peepeetee <[email protected]>
docs/zh-cn/newbs_git_best_practices.md Outdated Show resolved Hide resolved
docs/zh-cn/newbs_git_resolving_merge_conflicts.md Outdated Show resolved Hide resolved
docs/zh-cn/newbs_git_resolving_merge_conflicts.md Outdated Show resolved Hide resolved
docs/zh-cn/newbs_git_resynchronize_a_branch.md Outdated Show resolved Hide resolved
docs/zh-cn/newbs_git_using_your_master_branch.md Outdated Show resolved Hide resolved
docs/zh-cn/newbs_git_resynchronize_a_branch.md Outdated Show resolved Hide resolved
docs/zh-cn/newbs_git_resynchronize_a_branch.md Outdated Show resolved Hide resolved
docs/zh-cn/newbs_git_resolving_merge_conflicts.md Outdated Show resolved Hide resolved
@stale
Copy link

stale bot commented Apr 16, 2022

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@stale stale bot removed the awaiting changes label Apr 22, 2022
@tzarc tzarc merged commit 83ce70c into qmk:master Apr 22, 2022
mikedecr added a commit to mikedecr/qmk_firmware that referenced this pull request May 13, 2022
* Lint keyboard/project name (qmk#16766)

* usb-usb converter: fix layout macros (qmk#16769)

* Automatically approve workflow runs from first time contributors (qmk#16774)

* Automatically approve workflow runs from first time contributors (qmk#16775)

* Automatically approve workflow runs from first time contributors

* Automatically approve workflow runs from first time contributors

* Align action workflow filenames (qmk#16776)

* fix typo in ps2 set_defaults (qmk#16767)

* Run auto approve only on qmk/qmk_firmware (qmk#16786)

* Hineybush H65 Layout Additions and Configurator Update (qmk#16779)

* 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

* Hineybush H65 Hotswap Layout Additions and Configurator Update (qmk#16780)

* 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

* Wavtype Foundation Layout Macro Refactor and Configurator Update (qmk#16781)

* 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.

* add folders and capsule65 (qmk#16687)

* Fix lineendings for eason/capsule65 (qmk#16801)

* Format code according to conventions (qmk#16802)

* Cutie Club Novus Layout Macro Updates (qmk#16792)

* 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

* RGBKB Sol 3 rev1: Configurator Data and Readme (qmk#16798)

* add QMK Configurator data

* add readme file

* Add Iris Rev 6.1 (qmk#16722)

* QK65 Hotswap Community Layout Support (qmk#16793)

* 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.

* QK65 Solder Community Layout Support (qmk#16796)

* 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

* Sandwich Keeb68 Layout Macro Rework and Configurator Data (qmk#16803)

* 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`

* Update LW-67 info.json (qmk#16788)

* 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

* io_mini1800 Configurator Fixes (qmk#16813)

* info.json: apply friendly formatting

* info.json: fix key sequence errors

Fixes out-of-sequence issue for the Numpad Plus key on both layouts.

* Header file fixes for all keymaps (qmk#16180)

* Reduce the size of the keymap helix:fraanrosi (qmk#16717)

* [Bug] Fix matrix scan reporting interval (qmk#16825)

* Change helix:froggy keymap to use split_common (qmk#16703)

* 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

* GMMK Pro return false in encoder user. (qmk#16830)

* Fix numbering to match the correct columns (qmk#16831)

* [Keyboard] Add userspace pdl and a handwired board (qmk#14199)

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]>

* [Keyboard] Add s-ol/0xC.pad (qmk#16057)

* [Keyboard] Add s_ol/0xc_pad

* [Keyboard] add factory testing RGB_MATRIX pattern

Co-authored-by: s-ol <[email protected]>

* [Keyboard] Add Synth Labs Solo keyboard (qmk#16103)

Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>

* [Keyboard] add 10k (qmk#16531)

Co-authored-by: Ryan <[email protected]>
Co-authored-by: Nicolas Ballet <[email protected]>

* [Keyboard] super16 update (qmk#16494)

* [Keyboard] add E80-1800 PCB (qmk#16645)

Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>

* [Keyboard] add pegasus (qmk#16701)

Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>

* [Keymap] Change helix:froggy_106 keymap to use split_common (qmk#16704)

* [Keyboard] Adding waffling80, TKL PCB (qmk#16726)

Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Ryan <[email protected]>

* [Keyboard] Add ratio65 by rationalist (qmk#16727)

Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Ryan <[email protected]>

* [Keymap] fixed oled turn-off issue for crkbd:gotham (qmk#16748)

* [Keyboard] Add Eros by PJB (qmk#16756)

Co-authored-by: Ryan <[email protected]>
Co-authored-by: Joel Challis <[email protected]>

* [Keymap] sinc/lickel: Use backlight keys in Fn Row (qmk#16789)

* [Keyboard] Waffling60 - minor tweak, improve default behavior of caps lock indicator. (qmk#16836)

Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: 4pplet <[email protected]>
Co-authored-by: 4pplet <[email protected]>

* [Keyboard] Ported ErgoDox to VIA (qmk#16804)

* [Keyboard] KBD67 rev1 Caps Lock LED Fix (qmk#16790)

* [Keymap] Fix snowe keymap after updates to QMK (qmk#16777)

* [Keyboard] correct matrix for Kay65 (qmk#16751)

* [Keyboard] Add banime40 keyboard (qmk#16694)

Co-authored-by: Ryan <[email protected]>

* [Keyboard] annepro2: match default keymap to stock keycaps (qmk#16724)

* [Keyboard] add tiger80 keyboard (qmk#16742)

Co-authored-by: Drashna Jaelre <[email protected]>

* [Keyboard] Add Frooastboard Walnut (69% Keyboard) (qmk#16743)

Co-authored-by: Ryan <[email protected]>

* [Keymap] Add thattolleyguy keymaps (qmk#15351)

* Adding personal keymaps

* Update licenses

* Fix RGB settings

* Define used animations

Co-authored-by: Drashna Jaelre <[email protected]>

Co-authored-by: Drashna Jaelre <[email protected]>

* [Keyboard] Add RM_Numpad (qmk#15983)

Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>
Co-authored-by: jason <[email protected]>

* [Keymap] bépo layout on Lily58L (qmk#16243)

Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>

* [Keyboard] The inaugural commit for Leeloo's firmware. (qmk#16599)

Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>

* [Keyboard] Fix waffling80 - Missing comma (qmk#16848)

* [Keyboard] Fix kay65 - Missing keycode (qmk#16849)

* Fix external flash on AVR (qmk#16851)

* Ignore VIA(L) json files (qmk#16845)

* [Keyboard] move/rename obro to Meridian RGB (qmk#16828)

Co-authored-by: Joel Challis <[email protected]>

* [Keyboard] Add via support for creatkeebs/glacier (qmk#16747)

Co-authored-by: Joel Challis <[email protected]>

* [Keyboard] Add avalanche (qmk#16407)

* [Keyboard] Add avalanche

* PR feedback

* Update keyboards/avalanche/v1/config.h

* Update keyboards/avalanche/v1/v1.h

* Update keyboards/avalanche/v2/config.h

* Update keyboards/avalanche/v2/v2.h

* Update keyboards/avalanche/v3/config.h

* Update keyboards/avalanche/v3/v3.h

* Apply suggestions from code review

* Remove rules.mk comment and fix other comments.

* Shared encoder code, follow conventions in rules.mk files.

* Remove config files which do not change defaul behavior.

* Resolve layout macro inconsistencies for rmkeebs/rm_numpad (qmk#16856)

* rgblight: Limit max repeat times in rgblight_blink_layer_repeat (qmk#16860)

* [Keyboard] Update X-Bows Keyboard (qmk#16765)

Co-authored-by: Ryan <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Shulin <[email protected]>

* Fix Xorg segfault with KeebCats PCBs (qmk#16434)

* [Keyboard] Add Phase One keyboard (qmk#16430)

Co-authored-by: Ryan <[email protected]>

* Refine LED indicator documentation (qmk#16304)

* Anne Pro 2 Refactor (qmk#16864)

* move RGB Matrix rules to keyboard level

* move PERMISSIVE_HOLD config to keyboard level

* annepro2.c: convert tabs to spaces

* refactor rules.mk files

Reformats each version's `rules.mk` file to be arranged more similarly to those of the rest of the keyboards in QMK.

No logic change.

* annepro2.c: allow compilation without RGB Matrix

Wraps the `led_enabled` definition and the `KC_AP_RGB_*` keycodes in `#ifdef RGB_MATRIX_ENABLE`, allowing successful compilation if the user sets `RGB_MATRIX_ENABLE = no`.

* rework readme files

Reworks the main `readme.md` file to be more friendly to GitHub viewing, and removes the single-line version-specific readme files (exposes the main readme to QMK Configurator users).

* info.json: update maintainer value

* info.json: apply friendly formatting

* [Keyboard] Add sandbox keyboard (qmk#16021)

Co-authored-by: precondition <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>

* [Keyboard] SharkPCB release Beta compatibility (qmk#16713)

Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>

* [Keyboard] Add digicarpice (qmk#16791)

Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: swiftrax <[email protected]>

* [Keyboard] Add the Ciel (qmk#16816)

Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>

* Ploopy Trackball Mini: only define DPI options as needed (qmk#16160)

* [Keyboard] Add deskpad (qmk#15602)

Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>

* [Keyboard] sandbox - fix keymaps (qmk#16873)

* [Keyboard] Add CrimsonKeyboards' Resume1800 (qmk#16842)

* [Keyboard] Fix resume1800 - Dynamic layer count undefined (qmk#16877)

* [Keyboard] Add converter/a1200/mistress1200 variant (qmk#16634)

Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>

* [Keyboard] Add Amber80 Solder & VCL65 Solder  (qmk#15945)

Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Ryan <[email protected]>

* Change helix:yshrsmz keymap to use split_common (qmk#16537)

* [Keymap] A Colemak keymap for the crkbd keyboard (qmk#16550)

* Add my planck layout (qmk#13143)

* Add my planck layout

* Add copyright

* Address requested changes

* Fix dipswitch return type

* [Keyboard] New kbd 1k (qmk#15509)

Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: mtei <[email protected]>
Co-authored-by: Nick Brassel <[email protected]>

* Add initial support for the Makey Makey Classic (qmk#16658)

* Fix broken build for users/curry (qmk#16492)

* boardsource/microdox V2 (qmk#16569)

* New custom keymap for Glorious GMMK Pro ANSI layout (qmk#16199)

Co-authored-by: Drashna Jaelre <[email protected]>

* Dactyl manuform 5x6 5 via (qmk#16741)

* kin80 (qmk#16754)

Co-authored-by: Nick Brassel <[email protected]>

* [Keyboard] Add notes on Iris rev6a firmware (qmk#16878)

* Fixed error in config (qmk#16895)

* Fix i2c driver doc: Incorrect name (qmk#16898)

* [Keyboard] Fix kin80 default keymap (qmk#16893)

* rgblight: Fix rgblight_blink_layer when multiple layers are active (qmk#16824)

* [Keymap] Fix build error `helix:five_rows` (qmk#16847)

* Added new keyboard Gas75 (qmk#16768)

* Keychron Q2 add Caps Lock indicator and layer RGB (qmk#16641)

* Loki65 (qmk#16844)

Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: yiancar <[email protected]>

* [Keyboard]Remove RGB light implementation of ID67, revert the file structure changes by qmk#15558 (qmk#15854)

* [Docs] zh-cn document translate: git parts (qmk#15576)

Co-authored-by: peepeetee <[email protected]>
Co-authored-by: Dasky <[email protected]>

* [Keyboard] Fix Pegasus Hoof (2013) layout, matrix and pin assignment (qmk#16042)

* [Keymap] Toinux's crkbd keymap and userspace (qmk#16437)

* [Keymap] Addition of new keymap for the anavi macropad8 keyboard (qmk#16910)

* Creation of Visual Studio Code keymap

* Add files via upload

* Add Dactyl_Manuform/3x5_3 (qmk#16238)

* Added massdrop/ctrl:xanimos keymap (qmk#16187)

Co-authored-by: xanimos <[email protected]>

* Fix id67 RGB Matrix (qmk#16916)

* [Keyboard] Add Rooboard 65 (qmk#15294)

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]>

* [Keyboard] Add missing KC_QUOT (qmk#16925)

* gergoplex: small cleanup (qmk#16928)

* Fix backslash bug (qmk#16935)

* Add missing dead key LUTs for sendstring headers (qmk#16929)

* dactyl_manuform/3x5_3: fix layout (qmk#16944)

* Add Ukrainian keymap header (qmk#16947)

* Add Ukrainian keymap header

* Docs

* [Keyboard] Small fix for Sol3 with only a slave touch bar (qmk#16952)

* [Keyboard] Add Maker Keyboards Alexa Solder PCB (qmk#16943)

* [Keyboard] Add SkeletonNumPad (qmk#16753)

* add SkeletonNumPad keyboard

* fix

* fix

* fixed info.json

* Update keyboards/skeletonkbd/skeletonnumpad/rules.mk

Co-authored-by: Ryan <[email protected]>

* Change RGBLIGHT_LIMIT_VAL

Co-authored-by: Ryan <[email protected]>

* [Keymap] Add keymap for kinesis advantage (qmk#16862)

Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>

* [Keyboard] Solanis H87C/H88C Compatible Replacement PCBs (qmk#16942)

Co-authored-by: Ryan <[email protected]>

* [Keyboard] RM_Numpad: Fix layout bug (qmk#16857)

Co-authored-by: jason <[email protected]>

* Fix fjlabs/solanis (qmk#16965)

* [Keymap] Improve Pain27 default keymap readability (qmk#16956)

* [Keyboard] Add gameroyadvance (qmk#16882)

Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>

* keyboards/ryanskidmore: add rskeys100 keyboard (qmk#15506)

* keyboards/ryanskidmore/rskeys100: add rskeys100 draft firmware

* keyboards/ryanskidmore/rskeys100: fix firmware

* ryanskidmore/rskeys100: fix remaining bugs

* keyboards/ryanskidmore/rskeys100: finishing touches on firmware

* keyboards/ryanskidmore/rskeys100: migrate from full replacement matrix scanning to lite, move rgb matrix enable call to keymap

* keyboards/ryanskidmore/rskeys100: remove undefines, clarify comments

* ryanskidmore/rskeys100: remove unused imports

* keyboards/ryanskidmore/rskeys100: pr feedback

* Jonavin-kb67-Reduce mem usage (qmk#16991)

Co-authored-by: Jonavin <=>

* [Keymap] Introduced New layer & Improvements (qmk#16921)

Co-authored-by: Ryan <[email protected]>

* [Keyboard] Add per-key RGB for Quark LP RGB variants (qmk#16671)

Co-authored-by: Drashna Jaelre <[email protected]>

* Add missing dependency for qmk setup on Fedora (qmk#17003)

* [Keyboard] RS60 Rev2 Addition (qmk#16988)

* Add ibis PCB (qmk#17001)

* initial ibis commit

* updates etc

* layout updates to fix mismatched keys

* Apply suggestions from code review

Co-authored-by: Joel Challis <[email protected]>

* Update keyboards/hineybush/ibis/info.json

Co-authored-by: Joel Challis <[email protected]>

* Update keyboards/hineybush/ibis/readme.md

Co-authored-by: Ryan <[email protected]>

Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Ryan <[email protected]>

* [Bug] Fix RS60 Rev2 I2C (qmk#17015)

* Ensure .hex file output for ARM Teensys (qmk#17014)

* Sol3 fix rgb map (qmk#17019)

* Fix for key -> LED mapping

* Revert whitespace changes

* Revert whitespace changes 2

Co-authored-by: theVDude <[email protected]>

* feat: add support for JJ50 VIA (qmk#16420)

* Update RMKB to support SNAP (qmk#17042)

* converter/a1200/mistress1200: further firmware shrinking to fit on Atmega16U4 (16kb) (qmk#17040)

* Create dummy.txt

* Add files via upload

* Add files via upload

* Delete dummy.txt

* Update config.h

* Update rules.mk

* Update keymap.c

* Update keyboards/converter/a1200/mistress1200/rules.mk

Co-authored-by: Joel Challis <[email protected]>

* Update keyboards/converter/a1200/mistress1200/rules.mk

Co-authored-by: Joel Challis <[email protected]>

* Update keyboards/converter/a1200/mistress1200/rules.mk

Co-authored-by: Joel Challis <[email protected]>

* Update keyboards/converter/a1200/mistress1200/config.h

Co-authored-by: Drashna Jaelre <[email protected]>

* Update keyboards/converter/a1200/mistress1200/config.h

Co-authored-by: Drashna Jaelre <[email protected]>

* Update keyboards/converter/a1200/mistress1200/config.h

Co-authored-by: Drashna Jaelre <[email protected]>

* Update keyboards/converter/a1200/mistress1200/rules.mk

Co-authored-by: Drashna Jaelre <[email protected]>

* Update config.h

* Update rules.mk

* Update readme.md

* Update config.h

* Update rules.mk

* Update config.h

* Update keyboards/converter/a1200/mistress1200/config.h

Co-authored-by: Joel Challis <[email protected]>

Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>

* Adding akira (qmk#16982)

* keyboard:akira initial commit

* Update keyboards/ekow/akira/akira.h

Co-authored-by: Joel Challis <[email protected]>

* Update keyboards/ekow/akira/keymaps/via/rules.mk

Co-authored-by: Joel Challis <[email protected]>

* Update keyboards/ekow/akira/readme.md

Co-authored-by: Joel Challis <[email protected]>

* Update .gitignore

Co-authored-by: Joel Challis <[email protected]>

* Update readme.md

* Update keyboards/ekow/akira/rules.mk

Co-authored-by: Drashna Jaelre <[email protected]>

* Update rules.mk

remove redundant content.

* added keyboard/ekow/keymaps/via/keymap.c

* remove .ccls-cache

* add instructions of enter the bootloader

* add instructions of enter the bootloader

* modify ekow/akira:via

* Update keyboards/ekow/akira/readme.md

Co-authored-by: Ryan <[email protected]>

* Update keyboards/ekow/akira/keymaps/via/rules.mk

Co-authored-by: Ryan <[email protected]>

Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>

* [Keyboard] Fix led num for center_enter/qoolee (qmk#17050)

* [Keyboard] Add Axostudio Yeti hotswap version (qmk#16820)

Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Ryan <[email protected]>

* [Keyboard] Momokai Tap Trio (qmk#16463)

* add winry3m3w

* change name to Momokai Tap Trio

* Delete settings.json

* add rgb effects

* amend default keymap

* add limited RGB controls to default keymap

* fix VAD

* Update keyboards/momokai/tap_trio/tap_trio.h

Co-authored-by: Joel Challis <[email protected]>

* Update keyboards/momokai/tap_trio/tap_trio.h

Co-authored-by: Joel Challis <[email protected]>

* Update keyboards/momokai/tap_trio/config.h

Co-authored-by: Drashna Jaelre <[email protected]>

* Update keyboards/momokai/tap_trio/rules.mk

Co-authored-by: Ryan <[email protected]>

* implement RGB matrix, change default keymap

* change keymaps

* change rgb effects

* comment out the RGB matrix and switch back to RGB light due to VIA not playing ball

Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>

* [Keyboard] Add usable tap-hold defaults for ferris via (qmk#16696)

* [Keyboard] fix tf65rgbv2 keyboard layout (qmk#17029)

* KBDfans KBD75 Refactor - 2022 Edition (qmk#17052)

* add license headers

* tidy-up revision rules.mk files

- convert tabs to spaces
- align inline comments
- update rule ordering

* touch-up readme.md

* touch-up rev1/rev1.h

- convert tabs to spaces
- convert to QMK 3-character notation for matrix positions

* rev1/rev1.h: add matrix diagram

* touch-up rev2/rev2.h

- convert tabs to spaces
- convert to QMK 3-character notation for matrix positions

* rev2/rev2.h: add matrix diagrams

* rev1/info.json: apply friendly formatting

* rev2/info.json: apply friendly formatting

* refactor layout macros

- switch `LAYOUT_ansi_1u` with `LAYOUT_75_ansi`
  - makes `LAYOUT_75_ansi` the canonical macro name, with `LAYOUT_ansi_1u` as an alias for backwards compatibility
  - move `LAYOUT_ansi_1u` alias to `info.json` files from revision headers
- remove `LAYOUT_iso_1u` (was unused)
- rename `LAYOUT_ansi` to `LAYOUT_75_ansi_rwkl`
- rename `LAYOUT_iso` to `LAYOUT_75_iso_rwkl`

* refactor default keymap

- use four-space indent
- update grid alignment

* refactor iso keymap

- refactor to use `LAYOUT_75_iso` macro
  - change from Split to 2u Backspace
  - change from Split to Standard Spacebar
  - change `KC_BSLS` keycode to `KC_NUHS`, and place on home row
- use four-space indent
- update grid alignment

* refactor via keymap

- use four-space indent
- update grid alignment

* touch-up readme.md again

Fix a broken link.

* update section comments in revision header files

* add Full Winkeyless layouts

- add `LAYOUT_75_ansi_wkl` and `LAYOUT_75_iso_wkl` layout macros

* [Keyboard] Add subrezon/la_nc keyboard (qmk#16833)

Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>
Co-authored-by: Daniel Osipishin <[email protected]>

* [Keyboard] Update YMDK Split 64 config (qmk#16979)

Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Ryan <[email protected]>

* [Keyboard] Yakiimo PCB (qmk#16984)

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]>

* [Keyboard] Littlefoot lx dev (qmk#16771)

Co-authored-by: Ryan <[email protected]>

* [Keyboard] Add ano keyboard (qmk#16885)

Co-authored-by: Ryan <[email protected]>

* [Keyboard] remove handwired/reddot as per qmk#14211 (qmk#17033)

* [Keyboard] Revert "Fix id67 RGB Matrix (qmk#16916)" - on IDOBAO ID67 kb (qmk#16917)

Co-authored-by: Drashna Jaelre <[email protected]>

* [Keyboard] Add Black E6.5 keyboard (qmk#16807)

* [Keyboard] Cleanup zhou65 and add nz64 keyboard (qmk#17032)

Co-authored-by: Drashna Jaelre <[email protected]>

* [Keyboard] Add Mokulua keyboard (qmk#17055)

Co-authored-by: Drashna Jaelre <[email protected]>

* initial (qmk#17067)

* [Keyboard] Move M63 RGB into maker folder (qmk#17061)

* Allow overriding Niv inputs in shell.nix (qmk#16602)

* [Keyboard] Refactor mechwild/mokulua (qmk#17068)

* [Keyboard] KBIC65 Refactor (qmk#17066)

* 65_iso_split_bs Community Layout keymap bugfix (qmk#17072)

Fix the layout macro reference in the `keymap.c` file, which caused this keymap to not be able to be compiled.

* [Bug] Updated Cirque Pinnacle SPI driver to read data correctly (qmk#17074)

* [Keyboard] Add caps and num indicators to Balance keyboard (qmk#17075)

* [Keyboard] H60 updates (qmk#16999)

Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>

* [Keymap] Contra - QWERTY US basic layout; MechWild Marcuio - EN update layout (qmk#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]>

* [Keyboard] Fixed info.json issue, some key got wrong pos for Gas75 (qmk#17070)

* [Keyboard] Add keyboard "Spreadwriter" (qmk#17031)

Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>

Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Ryan <[email protected]>
Co-authored-by: Gompa <[email protected]>
Co-authored-by: James Young <[email protected]>
Co-authored-by: eason <[email protected]>
Co-authored-by: Erovia <[email protected]>
Co-authored-by: QMK Bot <[email protected]>
Co-authored-by: Danny <[email protected]>
Co-authored-by: Laneware <[email protected]>
Co-authored-by: joedinkle <[email protected]>
Co-authored-by: Takeshi ISHII <[email protected]>
Co-authored-by: Simon Arlott <[email protected]>
Co-authored-by: Dasky <[email protected]>
Co-authored-by: Kamil Zielinski <[email protected]>
Co-authored-by: Daniel Perrett <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: sol <[email protected]>
Co-authored-by: s-ol <[email protected]>
Co-authored-by: Nostril <[email protected]>
Co-authored-by: Nabos <[email protected]>
Co-authored-by: Nicolas Ballet <[email protected]>
Co-authored-by: ziptyze <[email protected]>
Co-authored-by: Moritz <[email protected]>
Co-authored-by: melonbred <[email protected]>
Co-authored-by: 4pplet <[email protected]>
Co-authored-by: Allen Choi <[email protected]>
Co-authored-by: PJB Keyboard Design <[email protected]>
Co-authored-by: Adam Lickel <[email protected]>
Co-authored-by: 4pplet <[email protected]>
Co-authored-by: 4pplet <[email protected]>
Co-authored-by: IFo Hancroft <[email protected]>
Co-authored-by: mudhead <[email protected]>
Co-authored-by: Tyler Thrailkill <[email protected]>
Co-authored-by: mechlovin <[email protected]>
Co-authored-by: Christian Lo <[email protected]>
Co-authored-by: bwisn <[email protected]>
Co-authored-by: moyi4681 <[email protected]>
Co-authored-by: Simon <[email protected]>
Co-authored-by: Tyler Tolley <[email protected]>
Co-authored-by: Rucker Machine <[email protected]>
Co-authored-by: jason <[email protected]>
Co-authored-by: N L <[email protected]>
Co-authored-by: ClicketySplit <[email protected]>
Co-authored-by: jack <[email protected]>
Co-authored-by: leah-splitkb <[email protected]>
Co-authored-by: holtenc <[email protected]>
Co-authored-by: Tim Liu <[email protected]>
Co-authored-by: Will Winder <[email protected]>
Co-authored-by: X-Bows Tech <[email protected]>
Co-authored-by: Shulin <[email protected]>
Co-authored-by: Amber Cronin <[email protected]>
Co-authored-by: Albert Y <[email protected]>
Co-authored-by: yfuku <[email protected]>
Co-authored-by: precondition <[email protected]>
Co-authored-by: Álvaro A. Volpato <[email protected]>
Co-authored-by: Brandon Claveria <[email protected]>
Co-authored-by: swiftrax <[email protected]>
Co-authored-by: Ramon Imbao <[email protected]>
Co-authored-by: alaviss <[email protected]>
Co-authored-by: Md. Mashur Shalehin Sakib <[email protected]>
Co-authored-by: DeeDesired <[email protected]>
Co-authored-by: 8bits4ever <[email protected]>
Co-authored-by: Sắn <[email protected]>
Co-authored-by: Álvaro Cortés <[email protected]>
Co-authored-by: Abhinav <[email protected]>
Co-authored-by: MakotoKurauchi <[email protected]>
Co-authored-by: Nick Brassel <[email protected]>
Co-authored-by: jpe230 <[email protected]>
Co-authored-by: gourdo1 <[email protected]>
Co-authored-by: LegoWolf <[email protected]>
Co-authored-by: Dmitry Nosachev <[email protected]>
Co-authored-by: jels <[email protected]>
Co-authored-by: HorrorTroll <[email protected]>
Co-authored-by: Ladduro <[email protected]>
Co-authored-by: yiancar <[email protected]>
Co-authored-by: yiancar <[email protected]>
Co-authored-by: peepeetee <[email protected]>
Co-authored-by: IskandarMa <[email protected]>
Co-authored-by: Víctor Pont <[email protected]>
Co-authored-by: toinux <[email protected]>
Co-authored-by: E.Iosifidis <[email protected]>
Co-authored-by: DL Ford <[email protected]>
Co-authored-by: Daniel Weeks <[email protected]>
Co-authored-by: xanimos <[email protected]>
Co-authored-by: Felix Jen <[email protected]>
Co-authored-by: tuvietnamm <[email protected]>
Co-authored-by: XScorpion2 <[email protected]>
Co-authored-by: skeletonkbd <[email protected]>
Co-authored-by: Nicholas Granado <[email protected]>
Co-authored-by: Hunter Haugen <[email protected]>
Co-authored-by: ROYMEETSWORLD <[email protected]>
Co-authored-by: Ryan Skidmore <[email protected]>
Co-authored-by: jonavin <[email protected]>
Co-authored-by: npspears <[email protected]>
Co-authored-by: Mateusz Mojsiejuk <[email protected]>
Co-authored-by: Xelus22 <[email protected]>
Co-authored-by: Josh Hinnebusch <[email protected]>
Co-authored-by: Doomsdayrs <[email protected]>
Co-authored-by: theVDude <[email protected]>
Co-authored-by: Guillaume Gérard <[email protected]>
Co-authored-by: Jay Greco <[email protected]>
Co-authored-by: Eugene-Yuan Kou <[email protected]>
Co-authored-by: takashicompany <[email protected]>
Co-authored-by: kb-elmo <[email protected]>
Co-authored-by: Willy Breitenbach <[email protected]>
Co-authored-by: Daniel Osipishin <[email protected]>
Co-authored-by: Daniel Osipishin <[email protected]>
Co-authored-by: Minke Zhang <[email protected]>
Co-authored-by: TJ <[email protected]>
Co-authored-by: sauvehoo <[email protected]>
Co-authored-by: Vino Rodrigues <[email protected]>
Co-authored-by: JX <[email protected]>
Co-authored-by: Kyle McCreery <[email protected]>
Co-authored-by: Astrid Yu <[email protected]>
Co-authored-by: Andrew Kannan <[email protected]>
Co-authored-by: Stephon Parker <[email protected]>
Co-authored-by: Stephon Parker <[email protected]>
vinorodrigues pushed a commit to Idobao/qmk.qmk_firmware that referenced this pull request May 17, 2022
0xcharly pushed a commit to Bastardkb/bastardkb-qmk that referenced this pull request Jul 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants