From 29d1b5c233775e299e55e62f5a41fa1fa6a0e3ff Mon Sep 17 00:00:00 2001 From: Dan White Date: Sun, 19 Nov 2023 08:19:12 -0700 Subject: [PATCH] Merge upstream (#38) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doio/kb16: Added timeout option for OLED boot logo. (#21823) * Revert "fix 60_hhkb ASCII diagram (#21813)" (#21869) This reverts commit af2d6ea128f684691432e2a209cfa11a63f77422. * CannonKeys Meetup Pad 2023 (#21806) Co-authored-by: Ryan * [keyboard] add sweeq, a ferris/sweep variant with diodes (#21597) * Update macOS install script (#21854) * Abko AK84BT Layout Touch-Up (#21876) * [refactor] rename LAYOUT_75_ansi to LAYOUT * [enhancement] touch-up layout * AH Haven65 Community Layout support (#21880) * [refactor] rename LAYOUT to LAYOUT_65_ansi_blocker * [enhancement] enable Community Layout support * nullbitsco/snap: fix broken keymaps (#21877) * chore: ignore virtual environment directory (#20905) * Add 1upkeyboards Super16v3 (#21665) Co-authored-by: Duncan Sutherland * [keyboard] add redragon/k667 (#21417) Co-authored-by: Duncan Sutherland Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Ryan Co-authored-by: syc * Add M6-C Keyboard Firmware (#21852) Co-authored-by: Joel Challis Co-authored-by: Drashna Jaelre Co-authored-by: Wolf * Added kiserdesigns keyboard folder and Madeline keyboard (#21857) Co-authored-by: Drashna Jaelre Co-authored-by: Ryan * redragon/k667: Remove 2 layer VIA restriction (#21889) * AH Haven80 Community Layout support (#21885) * [enhancement] correct layout data * [refactor] rename LAYOUT to LAYOUT_tkl_f13_ansi_tsangan * [enhancement] enable Community Layout support * Haven80 Solder: add LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift [enhancement] * Haven80 Solder: add LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift [enhancement] * Haven80 Solder: add LAYOUT_tkl_f13_iso_tsangan [enhancement] * Haven80 Solder: extend Community Layout support [enhancement] * ANAVI Macro Pad 12: rename LAYOUT to LAYOUT_ortho_4x3 (#21886) [refactor] * Chosfox CF81: correct layout data (#21902) * Auto-label data-driven efforts (#21900) * CannonKeys Bastion75 Layout Additions (#21899) * [docs] add layout/matrix diagram * [refactor] rename LAYOUT to LAYOUT_all * [enhancement] add LAYOUT_ansi_blocker_split_bs * [enhancement] add LAYOUT_ansi_blocker * [enhancement] add LAYOUT_ansi_blocker_tsangan_split_bs * [enhancement] add LAYOUT_ansi_blocker_tsangan * [enhancement] add LAYOUT_iso_blocker_split_bs * [enhancement] add LAYOUT_iso_blocker * [enhancement] add LAYOUT_iso_blocker_tsangan_split_bs * [enhancement] add LAYOUT_iso_blocker_tsangan * CannonKeys Bastion60 Layout Additions (#21887) * [bugfix] correct LAYOUT_60_iso_tsangan key order * [docs] add layout/matrix diagram * [enhancement] add LAYOUT_60_tsangan_hhkb * [enhancement] add LAYOUT_60_ansi_tsangan * [enhancement] add LAYOUT_60_iso * [enhancement] add LAYOUT_60_iso_split_bs_rshift * [enhancement] add LAYOUT_60_iso_tsangan_split_bs_rshift * [enhancement] add LAYOUT_60_hhkb * [enhancement] extend Community Layout support * CannonKeys Bastion65 Layout Additions (#21888) * [docs] add layout/matrix diagram * [refactor] rename LAYOUT to LAYOUT_all * [enhancement] add LAYOUT_65_ansi_blocker_split_bs * [enhancement] add LAYOUT_65_ansi_blocker * [enhancement] add LAYOUT_65_ansi_blocker_tsangan_split_bs * [enhancement] add LAYOUT_65_ansi_blocker_tsangan * [enhancement] add LAYOUT_65_iso_blocker_split_bs * [enhancement] add LAYOUT_65_iso_blocker * [enhancement] add LAYOUT_65_iso_blocker_tsangan_split_bs * [enhancement] add LAYOUT_65_iso_blocker_tsangan * [enhancement] enable Community Layout support * CannonKeys BastionTKL Layout Additions (#21901) * [docs] add layout/matrix diagram * [enhancement] 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_f13_ansi_tsangan * [enhancement] add LAYOUT_tkl_f13_ansi_split_bs_rshift * [enhancement] add LAYOUT_tkl_f13_ansi * [enhancement] correct LAYOUT_tkl_iso key order * [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_f13_iso_split_bs_rshift * [enhancement] add LAYOUT_tkl_f13_iso * [enhancement] add LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift * [enhancement] add LAYOUT_tkl_f13_iso_tsangan * [enhancement] extend Community Layout support * Bump actions/checkout from 3 to 4 (#21907) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * GMMK2 65% ISO: Correct layout data (#21925) Correct key sizes/positioning on the right side of the board. * [Docs] Improve contrast for warnings in dark mode (#21928) * GMMK2 96% ANSI: Correct layout data (#21937) [enhancement] * Cipulot EC Theca Community Layout Support (#21913) * Alias `LAYOUT_all` as `LAYOUT_tkl_ansi` The data for `LAYOUT_all` and `LAYOUT_tkl_ansi` is identical, so alias the former to the latter to reduce redundancy. [refactor] * Rename `LAYOUT_tkl_ansi_tsangan_wkl` to `LAYOUT_tkl_ansi_wkl` [refactor] * Enable Community Layout support [enhancement] * customMK EVO70 R2 Layout Additions (#21916) * Rename `LAYOUT` to `LAYOUT_all` [refactor] * Add layout/matrix diagram [docs] * Correct layout data Reduce the gap between the encoder/macro section and the alphanumeric section by 0.25u. [enhancement] * Add `LAYOUT_ansi_blocker` [enhancement] * Add `LAYOUT_iso_blocker` [enhancement] * Fix redundant `layout_aliases` keys per dunk2k [bugfix] * [Keyboard] Add Binepad Pixie (#21524) * Add Binepad Pixie * Post waffle87 and drashna review recommendations applied * Post-drashna code review suggestions applied Co-authored-by: Drashna Jaelre * post zvecr review --------- Co-authored-by: Drashna Jaelre * dnworks FRLTKL Community Layout support (#21922) * Add layout/matrix diagram [docs] * Rename `LAYOUT` to `LAYOUT_all` [refactor] * 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] * 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] * Enable Community Layout support [enhancement] * Repair malformed links in keyboard README files (#21969) * Remove oversize binaries (#21976) This stops a situation where a user could end up flashing oversize firmware soft bricking hardware. * Drewkeys Mercury65 Layout Additions (#21924) * Rename `LAYOUT` to `LAYOUT_all` [refactor] * Add layout/matrix diagram [docs] * Correct `LAYOUT_all` data Correct the order of the Up arrow and End keys. [enhancement] * Tidy-up `info.json` formatting - add line breaks between physical rows - remove trailing spaces [style] * Add `LAYOUT_iso_blocker_split_bs` [enhancement] * Add `LAYOUT_iso_blocker_tsangan_split_bs` [enhancement] * Add `LAYOUT_ansi_blocker_split_bs` [enhancement] * Add `LAYOUT_ansi_blocker_tsangan_split_bs` [enhancement] * Gray Studio Think65 v3 Layout Additions (#21930) * Add layout/matrix diagram [docs] * Format `info.json` as strict JSON [style] * Add `LAYOUT_all` [enhancement] * Refactor keymaps to use `LAYOUT_all` Refactor the `default` and `via` keymaps to use the `LAYOUT_all` macro. - change second Left Shift key to `KC_NUBS` - insert `KC_NUHS` keycode - update keycode grid alignment - remove trailing whitespace [refactor] * Rename `LAYOUT_65_blocker` to `LAYOUT_ansi_blocker` [refactor] * Rename `LAYOUT_65_iso_blocker` to `LAYOUT_iso_blocker` [refactor] * Correct `LAYOUT_iso_blocker` matrix data The Quote key was mapped as [1, 14] instead of [2, 12]. [bugfix] * Add `LAYOUT_ansi_blocker_split_bs` [enhancement] * Add `LAYOUT_ansi_blocker_tsangan_split_bs` [enhancement] * Add `LAYOUT_ansi_blocker_tsangan` [enhancement] * Add `LAYOUT_iso_blocker_split_bs` [enhancement] * Add `LAYOUT_iso_blocker_tsangan_split_bs` [enhancement] * Add `LAYOUT_iso_blocker_tsangan` [enhancement] * Handwired ScottoKeebs Configurator Updates (#21990) * ScottoKeebs ScottoAlp: Correct layout data [enhancement] * ScottoKeebs ScottoCMD: Correct layout data [enhancement] * ScottoKeebs ScottoErgo: Correct layout data Add hand separation and vertical stagger to the layout data. [enhancement] * ScottoKeebs ScottoFrog: Correct layout data [enhancement] * ScottoKeebs ScottoGame: Correct layout data [enhancement] * ScottoKeebs ScottoInvader: Correct layout data [enhancement] * ScottoKeebs ScottoNum: Correct layout data [enhancement] * ScottoKeebs ScottoSplit: Correct layout data [enhancement] * ScottoKeebs ScottoStarter: Correct layout data [enhancement] * Inland MK47 Community Layout Support (#21998) * Rename `LAYOUT` to `LAYOUT_planck_mit` [refactor] * Enable Community Layout support [enhancement] * Touch-up keymaps - grid-align keycodes [style] * Jaykeeb Sebelas: Standardize Layout Names (#21999) * Rename `LAYOUT_65_ansi_blocker` to `LAYOUT_ansi_blocker` [refactor] * Rename `LAYOUT_65_ansi_blocker_split_bs` to `LAYOUT_ansi_blocker_split_bs` [refactor] * Rename `LAYOUT_65_ansi_blocker_tsangan` to `LAYOUT_ansi_blocker_tsangan` [refactor] * Rename `LAYOUT_65_ansi_blocker_tsangan_split_bs` to `LAYOUT_ansi_blocker_tsangan_split_bs` [refactor] * Keebio NyquistPad Layout Updates (#22000) * Rename `LAYOUT` to `LAYOUT_ortho_5x6` [refactor] * Add `LAYOUT_ortho_5x6_1x2u` [enhancement] * Kibou Suisei Layout Addition (#22001) * Add layout/matrix diagram [docs] * Rename `LAYOUT` to `LAYOUT_65_ansi_blocker_tsangan_wkl_split_bs` [refactor] * Add `LAYOUT_65_ansi_blocker_tsangan_wkl` [enhancement] * Kopibeng XT87 Layout Additions & Touch-Up (#22002) * Add `LAYOUT_tkl_ansi_wkl_split_bs_rshift` [enhancement] * Add `LAYOUT_tkl_ansi_wkl` [enhancement] * Add `LAYOUT_tkl_iso_wkl_split_bs_rshift` [enhancement] * Add `LAYOUT_tkl_iso_wkl` [enhancement] * Correct layout data Correct key positioning on the function row. [enhancement] * Friendly-format `info.json` [style] * Move ISO Enter to Home Row Corrects the implementation of the ISO Community Layouts. [bugfix] * Update to 'peterfalken' userspace configurations (#21836) * Krado Industries Promenade Layout Additions (#22014) * Add layout/matrix diagram [docs] * Rename `LAYOUT` to `LAYOUT_all` [refactor] * Correct key order [bugfix] * Add `LAYOUT_2x2u` [enhancement] * Add `LAYOUT_2x3u` [enhancement] * Add `LAYOUT_6u_space` [enhancement] * Add `LAYOUT_7u_space` [enhancement] * Touch-up `via` keymap Update keycode grid alignment to match the `default` keymap. [style] * Linworks Fave60a Community Layout Support (#22015) * Friendly-format `info.json` [style] * Correct layout data [chore] * Add layout/matrix diagram [docs] * Rename `LAYOUT` to `LAYOUT_60_tsangan_hhkb` [refactor] * Add `LAYOUT_60_ansi_tsangan` [enhancement] * Enable Community Layout support [enhancement] * Maze Studio Jocker 1800 Layout Additions (#22016) * Add layout/matrix diagram [docs] * Rename `LAYOUT` to `LAYOUT_ansi_split_bs` [refactor] * Add `LAYOUT_ansi` [enhancement] * Add `LAYOUT_ansi_wkl_split_bs` [enhancement] * Add `LAYOUT_ansi_wkl` [enhancement] * Mechlovin Zed65 910 Layout Standardization (#22018) * Add layout/matrix diagram [docs] * Rename `LAYOUT_65_iso_tsangan_split_bs` to `LAYOUT_iso_split_bs` [refactor] * Rename `LAYOUT_65_ansi_tsangan` to `LAYOUT_ansi` [refactor] * Rename `LAYOUT_65_ansi_blocker_tsangan` to `LAYOUT_ansi_blocker_tsangan` [refactor] * Rename `LAYOUT_65_ansi_tsangan_split_bs` to `LAYOUT_all` [refactor] * Mode M256-WS Community Layout Support (#22020) * Add layout/matrix diagram [docs] * Rename `LAYOUT` to `LAYOUT_all` [refactor] * Add `LAYOUT_65_ansi_blocker_split_bs` [enhancement] * Add `LAYOUT_65_ansi_blocker` [enhancement] * Add `LAYOUT_65_ansi_blocker_tsangan_split_bs` [enhancement] * Add `LAYOUT_65_ansi_blocker_tsangan` [enhancement] * Add `LAYOUT_65_iso_blocker_split_bs` [enhancement] * Add `LAYOUT_65_iso_blocker` [enhancement] * patch `LAYOUT_65_iso_blocker_split_bs` * patch `LAYOUT_65_iso_blocker` * Add `LAYOUT_65_iso_blocker_tsangan_split_bs` [enhancement] * Add `LAYOUT_65_iso_blocker_tsangan` [enhancement] * Enable Community Layout support [enhancement] * Mode M256-WH Community Layout Support (#22019) * Add layout/matrix diagram [docs] * Rename `LAYOUT` to `LAYOUT_65_ansi_blocker` [refactor] * Add `LAYOUT_65_ansi_blocker_tsangan` [enhancement] * Enable Community Layout support [enhancement] * MonsGeek M1: Correct layout data (#22026) Apply vertical offset to the arrow keys. [chore] * `qmk format-json`: Add an in-place mode to format json command (#21610) * QVEX Tech Lynepad2 Layout Update (#22030) * Add layout/matrix diagram [docs] * Update layout data Update layout data to disambiguate the key/joystick/thumbpad functions in Configurator. [chore] * OwLab Jelly Evolv Solder Layout Additions (#22029) * Add layout/matrix diagram [docs] * Friendly-format `info.json` [style] * Rename `LAYOUT` to `LAYOUT_all` [refactor] * Add `LAYOUT_ansi_blocker` [enhancement] * Add `LAYOUT_ansi_blocker_split_bs` [enhancement] * Add `LAYOUT_ansi_blocker_tsangan_split_bs` [enhancement] * Add `LAYOUT_ansi_blocker_tsangan` [enhancement] * Add `LAYOUT_iso_blocker` [enhancement] * Add `LAYOUT_iso_blocker_split_bs` [enhancement] * Add `LAYOUT_iso_blocker_tsangan_split_bs` [enhancement] * Add `LAYOUT_iso_blocker_tsangan` [enhancement] * Nix Studio Lilith Layout Additions (#22028) * Add layout/matrix diagram [docs] * Sort keys in `info.json` [style] * Add `LAYOUT_65_ansi_blocker_split_bs` [enhancement] * Add `LAYOUT_65_ansi_blocker_tsangan` [enhancement] * Add `LAYOUT_65_iso_blocker_split_bs` [enhancement] * Add `LAYOUT_65_iso_blocker_tsangan_split_bs` [enhancement] * Extend Community Layout support [enhancement] * Neson Design Nico Layout Additions (#22027) * Add layout/matrix diagram [docs] * Rename `LAYOUT` to `LAYOUT_65_xt_ansi_blocker_split_bs` [refactor] * Add `LAYOUT_65_xt_ansi_blocker` [enhancement] * Add `LAYOUT_65_xt_ansi_blocker_tsangan` [enhancement] * Add `LAYOUT_65_xt_ansi_blocker_tsangan_split_bs` [enhancement] * Touch-up keymaps - grid-align keycodes - use four-space indent - use QMK-native keycode aliases [refactor] * Update `via` keymap Update the `via` keymaps to have the same key assignments as the `default` keymap, which is more fleshed out. [chore] * [Keyboard] Add splitkb.com's Aurora Helix (#21871) Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Co-authored-by: Ryan * [Keyboard] add 1upkeyboards 1upslider8 (#21546) Co-authored-by: Duncan Sutherland Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Drashna Jaelre * [Keyboard] Adding Treasure TYPE-9 series III (#21748) Co-authored-by: Duncan Sutherland Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Joel Challis Co-authored-by: Drashna Jaelre * Raindrop Layout Updates (#22032) * Add layout/matrix diagram [docs] * Rename `LAYOUT_all` to `LAYOUT_64_ansi_split_bs` [refactor] * Add `LAYOUT_60_ansi_split_bs_rshift` [enhancement] * Rico Phoenix Project No. 1 Layout Additions (#22035) * Add layout/matrix diagram [docs] * Rename `LAYOUT` to `LAYOUT_all` [refactor] * Add `LAYOUT_65_ansi_rwkl_split_bs` [enhancement] * Add `LAYOUT_65_ansi_rwkl` [enhancement] * Add `LAYOUT_65_ansi_wkl_split_bs` [enhancement] * Add `LAYOUT_65_ansi_wkl` [enhancement] * Add `LAYOUT_65_iso_rwkl_split_bs` [enhancement] * Add `LAYOUT_65_iso_rwkl` [enhancement] * Add `LAYOUT_65_iso_wkl_split_bs` [enhancement] * Add `LAYOUT_65_iso_wkl` [enhancement] * RuckerMachine RM Fullsize Layout Additions (#22036) * Add layout/matrix diagram [docs] * Rename `LAYOUT` to `LAYOUT_all` [refactor] * Add `LAYOUT_fullsize_108_ansi` [enhancement] * Add `LAYOUT_fullsize_108_ansi_tsangan` [enhancement] * Sho Studios ARC Layout Addition (#22037) * Add layout/matrix diagram [docs] * Format `info.json` Apply four-space indent. [style] * Add `LAYOUT_ansi_split_bs` [enhancement] * Move Digitizer to "Software Features" (#22031) * Add missing gpio and chibios defs to uart.h (#22033) * Fix paragon encoder pinout for soldered version (#22043) * geistmaschine/macropod: fix issues waking up after suspend on apple devices (#22023) * Add all RGB Matrix Animations to city42 (#21992) * Viktus Styrka Topre Layout Standardization and Touch-Up (#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 (#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 (#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 (#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 (#21731) * Add missing gpio include to ps2 vendor (#22063) * [Keyboard] Add riot pad (#22060) Co-authored-by: ShandonCodes * DZTech Pluto Community Layout support (#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 (#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 (#21936) * SapuSeven MacroPad12: rename LAYOUT to LAYOUT_ortho_3x4 (#22081) * Alchemist Keyboards OGRN Layout Addition (#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/ (#22066) * Restrict "feature" and "animation" keys (#21895) * [Keyboard] Momokai Aurora (#20419) Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com> Co-authored-by: Ryan Co-authored-by: Drashna Jaelre Co-authored-by: Joel Challis * [Keyboard] add Quokka keyboard (#20979) Co-authored-by: Drashna Jaelre Co-authored-by: Ryan * apply 66_(ansi|iso) to keyboards (#21834) * Add ScottoSlant Keyboard (#20942) Co-authored-by: Ryan * Add ScottoMouse Handwired Macropad (#21074) Co-authored-by: Joel Challis Co-authored-by: Ryan Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com> * Add ScottoFly Keyboard (#20939) Co-authored-by: Ryan * Add ScottoMacrodeck Macropad (#20946) Co-authored-by: Drashna Jaelre Co-authored-by: Ryan * Add ScottoLong Keyboard (#20938) Co-authored-by: Ryan * Add funtions of Encoder and VIA for redragon/k667 (#21917) Co-authored-by: Duncan Sutherland Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Ryan Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Co-authored-by: Joel Challis Co-authored-by: syc * [Keyboard] Add rpk-001 keyboard (#21042) Co-authored-by: Joel Challis Co-authored-by: Drashna Jaelre Co-authored-by: Duncan Sutherland Co-authored-by: Joy * amend 68_(ansi|iso) community_layouts in keyboards/ (#21835) * [Keyboard] Add QCK-75 (#21180) Co-authored-by: Ryan Co-authored-by: Joel Challis Co-authored-by: Drashna Jaelre Co-authored-by: Duncan Sutherland * Quarkeys Studio Z67 Solder Community Layout Support (#22095) * Quarkeys Studio Z67 Hotswap Community Layout Support (#22096) * kimiko: mirror encoder pins between halves (#21728) * Keychron q9 plus (#21399) Co-authored-by: Ryan Co-authored-by: Drashna Jaelre * add dz60v2 keyboard (#21862) Co-authored-by: Duncan Sutherland Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Co-authored-by: Drashna Jaelre Co-authored-by: Ryan * add odinmini layout (#21983) Co-authored-by: Ryan * keymaps: Fix hacker_dvorak build. (#22102) * Allow for `qmk compile -kb all`. (#22022) * Royal Kludge RK G68 Community Layout Support (#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 (#22112) * Shoc: physically arrange keymaps/layout macro (#22100) * Fix up `qmk mass-compile` makefile indenting. (#22115) * Add 'dactyl_tracer' keyboard (#20993) Co-authored-by: Drashna Jaelre Co-authored-by: Ryan * add subrezon/lancer keyboard (#20792) Co-authored-by: Joel Challis Co-authored-by: Drashna Jaelre Co-authored-by: Daniel Osipishin * [Keyboard] Add SIRIND Klein (#21951) Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Co-authored-by: Drashna Jaelre Co-authored-by: jack <0x6a73@protonmail.com> * GMMK2 96% ISO: Correct layout data (#22101) * Add reminder about format-json to PR Checklist (#22055) * Add Jank RP2040 Dactyl (#21973) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Drashna Jaelre * [Keyboard] Enable RGB_TEST animation on riot_pad (#22118) Co-authored-by: ShandonCodes * YMDK Melody96 Matrix Touch-Up (#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 (#21483) * Revert "Update feature_rgblight.md" (#22132) * included keyboard.h. To use is_keyboard_master with a split with an i… (#21571) Co-authored-by: Drashna Jaelre Co-authored-by: tokky * Added Wyvern Hotswap by BredWorks (#21141) Co-authored-by: Neil Brian Ramirez Co-authored-by: Neil Brian Ramirez * Fix combo_ref_from_layer respect different default layer [#21780] (#21781) * Fix variable misspelling (#21774) * amend split_* community_layouts in keyboards (#21847) * amend 75_(ansi|iso) community_layouts in keyboards/ (#21837) * Add is0gr to QMK (#22024) Co-authored-by: Duncan Sutherland Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Document the RP2040-specific PS/2 implementation (#22079) Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> * Bump tj-actions/changed-files from 38 to 39 (#21923) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add Palmetto PCB (#21955) * Add zoom98 (#22062) Co-authored-by: Drashna Jaelre Co-authored-by: Joel Challis * Added more rgb effects for rpk-001 keyboard (#22120) * Fix typo in oled_driver (#22134) betwen -> between * Fix entry into bootloader for STM32G431. (#22138) * Fix doc for programmable buttons. (#22136) Co-authored-by: Yanfei Guo * rastersoft/minitkl layout corrections (#22130) * [Keyboard] Add spankbd, 3x5+3 split keyboard (#22003) * Initial support for CSTM80 (#22137) * Add support for YMD75 V4 - ISO (#22128) * Drop V2 production updates (#22147) * Allow inline generation of compile_commands.json while doing a `qmk compile`, using `--compiledb` (#21549) * Allow for `qmk mass-compile all:` (#22116) Co-authored-by: Joel Challis * HnahKB Freyr Layout Additions (#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 (#22155) * Friendly-format `info.json` [style] * Update layout data - separate keyboard halves - add vertical stagger [refactor] * add linworks fave60 (#20796) Co-authored-by: Drashna Jaelre Co-authored-by: Ryan Co-authored-by: Duncan Sutherland * Add KB12 keyboard (#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 Co-authored-by: Drashna Jaelre Co-authored-by: Ryan * 4pplet Eagle/Viper Rep Rev.A Layout Additions II (#22161) * teleport/native: switch from wrongly used user to kb function, boost matrix scan rate (#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 * slightly upped debounce, as some testers had chatter with async + default debounce --------- Co-authored-by: Joel Challis * Add Brutalv2 60 Keyboard (#22094) Co-authored-by: Duncan Sutherland * keyboards: Add support for Sofle Choc (#16736) Co-developed-by: Brian Low Co-developed-by: duese Co-authored-by: Thomas Weißschuh * Remove rosetta instructions for Apple Silicon (#22174) * Bastard Keyboards: Add support for Dilemma Max (4x6_4) (#22064) * tentatively add dilemma 4x6_4 WIP untested PR by Casuanoob. Co-authored-by: Joel Challis Co-authored-by: Drashna Jaelre Co-authored-by: Ryan * Miscellaneous fixes for recently merged keyboards (#22179) * Add Soulstone keyboard (#22093) * [Keyboard] Add SyenaKeyboards (#22168) Co-authored-by: Syenasweta * Fix minimum python version references (#22191) * Added /handwired/ziyoulang_k3_mod (#21965) Co-authored-by: Duncan Sutherland Co-authored-by: Drashna Jaelre * Add the Split67 keyboard PCB (#22107) Co-authored-by: “yuezp” <“yuezpchn@126.com”> * Monstargear XO87 Soldered: correct layout data (#22199) Correct key positions on the bottom row for `LAYOUT_tkl_ansi_tsangan`. [chore] * Add Acheron Themis and its variants (#22142) Co-authored-by: Drashna Jaelre * Add keyboard Projectd/75/Projectd_75_ansi (#21628) Co-authored-by: Ryan Co-authored-by: gksygithub <106651989+gksygithub@users.noreply.github.com> * [Keyboard] Add SP-111 v2 keyboard (#21652) Co-authored-by: Duncan Sutherland Co-authored-by: jack <0x6a73@protonmail.com> * [Keyboard] Add qwertyqop60hs (#22164) Co-authored-by: Duncan Sutherland * Added 3dp660 oled keyboard (#20591) Co-authored-by: Drashna Jaelre Co-authored-by: Duncan Sutherland Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: xia0 * Add Wave keyboard (#22054) Co-authored-by: Joel Challis Co-authored-by: Drashna Jaelre * Add Keychron Q1 Version 2 (#20416) Co-authored-by: Drashna Jaelre Co-authored-by: Ryan Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com> Co-authored-by: Adophoxia * Add Line TKL keyboard (#22172) Co-authored-by: Duncan Sutherland * Add printedpad keyboard (#21202) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Drashna Jaelre * Add `qmk ci-validate-aliases` (#22205) * Move orphaned Yugo-M files (#22211) Moves files that were left behind by #14996. [bugfix] * Klein_HS PCB support (#22203) * Update vid for printedpad (#22215) * Adding BriianPowell Discipline Keyboard Layout Updates (#21474) * Flag vial keymaps in 'qmk lint' (#22227) * Fix build error when Automatic Mouse Layer is enabled (#22229) * [Keyboard] vinhcatba/uncertainty (#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 (#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` (#22232) `Stes` -> `Sets` * [Keyboard] HorrorTroll Nyx (#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 (#22237) * Yampad add missing includes for CONVERT_TO (#22237) * Fix old usage of UNICODE_MODE_MAC (#22238) * [Keyboard] Add MIIIW BlackIO83 (#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 (#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 (#22246) * [Keyboard] Hineybush H101 (#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 (#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. (#22247) Co-authored-by: Ryan * Add Ratio60 PCB (#21609) Co-authored-by: Drashna Jaelre Co-authored-by: Duncan Sutherland Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Ryan Co-authored-by: 4pplet <4pplet@protonmail.com> Co-authored-by: 4pplet * Add 62 key Dactyl Manuform (#21394) Co-authored-by: Duncan Sutherland * Add `60_iso_tsangan_split_bs_rshift` Community Layout (#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 (#22217) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Ryan * Reword mention of personal keymaps from PR checklist (#22258) * Add support for CSTC40 keyboard (#22154) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: lesshonor and waffle87 Co-authored-by: Drashna Jaelre Co-authored-by: lesshonor Co-authored-by: itsvar <120035196+itsvar8@users.noreply.github.com> * [Keyboard] Add support for EnviousDesign keyboards (#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 f4bace51621ed0c5bd40c729fa1c6339f665f0b7. * 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 (#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 (#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 (#21846) * add alice* to keyboards * add seigaiha * additions * Update info.json * revert wanderland * add tgr/alice * add matrix diagram.md * [Keyboard] Add Okayu (#22077) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Duncan Sutherland Co-authored-by: Drashna Jaelre * Enable encoder map on navpad1.0 (#22266) * [Keyboard] jukaie/jk01 (#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 * Fix typo in keychron v6 encoder map enable (#22272) * Allow for disabling of parallel processing of qmk find and `qmk mass-compile`. (#22160) Co-authored-by: Duncan Sutherland * Fixup symbol sizing listing. (#22307) * [Keyboard] Add purin (#22306) * [Keyboard] Add QK100 (#21782) Co-authored-by: Drashna Jaelre * Remove extra led_matrix_indicators_user call (#22329) * [Keyboard] Add LGBTKL (#22331) Co-authored-by: jack <0x6a73@protonmail.com> * Clarify PIO define is optional in docs. (#22339) * [Keyboard] Add Kaly42 (#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 * Added community_layouts to info.json. Co-authored-by: Duncan Sutherland --------- Co-authored-by: Duncan Sutherland * [Keyboard] add pisces pcb (#22334) * [Keyboard] Waffling60 Rev E ANSI Hotswap (#22270) Co-authored-by: Duncan Sutherland * Add darkproject/kd87a_bfg_edition keyboard (#18981) Co-authored-by: gksygithub <106651989+gksygithub@users.noreply.github.com> * eason/aeroboard - Modify bootloader (#22286) * [Keyboard] doksin (#22220) * [Keyboard] Add Velvet hotswap & solder (#22284) * Flag more VIAL config options in lint (#22345) * Removed clueboard link as the website has been parked for some time (#22290) * [Keyboard] add enter67 keyboard (#22346) Co-authored-by: “yuezp” <“yuezpchn@126.com”> * Fix for swapped PID and VID (#22372) * Add Kindakeyboards Conone65 Via support (#22320) * [Keyboard] Add TeaQueen (#22352) Co-authored-by: jack <0x6a73@protonmail.com> * [Keyboard] Add Klein_SD (#22371) Co-authored-by: Joel Challis * boardsource/unicorne - Fixed OLED layers being all set to zero (#22389) * docs(rgblight): fix typos (#22399) * Teaqueen: correct layout data (#22406) * [Keyboard] Add Piantor Pro (#22361) Co-authored-by: Duncan Sutherland Co-authored-by: jack <0x6a73@protonmail.com> * Red Herring PCB support (#22409) Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Co-authored-by: jack <0x6a73@protonmail.com> * Add riblee handwired split keyboard (#22277) * [Keyboard] Add Duet Switch Tester (#22367) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Drashna Jaelre * [Keyboard] Add PCB Utopia88 (#22257) * Fix Herringbone pro Layouts (#22317) Co-authored-by: Duncan Sutherland * Add iso85k keyboard (#22411) Co-authored-by: Duncan Sutherland * Fix corne keylog (#22420) * [Keyboard] Fix bug in set_keylog function Fixes issue where some keys would not trigger the oled to output the row and column of a pressed key (would happen with LT(...) for my keymap) * [Keyboard] Tiny improvement to oled_render_keylog for crkbd Added improvement suggestion I got for another keyboard * Fix indicator LED definition for Sofle RGB. (#22408) * Update layer state of Lily58 from 'Default' to 'Base' (#22397) * Add SNES Macropad keyboard (#22377) Co-authored-by: jack <0x6a73@protonmail.com> * Update gregandcin/teaqueen (#22402) * [Keyboard] Add alpaca/wfeclipse (#22230) Co-authored-by: Joel Challis Co-authored-by: Drashna Jaelre * Add Ploopy Madromys mouse (#21989) Added PloopyCo madromys/adept mouse Co-authored-by: Drashna Jaelre * [Keyboard] Add MariOrion v2.5 (#22273) * Pushed MariOrion v2.5 to the branch. Prod and proto version added. * Pushed MariOrion v2.5 to the branch. Prod and proto version added. * Proper addition of layout options Addition of split bs rshift tsangan layout options. Co-authored-by: Duncan Sutherland * Merge branch 'toril940mariorion_v25' of github.com:toril940/qmk_firmware into toril940mariorion_v25 * Merge branch 'toril940mariorion_v25' of github.com:toril940/qmk_firmware into toril940mariorion_v25 * Update keyboards/mariorion_v25/proto/keymaps/via/keymap.c Co-authored-by: Duncan Sutherland * Update keyboards/mariorion_v25/proto/keymaps/default/keymap.c Co-authored-by: Duncan Sutherland * Updated readme.md with more information regarding make commands, and proto vs prod. * Update keyboards/mariorion_v25/prod/keymaps/via/keymap.c Co-authored-by: Duncan Sutherland * Update keyboards/mariorion_v25/prod/keymaps/default/keymap.c Co-authored-by: Duncan Sutherland * Update keyboards/mariorion_v25/prod/info.json Co-authored-by: Duncan Sutherland * Amended some changes to info.json - community layouts changed from scope to array. * Update keyboards/mariorion_v25/readme.md Co-authored-by: Duncan Sutherland * Revert keyboards/gray_studio/think65/solder/solder.c Co-authored-by: Duncan Sutherland * Revert keyboards/gray_studio/think65/solder/solder.c Co-authored-by: Duncan Sutherland * Revert keyboards/gray_studio/think65/solder/solder.c Co-authored-by: Duncan Sutherland * Removed via.json from the via keymaps. Replaced with matrix_diagram.md. via.json file moved off to [public mariorion_v25 repo](https://github.com/toril940/orion-v25) * Revert keyboards/gray_studio/think65/solder/solder.c Co-authored-by: Duncan Sutherland * Removed via.json from the via keymaps. Replaced with matrix_diagram.md. via.json file moved off to [public mariorion_v25 repo](https://github.com/toril940/orion-v25) * Update keyboards/mariorion_v25/proto/info.json Co-authored-by: Duncan Sutherland * Update keyboards/mariorion_v25/rules.mk Co-authored-by: Duncan Sutherland * Update keyboards/mariorion_v25/proto/info.json Co-authored-by: Duncan Sutherland * Update keyboards/mariorion_v25/proto/info.json Co-authored-by: Duncan Sutherland * Update keyboards/mariorion_v25/proto/info.json Co-authored-by: Duncan Sutherland * Update keyboards/mariorion_v25/prod/info.json Co-authored-by: Duncan Sutherland * Update keyboards/mariorion_v25/prod/info.json Co-authored-by: Duncan Sutherland * Update keyboards/mariorion_v25/prod/info.json Co-authored-by: Duncan Sutherland * Update keyboards/mariorion_v25/prod/info.json Co-authored-by: Duncan Sutherland * Revert keyboards/gray_studio/think65/solder/solder.c Co-authored-by: Duncan Sutherland * Update keyboards/mariorion_v25/matrix_diagram.md Co-authored-by: Duncan Sutherland * Update keyboards/mariorion_v25/readme.md Co-authored-by: Duncan Sutherland * Update keyboards/mariorion_v25/readme.md Co-authored-by: Duncan Sutherland * Update keyboards/mariorion_v25/readme.md Co-authored-by: Duncan Sutherland * Update keyboards/mariorion_v25/readme.md Co-authored-by: Duncan Sutherland * Update keyboards/mariorion_v25/readme.md Co-authored-by: Duncan Sutherland * Update keyboards/mariorion_v25/proto/mariorion_v25.c Co-authored-by: Duncan Sutherland * Update keyboards/mariorion_v25/prod/mariorion_v25.c Co-authored-by: Duncan Sutherland * Pushed new info.json and keymap.c files. * Pushed new info.json and keymap.c files. * Fixes to LED driver wrt PWM definitions with STM. * Update keyboards/mariorion_v25/prod/keymaps/via/keymap.c Co-authored-by: Ryan * Update keyboards/mariorion_v25/prod/keymaps/via/keymap.c Co-authored-by: Ryan * Update keyboards/mariorion_v25/prod/info.json Co-authored-by: Ryan * Update keyboards/mariorion_v25/prod/mariorion_v25.c Co-authored-by: Ryan * Update keyboards/mariorion_v25/proto/info.json Co-authored-by: Ryan * Update keyboards/mariorion_v25/proto/config.h Co-authored-by: Ryan * Update keyboards/mariorion_v25/proto/mariorion_v25.c Co-authored-by: Ryan * Update keyboards/mariorion_v25/proto/mariorion_v25.c Co-authored-by: Ryan * Update keyboards/mariorion_v25/proto/keymaps/via/keymap.c Co-authored-by: Ryan * Update keyboards/mariorion_v25/proto/keymaps/via/keymap.c Co-authored-by: Ryan * Committing a details update to readme.md. * Committing a details update to readme.md. * Update keyboards/mariorion_v25/prod/config.h Co-authored-by: Ryan * Update keyboards/mariorion_v25/prod/mariorion_v25.c Co-authored-by: Ryan * Revert "Committing a details update to readme.md." This reverts commit 068a82a1fcf1996d87f7f97a10e9f5fbbee79a29. * Committing a details update to readme.md. * Update keyboards/mariorion_v25/halconf.h Co-authored-by: Ryan * Update keyboards/mariorion_v25/mcuconf.h Co-authored-by: Ryan * Update keyboards/mariorion_v25/prod/config.h Co-authored-by: Ryan * Update keyboards/mariorion_v25/proto/config.h Co-authored-by: Ryan * Update keyboards/mariorion_v25/halconf.h Co-authored-by: Ryan * Production pictures replacing the standard ones in the readme.md :) * waffle87 requests bundled: - Licence headers added - Codeblocked matrix_diagram.md - Consolidated files where possible - Removed excess from config.h --------- Co-authored-by: toril940 Co-authored-by: Duncan Sutherland Co-authored-by: Ryan * Add `qmk license-check` developer-level CLI command. (#22075) * add 5087 keyboard (#20557) Co-authored-by: Drashna Jaelre Co-authored-by: Joel Challis Co-authored-by: Ryan Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * studiokestra/line_tkl: correct layout data (#22455) * fix `layouts` data * add EoF * [Keyboard] Fixes to make snes_macropad play nicer with qmk configurator (#22432) * [Keyboard] Change default implementation for get_layer_name_user Will now show the layer number instead of "Unknown", since this is what will be shown if QMK Configurator is used to compile the firmware. * [Keyboard] Update the layout info This makes it look sort of like a macropad + gamepad rather than an 4x6 ortholinear keyboard. * [Keyboard] Fix default implementation of get_layer_name_user Based on feedback from code review the implementation was swapped in favor of using get_u8_str. This implied a change to the argument type from int to uint8_t, which cascaded into the existing keymaps. (This made sense in general, since the return type of get_highest_layer is also a uint8_t.) * add `68_ansi` Community Layout to nebula68b (#22433) * Fix typos: key-modifer→key-modifier and interacton→interaction (#22464) * Bs equals (#21690) Co-authored-by: Drashna Jaelre Co-authored-by: Ryan Co-authored-by: jack <0x6A73@pm.me> * Update stale.yml (#22473) * Update stale.yml * [Keyboard] Add Eden (#22467) Co-authored-by: Duncan Sutherland * Add leonardo build target for leonardo + usb2.0 shield based projects (#22243) * [Keyboard] Add dnworks 997pt3 (#22466) Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Co-authored-by: Duncan Sutherland * [Doc] Improve converter references (#21801) * reset master to upstream (#35) * Update 1up keymaps (#36) * Fix IJ debugger shortcut (#37) --------- Signed-off-by: dependabot[bot] Co-authored-by: Lasse Luttermann Co-authored-by: Joel Challis Co-authored-by: Andrew Kannan Co-authored-by: Ryan Co-authored-by: Idan Kamara Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Jay Greco Co-authored-by: Frank Ebel Co-authored-by: ziptyze Co-authored-by: Duncan Sutherland Co-authored-by: temp4gh Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: syc Co-authored-by: Wolf Van Herreweghe Co-authored-by: Drashna Jaelre Co-authored-by: Wolf Co-authored-by: NCKiser <37519411+NCKiser@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: 3geek14 Co-authored-by: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com> Co-authored-by: Falco Gerritsjans Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: Luis Garcia Co-authored-by: harveysch <126267034+harveysch@users.noreply.github.com> Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Co-authored-by: TreasureTypes <73436366+TreasureTypes@users.noreply.github.com> Co-authored-by: Constantine Karos <36245370+karosc@users.noreply.github.com> Co-authored-by: Yak <68242321+yakMM@users.noreply.github.com> Co-authored-by: Moritz Plattner Co-authored-by: Controller Works <103382872+controller-works@users.noreply.github.com> Co-authored-by: Filip Sund Co-authored-by: Shandon Anderson Co-authored-by: ShandonCodes Co-authored-by: Deddia Permana Co-authored-by: peepeetee <43021794+peepeetee@users.noreply.github.com> Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com> Co-authored-by: Dan Ford Co-authored-by: Joe Scotto <8194147+joe-scotto@users.noreply.github.com> Co-authored-by: Joy Lee Co-authored-by: Joy Co-authored-by: Poring <97579443+PoringH@users.noreply.github.com> Co-authored-by: Charles Strahan Co-authored-by: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com> Co-authored-by: dztech Co-authored-by: Apteryks Co-authored-by: Nick Brassel Co-authored-by: Ryan Neff Co-authored-by: Daniel Osipishin <88534270+subrezon@users.noreply.github.com> Co-authored-by: Daniel Osipishin 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 Co-authored-by: T.A <83424097+t0kies@users.noreply.github.com> Co-authored-by: tokky Co-authored-by: DeskDaily <65656486+DeskDaily@users.noreply.github.com> Co-authored-by: Neil Brian Ramirez Co-authored-by: Neil Brian Ramirez Co-authored-by: Ben Cooper <63478578+bncpr@users.noreply.github.com> Co-authored-by: plaublin Co-authored-by: Andrew Kannan Co-authored-by: Michael Büchler Co-authored-by: Ross Montsinger Co-authored-by: spbgzh <72414103+spbgzh@users.noreply.github.com> Co-authored-by: Ikko Eltociear Ashimine Co-authored-by: Yanfei Guo Co-authored-by: Yanfei Guo 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: Brian Low Co-authored-by: Thomas Weißschuh Co-authored-by: casuanoob <96005765+casuanoob@users.noreply.github.com> Co-authored-by: Sergey Fedorov Co-authored-by: Syenasweta Co-authored-by: Syenasweta 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 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 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 Co-authored-by: Etienne Collin Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com> Co-authored-by: Adophoxia Co-authored-by: studiokestra <74369928+studiokestra@users.noreply.github.com> Co-authored-by: noahbei <123449614+noahbei@users.noreply.github.com> Co-authored-by: Brian Co-authored-by: ikorihn <16367098+ikorihn@users.noreply.github.com> Co-authored-by: vinhcatba Co-authored-by: Cloud Chagnon Co-authored-by: HorrorTroll 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 Co-authored-by: Agent Blu, 006 Co-authored-by: 4pplet Co-authored-by: 4pplet <4pplet@protonmail.com> Co-authored-by: 4pplet Co-authored-by: adam tombleson Co-authored-by: kisakey-luxury <143060353+kisakey-luxury@users.noreply.github.com> Co-authored-by: Wilhelm Schuster Co-authored-by: Felipe Curty Co-authored-by: itsvar <120035196+itsvar8@users.noreply.github.com> Co-authored-by: EnviousData Co-authored-by: Sắn <59417802+MaiTheSan@users.noreply.github.com> Co-authored-by: MakotoKurauchi Co-authored-by: jukaie <131839249+jukaie@users.noreply.github.com> Co-authored-by: gksygithub 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 Co-authored-by: Brian Choromanski 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 Co-authored-by: ID64F <54159272+ID64F@users.noreply.github.com> Co-authored-by: Kiryl Mialeshka <8974488+meskill@users.noreply.github.com> Co-authored-by: Leo Lou Co-authored-by: Ming-Gih Lam Co-authored-by: Reibl János Dániel Co-authored-by: ai03 Co-authored-by: Kelwin0313 <139501176+Kelwin0313@users.noreply.github.com> Co-authored-by: Fredrik A. Kristiansen Co-authored-by: John Barbero Co-authored-by: Matthias Liffers Co-authored-by: Panos Sakkos Co-authored-by: ploopyco <54917504+ploopyco@users.noreply.github.com> Co-authored-by: Maria <81305596+toril940@users.noreply.github.com> Co-authored-by: toril940 Co-authored-by: John Barbero Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> Co-authored-by: cole smith <38364556+daysgobye@users.noreply.github.com> Co-authored-by: jack <0x6A73@pm.me> Co-authored-by: Le Zhang --- data/schemas/definitions.jsonschema | 4 + .../themis/88htsc/keymaps/via/rules.mk | 1 + .../ai03/duet/keymaps/coordinate/keymap.c | 34 +++ .../ai03/duet/keymaps/coordinate/readme.md | 4 + keyboards/bestway/halconf.h | 1 - .../wyvern_hs/keymaps/regular_numpad/keymap.c | 33 +++ .../wave/keymaps/feature/config.h | 42 ++++ .../wave/keymaps/feature/keymap.c | 191 ++++++++++++++++ .../wave/keymaps/feature/readme.md | 11 + .../wave/keymaps/feature/rules.mk | 2 + keyboards/eyeohdesigns/humble40/config.h | 1 - keyboards/gmmk/pro/config.h | 2 + keyboards/handwired/dmote/info.json | 8 + .../scottomouse/keymaps/scotto/config.h | 26 +++ .../scottomouse/keymaps/scotto/rules.mk | 1 + .../scottoslant/keymaps/scotto/keymap.c | 69 ++++++ keyboards/helix/rev2/info.json | 15 ++ keyboards/jorne/rev1/info.json | 4 + keyboards/kbdfans/odin75/lib/bongocat.h | 2 +- keyboards/lfkeyboards/smk65/revf/info.json | 4 + keyboards/mechwild/mokulua/mirrored/info.json | 11 + keyboards/mechwild/mokulua/standard/info.json | 11 + keyboards/mlego/m65/rev1/info.json | 16 ++ keyboards/mlego/m65/rev2/info.json | 16 ++ keyboards/mlego/m65/rev3/info.json | 16 ++ keyboards/mlego/m65/rev4/info.json | 16 ++ keyboards/mode/m60s/halconf.h | 0 .../minitkl/keymaps/hybrid/keymap.c | 37 +++ .../minitkl/keymaps/hybrid/readme.md | 11 + keyboards/rgbkb/mun/keymaps/peott-fr/rules.mk | 1 + .../aurora/helix/keymaps/debug/config.h | 1 - keyboards/studiokestra/line_tkl/config.h | 9 + keyboards/studiokestra/line_tkl/info.json | 216 ++++++++++++++++++ .../line_tkl/keymaps/default/keymap.c | 39 ++++ .../line_tkl/keymaps/split_bs_rshift/keymap.c | 39 ++++ .../line_tkl/keymaps/via/keymap.c | 39 ++++ .../line_tkl/keymaps/via/rules.mk | 1 + keyboards/studiokestra/line_tkl/readme.md | 27 +++ keyboards/studiokestra/line_tkl/rules.mk | 1 + keyboards/woodkeys/meira/post_rules.mk | 9 + keyboards/ymdk/melody96/matrix_diagram.md | 35 +++ lib/python/qmk/cli/compile.py | 4 + lib/python/qmk/keyboard.py | 14 ++ quantum/led_matrix/led_matrix.h | 1 + quantum/painter/qp.c | 2 +- quantum/rgb_matrix/rgb_matrix.h | 1 + .../auto_shift_no_auto_repeat/config.h | 2 + .../hold_on_other_key_press/config.h | 2 +- 48 files changed, 1026 insertions(+), 6 deletions(-) create mode 100644 keyboards/ai03/duet/keymaps/coordinate/keymap.c create mode 100644 keyboards/ai03/duet/keymaps/coordinate/readme.md create mode 100644 keyboards/bredworks/wyvern_hs/keymaps/regular_numpad/keymap.c create mode 100644 keyboards/etiennecollin/wave/keymaps/feature/config.h create mode 100644 keyboards/etiennecollin/wave/keymaps/feature/keymap.c create mode 100644 keyboards/etiennecollin/wave/keymaps/feature/readme.md create mode 100644 keyboards/etiennecollin/wave/keymaps/feature/rules.mk create mode 100644 keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/config.h create mode 100644 keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/rules.mk create mode 100644 keyboards/handwired/scottokeebs/scottoslant/keymaps/scotto/keymap.c mode change 100644 => 100755 keyboards/mode/m60s/halconf.h create mode 100644 keyboards/rastersoft/minitkl/keymaps/hybrid/keymap.c create mode 100644 keyboards/rastersoft/minitkl/keymaps/hybrid/readme.md create mode 100644 keyboards/rgbkb/mun/keymaps/peott-fr/rules.mk create mode 100644 keyboards/studiokestra/line_tkl/config.h create mode 100644 keyboards/studiokestra/line_tkl/info.json create mode 100644 keyboards/studiokestra/line_tkl/keymaps/default/keymap.c create mode 100644 keyboards/studiokestra/line_tkl/keymaps/split_bs_rshift/keymap.c create mode 100644 keyboards/studiokestra/line_tkl/keymaps/via/keymap.c create mode 100644 keyboards/studiokestra/line_tkl/keymaps/via/rules.mk create mode 100644 keyboards/studiokestra/line_tkl/readme.md create mode 100644 keyboards/studiokestra/line_tkl/rules.mk create mode 100644 keyboards/woodkeys/meira/post_rules.mk create mode 100644 keyboards/ymdk/melody96/matrix_diagram.md diff --git a/data/schemas/definitions.jsonschema b/data/schemas/definitions.jsonschema index a1fdd2dcc680..c0c541ebb7a4 100644 --- a/data/schemas/definitions.jsonschema +++ b/data/schemas/definitions.jsonschema @@ -86,6 +86,10 @@ "maxLength": 7, "pattern": "^[A-Z][A-Zs_0-9]*$" }, + "snake_case": { + "type": "string", + "pattern": "^[a-z][a-z0-9_]*$" + }, "layout_macro": { "oneOf": [ { diff --git a/keyboards/acheron/themis/88htsc/keymaps/via/rules.mk b/keyboards/acheron/themis/88htsc/keymaps/via/rules.mk index 1e5b99807cb7..f1adcab005e8 100644 --- a/keyboards/acheron/themis/88htsc/keymaps/via/rules.mk +++ b/keyboards/acheron/themis/88htsc/keymaps/via/rules.mk @@ -1 +1,2 @@ VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/ai03/duet/keymaps/coordinate/keymap.c b/keyboards/ai03/duet/keymaps/coordinate/keymap.c new file mode 100644 index 000000000000..821c0295343f --- /dev/null +++ b/keyboards/ai03/duet/keymaps/coordinate/keymap.c @@ -0,0 +1,34 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + + +/* Coordinate keymap - designed to send a string in the format [a-r][0-5] corresponding to the matrix position, where a0 is the top left and r5 is bottom right */ + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, + KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, + KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, + KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, + KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, + KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0, KC_0 + ), +}; + + +/* String generation */ + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + + if (record->event.pressed) { + char col = record->event.key.col + 'a'; + char row = record->event.key.row + '0'; + char result[2] = {col, row}; + send_string(result); + } + + return false; +} diff --git a/keyboards/ai03/duet/keymaps/coordinate/readme.md b/keyboards/ai03/duet/keymaps/coordinate/readme.md new file mode 100644 index 000000000000..de8245875d11 --- /dev/null +++ b/keyboards/ai03/duet/keymaps/coordinate/readme.md @@ -0,0 +1,4 @@ +# The coordinate keymap for Duet + +An example keymap which sends a string `[a-r][0-5]` corresponding to the column-row position of the pressed switch. +Possibly useful for pairing to a kiosk device provided the display application can parse and handle this format. diff --git a/keyboards/bestway/halconf.h b/keyboards/bestway/halconf.h index 76f44ff900a3..5028cac1eb4b 100644 --- a/keyboards/bestway/halconf.h +++ b/keyboards/bestway/halconf.h @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once #define HAL_USE_PWM TRUE diff --git a/keyboards/bredworks/wyvern_hs/keymaps/regular_numpad/keymap.c b/keyboards/bredworks/wyvern_hs/keymaps/regular_numpad/keymap.c new file mode 100644 index 000000000000..78037bac14ab --- /dev/null +++ b/keyboards/bredworks/wyvern_hs/keymaps/regular_numpad/keymap.c @@ -0,0 +1,33 @@ +/* Copyright 2023 DeskDaily + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_regular_numpad( + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_P1, KC_P2, KC_P3, KC_ENT, KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, MO(1), KC_UP, + KC_P0, KC_DEL, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC + ), + [1] = LAYOUT_regular_numpad( + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; \ No newline at end of file diff --git a/keyboards/etiennecollin/wave/keymaps/feature/config.h b/keyboards/etiennecollin/wave/keymaps/feature/config.h new file mode 100644 index 000000000000..42421b33d396 --- /dev/null +++ b/keyboards/etiennecollin/wave/keymaps/feature/config.h @@ -0,0 +1,42 @@ +/* Copyright 2023 Etienne Collin (@etiennecollin) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +// Activate caps word by pressing Left Shift + Right Shift +#define BOTH_SHIFTS_TURNS_ON_CAPS_WORD + +// Maximum time between taps of tap dances +#define TAPPING_TERM 175 + +// Max time between taps to prevent hold function and hold auto-repeat +#define QUICK_TAP_TERM 100 + +// Perform hold action if pressing a dual-role key, tapping another key and +// releasing the dual-role key withing tapping term +#define PERMISSIVE_HOLD + +// Mouse key speed and acceleration. +#define MOUSEKEY_DELAY 0 +#define MOUSEKEY_INTERVAL 16 +#define MOUSEKEY_WHEEL_DELAY 0 +#define MOUSEKEY_MAX_SPEED 6 +#define MOUSEKEY_TIME_TO_MAX 64 + +// Thumb Combos +#define COMBO_COUNT 2 +#define COMBO_TERM 200 +#define EXTRA_SHORT_COMBOS diff --git a/keyboards/etiennecollin/wave/keymaps/feature/keymap.c b/keyboards/etiennecollin/wave/keymaps/feature/keymap.c new file mode 100644 index 000000000000..24bc85d5b499 --- /dev/null +++ b/keyboards/etiennecollin/wave/keymaps/feature/keymap.c @@ -0,0 +1,191 @@ +/* Copyright 2023 Etienne Collin (@etiennecollin) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +enum custom_layers { + COL, + QWE, + GAM, + MED, + NAV, + MOS, + SYM, + NUM, + FUN, + SYS, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [COL] = LAYOUT_split_3x5_3( + // ----------------------------------------- ----------------------------------------- + // | q | w | f | p | b | | j | l | u | y | ' | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | a | r | s | t | g | | m | n | e | i | o | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | z | x | c | d | v | | k | h | , | . | / | + // --------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | esc | spc | tab | | ent | bsp | del | + // --------+-------+-------- --------+-------+-------- + KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, + LGUI_T(KC_A), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_G, KC_M, LSFT_T(KC_N), LCTL_T(KC_E), LALT_T(KC_I), LGUI_T(KC_O), + KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, + LT(MED, KC_ESC), LT(NAV, KC_SPC), LT(MOS, KC_TAB), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_DEL) + ), + [QWE] = LAYOUT_split_3x5_3( + // ----------------------------------------- ----------------------------------------- + // | q | w | e | r | t | | y | u | i | o | p | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | a | s | d | f | g | | h | j | k | l | ' | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | z | x | c | v | b | | n | m | , | . | / | + // --------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | esc | spc | tab | | ent | bsp | del | + // --------+-------+-------- --------+-------+-------- + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LCTL_T(KC_K), LALT_T(KC_L), LGUI_T(KC_QUOT), + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + LT(MED, KC_ESC), LT(NAV, KC_SPC), LT(MOS, KC_TAB), LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_DEL) + ), + [GAM] = LAYOUT_split_3x5_3( + // ----------------------------------------- ----------------------------------------- + // | tab | q | w | e | r | | t | y | u | i | o | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | sht | a | s | d | f | | g | h | j | k | l | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | ctl | z | x | c | v | | b | n | m | , | . | + // --------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | alt | cps | spc | | ent | bsp | esc | + // --------+-------+-------- --------+-------+-------- + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, + KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, + KC_LALT, KC_CAPS, KC_SPC, LT(SYM, KC_ENT), LT(NUM, KC_BSPC), LT(FUN, KC_ESC) + ), + [MED] = LAYOUT_split_3x5_3( + // ----------------------------------------- ----------------------------------------- + // | | | | | | | | | | | | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | gui | alt | ctl | sht | | | | prev | vol - | vol + | next | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | | | | | | | | | | | | + // --------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | ___ | | | | stop | pause | mute | + // --------+-------+-------- --------+-------+-------- + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, XXXXXXX, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MRWD, XXXXXXX, XXXXXXX, KC_MFFD, + _______, XXXXXXX, XXXXXXX, KC_MSTP, KC_MPLY, KC_MUTE + ), + [NAV] = LAYOUT_split_3x5_3( + // ----------------------------------------- ----------------------------------------- + // | | | | | | | | | | | | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | gui | alt | ctl | sht | | | cps | ← | ↓ | ↑ | → | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | | | | | | | insrt | home | pageu | paged | end | + // --------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | | ___ | | | ent | bsp | del | + // --------+-------+-------- --------+-------+-------- + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_CAPS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, + XXXXXXX, _______, XXXXXXX, KC_ENT, KC_BSPC, KC_DEL + ), + [MOS] = LAYOUT_split_3x5_3( + // ----------------------------------------- ----------------------------------------- + // | | | | | | | | acc0 | acc1 | acc2 | | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | gui | alt | ctl | sht | | | | ← | ↓ | ↑ | → | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | | | | | | | | w← | w↓ | w↑ | w→ | + // --------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | | | ___ | | left | right | mid | + // --------+-------+-------- --------+-------+-------- + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_ACL0, KC_ACL1, KC_ACL2, XXXXXXX, + KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, + XXXXXXX, XXXXXXX, _______, KC_BTN1, KC_BTN2, KC_BTN3 + ), + [SYM] = LAYOUT_split_3x5_3( + // ----------------------------------------- ----------------------------------------- + // | { | & | * | ( | } | | | | | | | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | : | $ | % | ^ | + | | | sht | ctl | alt | gui | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | ~ | ! | @ | # | | | | | | | | | + // --------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | ( | ) | _ | | ___ | | | + // --------+-------+-------- --------+-------+-------- + KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_COLN, KC_DLR, KC_PERC, KC_CIRC, KC_PLUS, XXXXXXX, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_PIPE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LPRN, KC_RPRN, KC_UNDS, _______, XXXXXXX, XXXXXXX + ), + [NUM] = LAYOUT_split_3x5_3( + // ----------------------------------------- ----------------------------------------- + // | [ { | 7 & | 8 * | 9 ( | ] } | | | | | | | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | ; : | 4 $ | 5 % | 6 ^ | = + | | | sht | ctl | alt | gui | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | ` ~ | 1 ! | 2 @ | 3 # | \ | | | | | | | | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | . > | 0 ) | - _ | | | ___ | | + // --------+-------+-------- --------+-------+-------- + KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_SCLN, KC_4, KC_5, KC_6, KC_EQL, XXXXXXX, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, + KC_GRV, KC_1, KC_2, KC_3, KC_BSLS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_DOT, KC_0, KC_MINS, XXXXXXX, _______, XXXXXXX + ), + [FUN] = LAYOUT_split_3x5_3( + // ----------------------------------------- ----------------------------------------- + // | F12 | F 7 | F 8 | F 9 | PrScr | | | | | | | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | F11 | F 4 | F 5 | F 6 | pause | | | sht | ctl | alt | gui | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | F10 | F 1 | F 2 | F 3 | scrlk | | | | | | | + // --------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | app | spc | tab | | | | ___ | + // --------+-------+-------- --------+-------+-------- + KC_F12, KC_F7, KC_F8, KC_F9, KC_PSCR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_F11, KC_F4, KC_F5, KC_F6, KC_PAUS, XXXXXXX, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, + KC_F10, KC_F1, KC_F2, KC_F3, KC_SCRL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_APP, KC_SPC, KC_TAB, XXXXXXX, XXXXXXX, _______ + ), + [SYS] = LAYOUT_split_3x5_3( + // ----------------------------------------- ----------------------------------------- + // | BOOT | | GAME | QWERT | COLMK | | COLMK | QWERT | GAME | | BOOT | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | | | | | | | | | | | | + // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | | | | | | | | | | | | + // --------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| + // | | | | | | | | + // --------+-------+-------- --------+-------+-------- + QK_BOOT, XXXXXXX, DF(GAM), DF(QWE), DF(COL), DF(COL), DF(QWE), DF(GAM), XXXXXXX, QK_BOOT, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______ + ) +}; + +const uint16_t PROGMEM combo_sys[] = {LT(MED, KC_ESC), LT(FUN, KC_DEL), COMBO_END}; +const uint16_t PROGMEM combo_sys_gam[] = {KC_LALT, LT(FUN, KC_ESC), COMBO_END}; + +combo_t key_combos[] = { + COMBO(combo_sys, MO(SYS)), + COMBO(combo_sys_gam, MO(SYS)) +}; diff --git a/keyboards/etiennecollin/wave/keymaps/feature/readme.md b/keyboards/etiennecollin/wave/keymaps/feature/readme.md new file mode 100644 index 000000000000..d9971b352b14 --- /dev/null +++ b/keyboards/etiennecollin/wave/keymaps/feature/readme.md @@ -0,0 +1,11 @@ +# Feature keymap + +This keymap is heavily inspired by the [miryoku](https://github.com/manna-harbour/miryoku) layout. + +It defaults to a [COLEMAK mod dh](https://colemakmods.github.io/mod-dh/) layer, but a QWERTY and a gaming layer are available from the `sys` layer. + +It uses the following features: + +- Home row modifiers +- Usual special layers (`media`, `navigation`, `mouse`, `symbols`, `numbers`, `functions`, `system`) +- Combos (to access the `sys` layer by pressing both external thumb keys) diff --git a/keyboards/etiennecollin/wave/keymaps/feature/rules.mk b/keyboards/etiennecollin/wave/keymaps/feature/rules.mk new file mode 100644 index 000000000000..96093b82013e --- /dev/null +++ b/keyboards/etiennecollin/wave/keymaps/feature/rules.mk @@ -0,0 +1,2 @@ +CAPS_WORD_ENABLE = yes +COMBO_ENABLE = yes diff --git a/keyboards/eyeohdesigns/humble40/config.h b/keyboards/eyeohdesigns/humble40/config.h index 2458474199aa..39ceae137a18 100644 --- a/keyboards/eyeohdesigns/humble40/config.h +++ b/keyboards/eyeohdesigns/humble40/config.h @@ -5,7 +5,6 @@ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the diff --git a/keyboards/gmmk/pro/config.h b/keyboards/gmmk/pro/config.h index 995dd95ec811..b8d4788fc3eb 100644 --- a/keyboards/gmmk/pro/config.h +++ b/keyboards/gmmk/pro/config.h @@ -33,6 +33,8 @@ #define RGB_DISABLE_WHEN_USB_SUSPENDED +#define RGB_DISABLE_WHEN_USB_SUSPENDED + // RGB Matrix Animation modes. Explicitly enabled // For full list of effects, see: // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects diff --git a/keyboards/handwired/dmote/info.json b/keyboards/handwired/dmote/info.json index fc52fee11e91..317720d3a135 100644 --- a/keyboards/handwired/dmote/info.json +++ b/keyboards/handwired/dmote/info.json @@ -26,6 +26,14 @@ "knight": true } }, + "rgblight": { + "led_count": 6, + "split_count": [3, 3], + "animations": { + "knight": true, + "christmas": true + } + }, "ws2812": { "pin": "D1" }, diff --git a/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/config.h b/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/config.h new file mode 100644 index 000000000000..4b0d2cd2fb00 --- /dev/null +++ b/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/config.h @@ -0,0 +1,26 @@ +/* +Copyright 2023 Joe Scotto + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#pragma once + +// Mouse key speed and acceleration. +#define MOUSEKEY_DELAY 0 +#define MOUSEKEY_INTERVAL 16 +#define MOUSEKEY_WHEEL_DELAY 0 +#define MOUSEKEY_MAX_SPEED 6 +#define MOUSEKEY_TIME_TO_MAX 64 + diff --git a/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/rules.mk b/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/rules.mk new file mode 100644 index 000000000000..ab1e438182a3 --- /dev/null +++ b/keyboards/handwired/scottokeebs/scottomouse/keymaps/scotto/rules.mk @@ -0,0 +1 @@ +COMBO_ENABLE = yes diff --git a/keyboards/handwired/scottokeebs/scottoslant/keymaps/scotto/keymap.c b/keyboards/handwired/scottokeebs/scottoslant/keymaps/scotto/keymap.c new file mode 100644 index 000000000000..dc2d08d91053 --- /dev/null +++ b/keyboards/handwired/scottokeebs/scottoslant/keymaps/scotto/keymap.c @@ -0,0 +1,69 @@ +/* +Copyright 2022 Joe Scotto + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_BSPC, + KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, + LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMMA, KC_DOT, RSFT_T(KC_SLSH), + KC_ESC, KC_LCTL, KC_LALT, LGUI_T(KC_SPC), LT(1, KC_TAB), LT(2, KC_ENT), KC_ESC + ), + [1] = LAYOUT( + KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_COLN, KC_GRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL, + KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, + LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS), + KC_ESC, KC_LCTL, KC_LALT, LGUI_T(KC_SPC), KC_TRNS, KC_TRNS, KC_ESC + ), + [2] = LAYOUT( + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC, + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, + KC_LSFT, KC_NO, KC_NO, KC_NO, MO(3), KC_NO, KC_NO, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), + KC_ESC, KC_LCTL, KC_LALT, LGUI_T(KC_SPC), KC_TRNS, KC_TRNS, KC_ESC + ), + [3] = LAYOUT( + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(4), + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, + KC_F11, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12, + KC_ESC, KC_LCTL, KC_LALT, LGUI_T(KC_SPC), KC_TRNS, KC_TRNS, KC_ESC + ), + [4] = LAYOUT( + KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_BSPC, + KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, + LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMMA, KC_DOT, RSFT_T(KC_SLSH), + KC_ESC, KC_LALT, KC_LCTL, KC_SPC, LT(5, KC_TAB), LT(6, KC_ENT), KC_ESC + ), + [5] = LAYOUT( + KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_COLN, KC_GRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL, + KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, + LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS), + KC_ESC, KC_LALT, KC_LCTL, KC_SPC, LT(5, KC_TAB), LT(6, KC_ENT), KC_ESC + ), + [6] = LAYOUT( + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC, + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, + KC_LSFT, KC_NO, KC_NO, KC_NO, MO(7), KC_NO, KC_NO, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), + KC_ESC, KC_LALT, KC_LCTL, KC_SPC, LT(5, KC_TAB), LT(6, KC_ENT), KC_ESC + ), + [7] = LAYOUT( + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(0), + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, + KC_F11, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12, + KC_ESC, KC_LALT, KC_LCTL, KC_SPC, LT(5, KC_TAB), LT(6, KC_ENT), KC_ESC + ) +}; diff --git a/keyboards/helix/rev2/info.json b/keyboards/helix/rev2/info.json index aac3cc9dbb15..60f452562249 100644 --- a/keyboards/helix/rev2/info.json +++ b/keyboards/helix/rev2/info.json @@ -37,6 +37,21 @@ "static_gradient": true } }, + "tapping": { + "term": 100 + }, + "rgblight": { + "hue_steps": 10, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true + } + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/jorne/rev1/info.json b/keyboards/jorne/rev1/info.json index f76b9c0e7d9f..7433b1c33444 100644 --- a/keyboards/jorne/rev1/info.json +++ b/keyboards/jorne/rev1/info.json @@ -26,6 +26,10 @@ "led_count": 56, "split_count": [28, 28] }, + "rgblight": { + "led_count": 56, + "split_count": [28, 28] + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/kbdfans/odin75/lib/bongocat.h b/keyboards/kbdfans/odin75/lib/bongocat.h index 2ffeca199353..1ba068a486cd 100644 --- a/keyboards/kbdfans/odin75/lib/bongocat.h +++ b/keyboards/kbdfans/odin75/lib/bongocat.h @@ -1,4 +1,4 @@ -/* Copyright 2022 HorrorTroll +/* Copyright 2023 eerraa * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/keyboards/lfkeyboards/smk65/revf/info.json b/keyboards/lfkeyboards/smk65/revf/info.json index 63e9d0abc752..50c039b76cb2 100644 --- a/keyboards/lfkeyboards/smk65/revf/info.json +++ b/keyboards/lfkeyboards/smk65/revf/info.json @@ -4,6 +4,10 @@ }, "processor": "atmega32u4", "bootloader": "halfkay", + "rgblight": { + "driver": "custom", + "led_count": 28 + }, "layouts": { "LAYOUT_65_ansi": { "layout": [ diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/info.json index 7289147e6b5f..cdb20188abc1 100644 --- a/keyboards/mechwild/mokulua/mirrored/info.json +++ b/keyboards/mechwild/mokulua/mirrored/info.json @@ -43,6 +43,17 @@ "rainbow_swirl": true } }, + "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, + "led_count": 16, + "sleep": true, + "split_count": [8, 8], + "animations": { + "rainbow_mood": true, + "rainbow_swirl": true + } + }, "ws2812": { "pin": "B6" }, diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/info.json index da82447980fb..c3397f9f5015 100644 --- a/keyboards/mechwild/mokulua/standard/info.json +++ b/keyboards/mechwild/mokulua/standard/info.json @@ -43,6 +43,17 @@ "rainbow_swirl": true } }, + "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, + "led_count": 16, + "sleep": true, + "split_count": [8, 8], + "animations": { + "rainbow_mood": true, + "rainbow_swirl": true + } + }, "ws2812": { "pin": "B6" }, diff --git a/keyboards/mlego/m65/rev1/info.json b/keyboards/mlego/m65/rev1/info.json index d8bb91de3009..30d6075233a9 100644 --- a/keyboards/mlego/m65/rev1/info.json +++ b/keyboards/mlego/m65/rev1/info.json @@ -57,6 +57,22 @@ "pid": "0x6061", "vid": "0xBABA" }, + "rgblight": { + "saturation_steps": 8, + "led_count": 20, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, "ws2812": { "pin": "B15" }, diff --git a/keyboards/mlego/m65/rev2/info.json b/keyboards/mlego/m65/rev2/info.json index e8575e23e85b..b96ca466e318 100644 --- a/keyboards/mlego/m65/rev2/info.json +++ b/keyboards/mlego/m65/rev2/info.json @@ -56,6 +56,22 @@ "pid": "0x6061", "vid": "0xBABA" }, + "rgblight": { + "saturation_steps": 8, + "led_count": 20, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, "ws2812": { "pin": "B15" }, diff --git a/keyboards/mlego/m65/rev3/info.json b/keyboards/mlego/m65/rev3/info.json index d48d52d9d97c..94de105ec1ee 100644 --- a/keyboards/mlego/m65/rev3/info.json +++ b/keyboards/mlego/m65/rev3/info.json @@ -57,6 +57,22 @@ "pid": "0x6062", "vid": "0xBABA" }, + "rgblight": { + "saturation_steps": 8, + "led_count": 20, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, "ws2812": { "pin": "B15" }, diff --git a/keyboards/mlego/m65/rev4/info.json b/keyboards/mlego/m65/rev4/info.json index 56fed15317fe..bc6c83083d4f 100644 --- a/keyboards/mlego/m65/rev4/info.json +++ b/keyboards/mlego/m65/rev4/info.json @@ -59,6 +59,22 @@ "pid": "0x6062", "vid": "0xBABA" }, + "rgblight": { + "saturation_steps": 8, + "led_count": 20, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, "ws2812": { "pin": "B15" }, diff --git a/keyboards/mode/m60s/halconf.h b/keyboards/mode/m60s/halconf.h old mode 100644 new mode 100755 diff --git a/keyboards/rastersoft/minitkl/keymaps/hybrid/keymap.c b/keyboards/rastersoft/minitkl/keymaps/hybrid/keymap.c new file mode 100644 index 000000000000..a65df705739c --- /dev/null +++ b/keyboards/rastersoft/minitkl/keymaps/hybrid/keymap.c @@ -0,0 +1,37 @@ +/* + * Copyright 2023 Raster Software Vigo + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_hybrid( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, KC_END, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_NUHS, KC_INS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_DEL, KC_PGDN, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, LT(1, KC_APP), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_APP, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_hybrid( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, RGB_TOG, RGB_MODE_FORWARD, RGB_MODE_REVERSE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD, KC_VOLD, KC_VOLU + ), +}; diff --git a/keyboards/rastersoft/minitkl/keymaps/hybrid/readme.md b/keyboards/rastersoft/minitkl/keymaps/hybrid/readme.md new file mode 100644 index 000000000000..121f6277f2c3 --- /dev/null +++ b/keyboards/rastersoft/minitkl/keymaps/hybrid/readme.md @@ -0,0 +1,11 @@ +# The HYBRID keymap for MiniTKL + +![keymap](https://images2.imgbox.com/00/22/vjrqgfHy_o.png) + +This keymap is designed to be able to have an ISO keyboard with the ANSI Return +key. This is useful in, at least, two cases: + +* some programmers prefer the ANSI key, but want to use European languages. +* some keycaps come without ISO return key, even for European languages layouts. + +The `Fn` key trigger `KC_APP` when tapped, and activate Layer 1 when held. diff --git a/keyboards/rgbkb/mun/keymaps/peott-fr/rules.mk b/keyboards/rgbkb/mun/keymaps/peott-fr/rules.mk new file mode 100644 index 000000000000..ee325681483f --- /dev/null +++ b/keyboards/rgbkb/mun/keymaps/peott-fr/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/splitkb/aurora/helix/keymaps/debug/config.h b/keyboards/splitkb/aurora/helix/keymaps/debug/config.h index a15def3fb913..e6231cabf8b8 100644 --- a/keyboards/splitkb/aurora/helix/keymaps/debug/config.h +++ b/keyboards/splitkb/aurora/helix/keymaps/debug/config.h @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once #define RGBLIGHT_EFFECT_BREATHING \ No newline at end of file diff --git a/keyboards/studiokestra/line_tkl/config.h b/keyboards/studiokestra/line_tkl/config.h new file mode 100644 index 000000000000..c37d8a5ad28d --- /dev/null +++ b/keyboards/studiokestra/line_tkl/config.h @@ -0,0 +1,9 @@ +// Copyright 2023 studiokestra (@studiokestra) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/studiokestra/line_tkl/info.json b/keyboards/studiokestra/line_tkl/info.json new file mode 100644 index 000000000000..ba6601a3304d --- /dev/null +++ b/keyboards/studiokestra/line_tkl/info.json @@ -0,0 +1,216 @@ +{ + "manufacturer": "Studio Kestra", + "keyboard_name": "Line TKL", + "maintainer": "studiokestra", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "indicators": { + "caps_lock": "B6", + "on_state": 1, + "scroll_lock": "D2" + }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B5", "D5", "D3"], + "rows": ["D0", "D1", "B0", "B7", "B3", "E6", "C7", "C6", "B4", "D7", "D6", "D4"] + }, + "processor": "atmega32u4", + "url": "https://minokeys.com/collections/line-friends", + "usb": { + "device_version": "1.0.0", + "pid": "0x8704", + "vid": "0x7C10" + }, + "community_layouts": ["tkl_ansi_tsangan", "tkl_ansi_tsangan_split_bs_rshift"], + "layouts": { + "LAYOUT_tkl_ansi_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [1, 2], "x": 4, "y": 0}, + {"matrix": [0, 3], "x": 5, "y": 0}, + {"matrix": [1, 3], "x": 6.5, "y": 0}, + {"matrix": [0, 4], "x": 7.5, "y": 0}, + {"matrix": [1, 4], "x": 8.5, "y": 0}, + {"matrix": [0, 5], "x": 9.5, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0}, + {"matrix": [0, 7], "x": 14, "y": 0}, + {"matrix": [1, 7], "x": 15.25, "y": 0}, + {"matrix": [0, 8], "x": 16.25, "y": 0}, + {"matrix": [1, 8], "x": 17.25, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1.25}, + {"matrix": [3, 0], "x": 1, "y": 1.25}, + {"matrix": [2, 1], "x": 2, "y": 1.25}, + {"matrix": [3, 1], "x": 3, "y": 1.25}, + {"matrix": [2, 2], "x": 4, "y": 1.25}, + {"matrix": [3, 2], "x": 5, "y": 1.25}, + {"matrix": [2, 3], "x": 6, "y": 1.25}, + {"matrix": [3, 3], "x": 7, "y": 1.25}, + {"matrix": [2, 4], "x": 8, "y": 1.25}, + {"matrix": [3, 4], "x": 9, "y": 1.25}, + {"matrix": [2, 5], "x": 10, "y": 1.25}, + {"matrix": [3, 5], "x": 11, "y": 1.25}, + {"matrix": [2, 6], "x": 12, "y": 1.25}, + {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [3, 7], "x": 15.25, "y": 1.25}, + {"matrix": [2, 8], "x": 16.25, "y": 1.25}, + {"matrix": [3, 8], "x": 17.25, "y": 1.25}, + {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 2.25}, + {"matrix": [4, 1], "x": 2.5, "y": 2.25}, + {"matrix": [5, 1], "x": 3.5, "y": 2.25}, + {"matrix": [4, 2], "x": 4.5, "y": 2.25}, + {"matrix": [5, 2], "x": 5.5, "y": 2.25}, + {"matrix": [4, 3], "x": 6.5, "y": 2.25}, + {"matrix": [5, 3], "x": 7.5, "y": 2.25}, + {"matrix": [4, 4], "x": 8.5, "y": 2.25}, + {"matrix": [5, 4], "x": 9.5, "y": 2.25}, + {"matrix": [4, 5], "x": 10.5, "y": 2.25}, + {"matrix": [5, 5], "x": 11.5, "y": 2.25}, + {"matrix": [4, 6], "x": 12.5, "y": 2.25}, + {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [5, 7], "x": 15.25, "y": 2.25}, + {"matrix": [4, 8], "x": 16.25, "y": 2.25}, + {"matrix": [5, 8], "x": 17.25, "y": 2.25}, + {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [7, 0], "x": 1.75, "y": 3.25}, + {"matrix": [6, 1], "x": 2.75, "y": 3.25}, + {"matrix": [7, 1], "x": 3.75, "y": 3.25}, + {"matrix": [6, 2], "x": 4.75, "y": 3.25}, + {"matrix": [7, 2], "x": 5.75, "y": 3.25}, + {"matrix": [6, 3], "x": 6.75, "y": 3.25}, + {"matrix": [7, 3], "x": 7.75, "y": 3.25}, + {"matrix": [6, 4], "x": 8.75, "y": 3.25}, + {"matrix": [7, 4], "x": 9.75, "y": 3.25}, + {"matrix": [6, 5], "x": 10.75, "y": 3.25}, + {"matrix": [7, 5], "x": 11.75, "y": 3.25}, + {"matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [8, 1], "x": 2.25, "y": 4.25}, + {"matrix": [9, 1], "x": 3.25, "y": 4.25}, + {"matrix": [8, 2], "x": 4.25, "y": 4.25}, + {"matrix": [9, 2], "x": 5.25, "y": 4.25}, + {"matrix": [8, 3], "x": 6.25, "y": 4.25}, + {"matrix": [9, 3], "x": 7.25, "y": 4.25}, + {"matrix": [8, 4], "x": 8.25, "y": 4.25}, + {"matrix": [9, 4], "x": 9.25, "y": 4.25}, + {"matrix": [8, 5], "x": 10.25, "y": 4.25}, + {"matrix": [9, 5], "x": 11.25, "y": 4.25}, + {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [9, 8], "x": 16.25, "y": 4.25}, + {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [11, 0], "x": 1.5, "y": 5.25}, + {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [10, 3], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [10, 6], "x": 12.5, "y": 5.25}, + {"matrix": [10, 7], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [11, 7], "x": 15.25, "y": 5.25}, + {"matrix": [10, 8], "x": 16.25, "y": 5.25}, + {"matrix": [11, 8], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [1, 2], "x": 4, "y": 0}, + {"matrix": [0, 3], "x": 5, "y": 0}, + {"matrix": [1, 3], "x": 6.5, "y": 0}, + {"matrix": [0, 4], "x": 7.5, "y": 0}, + {"matrix": [1, 4], "x": 8.5, "y": 0}, + {"matrix": [0, 5], "x": 9.5, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0}, + {"matrix": [0, 7], "x": 14, "y": 0}, + {"matrix": [1, 7], "x": 15.25, "y": 0}, + {"matrix": [0, 8], "x": 16.25, "y": 0}, + {"matrix": [1, 8], "x": 17.25, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1.25}, + {"matrix": [3, 0], "x": 1, "y": 1.25}, + {"matrix": [2, 1], "x": 2, "y": 1.25}, + {"matrix": [3, 1], "x": 3, "y": 1.25}, + {"matrix": [2, 2], "x": 4, "y": 1.25}, + {"matrix": [3, 2], "x": 5, "y": 1.25}, + {"matrix": [2, 3], "x": 6, "y": 1.25}, + {"matrix": [3, 3], "x": 7, "y": 1.25}, + {"matrix": [2, 4], "x": 8, "y": 1.25}, + {"matrix": [3, 4], "x": 9, "y": 1.25}, + {"matrix": [2, 5], "x": 10, "y": 1.25}, + {"matrix": [3, 5], "x": 11, "y": 1.25}, + {"matrix": [2, 6], "x": 12, "y": 1.25}, + {"matrix": [3, 6], "x": 13, "y": 1.25}, + {"matrix": [2, 7], "x": 14, "y": 1.25}, + {"matrix": [3, 7], "x": 15.25, "y": 1.25}, + {"matrix": [2, 8], "x": 16.25, "y": 1.25}, + {"matrix": [3, 8], "x": 17.25, "y": 1.25}, + {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 2.25}, + {"matrix": [4, 1], "x": 2.5, "y": 2.25}, + {"matrix": [5, 1], "x": 3.5, "y": 2.25}, + {"matrix": [4, 2], "x": 4.5, "y": 2.25}, + {"matrix": [5, 2], "x": 5.5, "y": 2.25}, + {"matrix": [4, 3], "x": 6.5, "y": 2.25}, + {"matrix": [5, 3], "x": 7.5, "y": 2.25}, + {"matrix": [4, 4], "x": 8.5, "y": 2.25}, + {"matrix": [5, 4], "x": 9.5, "y": 2.25}, + {"matrix": [4, 5], "x": 10.5, "y": 2.25}, + {"matrix": [5, 5], "x": 11.5, "y": 2.25}, + {"matrix": [4, 6], "x": 12.5, "y": 2.25}, + {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [5, 7], "x": 15.25, "y": 2.25}, + {"matrix": [4, 8], "x": 16.25, "y": 2.25}, + {"matrix": [5, 8], "x": 17.25, "y": 2.25}, + {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [7, 0], "x": 1.75, "y": 3.25}, + {"matrix": [6, 1], "x": 2.75, "y": 3.25}, + {"matrix": [7, 1], "x": 3.75, "y": 3.25}, + {"matrix": [6, 2], "x": 4.75, "y": 3.25}, + {"matrix": [7, 2], "x": 5.75, "y": 3.25}, + {"matrix": [6, 3], "x": 6.75, "y": 3.25}, + {"matrix": [7, 3], "x": 7.75, "y": 3.25}, + {"matrix": [6, 4], "x": 8.75, "y": 3.25}, + {"matrix": [7, 4], "x": 9.75, "y": 3.25}, + {"matrix": [6, 5], "x": 10.75, "y": 3.25}, + {"matrix": [7, 5], "x": 11.75, "y": 3.25}, + {"matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [8, 1], "x": 2.25, "y": 4.25}, + {"matrix": [9, 1], "x": 3.25, "y": 4.25}, + {"matrix": [8, 2], "x": 4.25, "y": 4.25}, + {"matrix": [9, 2], "x": 5.25, "y": 4.25}, + {"matrix": [8, 3], "x": 6.25, "y": 4.25}, + {"matrix": [9, 3], "x": 7.25, "y": 4.25}, + {"matrix": [8, 4], "x": 8.25, "y": 4.25}, + {"matrix": [9, 4], "x": 9.25, "y": 4.25}, + {"matrix": [8, 5], "x": 10.25, "y": 4.25}, + {"matrix": [9, 5], "x": 11.25, "y": 4.25}, + {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [9, 6], "x": 14, "y": 4.25}, + {"matrix": [9, 8], "x": 16.25, "y": 4.25}, + {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [11, 0], "x": 1.5, "y": 5.25}, + {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [10, 3], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [10, 6], "x": 12.5, "y": 5.25}, + {"matrix": [10, 7], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [11, 7], "x": 15.25, "y": 5.25}, + {"matrix": [10, 8], "x": 16.25, "y": 5.25}, + {"matrix": [11, 8], "x": 17.25, "y": 5.25} + ] + } + } +} diff --git a/keyboards/studiokestra/line_tkl/keymaps/default/keymap.c b/keyboards/studiokestra/line_tkl/keymaps/default/keymap.c new file mode 100644 index 000000000000..a8dc54ee8706 --- /dev/null +++ b/keyboards/studiokestra/line_tkl/keymaps/default/keymap.c @@ -0,0 +1,39 @@ +// Copyright 2023 studiokestra (@studiokestra) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐ + * │Esc│ │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│ + * └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Bcksp │ │Ins│Hom│PgU│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │ │Del│End│PgD│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐ + * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift │ │ ↑ │ + * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ ┌───┼───┼───┐ + * │Ctrl │GUI│Alt │ │ Alt│GUI│ Ctrl│ │ ← │ ↓ │ → │ + * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘ + */ + + [0] = LAYOUT_tkl_ansi_tsangan( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ), + + [1] = LAYOUT_tkl_ansi_tsangan( + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), +}; diff --git a/keyboards/studiokestra/line_tkl/keymaps/split_bs_rshift/keymap.c b/keyboards/studiokestra/line_tkl/keymaps/split_bs_rshift/keymap.c new file mode 100644 index 000000000000..595ed5d03cc5 --- /dev/null +++ b/keyboards/studiokestra/line_tkl/keymaps/split_bs_rshift/keymap.c @@ -0,0 +1,39 @@ +// Copyright 2023 studiokestra (@studiokestra) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐ + * │Esc│ │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│ + * └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │LBk│RBk│ │Ins│Hom│PgU│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │ │Del│End│PgD│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ + * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Mo1│ │ ↑ │ + * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐ + * │Ctrl │GUI│Alt │ │ Alt│GUI│ Ctrl│ │ ← │ ↓ │ → │ + * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘ + */ + + [0] = LAYOUT_tkl_ansi_tsangan_split_bs_rshift( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ), + + [1] = LAYOUT_tkl_ansi_tsangan_split_bs_rshift( + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), +}; diff --git a/keyboards/studiokestra/line_tkl/keymaps/via/keymap.c b/keyboards/studiokestra/line_tkl/keymaps/via/keymap.c new file mode 100644 index 000000000000..595ed5d03cc5 --- /dev/null +++ b/keyboards/studiokestra/line_tkl/keymaps/via/keymap.c @@ -0,0 +1,39 @@ +// Copyright 2023 studiokestra (@studiokestra) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐ + * │Esc│ │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│ + * └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘ + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │LBk│RBk│ │Ins│Hom│PgU│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │ │Del│End│PgD│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ + * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Mo1│ │ ↑ │ + * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐ + * │Ctrl │GUI│Alt │ │ Alt│GUI│ Ctrl│ │ ← │ ↓ │ → │ + * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘ + */ + + [0] = LAYOUT_tkl_ansi_tsangan_split_bs_rshift( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ), + + [1] = LAYOUT_tkl_ansi_tsangan_split_bs_rshift( + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), +}; diff --git a/keyboards/studiokestra/line_tkl/keymaps/via/rules.mk b/keyboards/studiokestra/line_tkl/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/studiokestra/line_tkl/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/studiokestra/line_tkl/readme.md b/keyboards/studiokestra/line_tkl/readme.md new file mode 100644 index 000000000000..a5d7ae0c4143 --- /dev/null +++ b/keyboards/studiokestra/line_tkl/readme.md @@ -0,0 +1,27 @@ +# studiokestra/line_tkl + +![studiokestra/line_tkl](https://i.imgur.com/3MmRQkh.png) + +PCB developed for Mino Keys in collaboration with Line Friends (C). + +* Keyboard Maintainer: [Studio Kestra](https://github.com/studiokestra/) +* Hardware Supported: Line TKL +* Hardware Availability: https://minokeys.com/collections/line-friends + +Make example for this keyboard (after setting up your build environment): + + make studiokestra/line_tkl:default + +Flashing example for this keyboard: + + make studiokestra/line_tkl:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/studiokestra/line_tkl/rules.mk b/keyboards/studiokestra/line_tkl/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/studiokestra/line_tkl/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/woodkeys/meira/post_rules.mk b/keyboards/woodkeys/meira/post_rules.mk new file mode 100644 index 000000000000..5d85581c6eeb --- /dev/null +++ b/keyboards/woodkeys/meira/post_rules.mk @@ -0,0 +1,9 @@ +SRC += matrix.c TWIlib.c issi.c lighting.c + +#ifeq ($(strip $(ISSI_ENABLE)), yes) +# OPT_DEFS += -DISSI_ENABLE +#endif + +#ifeq ($(strip $(WATCHDOG_ENABLE)), yes) +# OPT_DEFS += -DWATCHDOG_ENABLE +#endif diff --git a/keyboards/ymdk/melody96/matrix_diagram.md b/keyboards/ymdk/melody96/matrix_diagram.md new file mode 100644 index 000000000000..e589bcc469de --- /dev/null +++ b/keyboards/ymdk/melody96/matrix_diagram.md @@ -0,0 +1,35 @@ +# Matrix Diagram for YMDK Melody96 + +``` +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│50 │51 │52 │53 │54 │55 │56 │57 │58 │B8 │B7 │B5 │B4 │B3 │B6 │B2 │B1 │B0 │63 │ +├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ ┌───────┐ +│40 │41 │42 │43 │44 │45 │56 │47 │48 │A8 │A7 │A5 │A4 │A3 │A6 │A2 │A1 │A0 │64 │ │A6 │ 2u Backpsace +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┼───┼───┼───┤ └─┬─────┤ ┌───┐ +│30 │31 │32 │33 │34 │35 │36 │37 │38 │98 │97 │95 │94 │84 │96 │92 │91 │90 │ │ │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┼───┼───┼───┤ ┌──┴┐93 │ ISO Enter │80 │ Numpad "+" 2u +│20 │21 │22 │23 │24 │25 │26 │27 │28 │88 │87 │85 │93 │86 │82 │81 │80 │ │84 │ │ │ │ +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┼───┼───┼───┤ └───┴────┘ ├───┤ +│10 │11 │12 │13 │14 │15 │16 │17 │18 │78 │77 │75 │74 │73 │76 │72 │71 │70 │ │ │ +├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┼───┼───┼───┤ ┌───────┐ │60 │ Numpad Enter 2U +│00 │01 │02 │06 │08 │07 │05 │04 │03 │66 │62 │61 │60 │ Numpad 0 2u │62 │ │ │ +└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┴───┴───┴───┘ └───────┘ └───┘ +┌────────┐ ┌──────────┐ +│10 │ 2.25u LShift 2.75u RShift │74 │ +└────────┘ └──────────┘ +┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐ +│00 │01 │02 │06 │08 │07 │04 │03 │ 4x1.25u Right Mod +└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ +┌─────┬─────┬───────────────────────────┬───┬───┬───┬───┬───┐ +│00 │01 │06 │08 │07 │05 │04 │03 │ 2x1.5u Left Mod +└─────┴─────┴───────────────────────────┴───┴───┴───┴───┴───┘ +┌─────┬───┬─────┬───────────────────────┬─────┬─────┬───┬───┐ +│00 │01 │02 │06 │08 │05 │04 │03 │ Tsangan Left Mod, 2x1.5u-2x1u Right Mod +└─────┴───┴─────┴───────────────────────┴─────┴─────┴───┴───┘ +┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐ +│00 │01 │02 │06 │07 │04 │03 │ Tsangan/WKL/HHKB +└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ +┌─────┬───┬─────┬───────────────────────────┬───┬───┬───┬───┐ +│00 │01 │02 │06 │07 │05 │04 │03 │ 4x1u Right Mod +└─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘ +``` diff --git a/lib/python/qmk/cli/compile.py b/lib/python/qmk/cli/compile.py index 4c36dec3e792..7cbbbc1429c9 100755 --- a/lib/python/qmk/cli/compile.py +++ b/lib/python/qmk/cli/compile.py @@ -7,6 +7,7 @@ from milc import cli import qmk.path +from qmk.constants import QMK_FIRMWARE from qmk.decorators import automagic_keyboard, automagic_keymap from qmk.commands import build_environment from qmk.keyboard import keyboard_completer, keyboard_folder_or_all, is_all_keyboards @@ -60,6 +61,9 @@ def compile(cli): # Handler for the build target target = None + current_keyboard = None + current_keymap = None + if cli.args.filename: # if we were given a filename, assume we have a json build target target = JsonKeymapBuildTarget(cli.args.filename) diff --git a/lib/python/qmk/keyboard.py b/lib/python/qmk/keyboard.py index b56505d649ca..6851684ee42a 100644 --- a/lib/python/qmk/keyboard.py +++ b/lib/python/qmk/keyboard.py @@ -54,6 +54,20 @@ } +class AllKeyboards: + """Represents all keyboards. + """ + def __str__(self): + return 'all' + + def __repr__(self): + return 'all' + + def __eq__(self, other): + return isinstance(other, AllKeyboards) + + + class AllKeyboards: """Represents all keyboards. """ diff --git a/quantum/led_matrix/led_matrix.h b/quantum/led_matrix/led_matrix.h index c903a230f470..ed3afafe8093 100644 --- a/quantum/led_matrix/led_matrix.h +++ b/quantum/led_matrix/led_matrix.h @@ -88,6 +88,7 @@ #ifndef LED_MATRIX_LED_PROCESS_LIMIT # define LED_MATRIX_LED_PROCESS_LIMIT ((LED_MATRIX_LED_COUNT + 4) / 5) #endif +#define LED_MATRIX_LED_PROCESS_MAX_ITERATIONS ((LED_MATRIX_LED_COUNT + LED_MATRIX_LED_PROCESS_LIMIT - 1) / LED_MATRIX_LED_PROCESS_LIMIT) struct led_matrix_limits_t { uint8_t led_min_index; diff --git a/quantum/painter/qp.c b/quantum/painter/qp.c index 375986650938..cb17ba101e77 100644 --- a/quantum/painter/qp.c +++ b/quantum/painter/qp.c @@ -225,7 +225,7 @@ uint16_t qp_get_offset_y(painter_device_t device) { } void qp_get_geometry(painter_device_t device, uint16_t *width, uint16_t *height, painter_rotation_t *rotation, uint16_t *offset_x, uint16_t *offset_y) { - qp_dprintf("qp_geometry: entry\n"); + qp_dprintf("qp_get_geometry: entry\n"); painter_driver_t *driver = (painter_driver_t *)device; if (!driver || !driver->validate_ok) { diff --git a/quantum/rgb_matrix/rgb_matrix.h b/quantum/rgb_matrix/rgb_matrix.h index 9a3ffb8ea3a2..581ccbbf424e 100644 --- a/quantum/rgb_matrix/rgb_matrix.h +++ b/quantum/rgb_matrix/rgb_matrix.h @@ -106,6 +106,7 @@ #ifndef RGB_MATRIX_LED_PROCESS_LIMIT # define RGB_MATRIX_LED_PROCESS_LIMIT ((RGB_MATRIX_LED_COUNT + 4) / 5) #endif +#define RGB_MATRIX_LED_PROCESS_MAX_ITERATIONS ((RGB_MATRIX_LED_COUNT + RGB_MATRIX_LED_PROCESS_LIMIT - 1) / RGB_MATRIX_LED_PROCESS_LIMIT) struct rgb_matrix_limits_t { uint8_t led_min_index; diff --git a/tests/auto_shift/auto_shift_repeat/auto_shift_no_auto_repeat/config.h b/tests/auto_shift/auto_shift_repeat/auto_shift_no_auto_repeat/config.h index 973e04582fda..f6d544dd9003 100644 --- a/tests/auto_shift/auto_shift_repeat/auto_shift_no_auto_repeat/config.h +++ b/tests/auto_shift/auto_shift_repeat/auto_shift_no_auto_repeat/config.h @@ -14,6 +14,8 @@ * along with this program. If not, see . */ + + #pragma once #include "test_common.h" diff --git a/tests/auto_shift/retro_shift/tap_hold_configurations/hold_on_other_key_press/config.h b/tests/auto_shift/retro_shift/tap_hold_configurations/hold_on_other_key_press/config.h index 396683963d36..e946a26bdce6 100644 --- a/tests/auto_shift/retro_shift/tap_hold_configurations/hold_on_other_key_press/config.h +++ b/tests/auto_shift/retro_shift/tap_hold_configurations/hold_on_other_key_press/config.h @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - + #pragma once #include "test_common.h"