Pull Latest #28
Merged
Pull Latest #28
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: 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
Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Tommi Pääkkö <tommi.paakko@symbio.com>
* adding my keyboard * Update keyboards/kk/65/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/kk/65/keymaps/via/rules.mk Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/kk/65/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/kk/65/keymaps/default/keymap.c Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/kk/65/rules.mk Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/kk/65/keymaps/via/keymap.c Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Added photo imgur photo link to readme.md * Adjusted keyboard level config and added config files with tapping_toggle to keymaps. * Update keyboards/kk/65/readme.md Co-authored-by: Drashna Jaelre <drashna@live.com> * Migrated qmk.locking settings to info.json and removed config.h * Update keyboards/kk/65/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/kk/65/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> --------- Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* Added keyboard rena * format file info.json * modify info.json file * modify 16mhz to 8mhz * modify info.json file * Delete redundant Spaces * Delete redundant Spaces * Delete redundant Spaces * Delete redundant Spaces --------- Co-authored-by: “yuezp” <“yuezpchn@126.com”>
Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Co-authored-by: Ex3c4Def <Joe_No@gmx.net> Co-authored-by: Ben Roe <ben@MacBookzPro-M2.lan> Co-authored-by: Ben Roe <ben@MacBook-Pro-von-Ben.local>
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
* add dnworks numpad * Apply suggestions from code review (Added community layouts) Co-authored-by: Drashna Jaelre <drashna@live.com> * fix linting * formatted json --------- Co-authored-by: Drashna Jaelre <drashna@live.com>
* Add GreatPad under gkeyboard Add GreatPad macropad * Update keyboards/gkeyboard/greatpad/config.h Co-authored-by: jack <0x6a73@protonmail.com> * Update keyboards/gkeyboard/greatpad/greatpad.c Co-authored-by: jack <0x6a73@protonmail.com> * Update keyboards/gkeyboard/greatpad/info.json Co-authored-by: jack <0x6a73@protonmail.com> * Update keyboards/gkeyboard/greatpad/info.json Co-authored-by: jack <0x6a73@protonmail.com> * Update keyboards/gkeyboard/greatpad/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> * Update keyboards/gkeyboard/greatpad/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> * Update keyboards/gkeyboard/greatpad/keymaps/via/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> * Update keyboards/gkeyboard/greatpad/keymaps/via/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> * Add a license header Add a license header to glcdfont.c * Update glcdfont.c * delete file * Revert "delete file" This reverts commit 388e6f0. * Update keyboards/gkeyboard/greatpad/mcuconf.h Co-authored-by: jack <0x6a73@protonmail.com> * Update .vscode/settings.json Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/gkeyboard/greatpad/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Enable encoder Enable encoder in file info.json * Update keyboards/gkeyboard/greatpad/greatpad.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update info.json Run qmk format-json -i file info.json --------- Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* Implement Sha keyboard with default layout * Adjust readme and info.json per PR checklist * Fix RGB Light description in default keymap readme * Update keyboards/sha/rules.mk Move configuration to info.json Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/sha/info.json Move configuration to info.json Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/sha/info.json Move configuration to info.json Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/sha/info.json Define RGB animations in info.json Co-authored-by: Joel Challis <git@zvecr.com> * Enable RGB Lighting Layers at keymap level, not keyboard level --------- Co-authored-by: Joel Challis <git@zvecr.com>
Fix for wrong key's placement.
* initial commit lvl1 * Add APM32 option * update stuff:) * White * Update to yaml * Update keyboards/artifact/lvl/rev_hs01/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update info.json * Update info.json Ups... * Update mcuconf.h * Update halconf.h * Update info.json * Update keyboards/artifact/lvl/rev_hs01/config.h Co-authored-by: Ryan <fauxpark@gmail.com> --------- Co-authored-by: yiancar <yiancar@gmail.com> Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
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.
Description
Types of Changes
Issues Fixed or Closed by This PR
Checklist