Skip to content

Commit

Permalink
Update from Base (#15)
Browse files Browse the repository at this point in the history
* Viktus Styrka Topre Layout Standardization and Touch-Up (qmk#22044)

* Add layout/matrix diagram

[docs]

* Alias `LAYOUT_all` to `LAYOUT_split_6u`

`LAYOUT_all` and `LAYOUT_split_6u` represent the same matrix positions
and sequence, so implement the former as an alias.

[refactor]

* Touch-up keymaps

- grid-align keycodes
- use QMK-native keycode aliases

[chore]

* Friendly-format `info.json`

[style]

* Correct layout data

Correct key sizes/positioning on the bottom row.

[chore]

* Rename `LAYOUT_2u_6u` to `LAYOUT_65_xt_ansi_blocker`

[refactor]

* Rename `LAYOUT_2u_7u` to `LAYOUT_65_xt_ansi_blocker_tsangan`

[refactor]

* Rename `LAYOUT_split_6u` to `LAYOUT_65_xt_ansi_blocker_split_bs`

[refactor]

* Rename `LAYOUT_split_7u` to `LAYOUT_65_xt_ansi_blocker_tsangan_split_bs`

[refactor]

* Wolf Neely65 Touch-Up (qmk#22045)

* Add layout/matrix diagram

[docs]

* Friendly-format `info.json`

[style]

* Touch-up keymaps

- grid-align keycodes
- use QMK-native keycode aliases

[refactor]

* Fix keymaps

Fix keycodes being assigned out of order with respect to `info.json`.

- move XT function keys to left side
- move keycodes for position [2, 14] from Home Row to Number Row

[bugfix]

* Rename `LAYOUT` to `LAYOUT_65_xt_ansi_blocker_tsangan_wkl_split_bs`

[refactor]

* Add `LAYOUT_65_xt_ansi_blocker_tsangan_wkl`

[enhancement]

* Wolf Silhouette Community Layout Support (qmk#22052)

* Add layout/matrix diagram

[docs]

* Friendly-format `info.json`

[style]

* Touch-up layout data

Move the ISO Hash key to the main key area.

[chore]

* Rename `LAYOUT` to `LAYOUT_all`

[refactor]

* Add `LAYOUT_tkl_nofrow_ansi_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_nofrow_ansi`

[enhancement]

* Add `LAYOUT_tkl_nofrow_ansi_tsangan_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_nofrow_ansi_tsangan`

[enhancement]

* Add `LAYOUT_tkl_nofrow_ansi_wkl_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_nofrow_ansi_wkl`

[enhancement]

* Add `LAYOUT_tkl_nofrow_iso_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_nofrow_iso`

[enhancement]

* Add `LAYOUT_tkl_nofrow_iso_tsangan_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_nofrow_iso_tsangan`

[enhancement]

* Add `LAYOUT_tkl_nofrow_iso_wkl_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_nofrow_iso_wkl`

[enhancement]

* Enable Community Layout support

[enhancement]

* Wolf Ziggurat Layout Additions (qmk#22053)

* Add layout/matrix diagram

[docs]

* Friendly-format `info.json`

[style]

* Touch-up layout data

Move the ISO Hash key to the main key area.

[chore]

* Rename `LAYOUT` to `LAYOUT_all`

[refactor]

* Add `LAYOUT_65_xt_ansi_blocker_tsangan_split_bs`

[enhancement]

* Add `LAYOUT_65_xt_ansi_blocker_tsangan`

[enhancement]

* Add `LAYOUT_65_xt_iso_blocker_tsangan_split_bs`

[enhancement]

* Add `LAYOUT_65_xt_iso_blocker_tsangan`

[enhancement]

* Adding support for the Pteron56 (PCB) keyboard (qmk#21731)

* Add missing gpio include to ps2 vendor (qmk#22063)

* [Keyboard] Add riot pad (qmk#22060)

Co-authored-by: ShandonCodes <shandon@shandon.codes>

* DZTech Pluto Community Layout support (qmk#22069)

* Add layout/matrix diagram

[docs]

* Friendly-format `info.json`

- apply four-space indent
- sort JSON keys in layout objects

[style]

* Correct `LAYOUT_all` data

Correct key sizes/positions of:

- ANSI Backslash [1, 13]
- ANSI Enter [1, 14]
- Fn [3, 13]

[chore]

* Correct `LAYOUT_iso` data

Correct position of Fn key [3, 13].

[chore]

* Add `LAYOUT_tkl_nofrow_ansi_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_nofrow_ansi`

[enhancement]

* Add `LAYOUT_tkl_nofrow_ansi_tsangan_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_nofrow_ansi_tsangan`

[enhancement]

* Add `LAYOUT_tkl_nofrow_ansi_wkl_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_nofrow_ansi_wkl`

[enhancement]

* Add `LAYOUT_tkl_nofrow_iso_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_nofrow_iso`

[enhancement]

* Add `LAYOUT_tkl_nofrow_iso_tsangan_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_nofrow_iso_tsangan`

[enhancement]

* Add `LAYOUT_tkl_nofrow_iso_wkl_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_nofrow_iso_wkl`

[enhancement]

* Enable Community Layout support

[enhancement]

* Touch-up keymaps

Update keycode grid alignment.

[style]

* Ubest VN Community Layout Support (qmk#22070)

* Add layout/matrix diagram

[docs]

* Rename `LAYOUT` to `LAYOUT_all`

[refactor]

* Add `LAYOUT_65_ansi_split_bs`

[enhancement]

* Add `LAYOUT_65_ansi`

[enhancement]

* Add `LAYOUT_65_iso_split_bs`

[enhancement]

* Add `LAYOUT_65_iso`

[enhancement]

* Enable Community Layout support

[enhancement]

* Touch-up keymaps

- apply four-space indent
- grid-align keycodes

[style]

* Add OLED logo DP3000 macropad (qmk#21936)

* SapuSeven MacroPad12: rename LAYOUT to LAYOUT_ortho_3x4 (qmk#22081)

* Alchemist Keyboards OGRN Layout Addition (qmk#22080)

* Add layout/matrix diagram

[docs]

* Friendly-format `info.json`

[style]

* Add `LAYOUT_ortho_5x4`

[enhancement]

* Touch-up keymaps

- update grid-alignment (layer-to-layer consistency)
- fix box drawings

[style]

* Extend Community Layout support

Add `ortho_5x4` to supported Community Layouts.

[enhancement]

* amend 96_(ansi|iso) community_layouts in keyboards/ (qmk#22066)

* Restrict "feature" and "animation" keys (qmk#21895)

* [Keyboard] Momokai Aurora (qmk#20419)

Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>

* [Keyboard] add Quokka keyboard (qmk#20979)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* apply 66_(ansi|iso) to keyboards (qmk#21834)

* Add ScottoSlant Keyboard (qmk#20942)

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

* Add ScottoMouse Handwired Macropad (qmk#21074)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>

* Add ScottoFly Keyboard (qmk#20939)

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

* Add ScottoMacrodeck Macropad (qmk#20946)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* Add ScottoLong Keyboard (qmk#20938)

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

* Add funtions of Encoder and VIA for redragon/k667 (qmk#21917)

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: syc <squall_sha@163.com>

* [Keyboard] Add rpk-001 keyboard (qmk#21042)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Joy <chang.li@westberrytech.com>

* amend 68_(ansi|iso) community_layouts in keyboards/ (qmk#21835)

* [Keyboard] Add QCK-75 (qmk#21180)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Quarkeys Studio Z67 Solder Community Layout Support (qmk#22095)

* Quarkeys Studio Z67 Hotswap Community Layout Support (qmk#22096)

* kimiko: mirror encoder pins between halves (qmk#21728)

* Keychron q9 plus (qmk#21399)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* add dz60v2 keyboard (qmk#21862)

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* add odinmini layout (qmk#21983)

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

* keymaps: Fix hacker_dvorak build. (qmk#22102)

* Allow for `qmk compile -kb all`. (qmk#22022)

* Royal Kludge RK G68 Community Layout Support (qmk#22103)

* Rename `LAYOUT` to `LAYOUT_65_ansi`

[refactor]

* Enable Community Layout support

[enhancement]

* Touch-up keymaps

- fix keycode grid alignment

[style]

* Touch-up readme

- link to maintainer's GitHub profile
- specify codebase is for RGB version of RK G68
- update Hardware Availability links

[docs]

* Added OLED SSD1306 128x64 to the verified working table (qmk#22112)

* Shoc: physically arrange keymaps/layout macro (qmk#22100)

* Fix up `qmk mass-compile` makefile indenting. (qmk#22115)

* Add 'dactyl_tracer' keyboard (qmk#20993)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* add subrezon/lancer keyboard (qmk#20792)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Daniel Osipishin <danielos@retarus.de>

* [Keyboard] Add SIRIND Klein (qmk#21951)

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>

* GMMK2 96% ISO: Correct layout data (qmk#22101)

* Add reminder about format-json to PR Checklist (qmk#22055)

* Add Jank RP2040 Dactyl (qmk#21973)

Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* [Keyboard] Enable RGB_TEST animation on riot_pad (qmk#22118)

Co-authored-by: ShandonCodes <shandon@shandon.codes>

* YMDK Melody96 Matrix Touch-Up (qmk#22113)

* Correct layout/matrix diagram

Correct swapped designations for ANSI Backslash and ANSI Enter keys.

[docs]

* Correct matrix data

Correct the matrix data for:

  - `LAYOUT_all`
  - `LAYOUT_96_ansi`
  - `LAYOUT_96_ansi_splitbs`

which all had the matrix positions for ANSI Backslash and ANSI Enter swapped.

[bugfix]

* Implement `LAYOUT_hotswap` directly

Implement `LAYOUT_hotswap` as its own layout, instead of aliasing it to
`LAYOUT_96_ansi`.

[bugfix]

* Specify primary support for Soldered PCBs

Current version of codebase primarily supports Soldered PCBs.

[enhancement] [docs]

* Update feature_rgblight.md (qmk#21483)

* Revert "Update feature_rgblight.md" (qmk#22132)

* included keyboard.h. To use is_keyboard_master with a split with an i… (qmk#21571)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: tokky <tokky@localhost-live.attlocal.net>

* Added Wyvern Hotswap by BredWorks (qmk#21141)

Co-authored-by: Neil Brian Ramirez <nightlykeyboards@gmail.com>
Co-authored-by: Neil Brian Ramirez <nightlyboards@gmail.com>

* Fix combo_ref_from_layer respect different default layer [qmk#21780] (qmk#21781)

* Fix variable misspelling (qmk#21774)

* amend split_* community_layouts in keyboards (qmk#21847)

* amend 75_(ansi|iso) community_layouts in keyboards/ (qmk#21837)

* Add is0gr to QMK (qmk#22024)

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Document the RP2040-specific PS/2 implementation (qmk#22079)

Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>

* Bump tj-actions/changed-files from 38 to 39 (qmk#21923)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Add Palmetto PCB (qmk#21955)

* Add zoom98 (qmk#22062)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>

* Added more rgb effects for rpk-001 keyboard (qmk#22120)

* Fix typo in oled_driver (qmk#22134)

betwen -> between

* Fix entry into bootloader for STM32G431. (qmk#22138)

* Fix doc for programmable buttons. (qmk#22136)

Co-authored-by: Yanfei Guo <yguo@anl.gov>

* rastersoft/minitkl layout corrections (qmk#22130)

* [Keyboard] Add spankbd, 3x5+3 split keyboard (qmk#22003)

* Initial support for CSTM80 (qmk#22137)

* Add support for YMD75 V4 - ISO (qmk#22128)

* Drop V2 production updates (qmk#22147)

* Allow inline generation of compile_commands.json while doing a `qmk compile`, using `--compiledb` (qmk#21549)

* Allow for `qmk mass-compile all:<keymap>` (qmk#22116)

Co-authored-by: Joel Challis <git@zvecr.com>

* HnahKB Freyr Layout Additions (qmk#22150)

* Add layout/matrix diagram

[docs]

* Add `LAYOUT_tkl_ansi_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_ansi_tsangan_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_ansi_tsangan`

[enhancement]

* Add `LAYOUT_tkl_ansi_wkl_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_ansi_wkl`

[enhancement]

* Add `LAYOUT_tkl_iso_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_iso_tsangan_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_iso_tsangan`

[enhancement]

* Add `LAYOUT_tkl_iso_wkl_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_iso_wkl`

[enhancement]

* Extend Community Layout support

Add as supported layouts:

- `tkl_ansi_split_bs_rshift`
- `tkl_ansi_tsangan`
- `tkl_ansi_tsangan_split_bs_rshift`
- `tkl_iso_split_bs_rshift`
- `tkl_iso_tsangan`
- `tkl_iso_tsangan_split_bs_rshift`

[enhancement]

* Rura66 Layout Data (qmk#22155)

* Friendly-format `info.json`

[style]

* Update layout data

- separate keyboard halves
- add vertical stagger

[refactor]

* add linworks fave60 (qmk#20796)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Add KB12 keyboard (qmk#21605)

Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* 4pplet Eagle/Viper Rep Rev.A Layout Additions II (qmk#22161)

* teleport/native: switch from wrongly used user to kb function, boost matrix scan rate (qmk#21172)

* enable LTO

* change from _user to _kb function

* switch matrix io delay to nops, add opt=3 for higher scan rates

* disable console which was enabled for testing but collides with endpoint used by VIA

* switched from opt=3 to opt=2

* Update keyboards/teleport/native/native.c

Co-authored-by: Joel Challis <git@zvecr.com>

* slightly upped debounce, as some testers had chatter with async + default debounce

---------

Co-authored-by: Joel Challis <git@zvecr.com>

* Add Brutalv2 60 Keyboard (qmk#22094)

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* keyboards: Add support for Sofle Choc (qmk#16736)

Co-developed-by: Brian Low <github@brianlow.com>
Co-developed-by: duese <duese@users.noreply.github.com>

Co-authored-by: Thomas Weißschuh <thomas@t-8ch.de>

* Remove rosetta instructions for Apple Silicon (qmk#22174)

* Bastard Keyboards: Add support for Dilemma Max (4x6_4) (qmk#22064)

* tentatively add dilemma 4x6_4 WIP untested 
PR by Casuanoob.

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* Miscellaneous fixes for recently merged keyboards (qmk#22179)

* Add Soulstone keyboard (qmk#22093)

* [Keyboard] Add SyenaKeyboards (qmk#22168)

Co-authored-by: Syenasweta <syenasweta@gmail.com>

* Fix minimum python version references (qmk#22191)

* Added /handwired/ziyoulang_k3_mod (qmk#21965)

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* Add the Split67 keyboard PCB (qmk#22107)

Co-authored-by: “yuezp” <“yuezpchn@126.com”>

* Monstargear XO87 Soldered: correct layout data (qmk#22199)

Correct key positions on the bottom row for `LAYOUT_tkl_ansi_tsangan`.

[chore]

* Add Acheron Themis and its variants (qmk#22142)

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Add keyboard Projectd/75/Projectd_75_ansi (qmk#21628)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: gksygithub <106651989+gksygithub@users.noreply.github.com>

* [Keyboard] Add SP-111 v2 keyboard (qmk#21652)

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>

* [Keyboard] Add qwertyqop60hs (qmk#22164)

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Added 3dp660 oled keyboard (qmk#20591)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: xia0 <xiao@morgan.net.au>

* Add Wave keyboard (qmk#22054)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* Add Keychron Q1 Version 2 (qmk#20416)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: Adophoxia <andyao1528@gmail.com>

* Add Line TKL keyboard (qmk#22172)

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Add printedpad keyboard (qmk#21202)

Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* Add `qmk ci-validate-aliases` (qmk#22205)

* Move orphaned Yugo-M files (qmk#22211)

Moves files that were left behind by qmk#14996.

[bugfix]

* Klein_HS PCB support (qmk#22203)

* Update vid for printedpad (qmk#22215)

* Adding BriianPowell Discipline Keyboard Layout Updates (qmk#21474)

* Flag vial keymaps in 'qmk lint' (qmk#22227)

* Fix build error when Automatic Mouse Layer is enabled (qmk#22229)

* [Keyboard] vinhcatba/uncertainty (qmk#21142)

* vinh: test fw for uncertainty (deprecated)

* v0.1: update base firmware with 2 layers, use bongo cat animation for oled

* v0.1: change directory

* v0.1: cleanup

* v0.2: update layers

* v0.3: add VIA support

* v0.3: add VIA support (continue)

* vinh: test fw for uncertainty (deprecated)

* v0.1: update base firmware with 2 layers, use bongo cat animation for oled

* v0.1: change directory

* v0.1: cleanup

* v0.2: update layers

* v0.3: add VIA support

* v0.3: add VIA support (continue)

* v0.3: change keyboard name, remove eeprom config save in VIA keymap

* cleanup for PR

* update readme

* vinh: test fw for uncertainty (deprecated)

* v0.1: update base firmware with 2 layers, use bongo cat animation for oled

* v0.1: change directory

* v0.1: cleanup

* v0.2: update layers

* v0.3: add VIA support

* v0.3: add VIA support (continue)

* vinh: test fw for uncertainty (deprecated)

* v0.1: update base firmware with 2 layers, use bongo cat animation for oled

* v0.1: change directory

* v0.1: cleanup

* v0.3: change keyboard name, remove eeprom config save in VIA keymap

* cleanup for PR

* update readme

* add license to header files, update ws2812 driver and DI_PIN to info.json

* resovle PR suggestion for config.h, halconf.h, mcuconf.h

* update info.json regarding PR comment

* update bongo.h regarding PR comment

* add oled mode toggle

* update readme.md, rules.mk regarding PR comment

* add submodule update

* move oled handle to keyboard level

* Update keyboards/vinhcatba/uncertainty/uncertainty.c

forgot user-level proces_record

* now using bongo as source file

* Apply suggestions from code review

remove default value codes

* move WPM_ENABLE and ENCODER_MAP_ENABLE to keymap level

* Apply suggestions from code review

* Apply suggestions from code review

* Update keyboards/vinhcatba/uncertainty/config.h

* [Keyboard] Split-Cloud Handwired (qmk#21327)

* Added new handwired, the Split-Cloud

* Minor changes to make clang-format happy

* Alligned files with project standard.

Trimmed midi out of the default layout, modified the readme, and removed unnecessary files.

* Simplified default keymap further, changes to info.json

* Moved image to imgur, simplified, and removed the unneeded rules.mk file

* Update keyboards/handwired/split_cloud/readme.md

Changed image in readme to Huge Thumbnail instead of Original.

* Removed unneeded tri layer custom keycodes

Now using the built-in functionality!

* Update keyboards/handwired/split_cloud/readme.md

Accidentally reverted this when making other changes

* Fix typo in `docs/feature_tri_layer.md` (qmk#22232)

`Stes` -> `Sets`

* [Keyboard] HorrorTroll Nyx (qmk#21143)

* Added support keyboard Nyx

* Resolved zvarc suggested and lint error

* Delete FORCE_NKRO due to problem with BIOS on mainboard

* Resolved dunk2k suggested and limit more brightness, disable some RGB Effect

* Resolved drashna suggested

* Delete flower blooming effect and move to rev1 folder

* Yampad add missing includes for CONVERT_TO (qmk#22237)

* Yampad add missing includes for CONVERT_TO (qmk#22237)

* Fix old usage of UNICODE_MODE_MAC (qmk#22238)

* [Keyboard] Add MIIIW BlackIO83 (qmk#21970)

* Add MIIIW BlackIO83

* Improve the code

* Updated instructions for entering the bootloader

* Update keyboards/miiiw/blackio83/rev_0100/config.h

* Update keyboards/miiiw/blackio83/rev_0100/config.h

* Update keyboards/miiiw/blackio83/config.h

* Update config.h

* [Keyboard] MonsGeek M3 (qmk#20542)

* Add keybord monsgeek m3.

* Add keybord monsgeek m3.

* Add keybord monsgeek m3.

* updata rules.mk

* add readme.md

* delete monsgeek\m3\rgb_matrix_kb.inc

* add DISABLE_M3_KEYCODES

* user_config --> kb_config

* Move code to info.json,and removed redundant features

* Update keyboards/monsgeek/m3/info.json

* Update keyboards/monsgeek/m3/info.json

* Update readme.md

* Update keyboards/monsgeek/m3/config.h

* Update keyboards/monsgeek/m3/info.json

* Update keyboards/monsgeek/m3/info.json

* Update keyboards/monsgeek/m3/keymaps/default/keymap.c

* Update keyboards/monsgeek/m3/keymaps/via/keymap.c

* Update keyboards/monsgeek/m3/readme.md

* Update m3.c

* Update m3.c

* Update info.json

* Update keymap.c

* Update keymap.c

* Update config.h

* Update keyboards/monsgeek/m3/readme.md

* Update keyboards/monsgeek/m3/rules.mk

* Update keyboards/monsgeek/m3/info.json

* Update keyboards/monsgeek/m3/keymaps/default/keymap.c

* Update keyboards/monsgeek/m3/keymaps/via/keymap.c

* Update keyboards/monsgeek/m3/info.json

* Update keyboards/monsgeek/m3/info.json

* Update keyboards/monsgeek/m3/info.json

* Update m3.c

* Update keyboards/monsgeek/m3/info.json

* Update keyboards/monsgeek/m3/m3.c

* Update keymap.c

replace the tabs with spaces

* Update keymap.c

replace the tabs with spaces

* add missing gpio include for pointing motion pin (qmk#22246)

* [Keyboard] Hineybush H101 (qmk#22186)

* initial h101 commit

* update keymap and add via support

* update doc stuff

* readme typo

* updates

* add indicator LEDs, needs testing

* update readme

* update USB VID/PID to match VIA json

* Update keyboards/hineybush/h101/readme.md

* Update keyboards/hineybush/h101/keymaps/default/keymap.c

* Update keyboards/hineybush/h101/readme.md

* Update keyboards/hineybush/h101/keymaps/via/keymap.c

* updates from PR comments

* updates per PR comments

* idk why the folder is acting weird

* maybe this will fix it

* update to hopefully fix everything weird

* keycode fixes

* keymap updates

* add 60_(ansi|iso)_wkl* community layouts (qmk#21811)

* add 60_(ansi|iso)_tsangan_wkl* layouts

* Update keymap.c

* `tsangan_wkl` to `wkl`

* update info.json

* split backspace changes

* Apply suggestions from code review

* Keyboard change blu/vimclutch to hardware revision B. (qmk#22247)

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

* Add Ratio60 PCB (qmk#21609)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>

* Add 62 key Dactyl Manuform (qmk#21394)

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Add `60_iso_tsangan_split_bs_rshift` Community Layout (qmk#21812)

* add 60_(ansi|iso)_tsangan_split_bs_shift layouts

* shift to rshift

* remove 60_ansi_tsangan_split_bs_rshift

* Update layouts/default/60_iso_tsangan_split_bs_rshift/info.json

* Kisakey (qmk#22217)

Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* Reword mention of personal keymaps from PR checklist (qmk#22258)

* Add support for CSTC40 keyboard (qmk#22154)

Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: lesshonor and waffle87
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: lesshonor
Co-authored-by: itsvar <120035196+itsvar8@users.noreply.github.com>

* [Keyboard] Add support for EnviousDesign keyboards (qmk#17544)

* Add support for Envious.Design Keyboards

Add various RP2040 keyboards I've designed.

* Fixed missing newlines at EOF.

* Ran CLANG-FORMAT and sorted out any potential issues.

* Gave keyboards all unique product IDs

* Made requested changes.

* removed all VIAL related code
* sorted out license on all *.h or *.h  files
* removed outdated RESET Keycode

* missed some VIAL bits

* Made suggested changes

* Made Suggested Changes

* missed one file to change.

* Attempted fix of CI issues

* Update .gitmodules

* Revert "Update .gitmodules"

This reverts commit f4bace5.

* hopefully fixed all CI and QMK lint issues

* resolve more CI errors and a couple typos

* fixed last remaining issue as of now

* made requested changes

* further more on suggested change

* Delete README.md

* derpy workaround to change case of readme

* finished up 65M firmware

via does not work, I will investigate another time.

* re-did a lot of 65M firmware bits, also fixed via for this board

* corrected mistake in firmware

* made suggested change to info.json for 65m/60F

* finished 65M non via keymap and re-sorted via keymap

* Update keyboards/enviousdesign/tkl/rgb/keymaps/default/keymap.c

* Update keyboards/enviousdesign/tkl/rgb/keymaps/default/keymap.c

* Apply suggestions from code review

Verified updated Info.json works for aforementioned keyboards,

* Follow-up commit with aforementioned suggested changes

* Apply suggestions from code review

correction to a couple typos pointed out.

* follow-up removed some un-needed Readmes and corrected a mistake in 60F via keymap

* Apply suggestions from code review

* Added images of PCB to each Keyboard README

* Apply suggestions from code review

* Update keyboards/enviousdesign/60f/readme.md

* Added missing aspects of info.json and corrected RGB_DI_PIN to WS2812_DI_PIN in RGB keyboard

* made requested changes

* Update config.h

* used QMK migrate to update info.json

* Apply suggestions from code review

* Update keyboards/enviousdesign/65m/info.json

* renamed named keyboards as suggested and added commission keyboard to repo

* renamed file to hopefully please lint

* renamed things to be all lower case since lint doesn't appear to look for upper case

* updated keymap.c and removed unnecessary file

* fixed readme and a couple other bits

* converted various aspects to json information

* attempt fix for lint error

* fix some issues I overlooked

* Apply suggestions from code review

* moved some folders about as suggested

* Made suggested changes

* Apply suggestions from code review

* removed outdated config.h

* fixed errors in 65M and mini1800

* Apply suggestions from code review

* Update keyboards/enviousdesign/delirium/rev1/info.json

* Update keyboards/enviousdesign/65m/info.json

* Apply suggestions from code review

* [Keyboard] Inland V83P (qmk#21725)

* [Keyboard]add v83p keyboard.

* Update keymap.c

* Update keyboards/inland/v83p/keymaps/via/keymap.c

* Update keyboards/inland/v83p/keymaps/default/keymap.c

* Update keyboards/inland/v83p/config.h

* Update keyboards/inland/v83p/info.json

* Update info.json

* Update keymap.c

* Update keyboards/inland/v83p/mcuconf.h

* Update keyboards/inland/v83p/halconf.h

* Update keyboards/inland/v83p/info.json

* Update keyboards/inland/v83p/v83p.c

* Update keymap.c

replace the tabs with spaces

* Update keymap.c

replace the tabs with spaces

* Update keyboards/inland/v83p/info.json

* [Keyboard] RPNeko65 by lendunistus (qmk#21747)

* initialise rpneko65, info.json

* force NKRO

* define WS2812 stuff

and capitalise RPNeko65

* use RGBlight, add ANSI to keymap.c

also remove _ADC suffixes from pins

* basic readme

plus making it so the info.json RGB values are actually recognised as integers

* update repository URL

* fix info.json formatting

* caps lock LED implementation

"borrowed" from waffling60

* put RGBLIGHT_ENABLE in json

also remove "pin" from the rgblight option

* add actually correct keymaps

also reformat info.json

* move to designer folder, add image to README

* move keyboard to separate revision folder

and remove erroneous tag from config.h

* remove brightness/hue/saturation steps

* change device version to 1.0

* move quantum.h include to top

* actually, let's try a new image

I also forgot to save the info.json file beforehand
oops

* Remove comma in info.json

* Community layouts in info.json

* Delete rpneko65/readme.md

* Apply suggested changes to readme

* Suggested code changes

* Suggested imgur link

* rename code file

this was the issue all along
sigh

* Correct layer matching this time

* Move Enter in info.json

* README/info.json change

* Another batch of suggestions

* amend alice* community_layouts in keyboards (qmk#21846)

* add alice* to keyboards

* add seigaiha

* additions

* Update info.json

* revert wanderland

* add tgr/alice

* add matrix diagram.md

* [Keyboard] Add Okayu (qmk#22077)

Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* Enable encoder map on navpad1.0 (qmk#22266)

* [Keyboard] jukaie/jk01 (qmk#20573)

* ADD Keyboard

* Resolved requested changes

* update keymap.c file

* resolved requested changes

* updated info.json file

* Updated requested changes

* Delete JK01.h file

* Resolved requested changes

* Delete readme.md

* add rules.mk to default folder

* Upload default/keymap.c

* Add via/keymap.c

* Updated info.Json file

* Change VID in info.json

* Resolved requested changes

* Resolved requested changes.

* Resolved requested changes

* Updated changes

---------

Co-authored-by: gksygithub <gskyGit@gsky.com.tw>

* Fix typo in keychron v6 encoder map enable (qmk#22272)

* Allow for disabling of parallel processing of qmk find and `qmk mass-compile`. (qmk#22160)

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Fixup symbol sizing listing. (qmk#22307)

* [Keyboard] Add purin (qmk#22306)

* [Keyboard] Add QK100 (qmk#21782)

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Remove extra led_matrix_indicators_user call (qmk#22329)

* [Keyboard] Add LGBTKL (qmk#22331)

Co-authored-by: jack <0x6a73@protonmail.com>

* Clarify PIO define is optional in docs. (qmk#22339)

* [Keyboard] Add Kaly42 (qmk#22282)

* Added Kaly/Kaly42 keyboard's minimal files.

* Updated readme.md; New link and improved description text.

* Apply suggestions from code review

Added all suggestions given by @dunk2k

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Added community_layouts to info.json.

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

---------

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* [Keyboard] add pisces pcb (qmk#22334)

* [Keyboard] Waffling60 Rev E ANSI Hotswap (qmk#22270)

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Add darkproject/kd87a_bfg_edition keyboard (qmk#18981)

Co-authored-by: gksygithub <106651989+gksygithub@users.noreply.github.com>

* eason/aeroboard - Modify bootloader (qmk#22286)

* [Keyboard] doksin (qmk#22220)

* [Keyboard] Add Velvet hotswap & solder (qmk#22284)

* Flag more VIAL config options in lint (qmk#22345)

* Removed clueboard link as the website has been parked for some time (qmk#22290)

* [Keyboard] add enter67 keyboard (qmk#22346)

Co-authored-by: “yuezp” <“yuezpchn@126.com”>

* Fix for swapped PID and VID (qmk#22372)

* Add Kindakeyboards Conone65 Via support (qmk#22320)

* [Keyboard] Add TeaQueen (qmk#22352)

Co-authored-by: jack <0x6a73@protonmail.com>

* [Keyboard] Add Klein_SD (qmk#22371)

Co-authored-by: Joel Challis <git@zvecr.com>

* boardsource/unicorne - Fixed OLED layers being all set to zero (qmk#22389)

---------

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Filip Sund <filip.sund@gmail.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: Shandon Anderson <CheeseL0ver@users.noreply.github.com>
Co-authored-by: ShandonCodes <shandon@shandon.codes>
Co-authored-by: Deddia Permana <deddiapermana97@gmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: peepeetee <43021794+peepeetee@users.noreply.github.com>
Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Dan Ford <dan-github2@dlford.co>
Co-authored-by: Joe Scotto <8194147+joe-scotto@users.noreply.github.com>
Co-authored-by: temp4gh <temp4bbs@163.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: syc <squall_sha@163.com>
Co-authored-by: Joy Lee <joylee.lc@foxmail.com>
Co-authored-by: Joy <chang.li@westberrytech.com>
Co-authored-by: Poring <97579443+PoringH@users.noreply.github.com>
Co-authored-by: Charles Strahan <charles@cstrahan.com>
Co-authored-by: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com>
Co-authored-by: dztech <moyi4681@users.noreply.github.com>
Co-authored-by: Apteryks <maxim.cournoyer@gmail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Ryan Neff <ryan.ray.neff@fluke.com>
Co-authored-by: Daniel Osipishin <88534270+subrezon@users.noreply.github.com>
Co-authored-by: Daniel Osipishin <danielos@retarus.de>
Co-authored-by: era <73109780+eerraa@users.noreply.github.com>
Co-authored-by: lendunistus <53618962+lendunistus@users.noreply.github.com>
Co-authored-by: Ethan Perry <86326912+wheres-perry@users.noreply.github.com>
Co-authored-by: Tom singleton <Radther@users.noreply.github.com>
Co-authored-by: T.A <83424097+t0kies@users.noreply.github.com>
Co-authored-by: tokky <tokky@localhost-live.attlocal.net>
Co-authored-by: DeskDaily <65656486+DeskDaily@users.noreply.github.com>
Co-authored-by: Neil Brian Ramirez <nightlykeyboards@gmail.com>
Co-authored-by: Neil Brian Ramirez <nightlyboards@gmail.com>
Co-authored-by: Ben Cooper <63478578+bncpr@users.noreply.github.com>
Co-authored-by: plaublin <pl@pakupaku.me>
Co-authored-by: Andrew Kannan <andrew.kannan@gmail.com>
Co-authored-by: Michael Büchler <michael.buechler@posteo.net>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ross Montsinger <rmontsinger@gmail.com>
Co-authored-by: spbgzh <72414103+spbgzh@users.noreply.github.com>
Co-authored-by: Ikko Eltociear Ashimine <eltociear@gmail.com>
Co-authored-by: Yanfei Guo <yanf.guo@gmail.com>
Co-authored-by: Yanfei Guo <yguo@anl.gov>
Co-authored-by: Idan Kamara <i@idank.me>
Co-authored-by: DUILCHOI <48977039+duilchoi@users.noreply.github.com>
Co-authored-by: DOIO2022 <116554792+DOIO2022@users.noreply.github.com>
Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
Co-authored-by: Moritz Plattner <moritz.plattner@gmx.net>
Co-authored-by: Brian Low <brian@brianlow.com>
Co-authored-by: Thomas Weißschuh <thomas@t-8ch.de>
Co-authored-by: casuanoob <96005765+casuanoob@users.noreply.github.com>
Co-authored-by: Sergey Fedorov <oni.strech@gmail.com>
Co-authored-by: Syenasweta <nshrllh.l.fz@gmail.com>
Co-authored-by: Syenasweta <syenasweta@gmail.com>
Co-authored-by: Coom <1655787+coomstoolbox@users.noreply.github.com>
Co-authored-by: yuezp <49514776+LXF-YZP@users.noreply.github.com>
Co-authored-by: “yuezp” <“yuezpchn@126.com”>
Co-authored-by: Álvaro A. Volpato <alvaro.augusto.volpato@gmail.com>
Co-authored-by: gskygithub <106651989+gskygithub@users.noreply.github.com>
Co-authored-by: gksygithub <106651989+gksygithub@users.noreply.github.com>
Co-authored-by: thompson-ele <ele.thompson12@gmail.com>
Co-authored-by: leyew <102467346+itsme-zeix@users.noreply.github.com>
Co-authored-by: xia0 <307671+xia0@users.noreply.github.com>
Co-authored-by: xia0 <xiao@morgan.net.au>
Co-authored-by: Etienne Collin <collin.etienne.media@gmail.com>
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: Adophoxia <andyao1528@gmail.com>
Co-authored-by: studiokestra <74369928+studiokestra@users.noreply.github.com>
Co-authored-by: noahbei <123449614+noahbei@users.noreply.github.com>
Co-authored-by: Brian <brian@powell.place>
Co-authored-by: ikorihn <16367098+ikorihn@users.noreply.github.com>
Co-authored-by: vinhcatba <vinhcatba1@gmail.com>
Co-authored-by: Cloud Chagnon <noob.cloud@gmail.com>
Co-authored-by: HorrorTroll <sonicvipduc@gmail.com>
Co-authored-by: Arthur <37627147+ArthurCyy@users.noreply.github.com>
Co-authored-by: jonylee@hfd <108282809+jonylee1986@users.noreply.github.com>
Co-authored-by: Josh Hinnebusch <joshhinnebusch@gmail.com>
Co-authored-by: Agent Blu, 006 <blu006@ucr.edu>
Co-authored-by: 4pplet <mail@4pplet.com>
Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
Co-authored-by: adam tombleson <rekarnar@gmail.com>
Co-authored-by: kisakey-luxury <143060353+kisakey-luxury@users.noreply.github.com>
Co-authored-by: Wilhelm Schuster <ws@rot13.io>
Co-authored-by: Felipe Curty <felipecrp@gmail.com>
Co-authored-by: itsvar <120035196+itsvar8@users.noreply.github.com>
Co-authored-by: EnviousData <Enviousdata@gmail.com>
Co-authored-by: Sắn <59417802+MaiTheSan@users.noreply.github.com>
Co-authored-by: MakotoKurauchi <pluis@me.com>
Co-authored-by: jukaie <131839249+jukaie@users.noreply.github.com>
Co-authored-by: gksygithub <gskyGit@gsky.com.tw>
Co-authored-by: Yonghyuk Choi <42003350+oRE-o@users.noreply.github.com>
Co-authored-by: owlab-git <88034417+owlab-git@users.noreply.github.com>
Co-authored-by: Olivia J <65928618+ojthetiny@users.noreply.github.com>
Co-authored-by: Kael Augusto <45074062+Dwctor@users.noreply.github.com>
Co-authored-by: khchen2004 <148961563+khchen2004@users.noreply.github.com>
Co-authored-by: eason <98533237+EasonQian1@users.noreply.github.com>
Co-authored-by: millet <49581988+milletmilletmilletmilletmilletmilletmil@users.noreply.github.com>
Co-authored-by: Felix Jen <fjen@felixjen.com>
Co-authored-by: Brian Choromanski <BrianChoromanski@gmail.com>
Co-authored-by: Cipulot <40441626+Cipulot@users.noreply.github.com>
Co-authored-by: Matt Chan <5021+mattchan@users.noreply.github.com>
Co-authored-by: gregandcin <gregandcinbusiness@gmail.com>
Co-authored-by: ID64F <54159272+ID64F@users.noreply.github.com>
  • Loading branch information
Show file tree
Hide file tree
Showing 935 changed files with 50,185 additions and 1,736 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Get changed files
id: file_changes
uses: tj-actions/changed-files@v38
uses: tj-actions/changed-files@v39

- name: Run qmk formatters
shell: 'bash {0}'
Expand Down
27 changes: 3 additions & 24 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

- name: Get changed files
id: file_changes
uses: tj-actions/changed-files@v38
uses: tj-actions/changed-files@v39

- name: Print info
run: |
Expand Down Expand Up @@ -74,31 +74,10 @@ jobs:
fi
exit $exit_code
- name: Verify at most one added keyboard
- name: Verify keyboard aliases
if: always()
shell: 'bash {0}'
run: |
git reset --hard
git clean -xfd
# Get the keyboard list and count for the target branch
git checkout -f ${{ github.base_ref }}
git pull --ff-only
QMK_KEYBOARDS_BASE=$(qmk list-keyboards)
QMK_KEYBOARDS_BASE_COUNT=$(qmk list-keyboards | wc -l)
# Get the keyboard list and count for the PR
git checkout -f ${{ github.head_ref }}
git merge --no-commit --squash ${{ github.base_ref }}
QMK_KEYBOARDS_PR=$(qmk list-keyboards)
QMK_KEYBOARDS_PR_COUNT=$(qmk list-keyboards | wc -l)
echo "::group::Keyboards changes in this PR"
diff -d -U 0 <(echo "$QMK_KEYBOARDS_BASE") <(echo "$QMK_KEYBOARDS_PR") | grep -vE '^(---|\+\+\+|@@)' | sed -e 's@^-@Removed: @g' -e 's@^+@ Added: @g'
echo "::endgroup::"
if [[ $QMK_KEYBOARDS_PR_COUNT -gt $(($QMK_KEYBOARDS_BASE_COUNT + 1)) ]]; then
echo "More than one keyboard added in this PR -- see the PR Checklist."
echo "::error::More than one keyboard added in this PR -- see the PR Checklist."
exit 1
fi
qmk ci-validate-aliases
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -108,5 +108,6 @@ compile_commands.json
.clangd/
.cache/

# VIA(L) json files that don't belong in QMK repo
# VIA(L) files that don't belong in QMK repo
via*.json
/keyboards/**/keymaps/vial/*
4 changes: 2 additions & 2 deletions builddefs/build_keyboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -495,10 +495,10 @@ check-size: top-symbols
top-symbols: build
echo "###########################################"
echo "# Highest flash usage:"
$(NM) -Crtd --size-sort $(BUILD_DIR)/$(TARGET).elf | grep -i ' [t] ' | head -n$(NUM_TOP_SYMBOLS) | sed -e 's#^0000000# #g' -e 's#^000000# #g' -e 's#^00000# #g' -e 's#^0000# #g' -e 's#^000# #g' -e 's#^00# #g' -e 's#^0# #g'
$(NM) -Crtd --size-sort $(BUILD_DIR)/$(TARGET).elf | grep ' [RrTt] ' | head -n$(NUM_TOP_SYMBOLS) | sed -e 's#^0000000# #g' -e 's#^000000# #g' -e 's#^00000# #g' -e 's#^0000# #g' -e 's#^000# #g' -e 's#^00# #g' -e 's#^0# #g'
echo "###########################################"
echo "# Highest RAM usage:"
$(NM) -Crtd --size-sort $(BUILD_DIR)/$(TARGET).elf | grep -i ' [dbv] ' | head -n$(NUM_TOP_SYMBOLS) | sed -e 's#^0000000# #g' -e 's#^000000# #g' -e 's#^00000# #g' -e 's#^0000# #g' -e 's#^000# #g' -e 's#^00# #g' -e 's#^0# #g'
$(NM) -Crtd --size-sort $(BUILD_DIR)/$(TARGET).elf | grep ' [BbCDdGgSs] ' | head -n$(NUM_TOP_SYMBOLS) | sed -e 's#^0000000# #g' -e 's#^000000# #g' -e 's#^00000# #g' -e 's#^0000# #g' -e 's#^000# #g' -e 's#^00# #g' -e 's#^0# #g'
echo "###########################################"
endif

Expand Down
5 changes: 5 additions & 0 deletions data/mappings/info_config.hjson
Original file line number Diff line number Diff line change
Expand Up @@ -190,4 +190,9 @@
"PRODUCT": {"info_key": "keyboard_name", "warn_duplicate": false, "value_type": "str", "deprecated": true, "replace_with": "`keyboard_name` in info.json"},
"PRODUCT_ID": {"info_key": "usb.pid", "value_type": "hex", "deprecated": true, "replace_with": "`usb.pid` in info.json"},
"VENDOR_ID": {"info_key": "usb.vid", "value_type": "hex", "deprecated": true, "replace_with": "`usb.vid` in info.json"},

// Items we want flagged in lint
"VIAL_KEYBOARD_UID": {"info_key": "_invalid.vial_uid", "invalid": true},
"VIAL_UNLOCK_COMBO_COLS": {"info_key": "_invalid.vial_unlock_cols", "invalid": true},
"VIAL_UNLOCK_COMBO_ROWS": {"info_key": "_invalid.vial_unlock_rows", "invalid": true}
}
64 changes: 37 additions & 27 deletions data/mappings/keyboard_aliases.hjson
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
// "target": "<keyboard_folder>"
// }
//

/* This list of aliases is for testing purposes -- ensures "linked list" recursive traversal works correctly. */
"_test_a": { "target": "_test_b" },
"_test_b": { "target": "_test_c" },
"_test_c": { "target": "planck/rev6" },

/* The main list of aliases for moved keyboards within QMK. */
"2_milk": {
"target": "spaceman/2_milk"
},
Expand Down Expand Up @@ -35,7 +42,7 @@
"target": "amjkeyboard/amjpad"
},
"angel64": {
"target": "angel64/alpha"
"target": "kakunpc/angel64/alpha"
},
"ashpil/modelm_usbc": {
"target": "ibm/model_m/ashpil_usbc"
Expand All @@ -47,10 +54,10 @@
"target": "viktus/at101_bh"
},
"atom47/rev2": {
"target": "maartenwut/atom47/rev2"
"target": "evyd13/atom47/rev2"
},
"atom47/rev3": {
"target": "maartenwut/atom47/rev3"
"target": "evyd13/atom47/rev3"
},
"bakeneko60": {
"target": "kkatano/bakeneko60"
Expand All @@ -65,7 +72,7 @@
"target": "bear_face/v1"
},
"bm16a": {
"target": "kprepublic/bm16a"
"target": "kprepublic/bm16a/v1"
},
"bm16s": {
"target": "kprepublic/bm16s"
Expand All @@ -77,16 +84,16 @@
"target": "kprepublic/bm43a"
},
"bm60poker": {
"target": "kprepublic/bm60poker"
"target": "kprepublic/bm60hsrgb_poker/rev1"
},
"bm60rgb": {
"target": "kprepublic/bm60rgb"
"target": "kprepublic/bm60hsrgb/rev1"
},
"bm60rgb_iso": {
"target": "kprepublic/bm60rgb_iso"
"target": "kprepublic/bm60hsrgb_iso/rev1"
},
"bm68rgb": {
"target": "kprepublic/bm68rgb"
"target": "kprepublic/bm68hsrgb/rev1"
},
"bpiphany/pegasushoof": {
"target": "bpiphany/pegasushoof/2013"
Expand Down Expand Up @@ -140,7 +147,10 @@
"target": "jagdpietr/drakon"
},
"durgod/k320": {
"target": "durgod/k3x0/k320"
"target": "durgod/k320/base"
},
"durgod/k3x0/k320": {
"target": "durgod/k320/base"
},
"durgod/hades": {
"target": "durgod/dgk6x/hades_ansi"
Expand Down Expand Up @@ -269,7 +279,7 @@
"target": "idb/idb_60"
},
"idobo": {
"target": "idobao/id75"
"target": "idobao/id75/v1"
},
"jacky_studio/piggy60": {
"target": "jacky_studio/piggy60/rev1"
Expand Down Expand Up @@ -401,7 +411,7 @@
"target": "mechlovin/adelais/rgb_led/rev1"
},
"mechlovin/adelais/standard_led": {
"target": "mechlovin/adelais/standard_led/rev2"
"target": "mechlovin/adelais/standard_led/arm/rev2"
},
"mechlovin/delphine": {
"target": "mechlovin/delphine/mono_led"
Expand Down Expand Up @@ -455,10 +465,10 @@
"target": "pabile/p20/ver1"
},
"pancake/feather": {
"target": "spaceman/pancake/feather"
"target": "spaceman/pancake/rev1/feather"
},
"pancake/promicro": {
"target": "spaceman/pancake/promicro"
"target": "spaceman/pancake/rev1/promicro"
},
"peiorisboards/ixora": {
"target": "coarse/ixora"
Expand All @@ -467,7 +477,7 @@
"target": "dm9records/plaid"
},
"plain60": {
"target": "maartenwut/plain60"
"target": "evyd13/plain60"
},
"ploopyco/trackball": {
"target": "ploopyco/trackball/rev1_005"
Expand Down Expand Up @@ -503,10 +513,10 @@
"target": "wilba_tech/rama_works_u80_a"
},
"ramonimbao/herringbone": {
"target": "ramonimbao/herringbone/v1"
"target": "rmi_kb/herringbone/v1"
},
"ramonimbao/mona": {
"target": "ramonimbao/mona/v1"
"target": "rmi_kb/mona/v1"
},
"rgbkb/pan": {
"target": "rgbkb/pan/rev1/32a"
Expand Down Expand Up @@ -542,10 +552,10 @@
"target": "tkw/stoutgat/v1"
},
"suihankey": {
"target": "suihankey/split/alpha"
"target": "kakunpc/suihankey/split/alpha"
},
"ta65": {
"target": "maartenwut/ta65"
"target": "evyd13/ta65"
},
"tartan": {
"target": "dm9records/tartan"
Expand All @@ -563,13 +573,13 @@
"target": "matthewdias/txuu"
},
"underscore33": {
"target": "underscore33/rev1"
"target": "tominabox1/underscore33/rev1"
},
"vinta": {
"target": "coarse/vinta"
},
"wasdat": {
"target": "maartenwut/wasdat"
"target": "evyd13/wasdat"
},
"westfoxtrot/cypher": {
"target": "westfoxtrot/cypher/rev1"
Expand All @@ -581,10 +591,10 @@
"target": "xiudi/xd002"
},
"xd004": {
"target": "xiudi/xd004"
"target": "xiudi/xd004/v1"
},
"xd60": {
"target": "xiudi/xd60"
"target": "xiudi/xd60/rev2"
},
"xd68": {
"target": "xiudi/xd68"
Expand Down Expand Up @@ -831,7 +841,7 @@
"target": "kagizaraya/halberd"
},
"handwired/hillside/0_1": {
"target": "handwired/hillside/48"
"target": "hillside/48/0_1"
},
"hecomi/alpha": {
"target": "takashiski/hecomi/alpha"
Expand All @@ -843,10 +853,10 @@
"target": "bpiphany/hid_liber"
},
"id67/default_rgb": {
"target": "idobao/id67/default_rgb"
"target": "idobao/id67"
},
"id67/rgb": {
"target": "idobao/id67/rgb"
"target": "idobao/id67"
},
"id80": {
"target": "idobao/id80/v2/ansi"
Expand Down Expand Up @@ -1236,7 +1246,7 @@
"target": "marksard/treadstone48/rev2"
},
"tronguylabs/m122_3270": {
"target": "ibm/model_m_122/m122_3270"
"target": "ibm/model_m_122/m122_3270/teensy"
},
"ua62": {
"target": "nacly/ua62"
Expand Down Expand Up @@ -1290,7 +1300,7 @@
"target": "ydkb/yd68"
},
"ymd75": {
"target": "ymdk/ymd75"
"target": "ymdk/ymd75/rev1"
},
"ymd96": {
"target": "ymdk/ymd96"
Expand Down
4 changes: 4 additions & 0 deletions data/schemas/definitions.jsonschema
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
"minLength": 1,
"maxLength": 250
},
"snake_case": {
"type": "string",
"pattern": "^[a-z][a-z0-9_]*$"
},
"layout_macro": {
"oneOf": [
{
Expand Down
9 changes: 8 additions & 1 deletion data/schemas/keyboard.jsonschema
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,11 @@
"enabled": {"type": "boolean"}
}
},
"features": {"$ref": "qmk.definitions.v1#/boolean_array"},
"features": {
"$ref": "qmk.definitions.v1#/boolean_array",
"propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" }

},
"indicators": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -370,6 +374,7 @@
"properties": {
"animations": {
"type": "object",
"propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" }
"additionalProperties": {
"type": "boolean"
}
Expand Down Expand Up @@ -419,6 +424,7 @@
"properties": {
"animations": {
"type": "object",
"propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" }
"additionalProperties": {
"type": "boolean"
}
Expand Down Expand Up @@ -471,6 +477,7 @@
"properties": {
"animations": {
"type": "object",
"propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" }
"additionalProperties": {
"type": "boolean"
}
Expand Down
4 changes: 2 additions & 2 deletions docs/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The QMK CLI makes building and working with QMK keyboards easier. We have provid

### Requirements :id=requirements

QMK requires Python 3.6 or greater. We try to keep the number of requirements small but you will also need to install the packages listed in [`requirements.txt`](https://github.com/qmk/qmk_firmware/blob/master/requirements.txt). These are installed automatically when you install the QMK CLI.
QMK requires Python 3.7 or greater. We try to keep the number of requirements small but you will also need to install the packages listed in [`requirements.txt`](https://github.com/qmk/qmk_firmware/blob/master/requirements.txt). These are installed automatically when you install the QMK CLI.

### Install Using Homebrew (macOS, some Linux) :id=install-using-homebrew

Expand All @@ -20,7 +20,7 @@ qmk setup # This will clone `qmk/qmk_firmware` and optionally set up your build

### Install Using pip :id=install-using-easy_install-or-pip

If your system is not listed above you can install QMK manually. First ensure that you have Python 3.6 (or later) installed and have installed pip. Then install QMK with this command:
If your system is not listed above you can install QMK manually. First ensure that you have Python 3.7 (or later) installed and have installed pip. Then install QMK with this command:

```
python3 -m pip install qmk
Expand Down
6 changes: 3 additions & 3 deletions docs/cli_development.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def hello(cli):

First we import the `cli` object from `milc`. This is how we interact with the user and control the script's behavior. We use `@cli.argument()` to define a command line flag, `--name`. This also creates a configuration variable named `hello.name` (and the corresponding `user.name`) which the user can set so they don't have to specify the argument. The `cli.subcommand()` decorator designates this function as a subcommand. The name of the subcommand will be taken from the name of the function.

Once inside our function we find a typical "Hello, World!" program. We use `cli.log` to access the underlying [Logger Object](https://docs.python.org/3.6/library/logging.html#logger-objects), whose behavior is user controllable. We also access the value for name supplied by the user as `cli.config.hello.name`. The value for `cli.config.hello.name` will be determined by looking at the `--name` argument supplied by the user, if not provided it will use the value in the `qmk.ini` config file, and if neither of those is provided it will fall back to the default supplied in the `cli.argument()` decorator.
Once inside our function we find a typical "Hello, World!" program. We use `cli.log` to access the underlying [Logger Object](https://docs.python.org/3.7/library/logging.html#logger-objects), whose behavior is user controllable. We also access the value for name supplied by the user as `cli.config.hello.name`. The value for `cli.config.hello.name` will be determined by looking at the `--name` argument supplied by the user, if not provided it will use the value in the `qmk.ini` config file, and if neither of those is provided it will fall back to the default supplied in the `cli.argument()` decorator.

# User Interaction

Expand All @@ -56,13 +56,13 @@ There are two main methods for outputting text in a subcommand- `cli.log` and `c

You can use special tokens to colorize your text, to make it easier to understand the output of your program. See [Colorizing Text](#colorizing-text) below.

Both of these methods support built-in string formatting using python's [printf style string format operations](https://docs.python.org/3.6/library/stdtypes.html#old-string-formatting). You can use tokens such as `%s` and `%d` within your text strings then pass the values as arguments. See our Hello, World program above for an example.
Both of these methods support built-in string formatting using python's [printf style string format operations](https://docs.python.org/3.7/library/stdtypes.html#old-string-formatting). You can use tokens such as `%s` and `%d` within your text strings then pass the values as arguments. See our Hello, World program above for an example.

You should never use the format operator (`%`) directly, always pass values as arguments.

### Logging (`cli.log`)

The `cli.log` object gives you access to a [Logger Object](https://docs.python.org/3.6/library/logging.html#logger-objects). We have configured our log output to show the user a nice emoji for each log level (or the log level name if their terminal does not support unicode.) This way the user can tell at a glance which messages are most important when something goes wrong.
The `cli.log` object gives you access to a [Logger Object](https://docs.python.org/3.7/library/logging.html#logger-objects). We have configured our log output to show the user a nice emoji for each log level (or the log level name if their terminal does not support unicode.) This way the user can tell at a glance which messages are most important when something goes wrong.

The default log level is `INFO`. If the user runs `qmk -v <subcommand>` the default log level will be set to `DEBUG`.

Expand Down
2 changes: 1 addition & 1 deletion docs/coding_conventions_python.md
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ At the time of this writing our tests are not very comprehensive. Looking at the

## Integration Tests

Integration tests can be found in `lib/python/qmk/tests/test_cli_commands.py`. This is where CLI commands are actually run and their overall behavior is verified. We use [`subprocess`](https://docs.python.org/3.6/library/subprocess.html#module-subprocess) to launch each CLI command and a combination of checking output and returncode to determine if the right thing happened.
Integration tests can be found in `lib/python/qmk/tests/test_cli_commands.py`. This is where CLI commands are actually run and their overall behavior is verified. We use [`subprocess`](https://docs.python.org/3.7/library/subprocess.html#module-subprocess) to launch each CLI command and a combination of checking output and returncode to determine if the right thing happened.

## Unit Tests

Expand Down
Loading

0 comments on commit 002457b

Please sign in to comment.