Merge up until userkeymap support #2
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Ryan <fauxpark@gmail.com>
* [refactor] rename LAYOUT_75_ansi to LAYOUT * [enhancement] touch-up layout
* [refactor] rename LAYOUT to LAYOUT_65_ansi_blocker * [enhancement] enable Community Layout support
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: syc <squall_sha@163.com>
Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Wolf <contact@vwolf.be>
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* [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]
* [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
* [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
* [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
* [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
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](actions/checkout@v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Correct key sizes/positioning on the right side of the board.
[enhancement]
* 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]
* 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]
* Add Binepad Pixie * Post waffle87 and drashna review recommendations applied * Post-drashna code review suggestions applied Co-authored-by: Drashna Jaelre <drashna@live.com> * post zvecr review --------- Co-authored-by: Drashna Jaelre <drashna@live.com>
* 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]
Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* [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
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
Added PloopyCo madromys/adept mouse Co-authored-by: Drashna Jaelre <drashna@live.com>
* 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 <dunk2k_2000@hotmail.com> * 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 <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/proto/keymaps/default/keymap.c Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * 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 <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/prod/keymaps/default/keymap.c Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/prod/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Amended some changes to info.json - community layouts changed from scope to array. * Update keyboards/mariorion_v25/readme.md Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Revert keyboards/gray_studio/think65/solder/solder.c Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Revert keyboards/gray_studio/think65/solder/solder.c Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Revert keyboards/gray_studio/think65/solder/solder.c Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * 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 <dunk2k_2000@hotmail.com> * 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 <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/rules.mk Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/proto/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/proto/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/proto/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/prod/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/prod/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/prod/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/prod/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Revert keyboards/gray_studio/think65/solder/solder.c Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/matrix_diagram.md Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/readme.md Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/readme.md Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/readme.md Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/readme.md Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/readme.md Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/proto/mariorion_v25.c Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/mariorion_v25/prod/mariorion_v25.c Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * 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 <fauxpark@gmail.com> * Update keyboards/mariorion_v25/prod/keymaps/via/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/prod/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/prod/mariorion_v25.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/proto/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/proto/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/proto/mariorion_v25.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/proto/mariorion_v25.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/proto/keymaps/via/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/proto/keymaps/via/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * 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 <fauxpark@gmail.com> * Update keyboards/mariorion_v25/prod/mariorion_v25.c Co-authored-by: Ryan <fauxpark@gmail.com> * Revert "Committing a details update to readme.md." This reverts commit 068a82a. * Committing a details update to readme.md. * Update keyboards/mariorion_v25/halconf.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/mcuconf.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/prod/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/proto/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/mariorion_v25/halconf.h Co-authored-by: Ryan <fauxpark@gmail.com> * 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 <anastasialucas940@hotmail.com> Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* fix `layouts` data * add EoF
…or (qmk#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.)
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: jack <0x6A73@pm.me>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Add files via upload * [keyboard] * [Keyboard] * Delete flash_spi.c * Delete flash_spi.h * Delete wb32_spi_master.c * Delete wb32_spi_master.h * [Keyboard] * Resolved requested changes * Resolved requested changes * Changed rules.mk file accordingly. * Resolved changes accordingly. * Update config.h file and rules.mk file * Removed eeprom_flash.c file * Update default/keymap.c file * Delete keyboards/darkproject/kd83a_bfg_edition directory * Add keyboard * Add keyboard * Delete darkproject/kd83a_bfg_edition directory * Resolved Changes * Resolved requested changes * keyboard * Add keyboard * Delete keyboard * Add keyboard * Delete keyboards/darkproject/kd87a_bfg_edition directory * update keymap.c file * update via/keymap.c, config.h and kd83a_bfg_edition.c files * Delete keymap.c * Update via/keymap.c, config.h and kd83a_bfg_edition.c files * update config.h file * update keymap.c file * update keymap.c file * update config.h * update kd83a_bfg_edition.c * Resolved requested changes. * Delete folder which was added accidentally. * Update keyboards/darkproject/kd83a_bfg_edition/config.h * Update keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c * Update keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c * Update keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c * Update keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c * Update keyboards/darkproject/kd83a_bfg_edition/info.json * Update keyboards/darkproject/kd83a_bfg_edition/rules.mk * Update keyboards/darkproject/kd83a_bfg_edition/info.json * update info.json file * update config.h file * Updated requested changes * update readme.md * Resolved requested changes * Update info.json file * Delete kd83a_bfg_edition.h * Delete readme.md in default folder * Update info.json file * update info.json * Updated changes * Updated changes * Resolved requested changes * Resolved requested changes
…_support Last commit with all user keymaps still present.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
QMK removed support for all user keymaps. Updating to the latest right before this removal. Based on topic
user-keymaps-still-present