summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-111-2/+5
|\|
| * [Keyboard] fix: unicorne info.json LAYOUT (#17981)Less/Rikki2022-08-101-2/+5
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-117-122/+1314
|\|
| * Acheron Athena Layout Macro Refactor and Additions (#17973)James Young2022-08-107-122/+1314
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-112-53/+77
|\|
| * KBDfans KBD67 rev2: rename LAYOUT_65_ansi_split_bs_2_right_mods macro (#17972)James Young2022-08-102-53/+77
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-1111-0/+697
|\|
| * [Keyboard] Add Viendi8L (#17943)Álvaro A. Volpato2022-08-1011-0/+697
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-1121-0/+746
|\|
| * [Keyboard] Initial FM-S and FM-H support (#17765)Álvaro A. Volpato2022-08-1021-0/+746
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-1120-0/+2560
|\|
| * [Keyboard] add chromatonemini keyboard (#13516)3araht2022-08-1020-0/+2560
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-116-66/+89
|\|
| * MacroCat Refactor (#17969)James Young2022-08-105-66/+69
| |
| * [Keymap] single layer layout for BFO-9000 with numpad on the left (#17957)Roger2022-08-101-0/+20
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-1013-0/+353
|\|
| * Aurora65 (#17966)yiancar2022-08-1013-0/+353
| | | | | | | | | | | | | | | | | | * aurora65 initial commit * Add keymap images * Move USB config to JSON Co-authored-by: yiancar <yiancar@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-104-12/+12
|\|
| * Fix detection of EEPROM reset in some keyboards (#17970)Wilba2022-08-094-12/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-1014-0/+1081
|\|
| * [Keyboard] MechWild Puckbuddy (#17161)Kyle McCreery2022-08-0914-0/+1081
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial commit * testing modes * working on puckbuddy firmware. This is all working for now but need to clean it up and personalize it. * needs to be updated from vial build * prepping for PR * added rgb mode cycling to fn1 since it isn't on the encoder for these maps * readme written in preparation for pr * reverting driver print line * Removed old reference to OBE in the readme from copypaste error * applying changes based on review * applying changes from review * Update keyboards/mechwild/puckbuddy/puckbuddy.c * trailing whitespaces removed * added clear screen condition for switching back to name rendering * Added uf2 keymap and fixed display glitch for the logo render art. * Removed extra definition of FEE_PAGE_BASE_ADDRESS * Removed the uf2 keymap and made it automatic when selecting bootloader instead * Fixed the bad bootloader check * moved the uf2 check from rules.mk to post_rules.mk to satisfy lint * changing it back to stm32-dfu bootloader default * Fixed RGBLIGHT enable oversight. * Added persistent dynamic tapping configuration for the cirque touchpad tap term * new lines at end of files for formatting and diff sanity * changing default bootloader back to stm32-dfu * Had to completely redefine the tap keycodes instead of using the DT_UP and DT_DOWN keycodes because I was not able to specify them easily in the via/vial configs and this allows me to keep the original functionality instead of tying it to eeprom like these are. * Added tap toggling keycodes to quick enable and disable the tapping term * working out an issue where the tap status keeps turning to off on power cycle * correcting submodule garbo * Fixed display issue and rewrote TAP config approach to make it a little easier to control * removing backup puckbuddy.c code * Added some comment, removed some commented out old code, removed trailing whitespace * Changed to handle tinyuf2 by expecting emulated eeprom so that adding other forms of eeprom can be handled for the memory offset separately, and added user oled conditional inside the keyboard oled code block * Updated default keymaps to have the tap and dpi keys on by default * Apply suggestions from code review * Apply suggestions from code review
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-097-73/+146
|\|
| * change Adelais En Ciel rev. 3 from STM32F303 to APM32F103 MCU (#16964)mechlovin2022-08-097-73/+146
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-099-0/+233
|\|
| * [Keyboard] add ecila keyboard (#17596)mincedshon2022-08-099-0/+233
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-0913-0/+432
|\|
| * [Keyboard] Add NK20 (#17907)yiancar2022-08-0913-0/+432
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: yiancar <yiancar@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-094-4/+4
|\|
| * [Keyboard] (7skb)Change number of LEDs and Enable Mouse Keys (#17954)Salicylic-acid32022-08-084-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-085-168/+176
|\|
| * Also disable line ending conversion for merge workflows (#17953)Joel Challis2022-08-082-0/+8
| |
| * Format code according to conventions (#17951)QMK Bot2022-08-083-168/+168
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-081-0/+4
|\|
| * Force no git line ending conversion on format workflow (#16176)Joel Challis2022-08-081-0/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-089-0/+355
|\|
| * [Keyboard] Add Vertex AngleR2 keyboard (#16764)Vertex-kb2022-08-089-0/+355
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add files via upload * Delete Vertex/AngleR2 directory * Add files via upload * Delete keyboards/Vertex/AngleR2 directory * Add files via upload * Add files via upload * Add files via upload * Update keyboards/vertex/angler2/angler2.h * Update keyboards/vertex/angler2/info.json * Update keyboards/vertex/angler2/keymaps/default/keymap.c * Update keyboards/vertex/angler2/keymaps/via/keymap.c * Update keyboards/vertex/angler2/keymaps/via/keymap.c * Update keyboards/vertex/angler2/keymaps/via/keymap.c * Update keyboards/vertex/angler2/keymaps/default/keymap.c * Update keyboards/vertex/angler2/keymaps/via/keymap.c
* | Remove tmk_core 'serial' code (#17866)Joel Challis2022-08-083-234/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-0714-0/+242
|\|
| * [Keyboard] Add Shisaku keyboard (#17572)Arturo Avila2022-08-0714-0/+242
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-078-0/+1539
|\|
| * [Keymap] qwerty and dvorak keyboard setup (#16592)yeimialberth2022-08-078-0/+1539
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-076-23/+33
|\|
| * csc027/keymap-updates (#17881)csc0272022-08-076-23/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | * Reverted to most usable configuration for RDP usage. * Added some HSV color definitions without the value portion to allow using the existing value. * Switched to using HSV and HS color definitions. * Added media keys to the convenience layer. * Updated make rules to enable media keys. * Cleaned up planck make rules.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-071-1/+1
|\|
| * fix comment space code in quantum/matrix_common.c (#17942)Takeshi ISHII2022-08-071-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-074-86/+4
|\|
| * Rgbkb/keeb fixes (#17932)XScorpion22022-08-074-86/+4
| | | | | | | | | | | | | | | | | | * Disable console by default for better bios & reboot behavior * Remove custom matrix * Disable console by default for better bios & reboot behavior * PR feedback
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-0710-110/+31
|\|
| * rgbkb/zen - Resolve CONVERT_TO_PROTON_C warnings (#17619)Joel Challis2022-08-0710-110/+31
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-079-1/+407
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 03:25:26 +0000